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

dwmblocks and status2d buttonpress adjustments for awesomebar and statuspadding

Browse Source
This commit is contained in:
bakkeby 2020-05-28 07:15:00 +02:00
parent 2e30bddc16
commit 8236f1940b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dwm.c
View File

@ -737,13 +737,9 @@ buttonpress(XEvent *e)
#if STATUSCMD_PATCH && !DWMBLOCKS_PATCH #if STATUSCMD_PATCH && !DWMBLOCKS_PATCH
lastbutton = ev->button; lastbutton = ev->button;
#endif // STATUSCMD_PATCH | DWMBLOCKS_PATCH #endif // STATUSCMD_PATCH | DWMBLOCKS_PATCH
#if AWESOMEBAR_PATCH || STATUSCMD_PATCH
padding += lrpad - 2;
#endif // AWESOMEBAR_PATCH | STATUSCMD_PATCH
#if SYSTRAY_PATCH #if SYSTRAY_PATCH
padding -= getsystraywidth(); padding -= getsystraywidth();
#endif // SYSTRAY_PATCH #endif // SYSTRAY_PATCH
#if TAGGRID_PATCH #if TAGGRID_PATCH
columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0); columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0);
#endif // TAGGRID_PATCH #endif // TAGGRID_PATCH
@ -811,11 +807,14 @@ buttonpress(XEvent *e)
{ {
click = ClkStatusText; click = ClkStatusText;
xc = selmon->ww - tw + padding; xc = selmon->ww - tw + padding;
#if STATUSPADDING_PATCH
xc += lrpad / 2;
#endif // STATUSPADDING_PATCH
char *text = rawstext; char *text = rawstext;
int i = -1; int i = -1;
char ch; char ch;
#if DWMBLOCKS_PATCH #if DWMBLOCKS_PATCH
dwmblockssig = 0; dwmblockssig = -1;
#else #else
statuscmdn = 0; statuscmdn = 0;
#endif // DWMBLOCKS_PATCH #endif // DWMBLOCKS_PATCH
@ -831,16 +830,22 @@ buttonpress(XEvent *e)
text[i] = ch; text[i] = ch;
text += i+1; text += i+1;
i = -1; i = -1;
if (xc >= ev->x)
break;
#if DWMBLOCKS_PATCH #if DWMBLOCKS_PATCH
if (xc >= ev->x && dwmblockssig != -1)
break;
dwmblockssig = ch; dwmblockssig = ch;
#else #else
if (xc >= ev->x)
break;
if (ch <= LENGTH(statuscmds)) if (ch <= LENGTH(statuscmds))
statuscmdn = ch - 1; statuscmdn = ch - 1;
#endif // DWMBLOCKS_PATCH #endif // DWMBLOCKS_PATCH
} }
} }
#if DWMBLOCKS_PATCH
if (dwmblockssig == -1)
dwmblockssig = 0;
#endif // DWMBLOCKS_PATCH
} }
#endif // STATUSCMD_PATCH #endif // STATUSCMD_PATCH
#if AWESOMEBAR_PATCH #if AWESOMEBAR_PATCH