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 0cacc515..b5f4bb16 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
@@ -420,17 +420,9 @@ void ipc_client_handle_command(struct ipc_client *client) { | |||
420 | } | 420 | } |
421 | json_object *inputs = json_object_new_array(); | 421 | json_object *inputs = json_object_new_array(); |
422 | if (input_devices) { | 422 | if (input_devices) { |
423 | for(int i=0; i<input_devices->length; i++) { | 423 | for(int i = 0; i<input_devices->length; i++) { |
424 | struct libinput_device *device = input_devices->items[i]; | 424 | struct libinput_device *device = input_devices->items[i]; |
425 | char* identifier = libinput_dev_unique_id(device); | 425 | json_object_array_add(inputs, ipc_json_describe_input(device)); |
426 | json_object *device_object = json_object_new_object(); | ||
427 | if (!identifier) { | ||
428 | json_object_object_add(device_object, "identifier", NULL); | ||
429 | } else { | ||
430 | json_object_object_add(device_object, "identifier", json_object_new_string(identifier)); | ||
431 | } | ||
432 | json_object_array_add(inputs, device_object); | ||
433 | free(identifier); | ||
434 | } | 426 | } |
435 | } | 427 | } |
436 | const char *json_string = json_object_to_json_string(inputs); | 428 | const char *json_string = json_object_to_json_string(inputs); |