Changeset e273e9e in mainline for uspace/app/terminal

Timestamp:

2024-10-03T18:48:48Z (10 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

5132379

Parents:

b2c9e42c

Message:

Move link out of cons_event_t

Location:

uspace/app/terminal

Files:

• terminal.c (modified) (4 diffs)
• terminal.h (modified) (3 diffs)

uspace/app/terminal/terminal.c

@@ -403 +403 @@
                 if (pos < size) {
                         link_t *link = prodcons_consume(&term->input_pc);
-                        cons_event_t *event = list_get_instance(link, cons_event_t, link);
+                        terminal_event_t *qevent = list_get_instance(link,
+                            terminal_event_t, link);
+                        cons_event_t *event = &qevent->ev;
 
                         /* Accept key presses of printable chars only. */
@@ -417 +419 @@
                         }
 
-                        free(event);
+                        free(qevent);
                 }
         }
@@ -635 +637 @@
         terminal_t *term = srv_to_terminal(srv);
         link_t *link = prodcons_consume(&term->input_pc);
-        cons_event_t *ev = list_get_instance(link, cons_event_t, link);
-
-        *event = *ev;
+        terminal_event_t *ev = list_get_instance(link, terminal_event_t, link);
+
+        *event = ev->ev;
         free(ev);
         return EOK;
@@ -823 +825 @@
 {
         /* Got key press/release event */
-        cons_event_t *event =
-            (cons_event_t *) malloc(sizeof(cons_event_t));
+        terminal_event_t *event =
+            (terminal_event_t *) malloc(sizeof(terminal_event_t));
         if (event == NULL)
                 return;
 
-        *event = *ev;
+        event->ev = *ev;
         link_initialize(&event->link);
 

uspace/app/terminal/terminal.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
@@ -46 +46 @@
 #include <gfx/coord.h>
 #include <io/con_srv.h>
+#include <io/cons_event.h>
 #include <loc.h>
 #include <stdatomic.h>
@@ -102 +103 @@
 } terminal_t;
 
+/** Terminal event */
+typedef struct {
+        /** Link to list of events */
+        link_t link;
+        /** Console event */
+        cons_event_t ev;
+} terminal_event_t;
+
 extern errno_t terminal_create(const char *, sysarg_t, sysarg_t,
     terminal_flags_t, const char *, terminal_t **);