Changeset 66829 in webkit

Timestamp:

Sep 6, 2010 7:44:42 AM (14 years ago)

Author:

Martin Robinson

Message:

2010-09-06 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] EventSender should support modifier keys with mouseDown and mouseUp events
​https://bugs.webkit.org/show_bug.cgi?id=45235

• platform/gtk/Skipped: Unskip a test which is now passing.

2010-09-06 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] EventSender should support modifier keys with mouseDown and mouseUp events
​https://bugs.webkit.org/show_bug.cgi?id=45235

Add support for interpreting the modifier key arguments to the mouseDown and mouseUp
methods of the EventSender.

• DumpRenderTree/gtk/EventSender.cpp: (prepareMouseButtonEvent): Allow passing in a modifier bitmask, which will be OR'd with the current modifiers. (contextClickCallback): Always send no modifiers when preparing the mouse event. (gdkModifersFromJSValue): Added, converts a JSValue array into a GDK modifier bitmask. (mouseDownCallback): Send in the requested modifiers to prepareMouseButtonEvent. (mouseUpCallback): Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk/EventSender.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-06  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] EventSender should support modifier keys with mouseDown and mouseUp events
+        https://bugs.webkit.org/show_bug.cgi?id=45235
+
+        * platform/gtk/Skipped: Unskip a test which is now passing.
+
 2010-09-06  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -5563 +5563 @@
 http/tests/workers/text-encoding.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=38656
-editing/selection/shift-click.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=31302
 fast/css/font-face-woff.html 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-09-06  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] EventSender should support modifier keys with mouseDown and mouseUp events
+        https://bugs.webkit.org/show_bug.cgi?id=45235
+
+        Add support for interpreting the modifier key arguments to the mouseDown and mouseUp
+        methods of the EventSender.
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (prepareMouseButtonEvent): Allow passing in a modifier bitmask, which will be OR'd
+        with the current modifiers.
+        (contextClickCallback): Always send no modifiers when preparing the mouse event.
+        (gdkModifersFromJSValue): Added, converts a JSValue array into a GDK modifier bitmask.
+        (mouseDownCallback): Send in the requested modifiers to prepareMouseButtonEvent.
+        (mouseUpCallback): Ditto.
+
 2010-09-05  Peter Kasting  <pkasting@google.com>
 

trunk/WebKitTools/DumpRenderTree/gtk/EventSender.cpp

@@ -111 +111 @@
 }
 
-bool prepareMouseButtonEvent(GdkEvent* event, int eventSenderButtonNumber)
+bool prepareMouseButtonEvent(GdkEvent* event, int eventSenderButtonNumber, guint modifiers)
 {
     WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
@@ -134 +134 @@
     g_object_ref(event->button.window);
     event->button.device = getDefaultGDKPointerDevice(event->button.window);
-    event->button.state = getStateFlags();
+    event->button.state = modifiers | getStateFlags();
     event->button.time = GDK_CURRENT_TIME;
     event->button.axes = 0;
@@ -149 +149 @@
 {
     GdkEvent* pressEvent = gdk_event_new(GDK_BUTTON_PRESS);
-    if (!prepareMouseButtonEvent(pressEvent, 2))
+    if (!prepareMouseButtonEvent(pressEvent, 2, 0))
         return JSValueMakeUndefined(context);
 
@@ -171 +171 @@
 }
 
+static guint gdkModifersFromJSValue(JSContextRef context, const JSValueRef modifiers)
+{
+    JSObjectRef modifiersArray = JSValueToObject(context, modifiers, 0);
+    if (!modifiersArray)
+        return 0;
+
+    guint gdkModifiers = 0;
+    int modifiersCount = JSValueToNumber(context, JSObjectGetProperty(context, modifiersArray, JSStringCreateWithUTF8CString("length"), 0), 0);
+    for (int i = 0; i < modifiersCount; ++i) {
+        JSValueRef value = JSObjectGetPropertyAtIndex(context, modifiersArray, i, 0);
+        JSStringRef string = JSValueToStringCopy(context, value, 0);
+        if (JSStringIsEqualToUTF8CString(string, "ctrlKey")
+            || JSStringIsEqualToUTF8CString(string, "addSelectionKey"))
+            gdkModifiers |= GDK_CONTROL_MASK;
+        else if (JSStringIsEqualToUTF8CString(string, "shiftKey")
+                 || JSStringIsEqualToUTF8CString(string, "rangeSelectionKey"))
+            gdkModifiers |= GDK_SHIFT_MASK;
+        else if (JSStringIsEqualToUTF8CString(string, "altKey"))
+            gdkModifiers |= GDK_MOD1_MASK;
+
+        // Currently the metaKey as defined in WebCore/platform/gtk/MouseEventGtk.cpp
+        // is GDK_MOD2_MASK. This code must be kept in sync with that file.
+        else if (JSStringIsEqualToUTF8CString(string, "metaKey"))
+            gdkModifiers |= GDK_MOD2_MASK;
+
+        JSStringRelease(string);
+    }
+    return gdkModifiers;
+}
+
 static JSValueRef mouseDownCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
@@ -178 +208 @@
         g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context));
     }
+    guint modifiers = argumentCount >= 2 ? gdkModifersFromJSValue(context, arguments[1]) : 0;
 
     GdkEvent* event = gdk_event_new(GDK_BUTTON_PRESS);
-    if (!prepareMouseButtonEvent(event, button))
+    if (!prepareMouseButtonEvent(event, button, modifiers))
         return JSValueMakeUndefined(context);
 
@@ -221 +252 @@
         g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context));
     }
+    guint modifiers = argumentCount >= 2 ? gdkModifersFromJSValue(context, arguments[1]) : 0;
 
     GdkEvent* event = gdk_event_new(GDK_BUTTON_RELEASE);
-    if (!prepareMouseButtonEvent(event, button))
+    if (!prepareMouseButtonEvent(event, button, modifiers))
         return JSValueMakeUndefined(context);