use g_timeout_add_seconds() where appropriate

[ncmpc.git] / src / screen.c

diff --git a/src/screen.c b/src/screen.c
index 9ea6f9183e93c4472b828b977b108867758a0fc7..781b68f22eb9e99c2d06b2590dce1990548041a6 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -219,16 +219,13 @@ screen_resize(struct mpdclient *c)
        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);
 
        /* progress window */
        progress_bar_resize(&screen.progress_bar, screen.cols,
                            screen.rows - 2, 0);
-       progress_bar_paint(&screen.progress_bar);
 
        /* status window */
        status_bar_resize(&screen.status_bar, screen.cols, screen.rows - 1, 0);
-       status_bar_paint(&screen.status_bar, c->status, c->song);
 
        screen.buf_size = screen.cols;
        g_free(screen.buf);
@@ -250,9 +247,7 @@ welcome_timer_callback(gpointer data)
 {
        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)
@@ -282,8 +277,8 @@ screen_init(struct mpdclient *c)
 #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 */
@@ -300,11 +295,9 @@ screen_init(struct mpdclient *c)
        /* create progress window */
        progress_bar_init(&screen.progress_bar, screen.cols,
                          screen.rows - 2, 0);
-       progress_bar_paint(&screen.progress_bar);
 
        /* create status window */
        status_bar_init(&screen.status_bar, screen.cols, screen.rows - 1, 0);
-       status_bar_paint(&screen.status_bar, c->status, c->song);
 
 #ifdef ENABLE_COLORS
        if (options.enable_colors) {
@@ -327,19 +320,19 @@ screen_init(struct mpdclient *c)
                mode_fn->open(c);
 }
 
-void
-screen_paint(struct mpdclient *c)
+static void
+screen_refresh(struct mpdclient *c, bool main_dirty)
 {
-       const char *title = NULL;
-
-       if (mode_fn->get_title != NULL)
-               title = mode_fn->get_title(screen.buf, screen.buf_size);
-
-       /* paint the title/header window */
-       if( title )
-               paint_top_window(title, c);
-       else
-               paint_top_window("", c);
+       /* 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 */
 
@@ -348,9 +341,11 @@ screen_paint(struct mpdclient *c)
 
        /* paint the main window */
 
-       wclear(screen.main_window.w);
-       if (mode_fn->paint != NULL)
-               mode_fn->paint();
+       if (main_dirty) {
+               wclear(screen.main_window.w);
+               if (mode_fn->paint != NULL)
+                       mode_fn->paint();
+       }
 
        /* move the cursor to the origin */
 
@@ -363,6 +358,12 @@ screen_paint(struct mpdclient *c)
        doupdate();
 }
 
+void
+screen_paint(struct mpdclient *c)
+{
+       screen_refresh(c, true);
+}
+
 void
 screen_update(struct mpdclient *c)
 {
@@ -430,36 +431,13 @@ screen_update(struct mpdclient *c)
            mpdclient_is_connected(c))
                screen_status_printf(_("Database updated"));
        was_connected = mpdclient_is_connected(c);
-
-       /* update title/header window */
-       if (screen.welcome_source_id != 0)
-               paint_top_window("", c);
-       else
 #endif
-       if (mode_fn->get_title != NULL) {
-               paint_top_window(mode_fn->get_title(screen.buf,screen.buf_size), c);
-       } else
-               paint_top_window("", c);
-
-       /* update progress window */
-       update_progress_window(c, false);
-
-       /* update status window */
-       status_bar_paint(&screen.status_bar, c->status, c->song);
 
        /* update the main window */
        if (mode_fn->update != NULL)
                mode_fn->update(c);
 
-       /* 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();
+       screen_refresh(c, false);
 }
 
 #ifdef HAVE_GETMOUSE