disobedience/disobedience.h: Declare variables as `extern'.

[disorder] / disobedience / control.c

diff --git a/disobedience/control.c b/disobedience/control.c
index 39bced1b46b82b9ccba33b7ed7c8d8a5eca02544..9153f33b1f5dfc55b0f20148a9ecc5411e1ec87c 100644 (file)
--- a/disobedience/control.c
+++ b/disobedience/control.c
@@ -1,21 +1,19 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2006-2009 Richard Kettlewell

  *
  *

- * This program is free software; you can redistribute it and/or modify
+ * 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
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or

  * (at your option) any later version.
  *
  * (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.
- *
+ * 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
  * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */
 /** @file disobedience/control.c
  * @brief Volume control and buttons
  */
 /** @file disobedience/control.c
  * @brief Volume control and buttons


@@ -25,27 +23,32 @@
 
 /* Forward declarations ---------------------------------------------------- */
 
 
 /* Forward declarations ---------------------------------------------------- */
 

-WT(adjustment);
-WT(hscale);
-WT(hbox);
-WT(button);
-WT(image);
-WT(label);
-WT(vbox);
-

 struct icon;
 
 struct icon;
 

-static void update_pause(const struct icon *);
-static void update_play(const struct icon *);
-static void update_scratch(const struct icon *);
-static void update_random_enable(const struct icon *);
-static void update_random_disable(const struct icon *);
-static void update_enable(const struct icon *);
-static void update_disable(const struct icon *);
-static void update_rtp(const struct icon *);
-static void update_nortp(const struct icon *);
-static void clicked_icon(GtkButton *, gpointer);
-
+static void clicked_icon(GtkToolButton *, gpointer);
+static void toggled_icon(GtkToggleToolButton *button,
+                         gpointer user_data);
+static void clicked_menu(GtkMenuItem *, gpointer userdata);
+static void toggled_menu(GtkCheckMenuItem *, gpointer userdata);
+
+static int enable_playing(disorder_eclient *c,
+                          disorder_eclient_no_response *completed,
+                          void *v);
+static int disable_playing(disorder_eclient *c,
+                           disorder_eclient_no_response *completed,
+                           void *v);
+static int enable_random(disorder_eclient *c,
+                         disorder_eclient_no_response *completed,
+                         void *v);
+static int disable_random(disorder_eclient *c,
+                          disorder_eclient_no_response *completed,
+                          void *v);
+static int pause_track(disorder_eclient *c,
+                       disorder_eclient_no_response *completed,
+                       void *v);
+static int resume_track(disorder_eclient *c,
+                        disorder_eclient_no_response *completed,
+                        void *v);

 static int enable_rtp(disorder_eclient *c,
                       disorder_eclient_no_response *completed,
                       void *v);
 static int enable_rtp(disorder_eclient *c,
                       disorder_eclient_no_response *completed,
                       void *v);


@@ -62,58 +65,221 @@ static void volume_adjusted(GtkAdjustment *a, gpointer user_data);
 static gchar *format_volume(GtkScale *scale, gdouble value);
 static gchar *format_balance(GtkScale *scale, gdouble value);
 
 static gchar *format_volume(GtkScale *scale, gdouble value);
 static gchar *format_balance(GtkScale *scale, gdouble value);
 

+static void icon_changed(const char *event,
+                         void *evendata,
+                         void *callbackdata);
+static void volume_changed(const char *event,
+                           void *eventdata,
+                           void *callbackdata);
+static void control_minimode(const char *event,
+                             void *eventdata,
+                             void *callbackdata);
+

 /* Control bar ------------------------------------------------------------- */
 
 /* Control bar ------------------------------------------------------------- */
 

-/** @brief Guard against feedback loop in volume control */
-static int suppress_set_volume;
+/** @brief Guard against feedback */
+int suppress_actions = 1;
+
+/** @brief Toolbar widget */
+static GtkWidget *toolbar;
+
+/** @brief Old state to restore on error
+ *
+ * Here's the problem we're trying to solve.  Suppose the user clicks the
+ * `pause' button.  Immediately, Gtk toggles the button's state.  There's also
+ * a menu item which is @i not yet updated, so we hack @c last_state and call
+ * icon_changed() by hand.  We send a `pause' command to the server.  If all is
+ * well, then we're done: we'll get a state update in the server log which will
+ * match what we're already doing and everything is fine.  If there's an error,
+ * though, we must put @c last_state back the way we found it since there will
+ * be no change reported in the server log to correct the wrong state
+ * information.  Also, we must untoggle the icon and menu items.
+ */
+static unsigned long restore_state;

 
 /** @brief Definition of an icon
  *
 
 /** @brief Definition of an icon
  *

- * The design here is rather mad: rather than changing the image displayed by
- * icons according to their state, we flip the visibility of pairs of icons.
+ * We have two kinds of icon:
+ * - action icons, which just do something but don't have a state as such
+ * - toggle icons, which toggle between two states ("on" and "off").
+ *
+ * The scratch button is an action icon; currently all the others are toggle
+ * icons.
+ *
+ * (All icons can be sensitive or insensitive, separately to the above.)

  */
 struct icon {
  */
 struct icon {

-  /** @brief Filename for image */
+  /** @brief TRUE to use GTK+ stock icons instead of filenames */
+  gboolean stock;
+
+  /** @brief TRUE for toggle buttons, FALSE for action buttons */
+  gboolean toggle;
+  
+  /** @brief Filename for image or stock string */

   const char *icon;
 
   const char *icon;
 

-  /** @brief Text for tooltip */
-  const char *tip;
+  /** @brief Text for 'on' tooltip */
+  const char *tip_on;
+
+  /** @brief Text for 'off' tooltip */
+  const char *tip_off;
+
+  /** @brief Associated menu item or NULL */
+  const char *menuitem;

 
 

-  /** @brief Called when button is clicked (activated) */
-  void (*clicked)(GtkButton *button, gpointer userdata);
+  /** @brief Label text */
+  const char *label;

 
 

-  /** @brief Called to update button when state may have changed */
-  void (*update)(const struct icon *i);
+  /** @brief Events that change this icon, separated by spaces */
+  const char *events;

 
 

-  /** @brief @ref eclient.h function to call */
-  int (*action)(disorder_eclient *c,
-                disorder_eclient_no_response *completed,
-                void *v);
+  /** @brief @ref eclient.h function to call to go from off to on
+   *
+   * For action buttons, this should be NULL.
+   */
+  int (*action_go_on)(disorder_eclient *c,
+                      disorder_eclient_no_response *completed,
+                      void *v);
+
+  /** @brief @ref eclient.h function to call to go from on to off
+   *
+   * For action buttons, this action is used.
+   */
+  int (*action_go_off)(disorder_eclient *c,
+                       disorder_eclient_no_response *completed,
+                       void *v);

 
 

+  /** @brief Get button state
+   * @return 1 for on, 0 for off
+   */
+  int (*on)(void);
+
+  /** @brief Get button sensitivity
+   * @return 1 for sensitive, 0 for insensitive
+   *
+   * Can be NULL for always sensitive.
+   */
+  int (*sensitive)(void);
+
+  /** @brief True if the menu item has inverse sense to the button */
+  gboolean menu_invert;
+  

   /** @brief Pointer to button */
   GtkWidget *button;
   /** @brief Pointer to button */
   GtkWidget *button;

+
+  /** @brief Pointer to menu item */
+  GtkWidget *item;
+
+  GtkWidget *image;

 };
 
 };
 

+static int pause_resume_on(void) {
+  return !!(last_state & DISORDER_TRACK_PAUSED);
+}
+
+static int pause_resume_sensitive(void) {
+  return playing_track
+    && !!(last_state & DISORDER_PLAYING)
+    && (last_rights & RIGHT_PAUSE);
+}
+
+static int scratch_sensitive(void) {
+  return !!(last_state & DISORDER_PLAYING)
+    && right_scratchable(last_rights, config->username, playing_track);
+}
+
+static int random_sensitive(void) {
+  return !!(last_rights & RIGHT_GLOBAL_PREFS);
+}
+
+static int random_enabled(void) {
+  return !!(last_state & DISORDER_RANDOM_ENABLED);
+}
+
+static int playing_sensitive(void) {
+  return !!(last_rights & RIGHT_GLOBAL_PREFS);
+}
+
+static int playing_enabled(void) {
+  return !!(last_state & DISORDER_PLAYING_ENABLED);
+}
+
+static int rtp_enabled(void) {
+  return rtp_is_running;
+}
+
+static int rtp_sensitive(void) {
+  return rtp_supported;
+}
+

 /** @brief Table of all icons */
 static struct icon icons[] = {
 /** @brief Table of all icons */
 static struct icon icons[] = {

-  { "pause.png", "Pause playing track", clicked_icon, update_pause,
-    disorder_eclient_pause, 0 },
-  { "play.png", "Resume playing track", clicked_icon, update_play,
-    disorder_eclient_resume, 0 },
-  { "cross.png", "Cancel playing track", clicked_icon, update_scratch,
-    disorder_eclient_scratch_playing, 0 },
-  { "random.png", "Enable random play", clicked_icon, update_random_enable,
-    disorder_eclient_random_enable, 0 },
-  { "randomcross.png", "Disable random play", clicked_icon, update_random_disable,
-    disorder_eclient_random_disable, 0 },
-  { "notes.png", "Enable play", clicked_icon, update_enable,
-    disorder_eclient_enable, 0 },
-  { "notescross.png", "Disable play", clicked_icon, update_disable,
-    disorder_eclient_disable, 0 },
-  { "speaker.png", "Play network stream", clicked_icon, update_rtp,
-    enable_rtp, 0 },
-  { "speakercross.png", "Stop playing network stream", clicked_icon, update_nortp,
-    disable_rtp, 0 },
+  {
+    .toggle = TRUE,
+    .stock = TRUE,
+    .icon = GTK_STOCK_MEDIA_PAUSE,
+    .label = "Pause",
+    .tip_on = "Resume playing track",
+    .tip_off = "Pause playing track",
+    .menuitem = "<GdisorderMain>/Control/Playing",
+    .on = pause_resume_on,
+    .sensitive = pause_resume_sensitive,
+    .action_go_on = pause_track,
+    .action_go_off = resume_track,
+    .events = "pause-changed playing-changed rights-changed playing-track-changed",
+    .menu_invert = TRUE,
+  },
+  {
+    .stock = TRUE,
+    .icon = GTK_STOCK_STOP,
+    .label = "Scratch",
+    .tip_on = "Cancel playing track",
+    .menuitem = "<GdisorderMain>/Control/Scratch",
+    .sensitive = scratch_sensitive,
+    .action_go_off = disorder_eclient_scratch_playing,
+    .events = "playing-track-changed rights-changed",
+  },
+  {
+    .toggle = TRUE,
+    .stock = FALSE,
+    .icon = "cards24.png",
+    .label = "Random",
+    .tip_on = "Disable random play",
+    .tip_off = "Enable random play",
+    .menuitem = "<GdisorderMain>/Control/Random play",
+    .on = random_enabled,
+    .sensitive = random_sensitive,
+    .action_go_on = enable_random,
+    .action_go_off = disable_random,
+    .events = "random-changed rights-changed",
+  },
+  {
+    .toggle = TRUE,
+    .stock = TRUE,
+    .icon = GTK_STOCK_MEDIA_PLAY,
+    .label = "Play",
+    .tip_on = "Disable play",
+    .tip_off = "Enable play",
+    .on = playing_enabled,
+    .sensitive = playing_sensitive,
+    .action_go_on = enable_playing,
+    .action_go_off = disable_playing,
+    .events = "enabled-changed rights-changed",
+  },
+  {
+    .toggle = TRUE,
+    .stock = TRUE,
+    .icon = GTK_STOCK_CONNECT,
+    .label = "RTP",
+    .tip_on = "Stop playing network stream",
+    .tip_off = "Play network stream",
+    .menuitem = "<GdisorderMain>/Control/Network player",
+    .on = rtp_enabled,
+    .sensitive = rtp_sensitive,
+    .action_go_on = enable_rtp,
+    .action_go_off = disable_rtp,
+    .events = "rtp-changed",
+  },

 };
 
 /** @brief Count of icons */
 };
 
 /** @brief Count of icons */


@@ -121,180 +287,227 @@ static struct icon icons[] = {
 
 static GtkAdjustment *volume_adj;
 static GtkAdjustment *balance_adj;
 
 static GtkAdjustment *volume_adj;
 static GtkAdjustment *balance_adj;

-
-/** @brief Called whenever last_state changes in any way */
-void control_monitor(void attribute((unused)) *u) {
-  int n;
-
-  D(("control_monitor"));
-  for(n = 0; n < NICONS; ++n)
-    icons[n].update(&icons[n]);
-}
+static GtkWidget *volume_widget;
+static GtkWidget *balance_widget;

 
 /** @brief Create the control bar */
 GtkWidget *control_widget(void) {
 
 /** @brief Create the control bar */
 GtkWidget *control_widget(void) {

-  GtkWidget *hbox = gtk_hbox_new(FALSE, 1), *vbox;
-  GtkWidget *content;
-  GdkPixbuf *pb;
-  GtkWidget *v, *b;
+  GtkWidget *hbox = gtk_hbox_new(FALSE, 1);

   int n;
 
   int n;
 

-  NW(hbox);

   D(("control_widget"));
   D(("control_widget"));

+  assert(mainmenufactory);              /* ordering must be right */
+  toolbar = gtk_toolbar_new();
+  /* Don't permit overflow arrow as otherwise the toolbar isn't greedy enough
+   * in asking for space.  The ideal is probably to make the volume and balance
+   * sliders hang down from the toolbar so it unavoidably gets the whole width
+   * of the window to play with. */
+  gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), FALSE);
+  if(full_mode) gtk_toolbar_unset_style(GTK_TOOLBAR(toolbar));
+  else gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);

   for(n = 0; n < NICONS; ++n) {
   for(n = 0; n < NICONS; ++n) {

-    NW(button);
-    icons[n].button = gtk_button_new();
-    if((pb = find_image(icons[n].icon))) {
-      NW(image);
-      content = gtk_image_new_from_pixbuf(pb);
+    struct icon *const icon = &icons[n];
+    icon->button = (icon->toggle
+                    ? GTK_WIDGET(gtk_toggle_tool_button_new())
+                    : GTK_WIDGET(gtk_tool_button_new(NULL, NULL)));
+    gtk_widget_set_style(icons[n].button, tool_style);
+    if(icons[n].stock) {
+      /* We'll use the stock icons for this one */
+      icon->image = gtk_image_new_from_stock(icons[n].icon,
+                                             GTK_ICON_SIZE_LARGE_TOOLBAR);

     } else {
     } else {

-      NW(label);
-      content = gtk_label_new(icons[n].icon);
+      /* Create the 'on' image */
+      icon->image = gtk_image_new_from_pixbuf(find_image(icons[n].icon));

     }
     }

-    gtk_container_add(GTK_CONTAINER(icons[n].button), content);
-    gtk_tooltips_set_tip(tips, icons[n].button, icons[n].tip, "");
-    g_signal_connect(G_OBJECT(icons[n].button), "clicked",
-                     G_CALLBACK(icons[n].clicked), &icons[n]);
-    /* pop the icon in a vbox so it doesn't get vertically stretch if there are
-     * taller things in the control bar */
-    NW(vbox);
-    vbox = gtk_vbox_new(FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(vbox), icons[n].button, TRUE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
+    assert(icon->image);
+    gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(icon->button),
+                                    icon->image);
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(icon->button),
+                                    icon->label);
+    if(icon->toggle)
+      g_signal_connect(G_OBJECT(icon->button), "toggled",
+                       G_CALLBACK(toggled_icon), icon);
+    else
+      g_signal_connect(G_OBJECT(icon->button), "clicked",
+                       G_CALLBACK(clicked_icon), icon);
+    gtk_toolbar_insert(GTK_TOOLBAR(toolbar),
+                       GTK_TOOL_ITEM(icon->button),
+                       -1);
+    if(icons[n].menuitem) {
+      /* Find the menu item */
+      icons[n].item = gtk_item_factory_get_widget(mainmenufactory,
+                                                  icons[n].menuitem);
+      if(icon->toggle)
+        g_signal_connect(G_OBJECT(icons[n].item), "toggled",
+                         G_CALLBACK(toggled_menu), &icons[n]);
+      else
+        g_signal_connect(G_OBJECT(icons[n].item), "activate",
+                         G_CALLBACK(clicked_menu), &icons[n]);
+    }
+    /* Make sure the icon is updated when relevant things changed */
+    char **events = split(icons[n].events, 0, 0, 0, 0);
+    while(*events)
+      event_register(*events++, icon_changed, &icons[n]);
+    event_register("connected-changed", icon_changed, &icons[n]);

   }
   /* create the adjustments for the volume control */
   }
   /* create the adjustments for the volume control */

-  NW(adjustment);

   volume_adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, goesupto,
                                                  goesupto / 20, goesupto / 20,
                                                  0));
   volume_adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, goesupto,
                                                  goesupto / 20, goesupto / 20,
                                                  0));

-  NW(adjustment);

   balance_adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -1, 1,
                                                   0.2, 0.2, 0));
   /* the volume control */
   balance_adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -1, 1,
                                                   0.2, 0.2, 0));
   /* the volume control */

-  NW(hscale);
-  v = gtk_hscale_new(volume_adj);
-  NW(hscale);
-  b = gtk_hscale_new(balance_adj);
-  gtk_scale_set_digits(GTK_SCALE(v), 10);
-  gtk_scale_set_digits(GTK_SCALE(b), 10);
-  gtk_widget_set_size_request(v, 192, -1);
-  gtk_widget_set_size_request(b, 192, -1);
-  gtk_tooltips_set_tip(tips, v, "Volume", "");
-  gtk_tooltips_set_tip(tips, b, "Balance", "");
-  gtk_box_pack_start(GTK_BOX(hbox), v, FALSE, TRUE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), b, FALSE, TRUE, 0);
+  volume_widget = gtk_hscale_new(volume_adj);
+  balance_widget = gtk_hscale_new(balance_adj);
+  gtk_widget_set_style(volume_widget, tool_style);
+  gtk_widget_set_style(balance_widget, tool_style);
+  gtk_scale_set_digits(GTK_SCALE(volume_widget), 10);
+  gtk_scale_set_digits(GTK_SCALE(balance_widget), 10);
+  gtk_widget_set_size_request(volume_widget, 128, -1);
+  gtk_widget_set_size_request(balance_widget, 128, -1);
+  gtk_widget_set_tooltip_text(volume_widget, "Volume");
+  gtk_widget_set_tooltip_text(balance_widget, "Balance");
+  gtk_box_pack_start(GTK_BOX(hbox), toolbar,
+                     FALSE/*expand*/, TRUE/*fill*/, 0);
+  gtk_box_pack_start(GTK_BOX(hbox), volume_widget,
+                     FALSE/*expand*/, TRUE/*fill*/, 0);
+  gtk_box_pack_start(GTK_BOX(hbox), balance_widget,
+                     FALSE/*expand*/, TRUE/*fill*/, 0);

   /* space updates rather than hammering the server */
   /* space updates rather than hammering the server */

-  gtk_range_set_update_policy(GTK_RANGE(v), GTK_UPDATE_DELAYED);
-  gtk_range_set_update_policy(GTK_RANGE(b), GTK_UPDATE_DELAYED);
+  gtk_range_set_update_policy(GTK_RANGE(volume_widget), GTK_UPDATE_DELAYED);
+  gtk_range_set_update_policy(GTK_RANGE(balance_widget), GTK_UPDATE_DELAYED);

   /* notice when the adjustments are changed */
   g_signal_connect(G_OBJECT(volume_adj), "value-changed",
                    G_CALLBACK(volume_adjusted), 0);
   g_signal_connect(G_OBJECT(balance_adj), "value-changed",
                    G_CALLBACK(volume_adjusted), 0);
   /* format the volume/balance values ourselves */
   /* notice when the adjustments are changed */
   g_signal_connect(G_OBJECT(volume_adj), "value-changed",
                    G_CALLBACK(volume_adjusted), 0);
   g_signal_connect(G_OBJECT(balance_adj), "value-changed",
                    G_CALLBACK(volume_adjusted), 0);
   /* format the volume/balance values ourselves */

-  g_signal_connect(G_OBJECT(v), "format-value",
+  g_signal_connect(G_OBJECT(volume_widget), "format-value",

                    G_CALLBACK(format_volume), 0);
                    G_CALLBACK(format_volume), 0);

-  g_signal_connect(G_OBJECT(b), "format-value",
+  g_signal_connect(G_OBJECT(balance_widget), "format-value",

                    G_CALLBACK(format_balance), 0);
                    G_CALLBACK(format_balance), 0);

-  register_monitor(control_monitor, 0, -1UL);
+  event_register("volume-changed", volume_changed, 0);
+  event_register("rtp-changed", volume_changed, 0);
+  event_register("mini-mode-changed", control_minimode, 0);

   return hbox;
 }
 
   return hbox;
 }
 

+/** @brief Return TRUE if volume setting is supported */
+static int volume_supported(void) {
+  /* TODO: if the server doesn't know how to set the volume [but isn't using
+   * network play] then we should have volume_supported = FALSE */
+  return 1;
+}
+

 /** @brief Update the volume control when it changes */
 /** @brief Update the volume control when it changes */

-void volume_update(void) {
+static void volume_changed(const char attribute((unused)) *event,
+                           void attribute((unused)) *eventdata,
+                           void attribute((unused)) *callbackdata) {

   double l, r;
 
   double l, r;
 

-  D(("volume_update"));
-  l = volume_l / 100.0;
-  r = volume_r / 100.0;
-  ++suppress_set_volume;
-  gtk_adjustment_set_value(volume_adj, volume(l, r) * goesupto);
-  gtk_adjustment_set_value(balance_adj, balance(l, r));
-  --suppress_set_volume;
+  D(("volume_changed"));
+  ++suppress_actions;
+  /* Only display volume/balance controls if they will work */
+  if(volume_supported()) {
+    gtk_widget_show(volume_widget);
+    if(full_mode)
+      gtk_widget_show(balance_widget);
+    l = volume_l / 100.0;
+    r = volume_r / 100.0;
+    gtk_adjustment_set_value(volume_adj, volume(l, r) * goesupto);
+    gtk_adjustment_set_value(balance_adj, balance(l, r));
+  } else {
+    gtk_widget_hide(volume_widget);
+    gtk_widget_hide(balance_widget);
+  }
+  --suppress_actions;

 }
 
 /** @brief Update the state of one of the control icons
 }
 
 /** @brief Update the state of one of the control icons

- * @param icon Target icon
- * @param visible True if this version of the button should be visible
- * @param usable True if the button is currently usable
- *
- * Several of the icons, rather bizarrely, come in pairs: for instance exactly
- * one of the play and pause buttons is supposed to be visible at any given
- * moment.
- *
- * @p usable need not take into account server availability, that is done
- * automatically.

  */
  */

-static void update_icon(const struct icon *icon,
-                        int visible, int usable) {
+static void icon_changed(const char attribute((unused)) *event,
+                         void attribute((unused)) *evendata,
+                         void *callbackdata) {
+  //fprintf(stderr, "icon_changed (%s)\n", event);
+  const struct icon *const icon = callbackdata;
+  int on = icon->on ? icon->on() : 1;
+  int sensitive = icon->sensitive ? icon->sensitive() : 1;
+  //fprintf(stderr, "sensitive->%d\n", sensitive);
+
+  ++suppress_actions;

   /* If the connection is down nothing is ever usable */
   if(!(last_state & DISORDER_CONNECTED))
   /* If the connection is down nothing is ever usable */
   if(!(last_state & DISORDER_CONNECTED))

-    usable = 0;
-  (visible ? gtk_widget_show : gtk_widget_hide)(icon->button);
-  /* Only both updating usability if the button is visible */
-  if(visible)
-    gtk_widget_set_sensitive(icon->button, usable);
-}
-
-static void update_pause(const struct icon *icon) {
-  const int visible = !(last_state & DISORDER_TRACK_PAUSED);
-  const int usable = !!(last_state & DISORDER_PLAYING); /* TODO: might be a lie */
-  update_icon(icon, visible, usable);
-}
-
-static void update_play(const struct icon *icon) {
-  const int visible = !!(last_state & DISORDER_TRACK_PAUSED);
-  const int usable = !!(last_state & DISORDER_PLAYING);
-  update_icon(icon, visible, usable);
+    sensitive = 0;
+  if(icon->toggle)
+    gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(icon->button),
+                                      on);
+  /* If you disable play or random play NOT via the icon (for instance, via the
+   * edit menu or via a completely separate command line invocation) then the
+   * icon shows up as insensitive.  Hover the mouse over it and the correct
+   * state is immediately displayed.  sensitive and GTK_WIDGET_SENSITIVE show
+   * it to be in the correct state, so I think this is may be a GTK+ bug. */
+  if(icon->tip_on)
+    gtk_widget_set_tooltip_text(icon->button,
+                                on ? icon->tip_on : icon->tip_off);
+  gtk_widget_set_sensitive(icon->button, sensitive);
+  /* Icons with an associated menu item */
+  if(icon->item) {
+    if(icon->toggle)
+      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(icon->item),
+                                     !!icon->menu_invert ^ !!on);
+    gtk_widget_set_sensitive(icon->item, sensitive);
+  }
+  --suppress_actions;

 }
 
 }
 

-static void update_scratch(const struct icon *icon) {
-  const int visible = 1;
-  const int usable = !!(last_state & DISORDER_PLAYING);
-  update_icon(icon, visible, usable);
+static void icon_action_completed(void *v, const char *err) {
+  if(err) {
+    last_state = restore_state;
+    popup_protocol_error(0, err);
+    icon_changed(0, 0, v);
+  }

 }
 
 }
 

-static void update_random_enable(const struct icon *icon) {
-  const int visible = !(last_state & DISORDER_RANDOM_ENABLED);
-  const int usable = 1;
-  update_icon(icon, visible, usable);
-}
+static void clicked_icon(GtkToolButton attribute((unused)) *button,
+                         gpointer userdata) {
+  const struct icon *icon = userdata;

 
 

-static void update_random_disable(const struct icon *icon) {
-  const int visible = !!(last_state & DISORDER_RANDOM_ENABLED);
-  const int usable = 1;
-  update_icon(icon, visible, usable);
+  if(suppress_actions)
+    return;
+  icon->action_go_off(client, icon_action_completed, 0);

 }
 
 }
 

-static void update_enable(const struct icon *icon) {
-  const int visible = !(last_state & DISORDER_PLAYING_ENABLED);
-  const int usable = 1;
-  update_icon(icon, visible, usable);
-}
+static void toggled_icon(GtkToggleToolButton attribute((unused)) *button,
+                         gpointer user_data) {
+  const struct icon *icon = user_data;

 
 

-static void update_disable(const struct icon *icon) {
-  const int visible = !!(last_state & DISORDER_PLAYING_ENABLED);
-  const int usable = 1;
-  update_icon(icon, visible, usable);
-}
-
-static void update_rtp(const struct icon *icon) {
-  const int visible = !rtp_is_running;
-  const int usable = rtp_supported;
-  update_icon(icon, visible, usable);
+  if(suppress_actions)
+    return;
+  restore_state = last_state;
+  if(icon->on())
+    icon->action_go_off(client, icon_action_completed, 0);
+  else
+    icon->action_go_on(client, icon_action_completed, 0);
+  icon_changed(0, 0, user_data);

 }
 
 }
 

-static void update_nortp(const struct icon *icon) {
-  const int visible = rtp_is_running;
-  const int usable = rtp_supported;
-  update_icon(icon, visible, usable);
+static void clicked_menu(GtkMenuItem attribute((unused)) *menuitem,
+                         gpointer userdata) {
+  clicked_icon(NULL, userdata);

 }
 
 }
 

-static void clicked_icon(GtkButton attribute((unused)) *button,
+static void toggled_menu(GtkCheckMenuItem attribute((unused)) *menuitem,

                          gpointer userdata) {
                          gpointer userdata) {

-  const struct icon *icon = userdata;
+  toggled_icon(NULL, userdata);
+}

 
 

-  icon->action(client, 0, 0);
+/** @brief Called when a volume command completes */
+static void volume_completed(void attribute((unused)) *v,
+                             const char *err) {
+  if(err)
+    popup_protocol_error(0, err);
+  /* We don't set the UI's notion of the volume here, it is set from the log
+   * regardless of the reason it changed */

 }
 
 /** @brief Called when the volume has been adjusted */
 }
 
 /** @brief Called when the volume has been adjusted */


@@ -303,7 +516,7 @@ static void volume_adjusted(GtkAdjustment attribute((unused)) *a,
   double v = gtk_adjustment_get_value(volume_adj) / goesupto;
   double b = gtk_adjustment_get_value(balance_adj);
 
   double v = gtk_adjustment_get_value(volume_adj) / goesupto;
   double b = gtk_adjustment_get_value(balance_adj);
 

-  if(suppress_set_volume)
+  if(suppress_actions)

     /* This is the result of an update from the server, not a change from the
      * user.  Don't feedback! */
     return;
     /* This is the result of an update from the server, not a change from the
      * user.  Don't feedback! */
     return;


@@ -313,10 +526,14 @@ static void volume_adjusted(GtkAdjustment attribute((unused)) *a,
   b = nearbyint(5 * b) / 5;
   /* Set the volume.  We don't want a reply, we'll get the actual new volume
    * from the log. */
   b = nearbyint(5 * b) / 5;
   /* Set the volume.  We don't want a reply, we'll get the actual new volume
    * from the log. */

-  disorder_eclient_volume(client, 0,
-                          nearbyint(left(v, b) * 100),
-                          nearbyint(right(v, b) * 100),
-                          0);
+  if(rtp_supported) {
+    int l = nearbyint(left(v, b) * 100), r = nearbyint(right(v, b) * 100);
+    rtp_setvol(&l, &r);
+  } else
+    disorder_eclient_set_volume(client, volume_completed,
+                                nearbyint(left(v, b) * 100),
+                                nearbyint(right(v, b) * 100),
+                                0);

 }
 
 /** @brief Formats the volume value */
 }
 
 /** @brief Formats the volume value */


@@ -402,6 +619,48 @@ static double balance(double l, double r) {
     return 0;
 }
 
     return 0;
 }
 

+/** @brief Called to enable jukebox playback */
+static int enable_playing(disorder_eclient *c,
+                          disorder_eclient_no_response *completed, void *v) {
+  last_state |= DISORDER_PLAYING;
+  return disorder_eclient_enable(c, completed, v);
+}
+
+/** @brief Called to disable jukebox playback */
+static int disable_playing(disorder_eclient *c,
+                           disorder_eclient_no_response *completed, void *v) {
+  last_state &= ~DISORDER_PLAYING;
+  return disorder_eclient_disable(c, completed, v);
+}
+
+/** @brief Called to enable random selection */
+static int enable_random(disorder_eclient *c,
+                         disorder_eclient_no_response *completed, void *v) {
+  last_state |= DISORDER_RANDOM_ENABLED;
+  return disorder_eclient_random_enable(c, completed, v);
+}
+
+/** @brief Called to disable random selection */
+static int disable_random(disorder_eclient *c,
+                          disorder_eclient_no_response *completed, void *v) {
+  last_state &= ~DISORDER_RANDOM_ENABLED;
+  return disorder_eclient_random_disable(c, completed, v);
+}
+
+/** @brief Called to pause the current track */
+static int pause_track(disorder_eclient *c,
+                       disorder_eclient_no_response *completed, void *v) {
+  last_state |= DISORDER_TRACK_PAUSED;
+  return disorder_eclient_pause(c, completed, v);
+}
+
+/** @brief Called to resume the current track */
+static int resume_track(disorder_eclient *c,
+                        disorder_eclient_no_response *completed, void *v) {
+  last_state &= ~DISORDER_TRACK_PAUSED;
+  return disorder_eclient_resume(c, completed, v);
+}
+

 /** @brief Called to enable RTP play
  *
  * Rather odd signature is to fit in with the other icons which all call @ref
 /** @brief Called to enable RTP play
  *
  * Rather odd signature is to fit in with the other icons which all call @ref


@@ -411,6 +670,7 @@ static int enable_rtp(disorder_eclient attribute((unused)) *c,
                       disorder_eclient_no_response attribute((unused)) *completed,
                       void attribute((unused)) *v) {
   start_rtp();
                       disorder_eclient_no_response attribute((unused)) *completed,
                       void attribute((unused)) *v) {
   start_rtp();

+  rtp_is_running = 1;

   return 0;
 }
 
   return 0;
 }
 


@@ -423,9 +683,24 @@ static int disable_rtp(disorder_eclient attribute((unused)) *c,
                        disorder_eclient_no_response attribute((unused)) *completed,
                        void attribute((unused)) *v) {
   stop_rtp();
                        disorder_eclient_no_response attribute((unused)) *completed,
                        void attribute((unused)) *v) {
   stop_rtp();

+  rtp_is_running = 0;

   return 0;
 }
 
   return 0;
 }
 

+static void control_minimode(const char attribute((unused)) *event,
+                             void attribute((unused)) *evendata,
+                             void attribute((unused)) *callbackdata) {
+  if(full_mode && volume_supported()) {
+    gtk_widget_show(balance_widget);
+    gtk_scale_set_value_pos(GTK_SCALE(volume_widget), GTK_POS_TOP);
+  } else {
+    gtk_widget_hide(balance_widget);
+    gtk_scale_set_value_pos(GTK_SCALE(volume_widget), GTK_POS_RIGHT);
+  }
+  if(full_mode) gtk_toolbar_unset_style(GTK_TOOLBAR(toolbar));
+  else gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
+}
+

 /*
 Local Variables:
 c-basic-offset:2
 /*
 Local Variables:
 c-basic-offset:2