X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_outputs.c;h=98c4d9cbe5db08d507e8085d6e6a299e6fb4d5e4;hb=a7ab2fcf9d02b39436e71a7a207bd13fd515958c;hp=4857e489297f71f8c52e9b65427fee3f4ee30f9a;hpb=b398de1a003fafd0b140dbe82f543f515102fed4;p=ncmpc.git

diff --git a/src/screen_outputs.c b/src/screen_outputs.c
index 4857e48..98c4d9c 100644
--- a/src/screen_outputs.c
+++ b/src/screen_outputs.c
@@ -1,5 +1,5 @@
 /* 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
@@ -19,7 +19,8 @@
 
 #include "screen_outputs.h"
 #include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
+#include "paint.h"
 #include "i18n.h"
 #include "list_window.h"
 #include "mpdclient.h"
@@ -51,11 +52,13 @@ toggle_output(struct mpdclient *c, unsigned int output_index)
 
 	assert(mpd_outputs != NULL);
 
-	if (!mpdclient_is_connected(c) ||
-	    output_index >= mpd_outputs->len)
+	if (output_index >= mpd_outputs->len)
 		return false;
 
 	connection = mpdclient_get_connection(c);
+	if (connection == NULL)
+		return false;
+
 	output = g_ptr_array_index(mpd_outputs, output_index);
 
 	if (!mpd_output_get_enabled(output)) {
@@ -101,6 +104,11 @@ clear_outputs_list(void)
 
 	g_ptr_array_foreach(mpd_outputs, clear_output_element, NULL);
 	g_ptr_array_remove_range(mpd_outputs, 0, mpd_outputs->len);
+
+	/* not updating the list_window length here, because that
+	   would clear the cursor position, and fill_outputs_list()
+	   will be called after this function anyway */
+	/* list_window_set_length(lw, 0); */
 }
 
 static void
@@ -111,10 +119,12 @@ fill_outputs_list(struct mpdclient *c)
 
 	assert(mpd_outputs != NULL);
 
-	if (!mpdclient_is_connected(c))
+	connection = mpdclient_get_connection(c);
+	if (connection == NULL) {
+		list_window_set_length(lw, 0);
 		return;
+	}
 
-	connection = mpdclient_get_connection(c);
 	mpd_send_outputs(connection);
 	while ((output = mpd_recv_output(connection)) != NULL) {
 		g_ptr_array_add(mpd_outputs, output);
@@ -122,25 +132,8 @@ fill_outputs_list(struct mpdclient *c)
 
 	if (!mpd_response_finish(connection))
 		mpdclient_handle_error(c);
-}
-
-static const char *
-outputs_list_callback(unsigned int output_index, bool *highlight,
-		      G_GNUC_UNUSED char **sc, G_GNUC_UNUSED void *data)
-{
-	struct mpd_output *output;
-
-	assert(mpd_outputs != NULL);
 
-	if (output_index >= mpd_outputs->len)
-		return NULL;
-
-	output = g_ptr_array_index(mpd_outputs, output_index);
-
-	if (mpd_output_get_enabled(output))
-		*highlight = true;
-
-	return mpd_output_get_name(output);
+	list_window_set_length(lw, mpd_outputs->len);
 }
 
 static void
@@ -154,8 +147,7 @@ outputs_init(WINDOW *w, int cols, int rows)
 static void
 outputs_resize(int cols, int rows)
 {
-	lw->cols = cols;
-	lw->rows = rows;
+	list_window_resize(lw, cols, rows);
 }
 
 static void
@@ -184,10 +176,28 @@ outputs_title(G_GNUC_UNUSED char *str, G_GNUC_UNUSED size_t size)
 	return _("Outputs");
 }
 
+static void
+screen_outputs_paint_callback(WINDOW *w, unsigned i,
+			      G_GNUC_UNUSED unsigned y, unsigned width,
+			      bool selected, G_GNUC_UNUSED void *data)
+{
+	const struct mpd_output *output;
+
+	assert(mpd_outputs != NULL);
+	assert(i < mpd_outputs->len);
+
+	output = g_ptr_array_index(mpd_outputs, i);
+
+	row_color(w, COLOR_LIST, selected);
+	waddstr(w, mpd_output_get_enabled(output) ? "[X] " : "[ ] ");
+	waddstr(w, mpd_output_get_name(output));
+	row_clear_to_eol(w, width, selected);
+}
+
 static void
 outputs_paint(void)
 {
-	list_window_paint(lw, outputs_list_callback, NULL);
+	list_window_paint2(lw, screen_outputs_paint_callback, NULL);
 }
 
 static void
@@ -205,7 +215,7 @@ outputs_cmd(struct mpdclient *c, command_t cmd)
 {
 	assert(mpd_outputs != NULL);
 
-	if (list_window_cmd(lw, mpd_outputs->len, cmd)) {
+	if (list_window_cmd(lw, cmd)) {
 		outputs_repaint();
 		return true;
 	}
@@ -235,7 +245,7 @@ const struct screen_functions screen_outputs = {
 	.close     = outputs_close,
 	.resize    = outputs_resize,
 	.paint     = outputs_paint,
-	.update = screen_outputs_update,
+	.update    = screen_outputs_update,
 	.cmd       = outputs_cmd,
 	.get_title = outputs_title,
 };