![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/main.c b/src/main.c
index 34fa355379c8677ccf6f9ed8f66cd302cdafec0d..33678eecb9c05c76367b76c23bc0459cbb7a8270 100644 (file)
--- a/src/main.c
+++ b/src/main.c
/* 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.
-*/
+ */
#include "config.h"
#include "ncmpc.h"
#include "ncu.h"
#include "screen.h"
#include "screen_utils.h"
-#include "screen_message.h"
+#include "screen_status.h"
#include "strfsong.h"
#include "i18n.h"
#include "player_command.h"
#include <stdlib.h>
#include <unistd.h>
+#include <fcntl.h>
#include <signal.h>
#include <string.h>
#include <locale.h>
#endif
-/* time between mpd updates [s] */
+/* time between mpd updates [ms] */
static const guint update_interval = 500;
#define BUFSIZE 1024
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;
}
}
+#ifndef WIN32
static void
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,
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.
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, false));
+ g_free(name);
doupdate();
mpdclient_disconnect(mpd);
success = mpdclient_connect(mpd,
options.host, options.port,
- 1.5,
+ options.timeout_ms,
options.password);
if (!success) {
/* try again in 5 seconds */
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(connection, 0, 12, 0) < 0) {
+ /* quit if mpd is pre 0.14 - song id not supported by mpd */
+ if (mpd_connection_cmp_server_version(connection, 0, 16, 0) < 0) {
const unsigned *version =
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");
+ "0.16.0");
mpdclient_disconnect(mpd);
doupdate();
}
#endif
- if (mpd_connection_cmp_server_version(connection,
- 0, 14, 0) >= 0)
- mpd->source = mpd_glib_new(connection,
- idle_callback, mpd);
+ mpd->source = mpd_glib_new(connection,
+ idle_callback, mpd);
- screen_status_printf(_("Connected to %s"),
- options.host != NULL
- ? options.host : "localhost");
+ 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();
/**
* 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,
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;
doupdate();
mpdclient_disconnect(c);
+ screen_update(mpd);
reconnect_source_id = g_timeout_add(1000, timer_reconnect,
NULL);
return;
and this is a hint for the user what to press to correct
that */
g_snprintf(comment, sizeof(comment), _("press %s for the key editor"),
- get_key_names(CMD_SCREEN_KEYDEF, 0));
+ get_key_names(CMD_SCREEN_KEYDEF, false));
g_strlcat(buf, comment, sizeof(buf));
g_strlcat(buf, ")", sizeof(buf));
#endif
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;
int lirc_socket;
GIOChannel *lirc_channel = NULL;
#endif
+ GIOChannel *sigwinch_channel = NULL;
#ifdef ENABLE_LOCALE
/* time and date formatting */
/* parse command line options - 2 pass */
options_parse(argc, argv);
+#ifndef WIN32
/* setup signal behavior - SIGINT */
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
perror("sigaction(SIGPIPE)");
exit(EXIT_FAILURE);
}
+#endif
ncu_init();
}
#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);
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)