diff --git a/src/main.c b/src/main.c
index 88660de05842e12fc4258c58da3a45f13547bb70..eccb5a004c8a114f98966270447278dcbdbf439d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
mpd->events = 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);
-}
-
-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;
-}
-
/**
* 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();
+ 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);
return true;
}
+#ifdef HAVE_GETMOUSE
+
+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
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);