aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sway/container.c30
-rw-r--r--sway/handlers.c8
-rw-r--r--sway/layout.c1
-rw-r--r--sway/workspace.c71
-rw-r--r--sway/workspace.h1
5 files changed, 87 insertions, 24 deletions
diff --git a/sway/container.c b/sway/container.c
index b52ffd8c..189f064b 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -47,9 +47,9 @@ swayc_t *new_output(wlc_handle handle) {
const struct wlc_size* size = wlc_output_get_resolution(handle);
swayc_t *output = new_swayc(C_OUTPUT);
- output->width = size->w;
- output->height = size->h;
- output->handle = handle;
+ output->width = size->w;
+ output->height = size->h;
+ output->handle = handle;
add_child(&root_container, output);
@@ -69,10 +69,10 @@ swayc_t *new_workspace(swayc_t * output, const char *name) {
sway_log(L_DEBUG, "Added workspace %s for output %d", name, output->handle);
swayc_t *workspace = new_swayc(C_WORKSPACE);
- workspace->layout = L_HORIZ; // TODO:default layout
- workspace->width = output->width;
- workspace->height = output->height;
- workspace->name = strdup(name);
+ workspace->layout = L_HORIZ; // TODO:default layout
+ workspace->width = output->width;
+ workspace->height = output->height;
+ workspace->name = strdup(name);
workspace->visible = true;
add_child(output, workspace);
@@ -84,12 +84,12 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
sway_log(L_DEBUG, "creating container %p around %p", cont, child);
- cont->layout = layout;
- cont->width = child->width;
- cont->height = child->height;
- cont->x = child->x;
- cont->y = child->y;
- cont->visible = child->visible;
+ cont->layout = layout;
+ cont->width = child->width;
+ cont->height = child->height;
+ cont->x = child->x;
+ cont->y = child->y;
+ cont->visible = child->visible;
/* Container inherits all of workspaces children, layout and whatnot */
if (child->type == C_WORKSPACE) {
@@ -131,8 +131,8 @@ swayc_t *new_view(swayc_t *sibling, wlc_handle handle) {
sway_log(L_DEBUG, "Adding new view %d:%s:%d to container %p %d",
handle, title, type, sibling, sibling?sibling->type:0);
//Setup values
- view->handle = handle;
- view->name = strdup(title);
+ view->handle = handle;
+ view->name = strdup(title);
view->visible = true;
//Case of focused workspace, just create as child of it
diff --git a/sway/handlers.c b/sway/handlers.c
index 393a2181..f95683d0 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -15,9 +15,14 @@ static struct wlc_origin mouse_origin;
static bool pointer_test(swayc_t *view, void *_origin) {
const struct wlc_origin *origin = _origin;
+ //Determine the output that the view is under
+ swayc_t *parent = view;
+ while (parent->type != C_OUTPUT) {
+ parent = parent->parent;
+ }
if (view->type == C_VIEW && origin->x >= view->x && origin->y >= view->y
&& origin->x < view->x + view->width && origin->y < view->y + view->height
- && view->visible) {
+ && view->visible && parent == root_container.focused) {
return true;
}
return false;
@@ -254,4 +259,3 @@ struct wlc_interface interface = {
.ready = handle_wlc_ready
}
};
-
diff --git a/sway/layout.c b/sway/layout.c
index e2e91593..3fd7f5c1 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -179,6 +179,7 @@ void arrange_windows(swayc_t *container, int width, int height) {
}
break;
}
+ layout_log(&root_container, 0);
}
swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent) {
diff --git a/sway/workspace.c b/sway/workspace.c
index cd5472e3..9748c23f 100644
--- a/sway/workspace.c
+++ b/sway/workspace.c
@@ -94,20 +94,77 @@ swayc_t *workspace_find_by_name(const char* name) {
}
void workspace_switch(swayc_t *workspace) {
- if (workspace != active_workspace && active_workspace) {
- sway_log(L_DEBUG, "workspace: changing from '%s' to '%s'", active_workspace->name, workspace->name);
+ swayc_t *parent = workspace;
+ while (parent->type != C_OUTPUT) {
+ parent = parent->parent;
+ }
+ // The current workspace of the output our target workspace is in
+ swayc_t *c_workspace = parent->focused;
+ if (workspace != c_workspace && c_workspace) {
+ sway_log(L_DEBUG, "workspace: changing from '%s' to '%s'", c_workspace->name, workspace->name);
uint32_t mask = 1;
- // set all c_views in the old workspace to the invisible mask
- container_map(active_workspace, set_mask, &mask);
- // and c_views in the new workspace to the visible mask
+ // set all c_views in the old workspace to the invisible mask if the workspace
+ // is in the same output & c_views in the new workspace to the visible mask
+ container_map(c_workspace, set_mask, &mask);
mask = 2;
container_map(workspace, set_mask, &mask);
-
wlc_output_set_mask(wlc_get_focused_output(), 2);
+
unfocus_all(&root_container);
focus_view(workspace);
- destroy_workspace(active_workspace);
+
+ destroy_workspace(c_workspace);
}
active_workspace = workspace;
}
+
+/* XXX:DEBUG:XXX */
+static void container_log(const swayc_t *c) {
+ fprintf(stderr, "focus:%c|",
+ c == get_focused_container(&root_container) ? 'F' : //Focused
+ c == active_workspace ? 'W' : //active workspace
+ c == &root_container ? 'R' : //root
+ 'X');//not any others
+ fprintf(stderr,"(%p)",c);
+ fprintf(stderr,"(p:%p)",c->parent);
+ fprintf(stderr,"(f:%p)",c->focused);
+ fprintf(stderr,"Type:");
+ fprintf(stderr,
+ c->type == C_ROOT ? "Root|" :
+ c->type == C_OUTPUT ? "Output|" :
+ c->type == C_WORKSPACE ? "Workspace|" :
+ c->type == C_CONTAINER ? "Container|" :
+ c->type == C_VIEW ? "View|" :
+ "Unknown|");
+ fprintf(stderr,"layout:");
+ fprintf(stderr,
+ c->layout == L_NONE ? "NONE|" :
+ c->layout == L_HORIZ ? "Horiz|":
+ c->layout == L_VERT ? "Vert|":
+ c->layout == L_STACKED ? "Stacked|":
+ c->layout == L_FLOATING ? "Floating|":
+ "Unknown|");
+ fprintf(stderr, "w:%d|h:%d|", c->width, c->height);
+ fprintf(stderr, "x:%d|y:%d|", c->x, c->y);
+ fprintf(stderr, "vis:%c|", c->visible?'t':'f');
+ fprintf(stderr, "wgt:%d|", c->weight);
+ fprintf(stderr, "name:%.16s|", c->name);
+ fprintf(stderr, "children:%d\n",c->children?c->children->length:0);
+}
+void layout_log(const swayc_t *c, int depth) {
+ int i;
+ int e = c->children?c->children->length:0;
+ for (i = 0; i < depth; ++i) fputc(' ', stderr);
+ container_log(c);
+ if (e) {
+ for (i = 0; i < depth; ++i) fputc(' ', stderr);
+ fprintf(stderr,"(\n");
+ for (i = 0; i < e; ++i) {
+ layout_log(c->children->items[i], depth + 1);
+ }
+ for (i = 0; i < depth; ++i) fputc(' ', stderr);
+ fprintf(stderr,")\n");
+ }
+}
+/* XXX:DEBUG:XXX */
diff --git a/sway/workspace.h b/sway/workspace.h
index 523ce633..59a6d526 100644
--- a/sway/workspace.h
+++ b/sway/workspace.h
@@ -11,5 +11,6 @@ char *workspace_next_name(void);
swayc_t *workspace_create(const char*);
swayc_t *workspace_find_by_name(const char*);
void workspace_switch(swayc_t*);
+void layout_log(const swayc_t *c, int depth);
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 15:49:08 +0000