Changeset 166dccf in mainline

Timestamp:

2021-01-08T00:48:12Z (12 days ago)

Author:

GitHub <noreply@…>

Parents:

d70dc1c4 (diff), 8fb674b (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:

Matthieu Riolo <matthieu.riolo@…> (2021-01-08 00:48:12)

git-committer:

GitHub <noreply@…> (2021-01-08 00:48:12)

Message:

Merge 8fb674bf23f163e488d9f574fd372f15eacb9f21 into d70dc1c40835f7e957ea1b4fa52c29db4d21ced4

Location:

uspace

Files:

• app/init/init.c (modified) (2 diffs)
• app/layout/layout.c (added)
• app/layout/meson.build (added)
• app/meson.build (modified) (1 diff)
• lib/c/generic/io/input.c (modified) (2 diffs)
• lib/c/include/io/input.h (modified) (1 diff)
• lib/c/include/ipc/input.h (modified) (1 diff)
• lib/c/include/ipc/services.h (modified) (1 diff)
• srv/hid/input/input.c (modified) (6 diffs)
• srv/hid/input/input.h (modified) (1 diff)
• srv/hid/input/layout.h (modified) (1 diff)
• srv/hid/input/layout/ar.c (modified) (1 diff)
• srv/hid/input/layout/cz.c (modified) (1 diff)
• srv/hid/input/layout/fr_azerty.c (modified) (1 diff)
• srv/hid/input/layout/us_dvorak.c (modified) (1 diff)
• srv/hid/input/layout/us_qwerty.c (modified) (1 diff)

uspace/app/init/init.c

@@ -50 +50 @@
 #include <vfs/vfs.h>
 #include <vol.h>
+#include <ipc/services.h>
 #include "untar.h"
 #include "init.h"
@@ -70 +71 @@
 #define SRV_DISPLAY  "/srv/hid/display"
 
-#define HID_INPUT              "hid/input"
+#define HID_INPUT              SERVICE_NAME_HID_INPUT
 #define HID_OUTPUT             "hid/output"
 

uspace/app/meson.build

@@ -56 +56 @@
         'kio',
         'launcher',
+        'layout',
         'loc',
         'logset',

uspace/lib/c/generic/io/input.c

@@ -42 +42 @@
 #include <ipc/input.h>
 #include <stdlib.h>
+#include <str.h>
 
 static void input_cb_conn(ipc_call_t *icall, void *arg);
@@ -202 +203 @@
 }
 
+/**
+ * Retrieves the active keyboard layout
+ * @param sess Active session to the input server
+ * @param layout The name of the currently active layout,
+ *        needs to be freed by the caller
+ * @return EOK if sucessful or the corresponding error code.
+ *         If a failure occurs the param layout is already freed
+ */
+errno_t input_layout_get(async_sess_t *sess, char **layout)
+{
+        *layout = NULL;
+
+        async_exch_t *exch = async_exchange_begin(sess);
+
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, INPUT_GET_LAYOUT, &answer);
+
+        char layout_buf[INPUT_LAYOUT_NAME_MAXLEN + 1];
+        ipc_call_t dreply;
+        aid_t dreq = async_data_read(exch, layout_buf, INPUT_LAYOUT_NAME_MAXLEN,
+            &dreply);
+
+        errno_t dretval;
+        async_wait_for(dreq, &dretval);
+
+        async_exchange_end(exch);
+
+        if (dretval != EOK) {
+                async_forget(req);
+                return dretval;
+        }
+
+        errno_t retval;
+        async_wait_for(req, &retval);
+
+        if (retval != EOK)
+                return retval;
+
+        size_t length = ipc_get_arg2(&dreply);
+        assert(length <= INPUT_LAYOUT_NAME_MAXLEN);
+        layout_buf[length] = '\0';
+
+        *layout = str_dup(layout_buf);
+        if (*layout == NULL)
+                return ENOMEM;
+
+        return EOK;
+}
+
+/**
+ * Changes the keyboard layout
+ * @param sess Active session to the input server
+ * @param layout The name of the layout which should be activated
+ * @return EOK if sucessful or the corresponding error code.
+ */
+errno_t input_layout_set(async_sess_t *sess, const char *layout)
+{
+        errno_t rc;
+        ipc_call_t call;
+        async_exch_t *exch = async_exchange_begin(sess);
+
+        aid_t mid = async_send_0(exch, INPUT_SET_LAYOUT, &call);
+        rc = async_data_write_start(exch, layout, str_size(layout));
+
+        if (rc == EOK)
+                async_wait_for(mid, &rc);
+
+        async_exchange_end(exch);
+        return rc;
+}
+
 /** @}
  */

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

@@ -60 +60 @@
 extern errno_t input_activate(input_t *);
 
+extern errno_t input_layout_get(async_sess_t *sess, char **layout_name);
+extern errno_t input_layout_set(async_sess_t *sess, const char *layout_name);
 #endif
 

uspace/lib/c/include/ipc/input.h

@@ -38 +38 @@
 #include <ipc/common.h>
 
+static size_t const INPUT_LAYOUT_NAME_MAXLEN = 255;
+
 typedef enum {
-        INPUT_ACTIVATE = IPC_FIRST_USER_METHOD
+        INPUT_ACTIVATE = IPC_FIRST_USER_METHOD,
+        INPUT_SET_LAYOUT,
+        INPUT_GET_LAYOUT
 } input_request_t;
 

uspace/lib/c/include/ipc/services.h

@@ -59 +59 @@
 #define SERVICE_NAME_INET     "net/inet"
 #define SERVICE_NAME_IPC_TEST "ipc-test"
+#define SERVICE_NAME_HID_INPUT    "hid/input"
 #define SERVICE_NAME_NETCONF  "net/netconf"
 #define SERVICE_NAME_UDP      "net/udp"

uspace/srv/hid/input/input.c

@@ -50 +50 @@
 #include <ipc/input.h>
 #include <loc.h>
+#include <macros.h>
 #include <ns.h>
 #include <stdbool.h>
@@ -66 +67 @@
 #include "serial.h"
 
-#define NUM_LAYOUTS 5
+static layout_ops_t *layout_active = &us_qwerty_ops;
+
+#define NUM_LAYOUTS  5
 
 static layout_ops_t *layout[NUM_LAYOUTS] = {
@@ -107 +110 @@
 
 static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
+
+/* changes all kb devices to the given layout */
+static void layout_change(layout_ops_t *layout)
+{
+        list_foreach(kbd_devs, link, kbd_dev_t, kdev) {
+                layout_t *ret = layout_create(layout);
+                if (ret != NULL) {
+                        layout_destroy(kdev->active_layout);
+                        kdev->active_layout = ret;
+                }
+        }
+}
+
+/* similiar like layout_change but takes as an argument the name of the layout */
+static errno_t layout_load(const char *layout_name)
+{
+        /* TODO: change this into a loader for kb layout maps */
+        for (int i = 0; i < NUM_LAYOUTS; i++) {
+                if (str_cmp(layout[i]->name, layout_name) == 0) {
+                        layout_active = layout[i];
+                        layout_change(layout_active);
+                        return EOK;
+                }
+        }
+
+        return ENOTSUP;
+}
+
+/* Handler for IPC call INPUT_SET_LAYOUT */
+static void client_set_layout_srv(ipc_call_t *call)
+{
+        void *layout_name;
+        errno_t ret = async_data_write_accept(&layout_name, true, 0, 0, 0, 0);
+        if (ret != EOK) {
+                async_answer_0(call, ret);
+                return;
+        }
+
+        errno_t retval = layout_load((char *)layout_name);
+        free(layout_name);
+        async_answer_0(call, retval);
+}
+
+/* Handler for IPC call INPUT_GET_LAYOUT */
+static void client_get_layout_srv(ipc_call_t *call)
+{
+        const char *layout_name = layout_active->name;
+        size_t length = str_size(layout_name) + 1;
+        ipc_call_t rec_call;
+
+        size_t max_size;
+        if (!async_data_read_receive(&rec_call, &max_size)) {
+                async_answer_0(&rec_call, EREFUSED);
+                async_answer_0(call, EREFUSED);
+                return;
+        }
+
+        errno_t rc = async_data_read_finalize(&rec_call, layout_name,
+            min(length, max_size));
+        async_answer_0(call, rc);
+}
 
 static void *client_data_create(void)
@@ -212 +276 @@
                 switch (key) {
                 case KC_F1:
-                        layout_destroy(kdev->active_layout);
-                        kdev->active_layout = layout_create(layout[0]);
+                        layout_change(layout[0]);
                         break;
                 case KC_F2:
-                        layout_destroy(kdev->active_layout);
-                        kdev->active_layout = layout_create(layout[1]);
+                        layout_change(layout[1]);
                         break;
                 case KC_F3:
-                        layout_destroy(kdev->active_layout);
-                        kdev->active_layout = layout_create(layout[2]);
+                        layout_change(layout[2]);
                         break;
                 case KC_F4:
-                        layout_destroy(kdev->active_layout);
-                        kdev->active_layout = layout_create(layout[3]);
+                        layout_change(layout[3]);
                         break;
                 case KC_F5:
-                        layout_destroy(kdev->active_layout);
-                        kdev->active_layout = layout_create(layout[4]);
+                        layout_change(layout[4]);
                         break;
                 default: // default: is here to avoid compiler warning about unhandled cases
@@ -367 +426 @@
                                 async_answer_0(&call, EOK);
                                 break;
+                        case INPUT_SET_LAYOUT:
+                                client_set_layout_srv(&call);
+                                break;
+                        case INPUT_GET_LAYOUT:
+                                client_get_layout_srv(&call);
+                                break;
                         default:
                                 async_answer_0(&call, EINVAL);
@@ -400 +465 @@
         kdev->mods = KM_NUM_LOCK;
         kdev->lock_keys = 0;
-        kdev->active_layout = layout_create(layout[0]);
+        kdev->active_layout = layout_create(layout_active);
 
         return kdev;

uspace/srv/hid/input/input.h

@@ -41 +41 @@
 #include <stdbool.h>
 #include <async.h>
+#include <ipc/services.h>
 
-#define NAME  "input"
+#define NAME SERVICE_NAME_HID_INPUT
 
 extern bool irc_service;

uspace/srv/hid/input/layout.h

@@ -54 +54 @@
         void (*destroy)(layout_t *);
         char32_t (*parse_ev)(layout_t *, kbd_event_t *);
+        const char *name;
 } layout_ops_t;
 

uspace/srv/hid/input/layout/ar.c

@@ -49 +49 @@
         .create = ar_create,
         .destroy = ar_destroy,
-        .parse_ev = ar_parse_ev
+        .parse_ev = ar_parse_ev,
+        .name = "ar"
 };
 

uspace/srv/hid/input/layout/cz.c

@@ -60 +60 @@
         .create = cz_create,
         .destroy = cz_destroy,
-        .parse_ev = cz_parse_ev
+        .parse_ev = cz_parse_ev,
+        .name = "cz"
 };
 

uspace/srv/hid/input/layout/fr_azerty.c

@@ -48 +48 @@
         .create = fr_azerty_create,
         .destroy = fr_azerty_destroy,
-        .parse_ev = fr_azerty_parse_ev
+        .parse_ev = fr_azerty_parse_ev,
+        .name = "fr_azerty"
 };
 

uspace/srv/hid/input/layout/us_dvorak.c

@@ -48 +48 @@
         .create = us_dvorak_create,
         .destroy = us_dvorak_destroy,
-        .parse_ev = us_dvorak_parse_ev
+        .parse_ev = us_dvorak_parse_ev,
+        .name = "us_dvorak"
 };
 

uspace/srv/hid/input/layout/us_qwerty.c

@@ -48 +48 @@
         .create = us_qwerty_create,
         .destroy = us_qwerty_destroy,
-        .parse_ev = us_qwerty_parse_ev
+        .parse_ev = us_qwerty_parse_ev,
+        .name = "us_qwerty"
 };