Changes in uspace/srv/hid/console/console.c [5d1ff11:e273e9e] in mainline

File:

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

uspace/srv/hid/console/console.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -37 +37 @@
 #include <stdio.h>
 #include <adt/prodcons.h>
+#include <io/console.h>
 #include <io/input.h>
 #include <ipc/vfs.h>
@@ -89 +90 @@
 } console_t;
 
+static loc_srv_t *console_srv;
+
 /** Input server proxy */
 static input_t *input;
@@ -120 +123 @@
 static errno_t input_ev_active(input_t *);
 static errno_t input_ev_deactive(input_t *);
-static errno_t input_ev_key(input_t *, kbd_event_type_t, keycode_t, keymod_t, char32_t);
-static errno_t input_ev_move(input_t *, int, int);
-static errno_t input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
-static errno_t input_ev_button(input_t *, int, int);
+static errno_t input_ev_key(input_t *, unsigned, kbd_event_type_t, keycode_t,
+    keymod_t, char32_t);
+static errno_t input_ev_move(input_t *, unsigned, int, int);
+static errno_t input_ev_abs_move(input_t *, unsigned, unsigned, unsigned,
+    unsigned, unsigned);
+static errno_t input_ev_button(input_t *, unsigned, int, int);
+static errno_t input_ev_dclick(input_t *, unsigned, int);
 
 static input_ev_ops_t input_ev_ops = {
@@ -131 +137 @@
         .move = input_ev_move,
         .abs_move = input_ev_abs_move,
-        .button = input_ev_button
+        .button = input_ev_button,
+        .dclick = input_ev_dclick
 };
 
@@ -149 +156 @@
 static void cons_set_rgb_color(con_srv_t *, pixel_t, pixel_t);
 static void cons_set_cursor_visibility(con_srv_t *, bool);
+static errno_t cons_set_caption(con_srv_t *, const char *);
 static errno_t cons_get_event(con_srv_t *, cons_event_t *);
 static errno_t cons_map(con_srv_t *, sysarg_t, sysarg_t, charfield_t **);
@@ -170 +178 @@
         .set_rgb_color = cons_set_rgb_color,
         .set_cursor_visibility = cons_set_cursor_visibility,
+        .set_caption = cons_set_caption,
         .get_event = cons_get_event,
         .map = cons_map,
@@ -325 +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);
 
@@ -353 +362 @@
 }
 
-static errno_t input_ev_key(input_t *input, kbd_event_type_t type, keycode_t key,
-    keymod_t mods, char32_t c)
+static errno_t input_ev_key(input_t *input, unsigned kbd_id,
+    kbd_event_type_t type, keycode_t key, keymod_t mods, char32_t c)
 {
         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 {
@@ -365 +380 @@
                 event.type = CEV_KEY;
 
+                (void)kbd_id;
                 event.ev.key.type = type;
                 event.ev.key.key = key;
@@ -413 +429 @@
 }
 
-static errno_t input_ev_move(input_t *input, int dx, int dy)
-{
+static errno_t input_ev_move(input_t *input, unsigned pos_id, int dx, int dy)
+{
+        (void) pos_id;
         pointer_update(pointer_x + dx, pointer_y + dy);
         return EOK;
 }
 
-static errno_t input_ev_abs_move(input_t *input, unsigned x, unsigned y,
-    unsigned max_x, unsigned max_y)
-{
+static errno_t input_ev_abs_move(input_t *input, unsigned pos_id, unsigned x,
+    unsigned y, unsigned max_x, unsigned max_y)
+{
+        (void)pos_id;
         pointer_update(mouse_scale_x * cols * x / max_x, mouse_scale_y * rows * y / max_y);
         return EOK;
 }
 
-static errno_t input_ev_button(input_t *input, int bnum, int bpress)
+static errno_t input_ev_button(input_t *input, unsigned pos_id, int bnum,
+    int bpress)
 {
         cons_event_t event;
+
+        (void)pos_id;
 
         event.type = CEV_POS;
         event.ev.pos.type = bpress ? POS_PRESS : POS_RELEASE;
+        event.ev.pos.btn_num = bnum;
+        event.ev.pos.hpos = pointer_x / mouse_scale_x;
+        event.ev.pos.vpos = pointer_y / mouse_scale_y;
+
+        console_queue_cons_event(active_console, &event);
+        return EOK;
+}
+
+static errno_t input_ev_dclick(input_t *input, unsigned pos_id, int bnum)
+{
+        cons_event_t event;
+
+        (void)pos_id;
+
+        event.type = CEV_POS;
+        event.ev.pos.type = POS_DCLICK;
         event.ev.pos.btn_num = bnum;
         event.ev.pos.hpos = pointer_x / mouse_scale_x;
@@ -519 +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. */
@@ -530 +568 @@
                         }
 
-                        free(event);
+                        free(qevent);
                 }
         }
@@ -653 +691 @@
 }
 
+static errno_t cons_set_caption(con_srv_t *srv, const char *caption)
+{
+        console_t *cons = srv_to_console(srv);
+
+        (void) cons;
+        (void) caption;
+        return EOK;
+}
+
 static errno_t cons_get_event(con_srv_t *srv, cons_event_t *event)
 {
         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;
 }
@@ -865 +912 @@
         /* Register server */
         async_set_fallback_port_handler(client_connection, NULL);
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &console_srv);
         if (rc != EOK) {
                 printf("%s: Unable to register server (%s)\n", NAME,
@@ -915 +962 @@
                         snprintf(vc, LOC_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i);
 
-                        if (loc_service_register(vc, &consoles[i].dsid) != EOK) {
+                        if (loc_service_register(console_srv, vc,
+                            &consoles[i].dsid) != EOK) {
                                 printf("%s: Unable to register device %s\n", NAME, vc);
                                 return false;