Index: components/arc/input/arc_input_bridge.h |
diff --git a/components/arc/input/arc_input_bridge.h b/components/arc/input/arc_input_bridge.h |
index 1082dc47c3d65c3a3722f3a75d29adfd39786911..5021741a6cd4897920bc3f4f36913ede50041015 100644 |
--- a/components/arc/input/arc_input_bridge.h |
+++ b/components/arc/input/arc_input_bridge.h |
@@ -2,18 +2,37 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef COMPONENTS_EXO_ARC_INPUT_ARC_INPUT_BRIDGE_H_ |
-#define COMPONENTS_EXO_ARC_INPUT_ARC_INPUT_BRIDGE_H_ |
+#ifndef COMPONENTS_ARC_INPUT_ARC_INPUT_BRIDGE_H_ |
+#define COMPONENTS_ARC_INPUT_ARC_INPUT_BRIDGE_H_ |
+#include <stdint.h> |
+#include <string> |
+#include <vector> |
+ |
+#include "base/files/scoped_file.h" |
#include "base/macros.h" |
#include "components/arc/arc_bridge_service.h" |
+#include "components/arc/arc_service.h" |
+#include "ui/aura/env.h" |
hidehiko
2016/01/18 01:26:45
nit: Looks unnecessary?
Luis Héctor Chávez
2016/01/19 17:43:54
Done.
|
+#include "ui/aura/env_observer.h" |
+#include "ui/aura/window_tracker.h" |
+#include "ui/events/event.h" |
+#include "ui/events/event_handler.h" |
+ |
+namespace aura { |
+class Window; |
hidehiko
2016/01/18 01:26:45
Can we include ui/aura/window.h directly, as we do
Luis Héctor Chávez
2016/01/19 17:43:54
To reduce compilation time, I'd prefer to remove u
|
+} |
+ |
+namespace ui { |
+enum class DomCode; |
+} |
namespace arc { |
class ArcBridgeService; |
-// The ArcInputBridge is responsible for sending input events from ARC windows |
-// to the ARC instance. |
+// The ArcInputBridge is responsible for sending input events from ARC |
+// windows to the ARC instance. |
// It hooks into aura::Env to watch for ExoSurface windows that are running ARC |
// applications. On those windows the input bridge will attach an EventPreTarget |
// to capture all input events. |
@@ -22,22 +41,106 @@ class ArcBridgeService; |
// we can send linux input_event's. |
// ui::Events to the ARC windows are translated to linux input_event's, which |
// are then sent through the respective file descriptor. |
-class ArcInputBridge { |
+class ArcInputBridge : public ArcService, |
+ public ArcBridgeService::Observer, |
+ public aura::EnvObserver, |
+ public ui::EventHandler { |
public: |
- virtual ~ArcInputBridge() {} |
+ // The constructor will register an Observer with aura::Env and the |
+ // ArcBridgeService. From then on, no further interaction with this class |
+ // is needed. |
+ explicit ArcInputBridge(ArcBridgeService* arc_bridge); |
+ ~ArcInputBridge() override; |
- // Creates a new instance of ArcInputBridge. It will register an Observer |
- // with aura::Env and the ArcBridgeService. |
- static scoped_ptr<ArcInputBridge> Create( |
- ArcBridgeService* arc_bridge_service); |
+ // Overridden from ui::EventHandler: |
+ void OnEvent(ui::Event* event) override; |
- protected: |
- ArcInputBridge() {} |
+ // Overridden from aura::EnvObserver: |
+ void OnWindowInitialized(aura::Window* new_window) override; |
+ |
+ // Overridden from ArcBridgeService::Observer: |
+ void OnInputInstanceReady() override; |
private: |
+ // Specialized method to translate and send events to the right file |
+ // descriptor. |
+ void SendKeyEvent(ui::KeyEvent* event); |
+ void SendTouchEvent(ui::TouchEvent* event); |
+ void SendMouseEvent(ui::MouseEvent* event); |
+ |
+ // Helper method to send a struct input_event to the file descriptor. This |
+ // method is to be called on the ui thread and will post a request to send |
+ // the event to the io thread. |
+ // The parameters map directly to the members of input_event as |
+ // defined by the evdev protocol. |
+ // |type| is the type of event to sent, such as EV_SYN, EV_KEY, EV_ABS. |
+ // |code| is either interpreted as axis (ABS_X, ABS_Y, ...) or as key-code |
+ // (KEY_A, KEY_B, ...). |
+ // |value| is either the value of that axis or the boolean value of the key |
+ // as in 0 (released), 1 (pressed) or 2 (repeated press). |
+ void SendKernelEvent(const base::ScopedFD& fd, |
+ base::TimeDelta timestamp, |
+ uint16_t type, |
+ uint16_t code, |
+ int value); |
+ |
+ // Shorthand for sending EV_SYN/SYN_REPORT |
+ void SendSynReport(const base::ScopedFD& fd, base::TimeDelta timestamp); |
+ |
+ // Return existing or new slot for this event. |
+ int AcquireTouchSlot(ui::TouchEvent* event); |
+ |
+ // Return touch slot for tracking id. |
+ int FindTouchSlot(int tracking_id); |
+ |
+ // Maps DOM key codes to evdev key codes |
+ uint16_t DomCodeToEvdevCode(ui::DomCode dom_code); |
+ |
+ // Setup bridge devices on the instance side. This needs to be called after |
+ // the InstanceBootPhase::SYSTEM_SERVICES_READY has been reached. |
+ void SetupBridgeDevices(); |
+ |
+ // Creates and registers file descriptor pair with the ARC bridge service, |
+ // the write end is returned while the read end is sent through the bridge |
+ // to the ARC instance. |
+ // TODO(denniskempin): Make this interface more typesafe. |
+ // |name| should be the displayable name of the emulated device (e.g. "Chrome |
+ // OS Keyboard"), |device_type| the name of the device type (e.g. "keyboard") |
+ // and |fd| a file descriptor that emulates the kernel events of the device. |
+ // This can only be called on the thread that this class was created on. |
+ base::ScopedFD CreateBridgeInputDevice(const std::string& name, |
+ const std::string& device_type); |
+ |
+ // Owned by ArcServiceManager which makes sure ArcBridgeService is destroyed |
+ // after ArcInputBridge. |
+ ArcBridgeService* const arc_bridge_service_; |
+ |
+ // File descriptors for the different device types. |
+ base::ScopedFD keyboard_fd_; |
+ base::ScopedFD mouse_fd_; |
+ base::ScopedFD touchscreen_fd_; |
+ |
+ // Scroll accumlator. |
+ float offset_x_acc_; |
+ float offset_y_acc_; |
+ |
+ // Currently selected slot for multi-touch events. |
+ int current_slot_; |
+ |
+ // List of touch tracking id to slot assignments. |
+ std::vector<int> current_slot_tracking_ids_; |
+ |
+ scoped_refptr<base::SequencedTaskRunner> origin_task_runner_; |
+ |
+ // List of windows we are hooked into |
+ aura::WindowTracker arc_windows_; |
+ |
+ // WeakPtrFactory to use for callbacks. |
+ base::WeakPtrFactory<ArcInputBridge> weak_factory_; |
+ |
DISALLOW_COPY_AND_ASSIGN(ArcInputBridge); |
}; |
} // namespace arc |
-#endif // COMPONENTS_EXO_ARC_INPUT_ARC_INPUT_BRIDGE_H_ |
+#endif // COMPONENTS_ARC_INPUT_ARC_INPUT_BRIDGE_H_ |