X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmain.c;h=6f35c9849655d2bd6414e5fd074430e79cf45bf9;hb=110b5a3a1850d4ff5d9f4426172a7df048cacdda;hp=970774d2eac52a7ff5350891f8442619287eb265;hpb=88cddf89c868fa3c62f51078dddc588b897f1af0;p=geometrycompositor.git

diff --git a/source/main.c b/source/main.c
index 970774d..6f35c98 100644
--- a/source/main.c
+++ b/source/main.c
@@ -111,7 +111,7 @@ static const char *fshader_src =
 	"out vec4 frag_color;\n"
 	"void main()\n"
 	"{\n"
-	"	frag_color = texture(image, texcoord);\n"
+	"  frag_color = texture(image, texcoord);\n"
 	"}\n";
 
 static const char *masked_fshader_src =
@@ -1089,7 +1089,6 @@ void process_configure_event(Compositor *compositor, XConfigureEvent *event)
 		window->height = event->height;
 		window->border = event->border_width;
 		create_window_pixmap(compositor, screen, window);
-		update_window_mask(compositor, window);
 	}
 	reorder_window(screen, window, event->above);
 
@@ -1137,50 +1136,53 @@ void process_shape_event(Compositor *compositor, XShapeEvent *event)
 	}
 }
 
-int process_event(Compositor *compositor)
+void process_events(Compositor *compositor)
 {
+	int pending;
 	XEvent event;
-	if(compositor->dirty)
+
+	pending = 0;
+	while((pending || !compositor->dirty) && !terminate_requested)
 	{
-		if(!XCheckMaskEvent(compositor->display, -1, &event))
-			return 0;
-	}
-	else
+		if(!pending)
+			pending = XPending(compositor->display);
+
 		XNextEvent(compositor->display, &event);
+		if(pending)
+			--pending;
 
-	switch(event.type)
-	{
-	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;
-	case ConfigureNotify:
-		process_configure_event(compositor, &event.xconfigure);
-		break;
-	case PropertyNotify:
-		process_property_event(compositor, &event.xproperty);
-		break;
-	default:
-		if(event.type==compositor->damage_event+XDamageNotify)
-			process_damage_event(compositor, (XDamageNotifyEvent *)&event);
-		else if(event.type==compositor->shape_event+ShapeNotify)
-			process_shape_event(compositor, (XShapeEvent *)&event);
-		else
-			printf("Event %d\n", event.type);
+		switch(event.type)
+		{
+		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;
+		case ConfigureNotify:
+			process_configure_event(compositor, &event.xconfigure);
+			break;
+		case PropertyNotify:
+			process_property_event(compositor, &event.xproperty);
+			break;
+		default:
+			if(event.type==compositor->damage_event+XDamageNotify)
+				process_damage_event(compositor, (XDamageNotifyEvent *)&event);
+			else if(event.type==compositor->shape_event+ShapeNotify)
+				process_shape_event(compositor, (XShapeEvent *)&event);
+			else
+				printf("Event %d\n", event.type);
+		}
 	}
-
-	return 1;
 }
 
 void refresh_screen(Compositor *compositor, CompositedScreen *screen)
@@ -1199,7 +1201,9 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen)
 	glBindVertexArray(screen->window_vertex_array);
 	for(i=0; i<screen->nwindows; ++i)
 	{
-		CompositedWindow *window = &screen->windows[i];
+		CompositedWindow *window;
+
+		window = &screen->windows[i];
 		if(window->map_state!=IsViewable)
 			continue;
 
@@ -1289,7 +1293,8 @@ int main()
 
 	while(!terminate_requested)
 	{
-		if(!process_event(&compositor))
+		process_events(&compositor);
+		if(compositor.dirty && !terminate_requested)
 			refresh_all_screens(&compositor);
 	}