Merge mouse and touch events

Both are handled the very same way on the device.

BUILD.md

@@ -43,7 +43,7 @@ Install the required packages from your package manager.
 sudo apt install ffmpeg libsdl2-2.0-0
 
 # client build dependencies
-sudo apt install make gcc git pkg-config meson ninja-build \
+sudo apt install gcc git pkg-config meson ninja-build \
                  libavcodec-dev libavformat-dev libavutil-dev \
                  libsdl2-dev
 

FAQ.md

@@ -1,10 +1,5 @@
 # Frequently Asked Questions
 
-## Common issues
-
-The application is very young, it is not unlikely that you encounter problems
-with it.
-
 Here are the common reported problems and their status.
 
 
@@ -20,9 +15,13 @@ Windows may need some [drivers] to detect your device.
 [drivers]: https://developer.android.com/studio/run/oem-usb.html
 
 
-### Mouse clicks do not work
+### I can only mirror, I cannot interact with the device
 
 On some devices, you may need to enable an option to allow [simulating input].
+In developer options, enable:
+
+> **USB debugging (Security settings)**  
+> _Allow granting permissions and simulating input via USB debugging_
 
 [simulating input]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323
 
@@ -43,6 +42,16 @@ meson x --buildtype release -Dhidpi_support=false
 However, the video will be displayed at lower resolution.
 
 
+### The quality is low on HiDPI display
+
+On Windows, you may need to configure the [scaling behavior].
+
+> `scrcpy.exe` > Properties > Compatibility > Change high DPI settings >
+> Override high DPI scaling behavior > Scaling performed by: _Application_.
+
+[scaling behavior]: https://github.com/Genymobile/scrcpy/issues/40#issuecomment-424466723
+
+
 ### KWin compositor crashes
 
 On Plasma Desktop, compositor is disabled while _scrcpy_ is running.
@@ -50,3 +59,26 @@ On Plasma Desktop, compositor is disabled while _scrcpy_ is running.
 As a workaround, [disable "Block compositing"][kwin].
 
 [kwin]: https://github.com/Genymobile/scrcpy/issues/114#issuecomment-378778613
+
+
+### I get an error "Could not open video stream"
+
+There may be many reasons. One common cause is that the hardware encoder of your
+device is not able to encode at the given definition:
+
+```
+ERROR: Exception on thread Thread[main,5,main]
+android.media.MediaCodec$CodecException: Error 0xfffffc0e
+...
+Exit due to uncaughtException in main thread:
+ERROR: Could not open video stream
+INFO: Initial texture: 1080x2336
+```
+
+Just try with a lower definition:
+
+```
+scrcpy -m 1920
+scrcpy -m 1024
+scrcpy -m 800
+```

app/meson.build

@@ -3,10 +3,10 @@ src = [
     'src/command.c',
     'src/control_msg.c',
     'src/controller.c',
-    'src/convert.c',
     'src/decoder.c',
     'src/device.c',
     'src/device_msg.c',
+    'src/event_converter.c',
     'src/file_handler.c',
     'src/fps_counter.c',
     'src/input_manager.c',

app/src/buffer_util.h

@@ -4,6 +4,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "config.h"
+
 static inline void
 buffer_write16be(uint8_t *buf, uint16_t value) {
     buf[0] = value >> 8;
@@ -18,6 +20,12 @@ buffer_write32be(uint8_t *buf, uint32_t value) {
     buf[3] = value;
 }
 
+static inline void
+buffer_write64be(uint8_t *buf, uint64_t value) {
+    buffer_write32be(buf, value >> 32);
+    buffer_write32be(&buf[4], (uint32_t) value);
+}
+
 static inline uint16_t
 buffer_read16be(const uint8_t *buf) {
     return (buf[0] << 8) | buf[1];

app/src/cbuf.h

@@ -5,6 +5,8 @@
 #include <stdbool.h>
 #include <unistd.h>
 
+#include "config.h"
+
 // To define a circular buffer type of 20 ints:
 //     struct cbuf_int CBUF(int, 20);
 //

app/src/command.c

@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "config.h"
 #include "common.h"
 #include "log.h"
 #include "str_util.h"

app/src/command.h

@@ -33,6 +33,8 @@
 
 #endif
 
+#include "config.h"
+
 # define NO_EXIT_CODE -1
 
 enum process_result {

app/src/common.h

@@ -3,6 +3,8 @@
 
 #include <stdint.h>
 
+#include "config.h"
+
 #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
 #define MIN(X,Y) (X) < (Y) ? (X) : (Y)
 #define MAX(X,Y) (X) > (Y) ? (X) : (Y)

app/src/control_msg.c

@@ -1,7 +1,9 @@
 #include "control_msg.h"
 
 #include <string.h>
+#include <SDL2/SDL_assert.h>
 
+#include "config.h"
 #include "buffer_util.h"
 #include "log.h"
 #include "str_util.h"
@@ -23,6 +25,16 @@ write_string(const char *utf8, size_t max_len, unsigned char *buf) {
     return 2 + len;
 }
 
+static uint16_t
+to_fixed_point_16(float f) {
+    SDL_assert(f >= 0.0f && f <= 1.0f);
+    uint32_t u = f * 0x1p16f; // 2^16
+    if (u >= 0xffff) {
+        u = 0xffff;
+    }
+    return (uint16_t) u;
+}
+
 size_t
 control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
     buf[0] = msg->type;
@@ -37,11 +49,15 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
                                       CONTROL_MSG_TEXT_MAX_LENGTH, &buf[1]);
             return 1 + len;
         }
-        case CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT:
-            buf[1] = msg->inject_mouse_event.action;
-            buffer_write32be(&buf[2], msg->inject_mouse_event.buttons);
-            write_position(&buf[6], &msg->inject_mouse_event.position);
-            return 18;
+        case CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT:
+            buf[1] = msg->inject_touch_event.action;
+            buffer_write64be(&buf[2], msg->inject_touch_event.pointer_id);
+            write_position(&buf[10], &msg->inject_touch_event.position);
+            uint16_t pressure =
+                to_fixed_point_16(msg->inject_touch_event.pressure);
+            buffer_write16be(&buf[22], pressure);
+            buffer_write32be(&buf[24], msg->inject_touch_event.buttons);
+            return 28;
         case CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT:
             write_position(&buf[1], &msg->inject_scroll_event.position);
             buffer_write32be(&buf[13],

app/src/control_msg.h

@@ -5,6 +5,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "config.h"
 #include "android/input.h"
 #include "android/keycodes.h"
 #include "common.h"
@@ -14,10 +15,12 @@
 #define CONTROL_MSG_SERIALIZED_MAX_SIZE \
     (3 + CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH)
 
+#define POINTER_ID_MOUSE UINT64_C(-1);
+
 enum control_msg_type {
     CONTROL_MSG_TYPE_INJECT_KEYCODE,
     CONTROL_MSG_TYPE_INJECT_TEXT,
-    CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT,
+    CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
     CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
     CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
     CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL,
@@ -47,8 +50,10 @@ struct control_msg {
         struct {
             enum android_motionevent_action action;
             enum android_motionevent_buttons buttons;
+            uint64_t pointer_id;
             struct position position;
-        } inject_mouse_event;
+            float pressure;
+        } inject_touch_event;
         struct {
             struct position position;
             int32_t hscroll;

app/src/controller.h

@@ -5,6 +5,7 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
+#include "config.h"
 #include "cbuf.h"
 #include "control_msg.h"
 #include "net.h"

app/src/convert.h

@@ -1,41 +0,0 @@
-#ifndef CONVERT_H
-#define CONVERT_H
-
-#include <stdbool.h>
-#include <SDL2/SDL_events.h>
-
-#include "control_msg.h"
-
-struct complete_mouse_motion_event {
-    SDL_MouseMotionEvent *mouse_motion_event;
-    struct size screen_size;
-};
-
-struct complete_mouse_wheel_event {
-    SDL_MouseWheelEvent *mouse_wheel_event;
-    struct point position;
-};
-
-bool
-input_key_from_sdl_to_android(const SDL_KeyboardEvent *from,
-                              struct control_msg *to);
-
-bool
-mouse_button_from_sdl_to_android(const SDL_MouseButtonEvent *from,
-                                 struct size screen_size,
-                                 struct control_msg *to);
-
-// the video size may be different from the real device size, so we need the
-// size to which the absolute position apply, to scale it accordingly
-bool
-mouse_motion_from_sdl_to_android(const SDL_MouseMotionEvent *from,
-                                 struct size screen_size,
-                                 struct control_msg *to);
-
-// on Android, a scroll event requires the current mouse position
-bool
-mouse_wheel_from_sdl_to_android(const SDL_MouseWheelEvent *from,
-                                struct position position,
-                                struct control_msg *to);
-
-#endif

app/src/decoder.c

@@ -8,8 +8,8 @@
 #include <SDL2/SDL_thread.h>
 #include <unistd.h>
 
-#include "compat.h"
 #include "config.h"
+#include "compat.h"
 #include "buffer_util.h"
 #include "events.h"
 #include "lock_util.h"

app/src/decoder.h

@@ -4,6 +4,8 @@
 #include <stdbool.h>
 #include <libavformat/avformat.h>
 
+#include "config.h"
+
 struct video_buffer;
 
 struct decoder {

app/src/device.c

@@ -1,4 +1,6 @@
 #include "device.h"
+
+#include "config.h"
 #include "log.h"
 
 bool

app/src/device.h

@@ -3,6 +3,7 @@
 
 #include <stdbool.h>
 
+#include "config.h"
 #include "common.h"
 #include "net.h"
 

app/src/device_msg.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <SDL2/SDL_assert.h>
 
+#include "config.h"
 #include "buffer_util.h"
 #include "log.h"
 

app/src/device_msg.h

@@ -5,6 +5,8 @@
 #include <stdint.h>
 #include <unistd.h>
 
+#include "config.h"
+
 #define DEVICE_MSG_TEXT_MAX_LENGTH 4093
 #define DEVICE_MSG_SERIALIZED_MAX_SIZE (3 + DEVICE_MSG_TEXT_MAX_LENGTH)
 

app/src/event_converter.c

@@ -1,4 +1,6 @@
-#include "convert.h"
+#include "event_converter.h"
+
+#include "config.h"
 
 #define MAP(FROM, TO) case FROM: *to = TO; return true
 #define FAIL default: return false
@@ -31,7 +33,6 @@ autocomplete_metastate(enum android_metastate metastate) {
     return metastate;
 }
 
-
 static enum android_metastate
 convert_meta_state(SDL_Keymod mod) {
     enum android_metastate metastate = 0;
@@ -127,15 +128,6 @@ convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod) {
     }
 }
 
-static bool
-convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to) {
-    switch (from) {
-        MAP(SDL_MOUSEBUTTONDOWN, AMOTION_EVENT_ACTION_DOWN);
-        MAP(SDL_MOUSEBUTTONUP,   AMOTION_EVENT_ACTION_UP);
-        FAIL;
-    }
-}
-
 static enum android_motionevent_buttons
 convert_mouse_buttons(uint32_t state) {
     enum android_motionevent_buttons buttons = 0;
@@ -158,8 +150,7 @@ convert_mouse_buttons(uint32_t state) {
 }
 
 bool
-input_key_from_sdl_to_android(const SDL_KeyboardEvent *from,
-                              struct control_msg *to) {
+convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to) {
     to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE;
 
     if (!convert_keycode_action(from->type, &to->inject_keycode.action)) {
@@ -176,43 +167,82 @@ input_key_from_sdl_to_android(const SDL_KeyboardEvent *from,
     return true;
 }
 
-bool
-mouse_button_from_sdl_to_android(const SDL_MouseButtonEvent *from,
-                                 struct size screen_size,
-                                 struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT;
+static bool
+convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to) {
+    switch (from) {
+        MAP(SDL_MOUSEBUTTONDOWN, AMOTION_EVENT_ACTION_DOWN);
+        MAP(SDL_MOUSEBUTTONUP,   AMOTION_EVENT_ACTION_UP);
+        FAIL;
+    }
+}
 
-    if (!convert_mouse_action(from->type, &to->inject_mouse_event.action)) {
+bool
+convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size,
+                     struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+
+    if (!convert_mouse_action(from->type, &to->inject_touch_event.action)) {
         return false;
     }
 
-    to->inject_mouse_event.buttons =
+    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
+    to->inject_touch_event.position.screen_size = screen_size;
+    to->inject_touch_event.position.point.x = from->x;
+    to->inject_touch_event.position.point.y = from->y;
+    to->inject_touch_event.pressure = 1.f;
+    to->inject_touch_event.buttons =
         convert_mouse_buttons(SDL_BUTTON(from->button));
-    to->inject_mouse_event.position.screen_size = screen_size;
-    to->inject_mouse_event.position.point.x = from->x;
-    to->inject_mouse_event.position.point.y = from->y;
 
     return true;
 }
 
 bool
-mouse_motion_from_sdl_to_android(const SDL_MouseMotionEvent *from,
-                                 struct size screen_size,
-                                 struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT;
-    to->inject_mouse_event.action = AMOTION_EVENT_ACTION_MOVE;
-    to->inject_mouse_event.buttons = convert_mouse_buttons(from->state);
-    to->inject_mouse_event.position.screen_size = screen_size;
-    to->inject_mouse_event.position.point.x = from->x;
-    to->inject_mouse_event.position.point.y = from->y;
+convert_mouse_motion(const SDL_MouseMotionEvent *from, struct size screen_size,
+                     struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+    to->inject_touch_event.action = AMOTION_EVENT_ACTION_MOVE;
+    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
+    to->inject_touch_event.position.screen_size = screen_size;
+    to->inject_touch_event.position.point.x = from->x;
+    to->inject_touch_event.position.point.y = from->y;
+    to->inject_touch_event.pressure = 1.f;
+    to->inject_touch_event.buttons = convert_mouse_buttons(from->state);
 
     return true;
 }
 
+static bool
+convert_touch_action(SDL_EventType from, enum android_motionevent_action *to) {
+    switch (from) {
+        MAP(SDL_FINGERMOTION, AMOTION_EVENT_ACTION_MOVE);
+        MAP(SDL_FINGERDOWN,   AMOTION_EVENT_ACTION_DOWN);
+        MAP(SDL_FINGERUP,     AMOTION_EVENT_ACTION_UP);
+        FAIL;
+    }
+}
+
 bool
-mouse_wheel_from_sdl_to_android(const SDL_MouseWheelEvent *from,
-                                struct position position,
-                                struct control_msg *to) {
+convert_touch(const SDL_TouchFingerEvent *from, struct size screen_size,
+              struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+
+    if (!convert_touch_action(from->type, &to->inject_touch_event.action)) {
+        return false;
+    }
+
+    to->inject_touch_event.pointer_id = from->fingerId;
+    to->inject_touch_event.position.screen_size = screen_size;
+    // SDL touch event coordinates are normalized in the range [0; 1]
+    to->inject_touch_event.position.point.x = from->x * screen_size.width;
+    to->inject_touch_event.position.point.y = from->y * screen_size.height;
+    to->inject_touch_event.pressure = from->pressure;
+    to->inject_touch_event.buttons = 0;
+    return true;
+}
+
+bool
+convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct position position,
+                    struct control_msg *to) {
     to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;
 
     to->inject_scroll_event.position = position;

app/src/event_converter.h

@@ -0,0 +1,42 @@
+#ifndef CONVERT_H
+#define CONVERT_H
+
+#include <stdbool.h>
+#include <SDL2/SDL_events.h>
+
+#include "config.h"
+#include "control_msg.h"
+
+struct complete_mouse_motion_event {
+    SDL_MouseMotionEvent *mouse_motion_event;
+    struct size screen_size;
+};
+
+struct complete_mouse_wheel_event {
+    SDL_MouseWheelEvent *mouse_wheel_event;
+    struct point position;
+};
+
+bool
+convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to);
+
+bool
+convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size,
+                     struct control_msg *to);
+
+// the video size may be different from the real device size, so we need the
+// size to which the absolute position apply, to scale it accordingly
+bool
+convert_mouse_motion(const SDL_MouseMotionEvent *from, struct size screen_size,
+                     struct control_msg *to);
+
+bool
+convert_touch(const SDL_TouchFingerEvent *from, struct size screen_size,
+              struct control_msg *to);
+
+// on Android, a scroll event requires the current mouse position
+bool
+convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct position position,
+                    struct control_msg *to);
+
+#endif

app/src/file_handler.h

@@ -5,6 +5,7 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
+#include "config.h"
 #include "cbuf.h"
 #include "command.h"
 

app/src/fps_counter.c

@@ -3,6 +3,7 @@
 #include <SDL2/SDL_assert.h>
 #include <SDL2/SDL_timer.h>
 
+#include "config.h"
 #include "lock_util.h"
 #include "log.h"
 

app/src/fps_counter.h

@@ -7,6 +7,8 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
+#include "config.h"
+
 struct fps_counter {
     SDL_Thread *thread;
     SDL_mutex *mutex;

app/src/input_manager.c

@@ -1,7 +1,9 @@
 #include "input_manager.h"
 
 #include <SDL2/SDL_assert.h>
-#include "convert.h"
+
+#include "config.h"
+#include "event_converter.h"
 #include "lock_util.h"
 #include "log.h"
 
@@ -102,7 +104,7 @@ press_back_or_turn_screen_on(struct controller *controller) {
     msg.type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON;
 
     if (!controller_push_msg(controller, &msg)) {
-        LOGW("Could not request 'turn screen on'");
+        LOGW("Could not request 'press back or turn screen on'");
     }
 }
 
@@ -373,7 +375,7 @@ input_manager_process_key(struct input_manager *input_manager,
     }
 
     struct control_msg msg;
-    if (input_key_from_sdl_to_android(event, &msg)) {
+    if (convert_input_key(event, &msg)) {
         if (!controller_push_msg(controller, &msg)) {
             LOGW("Could not request 'inject keycode'");
         }
@@ -387,16 +389,29 @@ input_manager_process_mouse_motion(struct input_manager *input_manager,
         // do not send motion events when no button is pressed
         return;
     }
+    if (event->which == SDL_TOUCH_MOUSEID) {
+        // simulated from touch events, so it's a duplicate
+        return;
+    }
     struct control_msg msg;
-    if (mouse_motion_from_sdl_to_android(event,
-                                         input_manager->screen->frame_size,
-                                         &msg)) {
+    if (convert_mouse_motion(event, input_manager->screen->frame_size, &msg)) {
         if (!controller_push_msg(input_manager->controller, &msg)) {
             LOGW("Could not request 'inject mouse motion event'");
         }
     }
 }
 
+void
+input_manager_process_touch(struct input_manager *input_manager,
+                            const SDL_TouchFingerEvent *event) {
+    struct control_msg msg;
+    if (convert_touch(event, input_manager->screen->frame_size, &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
+            LOGW("Could not request 'inject touch event'");
+        }
+    }
+}
+
 static bool
 is_outside_device_screen(struct input_manager *input_manager, int x, int y)
 {
@@ -408,6 +423,10 @@ void
 input_manager_process_mouse_button(struct input_manager *input_manager,
                                    const SDL_MouseButtonEvent *event,
                                    bool control) {
+    if (event->which == SDL_TOUCH_MOUSEID) {
+        // simulated from touch events, so it's a duplicate
+        return;
+    }
     if (event->type == SDL_MOUSEBUTTONDOWN) {
         if (control && event->button == SDL_BUTTON_RIGHT) {
             press_back_or_turn_screen_on(input_manager->controller);
@@ -434,9 +453,7 @@ input_manager_process_mouse_button(struct input_manager *input_manager,
     }
 
     struct control_msg msg;
-    if (mouse_button_from_sdl_to_android(event,
-                                         input_manager->screen->frame_size,
-                                         &msg)) {
+    if (convert_mouse_button(event, input_manager->screen->frame_size, &msg)) {
         if (!controller_push_msg(input_manager->controller, &msg)) {
             LOGW("Could not request 'inject mouse button event'");
         }
@@ -451,7 +468,7 @@ input_manager_process_mouse_wheel(struct input_manager *input_manager,
         .point = get_mouse_point(input_manager->screen),
     };
     struct control_msg msg;
-    if (mouse_wheel_from_sdl_to_android(event, position, &msg)) {
+    if (convert_mouse_wheel(event, position, &msg)) {
         if (!controller_push_msg(input_manager->controller, &msg)) {
             LOGW("Could not request 'inject mouse wheel event'");
         }

app/src/input_manager.h

@@ -3,6 +3,7 @@
 
 #include <stdbool.h>
 
+#include "config.h"
 #include "common.h"
 #include "controller.h"
 #include "fps_counter.h"
@@ -28,6 +29,10 @@ void
 input_manager_process_mouse_motion(struct input_manager *input_manager,
                                    const SDL_MouseMotionEvent *event);
 
+void
+input_manager_process_touch(struct input_manager *input_manager,
+                            const SDL_TouchFingerEvent *event);
+
 void
 input_manager_process_mouse_button(struct input_manager *input_manager,
                                    const SDL_MouseButtonEvent *event,

app/src/lock_util.h

@@ -4,6 +4,7 @@
 #include <stdint.h>
 #include <SDL2/SDL_mutex.h>
 
+#include "config.h"
 #include "log.h"
 
 static inline void

app/src/main.c

@@ -8,8 +8,8 @@
 #define SDL_MAIN_HANDLED // avoid link error on Linux Windows Subsystem
 #include <SDL2/SDL.h>
 
-#include "compat.h"
 #include "config.h"
+#include "compat.h"
 #include "log.h"
 #include "recorder.h"
 
@@ -328,7 +328,7 @@ parse_args(struct args *args, int argc, char *argv[]) {
         {"push-target",           required_argument, NULL,
                                                  OPT_PUSH_TARGET},
         {"record",                required_argument, NULL, 'r'},
-        {"record-format",         required_argument, NULL, 'f'},
+        {"record-format",         required_argument, NULL, 'F'},
         {"render-expired-frames", no_argument,       NULL,
                                                  OPT_RENDER_EXPIRED_FRAMES},
         {"serial",                required_argument, NULL, 's'},

app/src/net.c

@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 
+#include "config.h"
 #include "log.h"
 
 #ifdef __WINDOWS__

app/src/net.h

@@ -17,6 +17,8 @@
   typedef int socket_t;
 #endif
 
+#include "config.h"
+
 bool
 net_init(void);
 

app/src/queue.h

@@ -6,6 +6,8 @@
 #include <stddef.h>
 #include <SDL2/SDL_assert.h>
 
+#include "config.h"
+
 // To define a queue type of "struct foo":
 //    struct queue_foo QUEUE(struct foo);
 #define QUEUE(TYPE) { \

app/src/receiver.h

@@ -5,6 +5,7 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
+#include "config.h"
 #include "net.h"
 
 // receive events from the device

app/src/recorder.c

@@ -3,8 +3,8 @@
 #include <libavutil/time.h>
 #include <SDL2/SDL_assert.h>
 
-#include "compat.h"
 #include "config.h"
+#include "compat.h"
 #include "lock_util.h"
 #include "log.h"
 
@@ -33,6 +33,11 @@ record_packet_new(const AVPacket *packet) {
     if (!rec) {
         return NULL;
     }
+
+    // av_packet_ref() does not initialize all fields in old FFmpeg versions
+    // See <https://github.com/Genymobile/scrcpy/issues/707>
+    av_init_packet(&rec->packet);
+
     if (av_packet_ref(&rec->packet, packet)) {
         SDL_free(rec);
         return NULL;
@@ -87,6 +92,7 @@ recorder_init(struct recorder *recorder,
     recorder->format = format;
     recorder->declared_frame_size = declared_frame_size;
     recorder->header_written = false;
+    recorder->previous = NULL;
 
     return true;
 }
@@ -257,6 +263,19 @@ run_recorder(void *data) {
 
         if (recorder->stopped && queue_is_empty(&recorder->queue)) {
             mutex_unlock(recorder->mutex);
+            struct record_packet *last = recorder->previous;
+            if (last) {
+                // assign an arbitrary duration to the last packet
+                last->packet.duration = 100000;
+                bool ok = recorder_write(recorder, &last->packet);
+                if (!ok) {
+                    // failing to write the last frame is not very serious, no
+                    // future frame may depend on it, so the resulting file
+                    // will still be valid
+                    LOGW("Could not record last packet");
+                }
+                record_packet_delete(last);
+            }
             break;
         }
 
@@ -265,8 +284,20 @@ run_recorder(void *data) {
 
         mutex_unlock(recorder->mutex);
 
-        bool ok = recorder_write(recorder, &rec->packet);
-        record_packet_delete(rec);
+        // recorder->previous is only written from this thread, no need to lock
+        struct record_packet *previous = recorder->previous;
+        recorder->previous = rec;
+
+        if (!previous) {
+            // we just received the first packet
+            continue;
+        }
+
+        // we now know the duration of the previous packet
+        previous->packet.duration = rec->packet.pts - previous->packet.pts;
+
+        bool ok = recorder_write(recorder, &previous->packet);
+        record_packet_delete(previous);
         if (!ok) {
             LOGE("Could not record packet");
 

app/src/recorder.h

@@ -6,6 +6,7 @@
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
+#include "config.h"
 #include "common.h"
 #include "queue.h"
 
@@ -34,6 +35,12 @@ struct recorder {
     bool stopped; // set on recorder_stop() by the stream reader
     bool failed; // set on packet write failure
     struct recorder_queue queue;
+
+    // we can write a packet only once we received the next one so that we can
+    // set its duration (next_pts - current_pts)
+    // "previous" is only accessed from the recorder thread, so it does not
+    // need to be protected by the mutex
+    struct record_packet *previous;
 };
 
 bool

app/src/scrcpy.c

@@ -7,6 +7,7 @@
 #include <sys/time.h>
 #include <SDL2/SDL.h>
 
+#include "config.h"
 #include "command.h"
 #include "common.h"
 #include "compat.h"
@@ -180,6 +181,11 @@ handle_event(SDL_Event *event, bool control) {
             input_manager_process_mouse_button(&input_manager, &event->button,
                                                control);
             break;
+        case SDL_FINGERMOTION:
+        case SDL_FINGERDOWN:
+        case SDL_FINGERUP:
+            input_manager_process_touch(&input_manager, &event->tfinger);
+            break;
         case SDL_DROPFILE: {
             if (!control) {
                 break;

app/src/scrcpy.h

@@ -5,6 +5,8 @@
 #include <stdint.h>
 #include <recorder.h>
 
+#include "config.h"
+
 struct scrcpy_options {
     const char *serial;
     const char *crop;

app/src/screen.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <SDL2/SDL.h>
 
+#include "config.h"
 #include "common.h"
 #include "compat.h"
 #include "icon.xpm"

app/src/screen.h

@@ -5,6 +5,7 @@
 #include <SDL2/SDL.h>
 #include <libavformat/avformat.h>
 
+#include "config.h"
 #include "common.h"
 
 struct video_buffer;

app/src/server.h

@@ -4,6 +4,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "config.h"
 #include "command.h"
 #include "net.h"
 

app/src/str_util.c

@@ -10,6 +10,8 @@
 
 #include <SDL2/SDL_stdinc.h>
 
+#include "config.h"
+
 size_t
 xstrncpy(char *dest, const char *src, size_t n) {
     size_t i;

app/src/str_util.h

@@ -3,6 +3,8 @@
 
 #include <stddef.h>
 
+#include "config.h"
+
 // like strncpy, except:
 //  - it copies at most n-1 chars
 //  - the dest string is nul-terminated

app/src/stream.c

@@ -8,8 +8,8 @@
 #include <SDL2/SDL_thread.h>
 #include <unistd.h>
 
-#include "compat.h"
 #include "config.h"
+#include "compat.h"
 #include "buffer_util.h"
 #include "decoder.h"
 #include "events.h"

app/src/stream.h

@@ -7,6 +7,7 @@
 #include <SDL2/SDL_atomic.h>
 #include <SDL2/SDL_thread.h>
 
+#include "config.h"
 #include "net.h"
 
 struct video_buffer;

app/src/sys/unix/command.c

@@ -7,6 +7,8 @@
 
 #include "command.h"
 
+#include "config.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>

app/src/sys/unix/net.c

@@ -2,6 +2,8 @@
 
 #include <unistd.h>
 
+#include "config.h"
+
 bool
 net_init(void) {
     // do nothing

app/src/sys/win/net.c

@@ -1,5 +1,6 @@
 #include "net.h"
 
+#include "config.h"
 #include "log.h"
 
 bool

app/src/tiny_xpm.c

@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "config.h"
 #include "log.h"
 
 struct index {

app/src/tiny_xpm.h

@@ -3,6 +3,8 @@
 
 #include <SDL2/SDL.h>
 
+#include "config.h"
+
 SDL_Surface *
 read_xpm(char *xpm[]);
 

app/src/video_buffer.h

@@ -4,6 +4,7 @@
 #include <stdbool.h>
 #include <SDL2/SDL_mutex.h>
 
+#include "config.h"
 #include "fps_counter.h"
 
 // forward declarations

app/tests/test_control_msg_serialize.c

@@ -67,35 +67,39 @@ static void test_serialize_inject_text_long(void) {
     assert(!memcmp(buf, expected, sizeof(expected)));
 }
 
-static void test_serialize_inject_mouse_event(void) {
+static void test_serialize_inject_touch_event(void) {
     struct control_msg msg = {
-        .type = CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT,
-        .inject_mouse_event = {
+        .type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
+        .inject_touch_event = {
             .action = AMOTION_EVENT_ACTION_DOWN,
-            .buttons = AMOTION_EVENT_BUTTON_PRIMARY,
+            .pointer_id = 0x1234567887654321L,
             .position = {
                 .point = {
-                    .x = 260,
-                    .y = 1026,
+                    .x = 100,
+                    .y = 200,
                 },
                 .screen_size = {
                     .width = 1080,
                     .height = 1920,
                 },
             },
+            .pressure = 1.0f,
+            .buttons = AMOTION_EVENT_BUTTON_PRIMARY,
         },
     };
 
     unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
     int size = control_msg_serialize(&msg, buf);
-    assert(size == 18);
+    assert(size == 28);
 
     const unsigned char expected[] = {
-        CONTROL_MSG_TYPE_INJECT_MOUSE_EVENT,
+        CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
         0x00, // AKEY_EVENT_ACTION_DOWN
-        0x00, 0x00, 0x00, 0x01, // AMOTION_EVENT_BUTTON_PRIMARY
-        0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x04, 0x02, // 260 1026
+        0x12, 0x34, 0x56, 0x78, 0x87, 0x65, 0x43, 0x21, // pointer id
+        0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0xc8, // 100 200
         0x04, 0x38, 0x07, 0x80, // 1080 1920
+        0xff, 0xff, // pressure
+        0x00, 0x00, 0x00, 0x01 // AMOTION_EVENT_BUTTON_PRIMARY
     };
     assert(!memcmp(buf, expected, sizeof(expected)));
 }
@@ -236,7 +240,7 @@ int main(void) {
     test_serialize_inject_keycode();
     test_serialize_inject_text();
     test_serialize_inject_text_long();
-    test_serialize_inject_mouse_event();
+    test_serialize_inject_touch_event();
     test_serialize_inject_scroll_event();
     test_serialize_back_or_screen_on();
     test_serialize_expand_notification_panel();

server/meson.build

@@ -6,6 +6,7 @@ if prebuilt_server == ''
                   build_always: true,  # gradle is responsible for tracking source changes
                   output: 'scrcpy-server.jar',
                   command: [find_program('./scripts/build-wrapper.sh'), meson.current_source_dir(), '@OUTPUT@', get_option('buildtype')],
+                  console: true,
                   install: true,
                   install_dir: 'share/scrcpy')
 else

server/src/main/java/com/genymobile/scrcpy/ControlMessage.java

@@ -7,7 +7,7 @@ public final class ControlMessage {
 
     public static final int TYPE_INJECT_KEYCODE = 0;
     public static final int TYPE_INJECT_TEXT = 1;
-    public static final int TYPE_INJECT_MOUSE_EVENT = 2;
+    public static final int TYPE_INJECT_TOUCH_EVENT = 2;
     public static final int TYPE_INJECT_SCROLL_EVENT = 3;
     public static final int TYPE_BACK_OR_SCREEN_ON = 4;
     public static final int TYPE_EXPAND_NOTIFICATION_PANEL = 5;
@@ -22,6 +22,8 @@ public final class ControlMessage {
     private int action; // KeyEvent.ACTION_* or MotionEvent.ACTION_* or POWER_MODE_*
     private int keycode; // KeyEvent.KEYCODE_*
     private int buttons; // MotionEvent.BUTTON_*
+    private long pointerId;
+    private float pressure;
     private Position position;
     private int hScroll;
     private int vScroll;
@@ -30,60 +32,63 @@ public final class ControlMessage {
     }
 
     public static ControlMessage createInjectKeycode(int action, int keycode, int metaState) {
-        ControlMessage event = new ControlMessage();
-        event.type = TYPE_INJECT_KEYCODE;
-        event.action = action;
-        event.keycode = keycode;
-        event.metaState = metaState;
-        return event;
+        ControlMessage msg = new ControlMessage();
+        msg.type = TYPE_INJECT_KEYCODE;
+        msg.action = action;
+        msg.keycode = keycode;
+        msg.metaState = metaState;
+        return msg;
     }
 
     public static ControlMessage createInjectText(String text) {
-        ControlMessage event = new ControlMessage();
-        event.type = TYPE_INJECT_TEXT;
-        event.text = text;
-        return event;
+        ControlMessage msg = new ControlMessage();
+        msg.type = TYPE_INJECT_TEXT;
+        msg.text = text;
+        return msg;
     }
 
-    public static ControlMessage createInjectMouseEvent(int action, int buttons, Position position) {
-        ControlMessage event = new ControlMessage();
-        event.type = TYPE_INJECT_MOUSE_EVENT;
-        event.action = action;
-        event.buttons = buttons;
-        event.position = position;
-        return event;
+    public static ControlMessage createInjectTouchEvent(int action, long pointerId, Position position, float pressure,
+            int buttons) {
+        ControlMessage msg = new ControlMessage();
+        msg.type = TYPE_INJECT_TOUCH_EVENT;
+        msg.action = action;
+        msg.pointerId = pointerId;
+        msg.pressure = pressure;
+        msg.position = position;
+        msg.buttons = buttons;
+        return msg;
     }
 
     public static ControlMessage createInjectScrollEvent(Position position, int hScroll, int vScroll) {
-        ControlMessage event = new ControlMessage();
-        event.type = TYPE_INJECT_SCROLL_EVENT;
-        event.position = position;
-        event.hScroll = hScroll;
-        event.vScroll = vScroll;
-        return event;
+        ControlMessage msg = new ControlMessage();
+        msg.type = TYPE_INJECT_SCROLL_EVENT;
+        msg.position = position;
+        msg.hScroll = hScroll;
+        msg.vScroll = vScroll;
+        return msg;
     }
 
     public static ControlMessage createSetClipboard(String text) {
-        ControlMessage event = new ControlMessage();
-        event.type = TYPE_SET_CLIPBOARD;
-        event.text = text;
-        return event;
+        ControlMessage msg = new ControlMessage();
+        msg.type = TYPE_SET_CLIPBOARD;
+        msg.text = text;
+        return msg;
     }
 
     /**
      * @param mode one of the {@code Device.SCREEN_POWER_MODE_*} constants
      */
     public static ControlMessage createSetScreenPowerMode(int mode) {
-        ControlMessage event = new ControlMessage();
-        event.type = TYPE_SET_SCREEN_POWER_MODE;
-        event.action = mode;
-        return event;
+        ControlMessage msg = new ControlMessage();
+        msg.type = TYPE_SET_SCREEN_POWER_MODE;
+        msg.action = mode;
+        return msg;
     }
 
     public static ControlMessage createEmpty(int type) {
-        ControlMessage event = new ControlMessage();
-        event.type = type;
-        return event;
+        ControlMessage msg = new ControlMessage();
+        msg.type = type;
+        return msg;
     }
 
     public int getType() {
@@ -110,6 +115,14 @@ public final class ControlMessage {
         return buttons;
     }
 
+    public long getPointerId() {
+        return pointerId;
+    }
+
+    public float getPressure() {
+        return pressure;
+    }
+
     public Position getPosition() {
         return position;
     }

server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java

@@ -10,6 +10,7 @@ public class ControlMessageReader {
 
     private static final int INJECT_KEYCODE_PAYLOAD_LENGTH = 9;
     private static final int INJECT_MOUSE_EVENT_PAYLOAD_LENGTH = 17;
+    private static final int INJECT_TOUCH_EVENT_PAYLOAD_LENGTH = 21;
     private static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 20;
     private static final int SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH = 1;
 
@@ -59,8 +60,8 @@ public class ControlMessageReader {
             case ControlMessage.TYPE_INJECT_TEXT:
                 msg = parseInjectText();
                 break;
-            case ControlMessage.TYPE_INJECT_MOUSE_EVENT:
-                msg = parseInjectMouseEvent();
+            case ControlMessage.TYPE_INJECT_TOUCH_EVENT:
+                msg = parseInjectTouchEvent();
                 break;
             case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
                 msg = parseInjectScrollEvent();
@@ -120,14 +121,20 @@ public class ControlMessageReader {
         return ControlMessage.createInjectText(text);
     }
 
-    private ControlMessage parseInjectMouseEvent() {
-        if (buffer.remaining() < INJECT_MOUSE_EVENT_PAYLOAD_LENGTH) {
+    @SuppressWarnings("checkstyle:MagicNumber")
+    private ControlMessage parseInjectTouchEvent() {
+        if (buffer.remaining() < INJECT_TOUCH_EVENT_PAYLOAD_LENGTH) {
             return null;
         }
         int action = toUnsigned(buffer.get());
-        int buttons = buffer.getInt();
+        long pointerId = buffer.getLong();
         Position position = readPosition(buffer);
-        return ControlMessage.createInjectMouseEvent(action, buttons, position);
+        // 16 bits fixed-point
+        int pressureInt = toUnsigned(buffer.getShort());
+        // convert it to a float between 0 and 1 (0x1p16f is 2^16 as float)
+        float pressure = pressureInt == 0xffff ? 1f : (pressureInt / 0x1p16f);
+        int buttons = buffer.getInt();
+        return ControlMessage.createInjectTouchEvent(action, pointerId, position, pressure, buttons);
     }
 
     private ControlMessage parseInjectScrollEvent() {

server/src/main/java/com/genymobile/scrcpy/Controller.java

@@ -19,38 +19,32 @@ public class Controller {
 
     private final KeyCharacterMap charMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
 
-    private long lastMouseDown;
-    private final MotionEvent.PointerProperties[] pointerProperties = {new MotionEvent.PointerProperties()};
-    private final MotionEvent.PointerCoords[] pointerCoords = {new MotionEvent.PointerCoords()};
+    private long lastTouchDown;
+    private final PointersState pointersState = new PointersState();
+    private final MotionEvent.PointerProperties[] pointerProperties =
+            new MotionEvent.PointerProperties[PointersState.MAX_POINTERS];
+    private final MotionEvent.PointerCoords[] pointerCoords =
+            new MotionEvent.PointerCoords[PointersState.MAX_POINTERS];
 
     public Controller(Device device, DesktopConnection connection) {
         this.device = device;
         this.connection = connection;
-        initPointer();
+        initPointers();
         sender = new DeviceMessageSender(connection);
     }
 
-    private void initPointer() {
-        MotionEvent.PointerProperties props = pointerProperties[0];
-        props.id = 0;
-        props.toolType = MotionEvent.TOOL_TYPE_FINGER;
+    private void initPointers() {
+        for (int i = 0; i < PointersState.MAX_POINTERS; ++i) {
+            MotionEvent.PointerProperties props = new MotionEvent.PointerProperties();
+            props.toolType = MotionEvent.TOOL_TYPE_FINGER;
 
-        MotionEvent.PointerCoords coords = pointerCoords[0];
-        coords.orientation = 0;
-        coords.pressure = 1;
-        coords.size = 1;
-    }
+            MotionEvent.PointerCoords coords = new MotionEvent.PointerCoords();
+            coords.orientation = 0;
+            coords.size = 1;
 
-    private void setPointerCoords(Point point) {
-        MotionEvent.PointerCoords coords = pointerCoords[0];
-        coords.x = point.getX();
-        coords.y = point.getY();
-    }
-
-    private void setScroll(int hScroll, int vScroll) {
-        MotionEvent.PointerCoords coords = pointerCoords[0];
-        coords.setAxisValue(MotionEvent.AXIS_HSCROLL, hScroll);
-        coords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll);
+            pointerProperties[i] = props;
+            pointerCoords[i] = coords;
+        }
     }
 
     @SuppressWarnings("checkstyle:MagicNumber")
@@ -87,8 +81,8 @@ public class Controller {
             case ControlMessage.TYPE_INJECT_TEXT:
                 injectText(msg.getText());
                 break;
-            case ControlMessage.TYPE_INJECT_MOUSE_EVENT:
-                injectMouse(msg.getAction(), msg.getButtons(), msg.getPosition());
+            case ControlMessage.TYPE_INJECT_TOUCH_EVENT:
+                injectTouch(msg.getAction(), msg.getPointerId(), msg.getPosition(), msg.getPressure(), 0);
                 break;
             case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
                 injectScroll(msg.getPosition(), msg.getHScroll(), msg.getVScroll());
@@ -148,19 +142,42 @@ public class Controller {
         return successCount;
     }
 
-    private boolean injectMouse(int action, int buttons, Position position) {
+    private boolean injectTouch(int action, long pointerId, Position position, float pressure, int buttons) {
         long now = SystemClock.uptimeMillis();
-        if (action == MotionEvent.ACTION_DOWN) {
-            lastMouseDown = now;
-        }
+
         Point point = device.getPhysicalPoint(position);
         if (point == null) {
             // ignore event
             return false;
         }
-        setPointerCoords(point);
-        MotionEvent event = MotionEvent.obtain(lastMouseDown, now, action, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, 0, 0,
-                InputDevice.SOURCE_TOUCHSCREEN, 0);
+
+        int pointerIndex = pointersState.getPointerIndex(pointerId);
+        if (pointerIndex == -1) {
+            Ln.w("Too many pointers for touch event");
+            return false;
+        }
+        Pointer pointer = pointersState.get(pointerIndex);
+        pointer.setPoint(point);
+        pointer.setPressure(pressure);
+        pointer.setUp(action == MotionEvent.ACTION_UP);
+
+        int pointerCount = pointersState.update(pointerProperties, pointerCoords);
+
+        if (pointerCount == 1) {
+            if (action == MotionEvent.ACTION_DOWN) {
+                lastTouchDown = now;
+            }
+        } else {
+            // secondary pointers must use ACTION_POINTER_* ORed with the pointerIndex
+            if (action == MotionEvent.ACTION_UP) {
+                action = MotionEvent.ACTION_POINTER_UP | (pointerIndex << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
+            } else if (action == MotionEvent.ACTION_DOWN) {
+                action = MotionEvent.ACTION_POINTER_DOWN | (pointerIndex << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
+            }
+        }
+
+        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties,
+                pointerCoords, 0, 0, 1f, 1f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0);
         return injectEvent(event);
     }
 
@@ -171,23 +188,30 @@ public class Controller {
             // ignore event
             return false;
         }
-        setPointerCoords(point);
-        setScroll(hScroll, vScroll);
-        MotionEvent event = MotionEvent.obtain(lastMouseDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, 0, 1f, 1f, 0,
-                0, InputDevice.SOURCE_MOUSE, 0);
+
+        MotionEvent.PointerProperties props = pointerProperties[0];
+        props.id = 0;
+
+        MotionEvent.PointerCoords coords = pointerCoords[0];
+        coords.x = point.getX();
+        coords.y = point.getY();
+        coords.setAxisValue(MotionEvent.AXIS_HSCROLL, hScroll);
+        coords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll);
+
+        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties,
+                pointerCoords, 0, 0, 1f, 1f, 0, 0, InputDevice.SOURCE_MOUSE, 0);
         return injectEvent(event);
     }
 
     private boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState) {
         long now = SystemClock.uptimeMillis();
-        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
-                InputDevice.SOURCE_KEYBOARD);
+        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD,
+                0, 0, InputDevice.SOURCE_KEYBOARD);
         return injectEvent(event);
     }
 
     private boolean injectKeycode(int keyCode) {
-        return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0)
-                && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0);
+        return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0) && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0);
     }
 
     private boolean injectEvent(InputEvent event) {

server/src/main/java/com/genymobile/scrcpy/Pointer.java

@@ -0,0 +1,55 @@
+package com.genymobile.scrcpy;
+
+public class Pointer {
+
+    /**
+     * Pointer id as received from the client.
+     */
+    private final long id;
+
+    /**
+     * Local pointer id, using the lowest possible values to fill the {@link android.view.MotionEvent.PointerProperties PointerProperties}.
+     */
+    private final int localId;
+
+    private Point point;
+    private float pressure;
+    private boolean up;
+
+    public Pointer(long id, int localId) {
+        this.id = id;
+        this.localId = localId;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public int getLocalId() {
+        return localId;
+    }
+
+    public Point getPoint() {
+        return point;
+    }
+
+    public void setPoint(Point point) {
+        this.point = point;
+    }
+
+    public float getPressure() {
+        return pressure;
+    }
+
+    public void setPressure(float pressure) {
+        this.pressure = pressure;
+    }
+
+    public boolean isUp() {
+        return up;
+    }
+
+    public void setUp(boolean up) {
+        this.up = up;
+    }
+}

server/src/main/java/com/genymobile/scrcpy/PointersState.java

@@ -0,0 +1,103 @@
+package com.genymobile.scrcpy;
+
+import android.view.MotionEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PointersState {
+
+    public static final int MAX_POINTERS = 10;
+
+    private final List<Pointer> pointers = new ArrayList<>();
+
+    private int indexOf(long id) {
+        for (int i = 0; i < pointers.size(); ++i) {
+            Pointer pointer = pointers.get(i);
+            if (pointer.getId() == id) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    private boolean isLocalIdAvailable(int localId) {
+        for (int i = 0; i < pointers.size(); ++i) {
+            Pointer pointer = pointers.get(i);
+            if (pointer.getLocalId() == localId) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private int nextUnusedLocalId() {
+        for (int localId = 0; localId < MAX_POINTERS; ++localId) {
+            if (isLocalIdAvailable(localId)) {
+                return localId;
+            }
+        }
+        return -1;
+    }
+
+    public Pointer get(int index) {
+        return pointers.get(index);
+    }
+
+    public int getPointerIndex(long id) {
+        int index = indexOf(id);
+        if (index != -1) {
+            // already exists, return it
+            return index;
+        }
+        if (pointers.size() >= MAX_POINTERS) {
+            // it's full
+            return -1;
+        }
+        // id 0 is reserved for mouse events
+        int localId = nextUnusedLocalId();
+        if (localId == -1) {
+            throw new AssertionError("pointers.size() < maxFingers implies that a local id is available");
+        }
+        Pointer pointer = new Pointer(id, localId);
+        pointers.add(pointer);
+        // return the index of the pointer
+        return pointers.size() - 1;
+    }
+
+    /**
+     * Initialize the motion event parameters.
+     *
+     * @param props  the pointer properties
+     * @param coords the pointer coordinates
+     * @return The number of items initialized (the number of pointers).
+     */
+    public int update(MotionEvent.PointerProperties[] props, MotionEvent.PointerCoords[] coords) {
+        int count = pointers.size();
+        for (int i = 0; i < count; ++i) {
+            Pointer pointer = pointers.get(i);
+
+            // id 0 is reserved for mouse events
+            props[i].id = pointer.getLocalId();
+
+            Point point = pointer.getPoint();
+            coords[i].x = point.getX();
+            coords[i].y = point.getY();
+            coords[i].pressure = pointer.getPressure();
+        }
+        cleanUp();
+        return count;
+    }
+
+    /**
+     * Remove all pointers which are UP.
+     */
+    private void cleanUp() {
+        for (int i = pointers.size() - 1; i >= 0; --i) {
+            Pointer pointer = pointers.get(i);
+            if (pointer.isUp()) {
+                pointers.remove(i);
+            }
+        }
+    }
+}

server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java

@@ -14,7 +14,7 @@ public final class WindowManager {
         try {
             Class<?> cls = manager.getClass();
             try {
-                return (Integer) manager.getClass().getMethod("getRotation").invoke(manager);
+                return (Integer) cls.getMethod("getRotation").invoke(manager);
             } catch (NoSuchMethodException e) {
                 // method changed since this commit:
                 // https://android.googlesource.com/platform/frameworks/base/+/8ee7285128c3843401d4c4d0412cd66e86ba49e3%5E%21/#F2

server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java

@@ -77,24 +77,36 @@ public class ControlMessageReaderTest {
     }
 
     @Test
-    public void testParseMouseEvent() throws IOException {
+    @SuppressWarnings("checkstyle:MagicNumber")
+    public void testParseTouchEvent() throws IOException {
         ControlMessageReader reader = new ControlMessageReader();
 
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         DataOutputStream dos = new DataOutputStream(bos);
-        dos.writeByte(ControlMessage.TYPE_INJECT_KEYCODE);
+        dos.writeByte(ControlMessage.TYPE_INJECT_TOUCH_EVENT);
         dos.writeByte(MotionEvent.ACTION_DOWN);
+        dos.writeLong(-42); // pointerId
+        dos.writeInt(100);
+        dos.writeInt(200);
+        dos.writeShort(1080);
+        dos.writeShort(1920);
+        dos.writeShort(0xffff); // pressure
         dos.writeInt(MotionEvent.BUTTON_PRIMARY);
-        dos.writeInt(KeyEvent.META_CTRL_ON);
+
         byte[] packet = bos.toByteArray();
 
         reader.readFrom(new ByteArrayInputStream(packet));
         ControlMessage event = reader.next();
 
-        Assert.assertEquals(ControlMessage.TYPE_INJECT_KEYCODE, event.getType());
+        Assert.assertEquals(ControlMessage.TYPE_INJECT_TOUCH_EVENT, event.getType());
         Assert.assertEquals(MotionEvent.ACTION_DOWN, event.getAction());
-        Assert.assertEquals(MotionEvent.BUTTON_PRIMARY, event.getKeycode());
-        Assert.assertEquals(KeyEvent.META_CTRL_ON, event.getMetaState());
+        Assert.assertEquals(-42, event.getPointerId());
+        Assert.assertEquals(100, event.getPosition().getPoint().getX());
+        Assert.assertEquals(200, event.getPosition().getPoint().getY());
+        Assert.assertEquals(1080, event.getPosition().getScreenSize().getWidth());
+        Assert.assertEquals(1920, event.getPosition().getScreenSize().getHeight());
+        Assert.assertEquals(1f, event.getPressure(), 0f); // must be exact
+        Assert.assertEquals(MotionEvent.BUTTON_PRIMARY, event.getButtons());
     }
 
     @Test