GTK: add middle click and right click functionality to maximize button.

If the user right clicks on the maximize button, it will horizontally maximize the window, and if the user middle clicks on the maximize button it will vertically maximize the window.

At least on kde, the window manager supports more complicated behavior, e.g. right clicking on a window that is horizontally maximized will return it to its former size. It seems to keep track of multiple restored rects. However, we're not well equipped to replicate this behavior, so I just didn't add it. If the user wants it, they can disable the custom frame.

BUG=28881

Review URL: http://codereview.chromium.org/455012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33389 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 23 insertions, 9 deletions

diff --git a/chrome/common/gtk_util.cc b/chrome/common/gtk_util.cc
index 8cd0cf0..c6c08e4 100644
--- a/chrome/common/gtk_util.cc
+++ b/chrome/common/gtk_util.cc
@@ -28,14 +28,15 @@ void RemoveWidget(GtkWidget* widget, gpointer container) {
 // These two functions are copped almost directly from gtk core. The only
 // difference is that they accept middle clicks.
 gboolean OnMouseButtonPressed(GtkWidget* widget, GdkEventButton* event,
-                              gpointer unused) {
+                              gpointer userdata) {
   if (event->type == GDK_BUTTON_PRESS) {
     if (gtk_button_get_focus_on_click(GTK_BUTTON(widget)) &&
         !GTK_WIDGET_HAS_FOCUS(widget)) {
       gtk_widget_grab_focus(widget);
     }
 
-    if (event->button == 1 || event->button == 2)
+    gint button_mask = GPOINTER_TO_INT(userdata);
+    if (button_mask && (1 << event->button))
       gtk_button_pressed(GTK_BUTTON(widget));
   }
 
@@ -43,8 +44,9 @@ gboolean OnMouseButtonPressed(GtkWidget* widget, GdkEventButton* event,
 }
 
 gboolean OnMouseButtonReleased(GtkWidget* widget, GdkEventButton* event,
-                               gpointer unused) {
-  if (event->button == 1 || event->button == 2)
+                               gpointer userdata) {
+  gint button_mask = GPOINTER_TO_INT(userdata);
+  if (button_mask && (1 << event->button))
     gtk_button_released(GTK_BUTTON(widget));
 
   return TRUE;
@@ -325,13 +327,25 @@ void EnumerateTopLevelWindows(x11_util::EnumerateWindowsDelegate* delegate) {
   }
 }
 
-void SetButtonTriggersNavigation(GtkWidget* button) {
-  // We handle button activation manually because we want to accept middle mouse
-  // clicks.
+void SetButtonClickableByMouseButtons(GtkWidget* button,
+                                      bool left, bool middle, bool right) {
+  gint button_mask = 0;
+  if (left)
+    button_mask |= 1 << 1;
+  if (middle)
+    button_mask |= 1 << 2;
+  if (right)
+    button_mask |= 1 << 3;
+  void* userdata = GINT_TO_POINTER(button_mask);
+
   g_signal_connect(G_OBJECT(button), "button-press-event",
-                   G_CALLBACK(OnMouseButtonPressed), NULL);
+                   G_CALLBACK(OnMouseButtonPressed), userdata);
   g_signal_connect(G_OBJECT(button), "button-release-event",
-                   G_CALLBACK(OnMouseButtonReleased), NULL);
+                   G_CALLBACK(OnMouseButtonReleased), userdata);
+}
+
+void SetButtonTriggersNavigation(GtkWidget* button) {
+  SetButtonClickableByMouseButtons(button, true, true, false);
 }
 
 int MirroredLeftPointForRect(GtkWidget* widget, const gfx::Rect& bounds) {