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

Rolling back workaround for systray not displaying when designated monitor is removed (ref. hotplugging issues)

Browse Source
This commit is contained in:
bakkeby 2020-11-14 08:40:31 +01:00
parent 3e3afde993
commit 1b9e0d9a88
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dwm.c
View File

@ -1647,9 +1647,6 @@ drawbarwin(Bar *bar)
int r, w, total_drawn = 0; int r, w, total_drawn = 0;
int rx, lx, rw, lw; // bar size, split between left and right if a center module is added int rx, lx, rw, lw; // bar size, split between left and right if a center module is added
const BarRule *br; const BarRule *br;
#if BAR_SYSTRAY_PATCH
Monitor *lastmon;
#endif // BAR_SYSTRAY_PATCH
if (bar->borderpx) { if (bar->borderpx) {
XSetForeground(drw->dpy, drw->gc, scheme[bar->borderscheme][ColBorder].pixel); XSetForeground(drw->dpy, drw->gc, scheme[bar->borderscheme][ColBorder].pixel);
@ -1663,21 +1660,13 @@ drawbarwin(Bar *bar)
rw = lw = bar->bw - 2 * bar->borderpx; rw = lw = bar->bw - 2 * bar->borderpx;
rx = lx = bar->borderpx; rx = lx = bar->borderpx;
#if BAR_SYSTRAY_PATCH
for (lastmon = mons; lastmon && lastmon->next; lastmon = lastmon->next);
#endif // BAR_SYSTRAY_PATCH
drw_setscheme(drw, scheme[SchemeNorm]); drw_setscheme(drw, scheme[SchemeNorm]);
drw_rect(drw, lx, bar->borderpx, lw, bar->bh - 2 * bar->borderpx, 1, 1); drw_rect(drw, lx, bar->borderpx, lw, bar->bh - 2 * bar->borderpx, 1, 1);
for (r = 0; r < LENGTH(barrules); r++) { for (r = 0; r < LENGTH(barrules); r++) {
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->index)
#if BAR_SYSTRAY_PATCH
&& (br->drawfunc != draw_systray || (lastmon->index >= br->monitor && bar->mon->index == 0)) // hack: draw systray on first monitor if the designated one is not available
#endif // BAR_SYSTRAY_PATCH
)
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);