diff options
Diffstat (limited to 'sway/ipc-server.c')
-rw-r--r-- | sway/ipc-server.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 6554098b..67a3cdc8 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
@@ -421,17 +421,9 @@ void ipc_client_handle_command(struct ipc_client *client) { | |||
421 | } | 421 | } |
422 | json_object *inputs = json_object_new_array(); | 422 | json_object *inputs = json_object_new_array(); |
423 | if (input_devices) { | 423 | if (input_devices) { |
424 | for(int i=0; i<input_devices->length; i++) { | 424 | for(int i = 0; i<input_devices->length; i++) { |
425 | struct libinput_device *device = input_devices->items[i]; | 425 | struct libinput_device *device = input_devices->items[i]; |
426 | char* identifier = libinput_dev_unique_id(device); | 426 | json_object_array_add(inputs, ipc_json_describe_input(device)); |
427 | json_object *device_object = json_object_new_object(); | ||
428 | if (!identifier) { | ||
429 | json_object_object_add(device_object, "identifier", NULL); | ||
430 | } else { | ||
431 | json_object_object_add(device_object, "identifier", json_object_new_string(identifier)); | ||
432 | } | ||
433 | json_object_array_add(inputs, device_object); | ||
434 | free(identifier); | ||
435 | } | 427 | } |
436 | } | 428 | } |
437 | const char *json_string = json_object_to_json_string(inputs); | 429 | const char *json_string = json_object_to_json_string(inputs); |