Changeset b2c9e42c in mainline

Timestamp:

2024-10-03T18:21:04Z (8 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

e273e9e

Parents:

d05c237

Message:

Move link out of kbd_event_t

Location:

uspace

Files:

• lib/input/include/io/kbd_event.h (modified) (3 diffs)
• lib/ui/include/types/ui/testctl.h (modified) (2 diffs)
• srv/hid/remcons/remcons.c (modified) (3 diffs)
• srv/hid/remcons/remcons.h (modified) (2 diffs)

uspace/lib/input/include/io/kbd_event.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #define _LIBINPUT_IO_KBD_EVENT_H_
 
-#include <adt/list.h>
 #include <inttypes.h>
 #include <io/keycode.h>
@@ -48 +47 @@
 /** Console event structure. */
 typedef struct {
-        /** List handle */
-        link_t link;
-
         /** Keyboard device ID */
         sysarg_t kbd_id;

uspace/lib/ui/include/types/ui/testctl.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #ifndef _UI_TYPES_TESTCTL_H
 #define _UI_TYPES_TESTCTL_H
+
+#include <errno.h>
+#include <io/kbd_event.h>
+#include <io/pos_event.h>
+#include <stdbool.h>
+#include <types/ui/event.h>
 
 struct ui_test_ctl;

uspace/srv/hid/remcons/remcons.c

@@ -348 +348 @@
  * @param c Pressed character.
  */
-static kbd_event_t *new_kbd_event(kbd_event_type_t type, keymod_t mods,
+static remcons_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));
+        remcons_event_t *event = malloc(sizeof(remcons_event_t));
         assert(event);
 
         link_initialize(&event->link);
-        event->type = type;
-        event->mods = mods;
-        event->key = key;
-        event->c = c;
+        event->kbd.type = type;
+        event->kbd.mods = mods;
+        event->kbd.key = key;
+        event->kbd.c = c;
 
         return event;
@@ -381 +381 @@
 
         link_t *link = prodcons_consume(&remcons->in_events);
-        kbd_event_t *tmp = list_get_instance(link, kbd_event_t, link);
+        remcons_event_t *tmp = list_get_instance(link, remcons_event_t, link);
 
         event->type = CEV_KEY;
-        event->ev.key = *tmp;
+        event->ev.key = tmp->kbd;
 
         free(tmp);
@@ -587 +587 @@
         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);
+        remcons_event_t *down = new_kbd_event(KEY_PRESS, mods, key, c);
+        remcons_event_t *up = new_kbd_event(KEY_RELEASE, mods, key, c);
         assert(down);
         assert(up);

uspace/srv/hid/remcons/remcons.h

@@ -38 +38 @@
 
 #include <adt/prodcons.h>
+#include <io/kbd_event.h>
 #include <stdbool.h>
 #include <vt/vt100.h>
@@ -56 +57 @@
         bool curs_visible;      /**< cursor is visible */
 
-        /** Producer-consumer of kbd_event_t. */
+        /** Producer-consumer of remcons_event_t. */
         prodcons_t in_events;
 } remcons_t;
+
+/** Remote console event */
+typedef struct {
+        link_t link;            /**< link to list of events */
+        kbd_event_t kbd;        /**< keyboard event */
+} remcons_event_t;
 
 #endif