summaryrefslogtreecommitdiffstats
path: root/remoting/client
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/client')
-rw-r--r--remoting/client/plugin/chromoting_instance.cc23
-rw-r--r--remoting/client/plugin/chromoting_instance.h4
-rw-r--r--remoting/client/plugin/pepper_input_handler.cc21
-rw-r--r--remoting/client/plugin/pepper_input_handler.h12
4 files changed, 33 insertions, 27 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 71f3563..0c63c49 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -19,7 +19,7 @@
#include "remoting/client/plugin/pepper_input_handler.h"
#include "remoting/client/plugin/pepper_view.h"
#include "remoting/jingle_glue/jingle_thread.h"
-#include "third_party/ppapi/c/pp_event.h"
+#include "third_party/ppapi/c/pp_input_event.h"
#include "third_party/ppapi/cpp/completion_callback.h"
#include "third_party/ppapi/cpp/rect.h"
@@ -112,33 +112,34 @@ bool ChromotingInstance::CurrentlyOnPluginThread() const {
return pepper_main_loop_dont_post_to_me_ == MessageLoop::current();
}
-bool ChromotingInstance::HandleEvent(const PP_Event& event) {
+bool ChromotingInstance::HandleEvent(const PP_InputEvent& event) {
DCHECK(CurrentlyOnPluginThread());
PepperInputHandler* pih
= static_cast<PepperInputHandler*>(input_handler_.get());
switch (event.type) {
- case PP_EVENT_TYPE_MOUSEDOWN:
+ case PP_INPUTEVENT_TYPE_MOUSEDOWN:
pih->HandleMouseButtonEvent(true, event.u.mouse);
return true;
- case PP_EVENT_TYPE_MOUSEUP:
+ case PP_INPUTEVENT_TYPE_MOUSEUP:
pih->HandleMouseButtonEvent(false, event.u.mouse);
return true;
- case PP_EVENT_TYPE_MOUSEMOVE:
- case PP_EVENT_TYPE_MOUSEENTER:
- case PP_EVENT_TYPE_MOUSELEAVE:
+ case PP_INPUTEVENT_TYPE_MOUSEMOVE:
+ case PP_INPUTEVENT_TYPE_MOUSEENTER:
+ case PP_INPUTEVENT_TYPE_MOUSELEAVE:
pih->HandleMouseMoveEvent(event.u.mouse);
return true;
- case PP_EVENT_TYPE_KEYDOWN:
- case PP_EVENT_TYPE_KEYUP:
- pih->HandleKeyEvent(event.type == PP_EVENT_TYPE_KEYDOWN, event.u.key);
+ case PP_INPUTEVENT_TYPE_KEYDOWN:
+ case PP_INPUTEVENT_TYPE_KEYUP:
+ pih->HandleKeyEvent(event.type == PP_INPUTEVENT_TYPE_KEYDOWN,
+ event.u.key);
return true;
- case PP_EVENT_TYPE_CHAR:
+ case PP_INPUTEVENT_TYPE_CHAR:
pih->HandleCharacterEvent(event.u.character);
return true;
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index 6d6d6f7..9001838 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -14,7 +14,6 @@
#include "base/scoped_ptr.h"
#include "remoting/client/client_context.h"
#include "remoting/client/host_connection.h"
-#include "third_party/ppapi/c/pp_event.h"
#include "third_party/ppapi/c/pp_instance.h"
#include "third_party/ppapi/c/pp_rect.h"
#include "third_party/ppapi/c/pp_resource.h"
@@ -22,6 +21,7 @@
#include "third_party/ppapi/cpp/var.h"
class MessageLoop;
+struct PP_InputEvent;
namespace base {
class Thread;
@@ -50,7 +50,7 @@ class ChromotingInstance : public pp::Instance {
virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]);
virtual void Connect(const ClientConfig& config);
- virtual bool HandleEvent(const PP_Event& event);
+ virtual bool HandleEvent(const PP_InputEvent& event);
virtual pp::Var GetInstanceObject();
virtual void ViewChanged(const pp::Rect& position, const pp::Rect& clip);
diff --git a/remoting/client/plugin/pepper_input_handler.cc b/remoting/client/plugin/pepper_input_handler.cc
index 2ba1603..c5677bd 100644
--- a/remoting/client/plugin/pepper_input_handler.cc
+++ b/remoting/client/plugin/pepper_input_handler.cc
@@ -4,6 +4,8 @@
#include "remoting/client/plugin/pepper_input_handler.h"
+#include "third_party/ppapi/c/pp_input_event.h"
+
namespace remoting {
PepperInputHandler::PepperInputHandler(ClientContext* context,
@@ -19,27 +21,28 @@ void PepperInputHandler::Initialize() {
}
void PepperInputHandler::HandleKeyEvent(bool keydown,
- const PP_Event_Key& event) {
- SendKeyEvent(keydown, event.normalizedKeyCode);
+ const PP_InputEvent_Key& event) {
+ SendKeyEvent(keydown, event.key_code);
}
-void PepperInputHandler::HandleCharacterEvent(const PP_Event_Character& event) {
+void PepperInputHandler::HandleCharacterEvent(const PP_InputEvent_Character& event) {
// TODO(garykac): Coordinate key and char events.
}
-void PepperInputHandler::HandleMouseMoveEvent(const PP_Event_Mouse& event) {
+void PepperInputHandler::HandleMouseMoveEvent(const PP_InputEvent_Mouse& event) {
SendMouseMoveEvent(static_cast<int>(event.x),
static_cast<int>(event.y));
}
-void PepperInputHandler::HandleMouseButtonEvent(bool button_down,
- const PP_Event_Mouse& event) {
+void PepperInputHandler::HandleMouseButtonEvent(
+ bool button_down,
+ const PP_InputEvent_Mouse& event) {
MouseButton button = MouseButtonUndefined;
- if (event.button == PP_EVENT_MOUSEBUTTON_LEFT) {
+ if (event.button == PP_INPUTEVENT_MOUSEBUTTON_LEFT) {
button = MouseButtonLeft;
- } else if (event.button == PP_EVENT_MOUSEBUTTON_MIDDLE) {
+ } else if (event.button == PP_INPUTEVENT_MOUSEBUTTON_MIDDLE) {
button = MouseButtonMiddle;
- } else if (event.button == PP_EVENT_MOUSEBUTTON_RIGHT) {
+ } else if (event.button == PP_INPUTEVENT_MOUSEBUTTON_RIGHT) {
button = MouseButtonRight;
}
diff --git a/remoting/client/plugin/pepper_input_handler.h b/remoting/client/plugin/pepper_input_handler.h
index dd2a76e..f7ad657 100644
--- a/remoting/client/plugin/pepper_input_handler.h
+++ b/remoting/client/plugin/pepper_input_handler.h
@@ -7,7 +7,9 @@
#include "remoting/client/input_handler.h"
-#include "third_party/ppapi/c/pp_event.h"
+struct PP_InputEvent_Character;
+struct PP_InputEvent_Key;
+struct PP_InputEvent_Mouse;
namespace remoting {
@@ -20,12 +22,12 @@ class PepperInputHandler : public InputHandler {
void Initialize();
- void HandleKeyEvent(bool keydown, const PP_Event_Key& event);
- void HandleCharacterEvent(const PP_Event_Character& event);
+ void HandleKeyEvent(bool keydown, const PP_InputEvent_Key& event);
+ void HandleCharacterEvent(const PP_InputEvent_Character& event);
- void HandleMouseMoveEvent(const PP_Event_Mouse& event);
+ void HandleMouseMoveEvent(const PP_InputEvent_Mouse& event);
void HandleMouseButtonEvent(bool button_down,
- const PP_Event_Mouse& event);
+ const PP_InputEvent_Mouse& event);
private:
DISALLOW_COPY_AND_ASSIGN(PepperInputHandler);
generated by cgit v1.1 at 2025-02-07 14:43:24 +0000