X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmain.c;h=8bfa03a86cff4bc8c0e9e06a55f7660b13159bf1;hb=9b08b8d793f6ee02e021f013397eaf3b22348283;hp=058c84a21b54765e5eb6d01fdbdfef64396436da;hpb=480e564bf37559d682ef53a39423e4b7811a448f;p=ncmpc.git

diff --git a/src/main.c b/src/main.c
index 058c84a..8bfa03a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,34 +1,39 @@
 /* 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 "config.h"
 #include "ncmpc.h"
 #include "mpdclient.h"
+#include "callbacks.h"
 #include "charset.h"
 #include "options.h"
 #include "command.h"
 #include "ncu.h"
 #include "screen.h"
 #include "screen_utils.h"
+#include "screen_status.h"
 #include "strfsong.h"
 #include "i18n.h"
 #include "player_command.h"
+#include "keyboard.h"
+#include "lirc.h"
+#include "signals.h"
 
 #ifndef NCMPC_MINI
 #include "conf.h"
@@ -38,14 +43,11 @@
 #include "lyrics.h"
 #endif
 
-#ifdef ENABLE_LIRC
-#include "lirc.h"
-#endif
-
 #include <mpd/client.h>
 
 #include <stdlib.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <signal.h>
 #include <string.h>
 
@@ -53,13 +55,12 @@
 #include <locale.h>
 #endif
 
-/* time between mpd updates [s] */
+/* time between mpd updates [ms] */
 static const guint update_interval = 500;
 
 #define BUFSIZE 1024
 
 static struct mpdclient *mpd = NULL;
-static gboolean connected = FALSE;
 static GMainLoop *main_loop;
 static guint reconnect_source_id, update_source_id;
 
@@ -67,62 +68,19 @@ static guint reconnect_source_id, update_source_id;
 static guint check_key_bindings_source_id;
 #endif
 
-static const gchar *
-error_msg(const gchar *msg)
-{
-	gchar *p;
-
-	if ((p = strchr(msg, '}')) == NULL)
-		return msg;
-
-	do {
-		p++;
-	} while (*p == '}' || * p== ' ');
-
-	return p;
-}
-
-static void
-error_callback(G_GNUC_UNUSED struct mpdclient *c, gint error, const gchar *_msg)
-{
-	char *msg = utf8_to_locale(_msg);
-
-	error = error & 0xFF;
-	switch (error) {
-	case MPD_ERROR_SERVER:
-		screen_status_printf("%s", error_msg(msg));
-		screen_bell();
-		break;
-	default:
-		screen_status_printf("%s", msg);
-		screen_bell();
-		doupdate();
-		connected = FALSE;
-	}
-
-	g_free(msg);
-}
-
 #ifndef NCMPC_MINI
 static void
 update_xterm_title(void)
 {
-	static char title[BUFSIZE];
-	char tmp[BUFSIZE];
-	struct mpd_status *status = NULL;
-	struct mpd_song *song = NULL;
-
-	if (mpd) {
-		status = mpd->status;
-		song = mpd->song;
-	}
+	const struct mpd_song *song = mpd->song;
 
-	if (options.xterm_title_format && status && song &&
-	    IS_PLAYING(mpd_status_get_state(status)))
+	char tmp[BUFSIZE];
+	if (options.xterm_title_format && mpd->playing && song)
 		strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
 	else
 		g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
 
+	static char title[BUFSIZE];
 	if (strncmp(title, tmp, BUFSIZE)) {
 		g_strlcpy(title, tmp, BUFSIZE);
 		set_xterm_title("%s", title);
@@ -130,145 +88,200 @@ update_xterm_title(void)
 }
 #endif
 
+static gboolean
+timer_mpd_update(gpointer data);
+
 static void
-exit_and_cleanup(void)
+enable_update_timer(void)
 {
-	screen_exit();
-#ifndef NCMPC_MINI
-	set_xterm_title("");
-#endif
-	printf("\n");
+	if (update_source_id != 0)
+		return;
 
-	if (mpd) {
-		mpdclient_disconnect(mpd);
-		mpdclient_free(mpd);
-	}
+	update_source_id = g_timeout_add(update_interval,
+					 timer_mpd_update, NULL);
 }
 
 static void
-catch_sigint(G_GNUC_UNUSED int sig)
+disable_update_timer(void)
 {
-	g_main_loop_quit(main_loop);
+	if (update_source_id == 0)
+		return;
+
+	g_source_remove(update_source_id);
+	update_source_id = 0;
 }
 
+static bool
+should_enable_update_timer(void)
+{
+	return mpd->playing
+#ifndef NCMPC_MINI
+		|| options.display_time
+#endif
+		;
+}
 
 static void
-catch_sigcont(G_GNUC_UNUSED int sig)
+auto_update_timer(void)
 {
-	screen_resize(mpd);
+	if (should_enable_update_timer())
+		enable_update_timer();
+	else
+		disable_update_timer();
 }
 
-void
-sigstop(void)
+static void
+do_mpd_update(void)
 {
-  def_prog_mode();  /* save the tty modes */
-  endwin();         /* end curses mode temporarily */
-  kill(0, SIGSTOP); /* issue SIGSTOP */
-}
+	if (mpdclient_is_connected(mpd) &&
+	    (mpd->events != 0 || mpd->playing))
+		mpdclient_update(mpd);
 
-static guint timer_sigwinch_id;
+#ifndef NCMPC_MINI
+	if (options.enable_xterm_title)
+		update_xterm_title();
+#endif
 
-static gboolean
-timer_sigwinch(G_GNUC_UNUSED gpointer data)
+	screen_update(mpd);
+	mpd->events = 0;
+}
+
+static char *
+settings_name(const struct mpd_settings *settings)
 {
-	/* the following causes the screen to flicker.  There might be
-	   better solutions, but I believe it isn't all that
-	   important. */
+	const char *host = mpd_settings_get_host(settings);
+	if (host == NULL)
+		host = _("unknown");
 
-	endwin();
-	refresh();
-	screen_resize(mpd);
+	if (host[0] == '/')
+		return g_strdup(host);
 
-	return FALSE;
+	unsigned port = mpd_settings_get_port(settings);
+	if (port == 0 || port == 6600)
+		return g_strdup(host);
+
+	return g_strdup_printf("%s:%u", host, port);
 }
 
-static void
-catch_sigwinch(G_GNUC_UNUSED int sig)
+static char *
+default_settings_name(void)
 {
-	if (timer_sigwinch_id != 0)
-		g_source_remove(timer_sigwinch_id);
+	struct mpd_settings *settings =
+		mpd_settings_new(options.host, options.port, 0,
+				 NULL, options.password);
+	if (settings == NULL)
+		return g_strdup(_("unknown"));
 
-	timer_sigwinch_id = g_timeout_add(100, timer_sigwinch, NULL);
-}
+	char *name = settings_name(settings);
+	mpd_settings_free(settings);
 
-static gboolean
-timer_mpd_update(gpointer data);
+	return name;
+}
 
 /**
  * This timer is installed when the connection to the MPD server is
  * broken.  It tries to recover by reconnecting periodically.
  */
 static gboolean
-timer_reconnect(G_GNUC_UNUSED gpointer data)
+timer_reconnect(gcc_unused gpointer data)
 {
-	int ret;
+	assert(mpdclient_is_dead(mpd));
 
-	assert(!connected);
+	reconnect_source_id = 0;
 
+	char *name = default_settings_name();
 	screen_status_printf(_("Connecting to %s...  [Press %s to abort]"),
-			     options.host, get_key_names(CMD_QUIT,0) );
+			     name, get_key_names(CMD_QUIT, false));
+	g_free(name);
 	doupdate();
 
-	mpdclient_disconnect(mpd);
-	ret = mpdclient_connect(mpd,
-				options.host, options.port,
-				1.5,
-				options.password);
-	if (ret != 0) {
-		/* try again in 5 seconds */
-		g_timeout_add(5000, timer_reconnect, NULL);
-		return FALSE;
-	}
+	mpdclient_connect(mpd);
+
+	return FALSE;
+}
+
+void
+mpdclient_connected_callback(void)
+{
+	assert(reconnect_source_id == 0);
 
 #ifndef NCMPC_MINI
-	/* quit if mpd is pre 0.11.0 - song id not supported by mpd */
-	if (mpd_connection_cmp_server_version(mpd->connection, 0, 11, 0) < 0) {
+	/* quit if mpd is pre 0.14 - song id not supported by mpd */
+	struct mpd_connection *connection = mpdclient_get_connection(mpd);
+	if (mpd_connection_cmp_server_version(connection, 0, 16, 0) < 0) {
 		const unsigned *version =
-			mpd_connection_get_server_version(mpd->connection);
-		screen_status_printf(_("Error: MPD version %d.%d.%d is to old (%s needed)"),
+			mpd_connection_get_server_version(connection);
+		screen_status_printf(_("Error: MPD version %d.%d.%d is too old (%s needed)"),
 				     version[0], version[1], version[2],
-				     "0.11.0");
+				     "0.16.0");
 		mpdclient_disconnect(mpd);
 		doupdate();
 
 		/* try again after 30 seconds */
-		g_timeout_add(30000, timer_reconnect, NULL);
-		return FALSE;
+		reconnect_source_id = g_timeout_add(30000,
+						    timer_reconnect, NULL);
+		return;
 	}
 #endif
 
-	screen_status_printf(_("Connected to %s"),
-			     options.host != NULL
-			     ? options.host : "localhost");
+	screen_status_clear_message();
 	doupdate();
 
-	connected = TRUE;
-
 	/* update immediately */
-	g_timeout_add(1, timer_mpd_update, GINT_TO_POINTER(FALSE));
+	mpd->events = MPD_IDLE_ALL;
 
-	reconnect_source_id = 0;
-	return FALSE;
+	do_mpd_update();
 
+	auto_update_timer();
 }
 
-static gboolean
-timer_mpd_update(gpointer data)
+void
+mpdclient_failed_callback(void)
 {
-	if (connected)
-		mpdclient_update(mpd);
-	else if (reconnect_source_id == 0)
-		reconnect_source_id = g_timeout_add(1000, timer_reconnect,
-						    NULL);
+	assert(reconnect_source_id == 0);
+
+	/* try again in 5 seconds */
+	reconnect_source_id = g_timeout_add(5000,
+					    timer_reconnect, NULL);
+}
+
+void
+mpdclient_lost_callback(void)
+{
+	assert(reconnect_source_id == 0);
 
+	screen_update(mpd);
+
+	reconnect_source_id = g_timeout_add(1000, timer_reconnect, NULL);
+}
+
+/**
+ * This function is called by the gidle.c library when MPD sends us an
+ * idle event (or when the connection dies).
+ */
+void
+mpdclient_idle_callback(gcc_unused enum mpd_idle events)
+{
 #ifndef NCMPC_MINI
 	if (options.enable_xterm_title)
 		update_xterm_title();
 #endif
 
 	screen_update(mpd);
+	auto_update_timer();
+}
 
-	return GPOINTER_TO_INT(data);
+static gboolean
+timer_mpd_update(gcc_unused gpointer data)
+{
+	do_mpd_update();
+
+	if (should_enable_update_timer())
+		return true;
+	else {
+		update_source_id = 0;
+		return false;
+	}
 }
 
 void begin_input_event(void)
@@ -278,43 +291,26 @@ void begin_input_event(void)
 void end_input_event(void)
 {
 	screen_update(mpd);
+	mpd->events = 0;
+
+	auto_update_timer();
 }
 
-int do_input_event(command_t cmd)
+bool
+do_input_event(command_t cmd)
 {
 	if (cmd == CMD_QUIT) {
 		g_main_loop_quit(main_loop);
-		return -1;
+		return false;
 	}
 
 	screen_cmd(mpd, cmd);
 
-	if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN) {
+	if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN)
 		/* make sure we don't update the volume yet */
-		g_source_remove(update_source_id);
-		update_source_id = g_timeout_add(update_interval,
-						 timer_mpd_update,
-						 GINT_TO_POINTER(TRUE));
-	}
-
-	return 0;
-}
+		disable_update_timer();
 
-static gboolean
-keyboard_event(G_GNUC_UNUSED GIOChannel *source,
-	       G_GNUC_UNUSED GIOCondition condition,
-	       G_GNUC_UNUSED gpointer data)
-{
-	command_t cmd;
-
-	begin_input_event();
-
-	if ((cmd=get_keyboard_command()) != CMD_NONE)
-		if (do_input_event(cmd) != 0)
-			return FALSE;
-
-	end_input_event();
-	return TRUE;
+	return true;
 }
 
 #ifndef NCMPC_MINI
@@ -323,16 +319,11 @@ keyboard_event(G_GNUC_UNUSED GIOChannel *source,
  * message every 10 seconds.
  */
 static gboolean
-timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
+timer_check_key_bindings(gcc_unused gpointer data)
 {
 	char buf[256];
-#ifdef ENABLE_KEYDEF_SCREEN
-	char comment[64];
-#endif
-	gboolean key_error;
 
-	key_error = check_key_bindings(NULL, buf, sizeof(buf));
-	if (!key_error) {
+	if (check_key_bindings(NULL, buf, sizeof(buf))) {
 		/* no error: disable this timer for the rest of this
 		   process */
 		check_key_bindings_source_id = 0;
@@ -345,8 +336,9 @@ timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
 	/* to translators: a key was bound twice in the key editor,
 	   and this is a hint for the user what to press to correct
 	   that */
+	char comment[64];
 	g_snprintf(comment, sizeof(comment), _("press %s for the key editor"),
-		   get_key_names(CMD_SCREEN_KEYDEF, 0));
+		   get_key_names(CMD_SCREEN_KEYDEF, false));
 	g_strlcat(buf, comment, sizeof(buf));
 	g_strlcat(buf, ")", sizeof(buf));
 #endif
@@ -361,17 +353,11 @@ timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
 int
 main(int argc, const char *argv[])
 {
-	struct sigaction act;
 #ifdef ENABLE_LOCALE
-	const char *charset = NULL;
-#endif
-	GIOChannel *keyboard_channel;
-#ifdef ENABLE_LIRC
-	int lirc_socket;
-	GIOChannel *lirc_channel = NULL;
+#ifndef ENABLE_NLS
+	gcc_unused
 #endif
-
-#ifdef ENABLE_LOCALE
+	const char *charset = NULL;
 	/* time and date formatting */
 	setlocale(LC_TIME,"");
 	/* care about sorting order etc */
@@ -410,56 +396,6 @@ main(int argc, const char *argv[])
 	/* parse command line options - 2 pass */
 	options_parse(argc, argv);
 
-	/* setup signal behavior - SIGINT */
-	sigemptyset(&act.sa_mask);
-	act.sa_flags = 0;
-	act.sa_handler = catch_sigint;
-	if (sigaction(SIGINT, &act, NULL) < 0) {
-		perror("signal");
-		exit(EXIT_FAILURE);
-	}
-
-	/* setup signal behavior - SIGTERM */
-
-	act.sa_handler = catch_sigint;
-	if (sigaction(SIGTERM, &act, NULL) < 0) {
-		perror("sigaction()");
-		exit(EXIT_FAILURE);
-	}
-
-	/* setup signal behavior - SIGCONT */
-
-	act.sa_handler = catch_sigcont;
-	if (sigaction(SIGCONT, &act, NULL) < 0) {
-		perror("sigaction(SIGCONT)");
-		exit(EXIT_FAILURE);
-	}
-
-	/* setup signal behaviour - SIGHUP*/
-
-	act.sa_handler = catch_sigint;
-	if (sigaction(SIGHUP, &act, NULL) < 0) {
-		perror("sigaction(SIGHUP)");
-		exit(EXIT_FAILURE);
-	}
-
-	/* setup SIGWINCH */
-
-	act.sa_flags = SA_RESTART;
-	act.sa_handler = catch_sigwinch;
-	if (sigaction(SIGWINCH, &act, NULL) < 0) {
-		perror("sigaction(SIGWINCH)");
-		exit(EXIT_FAILURE);
-	}
-
-	/* ignore SIGPIPE */
-
-	act.sa_handler = SIG_IGN;
-	if (sigaction(SIGPIPE, &act, NULL) < 0) {
-		perror("sigaction(SIGPIPE)");
-		exit(EXIT_FAILURE);
-	}
-
 	ncu_init();
 
 #ifdef ENABLE_LYRICS_SCREEN
@@ -467,8 +403,9 @@ main(int argc, const char *argv[])
 #endif
 
 	/* create mpdclient instance */
-	mpd = mpdclient_new();
-	mpdclient_install_error_callback(mpd, error_callback);
+	mpd = mpdclient_new(options.host, options.port,
+			    options.timeout_ms,
+			    options.password);
 
 	/* initialize curses */
 	screen_init(mpd);
@@ -477,24 +414,18 @@ main(int argc, const char *argv[])
 	main_loop = g_main_loop_new(NULL, FALSE);
 
 	/* watch out for keyboard input */
-	keyboard_channel = g_io_channel_unix_new(STDIN_FILENO);
-	g_io_add_watch(keyboard_channel, G_IO_IN, keyboard_event, NULL);
+	keyboard_init();
 
-#ifdef ENABLE_LIRC
 	/* watch out for lirc input */
-	lirc_socket = ncmpc_lirc_open();
-	if (lirc_socket >= 0) {
-		lirc_channel = g_io_channel_unix_new(lirc_socket);
-		g_io_add_watch(lirc_channel, G_IO_IN, lirc_event, NULL);
-	}
-#endif
+	ncmpc_lirc_init();
+
+	signals_init(main_loop, mpd);
 
 	/* attempt to connect */
-	reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);
+	reconnect_source_id = g_idle_add(timer_reconnect, NULL);
+
+	auto_update_timer();
 
-	update_source_id = g_timeout_add(update_interval,
-					 timer_mpd_update,
-					 GINT_TO_POINTER(TRUE));
 #ifndef NCMPC_MINI
 	check_key_bindings_source_id = g_timeout_add(10000, timer_check_key_bindings, NULL);
 #endif
@@ -502,28 +433,32 @@ main(int argc, const char *argv[])
 	screen_paint(mpd);
 
 	g_main_loop_run(main_loop);
+	g_main_loop_unref(main_loop);
 
 	/* cleanup */
 
 	cancel_seek_timer();
 
-	g_source_remove(update_source_id);
+	disable_update_timer();
+
+	if (reconnect_source_id != 0)
+		g_source_remove(reconnect_source_id);
 
 #ifndef NCMPC_MINI
 	if (check_key_bindings_source_id != 0)
 		g_source_remove(check_key_bindings_source_id);
 #endif
 
-	g_main_loop_unref(main_loop);
-	g_io_channel_unref(keyboard_channel);
+	signals_deinit();
+	ncmpc_lirc_deinit();
 
-#ifdef ENABLE_LIRC
-	if (lirc_socket >= 0)
-		g_io_channel_unref(lirc_channel);
-	ncmpc_lirc_close();
+	screen_exit();
+#ifndef NCMPC_MINI
+	set_xterm_title("");
 #endif
+	printf("\n");
 
-	exit_and_cleanup();
+	mpdclient_free(mpd);
 
 #ifdef ENABLE_LYRICS_SCREEN
 	lyrics_deinit();