aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2023-03-26 23:27:40 +0200
committerLibravatar Simon Ser <contact@emersion.fr>2023-03-27 10:56:16 +0200
commitdee032d0a0ecd958c902b88302dc59703d703c7f (patch)
treeeaf0283fdabfb854b8813b397e58c3b536470120
parentAdd a .mailmap file (diff)
downloadsway-dee032d0a0ecd958c902b88302dc59703d703c7f.tar.gz
sway-dee032d0a0ecd958c902b88302dc59703d703c7f.tar.zst
sway-dee032d0a0ecd958c902b88302dc59703d703c7f.zip
ipc: add LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM entry
This was introduced in the last libinput release. Fixes the following error: ../sway/ipc-json.c:928:17: error: enumeration value 'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM' not handled in switch [-Werror=switch] 928 | switch (libinput_device_config_accel_get_profile(device)) { | ^~~~~~
-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 84e7c6c5..d1fbfa38 100644
--- a/meson.build
+++ b/meson.build
@@ -117,6 +117,11 @@ conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd
117conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind') 117conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind')
118conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu') 118conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu')
119conf_data.set10('HAVE_TRAY', have_tray) 119conf_data.set10('HAVE_TRAY', have_tray)
120conf_data.set10('HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', cc.has_header_symbol(
121 'libinput.h',
122 'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM',
123 dependencies: libinput,
124))
120 125
121scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) 126scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
122if scdoc.found() 127if scdoc.found()
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 51e6a995..c7cbea01 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -935,6 +935,11 @@ static json_object *describe_libinput_device(struct libinput_device *device) {
935 case LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE: 935 case LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE:
936 accel_profile = "adaptive"; 936 accel_profile = "adaptive";
937 break; 937 break;
938#if HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM
939 case LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM:
940 accel_profile = "custom";
941 break;
942#endif
938 } 943 }
939 json_object_object_add(object, "accel_profile", 944 json_object_object_add(object, "accel_profile",
940 json_object_new_string(accel_profile)); 945 json_object_new_string(accel_profile));