Changeset 51364 in webkit

Timestamp:

Nov 24, 2009 3:46:21 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-24 Evan Stade <​estade@chromium.org>

Reviewed by David Levin.

Linux Chromium sends too many click events
​https://bugs.webkit.org/show_bug.cgi?id=31841

Manually count number of clicks for double/triple click events. This
makes us match Firefox on ​http://www.quirksmode.org/js/events_mouse.html
Chromium side of this patch is here:
​http://codereview.chromium.org/431031/show

• src/gtk/WebInputEventFactory.cpp: (WebKit::WebInputEventFactory::mouseEvent):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/gtk/WebInputEventFactory.cpp (modified) (2 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2009-11-24  Evan Stade  <estade@chromium.org>
+
+        Reviewed by David Levin.
+
+        Linux Chromium sends too many click events
+        https://bugs.webkit.org/show_bug.cgi?id=31841
+
+        Manually count number of clicks for double/triple click events. This
+        makes us match Firefox on http://www.quirksmode.org/js/events_mouse.html
+        Chromium side of this patch is here:
+        http://codereview.chromium.org/431031/show
+
+        * src/gtk/WebInputEventFactory.cpp:
+        (WebKit::WebInputEventFactory::mouseEvent):
+
 2009-11-24  Darin Fisher  <darin@chromium.org>
 

trunk/WebKit/chromium/src/gtk/WebInputEventFactory.cpp

@@ -39 +39 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
 #include <gtk/gtkversion.h>
 
 #include <wtf/Assertions.h>
+
+namespace {
+
+gint getDoubleClickTime()
+{
+    static GtkSettings* settings = gtk_settings_get_default();
+    gint doubleClickTime = 250;
+    g_object_get(G_OBJECT(settings), "gtk-double-click-time", &doubleClickTime, 0);
+    return doubleClickTime;
+}
+
+}  // namespace
 
 namespace WebKit {
@@ -322 +335 @@
 
     switch (event->type) {
-    case GDK_3BUTTON_PRESS:
-        ++result.clickCount;
-        // fallthrough
-    case GDK_2BUTTON_PRESS:
-        ++result.clickCount;
-        // fallthrough
     case GDK_BUTTON_PRESS:
         result.type = WebInputEvent::MouseDown;
-        ++result.clickCount;
         break;
     case GDK_BUTTON_RELEASE:
         result.type = WebInputEvent::MouseUp;
         break;
-
+    case GDK_3BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
     default:
         ASSERT_NOT_REACHED();
     };
+
+    if (GDK_BUTTON_PRESS == event->type) {
+        static int numClicks = 0;
+        static GdkWindow* eventWindow = 0;
+        static gint lastLeftClickTime = 0;
+
+        gint time_diff = event->time - lastLeftClickTime;
+        if (eventWindow == event->window && time_diff < getDoubleClickTime())
+            numClicks++;
+        else
+            numClicks = 1;
+
+        result.clickCount = numClicks;
+        eventWindow = event->window;
+        lastLeftClickTime = event->time;
+    }
 
     result.button = WebMouseEvent::ButtonNone;