Merge pull request anbox#1129 from p-an/enable_multitouch

enable multitouch

Author: morphis

src/anbox/platform/sdl/platform.cpp

@@ -111,9 +111,6 @@ Platform::Platform(
   touch_->set_driver_version(1);
   touch_->set_input_id({BUS_VIRTUAL, 4, 4, 4});
   touch_->set_physical_location("none");
-  touch_->set_key_bit(BTN_TOUCH);
-  touch_->set_key_bit(BTN_TOOL_FINGER);
-
   touch_->set_abs_bit(ABS_MT_SLOT);
   touch_->set_abs_max(ABS_MT_SLOT, 10);
   touch_->set_abs_bit(ABS_MT_TOUCH_MAJOR);
@@ -125,9 +122,12 @@ Platform::Platform(
   touch_->set_abs_bit(ABS_MT_POSITION_Y);
   touch_->set_abs_max(ABS_MT_POSITION_Y, display_frame.height());
   touch_->set_abs_bit(ABS_MT_TRACKING_ID);
-  touch_->set_abs_max(ABS_MT_TRACKING_ID, 10);
+  touch_->set_abs_max(ABS_MT_TRACKING_ID, MAX_TRACKING_ID);
   touch_->set_prop_bit(INPUT_PROP_DIRECT);
 
+  for (int i = 0; i < MAX_FINGERS; i++)
+      touch_slots[i] = -1;
+
   event_thread_ = std::thread(&Platform::process_events, this);
 }
 
@@ -204,30 +204,14 @@ void Platform::process_input_event(const SDL_Event &event) {
         y = event.button.y;
         if (!adjust_coordinates(x, y))
           break;
-
-        touch_events.push_back({EV_ABS, ABS_MT_TRACKING_ID, static_cast<std::int32_t>(emulated_touch_id_)});
-        touch_events.push_back({EV_ABS, ABS_MT_SLOT, 0});
-        touch_events.push_back({EV_KEY, BTN_TOUCH, 1});
-        touch_events.push_back({EV_KEY, BTN_TOOL_FINGER, 1});
-
-        touch_events.push_back({EV_ABS, ABS_MT_POSITION_X, x});
-        touch_events.push_back({EV_ABS, ABS_MT_POSITION_Y, y});
-
-        touch_events.push_back({EV_ABS, ABS_MT_TOUCH_MAJOR, 24});
-        touch_events.push_back({EV_ABS, ABS_MT_TOUCH_MINOR, 24});
-
-        touch_events.push_back({EV_SYN, SYN_REPORT, 0});
+        push_finger_down(x, y, emulated_touch_id_, touch_events);
       }
       break;
     case SDL_MOUSEBUTTONUP:
       if (config_.no_touch_emulation) {
         mouse_events.push_back({EV_KEY, BTN_LEFT, 0});
       } else {
-        touch_events.push_back({EV_ABS, ABS_MT_TRACKING_ID, -1});
-        touch_events.push_back({EV_ABS, ABS_MT_SLOT, 0});
-        touch_events.push_back({EV_KEY, BTN_TOUCH, 0});
-        touch_events.push_back({EV_KEY, BTN_TOOL_FINGER, 0});
-        touch_events.push_back({EV_SYN, SYN_REPORT, 0});
+        push_finger_up(emulated_touch_id_, touch_events);
       }
       break;
     case SDL_MOUSEMOTION:
@@ -248,14 +232,7 @@ void Platform::process_input_event(const SDL_Event &event) {
         mouse_events.push_back({EV_REL, REL_X, event.motion.xrel});
         mouse_events.push_back({EV_REL, REL_Y, event.motion.yrel});
       } else {
-        touch_events.push_back({EV_ABS, ABS_MT_SLOT, 0});
-
-        touch_events.push_back({EV_ABS, ABS_MT_POSITION_X, x});
-        touch_events.push_back({EV_ABS, ABS_MT_POSITION_Y, y});
-
-        touch_events.push_back({EV_ABS, ABS_MT_TOUCH_MAJOR, 24});
-        touch_events.push_back({EV_ABS, ABS_MT_TOUCH_MINOR, 24});
-        touch_events.push_back({EV_SYN, SYN_REPORT, 0});
+        push_finger_motion(x, y, emulated_touch_id_, touch_events);
       }
       break;
     case SDL_MOUSEWHEEL:
@@ -285,44 +262,21 @@ void Platform::process_input_event(const SDL_Event &event) {
     }
     // Touch screen
     case SDL_FINGERDOWN: {
-      touch_events.push_back({EV_ABS, ABS_MT_TRACKING_ID, static_cast<std::int32_t>(event.tfinger.fingerId)});
-      touch_events.push_back({EV_ABS, ABS_MT_SLOT, 0});
-      touch_events.push_back({EV_KEY, BTN_TOUCH, 1});
-      touch_events.push_back({EV_KEY, BTN_TOOL_FINGER, 1});
-
       if (!calculate_touch_coordinates(event, x, y))
         break;
+      push_finger_down(x, y, event.tfinger.fingerId, touch_events);
 
-      touch_events.push_back({EV_ABS, ABS_MT_POSITION_X, x});
-      touch_events.push_back({EV_ABS, ABS_MT_POSITION_Y, y});
-
-      touch_events.push_back({EV_ABS, ABS_MT_TOUCH_MAJOR, 24});
-      touch_events.push_back({EV_ABS, ABS_MT_TOUCH_MINOR, 24});
-
-      touch_events.push_back({EV_SYN, SYN_REPORT, 0});
       break;
     }
-	  case SDL_FINGERUP: {
-      touch_events.push_back({EV_ABS, ABS_MT_TRACKING_ID, -1});
-      touch_events.push_back({EV_ABS, ABS_MT_SLOT, 0});
-      touch_events.push_back({EV_KEY, BTN_TOUCH, 0});
-      touch_events.push_back({EV_KEY, BTN_TOOL_FINGER, 0});
-      touch_events.push_back({EV_SYN, SYN_REPORT, 0});
+    case SDL_FINGERUP: {
+      push_finger_up(event.tfinger.fingerId, touch_events);
       break;
     }
-	  case SDL_FINGERMOTION: {
-      touch_events.push_back({EV_ABS, ABS_MT_SLOT, 0});
+	case SDL_FINGERMOTION: {
 
       if (!calculate_touch_coordinates(event, x, y))
         break;
-
-      touch_events.push_back({EV_ABS, ABS_MT_POSITION_X, x});
-      touch_events.push_back({EV_ABS, ABS_MT_POSITION_Y, y});
-      DEBUG("ABS_MT_POSITION: x: %i y: %i", x,y);
-
-      touch_events.push_back({EV_ABS, ABS_MT_TOUCH_MAJOR, 24});
-      touch_events.push_back({EV_ABS, ABS_MT_TOUCH_MINOR, 24});
-      touch_events.push_back({EV_SYN, SYN_REPORT, 0});
+      push_finger_motion(x, y, event.tfinger.fingerId, touch_events);
       break;
     }
     default:
@@ -341,6 +295,56 @@ void Platform::process_input_event(const SDL_Event &event) {
     touch_->send_events(touch_events);
 }
 
+int Platform::find_touch_slot(int id){
+    for (int i = 0; i < MAX_FINGERS; i++) {
+        if (touch_slots[i] == id)
+          return i;
+    }
+    return -1;
+}
+
+void Platform::push_slot(std::vector<input::Event> &touch_events, int slot){
+    if (last_slot != slot) {
+        touch_events.push_back({EV_ABS, ABS_MT_SLOT, slot});
+        last_slot = slot;
+    }
+}
+
+void Platform::push_finger_down(int x, int y, int finger_id, std::vector<input::Event> &touch_events){
+    int slot = find_touch_slot(-1);
+    if (slot == -1) {
+        DEBUG("no free slot!");
+        return;
+    }
+    touch_slots[slot] = finger_id;
+    push_slot(touch_events, slot);
+    touch_events.push_back({EV_ABS, ABS_MT_TRACKING_ID, static_cast<std::int32_t>(finger_id % MAX_TRACKING_ID + 1)});
+    touch_events.push_back({EV_ABS, ABS_MT_POSITION_X, x});
+    touch_events.push_back({EV_ABS, ABS_MT_POSITION_Y, y});
+    touch_events.push_back({EV_SYN, SYN_REPORT, 0});
+}
+
+void Platform::push_finger_up(int finger_id, std::vector<input::Event> &touch_events){
+    int slot = find_touch_slot(finger_id);
+    if (slot == -1) 
+      return;
+    push_slot(touch_events, slot);
+    touch_events.push_back({EV_ABS, ABS_MT_TRACKING_ID, -1});
+    touch_events.push_back({EV_SYN, SYN_REPORT, 0});
+    touch_slots[slot] = -1;
+}
+
+void Platform::push_finger_motion(int x, int y, int finger_id, std::vector<input::Event> &touch_events){
+    int slot = find_touch_slot(finger_id);
+    if (slot == -1) 
+      return;
+    push_slot(touch_events, slot);
+    touch_events.push_back({EV_ABS, ABS_MT_POSITION_X, x});
+    touch_events.push_back({EV_ABS, ABS_MT_POSITION_Y, y});
+    touch_events.push_back({EV_SYN, SYN_REPORT, 0});
+}
+
+
 bool Platform::adjust_coordinates(std::int32_t &x, std::int32_t &y) {
   SDL_Window *window = nullptr;
 

src/anbox/platform/sdl/platform.h

@@ -22,6 +22,7 @@
 #include "anbox/platform/sdl/sdl_wrapper.h"
 #include "anbox/platform/base_platform.h"
 #include "anbox/graphics/emugl/DisplayManager.h"
+#include "anbox/input/device.h"
 
 #include <map>
 #include <thread>
@@ -97,6 +98,17 @@ class Platform : public std::enable_shared_from_this<Platform>,
   bool window_size_immutable_ = false;
   std::uint32_t focused_sdl_window_id_ = 0;
   Configuration config_;
+
+  static const int MAX_FINGERS = 10;
+  static const int MAX_TRACKING_ID = 10;
+  int touch_slots[MAX_FINGERS];
+  int last_slot = -1;
+
+  int find_touch_slot(int id);
+  void push_slot(std::vector<input::Event> &touch_events, int slot);
+  void push_finger_down(int x, int y, int finger_id, std::vector<input::Event> &touch_events);
+  void push_finger_up(int finger_id, std::vector<input::Event> &touch_events);
+  void push_finger_motion(int x, int y, int finger_id, std::vector<input::Event> &touch_events);
 };
 } // namespace sdl
 } // namespace platform