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

fix: master mafact and number set not perpetual

Browse source
This commit is contained in:
DreamMaoMao 2025-02-06 08:20:00 +08:00
parent ab4ef0bb64
commit fd6b74ede2
2 changed files with 55 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config.def.h
View file

@ -17,6 +17,8 @@ static const double animation_curve[4] = {0.46,1.0,0.29,0.99}; // Animation curv
static const unsigned int axis_bind_apply_timeout = 100; // Timeout for wheel binding actions static const unsigned int axis_bind_apply_timeout = 100; // Timeout for wheel binding actions
static const unsigned int focus_on_activate = 1; // Automatically focus on window activation request static const unsigned int focus_on_activate = 1; // Automatically focus on window activation request
static const unsigned int new_is_master = 1; // New windows are inserted at the head static const unsigned int new_is_master = 1; // New windows are inserted at the head
static const unsigned int default_mfact = 0.55f; // Master mfact
static const unsigned int default_nmaster = 1; // Master number
/* logging */ /* logging */
static int log_level = WLR_ERROR; static int log_level = WLR_ERROR;
static const unsigned int numlockon = 1; // Enable numlock static const unsigned int numlockon = 1; // Enable numlock

114
main.c
View file

@ -1868,8 +1868,8 @@ createmon(struct wl_listener *listener, void *data)
m->is_in_hotarea = 0; m->is_in_hotarea = 0;
m->tagset[0] = m->tagset[1] = 1; m->tagset[0] = m->tagset[1] = 1;
float scale = 1; float scale = 1;
m->mfact = 0.5; m->mfact = default_mfact;
m->nmaster = 1; m->nmaster = default_nmaster;
enum wl_output_transform rr = WL_OUTPUT_TRANSFORM_NORMAL; enum wl_output_transform rr = WL_OUTPUT_TRANSFORM_NORMAL;
if(LENGTH(layouts) > 1){ if(LENGTH(layouts) > 1){
@ -2337,50 +2337,51 @@ void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output) {
focused = focustop(monitor); focused = focustop(monitor);
zdwl_ipc_output_v2_send_active(ipc_output->resource, monitor == selmon); zdwl_ipc_output_v2_send_active(ipc_output->resource, monitor == selmon);
// if ((monitor->tagset[monitor->seltags] & TAGMASK) == TAGMASK) { if ((monitor->tagset[monitor->seltags] & TAGMASK) == TAGMASK) {
// state = 0; state = 0;
// state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE; state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
// zdwl_ipc_output_v2_send_tag(ipc_output->resource, 888, state, 1, 1); zdwl_ipc_output_v2_send_tag(ipc_output->resource, 888, state, 1, 1);
// } else { } else {
// for ( tag = 0 ; tag < LENGTH(tags); tag++) { for ( tag = 0 ; tag < LENGTH(tags); tag++) {
// numclients = state = focused_client = 0; numclients = state = focused_client = 0;
// tagmask = 1 << tag; tagmask = 1 << tag;
// if ((tagmask & monitor->tagset[monitor->seltags]) != 0) if ((tagmask & monitor->tagset[monitor->seltags]) != 0)
// state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE; state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
// wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
// if (c->mon != monitor) if (c->mon != monitor)
// continue; continue;
// if (!(c->tags & tagmask)) if (!(c->tags & tagmask))
// continue; continue;
// if (c == focused) if (c == focused)
// focused_client = 1; focused_client = 1;
// if (c->isurgent) if (c->isurgent)
// state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_URGENT; state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_URGENT;
// numclients++; numclients++;
// } }
// zdwl_ipc_output_v2_send_tag(ipc_output->resource, tag, state, numclients, focused_client); zdwl_ipc_output_v2_send_tag(ipc_output->resource, tag, state, numclients, focused_client);
// } }
// } }
for ( tag = 0 ; tag < LENGTH(tags); tag++) {
numclients = state = focused_client = 0; // for ( tag = 0 ; tag < LENGTH(tags); tag++) {
tagmask = 1 << tag; // numclients = state = focused_client = 0;
if ((tagmask & monitor->tagset[monitor->seltags]) != 0) // tagmask = 1 << tag;
state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE; // if ((tagmask & monitor->tagset[monitor->seltags]) != 0)
wl_list_for_each(c, &clients, link) { // state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_ACTIVE;
if (c->mon != monitor) // wl_list_for_each(c, &clients, link) {
continue; // if (c->mon != monitor)
if (!(c->tags & tagmask)) // continue;
continue; // if (!(c->tags & tagmask))
if (c == focused) // continue;
focused_client = 1; // if (c == focused)
if (c->isurgent) // focused_client = 1;
state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_URGENT; // if (c->isurgent)
numclients++; // state |= ZDWL_IPC_OUTPUT_V2_TAG_STATE_URGENT;
} // numclients++;
zdwl_ipc_output_v2_send_tag(ipc_output->resource, tag, state, numclients, focused_client); // }
} // zdwl_ipc_output_v2_send_tag(ipc_output->resource, tag, state, numclients, focused_client);
// }
title = focused ? client_get_title(focused) : ""; title = focused ? client_get_title(focused) : "";
appid = focused ? client_get_appid(focused) : ""; appid = focused ? client_get_appid(focused) : "";
@ -2622,7 +2623,7 @@ incnmaster(const Arg *arg)
{ {
if (!arg || !selmon) if (!arg || !selmon)
return; return;
selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0); selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->pertag->nmasters[selmon->pertag->curtag] + arg->i, 0);
arrange(selmon,false); arrange(selmon,false);
} }
@ -4003,10 +4004,11 @@ setmfact(const Arg *arg)
if (!arg || !selmon || !selmon->lt[selmon->sellt]->arrange) if (!arg || !selmon || !selmon->lt[selmon->sellt]->arrange)
return; return;
f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0; f = arg->f < 1.0 ? arg->f + selmon->pertag->mfacts[selmon->pertag->curtag] : arg->f - 1.0;
if (f < 0.1 || f > 0.9) if (f < 0.1 || f > 0.9)
return; return;
selmon->mfact = f; // selmon->mfact = f;
selmon->pertag->mfacts[selmon->pertag->curtag] = f;
arrange(selmon,false); arrange(selmon,false);
} }
@ -4651,8 +4653,8 @@ tile(Monitor *m,unsigned int gappo, unsigned int uappi)
oe = 0; // outer gaps disabled oe = 0; // outer gaps disabled
} }
if (n > m->nmaster) if (n > selmon->pertag->nmasters[selmon->pertag->curtag])
mw = m->nmaster ? (m->w.width + m->gappiv*ie) * m->mfact : 0; mw = selmon->pertag->nmasters[selmon->pertag->curtag] ? (m->w.width + m->gappiv*ie) * selmon->pertag->mfacts[selmon->pertag->curtag] : 0;
else else
mw = m->w.width - 2*m->gappov*oe + m->gappiv*ie; mw = m->w.width - 2*m->gappov*oe + m->gappiv*ie;
i = 0; i = 0;
@ -4660,8 +4662,8 @@ tile(Monitor *m,unsigned int gappo, unsigned int uappi)
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (!VISIBLEON(c, m) || c->animation.tagouting || c->isfloating || c->isfullscreen || c->isfakefullscreen ) if (!VISIBLEON(c, m) || c->animation.tagouting || c->isfloating || c->isfullscreen || c->isfakefullscreen )
continue; continue;
if (i < m->nmaster) { if (i < selmon->pertag->nmasters[selmon->pertag->curtag]) {
r = MIN(n, m->nmaster) - i; r = MIN(n, selmon->pertag->nmasters[selmon->pertag->curtag]) - i;
h = (m->w.height - my - m->gappoh*oe - m->gappih*ie * (r - 1)) / r; h = (m->w.height - my - m->gappoh*oe - m->gappih*ie * (r - 1)) / r;
resize(c, (struct wlr_box){.x = m->w.x + m->gappov*oe, .y = m->w.y + my, resize(c, (struct wlr_box){.x = m->w.x + m->gappov*oe, .y = m->w.y + my,
.width = mw - m->gappiv*ie, .height = h}, 0); .width = mw - m->gappiv*ie, .height = h}, 0);
@ -5011,8 +5013,6 @@ view(const Arg *arg,bool want_animation)
selmon->pertag->curtag = tmptag; selmon->pertag->curtag = tmptag;
} }
selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]; selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt]; selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1]; selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
@ -5052,8 +5052,6 @@ viewtoleft(const Arg *arg)
selmon->pertag->curtag = tmptag; selmon->pertag->curtag = tmptag;
} }
selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]; selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt]; selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1]; selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
@ -5105,8 +5103,6 @@ viewtoright_have_client(const Arg *arg)
selmon->pertag->curtag = tmptag; selmon->pertag->curtag = tmptag;
} }
selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]; selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt]; selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1]; selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
@ -5142,8 +5138,6 @@ viewtoright(const Arg *arg)
selmon->pertag->curtag = tmptag; selmon->pertag->curtag = tmptag;
} }
selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]; selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt]; selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1]; selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
@ -5195,8 +5189,6 @@ viewtoleft_have_client(const Arg *arg)
selmon->pertag->curtag = tmptag; selmon->pertag->curtag = tmptag;
} }
selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]; selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt]; selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1]; selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];