Changeset a8171b86 in mainline for uspace/srv/hid/input/input.c

Timestamp:

2019-05-18T06:42:01Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Parents:

f9edc7b

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-05-16 09:48:08)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-05-18 06:42:01)

Message:

Implementing layout get

The command layout can now display the current active
keyboard layout. The service hid/input has been extended
for the IPC call INPUT_GET_LAYOUT

File:

• uspace/srv/hid/input/input.c (modified) (4 diffs)

uspace/srv/hid/input/input.c

@@ -120 +120 @@
         length += str_size(layout_name);
         char *path = malloc(sizeof(char) * (length + 1));
-        
+
         if (path == NULL) {
                 printf("%s: Error allocating layout path. Out of memory.\n", NAME);
@@ -130 +130 @@
         str_append(path, length, layout_name);
         str_append(path, length, suffix);
-        printf("%s\n", path);
 
         void *handle = dlopen(path, 0);
@@ -340 +339 @@
 }
 
+/* Handler for IPC call INPUT_CHANGE_LAYOUT */
+static void client_change_layout_handler(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_handler(ipc_call_t *call)
+{
+        const char *layout_name = layout_active.get_name();
+        size_t length = str_size(layout_name) + 1;
+        ipc_call_t id;
+
+        async_answer_1(call, EOK, length);
+        if (async_data_read_receive(&id, NULL)) {
+                async_data_read_finalize(&id, layout_name, length);
+        }
+}
+
 /** New client connection */
 static void client_connection(ipc_call_t *icall, void *arg)
@@ -380 +407 @@
                                 async_answer_0(&call, EOK);
                                 break;
-                        case INPUT_CHANGE_LAYOUT: {
-                                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);
-                                        break;
-                                }
-
-                                errno_t retval = layout_load((char *)layout_name);
-                                free(layout_name);
-                                async_answer_0(&call, retval);
+                        case INPUT_CHANGE_LAYOUT:
+                                client_change_layout_handler(&call);
                                 break;
-                        }
+                        case INPUT_GET_LAYOUT:
+                                client_get_layout_handler(&call);
+                                break;
                         default:
                                 async_answer_0(&call, EINVAL);