main: use g_unix_signal_add() for SIGTERM, SIGINT and SIGHUP

[ncmpc.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 85548bec1ebaa6376f01f52dd228713bfc08abda..214478e39ded84a53a3ac96591888e7f96c0d19c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -31,6 +31,7 @@
 #include "strfsong.h"
 #include "i18n.h"
 #include "player_command.h"
+#include "keyboard.h"
 #include "lirc.h"
 
 #ifndef NCMPC_MINI
@@ -43,6 +44,10 @@
 
 #include <mpd/client.h>
 
+#ifndef WIN32
+#include <glib-unix.h>
+#endif
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -88,26 +93,11 @@ update_xterm_title(void)
 #endif
 
 #ifndef WIN32
-static void
-catch_sigint(gcc_unused int sig)
+static gboolean
+handle_quit_signal(gcc_unused gpointer data)
 {
        g_main_loop_quit(main_loop);
-}
-
-
-static void
-catch_sigcont(gcc_unused int sig)
-{
-       if (1 != write(sigwinch_pipes[1], "", 1))
-               exit(EXIT_FAILURE);
-}
-
-void
-sigstop(void)
-{
-       def_prog_mode();  /* save the tty modes */
-       endwin();         /* end curses mode temporarily */
-       kill(0, SIGSTOP); /* issue SIGSTOP */
+       return false;
 }
 
 static gboolean
@@ -361,11 +351,12 @@ void end_input_event(void)
        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);
@@ -374,23 +365,7 @@ int do_input_event(command_t cmd)
                /* make sure we don't update the volume yet */
                disable_update_timer();
 
-       return 0;
-}
-
-static gboolean
-keyboard_event(gcc_unused GIOChannel *source,
-              gcc_unused GIOCondition condition,
-              gcc_unused gpointer data)
-{
-       begin_input_event();
-
-       command_t cmd = get_keyboard_command();
-       if (cmd != CMD_NONE)
-               if (do_input_event(cmd) != 0)
-                       return FALSE;
-
-       end_input_event();
-       return TRUE;
+       return true;
 }
 
 #ifndef NCMPC_MINI
@@ -477,40 +452,23 @@ main(int argc, const char *argv[])
        options_parse(argc, argv);
 
 #ifndef WIN32
-       /* setup signal behavior - SIGINT */
+       /* setup quit signals */
+       g_unix_signal_add(SIGTERM, handle_quit_signal, NULL);
+       g_unix_signal_add(SIGINT, handle_quit_signal, NULL);
+       g_unix_signal_add(SIGHUP, handle_quit_signal, NULL);
+
+       /* setup signal behavior - SIGCONT */
+
        struct sigaction act;
        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;
+       act.sa_handler = catch_sigwinch;
        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;
@@ -545,9 +503,7 @@ main(int argc, const char *argv[])
        main_loop = g_main_loop_new(NULL, FALSE);
 
        /* watch out for keyboard input */
-       GIOChannel *keyboard_channel = g_io_channel_unix_new(STDIN_FILENO);
-       g_io_add_watch(keyboard_channel, G_IO_IN, keyboard_event, NULL);
-       g_io_channel_unref(keyboard_channel);
+       keyboard_init();
 
        /* watch out for lirc input */
        ncmpc_lirc_init();