Index: uspace/app/layout/layout.c =================================================================== --- uspace/app/layout/layout.c (revision 19f60a38af814614ddf905c12dbc60cfbe9687b0) +++ uspace/app/layout/layout.c (revision 19f60a38af814614ddf905c12dbc60cfbe9687b0) @@ -0,0 +1,179 @@ +/* + * Copyright (c) 2019 Matthieu Riolo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup layout + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static const char *cmdname = "layout"; + +/* Dispays help for layout in various levels */ +static void print_help() +{ + printf("Changes, lists or displays the current keyboard layout.\n"); + + printf( + "Usage: %s\n" + "\t%s list\tlists all layouts\n" + "\t%s get\t displays currently set layout\n" + "\t%s set \tchanges to the new layout\n", + cmdname, cmdname, cmdname, cmdname); +} + +/* lists all available kb layouts */ +static errno_t list_layout(void) +{ + /* TODO: replace this with the content of the folder containing the keymaps */ + + printf("ar\n"); + printf("cz\n"); + printf("fr_azerty\n"); + printf("us_dvorak\n"); + printf("us_qwerty\n"); + + return EOK; +} + +/* displays active keyboard layout */ +static errno_t get_layout(void) +{ + service_id_t svcid; + ipc_call_t call; + errno_t rc = loc_service_get_id(SERVICE_NAME_HID_INPUT, &svcid, 0); + if (rc != EOK) { + printf("%s: Failing to find service `%s`\n", cmdname, SERVICE_NAME_HID_INPUT); + return rc; + } + + async_sess_t *sess = loc_service_connect(svcid, INTERFACE_ANY, 0); + if (sess == NULL) { + printf("%s: Failing to connect to service `%s`\n", cmdname, SERVICE_NAME_HID_INPUT); + return rc; + } + + 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) { + printf("%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; + +} + +/* changes the keyboard layout */ +static errno_t set_layout(char *layout) +{ + service_id_t svcid; + ipc_call_t call; + errno_t rc = loc_service_get_id(SERVICE_NAME_HID_INPUT, &svcid, 0); + if (rc != EOK) { + printf("%s: Failing to find service `%s`\n", cmdname, SERVICE_NAME_HID_INPUT); + return rc; + } + + async_sess_t *sess = loc_service_connect(svcid, INTERFACE_ANY, 0); + if (sess == NULL) { + printf("%s: Failing to connect to service `%s`\n", cmdname, SERVICE_NAME_HID_INPUT); + return rc; + } + + 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); + async_hangup(sess); + + if (rc != EOK) { + printf("%s: Cannot activate keyboard layout `%s`\n (%s)\n", cmdname, layout, str_error(rc)); + } + + return rc; +} + +int main(int argc, char *argv[]) +{ + if (argc == 2) { + if (str_cmp(argv[1], "list") == 0) { + return list_layout(); + } else if (str_cmp(argv[1], "get") == 0) { + return get_layout(); + } + } else if (argc == 3) { + if (str_cmp(argv[1], "set") == 0 && argc == 3) { + return set_layout(argv[2]); + } + } + + print_help(); + return 1; +} Index: uspace/app/layout/meson.build =================================================================== --- uspace/app/layout/meson.build (revision 19f60a38af814614ddf905c12dbc60cfbe9687b0) +++ uspace/app/layout/meson.build (revision 19f60a38af814614ddf905c12dbc60cfbe9687b0) @@ -0,0 +1,29 @@ +# +# Copyright (c) 2019 Matthieu Riolo +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +src = files('layout.c') Index: uspace/app/meson.build =================================================================== --- uspace/app/meson.build (revision 11e394f9d494211274c7ab598fe773604068e733) +++ uspace/app/meson.build (revision 19f60a38af814614ddf905c12dbc60cfbe9687b0) @@ -56,4 +56,5 @@ 'kio', 'launcher', + 'layout', 'loc', 'logset',