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

diff --git a/source/main.c b/source/main.c
index 9865eb9..6886685 100644
--- a/source/main.c
+++ b/source/main.c
@@ -260,24 +260,24 @@ void create_window_pixmap(Compositor *compositor, CompositedScreen *screen, Comp
 	window->glx_pixmap = glXCreatePixmap(compositor->display, screen->fbconfig, window->pixmap, attribs);
 }
 
-void add_window(Compositor *compositor, CompositedScreen *screen, Window w)
+CompositedWindow *add_window(Compositor *compositor, CompositedScreen *screen, Window w)
 {
 	CompositedWindow *window;
 	XWindowAttributes win_attr;
 
 	if(w==screen->root || w==screen->overlay)
-		return;
+		return NULL;
 
 	if(!XGetWindowAttributes(compositor->display, w, &win_attr))
 	{
 		printf("XGetWindowAttributes failed; probably the window was already destroyed\n");
-		return;
+		return NULL;
 	}
 	if(win_attr.class==InputOnly)
-		return;
+		return NULL;
 
 	if(find_window(screen, w))
-		return;
+		return NULL;
 
 	if(screen->nwindows==screen->windows_capacity)
 	{
@@ -308,21 +308,29 @@ void add_window(Compositor *compositor, CompositedScreen *screen, Window w)
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+	return window;
 }
 
-void remove_window(CompositedScreen *screen, Window w)
+void remove_window(Compositor *compositor, CompositedScreen *screen, CompositedWindow *window, int destroyed)
 {
 	unsigned i;
 
-	for(i=0; i<screen->nwindows; ++i)
-		if(screen->windows[i].window==w)
+	glDeleteTextures(1, &window->texture);
+	if(!destroyed)
+	{
+		XDamageDestroy(compositor->display, window->damage);
+		if(window->pixmap)
 		{
-			glDeleteTextures(1, &screen->windows[i].texture);
-
-			--screen->nwindows;
-			for(; i<screen->nwindows; ++i)
-				screen->windows[i] = screen->windows[i+1];
+			glXDestroyPixmap(compositor->display, window->glx_pixmap);
+			XFreePixmap(compositor->display, window->pixmap);
 		}
+		XCompositeUnredirectWindow(compositor->display, window->window, CompositeRedirectManual);
+	}
+
+	--screen->nwindows;
+	for(i=window-screen->windows; i<screen->nwindows; ++i)
+		screen->windows[i] = screen->windows[i+1];
 }
 
 CompositedScreen *find_screen_by_root(Compositor *compositor, Window root)
@@ -493,6 +501,12 @@ void shutdown_compositor(Compositor *compositor)
 	XCloseDisplay(compositor->display);
 }
 
+void mark_dirty(Compositor *compositor, CompositedScreen *screen)
+{
+	compositor->dirty = 1;
+	screen->dirty = 1;
+}
+
 void process_create_window_event(Compositor *compositor, XCreateWindowEvent *event)
 {
 	CompositedScreen *screen = find_screen_by_root(compositor, event->parent);
@@ -508,7 +522,9 @@ void process_destroy_window_event(Compositor *compositor, XDestroyWindowEvent *e
 	if(!screen)
 		return;
 
-	remove_window(screen, event->window);
+	CompositedWindow *window = find_window(screen, event->window);
+	if(window)
+		remove_window(compositor, screen, window, 1);
 }
 
 void process_map_event(Compositor *compositor, XMapEvent *event)
@@ -518,11 +534,13 @@ 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);
+
+	mark_dirty(compositor, screen);
 }
 
 void process_unmap_event(Compositor *compositor, XUnmapEvent *event)
@@ -534,6 +552,30 @@ void process_unmap_event(Compositor *compositor, XUnmapEvent *event)
 	CompositedWindow *window = find_window(screen, event->window);
 	if(window)
 		window->map_state = IsUnviewable;
+
+	mark_dirty(compositor, screen);
+}
+
+void process_reparent_event(Compositor *compositor, XReparentEvent *event)
+{
+	CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+	if(!screen)
+		return;
+
+	CompositedWindow *window;
+	if(event->parent==screen->root)
+		window = add_window(compositor, screen, event->window);
+	else
+	{
+		window = find_window(screen, event->window);
+		if(!window)
+			return;
+
+		remove_window(compositor, screen, window, 0);
+	}
+
+	if(window && window->map_state==IsViewable)
+		mark_dirty(compositor, screen);
 }
 
 void process_damage_event(Compositor *compositor, XDamageNotifyEvent *event)
@@ -542,8 +584,9 @@ void process_damage_event(Compositor *compositor, XDamageNotifyEvent *event)
 	if(!screen)
 		return;
 
-	screen->dirty = 1;
-	compositor->dirty = 1;
+	CompositedWindow *window = find_window(screen, event->drawable);
+	if(window->map_state==IsViewable)
+		mark_dirty(compositor, screen);
 }
 
 int process_event(Compositor *compositor)
@@ -571,6 +614,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);
@@ -588,6 +634,9 @@ void refresh_screens(Compositor *compositor)
 	for(i=0; i<compositor->nscreens; ++i)
 	{
 		CompositedScreen *screen = &compositor->screens[i];
+		if(!screen->dirty)
+			continue;
+
 		use_gl(compositor, screen);
 
 		glClearColor(0.5f, 0.5f, 0.5f, 0.0f);