diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-09-27 02:07:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-27 02:07:15 -0500 |
commit | 5912be46c32fefbbcdb895a81c817ed1579887ed (patch) | |
tree | 82b1f000ffe68c1bfc781a02ed75b02d2a900efd | |
parent | Merge pull request #2715 from sghctoma/add-c11_source (diff) | |
parent | input: enable configuring tablets with libinput (diff) | |
download | sway-5912be46c32fefbbcdb895a81c817ed1579887ed.tar.gz sway-5912be46c32fefbbcdb895a81c817ed1579887ed.tar.zst sway-5912be46c32fefbbcdb895a81c817ed1579887ed.zip |
Merge pull request #2704 from ianyfan/tablet-config
input: enable configuring tablets with libinput
-rw-r--r-- | sway/input/input-manager.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c index f696646f..f39fe29c 100644 --- a/sway/input/input-manager.c +++ b/sway/input/input-manager.c | |||
@@ -233,7 +233,8 @@ static void handle_new_input(struct wl_listener *listener, void *data) { | |||
233 | wlr_log(WLR_DEBUG, "adding device: '%s'", | 233 | wlr_log(WLR_DEBUG, "adding device: '%s'", |
234 | input_device->identifier); | 234 | input_device->identifier); |
235 | 235 | ||
236 | if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) { | 236 | if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER || |
237 | input_device->wlr_device->type == WLR_INPUT_DEVICE_TABLET_TOOL) { | ||
237 | input_manager_libinput_config_pointer(input_device); | 238 | input_manager_libinput_config_pointer(input_device); |
238 | } | 239 | } |
239 | 240 | ||
@@ -393,7 +394,8 @@ void input_manager_apply_input_config(struct sway_input_manager *input, | |||
393 | wl_list_for_each(input_device, &input->devices, link) { | 394 | wl_list_for_each(input_device, &input->devices, link) { |
394 | if (strcmp(input_device->identifier, input_config->identifier) == 0 | 395 | if (strcmp(input_device->identifier, input_config->identifier) == 0 |
395 | || wildcard) { | 396 | || wildcard) { |
396 | if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) { | 397 | if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER || |
398 | input_device->wlr_device->type == WLR_INPUT_DEVICE_TABLET_TOOL) { | ||
397 | input_manager_libinput_config_pointer(input_device); | 399 | input_manager_libinput_config_pointer(input_device); |
398 | } | 400 | } |
399 | 401 | ||