Changeset 1087 for trunk/src/platform/naclTweet

Timestamp:

Nov 25, 2011, 12:30:26 AM (11 years ago)

Author:

sam

Message:

nacl: quick and dirty mouse support.

Location:

trunk/src/platform/nacl

Files:

• nacl_instance.cpp (modified) (3 diffs)
• nacl_instance.h (modified) (1 diff)
• opengl_context.h (modified) (1 diff)

trunk/src/platform/nacl/nacl_instance.cpp

@@ -18 +18 @@
 #include <ppapi/cpp/module.h>
 #include <ppapi/cpp/completion_callback.h>
+#include <ppapi/cpp/input_event.h>
 
 #include "core.h"
@@ -32 +33 @@
       m_size(0, 0)
 {
-    ;
+    RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE);
 }
 
@@ -102 +103 @@
 }
 
+bool NaClInstance::HandleInputEvent(const pp::InputEvent& event)
+{
+    switch (event.GetType())
+    {
+    case PP_INPUTEVENT_TYPE_MOUSEDOWN:
+        Input::SetMouseButton(pp::MouseInputEvent(event).GetButton());
+        break;
+    case PP_INPUTEVENT_TYPE_MOUSEUP:
+        Input::UnsetMouseButton(pp::MouseInputEvent(event).GetButton());
+        break;
+    case PP_INPUTEVENT_TYPE_MOUSEMOVE:
+        Input::SetMousePos(ivec2(pp::MouseInputEvent(event).GetPosition().x(), opengl_context_->GetSize().height() - 1 - pp::MouseInputEvent(event).GetPosition().y()));
+        break;
+    default:
+        break;
+    }
+    return true;
+}
+
 void NaClInstance::DrawSelf()
 {

trunk/src/platform/nacl/nacl_instance.h

@@ -37 +37 @@
   //void InitializeMethods(ScriptingBridge* bridge);
 
+
   // Called to draw the contents of the module's browser area.
-  void DrawSelf();
+    virtual bool HandleInputEvent(const pp::InputEvent& event);
 
-// private:
-  // Browser connectivity and scripting support.
-//  ScriptingBridge scripting_bridge_;
+    void DrawSelf();
 
-  SharedOpenGLContext opengl_context_;
+    SharedOpenGLContext opengl_context_;
 
     ivec2 m_size;

trunk/src/platform/nacl/opengl_context.h

@@ -62 +62 @@
   void ResizeContext(const pp::Size& size);
 
+  pp::Size const& GetSize() { return size_; }
+
   /// The OpenGL ES 2.0 interface.
   const struct PPB_OpenGLES2* gles2() const {