X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmain.c;h=2da64e601b6472a42fba0dab7f4781fa1ead4d79;hb=0f620e224622a48411afc1f47d900b96e09ea82a;hp=9865eb9ac7c7f84d2104c423e41f31614b4ab6fb;hpb=b7cfb7990668847fd2aa3095d803560d4482ff51;p=geometrycompositor.git

diff --git a/source/main.c b/source/main.c
index 9865eb9..2da64e6 100644
--- a/source/main.c
+++ b/source/main.c
@@ -310,7 +310,7 @@ void add_window(Compositor *compositor, CompositedScreen *screen, Window w)
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 }
 
-void remove_window(CompositedScreen *screen, Window w)
+void remove_window(Compositor *compositor, CompositedScreen *screen, Window w, int destroyed)
 {
 	unsigned i;
 
@@ -318,6 +318,16 @@ void remove_window(CompositedScreen *screen, Window w)
 		if(screen->windows[i].window==w)
 		{
 			glDeleteTextures(1, &screen->windows[i].texture);
+			if(!destroyed)
+			{
+				XDamageDestroy(compositor->display, screen->windows[i].damage);
+				if(screen->windows[i].pixmap)
+				{
+					glXDestroyPixmap(compositor->display, screen->windows[i].glx_pixmap);
+					XFreePixmap(compositor->display, screen->windows[i].pixmap);
+				}
+				XCompositeUnredirectWindow(compositor->display, screen->windows[i].window, CompositeRedirectManual);
+			}
 
 			--screen->nwindows;
 			for(; i<screen->nwindows; ++i)
@@ -508,7 +518,7 @@ void process_destroy_window_event(Compositor *compositor, XDestroyWindowEvent *e
 	if(!screen)
 		return;
 
-	remove_window(screen, event->window);
+	remove_window(compositor, screen, event->window, 1);
 }
 
 void process_map_event(Compositor *compositor, XMapEvent *event)
@@ -518,11 +528,11 @@ void process_map_event(Compositor *compositor, XMapEvent *event)
 		return;
 
 	CompositedWindow *window = find_window(screen, event->window);
-	if(window)
-	{
-		window->map_state = IsViewable;
-		create_window_pixmap(compositor, screen, window);
-	}
+	if(!window)
+		return;
+
+	window->map_state = IsViewable;
+	create_window_pixmap(compositor, screen, window);
 }
 
 void process_unmap_event(Compositor *compositor, XUnmapEvent *event)
@@ -536,6 +546,18 @@ void process_unmap_event(Compositor *compositor, XUnmapEvent *event)
 		window->map_state = IsUnviewable;
 }
 
+void process_reparent_event(Compositor *compositor, XReparentEvent *event)
+{
+	CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+	if(!screen)
+		return;
+
+	if(event->parent==screen->root)
+		add_window(compositor, screen, event->window);
+	else
+		remove_window(compositor, screen, event->window, 0);
+}
+
 void process_damage_event(Compositor *compositor, XDamageNotifyEvent *event)
 {
 	CompositedScreen *screen = find_screen_by_window(compositor, event->drawable);
@@ -571,6 +593,9 @@ int process_event(Compositor *compositor)
 	case UnmapNotify:
 		process_unmap_event(compositor, &event.xunmap);
 		break;
+	case ReparentNotify:
+		process_reparent_event(compositor, &event.xreparent);
+		break;
 	default:
 		if(event.type==compositor->damage_event+XDamageNotify)
 			process_damage_event(compositor, (XDamageNotifyEvent *)&event);