Changeset a76ba5f3 in mainline for uspace/lib/c/generic/io/input.c

Timestamp:

2020-12-31T21:27:13Z (4 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

6a208fc

Parents:

19f60a38

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-10-07 18:10:19)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-12-31 21:27:13)

Message:

Relocating IPC calls in the layout to io/input

The IPC calls for changing the layout was located in
the application layout. Now they have been relocated
into the library io/input. This commit also changes
the behaviour of layout when called without any
parameters (no error status is returned)

File:

• uspace/lib/c/generic/io/input.c (modified) (2 diffs)

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)
+{
+        errno_t rc;
+        ipc_call_t call;
+        async_exch_t *exch = async_exchange_begin(sess);
+        aid_t mid = async_send_0(exch, INPUT_GET_LAYOUT, &call);
+        async_wait_for(mid, &rc);
+
+        if (rc != EOK) {
+                goto error;
+        }
+
+        size_t length = ipc_get_arg1(&call);
+
+        *layout = malloc(length * sizeof(char *));
+        if (layout == NULL) {
+                rc = ENOMEM;
+                free(*layout);
+                goto error;
+        }
+
+        rc = async_data_read_start(exch, *layout, length);
+
+        if (rc != EOK)
+                free(*layout);
+
+error:
+        async_exchange_end(exch);
+        return rc;
+}
+
+/**
+ * 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_CHANGE_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;
+}
+
 /** @}
  */