mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 16:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipc: handle unnamed xkb_active_layout_name

Browse source 
If the active xkb_layout does not have a name, use `NULL` instead of
`json_object_new_string(NULL)`. This also makes it so swaymsg will pretty
print this as `(unnamed)`.
This commit is contained in:
Brian Ashworth 2019-02-10 15:37:24 -05:00 committed by Drew DeVault
parent 4e27785980
commit a4d7ee1923
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/ipc-json.c
View file

@ -597,7 +597,7 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) {
const char *layout = const char *layout =
xkb_keymap_layout_get_name(keymap, layout_idx); xkb_keymap_layout_get_name(keymap, layout_idx);
json_object_object_add(object, "xkb_active_layout_name", json_object_object_add(object, "xkb_active_layout_name",
json_object_new_string(layout)); layout ? json_object_new_string(layout) : NULL);
break; break;
} }
} }

4
swaymsg/main.c
View file

@ -135,8 +135,8 @@ static void pretty_print_input(json_object *i) {
json_object_get_int(vendor)); json_object_get_int(vendor));
if (json_object_object_get_ex(i, "xkb_active_layout_name", &kbdlayout)) { if (json_object_object_get_ex(i, "xkb_active_layout_name", &kbdlayout)) {
printf(" Active Keyboard Layout: %s\n", const char *layout = json_object_get_string(kbdlayout);
json_object_get_string(kbdlayout)); printf(" Active Keyboard Layout: %s\n", layout ? layout : "(unnamed)");
} }
if (json_object_object_get_ex(i, "libinput_send_events", &events)) { if (json_object_object_get_ex(i, "libinput_send_events", &events)) {