mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-01 19:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add backwards compatability for binding event

Browse source
This commit is contained in:
Mikkel Oscar Lyderik 2016-01-09 20:56:42 +01:00
parent e3ddcaabc4
commit 15621ea8ff
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sway/ipc-server.c
View file

@ -668,13 +668,18 @@ void ipc_event_binding_keyboard(struct sway_binding *sb) {
json_object_object_add(sb_obj, "event_state_mask", modifiers); json_object_object_add(sb_obj, "event_state_mask", modifiers);
json_object *input_codes = json_object_new_array(); json_object *input_codes = json_object_new_array();
int input_code = 0;
json_object *symbols = json_object_new_array(); json_object *symbols = json_object_new_array();
json_object *symbol = NULL;
if (sb->bindcode) { // bindcode: populate input_codes if (sb->bindcode) { // bindcode: populate input_codes
uint32_t keycode; uint32_t keycode;
for (i = 0; i < sb->keys->length; ++i) { for (i = 0; i < sb->keys->length; ++i) {
keycode = *(uint32_t *)sb->keys->items[i]; keycode = *(uint32_t *)sb->keys->items[i];
json_object_array_add(input_codes, json_object_new_int(keycode)); json_object_array_add(input_codes, json_object_new_int(keycode));
if (i == 0) {
input_code = keycode;
}
} }
} else { // bindsym: populate symbols } else { // bindsym: populate symbols
uint32_t keysym; uint32_t keysym;
@ -682,13 +687,19 @@ void ipc_event_binding_keyboard(struct sway_binding *sb) {
for (i = 0; i < sb->keys->length; ++i) { for (i = 0; i < sb->keys->length; ++i) {
keysym = *(uint32_t *)sb->keys->items[i]; keysym = *(uint32_t *)sb->keys->items[i];
if (xkb_keysym_get_name(keysym, buffer, 64) > 0) { if (xkb_keysym_get_name(keysym, buffer, 64) > 0) {
json_object_array_add(symbols, json_object_new_string(buffer)); json_object *str = json_object_new_string(buffer);
json_object_array_add(symbols, str);
if (i == 0) {
symbol = str;
}
} }
} }
} }
json_object_object_add(sb_obj, "input_codes", input_codes); json_object_object_add(sb_obj, "input_codes", input_codes);
json_object_object_add(sb_obj, "input_code", json_object_new_int(input_code));
json_object_object_add(sb_obj, "symbols", symbols); json_object_object_add(sb_obj, "symbols", symbols);
json_object_object_add(sb_obj, "symbol", symbol);
json_object_object_add(sb_obj, "input_type", json_object_new_string("keyboard")); json_object_object_add(sb_obj, "input_type", json_object_new_string("keyboard"));
ipc_event_binding(sb_obj); ipc_event_binding(sb_obj);