Implement character and wheel events

1 files changed, 39 insertions, 10 deletions

diff --git a/src/gui/kernel/qeventdispatcher_pepper.cpp b/src/gui/kernel/qeventdispatcher_pepper.cpp
index 04b9be35f8..7fe8a6167d 100644
--- a/src/gui/kernel/qeventdispatcher_pepper.cpp
+++ b/src/gui/kernel/qeventdispatcher_pepper.cpp
@@ -88,6 +88,7 @@ QEventDispatcherPepper::~QEventDispatcherPepper()
 
 bool QEventDispatcherPepper::processEvents(QEventLoop::ProcessEventsFlags flags)
 {
+    Q_UNUSED(flags);
 }
 
 
@@ -99,12 +100,12 @@ bool QEventDispatcherPepper::hasPendingEvents()
 
 void QEventDispatcherPepper::registerSocketNotifier(QSocketNotifier *notifier)
 {
-
+    Q_UNUSED(notifier);
 }
 
 void QEventDispatcherPepper::unregisterSocketNotifier(QSocketNotifier *notifier)
 {
-
+    Q_UNUSED(notifier);
 }
 
 void QEventDispatcherPepper::startingUp()
@@ -188,12 +189,19 @@ void QEventDispatcherPepper::processKeyEvent(NPKeyEvent *key, uint32 eventType)
 
 void QEventDispatcherPepper::processCharacterEvent(NPCharacterEvent *character)
 {
-
+/*
+  uint32 modifier;
+  uint16 text[4];
+  uint16 unmodifiedText[4];
+*/
+    QKeyEvent keyEvent(QEvent::KeyPress, 0, Qt::NoModifier,
+                       QString(reinterpret_cast<QChar *>(character->text), 4));
+    QApplicationPrivate::handleKeyEvent(0, &keyEvent);
 }
 
-Qt::MouseButtons pepperMouseButtonToQt(int32 pepperButton)
+Qt::MouseButton pepperMouseButtonToQt(int32 pepperButton)
 {
-    Qt::MouseButtons button;
+    Qt::MouseButton button;
     if (pepperButton == NPMouseButton_Left)
         button = Qt::LeftButton;
     if (pepperButton == NPMouseButton_Middle)
@@ -214,18 +222,18 @@ void QEventDispatcherPepper::processMouseEvent(NPMouseEvent *mouse, uint32 event
   int32 clickCount;
 */
     QPoint p(mouse->x, mouse->y);
-    Qt::MouseButtons buttons = pepperMouseButtonToQt(mouse->button);
+    Qt::MouseButton button = pepperMouseButtonToQt(mouse->button);
     
     if (eventType == NPEventType_MouseDown) {
         //fprintf(stderr, "mouse coords %d %d \n", event.button.x, event.button.y);
         
-        QMouseEvent mouseEvent(QEvent::MouseButtonPress, p, p, Qt::LeftButton,
-                               Qt::LeftButton, Qt::NoModifier);
+        QMouseEvent mouseEvent(QEvent::MouseButtonPress, p, p, button,
+                               button, Qt::NoModifier);
         QApplicationPrivate::handleMouseEvent(0, mouseEvent);
     }
     
     else if (eventType == NPEventType_MouseUp) {
-        QMouseEvent mouseEvent(QEvent::MouseButtonRelease, p, p, Qt::LeftButton,
+        QMouseEvent mouseEvent(QEvent::MouseButtonRelease, p, p, button,
                                Qt::NoButton, Qt::NoModifier);
         QApplicationPrivate::handleMouseEvent(0, mouseEvent);
     }
@@ -242,22 +250,43 @@ void QEventDispatcherPepper::processMouseEvent(NPMouseEvent *mouse, uint32 event
 
 void QEventDispatcherPepper::processMouseWheelEvent(NPMouseWheelEvent *wheel)
 {
-    Q_UNUSED(wheel)
+/*
+  uint32 modifier;
+  float deltaX;
+  float deltaY;
+  float wheelTicksX;
+  float wheelTicksY;
+  uint32 scrollByPage;
+*/
+    QWheelEvent wheelEvent(QPoint(), QPoint(wheel->deltaX, wheel->deltaY),
+                           Qt::NoButton, Qt::NoButton, Qt::NoModifier);
+    
+    QApplicationPrivate::handleWheelEvent(0, wheelEvent);
 }
 
 void QEventDispatcherPepper::processMinimizeEvent(NPMinimizeEvent *minimize)
 {
     Q_UNUSED(minimize)
+/*
+  int32 value;
+*/
 }
 
 void QEventDispatcherPepper::processFocusEvent(NPFocusEvent *focus)
 {
     Q_UNUSED(focus)
+/*
+  int32 value;
+*/
 }
 
 void QEventDispatcherPepper::processDeviceEvent(NPDeviceEvent *device)
 {
     Q_UNUSED(device)
+/*  
+  uint32 device_uid;
+  uint32 subtype;
+*/
 }