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

* Fix grab count negative values if you do weird combinations of 

press and release with multiple fingers or multiple mouse
        buttons.
        


SVN revision: 66134
This commit is contained in:
Carsten Haitzler 2011-12-13 05:59:36 +00:00
parent c1f916f396
commit 0434ce6574
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/evas/ChangeLog
View File

@ -550,3 +550,8 @@
Those functions let you jump to the start/end of the word under the
cursor.
2011-12-13 Carsten Haitzler (The Rasterman)
* Fix grab count negative values if you do weird combinations of
press and release with multiple fingers or multiple mouse
buttons.

23
legacy/evas/src/lib/canvas/evas_events.c
View File

@ -197,7 +197,8 @@ evas_event_feed_mouse_down(Evas *e, int b, Evas_Button_Flags flags, unsigned int
Eina_List *l, *copy;
Evas_Event_Mouse_Down ev;
Evas_Object *obj;
int addgrab = 0;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
@ -205,6 +206,7 @@ evas_event_feed_mouse_down(Evas *e, int b, Evas_Button_Flags flags, unsigned int
if ((b < 1) || (b > 32)) return;
e->pointer.button |= (1 << (b - 1));
e->pointer.downs++;
if (e->events_frozen > 0) return;
e->last_timestamp = timestamp;
@ -238,14 +240,17 @@ evas_event_feed_mouse_down(Evas *e, int b, Evas_Button_Flags flags, unsigned int
e->pointer.object.in = eina_list_free(e->pointer.object.in);
/* and set up the new one */
e->pointer.object.in = ins;
/* adjust grabbed count by the nuymber of currently held down
* fingers/buttons */
if (e->pointer.downs > 1) addgrab = e->pointer.downs - 1;
}
copy = evas_event_list_copy(e->pointer.object.in);
EINA_LIST_FOREACH(copy, l, obj)
{
if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
{
obj->mouse_grabbed++;
e->pointer.mouse_grabbed++;
obj->mouse_grabbed += addgrab + 1;
e->pointer.mouse_grabbed += addgrab + 1;
}
}
EINA_LIST_FOREACH(copy, l, obj)
@ -383,6 +388,7 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
if ((b < 1) || (b > 32)) return;
e->pointer.button &= ~(1 << (b - 1));
e->pointer.downs--;
if (e->events_frozen > 0) return;
e->last_timestamp = timestamp;
@ -899,11 +905,13 @@ evas_event_feed_multi_down(Evas *e,
Eina_List *l, *copy;
Evas_Event_Multi_Down ev;
Evas_Object *obj;
int addgrab = 0;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
e->pointer.downs++;
if (e->events_frozen > 0) return;
e->last_timestamp = timestamp;
@ -931,13 +939,17 @@ evas_event_feed_multi_down(Evas *e,
_evas_walk(e);
/* append new touch point to the touch point list */
_evas_touch_point_append(e, d, x, y);
if (e->pointer.mouse_grabbed == 0)
{
if (e->pointer.downs > 1) addgrab = e->pointer.downs - 1;
}
copy = evas_event_list_copy(e->pointer.object.in);
EINA_LIST_FOREACH(copy, l, obj)
{
if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
{
obj->mouse_grabbed++;
e->pointer.mouse_grabbed++;
obj->mouse_grabbed += addgrab + 1;
e->pointer.mouse_grabbed += addgrab + 1;
}
}
EINA_LIST_FOREACH(copy, l, obj)
@ -979,6 +991,7 @@ evas_event_feed_multi_up(Evas *e,
return;
MAGIC_CHECK_END();
e->pointer.downs--;
if (e->events_frozen > 0) return;
e->last_timestamp = timestamp;

1
legacy/evas/src/lib/include/evas_private.h
View File

@ -301,6 +301,7 @@ struct _Evas
struct {
unsigned char inside : 1;
int mouse_grabbed;
int downs;
DATA32 button;
Evas_Coord x, y;
struct {