From: devilhorns Date: Wed, 6 Jun 2012 14:10:43 +0000 (+0000) Subject: Ecore_Wayland: Patch from Rob Bradford for X-Git-Tag: 2.0_alpha~25^2~40 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e69ea37fb636631393d3e8a91832d11aae5492f1;p=framework%2Fuifw%2Fecore.git Ecore_Wayland: Patch from Rob Bradford for updating axis events to be fixed point numbers. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@71756 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/ChangeLog b/ChangeLog index fcaafb3..82d26ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -731,3 +731,7 @@ - this is required where the keysym is not the same as the printable definition +2012-06-06 Rob Bradford + + * Ecore_Wayland: Update to protocol change - axis events are now fixed point numbers + diff --git a/src/lib/ecore_evas/ecore_evas_wayland_egl.c b/src/lib/ecore_evas/ecore_evas_wayland_egl.c index bc95754..46bbf0f 100644 --- a/src/lib/ecore_evas/ecore_evas_wayland_egl.c +++ b/src/lib/ecore_evas/ecore_evas_wayland_egl.c @@ -242,6 +242,7 @@ ecore_evas_wayland_egl_new(const char *disp_name, unsigned int parent, int x, in einfo->info.display = ecore_wl_display_get(); einfo->info.destination_alpha = ee->alpha; einfo->info.rotation = ee->rotation; + einfo->info.depth = 32; if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) { ERR("Failed to set Evas Engine Info for '%s'", ee->driver); diff --git a/src/lib/ecore_wayland/ecore_wl_input.c b/src/lib/ecore_wayland/ecore_wl_input.c index 19c290b..54ca296 100644 --- a/src/lib/ecore_wayland/ecore_wl_input.c +++ b/src/lib/ecore_wayland/ecore_wl_input.c @@ -45,7 +45,7 @@ static void _ecore_wl_input_cb_pointer_enter(void *data, struct wl_pointer *poin static void _ecore_wl_input_cb_pointer_leave(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int serial, struct wl_surface *surface); static void _ecore_wl_input_cb_pointer_motion(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int timestamp, wl_fixed_t sx, wl_fixed_t sy); static void _ecore_wl_input_cb_pointer_button(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int serial, unsigned int timestamp, unsigned int button, unsigned int state); -static void _ecore_wl_input_cb_pointer_axis(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int timestamp, unsigned int axis, int value); +static void _ecore_wl_input_cb_pointer_axis(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int timestamp, unsigned int axis, wl_fixed_t value); static void _ecore_wl_input_cb_keyboard_keymap(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int format, int fd, unsigned int size); static void _ecore_wl_input_cb_keyboard_enter(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int serial, struct wl_surface *surface, struct wl_array *keys __UNUSED__); static void _ecore_wl_input_cb_keyboard_leave(void *data, struct wl_keyboard *keyboard __UNUSED__, unsigned int serial, struct wl_surface *surface); @@ -351,14 +351,15 @@ _ecore_wl_input_cb_pointer_button(void *data, struct wl_pointer *pointer __UNUSE } static void -_ecore_wl_input_cb_pointer_axis(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int timestamp, unsigned int axis, int value) +_ecore_wl_input_cb_pointer_axis(void *data, struct wl_pointer *pointer __UNUSED__, unsigned int timestamp, unsigned int axis, wl_fixed_t value) { Ecore_Wl_Input *input; LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!(input = data)) return; - _ecore_wl_input_mouse_wheel_send(input, axis, value, timestamp); + _ecore_wl_input_mouse_wheel_send(input, axis, wl_fixed_to_int(value), + timestamp); } static void