X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmain.c;h=26ab45896b9f36fc408f0f8a24f44e1c52854c0d;hb=86a2786d1dce581639b4f4793cb59ad28bf6e3f0;hp=e701712fd871974057e43ee5d8842a580df4e019;hpb=f81333daa0bb652a5c1296941057eef82a12e12f;p=ncmpc.git

diff --git a/src/main.c b/src/main.c
index e701712..26ab458 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,7 +21,6 @@
 #include "mpdclient.h"
 #include "charset.h"
 #include "options.h"
-#include "conf.h"
 #include "command.h"
 #include "ncu.h"
 #include "screen.h"
@@ -30,17 +29,25 @@
 #include "i18n.h"
 #include "gcc.h"
 
+#ifndef NCMPC_MINI
+#include "conf.h"
+#endif
+
 #ifdef ENABLE_LYRICS_SCREEN
 #include "lyrics.h"
 #endif
 
+#ifdef ENABLE_LIRC
+#include "lirc.h"
+#endif
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
 #include <string.h>
 
 /* time between mpd updates [s] */
-static const float MPD_UPDATE_TIME = 0.5;
+static const guint update_interval = 500;
 
 #define BUFSIZE 1024
 
@@ -59,15 +66,18 @@ error_msg(const gchar *msg)
 	if ((p = strchr(msg, '}')) == NULL)
 		return msg;
 
-	while (p && *p && (*p=='}' || *p==' '))
+	do {
 		p++;
+	} while (*p == '}' || * p== ' ');
 
 	return p;
 }
 
 static void
-error_callback(mpd_unused mpdclient_t *c, gint error, const gchar *msg)
+error_callback(mpd_unused mpdclient_t *c, gint error, const gchar *_msg)
 {
+	char *msg = utf8_to_locale(_msg);
+
 	error = error & 0xFF;
 	switch (error) {
 	case MPD_ERROR_CONNPORT:
@@ -83,8 +93,11 @@ error_callback(mpd_unused mpdclient_t *c, gint error, const gchar *msg)
 		doupdate();
 		connected = FALSE;
 	}
+
+	g_free(msg);
 }
 
+#ifndef NCMPC_MINI
 static void
 update_xterm_title(void)
 {
@@ -109,12 +122,15 @@ 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) {
@@ -126,7 +142,9 @@ exit_and_cleanup(void)
 	g_free(options.password);
 	g_free(options.list_format);
 	g_free(options.status_format);
+#ifndef NCMPC_MINI
 	g_free(options.scroll_sep);
+#endif
 }
 
 static void
@@ -139,11 +157,7 @@ catch_sigint(mpd_unused int sig)
 static void
 catch_sigcont(mpd_unused int sig)
 {
-#ifdef ENABLE_RAW_MODE
-	reset_prog_mode(); /* restore tty modes */
-	refresh();
-#endif
-	screen_resize();
+	screen_resize(mpd);
 }
 
 void
@@ -165,7 +179,7 @@ timer_sigwinch(mpd_unused gpointer data)
 
 	endwin();
 	refresh();
-	screen_resize();
+	screen_resize(mpd);
 
 	return FALSE;
 }
@@ -209,6 +223,7 @@ timer_reconnect(mpd_unused gpointer data)
 		return FALSE;
 	}
 
+#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"),
@@ -222,6 +237,7 @@ timer_reconnect(mpd_unused gpointer data)
 		g_timeout_add(30000, timer_reconnect, NULL);
 		return FALSE;
 	}
+#endif
 
 	screen_status_printf(_("Connected to %s!"), options.host);
 	doupdate();
@@ -245,8 +261,10 @@ timer_mpd_update(gpointer data)
 		reconnect_source_id = g_timeout_add(1000, timer_reconnect,
 						    NULL);
 
+#ifndef NCMPC_MINI
 	if (options.enable_xterm_title)
 		update_xterm_title();
+#endif
 
 	screen_update(mpd);
 
@@ -264,38 +282,56 @@ timer_idle(mpd_unused gpointer data)
 	return TRUE;
 }
 
-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);
 
-		screen_cmd(mpd, cmd);
+	idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
+}
 
-		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((guint)(MPD_UPDATE_TIME * 1000),
-							 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);
+	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));
+	}
+
+	return 0;
+}
+
+static gboolean
+keyboard_event(mpd_unused GIOChannel *source,
+	       mpd_unused GIOCondition condition, mpd_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;
 }
 
+#ifndef NCMPC_MINI
 /**
  * Check the configured key bindings for errors, and display a status
  * message every 10 seconds.
@@ -316,17 +352,22 @@ timer_check_key_bindings(mpd_unused gpointer data)
 	doupdate();
 	return TRUE;
 }
+#endif
 
 int
 main(int argc, const char *argv[])
 {
 	struct sigaction act;
-#ifdef HAVE_LOCALE_H
+#if defined(HAVE_LOCALE_H) && !defined(NCMPC_MINI)
 	const char *charset = NULL;
 #endif
 	GIOChannel *keyboard_channel;
+#ifdef ENABLE_LIRC
+	int lirc_socket;
+	GIOChannel *lirc_channel = NULL;
+#endif
 
-#ifdef HAVE_LOCALE_H
+#if defined(HAVE_LOCALE_H) && !defined(NCMPC_MINI)
 	/* time and date formatting */
 	setlocale(LC_TIME,"");
 	/* care about sorting order etc */
@@ -352,7 +393,9 @@ main(int argc, const char *argv[])
 	options_parse(argc, argv);
 
 	/* read configuration */
-	read_configuration(&options);
+#ifndef NCMPC_MINI
+	read_configuration();
+#endif
 
 	/* check key bindings */
 	check_key_bindings(NULL, NULL, 0);
@@ -370,8 +413,7 @@ main(int argc, const char *argv[])
 	}
 
 	/* setup signal behavior - SIGTERM */
-	sigemptyset(&act.sa_mask);
-	act.sa_flags = 0;
+
 	act.sa_handler = catch_sigint;
 	if (sigaction(SIGTERM, &act, NULL) < 0) {
 		perror("sigaction()");
@@ -379,8 +421,7 @@ main(int argc, const char *argv[])
 	}
 
 	/* setup signal behavior - SIGCONT */
-	sigemptyset(&act.sa_mask);
-	act.sa_flags = 0;
+
 	act.sa_handler = catch_sigcont;
 	if (sigaction(SIGCONT, &act, NULL) < 0) {
 		perror("sigaction(SIGCONT)");
@@ -388,8 +429,7 @@ main(int argc, const char *argv[])
 	}
 
 	/* setup signal behaviour - SIGHUP*/
-	sigemptyset(&act.sa_mask);
-	act.sa_flags = 0;
+
 	act.sa_handler = catch_sigint;
 	if (sigaction(SIGHUP, &act, NULL) < 0) {
 		perror("sigaction(SIGHUP)");
@@ -398,6 +438,7 @@ main(int argc, const char *argv[])
 
 	/* setup SIGWINCH */
 
+	act.sa_flags = SA_RESTART;
 	act.sa_handler = catch_sigwinch;
 	if (sigaction(SIGWINCH, &act, NULL) < 0) {
 		perror("sigaction(SIGWINCH)");
@@ -406,10 +447,9 @@ main(int argc, const char *argv[])
 
 	/* ignore SIGPIPE */
 
-	act.sa_flags = SA_RESTART;
 	act.sa_handler = SIG_IGN;
-	if (sigaction(SIGWINCH, &act, NULL) < 0) {
-		perror("sigaction(SIGWINCH)");
+	if (sigaction(SIGPIPE, &act, NULL) < 0) {
+		perror("sigaction(SIGPIPE)");
 		exit(EXIT_FAILURE);
 	}
 
@@ -433,15 +473,28 @@ main(int argc, const char *argv[])
 	keyboard_channel = g_io_channel_unix_new(STDIN_FILENO);
 	g_io_add_watch(keyboard_channel, G_IO_IN, keyboard_event, NULL);
 
+#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
+
 	/* attempt to connect */
 	reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);
 
-	update_source_id = g_timeout_add((guint)(MPD_UPDATE_TIME * 1000),
+	update_source_id = g_timeout_add(update_interval,
 					 timer_mpd_update,
 					 GINT_TO_POINTER(TRUE));
+#ifndef NCMPC_MINI
 	g_timeout_add(10000, timer_check_key_bindings, NULL);
+#endif
 	idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
 
+	screen_paint(mpd);
+
 	g_main_loop_run(main_loop);
 
 	/* cleanup */
@@ -449,6 +502,12 @@ main(int argc, const char *argv[])
 	g_main_loop_unref(main_loop);
 	g_io_channel_unref(keyboard_channel);
 
+#ifdef ENABLE_LIRC
+	if (lirc_socket >= 0)
+		g_io_channel_unref(lirc_channel);
+	ncmpc_lirc_close();
+#endif
+
 	exit_and_cleanup();
 	ncu_deinit();