huntedbytheirs/peachwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add floating window movement with keys. Add focus moving on floating

Browse Source
This commit is contained in:
huntedbytheirs
2026-06-30 00:40:39 -04:00
parent 02708b12c8
commit 5e5e787c41
4 changed files with 127 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/config.lua
+4 -4
View File
@@ -74,10 +74,10 @@ keybinds = {
{ mods = { "logo" }, key = "j", action = "focusdir", args = { "down" } }, { mods = { "logo" }, key = "j", action = "focusdir", args = { "down" } },
{ mods = { "logo" }, key = "k", action = "focusdir", args = { "up" } }, { mods = { "logo" }, key = "k", action = "focusdir", args = { "up" } },
{ mods = { "logo" }, key = "l", action = "focusdir", args = { "right" } }, { mods = { "logo" }, key = "l", action = "focusdir", args = { "right" } },
{ mods = { "logo", "shift" }, key = "H", action = "swapdir", args = { "left" } }, { mods = { "logo", "shift" }, key = "H", action = "swapdir", args = { "left", "10" } },
{ mods = { "logo", "shift" }, key = "J", action = "swapdir", args = { "down" } }, { mods = { "logo", "shift" }, key = "J", action = "swapdir", args = { "down", "10" } },
{ mods = { "logo", "shift" }, key = "K", action = "swapdir", args = { "up" } }, { mods = { "logo", "shift" }, key = "K", action = "swapdir", args = { "up", "10" } },
{ mods = { "logo", "shift" }, key = "L", action = "swapdir", args = { "right" } }, { mods = { "logo", "shift" }, key = "L", action = "swapdir", args = { "right", "10" } },
{ mods = { "logo" }, key = "Tab", action = "switchlayout" }, { mods = { "logo" }, key = "Tab", action = "switchlayout" },
{ mods = { "logo" }, key = "0", action = "view", args = { "all" } }, { mods = { "logo" }, key = "0", action = "view", args = { "all" } },
{ mods = { "logo" }, key = "comma", action = "focusmon", args = { "left" } }, { mods = { "logo" }, key = "comma", action = "focusmon", args = { "left" } },
include/ipc.h
+7 -4
View File
@@ -83,13 +83,13 @@ ipc_send_output_state(IpcOutput *ipc_out)
{ {
uint32_t i; uint32_t i;
for (i = 0; i < LENGTH(layouts); i++) for (i = 0; i < LENGTH(layouts); i++)
if (&layouts[i] == m->lt[m->sellt]) if (&layouts[i] == curlayout(m))
break; break;
zpeachwm_ipc_output_v2_send_layout(res, i); zpeachwm_ipc_output_v2_send_layout(res, i);
} }
/* layout symbol */ /* layout symbol */
zpeachwm_ipc_output_v2_send_layout_symbol(res, m->ltsymbol); zpeachwm_ipc_output_v2_send_layout_symbol(res, m->ltsymbol[current_tag_idx(m)]);
/* title/appid/fullscreen/floating */ /* title/appid/fullscreen/floating */
if (c) { if (c) {
@@ -184,8 +184,11 @@ ipc_output_handle_set_layout(struct wl_client *client,
Monitor *m = out->mon; Monitor *m = out->mon;
if (!m || idx >= LENGTH(layouts)) return; if (!m || idx >= LENGTH(layouts)) return;
m->lt[m->sellt] = &layouts[idx]; int ti = current_tag_idx(m);
strncpy(m->ltsymbol, layouts[idx].symbol, LENGTH(m->ltsymbol)); if (m->lt[ti][m->sellt[ti]] != &layouts[idx])
m->sellt[ti] ^= 1;
m->lt[ti][m->sellt[ti]] = &layouts[idx];
strncpy(m->ltsymbol[ti], layouts[idx].symbol, LENGTH(m->ltsymbol[ti]));
arrange(m); arrange(m);
printstatus(); printstatus();
} }
include/ipc_socket.h
+3 -3
View File
@@ -394,7 +394,7 @@ ipc_build_workspace(struct json_writer *w, Monitor *m, uint32_t tag_bit,
json_object_end(w); json_object_end(w);
json_key_string(w, "output", m->wlr_output->name); json_key_string(w, "output", m->wlr_output->name);
json_key_string(w, "layout", m->ltsymbol); json_key_string(w, "layout", m->ltsymbol[tag_idx]);
json_key_string(w, "representation", ""); json_key_string(w, "representation", "");
json_key_string(w, "type", "workspace"); json_key_string(w, "type", "workspace");
@@ -495,7 +495,7 @@ static void
ipc_build_client(struct json_writer *w, Client *c) ipc_build_client(struct json_writer *w, Client *c)
{ {
int floating = c->isfloating || int floating = c->isfloating ||
!c->mon->lt[c->mon->sellt]->arrange; !curlayout(c->mon)->arrange;
json_object_start(w); json_object_start(w);
json_key_int(w, "id", (int64_t)(uintptr_t)c); json_key_int(w, "id", (int64_t)(uintptr_t)c);
@@ -685,7 +685,7 @@ ipc_handle_get_tree(struct ipc_client *client)
json_key_string(&w, "type", "workspace"); json_key_string(&w, "type", "workspace");
json_key_string(&w, "name", json_key_string(&w, "name",
ipc_tag_name(i)); ipc_tag_name(i));
json_key_string(&w, "layout", m->ltsymbol); json_key_string(&w, "layout", m->ltsymbol[i]);
json_key(&w, "rect"); json_key(&w, "rect");
json_object_start(&w); json_object_start(&w);
src/peachwm.c
+96 -59
View File
@@ -253,15 +253,15 @@ struct Monitor {
struct wlr_box m; /* monitor area, layout-relative */ struct wlr_box m; /* monitor area, layout-relative */
struct wlr_box w; /* window area, layout-relative */ struct wlr_box w; /* window area, layout-relative */
struct wl_list layers[4]; /* LayerSurface.link */ struct wl_list layers[4]; /* LayerSurface.link */
const Layout *lt[2]; const Layout *lt[TAGCOUNT][2]; /* per-tag layout slots */
int gaps; int gaps;
unsigned int seltags; unsigned int seltags;
struct wlr_ext_workspace_group_handle_v1 *ext_group; struct wlr_ext_workspace_group_handle_v1 *ext_group;
unsigned int sellt; unsigned int sellt[TAGCOUNT]; /* per-tag layout toggle index */
uint32_t tagset[2]; uint32_t tagset[2];
float mfact; float mfact;
int nmaster; int nmaster;
char ltsymbol[16]; char ltsymbol[TAGCOUNT][16]; /* per-tag layout symbol */
int asleep; int asleep;
DwindleNode *dwindle_root[TAGCOUNT]; /* one tree per tag */ DwindleNode *dwindle_root[TAGCOUNT]; /* one tree per tag */
Client *dwindle_focus[TAGCOUNT]; /* insertion anchor, one per tag */ Client *dwindle_focus[TAGCOUNT]; /* insertion anchor, one per tag */
@@ -324,6 +324,7 @@ static void dwindle_free_tree(DwindleNode *n);
static void dwindle_remove_client(Client *c); static void dwindle_remove_client(Client *c);
static void master_remove_client(Client *c); static void master_remove_client(Client *c);
static inline int current_tag_idx(Monitor *m); static inline int current_tag_idx(Monitor *m);
static inline const Layout *curlayout(Monitor *m);
static void commitlayersurfacenotify(struct wl_listener *listener, void *data); static void commitlayersurfacenotify(struct wl_listener *listener, void *data);
static void commitnotify(struct wl_listener *listener, void *data); static void commitnotify(struct wl_listener *listener, void *data);
static void commitpopup(struct wl_listener *listener, void *data); static void commitpopup(struct wl_listener *listener, void *data);
@@ -544,6 +545,14 @@ static char config_path[1024];
/* function implementations */ /* function implementations */
/* Helper: get current layout for the active tag on monitor m */
static inline const Layout *
curlayout(Monitor *m)
{
int ti = current_tag_idx(m);
return m->lt[ti][m->sellt[ti]];
}
/* Apply a workspace default layout for the given tag index (0-based) on monitor /* Apply a workspace default layout for the given tag index (0-based) on monitor
* m */ * m */
static void apply_workspace_layout(Monitor *m, int tag_idx) { static void apply_workspace_layout(Monitor *m, int tag_idx) {
@@ -555,19 +564,19 @@ static void apply_workspace_layout(Monitor *m, int tag_idx) {
for (int li = 0; li < (int)LENGTH(layouts); li++) { for (int li = 0; li < (int)LENGTH(layouts); li++) {
if (layouts[li].symbol && !strcmp(layout_name, layouts[li].symbol)) { if (layouts[li].symbol && !strcmp(layout_name, layouts[li].symbol)) {
m->lt[m->sellt] = &layouts[li]; m->lt[tag_idx][m->sellt[tag_idx]] = &layouts[li];
break; break;
} }
if (!strcmp(layout_name, "dwindle") && layouts[li].arrange == dwindle) { if (!strcmp(layout_name, "dwindle") && layouts[li].arrange == dwindle) {
m->lt[m->sellt] = &layouts[li]; m->lt[tag_idx][m->sellt[tag_idx]] = &layouts[li];
break; break;
} }
if (!strcmp(layout_name, "master") && layouts[li].arrange == master) { if (!strcmp(layout_name, "master") && layouts[li].arrange == master) {
m->lt[m->sellt] = &layouts[li]; m->lt[tag_idx][m->sellt[tag_idx]] = &layouts[li];
break; break;
} }
if (!strcmp(layout_name, "monocle") && layouts[li].arrange == monocle) { if (!strcmp(layout_name, "monocle") && layouts[li].arrange == monocle) {
m->lt[m->sellt] = &layouts[li]; m->lt[tag_idx][m->sellt[tag_idx]] = &layouts[li];
break; break;
} }
} }
@@ -632,7 +641,8 @@ void arrange(Monitor *m) {
wlr_scene_node_set_enabled(&m->fullscreen_bg->node, wlr_scene_node_set_enabled(&m->fullscreen_bg->node,
(c = focustop(m)) && c->isfullscreen); (c = focustop(m)) && c->isfullscreen);
strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol)); int ti = current_tag_idx(m);
strncpy(m->ltsymbol[ti], curlayout(m)->symbol, LENGTH(m->ltsymbol[ti]));
/* We move all clients (except fullscreen and unmanaged) to LyrTile while /* We move all clients (except fullscreen and unmanaged) to LyrTile while
* in floating layout to avoid "real" floating clients be always on top */ * in floating layout to avoid "real" floating clients be always on top */
@@ -645,14 +655,14 @@ void arrange(Monitor *m) {
} else { } else {
wlr_scene_node_reparent( wlr_scene_node_reparent(
&c->scene->node, &c->scene->node,
(!m->lt[m->sellt]->arrange && c->isfloating) ? layers[LyrTile] (!curlayout(m)->arrange && c->isfloating) ? layers[LyrTile]
: (m->lt[m->sellt]->arrange && c->isfloating) ? layers[LyrFloat] : (curlayout(m)->arrange && c->isfloating) ? layers[LyrFloat]
: c->scene->node.parent); : c->scene->node.parent);
} }
} }
if (m->lt[m->sellt]->arrange) if (curlayout(m)->arrange)
m->lt[m->sellt]->arrange(m); curlayout(m)->arrange(m);
motionnotify(0, NULL, 0, 0, 0, 0); motionnotify(0, NULL, 0, 0, 0, 0);
checkidleinhibitor(NULL); checkidleinhibitor(NULL);
} }
@@ -788,7 +798,7 @@ void buttonpress(struct wl_listener *listener, void *data) {
xytonode(cursor->x, cursor->y, NULL, &target, NULL, NULL, NULL); xytonode(cursor->x, cursor->y, NULL, &target, NULL, NULL, NULL);
if (target && target != grabc && !target->isfloating && if (target && target != grabc && !target->isfloating &&
!target->isfullscreen && !target->isfullscreen &&
target->mon->lt[target->mon->sellt]->arrange) curlayout(target->mon)->arrange)
swaptiled(grabc, target); swaptiled(grabc, target);
cursor_mode = CurNormal; cursor_mode = CurNormal;
grabc = NULL; grabc = NULL;
@@ -1227,32 +1237,37 @@ void createmon(struct wl_listener *listener, void *data) {
m->m.y = r->y; m->m.y = r->y;
m->mfact = r->mfact; m->mfact = r->mfact;
m->nmaster = r->nmaster; m->nmaster = r->nmaster;
/* Map layout name to layouts[] entry (it's not /* Determine monitor's default layout */
* very useful I know) */ const Layout *mon_layout = &layouts[0];
m->lt[0] = &layouts[0]; /* default: floating */
for (int li = 0; li < (int)LENGTH(layouts); li++) { for (int li = 0; li < (int)LENGTH(layouts); li++) {
if (layouts[li].symbol && !strcmp(r->layout, layouts[li].symbol)) { if (layouts[li].symbol && !strcmp(r->layout, layouts[li].symbol)) {
m->lt[0] = &layouts[li]; mon_layout = &layouts[li];
break; break;
} }
/* also match by arrange function name string */
if (!strcmp(r->layout, "dwindle") && layouts[li].arrange == dwindle) { if (!strcmp(r->layout, "dwindle") && layouts[li].arrange == dwindle) {
m->lt[0] = &layouts[li]; mon_layout = &layouts[li];
break; break;
} }
if (!strcmp(r->layout, "master") && layouts[li].arrange == master) { if (!strcmp(r->layout, "master") && layouts[li].arrange == master) {
m->lt[0] = &layouts[li]; mon_layout = &layouts[li];
break; break;
} }
if (!strcmp(r->layout, "monocle") && layouts[li].arrange == monocle) { if (!strcmp(r->layout, "monocle") && layouts[li].arrange == monocle) {
m->lt[0] = &layouts[li]; mon_layout = &layouts[li];
break; break;
} }
} }
m->lt[1] = &layouts[LENGTH(layouts) > 1 && m->lt[0] != &layouts[1]]; const Layout *alt_layout = &layouts[LENGTH(layouts) > 1 && mon_layout != &layouts[1]];
/* Apply per-workspace default for the initial tag (workspace 1) */ /* Propagate monitor layout to all tags */
apply_workspace_layout(m, 0); for (int ti = 0; ti < TAGCOUNT; ti++) {
strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol)); m->lt[ti][0] = mon_layout;
m->lt[ti][1] = alt_layout;
m->sellt[ti] = 0;
}
/* Apply per-workspace default layout for all tags */
for (int ti = 0; ti < TAGCOUNT; ti++)
apply_workspace_layout(m, ti);
strncpy(m->ltsymbol[0], curlayout(m)->symbol, LENGTH(m->ltsymbol[0]));
wlr_output_state_set_scale(&state, r->scale); wlr_output_state_set_scale(&state, r->scale);
wlr_output_state_set_transform(&state, r->transform); wlr_output_state_set_transform(&state, r->transform);
break; break;
@@ -1741,7 +1756,7 @@ void focusdir(const Arg *arg) {
} }
/* In monocle layout, cycle through clients in order */ /* In monocle layout, cycle through clients in order */
if (selmon->lt[selmon->sellt]->arrange == monocle) { if (curlayout(selmon)->arrange == monocle) {
Client *first = NULL, *next = NULL, *prev = NULL; Client *first = NULL, *next = NULL, *prev = NULL;
int found = 0; int found = 0;
@@ -1790,7 +1805,7 @@ void focusdir(const Arg *arg) {
client_center(sel, &sx, &sy); client_center(sel, &sx, &sy);
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (c == sel || !VISIBLEON(c, selmon) || c->isfloating) if (c == sel || !VISIBLEON(c, selmon))
continue; continue;
client_center(c, &cx, &cy); client_center(c, &cx, &cy);
@@ -1985,14 +2000,32 @@ static void dispatch_action(const char *action,
return; return;
} }
if (!strcmp(action, "swapdir")) { if (!strcmp(action, "swapdir")) {
int dir = 0;
if (a0 && !strcmp(a0, "left")) if (a0 && !strcmp(a0, "left"))
arg.i = WLR_DIRECTION_LEFT; dir = WLR_DIRECTION_LEFT;
else if (a0 && !strcmp(a0, "right")) else if (a0 && !strcmp(a0, "right"))
arg.i = WLR_DIRECTION_RIGHT; dir = WLR_DIRECTION_RIGHT;
else if (a0 && !strcmp(a0, "up")) else if (a0 && !strcmp(a0, "up"))
arg.i = WLR_DIRECTION_UP; dir = WLR_DIRECTION_UP;
else if (a0 && !strcmp(a0, "down")) else if (a0 && !strcmp(a0, "down"))
arg.i = WLR_DIRECTION_DOWN; dir = WLR_DIRECTION_DOWN;
/* If focused window is floating, move it instead of swapping */
Client *sel = focustop(selmon);
if (sel && sel->isfloating && !sel->isfullscreen && dir) {
int pixels = (nargs > 1 && args[1][0]) ? atoi(args[1]) : 5;
struct wlr_box new_geo = sel->geom;
switch (dir) {
case WLR_DIRECTION_LEFT: new_geo.x -= pixels; break;
case WLR_DIRECTION_RIGHT: new_geo.x += pixels; break;
case WLR_DIRECTION_UP: new_geo.y -= pixels; break;
case WLR_DIRECTION_DOWN: new_geo.y += pixels; break;
}
resize(sel, new_geo, 1);
return;
}
arg.i = dir;
swapdir(&arg); swapdir(&arg);
return; return;
} }
@@ -2031,7 +2064,7 @@ static void dispatch_action(const char *action,
if (!strcmp(action, "switchlayout")) { if (!strcmp(action, "switchlayout")) {
uint32_t i; uint32_t i;
for (i = 0; i < LENGTH(layouts); i++) for (i = 0; i < LENGTH(layouts); i++)
if (selmon->lt[selmon->sellt] == &layouts[i]) if (curlayout(selmon) == &layouts[i])
break; break;
arg.ui = (i + 1) % LENGTH(layouts); arg.ui = (i + 1) % LENGTH(layouts);
setlayout(&arg); setlayout(&arg);
@@ -2458,7 +2491,7 @@ void moveresize(const Arg *arg) {
return; return;
if (arg->ui == CurMove && !grabc->isfloating && if (arg->ui == CurMove && !grabc->isfloating &&
grabc->mon->lt[grabc->mon->sellt]->arrange) { curlayout(grabc->mon)->arrange) {
cursor_mode = CurTileDrag; cursor_mode = CurTileDrag;
grabcx = (int)round(cursor->x) - grabc->geom.x; grabcx = (int)round(cursor->x) - grabc->geom.x;
grabcy = (int)round(cursor->y) - grabc->geom.y; grabcy = (int)round(cursor->y) - grabc->geom.y;
@@ -2613,7 +2646,8 @@ void printstatus(void) {
printf("%s selmon %u\n", m->wlr_output->name, m == selmon); printf("%s selmon %u\n", m->wlr_output->name, m == selmon);
printf("%s tags %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 "\n", printf("%s tags %" PRIu32 " %" PRIu32 " %" PRIu32 " %" PRIu32 "\n",
m->wlr_output->name, occ, m->tagset[m->seltags], sel, urg); m->wlr_output->name, occ, m->tagset[m->seltags], sel, urg);
printf("%s layout %s\n", m->wlr_output->name, m->ltsymbol); int _ti = current_tag_idx(m);
printf("%s layout %s\n", m->wlr_output->name, m->ltsymbol[_ti]);
ext_workspace_printstatus(m); ext_workspace_printstatus(m);
} }
fflush(stdout); fflush(stdout);
@@ -2814,7 +2848,7 @@ void setfloating(Client *c, int floating) {
c->isfloating = floating; c->isfloating = floating;
/* If in floating layout do not change the client's layer */ /* If in floating layout do not change the client's layer */
if (!c->mon || !client_surface(c)->mapped || if (!c->mon || !client_surface(c)->mapped ||
!c->mon->lt[c->mon->sellt]->arrange) !curlayout(c->mon)->arrange)
return; return;
if (c->isscratchpad) { if (c->isscratchpad) {
wlr_scene_node_reparent(&c->scene->node, layers[LyrScratch]); wlr_scene_node_reparent(&c->scene->node, layers[LyrScratch]);
@@ -2857,27 +2891,27 @@ void setfullscreen(Client *c, int fullscreen) {
void setlayout(const Arg *arg) { void setlayout(const Arg *arg) {
if (!selmon) if (!selmon)
return; return;
int ti = current_tag_idx(selmon);
/* arg->ui is an index into layouts[]. If out of range, just toggle. */ /* arg->ui is an index into layouts[]. If out of range, just toggle. */
if (arg && arg->ui < LENGTH(layouts)) { if (arg && arg->ui < LENGTH(layouts)) {
if (selmon->lt[selmon->sellt] != &layouts[arg->ui]) if (selmon->lt[ti][selmon->sellt[ti]] != &layouts[arg->ui])
selmon->sellt ^= 1; selmon->sellt[ti] ^= 1;
selmon->lt[selmon->sellt] = &layouts[arg->ui]; selmon->lt[ti][selmon->sellt[ti]] = &layouts[arg->ui];
} else { } else {
selmon->sellt ^= 1; selmon->sellt[ti] ^= 1;
} }
strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, strncpy(selmon->ltsymbol[ti], selmon->lt[ti][selmon->sellt[ti]]->symbol,
LENGTH(selmon->ltsymbol)); LENGTH(selmon->ltsymbol[ti]));
/* Convert windows when switching to master: set focused client as master */ /* Convert windows when switching to master: set focused client as master */
if (selmon->lt[selmon->sellt]->arrange == master) { if (curlayout(selmon)->arrange == master) {
int ti = current_tag_idx(selmon);
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
if (sel && VISIBLEON(sel, selmon) && !sel->isfloating && !sel->isfullscreen) if (sel && VISIBLEON(sel, selmon) && !sel->isfloating && !sel->isfullscreen)
selmon->master_master[ti] = sel; selmon->master_master[ti] = sel;
else else
selmon->master_master[ti] = NULL; selmon->master_master[ti] = NULL;
/* Convert to floating: float all tiled clients */ /* Convert to floating: float all tiled clients */
} else if (!selmon->lt[selmon->sellt]->arrange) { } else if (!curlayout(selmon)->arrange) {
Client *c; Client *c;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (VISIBLEON(c, selmon) && !c->isfloating && !c->isfullscreen) if (VISIBLEON(c, selmon) && !c->isfloating && !c->isfullscreen)
@@ -3011,26 +3045,31 @@ reapply_monitor_config(void)
m->mfact = r->mfact; m->mfact = r->mfact;
m->nmaster = r->nmaster; m->nmaster = r->nmaster;
/* Map layout name */ /* Map layout name */
m->lt[0] = &layouts[0]; const Layout *mon_layout = &layouts[0];
for (int li = 0; li < (int)LENGTH(layouts); li++) { for (int li = 0; li < (int)LENGTH(layouts); li++) {
if (layouts[li].symbol && !strcmp(r->layout, layouts[li].symbol)) { if (layouts[li].symbol && !strcmp(r->layout, layouts[li].symbol)) {
m->lt[0] = &layouts[li]; mon_layout = &layouts[li];
break; break;
} }
if (!strcmp(r->layout, "dwindle") && layouts[li].arrange == dwindle) { if (!strcmp(r->layout, "dwindle") && layouts[li].arrange == dwindle) {
m->lt[0] = &layouts[li]; mon_layout = &layouts[li];
break; break;
} }
if (!strcmp(r->layout, "master") && layouts[li].arrange == master) { if (!strcmp(r->layout, "master") && layouts[li].arrange == master) {
m->lt[0] = &layouts[li]; mon_layout = &layouts[li];
break; break;
} }
if (!strcmp(r->layout, "monocle") && layouts[li].arrange == monocle) { if (!strcmp(r->layout, "monocle") && layouts[li].arrange == monocle) {
m->lt[0] = &layouts[li]; mon_layout = &layouts[li];
break; break;
} }
} }
m->lt[1] = &layouts[LENGTH(layouts) > 1 && m->lt[0] != &layouts[1]]; const Layout *alt_layout = &layouts[LENGTH(layouts) > 1 && mon_layout != &layouts[1]];
for (int ti = 0; ti < TAGCOUNT; ti++) {
m->lt[ti][0] = mon_layout;
m->lt[ti][1] = alt_layout;
m->sellt[ti] = 0;
}
/* Apply scale and transform */ /* Apply scale and transform */
struct wlr_output_state state; struct wlr_output_state state;
wlr_output_state_init(&state); wlr_output_state_init(&state);
@@ -3111,7 +3150,8 @@ on_config_reload(const Config *newcfg, void *ud)
reapply_client_appearance(); reapply_client_appearance();
reapply_client_rules(); reapply_client_rules();
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {
apply_workspace_layout(m, current_tag_idx(m)); for (int ti = 0; ti < TAGCOUNT; ti++)
apply_workspace_layout(m, ti);
arrange(m); arrange(m);
} }
printstatus(); printstatus();
@@ -3132,7 +3172,8 @@ do_reload(void)
reapply_client_rules(); reapply_client_rules();
Monitor *m; Monitor *m;
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {
apply_workspace_layout(m, current_tag_idx(m)); for (int ti = 0; ti < TAGCOUNT; ti++)
apply_workspace_layout(m, ti);
arrange(m); arrange(m);
} }
printstatus(); printstatus();
@@ -4022,7 +4063,7 @@ void swapdir(const Arg *arg) {
if (!other) if (!other)
return; return;
if (selmon->lt[selmon->sellt]->arrange == dwindle) { if (curlayout(selmon)->arrange == dwindle) {
int ti = current_tag_idx(selmon); int ti = current_tag_idx(selmon);
DwindleNode **root = &selmon->dwindle_root[ti]; DwindleNode **root = &selmon->dwindle_root[ti];
if (*root) { if (*root) {
@@ -4042,7 +4083,7 @@ void swapdir(const Arg *arg) {
dwindle_recalc(*root, e); dwindle_recalc(*root, e);
} }
} }
} else if (selmon->lt[selmon->sellt]->arrange == master) { } else if (curlayout(selmon)->arrange == master) {
int ti = current_tag_idx(selmon); int ti = current_tag_idx(selmon);
int side = selmon->master_side[ti]; int side = selmon->master_side[ti];
@@ -4133,8 +4174,6 @@ void toggleview(const Arg *arg) {
return; return;
selmon->tagset[selmon->seltags] = newtagset; selmon->tagset[selmon->seltags] = newtagset;
/* Apply per-workspace default layout if configured */
apply_workspace_layout(selmon, current_tag_idx(selmon));
focusclient(focustop(selmon), 1); focusclient(focustop(selmon), 1);
arrange(selmon); arrange(selmon);
printstatus(); printstatus();
@@ -4337,8 +4376,6 @@ void view(const Arg *arg) {
selmon->seltags ^= 1; /* toggle sel tagset */ selmon->seltags ^= 1; /* toggle sel tagset */
if (arg->ui & TAGMASK) if (arg->ui & TAGMASK)
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
/* Apply per-workspace default layout if configured */
apply_workspace_layout(selmon, current_tag_idx(selmon));
focusclient(focustop(selmon), 1); focusclient(focustop(selmon), 1);
arrange(selmon); arrange(selmon);
printstatus(); printstatus();
@@ -4434,7 +4471,7 @@ void configurex11(struct wl_listener *listener, void *data) {
event->width, event->height); event->width, event->height);
return; return;
} }
if ((c->isfloating && c != grabc) || !c->mon->lt[c->mon->sellt]->arrange) { if ((c->isfloating && c != grabc) || !curlayout(c->mon)->arrange) {
resize(c, resize(c,
(struct wlr_box){.x = event->x - c->bw, (struct wlr_box){.x = event->x - c->bw,
.y = event->y - c->bw, .y = event->y - c->bw,