X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmain.c;h=c37ecc8d86f6f552a9cbe2ac481ad87a30065640;hb=f13c078df3041afbf1b9d4fdbb502b426c46640c;hp=ae9bc4ffabb629c9c1746e98925cfb5f5c55b4fe;hpb=f8e05a9f3004b5d6cb135512785283e003f0c16e;p=geometrycompositor.git

diff --git a/source/main.c b/source/main.c
index ae9bc4f..c37ecc8 100644
--- a/source/main.c
+++ b/source/main.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/Xcomposite.h>
 #include <X11/extensions/Xdamage.h>
@@ -87,6 +88,8 @@ static const float vertices[] =
 	1.0f, 0.0f
 };
 
+int terminate_requested = 0;
+
 int x_error_handler(Display *display, XErrorEvent *event)
 {
 	printf("Ignoring X error %d on resource %lx\n", event->error_code, event->resourceid);
@@ -307,6 +310,31 @@ void add_window(Compositor *compositor, CompositedScreen *screen, Window w)
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 }
 
+void remove_window(Compositor *compositor, CompositedScreen *screen, Window w, int destroyed)
+{
+	unsigned i;
+
+	for(i=0; i<screen->nwindows; ++i)
+		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)
+				screen->windows[i] = screen->windows[i+1];
+		}
+}
+
 CompositedScreen *find_screen_by_root(Compositor *compositor, Window root)
 {
 	unsigned i;
@@ -375,6 +403,8 @@ int initialize_screen(Compositor *compositor, unsigned number)
 
 	XFree(children);
 
+	screen->dirty = 1;
+
 	return 1;
 }
 
@@ -430,25 +460,47 @@ int initialize_compositor(Compositor *compositor)
 		if(!initialize_screen(compositor, i))
 			return 0;
 
+	compositor->dirty = 1;
+
 	return 1;
 }
 
 void shutdown_screen(Compositor *compositor, CompositedScreen *screen)
 {
+	unsigned i;
+
+	use_gl(compositor, screen);
+
+	for(i=0; i<screen->nwindows; ++i)
+	{
+		glDeleteTextures(1, &screen->windows[i].texture);
+		if(screen->windows[i].pixmap)
+		{
+			glXDestroyPixmap(compositor->display, screen->windows[i].glx_pixmap);
+			XFreePixmap(compositor->display, screen->windows[i].pixmap);
+			XDamageDestroy(compositor->display, screen->windows[i].damage);
+		}
+	}
+
+	glXMakeContextCurrent(compositor->display, 0, 0, NULL);
 	glXDestroyContext(compositor->display, screen->glx_context);
 	glXDestroyWindow(compositor->display, screen->glx_window);
 	XDestroyWindow(compositor->display, screen->render_window);
 
 	XCompositeReleaseOverlayWindow(compositor->display, screen->overlay);
+
+	free(screen->windows);
 }
 
 void shutdown_compositor(Compositor *compositor)
 {
 	unsigned i;
 
-	glXMakeContextCurrent(compositor->display, 0, 0, NULL);
 	for(i=0; i<compositor->nscreens; ++i)
 		shutdown_screen(compositor, &compositor->screens[i]);
+	free(compositor->screens);
+
+	XCloseDisplay(compositor->display);
 }
 
 void process_create_window_event(Compositor *compositor, XCreateWindowEvent *event)
@@ -460,6 +512,15 @@ void process_create_window_event(Compositor *compositor, XCreateWindowEvent *eve
 	add_window(compositor, screen, event->window);
 }
 
+void process_destroy_window_event(Compositor *compositor, XDestroyWindowEvent *event)
+{
+	CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+	if(!screen)
+		return;
+
+	remove_window(compositor, screen, event->window, 1);
+}
+
 void process_map_event(Compositor *compositor, XMapEvent *event)
 {
 	CompositedScreen *screen = find_screen_by_root(compositor, event->event);
@@ -485,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);
@@ -511,12 +584,18 @@ int process_event(Compositor *compositor)
 	case CreateNotify:
 		process_create_window_event(compositor, &event.xcreatewindow);
 		break;
+	case DestroyNotify:
+		process_destroy_window_event(compositor, &event.xdestroywindow);
+		break;
 	case MapNotify:
 		process_map_event(compositor, &event.xmap);
 		break;
 	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);
@@ -562,14 +641,23 @@ void refresh_screens(Compositor *compositor)
 	compositor->dirty = 0;
 }
 
+void sighandler(int sig)
+{
+	terminate_requested = 1;
+	(void)sig;
+}
+
 int main()
 {
 	Compositor compositor;
 
+	signal(SIGINT, &sighandler);
+	signal(SIGTERM, &sighandler);
+
 	if(!initialize_compositor(&compositor))
 		return 1;
 
-	while(1)
+	while(!terminate_requested)
 	{
 		if(!process_event(&compositor))
 			refresh_screens(&compositor);