diff options
author | Elyes HAOUAS <ehaouas@noos.fr> | 2020-06-20 09:43:56 +0000 |
---|---|---|
committer | Stefan Schmidt <s.schmidt@samsung.com> | 2020-06-23 10:29:14 +0200 |
commit | 1fd0435f21ef74f28417fbb832aad764e618d9fb (patch) | |
tree | 9e504657c5f92ec2a025e0ad267ee70747bffc48 /src/lib/ecore_drm/ecore_drm_evdev.c | |
parent | c2be0d0dba1e11bcedbe41997fe0ea9b98014289 (diff) |
Get rid of trailing whitespaces (4 / 14)
Remove trailing whitespaces
Differential Revision: https://phab.enlightenment.org/D12002
Diffstat (limited to '')
-rw-r--r-- | src/lib/ecore_drm/ecore_drm_evdev.c | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c b/src/lib/ecore_drm/ecore_drm_evdev.c index c907769be9..f93f78ca0e 100644 --- a/src/lib/ecore_drm/ecore_drm_evdev.c +++ b/src/lib/ecore_drm/ecore_drm_evdev.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | static void _device_modifiers_update(Ecore_Drm_Evdev *edev); | 33 | static void _device_modifiers_update(Ecore_Drm_Evdev *edev); |
34 | 34 | ||
35 | static void | 35 | static void |
36 | _device_calibration_set(Ecore_Drm_Evdev *edev) | 36 | _device_calibration_set(Ecore_Drm_Evdev *edev) |
37 | { | 37 | { |
38 | const char *sysname; | 38 | const char *sysname; |
@@ -42,7 +42,7 @@ _device_calibration_set(Ecore_Drm_Evdev *edev) | |||
42 | const char *vals; | 42 | const char *vals; |
43 | enum libinput_config_status status; | 43 | enum libinput_config_status status; |
44 | 44 | ||
45 | if ((!libinput_device_config_calibration_has_matrix(edev->device)) || | 45 | if ((!libinput_device_config_calibration_has_matrix(edev->device)) || |
46 | (libinput_device_config_calibration_get_default_matrix(edev->device, cal) != 0)) | 46 | (libinput_device_config_calibration_get_default_matrix(edev->device, cal) != 0)) |
47 | return; | 47 | return; |
48 | 48 | ||
@@ -54,7 +54,7 @@ _device_calibration_set(Ecore_Drm_Evdev *edev) | |||
54 | EINA_LIST_FREE(devices, device) | 54 | EINA_LIST_FREE(devices, device) |
55 | { | 55 | { |
56 | vals = eeze_udev_syspath_get_property(device, "WL_CALIBRATION"); | 56 | vals = eeze_udev_syspath_get_property(device, "WL_CALIBRATION"); |
57 | if ((!vals) || | 57 | if ((!vals) || |
58 | (sscanf(vals, "%f %f %f %f %f %f", | 58 | (sscanf(vals, "%f %f %f %f %f %f", |
59 | &cal[0], &cal[1], &cal[2], &cal[3], &cal[4], &cal[5]) != 6)) | 59 | &cal[0], &cal[1], &cal[2], &cal[3], &cal[4], &cal[5]) != 6)) |
60 | goto cont; | 60 | goto cont; |
@@ -62,7 +62,7 @@ _device_calibration_set(Ecore_Drm_Evdev *edev) | |||
62 | cal[2] /= edev->output->current_mode->width; | 62 | cal[2] /= edev->output->current_mode->width; |
63 | cal[5] /= edev->output->current_mode->height; | 63 | cal[5] /= edev->output->current_mode->height; |
64 | 64 | ||
65 | status = | 65 | status = |
66 | libinput_device_config_calibration_set_matrix(edev->device, cal); | 66 | libinput_device_config_calibration_set_matrix(edev->device, cal); |
67 | 67 | ||
68 | if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) | 68 | if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) |
@@ -74,7 +74,7 @@ cont: | |||
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | static void | 77 | static void |
78 | _device_output_set(Ecore_Drm_Evdev *edev) | 78 | _device_output_set(Ecore_Drm_Evdev *edev) |
79 | { | 79 | { |
80 | Ecore_Drm_Input *input; | 80 | Ecore_Drm_Input *input; |
@@ -102,7 +102,7 @@ _device_output_set(Ecore_Drm_Evdev *edev) | |||
102 | 102 | ||
103 | edev->output = output; | 103 | edev->output = output; |
104 | 104 | ||
105 | if (libinput_device_has_capability(edev->device, | 105 | if (libinput_device_has_capability(edev->device, |
106 | LIBINPUT_DEVICE_CAP_POINTER)) | 106 | LIBINPUT_DEVICE_CAP_POINTER)) |
107 | { | 107 | { |
108 | edev->seat->ptr.ix = edev->seat->ptr.dx = edev->output->current_mode->width / 2; | 108 | edev->seat->ptr.ix = edev->seat->ptr.dx = edev->output->current_mode->width / 2; |
@@ -112,7 +112,7 @@ _device_output_set(Ecore_Drm_Evdev *edev) | |||
112 | } | 112 | } |
113 | } | 113 | } |
114 | 114 | ||
115 | static void | 115 | static void |
116 | _device_configure(Ecore_Drm_Evdev *edev) | 116 | _device_configure(Ecore_Drm_Evdev *edev) |
117 | { | 117 | { |
118 | if (libinput_device_config_tap_get_finger_count(edev->device) > 0) | 118 | if (libinput_device_config_tap_get_finger_count(edev->device) > 0) |
@@ -123,7 +123,7 @@ _device_configure(Ecore_Drm_Evdev *edev) | |||
123 | libinput_device_config_tap_set_enabled(edev->device, tap); | 123 | libinput_device_config_tap_set_enabled(edev->device, tap); |
124 | } | 124 | } |
125 | 125 | ||
126 | ecore_drm_outputs_geometry_get(edev->seat->input->dev, | 126 | ecore_drm_outputs_geometry_get(edev->seat->input->dev, |
127 | &edev->mouse.minx, &edev->mouse.miny, | 127 | &edev->mouse.minx, &edev->mouse.miny, |
128 | &edev->mouse.maxw, &edev->mouse.maxh); | 128 | &edev->mouse.maxw, &edev->mouse.maxh); |
129 | 129 | ||
@@ -131,7 +131,7 @@ _device_configure(Ecore_Drm_Evdev *edev) | |||
131 | _device_calibration_set(edev); | 131 | _device_calibration_set(edev); |
132 | } | 132 | } |
133 | 133 | ||
134 | static void | 134 | static void |
135 | _device_keyboard_setup(Ecore_Drm_Evdev *edev) | 135 | _device_keyboard_setup(Ecore_Drm_Evdev *edev) |
136 | { | 136 | { |
137 | Ecore_Drm_Input *input; | 137 | Ecore_Drm_Input *input; |
@@ -155,25 +155,25 @@ _device_keyboard_setup(Ecore_Drm_Evdev *edev) | |||
155 | return; | 155 | return; |
156 | } | 156 | } |
157 | 157 | ||
158 | edev->xkb.ctrl_mask = | 158 | edev->xkb.ctrl_mask = |
159 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_CTRL); | 159 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_CTRL); |
160 | edev->xkb.alt_mask = | 160 | edev->xkb.alt_mask = |
161 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_ALT); | 161 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_ALT); |
162 | edev->xkb.shift_mask = | 162 | edev->xkb.shift_mask = |
163 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_SHIFT); | 163 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_SHIFT); |
164 | edev->xkb.win_mask = | 164 | edev->xkb.win_mask = |
165 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_LOGO); | 165 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_LOGO); |
166 | edev->xkb.scroll_mask = | 166 | edev->xkb.scroll_mask = |
167 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_LED_NAME_SCROLL); | 167 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_LED_NAME_SCROLL); |
168 | edev->xkb.num_mask = | 168 | edev->xkb.num_mask = |
169 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_LED_NAME_NUM); | 169 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_LED_NAME_NUM); |
170 | edev->xkb.caps_mask = | 170 | edev->xkb.caps_mask = |
171 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_CAPS); | 171 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, XKB_MOD_NAME_CAPS); |
172 | edev->xkb.altgr_mask = | 172 | edev->xkb.altgr_mask = |
173 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, "ISO_Level3_Shift"); | 173 | 1 << xkb_map_mod_get_index(edev->xkb.keymap, "ISO_Level3_Shift"); |
174 | } | 174 | } |
175 | 175 | ||
176 | static int | 176 | static int |
177 | _device_keysym_translate(xkb_keysym_t keysym, unsigned int modifiers, char *buffer, int bytes) | 177 | _device_keysym_translate(xkb_keysym_t keysym, unsigned int modifiers, char *buffer, int bytes) |
178 | { | 178 | { |
179 | unsigned long hbytes = 0; | 179 | unsigned long hbytes = 0; |
@@ -222,13 +222,13 @@ _device_modifiers_update_device(Ecore_Drm_Evdev *edev, Ecore_Drm_Evdev *from) | |||
222 | { | 222 | { |
223 | xkb_mod_mask_t mask; | 223 | xkb_mod_mask_t mask; |
224 | 224 | ||
225 | edev->xkb.depressed = | 225 | edev->xkb.depressed = |
226 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_DEPRESSED); | 226 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_DEPRESSED); |
227 | edev->xkb.latched = | 227 | edev->xkb.latched = |
228 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_LATCHED); | 228 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_LATCHED); |
229 | edev->xkb.locked = | 229 | edev->xkb.locked = |
230 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_LOCKED); | 230 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_LOCKED); |
231 | edev->xkb.group = | 231 | edev->xkb.group = |
232 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_EFFECTIVE); | 232 | xkb_state_serialize_mods(from->xkb.state, XKB_STATE_EFFECTIVE); |
233 | 233 | ||
234 | mask = (edev->xkb.depressed | edev->xkb.latched); | 234 | mask = (edev->xkb.depressed | edev->xkb.latched); |
@@ -251,7 +251,7 @@ _device_modifiers_update_device(Ecore_Drm_Evdev *edev, Ecore_Drm_Evdev *from) | |||
251 | edev->xkb.modifiers |= ECORE_EVENT_MODIFIER_ALTGR; | 251 | edev->xkb.modifiers |= ECORE_EVENT_MODIFIER_ALTGR; |
252 | } | 252 | } |
253 | 253 | ||
254 | static void | 254 | static void |
255 | _device_modifiers_update(Ecore_Drm_Evdev *edev) | 255 | _device_modifiers_update(Ecore_Drm_Evdev *edev) |
256 | { | 256 | { |
257 | edev->xkb.modifiers = 0; | 257 | edev->xkb.modifiers = 0; |
@@ -322,7 +322,7 @@ _device_handle_key(struct libinput_device *device, struct libinput_event_keyboar | |||
322 | ((state == LIBINPUT_KEY_STATE_RELEASED) && (key_count != 0))) | 322 | ((state == LIBINPUT_KEY_STATE_RELEASED) && (key_count != 0))) |
323 | return; | 323 | return; |
324 | 324 | ||
325 | xkb_state_update_key(edev->xkb.state, code, | 325 | xkb_state_update_key(edev->xkb.state, code, |
326 | (state ? XKB_KEY_DOWN : XKB_KEY_UP)); | 326 | (state ? XKB_KEY_DOWN : XKB_KEY_UP)); |
327 | 327 | ||
328 | /* get the keysym for this code */ | 328 | /* get the keysym for this code */ |
@@ -340,8 +340,8 @@ _device_handle_key(struct libinput_device *device, struct libinput_event_keyboar | |||
340 | snprintf(keyname, sizeof(keyname), "Keycode-%u", code); | 340 | snprintf(keyname, sizeof(keyname), "Keycode-%u", code); |
341 | 341 | ||
342 | /* if shift is active, we need to transform the key to lower */ | 342 | /* if shift is active, we need to transform the key to lower */ |
343 | if (xkb_state_mod_index_is_active(edev->xkb.state, | 343 | if (xkb_state_mod_index_is_active(edev->xkb.state, |
344 | xkb_map_mod_get_index(edev->xkb.keymap, | 344 | xkb_map_mod_get_index(edev->xkb.keymap, |
345 | XKB_MOD_NAME_SHIFT), | 345 | XKB_MOD_NAME_SHIFT), |
346 | XKB_STATE_MODS_EFFECTIVE)) | 346 | XKB_STATE_MODS_EFFECTIVE)) |
347 | { | 347 | { |
@@ -350,7 +350,7 @@ _device_handle_key(struct libinput_device *device, struct libinput_event_keyboar | |||
350 | } | 350 | } |
351 | 351 | ||
352 | memset(compose_buffer, 0, sizeof(compose_buffer)); | 352 | memset(compose_buffer, 0, sizeof(compose_buffer)); |
353 | if (_device_keysym_translate(sym, edev->xkb.modifiers, | 353 | if (_device_keysym_translate(sym, edev->xkb.modifiers, |
354 | compose_buffer, sizeof(compose_buffer))) | 354 | compose_buffer, sizeof(compose_buffer))) |
355 | { | 355 | { |
356 | compose = eina_str_convert("ISO8859-1", "UTF-8", compose_buffer); | 356 | compose = eina_str_convert("ISO8859-1", "UTF-8", compose_buffer); |
@@ -398,7 +398,7 @@ err: | |||
398 | if (tmp) free(tmp); | 398 | if (tmp) free(tmp); |
399 | } | 399 | } |
400 | 400 | ||
401 | static void | 401 | static void |
402 | _device_pointer_motion(Ecore_Drm_Evdev *edev, struct libinput_event_pointer *event) | 402 | _device_pointer_motion(Ecore_Drm_Evdev *edev, struct libinput_event_pointer *event) |
403 | { | 403 | { |
404 | Ecore_Drm_Input *input; | 404 | Ecore_Drm_Input *input; |
@@ -455,7 +455,7 @@ _ecore_drm_pointer_motion_post(Ecore_Drm_Evdev *edev) | |||
455 | _device_pointer_motion(edev, NULL); | 455 | _device_pointer_motion(edev, NULL); |
456 | } | 456 | } |
457 | 457 | ||
458 | static void | 458 | static void |
459 | _device_handle_pointer_motion(struct libinput_device *device, struct libinput_event_pointer *event) | 459 | _device_handle_pointer_motion(struct libinput_device *device, struct libinput_event_pointer *event) |
460 | { | 460 | { |
461 | Ecore_Drm_Evdev *edev; | 461 | Ecore_Drm_Evdev *edev; |
@@ -476,7 +476,7 @@ _device_handle_pointer_motion(struct libinput_device *device, struct libinput_ev | |||
476 | _device_pointer_motion(edev, event); | 476 | _device_pointer_motion(edev, event); |
477 | } | 477 | } |
478 | 478 | ||
479 | static void | 479 | static void |
480 | _device_handle_pointer_motion_absolute(struct libinput_device *device, struct libinput_event_pointer *event) | 480 | _device_handle_pointer_motion_absolute(struct libinput_device *device, struct libinput_event_pointer *event) |
481 | { | 481 | { |
482 | Ecore_Drm_Evdev *edev; | 482 | Ecore_Drm_Evdev *edev; |
@@ -498,7 +498,7 @@ _device_handle_pointer_motion_absolute(struct libinput_device *device, struct li | |||
498 | _device_pointer_motion(edev, event); | 498 | _device_pointer_motion(edev, event); |
499 | } | 499 | } |
500 | 500 | ||
501 | static void | 501 | static void |
502 | _device_handle_button(struct libinput_device *device, struct libinput_event_pointer *event) | 502 | _device_handle_button(struct libinput_device *device, struct libinput_event_pointer *event) |
503 | { | 503 | { |
504 | Ecore_Drm_Evdev *edev; | 504 | Ecore_Drm_Evdev *edev; |
@@ -557,7 +557,7 @@ _device_handle_button(struct libinput_device *device, struct libinput_event_poin | |||
557 | (button == edev->mouse.prev_button)) | 557 | (button == edev->mouse.prev_button)) |
558 | { | 558 | { |
559 | edev->mouse.did_double = EINA_TRUE; | 559 | edev->mouse.did_double = EINA_TRUE; |
560 | if (((current - edev->mouse.last) <= (2 * edev->mouse.threshold)) && | 560 | if (((current - edev->mouse.last) <= (2 * edev->mouse.threshold)) && |
561 | (button == edev->mouse.last_button)) | 561 | (button == edev->mouse.last_button)) |
562 | { | 562 | { |
563 | edev->mouse.did_triple = EINA_TRUE; | 563 | edev->mouse.did_triple = EINA_TRUE; |
@@ -600,7 +600,7 @@ _event_scroll_get(struct libinput_event_pointer *pe, enum libinput_pointer_axis | |||
600 | return 0.0; | 600 | return 0.0; |
601 | } | 601 | } |
602 | 602 | ||
603 | static void | 603 | static void |
604 | _device_handle_axis(struct libinput_device *device, struct libinput_event_pointer *event) | 604 | _device_handle_axis(struct libinput_device *device, struct libinput_event_pointer *event) |
605 | { | 605 | { |
606 | Ecore_Drm_Evdev *edev; | 606 | Ecore_Drm_Evdev *edev; |
@@ -635,7 +635,7 @@ _device_handle_axis(struct libinput_device *device, struct libinput_event_pointe | |||
635 | ev->z = _event_scroll_get(event, axis); | 635 | ev->z = _event_scroll_get(event, axis); |
636 | 636 | ||
637 | axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL; | 637 | axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL; |
638 | if (libinput_event_pointer_has_axis(event, axis)) | 638 | if (libinput_event_pointer_has_axis(event, axis)) |
639 | { | 639 | { |
640 | ev->direction = 1; | 640 | ev->direction = 1; |
641 | ev->z = _event_scroll_get(event, axis); | 641 | ev->z = _event_scroll_get(event, axis); |
@@ -771,7 +771,7 @@ _device_handle_touch_event_send(Ecore_Drm_Evdev *edev, struct libinput_event_tou | |||
771 | (button == edev->mouse.prev_button)) | 771 | (button == edev->mouse.prev_button)) |
772 | { | 772 | { |
773 | edev->mouse.did_double = EINA_TRUE; | 773 | edev->mouse.did_double = EINA_TRUE; |
774 | if (((current - edev->mouse.last) <= (2 * edev->mouse.threshold)) && | 774 | if (((current - edev->mouse.last) <= (2 * edev->mouse.threshold)) && |
775 | (button == edev->mouse.last_button)) | 775 | (button == edev->mouse.last_button)) |
776 | { | 776 | { |
777 | edev->mouse.did_triple = EINA_TRUE; | 777 | edev->mouse.did_triple = EINA_TRUE; |
@@ -877,7 +877,7 @@ _device_handle_touch_motion(struct libinput_device *device, struct libinput_even | |||
877 | _device_handle_touch_motion_send(edev, event); | 877 | _device_handle_touch_motion_send(edev, event); |
878 | } | 878 | } |
879 | 879 | ||
880 | static void | 880 | static void |
881 | _device_handle_touch_up(struct libinput_device *device, struct libinput_event_touch *event) | 881 | _device_handle_touch_up(struct libinput_device *device, struct libinput_event_touch *event) |
882 | { | 882 | { |
883 | Ecore_Drm_Evdev *edev; | 883 | Ecore_Drm_Evdev *edev; |
@@ -889,13 +889,13 @@ _device_handle_touch_up(struct libinput_device *device, struct libinput_event_to | |||
889 | _device_handle_touch_event_send(edev, event, ECORE_EVENT_MOUSE_BUTTON_UP); | 889 | _device_handle_touch_event_send(edev, event, ECORE_EVENT_MOUSE_BUTTON_UP); |
890 | } | 890 | } |
891 | 891 | ||
892 | static void | 892 | static void |
893 | _device_handle_touch_frame(struct libinput_device *device EINA_UNUSED, struct libinput_event_touch *event EINA_UNUSED) | 893 | _device_handle_touch_frame(struct libinput_device *device EINA_UNUSED, struct libinput_event_touch *event EINA_UNUSED) |
894 | { | 894 | { |
895 | /* DBG("Unhandled Touch Frame Event"); */ | 895 | /* DBG("Unhandled Touch Frame Event"); */ |
896 | } | 896 | } |
897 | 897 | ||
898 | void | 898 | void |
899 | _ecore_drm_evdev_device_destroy(Ecore_Drm_Evdev *edev) | 899 | _ecore_drm_evdev_device_destroy(Ecore_Drm_Evdev *edev) |
900 | { | 900 | { |
901 | EINA_SAFETY_ON_NULL_RETURN(edev); | 901 | EINA_SAFETY_ON_NULL_RETURN(edev); |
@@ -913,7 +913,7 @@ _ecore_drm_evdev_device_destroy(Ecore_Drm_Evdev *edev) | |||
913 | free(edev); | 913 | free(edev); |
914 | } | 914 | } |
915 | 915 | ||
916 | Eina_Bool | 916 | Eina_Bool |
917 | _ecore_drm_evdev_event_process(struct libinput_event *event) | 917 | _ecore_drm_evdev_event_process(struct libinput_event *event) |
918 | { | 918 | { |
919 | struct libinput_device *device; | 919 | struct libinput_device *device; |
@@ -926,11 +926,11 @@ _ecore_drm_evdev_event_process(struct libinput_event *event) | |||
926 | _device_handle_key(device, libinput_event_get_keyboard_event(event)); | 926 | _device_handle_key(device, libinput_event_get_keyboard_event(event)); |
927 | break; | 927 | break; |
928 | case LIBINPUT_EVENT_POINTER_MOTION: | 928 | case LIBINPUT_EVENT_POINTER_MOTION: |
929 | _device_handle_pointer_motion(device, | 929 | _device_handle_pointer_motion(device, |
930 | libinput_event_get_pointer_event(event)); | 930 | libinput_event_get_pointer_event(event)); |
931 | break; | 931 | break; |
932 | case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: | 932 | case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: |
933 | _device_handle_pointer_motion_absolute(device, | 933 | _device_handle_pointer_motion_absolute(device, |
934 | libinput_event_get_pointer_event(event)); | 934 | libinput_event_get_pointer_event(event)); |
935 | break; | 935 | break; |
936 | case LIBINPUT_EVENT_POINTER_BUTTON: | 936 | case LIBINPUT_EVENT_POINTER_BUTTON: |
@@ -943,7 +943,7 @@ _ecore_drm_evdev_event_process(struct libinput_event *event) | |||
943 | _device_handle_touch_down(device, libinput_event_get_touch_event(event)); | 943 | _device_handle_touch_down(device, libinput_event_get_touch_event(event)); |
944 | break; | 944 | break; |
945 | case LIBINPUT_EVENT_TOUCH_MOTION: | 945 | case LIBINPUT_EVENT_TOUCH_MOTION: |
946 | _device_handle_touch_motion(device, | 946 | _device_handle_touch_motion(device, |
947 | libinput_event_get_touch_event(event)); | 947 | libinput_event_get_touch_event(event)); |
948 | break; | 948 | break; |
949 | case LIBINPUT_EVENT_TOUCH_UP: | 949 | case LIBINPUT_EVENT_TOUCH_UP: |
@@ -985,7 +985,7 @@ ecore_drm_inputs_device_axis_size_set(Ecore_Drm_Evdev *edev, int w, int h) | |||
985 | EINA_SAFETY_ON_NULL_RETURN(edev); | 985 | EINA_SAFETY_ON_NULL_RETURN(edev); |
986 | EINA_SAFETY_ON_TRUE_RETURN((w == 0) || (h == 0)); | 986 | EINA_SAFETY_ON_TRUE_RETURN((w == 0) || (h == 0)); |
987 | 987 | ||
988 | if ((!libinput_device_config_calibration_has_matrix(edev->device)) || | 988 | if ((!libinput_device_config_calibration_has_matrix(edev->device)) || |
989 | (libinput_device_config_calibration_get_default_matrix(edev->device, cal) != 0)) | 989 | (libinput_device_config_calibration_get_default_matrix(edev->device, cal) != 0)) |
990 | return; | 990 | return; |
991 | 991 | ||
@@ -997,7 +997,7 @@ ecore_drm_inputs_device_axis_size_set(Ecore_Drm_Evdev *edev, int w, int h) | |||
997 | EINA_LIST_FREE(devices, device) | 997 | EINA_LIST_FREE(devices, device) |
998 | { | 998 | { |
999 | vals = eeze_udev_syspath_get_property(device, "WL_CALIBRATION"); | 999 | vals = eeze_udev_syspath_get_property(device, "WL_CALIBRATION"); |
1000 | if ((!vals) || | 1000 | if ((!vals) || |
1001 | (sscanf(vals, "%f %f %f %f %f %f", | 1001 | (sscanf(vals, "%f %f %f %f %f %f", |
1002 | &cal[0], &cal[1], &cal[2], &cal[3], &cal[4], &cal[5]) != 6)) | 1002 | &cal[0], &cal[1], &cal[2], &cal[3], &cal[4], &cal[5]) != 6)) |
1003 | goto cont; | 1003 | goto cont; |
@@ -1005,7 +1005,7 @@ ecore_drm_inputs_device_axis_size_set(Ecore_Drm_Evdev *edev, int w, int h) | |||
1005 | cal[2] /= w; | 1005 | cal[2] /= w; |
1006 | cal[5] /= h; | 1006 | cal[5] /= h; |
1007 | 1007 | ||
1008 | status = | 1008 | status = |
1009 | libinput_device_config_calibration_set_matrix(edev->device, cal); | 1009 | libinput_device_config_calibration_set_matrix(edev->device, cal); |
1010 | 1010 | ||
1011 | if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) | 1011 | if (status != LIBINPUT_CONFIG_STATUS_SUCCESS) |