isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 19:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

evdev: Used floating point instead of fixed point numbers

Browse Source 
Following the API change in libinput, change the uses of fixed point
numbers to floating point numbers.

https://bugzilla.gnome.org/show_bug.cgi?id=731178
This commit is contained in:
Jonas Ådahl 2014-06-02 23:16:21 +02:00 committed by Emmanuele Bassi
parent 499f2e5831
commit 61929e26e1
3 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
clutter/evdev/clutter-device-manager-evdev.c
View File

@ -400,8 +400,8 @@ notify_absolute_motion (ClutterInputDevice *input_device,
static void static void
notify_relative_motion (ClutterInputDevice *input_device, notify_relative_motion (ClutterInputDevice *input_device,
guint32 time_, guint32 time_,
li_fixed_t dx, double dx,
li_fixed_t dy) double dy)
{ {
gfloat new_x, new_y; gfloat new_x, new_y;
ClutterInputDeviceEvdev *device_evdev; ClutterInputDeviceEvdev *device_evdev;
@ -416,17 +416,9 @@ notify_relative_motion (ClutterInputDevice *input_device,
device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device); device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
seat = _clutter_input_device_evdev_get_seat (device_evdev); seat = _clutter_input_device_evdev_get_seat (device_evdev);
/* Append previously discarded fraction. */
dx += device_evdev->dx_frac;
dy += device_evdev->dy_frac;
clutter_input_device_get_coords (seat->core_pointer, NULL, &point); clutter_input_device_get_coords (seat->core_pointer, NULL, &point);
new_x = point.x + li_fixed_to_int (dx); new_x = point.x + dx;
new_y = point.y + li_fixed_to_int (dy); new_y = point.y + dy;
/* Save the discarded fraction part for next motion event. */
device_evdev->dx_frac = (dx < 0 ? -1 : 1) * (0xff & dx);
device_evdev->dy_frac = (dy < 0 ? -1 : 1) * (0xff & dy);
notify_absolute_motion (input_device, time_, new_x, new_y); notify_absolute_motion (input_device, time_, new_x, new_y);
} }
@ -1122,7 +1114,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
case LIBINPUT_EVENT_POINTER_MOTION: case LIBINPUT_EVENT_POINTER_MOTION:
{ {
guint32 time; guint32 time;
li_fixed_t dx, dy; double dx, dy;
struct libinput_event_pointer *motion_event = struct libinput_event_pointer *motion_event =
libinput_event_get_pointer_event (event); libinput_event_get_pointer_event (event);
device = libinput_device_get_user_data (libinput_device); device = libinput_device_get_user_data (libinput_device);
@ -1138,7 +1130,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE:
{ {
guint32 time; guint32 time;
li_fixed_t x, y; double x, y;
gfloat stage_width, stage_height; gfloat stage_width, stage_height;
ClutterStage *stage; ClutterStage *stage;
struct libinput_event_pointer *motion_event = struct libinput_event_pointer *motion_event =
@ -1157,10 +1149,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
stage_width); stage_width);
y = libinput_event_pointer_get_absolute_y_transformed (motion_event, y = libinput_event_pointer_get_absolute_y_transformed (motion_event,
stage_height); stage_height);
notify_absolute_motion (device, notify_absolute_motion (device, time, x, y);
time,
li_fixed_to_double(x),
li_fixed_to_double(y));
break; break;
} }
@ -1191,8 +1180,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
device = libinput_device_get_user_data (libinput_device); device = libinput_device_get_user_data (libinput_device);
time = libinput_event_pointer_get_time (axis_event); time = libinput_event_pointer_get_time (axis_event);
value = li_fixed_to_double ( value = libinput_event_pointer_get_axis_value (axis_event);
libinput_event_pointer_get_axis_value (axis_event));
axis = libinput_event_pointer_get_axis (axis_event); axis = libinput_event_pointer_get_axis (axis_event);
switch (axis) switch (axis)
@ -1218,7 +1206,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
{ {
gint32 slot; gint32 slot;
guint32 time; guint32 time;
li_fixed_t x, y; double x, y;
gfloat stage_width, stage_height; gfloat stage_width, stage_height;
ClutterStage *stage; ClutterStage *stage;
ClutterTouchState *touch_state; ClutterTouchState *touch_state;
@ -1241,8 +1229,8 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
stage_height); stage_height);
touch_state = _device_seat_add_touch (device, slot); touch_state = _device_seat_add_touch (device, slot);
touch_state->coords.x = li_fixed_to_double (x); touch_state->coords.x = x;
touch_state->coords.y = li_fixed_to_double (y); touch_state->coords.y = y;
notify_touch_event (device, CLUTTER_TOUCH_BEGIN, time, slot, notify_touch_event (device, CLUTTER_TOUCH_BEGIN, time, slot,
touch_state->coords.x, touch_state->coords.y); touch_state->coords.x, touch_state->coords.y);
@ -1273,7 +1261,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
{ {
gint32 slot; gint32 slot;
guint32 time; guint32 time;
li_fixed_t x, y; double x, y;
gfloat stage_width, stage_height; gfloat stage_width, stage_height;
ClutterStage *stage; ClutterStage *stage;
ClutterTouchState *touch_state; ClutterTouchState *touch_state;
@ -1296,8 +1284,8 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
stage_height); stage_height);
touch_state = _device_seat_get_touch (device, slot); touch_state = _device_seat_get_touch (device, slot);
touch_state->coords.x = li_fixed_to_double (x); touch_state->coords.x = x;
touch_state->coords.y = li_fixed_to_double (y); touch_state->coords.y = y;
notify_touch_event (device, CLUTTER_TOUCH_UPDATE, time, slot, notify_touch_event (device, CLUTTER_TOUCH_UPDATE, time, slot,
touch_state->coords.x, touch_state->coords.y); touch_state->coords.x, touch_state->coords.y);

2
clutter/evdev/clutter-input-device-evdev.h
View File

@ -64,8 +64,6 @@ struct _ClutterInputDeviceEvdev
struct libinput_device *libinput_device; struct libinput_device *libinput_device;
ClutterSeatEvdev *seat; ClutterSeatEvdev *seat;
li_fixed_t dx_frac;
li_fixed_t dy_frac;
}; };
GType _clutter_input_device_evdev_get_type (void) G_GNUC_CONST; GType _clutter_input_device_evdev_get_type (void) G_GNUC_CONST;

2
configure.ac
View File

@ -146,7 +146,7 @@ m4_define([uprof_req_version], [0.3])
m4_define([gtk_doc_req_version], [1.20]) m4_define([gtk_doc_req_version], [1.20])
m4_define([xcomposite_req_version], [0.4]) m4_define([xcomposite_req_version], [0.4])
m4_define([gdk_req_version], [3.3.18]) m4_define([gdk_req_version], [3.3.18])
m4_define([libinput_req_version], [0.1.0]) m4_define([libinput_req_version], [0.3.0])
m4_define([libudev_req_version], [136]) m4_define([libudev_req_version], [136])
AC_SUBST([GLIB_REQ_VERSION], [glib_req_version]) AC_SUBST([GLIB_REQ_VERSION], [glib_req_version])