mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-10-29 05:40:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: make ~0 tag own independent layout

Browse source
This commit is contained in:
DreamMaoMao 2025-09-15 22:06:10 +08:00
parent 4a8568639f
commit 31ac4bd6ed
5 changed files with 15 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/animation/client.h
View file

@ -30,13 +30,6 @@ enum corner_location set_client_corner_location(Client *c) {
bool is_horizontal_stack_layout(Monitor *m) {
if (!m->pertag->curtag &&
(strcmp(m->pertag->ltidxs[m->pertag->prevtag]->name, "tile") == 0 ||
strcmp(m->pertag->ltidxs[m->pertag->prevtag]->name, "spiral") == 0 ||
strcmp(m->pertag->ltidxs[m->pertag->prevtag]->name, "dwindle") == 0 ||
strcmp(m->pertag->ltidxs[m->pertag->prevtag]->name, "deck") == 0))
return true;
if (m->pertag->curtag &&
(strcmp(m->pertag->ltidxs[m->pertag->curtag]->name, "tile") == 0 ||
strcmp(m->pertag->ltidxs[m->pertag->curtag]->name, "spiral") == 0 ||

20
src/dispatch/bind_define.h
View file

@ -418,12 +418,10 @@ void restore_minimized(const Arg *arg) {
void // 17
setlayout(const Arg *arg) {
int jk;
unsigned int target_tag = selmon->pertag->curtag ? selmon->pertag->curtag
: selmon->pertag->prevtag;
for (jk = 0; jk < LENGTH(layouts); jk++) {
if (strcmp(layouts[jk].name, arg->v) == 0) {
selmon->pertag->ltidxs[target_tag] = &layouts[jk];
selmon->pertag->ltidxs[selmon->pertag->curtag] = &layouts[jk];
arrange(selmon, false);
printstatus();
@ -823,17 +821,17 @@ void switch_layout(const Arg *arg) {
int jk, ji;
char *target_layout_name = NULL;
unsigned int len;
unsigned int target_tag = selmon->pertag->curtag ? selmon->pertag->curtag
: selmon->pertag->prevtag;
if (config.circle_layout_count != 0) {
for (jk = 0; jk < config.circle_layout_count; jk++) {
len = MAX(strlen(config.circle_layout[jk]),
strlen(selmon->pertag->ltidxs[target_tag]->name));
len = MAX(
strlen(config.circle_layout[jk]),
strlen(selmon->pertag->ltidxs[selmon->pertag->curtag]->name));
if (strncmp(config.circle_layout[jk],
selmon->pertag->ltidxs[target_tag]->name, len) == 0) {
selmon->pertag->ltidxs[selmon->pertag->curtag]->name,
len) == 0) {
target_layout_name = jk == config.circle_layout_count - 1
? config.circle_layout[0]
: config.circle_layout[jk + 1];
@ -848,7 +846,7 @@ void switch_layout(const Arg *arg) {
for (ji = 0; ji < LENGTH(layouts); ji++) {
len = MAX(strlen(layouts[ji].name), strlen(target_layout_name));
if (strncmp(layouts[ji].name, target_layout_name, len) == 0) {
selmon->pertag->ltidxs[target_tag] = &layouts[ji];
selmon->pertag->ltidxs[selmon->pertag->curtag] = &layouts[ji];
break;
}
@ -861,8 +859,8 @@ void switch_layout(const Arg *arg) {
for (jk = 0; jk < LENGTH(layouts); jk++) {
if (strcmp(layouts[jk].name,
selmon->pertag->ltidxs[target_tag]->name) == 0) {
selmon->pertag->ltidxs[target_tag] =
selmon->pertag->ltidxs[selmon->pertag->curtag]->name) == 0) {
selmon->pertag->ltidxs[selmon->pertag->curtag] =
jk == LENGTH(layouts) - 1 ? &layouts[0] : &layouts[jk + 1];
arrange(selmon, false);
printstatus();

12
src/ext-protocol/dwl-ipc.h
View file

@ -140,12 +140,10 @@ void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output) {
title = focused ? client_get_title(focused) : "";
appid = focused ? client_get_appid(focused) : "";
if (monitor->pertag->curtag) {
symbol = monitor->pertag->ltidxs[monitor->pertag->curtag]->symbol;
} else if (monitor->isoverview) {
if (monitor->isoverview) {
symbol = overviewlayout.symbol;
} else {
symbol = monitor->pertag->ltidxs[monitor->pertag->prevtag]->symbol;
symbol = monitor->pertag->ltidxs[monitor->pertag->curtag]->symbol;
}
keyboard = &kb_group->wlr_group->keyboard;
@ -238,7 +236,6 @@ void dwl_ipc_output_set_layout(struct wl_client *client,
unsigned int index) {
DwlIpcOutput *ipc_output;
Monitor *monitor;
unsigned int target_tag;
ipc_output = wl_resource_get_user_data(resource);
if (!ipc_output)
@ -248,10 +245,7 @@ void dwl_ipc_output_set_layout(struct wl_client *client,
if (index >= LENGTH(layouts))
index = 0;
target_tag = monitor->pertag->curtag ? monitor->pertag->curtag
: monitor->pertag->prevtag;
monitor->pertag->ltidxs[target_tag] = &layouts[index];
monitor->pertag->ltidxs[monitor->pertag->curtag] = &layouts[index];
arrange(monitor, false);
printstatus();
}

12
src/fetch/monitor.h
View file

@ -17,21 +17,13 @@ Monitor *dirtomon(enum wlr_direction dir) {
bool is_scroller_layout(Monitor *m) {
if (!m->pertag->curtag &&
strcmp(m->pertag->ltidxs[m->pertag->prevtag]->name, "scroller") == 0)
if (strcmp(m->pertag->ltidxs[m->pertag->curtag]->name, "scroller") == 0)
return true;
if (!m->pertag->curtag &&
strcmp(m->pertag->ltidxs[m->pertag->prevtag]->name,
"vertical_scroller") == 0)
return true;
if (m->pertag->curtag &&
strcmp(m->pertag->ltidxs[m->pertag->curtag]->name, "scroller") == 0)
return true;
if (strcmp(m->pertag->ltidxs[m->pertag->curtag]->name,
"vertical_scroller") == 0)
return true;
return false;
}

6
src/mango.c
View file

@ -1391,12 +1391,8 @@ arrange(Monitor *m, bool want_animation) {
if (m->isoverview) {
overviewlayout.arrange(m);
} else if (m && m->pertag->curtag &&
m->pertag->ltidxs[m->pertag->curtag]->arrange) {
} else {
m->pertag->ltidxs[m->pertag->curtag]->arrange(m);
} else if (m && m->pertag->prevtag &&
m->pertag->ltidxs[m->pertag->prevtag]->arrange) {
m->pertag->ltidxs[m->pertag->prevtag]->arrange(m);
}
motionnotify(0, NULL, 0, 0, 0, 0);