Changeset a8171b86 in mainline for uspace/app/bdsh/cmds/modules/layout/layout.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/app/bdsh/cmds/modules/layout/layout.c (modified) (7 diffs)

uspace/app/bdsh/cmds/modules/layout/layout.c

@@ -30 +30 @@
 #include <stdlib.h>
 #include <str.h>
+#include <str_error.h>
 #include <dirent.h>
 #include <ipc/services.h>
@@ -46 +47 @@
 static const char *path_layouts = "/lib/layouts/";
 
-
 /* Dispays help for layout in various levels */
 void help_cmd_layout(unsigned int level)
@@ -54 +54 @@
         if (level != HELP_SHORT) {
                 printf(
-                        "Usage: %s\n"
-                        "\t%s list\tlists all layouts\n"
-                        "\t%s get\t displays currently set layout\n"
-                        "\t%s set <layout>\tchanges to the new layout\n",
-                        cmdname, cmdname, cmdname, cmdname);
+                    "Usage: %s\n"
+                    "\t%s list\tlists all layouts\n"
+                    "\t%s get\t displays currently set layout\n"
+                    "\t%s set <layout>\tchanges to the new layout\n",
+                    cmdname, cmdname, cmdname, cmdname);
         }
 
@@ -102 +102 @@
 }
 
+/* displays active keyboard layout */
 static int cmd_layout_get(void)
 {
-        return CMD_FAILURE;
-}
-
-
+        service_id_t svcid;
+        ipc_call_t call;
+        errno_t rc = loc_service_get_id(SERVICE_NAME_HID_INPUT, &svcid, 0);
+        if (rc != EOK) {
+                cli_error(CL_ENOENT, "%s: Failing to find service `%s`\n", cmdname, SERVICE_NAME_HID_INPUT);
+                return CMD_FAILURE;
+        }
+
+        async_sess_t *sess = loc_service_connect(svcid, INTERFACE_ANY, 0);
+        if (sess == NULL) {
+                cli_error(CL_ENOENT, "%s: Failing to connect to service `%s`\n", cmdname, SERVICE_NAME_HID_INPUT);
+                return CMD_FAILURE;
+        }
+
+        void *layout_name = NULL;
+        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_name = malloc(length * sizeof(char *));
+        if (layout_name == NULL) {
+                cli_error(CL_ENOMEM, "%s: Failing to allocate memory for keyboard layout\n", cmdname);
+                rc = ENOMEM;
+                goto error;
+        }
+
+        rc = async_data_read_start(exch, layout_name, length);
+
+        if (rc == EOK) {
+                printf("%s\n", (char *)layout_name);
+        } else {
+                printf("%s: Failing to get activated keyboard layout\n (%s)\n", cmdname, str_error(rc));
+                goto error;
+        }
+
+error:
+        free(layout_name);
+        async_exchange_end(exch);
+        async_hangup(sess);
+
+        return rc == EOK ? CMD_SUCCESS : CMD_FAILURE;
+
+}
+
+/* changes the keyboard layout */
 static int cmd_layout_set(char *layout)
 {
@@ -129 +177 @@
         aid_t mid = async_send_0(exch, INPUT_CHANGE_LAYOUT, &call);
         rc = async_data_write_start(exch, layout, str_size(layout));
-        
-        if (rc == EOK)
+
+        if (rc == EOK) {
                 async_wait_for(mid, &rc);
-        
+        }
+
         async_exchange_end(exch);
         async_hangup(sess);
+
+        if (rc != EOK) {
+                printf("%s: Cannot activate keyboard layout `%s`\n (%s)\n", cmdname, layout, str_error(rc));
+        }
 
         return rc == EOK ? CMD_SUCCESS : CMD_FAILURE;
@@ -155 +208 @@
                 } else if (str_cmp(argv[1], "set") == 0 && argc == 3) {
                         return cmd_layout_set(argv[2]);
-                }       
+                }
         }
 
@@ -161 +214 @@
         return CMD_FAILURE;
 }
-