![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen.c b/src/screen.c
index beddb95b823c6cc91f617662fcaedfd4cdb9aa2f..526f091dd09df03aa0fa7bb42af3c35256b218da 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
*/
#include "screen.h"
+#include "screen_list.h"
#include "screen_utils.h"
#include "config.h"
#include "ncmpc.h"
#include <time.h>
#include <locale.h>
-#define SCREEN_PLAYLIST_ID 0
-#define SCREEN_BROWSE_ID 1
-#define SCREEN_ARTIST_ID 2
-#define SCREEN_HELP_ID 100
-#define SCREEN_KEYDEF_ID 101
-#define SCREEN_CLOCK_ID 102
-#define SCREEN_SEARCH_ID 103
-#define SCREEN_LYRICS_ID 104
-
-
-
/* screens */
-extern const struct screen_functions screen_playlist;
-extern const struct screen_functions screen_browse;
-#ifdef ENABLE_ARTIST_SCREEN
-extern const struct screen_functions screen_artist;
-#endif
-extern const struct screen_functions screen_help;
-#ifdef ENABLE_SEARCH_SCREEN
-extern const struct screen_functions screen_search;
-#endif
-#ifdef ENABLE_KEYDEF_SCREEN
-extern const struct screen_functions screen_keydef;
-#endif
-#ifdef ENABLE_CLOCK_SCREEN
-extern const struct screen_functions screen_clock;
-#endif
-extern const struct screen_functions screen_lyrics;
-
-typedef struct screen_functions * (*screen_get_mode_functions_fn_t) (void);
-
-static const struct
-{
- gint id;
- const gchar *name;
- const struct screen_functions *functions;
-} screens[] = {
- { SCREEN_PLAYLIST_ID, "playlist", &screen_playlist },
- { SCREEN_BROWSE_ID, "browse", &screen_browse },
-#ifdef ENABLE_ARTIST_SCREEN
- { SCREEN_ARTIST_ID, "artist", &screen_artist },
-#endif
- { SCREEN_HELP_ID, "help", &screen_help },
-#ifdef ENABLE_SEARCH_SCREEN
- { SCREEN_SEARCH_ID, "search", &screen_search },
-#endif
-#ifdef ENABLE_KEYDEF_SCREEN
- { SCREEN_KEYDEF_ID, "keydef", &screen_keydef },
-#endif
-#ifdef ENABLE_CLOCK_SCREEN
- { SCREEN_CLOCK_ID, "clock", &screen_clock },
-#endif
-#ifdef ENABLE_LYRICS_SCREEN
- { SCREEN_LYRICS_ID, "lyrics", &screen_lyrics },
-#endif
-};
-
-#define NUM_SCREENS (sizeof(screens) / sizeof(screens[0]))
static gboolean welcome = TRUE;
static struct screen screen;
static int seek_id = -1;
static int seek_target_time = 0;
-gint
-screen_get_id(const char *name)
-{
- guint i;
-
- for (i = 0; i < NUM_SCREENS; ++i)
- if (strcmp(name, screens[i].name) == 0)
- return screens[i].id;
-
- return -1;
-}
-
-static gint
-lookup_mode(gint id)
-{
- guint i;
-
- for (i = 0; i < NUM_SCREENS; ++i)
- if (screens[i].id == id)
- return i;
-
- return -1;
-}
-
-gint get_cur_mode_id(void)
+gboolean
+screen_is_visible(const struct screen_functions *sf)
{
- return screens[screen.mode].id;
+ return sf == mode_fn;
}
static void
-switch_screen_mode(gint id, mpdclient_t *c)
+switch_screen_mode(const struct screen_functions *sf, mpdclient_t *c)
{
- gint new_mode;
+ assert(sf != NULL);
- if( id == screens[screen.mode].id )
- return;
-
- new_mode = lookup_mode(id);
- if (new_mode < 0)
+ if (sf == mode_fn)
return;
/* close the old mode */
mode_fn->close();
/* get functions for the new mode */
- D("switch_screen(%s)\n", screens[new_mode].name );
- mode_fn = screens[new_mode].functions;
- screen.mode = new_mode;
+ mode_fn = sf;
screen.painted = 0;
/* open the new mode */
{
int max = g_strv_length(options.screen_list);
int current, next;
+ const struct screen_functions *sf;
/* find current screen */
- current = find_configured_screen(screens[screen.mode].name);
+ current = find_configured_screen(screen_get_name(mode_fn));
next = current + offset;
if (next<0)
next = max-1;
next = 0;
D("current mode: %d:%d next:%d\n", current, max, next);
- switch_screen_mode(screen_get_id(options.screen_list[next]), c);
+ sf = screen_lookup_name(options.screen_list[next]);
+ if (sf != NULL)
+ switch_screen_mode(sf, c);
}
static void
mpd_Status *status = c->status;
mpd_Song *song = c->song;
int elapsedTime = 0;
+ char bitrate[16];
const char *str = NULL;
int x = 0;
if( c->song && seek_id == c->song->id )
elapsedTime = seek_target_time;
+
+ /* display bitrate if visible-bitrate is true */
+ if (options.visible_bitrate) {
+ g_snprintf(bitrate, 16,
+ " [%d kbps]", status->bitRate);
+ } else {
+ bitrate[0] = '\0';
+ }
+
/*write out the time, using hours if time over 60 minutes*/
if (c->status->totalTime > 3600) {
g_snprintf(screen.buf, screen.buf_size,
- " [%i:%02i:%02i/%i:%02i:%02i]",
- elapsedTime/3600, (elapsedTime%3600)/60, elapsedTime%60,
+ "%s [%i:%02i:%02i/%i:%02i:%02i]",
+ bitrate, elapsedTime/3600, (elapsedTime%3600)/60, elapsedTime%60,
status->totalTime/3600, (status->totalTime%3600)/60, status->totalTime%60);
} else {
g_snprintf(screen.buf, screen.buf_size,
- " [%i:%02i/%i:%02i]",
- elapsedTime/60, elapsedTime%60,
+ "%s [%i:%02i/%i:%02i]",
+ bitrate, elapsedTime/60, elapsedTime%60,
status->totalTime/60, status->totalTime%60 );
}
} else {
void
screen_exit(void)
{
- guint i;
-
- endwin();
-
if (mode_fn->close != NULL)
mode_fn->close();
- /* close and exit all screens (playlist,browse,help...) */
- for (i = 0; i < NUM_SCREENS; ++i) {
- const struct screen_functions *sf = screens[i].functions;
-
- if (sf->exit)
- sf->exit();
- }
+ screen_list_exit();
string_list_free(screen.find_history);
g_free(screen.buf);
void
screen_resize(void)
{
- guint i;
-
D("Resize rows %d->%d, cols %d->%d\n",screen.rows,LINES,screen.cols,COLS);
if (COLS<SCREEN_MIN_COLS || LINES<SCREEN_MIN_ROWS) {
screen_exit();
g_free(screen.buf);
screen.buf = g_malloc(screen.cols);
- /* close and exit all screens (playlist,browse,help...) */
- for (i = 0; i < NUM_SCREENS; ++i) {
- const struct screen_functions *sf = screens[i].functions;
-
- if (sf->resize)
- sf->resize(screen.main_window.cols, screen.main_window.rows);
- }
-
+ /* resize all screens */
+ screen_list_resize(screen.main_window.cols, screen.main_window.rows);
/* ? - without this the cursor becomes visible with aterm & Eterm */
curs_set(1);
}
void
-ncurses_init(void)
+screen_init(mpdclient_t *c)
{
-
- /* initialize the curses library */
- initscr();
- /* initialize color support */
- colors_start();
- /* tell curses not to do NL->CR/NL on output */
- nonl();
- /* use raw mode (ignore interrupt,quit,suspend, and flow control ) */
-#ifdef ENABLE_RAW_MODE
- // raw();
-#endif
- /* don't echo input */
- noecho();
- /* set cursor invisible */
- curs_set(0);
- /* enable extra keys */
- keypad(stdscr, TRUE);
- /* return from getch() without blocking */
- timeout(SCREEN_TIMEOUT);
- /* initialize mouse support */
-#ifdef HAVE_GETMOUSE
- if (options.enable_mouse)
- mousemask(ALL_MOUSE_EVENTS, NULL);
-#endif
-
if (COLS < SCREEN_MIN_COLS || LINES < SCREEN_MIN_ROWS) {
fprintf(stderr, _("Error: Screen to small!\n"));
exit(EXIT_FAILURE);
}
- screen.mode = 0;
screen.cols = COLS;
screen.rows = LINES;
screen.findbuf = NULL;
screen.painted = 0;
screen.start_timestamp = time(NULL);
- screen.input_timestamp = time(NULL);
screen.last_cmd = CMD_NONE;
/* create top window */
}
refresh();
-}
-
-void
-screen_init(mpdclient_t *c)
-{
- guint i;
/* initialize screens */
- for (i = 0; i < NUM_SCREENS; ++i) {
- const struct screen_functions *fn = screens[i].functions;
-
- if (fn->init)
- fn->init(screen.main_window.w,
- screen.main_window.cols,
- screen.main_window.rows);
- }
+ screen_list_init(screen.main_window.w,
+ screen.main_window.cols, screen.main_window.rows);
if (mode_fn->open != NULL)
mode_fn->open(&screen, c);
/* paint the main window */
wclear(screen.main_window.w);
if (mode_fn->paint != NULL)
- mode_fn->paint(&screen, c);
+ mode_fn->paint(c);
paint_progress_window(c);
paint_status_window(c);
static int dbupdate = -1;
if( !screen.painted )
- return screen_paint(c);
+ screen_paint(c);
/* print a message if mpd status has changed */
if (c->status != NULL) {
}
/* update title/header window */
- if (welcome && screen.last_cmd==CMD_NONE &&
+ if (welcome && options.welcome_screen_list &&
+ screen.last_cmd==CMD_NONE &&
time(NULL)-screen.start_timestamp <= SCREEN_WELCOME_TIME)
paint_top_window("", c, 0);
else if (mode_fn->get_title != NULL) {
/* update the main window */
if (mode_fn->update != NULL)
- mode_fn->update(&screen, c);
+ mode_fn->update(c);
/* update progress window */
paint_progress_window(c);
#ifdef HAVE_GETMOUSE
int
-screen_get_mouse_event(mpdclient_t *c,
- list_window_t *lw, int lw_length,
- unsigned long *bstate, int *row)
+screen_get_mouse_event(mpdclient_t *c, unsigned long *bstate, int *row)
{
MEVENT event;
return 1;
}
- /* if the even occured above the list window move up */
- if (*row < 0 && lw) {
- if (event.bstate & BUTTON3_CLICKED)
- list_window_first(lw);
- else
- list_window_previous_page(lw);
- return 1;
- }
-
- /* if the even occured below the list window move down */
- if ((unsigned)*row >= lw->rows && lw) {
- if (event.bstate & BUTTON3_CLICKED)
- list_window_last(lw, lw_length);
- else
- list_window_next_page(lw, lw_length);
- return 1;
- }
-
return 0;
}
#endif
return 0;
switch(cmd) {
+ /*
case CMD_PLAY:
mpdclient_cmd_play(c, MPD_PLAY_AT_BEGINNING);
break;
+ */
case CMD_PAUSE:
mpdclient_cmd_pause(c, !IS_PAUSED(c->status->state));
break;
case CMD_STOP:
mpdclient_cmd_stop(c);
break;
+ case CMD_CROP:
+ mpdclient_cmd_crop(c);
+ break;
case CMD_SEEK_FORWARD:
if (!IS_STOPPED(c->status->state)) {
if (c->song && seek_id != c->song->id) {
void
screen_cmd(mpdclient_t *c, command_t cmd)
{
- screen.input_timestamp = time(NULL);
screen.last_cmd = cmd;
welcome = FALSE;
screen_next_mode(c, 1);
break;
case CMD_SCREEN_PLAY:
- switch_screen_mode(SCREEN_PLAYLIST_ID, c);
+ switch_screen_mode(&screen_playlist, c);
break;
case CMD_SCREEN_FILE:
- switch_screen_mode(SCREEN_BROWSE_ID, c);
+ switch_screen_mode(&screen_browse, c);
break;
case CMD_SCREEN_HELP:
- switch_screen_mode(SCREEN_HELP_ID, c);
+ switch_screen_mode(&screen_help, c);
break;
+#ifdef ENABLE_SEARCH_SCREEN
case CMD_SCREEN_SEARCH:
- switch_screen_mode(SCREEN_SEARCH_ID, c);
+ switch_screen_mode(&screen_search, c);
break;
+#endif
+#ifdef ENABLE_ARTIST_SCREEN
case CMD_SCREEN_ARTIST:
- switch_screen_mode(SCREEN_ARTIST_ID, c);
+ switch_screen_mode(&screen_artist, c);
break;
+#endif
+#ifdef ENABLE_KEYDEF_SCREEN
case CMD_SCREEN_KEYDEF:
- switch_screen_mode(SCREEN_KEYDEF_ID, c);
- break;
- case CMD_SCREEN_CLOCK:
- switch_screen_mode(SCREEN_CLOCK_ID, c);
+ switch_screen_mode(&screen_keydef, c);
break;
+#endif
+#ifdef ENABLE_LYRICS_SCREEN
case CMD_SCREEN_LYRICS:
- switch_screen_mode(SCREEN_LYRICS_ID, c);
+ switch_screen_mode(&screen_lyrics, c);
break;
- case CMD_QUIT:
- exit(EXIT_SUCCESS);
+#endif
default:
break;
}