From: Enlightenment S. <no-...@en...> - 2010-10-18 21:50:49
|
Log: Use event_win when it exists to match source of events I don't expect anything to break, but if mouse or keyboard events suddenly disappear, feel free to revert this patch while blaming cedric or discomfitor. Author: sachiel Date: 2010-10-18 14:50:41 -0700 (Mon, 18 Oct 2010) New Revision: 53583 Modified: trunk/ecore/src/lib/ecore_evas/ecore_evas_x.c trunk/ecore/src/lib/ecore_input_evas/ecore_input_evas.c Modified: trunk/ecore/src/lib/ecore_evas/ecore_evas_x.c =================================================================== --- trunk/ecore/src/lib/ecore_evas/ecore_evas_x.c 2010-10-18 19:24:17 UTC (rev 53582) +++ trunk/ecore/src/lib/ecore_evas/ecore_evas_x.c 2010-10-18 21:50:41 UTC (rev 53583) @@ -744,7 +744,7 @@ Ecore_X_Event_Mouse_In *e; e = event; - ee = ecore_event_window_match(e->win); + ee = ecore_event_window_match(e->event_win); if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on event */ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON; /* { */ @@ -795,7 +795,7 @@ Ecore_X_Event_Mouse_Out *e; e = event; - ee = ecore_event_window_match(e->win); + ee = ecore_event_window_match(e->event_win); if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on event */ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON; @@ -954,7 +954,7 @@ Ecore_X_Event_Window_Destroy *e; e = event; - ee = ecore_event_window_match(e->win); + ee = ecore_event_window_match(e->event_win); if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON; if (ee->func.fn_destroy) ee->func.fn_destroy(ee); @@ -970,7 +970,7 @@ Ecore_X_Event_Window_Configure *e; e = event; - ee = ecore_event_window_match(e->win); + ee = ecore_event_window_match(e->event_win); if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON; if (ee->engine.x.direct_resize) return ECORE_CALLBACK_PASS_ON; @@ -1049,7 +1049,7 @@ static int first_map_bug = -1; e = event; - ee = ecore_event_window_match(e->win); + ee = ecore_event_window_match(e->event_win); if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON; if (first_map_bug < 0) @@ -1076,7 +1076,7 @@ Ecore_X_Event_Window_Hide *e; e = event; - ee = ecore_event_window_match(e->win); + ee = ecore_event_window_match(e->event_win); if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */ if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON; if (!ee->visible) return ECORE_CALLBACK_DONE; Modified: trunk/ecore/src/lib/ecore_input_evas/ecore_input_evas.c =================================================================== --- trunk/ecore/src/lib/ecore_input_evas/ecore_input_evas.c 2010-10-18 19:24:17 UTC (rev 53582) +++ trunk/ecore/src/lib/ecore_input_evas/ecore_input_evas.c 2010-10-18 21:50:41 UTC (rev 53583) @@ -132,7 +132,7 @@ { Ecore_Input_Window *lookup; - lookup = _ecore_event_window_match(e->window); + lookup = _ecore_event_window_match(e->event_window); if (!lookup) return ECORE_CALLBACK_RENEW; ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers); if (press == ECORE_DOWN) @@ -148,7 +148,7 @@ Ecore_Input_Window *lookup; Evas_Button_Flags flags = EVAS_BUTTON_NONE; - lookup = _ecore_event_window_match(e->window); + lookup = _ecore_event_window_match(e->event_window); if (!lookup) return ECORE_CALLBACK_RENEW; if (e->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK; if (e->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK; @@ -177,7 +177,7 @@ Ecore_Input_Window *lookup; e = event; - lookup = _ecore_event_window_match(e->window); + lookup = _ecore_event_window_match(e->event_window); if (!lookup) return ECORE_CALLBACK_RENEW; if (e->multi.device == 0) { @@ -208,7 +208,7 @@ { Ecore_Input_Window *lookup; - lookup = _ecore_event_window_match(e->window); + lookup = _ecore_event_window_match(e->event_window); if (!lookup) return ECORE_CALLBACK_RENEW; ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers); switch (io) @@ -246,7 +246,7 @@ Ecore_Input_Window *lookup; e = event; - lookup = _ecore_event_window_match(e->window); + lookup = _ecore_event_window_match(e->event_window); if (!lookup) return ECORE_CALLBACK_RENEW; ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers); evas_event_feed_mouse_wheel(lookup->evas, e->direction, e->z, e->timestamp, NULL); |