X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmain.c;h=23c061b86fc3a5557dfba3b2266499f29b36ef1c;hb=6f6754fda1a75575ac37ee685f24d585369d9fde;hp=13038c29ef83f6b8292a6e970edd06225c4de652;hpb=03938166b24208348b4ea25600b4d06c8fd2400a;p=geometrycompositor.git diff --git a/source/main.c b/source/main.c index 13038c2..23c061b 100644 --- a/source/main.c +++ b/source/main.c @@ -3,7 +3,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -23,16 +25,25 @@ 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; 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; @@ -51,13 +62,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; @@ -72,13 +88,17 @@ typedef struct Compositor CompositedScreen *screens; unsigned nscreens; int damage_event; + int shape_event; PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB; PFNGLXBINDTEXIMAGEEXTPROC glXBindTexImageEXT; PFNGLXRELEASETEXIMAGEEXTPROC glXReleaseTexImageEXT; + Atom root_pmap_atom; + Atom correction_atom; + Atom monitors_atom; int dirty; } Compositor; -static const char *vshader = +static const char *vshader_src = "#version 150\n" "uniform vec4 geometry;\n" "in vec2 vertex;\n" @@ -90,14 +110,27 @@ static const char *vshader = " texcoord = texture_coord;\n" "}\n"; -static const char *fshader = +static const char *fshader_src = "#version 150\n" "uniform sampler2D image;\n" "in vec2 texcoord;\n" "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 = + "#version 150\n" + "uniform sampler2D image;\n" + "uniform sampler2D mask;\n" + "in vec2 texcoord;\n" + "out vec4 frag_color;\n" + "void main()\n" + "{\n" + " if(texture(mask, texcoord).r==0.0)\n" + " discard;\n" + " frag_color = texture(image, texcoord);\n" "}\n"; static const float window_vertices[] = @@ -202,17 +235,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; ishaders[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); @@ -264,12 +319,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); @@ -278,6 +329,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; } @@ -292,17 +345,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; inscreens; ++i) + for(j=0; jscreens[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; @@ -310,8 +375,91 @@ 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); + + 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; iborder; + 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; ymask_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) @@ -354,14 +502,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; } @@ -435,18 +583,6 @@ CompositedScreen *find_screen_by_root(Compositor *compositor, Window root) return NULL; } -CompositedScreen *find_screen_by_window(Compositor *compositor, Window w) -{ - unsigned i, j; - - for(i=0; inscreens; ++i) - for(j=0; jscreens[i].nwindows; ++j) - if(compositor->screens[i].windows[j].window==w) - return &compositor->screens[i]; - - return NULL; -} - void update_monitor_vertices(CompositedScreen *screen, CompositedMonitor *monitor) { unsigned t; @@ -455,25 +591,76 @@ void update_monitor_vertices(CompositedScreen *screen, CompositedMonitor *monito 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 xf, yf; float *v; - xf = (float)x/t; - yf = (float)y/t; + 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] = xf; - v[1] = yf; - v[2] = (monitor->x+xf*monitor->width)/screen->width; - v[3] = (monitor->y+yf*monitor->height)/screen->height; + 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); @@ -499,14 +686,21 @@ void update_monitor_vertices(CompositedScreen *screen, CompositedMonitor *monito free(index_data); } -int initialize_monitor(Compositor *compositor, CompositedScreen *screen, CompositedMonitor *monitor, XRRScreenResources *xrr_res, unsigned index) +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) { @@ -522,11 +716,16 @@ int initialize_monitor(Compositor *compositor, CompositedScreen *screen, Composi 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 = 20; + monitor->tessellation = 50; update_monitor_vertices(screen, monitor); stride = 4*sizeof(float); @@ -544,6 +743,110 @@ int initialize_monitor(Compositor *compositor, CompositedScreen *screen, Composi 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); +} + +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 = 0; + } + + 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; + 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; @@ -568,7 +871,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); @@ -576,17 +879,25 @@ int initialize_screen(Compositor *compositor, unsigned number) 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); screen->nmonitors = xrr_res->noutput; screen->monitors = (CompositedMonitor *)malloc(screen->nmonitors*sizeof(CompositedMonitor)); for(i=0; inmonitors; ++i) - if(!initialize_monitor(compositor, screen, &screen->monitors[i], xrr_res, i)) + if(!initialize_monitor(compositor, screen, xrr_res, i)) return 0; XRRFreeScreenResources(xrr_res); + screen->root_pixmap = 0; + screen->root_glx_pixmap = 0; + + update_geometry_correction(compositor, screen); + update_root_pixmap(compositor, screen); + XQueryTree(compositor->display, screen->root, &dummy_root, &dummy_parent, &children, &nchildren); screen->windows = (CompositedWindow *)malloc(nchildren*sizeof(CompositedWindow)); @@ -638,7 +949,7 @@ 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"); @@ -656,6 +967,10 @@ int initialize_compositor(Compositor *compositor) compositor->glXBindTexImageEXT = (PFNGLXBINDTEXIMAGEEXTPROC)glXGetProcAddress((unsigned char *)"glXBindTexImageEXT"); 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->nscreens = ScreenCount(compositor->display); compositor->screens = (CompositedScreen *)malloc(compositor->nscreens*sizeof(CompositedScreen)); for(i=0; inscreens; ++i) @@ -676,6 +991,7 @@ void shutdown_screen(Compositor *compositor, CompositedScreen *screen) for(i=0; inwindows; ++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); @@ -685,20 +1001,27 @@ 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); } + } + + 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); glXDestroyContext(compositor->display, screen->glx_context); @@ -743,7 +1066,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) @@ -760,7 +1086,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); } @@ -825,7 +1152,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); @@ -833,96 +1160,168 @@ void process_configure_event(Compositor *compositor, XConfigureEvent *event) mark_dirty(compositor, screen); } +void process_property_event(Compositor *compositor, XPropertyEvent *event) +{ + CompositedScreen *screen; + + screen = find_screen_by_root(compositor, event->window); + if(!screen) + return; + + 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_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); + } } -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; - 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; + 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) { unsigned i; + int use_mask; + + for(i=0; inwindows; ++i) + if(screen->windows[i].map_state==IsViewable) + XDamageSubtract(compositor->display, screen->windows[i].damage, None, None); + glXWaitX(); use_gl(compositor, screen); + 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; inwindows; ++i) { - CompositedWindow *window = &screen->windows[i]; + CompositedWindow *window; + + window = &screen->windows[i]; if(window->map_state!=IsViewable) continue; + 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, - (float)window->x/screen->width, ((float)screen->height-window->y-window->height)/screen->height, + 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); compositor->glXReleaseTexImageEXT(compositor->display, window->glx_pixmap, GLX_FRONT_LEFT_EXT); - XDamageSubtract(compositor->display, window->damage, None, None); } 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; inmonitors; ++i) { @@ -931,13 +1330,15 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen) continue; glUniform4f(screen->geometry_loc, - (float)monitor->x/screen->width, (float)monitor->y/screen->height, + (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); + glXSwapBuffers(compositor->display, screen->glx_window); screen->dirty = 0; @@ -975,7 +1376,8 @@ int main() while(!terminate_requested) { - if(!process_event(&compositor)) + process_events(&compositor); + if(compositor.dirty && !terminate_requested) refresh_all_screens(&compositor); }