mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-01-12 23:36:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

ipc-json: handle LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY

Browse source 
New entry introduced in libinput 1.27.0.
This commit is contained in:
Simon Ser 2024-11-20 20:41:16 +01:00 committed by Kirill Primak
parent 5312376077
commit e2409aa496
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
meson.build
View file

@ -109,11 +109,9 @@ conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd
conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind') conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind')
conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu') conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu')
conf_data.set10('HAVE_TRAY', have_tray) conf_data.set10('HAVE_TRAY', have_tray)
conf_data.set10('HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', cc.has_header_symbol( foreach sym : ['LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', 'LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY']
'libinput.h', conf_data.set10('HAVE_' + sym, cc.has_header_symbol('libinput.h', sym, dependencies: libinput))
'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', endforeach
dependencies: libinput,
))
scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
if scdoc.found() if scdoc.found()

5
sway/ipc-json.c
View file

@ -931,6 +931,11 @@ static json_object *describe_libinput_device(struct libinput_device *device) {
case LIBINPUT_CONFIG_DRAG_LOCK_DISABLED: case LIBINPUT_CONFIG_DRAG_LOCK_DISABLED:
drag_lock = "disabled"; drag_lock = "disabled";
break; break;
#if HAVE_LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY
case LIBINPUT_CONFIG_DRAG_LOCK_ENABLED_STICKY:
drag_lock = "enabled_sticky";
break;
#endif
} }
json_object_object_add(object, "tap_drag_lock", json_object_object_add(object, "tap_drag_lock",
json_object_new_string(drag_lock)); json_object_new_string(drag_lock));