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

staticstatus + extrabar: Allow extrabar to be static on a monitor other than that of the main staticstatus monitor

Browse Source
This commit is contained in:
bakkeby 2020-07-08 14:13:29 +02:00
parent ccb275b984
commit fbaa215a14
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.def.h
View File

@ -57,6 +57,9 @@ static const int quit_empty_window_count = 2; /* only allow dwm to quit if no
#if EXTRABAR_PATCH #if EXTRABAR_PATCH
static const char statussep = ';'; /* separator between status bars */ static const char statussep = ';'; /* separator between status bars */
static const int ebalign = 0; /* extrabar alignment: 0 - left, 1 - right, 2 - center */ static const int ebalign = 0; /* extrabar alignment: 0 - left, 1 - right, 2 - center */
#if STATICSTATUS_PATCH && !STATUSALLMONS_PATCH
static const int statebmonval = statmonval;
#endif // STATICSTATUS_PATCH
#endif // EXTRABAR_PATCH #endif // EXTRABAR_PATCH
#if PANGO_PATCH #if PANGO_PATCH
static const char font[] = "monospace 10"; static const char font[] = "monospace 10";

25
dwm.c
View File

@ -593,6 +593,9 @@ static Drw *drw;
static Monitor *mons, *selmon; static Monitor *mons, *selmon;
#if STATICSTATUS_PATCH && !STATUSALLMONS_PATCH #if STATICSTATUS_PATCH && !STATUSALLMONS_PATCH
static Monitor *statmon; static Monitor *statmon;
#if EXTRABAR_PATCH
static Monitor *statebmon;
#endif // EXTRABAR_PATCH
#endif // STATICSTATUS_PATCH #endif // STATICSTATUS_PATCH
static Window root, wmcheckwin; static Window root, wmcheckwin;
@ -1993,7 +1996,7 @@ drawbar(Monitor *m)
#if EXTRABAR_PATCH #if EXTRABAR_PATCH
#if STATICSTATUS_PATCH #if STATICSTATUS_PATCH
if (m == statmon && m->extrabarwin) if (m == statebmon && m->extrabarwin)
#else #else
if (m == selmon && m->extrabarwin) if (m == selmon && m->extrabarwin)
#endif // STATICSTATUS_PATCH #endif // STATICSTATUS_PATCH
@ -4019,7 +4022,7 @@ updatebars(void)
} }
#if EXTRABAR_PATCH #if EXTRABAR_PATCH
#if STATICSTATUS_PATCH #if STATICSTATUS_PATCH
if (m == statmon && !m->extrabarwin) if (m == statebmon && !m->extrabarwin)
#else #else
if (!m->extrabarwin) if (!m->extrabarwin)
#endif // STATICSTATUS_PATCH #endif // STATICSTATUS_PATCH
@ -4060,7 +4063,7 @@ updatebarpos(Monitor *m)
#if EXTRABAR_PATCH #if EXTRABAR_PATCH
int num_bars; int num_bars;
#if STATICSTATUS_PATCH #if STATICSTATUS_PATCH
int has_extrabar = (m == statmon); int has_extrabar = (m == statebmon);
#else #else
int has_extrabar = 1; int has_extrabar = 1;
#endif // STATICSTATUS_PATCH #endif // STATICSTATUS_PATCH
@ -4157,6 +4160,10 @@ updategeom(void)
#if STATICSTATUS_PATCH && !STATUSALLMONS_PATCH #if STATICSTATUS_PATCH && !STATUSALLMONS_PATCH
if (i == statmonval) if (i == statmonval)
statmon = m; statmon = m;
#if EXTRABAR_PATCH
if (i == statebmonval)
statebmon = m;
#endif // EXTRABAR_PATCH
#endif // STATICSTATUS_PATCH #endif // STATICSTATUS_PATCH
if (i >= n if (i >= n
|| unique[i].x_org != m->mx || unique[i].y_org != m->my || unique[i].x_org != m->mx || unique[i].y_org != m->my
@ -4187,6 +4194,10 @@ updategeom(void)
#if STATICSTATUS_PATCH && !STATUSALLMONS_PATCH #if STATICSTATUS_PATCH && !STATUSALLMONS_PATCH
if (m == statmon) if (m == statmon)
statmon = mons; statmon = mons;
#if EXTRABAR_PATCH
if (m == statebmon)
statebmon = mons;
#endif // EXTRABAR_PATCH
#endif // STATICSTATUS_PATCH #endif // STATICSTATUS_PATCH
cleanupmon(m); cleanupmon(m);
} }
@ -4207,6 +4218,10 @@ updategeom(void)
#if STATICSTATUS_PATCH && !STATUSALLMONS_PATCH #if STATICSTATUS_PATCH && !STATUSALLMONS_PATCH
if (!statmon) if (!statmon)
statmon = mons; statmon = mons;
#if EXTRABAR_PATCH
if (!statebmon)
statebmon = mons;
#endif // EXTRABAR_PATCH
#endif // STATICSTATUS_PATCH #endif // STATICSTATUS_PATCH
if (dirty) { if (dirty) {
selmon = mons; selmon = mons;
@ -4331,6 +4346,10 @@ updatestatus(void)
drawbar(m); drawbar(m);
#elif STATICSTATUS_PATCH #elif STATICSTATUS_PATCH
drawbar(statmon); drawbar(statmon);
#if EXTRABAR_PATCH
if (statmon != statebmon)
drawbar(statebmon);
#endif // EXTRABAR_PATCH
#else #else
drawbar(selmon); drawbar(selmon);
#endif // STATUSALLMONS_PATCH | STATICSTATUS_PATCH #endif // STATUSALLMONS_PATCH | STATICSTATUS_PATCH