X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_outputs.c;h=888aa34f1f9edcbb970564e173f746443e5809db;hb=8ba6b8463c9b53bcd6b05574d639eb9ac099a37a;hp=7f64bd0fc49a919ce2126ee3aa7c531905175a81;hpb=94a8c60f3df33e42df79cd33822bfe5074b56afa;p=ncmpc.git

diff --git a/src/screen_outputs.c b/src/screen_outputs.c
index 7f64bd0..888aa34 100644
--- a/src/screen_outputs.c
+++ b/src/screen_outputs.c
@@ -1,26 +1,27 @@
 /* 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 "screen_outputs.h"
 #include "screen_interface.h"
+#include "screen_status.h"
+#include "paint.h"
 #include "i18n.h"
-#include "screen.h"
 #include "list_window.h"
 #include "mpdclient.h"
 
@@ -29,7 +30,7 @@
 #include <glib.h>
 #include <assert.h>
 
-static list_window_t *lw = NULL;
+static struct list_window *lw;
 
 static GPtrArray *mpd_outputs = NULL;
 
@@ -46,6 +47,7 @@ outputs_repaint(void)
 static bool
 toggle_output(struct mpdclient *c, unsigned int output_index)
 {
+	struct mpd_connection *connection;
 	struct mpd_output *output;
 
 	assert(mpd_outputs != NULL);
@@ -53,10 +55,14 @@ toggle_output(struct mpdclient *c, unsigned int output_index)
 	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)) {
-		if (!mpd_run_enable_output(c->connection,
+		if (!mpd_run_enable_output(connection,
 					   mpd_output_get_id(output))) {
 			mpdclient_handle_error(c);
 			return false;
@@ -67,7 +73,7 @@ toggle_output(struct mpdclient *c, unsigned int output_index)
 		screen_status_printf(_("Output '%s' enabled"),
 				     mpd_output_get_name(output));
 	} else {
-		if (!mpd_run_disable_output(c->connection,
+		if (!mpd_run_disable_output(connection,
 					    mpd_output_get_id(output))) {
 			mpdclient_handle_error(c);
 			return false;
@@ -98,44 +104,35 @@ 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
 fill_outputs_list(struct mpdclient *c)
 {
+	struct mpd_connection *connection;
 	struct mpd_output *output;
 
 	assert(mpd_outputs != NULL);
 
-	if (c->connection == NULL)
+	connection = mpdclient_get_connection(c);
+	if (connection == NULL) {
+		list_window_set_length(lw, 0);
 		return;
+	}
 
-	mpd_send_outputs(c->connection);
-	while ((output = mpd_recv_output(c->connection)) != NULL) {
+	mpd_send_outputs(connection);
+	while ((output = mpd_recv_output(connection)) != NULL) {
 		g_ptr_array_add(mpd_outputs, output);
 	}
 
-	if (!mpd_response_finish(c->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);
+	mpdclient_finish_command(c);
 
-	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
@@ -149,8 +146,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
@@ -179,10 +175,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
@@ -200,7 +214,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;
 	}
@@ -230,7 +244,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,
 };