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);
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);
}
return 0;
XRRFreeScreenResources(xrr_res);
+ screen->root_pixmap = None;
+ screen->root_glx_pixmap = None;
+
update_geometry_correction(compositor, screen);
update_root_pixmap(compositor, screen);
}
}
+ 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);
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);
{
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_damage_event(Compositor *compositor, XDamageNotifyEvent *event)
use_gl(compositor, screen);
+ glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, screen->framebuffer);
use_mask = -1;
compositor->glXReleaseTexImageEXT(compositor->display, screen->root_glx_pixmap, GLX_FRONT_LEFT_EXT);
}
else
- {
- glClearColor(0.5f, 0.5f, 0.5f, 0.0f);
glClear(GL_COLOR_BUFFER_BIT);
- }
for(i=0; i<screen->nwindows; ++i)
{
}
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);