Changeset 71078 in webkit

Timestamp:

Nov 1, 2010 5:05:16 PM (13 years ago)

Author:

tony@chromium.org

Message:

2010-11-01 Tony Chang <​tony@chromium.org>

Reviewed by Kent Tamura.

add plugin event logging for linux
​https://bugs.webkit.org/show_bug.cgi?id=48779

This is taken from Chromium's fork of the layout test plugin:
​http://git.chromium.org/gitweb/?p=chromium.git/.git;a=blob;f=webkit/tools/npapi_layout_test_plugin/main.cpp;h=3ebdada2f049b3624756438cff852364f86a2ede;hb=HEAD#l348

• DumpRenderTree/TestNetscapePlugIn/main.cpp: (handleEventX11): (NPP_HandleEvent):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/TestNetscapePlugIn/main.cpp (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-11-01  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        add plugin event logging for linux
+        https://bugs.webkit.org/show_bug.cgi?id=48779
+
+        This is taken from Chromium's fork of the layout test plugin:
+        http://git.chromium.org/gitweb/?p=chromium.git/.git;a=blob;f=webkit/tools/npapi_layout_test_plugin/main.cpp;h=3ebdada2f049b3624756438cff852364f86a2ede;hb=HEAD#l348
+
+        * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+        (handleEventX11):
+        (NPP_HandleEvent):
+
 2010-11-01  Dirk Pranke  <dpranke@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp

@@ -29 +29 @@
 #include <cstdlib>
 #include <string>
+
+#ifdef XP_UNIX
+#include <X11/Xlib.h>
+#endif
 
 #if !defined(NP_NO_CARBON) && defined(QD_HEADERS_ARE_PRIVATE) && QD_HEADERS_ARE_PRIVATE
@@ -566 +570 @@
 #endif // XP_MACOSX
 
+#ifdef XP_UNIX
+static int16_t handleEventX11(NPP instance, PluginObject* obj, XEvent* event)
+{
+    XButtonPressedEvent* buttonPressEvent = reinterpret_cast<XButtonPressedEvent*>(event);
+    XButtonReleasedEvent* buttonReleaseEvent = reinterpret_cast<XButtonReleasedEvent*>(event);
+    switch (event->type) {
+    case ButtonPress:
+        pluginLog(instance, "mouseDown at (%d, %d)", buttonPressEvent->x, buttonPressEvent->y);
+        if (obj->evaluateScriptOnMouseDownOrKeyDown && obj->mouseDownForEvaluateScript)
+            executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);
+        break;
+    case ButtonRelease:
+        pluginLog(instance, "mouseUp at (%d, %d)", buttonReleaseEvent->x, buttonReleaseEvent->y);
+        break;
+    case KeyPress:
+        // FIXME: extract key code
+        pluginLog(instance, "NOTIMPLEMENTED: keyDown '%c'", ' ');
+        if (obj->evaluateScriptOnMouseDownOrKeyDown && !obj->mouseDownForEvaluateScript)
+            executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);
+        break;
+    case KeyRelease:
+        // FIXME: extract key code
+        pluginLog(instance, "NOTIMPLEMENTED: keyUp '%c'", ' ');
+        break;
+    case GraphicsExpose:
+        pluginLog(instance, "updateEvt");
+        break;
+    // NPAPI events
+    case FocusIn:
+        pluginLog(instance, "getFocusEvent");
+        break;
+    case FocusOut:
+        pluginLog(instance, "loseFocusEvent");
+        break;
+    case EnterNotify:
+    case LeaveNotify:
+    case MotionNotify:
+        pluginLog(instance, "adjustCursorEvent");
+        break;
+    default:
+        pluginLog(instance, "event %d", event->type);
+    }
+
+    fflush(stdout);
+    return 0;
+}
+#endif // XP_UNIX
+
 int16_t NPP_HandleEvent(NPP instance, void *event)
 {
@@ -580 +632 @@
     assert(obj->eventModel == NPEventModelCocoa);
     return handleEventCocoa(instance, obj, static_cast<NPCocoaEvent*>(event));
+#elif defined(XP_UNIX)
+    return handleEventX11(instance, obj, static_cast<XEvent*>(event));
 #else
     // FIXME: Implement for other platforms.