X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmain.c;h=bc2a8c73dc30eb4193cc913556abb40ff658ece0;hb=0796b270b1699336f29908d11bca92d64da0653c;hp=49c813a7a49d83523b3b5012a14aee3b46136fca;hpb=d88a1718bbca660e13ad60f8f1aec6084fcf7788;p=ncmpc.git

diff --git a/src/main.c b/src/main.c
index 49c813a..bc2a8c7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2010 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
@@ -10,25 +11,30 @@
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- */
+ * 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 "gidle.h"
 #include "charset.h"
 #include "options.h"
-#include "conf.h"
 #include "command.h"
 #include "ncu.h"
 #include "screen.h"
 #include "screen_utils.h"
+#include "screen_message.h"
 #include "strfsong.h"
 #include "i18n.h"
-#include "gcc.h"
+#include "player_command.h"
+
+#ifndef NCMPC_MINI
+#include "conf.h"
+#endif
 
 #ifdef ENABLE_LYRICS_SCREEN
 #include "lyrics.h"
@@ -38,64 +44,38 @@
 #include "lirc.h"
 #endif
 
+#include <mpd/client.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
 #include <string.h>
 
-/* time between mpd updates [s] */
+#ifdef ENABLE_LOCALE
+#include <locale.h>
+#endif
+
+/* time between mpd updates [ms] */
 static const guint update_interval = 500;
 
 #define BUFSIZE 1024
 
-static const guint idle_interval = 500;
-
-static mpdclient_t *mpd = NULL;
-static gboolean connected = FALSE;
+static struct mpdclient *mpd = NULL;
 static GMainLoop *main_loop;
-static guint reconnect_source_id, idle_source_id, update_source_id;
+static guint reconnect_source_id, update_source_id;
 
-static const gchar *
-error_msg(const gchar *msg)
-{
-	gchar *p;
-
-	if ((p = strchr(msg, '}')) == NULL)
-		return msg;
-
-	while (p && *p && (*p=='}' || *p==' '))
-		p++;
-
-	return p;
-}
-
-static void
-error_callback(mpd_unused mpdclient_t *c, gint error, const gchar *msg)
-{
-	error = error & 0xFF;
-	switch (error) {
-	case MPD_ERROR_CONNPORT:
-	case MPD_ERROR_NORESPONSE:
-		break;
-	case MPD_ERROR_ACK:
-		screen_status_printf("%s", error_msg(msg));
-		screen_bell();
-		break;
-	default:
-		screen_status_printf("%s", msg);
-		screen_bell();
-		doupdate();
-		connected = FALSE;
-	}
-}
+#ifndef NCMPC_MINI
+static guint check_key_bindings_source_id;
+#endif
 
+#ifndef NCMPC_MINI
 static void
 update_xterm_title(void)
 {
 	static char title[BUFSIZE];
 	char tmp[BUFSIZE];
-	mpd_Status *status = NULL;
-	mpd_Song *song = NULL;
+	struct mpd_status *status = NULL;
+	const struct mpd_song *song = NULL;
 
 	if (mpd) {
 		status = mpd->status;
@@ -103,7 +83,7 @@ update_xterm_title(void)
 	}
 
 	if (options.xterm_title_format && status && song &&
-	    IS_PLAYING(status->state))
+	    mpd_status_get_state(status) == MPD_STATE_PLAY)
 		strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
 	else
 		g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
@@ -113,35 +93,32 @@ update_xterm_title(void)
 		set_xterm_title("%s", title);
 	}
 }
+#endif
 
 static void
 exit_and_cleanup(void)
 {
 	screen_exit();
+#ifndef NCMPC_MINI
 	set_xterm_title("");
+#endif
 	printf("\n");
 
 	if (mpd) {
 		mpdclient_disconnect(mpd);
 		mpdclient_free(mpd);
 	}
-
-	g_free(options.host);
-	g_free(options.password);
-	g_free(options.list_format);
-	g_free(options.status_format);
-	g_free(options.scroll_sep);
 }
 
 static void
-catch_sigint(mpd_unused int sig)
+catch_sigint(G_GNUC_UNUSED int sig)
 {
 	g_main_loop_quit(main_loop);
 }
 
 
 static void
-catch_sigcont(mpd_unused int sig)
+catch_sigcont(G_GNUC_UNUSED int sig)
 {
 	screen_resize(mpd);
 }
@@ -149,15 +126,15 @@ catch_sigcont(mpd_unused int sig)
 void
 sigstop(void)
 {
-  def_prog_mode();  /* save the tty modes */
-  endwin();         /* end curses mode temporarily */
-  kill(0, SIGSTOP); /* issue SIGSTOP */
+	def_prog_mode();  /* save the tty modes */
+	endwin();         /* end curses mode temporarily */
+	kill(0, SIGSTOP); /* issue SIGSTOP */
 }
 
 static guint timer_sigwinch_id;
 
 static gboolean
-timer_sigwinch(mpd_unused gpointer data)
+timer_sigwinch(G_GNUC_UNUSED gpointer data)
 {
 	/* the following causes the screen to flicker.  There might be
 	   better solutions, but I believe it isn't all that
@@ -171,7 +148,7 @@ timer_sigwinch(mpd_unused gpointer data)
 }
 
 static void
-catch_sigwinch(mpd_unused int sig)
+catch_sigwinch(G_GNUC_UNUSED int sig)
 {
 	if (timer_sigwinch_id != 0)
 		g_source_remove(timer_sigwinch_id);
@@ -179,183 +156,330 @@ catch_sigwinch(mpd_unused int sig)
 	timer_sigwinch_id = g_timeout_add(100, timer_sigwinch, NULL);
 }
 
+static void
+idle_callback(enum mpd_error error,
+	      G_GNUC_UNUSED enum mpd_server_error server_error,
+	      const char *message, enum mpd_idle events,
+	      G_GNUC_UNUSED void *ctx);
+
 static gboolean
 timer_mpd_update(gpointer data);
 
+static void
+enable_update_timer(void)
+{
+	if (update_source_id != 0)
+		return;
+
+	update_source_id = g_timeout_add(update_interval,
+					 timer_mpd_update, NULL);
+}
+
+static void
+disable_update_timer(void)
+{
+	if (update_source_id == 0)
+		return;
+
+	g_source_remove(update_source_id);
+	update_source_id = 0;
+}
+
+static bool
+should_enable_update_timer(void)
+{
+	return (mpdclient_is_connected(mpd) &&
+		(mpd->source == NULL || /* "idle" not supported */
+		 (mpd->status != NULL &&
+		  mpd_status_get_state(mpd->status) == MPD_STATE_PLAY)))
+#ifndef NCMPC_MINI
+		|| options.display_time
+#endif
+		;
+}
+
+static void
+auto_update_timer(void)
+{
+	if (should_enable_update_timer())
+		enable_update_timer();
+	else
+		disable_update_timer();
+}
+
+static void
+check_reconnect(void);
+
+static void
+do_mpd_update(void)
+{
+	if (mpdclient_is_connected(mpd) &&
+	    (mpd->source == NULL || mpd->events != 0 ||
+	     (mpd->status != NULL &&
+	      mpd_status_get_state(mpd->status) == MPD_STATE_PLAY)))
+		mpdclient_update(mpd);
+
+#ifndef NCMPC_MINI
+	if (options.enable_xterm_title)
+		update_xterm_title();
+#endif
+
+	screen_update(mpd);
+	mpd->events = 0;
+
+	mpdclient_put_connection(mpd);
+	check_reconnect();
+}
+
 /**
  * This timer is installed when the connection to the MPD server is
  * broken.  It tries to recover by reconnecting periodically.
  */
 static gboolean
-timer_reconnect(mpd_unused gpointer data)
+timer_reconnect(G_GNUC_UNUSED gpointer data)
 {
-	int ret;
+	bool success;
+	struct mpd_connection *connection;
 
-	if (connected)
-		return FALSE;
+	assert(!mpdclient_is_connected(mpd));
+
+	reconnect_source_id = 0;
 
 	screen_status_printf(_("Connecting to %s...  [Press %s to abort]"),
 			     options.host, get_key_names(CMD_QUIT,0) );
 	doupdate();
 
 	mpdclient_disconnect(mpd);
-	ret = mpdclient_connect(mpd,
-				options.host, options.port,
-				1.5,
-				options.password);
-	if (ret != 0) {
+	success = mpdclient_connect(mpd,
+				    options.host, options.port,
+				    1.5,
+				    options.password);
+	if (!success) {
 		/* try again in 5 seconds */
-		g_timeout_add(5000, timer_reconnect, NULL);
+		reconnect_source_id = g_timeout_add(5000,
+						    timer_reconnect, NULL);
 		return FALSE;
 	}
 
+	connection = mpdclient_get_connection(mpd);
+
+#ifndef NCMPC_MINI
 	/* quit if mpd is pre 0.11.0 - song id not supported by mpd */
-	if (MPD_VERSION_LT(mpd, 0, 11, 0)) {
-		screen_status_printf(_("Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"),
-				     mpd->connection->version[0],
-				     mpd->connection->version[1],
-				     mpd->connection->version[2]);
+	if (mpd_connection_cmp_server_version(connection, 0, 12, 0) < 0) {
+		const unsigned *version =
+			mpd_connection_get_server_version(connection);
+		screen_status_printf(_("Error: MPD version %d.%d.%d is to old (%s needed)"),
+				     version[0], version[1], version[2],
+				     "0.12.0");
 		mpdclient_disconnect(mpd);
 		doupdate();
 
 		/* try again after 30 seconds */
-		g_timeout_add(30000, timer_reconnect, NULL);
+		reconnect_source_id = g_timeout_add(30000,
+						    timer_reconnect, NULL);
 		return FALSE;
 	}
+#endif
 
-	screen_status_printf(_("Connected to %s!"), options.host);
-	doupdate();
+	if (mpd_connection_cmp_server_version(connection,
+					      0, 14, 0) >= 0)
+		mpd->source = mpd_glib_new(connection,
+					   idle_callback, mpd);
 
-	connected = TRUE;
+	screen_status_printf(_("Connected to %s"),
+			     options.host != NULL
+			     ? options.host : "localhost");
+	doupdate();
 
 	/* update immediately */
-	g_timeout_add(1, timer_mpd_update, GINT_TO_POINTER(FALSE));
+	mpd->events = MPD_IDLE_DATABASE|MPD_IDLE_STORED_PLAYLIST|
+		MPD_IDLE_QUEUE|MPD_IDLE_PLAYER|MPD_IDLE_MIXER|MPD_IDLE_OUTPUT|
+		MPD_IDLE_OPTIONS|MPD_IDLE_UPDATE;
+
+	do_mpd_update();
+
+	auto_update_timer();
 
-	reconnect_source_id = 0;
 	return FALSE;
+}
 
+static void
+check_reconnect(void)
+{
+	if (!mpdclient_is_connected(mpd) && reconnect_source_id == 0)
+		/* reconnect when the connection is lost */
+		reconnect_source_id = g_timeout_add(1000, timer_reconnect,
+						    NULL);
 }
 
-static gboolean
-timer_mpd_update(gpointer data)
+/**
+ * This function is called by the gidle.c library when MPD sends us an
+ * idle event (or when the connectiond dies).
+ */
+static void
+idle_callback(enum mpd_error error, enum mpd_server_error server_error,
+	      const char *message, enum mpd_idle events,
+	      void *ctx)
 {
-	if (connected)
-		mpdclient_update(mpd);
-	else if (reconnect_source_id == 0)
+	struct mpdclient *c = ctx;
+	struct mpd_connection *connection;
+
+	c->idle = false;
+
+	connection = mpdclient_get_connection(c);
+	assert(connection != NULL);
+
+	if (error != MPD_ERROR_SUCCESS) {
+		char *allocated;
+
+		if (error == MPD_ERROR_SERVER &&
+		    server_error == MPD_SERVER_ERROR_UNKNOWN_CMD) {
+			/* the "idle" command is not supported - fall
+			   back to timer based polling */
+			mpd_glib_free(c->source);
+			c->source = NULL;
+			auto_update_timer();
+			return;
+		}
+
+		if (error == MPD_ERROR_SERVER)
+			message = allocated = utf8_to_locale(message);
+		else
+			allocated = NULL;
+		screen_status_message(message);
+		g_free(allocated);
+		screen_bell();
+		doupdate();
+
+		mpdclient_disconnect(c);
+		screen_update(mpd);
 		reconnect_source_id = g_timeout_add(1000, timer_reconnect,
 						    NULL);
+		return;
+	}
 
+	c->events |= events;
+	mpdclient_update(c);
+
+#ifndef NCMPC_MINI
 	if (options.enable_xterm_title)
 		update_xterm_title();
+#endif
 
 	screen_update(mpd);
+	c->events = 0;
 
-	return GPOINTER_TO_INT(data);
+	mpdclient_put_connection(c);
+	check_reconnect();
+	auto_update_timer();
 }
 
-/**
- * This idle timer is invoked when the user hasn't typed a key for
- * 500ms.  It is used for delayed seeking.
- */
 static gboolean
-timer_idle(mpd_unused gpointer data)
+timer_mpd_update(G_GNUC_UNUSED gpointer data)
 {
-	screen_idle(mpd);
-	return TRUE;
+	do_mpd_update();
+
+	if (should_enable_update_timer())
+		return true;
+	else {
+		update_source_id = 0;
+		return false;
+	}
 }
 
-static gboolean
-keyboard_event(mpd_unused GIOChannel *source,
-	       mpd_unused GIOCondition condition, mpd_unused gpointer data)
+void begin_input_event(void)
 {
-	command_t cmd;
-
-	/* remove the idle timeout; add it later with fresh interval */
-	g_source_remove(idle_source_id);
+}
 
-	if ((cmd=get_keyboard_command()) != CMD_NONE) {
-		if (cmd == CMD_QUIT) {
-			g_main_loop_quit(main_loop);
-			return FALSE;
-		}
+void end_input_event(void)
+{
+	screen_update(mpd);
+	mpd->events = 0;
 
-		screen_cmd(mpd, cmd);
+	mpdclient_put_connection(mpd);
+	check_reconnect();
+	auto_update_timer();
+}
 
-		if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN) {
-			/* make sure we dont 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));
-		}
+int do_input_event(command_t cmd)
+{
+	if (cmd == CMD_QUIT) {
+		g_main_loop_quit(main_loop);
+		return -1;
 	}
 
-	screen_update(mpd);
+	screen_cmd(mpd, cmd);
 
-	idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
-	return TRUE;
+	if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN)
+		/* make sure we don't update the volume yet */
+		disable_update_timer();
+
+	return 0;
 }
 
-#ifdef ENABLE_LIRC
 static gboolean
-lirc_event(mpd_unused GIOChannel *source,
-	   mpd_unused GIOCondition condition, mpd_unused gpointer data)
+keyboard_event(G_GNUC_UNUSED GIOChannel *source,
+	       G_GNUC_UNUSED GIOCondition condition,
+	       G_GNUC_UNUSED gpointer data)
 {
 	command_t cmd;
 
-	/* remove the idle timeout; add it later with fresh interval */
-	g_source_remove(idle_source_id);
+	begin_input_event();
 
-	if ((cmd = ncmpc_lirc_get_command()) != CMD_NONE) {
-		if (cmd == CMD_QUIT) {
-			g_main_loop_quit(main_loop);
+	if ((cmd=get_keyboard_command()) != CMD_NONE)
+		if (do_input_event(cmd) != 0)
 			return FALSE;
-		}
-
-		screen_cmd(mpd, cmd);
-
-		if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN) {
-			/* make sure we dont 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));
-		}
-	}
-
-	screen_update(mpd);
 
-	idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
+	end_input_event();
 	return TRUE;
 }
-#endif
 
+#ifndef NCMPC_MINI
 /**
  * Check the configured key bindings for errors, and display a status
  * message every 10 seconds.
  */
 static gboolean
-timer_check_key_bindings(mpd_unused gpointer data)
+timer_check_key_bindings(G_GNUC_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 (!key_error) {
 		/* no error: disable this timer for the rest of this
 		   process */
+		check_key_bindings_source_id = 0;
 		return FALSE;
+	}
+
+#ifdef ENABLE_KEYDEF_SCREEN
+	g_strchomp(buf);
+	g_strlcat(buf, " (", sizeof(buf));
+	/* 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 */
+	g_snprintf(comment, sizeof(comment), _("press %s for the key editor"),
+		   get_key_names(CMD_SCREEN_KEYDEF, 0));
+	g_strlcat(buf, comment, sizeof(buf));
+	g_strlcat(buf, ")", sizeof(buf));
+#endif
 
 	screen_status_printf("%s", buf);
+
 	doupdate();
 	return TRUE;
 }
+#endif
 
 int
 main(int argc, const char *argv[])
 {
 	struct sigaction act;
-#ifdef HAVE_LOCALE_H
+#ifdef ENABLE_LOCALE
 	const char *charset = NULL;
 #endif
 	GIOChannel *keyboard_channel;
@@ -364,7 +488,7 @@ main(int argc, const char *argv[])
 	GIOChannel *lirc_channel = NULL;
 #endif
 
-#ifdef HAVE_LOCALE_H
+#ifdef ENABLE_LOCALE
 	/* time and date formatting */
 	setlocale(LC_TIME,"");
 	/* care about sorting order etc */
@@ -375,12 +499,15 @@ main(int argc, const char *argv[])
 	charset = charset_init();
 
 	/* initialize i18n support */
+#endif
+
 #ifdef ENABLE_NLS
 	setlocale(LC_MESSAGES, "");
 	bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+#ifdef ENABLE_LOCALE
 	bind_textdomain_codeset(GETTEXT_PACKAGE, charset);
-	textdomain(GETTEXT_PACKAGE);
 #endif
+	textdomain(GETTEXT_PACKAGE);
 #endif
 
 	/* initialize options */
@@ -389,11 +516,13 @@ main(int argc, const char *argv[])
 	/* parse command line options - 1 pass get configuration files */
 	options_parse(argc, argv);
 
+#ifndef NCMPC_MINI
 	/* read configuration */
 	read_configuration();
 
 	/* check key bindings */
 	check_key_bindings(NULL, NULL, 0);
+#endif
 
 	/* parse command line options - 2 pass */
 	options_parse(argc, argv);
@@ -456,7 +585,6 @@ main(int argc, const char *argv[])
 
 	/* create mpdclient instance */
 	mpd = mpdclient_new();
-	mpdclient_install_error_callback(mpd, error_callback);
 
 	/* initialize curses */
 	screen_init(mpd);
@@ -480,11 +608,11 @@ main(int argc, const char *argv[])
 	/* attempt to connect */
 	reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);
 
-	update_source_id = g_timeout_add(update_interval,
-					 timer_mpd_update,
-					 GINT_TO_POINTER(TRUE));
-	g_timeout_add(10000, timer_check_key_bindings, NULL);
-	idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
+	auto_update_timer();
+
+#ifndef NCMPC_MINI
+	check_key_bindings_source_id = g_timeout_add(10000, timer_check_key_bindings, NULL);
+#endif
 
 	screen_paint(mpd);
 
@@ -492,6 +620,18 @@ main(int argc, const char *argv[])
 
 	/* cleanup */
 
+	cancel_seek_timer();
+
+	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);
 
@@ -502,7 +642,13 @@ main(int argc, const char *argv[])
 #endif
 
 	exit_and_cleanup();
+
+#ifdef ENABLE_LYRICS_SCREEN
+	lyrics_deinit();
+#endif
+
 	ncu_deinit();
+	options_deinit();
 
 	return 0;
 }