![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/main.c b/src/main.c
index 12bee3d733a2e9733ab27f8a8feb37c4079500e5..eccb5a004c8a114f98966270447278dcbdbf439d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
#include "command.h"
#include "ncu.h"
#include "screen.h"
-#include "screen_utils.h"
#include "screen_status.h"
+#include "xterm_title.h"
#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"
#include "lyrics.h"
#endif
-#ifdef ENABLE_LIRC
-#include "lirc.h"
-#endif
-
#include <mpd/client.h>
#include <stdlib.h>
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;
const struct mpd_song *song = mpd->song;
char tmp[BUFSIZE];
+ const char *new_title = NULL;
if (options.xterm_title_format && mpd->playing && song)
- strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
- else
- g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
+ new_title = strfsong(tmp, BUFSIZE, options.xterm_title_format, song) > 0
+ ? tmp
+ : NULL;
+
+ if (new_title == NULL)
+ new_title = PACKAGE " version " VERSION;
static char title[BUFSIZE];
- if (strncmp(title, tmp, BUFSIZE)) {
- g_strlcpy(title, tmp, BUFSIZE);
- set_xterm_title("%s", title);
+ if (strncmp(title, new_title, BUFSIZE)) {
+ g_strlcpy(title, new_title, BUFSIZE);
+ set_xterm_title(title);
}
}
#endif
-static void
-exit_and_cleanup(void)
-{
- screen_exit();
-#ifndef NCMPC_MINI
- set_xterm_title("");
-#endif
- printf("\n");
-
- mpdclient_free(mpd);
-}
-
-#ifndef WIN32
-static void
-catch_sigint(gcc_unused int sig)
-{
- g_main_loop_quit(main_loop);
-}
-
-
-static void
-catch_sigcont(gcc_unused int sig)
-{
- char irrelevant = 'a';
- if (1 != write(sigwinch_pipes[1], &irrelevant, 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);
static bool
should_enable_update_timer(void)
{
- return mpd->playing
-#ifndef NCMPC_MINI
- || options.display_time
-#endif
- ;
+ return mpd->playing;
}
static void
disable_update_timer();
}
-static void
-check_reconnect(void);
-
static void
do_mpd_update(void)
{
screen_update(mpd);
mpd->events = 0;
-
- mpdclient_put_connection(mpd);
- check_reconnect();
-}
-
-static char *
-settings_name(const struct mpd_settings *settings)
-{
- const char *host = mpd_settings_get_host(settings);
- if (host == NULL)
- host = _("unknown");
-
- if (host[0] == '/')
- return g_strdup(host);
-
- unsigned port = mpd_settings_get_port(settings);
- if (port == 0 || port == 6600)
- return g_strdup(host);
-
- return g_strdup_printf("%s:%u", host, port);
-}
-
-static char *
-default_settings_name(void)
-{
- struct mpd_settings *settings =
- mpd_settings_new(options.host, options.port, 0,
- NULL, options.password);
- if (settings == NULL)
- return g_strdup(_("unknown"));
-
- char *name = settings_name(settings);
- mpd_settings_free(settings);
-
- return name;
}
/**
reconnect_source_id = 0;
- char *name = default_settings_name();
+ char *name = mpdclient_settings_name(mpd);
screen_status_printf(_("Connecting to %s... [Press %s to abort]"),
name, get_key_names(CMD_QUIT, false));
g_free(name);
doupdate();
- mpdclient_disconnect(mpd);
- mpdclient_connect(mpd, options.host, options.port,
- options.timeout_ms,
- options.password);
+ mpdclient_connect(mpd);
return FALSE;
}
-static void
-check_reconnect(void)
-{
- if (mpdclient_is_dead(mpd) && reconnect_source_id == 0)
- /* reconnect when the connection is lost */
- reconnect_source_id = g_timeout_add(1000, timer_reconnect,
- NULL);
-}
-
void
mpdclient_connected_callback(void)
{
doupdate();
/* try again after 30 seconds */
- reconnect_source_id = g_timeout_add(30000,
- timer_reconnect, NULL);
+ reconnect_source_id =
+ g_timeout_add_seconds(30, timer_reconnect, NULL);
return;
}
#endif
assert(reconnect_source_id == 0);
/* try again in 5 seconds */
- reconnect_source_id = g_timeout_add(5000,
- timer_reconnect, NULL);
+ reconnect_source_id = g_timeout_add_seconds(5, timer_reconnect, NULL);
}
void
screen_update(mpd);
- reconnect_source_id = g_timeout_add(1000, timer_reconnect, NULL);
+ reconnect_source_id = g_timeout_add_seconds(1, timer_reconnect, NULL);
}
/**
screen_update(mpd);
mpd->events = 0;
- mpdclient_put_connection(mpd);
- check_reconnect();
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);
/* make sure we don't update the volume yet */
disable_update_timer();
- return 0;
+ return true;
}
-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;
+#ifdef HAVE_GETMOUSE
- end_input_event();
- return TRUE;
+void
+do_mouse_event(int x, int y, mmask_t bstate)
+{
+ screen_mouse(mpd, x, y, bstate);
}
+#endif
+
#ifndef NCMPC_MINI
/**
* Check the configured key bindings for errors, and display a status
/* 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
#endif
/* create mpdclient instance */
- mpd = mpdclient_new();
+ mpd = mpdclient_new(options.host, options.port,
+ options.timeout_ms,
+ options.password);
/* initialize curses */
screen_init(mpd);
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);
+ keyboard_init();
-#ifdef ENABLE_LIRC
/* watch out for lirc input */
- int lirc_socket = ncmpc_lirc_open();
- GIOChannel *lirc_channel = NULL;
- 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
+ ncmpc_lirc_init();
-#ifndef WIN32
- GIOChannel *sigwinch_channel = NULL;
- 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
+ signals_init(main_loop, mpd);
/* attempt to connect */
- reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);
+ reconnect_source_id = g_idle_add(timer_reconnect, NULL);
auto_update_timer();
#ifndef NCMPC_MINI
- check_key_bindings_source_id = g_timeout_add(10000, timer_check_key_bindings, NULL);
+ check_key_bindings_source_id =
+ g_timeout_add_seconds(10, timer_check_key_bindings, NULL);
#endif
- screen_paint(mpd);
+ screen_paint(mpd, true);
g_main_loop_run(main_loop);
+ g_main_loop_unref(main_loop);
/* cleanup */
g_source_remove(check_key_bindings_source_id);
#endif
- 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)
- g_io_channel_unref(lirc_channel);
- ncmpc_lirc_close();
+ signals_deinit();
+ ncmpc_lirc_deinit();
+
+ screen_exit();
+#ifndef NCMPC_MINI
+ set_xterm_title("");
#endif
+ printf("\n");
- exit_and_cleanup();
+ mpdclient_free(mpd);
#ifdef ENABLE_LYRICS_SCREEN
lyrics_deinit();