X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmain.c;h=1cabcf637dc992dd14dcf71656795e371e218c5a;hb=574302ed0fced0d57233c4517d414b4c3e875d7d;hp=f4704aead4e0aef22c003bd38cc1507fc7d9c85f;hpb=bd6748fb5beb9d2f5cb0dd62fce445fe73b4d10e;p=geometrycompositor.git diff --git a/source/main.c b/source/main.c index f4704ae..1cabcf6 100644 --- a/source/main.c +++ b/source/main.c @@ -3,10 +3,13 @@ #include #include #include +#include #include +#include #include #include #include +#include #include #include @@ -25,6 +28,25 @@ typedef struct CompositedWindow unsigned texture; } CompositedWindow; +typedef struct CompositedMonitor +{ + char *name; + int enabled; + int x; + int y; + unsigned width; + unsigned height; + float keystone_vertical; + float cylinder_depth; + float vertical_center; + float perspective; + unsigned vertex_buffer; + unsigned index_buffer; + unsigned vertex_array; + unsigned tessellation; + unsigned nelements; +} CompositedMonitor; + typedef struct CompositedScreen { int number; @@ -39,11 +61,15 @@ typedef struct CompositedScreen unsigned shaders[2]; unsigned program; unsigned geometry_loc; - unsigned vertex_buffer; - unsigned vertex_array; + unsigned window_vertex_buffer; + unsigned window_vertex_array; + unsigned framebuffer; + unsigned fb_texture; CompositedWindow *windows; unsigned nwindows; unsigned windows_capacity; + CompositedMonitor *monitors; + unsigned nmonitors; int dirty; } CompositedScreen; @@ -56,6 +82,8 @@ typedef struct Compositor PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB; PFNGLXBINDTEXIMAGEEXTPROC glXBindTexImageEXT; PFNGLXRELEASETEXIMAGEEXTPROC glXReleaseTexImageEXT; + Atom correction_atom; + Atom monitors_atom; int dirty; } Compositor; @@ -81,7 +109,7 @@ static const char *fshader = " frag_color = texture(image, texcoord);\n" "}\n"; -static const float vertices[] = +static const float window_vertices[] = { /* vertex texcoord */ 0.0f, 1.0f, 0.0f, 0.0f, @@ -144,7 +172,7 @@ int initialize_gl(Compositor *compositor, CompositedScreen *screen) attribs[i++] = GLX_CONTEXT_MAJOR_VERSION_ARB; attribs[i++] = 3; attribs[i++] = GLX_CONTEXT_MINOR_VERSION_ARB; - attribs[i++] = 0; + attribs[i++] = 1; attribs[i] = None; screen->glx_context = compositor->glXCreateContextAttribsARB(compositor->display, screen->fbconfig, NULL, True, attribs); @@ -230,13 +258,13 @@ int create_gl_resources(Compositor *compositor, CompositedScreen *screen) screen->geometry_loc = glGetUniformLocation(screen->program, "geometry"); - glGenBuffers(1, &screen->vertex_buffer); - glBindBuffer(GL_ARRAY_BUFFER, screen->vertex_buffer); - glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW); + glGenBuffers(1, &screen->window_vertex_buffer); + glBindBuffer(GL_ARRAY_BUFFER, screen->window_vertex_buffer); + glBufferData(GL_ARRAY_BUFFER, sizeof(window_vertices), window_vertices, GL_STATIC_DRAW); stride = 4*sizeof(float); - glGenVertexArrays(1, &screen->vertex_array); - glBindVertexArray(screen->vertex_array); + glGenVertexArrays(1, &screen->window_vertex_array); + glBindVertexArray(screen->window_vertex_array); glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, stride, NULL); glEnableVertexAttribArray(0); glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, stride, (void *)(2*sizeof(float))); @@ -245,6 +273,20 @@ 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); + 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); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, screen->framebuffer); + glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, screen->fb_texture, 0); + glDepthMask(GL_FALSE); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); + return 1; } @@ -414,6 +456,231 @@ CompositedScreen *find_screen_by_window(Compositor *compositor, Window w) return NULL; } +void update_monitor_vertices(CompositedScreen *screen, CompositedMonitor *monitor) +{ + unsigned t; + unsigned data_size; + float *vertex_data; + unsigned short *index_data; + unsigned x, y; + unsigned i; + float aspect; + float cyl_radius; + float cyl_arc; + float sin_ksv; + float cos_ksv; + float distance; + float eye[3]; + float look[3]; + + t = monitor->tessellation; + + data_size = (t+1)*(t+1)*4*sizeof(float); + vertex_data = (float *)malloc(data_size); + + aspect = (float)monitor->width/monitor->height; + + if(monitor->cylinder_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); + } + + 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; + + eye[0] = 0.0f; + eye[1] = (monitor->vertical_center-0.5f)/aspect+sin_ksv*distance; + eye[2] = cos_ksv*distance; + + look[0] = 0.0f; + look[1] = -sin_ksv; + look[2] = -cos_ksv; + + for(y=0; y<=t; ++y) + for(x=0; x<=t; ++x) + { + float *v; + + v = vertex_data+(y*(t+1)+x)*3; + v[0] = (float)x/t-0.5f; + v[1] = ((float)y/t-0.5f)/aspect; + v[2] = 0; + if(monitor->cylinder_depth) + { + v[2] = (1.0f-cos(v[0]*cyl_arc))*cyl_radius-monitor->cylinder_depth; + v[0] = sin(v[0]*cyl_arc)*cyl_radius; + } + } + + for(y=t; y<=t; --y) + for(x=t; x<=t; --x) + { + float *v; + float px, py, pz; + float scale; + + v = vertex_data+(y*(t+1)+x)*3; + px = v[0]-eye[0]; + py = (v[0]-eye[0])*look[0] - (v[1]-eye[1])*look[2] + (v[2]-eye[2])*look[1]; + pz = (v[0]-eye[0])*look[0] + (v[1]-eye[1])*look[1] + (v[2]-eye[2])*look[2]; + scale = monitor->perspective/pz; + + v = vertex_data+(y*(t+1)+x)*4; + v[0] = px*scale+0.5f; + v[1] = py*aspect*scale+monitor->vertical_center; + v[2] = (monitor->x+(float)x*monitor->width/t)/screen->width; + v[3] = 1.0f-(monitor->y+(1.0f-(float)y/t)*monitor->height)/screen->height; + } + + glBindBuffer(GL_ARRAY_BUFFER, monitor->vertex_buffer); + glBufferData(GL_ARRAY_BUFFER, data_size, vertex_data, GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); + free(vertex_data); + + monitor->nelements = t*((t+1)*2+1)-1; + data_size = monitor->nelements*sizeof(unsigned short); + index_data = (unsigned short *)malloc(data_size); + i = 0; + for(y=0; y0) + index_data[i++] = 0xFFFF; + for(x=0; x<=t; ++x) + { + index_data[i++] = (y+1)*(t+1)+x; + index_data[i++] = y*(t+1)+x; + } + } + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, monitor->index_buffer); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, data_size, index_data, GL_STATIC_DRAW); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + free(index_data); +} + +int initialize_monitor(Compositor *compositor, CompositedScreen *screen, XRRScreenResources *xrr_res, unsigned index) +{ + CompositedMonitor *monitor; + XRROutputInfo *output; + int namelen; + XRRCrtcInfo *crtc; + unsigned buffers[2]; + unsigned stride; + + monitor = &screen->monitors[index]; + + output = XRRGetOutputInfo(compositor->display, xrr_res, xrr_res->outputs[index]); + namelen = strlen(output->name); + monitor->name = (char *)malloc(namelen+1); + strcpy(monitor->name, output->name); + monitor->enabled = !!output->crtc; + if(!monitor->enabled) + { + XRRFreeOutputInfo(output); + return 1; + } + + 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); + + monitor->keystone_vertical = 0.0f; + monitor->cylinder_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; + 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; +} + +CompositedMonitor *find_monitor_by_name(CompositedScreen *screen, char *name) +{ + unsigned i; + + for(i=0; inmonitors; ++i) + if(!strcmp(screen->monitors[i].name, name)) + return &screen->monitors[i]; + + return NULL; +} + +void update_geometry_correction(Compositor *compositor, CompositedScreen *screen) +{ + Atom prop_type; + int prop_format; + unsigned long overflow; + unsigned long names_length; + char *names; + unsigned long values_length; + short *values; + char *name_ptr; + unsigned i; + + XGetWindowProperty(compositor->display, screen->root, compositor->monitors_atom, 0, 64, False, XA_STRING, + &prop_type, &prop_format, &names_length, &overflow, (unsigned char **)&names); + if(prop_type!=XA_STRING || prop_format!=8) + return; + + XGetWindowProperty(compositor->display, screen->root, compositor->correction_atom, 0, 64, False, XA_INTEGER, + &prop_type, &prop_format, &values_length, &overflow, (unsigned char **)&values); + if(prop_type!=XA_INTEGER || prop_format!=16) + { + XFree(names); + return; + } + + use_gl(compositor, screen); + + name_ptr = names; + for(i=0; i*4=names+names_length) + break; + + 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; + + if(monitor->enabled) + update_monitor_vertices(screen, monitor); + } + + name_ptr += strlen(name_ptr)+1; + } + + XFree(names); + XFree(values); +} + int initialize_screen(Compositor *compositor, unsigned number) { CompositedScreen *screen; @@ -422,6 +689,7 @@ int initialize_screen(Compositor *compositor, unsigned number) int x, y; unsigned border; unsigned depth; + XRRScreenResources *xrr_res; Window dummy_parent; Window *children; unsigned nchildren; @@ -437,7 +705,7 @@ int initialize_screen(Compositor *compositor, unsigned number) return with_error("GLX_EXT_texture_from_pixmap is required"); screen->root = RootWindow(compositor->display, screen->number); - XSelectInput(compositor->display, screen->root, SubstructureNotifyMask); + XSelectInput(compositor->display, screen->root, SubstructureNotifyMask|PropertyChangeMask); screen->overlay = XCompositeGetOverlayWindow(compositor->display, screen->root); 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); @@ -448,6 +716,16 @@ int initialize_screen(Compositor *compositor, unsigned number) if(!create_gl_resources(compositor, screen)) return 0; + xrr_res = XRRGetScreenResources(compositor->display, screen->root); + screen->nmonitors = xrr_res->noutput; + screen->monitors = (CompositedMonitor *)malloc(screen->nmonitors*sizeof(CompositedMonitor)); + for(i=0; inmonitors; ++i) + if(!initialize_monitor(compositor, screen, xrr_res, i)) + return 0; + XRRFreeScreenResources(xrr_res); + + update_geometry_correction(compositor, screen); + XQueryTree(compositor->display, screen->root, &dummy_root, &dummy_parent, &children, &nchildren); screen->windows = (CompositedWindow *)malloc(nchildren*sizeof(CompositedWindow)); @@ -506,10 +784,20 @@ 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)) + 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"); + else if(major_ver<1 || (major_ver==1 && minor_ver<2)) + return with_error("XRandR 1.2 or later is required"); + compositor->glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)glXGetProcAddress((unsigned char *)"glXCreateContextAttribsARB"); 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->nscreens = ScreenCount(compositor->display); compositor->screens = (CompositedScreen *)malloc(compositor->nscreens*sizeof(CompositedScreen)); for(i=0; inscreens; ++i) @@ -538,6 +826,25 @@ void shutdown_screen(Compositor *compositor, CompositedScreen *screen) } } + for(i=0; inmonitors; ++i) + { + 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); + } + } + + 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]); + glXMakeContextCurrent(compositor->display, 0, 0, NULL); glXDestroyContext(compositor->display, screen->glx_context); glXDestroyWindow(compositor->display, screen->glx_window); @@ -546,6 +853,7 @@ void shutdown_screen(Compositor *compositor, CompositedScreen *screen) XCompositeReleaseOverlayWindow(compositor->display, screen->overlay); free(screen->windows); + free(screen->monitors); } void shutdown_compositor(Compositor *compositor) @@ -567,11 +875,10 @@ 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) @@ -579,13 +886,9 @@ void process_destroy_window_event(Compositor *compositor, XDestroyWindowEvent *e CompositedScreen *screen; CompositedWindow *window; - screen = find_screen_by_root(compositor, event->event); - if(!screen) - return; - - 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) @@ -675,6 +978,20 @@ void process_configure_event(Compositor *compositor, XConfigureEvent *event) mark_dirty(compositor, screen); } +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); +} + void process_damage_event(Compositor *compositor, XDamageNotifyEvent *event) { CompositedScreen *screen; @@ -720,6 +1037,9 @@ int process_event(Compositor *compositor) 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); @@ -730,39 +1050,72 @@ 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; inscreens; ++i) + use_gl(compositor, screen); + + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, screen->framebuffer); + + glClearColor(0.5f, 0.5f, 0.5f, 0.0f); + glClear(GL_COLOR_BUFFER_BIT); + + glUseProgram(screen->program); + glBindVertexArray(screen->window_vertex_array); + for(i=0; inwindows; ++i) { - CompositedScreen *screen = &compositor->screens[i]; - if(!screen->dirty) + CompositedWindow *window = &screen->windows[i]; + if(window->map_state!=IsViewable) continue; - use_gl(compositor, screen); + 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, 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); + 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); + 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); - glUseProgram(screen->program); - glBindVertexArray(screen->vertex_array); - for(j=0; jnwindows; ++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); + for(i=0; inmonitors; ++i) + { + CompositedMonitor *monitor = &screen->monitors[i]; + if(!monitor->enabled) + continue; + + glUniform4f(screen->geometry_loc, + (float)monitor->x/screen->width, 1.0f-(float)(monitor->y+monitor->height)/screen->height, + (float)monitor->width/screen->width, (float)monitor->height/screen->height); + + glBindVertexArray(monitor->vertex_array); + glDrawElements(GL_TRIANGLE_STRIP, monitor->nelements, GL_UNSIGNED_SHORT, NULL); + } + + glBindVertexArray(0); - screen->dirty = 0; + glXSwapBuffers(compositor->display, screen->glx_window); + + screen->dirty = 0; +} + +void refresh_all_screens(Compositor *compositor) +{ + unsigned i; + + for(i=0; inscreens; ++i) + { + CompositedScreen *screen = &compositor->screens[i]; + if(screen->dirty) + refresh_screen(compositor, screen); } compositor->dirty = 0; @@ -787,7 +1140,7 @@ int main() while(!terminate_requested) { if(!process_event(&compositor)) - refresh_screens(&compositor); + refresh_all_screens(&compositor); } shutdown_compositor(&compositor);