X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmain.c;h=c0bbe0e20c8d0d711242216e36a706d4b013eb8e;hb=a51a8bbe15114abe6accf1c0f63f9fcb2b97767e;hp=b26c46597beb22008963c5f01758aa96162ef73b;hpb=5851b1094d7b099adcfda16606f0e3e6979719d6;p=geometrycompositor.git

diff --git a/source/main.c b/source/main.c
index b26c465..c0bbe0e 100644
--- a/source/main.c
+++ b/source/main.c
@@ -63,29 +63,31 @@ static const char *vshader =
 	"#version 150\n"
 	"uniform vec4 geometry;\n"
 	"in vec2 vertex;\n"
+	"in vec2 texture_coord;\n"
 	"out vec2 texcoord;\n"
 	"void main()\n"
 	"{\n"
 	"  gl_Position = vec4((geometry.xy+vertex*geometry.zw)*2.0-1.0, 0.0, 1.0);\n"
-	"  texcoord = vec2(vertex.x, 1.0-vertex.y);\n"
+	"  texcoord = texture_coord;\n"
 	"}\n";
 
 static const char *fshader =
 	"#version 150\n"
-	"uniform sampler2D window;\n"
+	"uniform sampler2D image;\n"
 	"in vec2 texcoord;\n"
 	"out vec4 frag_color;\n"
 	"void main()\n"
 	"{\n"
-	"	frag_color = texture(window, texcoord);\n"
+	"	frag_color = texture(image, texcoord);\n"
 	"}\n";
 
 static const float vertices[] =
 {
-	0.0f, 1.0f,
-	0.0f, 0.0f,
-	1.0f, 1.0f,
-	1.0f, 0.0f
+	/* vertex    texcoord */
+	0.0f, 1.0f,  0.0f, 0.0f,
+	0.0f, 0.0f,  0.0f, 1.0f,
+	1.0f, 1.0f,  1.0f, 0.0f,
+	1.0f, 0.0f,  1.0f, 1.0f
 };
 
 int terminate_requested = 0;
@@ -181,12 +183,40 @@ unsigned compile_shader(GLenum type, const char *source)
 	return shader;
 }
 
-int create_gl_resources(Compositor *compositor, CompositedScreen *screen)
+unsigned link_program(unsigned *shaders, unsigned nshaders)
 {
+	unsigned program;
+	unsigned i;
 	int status;
 	char info_log[1024];
 	GLsizei length;
 
+	program = glCreateProgram();
+	for(i=0; i<nshaders; ++i)
+		glAttachShader(program, shaders[i]);
+	glBindAttribLocation(program, 0, "vertex");
+	glBindAttribLocation(program, 1, "texture_coord");
+	glBindFragDataLocation(program, 0, "frag_color");
+	glLinkProgram(program);
+
+	glGetProgramiv(program, GL_LINK_STATUS, &status);
+	glGetProgramInfoLog(program, sizeof(info_log), &length, info_log);
+	if(!status)
+	{
+		fprintf(stderr, "Program link failed:\n%s\n", info_log);
+		glDeleteProgram(program);
+		return 0;
+	}
+	else if(length)
+		printf("Program info log:\n%s\n", info_log);
+
+	return program;
+}
+
+int create_gl_resources(Compositor *compositor, CompositedScreen *screen)
+{
+	unsigned stride;
+
 	use_gl(compositor, screen);
 
 	screen->shaders[0] = compile_shader(GL_VERTEX_SHADER, vshader);
@@ -194,33 +224,24 @@ int create_gl_resources(Compositor *compositor, CompositedScreen *screen)
 	if(!screen->shaders[0] || !screen->shaders[1])
 		return 0;
 
-	screen->program = glCreateProgram();
-	glAttachShader(screen->program, screen->shaders[0]);
-	glAttachShader(screen->program, screen->shaders[1]);
-	glBindAttribLocation(screen->program, 0, "vertex");
-	glLinkProgram(screen->program);
+	screen->program = link_program(screen->shaders, 2);
+	if(!screen->program)
+		return 0;
 
 	screen->geometry_loc = glGetUniformLocation(screen->program, "geometry");
 
-	glGetProgramiv(screen->program, GL_LINK_STATUS, &status);
-	glGetProgramInfoLog(screen->program, sizeof(info_log), &length, info_log);
-	if(!status)
-	{
-		fprintf(stderr, "Program link failed:\n%s\n", info_log);
-		glDeleteProgram(screen->program);
-		return 0;
-	}
-	else if(length)
-		printf("Program info log:\n%s\n", info_log);
-
 	glGenBuffers(1, &screen->vertex_buffer);
 	glBindBuffer(GL_ARRAY_BUFFER, screen->vertex_buffer);
 	glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
 
+	stride = 4*sizeof(float);
 	glGenVertexArrays(1, &screen->vertex_array);
 	glBindVertexArray(screen->vertex_array);
-	glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, NULL);
+	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);
+	glBindVertexArray(0);
 
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 
@@ -333,6 +354,43 @@ void remove_window(Compositor *compositor, CompositedScreen *screen, CompositedW
 		screen->windows[i] = screen->windows[i+1];
 }
 
+CompositedWindow *reorder_window(CompositedScreen *screen, CompositedWindow *window, Window above)
+{
+	unsigned i, j;
+	CompositedWindow hold;
+
+	i = window-screen->windows;
+	if(above)
+	{
+		for(j=0; j<screen->nwindows; ++j)
+			if(screen->windows[j].window==above)
+				break;
+
+		if(j>=screen->nwindows || i==j+1)
+			return window;
+
+		if(j<i)
+			++j;
+	}
+	else
+		j = 0;
+
+	hold = *window;
+	if(i<j)
+	{
+		for(; i<j; ++i)
+			screen->windows[i] = screen->windows[i+1];
+	}
+	else
+	{
+		for(; i>j; --i)
+			screen->windows[i] = screen->windows[i-1];
+	}
+	screen->windows[j] = hold;
+
+	return &screen->windows[j];
+}
+
 CompositedScreen *find_screen_by_root(Compositor *compositor, Window root)
 {
 	unsigned i;
@@ -509,31 +567,32 @@ void mark_dirty(Compositor *compositor, CompositedScreen *screen)
 
 void process_create_window_event(Compositor *compositor, XCreateWindowEvent *event)
 {
-	CompositedScreen *screen = find_screen_by_root(compositor, event->parent);
-	if(!screen)
-		return;
+	CompositedScreen *screen;
 
-	add_window(compositor, screen, event->window);
+	if((screen = find_screen_by_root(compositor, event->parent)))
+		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;
+	CompositedScreen *screen;
+	CompositedWindow *window;
 
-	CompositedWindow *window = find_window(screen, event->window);
-	if(window)
-		remove_window(compositor, screen, window, 1);
+	if((screen = find_screen_by_root(compositor, event->event)))
+		if((window = find_window(screen, event->window)))
+			remove_window(compositor, screen, window, 1);
 }
 
 void process_map_event(Compositor *compositor, XMapEvent *event)
 {
-	CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	screen = find_screen_by_root(compositor, event->event);
 	if(!screen)
 		return;
 
-	CompositedWindow *window = find_window(screen, event->window);
+	window = find_window(screen, event->window);
 	if(!window)
 		return;
 
@@ -545,11 +604,14 @@ void process_map_event(Compositor *compositor, XMapEvent *event)
 
 void process_unmap_event(Compositor *compositor, XUnmapEvent *event)
 {
-	CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	screen = find_screen_by_root(compositor, event->event);
 	if(!screen)
 		return;
 
-	CompositedWindow *window = find_window(screen, event->window);
+	window = find_window(screen, event->window);
 	if(window)
 		window->map_state = IsUnviewable;
 
@@ -558,11 +620,13 @@ void process_unmap_event(Compositor *compositor, XUnmapEvent *event)
 
 void process_reparent_event(Compositor *compositor, XReparentEvent *event)
 {
-	CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	screen = find_screen_by_root(compositor, event->event);
 	if(!screen)
 		return;
 
-	CompositedWindow *window;
 	if(event->parent==screen->root)
 		window = add_window(compositor, screen, event->window);
 	else
@@ -578,13 +642,44 @@ void process_reparent_event(Compositor *compositor, XReparentEvent *event)
 		mark_dirty(compositor, screen);
 }
 
+void process_configure_event(Compositor *compositor, XConfigureEvent *event)
+{
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	screen = find_screen_by_root(compositor, event->event);
+	if(!screen)
+		return;
+
+	window = find_window(screen, event->window);
+	if(!window)
+		return;
+
+	window->x = event->x;
+	window->y = event->y;
+	if((unsigned)event->width!=window->width || (unsigned)event->height!=window->height || (unsigned)event->border_width!=window->border)
+	{
+		window->width = event->width;
+		window->height = event->height;
+		window->border = event->border_width;
+		create_window_pixmap(compositor, screen, window);
+	}
+	reorder_window(screen, window, event->above);
+
+	if(window->map_state==IsViewable)
+		mark_dirty(compositor, screen);
+}
+
 void process_damage_event(Compositor *compositor, XDamageNotifyEvent *event)
 {
-	CompositedScreen *screen = find_screen_by_window(compositor, event->drawable);
+	CompositedScreen *screen;
+	CompositedWindow *window;
+
+	screen = find_screen_by_window(compositor, event->drawable);
 	if(!screen)
 		return;
 
-	CompositedWindow *window = find_window(screen, event->drawable);
+	window = find_window(screen, event->drawable);
 	if(window->map_state==IsViewable)
 		mark_dirty(compositor, screen);
 }
@@ -617,6 +712,9 @@ int process_event(Compositor *compositor)
 	case ReparentNotify:
 		process_reparent_event(compositor, &event.xreparent);
 		break;
+	case ConfigureNotify:
+		process_configure_event(compositor, &event.xconfigure);
+		break;
 	default:
 		if(event.type==compositor->damage_event+XDamageNotify)
 			process_damage_event(compositor, (XDamageNotifyEvent *)&event);
@@ -627,36 +725,47 @@ int process_event(Compositor *compositor)
 	return 1;
 }
 
-void refresh_screens(Compositor *compositor)
+void refresh_screen(Compositor *compositor, CompositedScreen *screen)
 {
-	unsigned i, j;
+	unsigned i;
 
-	for(i=0; i<compositor->nscreens; ++i)
+	use_gl(compositor, screen);
+
+	glClearColor(0.5f, 0.5f, 0.5f, 0.0f);
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	glUseProgram(screen->program);
+	glBindVertexArray(screen->vertex_array);
+	for(i=0; i<screen->nwindows; ++i)
 	{
-		CompositedScreen *screen = &compositor->screens[i];
-		use_gl(compositor, screen);
+		CompositedWindow *window = &screen->windows[i];
+		if(window->map_state!=IsViewable)
+			continue;
+
+		glBindTexture(GL_TEXTURE_2D, window->texture);
+		compositor->glXBindTexImageEXT(compositor->display, window->glx_pixmap, GLX_FRONT_LEFT_EXT, NULL);
+		glUniform4f(screen->geometry_loc,
+			(float)window->x/screen->width, (float)(screen->height-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);
+		compositor->glXReleaseTexImageEXT(compositor->display, window->glx_pixmap, GLX_FRONT_LEFT_EXT);
+		XDamageSubtract(compositor->display, window->damage, None, None);
+	}
 
-		glClearColor(0.5f, 0.5f, 0.5f, 0.0f);
-		glClear(GL_COLOR_BUFFER_BIT);
+	glXSwapBuffers(compositor->display, screen->glx_window);
 
-		glUseProgram(screen->program);
-		glBindVertexArray(screen->vertex_array);
-		for(j=0; j<screen->nwindows; ++j)
-		{
-			CompositedWindow *window = &screen->windows[j];
-			if(window->map_state==IsViewable)
-			{
-				glBindTexture(GL_TEXTURE_2D, window->texture);
-				compositor->glXBindTexImageEXT(compositor->display, window->glx_pixmap, GLX_FRONT_LEFT_EXT, NULL);
-				glUniform4f(screen->geometry_loc, (float)window->x/screen->width, (float)(screen->height-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);
-				compositor->glXReleaseTexImageEXT(compositor->display, window->glx_pixmap, GLX_FRONT_LEFT_EXT);
-				XDamageSubtract(compositor->display, window->damage, None, None);
-			}
-		}
-		glXSwapBuffers(compositor->display, screen->glx_window);
+	screen->dirty = 0;
+}
 
-		screen->dirty = 0;
+void refresh_all_screens(Compositor *compositor)
+{
+	unsigned i;
+
+	for(i=0; i<compositor->nscreens; ++i)
+	{
+		CompositedScreen *screen = &compositor->screens[i];
+		if(screen->dirty)
+			refresh_screen(compositor, screen);
 	}
 
 	compositor->dirty = 0;
@@ -681,7 +790,7 @@ int main()
 	while(!terminate_requested)
 	{
 		if(!process_event(&compositor))
-			refresh_screens(&compositor);
+			refresh_all_screens(&compositor);
 	}
 
 	shutdown_compositor(&compositor);