X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmain.c;h=05b59557495cf9725cee2553db1b3cc5fa1fd2a8;hb=cad63ae5d592e02bcea6edc00205853761b5289e;hp=561159d5be08ebf6802a102049846b0f470d138f;hpb=86c8cc19b0b625cdadd4ce892ecbaeb94a0e5fe2;p=geometrycompositor.git

diff --git a/source/main.c b/source/main.c
index 561159d..05b5955 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,15 @@ 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);
+	(void)display;
+	return 0;
+}
+
 int with_error(const char *message)
 {
 	fprintf(stderr, "%s\n", message);
@@ -258,7 +268,11 @@ void add_window(Compositor *compositor, CompositedScreen *screen, Window w)
 	if(w==screen->root || w==screen->overlay)
 		return;
 
-	XGetWindowAttributes(compositor->display, w, &win_attr);
+	if(!XGetWindowAttributes(compositor->display, w, &win_attr))
+	{
+		printf("XGetWindowAttributes failed; probably the window was already destroyed\n");
+		return;
+	}
 	if(win_attr.class==InputOnly)
 		return;
 
@@ -364,6 +378,8 @@ int initialize_screen(Compositor *compositor, unsigned number)
 
 	XFree(children);
 
+	screen->dirty = 1;
+
 	return 1;
 }
 
@@ -379,6 +395,8 @@ int initialize_compositor(Compositor *compositor)
 	if(!compositor->display)
 		return with_error("Could not open X display");
 
+	XSetErrorHandler(&x_error_handler);
+
 	if(!XCompositeQueryExtension(compositor->display, &event_base, &error_base))
 		return with_error("XComposite is required but was not found");
 	else if(!XCompositeQueryVersion(compositor->display, &major_ver, &minor_ver))
@@ -417,25 +435,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)
@@ -549,14 +589,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);