From 03d0e564b502260a9058cbfd9c7a53951b068fad Mon Sep 17 00:00:00 2001 From: raster Date: Fri, 19 Sep 2008 09:29:27 +0000 Subject: [PATCH] add event_win's to all events that didnt have them before - needed. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@36091 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_x/Ecore_X.h | 7 +++++++ src/lib/ecore_x/xlib/ecore_x_events.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h index 1a37ec0..1cbd309 100644 --- a/src/lib/ecore_x/Ecore_X.h +++ b/src/lib/ecore_x/Ecore_X.h @@ -462,18 +462,21 @@ struct _Ecore_X_Event_Window_Create struct _Ecore_X_Event_Window_Destroy { Ecore_X_Window win; + Ecore_X_Window event_win; Ecore_X_Time time; }; struct _Ecore_X_Event_Window_Hide { Ecore_X_Window win; + Ecore_X_Window event_win; Ecore_X_Time time; }; struct _Ecore_X_Event_Window_Show { Ecore_X_Window win; + Ecore_X_Window event_win; Ecore_X_Time time; }; @@ -487,6 +490,7 @@ struct _Ecore_X_Event_Window_Show_Request struct _Ecore_X_Event_Window_Reparent { Ecore_X_Window win; + Ecore_X_Window event_win; Ecore_X_Window parent; Ecore_X_Time time; }; @@ -494,6 +498,7 @@ struct _Ecore_X_Event_Window_Reparent struct _Ecore_X_Event_Window_Configure { Ecore_X_Window win; + Ecore_X_Window event_win; Ecore_X_Window abovewin; int x, y, w, h; int border; @@ -505,6 +510,7 @@ struct _Ecore_X_Event_Window_Configure struct _Ecore_X_Event_Window_Configure_Request { Ecore_X_Window win; + Ecore_X_Window parent_win; Ecore_X_Window abovewin; int x, y, w, h; int border; @@ -516,6 +522,7 @@ struct _Ecore_X_Event_Window_Configure_Request struct _Ecore_X_Event_Window_Gravity { Ecore_X_Window win; + Ecore_X_Window event_win; Ecore_X_Time time; }; diff --git a/src/lib/ecore_x/xlib/ecore_x_events.c b/src/lib/ecore_x/xlib/ecore_x_events.c index 59bacb2..fba9f14 100644 --- a/src/lib/ecore_x/xlib/ecore_x_events.c +++ b/src/lib/ecore_x/xlib/ecore_x_events.c @@ -834,6 +834,7 @@ _ecore_x_event_handle_destroy_notify(XEvent *xevent) e = calloc(1, sizeof(Ecore_X_Event_Window_Destroy)); if (!e) return; e->win = xevent->xdestroywindow.window; + e->event_win = xevent->xdestroywindow.event; e->time = _ecore_x_event_last_time; if (e->win == _ecore_x_event_last_win) _ecore_x_event_last_win = 0; ecore_event_add(ECORE_X_EVENT_WINDOW_DESTROY, e, NULL, NULL); @@ -847,6 +848,7 @@ _ecore_x_event_handle_unmap_notify(XEvent *xevent) e = calloc(1, sizeof(Ecore_X_Event_Window_Hide)); if (!e) return; e->win = xevent->xunmap.window; + e->event_win = xevent->xunmap.event; e->time = _ecore_x_event_last_time; ecore_event_add(ECORE_X_EVENT_WINDOW_HIDE, e, NULL, NULL); } @@ -859,6 +861,7 @@ _ecore_x_event_handle_map_notify(XEvent *xevent) e = calloc(1, sizeof(Ecore_X_Event_Window_Show)); if (!e) return; e->win = xevent->xmap.window; + e->event_win = xevent->xmap.event; e->time = _ecore_x_event_last_time; ecore_event_add(ECORE_X_EVENT_WINDOW_SHOW, e, NULL, NULL); } @@ -884,6 +887,7 @@ _ecore_x_event_handle_reparent_notify(XEvent *xevent) e = calloc(1, sizeof(Ecore_X_Event_Window_Reparent)); if (!e) return; e->win = xevent->xreparent.window; + e->event_win = xevent->xreparent.event; e->parent = xevent->xreparent.parent; e->time = _ecore_x_event_last_time; ecore_event_add(ECORE_X_EVENT_WINDOW_REPARENT, e, NULL, NULL); @@ -897,6 +901,7 @@ _ecore_x_event_handle_configure_notify(XEvent *xevent) e = calloc(1, sizeof(Ecore_X_Event_Window_Configure)); if (!e) return; e->win = xevent->xconfigure.window; + e->event_win = xevent->xconfigure.event; e->abovewin = xevent->xconfigure.above; e->x = xevent->xconfigure.x; e->y = xevent->xconfigure.y; @@ -917,6 +922,7 @@ _ecore_x_event_handle_configure_request(XEvent *xevent) e = calloc(1, sizeof(Ecore_X_Event_Window_Configure_Request)); if (!e) return; e->win = xevent->xconfigurerequest.window; + e->parent_win = xevent->xconfigurerequest.parent; e->abovewin = xevent->xconfigurerequest.above; e->x = xevent->xconfigurerequest.x; e->y = xevent->xconfigurerequest.y; -- 2.7.4