aboutsummaryrefslogtreecommitdiffstats
path: root/swaymsg
diff options
context:
space:
mode:
authorLibravatar Harish Krupo <harishkrupo@gmail.com>2018-11-12 14:33:16 +0530
committerLibravatar Harish Krupo <harishkrupo@gmail.com>2018-11-12 22:00:22 +0530
commitd8ad429e3974690ed7b48e5ad1d5af6dc7f2aebe (patch)
treebf43028f14e68cd1dcd1b3c4fcec6506674d4376 /swaymsg
parentMerge pull request #3113 from RedSoxFan/fix-ws-auto-back-and-forth (diff)
downloadsway-d8ad429e3974690ed7b48e5ad1d5af6dc7f2aebe.tar.gz
sway-d8ad429e3974690ed7b48e5ad1d5af6dc7f2aebe.tar.zst
sway-d8ad429e3974690ed7b48e5ad1d5af6dc7f2aebe.zip
IPC: Send keyboard layout info in IPC_GET_INPUTS
Signed-off-by: Harish Krupo <harishkrupo@gmail.com>
Diffstat (limited to 'swaymsg')
-rw-r--r--swaymsg/main.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/swaymsg/main.c b/swaymsg/main.c
index 663518f6..243b5fdc 100644
--- a/swaymsg/main.c
+++ b/swaymsg/main.c
@@ -111,7 +111,7 @@ static const char *pretty_type_name(const char *name) {
111} 111}
112 112
113static void pretty_print_input(json_object *i) { 113static void pretty_print_input(json_object *i) {
114 json_object *id, *name, *type, *product, *vendor; 114 json_object *id, *name, *type, *product, *vendor, *kbdlayout;
115 json_object_object_get_ex(i, "identifier", &id); 115 json_object_object_get_ex(i, "identifier", &id);
116 json_object_object_get_ex(i, "name", &name); 116 json_object_object_get_ex(i, "name", &name);
117 json_object_object_get_ex(i, "type", &type); 117 json_object_object_get_ex(i, "type", &type);
@@ -123,7 +123,7 @@ static void pretty_print_input(json_object *i) {
123 " Type: %s\n" 123 " Type: %s\n"
124 " Identifier: %s\n" 124 " Identifier: %s\n"
125 " Product ID: %d\n" 125 " Product ID: %d\n"
126 " Vendor ID: %d\n\n"; 126 " Vendor ID: %d\n";
127 127
128 128
129 printf(fmt, json_object_get_string(name), 129 printf(fmt, json_object_get_string(name),
@@ -131,6 +131,13 @@ static void pretty_print_input(json_object *i) {
131 json_object_get_string(id), 131 json_object_get_string(id),
132 json_object_get_int(product), 132 json_object_get_int(product),
133 json_object_get_int(vendor)); 133 json_object_get_int(vendor));
134
135 if (json_object_object_get_ex(i, "xkb_active_layout_name", &kbdlayout)) {
136 printf(" Active Keyboard Layout: %s\n",
137 json_object_get_string(kbdlayout));
138 }
139
140 printf("\n");
134} 141}
135 142
136static void pretty_print_seat(json_object *i) { 143static void pretty_print_seat(json_object *i) {