[nautilus] navigation-action: do not use a GtkMenuToolButton

[Cosimo Cecchi <cosimoc src gnome org>]

commit 5756ac82bab3a63708544aeef47ee5b0e9b508da
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Feb 10 10:43:06 2011 -0500

    navigation-action: do not use a GtkMenuToolButton
    
    As it always has dropdown arrows, which we don't want to see.
    Make it a Firefox-like button instead, where you can either right click
    or keep the mouse button pressed for an amount of time to activate the
    context menu.

 src/nautilus-navigation-action.c |  177 +++++++++++++++++++++++++-------------
 1 files changed, 116 insertions(+), 61 deletions(-)
---
diff --git a/src/nautilus-navigation-action.c b/src/nautilus-navigation-action.c
index ea96880..836bcf0 100644
--- a/src/nautilus-navigation-action.c
+++ b/src/nautilus-navigation-action.c
@@ -3,7 +3,7 @@
 /*
  *  Nautilus
  *
- *  Copyright (C) 2004 Red Hat, Inc.
+ *  Copyright (C) 2004, 2011 Red Hat, Inc.
  *  Copyright (C) 2003 Marco Pesenti Gritti
  *
  *  Nautilus is free software; you can redistribute it and/or
@@ -24,6 +24,7 @@
  *
  *  Authors: Alexander Larsson <alexl redhat com>
  *           Marco Pesenti Gritti
+ *           Cosimo Cecchi <cosimoc redhat com>
  *
  */
 
@@ -45,6 +46,8 @@ struct NautilusNavigationActionPrivate
 	NautilusNavigationWindow *window;
 	NautilusNavigationDirection direction;
 	char *arrow_tooltip;
+
+        guint popup_timeout_id;
 };
 
 enum
@@ -131,27 +134,18 @@ fill_menu (NautilusNavigationWindow *window,
 }
 
 static void
-show_menu_callback (GtkMenuToolButton *button,
-		    NautilusNavigationAction *action)
+show_menu (NautilusNavigationAction *self,
+           guint button,
+           guint32 event_time)
 {
-	NautilusNavigationActionPrivate *p;
 	NautilusNavigationWindow *window;
 	GtkWidget *menu;
-	GList *children;
-	GList *li;
 
-	p = action->priv;
-	window = action->priv->window;
-	
-	menu = gtk_menu_tool_button_get_menu (button);
+	window = self->priv->window;
 	
-	children = gtk_container_get_children (GTK_CONTAINER (menu));
-	for (li = children; li; li = li->next) {
-		gtk_container_remove (GTK_CONTAINER (menu), li->data);
-	}
-	g_list_free (children);
+	menu = gtk_menu_new ();
 
-	switch (p->direction) {
+	switch (self->priv->direction) {
 	case NAUTILUS_NAVIGATION_DIRECTION_FORWARD:
 		fill_menu (window, menu, FALSE);
 		break;
@@ -162,72 +156,130 @@ show_menu_callback (GtkMenuToolButton *button,
 		g_assert_not_reached ();
 		break;
 	}
+
+        gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
+                        button, event_time);
 }
 
+#define MENU_POPUP_TIMEOUT 1200
+
 static gboolean
-proxy_button_press_event_cb (GtkButton *button,
-			     GdkEventButton *event,
-			     gpointer user_data)
+popup_menu_timeout_cb (gpointer data)
 {
-	if (event->button == 2) {
-                g_signal_emit_by_name (button, "pressed", 0);
-	}
+        NautilusNavigationAction *self = data;
 
-	return FALSE;
+        show_menu (self, 1, gtk_get_current_event_time ());
+
+        return FALSE;
+}
+
+static void
+unschedule_menu_popup_timeout (NautilusNavigationAction *self)
+{
+        if (self->priv->popup_timeout_id != 0) {
+                g_source_remove (self->priv->popup_timeout_id);
+                self->priv->popup_timeout_id = 0;
+        }
+}
+
+static void
+schedule_menu_popup_timeout (NautilusNavigationAction *self)
+{
+        /* unschedule any previous timeouts */
+        unschedule_menu_popup_timeout (self);
+
+        self->priv->popup_timeout_id =
+                g_timeout_add (MENU_POPUP_TIMEOUT,
+                               popup_menu_timeout_cb,
+                               self);
 }
 
 static gboolean
-proxy_button_release_event_cb (GtkButton *button,
-			       GdkEventButton *event,
-			       gpointer user_data)
+tool_button_press_cb (GtkButton *button,
+                      GdkEventButton *event,
+                      gpointer user_data)
 {
-	if (event->button == 2) {
-                g_signal_emit_by_name (button, "released", 0);
-	}
+        NautilusNavigationAction *self = user_data;
+
+        if (event->button == 3) {
+                /* right click */
+                show_menu (self, event->button, event->time);
+                return TRUE;
+        }
+
+        if (event->button == 1) {
+                schedule_menu_popup_timeout (self);
+        }
 
 	return FALSE;
 }
 
+static gboolean
+tool_button_release_cb (GtkButton *button,
+                        GdkEventButton *event,
+                        gpointer user_data)
+{
+        NautilusNavigationAction *self = user_data;
+
+        unschedule_menu_popup_timeout (self);
+        
+        return FALSE;
+}
+
+static GtkWidget *
+get_actual_button (GtkToolButton *tool_button)
+{
+	GList *children;
+	GtkWidget *button;
+
+	g_return_val_if_fail (GTK_IS_TOOL_BUTTON (tool_button), NULL);
+
+	children = gtk_container_get_children (GTK_CONTAINER (tool_button));
+	button = GTK_WIDGET (children->data);
+
+	g_list_free (children);
+
+	return button;
+}
+
 static void
-connect_proxy (GtkAction *action, GtkWidget *proxy)
+connect_proxy (GtkAction *action,
+               GtkWidget *proxy)
 {
-	if (GTK_IS_MENU_TOOL_BUTTON (proxy)) {
-		NautilusNavigationAction *naction = NAUTILUS_NAVIGATION_ACTION (action);
-		GtkMenuToolButton *button = GTK_MENU_TOOL_BUTTON (proxy);
-		GtkWidget *menu;
-		GtkWidget *child;
-
-		/* set an empty menu, so the arrow button becomes sensitive */
-		menu = gtk_menu_new ();
-		gtk_menu_tool_button_set_menu (button, menu);
-
-		gtk_menu_tool_button_set_arrow_tooltip_text (button,
-							     naction->priv->arrow_tooltip);
-		
-		g_signal_connect (proxy, "show-menu",
-				  G_CALLBACK (show_menu_callback), action);
-
-		/* Make sure that middle click works. Note that there is some code duplication
-		 * between here and nautilus-window-menus.c */
-		child = eel_gtk_menu_tool_button_get_button (button);
-		g_signal_connect (child, "button-press-event", G_CALLBACK (proxy_button_press_event_cb), NULL);
-		g_signal_connect (child, "button-release-event", G_CALLBACK (proxy_button_release_event_cb), NULL);
-	}
+        GtkToolButton *tool;
+        GtkWidget *button;
+
+	if (GTK_IS_TOOL_BUTTON (proxy)) {
+                tool = GTK_TOOL_BUTTON (proxy);
+                button = get_actual_button (tool);
+
+                g_signal_connect (button, "button-press-event",
+                                  G_CALLBACK (tool_button_press_cb), action);
+                g_signal_connect (button, "button-release-event",
+                                  G_CALLBACK (tool_button_release_cb), action);
+        }
 
 	(* GTK_ACTION_CLASS (nautilus_navigation_action_parent_class)->connect_proxy) (action, proxy);
 }
 
 static void
-disconnect_proxy (GtkAction *action, GtkWidget *proxy)
+disconnect_proxy (GtkAction *action,
+                  GtkWidget *proxy)
 {
-	if (GTK_IS_MENU_TOOL_BUTTON (proxy)) {
-		GtkWidget *child;
-		
-		g_signal_handlers_disconnect_by_func (proxy, G_CALLBACK (show_menu_callback), action);
+        GtkToolButton *tool;
+        GtkWidget *button;
+
+	if (GTK_IS_TOOL_BUTTON (proxy)) {
+                tool = GTK_TOOL_BUTTON (proxy);
+                button = get_actual_button (tool);
 
-		child = eel_gtk_menu_tool_button_get_button (GTK_MENU_TOOL_BUTTON (proxy));
-		g_signal_handlers_disconnect_by_func (child, G_CALLBACK (proxy_button_press_event_cb), NULL);
-		g_signal_handlers_disconnect_by_func (child, G_CALLBACK (proxy_button_release_event_cb), NULL);
+                /* remove any possible timeout going on */
+                unschedule_menu_popup_timeout (NAUTILUS_NAVIGATION_ACTION (action));
+
+		g_signal_handlers_disconnect_by_func (button,
+                                                      G_CALLBACK (tool_button_press_cb), action);
+		g_signal_handlers_disconnect_by_func (button,
+                                                      G_CALLBACK (tool_button_release_cb), action);
 	}
 
 	(* GTK_ACTION_CLASS (nautilus_navigation_action_parent_class)->disconnect_proxy) (action, proxy);
@@ -238,6 +290,9 @@ nautilus_navigation_action_finalize (GObject *object)
 {
 	NautilusNavigationAction *action = NAUTILUS_NAVIGATION_ACTION (object);
 
+        /* remove any possible timeout going on */
+        unschedule_menu_popup_timeout (action);
+
 	g_free (action->priv->arrow_tooltip);
 
 	(* G_OBJECT_CLASS (nautilus_navigation_action_parent_class)->finalize) (object);
@@ -302,7 +357,7 @@ nautilus_navigation_action_class_init (NautilusNavigationActionClass *class)
 	object_class->set_property = nautilus_navigation_action_set_property;
 	object_class->get_property = nautilus_navigation_action_get_property;
 
-	action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;
+	action_class->toolbar_item_type = GTK_TYPE_TOOL_BUTTON;
 	action_class->connect_proxy = connect_proxy;
 	action_class->disconnect_proxy = disconnect_proxy;