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

opt: optimie scroller code struct

Browse source
This commit is contained in:
DreamMaoMao 2025-09-07 10:30:51 +08:00
parent a882b1cdd4
commit 243ddc90f7
3 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/layout/horizontal.h
View file

@ -359,10 +359,8 @@ void scroller(Monitor *m) {
if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating && if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating &&
!m->sel->ismaxmizescreen && !m->sel->isfullscreen) { !m->sel->ismaxmizescreen && !m->sel->isfullscreen) {
root_client = m->sel; root_client = m->sel;
} else if (m->prevsel && !client_is_unmanaged(m->prevsel) && } else if (m->prevtilesel && !client_is_unmanaged(m->prevtilesel)) {
!m->prevsel->isfloating && !m->prevsel->ismaxmizescreen && root_client = m->prevtilesel;
!m->prevsel->isfullscreen) {
root_client = m->prevsel;
} else { } else {
root_client = center_select(m); root_client = center_select(m);
} }
@ -394,8 +392,8 @@ void scroller(Monitor *m) {
if (need_scroller) { if (need_scroller) {
if (scroller_focus_center || if (scroller_focus_center ||
((!m->prevsel || ((!m->prevtilesel ||
(m->prevsel->scroller_proportion * max_client_width) + (m->prevtilesel->scroller_proportion * max_client_width) +
(root_client->scroller_proportion * max_client_width) > (root_client->scroller_proportion * max_client_width) >
m->w.width - 2 * scroller_structs - cur_gappih) && m->w.width - 2 * scroller_structs - cur_gappih) &&
scroller_prefer_center)) { scroller_prefer_center)) {

10
src/layout/vertical.h
View file

@ -344,10 +344,8 @@ void vertical_scroller(Monitor *m) {
if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating && if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating &&
!m->sel->ismaxmizescreen && !m->sel->isfullscreen) { !m->sel->ismaxmizescreen && !m->sel->isfullscreen) {
root_client = m->sel; root_client = m->sel;
} else if (m->prevsel && !client_is_unmanaged(m->prevsel) && } else if (m->prevtilesel && !client_is_unmanaged(m->prevtilesel)) {
!m->prevsel->isfloating && !m->prevsel->ismaxmizescreen && root_client = m->prevtilesel;
!m->prevsel->isfullscreen) {
root_client = m->prevsel;
} else { } else {
root_client = center_select(m); root_client = center_select(m);
} }
@ -379,8 +377,8 @@ void vertical_scroller(Monitor *m) {
if (need_scroller) { if (need_scroller) {
if (scroller_focus_center || if (scroller_focus_center ||
((!m->prevsel || ((!m->prevtilesel ||
(m->prevsel->scroller_proportion * max_client_height) + (m->prevtilesel->scroller_proportion * max_client_height) +
(root_client->scroller_proportion * max_client_height) > (root_client->scroller_proportion * max_client_height) >
m->w.height - 2 * scroller_structs - cur_gappiv) && m->w.height - 2 * scroller_structs - cur_gappiv) &&
scroller_prefer_center)) { scroller_prefer_center)) {

17
src/mango.c
View file

@ -100,7 +100,7 @@
A->geom.x + A->geom.width < A->mon->m.x + A->mon->m.width && \ A->geom.x + A->geom.width < A->mon->m.x + A->mon->m.width && \
A->geom.y + A->geom.height < A->mon->m.y + A->mon->m.height) A->geom.y + A->geom.height < A->mon->m.y + A->mon->m.height)
#define ISTILED(A) \ #define ISTILED(A) \
(!(A)->isfloating && !(A)->isminied && !(A)->iskilling && \ (A && !(A)->isfloating && !(A)->isminied && !(A)->iskilling && \
!client_should_ignore_focus(A) && !(A)->isunglobal && \ !client_should_ignore_focus(A) && !(A)->isunglobal && \
!(A)->animation.tagouting && !(A)->ismaxmizescreen && !(A)->isfullscreen) !(A)->animation.tagouting && !(A)->ismaxmizescreen && !(A)->isfullscreen)
#define VISIBLEON(C, M) \ #define VISIBLEON(C, M) \
@ -434,7 +434,7 @@ struct Monitor {
int gappoh; /* horizontal outer gaps */ int gappoh; /* horizontal outer gaps */
int gappov; /* vertical outer gaps */ int gappov; /* vertical outer gaps */
Pertag *pertag; Pertag *pertag;
Client *sel, *prevsel; Client *sel, *prevtilesel;
int isoverview; int isoverview;
int is_in_hotarea; int is_in_hotarea;
int gamma_lut_changed; int gamma_lut_changed;
@ -1893,7 +1893,7 @@ buttonpress(struct wl_listener *listener, void *data) {
client_update_oldmonname_record(grabc, selmon); client_update_oldmonname_record(grabc, selmon);
setmon(grabc, selmon, 0, true); setmon(grabc, selmon, 0, true);
reset_foreign_tolevel(grabc); reset_foreign_tolevel(grabc);
selmon->prevsel = selmon->sel; selmon->prevtilesel = ISTILED(selmon->sel) ? selmon->sel : NULL;
selmon->sel = grabc; selmon->sel = grabc;
tmpc = grabc; tmpc = grabc;
grabc = NULL; grabc = NULL;
@ -3059,8 +3059,7 @@ void focusclient(Client *c, int lift) {
if (c && !c->iskilling && !client_is_unmanaged(c) && c->mon) { if (c && !c->iskilling && !client_is_unmanaged(c) && c->mon) {
selmon = c->mon; selmon = c->mon;
selmon->prevsel = selmon->prevtilesel = ISTILED(selmon->sel) ? selmon->sel : NULL;
selmon->sel && ISTILED(selmon->sel) ? selmon->sel : NULL;
selmon->sel = c; selmon->sel = c;
// decide whether need to re-arrange // decide whether need to re-arrange
@ -4496,8 +4495,8 @@ void setmon(Client *c, Monitor *m, unsigned int newtags, bool focus) {
oldmon->sel = NULL; oldmon->sel = NULL;
} }
if (oldmon && oldmon->prevsel == c) { if (oldmon && oldmon->prevtilesel == c) {
oldmon->prevsel = NULL; oldmon->prevtilesel = NULL;
} }
c->mon = m; c->mon = m;
@ -5103,8 +5102,8 @@ void unmapnotify(struct wl_listener *listener, void *data) {
if (c == m->sel) { if (c == m->sel) {
m->sel = NULL; m->sel = NULL;
} }
if (c == m->prevsel) { if (c == m->prevtilesel) {
m->prevsel = NULL; m->prevtilesel = NULL;
} }
} }