styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify e_mouse_update() code for x11 compositors 

ref D3433
This commit is contained in:
Mike Blumenkrantz 2015-12-16 16:40:01 -05:00
parent e40033be0a
commit 50e838ef0f
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/bin/e_mouse.c
View File

@ -3,46 +3,43 @@
E_API int E_API int
e_mouse_update(void) e_mouse_update(void)
{ {
unsigned char map[256] = { 0 };
int n;
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
if (e_comp->comp_type == E_PIXMAP_TYPE_X) 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, if (!ecore_x_pointer_control_set(e_config->mouse_accel_numerator,
e_config->mouse_accel_denominator, e_config->mouse_accel_denominator,
e_config->mouse_accel_threshold)) e_config->mouse_accel_threshold))
return 0; return 0;
if (!ecore_x_pointer_mapping_get(map, 256)) return 0; if (!ecore_x_pointer_mapping_get(map, 256)) return 0;
}
#endif
for (n = 0; n < 256; n++) for (n = 0; n < 256; n++)
{ {
if (!map[n]) break; if (!map[n]) break;
} }
if (n < 3) if (n < 3)
{ {
map[0] = 1; map[0] = 1;
map[1] = 2; map[1] = 2;
map[2] = 3; map[2] = 3;
n = 3; n = 3;
} }
if (e_config->mouse_hand == E_MOUSE_HAND_RIGHT) if (e_config->mouse_hand == E_MOUSE_HAND_RIGHT)
{ {
map[0] = 1; map[0] = 1;
map[2] = 3; map[2] = 3;
} }
else if (e_config->mouse_hand == E_MOUSE_HAND_LEFT) else if (e_config->mouse_hand == E_MOUSE_HAND_LEFT)
{ {
map[0] = 3; map[0] = 3;
map[2] = 1; map[2] = 1;
} }
#ifndef HAVE_WAYLAND_ONLY if (!ecore_x_pointer_mapping_set(map, n)) return 0;
if (e_comp->comp_type == E_PIXMAP_TYPE_X) }
if (!ecore_x_pointer_mapping_set(map, n)) return 0;
#endif #endif
return 1; return 1;