]> git.tdb.fi Git - geometrycompositor.git/blobdiff - source/main.c
Process ConfigureNotify events
[geometrycompositor.git] / source / main.c
index 05b59557495cf9725cee2553db1b3cc5fa1fd2a8..f7780a0e20a37955a69579bad3aae0666845a688 100644 (file)
@@ -260,24 +260,24 @@ void create_window_pixmap(Compositor *compositor, CompositedScreen *screen, Comp
        window->glx_pixmap = glXCreatePixmap(compositor->display, screen->fbconfig, window->pixmap, attribs);
 }
 
-void add_window(Compositor *compositor, CompositedScreen *screen, Window w)
+CompositedWindow *add_window(Compositor *compositor, CompositedScreen *screen, Window w)
 {
        CompositedWindow *window;
        XWindowAttributes win_attr;
 
        if(w==screen->root || w==screen->overlay)
-               return;
+               return NULL;
 
        if(!XGetWindowAttributes(compositor->display, w, &win_attr))
        {
                printf("XGetWindowAttributes failed; probably the window was already destroyed\n");
-               return;
+               return NULL;
        }
        if(win_attr.class==InputOnly)
-               return;
+               return NULL;
 
        if(find_window(screen, w))
-               return;
+               return NULL;
 
        if(screen->nwindows==screen->windows_capacity)
        {
@@ -308,6 +308,66 @@ void add_window(Compositor *compositor, CompositedScreen *screen, Window w)
        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);
+
+       return window;
+}
+
+void remove_window(Compositor *compositor, CompositedScreen *screen, CompositedWindow *window, int destroyed)
+{
+       unsigned i;
+
+       glDeleteTextures(1, &window->texture);
+       if(!destroyed)
+       {
+               XDamageDestroy(compositor->display, window->damage);
+               if(window->pixmap)
+               {
+                       glXDestroyPixmap(compositor->display, window->glx_pixmap);
+                       XFreePixmap(compositor->display, window->pixmap);
+               }
+               XCompositeUnredirectWindow(compositor->display, window->window, CompositeRedirectManual);
+       }
+
+       --screen->nwindows;
+       for(i=window-screen->windows; i<screen->nwindows; ++i)
+               screen->windows[i] = screen->windows[i+1];
+}
+
+CompositedWindow *reorder_window(CompositedScreen *screen, CompositedWindow *window, Window above)
+{
+       unsigned i, j;
+       CompositedWindow hold;
+
+       i = window-screen->windows;
+       if(above)
+       {
+               for(j=0; j<screen->nwindows; ++j)
+                       if(screen->windows[j].window==above)
+                               break;
+
+               if(j>=screen->nwindows || i==j+1)
+                       return window;
+
+               if(j<i)
+                       ++j;
+       }
+       else
+               j = 0;
+
+       hold = *window;
+       if(i<j)
+       {
+               for(; i<j; ++i)
+                       screen->windows[i] = screen->windows[i+1];
+       }
+       else
+       {
+               for(; i>j; --i)
+                       screen->windows[i] = screen->windows[i-1];
+       }
+       screen->windows[j] = hold;
+
+       return &screen->windows[j];
 }
 
 CompositedScreen *find_screen_by_root(Compositor *compositor, Window root)
@@ -478,6 +538,12 @@ void shutdown_compositor(Compositor *compositor)
        XCloseDisplay(compositor->display);
 }
 
+void mark_dirty(Compositor *compositor, CompositedScreen *screen)
+{
+       compositor->dirty = 1;
+       screen->dirty = 1;
+}
+
 void process_create_window_event(Compositor *compositor, XCreateWindowEvent *event)
 {
        CompositedScreen *screen = find_screen_by_root(compositor, event->parent);
@@ -487,7 +553,7 @@ void process_create_window_event(Compositor *compositor, XCreateWindowEvent *eve
        add_window(compositor, screen, event->window);
 }
 
-void process_map_event(Compositor *compositor, XMapEvent *event)
+void process_destroy_window_event(Compositor *compositor, XDestroyWindowEvent *event)
 {
        CompositedScreen *screen = find_screen_by_root(compositor, event->event);
        if(!screen)
@@ -495,10 +561,23 @@ void process_map_event(Compositor *compositor, XMapEvent *event)
 
        CompositedWindow *window = find_window(screen, event->window);
        if(window)
-       {
-               window->map_state = IsViewable;
-               create_window_pixmap(compositor, screen, window);
-       }
+               remove_window(compositor, screen, window, 1);
+}
+
+void process_map_event(Compositor *compositor, XMapEvent *event)
+{
+       CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+       if(!screen)
+               return;
+
+       CompositedWindow *window = find_window(screen, event->window);
+       if(!window)
+               return;
+
+       window->map_state = IsViewable;
+       create_window_pixmap(compositor, screen, window);
+
+       mark_dirty(compositor, screen);
 }
 
 void process_unmap_event(Compositor *compositor, XUnmapEvent *event)
@@ -510,6 +589,55 @@ void process_unmap_event(Compositor *compositor, XUnmapEvent *event)
        CompositedWindow *window = find_window(screen, event->window);
        if(window)
                window->map_state = IsUnviewable;
+
+       mark_dirty(compositor, screen);
+}
+
+void process_reparent_event(Compositor *compositor, XReparentEvent *event)
+{
+       CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+       if(!screen)
+               return;
+
+       CompositedWindow *window;
+       if(event->parent==screen->root)
+               window = add_window(compositor, screen, event->window);
+       else
+       {
+               window = find_window(screen, event->window);
+               if(!window)
+                       return;
+
+               remove_window(compositor, screen, window, 0);
+       }
+
+       if(window && window->map_state==IsViewable)
+               mark_dirty(compositor, screen);
+}
+
+void process_configure_event(Compositor *compositor, XConfigureEvent *event)
+{
+       CompositedScreen *screen = find_screen_by_root(compositor, event->event);
+       if(!screen)
+               return;
+
+       CompositedWindow *window = find_window(screen, event->window);
+       if(!window)
+               return;
+
+       window->x = event->x;
+       window->y = event->y;
+       if((unsigned)event->width!=window->width || (unsigned)event->height!=window->height || (unsigned)event->border_width!=window->border)
+       {
+               window->width = event->width;
+               window->height = event->height;
+               window->border = event->border_width;
+               create_window_pixmap(compositor, screen, window);
+       }
+       reorder_window(screen, window, event->above);
+
+       if(window->map_state==IsViewable)
+               mark_dirty(compositor, screen);
 }
 
 void process_damage_event(Compositor *compositor, XDamageNotifyEvent *event)
@@ -518,8 +646,9 @@ void process_damage_event(Compositor *compositor, XDamageNotifyEvent *event)
        if(!screen)
                return;
 
-       screen->dirty = 1;
-       compositor->dirty = 1;
+       CompositedWindow *window = find_window(screen, event->drawable);
+       if(window->map_state==IsViewable)
+               mark_dirty(compositor, screen);
 }
 
 int process_event(Compositor *compositor)
@@ -538,12 +667,21 @@ 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;
        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);
@@ -561,6 +699,9 @@ void refresh_screens(Compositor *compositor)
        for(i=0; i<compositor->nscreens; ++i)
        {
                CompositedScreen *screen = &compositor->screens[i];
+               if(!screen->dirty)
+                       continue;
+
                use_gl(compositor, screen);
 
                glClearColor(0.5f, 0.5f, 0.5f, 0.0f);