summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam McKinnon <[email protected]>2023-05-21 00:23:40 -0400
committerWilliam McKinnon <[email protected]>2023-05-21 00:23:40 -0400
commit3c2e38be0356fa6feed3b28254f54efde54fe27d (patch)
treee71f168e86d4f38f9739b8724a1089687b5d7026
parent0ca4062d6deb68d99acb78a87e2d2790618e8cbb (diff)
upstream: ipc: add LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM entry
-rw-r--r--meson.build5
-rw-r--r--sway/ipc-json.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/meson.build b/meson.build
index 82dc01a3..f13c1eb0 100644
--- a/meson.build
+++ b/meson.build
@@ -116,6 +116,11 @@ 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_BASU', sdbus.found() and sdbus.name() == 'basu')
conf_data.set10('HAVE_TRAY', have_tray)
+conf_data.set10('HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', cc.has_header_symbol(
+ 'libinput.h',
+ 'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM',
+ dependencies: libinput,
+))
scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
if scdoc.found()
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index c7e94a81..673a941a 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -964,6 +964,11 @@ static json_object *describe_libinput_device(struct libinput_device *device) {
case LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE:
accel_profile = "adaptive";
break;
+#if HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM
+ case LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM:
+ accel_profile = "custom";
+ break;
+#endif
}
json_object_object_add(object, "accel_profile",
json_object_new_string(accel_profile));