Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
ecore_evas_x.c
Log Message:
fix extra events to do just what they originally did
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- ecore_evas_x.c 11 Oct 2005 16:34:41 -0000 1.61
+++ ecore_evas_x.c 13 Oct 2005 14:06:20 -0000 1.62
@@ -363,6 +363,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
if (e->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
if (e->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
@@ -379,6 +380,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
evas_event_feed_mouse_up(ee->evas, e->button, EVAS_BUTTON_NONE, e->time,
NULL);
return 1;
@@ -392,9 +394,8 @@
e = event;
ee = _ecore_evas_x_match(e->win);
-
if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
-
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
evas_event_feed_mouse_wheel(ee->evas, e->direction, e->z, e->time, NULL);
@@ -410,6 +411,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
_ecore_evas_x_mouse_move_process(ee, e->x, e->y, e->time);
return 1;
@@ -424,6 +426,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
if (e->event_win == ee->engine.x.win_container) return 0;
/* if (e->mode != ECORE_X_EVENT_MODE_NORMAL) return 0; */
if (ee->func.fn_mouse_in) ee->func.fn_mouse_in(ee);
@@ -442,6 +445,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
if (e->event_win == ee->engine.x.win_container) return 0;
/* if (e->mode != ECORE_X_EVENT_MODE_NORMAL) return 0; */
_ecore_evas_x_modifier_locks_update(ee, e->modifiers);
@@ -461,6 +465,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
ee->prop.focused = 1;
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
return 1;
@@ -475,6 +480,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
if (ee->prop.fullscreen)
ecore_x_window_focus(ee->engine.x.win);
ee->prop.focused = 0;
@@ -491,6 +497,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
if (ee->engine.x.using_bg_pixmap) return 1;
if (ee->prop.avoid_damage)
{
@@ -542,6 +549,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
if (ee->func.fn_destroy) ee->func.fn_destroy(ee);
ecore_evas_free(ee);
return 1;
@@ -556,12 +564,9 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
if ((ee->prop.fullscreen) && (e->win == ee->engine.x.win_container)) return
0;
if (ee->engine.x.direct_resize) return 0;
- /* Only accept configure events on main windows */
- if ((e->win != ee->engine.x.win_container) &&
- (e->win != ee->engine.x.win))
- return 0;
if ((e->from_wm) || (ee->prop.fullscreen) || (ee->prop.override))
{
@@ -621,6 +626,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
if (ee->func.fn_delete_request) ee->func.fn_delete_request(ee);
return 1;
}
@@ -634,6 +640,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
if (ee->visible) return 0; /* dont pass it on */
ee->visible = 1;
if (ee->func.fn_show) ee->func.fn_show(ee);
@@ -649,6 +656,7 @@
e = event;
ee = _ecore_evas_x_match(e->win);
if (!ee) return 1; /* pass on event */
+ if ((e->win != ee->engine.x.win_container) && (e->win != ee->engine.x.win))
return 1;
if (!ee->visible) return 0; /* dont pass it on */
ee->visible = 0;
if (ee->func.fn_hide) ee->func.fn_hide(ee);
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
