X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmain.c;h=2d5dd9186e8f890175b5acae7006390bd3e71dfd;hb=e4d258345d33560b0e8fd176526d81f4d9b11cb7;hp=6f35c9849655d2bd6414e5fd074430e79cf45bf9;hpb=110b5a3a1850d4ff5d9f4426172a7df048cacdda;p=geometrycompositor.git diff --git a/source/main.c b/source/main.c index 6f35c98..2d5dd91 100644 --- a/source/main.c +++ b/source/main.c @@ -25,9 +25,11 @@ 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 @@ -69,6 +71,9 @@ typedef struct CompositedScreen 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; @@ -87,6 +92,7 @@ typedef struct Compositor PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB; PFNGLXBINDTEXIMAGEEXTPROC glXBindTexImageEXT; PFNGLXRELEASETEXIMAGEEXTPROC glXReleaseTexImageEXT; + Atom root_pmap_atom; Atom correction_atom; Atom monitors_atom; int dirty; @@ -269,13 +275,11 @@ unsigned create_2d_texture() return texture; } -int create_gl_resources(Compositor *compositor, CompositedScreen *screen) +int create_gl_resources(CompositedScreen *screen) { unsigned stride; int loc; - use_gl(compositor, screen); - 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); @@ -325,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; } @@ -357,17 +363,11 @@ CompositedWindow *find_window_global(Compositor *compositor, Window w, Composite return NULL; } -void create_window_pixmap(Compositor *compositor, CompositedScreen *screen, CompositedWindow *window) +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; @@ -375,8 +375,20 @@ 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) @@ -446,6 +458,8 @@ void update_window_mask(Compositor *compositor, CompositedWindow *window) 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) @@ -488,14 +502,11 @@ 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); window->texture = create_2d_texture(); window->mask_texture = create_2d_texture(); - - if(window->map_state==IsViewable) - update_window_mask(compositor, window); + window->recreate_mask = (window->map_state==IsViewable); XShapeSelectInput(compositor->display, window->window, ShapeNotifyMask); @@ -796,6 +807,33 @@ 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; + + 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; + } + return; + } + + screen->root_pixmap = pixmap[0]; + screen->root_glx_pixmap = pixmap_to_glx_pixmap(compositor, screen, screen->root_pixmap); + + XFree(pixmap); +} + int initialize_screen(Compositor *compositor, unsigned number) { CompositedScreen *screen; @@ -828,7 +866,9 @@ 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); @@ -840,6 +880,7 @@ int initialize_screen(Compositor *compositor, unsigned number) XRRFreeScreenResources(xrr_res); update_geometry_correction(compositor, screen); + update_root_pixmap(compositor, screen); XQueryTree(compositor->display, screen->root, &dummy_root, &dummy_parent, &children, &nchildren); @@ -910,6 +951,7 @@ 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); @@ -1005,7 +1047,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) @@ -1022,8 +1067,8 @@ void process_map_event(Compositor *compositor, XMapEvent *event) return; window->map_state = IsViewable; - create_window_pixmap(compositor, screen, window); - update_window_mask(compositor, window); + window->recreate_pixmap = 1; + window->recreate_mask = 1; mark_dirty(compositor, screen); } @@ -1088,7 +1133,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); @@ -1131,7 +1176,7 @@ void process_shape_event(Compositor *compositor, XShapeEvent *event) window = find_window_global(compositor, event->window, &screen); if(window && window->map_state==IsViewable) { - update_window_mask(compositor, window); + window->recreate_mask = 1; mark_dirty(compositor, screen); } } @@ -1190,15 +1235,32 @@ 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); - 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; @@ -1220,7 +1282,10 @@ void refresh_screen(Compositor *compositor, CompositedScreen *screen) glActiveTexture(GL_TEXTURE0); } - XDamageSubtract(compositor->display, window->damage, None, None); + 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); @@ -1232,7 +1297,6 @@ 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);