mirror of https://github.com/Genymobile/scrcpy
Extract keyboard HID handling
Split the keyboard implementation using AOA and the code handling HID events, so that HID events can be reused for another protocol (UHID). PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>uhid.38
Romain Vimont
4 months ago
parent
f2d6203156
commit
91485e2863
@ -0,0 +1,109 @@
|
|||||||
|
#include "keyboard_aoa.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
|
#include "input_events.h"
|
||||||
|
#include "util/log.h"
|
||||||
|
|
||||||
|
/** Downcast key processor to keyboard_aoa */
|
||||||
|
#define DOWNCAST(KP) container_of(KP, struct sc_keyboard_aoa, key_processor)
|
||||||
|
|
||||||
|
#define HID_KEYBOARD_ACCESSORY_ID 1
|
||||||
|
|
||||||
|
static bool
|
||||||
|
push_mod_lock_state(struct sc_keyboard_aoa *kb, uint16_t mods_state) {
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
if (!sc_hid_keyboard_event_from_mods(&hid_event, mods_state)) {
|
||||||
|
// Nothing to do
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!sc_aoa_push_hid_event(kb->aoa, HID_KEYBOARD_ACCESSORY_ID,
|
||||||
|
&hid_event)) {
|
||||||
|
LOGW("Could not request HID event (mod lock state)");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGD("HID keyboard state synchronized");
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
sc_key_processor_process_key(struct sc_key_processor *kp,
|
||||||
|
const struct sc_key_event *event,
|
||||||
|
uint64_t ack_to_wait) {
|
||||||
|
if (event->repeat) {
|
||||||
|
// In USB HID protocol, key repeat is handled by the host (Android), so
|
||||||
|
// just ignore key repeat here.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct sc_keyboard_aoa *kb = DOWNCAST(kp);
|
||||||
|
|
||||||
|
struct sc_hid_event hid_event;
|
||||||
|
|
||||||
|
// Not all keys are supported, just ignore unsupported keys
|
||||||
|
if (sc_hid_keyboard_event_from_key(&kb->hid, &hid_event, event)) {
|
||||||
|
if (!kb->mod_lock_synchronized) {
|
||||||
|
// Inject CAPSLOCK and/or NUMLOCK if necessary to synchronize
|
||||||
|
// keyboard state
|
||||||
|
if (push_mod_lock_state(kb, event->mods_state)) {
|
||||||
|
kb->mod_lock_synchronized = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If ack_to_wait is != SC_SEQUENCE_INVALID, then Ctrl+v is pressed, so
|
||||||
|
// clipboard synchronization has been requested. Wait until clipboard
|
||||||
|
// synchronization is acknowledged by the server, otherwise it could
|
||||||
|
// paste the old clipboard content.
|
||||||
|
|
||||||
|
if (!sc_aoa_push_hid_event_with_ack_to_wait(kb->aoa,
|
||||||
|
HID_KEYBOARD_ACCESSORY_ID,
|
||||||
|
&hid_event,
|
||||||
|
ack_to_wait)) {
|
||||||
|
LOGW("Could not request HID event (key)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_keyboard_aoa_init(struct sc_keyboard_aoa *kb, struct sc_aoa *aoa) {
|
||||||
|
kb->aoa = aoa;
|
||||||
|
|
||||||
|
bool ok = sc_aoa_setup_hid(aoa, HID_KEYBOARD_ACCESSORY_ID,
|
||||||
|
SC_HID_KEYBOARD_REPORT_DESC,
|
||||||
|
SC_HID_KEYBOARD_REPORT_DESC_LEN);
|
||||||
|
if (!ok) {
|
||||||
|
LOGW("Register HID keyboard failed");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
sc_hid_keyboard_init(&kb->hid);
|
||||||
|
|
||||||
|
kb->mod_lock_synchronized = false;
|
||||||
|
|
||||||
|
static const struct sc_key_processor_ops ops = {
|
||||||
|
.process_key = sc_key_processor_process_key,
|
||||||
|
// Never forward text input via HID (all the keys are injected
|
||||||
|
// separately)
|
||||||
|
.process_text = NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Clipboard synchronization is requested over the control socket, while HID
|
||||||
|
// events are sent over AOA, so it must wait for clipboard synchronization
|
||||||
|
// to be acknowledged by the device before injecting Ctrl+v.
|
||||||
|
kb->key_processor.async_paste = true;
|
||||||
|
kb->key_processor.ops = &ops;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_keyboard_aoa_destroy(struct sc_keyboard_aoa *kb) {
|
||||||
|
// Unregister HID keyboard so the soft keyboard shows again on Android
|
||||||
|
bool ok = sc_aoa_unregister_hid(kb->aoa, HID_KEYBOARD_ACCESSORY_ID);
|
||||||
|
if (!ok) {
|
||||||
|
LOGW("Could not unregister HID keyboard");
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
#ifndef SC_KEYBOARD_AOA_H
|
||||||
|
#define SC_KEYBOARD_AOA_H
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#include "aoa_hid.h"
|
||||||
|
#include "hid/hid_keyboard.h"
|
||||||
|
#include "trait/key_processor.h"
|
||||||
|
|
||||||
|
struct sc_keyboard_aoa {
|
||||||
|
struct sc_key_processor key_processor; // key processor trait
|
||||||
|
|
||||||
|
struct sc_hid_keyboard hid;
|
||||||
|
struct sc_aoa *aoa;
|
||||||
|
|
||||||
|
bool mod_lock_synchronized;
|
||||||
|
};
|
||||||
|
|
||||||
|
bool
|
||||||
|
sc_keyboard_aoa_init(struct sc_keyboard_aoa *kb, struct sc_aoa *aoa);
|
||||||
|
|
||||||
|
void
|
||||||
|
sc_keyboard_aoa_destroy(struct sc_keyboard_aoa *kb);
|
||||||
|
|
||||||
|
#endif
|
||||||
Loading…
Reference in New Issue