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

diff --git a/source/main.c b/source/main.c
index 2d5dd91..ea508d2 100644
--- a/source/main.c
+++ b/source/main.c
@@ -32,6 +32,12 @@ typedef struct CompositedWindow
 	int recreate_mask;
 } CompositedWindow;
 
+enum
+{
+	CYLINDRICAL = 1,
+	SPHERICAL
+};
+
 typedef struct CompositedMonitor
 {
 	char *name;
@@ -41,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;
@@ -49,6 +56,8 @@ typedef struct CompositedMonitor
 	unsigned vertex_array;
 	unsigned tessellation;
 	unsigned nelements;
+	short *geometry_data;
+	unsigned geometry_data_size;
 } CompositedMonitor;
 
 typedef struct CompositedScreen
@@ -89,17 +98,20 @@ typedef struct Compositor
 	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_src =
-	"#version 150\n"
+	"#version 130\n"
 	"uniform vec4 geometry;\n"
 	"in vec2 vertex;\n"
 	"in vec2 texture_coord;\n"
@@ -111,7 +123,7 @@ static const char *vshader_src =
 	"}\n";
 
 static const char *fshader_src =
-	"#version 150\n"
+	"#version 130\n"
 	"uniform sampler2D image;\n"
 	"in vec2 texcoord;\n"
 	"out vec4 frag_color;\n"
@@ -121,7 +133,7 @@ static const char *fshader_src =
 	"}\n";
 
 static const char *masked_fshader_src =
-	"#version 150\n"
+	"#version 130\n"
 	"uniform sampler2D image;\n"
 	"uniform sampler2D mask;\n"
 	"in vec2 texcoord;\n"
@@ -411,6 +423,8 @@ void update_window_mask(Compositor *compositor, CompositedWindow *window)
 		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;
@@ -506,6 +520,7 @@ CompositedWindow *add_window(Compositor *compositor, CompositedScreen *screen, W
 
 	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);
@@ -582,6 +597,48 @@ CompositedScreen *find_screen_by_root(Compositor *compositor, Window root)
 	return NULL;
 }
 
+void create_geometry_correction(CompositedMonitor *monitor)
+{
+	unsigned buffers[2];
+	unsigned stride;
+
+	glGenBuffers(2, buffers);
+	monitor->vertex_buffer = buffers[0];
+	monitor->index_buffer = buffers[1];
+
+	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)
 {
 	unsigned t;
@@ -591,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;
@@ -606,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;
@@ -633,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)
 		{
@@ -691,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];
 
@@ -704,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;
 	}
 
@@ -716,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;
 }
@@ -753,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;
@@ -781,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;
 
@@ -791,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);
@@ -814,22 +951,34 @@ void update_root_pixmap(Compositor *compositor, CompositedScreen *screen)
 	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 = 0;
-		if(screen->root_glx_pixmap)
-		{
-			glXDestroyPixmap(compositor->display, screen->root_glx_pixmap);
-			screen->root_glx_pixmap = 0;
-		}
+		screen->root_pixmap = None;
 		return;
 	}
 
 	screen->root_pixmap = pixmap[0];
-	screen->root_glx_pixmap = pixmap_to_glx_pixmap(compositor, screen, screen->root_pixmap);
+	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);
 }
@@ -860,6 +1009,7 @@ 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);
 
@@ -878,6 +1028,10 @@ 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);
@@ -940,7 +1094,7 @@ int initialize_compositor(Compositor *compositor)
 	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");
@@ -952,8 +1106,9 @@ int initialize_compositor(Compositor *compositor)
 	compositor->glXReleaseTexImageEXT = (PFNGLXRELEASETEXIMAGEEXTPROC)glXGetProcAddress((unsigned char *)"glXReleaseTexImageEXT");
 
 	compositor->root_pmap_atom = XInternAtom(compositor->display, "_XROOTPMAP_ID", False);
-	compositor->correction_atom = XInternAtom(compositor->display, "GEOMETRY_CORRECTION", False);
-	compositor->monitors_atom = XInternAtom(compositor->display, "GEOMETRY_CORRECTION_MONITORS", 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));
@@ -961,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;
@@ -988,13 +1146,12 @@ 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);
@@ -1004,7 +1161,7 @@ void shutdown_screen(Compositor *compositor, CompositedScreen *screen)
 	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);
@@ -1023,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);
 }
 
@@ -1122,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;
@@ -1145,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)
@@ -1181,6 +1385,14 @@ void process_shape_event(Compositor *compositor, XShapeEvent *event)
 	}
 }
 
+void process_randr_event(Compositor *compositor, XRRScreenChangeNotifyEvent *event)
+{
+	CompositedScreen *screen;
+
+	if((screen = find_screen_by_root(compositor, event->root)))
+		update_monitors(compositor, screen);
+}
+
 void process_events(Compositor *compositor)
 {
 	int pending;
@@ -1219,13 +1431,16 @@ void process_events(Compositor *compositor)
 		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
-				printf("Event %d\n", event.type);
+			else if(event.type==compositor->randr_event+RRScreenChangeNotify)
+				process_randr_event(compositor, (XRRScreenChangeNotifyEvent *)&event);
 		}
 	}
 }
@@ -1242,6 +1457,7 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen)
 
 	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);