Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Extract control event string serialization

Browse source 
A string is serialized as a length (2 bytes) followed by the string data
(non nul-terminated).

For now, it is used only once, but we will need to serialize strings in
other events.
This commit is contained in:
Romain Vimont 2019-05-30 18:50:01 +02:00
parent 6ec2ddd2d1
commit 69360c7407
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/control_event.c
View file

@ -14,6 +14,15 @@ write_position(uint8_t *buf, const struct position *position) {
buffer_write16be(&buf[10], position->screen_size.height); buffer_write16be(&buf[10], position->screen_size.height);
} }
// write length (2 bytes) + string (non nul-terminated)
static size_t
write_string(const char *utf8, size_t max_len, unsigned char *buf) {
size_t len = utf8_truncation_index(utf8, max_len);
buffer_write16be(buf, (uint16_t) len);
memcpy(&buf[2], utf8, len);
return 2 + len;
}
size_t size_t
control_event_serialize(const struct control_event *event, unsigned char *buf) { control_event_serialize(const struct control_event *event, unsigned char *buf) {
buf[0] = event->type; buf[0] = event->type;
@ -24,14 +33,9 @@ control_event_serialize(const struct control_event *event, unsigned char *buf) {
buffer_write32be(&buf[6], event->keycode_event.metastate); buffer_write32be(&buf[6], event->keycode_event.metastate);
return 10; return 10;
case CONTROL_EVENT_TYPE_TEXT: { case CONTROL_EVENT_TYPE_TEXT: {
// write length (2 bytes) + string (non nul-terminated) size_t len = write_string(event->text_event.text,
CONTROL_EVENT_TEXT_MAX_LENGTH, &buf[1]);
// injecting a text takes time, so limit the text length return 1 + len;
size_t len = utf8_truncation_index(event->text_event.text,
CONTROL_EVENT_TEXT_MAX_LENGTH);
buffer_write16be(&buf[1], (uint16_t) len);
memcpy(&buf[3], event->text_event.text, len);
return 3 + len;
} }
case CONTROL_EVENT_TYPE_MOUSE: case CONTROL_EVENT_TYPE_MOUSE:
buf[1] = event->mouse_event.action; buf[1] = event->mouse_event.action;