diff options
author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-12-16 13:27:45 +0000 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-12-16 15:04:06 +0100 |
commit | 1442d4e6881e06c9a43c985e6b890cfe77e13adf (patch) | |
tree | 976cdd267caae84e911992dc2d9cadc9817ed29e | |
parent | swaynag: damage the cursor surface on update (diff) | |
download | sway-1442d4e6881e06c9a43c985e6b890cfe77e13adf.tar.gz sway-1442d4e6881e06c9a43c985e6b890cfe77e13adf.tar.zst sway-1442d4e6881e06c9a43c985e6b890cfe77e13adf.zip |
Update for swaywm/wlroots#1377
-Werror is eͫ̐ͭ҉vi͆ͦ̏ͦlͥ̀͒̊͂͛
-rw-r--r-- | sway/input/seat.c | 4 | ||||
-rw-r--r-- | sway/ipc-json.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index f4098eb0..776d5766 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -392,6 +392,7 @@ static void seat_update_capabilities(struct sway_seat *seat) { | |||
392 | caps |= WL_SEAT_CAPABILITY_POINTER; | 392 | caps |= WL_SEAT_CAPABILITY_POINTER; |
393 | break; | 393 | break; |
394 | case WLR_INPUT_DEVICE_TABLET_PAD: | 394 | case WLR_INPUT_DEVICE_TABLET_PAD: |
395 | case WLR_INPUT_DEVICE_SWITCH: | ||
395 | break; | 396 | break; |
396 | } | 397 | } |
397 | } | 398 | } |
@@ -513,6 +514,9 @@ void seat_configure_device(struct sway_seat *seat, | |||
513 | case WLR_INPUT_DEVICE_TABLET_PAD: | 514 | case WLR_INPUT_DEVICE_TABLET_PAD: |
514 | wlr_log(WLR_DEBUG, "TODO: configure tablet pad"); | 515 | wlr_log(WLR_DEBUG, "TODO: configure tablet pad"); |
515 | break; | 516 | break; |
517 | case WLR_INPUT_DEVICE_SWITCH: | ||
518 | wlr_log(WLR_DEBUG, "TODO: configure switch device"); | ||
519 | break; | ||
516 | } | 520 | } |
517 | } | 521 | } |
518 | 522 | ||
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index fc631373..0c94fb63 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -93,6 +93,8 @@ static const char *ipc_json_device_type_description(struct sway_input_device *de | |||
93 | return "tablet_tool"; | 93 | return "tablet_tool"; |
94 | case WLR_INPUT_DEVICE_TABLET_PAD: | 94 | case WLR_INPUT_DEVICE_TABLET_PAD: |
95 | return "tablet_pad"; | 95 | return "tablet_pad"; |
96 | case WLR_INPUT_DEVICE_SWITCH: | ||
97 | return "switch"; | ||
96 | } | 98 | } |
97 | return "unknown"; | 99 | return "unknown"; |
98 | } | 100 | } |