Merge lp:~3v1n0/unity-2d/secondary-activate-support into lp:unity-2d/3.0

[Marco Trevisan (Treviño)]

Add support to "secondary-activate" event on middle-click, needed both by bug #609860 and bug #812933. See the second for more informations.

This needs the merge of lp:~3v1n0/libindicator/secondary-activate-support

[lp:~3v1n0/unity-2d/secondary-activate-support]

621. By Marco Trevisan (Treviño) on 2011-07-19

Merging with upstream...

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

libindicator doesn't support x,y mouse position anymore.

Dropping them from signal.

[Aurélien Gâteau (agateau)]

Unfortunately this branch cannot be merged in for the same reason lp:~3v1n0/unity-2d/scroll-api-merge cannot be (cf. https://code.launchpad.net/~3v1n0/unity-2d/scroll-api-merge/+merge/66680 )

review: Disapprove

Unmerged revisions

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

libindicator doesn't support x,y mouse position anymore.

Dropping them from signal.

621. By Marco Trevisan (Treviño) on 2011-07-19

Merging with upstream...

620. By Marco Trevisan (Treviño) on 2011-07-18

Use gtk_widget_get_allocation for better future Gtk3 support

619. By Marco Trevisan (Treviño) on 2011-07-09

Emit secondary_activate signal on Middle-Click over indicators

When a middle-click is performed (press and release over the same indicator)
emit the "secondary-activate" signal to the hit indicator entry.

This can be used by indicators to perform particular actions.

618. By Marco Trevisan (Treviño) on 2011-07-08

Compile with libindicator-0.4

617. By Marco Trevisan (Treviño) on 2011-07-02

Use the "entry-scrolled" signal instead of the old ones

It follows the API change of libindicator

=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
--- libunity-2d-private/Unity2d/CMakeLists.txt	2011-06-22 08:54:52 +0000
+++ libunity-2d-private/Unity2d/CMakeLists.txt	2011-07-21 16:44:34 +0000
@@ -8,7 +8,7 @@
 pkg_check_modules(GDK REQUIRED gdk-2.0)
 pkg_check_modules(GIO REQUIRED gio-2.0)
 pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
-pkg_check_modules(INDICATOR REQUIRED indicator)
+pkg_check_modules(INDICATOR REQUIRED indicator-0.4)
 
 find_package(X11 REQUIRED)
 

=== modified file 'panel/applets/CMakeLists.txt'
--- panel/applets/CMakeLists.txt	2011-06-22 08:22:14 +0000
+++ panel/applets/CMakeLists.txt	2011-07-21 16:44:34 +0000
@@ -15,14 +15,14 @@
 pkg_check_modules(QTBAMF REQUIRED libqtbamf)
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
 pkg_check_modules(GTK REQUIRED gtk+-2.0)
-pkg_check_modules(INDICATOR REQUIRED indicator)
+pkg_check_modules(INDICATOR REQUIRED indicator-0.4)
 pkg_check_modules(WNCK REQUIRED libwnck-1.0)
 
 find_package(X11 REQUIRED)
 
 # Get indicator dirs from pkgconfig
-read_pkg_variable(INDICATOR_DIR       indicator indicatordir)
-read_pkg_variable(INDICATOR_ICONS_DIR indicator iconsdir)
+read_pkg_variable(INDICATOR_DIR       indicator-0.4 indicatordir)
+read_pkg_variable(INDICATOR_ICONS_DIR indicator-0.4 iconsdir)
 configure_file(indicator-config.h.in indicator-config.h)
 
 # Sources

=== modified file 'panel/applets/indicator/indicator.c'
--- panel/applets/indicator/indicator.c	2011-07-21 16:44:33 +0000
+++ panel/applets/indicator/indicator.c	2011-07-21 16:44:34 +0000
@@ -165,6 +165,40 @@
 	return FALSE;
 }
 
+static gboolean
+on_menuitem_press (GtkWidget *menuitem, GdkEventButton *event, gpointer data)
+{
+	IndicatorObject *io = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_OBJECT);
+	IndicatorObjectEntry *entry = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_ENTRY);
+
+	g_return_val_if_fail(INDICATOR_IS_OBJECT(io), FALSE);
+	g_return_val_if_fail(entry, FALSE);
+
+	static GtkWidget *clicked_item = NULL;
+
+	if (event->button == 2) {
+		if (event->type == GDK_BUTTON_PRESS) {
+			clicked_item = menuitem;
+		} else if (event->type == GDK_BUTTON_RELEASE && clicked_item == menuitem) {
+			GtkAllocation alloc;
+			gint px = event->x;
+			gint py = event->y;
+			gtk_widget_get_allocation (menuitem, &alloc);
+
+			if (px >= 0 && px < alloc.width && py >= 0 && py < alloc.height) {
+				g_signal_emit_by_name (io, INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE,
+				                       entry, event->time);
+			}
+		} else if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) {
+			clicked_item = NULL;
+		}
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 static void
 entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
 {
@@ -247,6 +281,8 @@
 	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_ENTRY,  entry);
 	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_OBJECT, io);
 	g_signal_connect(G_OBJECT (menuitem), "scroll-event", G_CALLBACK(entry_scrolled), NULL);
+	g_signal_connect(G_OBJECT(menuitem), "button-press-event", G_CALLBACK(on_menuitem_press), NULL);
+	g_signal_connect(G_OBJECT(menuitem), "button-release-event", G_CALLBACK(on_menuitem_press), NULL);
 
 	return;
 }
@@ -441,6 +477,7 @@
   GTK_WIDGET_SET_FLAGS (indicator->menu, GTK_WIDGET_FLAGS(indicator->menu) | GTK_CAN_FOCUS);
   gtk_widget_set_name(GTK_WIDGET (indicator->menu), "indicator-applet-menubar");
   g_signal_connect(indicator->menu, "button-press-event", G_CALLBACK(on_menu_press), NULL);
+  g_signal_connect(indicator->menu, "button-release-event", G_CALLBACK(on_menu_press), NULL);
   //g_signal_connect_after(indicator->menu, "expose-event", G_CALLBACK(menu_on_expose), menu);
   gtk_container_set_border_width(GTK_CONTAINER(indicator->menu), 0);
 
@@ -487,7 +524,6 @@
   g_free(indicator);
 }
 
-
 #if 0
 static gboolean
 indicator_size_changed (XfcePanelPlugin *plugin,
@@ -510,15 +546,12 @@
 }
 #endif
 
-
 static gboolean
 on_menu_press (GtkWidget *widget, GdkEventButton *event, IndicatorPlugin *indicator)
 {
-    if (indicator != NULL && event->button == 1) /* left click only */
-    {
-     /*   gtk_menu_popup (GTK_MENU(indicator->menu), NULL, NULL, NULL, NULL, 0,
-                        event->time);*/
+    /* Don't open the menubar item on middle-click, it must be used to send events! */
+    if (event->button == 2)
         return TRUE;
-    }
+
     return FALSE ;
 }