Changeset e89dc0b in mainline

Timestamp:

2019-05-15T18:53:09Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

9fe1635

Parents:

8f16ede6

Message:

implementing IPC for changing kb layout

Location:

uspace

Files:

• lib/c/include/ipc/input.h (modified) (1 diff)
• srv/hid/input/input.c (modified) (5 diffs)

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

@@ -39 +39 @@
 
 typedef enum {
-        INPUT_ACTIVATE = IPC_FIRST_USER_METHOD
+        INPUT_ACTIVATE = IPC_FIRST_USER_METHOD,
+        INPUT_CHANGE_LAYOUT
 } input_request_t;
 

uspace/srv/hid/input/input.c

@@ -56 +56 @@
 #include <str.h>
 #include <str_error.h>
+#include <dlfcn.h>
 
 #include "input.h"
@@ -97 +98 @@
 
 static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
+
+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;
+                }
+        }
+}
+
+static void layout_load(const char *layout_name)
+{
+/*
+        async_get_call(ipc_call_t *);
+ipc_get_arg1(ipc_call_t *);
+*/      
+        const char *prefix = "/lib/layouts/";
+        const char *suffix = ".so";
+        size_t length = 1;
+        length += str_size(prefix);
+        length += str_size(suffix);
+        length += str_size(layout_name);
+        char *path = malloc(sizeof(char) * length);
+
+        if (path == NULL) {
+                printf("%s: Error allocating layout path. Out of memory.\n", NAME);
+                return;
+        }
+
+        str_append(path, length, prefix);
+        str_append(path, length, layout_name);
+        str_append(path, length, suffix);
+
+        void *handle = dlopen(path, 0);
+        if (handle == NULL) {
+                printf("%s: Keyboard layout could not be found.\n", NAME);
+                return;
+        }
+
+        layout_ops_t (*get_layout)(void) = dlsym(handle, "dl_get_constant");
+
+        if (get_layout == NULL) {
+                printf("%s: Keyboard layout constructor could not be found.\n", NAME);
+                return;
+        }
+
+        layout_active = get_layout();
+        layout_change(&layout_active);
+}
 
 static void *client_data_create(void)
@@ -198 +250 @@
 
         if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) && (key == KC_F1)) {
-                layout_destroy(kdev->active_layout);
-                kdev->active_layout = layout_create(&layout_default);
+                layout_active = layout_default;
+                layout_change(&layout_default);
                 return;
         }
@@ -326 +378 @@
                                 async_answer_0(&call, EOK);
                                 break;
+                        case INPUT_CHANGE_LAYOUT: {
+                                char * layout_name = (char *)ipc_get_arg1(&call);
+                                layout_load(layout_name);
+                                free(layout_name);
+                                break;
+                        }
                         default:
                                 async_answer_0(&call, EINVAL);
@@ -359 +417 @@
         kdev->mods = KM_NUM_LOCK;
         kdev->lock_keys = 0;
-        kdev->active_layout = layout_create(&layout_default);
+        kdev->active_layout = layout_create(&layout_active);
 
         return kdev;