Cleanup

No functional change.

CMakeLists.txt

@@ -47,13 +47,13 @@ else (USE_SYSTEM_TERMO)
 	set (Termo_LIBRARIES termo-static)
 endif (USE_SYSTEM_TERMO)
 
-include_directories (${UNISTRING_INCLUDE_DIRS}
+include_directories (${Unistring_INCLUDE_DIRS}
-	${NCURSESW_INCLUDE_DIRS} ${Termo_INCLUDE_DIRS} ${curl_INCLUDE_DIRS})
+	${Ncursesw_INCLUDE_DIRS} ${Termo_INCLUDE_DIRS} ${curl_INCLUDE_DIRS})
 link_directories (${curl_LIBRARY_DIRS})
 
 # Configuration
 include (CheckFunctionExists)
-set (CMAKE_REQUIRED_LIBRARIES ${NCURSESW_LIBRARIES})
+set (CMAKE_REQUIRED_LIBRARIES ${Ncursesw_LIBRARIES})
 CHECK_FUNCTION_EXISTS ("resizeterm" HAVE_RESIZETERM)
 
 # Generate a configuration file
@@ -63,8 +63,8 @@ include_directories (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
 
 # Build the main executable and link it
 add_executable (${PROJECT_NAME} ${PROJECT_NAME}.c)
-target_link_libraries (${PROJECT_NAME} ${UNISTRING_LIBRARIES}
+target_link_libraries (${PROJECT_NAME} ${Unistring_LIBRARIES}
-	${NCURSESW_LIBRARIES} termo-static ${curl_LIBRARIES})
+	${Ncursesw_LIBRARIES} termo-static ${curl_LIBRARIES})
 add_threads (${PROJECT_NAME})
 
 # Installation
@@ -98,8 +98,8 @@ endforeach (page)
 
 # CPack
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPD client")
-set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
+set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
-set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
+set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set (CPACK_PACKAGE_VERSION_MAJOR ${project_VERSION_MAJOR})
 set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR})

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016 - 2018, Přemysl Janouch <p@janouch.name>
+Copyright (c) 2016 - 2020, Přemysl Eric Janouch <p@janouch.name>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted.

line-editor.c

@@ -1,7 +1,7 @@
 /*
  * line-editor.c: a line editor component for the TUI part of liberty
  *
- * Copyright (c) 2017 - 2018, Přemysl Janouch <p@janouch.name>
+ * Copyright (c) 2017 - 2018, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.

nncmpp.c

@@ -1,7 +1,7 @@
 /*
  * nncmpp -- the MPD client you never knew you needed
  *
- * Copyright (c) 2016 - 2018, Přemysl Janouch <p@janouch.name>
+ * Copyright (c) 2016 - 2020, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.
@@ -21,30 +21,30 @@
 // We "need" to have an enum for attributes before including liberty.
 // Avoiding colours in the defaults here in order to support dumb terminals.
 #define ATTRIBUTE_TABLE(XX)                              \
-	XX( NORMAL,      "normal",     -1, -1, 0           ) \
+	XX( NORMAL,      normal,       -1, -1, 0           ) \
-	XX( HIGHLIGHT,   "highlight",  -1, -1, A_BOLD      ) \
+	XX( HIGHLIGHT,   highlight,    -1, -1, A_BOLD      ) \
 	/* Gauge                                          */ \
-	XX( ELAPSED,     "elapsed",    -1, -1, A_REVERSE   ) \
+	XX( ELAPSED,     elapsed,      -1, -1, A_REVERSE   ) \
-	XX( REMAINS,     "remains",    -1, -1, A_UNDERLINE ) \
+	XX( REMAINS,     remains,      -1, -1, A_UNDERLINE ) \
 	/* Tab bar                                        */ \
-	XX( TAB_BAR,     "tab_bar",    -1, -1, A_REVERSE   ) \
+	XX( TAB_BAR,     tab_bar,      -1, -1, A_REVERSE   ) \
-	XX( TAB_ACTIVE,  "tab_active", -1, -1, A_UNDERLINE ) \
+	XX( TAB_ACTIVE,  tab_active,   -1, -1, A_UNDERLINE ) \
 	/* Listview                                       */ \
-	XX( HEADER,      "header",     -1, -1, A_UNDERLINE ) \
+	XX( HEADER,      header,       -1, -1, A_UNDERLINE ) \
-	XX( EVEN,        "even",       -1, -1, 0           ) \
+	XX( EVEN,        even,         -1, -1, 0           ) \
-	XX( ODD,         "odd",        -1, -1, 0           ) \
+	XX( ODD,         odd,          -1, -1, 0           ) \
-	XX( DIRECTORY,   "directory",  -1, -1, 0           ) \
+	XX( DIRECTORY,   directory,    -1, -1, 0           ) \
-	XX( SELECTION,   "selection",  -1, -1, A_REVERSE   ) \
+	XX( SELECTION,   selection,    -1, -1, A_REVERSE   ) \
 	/* Cyan is good with both black and white.
 	 * Can't use A_REVERSE because bold'd be bright.
 	 * Unfortunately ran out of B&W attributes.       */ \
-	XX( MULTISELECT, "multiselect",-1,  6, 0           ) \
+	XX( MULTISELECT, multiselect,  -1,  6, 0           ) \
-	XX( SCROLLBAR,   "scrollbar",  -1, -1, 0           ) \
+	XX( SCROLLBAR,   scrollbar,    -1, -1, 0           ) \
 	/* These are for debugging only                   */ \
-	XX( WARNING,     "warning",     3, -1, 0           ) \
+	XX( WARNING,     warning,       3, -1, 0           ) \
-	XX( ERROR,       "error",       1, -1, 0           ) \
+	XX( ERROR,       error,         1, -1, 0           ) \
-	XX( INCOMING,    "incoming",    2, -1, 0           ) \
+	XX( INCOMING,    incoming,      2, -1, 0           ) \
-	XX( OUTGOING,    "outgoing",    4, -1, 0           )
+	XX( OUTGOING,    outgoing,      4, -1, 0           )
 
 enum
 {
@@ -82,6 +82,9 @@ enum
 
 // ncurses is notoriously retarded for input handling, we need something
 // different if only to receive mouse events reliably.
+//
+// 2020 update: ncurses is mostly reliable now but rxvt-unicode needs to start
+// supporting 1006, or ncurses needs to start supporting the 1015 mode.
 
 #include "termo.h"
 
@@ -174,7 +177,7 @@ print_curl_debug (CURL *easy, curl_infotype type, char *data, size_t len,
 	for (size_t i = 0; i < len; i++)
 	{
 		uint8_t c = data[i];
-		copy[i] = c >= 32 || c == '\n' ? c : '.';
+		copy[i] = !iscntrl_ascii (c) || c == '\n' ? c : '.';
 	}
 	copy[len] = '\0';
 
@@ -286,6 +289,9 @@ poller_curl_on_socket_action (CURL *easy, curl_socket_t s, int what,
 	}
 	if (what == CURL_POLL_REMOVE)
 	{
+		// Some annoying cURL bug.  Never trust libraries.
+		fd->fd.closed = fcntl(fd->fd.fd, F_GETFL) < 0 && errno == EBADF;
+
 		poller_fd_reset (&fd->fd);
 		LIST_UNLINK (self->fds, fd);
 		free (fd);
@@ -606,7 +612,8 @@ static struct app_context
 	struct str_map playback_info;       ///< Current song info
 
 	struct poller_timer elapsed_event;  ///< Seconds elapsed event
-	int64_t elapsed_since;              ///< Time of the next tick
+	int64_t elapsed_since;              ///< Last tick ts or last elapsed time
+	bool elapsed_poll;                  ///< Poll MPD for the elapsed time?
 
 	// TODO: initialize these to -1
 	int song;                           ///< Current song index
@@ -689,6 +696,13 @@ tab_selection_range (struct tab *self)
 
 // --- Configuration -----------------------------------------------------------
 
+static void
+on_poll_elapsed_time_changed (struct config_item *item)
+{
+	// This is only set once, on application startup
+	g.elapsed_poll = item->value.boolean;
+}
+
 static struct config_schema g_config_settings[] =
 {
 	{ .name      = "address",
@@ -701,13 +715,18 @@ static struct config_schema g_config_settings[] =
 	{ .name      = "root",
 	  .comment   = "Where all the files MPD is playing are located",
 	  .type      = CONFIG_ITEM_STRING },
+	{ .name      = "poll_elapsed_time",
+	  .comment   = "Whether to actively poll MPD for the elapsed time",
+	  .type      = CONFIG_ITEM_BOOLEAN,
+	  .on_change = on_poll_elapsed_time_changed,
+	  .default_  = "on" },
 	{}
 };
 
 static struct config_schema g_config_colors[] =
 {
 #define XX(name_, config, fg_, bg_, attrs_) \
-	{ .name = config, .type = CONFIG_ITEM_STRING },
+	{ .name = #config, .type = CONFIG_ITEM_STRING },
 	ATTRIBUTE_TABLE (XX)
 #undef XX
 	{}
@@ -742,7 +761,7 @@ load_config_colors (struct config_item *subtree, void *user_data)
 	// For simplicity, we should reload the entire table on each change anyway.
 	const char *value;
 #define XX(name, config, fg_, bg_, attrs_) \
-	if ((value = get_config_string (subtree, config))) \
+	if ((value = get_config_string (subtree, #config))) \
 		g.attrs[ATTRIBUTE_ ## name] = attrs_decode (value);
 	ATTRIBUTE_TABLE (XX)
 #undef XX
@@ -1528,67 +1547,69 @@ app_goto_tab (int tab_index)
 // --- Actions -----------------------------------------------------------------
 
 #define ACTIONS(XX) \
-	XX( NONE,               "Do nothing"                  ) \
+	XX( NONE,               Do nothing                  ) \
 	\
-	XX( QUIT,               "Quit"                        ) \
+	XX( QUIT,               Quit                        ) \
-	XX( REDRAW,             "Redraw screen"               ) \
+	XX( REDRAW,             Redraw screen               ) \
-	XX( HELP_TAB,           "Switch to help tab"          ) \
+	XX( TAB_HELP,           Switch to help tab          ) \
-	XX( LAST_TAB,           "Switch to previous tab"      ) \
+	XX( TAB_LAST,           Switch to last tab          ) \
+	XX( TAB_PREVIOUS,       Switch to previous tab      ) \
+	XX( TAB_NEXT,           Switch to next tab          ) \
 	\
-	XX( MPD_TOGGLE,         "Toggle play/pause"           ) \
+	XX( MPD_TOGGLE,         Toggle play/pause           ) \
-	XX( MPD_STOP,           "Stop playback"               ) \
+	XX( MPD_STOP,           Stop playback               ) \
-	XX( MPD_PREVIOUS,       "Previous song"               ) \
+	XX( MPD_PREVIOUS,       Previous song               ) \
-	XX( MPD_NEXT,           "Next song"                   ) \
+	XX( MPD_NEXT,           Next song                   ) \
-	XX( MPD_BACKWARD,       "Seek backwards"              ) \
+	XX( MPD_BACKWARD,       Seek backwards              ) \
-	XX( MPD_FORWARD,        "Seek forwards"               ) \
+	XX( MPD_FORWARD,        Seek forwards               ) \
-	XX( MPD_VOLUME_UP,      "Increase volume"             ) \
+	XX( MPD_VOLUME_UP,      Increase volume             ) \
-	XX( MPD_VOLUME_DOWN,    "Decrease volume"             ) \
+	XX( MPD_VOLUME_DOWN,    Decrease volume             ) \
 	\
-	XX( MPD_SEARCH,         "Global search"               ) \
+	XX( MPD_SEARCH,         Global search               ) \
-	XX( MPD_ADD,            "Add selection to playlist"   ) \
+	XX( MPD_ADD,            Add selection to playlist   ) \
-	XX( MPD_REPLACE,        "Replace playlist"            ) \
+	XX( MPD_REPLACE,        Replace playlist            ) \
-	XX( MPD_REPEAT,         "Toggle repeat"               ) \
+	XX( MPD_REPEAT,         Toggle repeat               ) \
-	XX( MPD_RANDOM,         "Toggle random playback"      ) \
+	XX( MPD_RANDOM,         Toggle random playback      ) \
-	XX( MPD_SINGLE,         "Toggle single song playback" ) \
+	XX( MPD_SINGLE,         Toggle single song playback ) \
-	XX( MPD_CONSUME,        "Toggle consume"              ) \
+	XX( MPD_CONSUME,        Toggle consume              ) \
-	XX( MPD_UPDATE_DB,      "Update MPD database"         ) \
+	XX( MPD_UPDATE_DB,      Update MPD database         ) \
-	XX( MPD_COMMAND,        "Send raw command to MPD"     ) \
+	XX( MPD_COMMAND,        Send raw command to MPD     ) \
 	\
-	XX( CHOOSE,             "Choose item"                 ) \
+	XX( CHOOSE,             Choose item                 ) \
-	XX( DELETE,             "Delete item"                 ) \
+	XX( DELETE,             Delete item                 ) \
-	XX( UP,                 "Go up a level"               ) \
+	XX( UP,                 Go up a level               ) \
-	XX( MULTISELECT,        "Toggle multiselect"          ) \
+	XX( MULTISELECT,        Toggle multiselect          ) \
 	\
-	XX( SCROLL_UP,          "Scroll up"                   ) \
+	XX( SCROLL_UP,          Scroll up                   ) \
-	XX( SCROLL_DOWN,        "Scroll down"                 ) \
+	XX( SCROLL_DOWN,        Scroll down                 ) \
-	XX( MOVE_UP,            "Move selection up"           ) \
+	XX( MOVE_UP,            Move selection up           ) \
-	XX( MOVE_DOWN,          "Move selection down"         ) \
+	XX( MOVE_DOWN,          Move selection down         ) \
 	\
-	XX( GOTO_TOP,           "Go to top"                   ) \
+	XX( GOTO_TOP,           Go to top                   ) \
-	XX( GOTO_BOTTOM,        "Go to bottom"                ) \
+	XX( GOTO_BOTTOM,        Go to bottom                ) \
-	XX( GOTO_ITEM_PREVIOUS, "Go to previous item"         ) \
+	XX( GOTO_ITEM_PREVIOUS, Go to previous item         ) \
-	XX( GOTO_ITEM_NEXT,     "Go to next item"             ) \
+	XX( GOTO_ITEM_NEXT,     Go to next item             ) \
-	XX( GOTO_PAGE_PREVIOUS, "Go to previous page"         ) \
+	XX( GOTO_PAGE_PREVIOUS, Go to previous page         ) \
-	XX( GOTO_PAGE_NEXT,     "Go to next page"             ) \
+	XX( GOTO_PAGE_NEXT,     Go to next page             ) \
 	\
-	XX( GOTO_VIEW_TOP,      "Select top item"             ) \
+	XX( GOTO_VIEW_TOP,      Select top item             ) \
-	XX( GOTO_VIEW_CENTER,   "Select center item"          ) \
+	XX( GOTO_VIEW_CENTER,   Select center item          ) \
-	XX( GOTO_VIEW_BOTTOM,   "Select bottom item"          ) \
+	XX( GOTO_VIEW_BOTTOM,   Select bottom item          ) \
 	\
-	XX( EDITOR_CONFIRM,     "Confirm input"               ) \
+	XX( EDITOR_CONFIRM,     Confirm input               ) \
 	\
-	XX( EDITOR_B_CHAR,      "Go back a character"         ) \
+	XX( EDITOR_B_CHAR,      Go back a character         ) \
-	XX( EDITOR_F_CHAR,      "Go forward a character"      ) \
+	XX( EDITOR_F_CHAR,      Go forward a character      ) \
-	XX( EDITOR_B_WORD,      "Go back a word"              ) \
+	XX( EDITOR_B_WORD,      Go back a word              ) \
-	XX( EDITOR_F_WORD,      "Go forward a word"           ) \
+	XX( EDITOR_F_WORD,      Go forward a word           ) \
-	XX( EDITOR_HOME,        "Go to start of line"         ) \
+	XX( EDITOR_HOME,        Go to start of line         ) \
-	XX( EDITOR_END,         "Go to end of line"           ) \
+	XX( EDITOR_END,         Go to end of line           ) \
 	\
-	XX( EDITOR_B_DELETE,    "Delete last character"       ) \
+	XX( EDITOR_B_DELETE,    Delete last character       ) \
-	XX( EDITOR_F_DELETE,    "Delete next character"       ) \
+	XX( EDITOR_F_DELETE,    Delete next character       ) \
-	XX( EDITOR_B_KILL_WORD, "Delete last word"            ) \
+	XX( EDITOR_B_KILL_WORD, Delete last word            ) \
-	XX( EDITOR_B_KILL_LINE, "Delete everything up to BOL" ) \
+	XX( EDITOR_B_KILL_LINE, Delete everything up to BOL ) \
-	XX( EDITOR_F_KILL_LINE, "Delete everything up to EOL" )
+	XX( EDITOR_F_KILL_LINE, Delete everything up to EOL )
 
 enum action
 {
@@ -1605,7 +1626,7 @@ static struct action_info
 }
 g_actions[] =
 {
-#define XX(name, description) { #name, description },
+#define XX(name, description) { #name, #description },
 	ACTIONS (XX)
 #undef XX
 };
@@ -1759,14 +1780,30 @@ app_process_action (enum action action)
 			tab->item_mark = tab->item_selected;
 		return true;
 
-	case ACTION_LAST_TAB:
+	case ACTION_TAB_LAST:
 		if (!g.last_tab)
 			return false;
 		app_switch_tab (g.last_tab);
 		return true;
-	case ACTION_HELP_TAB:
+	case ACTION_TAB_HELP:
 		app_switch_tab (g.help_tab);
 		return true;
+	case ACTION_TAB_PREVIOUS:
+		if (g.active_tab == g.help_tab)
+			return false;
+		if (!g.active_tab->prev)
+			app_switch_tab (g.help_tab);
+		else
+			app_switch_tab (g.active_tab->prev);
+		return true;
+	case ACTION_TAB_NEXT:
+		if (g.active_tab == g.help_tab)
+			app_switch_tab (g.tabs);
+		else if (g.active_tab->next)
+			app_switch_tab (g.active_tab->next);
+		else
+			return false;
+		return true;
 
 	case ACTION_MPD_TOGGLE:
 		if (g.state == PLAYER_PLAYING)  return MPD_SIMPLE ("pause", "1");
@@ -1987,8 +2024,12 @@ g_normal_defaults[] =
 	{ "Escape",     ACTION_QUIT               },
 	{ "q",          ACTION_QUIT               },
 	{ "C-l",        ACTION_REDRAW             },
-	{ "M-Tab",      ACTION_LAST_TAB           },
+	{ "M-Tab",      ACTION_TAB_LAST           },
-	{ "F1",         ACTION_HELP_TAB           },
+	{ "F1",         ACTION_TAB_HELP           },
+	{ "C-Left",     ACTION_TAB_PREVIOUS       },
+	{ "C-Right",    ACTION_TAB_NEXT           },
+	{ "C-PageUp",   ACTION_TAB_PREVIOUS       },
+	{ "C-PageDown", ACTION_TAB_NEXT           },
 
 	{ "Home",       ACTION_GOTO_TOP           },
 	{ "End",        ACTION_GOTO_BOTTOM        },
@@ -2008,6 +2049,8 @@ g_normal_defaults[] =
 	{ "C-n",        ACTION_GOTO_ITEM_NEXT     },
 	{ "C-b",        ACTION_GOTO_PAGE_PREVIOUS },
 	{ "C-f",        ACTION_GOTO_PAGE_NEXT     },
+	{ "C-y",        ACTION_SCROLL_UP          },
+	{ "C-e",        ACTION_SCROLL_DOWN        },
 
 	{ "H",          ACTION_GOTO_VIEW_TOP      },
 	{ "M",          ACTION_GOTO_VIEW_CENTER   },
@@ -2493,8 +2536,7 @@ library_tab_change_level (const char *new_path)
 	str_reset (path);
 	str_append (path, new_path);
 
-	free (g_library_tab.super.header);
+	cstr_set (&g_library_tab.super.header, NULL);
-	g_library_tab.super.header = NULL;
 	g_library_tab.super.item_mark = -1;
 
 	if (path->len)
@@ -2692,8 +2734,7 @@ library_tab_on_action (enum action action)
 			free (fake_subdir);
 		}
 
-		free (tab->header);
+		cstr_set (&tab->header, xstrdup_printf ("Global search"));
-		tab->header = xstrdup_printf ("Global search");
 		g_library_tab.searching = true;
 
 		// Since we've already changed the header, empty the list,
@@ -2849,7 +2890,7 @@ streams_tab_extract_links (struct str *data, const char *content_type,
 	for (size_t i = 0; i < data->len; i++)
 	{
 		uint8_t c = data->str[i];
-		if ((c < 32) & (c != '\t') & (c != '\r') & (c != '\n'))
+		if (iscntrl_ascii (c) & (c != '\t') & (c != '\r') & (c != '\n'))
 			return false;
 	}
 
@@ -2943,6 +2984,8 @@ streams_tab_process (const char *uri, bool replace, struct error **e)
 	task.replace = replace;
 	bool result = false;
 
+	struct curl_slist *ok_headers = curl_slist_append (NULL, "ICY 200 OK");
+
 	CURLcode res;
 	if ((res = curl_easy_setopt (easy, CURLOPT_FOLLOWLOCATION, 1L))
 	 || (res = curl_easy_setopt (easy, CURLOPT_NOPROGRESS,     1L))
@@ -2952,6 +2995,7 @@ streams_tab_process (const char *uri, bool replace, struct error **e)
 	 || (res = curl_easy_setopt (easy, CURLOPT_SSL_VERIFYPEER, 0L))
 	 || (res = curl_easy_setopt (easy, CURLOPT_SSL_VERIFYHOST, 0L))
 	 || (res = curl_easy_setopt (easy, CURLOPT_URL,            uri))
+	 || (res = curl_easy_setopt (easy, CURLOPT_HTTP200ALIASES, ok_headers))
 
 	 || (res = curl_easy_setopt (easy, CURLOPT_VERBOSE, (long) g_debug_mode))
 	 || (res = curl_easy_setopt (easy, CURLOPT_DEBUGFUNCTION, print_curl_debug))
@@ -2975,6 +3019,7 @@ streams_tab_process (const char *uri, bool replace, struct error **e)
 
 error:
 	curl_easy_cleanup (task.curl.easy);
+	curl_slist_free_all (ok_headers);
 	str_free (&task.data);
 	poller_curl_free (&pc);
 
@@ -3318,6 +3363,7 @@ mpd_read_time (const char *value, int *sec, int *optional_msec)
 		unsigned long n = strtoul (period + 1, &end, 10);
 		if (*end)
 			return;
+		// XXX: this relies on three decimal places
 		*optional_msec = MIN (INT_MAX, n);
 	}
 	unsigned long n = strtoul (value, &end, 10);
@@ -3341,6 +3387,33 @@ mpd_update_playlist_time (void)
 	}
 }
 
+static void
+mpd_set_elapsed_timer (int msec_past_second)
+{
+	int delay_msec = 1000 - msec_past_second;  // Until the next round second
+	if (!g.elapsed_poll)
+	{
+		poller_timer_set (&g.elapsed_event, delay_msec);
+		// Remember when the last round second was, relative to monotonic time
+		g.elapsed_since = clock_msec (CLOCK_BEST) - msec_past_second;
+		return;
+	}
+
+	// We may receive an earlier time, this seems to compensate for it well
+	// (I haven't seen it trigger more than 50ms too early)
+	delay_msec += 100;
+
+	// When playback stalls, avoid busy looping with the server
+	int elapsed_msec = g.song_elapsed * 1000 + msec_past_second;
+	if (elapsed_msec == g.elapsed_since)
+		delay_msec = MAX (delay_msec, 500);
+
+	// In polling mode, we're interested in progress rather than stability.
+	// We can reuse both the poller_timer struct and the timestamp field.
+	poller_timer_set (&g.elapsed_event, delay_msec);
+	g.elapsed_since = elapsed_msec;
+}
+
 static void
 mpd_update_playback_state (void)
 {
@@ -3377,13 +3450,11 @@ mpd_update_playback_state (void)
 	mpd_read_time (duration, &g.song_duration, NULL);
 	strv_free (&fields);
 
-	// We could also just poll the server each half a second but let's not
 	poller_timer_reset (&g.elapsed_event);
 	if (g.state == PLAYER_PLAYING)
-	{
+		mpd_set_elapsed_timer (msec_past_second);
-		poller_timer_set (&g.elapsed_event, 1000 - msec_past_second);
+	else
-		g.elapsed_since = clock_msec (CLOCK_BEST) - msec_past_second;
+		g.elapsed_since = -1;
-	}
 
 	// The server sends -1 when nothing is being played right now
 	unsigned long n;
@@ -3508,15 +3579,19 @@ mpd_on_info_response (const struct mpd_response *response,
 }
 
 static void
-mpd_on_tick (void *user_data)
+mpd_on_elapsed_time_tick (void *user_data)
 {
 	(void) user_data;
+
+	// Compute how much time has elapsed since the last round second
 	int64_t diff_msec = clock_msec (CLOCK_BEST) - g.elapsed_since;
 	int elapsed_sec = diff_msec / 1000;
 	int elapsed_msec = diff_msec % 1000;
 
 	g.song_elapsed += elapsed_sec;
 	g.elapsed_since += elapsed_sec * 1000;
+
+	// Try to get called on the next round second of playback
 	poller_timer_set (&g.elapsed_event, 1000 - elapsed_msec);
 
 	app_invalidate ();
@@ -3537,6 +3612,15 @@ mpd_request_info (void)
 	mpd_client_idle (c, 0);
 }
 
+static void
+mpd_on_elapsed_time_tick_poll (void *user_data)
+{
+	(void) user_data;
+
+	// As soon as the reply arrives, we (may) set the timer again
+	mpd_request_info ();
+}
+
 static void
 mpd_on_events (unsigned subsystems, void *user_data)
 {
@@ -3829,8 +3913,7 @@ app_on_message_timer (void *user_data)
 {
 	(void) user_data;
 
-	free (g.message);
+	cstr_set (&g.message, NULL);
-	g.message = NULL;
 	app_invalidate ();
 }
 
@@ -3858,8 +3941,7 @@ app_log_handler (void *user_data, const char *quote, const char *fmt,
 			user_data == NULL ? 0 : g.attrs[(intptr_t) user_data].attrs);
 	else
 	{
-		free (g.message);
+		cstr_set (&g.message, xstrdup (message.str));
-		g.message = xstrdup (message.str);
 		app_invalidate ();
 		poller_timer_set (&g.message_timer, 5000);
 	}
@@ -3890,7 +3972,9 @@ app_init_poller_events (void)
 	poller_timer_set (&g.connect_event, 0);
 
 	g.elapsed_event = poller_timer_make (&g.poller);
-	g.elapsed_event.dispatcher = mpd_on_tick;
+	g.elapsed_event.dispatcher = g.elapsed_poll
+		? mpd_on_elapsed_time_tick_poll
+		: mpd_on_elapsed_time_tick;
 
 	g.refresh_event = poller_idle_make (&g.poller);
 	g.refresh_event.dispatcher = app_on_refresh;