X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen.c;h=abd241d16e14e84981ed686fe7e12d3a99442627;hb=63fc23f1c83f52eb47b5511e97bb1fe7cf7d82d5;hp=d3a826523b548380a9638d539113d31d764ebc38;hpb=21e02b8b9c98568dfa67308a4dc8e2fecdfeb0b2;p=ncmpc.git diff --git a/src/screen.c b/src/screen.c index d3a8265..abd241d 100644 --- a/src/screen.c +++ b/src/screen.c @@ -1,34 +1,31 @@ /* 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" #include "mpdclient.h" -#include "utils.h" #include "options.h" -#include "colors.h" #include "player_command.h" #include "screen_help.h" #include "screen_queue.h" @@ -39,6 +36,7 @@ #include "screen_keydef.h" #include "screen_lyrics.h" #include "screen_outputs.h" +#include "screen_chat.h" #include @@ -46,51 +44,37 @@ #include #include #include -#include - -#ifndef NCMPC_MINI -/** welcome message time [s] */ -static const GTime SCREEN_WELCOME_TIME = 10; -#endif - -/* minimum window size */ -static const int SCREEN_MIN_COLS = 14; -static const int 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 @@ -131,236 +115,21 @@ 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(screen.current_page)); + 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_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, duration; - - 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); - - 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(); - - screen_list_exit(); - - string_list_free(screen.find_history); - g_free(screen.buf); - g_free(screen.findbuf); - - title_bar_deinit(&screen.title_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 -screen_resize(struct mpdclient *c) -{ - if (COLSstatus, c->song); - - screen.buf_size = screen.cols; - g_free(screen.buf); - screen.buf = g_malloc(screen.cols); - - /* 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); - curs_set(0); - - screen_paint(c); -} - -#ifndef NCMPC_MINI -static gboolean -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) - : "", - c); - doupdate(); - - return false; -} -#endif - -void -screen_init(struct mpdclient *c) -{ - if (COLS < SCREEN_MIN_COLS || LINES < 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.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); -#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 - 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) { - /* set background attributes */ - wbkgd(stdscr, COLOR_PAIR(COLOR_LIST)); - wbkgd(screen.main_window.w, COLOR_PAIR(COLOR_LIST)); - wbkgd(screen.title_bar.window.w, COLOR_PAIR(COLOR_TITLE)); - wbkgd(screen.progress_bar.window.w, - COLOR_PAIR(COLOR_PROGRESSBAR)); - wbkgd(screen.status_bar.window.w, COLOR_PAIR(COLOR_STATUS)); - colors_use(screen.progress_bar.window.w, COLOR_PROGRESSBAR); - } -#endif - - doupdate(); - - /* initialize screens */ - screen_list_init(screen.main_window.w, - screen.main_window.cols, screen.main_window.rows); - - if (mode_fn->open != NULL) - mode_fn->open(c); -} - -void -screen_paint(struct mpdclient *c) -{ - 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); - - /* paint the bottom window */ - - 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(); - - /* 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_update(struct mpdclient *c) { @@ -428,59 +197,14 @@ 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 (screen.current_page->update != NULL) + screen.current_page->update(c); - if (!options.hardware_cursor) - wmove(screen.main_window.w, 0, 0); - - wnoutrefresh(screen.main_window.w); - - /* tell curses to update */ - doupdate(); -} - -#ifdef HAVE_GETMOUSE -int -screen_get_mouse_event(struct mpdclient *c, unsigned long *bstate, int *row) -{ - MEVENT event; - - /* retrieve the mouse event from ncurses */ - getmouse(&event); - /* calculate the selected row in the list window */ - *row = event.y - screen.title_bar.window.rows; - /* copy button state bits */ - *bstate = event.bstate; - /* if button 2 was pressed switch screen */ - if (event.bstate & BUTTON2_CLICKED) { - screen_cmd(c, CMD_SCREEN_NEXT); - return 1; - } - - return 0; + screen_paint(c, false); } -#endif void screen_cmd(struct mpdclient *c, command_t cmd) @@ -492,7 +216,8 @@ screen_cmd(struct mpdclient *c, command_t cmd) } #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)) @@ -512,7 +237,7 @@ screen_cmd(struct mpdclient *c, command_t 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); @@ -560,12 +285,46 @@ 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; } } + +#ifdef HAVE_GETMOUSE + +static bool +screen_current_page_mouse(struct mpdclient *c, int x, int y, mmask_t bstate) +{ + if (screen.current_page->mouse == NULL) + return false; + + y -= screen.title_bar.window.rows; + return screen.current_page->mouse(c, x, y, bstate); +} + +bool +screen_mouse(struct mpdclient *c, int x, int y, mmask_t bstate) +{ + if (screen_current_page_mouse(c, x, y, bstate)) + return true; + + /* if button 2 was pressed switch screen */ + if (bstate & BUTTON2_CLICKED) { + screen_cmd(c, CMD_SCREEN_NEXT); + return true; + } + + return false; +} + +#endif