Merge lp:~3v1n0/indicator-sound/mute-on-secondary-activate into lp:indicator-sound/fourth

[Marco Trevisan (Treviño)]

When the "secondary-activate" event is emitted, the indicator-sound should toggle the volume on/off.

This branch performs this using a new mute-widget that is used by indicator-sound to control the mute-menu-item dbus menuitem.

The code needs the libindicator support (available in lp:~3v1n0/libindicator/secondary-activate-support) and unity/unity-2d support (available in lp:~3v1n0/unity/secondary-activate-support and in lp:~3v1n0/unity-2d/secondary-activate-support)

[lp:~3v1n0/indicator-sound/mute-on-secondary-activate]

257. By Marco Trevisan (Treviño) on 2011-07-21

X and Y pointer position aren't exported anymore by libindicator

Dropping them!

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-06-22 19:19:49 +0000
+++ src/Makefile.am	2011-07-21 16:14:32 +0000
@@ -18,6 +18,8 @@
             transport-widget.h \
             metadata-widget.c \
             metadata-widget.h \
+            mute-widget.c \
+            mute-widget.h \
             volume-widget.c \
             volume-widget.h \
             voip-input-widget.c \

=== modified file 'src/indicator-sound.c'
--- src/indicator-sound.c	2011-07-02 03:32:23 +0000
+++ src/indicator-sound.c	2011-07-21 16:14:32 +0000
@@ -39,6 +39,7 @@
 #include "voip-input-widget.h"
 #include "dbus-shared-names.h"
 #include "sound-state-manager.h"
+#include "mute-widget.h"
 
 #include "gen-sound-service.xml.h"
 #include "common-defs.h"
@@ -49,6 +50,7 @@
 {
   GtkWidget* volume_widget;
   GtkWidget* voip_widget;
+  MuteWidget *mute_widget;
   GList* transport_widgets_list;
   GDBusProxy *dbus_proxy; 
   SoundStateManager* state_manager;
@@ -75,6 +77,9 @@
 static void indicator_sound_scroll (IndicatorObject * io,
                                     IndicatorObjectEntry * entry, gint delta,
                                     IndicatorScrollDirection direction);
+static void indicator_sound_middle_click (IndicatorObject * io,
+                                          IndicatorObjectEntry * entry,
+                                          guint time, gpointer data);
 
 //key/moust event handlers
 static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data);
@@ -97,6 +102,10 @@
                                      DbusmenuMenuitem * parent,
                                      DbusmenuClient * client,
                                      gpointer user_data);
+static gboolean new_mute_widget (DbusmenuMenuitem * newitem,
+                                     DbusmenuMenuitem * parent,
+                                     DbusmenuClient * client,
+                                     gpointer user_data);
 
 // DBUS communication
 static GDBusNodeInfo *node_info = NULL;
@@ -125,6 +134,7 @@
   io_class->get_menu  = get_menu;
   io_class->get_accessible_desc = get_accessible_desc;
   io_class->entry_scrolled = indicator_sound_scroll;
+  io_class->secondary_activate = indicator_sound_middle_click;
 }
 
 static void
@@ -137,6 +147,7 @@
   IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(self);
   priv->volume_widget = NULL;
   priv->voip_widget = NULL;
+  priv->mute_widget = NULL;
   priv->dbus_proxy = NULL;
   GList* t_list = NULL;
   priv->transport_widgets_list = t_list;
@@ -207,6 +218,9 @@
   dbusmenu_client_add_type_handler (DBUSMENU_CLIENT(client),
                                     DBUSMENU_METADATA_MENUITEM_TYPE,
                                     new_metadata_widget);
+  dbusmenu_client_add_type_handler (DBUSMENU_CLIENT(client),
+                                    DBUSMENU_MUTE_MENUITEM_TYPE,
+                                    new_mute_widget);
   // Note: Not ideal but all key handling needs to be managed here and then 
   // delegated to the appropriate widget. 
   g_signal_connect (menu, "key-press-event", G_CALLBACK(key_press_cb), io);
@@ -459,6 +473,36 @@
   return TRUE;
 }
 
+static gboolean
+new_mute_widget(DbusmenuMenuitem * newitem,
+                DbusmenuMenuitem * parent,
+                DbusmenuClient * client,
+                gpointer user_data)
+{
+  IndicatorObject *io = NULL;
+
+  g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
+  g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
+
+  io = g_object_get_data (G_OBJECT (client), "indicator");
+  IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
+  
+  if (priv->mute_widget != NULL){ 
+    g_object_unref (priv->mute_widget);
+    priv->mute_widget = NULL;
+  }
+
+  priv->mute_widget = mute_widget_new(newitem);
+  GtkMenuItem *item = mute_widget_get_menu_item (priv->mute_widget);
+
+  dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client),
+                                  newitem,
+                                  item,
+                                  parent);
+
+  return TRUE;
+}
+
 /*******************************************************************/
 //UI callbacks
 /******************************************************************/
@@ -677,6 +721,16 @@
   sound_state_manager_show_notification (priv->state_manager, value);
 }
 
+static void
+indicator_sound_middle_click (IndicatorObject * io, IndicatorObjectEntry * entry,
+                              guint time, gpointer data)
+{
+  IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
+  g_return_if_fail (priv);
+
+  mute_widget_toggle(priv->mute_widget);
+}
+
 void
 update_accessible_desc (IndicatorObject * io)
 {

=== modified file 'src/mute-menu-item.c'
--- src/mute-menu-item.c	2011-02-18 13:05:58 +0000
+++ src/mute-menu-item.c	2011-07-21 16:14:32 +0000
@@ -63,6 +63,11 @@
   MuteMenuItemPrivate* priv = MUTE_MENU_ITEM_GET_PRIVATE(self);
   priv->button = NULL;
   priv->button = dbusmenu_menuitem_new();
+
+  dbusmenu_menuitem_property_set(priv->button,
+                                 DBUSMENU_MENUITEM_PROP_TYPE,
+                                 DBUSMENU_MUTE_MENUITEM_TYPE);
+
   dbusmenu_menuitem_property_set_bool (priv->button,
                                        DBUSMENU_MENUITEM_PROP_VISIBLE,
                                        TRUE);

=== added file 'src/mute-widget.c'
--- src/mute-widget.c	1970-01-01 00:00:00 +0000
+++ src/mute-widget.c	2011-07-21 16:14:32 +0000
@@ -0,0 +1,141 @@
+/*
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Marco Trevisan (Treviño) <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib/gi18n.h>
+#include <glib.h>
+#include "mute-widget.h"
+#include "common-defs.h"
+#include "indicator-sound.h"
+
+typedef struct _MuteWidgetPrivate MuteWidgetPrivate;
+
+struct _MuteWidgetPrivate
+{
+  DbusmenuMenuitem *item;  
+  GtkMenuItem *gitem;
+};
+
+#define MUTE_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MUTE_WIDGET_TYPE, MuteWidgetPrivate))
+
+/* Prototypes */
+static void mute_widget_class_init (MuteWidgetClass *klass);
+static void mute_widget_init       (MuteWidget *self);
+static void mute_widget_dispose    (GObject *object);
+static void mute_widget_finalize   (GObject *object);
+
+G_DEFINE_TYPE (MuteWidget, mute_widget, G_TYPE_OBJECT);
+
+static void
+mute_widget_class_init (MuteWidgetClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->dispose = mute_widget_dispose;
+  gobject_class->finalize = mute_widget_finalize;
+  g_type_class_add_private (klass, sizeof (MuteWidgetPrivate));
+}
+
+static void
+mute_widget_init (MuteWidget *self)
+{
+  MuteWidgetPrivate *priv = MUTE_WIDGET_GET_PRIVATE(self);
+  priv->item = NULL;
+  priv->gitem = GTK_MENU_ITEM(gtk_menu_item_new ());
+}
+
+static void
+mute_widget_dispose (GObject *object)
+{
+  G_OBJECT_CLASS (mute_widget_parent_class)->dispose (object);
+}
+
+static void
+mute_widget_finalize (GObject *object)
+{
+  MuteWidget *self = MUTE_WIDGET (object);
+  MuteWidgetPrivate *priv = MUTE_WIDGET_GET_PRIVATE(self);
+
+  g_object_unref (priv->item);
+  g_object_unref (G_OBJECT (priv->gitem));
+  G_OBJECT_CLASS (mute_widget_parent_class)->finalize (object);
+}
+
+GtkMenuItem *
+mute_widget_get_menu_item(MuteWidget *self)
+{
+  MuteWidgetPrivate *priv = MUTE_WIDGET_GET_PRIVATE(self);
+  return priv->gitem;
+}
+
+MuteStatus
+mute_widget_get_status (MuteWidget *self)
+{
+  g_return_val_if_fail(self, MUTE_STATUS_UNAVAILABLE);
+  MuteStatus status = MUTE_STATUS_UNAVAILABLE;
+  MuteWidgetPrivate *priv = MUTE_WIDGET_GET_PRIVATE(self);
+
+  GVariant *vstatus = dbusmenu_menuitem_property_get_variant(priv->item,
+                                                  DBUSMENU_MUTE_MENUITEM_VALUE);
+
+  if (g_variant_is_of_type (vstatus, G_VARIANT_TYPE_BOOLEAN))
+  {
+    if (g_variant_get_boolean (vstatus))
+      status = MUTE_STATUS_MUTED;
+    else
+      status = MUTE_STATUS_UNMUTED;
+  }
+
+  return status;
+}
+
+void mute_widget_toggle (MuteWidget *self)
+{
+  g_return_if_fail (self);
+  MuteWidgetPrivate *priv = MUTE_WIDGET_GET_PRIVATE(self);
+  gtk_menu_item_activate (priv->gitem);
+}
+
+/**
+ * mute_widget_new:
+ * @returns: a new #MuteWidget.
+ **/
+MuteWidget *
+mute_widget_new (DbusmenuMenuitem *item)
+{
+  MuteWidget* widget = g_object_new(MUTE_WIDGET_TYPE, NULL);
+  MuteWidgetPrivate* priv = MUTE_WIDGET_GET_PRIVATE(widget);
+  priv->item = g_object_ref(item);
+
+  GVariant *label = dbusmenu_menuitem_property_get_variant(priv->item,
+                                                  DBUSMENU_MENUITEM_PROP_LABEL);
+
+  if (g_variant_is_of_type(label, G_VARIANT_TYPE_STRING))
+    gtk_menu_item_set_label(priv->gitem, g_variant_get_string(label, NULL));
+
+  if (label)
+  {
+    g_debug("Added a new Mute Widget %s", g_variant_print(label, FALSE));
+    g_variant_unref(label);
+  }
+
+  return widget;
+}

=== added file 'src/mute-widget.h'
--- src/mute-widget.h	1970-01-01 00:00:00 +0000
+++ src/mute-widget.h	2011-07-21 16:14:32 +0000
@@ -0,0 +1,67 @@
+/*
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Marco Trevisan (Treviño) <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef __MUTE_WIDGET_H__
+#define __MUTE_WIDGET_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <libdbusmenu-gtk3/menuitem.h>
+#else
+#include <libdbusmenu-gtk/menuitem.h>
+#endif
+#include <libindicator/indicator-object.h>
+
+G_BEGIN_DECLS
+
+#define MUTE_WIDGET_TYPE            (mute_widget_get_type ())
+#define MUTE_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MUTE_WIDGET_TYPE, MuteWidget))
+#define MUTE_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MUTE_WIDGET_TYPE, MuteWidgetClass))
+#define IS_MUTE_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MUTE_WIDGET_TYPE))
+#define IS_MUTE_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MUTE_WIDGET_TYPE))
+#define MUTE_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MUTE_WIDGET_TYPE, MuteWidgetClass))
+
+typedef struct _MuteWidget  MuteWidget;
+typedef struct _MuteWidgetClass MuteWidgetClass;
+
+struct _MuteWidgetClass {
+  GObjectClass parent_class;
+};
+
+struct _MuteWidget {
+  GObject parent;
+};
+
+typedef enum {
+  MUTE_STATUS_UNAVAILABLE,
+  MUTE_STATUS_MUTED,
+  MUTE_STATUS_UNMUTED
+} MuteStatus;
+
+GType mute_widget_get_type (void) G_GNUC_CONST;
+MuteWidget* mute_widget_new (DbusmenuMenuitem *item);
+MuteStatus mute_widget_get_status (MuteWidget *self);
+void mute_widget_toggle (MuteWidget *self);
+GtkMenuItem *mute_widget_get_menu_item (MuteWidget *self);
+
+G_END_DECLS
+
+#endif
+