main: move signal handlers to signals.c

[ncmpc.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 85548bec1ebaa6376f01f52dd228713bfc08abda..c242da922e97e715ac88a27856f51d04e042c1a9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -31,7 +31,9 @@
 #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"
@@ -61,7 +63,6 @@ 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;
@@ -87,52 +88,6 @@ update_xterm_title(void)
 }
 #endif
 
-#ifndef WIN32
-static void
-catch_sigint(gcc_unused int sig)
-{
-       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 */
-}
-
-static gboolean
-sigwinch_event(gcc_unused GIOChannel *source,
-               gcc_unused GIOCondition condition, gcc_unused gpointer data)
-{
-       char ignoreme[64];
-       if (1 > read(sigwinch_pipes[0], ignoreme, 64))
-               exit(EXIT_FAILURE);
-
-       endwin();
-       refresh();
-       screen_resize(mpd);
-
-       return TRUE;
-}
-
-static void
-catch_sigwinch(gcc_unused int sig)
-{
-       if (1 != write(sigwinch_pipes[1], "", 1))
-               exit(EXIT_FAILURE);
-}
-#endif /* WIN32 */
-
 static gboolean
 timer_mpd_update(gpointer data);
 
@@ -361,11 +316,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 +330,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
@@ -476,59 +416,6 @@ main(int argc, const char *argv[])
        /* parse command line options - 2 pass */
        options_parse(argc, argv);
 
-#ifndef WIN32
-       /* setup signal behavior - SIGINT */
-       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;
-       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);
-       }
-#endif
-
        ncu_init();
 
 #ifdef ENABLE_LYRICS_SCREEN
@@ -545,25 +432,12 @@ 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();
 
-#ifndef WIN32
-       if (!pipe(sigwinch_pipes) &&
-               !fcntl(sigwinch_pipes[1], F_SETFL, O_NONBLOCK)) {
-               GIOChannel *sigwinch_channel = g_io_channel_unix_new(sigwinch_pipes[0]);
-               g_io_add_watch(sigwinch_channel, G_IO_IN, sigwinch_event, NULL);
-               g_io_channel_unref(sigwinch_channel);
-       }
-       else {
-               perror("sigwinch pipe creation failed");
-               exit(EXIT_FAILURE);
-       }
-#endif
+       signals_init(main_loop, mpd);
 
        /* attempt to connect */
        reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);
@@ -593,9 +467,7 @@ main(int argc, const char *argv[])
                g_source_remove(check_key_bindings_source_id);
 #endif
 
-       close(sigwinch_pipes[0]);
-       close(sigwinch_pipes[1]);
-
+       signals_deinit();
        ncmpc_lirc_deinit();
 
        screen_exit();