enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

ecore-drm: Transform touch events into output coordinates 

Summary: This updates touch events to be transformed into output
coordinates

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-12-10 10:17:54 -05:00
parent ce473d88a1
commit ed12acbfc6
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lib/ecore_drm/ecore_drm_evdev.c
View File

@ -9,17 +9,12 @@ static void
_device_calibration_set(Ecore_Drm_Evdev *edev)
{
const char *sysname;
int w = 0, h = 0;
float cal[6];
const char *device;
Eina_List *devices;
const char *vals;
enum libinput_config_status status;
ecore_drm_output_size_get(edev->seat->input->dev,
edev->seat->input->dev->window, &w, &h);
if ((w == 0) || (h == 0)) return;
if ((!libinput_device_config_calibration_has_matrix(edev->device)) ||
(libinput_device_config_calibration_get_default_matrix(edev->device, cal) != 0))
return;
@ -37,8 +32,8 @@ _device_calibration_set(Ecore_Drm_Evdev *edev)
&cal[0], &cal[1], &cal[2], &cal[3], &cal[4], &cal[5]) != 6))
goto cont;
cal[2] /= w;
cal[5] /= h;
cal[2] /= edev->output.w;
cal[5] /= edev->output.h;
status =
libinput_device_config_calibration_set_matrix(edev->device, cal);
@ -609,8 +604,10 @@ _device_handle_touch_down(struct libinput_device *device, struct libinput_event_
if (!(edev = libinput_device_get_user_data(device))) return;
edev->mouse.x = libinput_event_touch_get_x(event);
edev->mouse.y = libinput_event_touch_get_y(event);
edev->mouse.x =
libinput_event_touch_get_x_transformed(event, edev->output.w);
edev->mouse.y =
libinput_event_touch_get_y_transformed(event, edev->output.h);
edev->mt_slot = libinput_event_touch_get_seat_slot(event);
_device_handle_touch_event(edev, event, ECORE_EVENT_MOUSE_BUTTON_DOWN);
@ -628,8 +625,10 @@ _device_handle_touch_motion(struct libinput_device *device, struct libinput_even
if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Move)))) return;
edev->mouse.x = libinput_event_touch_get_x(event);
edev->mouse.y = libinput_event_touch_get_y(event);
edev->mouse.x =
libinput_event_touch_get_x_transformed(event, edev->output.w);
edev->mouse.y =
libinput_event_touch_get_y_transformed(event, edev->output.h);
edev->mt_slot = libinput_event_touch_get_seat_slot(event);
ev->window = (Ecore_Window)input->dev->window;
@ -669,8 +668,8 @@ _device_handle_touch_up(struct libinput_device *device, struct libinput_event_to
if (!(edev = libinput_device_get_user_data(device))) return;
edev->mouse.x = 0;
edev->mouse.y = 0;
/* edev->mouse.x = 0; */
/* edev->mouse.y = 0; */
edev->mt_slot = libinput_event_touch_get_seat_slot(event);
_device_handle_touch_event(edev, event, ECORE_EVENT_MOUSE_BUTTON_UP);