Changeset 6907f26 in mainline for uspace/srv/hid/remcons/remcons.c

Timestamp:

2024-10-03T15:42:59Z (8 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

d05c237

Parents:

d31c3ea

git-author:

Jiri Svoboda <jiri@…> (2024-10-02 17:42:46)

git-committer:

Jiri Svoboda <jiri@…> (2024-10-03 15:42:59)

Message:

Parse VT100 keyboard escape sequences in libvt

File:

• uspace/srv/hid/remcons/remcons.c (modified) (5 diffs)

uspace/srv/hid/remcons/remcons.c

@@ -34 +34 @@
  */
 
+#include <adt/prodcons.h>
 #include <as.h>
 #include <async.h>
@@ -124 +125 @@
 static void remcons_vt_cputs(void *, const char *);
 static void remcons_vt_flush(void *);
+static void remcons_vt_key(void *, keymod_t, keycode_t, char);
 
 static vt100_cb_t remcons_vt_cb = {
         .putuchar = remcons_vt_putchar,
         .control_puts = remcons_vt_cputs,
-        .flush = remcons_vt_flush
+        .flush = remcons_vt_flush,
+        .key = remcons_vt_key
 };
 
@@ -340 +343 @@
 }
 
+/** Creates new keyboard event from given char.
+ *
+ * @param type Event type (press / release).
+ * @param c Pressed character.
+ */
+static kbd_event_t *new_kbd_event(kbd_event_type_t type, keymod_t mods,
+    keycode_t key, char c)
+{
+        kbd_event_t *event = malloc(sizeof(kbd_event_t));
+        assert(event);
+
+        link_initialize(&event->link);
+        event->type = type;
+        event->mods = mods;
+        event->key = key;
+        event->c = c;
+
+        return event;
+}
+
 static errno_t remcons_get_event(con_srv_t *srv, cons_event_t *event)
 {
+        remcons_t *remcons = srv_to_remcons(srv);
         telnet_user_t *user = srv_to_user(srv);
-        kbd_event_t kevent;
-        errno_t rc;
-
-        rc = telnet_user_get_next_keyboard_event(user, &kevent);
-        if (rc != EOK) {
-                /* XXX What? */
-                memset(event, 0, sizeof(*event));
-                return EOK;
-        }
+        size_t nread;
+
+        while (list_empty(&remcons->in_events.list)) {
+                char next_byte = 0;
+
+                errno_t rc = telnet_user_recv(user, &next_byte, 1,
+                    &nread);
+                if (rc != EOK)
+                        return rc;
+
+                vt100_rcvd_char(remcons->vt, next_byte);
+        }
+
+        link_t *link = prodcons_consume(&remcons->in_events);
+        kbd_event_t *tmp = list_get_instance(link, kbd_event_t, link);
 
         event->type = CEV_KEY;
-        event->ev.key = kevent;
+        event->ev.key = *tmp;
+
+        free(tmp);
 
         return EOK;
@@ -551 +583 @@
 }
 
+static void remcons_vt_key(void *arg, keymod_t mods, keycode_t key, char c)
+{
+        remcons_t *remcons = (remcons_t *)arg;
+
+        kbd_event_t *down = new_kbd_event(KEY_PRESS, mods, key, c);
+        kbd_event_t *up = new_kbd_event(KEY_RELEASE, mods, key, c);
+        assert(down);
+        assert(up);
+        prodcons_produce(&remcons->in_events, &down->link);
+        prodcons_produce(&remcons->in_events, &up->link);
+}
+
 /** Handle network connection.
  *
@@ -567 +611 @@
         remcons->enable_rgb = !no_ctl && !no_rgb;
         remcons->user = user;
+        prodcons_initialize(&remcons->in_events);
 
         if (remcons->enable_ctl) {