X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_outputs.c;h=67cc4b86fbc0073e0d986f19e95b8f0d71d373cf;hb=bf5fc85f37af5698d477edc5dae250bf8984ed00;hp=1d60bae6feedf2cc66213315d1879018f5b0a884;hpb=fca2567482e65fe3bf3bc9f04015fab6ea27a692;p=ncmpc.git diff --git a/src/screen_outputs.c b/src/screen_outputs.c index 1d60bae..67cc4b8 100644 --- a/src/screen_outputs.c +++ b/src/screen_outputs.c @@ -1,25 +1,26 @@ /* ncmpc (Ncurses MPD Client) - * (c) 2004-2009 The Music Player Daemon Project + * (c) 2004-2017 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_message.h" +#include "screen_status.h" +#include "paint.h" #include "i18n.h" #include "list_window.h" #include "mpdclient.h" @@ -29,34 +30,26 @@ #include #include -static list_window_t *lw = NULL; +static struct list_window *lw; static GPtrArray *mpd_outputs = NULL; -static void -outputs_paint(void); - -static void -outputs_repaint(void) -{ - outputs_paint(); - wrefresh(lw->w); -} - static bool toggle_output(struct mpdclient *c, unsigned int output_index) { - struct mpd_output *output; - assert(mpd_outputs != NULL); if (output_index >= mpd_outputs->len) return false; - output = g_ptr_array_index(mpd_outputs, output_index); + struct mpd_connection *connection = mpdclient_get_connection(c); + if (connection == NULL) + return false; + struct mpd_output *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 +60,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; @@ -83,7 +76,7 @@ toggle_output(struct mpdclient *c, unsigned int output_index) } static void -clear_output_element(gpointer data, G_GNUC_UNUSED gpointer user_data) +clear_output_element(gpointer data, gcc_unused gpointer user_data) { mpd_output_free(data); } @@ -98,48 +91,38 @@ 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_output *output; - assert(mpd_outputs != NULL); - if (!mpdclient_is_connected(c)) + struct mpd_connection *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) { - g_ptr_array_add(mpd_outputs, output); } - if (!mpd_response_finish(c->connection)) - mpdclient_handle_error(c); -} + mpd_send_outputs(connection); -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; + while ((output = mpd_recv_output(connection)) != NULL) { + g_ptr_array_add(mpd_outputs, 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; + mpdclient_finish_command(c); - return mpd_output_get_name(output); + list_window_set_length(lw, mpd_outputs->len); } static void -outputs_init(WINDOW *w, int cols, int rows) +outputs_init(WINDOW *w, unsigned cols, unsigned rows) { lw = list_window_init(w, cols, rows); @@ -147,10 +130,9 @@ outputs_init(WINDOW *w, int cols, int rows) } static void -outputs_resize(int cols, int rows) +outputs_resize(unsigned cols, unsigned rows) { - lw->cols = cols; - lw->rows = rows; + list_window_resize(lw, cols, rows); } static void @@ -174,15 +156,33 @@ outputs_close(void) } static const char * -outputs_title(G_GNUC_UNUSED char *str, G_GNUC_UNUSED size_t size) +outputs_title(gcc_unused char *str, gcc_unused size_t size) { return _("Outputs"); } +static void +screen_outputs_paint_callback(WINDOW *w, unsigned i, + gcc_unused unsigned y, unsigned width, + bool selected, gcc_unused const 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 @@ -191,7 +191,7 @@ screen_outputs_update(struct mpdclient *c) if (c->events & MPD_IDLE_OUTPUT) { clear_outputs_list(); fill_outputs_list(c); - outputs_repaint(); + outputs_paint(); } } @@ -200,8 +200,8 @@ outputs_cmd(struct mpdclient *c, command_t cmd) { assert(mpd_outputs != NULL); - if (list_window_cmd(lw, mpd_outputs->len, cmd)) { - outputs_repaint(); + if (list_window_cmd(lw, cmd)) { + outputs_paint(); return true; } @@ -213,7 +213,7 @@ outputs_cmd(struct mpdclient *c, command_t cmd) case CMD_SCREEN_UPDATE: clear_outputs_list(); fill_outputs_list(c); - outputs_repaint(); + outputs_paint(); return true; default: @@ -230,7 +230,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, };