Code

screen: remove unnecessary doupdate() call from screen_init()
[ncmpc.git] / src / screen.c
index c01c79232571d2de8c37ad2492ef5d810e6382cc..9ea6f9183e93c4472b828b977b108867758a0fc7 100644 (file)
@@ -1,27 +1,27 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen.h"
 #include "screen_interface.h"
 #include "screen_list.h"
 #include "screen_utils.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "config.h"
 #include "i18n.h"
 #include "charset.h"
@@ -31,7 +31,7 @@
 #include "colors.h"
 #include "player_command.h"
 #include "screen_help.h"
-#include "screen_play.h"
+#include "screen_queue.h"
 #include "screen_file.h"
 #include "screen_artist.h"
 #include "screen_search.h"
@@ -39,6 +39,7 @@
 #include "screen_keydef.h"
 #include "screen_lyrics.h"
 #include "screen_outputs.h"
+#include "screen_chat.h"
 
 #include <mpd/client.h>
 
@@ -60,8 +61,8 @@ static const int SCREEN_MIN_ROWS = 5;
 /* screens */
 
 struct screen screen;
-static const struct screen_functions *mode_fn = &screen_playlist;
-static const struct screen_functions *mode_fn_prev = &screen_playlist;
+static const struct screen_functions *mode_fn = &screen_queue;
+static const struct screen_functions *mode_fn_prev = &screen_queue;
 
 gboolean
 screen_is_visible(const struct screen_functions *sf)
@@ -131,18 +132,17 @@ static void
 screen_next_mode(struct mpdclient *c, int offset)
 {
        int max = g_strv_length(options.screen_list);
-       int current, next;
-       const struct screen_functions *sf;
 
        /* find current screen */
-       current = find_configured_screen(screen_get_name(mode_fn));
-       next = current + offset;
+       int current = find_configured_screen(screen_get_name(mode_fn));
+       int next = current + offset;
        if (next<0)
                next = max-1;
        else if (next>=max)
                next = 0;
 
-       sf = screen_lookup_name(options.screen_list[next]);
+       const struct screen_functions *sf =
+               screen_lookup_name(options.screen_list[next]);
        if (sf != NULL)
                screen_switch(sf, c);
 }
@@ -156,18 +156,15 @@ paint_top_window(const char *header, const struct mpdclient *c)
 static void
 update_progress_window(struct mpdclient *c, bool repaint)
 {
-       unsigned elapsed, duration;
-
-       if (c->song != NULL && seek_id == (int)mpd_song_get_id(c->song))
+       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 if (c->status != NULL)
-               elapsed = mpd_status_get_elapsed_time(c->status);
        else
-               elapsed = 0;
+               elapsed = mpd_status_get_elapsed_time(c->status);
 
-       duration = c->status != NULL &&
-               (mpd_status_get_state(c->status) == MPD_STATE_PLAY ||
-                mpd_status_get_state(c->status) == MPD_STATE_PAUSE)
+       unsigned duration = mpdclient_is_playing(c)
                ? mpd_status_get_total_time(c->status)
                : 0;
 
@@ -204,11 +201,14 @@ screen_resize(struct mpdclient *c)
 {
        if (COLS<SCREEN_MIN_COLS || LINES<SCREEN_MIN_ROWS) {
                screen_exit();
-               fprintf(stderr, "%s", _("Error: Screen too small"));
+               fprintf(stderr, "%s\n", _("Error: Screen too small"));
                exit(EXIT_FAILURE);
        }
-
+#ifdef PDCURSES
+       resize_term(LINES, COLS);
+#else 
        resizeterm(LINES, COLS);
+#endif
 
        screen.cols = COLS;
        screen.rows = LINES;
@@ -292,7 +292,9 @@ screen_init(struct mpdclient *c)
        /* create main window */
        window_init(&screen.main_window, screen.rows - 4, screen.cols, 2, 0);
 
-       //  leaveok(screen.main_window.w, TRUE); temporary disabled
+       if (!options.hardware_cursor)
+               leaveok(screen.main_window.w, TRUE);
+
        keypad(screen.main_window.w, TRUE);
 
        /* create progress window */
@@ -317,8 +319,6 @@ screen_init(struct mpdclient *c)
        }
 #endif
 
-       doupdate();
-
        /* initialize screens */
        screen_list_init(screen.main_window.w,
                         screen.main_window.cols, screen.main_window.rows);
@@ -426,7 +426,8 @@ screen_update(struct mpdclient *c)
                crossfade = mpd_status_get_crossfade(c->status);
        }
 
-       if ((c->events & MPD_IDLE_DATABASE) != 0 && was_connected)
+       if ((c->events & MPD_IDLE_DATABASE) != 0 && was_connected &&
+           mpdclient_is_connected(c))
                screen_status_printf(_("Database updated"));
        was_connected = mpdclient_is_connected(c);
 
@@ -467,8 +468,12 @@ screen_get_mouse_event(struct mpdclient *c, unsigned long *bstate, int *row)
 {
        MEVENT event;
 
-       /* retrieve the mouse event from ncurses */
+       /* retrieve the mouse event from curses */
+#ifdef PDCURSES
+       nc_getmouse(&event);
+#else
        getmouse(&event);
+#endif
        /* calculate the selected row in the list window */
        *row = event.y - screen.title_bar.window.rows;
        /* copy button state bits */
@@ -522,7 +527,7 @@ screen_cmd(struct mpdclient *c, command_t cmd)
                screen_next_mode(c, 1);
                break;
        case CMD_SCREEN_PLAY:
-               screen_switch(&screen_playlist, c);
+               screen_switch(&screen_queue, c);
                break;
        case CMD_SCREEN_FILE:
                screen_switch(&screen_browse, c);
@@ -561,10 +566,15 @@ screen_cmd(struct mpdclient *c, command_t cmd)
        case CMD_SCREEN_OUTPUTS:
                screen_switch(&screen_outputs, c);
                break;
+#endif
+#ifdef ENABLE_CHAT_SCREEN
+       case CMD_SCREEN_CHAT:
+               screen_switch(&screen_chat, c);
+               break;
+#endif
        case CMD_SCREEN_SWAP:
                screen_swap(c, NULL);
                break;
-#endif
 
        default:
                break;