![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen.c b/src/screen.c
index cf995383cf361dc0dae0f14e0b517f46ed44675d..793eec93a0ddbe2e3ac9548bf97302e016ed8d73 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
/* 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_status.h"
#include "config.h"
#include "i18n.h"
#include "charset.h"
#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"
#include "screen_keydef.h"
#include "screen_lyrics.h"
#include "screen_outputs.h"
+#include "screen_chat.h"
#include <mpd/client.h>
#include <stdlib.h>
#include <unistd.h>
-#include <stdarg.h>
#include <string.h>
#include <time.h>
#include <locale.h>
/* screens */
-#ifndef NCMPC_MINI
-static gboolean welcome = TRUE;
-#endif
-
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)
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);
}
}
static void
-paint_progress_window(struct mpdclient *c)
+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 &&
- !IS_STOPPED(mpd_status_get_state(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))
+ if (progress_bar_set(&screen.progress_bar, elapsed, duration) ||
+ repaint)
progress_bar_paint(&screen.progress_bar);
}
delwin(screen.main_window.w);
progress_bar_deinit(&screen.progress_bar);
status_bar_deinit(&screen.status_bar);
+
+#ifndef NCMPC_MINI
+ if (screen.welcome_source_id != 0)
+ g_source_remove(screen.welcome_source_id);
+#endif
}
void
{
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;
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);
screen_paint(c);
}
-void
-screen_status_message(const char *msg)
+#ifndef NCMPC_MINI
+static gboolean
+welcome_timer_callback(gpointer data)
{
- status_bar_message(&screen.status_bar, msg);
-}
+ struct mpdclient *c = data;
-void
-screen_status_printf(const char *format, ...)
-{
- char *msg;
- va_list ap;
-
- va_start(ap,format);
- msg = g_strdup_vprintf(format,ap);
- va_end(ap);
- screen_status_message(msg);
- g_free(msg);
+#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);
+ doupdate();
+
+ return false;
}
+#endif
void
screen_init(struct mpdclient *c)
screen.buf = g_malloc(screen.cols);
screen.buf_size = screen.cols;
screen.findbuf = NULL;
- screen.start_timestamp = time(NULL);
+
+#ifndef NCMPC_MINI
+ if (options.welcome_screen_list)
+ screen.welcome_source_id =
+ g_timeout_add(SCREEN_WELCOME_TIME * 1000,
+ welcome_timer_callback, c);
+#endif
/* create top window */
title_bar_init(&screen.title_bar, screen.cols, 0, 0);
/* 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 */
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) {
}
#endif
- doupdate();
-
/* initialize screens */
screen_list_init(screen.main_window.w,
screen.main_window.cols, screen.main_window.rows);
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 */
- paint_progress_window(c);
+ update_progress_window(c, true);
status_bar_paint(&screen.status_bar, c->status, c->song);
/* 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 */
doupdate();
}
+void
+screen_paint(struct mpdclient *c)
+{
+ screen_refresh(c, true);
+}
+
void
screen_update(struct mpdclient *c)
{
#ifndef NCMPC_MINI
+ static bool was_connected;
static bool initialized = false;
static bool repeat;
static bool random_enabled;
crossfade = mpd_status_get_crossfade(c->status);
}
- if (c->events & MPD_IDLE_DATABASE)
+ if ((c->events & MPD_IDLE_DATABASE) != 0 && was_connected &&
+ mpdclient_is_connected(c))
screen_status_printf(_("Database updated"));
-
- /* update title/header window */
- if (welcome && options.welcome_screen_list &&
- time(NULL)-screen.start_timestamp <= SCREEN_WELCOME_TIME)
- 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);
-#ifndef NCMPC_MINI
- welcome = FALSE;
+ was_connected = mpdclient_is_connected(c);
#endif
- } else
- paint_top_window("", c);
-
- /* update progress window */
- paint_progress_window(c);
-
- /* 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
{
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 */
screen_cmd(struct mpdclient *c, command_t cmd)
{
#ifndef NCMPC_MINI
- welcome = FALSE;
+ if (screen.welcome_source_id != 0) {
+ g_source_remove(screen.welcome_source_id);
+ screen.welcome_source_id = 0;
+ }
#endif
if (mode_fn->cmd != NULL && mode_fn->cmd(c, 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);
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;