screen_song: make Path a proper label

[ncmpc.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 8536cb67c77d8e7fa8258f9ccab837b46d4bb75d..1e7caeea8444a346c003466851c80ab3f254c5fa 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -48,6 +48,7 @@
 
 #include <stdlib.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <signal.h>
 #include <string.h>
 
@@ -63,6 +64,7 @@ static const guint update_interval = 500;
 static struct mpdclient *mpd = NULL;
 static GMainLoop *main_loop;
 static guint reconnect_source_id, update_source_id;
+static int sigwinch_pipes[2];
 
 #ifndef NCMPC_MINI
 static guint check_key_bindings_source_id;
@@ -110,6 +112,7 @@ exit_and_cleanup(void)
        }
 }
 
+#ifndef WIN32
 static void
 catch_sigint(G_GNUC_UNUSED int sig)
 {
@@ -120,7 +123,9 @@ catch_sigint(G_GNUC_UNUSED int sig)
 static void
 catch_sigcont(G_GNUC_UNUSED int sig)
 {
-       screen_resize(mpd);
+       char irrelevant = 'a';
+       if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
+               exit(EXIT_FAILURE);
 }
 
 void
@@ -131,30 +136,29 @@ sigstop(void)
        kill(0, SIGSTOP); /* issue SIGSTOP */
 }
 
-static guint timer_sigwinch_id;
-
 static gboolean
-timer_sigwinch(G_GNUC_UNUSED gpointer data)
+sigwinch_event(G_GNUC_UNUSED GIOChannel *source,
+               G_GNUC_UNUSED GIOCondition condition, 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
-          important. */
+       char ignoreme[64];
+       if (1 > read(sigwinch_pipes[0], ignoreme, 64))
+               exit(EXIT_FAILURE);
 
        endwin();
        refresh();
        screen_resize(mpd);
 
-       return FALSE;
+       return TRUE;
 }
 
 static void
 catch_sigwinch(G_GNUC_UNUSED int sig)
 {
-       if (timer_sigwinch_id != 0)
-               g_source_remove(timer_sigwinch_id);
-
-       timer_sigwinch_id = g_timeout_add(100, timer_sigwinch, NULL);
+       char irrelevant = 'a';
+       if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
+               exit(EXIT_FAILURE);
 }
+#endif /* WIN32 */
 
 static void
 idle_callback(enum mpd_error error,
@@ -238,7 +242,7 @@ settings_name(const struct mpd_settings *settings)
 {
        const char *host = mpd_settings_get_host(settings);
        if (host == NULL)
-               host = "unknown";
+               host = _("unknown");
 
        if (host[0] == '/')
                return g_strdup(host);
@@ -260,14 +264,19 @@ default_settings_name(void)
                mpd_settings_new(options.host, options.port, 0,
                                 NULL, options.password);
        if (settings == NULL)
-               return g_strdup("unknown");
+               return g_strdup(_("unknown"));
 
        char *name = settings_name(settings);
        mpd_settings_free(settings);
 
        return name;
 #else
-       return g_strdup(options.host);
+       /*
+        * localhost is actually not correct, we only know that
+        * mpd_connection_new() has connected to the "default host".
+        */
+       const char *name = options.host ?: "localhost";
+       return g_strdup(name);
 #endif
 }
 
@@ -278,12 +287,13 @@ connection_settings_name(const struct mpd_connection *connection)
        const struct mpd_settings *settings =
                mpd_connection_get_settings(connection);
        if (settings == NULL)
-               return g_strdup("unknown");
+               return g_strdup(_("unknown"));
 
        return settings_name(settings);
 #else
        (void)connection;
-       return g_strdup(options.host);
+
+       return default_settings_name();
 #endif
 }
 
@@ -310,7 +320,7 @@ timer_reconnect(G_GNUC_UNUSED gpointer data)
        mpdclient_disconnect(mpd);
        success = mpdclient_connect(mpd,
                                    options.host, options.port,
-                                   1.5,
+                                   5000,
                                    options.password);
        if (!success) {
                /* try again in 5 seconds */
@@ -350,9 +360,7 @@ timer_reconnect(G_GNUC_UNUSED gpointer data)
        doupdate();
 
        /* update immediately */
-       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;
+       mpd->events = MPD_IDLE_ALL;
 
        do_mpd_update();
 
@@ -372,7 +380,7 @@ check_reconnect(void)
 
 /**
  * This function is called by the gidle.c library when MPD sends us an
- * idle event (or when the connectiond dies).
+ * idle event (or when the connection dies).
  */
 static void
 idle_callback(enum mpd_error error, enum mpd_server_error server_error,
@@ -380,12 +388,10 @@ idle_callback(enum mpd_error error, enum mpd_server_error server_error,
              void *ctx)
 {
        struct mpdclient *c = ctx;
-       struct mpd_connection *connection;
 
        c->idle = false;
 
-       connection = mpdclient_get_connection(c);
-       assert(connection != NULL);
+       assert(mpdclient_is_connected(c));
 
        if (error != MPD_ERROR_SUCCESS) {
                char *allocated;
@@ -536,8 +542,13 @@ timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
 int
 main(int argc, const char *argv[])
 {
+#ifndef WIN32
        struct sigaction act;
+#endif
 #ifdef ENABLE_LOCALE
+#ifndef ENABLE_NLS
+       G_GNUC_UNUSED
+#endif
        const char *charset = NULL;
 #endif
        GIOChannel *keyboard_channel;
@@ -545,6 +556,7 @@ main(int argc, const char *argv[])
        int lirc_socket;
        GIOChannel *lirc_channel = NULL;
 #endif
+       GIOChannel *sigwinch_channel = NULL;
 
 #ifdef ENABLE_LOCALE
        /* time and date formatting */
@@ -585,6 +597,7 @@ main(int argc, const char *argv[])
        /* parse command line options - 2 pass */
        options_parse(argc, argv);
 
+#ifndef WIN32
        /* setup signal behavior - SIGINT */
        sigemptyset(&act.sa_mask);
        act.sa_flags = 0;
@@ -634,6 +647,7 @@ main(int argc, const char *argv[])
                perror("sigaction(SIGPIPE)");
                exit(EXIT_FAILURE);
        }
+#endif
 
        ncu_init();
 
@@ -663,6 +677,18 @@ main(int argc, const char *argv[])
        }
 #endif
 
+#ifndef WIN32
+       if (!pipe(sigwinch_pipes) &&
+               !fcntl(sigwinch_pipes[1], F_SETFL, O_NONBLOCK)) {
+               sigwinch_channel = g_io_channel_unix_new(sigwinch_pipes[0]);
+               g_io_add_watch(sigwinch_channel, G_IO_IN, sigwinch_event, NULL);
+       }
+       else {
+               perror("sigwinch pipe creation failed");
+               exit(EXIT_FAILURE);
+       }
+#endif
+
        /* attempt to connect */
        reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);
 
@@ -692,6 +718,9 @@ main(int argc, const char *argv[])
 
        g_main_loop_unref(main_loop);
        g_io_channel_unref(keyboard_channel);
+       g_io_channel_unref(sigwinch_channel);
+       close(sigwinch_pipes[0]);
+       close(sigwinch_pipes[1]);
 
 #ifdef ENABLE_LIRC
        if (lirc_socket >= 0)