osama/dwm
1
0
Fork 0
mirror of https://github.com/mintycube/dwm.git synced 2024-10-22 14:05:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

For all intensive purposes the monitor index is the same as monitor num, thus refactoring to use the latter

Browse Source
This commit is contained in:
bakkeby 2022-04-17 10:33:26 +02:00
parent b2fbf08d3c
commit 49fc922f0d
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dwm.c
View File

@ -440,7 +440,6 @@ typedef struct {
typedef struct Pertag Pertag; typedef struct Pertag Pertag;
#endif // PERTAG_PATCH #endif // PERTAG_PATCH
struct Monitor { struct Monitor {
int index;
char ltsymbol[16]; char ltsymbol[16];
float mfact; float mfact;
#if FLEXTILE_DELUXE_LAYOUT #if FLEXTILE_DELUXE_LAYOUT
@ -1119,7 +1118,7 @@ buttonpress(XEvent *e)
br = &barrules[r]; br = &barrules[r];
if (br->bar != bar->idx || (br->monitor == 'A' && m != selmon) || br->clickfunc == NULL) if (br->bar != bar->idx || (br->monitor == 'A' && m != selmon) || br->clickfunc == NULL)
continue; continue;
if (br->monitor != 'A' && br->monitor != -1 && br->monitor != bar->mon->index) if (br->monitor != 'A' && br->monitor != -1 && br->monitor != bar->mon->num)
continue; continue;
if (bar->x[r] <= ev->x && ev->x <= bar->x[r] + bar->w[r]) { if (bar->x[r] <= ev->x && ev->x <= bar->x[r] + bar->w[r]) {
carg.x = ev->x - bar->x[r]; carg.x = ev->x - bar->x[r];
@ -1556,11 +1555,11 @@ createmon(void)
m->gappov = gappov; m->gappov = gappov;
#endif // VANITYGAPS_PATCH #endif // VANITYGAPS_PATCH
for (mi = 0, mon = mons; mon; mon = mon->next, mi++); // monitor index for (mi = 0, mon = mons; mon; mon = mon->next, mi++); // monitor index
m->index = mi; m->num = mi;
#if MONITOR_RULES_PATCH #if MONITOR_RULES_PATCH
for (j = 0; j < LENGTH(monrules); j++) { for (j = 0; j < LENGTH(monrules); j++) {
mr = &monrules[j]; mr = &monrules[j];
if ((mr->monitor == -1 || mr->monitor == mi) if ((mr->monitor == -1 || mr->monitor == m->num)
#if PERTAG_PATCH #if PERTAG_PATCH
&& (mr->tag <= 0 || (m->tagset[0] & (1 << (mr->tag - 1)))) && (mr->tag <= 0 || (m->tagset[0] & (1 << (mr->tag - 1))))
#endif // PERTAG_PATCH #endif // PERTAG_PATCH
@ -1591,7 +1590,7 @@ createmon(void)
/* Derive the number of bars for this monitor based on bar rules */ /* Derive the number of bars for this monitor based on bar rules */
for (n = -1, i = 0; i < LENGTH(barrules); i++) { for (n = -1, i = 0; i < LENGTH(barrules); i++) {
br = &barrules[i]; br = &barrules[i];
if (br->monitor == 'A' || br->monitor == -1 || br->monitor == mi) if (br->monitor == 'A' || br->monitor == -1 || br->monitor == m->num)
n = MAX(br->bar, n); n = MAX(br->bar, n);
} }
@ -1652,7 +1651,7 @@ createmon(void)
#if MONITOR_RULES_PATCH #if MONITOR_RULES_PATCH
for (j = 0; j < LENGTH(monrules); j++) { for (j = 0; j < LENGTH(monrules); j++) {
mr = &monrules[j]; mr = &monrules[j];
if ((mr->monitor == -1 || mr->monitor == mi) && (mr->tag == -1 || mr->tag == i)) { if ((mr->monitor == -1 || mr->monitor == m->num) && (mr->tag == -1 || mr->tag == i)) {
layout = MAX(mr->layout, 0); layout = MAX(mr->layout, 0);
layout = MIN(layout, LENGTH(layouts) - 1); layout = MIN(layout, LENGTH(layouts) - 1);
m->pertag->ltidxs[i][0] = &layouts[layout]; m->pertag->ltidxs[i][0] = &layouts[layout];
@ -1817,7 +1816,7 @@ drawbarwin(Bar *bar)
br = &barrules[r]; br = &barrules[r];
if (br->bar != bar->idx || !br->widthfunc || (br->monitor == 'A' && bar->mon != selmon)) if (br->bar != bar->idx || !br->widthfunc || (br->monitor == 'A' && bar->mon != selmon))
continue; continue;
if (br->monitor != 'A' && br->monitor != -1 && br->monitor != bar->mon->index) if (br->monitor != 'A' && br->monitor != -1 && br->monitor != bar->mon->num)
continue; continue;
drw_setscheme(drw, scheme[SchemeNorm]); drw_setscheme(drw, scheme[SchemeNorm]);
warg.w = (br->alignment < BAR_ALIGN_RIGHT_LEFT ? lw : rw); warg.w = (br->alignment < BAR_ALIGN_RIGHT_LEFT ? lw : rw);
@ -4521,8 +4520,6 @@ updategeom(void)
selmon = mons; selmon = mons;
cleanupmon(m); cleanupmon(m);
} }
for (i = 0, m = mons; m; m = m->next, i++)
m->index = i;
free(unique); free(unique);
} else } else
#endif /* XINERAMA */ #endif /* XINERAMA */

2
patch/bar_tagicons.c
View File

@ -4,7 +4,7 @@ tagicon(Monitor *m, int tag)
#if BAR_ALTTAGSDECORATION_PATCH #if BAR_ALTTAGSDECORATION_PATCH
Client *c; Client *c;
#endif // BAR_ALTTAGSDECORATION_PATCH #endif // BAR_ALTTAGSDECORATION_PATCH
int tagindex = tag + NUMTAGS * m->index; int tagindex = tag + NUMTAGS * m->num;
if (tagindex >= LENGTH(tagicons[DEFAULT_TAGS])) if (tagindex >= LENGTH(tagicons[DEFAULT_TAGS]))
tagindex = tagindex % LENGTH(tagicons[DEFAULT_TAGS]); tagindex = tagindex % LENGTH(tagicons[DEFAULT_TAGS]);
#if BAR_ALTTAGSDECORATION_PATCH #if BAR_ALTTAGSDECORATION_PATCH