Changeset ebb1489 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/srv/hid/console/console.c (modified) (6 diffs)

uspace/srv/hid/console/console.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -334 +334 @@
 {
         /* Got key press/release event */
-        cons_event_t *event =
-            (cons_event_t *) malloc(sizeof(cons_event_t));
+        cons_qevent_t *event =
+            (cons_qevent_t *) malloc(sizeof(cons_qevent_t));
         if (event == NULL)
                 return;
 
-        *event = *ev;
+        event->ev = *ev;
         link_initialize(&event->link);
 
@@ -366 +366 @@
 {
         cons_event_t event;
-
+        bool alt;
+        bool shift;
+
+        alt = (mods & KM_ALT) != 0 && (mods & (KM_CTRL | KM_SHIFT)) == 0;
+        shift = (mods & KM_SHIFT) != 0 && (mods & (KM_CTRL | KM_ALT)) == 0;
+
+        /* Switch console on Alt+Fn or Shift+Fn */
         if ((key >= KC_F1) && (key <= KC_F1 + CONSOLE_COUNT) &&
-            ((mods & KM_CTRL) == 0)) {
+            (alt || shift)) {
                 cons_switch(key - KC_F1);
         } else {
@@ -550 +556 @@
                 if (pos < size) {
                         link_t *link = prodcons_consume(&cons->input_pc);
-                        cons_event_t *event = list_get_instance(link,
-                            cons_event_t, link);
+                        cons_qevent_t *qevent = list_get_instance(link,
+                            cons_qevent_t, link);
+                        cons_event_t *event = &qevent->ev;
 
                         /* Accept key presses of printable chars only. */
@@ -561 +568 @@
                         }
 
-                        free(event);
+                        free(qevent);
                 }
         }
@@ -697 +704 @@
         console_t *cons = srv_to_console(srv);
         link_t *link = prodcons_consume(&cons->input_pc);
-        cons_event_t *cevent = list_get_instance(link, cons_event_t, link);
-
-        *event = *cevent;
-        free(cevent);
+        cons_qevent_t *qevent = list_get_instance(link, cons_qevent_t, link);
+
+        *event = qevent->ev;
+        free(qevent);
         return EOK;
 }