X-Git-Url: http://git.tdb.fi/?p=geometrycompositor.git;a=blobdiff_plain;f=source%2Fmain.c;h=ea508d285693031c08ea7b2d8827ed9413847be9;hp=074477bd35dca4e556b0c2cc113ddaf759d2127a;hb=42ed6047036a36fdfc063d83583158d2ec067334;hpb=19993ceafcc8e63da2f4cbfed71324434b5dfacc

diff --git a/source/main.c b/source/main.c
index 074477b..ea508d2 100644
--- a/source/main.c
+++ b/source/main.c
@@ -25,9 +25,19 @@ typedef struct CompositedWindow
 	Damage damage;
 	Pixmap pixmap;
 	GLXPixmap glx_pixmap;
+	int recreate_pixmap;
 	unsigned texture;
+	unsigned mask_texture;
+	int use_mask;
+	int recreate_mask;
 } CompositedWindow;
 
+enum
+{
+	CYLINDRICAL = 1,
+	SPHERICAL
+};
+
 typedef struct CompositedMonitor
 {
 	char *name;
@@ -37,7 +47,8 @@ typedef struct CompositedMonitor
 	unsigned width;
 	unsigned height;
 	float keystone_vertical;
-	float cylinder_depth;
+	float curvature_type;
+	float curvature_depth;
 	float vertical_center;
 	float perspective;
 	unsigned vertex_buffer;
@@ -45,6 +56,8 @@ typedef struct CompositedMonitor
 	unsigned vertex_array;
 	unsigned tessellation;
 	unsigned nelements;
+	short *geometry_data;
+	unsigned geometry_data_size;
 } CompositedMonitor;
 
 typedef struct CompositedScreen
@@ -58,13 +71,18 @@ typedef struct CompositedScreen
 	GLXFBConfig fbconfig;
 	GLXWindow glx_window;
 	GLXContext glx_context;
-	unsigned shaders[2];
+	unsigned shaders[3];
 	unsigned program;
-	unsigned geometry_loc;
+	int geometry_loc;
+	unsigned masked_program;
+	int masked_geometry_loc;
 	unsigned window_vertex_buffer;
 	unsigned window_vertex_array;
 	unsigned framebuffer;
 	unsigned fb_texture;
+	Pixmap root_pixmap;
+	GLXPixmap root_glx_pixmap;
+	unsigned root_texture;
 	CompositedWindow *windows;
 	unsigned nwindows;
 	unsigned windows_capacity;
@@ -79,16 +97,21 @@ typedef struct Compositor
 	CompositedScreen *screens;
 	unsigned nscreens;
 	int damage_event;
+	int shape_event;
+	int randr_event;
 	PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB;
 	PFNGLXBINDTEXIMAGEEXTPROC glXBindTexImageEXT;
 	PFNGLXRELEASETEXIMAGEEXTPROC glXReleaseTexImageEXT;
+	Atom root_pmap_atom;
 	Atom correction_atom;
 	Atom monitors_atom;
+	Atom geometry_data_atom;
+	Window selection_window;
 	int dirty;
 } Compositor;
 
-static const char *vshader =
-	"#version 150\n"
+static const char *vshader_src =
+	"#version 130\n"
 	"uniform vec4 geometry;\n"
 	"in vec2 vertex;\n"
 	"in vec2 texture_coord;\n"
@@ -99,14 +122,27 @@ static const char *vshader =
 	"  texcoord = texture_coord;\n"
 	"}\n";
 
-static const char *fshader =
-	"#version 150\n"
+static const char *fshader_src =
+	"#version 130\n"
+	"uniform sampler2D image;\n"
+	"in vec2 texcoord;\n"
+	"out vec4 frag_color;\n"
+	"void main()\n"
+	"{\n"
+	"  frag_color = texture(image, texcoord);\n"
+	"}\n";
+
+static const char *masked_fshader_src =
+	"#version 130\n"
 	"uniform sampler2D image;\n"
+	"uniform sampler2D mask;\n"
 	"in vec2 texcoord;\n"
 	"out vec4 frag_color;\n"
 	"void main()\n"
 	"{\n"
-	"	frag_color = texture(image, texcoord);\n"
+	"  if(texture(mask, texcoord).r==0.0)\n"
+	"    discard;\n"
+	"  frag_color = texture(image, texcoord);\n"
 	"}\n";
 
 static const float window_vertices[] =
@@ -211,17 +247,16 @@ unsigned compile_shader(GLenum type, const char *source)
 	return shader;
 }
 
-unsigned link_program(unsigned *shaders, unsigned nshaders)
+unsigned link_program(unsigned vshader, unsigned fshader)
 {
 	unsigned program;
-	unsigned i;
 	int status;
 	char info_log[1024];
 	GLsizei length;
 
 	program = glCreateProgram();
-	for(i=0; i<nshaders; ++i)
-		glAttachShader(program, shaders[i]);
+	glAttachShader(program, vshader);
+	glAttachShader(program, fshader);
 	glBindAttribLocation(program, 0, "vertex");
 	glBindAttribLocation(program, 1, "texture_coord");
 	glBindFragDataLocation(program, 0, "frag_color");
@@ -241,22 +276,45 @@ unsigned link_program(unsigned *shaders, unsigned nshaders)
 	return program;
 }
 
-int create_gl_resources(Compositor *compositor, CompositedScreen *screen)
+unsigned create_2d_texture()
 {
-	unsigned stride;
+	unsigned texture;
+	glGenTextures(1, &texture);
+	glBindTexture(GL_TEXTURE_2D, texture);
+	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 texture;
+}
 
-	use_gl(compositor, screen);
+int create_gl_resources(CompositedScreen *screen)
+{
+	unsigned stride;
+	int loc;
 
-	screen->shaders[0] = compile_shader(GL_VERTEX_SHADER, vshader);
-	screen->shaders[1] = compile_shader(GL_FRAGMENT_SHADER, fshader);
-	if(!screen->shaders[0] || !screen->shaders[1])
+	screen->shaders[0] = compile_shader(GL_VERTEX_SHADER, vshader_src);
+	screen->shaders[1] = compile_shader(GL_FRAGMENT_SHADER, fshader_src);
+	screen->shaders[2] = compile_shader(GL_FRAGMENT_SHADER, masked_fshader_src);
+	if(!screen->shaders[0] || !screen->shaders[1] || !screen->shaders[2])
 		return 0;
 
-	screen->program = link_program(screen->shaders, 2);
+	screen->program = link_program(screen->shaders[0], screen->shaders[1]);
 	if(!screen->program)
 		return 0;
 
+	screen->masked_program = link_program(screen->shaders[0], screen->shaders[2]);
+	if(!screen->masked_program)
+		return 0;
+
 	screen->geometry_loc = glGetUniformLocation(screen->program, "geometry");
+	screen->masked_geometry_loc = glGetUniformLocation(screen->masked_program, "geometry");
+
+	loc = glGetUniformLocation(screen->masked_program, "mask");
+	if(loc>=0)
+	{
+		glUseProgram(screen->masked_program);
+		glUniform1i(loc, 1);
+	}
 
 	glGenBuffers(1, &screen->window_vertex_buffer);
 	glBindBuffer(GL_ARRAY_BUFFER, screen->window_vertex_buffer);
@@ -273,12 +331,8 @@ int create_gl_resources(Compositor *compositor, CompositedScreen *screen)
 
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-	glGenTextures(1, &screen->fb_texture);
-	glBindTexture(GL_TEXTURE_2D, screen->fb_texture);
+	screen->fb_texture = create_2d_texture();
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, screen->width, screen->height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
-	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);
 	glBindTexture(GL_TEXTURE_2D, 0);
 
 	glGenFramebuffers(1, &screen->framebuffer);
@@ -287,6 +341,8 @@ int create_gl_resources(Compositor *compositor, CompositedScreen *screen)
 	glDepthMask(GL_FALSE);
 	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
 
+	screen->root_texture = create_2d_texture();
+
 	return 1;
 }
 
@@ -301,17 +357,29 @@ CompositedWindow *find_window(CompositedScreen *screen, Window w)
 	return NULL;
 }
 
-void create_window_pixmap(Compositor *compositor, CompositedScreen *screen, CompositedWindow *window)
+CompositedWindow *find_window_global(Compositor *compositor, Window w, CompositedScreen **screen)
+{
+	unsigned i, j;
+
+	for(i=0; i<compositor->nscreens; ++i)
+		for(j=0; j<compositor->screens[i].nwindows; ++j)
+			if(compositor->screens[i].windows[j].window==w)
+			{
+				if(screen)
+					*screen = &compositor->screens[i];
+				return &compositor->screens[i].windows[j];
+			}
+
+	if(screen)
+		*screen = NULL;
+	return NULL;
+}
+
+GLXPixmap pixmap_to_glx_pixmap(Compositor *compositor, CompositedScreen *screen, Pixmap pixmap)
 {
 	int attribs[5];
 	unsigned i;
 
-	if(window->pixmap)
-	{
-		glXDestroyPixmap(compositor->display, window->glx_pixmap);
-		XFreePixmap(compositor->display, window->pixmap);
-	}
-
 	i = 0;
 	attribs[i++] = GLX_TEXTURE_TARGET_EXT;
 	attribs[i++] = GLX_TEXTURE_2D_EXT;
@@ -319,8 +387,93 @@ void create_window_pixmap(Compositor *compositor, CompositedScreen *screen, Comp
 	attribs[i++] = GLX_TEXTURE_FORMAT_RGBA_EXT;
 	attribs[i++] = None;
 
+	return glXCreatePixmap(compositor->display, screen->fbconfig, pixmap, attribs);
+}
+
+void create_window_pixmap(Compositor *compositor, CompositedScreen *screen, CompositedWindow *window)
+{
+	if(window->pixmap)
+	{
+		glXDestroyPixmap(compositor->display, window->glx_pixmap);
+		XFreePixmap(compositor->display, window->pixmap);
+	}
+
 	window->pixmap = XCompositeNameWindowPixmap(compositor->display, window->window);
-	window->glx_pixmap = glXCreatePixmap(compositor->display, screen->fbconfig, window->pixmap, attribs);
+	window->glx_pixmap = pixmap_to_glx_pixmap(compositor, screen, window->pixmap);
+	window->recreate_pixmap = 0;
+}
+
+void update_window_mask(Compositor *compositor, CompositedWindow *window)
+{
+	Bool bounding_shaped;
+	Bool clip_shaped;
+	int xi, yi;
+	XRectangle *rects;
+	int rect_count;
+	int rect_order;
+	unsigned width;
+	unsigned height;
+	unsigned char *data;
+	int i;
+	unsigned y;
+
+	XShapeQueryExtents(compositor->display, window->window, &bounding_shaped, &xi, &yi, &width, &height, &clip_shaped, &xi, &yi, &width, &height);
+	window->use_mask = bounding_shaped;
+	if(!window->use_mask)
+		return;
+
+	rects = XShapeGetRectangles(compositor->display, window->window, ShapeBounding, &rect_count, &rect_order);
+	if(!rects)
+		return;
+
+	width = window->width+2*window->border;
+	height = window->height+2*window->border;
+	data = (unsigned char *)malloc(width*height);
+	memset(data, 0, width*height);
+	for(i=0; i<rect_count; ++i)
+	{
+		rects[i].x += window->border;
+		rects[i].y += window->border;
+		if(rects[i].x>=(int)width || rects[i].y>=(int)height)
+			continue;
+
+		if(rects[i].x<0)
+		{
+			if(-rects[i].x>rects[i].width)
+				continue;
+			rects[i].width += rects[i].x;
+			rects[i].x = 0;
+		}
+
+		if(rects[i].y<0)
+		{
+			if(-rects[i].y>rects[i].height)
+				continue;
+			rects[i].height += rects[i].y;
+			rects[i].y = 0;
+		}
+
+		if(rects[i].x+rects[i].width>(int)width)
+			rects[i].width = width-rects[i].x;
+		if(rects[i].y+rects[i].height>(int)height)
+			rects[i].height = height-rects[i].y;
+
+		for(y=0; y<rects[i].height; ++y)
+		{
+			unsigned char *row = data+(rects[i].y+y)*width+rects[i].x;
+			memset(row, 255, rects[i].width);
+		}
+	}
+
+	XFree(rects);
+
+	glBindTexture(GL_TEXTURE_2D, window->mask_texture);
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, data);
+
+	free(data);
+
+	window->recreate_mask = 0;
 }
 
 CompositedWindow *add_window(Compositor *compositor, CompositedScreen *screen, Window w)
@@ -363,14 +516,14 @@ CompositedWindow *add_window(Compositor *compositor, CompositedScreen *screen, W
 	window->glx_pixmap = None;
 
 	XCompositeRedirectWindow(compositor->display, window->window, CompositeRedirectManual);
-	if(window->map_state==IsViewable)
-		create_window_pixmap(compositor, screen, window);
+	window->recreate_pixmap = (window->map_state==IsViewable);
 
-	glGenTextures(1, &window->texture);
-	glBindTexture(GL_TEXTURE_2D, window->texture);
-	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);
+	window->texture = create_2d_texture();
+	window->mask_texture = create_2d_texture();
+	window->use_mask = 0;
+	window->recreate_mask = (window->map_state==IsViewable);
+
+	XShapeSelectInput(compositor->display, window->window, ShapeNotifyMask);
 
 	return window;
 }
@@ -444,16 +597,46 @@ CompositedScreen *find_screen_by_root(Compositor *compositor, Window root)
 	return NULL;
 }
 
-CompositedScreen *find_screen_by_window(Compositor *compositor, Window w)
+void create_geometry_correction(CompositedMonitor *monitor)
 {
-	unsigned i, j;
+	unsigned buffers[2];
+	unsigned stride;
 
-	for(i=0; i<compositor->nscreens; ++i)
-		for(j=0; j<compositor->screens[i].nwindows; ++j)
-			if(compositor->screens[i].windows[j].window==w)
-				return &compositor->screens[i];
+	glGenBuffers(2, buffers);
+	monitor->vertex_buffer = buffers[0];
+	monitor->index_buffer = buffers[1];
 
-	return NULL;
+	monitor->tessellation = 50;
+	monitor->geometry_data_size = (monitor->tessellation+1)*(monitor->tessellation+1)*3+16;
+	monitor->geometry_data = (short *)malloc(monitor->geometry_data_size*sizeof(short));
+	stride = 4*sizeof(float);
+
+	glGenVertexArrays(1, &monitor->vertex_array);
+	glBindVertexArray(monitor->vertex_array);
+	glBindBuffer(GL_ARRAY_BUFFER, monitor->vertex_buffer);
+	glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, stride, NULL);
+	glEnableVertexAttribArray(0);
+	glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, stride, (void *)(2*sizeof(float)));
+	glEnableVertexAttribArray(1);
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, monitor->index_buffer);
+	glBindVertexArray(0);
+}
+
+void free_geometry_correction(CompositedMonitor *monitor)
+{
+	unsigned buffers[2];
+
+	buffers[0] = monitor->vertex_buffer;
+	buffers[1] = monitor->index_buffer;
+	glDeleteBuffers(2, buffers);
+	monitor->vertex_buffer = 0;
+	monitor->index_buffer = 0;
+
+	glDeleteVertexArrays(1, &monitor->vertex_array);
+
+	free(monitor->geometry_data);
+	monitor->geometry_data = 0;
 }
 
 void update_monitor_vertices(CompositedScreen *screen, CompositedMonitor *monitor)
@@ -465,8 +648,8 @@ void update_monitor_vertices(CompositedScreen *screen, CompositedMonitor *monito
 	unsigned x, y;
 	unsigned i;
 	float aspect;
-	float cyl_radius;
-	float cyl_arc;
+	float curve_radius;
+	float curve_arc;
 	float sin_ksv;
 	float cos_ksv;
 	float distance;
@@ -480,15 +663,17 @@ void update_monitor_vertices(CompositedScreen *screen, CompositedMonitor *monito
 
 	aspect = (float)monitor->width/monitor->height;
 
-	if(monitor->cylinder_depth)
+	if(monitor->curvature_depth)
 	{
-		cyl_radius = (monitor->cylinder_depth*monitor->cylinder_depth+0.25f)/(2.0f*monitor->cylinder_depth);
-		cyl_arc = 2.0f*asin(0.5f/cyl_radius);
+		curve_radius = (monitor->curvature_depth*monitor->curvature_depth+0.25f)/(2.0f*monitor->curvature_depth);
+		curve_arc = 2.0f*asin(0.5f/curve_radius);
 	}
 
 	sin_ksv = monitor->keystone_vertical/sqrt(1.0f+monitor->keystone_vertical*monitor->keystone_vertical);
 	cos_ksv = sqrt(1.0f-sin_ksv*sin_ksv);
 	distance = monitor->perspective+sin_ksv*((sin_ksv>0)-monitor->vertical_center)/aspect;
+	if(monitor->curvature_depth<0)
+		distance += -monitor->curvature_depth;
 
 	eye[0] = 0.0f;
 	eye[1] = (monitor->vertical_center-0.5f)/aspect+sin_ksv*distance;
@@ -507,13 +692,41 @@ void update_monitor_vertices(CompositedScreen *screen, CompositedMonitor *monito
 			v[0] = (float)x/t-0.5f;
 			v[1] = ((float)y/t-0.5f)/aspect;
 			v[2] = 0;
-			if(monitor->cylinder_depth)
+			if(monitor->curvature_depth)
 			{
-				v[2] = (1.0f-cos(v[0]*cyl_arc))*cyl_radius-monitor->cylinder_depth;
-				v[0] = sin(v[0]*cyl_arc)*cyl_radius;
+				if(monitor->curvature_type==CYLINDRICAL)
+				{
+					v[2] = (1.0f-cos(v[0]*curve_arc))*curve_radius-monitor->curvature_depth;
+					v[0] = sin(v[0]*curve_arc)*curve_radius;
+				}
+				else if(monitor->curvature_type==SPHERICAL)
+				{
+					float r;
+
+					v[0] = tan(v[0]*curve_arc)*curve_radius;
+					v[1] = tan(v[1]*curve_arc)*curve_radius;
+					r = sqrt(v[0]*v[0]+v[1]*v[1]+curve_radius*curve_radius)/fabs(curve_radius);
+					v[0] /= r;
+					v[1] /= r;
+					v[2] = curve_radius-curve_radius/r-monitor->curvature_depth;
+				}
 			}
 		}
 
+	monitor->geometry_data[0] = t;
+	for(i=0; i<3; ++i)
+		monitor->geometry_data[1+i] = eye[i]*4096;
+	for(y=0; y<2; ++y)
+		for(x=0; x<2; ++x)
+		{
+			i = 1+(1+y*2+x)*3;
+			monitor->geometry_data[i] = ((x-0.5f)*distance/monitor->perspective)*4096;
+			monitor->geometry_data[i+1] = (eye[1]+look[1]*distance-(y-monitor->vertical_center)*look[2]*distance/monitor->perspective/aspect)*4096;
+			monitor->geometry_data[i+2] = (eye[2]+look[2]*distance+(y-monitor->vertical_center)*look[1]*distance/monitor->perspective/aspect)*4096;
+		}
+	for(i=0; i<(t+1)*(t+1)*3; ++i)
+		monitor->geometry_data[16+i] = vertex_data[i]*4096;
+
 	for(y=t; y<=t; --y)
 		for(x=t; x<=t; --x)
 		{
@@ -565,8 +778,6 @@ int initialize_monitor(Compositor *compositor, CompositedScreen *screen, XRRScre
 	XRROutputInfo *output;
 	int namelen;
 	XRRCrtcInfo *crtc;
-	unsigned buffers[2];
-	unsigned stride;
 
 	monitor = &screen->monitors[index];
 
@@ -578,6 +789,10 @@ int initialize_monitor(Compositor *compositor, CompositedScreen *screen, XRRScre
 	if(!monitor->enabled)
 	{
 		XRRFreeOutputInfo(output);
+		monitor->vertex_buffer = 0;
+		monitor->index_buffer = 0;
+		monitor->vertex_array = 0;
+		monitor->geometry_data = NULL;
 		return 1;
 	}
 
@@ -590,28 +805,13 @@ int initialize_monitor(Compositor *compositor, CompositedScreen *screen, XRRScre
 	XRRFreeOutputInfo(output);
 
 	monitor->keystone_vertical = 0.0f;
-	monitor->cylinder_depth = 0.0f;
+	monitor->curvature_type = CYLINDRICAL;
+	monitor->curvature_depth = 0.0f;
 	monitor->vertical_center = 0.5f;
 	monitor->perspective = 1.0f;
 
-	glGenBuffers(2, buffers);
-	monitor->vertex_buffer = buffers[0];
-	monitor->index_buffer = buffers[1];
-
-	monitor->tessellation = 50;
+	create_geometry_correction(monitor);
 	update_monitor_vertices(screen, monitor);
-	stride = 4*sizeof(float);
-
-	glGenVertexArrays(1, &monitor->vertex_array);
-	glBindVertexArray(monitor->vertex_array);
-	glBindBuffer(GL_ARRAY_BUFFER, monitor->vertex_buffer);
-	glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, stride, NULL);
-	glEnableVertexAttribArray(0);
-	glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, stride, (void *)(2*sizeof(float)));
-	glEnableVertexAttribArray(1);
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, monitor->index_buffer);
-	glBindVertexArray(0);
 
 	return 1;
 }
@@ -627,6 +827,68 @@ CompositedMonitor *find_monitor_by_name(CompositedScreen *screen, char *name)
 	return NULL;
 }
 
+CompositedMonitor *find_monitor_by_name_global(Compositor *compositor, char *name, CompositedScreen **screen)
+{
+	unsigned i, j;
+
+	for(i=0; i<compositor->nscreens; ++i)
+		for(j=0; j<compositor->screens[i].nmonitors; ++j)
+			if(!strcmp(compositor->screens[i].monitors[j].name, name))
+			{
+				if(screen)
+					*screen = &compositor->screens[i];
+				return &compositor->screens[i].monitors[j];
+			}
+
+	if(screen)
+		*screen = NULL;
+	return NULL;
+}
+
+void update_monitors(Compositor *compositor, CompositedScreen *screen)
+{
+	XRRScreenResources *xrr_res;
+	int i;
+
+	xrr_res = XRRGetScreenResources(compositor->display, screen->root);
+	for(i=0; i<xrr_res->noutput; ++i)
+	{
+		XRROutputInfo *output;
+		CompositedMonitor *monitor;
+		int was_enabled;
+		XRRCrtcInfo *crtc;
+
+		output = XRRGetOutputInfo(compositor->display, xrr_res, xrr_res->outputs[i]);
+		monitor = find_monitor_by_name(screen, output->name);
+		if(!monitor)
+			continue;
+
+		was_enabled = monitor->enabled;
+		monitor->enabled = !!output->crtc;
+		if(!monitor->enabled)
+		{
+			XRRFreeOutputInfo(output);
+			if(was_enabled)
+				free_geometry_correction(monitor);
+			continue;
+		}
+
+		crtc = XRRGetCrtcInfo(compositor->display, xrr_res, output->crtc);
+		monitor->x = crtc->x;
+		monitor->y = crtc->y;
+		monitor->width = crtc->width;
+		monitor->height = crtc->height;
+		XRRFreeCrtcInfo(crtc);
+		XRRFreeOutputInfo(output);
+
+		if(!was_enabled)
+			create_geometry_correction(monitor);
+
+		update_monitor_vertices(screen, monitor);
+	}
+	XRRFreeScreenResources(xrr_res);
+}
+
 void update_geometry_correction(Compositor *compositor, CompositedScreen *screen)
 {
 	Atom prop_type;
@@ -655,7 +917,7 @@ void update_geometry_correction(Compositor *compositor, CompositedScreen *screen
 	use_gl(compositor, screen);
 
 	name_ptr = names;
-	for(i=0; i*4<values_length; ++i)
+	for(i=0; i*5+4<values_length; ++i)
 	{
 		CompositedMonitor *monitor;
 
@@ -665,10 +927,11 @@ void update_geometry_correction(Compositor *compositor, CompositedScreen *screen
 		monitor = find_monitor_by_name(screen, name_ptr);
 		if(monitor)
 		{
-			monitor->keystone_vertical = values[i*4]/10000.0f;
-			monitor->cylinder_depth = values[i*4+1]/10000.0f;
-			monitor->vertical_center = values[i*4+2]/10000.0f;
-			monitor->perspective = values[i*4+3]/10000.0f;
+			monitor->keystone_vertical = values[i*5]/4096.0f;
+			monitor->curvature_type = values[i*5+1];
+			monitor->curvature_depth = values[i*5+2]/4096.0f;
+			monitor->vertical_center = values[i*5+3]/4096.0f;
+			monitor->perspective = values[i*5+4]/4096.0f;
 
 			if(monitor->enabled)
 				update_monitor_vertices(screen, monitor);
@@ -681,6 +944,45 @@ void update_geometry_correction(Compositor *compositor, CompositedScreen *screen
 	XFree(values);
 }
 
+void update_root_pixmap(Compositor *compositor, CompositedScreen *screen)
+{
+	Atom prop_type;
+	int prop_format;
+	unsigned long overflow;
+	unsigned long length;
+	long *pixmap;
+	Window root;
+	int x, y;
+	unsigned width;
+	unsigned height;
+	unsigned border;
+	unsigned depth;
+
+	use_gl(compositor, screen);
+
+	if(screen->root_glx_pixmap)
+	{
+		glXDestroyPixmap(compositor->display, screen->root_glx_pixmap);
+		screen->root_glx_pixmap = None;
+	}
+
+	XGetWindowProperty(compositor->display, screen->root, compositor->root_pmap_atom, 0, 1, False, XA_PIXMAP,
+		&prop_type, &prop_format, &length, &overflow, (unsigned char **)&pixmap);
+	if(prop_type!=XA_PIXMAP || prop_format!=32)
+	{
+		screen->root_pixmap = None;
+		return;
+	}
+
+	screen->root_pixmap = pixmap[0];
+	if(XGetGeometry(compositor->display, screen->root_pixmap, &root, &x, &y, &width, &height, &border, &depth))
+		screen->root_glx_pixmap = pixmap_to_glx_pixmap(compositor, screen, screen->root_pixmap);
+	else
+		screen->root_pixmap = None;
+
+	XFree(pixmap);
+}
+
 int initialize_screen(Compositor *compositor, unsigned number)
 {
 	CompositedScreen *screen;
@@ -707,13 +1009,16 @@ int initialize_screen(Compositor *compositor, unsigned number)
 	screen->root = RootWindow(compositor->display, screen->number);
 	XSelectInput(compositor->display, screen->root, SubstructureNotifyMask|PropertyChangeMask);
 	screen->overlay = XCompositeGetOverlayWindow(compositor->display, screen->root);
+	XSelectInput(compositor->display, screen->overlay, StructureNotifyMask);
 	XGetGeometry(compositor->display, screen->overlay, &dummy_root, &x, &y, &screen->width, &screen->height, &border, &depth);
 	XShapeCombineRectangles(compositor->display, screen->overlay, ShapeInput, 0, 0, NULL, 0, ShapeSet, Unsorted);
 
 	if(!initialize_gl(compositor, screen))
 		return 0;
 
-	if(!create_gl_resources(compositor, screen))
+	use_gl(compositor, screen);
+
+	if(!create_gl_resources(screen))
 		return 0;
 
 	xrr_res = XRRGetScreenResources(compositor->display, screen->root);
@@ -723,8 +1028,13 @@ int initialize_screen(Compositor *compositor, unsigned number)
 		if(!initialize_monitor(compositor, screen, xrr_res, i))
 			return 0;
 	XRRFreeScreenResources(xrr_res);
+	XRRSelectInput(compositor->display, screen->root, RRScreenChangeNotifyMask);
+
+	screen->root_pixmap = None;
+	screen->root_glx_pixmap = None;
 
 	update_geometry_correction(compositor, screen);
+	update_root_pixmap(compositor, screen);
 
 	XQueryTree(compositor->display, screen->root, &dummy_root, &dummy_parent, &children, &nchildren);
 
@@ -777,14 +1087,14 @@ int initialize_compositor(Compositor *compositor)
 	else if(major_ver<1)
 		return with_error("XDamage 1.0 or later is required");
 
-	if(!XShapeQueryExtension(compositor->display, &event_base, &error_base))
+	if(!XShapeQueryExtension(compositor->display, &compositor->shape_event, &error_base))
 		return with_error("XShape is required but was not found");
 	else if(!XShapeQueryVersion(compositor->display, &major_ver, &minor_ver))
 		return with_error("Cannot determine XShape version");
 	else if(major_ver<1 || (major_ver==1 && minor_ver<1))
 		return with_error("XShape 1.1 or later is required");
 
-	if(!XRRQueryExtension(compositor->display, &event_base, &error_base))
+	if(!XRRQueryExtension(compositor->display, &compositor->randr_event, &error_base))
 		return with_error("XRandR is required but was not found");
 	else if(!XRRQueryVersion(compositor->display, &major_ver, &minor_ver))
 		return with_error("Cannot determine XRandR version");
@@ -795,8 +1105,10 @@ int initialize_compositor(Compositor *compositor)
 	compositor->glXBindTexImageEXT = (PFNGLXBINDTEXIMAGEEXTPROC)glXGetProcAddress((unsigned char *)"glXBindTexImageEXT");
 	compositor->glXReleaseTexImageEXT = (PFNGLXRELEASETEXIMAGEEXTPROC)glXGetProcAddress((unsigned char *)"glXReleaseTexImageEXT");
 
-	compositor->correction_atom = XInternAtom(compositor->display, "GEOMETRY_CORRECTION", False);
-	compositor->monitors_atom = XInternAtom(compositor->display, "GEOMETRY_CORRECTION_MONITORS", False);
+	compositor->root_pmap_atom = XInternAtom(compositor->display, "_XROOTPMAP_ID", False);
+	compositor->correction_atom = XInternAtom(compositor->display, "_MSP_GEOMETRY_CORRECTION", False);
+	compositor->monitors_atom = XInternAtom(compositor->display, "_MSP_GEOMETRY_CORRECTION_MONITORS", False);
+	compositor->geometry_data_atom = XInternAtom(compositor->display, "_MSP_GEOMETRY_CORRECTION_DATA", False);
 
 	compositor->nscreens = ScreenCount(compositor->display);
 	compositor->screens = (CompositedScreen *)malloc(compositor->nscreens*sizeof(CompositedScreen));
@@ -804,6 +1116,9 @@ int initialize_compositor(Compositor *compositor)
 		if(!initialize_screen(compositor, i))
 			return 0;
 
+	compositor->selection_window = XCreateWindow(compositor->display, compositor->screens[0].root, 0, 0, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, 0, NULL);
+	XSetSelectionOwner(compositor->display, compositor->geometry_data_atom, compositor->selection_window, CurrentTime);
+
 	compositor->dirty = 1;
 
 	return 1;
@@ -818,6 +1133,7 @@ void shutdown_screen(Compositor *compositor, CompositedScreen *screen)
 	for(i=0; i<screen->nwindows; ++i)
 	{
 		glDeleteTextures(1, &screen->windows[i].texture);
+		glDeleteTextures(1, &screen->windows[i].mask_texture);
 		if(screen->windows[i].pixmap)
 		{
 			glXDestroyPixmap(compositor->display, screen->windows[i].glx_pixmap);
@@ -830,22 +1146,22 @@ void shutdown_screen(Compositor *compositor, CompositedScreen *screen)
 	{
 		free(screen->monitors[i].name);
 		if(screen->monitors[i].enabled)
-		{
-			glDeleteBuffers(1, &screen->monitors[i].vertex_buffer);
-			glDeleteBuffers(1, &screen->monitors[i].index_buffer);
-			glDeleteVertexArrays(1, &screen->monitors[i].vertex_array);
-		}
+			free_geometry_correction(&screen->monitors[i]);
 	}
 
+	glDeleteTextures(1, &screen->root_texture);
+	glXDestroyPixmap(compositor->display, screen->root_glx_pixmap);
+
 	glDeleteBuffers(1, &screen->window_vertex_buffer);
 	glDeleteVertexArrays(1, &screen->window_vertex_array);
 	glDeleteFramebuffers(1, &screen->framebuffer);
 	glDeleteTextures(1, &screen->fb_texture);
 	glDeleteProgram(screen->program);
-	glDeleteShader(screen->shaders[0]);
-	glDeleteShader(screen->shaders[1]);
+	glDeleteProgram(screen->masked_program);
+	for(i=0; i<3; ++i)
+		glDeleteShader(screen->shaders[i]);
 
-	glXMakeContextCurrent(compositor->display, 0, 0, NULL);
+	glXMakeContextCurrent(compositor->display, None, None, NULL);
 	glXDestroyContext(compositor->display, screen->glx_context);
 	glXDestroyWindow(compositor->display, screen->glx_window);
 	XDestroyWindow(compositor->display, screen->render_window);
@@ -864,6 +1180,8 @@ void shutdown_compositor(Compositor *compositor)
 		shutdown_screen(compositor, &compositor->screens[i]);
 	free(compositor->screens);
 
+	XDestroyWindow(compositor->display, compositor->selection_window);
+
 	XCloseDisplay(compositor->display);
 }
 
@@ -888,7 +1206,10 @@ void process_destroy_window_event(Compositor *compositor, XDestroyWindowEvent *e
 
 	if((screen = find_screen_by_root(compositor, event->event)))
 		if((window = find_window(screen, event->window)))
+		{
+			use_gl(compositor, screen);
 			remove_window(compositor, screen, window, 1);
+		}
 }
 
 void process_map_event(Compositor *compositor, XMapEvent *event)
@@ -905,7 +1226,8 @@ void process_map_event(Compositor *compositor, XMapEvent *event)
 		return;
 
 	window->map_state = IsViewable;
-	create_window_pixmap(compositor, screen, window);
+	window->recreate_pixmap = 1;
+	window->recreate_mask = 1;
 
 	mark_dirty(compositor, screen);
 }
@@ -959,6 +1281,19 @@ void process_configure_event(Compositor *compositor, XConfigureEvent *event)
 	if(!screen)
 		return;
 
+	if(event->window==screen->overlay)
+	{
+		screen->width = event->width;
+		screen->height = event->height;
+
+		XResizeWindow(compositor->display, screen->render_window, screen->width, screen->height);
+		use_gl(compositor, screen);
+		glBindTexture(GL_TEXTURE_2D, screen->fb_texture);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, screen->width, screen->height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
+		glBindTexture(GL_TEXTURE_2D, 0);
+		return;
+	}
+
 	window = find_window(screen, event->window);
 	if(!window)
 		return;
@@ -970,7 +1305,7 @@ void process_configure_event(Compositor *compositor, XConfigureEvent *event)
 		window->width = event->width;
 		window->height = event->height;
 		window->border = event->border_width;
-		create_window_pixmap(compositor, screen, window);
+		window->recreate_pixmap = 1;
 	}
 	reorder_window(screen, window, event->above);
 
@@ -982,14 +1317,46 @@ void process_property_event(Compositor *compositor, XPropertyEvent *event)
 {
 	CompositedScreen *screen;
 
-	if(event->atom!=compositor->correction_atom)
-		return;
-
 	screen = find_screen_by_root(compositor, event->window);
 	if(!screen)
 		return;
 
-	update_geometry_correction(compositor, screen);
+	if(event->atom==compositor->correction_atom)
+		update_geometry_correction(compositor, screen);
+	else if(event->atom==compositor->root_pmap_atom)
+		update_root_pixmap(compositor, screen);
+}
+
+void process_selection_request_event(Compositor *compositor, XSelectionRequestEvent *event)
+{
+	Atom prop_type;
+	int prop_format;
+	unsigned long overflow;
+	unsigned long names_length;
+	XSelectionEvent notify;
+
+	if(event->selection==compositor->geometry_data_atom)
+	{
+		char *monitor_name;
+		CompositedMonitor *monitor;
+
+		XGetWindowProperty(compositor->display, event->requestor, event->property, 0, 64, False, XA_STRING,
+			&prop_type, &prop_format, &names_length, &overflow, (unsigned char **)&monitor_name);
+		if(prop_type!=XA_STRING || prop_format!=8)
+			return;
+
+		monitor = find_monitor_by_name_global(compositor, monitor_name, NULL);
+		if(monitor && monitor->enabled)
+			XChangeProperty(compositor->display, event->requestor, event->property, XA_INTEGER, 16, PropModeReplace, (unsigned char *)monitor->geometry_data, monitor->geometry_data_size);
+
+		notify.type = SelectionNotify;
+		notify.requestor = event->requestor;
+		notify.selection = event->selection;
+		notify.target = event->target;
+		notify.property = (monitor ? event->property : None);
+		notify.time = event->time;
+		XSendEvent(compositor->display, event->requestor, False, 0, (XEvent *)&notify);
+	}
 }
 
 void process_damage_event(Compositor *compositor, XDamageNotifyEvent *event)
@@ -997,83 +1364,148 @@ void process_damage_event(Compositor *compositor, XDamageNotifyEvent *event)
 	CompositedScreen *screen;
 	CompositedWindow *window;
 
-	screen = find_screen_by_window(compositor, event->drawable);
-	if(!screen)
+	window = find_window_global(compositor, event->drawable, &screen);
+	if(window && window->map_state==IsViewable)
+		mark_dirty(compositor, screen);
+}
+
+void process_shape_event(Compositor *compositor, XShapeEvent *event)
+{
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	if(event->kind!=ShapeBounding)
 		return;
 
-	window = find_window(screen, event->drawable);
-	if(window->map_state==IsViewable)
+	window = find_window_global(compositor, event->window, &screen);
+	if(window && window->map_state==IsViewable)
+	{
+		window->recreate_mask = 1;
 		mark_dirty(compositor, screen);
+	}
+}
+
+void process_randr_event(Compositor *compositor, XRRScreenChangeNotifyEvent *event)
+{
+	CompositedScreen *screen;
+
+	if((screen = find_screen_by_root(compositor, event->root)))
+		update_monitors(compositor, screen);
 }
 
-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
-			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;
+		case SelectionRequest:
+			process_selection_request_event(compositor, &event.xselectionrequest);
+			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 if(event.type==compositor->randr_event+RRScreenChangeNotify)
+				process_randr_event(compositor, (XRRScreenChangeNotifyEvent *)&event);
+		}
 	}
-
-	return 1;
 }
 
 void refresh_screen(Compositor *compositor, CompositedScreen *screen)
 {
 	unsigned i;
+	int use_mask;
+
+	for(i=0; i<screen->nwindows; ++i)
+		if(screen->windows[i].map_state==IsViewable)
+			XDamageSubtract(compositor->display, screen->windows[i].damage, None, None);
+	glXWaitX();
 
 	use_gl(compositor, screen);
 
+	glViewport(0, 0, screen->width, screen->height);
+	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, screen->framebuffer);
 
-	glClearColor(0.5f, 0.5f, 0.5f, 0.0f);
-	glClear(GL_COLOR_BUFFER_BIT);
-
-	glUseProgram(screen->program);
+	use_mask = -1;
 	glBindVertexArray(screen->window_vertex_array);
+
+	if(screen->root_pixmap)
+	{
+		use_mask = 0;
+		glUseProgram(screen->program);
+		glBindTexture(GL_TEXTURE_2D, screen->root_texture);
+		compositor->glXBindTexImageEXT(compositor->display, screen->root_glx_pixmap, GLX_FRONT_LEFT_EXT, NULL);
+		glUniform4f(screen->geometry_loc, 0.0f, 0.0f, 1.0f, 1.0f);
+		glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+		compositor->glXReleaseTexImageEXT(compositor->display, screen->root_glx_pixmap, GLX_FRONT_LEFT_EXT);
+	}
+	else
+		glClear(GL_COLOR_BUFFER_BIT);
+
 	for(i=0; i<screen->nwindows; ++i)
 	{
-		CompositedWindow *window = &screen->windows[i];
+		CompositedWindow *window;
+
+		window = &screen->windows[i];
 		if(window->map_state!=IsViewable)
 			continue;
 
-		XDamageSubtract(compositor->display, window->damage, None, None);
+		if(window->use_mask!=use_mask)
+		{
+			use_mask = window->use_mask;
+			glUseProgram(use_mask ? screen->masked_program : screen->program);
+		}
+
+		if(window->use_mask)
+		{
+			glActiveTexture(GL_TEXTURE1);
+			glBindTexture(GL_TEXTURE_2D, window->mask_texture);
+			glActiveTexture(GL_TEXTURE0);
+		}
+
+		if(window->recreate_pixmap)
+			create_window_pixmap(compositor, screen, window);
+		if(window->recreate_mask)
+			update_window_mask(compositor, window);
 
 		glBindTexture(GL_TEXTURE_2D, window->texture);
 		compositor->glXBindTexImageEXT(compositor->display, window->glx_pixmap, GLX_FRONT_LEFT_EXT, NULL);
-		glUniform4f(screen->geometry_loc,
+		glUniform4f((use_mask ? screen->masked_geometry_loc : screen->geometry_loc),
 			(float)window->x/screen->width, 1.0f-(float)(window->y+window->height)/screen->height,
 			(float)(window->width+2*window->border)/screen->width, (float)(window->height+2*window->border)/screen->height);
 		glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -1081,11 +1513,12 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen)
 	}
 
 	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
-	glClearColor(0.5f, 0.0f, 0.5f, 0.0f);
 	glClear(GL_COLOR_BUFFER_BIT);
 	glBindTexture(GL_TEXTURE_2D, screen->fb_texture);
 	glEnable(GL_PRIMITIVE_RESTART);
 	glPrimitiveRestartIndex(0xFFFF);
+	if(use_mask)
+		glUseProgram(screen->program);
 
 	for(i=0; i<screen->nmonitors; ++i)
 	{
@@ -1140,7 +1573,8 @@ int main()
 
 	while(!terminate_requested)
 	{
-		if(!process_event(&compositor))
+		process_events(&compositor);
+		if(compositor.dirty && !terminate_requested)
 			refresh_all_screens(&compositor);
 	}