diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-01-21 02:41:06 -0500 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2019-01-21 08:46:36 +0100 |
commit | 5c834d36e14aaeca4ac1d22b869254d5722af4af (patch) | |
tree | 8b3fc30cf710d8a5e9d835ad268c26756473dd29 /sway | |
parent | Allocate minimum size necessary in pango text functions. (#3473) (diff) | |
download | sway-5c834d36e14aaeca4ac1d22b869254d5722af4af.tar.gz sway-5c834d36e14aaeca4ac1d22b869254d5722af4af.tar.zst sway-5c834d36e14aaeca4ac1d22b869254d5722af4af.zip |
Log libinput_config_status errors
This add errors from calls to `libinput_device_config_*_set` to the
debug log. This may be useful when looking at issues related to input
devices and config settings not working.
Diffstat (limited to 'sway')
-rw-r--r-- | sway/input/input-manager.c | 125 |
1 files changed, 76 insertions, 49 deletions
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c index d90803f6..9fff5f48 100644 --- a/sway/input/input-manager.c +++ b/sway/input/input-manager.c | |||
@@ -107,6 +107,12 @@ void input_manager_verify_fallback_seat(void) { | |||
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||
110 | static void log_libinput_config_status(enum libinput_config_status status) { | ||
111 | if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) { | ||
112 | wlr_log(WLR_DEBUG, "Error: %s", libinput_config_status_to_str(status)); | ||
113 | } | ||
114 | } | ||
115 | |||
110 | static void input_manager_libinput_config_keyboard( | 116 | static void input_manager_libinput_config_keyboard( |
111 | struct sway_input_device *input_device) { | 117 | struct sway_input_device *input_device) { |
112 | struct wlr_input_device *wlr_device = input_device->wlr_device; | 118 | struct wlr_input_device *wlr_device = input_device->wlr_device; |
@@ -124,8 +130,8 @@ static void input_manager_libinput_config_keyboard( | |||
124 | if (ic->send_events != INT_MIN) { | 130 | if (ic->send_events != INT_MIN) { |
125 | wlr_log(WLR_DEBUG, "libinput_config_keyboard(%s) send_events_set_mode(%d)", | 131 | wlr_log(WLR_DEBUG, "libinput_config_keyboard(%s) send_events_set_mode(%d)", |
126 | ic->identifier, ic->send_events); | 132 | ic->identifier, ic->send_events); |
127 | libinput_device_config_send_events_set_mode(libinput_device, | 133 | log_libinput_config_status(libinput_device_config_send_events_set_mode( |
128 | ic->send_events); | 134 | libinput_device, ic->send_events)); |
129 | } | 135 | } |
130 | } | 136 | } |
131 | 137 | ||
@@ -144,7 +150,8 @@ static void input_manager_libinput_reset_keyboard( | |||
144 | libinput_device_config_send_events_get_default_mode(libinput_device); | 150 | libinput_device_config_send_events_get_default_mode(libinput_device); |
145 | wlr_log(WLR_DEBUG, "libinput_reset_keyboard(%s) send_events_set_mode(%d)", | 151 | wlr_log(WLR_DEBUG, "libinput_reset_keyboard(%s) send_events_set_mode(%d)", |
146 | input_device->identifier, send_events); | 152 | input_device->identifier, send_events); |
147 | libinput_device_config_send_events_set_mode(libinput_device, send_events); | 153 | log_libinput_config_status(libinput_device_config_send_events_set_mode( |
154 | libinput_device, send_events)); | ||
148 | } | 155 | } |
149 | 156 | ||
150 | static void input_manager_libinput_config_touch( | 157 | static void input_manager_libinput_config_touch( |
@@ -164,8 +171,8 @@ static void input_manager_libinput_config_touch( | |||
164 | if (ic->send_events != INT_MIN) { | 171 | if (ic->send_events != INT_MIN) { |
165 | wlr_log(WLR_DEBUG, "libinput_config_touch(%s) send_events_set_mode(%d)", | 172 | wlr_log(WLR_DEBUG, "libinput_config_touch(%s) send_events_set_mode(%d)", |
166 | ic->identifier, ic->send_events); | 173 | ic->identifier, ic->send_events); |
167 | libinput_device_config_send_events_set_mode(libinput_device, | 174 | log_libinput_config_status(libinput_device_config_send_events_set_mode( |
168 | ic->send_events); | 175 | libinput_device, ic->send_events)); |
169 | } | 176 | } |
170 | } | 177 | } |
171 | 178 | ||
@@ -184,7 +191,8 @@ static void input_manager_libinput_reset_touch( | |||
184 | libinput_device_config_send_events_get_default_mode(libinput_device); | 191 | libinput_device_config_send_events_get_default_mode(libinput_device); |
185 | wlr_log(WLR_DEBUG, "libinput_reset_touch(%s) send_events_set_mode(%d)", | 192 | wlr_log(WLR_DEBUG, "libinput_reset_touch(%s) send_events_set_mode(%d)", |
186 | input_device->identifier, send_events); | 193 | input_device->identifier, send_events); |
187 | libinput_device_config_send_events_set_mode(libinput_device, send_events); | 194 | log_libinput_config_status(libinput_device_config_send_events_set_mode( |
195 | libinput_device, send_events)); | ||
188 | } | 196 | } |
189 | 197 | ||
190 | static void input_manager_libinput_config_pointer( | 198 | static void input_manager_libinput_config_pointer( |
@@ -204,89 +212,94 @@ static void input_manager_libinput_config_pointer( | |||
204 | if (ic->accel_profile != INT_MIN) { | 212 | if (ic->accel_profile != INT_MIN) { |
205 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)", | 213 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)", |
206 | ic->identifier, ic->accel_profile); | 214 | ic->identifier, ic->accel_profile); |
207 | libinput_device_config_accel_set_profile(libinput_device, | 215 | log_libinput_config_status(libinput_device_config_accel_set_profile( |
208 | ic->accel_profile); | 216 | libinput_device, ic->accel_profile)); |
209 | } | 217 | } |
210 | if (ic->click_method != INT_MIN) { | 218 | if (ic->click_method != INT_MIN) { |
211 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)", | 219 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)", |
212 | ic->identifier, ic->click_method); | 220 | ic->identifier, ic->click_method); |
213 | libinput_device_config_click_set_method(libinput_device, | 221 | log_libinput_config_status(libinput_device_config_click_set_method( |
214 | ic->click_method); | 222 | libinput_device, ic->click_method)); |
215 | } | 223 | } |
216 | if (ic->drag != INT_MIN) { | 224 | if (ic->drag != INT_MIN) { |
217 | wlr_log(WLR_DEBUG, | 225 | wlr_log(WLR_DEBUG, |
218 | "libinput_config_pointer(%s) tap_set_drag_enabled(%d)", | 226 | "libinput_config_pointer(%s) tap_set_drag_enabled(%d)", |
219 | ic->identifier, ic->drag); | 227 | ic->identifier, ic->drag); |
220 | libinput_device_config_tap_set_drag_enabled(libinput_device, | 228 | log_libinput_config_status(libinput_device_config_tap_set_drag_enabled( |
221 | ic->drag); | 229 | libinput_device, ic->drag)); |
222 | } | 230 | } |
223 | if (ic->drag_lock != INT_MIN) { | 231 | if (ic->drag_lock != INT_MIN) { |
224 | wlr_log(WLR_DEBUG, | 232 | wlr_log(WLR_DEBUG, |
225 | "libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)", | 233 | "libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)", |
226 | ic->identifier, ic->drag_lock); | 234 | ic->identifier, ic->drag_lock); |
227 | libinput_device_config_tap_set_drag_lock_enabled(libinput_device, | 235 | log_libinput_config_status( |
228 | ic->drag_lock); | 236 | libinput_device_config_tap_set_drag_lock_enabled( |
237 | libinput_device, ic->drag_lock)); | ||
229 | } | 238 | } |
230 | if (ic->dwt != INT_MIN) { | 239 | if (ic->dwt != INT_MIN) { |
231 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)", | 240 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)", |
232 | ic->identifier, ic->dwt); | 241 | ic->identifier, ic->dwt); |
233 | libinput_device_config_dwt_set_enabled(libinput_device, ic->dwt); | 242 | log_libinput_config_status(libinput_device_config_dwt_set_enabled( |
243 | libinput_device, ic->dwt)); | ||
234 | } | 244 | } |
235 | if (ic->left_handed != INT_MIN) { | 245 | if (ic->left_handed != INT_MIN) { |
236 | wlr_log(WLR_DEBUG, | 246 | wlr_log(WLR_DEBUG, |
237 | "libinput_config_pointer(%s) left_handed_set_enabled(%d)", | 247 | "libinput_config_pointer(%s) left_handed_set_enabled(%d)", |
238 | ic->identifier, ic->left_handed); | 248 | ic->identifier, ic->left_handed); |
239 | libinput_device_config_left_handed_set(libinput_device, | 249 | log_libinput_config_status(libinput_device_config_left_handed_set( |
240 | ic->left_handed); | 250 | libinput_device, ic->left_handed)); |
241 | } | 251 | } |
242 | if (ic->middle_emulation != INT_MIN) { | 252 | if (ic->middle_emulation != INT_MIN) { |
243 | wlr_log(WLR_DEBUG, | 253 | wlr_log(WLR_DEBUG, |
244 | "libinput_config_pointer(%s) middle_emulation_set_enabled(%d)", | 254 | "libinput_config_pointer(%s) middle_emulation_set_enabled(%d)", |
245 | ic->identifier, ic->middle_emulation); | 255 | ic->identifier, ic->middle_emulation); |
246 | libinput_device_config_middle_emulation_set_enabled(libinput_device, | 256 | log_libinput_config_status( |
247 | ic->middle_emulation); | 257 | libinput_device_config_middle_emulation_set_enabled( |
258 | libinput_device, ic->middle_emulation)); | ||
248 | } | 259 | } |
249 | if (ic->natural_scroll != INT_MIN) { | 260 | if (ic->natural_scroll != INT_MIN) { |
250 | wlr_log(WLR_DEBUG, | 261 | wlr_log(WLR_DEBUG, |
251 | "libinput_config_pointer(%s) natural_scroll_set_enabled(%d)", | 262 | "libinput_config_pointer(%s) natural_scroll_set_enabled(%d)", |
252 | ic->identifier, ic->natural_scroll); | 263 | ic->identifier, ic->natural_scroll); |
253 | libinput_device_config_scroll_set_natural_scroll_enabled( | 264 | log_libinput_config_status( |
254 | libinput_device, ic->natural_scroll); | 265 | libinput_device_config_scroll_set_natural_scroll_enabled( |
266 | libinput_device, ic->natural_scroll)); | ||
255 | } | 267 | } |
256 | if (ic->pointer_accel != FLT_MIN) { | 268 | if (ic->pointer_accel != FLT_MIN) { |
257 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)", | 269 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)", |
258 | ic->identifier, ic->pointer_accel); | 270 | ic->identifier, ic->pointer_accel); |
259 | libinput_device_config_accel_set_speed(libinput_device, | 271 | log_libinput_config_status(libinput_device_config_accel_set_speed( |
260 | ic->pointer_accel); | 272 | libinput_device, ic->pointer_accel)); |
261 | } | 273 | } |
262 | if (ic->scroll_button != INT_MIN) { | 274 | if (ic->scroll_button != INT_MIN) { |
263 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_button(%d)", | 275 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_button(%d)", |
264 | ic->identifier, ic->scroll_button); | 276 | ic->identifier, ic->scroll_button); |
265 | libinput_device_config_scroll_set_button(libinput_device, | 277 | log_libinput_config_status(libinput_device_config_scroll_set_button( |
266 | ic->scroll_button); | 278 | libinput_device, ic->scroll_button)); |
267 | } | 279 | } |
268 | if (ic->scroll_method != INT_MIN) { | 280 | if (ic->scroll_method != INT_MIN) { |
269 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)", | 281 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)", |
270 | ic->identifier, ic->scroll_method); | 282 | ic->identifier, ic->scroll_method); |
271 | libinput_device_config_scroll_set_method(libinput_device, | 283 | log_libinput_config_status(libinput_device_config_scroll_set_method( |
272 | ic->scroll_method); | 284 | libinput_device, ic->scroll_method)); |
273 | } | 285 | } |
274 | if (ic->send_events != INT_MIN) { | 286 | if (ic->send_events != INT_MIN) { |
275 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)", | 287 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)", |
276 | ic->identifier, ic->send_events); | 288 | ic->identifier, ic->send_events); |
277 | libinput_device_config_send_events_set_mode(libinput_device, | 289 | log_libinput_config_status(libinput_device_config_send_events_set_mode( |
278 | ic->send_events); | 290 | libinput_device, ic->send_events)); |
279 | } | 291 | } |
280 | if (ic->tap != INT_MIN) { | 292 | if (ic->tap != INT_MIN) { |
281 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)", | 293 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)", |
282 | ic->identifier, ic->tap); | 294 | ic->identifier, ic->tap); |
283 | libinput_device_config_tap_set_enabled(libinput_device, ic->tap); | 295 | log_libinput_config_status(libinput_device_config_tap_set_enabled( |
296 | libinput_device, ic->tap)); | ||
284 | } | 297 | } |
285 | if (ic->tap_button_map != INT_MIN) { | 298 | if (ic->tap_button_map != INT_MIN) { |
286 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) tap_set_button_map(%d)", | 299 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) tap_set_button_map(%d)", |
287 | ic->identifier, ic->tap_button_map); | 300 | ic->identifier, ic->tap_button_map); |
288 | libinput_device_config_tap_set_button_map(libinput_device, | 301 | log_libinput_config_status(libinput_device_config_tap_set_button_map( |
289 | ic->tap_button_map); | 302 | libinput_device, ic->tap_button_map)); |
290 | } | 303 | } |
291 | } | 304 | } |
292 | 305 | ||
@@ -305,19 +318,22 @@ static void input_manager_libinput_reset_pointer( | |||
305 | libinput_device_config_accel_get_default_profile(libinput_device); | 318 | libinput_device_config_accel_get_default_profile(libinput_device); |
306 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) accel_set_profile(%d)", | 319 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) accel_set_profile(%d)", |
307 | input_device->identifier, accel_profile); | 320 | input_device->identifier, accel_profile); |
308 | libinput_device_config_accel_set_profile(libinput_device, accel_profile); | 321 | log_libinput_config_status(libinput_device_config_accel_set_profile( |
322 | libinput_device, accel_profile)); | ||
309 | 323 | ||
310 | enum libinput_config_click_method click_method = | 324 | enum libinput_config_click_method click_method = |
311 | libinput_device_config_click_get_default_method(libinput_device); | 325 | libinput_device_config_click_get_default_method(libinput_device); |
312 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) click_set_method(%d)", | 326 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) click_set_method(%d)", |
313 | input_device->identifier, click_method); | 327 | input_device->identifier, click_method); |
314 | libinput_device_config_click_set_method(libinput_device, click_method); | 328 | log_libinput_config_status(libinput_device_config_click_set_method( |
329 | libinput_device, click_method)); | ||
315 | 330 | ||
316 | enum libinput_config_drag_state drag = | 331 | enum libinput_config_drag_state drag = |
317 | libinput_device_config_tap_get_default_drag_enabled(libinput_device); | 332 | libinput_device_config_tap_get_default_drag_enabled(libinput_device); |
318 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) tap_set_drag_enabled(%d)", | 333 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) tap_set_drag_enabled(%d)", |
319 | input_device->identifier, drag); | 334 | input_device->identifier, drag); |
320 | libinput_device_config_tap_set_drag_enabled(libinput_device, drag); | 335 | log_libinput_config_status(libinput_device_config_tap_set_drag_enabled( |
336 | libinput_device, drag)); | ||
321 | 337 | ||
322 | enum libinput_config_drag_lock_state drag_lock = | 338 | enum libinput_config_drag_lock_state drag_lock = |
323 | libinput_device_config_tap_get_default_drag_lock_enabled( | 339 | libinput_device_config_tap_get_default_drag_lock_enabled( |
@@ -325,21 +341,24 @@ static void input_manager_libinput_reset_pointer( | |||
325 | wlr_log(WLR_DEBUG, | 341 | wlr_log(WLR_DEBUG, |
326 | "libinput_reset_pointer(%s) tap_set_drag_lock_enabled(%d)", | 342 | "libinput_reset_pointer(%s) tap_set_drag_lock_enabled(%d)", |
327 | input_device->identifier, drag_lock); | 343 | input_device->identifier, drag_lock); |
328 | libinput_device_config_tap_set_drag_lock_enabled(libinput_device, | 344 | log_libinput_config_status( |
329 | drag_lock); | 345 | libinput_device_config_tap_set_drag_lock_enabled( |
346 | libinput_device, drag_lock)); | ||
330 | 347 | ||
331 | enum libinput_config_dwt_state dwt = | 348 | enum libinput_config_dwt_state dwt = |
332 | libinput_device_config_dwt_get_default_enabled(libinput_device); | 349 | libinput_device_config_dwt_get_default_enabled(libinput_device); |
333 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) dwt_set_enabled(%d)", | 350 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) dwt_set_enabled(%d)", |
334 | input_device->identifier, dwt); | 351 | input_device->identifier, dwt); |
335 | libinput_device_config_dwt_set_enabled(libinput_device, dwt); | 352 | log_libinput_config_status(libinput_device_config_dwt_set_enabled( |
353 | libinput_device, dwt)); | ||
336 | 354 | ||
337 | int left_handed = | 355 | int left_handed = |
338 | libinput_device_config_left_handed_get_default(libinput_device); | 356 | libinput_device_config_left_handed_get_default(libinput_device); |
339 | wlr_log(WLR_DEBUG, | 357 | wlr_log(WLR_DEBUG, |
340 | "libinput_reset_pointer(%s) left_handed_set_enabled(%d)", | 358 | "libinput_reset_pointer(%s) left_handed_set_enabled(%d)", |
341 | input_device->identifier, left_handed); | 359 | input_device->identifier, left_handed); |
342 | libinput_device_config_left_handed_set(libinput_device, left_handed); | 360 | log_libinput_config_status(libinput_device_config_left_handed_set( |
361 | libinput_device, left_handed)); | ||
343 | 362 | ||
344 | enum libinput_config_middle_emulation_state middle_emulation = | 363 | enum libinput_config_middle_emulation_state middle_emulation = |
345 | libinput_device_config_middle_emulation_get_default_enabled( | 364 | libinput_device_config_middle_emulation_get_default_enabled( |
@@ -347,8 +366,9 @@ static void input_manager_libinput_reset_pointer( | |||
347 | wlr_log(WLR_DEBUG, | 366 | wlr_log(WLR_DEBUG, |
348 | "libinput_reset_pointer(%s) middle_emulation_set_enabled(%d)", | 367 | "libinput_reset_pointer(%s) middle_emulation_set_enabled(%d)", |
349 | input_device->identifier, middle_emulation); | 368 | input_device->identifier, middle_emulation); |
350 | libinput_device_config_middle_emulation_set_enabled(libinput_device, | 369 | log_libinput_config_status( |
351 | middle_emulation); | 370 | libinput_device_config_middle_emulation_set_enabled( |
371 | libinput_device, middle_emulation)); | ||
352 | 372 | ||
353 | int natural_scroll = | 373 | int natural_scroll = |
354 | libinput_device_config_scroll_get_default_natural_scroll_enabled( | 374 | libinput_device_config_scroll_get_default_natural_scroll_enabled( |
@@ -356,44 +376,51 @@ static void input_manager_libinput_reset_pointer( | |||
356 | wlr_log(WLR_DEBUG, | 376 | wlr_log(WLR_DEBUG, |
357 | "libinput_reset_pointer(%s) natural_scroll_set_enabled(%d)", | 377 | "libinput_reset_pointer(%s) natural_scroll_set_enabled(%d)", |
358 | input_device->identifier, natural_scroll); | 378 | input_device->identifier, natural_scroll); |
359 | libinput_device_config_scroll_set_natural_scroll_enabled( | 379 | log_libinput_config_status( |
360 | libinput_device, natural_scroll); | 380 | libinput_device_config_scroll_set_natural_scroll_enabled( |
381 | libinput_device, natural_scroll)); | ||
361 | 382 | ||
362 | double pointer_accel = | 383 | double pointer_accel = |
363 | libinput_device_config_accel_get_default_speed(libinput_device); | 384 | libinput_device_config_accel_get_default_speed(libinput_device); |
364 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) accel_set_speed(%f)", | 385 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) accel_set_speed(%f)", |
365 | input_device->identifier, pointer_accel); | 386 | input_device->identifier, pointer_accel); |
366 | libinput_device_config_accel_set_speed(libinput_device, pointer_accel); | 387 | log_libinput_config_status(libinput_device_config_accel_set_speed( |
388 | libinput_device, pointer_accel)); | ||
367 | 389 | ||
368 | uint32_t scroll_button = | 390 | uint32_t scroll_button = |
369 | libinput_device_config_scroll_get_default_button(libinput_device); | 391 | libinput_device_config_scroll_get_default_button(libinput_device); |
370 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) scroll_set_button(%d)", | 392 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) scroll_set_button(%d)", |
371 | input_device->identifier, scroll_button); | 393 | input_device->identifier, scroll_button); |
372 | libinput_device_config_scroll_set_button(libinput_device, scroll_button); | 394 | log_libinput_config_status(libinput_device_config_scroll_set_button( |
395 | libinput_device, scroll_button)); | ||
373 | 396 | ||
374 | enum libinput_config_scroll_method scroll_method = | 397 | enum libinput_config_scroll_method scroll_method = |
375 | libinput_device_config_scroll_get_default_method(libinput_device); | 398 | libinput_device_config_scroll_get_default_method(libinput_device); |
376 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) scroll_set_method(%d)", | 399 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) scroll_set_method(%d)", |
377 | input_device->identifier, scroll_method); | 400 | input_device->identifier, scroll_method); |
378 | libinput_device_config_scroll_set_method(libinput_device, scroll_method); | 401 | log_libinput_config_status(libinput_device_config_scroll_set_method( |
402 | libinput_device, scroll_method)); | ||
379 | 403 | ||
380 | uint32_t send_events = | 404 | uint32_t send_events = |
381 | libinput_device_config_send_events_get_default_mode(libinput_device); | 405 | libinput_device_config_send_events_get_default_mode(libinput_device); |
382 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) send_events_set_mode(%d)", | 406 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) send_events_set_mode(%d)", |
383 | input_device->identifier, send_events); | 407 | input_device->identifier, send_events); |
384 | libinput_device_config_send_events_set_mode(libinput_device, send_events); | 408 | log_libinput_config_status(libinput_device_config_send_events_set_mode( |
409 | libinput_device, send_events)); | ||
385 | 410 | ||
386 | enum libinput_config_tap_state tap = | 411 | enum libinput_config_tap_state tap = |
387 | libinput_device_config_tap_get_default_enabled(libinput_device); | 412 | libinput_device_config_tap_get_default_enabled(libinput_device); |
388 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) tap_set_enabled(%d)", | 413 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) tap_set_enabled(%d)", |
389 | input_device->identifier, tap); | 414 | input_device->identifier, tap); |
390 | libinput_device_config_tap_set_enabled(libinput_device, tap); | 415 | log_libinput_config_status(libinput_device_config_tap_set_enabled( |
416 | libinput_device, tap)); | ||
391 | 417 | ||
392 | enum libinput_config_tap_button_map tap_button_map = | 418 | enum libinput_config_tap_button_map tap_button_map = |
393 | libinput_device_config_tap_get_button_map(libinput_device); | 419 | libinput_device_config_tap_get_button_map(libinput_device); |
394 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) tap_set_button_map(%d)", | 420 | wlr_log(WLR_DEBUG, "libinput_reset_pointer(%s) tap_set_button_map(%d)", |
395 | input_device->identifier, tap_button_map); | 421 | input_device->identifier, tap_button_map); |
396 | libinput_device_config_tap_set_button_map(libinput_device, tap_button_map); | 422 | log_libinput_config_status(libinput_device_config_tap_set_button_map( |
423 | libinput_device, tap_button_map)); | ||
397 | } | 424 | } |
398 | 425 | ||
399 | static void handle_device_destroy(struct wl_listener *listener, void *data) { | 426 | static void handle_device_destroy(struct wl_listener *listener, void *data) { |