X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmain.c;h=9865eb9ac7c7f84d2104c423e41f31614b4ab6fb;hb=b7cfb7990668847fd2aa3095d803560d4482ff51;hp=3f788848c119c6b230185a3878652566dd7214fd;hpb=ce67a9ea6b3bbce18ea80a238fa2104afaa3971c;p=geometrycompositor.git diff --git a/source/main.c b/source/main.c index 3f78884..9865eb9 100644 --- a/source/main.c +++ b/source/main.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -16,6 +17,7 @@ typedef struct CompositedWindow int y; unsigned width; unsigned height; + unsigned border; int map_state; Damage damage; Pixmap pixmap; @@ -86,6 +88,15 @@ static const float vertices[] = 1.0f, 0.0f }; +int terminate_requested = 0; + +int x_error_handler(Display *display, XErrorEvent *event) +{ + printf("Ignoring X error %d on resource %lx\n", event->error_code, event->resourceid); + (void)display; + return 0; +} + int with_error(const char *message) { fprintf(stderr, "%s\n", message); @@ -257,7 +268,11 @@ void add_window(Compositor *compositor, CompositedScreen *screen, Window w) if(w==screen->root || w==screen->overlay) return; - XGetWindowAttributes(compositor->display, w, &win_attr); + if(!XGetWindowAttributes(compositor->display, w, &win_attr)) + { + printf("XGetWindowAttributes failed; probably the window was already destroyed\n"); + return; + } if(win_attr.class==InputOnly) return; @@ -277,6 +292,7 @@ void add_window(Compositor *compositor, CompositedScreen *screen, Window w) window->y = win_attr.y; window->width = win_attr.width; window->height = win_attr.height; + window->border = win_attr.border_width; window->map_state = win_attr.map_state; window->damage = XDamageCreate(compositor->display, window->window, XDamageReportNonEmpty); @@ -294,6 +310,21 @@ void add_window(Compositor *compositor, CompositedScreen *screen, Window w) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); } +void remove_window(CompositedScreen *screen, Window w) +{ + unsigned i; + + for(i=0; inwindows; ++i) + if(screen->windows[i].window==w) + { + glDeleteTextures(1, &screen->windows[i].texture); + + --screen->nwindows; + for(; inwindows; ++i) + screen->windows[i] = screen->windows[i+1]; + } +} + CompositedScreen *find_screen_by_root(Compositor *compositor, Window root) { unsigned i; @@ -362,6 +393,8 @@ int initialize_screen(Compositor *compositor, unsigned number) XFree(children); + screen->dirty = 1; + return 1; } @@ -377,6 +410,8 @@ int initialize_compositor(Compositor *compositor) if(!compositor->display) return with_error("Could not open X display"); + XSetErrorHandler(&x_error_handler); + if(!XCompositeQueryExtension(compositor->display, &event_base, &error_base)) return with_error("XComposite is required but was not found"); else if(!XCompositeQueryVersion(compositor->display, &major_ver, &minor_ver)) @@ -415,25 +450,47 @@ int initialize_compositor(Compositor *compositor) if(!initialize_screen(compositor, i)) return 0; + compositor->dirty = 1; + return 1; } void shutdown_screen(Compositor *compositor, CompositedScreen *screen) { + unsigned i; + + use_gl(compositor, screen); + + for(i=0; inwindows; ++i) + { + glDeleteTextures(1, &screen->windows[i].texture); + if(screen->windows[i].pixmap) + { + glXDestroyPixmap(compositor->display, screen->windows[i].glx_pixmap); + XFreePixmap(compositor->display, screen->windows[i].pixmap); + XDamageDestroy(compositor->display, screen->windows[i].damage); + } + } + + glXMakeContextCurrent(compositor->display, 0, 0, NULL); glXDestroyContext(compositor->display, screen->glx_context); glXDestroyWindow(compositor->display, screen->glx_window); XDestroyWindow(compositor->display, screen->render_window); XCompositeReleaseOverlayWindow(compositor->display, screen->overlay); + + free(screen->windows); } void shutdown_compositor(Compositor *compositor) { unsigned i; - glXMakeContextCurrent(compositor->display, 0, 0, NULL); for(i=0; inscreens; ++i) shutdown_screen(compositor, &compositor->screens[i]); + free(compositor->screens); + + XCloseDisplay(compositor->display); } void process_create_window_event(Compositor *compositor, XCreateWindowEvent *event) @@ -445,6 +502,15 @@ void process_create_window_event(Compositor *compositor, XCreateWindowEvent *eve 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; + + remove_window(screen, event->window); +} + void process_map_event(Compositor *compositor, XMapEvent *event) { CompositedScreen *screen = find_screen_by_root(compositor, event->event); @@ -496,6 +562,9 @@ int process_event(Compositor *compositor) 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; @@ -526,8 +595,6 @@ void refresh_screens(Compositor *compositor) glUseProgram(screen->program); glBindVertexArray(screen->vertex_array); - XGrabServer(compositor->display); - glXWaitX(); for(j=0; jnwindows; ++j) { CompositedWindow *window = &screen->windows[j]; @@ -535,13 +602,12 @@ void refresh_screens(Compositor *compositor) { 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/screen->width, (float)window->height/screen->height); + 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); } } - XUngrabServer(compositor->display); glXSwapBuffers(compositor->display, screen->glx_window); screen->dirty = 0; @@ -550,14 +616,23 @@ void refresh_screens(Compositor *compositor) compositor->dirty = 0; } +void sighandler(int sig) +{ + terminate_requested = 1; + (void)sig; +} + int main() { Compositor compositor; + signal(SIGINT, &sighandler); + signal(SIGTERM, &sighandler); + if(!initialize_compositor(&compositor)) return 1; - while(1) + while(!terminate_requested) { if(!process_event(&compositor)) refresh_screens(&compositor);