X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen.c;h=c8ba729893695035471aad305a207d0ba5a50022;hb=3eca95ac1cb786d1aef59fd141d75661903c039a;hp=ac4a63ee1d47ed5a3bc875de03f006b076a85acf;hpb=45ff31548dc68c27e1af6fdf37945de97579f5f9;p=ncmpc.git diff --git a/src/screen.c b/src/screen.c index ac4a63e..c8ba729 100644 --- a/src/screen.c +++ b/src/screen.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * (c) 2004 by Kalle Wallin * * This program is free software; you can redistribute it and/or modify @@ -22,16 +20,14 @@ #include "screen_list.h" #include "screen_utils.h" #include "config.h" -#include "ncmpc.h" #include "i18n.h" #include "support.h" +#include "charset.h" #include "mpdclient.h" #include "utils.h" -#include "command.h" #include "options.h" #include "colors.h" #include "strfsong.h" -#include "wreadln.h" #include #include @@ -40,10 +36,25 @@ #include #include +#ifndef NCMPC_MINI +/** welcome message time [s] */ +static const GTime SCREEN_WELCOME_TIME = 10; +#endif + +/** status message time [s] */ +static const GTime SCREEN_STATUS_MESSAGE_TIME = 3; + +/* minumum window size */ +static const int SCREEN_MIN_COLS = 14; +static const int SCREEN_MIN_ROWS = 5; + /* screens */ +#ifndef NCMPC_MINI static gboolean welcome = TRUE; -static struct screen screen; +#endif + +struct screen screen; static const struct screen_functions *mode_fn = &screen_playlist; static int seek_id = -1; static int seek_target_time = 0; @@ -68,11 +79,12 @@ screen_switch(const struct screen_functions *sf, struct mpdclient *c) /* get functions for the new mode */ mode_fn = sf; - screen.painted = 0; /* open the new mode */ if (mode_fn->open != NULL) - mode_fn->open(&screen, c); + mode_fn->open(c); + + screen_paint(c); } static int @@ -117,6 +129,7 @@ paint_top_window2(const char *header, mpdclient_t *c) if (header[0]) { colors_use(w, COLOR_TITLE_BOLD); mvwaddstr(w, 0, 0, header); +#ifndef NCMPC_MINI } else { colors_use(w, COLOR_TITLE_BOLD); waddstr(w, get_key_names(CMD_SCREEN_HELP, FALSE)); @@ -147,15 +160,17 @@ paint_top_window2(const char *header, mpdclient_t *c) waddstr(w, get_key_names(CMD_SCREEN_LYRICS, FALSE)); colors_use(w, COLOR_TITLE); waddstr(w, _(":Lyrics ")); +#endif #endif } + if (c->status == NULL || c->status->volume == MPD_STATUS_NO_VOLUME) { g_snprintf(buf, 32, _("Volume n/a ")); } else { g_snprintf(buf, 32, _(" Volume %d%%"), c->status->volume); } colors_use(w, COLOR_TITLE); - mvwaddstr(w, 0, screen.top_window.cols-my_strlen(buf), buf); + mvwaddstr(w, 0, screen.top_window.cols - utf8_width(buf), buf); flags[0] = 0; if (c->status != NULL) { @@ -186,11 +201,11 @@ static void paint_top_window(const char *header, mpdclient_t *c, int full_repaint) { static int prev_volume = -1; - static size_t prev_header_len = -1; + static unsigned prev_header_len = -1; WINDOW *w = screen.top_window.w; - if (prev_header_len!=my_strlen(header)) { - prev_header_len = my_strlen(header); + if (prev_header_len != utf8_width(header)) { + prev_header_len = utf8_width(header); full_repaint = 1; } @@ -242,7 +257,11 @@ paint_status_window(mpdclient_t *c) mpd_Status *status = c->status; mpd_Song *song = c->song; int elapsedTime = 0; +#ifdef NCMPC_MINI + static char bitrate[1]; +#else char bitrate[16]; +#endif const char *str = NULL; int x = 0; @@ -267,7 +286,7 @@ paint_status_window(mpdclient_t *c) if (str) { waddstr(w, str); - x += my_strlen(str)+1; + x += utf8_width(str) + 1; } /* create time string */ @@ -285,12 +304,14 @@ paint_status_window(mpdclient_t *c) elapsedTime = seek_target_time; /* display bitrate if visible-bitrate is true */ +#ifndef NCMPC_MINI if (options.visible_bitrate) { g_snprintf(bitrate, 16, " [%d kbps]", status->bitRate); } else { bitrate[0] = '\0'; } +#endif /*write out the time, using hours if time over 60 minutes*/ if (c->status->totalTime > 3600) { @@ -304,22 +325,28 @@ paint_status_window(mpdclient_t *c) bitrate, elapsedTime/60, elapsedTime%60, status->totalTime/60, status->totalTime%60 ); } +#ifndef NCMPC_MINI } else { g_snprintf(screen.buf, screen.buf_size, " [%d kbps]", status->bitRate ); +#endif } +#ifndef NCMPC_MINI } else { time_t timep; time(&timep); strftime(screen.buf, screen.buf_size, "%X ",localtime(&timep)); +#endif } /* display song */ if (status != NULL && (IS_PLAYING(status->state) || IS_PAUSED(status->state))) { char songname[MAX_SONGNAME_LENGTH]; - int width = COLS-x-my_strlen(screen.buf); +#ifndef NCMPC_MINI + int width = COLS - x - utf8_width(screen.buf); +#endif if (song) strfsong(songname, MAX_SONGNAME_LENGTH, @@ -329,13 +356,15 @@ paint_status_window(mpdclient_t *c) colors_use(w, COLOR_STATUS); /* scroll if the song name is to long */ - if (options.scroll && my_strlen(songname) > (size_t)width) { +#ifndef NCMPC_MINI + if (options.scroll && utf8_width(songname) > (unsigned)width) { static scroll_state_t st = { 0, 0 }; char *tmp = strscroll(songname, options.scroll_sep, width, &st); g_strlcpy(songname, tmp, MAX_SONGNAME_LENGTH); g_free(tmp); } +#endif //mvwaddnstr(w, 0, x, songname, width); mvwaddstr(w, 0, x, songname); } @@ -364,7 +393,7 @@ screen_exit(void) } void -screen_resize(void) +screen_resize(struct mpdclient *c) { if (COLSopen != NULL) - mode_fn->open(&screen, c); - - /* initialize wreadln */ - wrln_wgetch = my_wgetch; - wrln_max_history_length = 16; + mode_fn->open(c); } void @@ -536,11 +562,10 @@ screen_paint(mpdclient_t *c) /* paint the main window */ wclear(screen.main_window.w); if (mode_fn->paint != NULL) - mode_fn->paint(c); + mode_fn->paint(); paint_progress_window(c); paint_status_window(c); - screen.painted = 1; wmove(screen.main_window.w, 0, 0); wnoutrefresh(screen.main_window.w); @@ -551,14 +576,12 @@ screen_paint(mpdclient_t *c) void screen_update(mpdclient_t *c) { +#ifndef NCMPC_MINI static int repeat = -1; static int random_enabled = -1; static int crossfade = -1; static int dbupdate = -1; - if( !screen.painted ) - screen_paint(c); - /* print a message if mpd status has changed */ if (c->status != NULL) { if (repeat < 0) { @@ -597,9 +620,13 @@ screen_update(mpdclient_t *c) screen.last_cmd==CMD_NONE && time(NULL)-screen.start_timestamp <= SCREEN_WELCOME_TIME) paint_top_window("", c, 0); - else if (mode_fn->get_title != NULL) { + else +#endif + if (mode_fn->get_title != NULL) { paint_top_window(mode_fn->get_title(screen.buf,screen.buf_size), c, 0); +#ifndef NCMPC_MINI welcome = FALSE; +#endif } else paint_top_window("", c, 0); @@ -731,7 +758,7 @@ screen_client_cmd(mpdclient_t *c, command_t cmd) break; case CMD_DB_UPDATE: if (!c->status->updatingDb) { - if( mpdclient_cmd_db_update_utf8(c,NULL)==0 ) + if( mpdclient_cmd_db_update(c,NULL)==0 ) screen_status_printf(_("Database update started!")); } else screen_status_printf(_("Database update running...")); @@ -756,9 +783,11 @@ void screen_cmd(mpdclient_t *c, command_t cmd) { screen.last_cmd = cmd; +#ifndef NCMPC_MINI welcome = FALSE; +#endif - if (mode_fn->cmd != NULL && mode_fn->cmd(&screen, c, cmd)) + if (mode_fn->cmd != NULL && mode_fn->cmd(c, cmd)) return; if (screen_client_cmd(c, cmd)) @@ -778,7 +807,7 @@ screen_cmd(mpdclient_t *c, command_t cmd) _("Auto center mode: Off")); break; case CMD_SCREEN_UPDATE: - screen.painted = 0; + screen_paint(c); break; case CMD_SCREEN_PREVIOUS: screen_next_mode(c, -1); @@ -792,9 +821,11 @@ screen_cmd(mpdclient_t *c, command_t cmd) case CMD_SCREEN_FILE: screen_switch(&screen_browse, c); break; +#ifdef ENABLE_HELP_SCREEN case CMD_SCREEN_HELP: screen_switch(&screen_help, c); break; +#endif #ifdef ENABLE_SEARCH_SCREEN case CMD_SCREEN_SEARCH: screen_switch(&screen_search, c);