diff options
| author | Benjamin Cheng <ben@bcheng.cf> | 2019-03-12 13:17:47 -0400 |
|---|---|---|
| committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-04-14 19:31:36 -0400 |
| commit | 6737b90cb93d0231bbbc6045adf8a2443bc4e21c (patch) | |
| tree | 1b9c4f75ec160e85a2ffe9018c3564f105bd6678 /sway/ipc-json.c | |
| parent | 6961bf2e4ce2c116e41a8db158691f6c993707ce (diff) | |
Add heuristics to differentiate touchpads
Use libinput_device_config_tap_get_finger_count to determine whether
a pointer is a touchpad.
swaymsg is also updated to reflect the new touchpad type.
Diffstat (limited to 'sway/ipc-json.c')
| -rw-r--r-- | sway/ipc-json.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index c320d958..4ccf6dfd 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -85,24 +85,6 @@ static const char *ipc_json_output_transform_description(enum wl_output_transfor return NULL; } -static const char *ipc_json_device_type_description(struct sway_input_device *device) { - switch (device->wlr_device->type) { - case WLR_INPUT_DEVICE_POINTER: - return "pointer"; - case WLR_INPUT_DEVICE_KEYBOARD: - return "keyboard"; - case WLR_INPUT_DEVICE_SWITCH: - return "switch"; - case WLR_INPUT_DEVICE_TOUCH: - return "touch"; - case WLR_INPUT_DEVICE_TABLET_TOOL: - return "tablet_tool"; - case WLR_INPUT_DEVICE_TABLET_PAD: - return "tablet_pad"; - } - return "unknown"; -} - json_object *ipc_json_get_version(void) { int major = 0, minor = 0, patch = 0; json_object *version = json_object_new_object(); @@ -819,7 +801,7 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) { json_object_new_int(device->wlr_device->product)); json_object_object_add(object, "type", json_object_new_string( - ipc_json_device_type_description(device))); + input_device_get_type(device))); if (device->wlr_device->type == WLR_INPUT_DEVICE_KEYBOARD) { struct wlr_keyboard *keyboard = device->wlr_device->keyboard; |