aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sway/handlers.c7
-rw-r--r--sway/layout.c94
-rw-r--r--sway/layout.h6
3 files changed, 93 insertions, 14 deletions
diff --git a/sway/handlers.c b/sway/handlers.c
index 27087295..79cbd31d 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -2,6 +2,7 @@
#include <stdbool.h>
#include <wlc/wlc.h>
#include "layout.h"
+#include "log.h"
#include "handlers.h"
bool handle_output_created(wlc_handle output) {
@@ -14,6 +15,12 @@ void handle_output_destroyed(wlc_handle output) {
}
void handle_output_resolution_change(wlc_handle output, const struct wlc_size *from, const struct wlc_size *to) {
+ sway_log(L_DEBUG, "Output %d resolution changed to %d x %d", output, to->w, to->h);
+ swayc_t *c = get_swayc_for_handle(output, &root_container);
+ if (!c) return;
+ c->width = to->w;
+ c->height = to->h;
+ arrange_windows(&root_container, -1, -1);
}
bool handle_view_created(wlc_handle view) {
diff --git a/sway/layout.c b/sway/layout.c
index f2fe4021..bbdcb844 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -7,8 +7,66 @@
swayc_t root_container;
-void arrange_windows() {
- // TODO
+void arrange_windows(swayc_t *container, int width, int height) {
+ int i;
+ if (width == -1 || height == -1) {
+ sway_log(L_DEBUG, "Arranging layout for %p", container);
+ }
+ if (width == -1) {
+ width = container->width;
+ }
+ if (height == -1) {
+ height = container->height;
+ }
+
+ if (container->type == C_ROOT) {
+ for (i = 0; i < container->children->length; ++i) {
+ arrange_windows(container->children->items[i], -1, -1);
+ }
+ return;
+ }
+
+ if (container->type == C_VIEW) {
+ sway_log(L_DEBUG, "Setting view to %d x %d @ %d, %d", width, height, container->x, container->y);
+ struct wlc_geometry geometry = {
+ .origin = {
+ .x = container->x,
+ .y = container->y
+ },
+ .size = {
+ .w = width,
+ .h = height
+ }
+ };
+ wlc_view_set_geometry(container->handle, &geometry);
+ return;
+ }
+ container->width = width;
+ container->height = height;
+
+ double total_weight = 0;
+ for (i = 0; i < container->children->length; ++i) {
+ swayc_t *child = container->children->items[i];
+ total_weight += child->weight;
+ }
+
+ int x = 0, y = 0;
+ switch (container->layout) {
+ case L_HORIZ:
+ default:
+ for (i = 0; i < container->children->length; ++i) {
+ swayc_t *child = container->children->items[i];
+ double percent = child->weight / total_weight;
+ sway_log(L_DEBUG, "Calculating arrangement for %p:%d (will receive %.2f of %d)", child, child->type, percent, width);
+ child->x = x + container->x;
+ child->y = y + container->y;
+ int w = width * percent;
+ int h = height;
+ arrange_windows(child, w, h);
+ x += w;
+ }
+ break;
+ }
}
void init_layout() {
@@ -52,34 +110,36 @@ swayc_t *get_focused_container(swayc_t *parent) {
void add_view(wlc_handle view_handle) {
swayc_t *parent = get_focused_container(&root_container);
- sway_log(L_DEBUG, "Adding new view %d under container %d", view_handle, (int)parent->type);
+ sway_log(L_DEBUG, "Adding new view %d under container %p %d", view_handle, parent, parent->type);
while (parent->type == C_VIEW) {
parent = parent->parent;
}
swayc_t *view = calloc(1, sizeof(swayc_t));
+ view->weight = 1;
view->layout = L_NONE;
view->handle = view_handle;
view->parent = parent;
view->type = C_VIEW;
- list_add(parent->children, view);
+ add_child(parent, view);
wlc_view_focus(view_handle);
- arrange_windows();
+ arrange_windows(parent, -1, -1);
}
void destroy_view(swayc_t *view) {
sway_log(L_DEBUG, "Destroying container %p", view);
- if (!view->parent) {
+ swayc_t *parent = view->parent;
+ if (!parent) {
return;
}
int i;
- for (i = 0; i < view->parent->children->length; ++i) {
- if (view->parent->children->items[i] == view) {
- list_del(view->parent->children, i);
+ for (i = 0; i < parent->children->length; ++i) {
+ if (parent->children->items[i] == view) {
+ list_del(parent->children, i);
break;
}
}
@@ -88,7 +148,7 @@ void destroy_view(swayc_t *view) {
// TODO: Focus some other window
- arrange_windows();
+ arrange_windows(parent, -1, -1);
}
void focus_view(swayc_t *view) {
@@ -99,11 +159,18 @@ void focus_view(swayc_t *view) {
focus_view(view->parent);
}
+void add_child(swayc_t *parent, swayc_t *child) {
+ sway_log(L_DEBUG, "Adding %p (%d, %dx%d) to %p (%d, %dx%d)", child, child->type,
+ child->width, child->height, parent, parent->type, parent->width, parent->height);
+ list_add(parent->children, child);
+}
+
void add_output(wlc_handle output) {
sway_log(L_DEBUG, "Adding output %d", output);
const struct wlc_size* size = wlc_output_get_resolution(output);
swayc_t *container = calloc(1, sizeof(swayc_t));
+ container->weight = 1;
container->handle = output;
container->type = C_OUTPUT;
container->children = create_list();
@@ -111,10 +178,10 @@ void add_output(wlc_handle output) {
container->layout = L_NONE;
container->width = size->w;
container->height = size->h;
-
- list_add(root_container.children, container);
+ add_child(&root_container, container);
swayc_t *workspace = calloc(1, sizeof(swayc_t));
+ workspace->weight = 1;
workspace->handle = -1;
workspace->type = C_WORKSPACE;
workspace->parent = container;
@@ -122,8 +189,7 @@ void add_output(wlc_handle output) {
workspace->height = size->h;
workspace->layout = L_HORIZ; // TODO: Get default layout from config
workspace->children = create_list();
-
- list_add(container->children, workspace);
+ add_child(container, workspace);
if (root_container.focused == NULL) {
focus_view(workspace);
diff --git a/sway/layout.h b/sway/layout.h
index 94e78a93..801faf90 100644
--- a/sway/layout.h
+++ b/sway/layout.h
@@ -27,6 +27,10 @@ struct sway_container {
// Not including borders or margins
int width, height;
+ int x, y;
+
+ int weight;
+
char *name;
list_t *children;
@@ -40,11 +44,13 @@ typedef struct sway_container swayc_t;
extern swayc_t root_container;
void init_layout();
+void add_child(swayc_t *parent, swayc_t *child);
void add_output(wlc_handle output);
void destroy_output(wlc_handle output);
void destroy_view(swayc_t *view);
void add_view(wlc_handle view);
void focus_view(swayc_t *view);
+void arrange_windows(swayc_t *container, int width, int height);
swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 19:26:26 +0000