[PATCH v3 3/8] winex11: Keep track of the host window children of interest.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winex11.drv/event.c  | 26 ++++++++++++++++++++++++++
 dlls/winex11.drv/x11drv.h |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index 05ecbeb8050..41d486c8922 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -183,6 +183,7 @@ void host_window_destroy( struct host_window *win )
     TRACE( "host window %p/%lx\n", win, win->window );

if (win->parent) host_window_release( win->parent );
+    free( win->children );
     free( win );
 }

@@ -199,6 +200,13 @@ void host_window_release( struct host_window *win )
     }
 }

+static unsigned int find_host_window_child( struct host_window *win, Window child )
+{
+    unsigned int i;
+    for (i = 0; i < win->children_count; i++) if (win->children[i].window == child) break;
+    return i;
+}
+
 static int host_window_error( Display *display, XErrorEvent *event, void *arg )
 {
     return (event->error_code == BadWindow);
@@ -235,7 +243,25 @@ static struct host_window *find_host_window( Window window, BOOL create )
 void host_window_reparent( struct host_window **win, Window parent, Window window )
 {
     struct host_window *old = *win, *new = find_host_window( parent, TRUE );
+    unsigned int index;
+    void *tmp;
+
     if ((*win = new)) host_window_add_ref( new );
+
+    if (old && (index = find_host_window_child( old, window )) < old->children_count)
+    {
+        old->children[index] = old->children[old->children_count - 1];
+        old->children_count--;
+    }
+
+    if (new && (index = find_host_window_child( new, window )) == new->children_count)
+    {
+        if (!(tmp = realloc( new->children, (index + 1) * sizeof(*new->children) ))) return;
+        new->children = tmp;
+        new->children[index].window = window;
+        new->children_count++;
+    }
+
     if (old) host_window_release( old );
 }

diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 8aa678e9f92..fc5ab81f282 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -368,6 +368,8 @@ struct host_window
     LONG refcount;
     Window window;
     struct host_window *parent;
+    unsigned int children_count;
+    struct { Window window; } *children;
 };

extern void host_window_destroy( struct host_window *win );