X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmain.c;h=1e7caeea8444a346c003466851c80ab3f254c5fa;hb=44c4e177bf52c70f307d6d528fb62b5c9176a3aa;hp=8669b6358bda9dcf87617790a99f8793f814add2;hpb=864295fc334f8887f2c17b484bca126f81b7f901;p=ncmpc.git diff --git a/src/main.c b/src/main.c index 8669b63..1e7caee 100644 --- a/src/main.c +++ b/src/main.c @@ -1,17 +1,17 @@ /* ncmpc (Ncurses MPD Client) - * (c) 2004-2009 The Music Player Daemon Project + * (c) 2004-2010 The Music Player Daemon Project * Project homepage: http://musicpd.org - + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -20,6 +20,7 @@ #include "config.h" #include "ncmpc.h" #include "mpdclient.h" +#include "gidle.h" #include "charset.h" #include "options.h" #include "command.h" @@ -47,6 +48,7 @@ #include #include +#include #include #include @@ -54,7 +56,7 @@ #include #endif -/* time between mpd updates [s] */ +/* time between mpd updates [ms] */ static const guint update_interval = 500; #define BUFSIZE 1024 @@ -62,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; @@ -109,6 +112,7 @@ exit_and_cleanup(void) } } +#ifndef WIN32 static void catch_sigint(G_GNUC_UNUSED int sig) { @@ -119,41 +123,48 @@ 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 sigstop(void) { - def_prog_mode(); /* save the tty modes */ - endwin(); /* end curses mode temporarily */ - kill(0, SIGSTOP); /* issue SIGSTOP */ + def_prog_mode(); /* save the tty modes */ + endwin(); /* end curses mode temporarily */ + 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, + G_GNUC_UNUSED enum mpd_server_error server_error, + const char *message, enum mpd_idle events, + G_GNUC_UNUSED void *ctx); static gboolean timer_mpd_update(gpointer data); @@ -178,13 +189,38 @@ disable_update_timer(void) update_source_id = 0; } +static bool +should_enable_update_timer(void) +{ + return (mpdclient_is_connected(mpd) && + (mpd->source == NULL || /* "idle" not supported */ + (mpd->status != NULL && + mpd_status_get_state(mpd->status) == MPD_STATE_PLAY))) +#ifndef NCMPC_MINI + || options.display_time +#endif + ; +} + +static void +auto_update_timer(void) +{ + if (should_enable_update_timer()) + enable_update_timer(); + else + disable_update_timer(); +} + static void check_reconnect(void); static void do_mpd_update(void) { - if (mpdclient_is_connected(mpd)) + if (mpdclient_is_connected(mpd) && + (mpd->source == NULL || mpd->events != 0 || + (mpd->status != NULL && + mpd_status_get_state(mpd->status) == MPD_STATE_PLAY))) mpdclient_update(mpd); #ifndef NCMPC_MINI @@ -195,9 +231,72 @@ do_mpd_update(void) screen_update(mpd); mpd->events = 0; + mpdclient_put_connection(mpd); check_reconnect(); } +#if LIBMPDCLIENT_CHECK_VERSION(2,4,0) + +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); +} + +#endif + +static char * +default_settings_name(void) +{ +#if LIBMPDCLIENT_CHECK_VERSION(2,4,0) + 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; +#else + /* + * 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 +} + +static char * +connection_settings_name(const struct mpd_connection *connection) +{ +#if LIBMPDCLIENT_CHECK_VERSION(2,4,0) + const struct mpd_settings *settings = + mpd_connection_get_settings(connection); + if (settings == NULL) + return g_strdup(_("unknown")); + + return settings_name(settings); +#else + (void)connection; + + return default_settings_name(); +#endif +} + /** * This timer is installed when the connection to the MPD server is * broken. It tries to recover by reconnecting periodically. @@ -206,19 +305,22 @@ static gboolean timer_reconnect(G_GNUC_UNUSED gpointer data) { bool success; + struct mpd_connection *connection; assert(!mpdclient_is_connected(mpd)); reconnect_source_id = 0; + char *name = default_settings_name(); screen_status_printf(_("Connecting to %s... [Press %s to abort]"), - options.host, get_key_names(CMD_QUIT,0) ); + name, get_key_names(CMD_QUIT,0) ); + g_free(name); doupdate(); mpdclient_disconnect(mpd); success = mpdclient_connect(mpd, options.host, options.port, - 1.5, + 5000, options.password); if (!success) { /* try again in 5 seconds */ @@ -227,11 +329,13 @@ timer_reconnect(G_GNUC_UNUSED gpointer data) return FALSE; } + connection = mpdclient_get_connection(mpd); + #ifndef NCMPC_MINI /* quit if mpd is pre 0.11.0 - song id not supported by mpd */ - if (mpd_connection_cmp_server_version(mpd->connection, 0, 12, 0) < 0) { + if (mpd_connection_cmp_server_version(connection, 0, 12, 0) < 0) { const unsigned *version = - mpd_connection_get_server_version(mpd->connection); + mpd_connection_get_server_version(connection); screen_status_printf(_("Error: MPD version %d.%d.%d is to old (%s needed)"), version[0], version[1], version[2], "0.12.0"); @@ -245,18 +349,23 @@ timer_reconnect(G_GNUC_UNUSED gpointer data) } #endif - screen_status_printf(_("Connected to %s"), - options.host != NULL - ? options.host : "localhost"); + if (mpd_connection_cmp_server_version(connection, + 0, 14, 0) >= 0) + mpd->source = mpd_glib_new(connection, + idle_callback, mpd); + + name = connection_settings_name(connection); + screen_status_printf(_("Connected to %s"), name); + g_free(name); 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(); + auto_update_timer(); + return FALSE; } @@ -269,12 +378,77 @@ check_reconnect(void) NULL); } +/** + * This function is called by the gidle.c library when MPD sends us an + * idle event (or when the connection dies). + */ +static void +idle_callback(enum mpd_error error, enum mpd_server_error server_error, + const char *message, enum mpd_idle events, + void *ctx) +{ + struct mpdclient *c = ctx; + + c->idle = false; + + assert(mpdclient_is_connected(c)); + + if (error != MPD_ERROR_SUCCESS) { + char *allocated; + + if (error == MPD_ERROR_SERVER && + server_error == MPD_SERVER_ERROR_UNKNOWN_CMD) { + /* the "idle" command is not supported - fall + back to timer based polling */ + mpd_glib_free(c->source); + c->source = NULL; + auto_update_timer(); + return; + } + + if (error == MPD_ERROR_SERVER) + message = allocated = utf8_to_locale(message); + else + allocated = NULL; + screen_status_message(message); + g_free(allocated); + screen_bell(); + doupdate(); + + mpdclient_disconnect(c); + screen_update(mpd); + reconnect_source_id = g_timeout_add(1000, timer_reconnect, + NULL); + return; + } + + c->events |= events; + mpdclient_update(c); + +#ifndef NCMPC_MINI + if (options.enable_xterm_title) + update_xterm_title(); +#endif + + screen_update(mpd); + c->events = 0; + + mpdclient_put_connection(c); + check_reconnect(); + auto_update_timer(); +} + static gboolean timer_mpd_update(G_GNUC_UNUSED gpointer data) { do_mpd_update(); - return true; + if (should_enable_update_timer()) + return true; + else { + update_source_id = 0; + return false; + } } void begin_input_event(void) @@ -286,7 +460,9 @@ void end_input_event(void) screen_update(mpd); mpd->events = 0; + mpdclient_put_connection(mpd); check_reconnect(); + auto_update_timer(); } int do_input_event(command_t cmd) @@ -298,11 +474,9 @@ int do_input_event(command_t cmd) screen_cmd(mpd, cmd); - if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN) { + if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN) /* make sure we don't update the volume yet */ disable_update_timer(); - enable_update_timer(); - } return 0; } @@ -368,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; @@ -377,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 */ @@ -417,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; @@ -466,6 +647,7 @@ main(int argc, const char *argv[]) perror("sigaction(SIGPIPE)"); exit(EXIT_FAILURE); } +#endif ncu_init(); @@ -495,10 +677,22 @@ 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); - enable_update_timer(); + auto_update_timer(); #ifndef NCMPC_MINI check_key_bindings_source_id = g_timeout_add(10000, timer_check_key_bindings, NULL); @@ -524,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)