Circulate window, not perfect yet

1 files changed, 96 insertions, 6 deletions

diff --git a/src/compositor.c b/src/compositor.c
index ee6c986..133c8fc 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -32,7 +32,7 @@ void ngxc_compositor_deinit(ngxc_compositor *self) {
 
 }
 
-void ngxc_compositor_add_window(ngxc_compositor *self, Window window) {
+void ngxc_compositor_add_window(ngxc_compositor *self, Window window, Window above_window) {
     if(self->num_windows == NGXC_COMPOSITOR_MAX_WINDOWS) {
         fprintf(stderr, "error: reached max number of trackable windows (%d), ignoring window with id %ld\n", NGXC_COMPOSITOR_MAX_WINDOWS, window);
         return;
@@ -53,23 +53,45 @@ void ngxc_compositor_add_window(ngxc_compositor *self, Window window) {
         return;
     }
 
+    window_obj->above_window = above_window;
     window_obj->x = xattr.x;
     window_obj->y = xattr.y;
-    ++self->num_windows;
+    self->num_windows++;
 
     fprintf(stderr, "ADDED WINDOW: %ld, x: %d, y: %d\n", window, xattr.x, xattr.y);
 }
 
+static void ngxc_compositor_remove_window_index(ngxc_compositor *self, int window_index) {
+    for(int i = window_index + 1; i < self->num_windows; ++i) {
+        self->windows[i - 1] = self->windows[i];
+    }
+    self->num_windows--;
+}
+
+static void ngxc_compositor_insert_window_index(ngxc_compositor *self, const ngxc_window *window, int index) {
+    for(int i = self->num_windows - 1; i > index; --i) {
+        self->windows[i] = self->windows[i - 1];
+    }
+    self->windows[index] = *window;
+}
+
+static void ngxc_compositor_append_window(ngxc_compositor *self, const ngxc_window *window) {
+    if(self->num_windows == NGXC_COMPOSITOR_MAX_WINDOWS) {
+        fprintf(stderr, "error: reached max number of trackable windows (%d), ignoring window with id %ld\n", NGXC_COMPOSITOR_MAX_WINDOWS, window->texture.window);
+        return;
+    }
+
+    self->windows[self->num_windows] = *window;
+    self->num_windows++;
+}
+
 void ngxc_compositor_remove_window(ngxc_compositor *self, Window window) {
     for(int i = 0; i < self->num_windows; ++i) {
         if(self->windows[i].texture.window != window)
             continue;
 
         window_texture_deinit(&self->windows[i].texture);
-        for(int j = i + 1; j < self->num_windows; ++j) {
-            self->windows[j - 1] = self->windows[j];
-        }
-        self->num_windows--;
+        ngxc_compositor_remove_window_index(self, i);
         break;
     }
 }
@@ -137,6 +159,52 @@ void ngxc_compositor_render(ngxc_compositor *self) {
     self->frame_timer = clock_get_monotonic_seconds();
 }
 
+static void ngxc_compositor_move_window_after(ngxc_compositor *self, ngxc_window *window_obj, Window above_window) {
+    int window_index = -1;
+    for(int i = 0; i < self->num_windows; ++i) {
+        if(self->windows[i].texture.window == window_obj->texture.window) {
+            window_index = i;
+            break;
+        }
+    }
+
+    if(window_index == -1) {
+        fprintf(stderr, "error: unable to find window %ld in compositor list\n", window_obj->texture.window);
+        return;
+    }
+
+    if(above_window == None) {
+        const ngxc_window window_obj_copy = *window_obj;
+        ngxc_compositor_remove_window_index(self, window_index);
+        ngxc_compositor_append_window(self, &window_obj_copy);
+        fprintf(stderr, "above window none, move to top\n");
+        return;
+    }
+
+    int above_window_index = -1;
+    for(int i = 0; i < self->num_windows; ++i) {
+        if(self->windows[i].texture.window == above_window) {
+            above_window_index = i;
+            break;
+        }
+    }
+
+    if(above_window_index == -1) {
+        fprintf(stderr, "error: unable to find above window %ld in compositor list\n", above_window);
+        return;
+    }
+
+    const ngxc_window window_obj_copy = *window_obj;
+    ngxc_compositor_remove_window_index(self, window_index);
+    if(above_window_index + 1 >= self->num_windows) {
+        ngxc_compositor_append_window(self, &window_obj_copy);
+        fprintf(stderr, "above, move to top\n");
+    } else {
+        ngxc_compositor_insert_window_index(self, &window_obj_copy, above_window_index + 1);
+        fprintf(stderr, "above window after %ld\n", above_window);
+    }
+}
+
 void ngxc_compositor_on_configure(ngxc_compositor *self, const XConfigureEvent *configure_event) {
     ngxc_window *window_obj = ngxc_compositor_get_window_by_id(self, configure_event->window);
     if(!window_obj)
@@ -148,4 +216,26 @@ void ngxc_compositor_on_configure(ngxc_compositor *self, const XConfigureEvent *
     if(configure_event->width != window_obj->texture.width || configure_event->height != window_obj->texture.height) {
         window_texture_on_resize(&window_obj->texture);
     }
+
+    if(configure_event->above != window_obj->above_window && configure_event->above != window_obj->texture.window) {
+        window_obj->above_window = configure_event->above; // TODO: If above window is none then get the topmost window and use that
+        ngxc_compositor_move_window_after(self, window_obj, configure_event->above);
+    }
+}
+
+void ngxc_compositor_on_circulate(ngxc_compositor *self, const XCirculateEvent *circulate_event) {
+    ngxc_window *window_obj = ngxc_compositor_get_window_by_id(self, circulate_event->window);
+    if(!window_obj)
+        return;
+
+    Window above_window = None;
+    if(circulate_event->place == PlaceOnTop)
+        above_window = None;
+    else if(circulate_event->place == PlaceOnBottom)
+        above_window = self->windows[self->num_windows - 1].texture.window;
+
+    if(above_window != window_obj->above_window && above_window != window_obj->texture.window) {
+        window_obj->above_window = above_window; // TODO: If above window is none then get the topmost window and use that
+        ngxc_compositor_move_window_after(self, window_obj, above_window);
+    }
 }