![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a514945)
raw | patch | inline | side by side (parent: a514945)
| author | Max Kellermann <max.kellermann@gmail.com> | |
| Mon, 20 Mar 2017 12:08:01 +0000 (13:08 +0100) | ||
| committer | Max Kellermann <max.kellermann@gmail.com> | |
| Mon, 20 Mar 2017 12:08:01 +0000 (13:08 +0100) |
This is already called by screen_refresh().
diff --git a/src/screen_artist.c b/src/screen_artist.c
index 52b81d02ad3c662b99d84ea8cc3920781616f38b..f8d50d0c096def9358075320d970d75811e12992 100644 (file)
--- a/src/screen_artist.c
+++ b/src/screen_artist.c
return buf;
}
-static void
-screen_artist_paint(void);
-
-static void
-artist_repaint(void)
-{
- screen_artist_paint();
- wrefresh(browser.lw->w);
-}
-
static void
string_array_free(GPtrArray *array)
{
| MPD_IDLE_QUEUE
#endif
))
- artist_repaint();
+ screen_artist_paint();
}
/* add_query - Add all songs satisfying specified criteria.
open_album_list(c, g_strdup(selected));
list_window_reset(browser.lw);
- artist_repaint();
+ screen_artist_paint();
return true;
case LIST_ALBUMS:
list_window_reset(browser.lw);
}
- artist_repaint();
+ screen_artist_paint();
return true;
case LIST_SONGS:
list_window_center(browser.lw, idx);
}
- artist_repaint();
+ screen_artist_paint();
return true;
}
break;
break;
}
- artist_repaint();
+ screen_artist_paint();
break;
case CMD_GO_ROOT_DIRECTORY:
break;
}
- artist_repaint();
+ screen_artist_paint();
break;
case CMD_SELECT:
case LIST_ARTISTS:
screen_find(browser.lw, cmd,
screen_artist_lw_callback, artist_list);
- artist_repaint();
+ screen_artist_paint();
return true;
case LIST_ALBUMS:
screen_find(browser.lw, cmd,
screen_artist_lw_callback, album_list);
- artist_repaint();
+ screen_artist_paint();
return true;
case LIST_SONGS:
screen_jump(browser.lw,
screen_artist_lw_callback, artist_list,
paint_artist_callback, artist_list);
- artist_repaint();
+ screen_artist_paint();
return true;
case LIST_ALBUMS:
screen_jump(browser.lw,
screen_artist_lw_callback, album_list,
paint_album_callback, album_list);
- artist_repaint();
+ screen_artist_paint();
return true;
case LIST_SONGS:
if (screen_artist_lw_cmd(c, cmd)) {
if (screen_is_visible(&screen_artist))
- artist_repaint();
+ screen_artist_paint();
return true;
}
diff --git a/src/screen_file.c b/src/screen_file.c
index af0dbd0049b5978f108fb57f6ba231b24053fc2c..5399c85d3bfe5c7fed1aea468321e2b8a23e813e 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
static struct screen_browser browser;
static char *current_path;
-static void
-screen_file_paint(void);
-
-static void
-screen_file_repaint(void)
-{
- screen_file_paint();
- wrefresh(browser.lw->w);
-}
-
static void
screen_file_load_list(struct mpdclient *c, struct filelist *filelist)
{
#endif
)) {
screen_browser_sync_highlights(browser.filelist, &c->playlist);
- screen_file_repaint();
+ screen_file_paint();
}
}
switch(cmd) {
case CMD_PLAY:
if (screen_file_handle_enter(c)) {
- screen_file_repaint();
+ screen_file_paint();
return true;
}
case CMD_GO_ROOT_DIRECTORY:
change_directory(c, "");
- screen_file_repaint();
+ screen_file_paint();
return true;
case CMD_GO_PARENT_DIRECTORY:
change_to_parent(c);
- screen_file_repaint();
+ screen_file_paint();
return true;
case CMD_LOCATE:
case CMD_SCREEN_UPDATE:
screen_file_reload(c);
screen_browser_sync_highlights(browser.filelist, &c->playlist);
- screen_file_repaint();
+ screen_file_paint();
return false;
default:
if (browser_cmd(&browser, c, cmd)) {
if (screen_is_visible(&screen_browse))
- screen_file_repaint();
+ screen_file_paint();
return true;
}
switch(cmd) {
case CMD_DELETE:
handle_delete(c);
- screen_file_repaint();
+ screen_file_paint();
break;
case CMD_SAVE_PLAYLIST:
diff --git a/src/screen_help.c b/src/screen_help.c
index 7497c11ad0ff0d73eba5419243037c2cffbf9155..c1a592f253a269995b77b77425789551114b98a7 100644 (file)
--- a/src/screen_help.c
+++ b/src/screen_help.c
{
if (list_window_scroll_cmd(lw, cmd)) {
help_paint();
- wrefresh(lw->w);
return true;
}
/* center the row */
list_window_center(lw, lw->selected);
help_paint();
- wrefresh(lw->w);
return true;
}
diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index 31c3582e4d61de964eb242669df8c9f357a286dd..44b191c26d0a40672473faf6c94b7193b66ca8f7 100644 (file)
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
static void
keydef_paint(void);
-static void
-keydef_repaint(void)
-{
- keydef_paint();
- wrefresh(lw->w);
-}
-
/** lw->start the last time switch_to_subcmd_mode() was called */
static unsigned saved_start = 0;
list_window_reset(lw);
check_subcmd_length();
- keydef_repaint();
+ keydef_paint();
}
static void
lw->start = saved_start;
- keydef_repaint();
+ keydef_paint();
}
/**
screen_status_printf(_("Deleted"));
/* repaint */
- keydef_repaint();
+ keydef_paint();
/* update key conflict flags */
check_key_bindings(cmds, NULL, 0);
check_subcmd_length();
/* repaint */
- keydef_repaint();
+ keydef_paint();
/* update key conflict flags */
check_key_bindings(cmds, NULL, 0);
return false;
if (list_window_cmd(lw, cmd)) {
- keydef_repaint();
+ keydef_paint();
return true;
}
case CMD_LIST_FIND_NEXT:
case CMD_LIST_RFIND_NEXT:
screen_find(lw, cmd, list_callback, NULL);
- keydef_repaint();
+ keydef_paint();
return true;
default:
diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index a195fd7dd62312139be2d3edba6419c179c0563b..b937e79bc3792ca16030d766178989d746faec9c 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
case CMD_LYRICS_UPDATE:
if (c->song != NULL) {
screen_lyrics_load(c->song);
- screen_text_repaint(&text);
+ screen_text_paint(&text);
}
return true;
case CMD_EDIT:
diff --git a/src/screen_outputs.c b/src/screen_outputs.c
index ce8fdc60b9d2c615e3e05e683c3f571fca5e0175..b2c9590afec535359b57ed9caf0b3215dc2ec0bd 100644 (file)
--- a/src/screen_outputs.c
+++ b/src/screen_outputs.c
static GPtrArray *mpd_outputs = NULL;
-static void
-outputs_paint(void);
-
-static void
-outputs_repaint(void)
-{
- outputs_paint();
- wrefresh(lw->w);
-}
-
static bool
toggle_output(struct mpdclient *c, unsigned int output_index)
{
if (c->events & MPD_IDLE_OUTPUT) {
clear_outputs_list();
fill_outputs_list(c);
- outputs_repaint();
+ outputs_paint();
}
}
assert(mpd_outputs != NULL);
if (list_window_cmd(lw, cmd)) {
- outputs_repaint();
+ outputs_paint();
return true;
}
case CMD_SCREEN_UPDATE:
clear_outputs_list();
fill_outputs_list(c);
- outputs_repaint();
+ outputs_paint();
return true;
default:
diff --git a/src/screen_queue.c b/src/screen_queue.c
index d3624d1f544a61e446f2a6344e1622a8e8e11e83..5b3b5f74cf005528e11d90df42715fd71da55267 100644 (file)
--- a/src/screen_queue.c
+++ b/src/screen_queue.c
c->events & MPD_IDLE_QUEUE)
/* the queue or the current song has changed, we must
paint the new version */
- screen_queue_repaint();
+ screen_queue_paint();
}
#ifdef HAVE_GETMOUSE
int row;
if (screen_get_mouse_event(c, &bstate, &row) ||
list_window_mouse(lw, bstate, row)) {
- screen_queue_repaint();
+ screen_queue_paint();
return true;
}
}
screen_queue_save_selection();
- screen_queue_repaint();
+ screen_queue_paint();
return true;
}
if (list_window_cmd(lw, cmd)) {
screen_queue_save_selection();
- screen_queue_repaint();
+ screen_queue_paint();
return true;
}
switch(cmd) {
case CMD_SCREEN_UPDATE:
center_playing_item(c->status, prev_cmd == CMD_SCREEN_UPDATE);
- screen_queue_repaint();
+ screen_queue_paint();
return false;
case CMD_SELECT_PLAYING:
list_window_set_cursor(lw, playlist_get_index(&c->playlist,
c->song));
screen_queue_save_selection();
- screen_queue_repaint();
+ screen_queue_paint();
return true;
case CMD_LIST_FIND:
case CMD_LIST_RFIND_NEXT:
screen_find(lw, cmd, screen_queue_lw_callback, NULL);
screen_queue_save_selection();
- screen_queue_repaint();
+ screen_queue_paint();
return true;
case CMD_LIST_JUMP:
screen_jump(lw, screen_queue_lw_callback, NULL, NULL, NULL);
screen_queue_save_selection();
- screen_queue_repaint();
+ screen_queue_paint();
return true;
#ifdef HAVE_GETMOUSE
diff --git a/src/screen_search.c b/src/screen_search.c
index 90e075fe96c95d2da9469a74c5bb5ac421d0b997..1465602ed2537fe49178acebb64cf99f2504c2ca 100644 (file)
--- a/src/screen_search.c
+++ b/src/screen_search.c
return help_text[idx];
}
-static void
-screen_search_paint(void);
-
-static void
-search_repaint(void)
-{
- screen_search_paint();
- wrefresh(browser.lw->w);
-}
-
/* sanity check search mode value */
static void
search_check_mode(void)
{
if (browser.filelist != NULL && c->events & MPD_IDLE_QUEUE) {
screen_browser_sync_highlights(browser.filelist, &c->playlist);
- search_repaint();
+ screen_search_paint();
}
}
/* fall through */
case CMD_SCREEN_UPDATE:
screen_search_reload(c);
- search_repaint();
+ screen_search_paint();
return true;
case CMD_SCREEN_SEARCH:
search_new(c);
- search_repaint();
+ screen_search_paint();
return true;
case CMD_CLEAR:
search_clear(true);
list_window_reset(browser.lw);
- search_repaint();
+ screen_search_paint();
return true;
default:
if (browser.filelist != NULL &&
browser_cmd(&browser, c, cmd)) {
if (screen_is_visible(&screen_search))
- search_repaint();
+ screen_search_paint();
return true;
}
diff --git a/src/screen_song.c b/src/screen_song.c
index c6d7d801e47299c3413079bc60577898d704f25f..1463ec6cd59a8289256c42ff558adc18968c8fd0 100644 (file)
--- a/src/screen_song.c
+++ b/src/screen_song.c
}
}
-static void
-screen_song_paint(void);
-
-/**
- * Repaint and update the screen.
- */
-static void
-screen_song_repaint(void)
-{
- screen_song_paint();
- wrefresh(lw->w);
-}
-
static const char *
screen_song_list_callback(unsigned idx, gcc_unused void *data)
{
mpdclient_handle_error(c);
list_window_set_length(lw, current.lines->len);
- screen_song_repaint();
+ screen_song_paint();
}
static bool
screen_song_cmd(struct mpdclient *c, command_t cmd)
{
if (list_window_scroll_cmd(lw, cmd)) {
- screen_song_repaint();
+ screen_song_paint();
return true;
}
if (screen_find(lw, cmd, screen_song_list_callback, NULL)) {
/* center the row */
list_window_center(lw, lw->selected);
- screen_song_repaint();
+ screen_song_paint();
return true;
}