discomfitor pushed a commit to annotated tag v0.20.2. http://git.enlightenment.org/core/enlightenment.git/commit/?id=41f3349b923558cf2161faffc0e171c2ed8b4e7c
commit 41f3349b923558cf2161faffc0e171c2ed8b4e7c Author: Mike Blumenkrantz <zm...@osg.samsung.com> Date: Wed Dec 16 16:40:01 2015 -0500 simplify e_mouse_update() code for x11 compositors ref D3433 --- src/bin/e_mouse.c | 55 ++++++++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/src/bin/e_mouse.c b/src/bin/e_mouse.c index 5de709d..5aaa561 100644 --- a/src/bin/e_mouse.c +++ b/src/bin/e_mouse.c @@ -3,46 +3,43 @@ E_API int e_mouse_update(void) { - unsigned char map[256] = { 0 }; - int n; - #ifndef HAVE_WAYLAND_ONLY if (e_comp->comp_type == E_PIXMAP_TYPE_X) { + unsigned char map[256] = { 0 }; + int n; + if (!ecore_x_pointer_control_set(e_config->mouse_accel_numerator, e_config->mouse_accel_denominator, e_config->mouse_accel_threshold)) return 0; if (!ecore_x_pointer_mapping_get(map, 256)) return 0; - } -#endif - for (n = 0; n < 256; n++) - { - if (!map[n]) break; - } - if (n < 3) - { - map[0] = 1; - map[1] = 2; - map[2] = 3; - n = 3; - } - if (e_config->mouse_hand == E_MOUSE_HAND_RIGHT) - { - map[0] = 1; - map[2] = 3; - } - else if (e_config->mouse_hand == E_MOUSE_HAND_LEFT) - { - map[0] = 3; - map[2] = 1; - } + for (n = 0; n < 256; n++) + { + if (!map[n]) break; + } + if (n < 3) + { + map[0] = 1; + map[1] = 2; + map[2] = 3; + n = 3; + } + if (e_config->mouse_hand == E_MOUSE_HAND_RIGHT) + { + map[0] = 1; + map[2] = 3; + } + else if (e_config->mouse_hand == E_MOUSE_HAND_LEFT) + { + map[0] = 3; + map[2] = 1; + } -#ifndef HAVE_WAYLAND_ONLY - if (e_comp->comp_type == E_PIXMAP_TYPE_X) - if (!ecore_x_pointer_mapping_set(map, n)) return 0; + if (!ecore_x_pointer_mapping_set(map, n)) return 0; + } #endif return 1; --