![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen.c b/src/screen.c
index b6f63007e6eea1b7a0add973c5c13a3f239b93a0..299d27eb4fe03a896478f93a5cea26cbceac4850 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
#endif
/* minimum window size */
-static const int SCREEN_MIN_COLS = 14;
-static const int SCREEN_MIN_ROWS = 5;
+static const unsigned SCREEN_MIN_COLS = 14;
+static const unsigned SCREEN_MIN_ROWS = 5;
/* screens */
-struct screen screen;
-static const struct screen_functions *mode_fn = &screen_queue;
-static const struct screen_functions *mode_fn_prev = &screen_queue;
+struct screen screen = {
+ .current_page = &screen_queue,
+};
-gboolean
-screen_is_visible(const struct screen_functions *sf)
-{
- return sf == mode_fn;
-}
+static const struct screen_functions *mode_fn_prev = &screen_queue;
void
screen_switch(const struct screen_functions *sf, struct mpdclient *c)
{
assert(sf != NULL);
- if (sf == mode_fn)
+ if (sf == screen.current_page)
return;
- mode_fn_prev = mode_fn;
+ mode_fn_prev = screen.current_page;
/* close the old mode */
- if (mode_fn->close != NULL)
- mode_fn->close();
+ if (screen.current_page->close != NULL)
+ screen.current_page->close();
/* get functions for the new mode */
- mode_fn = sf;
+ screen.current_page = sf;
/* open the new mode */
- if (mode_fn->open != NULL)
- mode_fn->open(c);
+ if (sf->open != NULL)
+ sf->open(c);
- screen_paint(c);
+ screen_paint(c, true);
}
void
int max = g_strv_length(options.screen_list);
/* find current screen */
- int current = find_configured_screen(screen_get_name(mode_fn));
+ int current = find_configured_screen(screen_get_name(screen.current_page));
int next = current + offset;
if (next<0)
next = max-1;
screen_switch(sf, c);
}
-static void
-paint_top_window(const char *header, const struct mpdclient *c)
-{
- title_bar_paint(&screen.title_bar, header, c->status);
-}
-
-static void
-update_progress_window(struct mpdclient *c, bool repaint)
-{
- unsigned elapsed;
- if (c->status == NULL)
- elapsed = 0;
- else if (seek_id >= 0 && seek_id == mpd_status_get_song_id(c->status))
- elapsed = seek_target_time;
- else
- elapsed = mpd_status_get_elapsed_time(c->status);
-
- unsigned duration = mpdclient_is_playing(c)
- ? mpd_status_get_total_time(c->status)
- : 0;
-
- if (progress_bar_set(&screen.progress_bar, elapsed, duration) ||
- repaint)
- progress_bar_paint(&screen.progress_bar);
-}
-
void
screen_exit(void)
{
- if (mode_fn->close != NULL)
- mode_fn->close();
+ if (screen.current_page->close != NULL)
+ screen.current_page->close();
screen_list_exit();
void
screen_resize(struct mpdclient *c)
{
- if (COLS<SCREEN_MIN_COLS || LINES<SCREEN_MIN_ROWS) {
+ const unsigned cols = COLS, rows = LINES;
+ if (cols < SCREEN_MIN_COLS || rows < SCREEN_MIN_ROWS) {
screen_exit();
fprintf(stderr, "%s\n", _("Error: Screen too small"));
exit(EXIT_FAILURE);
}
+
#ifdef PDCURSES
- resize_term(LINES, COLS);
+ resize_term(rows, cols);
#else
- resizeterm(LINES, COLS);
+ resizeterm(rows, cols);
#endif
- screen.cols = COLS;
- screen.rows = LINES;
-
- title_bar_resize(&screen.title_bar, screen.cols);
+ title_bar_resize(&screen.title_bar, cols);
/* main window */
- screen.main_window.cols = screen.cols;
- screen.main_window.rows = screen.rows-4;
- wresize(screen.main_window.w, screen.main_window.rows, screen.cols);
- wclear(screen.main_window.w);
+ screen.main_window.cols = cols;
+ screen.main_window.rows = rows - 4;
+ wresize(screen.main_window.w, screen.main_window.rows, cols);
/* progress window */
- progress_bar_resize(&screen.progress_bar, screen.cols,
- screen.rows - 2, 0);
- progress_bar_paint(&screen.progress_bar);
+ progress_bar_resize(&screen.progress_bar, cols, rows - 2, 0);
/* status window */
- status_bar_resize(&screen.status_bar, screen.cols, screen.rows - 1, 0);
- status_bar_paint(&screen.status_bar, c->status, c->song);
+ status_bar_resize(&screen.status_bar, cols, rows - 1, 0);
- screen.buf_size = screen.cols;
+ screen.buf_size = cols;
g_free(screen.buf);
- screen.buf = g_malloc(screen.cols);
+ screen.buf = g_malloc(cols);
/* resize all screens */
screen_list_resize(screen.main_window.cols, screen.main_window.rows);
curs_set(1);
curs_set(0);
- screen_paint(c);
+ screen_paint(c, true);
}
#ifndef NCMPC_MINI
{
struct mpdclient *c = data;
-#ifndef NCMPC_MINI
screen.welcome_source_id = 0;
-#endif
- paint_top_window(mode_fn->get_title != NULL
- ? mode_fn->get_title(screen.buf, screen.buf_size)
- : "",
- c);
+ paint_top_window(c);
doupdate();
return false;
void
screen_init(struct mpdclient *c)
{
- if (COLS < SCREEN_MIN_COLS || LINES < SCREEN_MIN_ROWS) {
+ const unsigned cols = COLS, rows = LINES;
+ if (cols < SCREEN_MIN_COLS || rows < SCREEN_MIN_ROWS) {
fprintf(stderr, "%s\n", _("Error: Screen too small"));
exit(EXIT_FAILURE);
}
- screen.cols = COLS;
- screen.rows = LINES;
-
- screen.buf = g_malloc(screen.cols);
- screen.buf_size = screen.cols;
+ screen.buf = g_malloc(cols);
+ screen.buf_size = cols;
screen.findbuf = NULL;
#ifndef NCMPC_MINI
if (options.welcome_screen_list)
screen.welcome_source_id =
- g_timeout_add(SCREEN_WELCOME_TIME * 1000,
- welcome_timer_callback, c);
+ g_timeout_add_seconds(SCREEN_WELCOME_TIME,
+ welcome_timer_callback, c);
#endif
/* create top window */
- title_bar_init(&screen.title_bar, screen.cols, 0, 0);
+ title_bar_init(&screen.title_bar, cols, 0, 0);
/* create main window */
- window_init(&screen.main_window, screen.rows - 4, screen.cols, 2, 0);
+ window_init(&screen.main_window, rows - 4, cols, 2, 0);
if (!options.hardware_cursor)
leaveok(screen.main_window.w, TRUE);
keypad(screen.main_window.w, TRUE);
/* create progress window */
- progress_bar_init(&screen.progress_bar, screen.cols,
- screen.rows - 2, 0);
+ progress_bar_init(&screen.progress_bar, cols, rows - 2, 0);
/* create status window */
- status_bar_init(&screen.status_bar, screen.cols, screen.rows - 1, 0);
+ status_bar_init(&screen.status_bar, cols, rows - 1, 0);
#ifdef ENABLE_COLORS
if (options.enable_colors) {
screen_list_init(screen.main_window.w,
screen.main_window.cols, screen.main_window.rows);
- if (mode_fn->open != NULL)
- mode_fn->open(c);
-}
-
-static void
-screen_refresh(struct mpdclient *c, bool main_dirty)
-{
- /* update title/header window */
- const char *title =
-#ifndef NCMPC_MINI
- screen.welcome_source_id == 0 &&
-#endif
- mode_fn->get_title != NULL
- ? mode_fn->get_title(screen.buf, screen.buf_size)
- : "";
- assert(title != NULL);
- paint_top_window(title, c);
-
- /* paint the bottom window */
-
- update_progress_window(c, true);
- status_bar_paint(&screen.status_bar, c->status, c->song);
-
- /* paint the main window */
-
- if (main_dirty) {
- wclear(screen.main_window.w);
- if (mode_fn->paint != NULL)
- mode_fn->paint();
- }
-
- /* move the cursor to the origin */
-
- if (!options.hardware_cursor)
- wmove(screen.main_window.w, 0, 0);
-
- wnoutrefresh(screen.main_window.w);
-
- /* tell curses to update */
- doupdate();
-}
-
-void
-screen_paint(struct mpdclient *c)
-{
- screen_refresh(c, true);
+ if (screen.current_page->open != NULL)
+ screen.current_page->open(c);
}
void
#endif
/* update the main window */
- if (mode_fn->update != NULL)
- mode_fn->update(c);
+ if (screen.current_page->update != NULL)
+ screen.current_page->update(c);
- screen_refresh(c, false);
+ screen_paint(c, false);
}
#ifdef HAVE_GETMOUSE
}
#endif
- if (mode_fn->cmd != NULL && mode_fn->cmd(c, cmd))
+ if (screen.current_page->cmd != NULL &&
+ screen.current_page->cmd(c, cmd))
return;
if (handle_player_command(c, cmd))
_("Auto center mode: Off"));
break;
case CMD_SCREEN_UPDATE:
- screen_paint(c);
+ screen_paint(c, true);
break;
case CMD_SCREEN_PREVIOUS:
screen_next_mode(c, -1);