Add barmodules
This commit is contained in:
parent
a759a807b5
commit
c031927603
31
bar/bar_dwmblocks.c
Normal file
31
bar/bar_dwmblocks.c
Normal file
|
@ -0,0 +1,31 @@
|
|||
static int dwmblockssig;
|
||||
pid_t dwmblockspid = 0;
|
||||
|
||||
int
|
||||
getdwmblockspid()
|
||||
{
|
||||
char buf[16];
|
||||
FILE *fp = popen("pidof -s dwmblocks", "r");
|
||||
if (fgets(buf, sizeof(buf), fp));
|
||||
pid_t pid = strtoul(buf, NULL, 10);
|
||||
pclose(fp);
|
||||
dwmblockspid = pid;
|
||||
return pid != 0 ? 0 : -1;
|
||||
}
|
||||
|
||||
void
|
||||
sigdwmblocks(const Arg *arg)
|
||||
{
|
||||
union sigval sv;
|
||||
sv.sival_int = (dwmblockssig << 8) | arg->i;
|
||||
if (!dwmblockspid)
|
||||
if (getdwmblockspid() == -1)
|
||||
return;
|
||||
|
||||
if (sigqueue(dwmblockspid, SIGUSR1, sv) == -1) {
|
||||
if (errno == ESRCH) {
|
||||
if (!getdwmblockspid())
|
||||
sigqueue(dwmblockspid, SIGUSR1, sv);
|
||||
}
|
||||
}
|
||||
}
|
2
bar/bar_dwmblocks.h
Normal file
2
bar/bar_dwmblocks.h
Normal file
|
@ -0,0 +1,2 @@
|
|||
static int getdwmblockspid();
|
||||
static void sigdwmblocks(const Arg *arg);
|
17
bar/bar_ltsymbol.c
Normal file
17
bar/bar_ltsymbol.c
Normal file
|
@ -0,0 +1,17 @@
|
|||
int
|
||||
width_ltsymbol(Bar *bar, BarWidthArg *a)
|
||||
{
|
||||
return TEXTW(bar->mon->ltsymbol);
|
||||
}
|
||||
|
||||
int
|
||||
draw_ltsymbol(Bar *bar, BarDrawArg *a)
|
||||
{
|
||||
return drw_text(drw, a->x, 0, a->w, bh, lrpad / 2, bar->mon->ltsymbol, 0, False, col_gray3, col_gray1, 255, 255);
|
||||
}
|
||||
|
||||
int
|
||||
click_ltsymbol(Bar *bar, Arg *arg, BarClickArg *a)
|
||||
{
|
||||
return ClkLtSymbol;
|
||||
}
|
3
bar/bar_ltsymbol.h
Normal file
3
bar/bar_ltsymbol.h
Normal file
|
@ -0,0 +1,3 @@
|
|||
static int width_ltsymbol(Bar *bar, BarWidthArg *a);
|
||||
static int draw_ltsymbol(Bar *bar, BarDrawArg *a);
|
||||
static int click_ltsymbol(Bar *bar, Arg *arg, BarClickArg *a);
|
19
bar/bar_status.c
Normal file
19
bar/bar_status.c
Normal file
|
@ -0,0 +1,19 @@
|
|||
int
|
||||
width_status(Bar *bar, BarWidthArg *a)
|
||||
{
|
||||
return TEXTW(stext);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
draw_status(Bar *bar, BarDrawArg *a)
|
||||
{
|
||||
return drw_text(drw, a->x, 0, a->w, bh, lrpad / 2, stext, 0);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
click_status(Bar *bar, Arg *arg, BarClickArg *a)
|
||||
{
|
||||
return ClkStatusText;
|
||||
}
|
3
bar/bar_status.h
Normal file
3
bar/bar_status.h
Normal file
|
@ -0,0 +1,3 @@
|
|||
static int width_status(Bar *bar, BarWidthArg *a);
|
||||
static int draw_status(Bar *bar, BarDrawArg *a);
|
||||
static int click_status(Bar *bar, Arg *arg, BarClickArg *a);
|
159
bar/bar_status2d.c
Normal file
159
bar/bar_status2d.c
Normal file
|
@ -0,0 +1,159 @@
|
|||
int
|
||||
width_status2d(Bar *bar, BarWidthArg *a)
|
||||
{
|
||||
return status2dtextlength(rawstext) + lrpad;
|
||||
}
|
||||
|
||||
int
|
||||
width_status2d_es(Bar *bar, BarWidthArg *a)
|
||||
{
|
||||
return status2dtextlength(rawestext);
|
||||
}
|
||||
|
||||
int
|
||||
draw_status2d(Bar *bar, BarDrawArg *a)
|
||||
{
|
||||
return drawstatusbar(a->x, rawstext);
|
||||
}
|
||||
|
||||
int
|
||||
draw_status2d_es(Bar *bar, BarDrawArg *a)
|
||||
{
|
||||
return drawstatusbar(a->x, rawestext);
|
||||
}
|
||||
|
||||
int
|
||||
drawstatusbar(int x, char* stext)
|
||||
{
|
||||
int i, w, len;
|
||||
short isCode = 0;
|
||||
char *text;
|
||||
char *p;
|
||||
|
||||
len = strlen(stext);
|
||||
if (!(text = (char*) malloc(sizeof(char)*(len + 1))))
|
||||
die("malloc");
|
||||
p = text;
|
||||
copyvalidchars(text, stext);
|
||||
text[len] = '\0';
|
||||
|
||||
x += lrpad / 2;
|
||||
|
||||
char *fgc = col_gray3;
|
||||
char *bgc = col_gray1;
|
||||
int fga = 255;
|
||||
int bga = 255;
|
||||
|
||||
/* process status text */
|
||||
i = -1;
|
||||
while (text[++i]) {
|
||||
if (text[i] == '^' && !isCode) {
|
||||
isCode = 1;
|
||||
|
||||
text[i] = '\0';
|
||||
w = TEXTW(text) - lrpad;
|
||||
drw_text(drw, x, 0, w, bh, 0, text, 0, True, fgc, bgc, fga, bga);
|
||||
|
||||
x += w;
|
||||
|
||||
/* process code */
|
||||
while (text[++i] != '^') {
|
||||
if (text[i] == 'c') {
|
||||
char buf[8];
|
||||
if (i + 7 > len - 1) {
|
||||
i += 7;
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
memcpy(buf, (char*)text+i+1, 7);
|
||||
buf[7] = '\0';
|
||||
fgc = buf;
|
||||
i += 7;
|
||||
} else if (text[i] == 'b') {
|
||||
char buf[8];
|
||||
if (i + 7 > len - 1) {
|
||||
i += 7;
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
memcpy(buf, (char*)text+i+1, 7);
|
||||
buf[7] = '\0';
|
||||
bgc = buf;
|
||||
i += 7;
|
||||
} else if (text[i] == 'd') {
|
||||
fgc = col_gray3;
|
||||
bgc = col_gray1;
|
||||
} else if (text[i] == 'r') {
|
||||
int rx = atoi(text + ++i);
|
||||
while (text[++i] != ',');
|
||||
int ry = atoi(text + ++i);
|
||||
while (text[++i] != ',');
|
||||
int rw = atoi(text + ++i);
|
||||
while (text[++i] != ',');
|
||||
int rh = atoi(text + ++i);
|
||||
|
||||
if (ry < 0)
|
||||
ry = 0;
|
||||
if (rx < 0)
|
||||
rx = 0;
|
||||
|
||||
drw_rect(drw, rx + x, ry, rw, rh, 1, 0, fgc, bgc, fga, bga);
|
||||
} else if (text[i] == 'f') {
|
||||
x += atoi(text + ++i);
|
||||
}
|
||||
}
|
||||
|
||||
text = text + i + 1;
|
||||
len -= i + 1;
|
||||
i=-1;
|
||||
isCode = 0;
|
||||
}
|
||||
}
|
||||
if (!isCode && len) {
|
||||
w = TEXTW(text) - lrpad;
|
||||
drw_text(drw, x, 0, w, bh, 0, text, 0, False, fgc, bgc, fga, bga);
|
||||
x += w;
|
||||
}
|
||||
free(p);
|
||||
|
||||
return x;
|
||||
}
|
||||
|
||||
int
|
||||
status2dtextlength(char* stext)
|
||||
{
|
||||
int i, w, len;
|
||||
short isCode = 0;
|
||||
char *text;
|
||||
char *p;
|
||||
|
||||
len = strlen(stext) + 1;
|
||||
if (!(text = (char*) malloc(sizeof(char)*len)))
|
||||
die("malloc");
|
||||
p = text;
|
||||
copyvalidchars(text, stext);
|
||||
|
||||
/* compute width of the status text */
|
||||
w = 0;
|
||||
i = -1;
|
||||
while (text[++i]) {
|
||||
if (text[i] == '^') {
|
||||
if (!isCode) {
|
||||
isCode = 1;
|
||||
text[i] = '\0';
|
||||
w += TEXTW(text) - lrpad;
|
||||
text[i] = '^';
|
||||
if (text[++i] == 'f')
|
||||
w += atoi(text + ++i);
|
||||
} else {
|
||||
isCode = 0;
|
||||
text = text + i + 1;
|
||||
i = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!isCode)
|
||||
w += TEXTW(text) - lrpad;
|
||||
free(p);
|
||||
return w;
|
||||
}
|
6
bar/bar_status2d.h
Normal file
6
bar/bar_status2d.h
Normal file
|
@ -0,0 +1,6 @@
|
|||
static int width_status2d(Bar *bar, BarWidthArg *a);
|
||||
static int width_status2d_es(Bar *bar, BarWidthArg *a);
|
||||
static int draw_status2d(Bar *bar, BarDrawArg *a);
|
||||
static int draw_status2d_es(Bar *bar, BarDrawArg *a);
|
||||
static int drawstatusbar(int x, char *text);
|
||||
static int status2dtextlength(char *stext);
|
49
bar/bar_statuscmd.c
Normal file
49
bar/bar_statuscmd.c
Normal file
|
@ -0,0 +1,49 @@
|
|||
int
|
||||
click_statuscmd(Bar *bar, Arg *arg, BarClickArg *a)
|
||||
{
|
||||
return click_statuscmd_text(arg, a->rel_x, rawstext);
|
||||
}
|
||||
|
||||
int
|
||||
click_statuscmd_es(Bar *bar, Arg *arg, BarClickArg *a)
|
||||
{
|
||||
return click_statuscmd_text(arg, a->rel_x, rawestext);
|
||||
}
|
||||
|
||||
int
|
||||
click_statuscmd_text(Arg *arg, int rel_x, char *text)
|
||||
{
|
||||
int i = -1;
|
||||
int x = 0;
|
||||
char ch;
|
||||
dwmblockssig = -1;
|
||||
while (text[++i]) {
|
||||
if ((unsigned char)text[i] < ' ') {
|
||||
ch = text[i];
|
||||
text[i] = '\0';
|
||||
x += status2dtextlength(text);
|
||||
text[i] = ch;
|
||||
text += i+1;
|
||||
i = -1;
|
||||
if (x >= rel_x && dwmblockssig != -1)
|
||||
break;
|
||||
dwmblockssig = ch;
|
||||
}
|
||||
}
|
||||
if (dwmblockssig == -1)
|
||||
dwmblockssig = 0;
|
||||
return ClkStatusText;
|
||||
}
|
||||
|
||||
void
|
||||
copyvalidchars(char *text, char *rawtext)
|
||||
{
|
||||
int i = -1, j = 0;
|
||||
|
||||
while (rawtext[++i]) {
|
||||
if ((unsigned char)rawtext[i] >= ' ') {
|
||||
text[j++] = rawtext[i];
|
||||
}
|
||||
}
|
||||
text[j] = '\0';
|
||||
}
|
4
bar/bar_statuscmd.h
Normal file
4
bar/bar_statuscmd.h
Normal file
|
@ -0,0 +1,4 @@
|
|||
static int click_statuscmd(Bar *bar, Arg *arg, BarClickArg *a);
|
||||
static int click_statuscmd_es(Bar *bar, Arg *arg, BarClickArg *a);
|
||||
static int click_statuscmd_text(Arg *arg, int rel_x, char *text);
|
||||
static void copyvalidchars(char *text, char *rawtext);
|
56
bar/bar_tags.c
Normal file
56
bar/bar_tags.c
Normal file
|
@ -0,0 +1,56 @@
|
|||
int
|
||||
width_tags(Bar *bar, BarWidthArg *a)
|
||||
{
|
||||
int w, i;
|
||||
|
||||
for (w = 0, i = 0; i < LENGTH(tags); i++) {
|
||||
w += TEXTW(tags[i]);
|
||||
}
|
||||
return w;
|
||||
}
|
||||
|
||||
int
|
||||
draw_tags(Bar *bar, BarDrawArg *a)
|
||||
{
|
||||
int w, x = a->x;
|
||||
int boxs = drw->font->h / 9;
|
||||
int boxw = drw->font->h / 6 + 2;
|
||||
unsigned int i, occ = 0, urg = 0;
|
||||
Client *c;
|
||||
Monitor *m = bar->mon;
|
||||
|
||||
for (c = m->clients; c; c = c->next) {
|
||||
occ |= c->tags;
|
||||
if (c->isurgent)
|
||||
urg |= c->tags;
|
||||
}
|
||||
|
||||
for (i = 0; i < LENGTH(tags); i++) {
|
||||
w = TEXTW(tags[i]);
|
||||
|
||||
int ts = m->tagset[m->seltags] & 1 << i ? 1 : 0;
|
||||
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i, False, ts ? col_gray4 : col_gray3, ts ? col_cyan : col_gray1, 255, 255);
|
||||
if (occ & 1 << i)
|
||||
drw_rect(drw, x + boxs, boxs, boxw, boxw,
|
||||
m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
|
||||
urg & 1 << i, ts ? col_gray4 : col_gray3, ts ? col_cyan : col_gray1, 255, 255);
|
||||
|
||||
x += w;
|
||||
}
|
||||
|
||||
return x;
|
||||
}
|
||||
|
||||
int
|
||||
click_tags(Bar *bar, Arg *arg, BarClickArg *a)
|
||||
{
|
||||
int i = 0, x = lrpad / 2;
|
||||
|
||||
do {
|
||||
x += TEXTW(tags[i]);
|
||||
} while (a->rel_x >= x && ++i < LENGTH(tags));
|
||||
if (i < LENGTH(tags)) {
|
||||
arg->ui = 1 << i;
|
||||
}
|
||||
return ClkTagBar;
|
||||
}
|
3
bar/bar_tags.h
Normal file
3
bar/bar_tags.h
Normal file
|
@ -0,0 +1,3 @@
|
|||
static int width_tags(Bar *bar, BarWidthArg *a);
|
||||
static int draw_tags(Bar *bar, BarDrawArg *a);
|
||||
static int click_tags(Bar *bar, Arg *arg, BarClickArg *a);
|
29
bar/bar_wintitle.c
Normal file
29
bar/bar_wintitle.c
Normal file
|
@ -0,0 +1,29 @@
|
|||
int
|
||||
width_wintitle(Bar *bar, BarWidthArg *a)
|
||||
{
|
||||
return a->max_width;
|
||||
}
|
||||
|
||||
int
|
||||
draw_wintitle(Bar *bar, BarDrawArg *a)
|
||||
{
|
||||
int boxs = drw->font->h / 9;
|
||||
int boxw = drw->font->h / 6 + 2;
|
||||
int x = a->x, w = a->w;
|
||||
Monitor *m = bar->mon;
|
||||
|
||||
if (m->sel) {
|
||||
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0, False, m == selmon ? col_gray4 : col_gray3, m == selmon ? col_cyan : col_gray1, 255, 255);
|
||||
if (m->sel->isfloating)
|
||||
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0, m == selmon ? col_gray4 : col_gray3, m == selmon ? col_cyan : col_gray1, 255, 255);
|
||||
} else {
|
||||
drw_rect(drw, x, 0, w, bh, 1, 1, col_gray3, col_gray1, 255, 255);
|
||||
}
|
||||
return x + w;
|
||||
}
|
||||
|
||||
int
|
||||
click_wintitle(Bar *bar, Arg *arg, BarClickArg *a)
|
||||
{
|
||||
return ClkWinTitle;
|
||||
}
|
3
bar/bar_wintitle.h
Normal file
3
bar/bar_wintitle.h
Normal file
|
@ -0,0 +1,3 @@
|
|||
static int width_wintitle(Bar *bar, BarWidthArg *a);
|
||||
static int draw_wintitle(Bar *bar, BarDrawArg *a);
|
||||
static int click_wintitle(Bar *bar, Arg *arg, BarClickArg *a);
|
8
bar/include.c
Normal file
8
bar/include.c
Normal file
|
@ -0,0 +1,8 @@
|
|||
/* Bar functionality */
|
||||
#include "bar_ltsymbol.c"
|
||||
//#include "bar_status.c"
|
||||
#include "bar_tags.c"
|
||||
#include "bar_wintitle.c"
|
||||
#include "bar_status2d.c"
|
||||
#include "bar_dwmblocks.c"
|
||||
#include "bar_statuscmd.c"
|
8
bar/include.h
Normal file
8
bar/include.h
Normal file
|
@ -0,0 +1,8 @@
|
|||
/* Bar functionality */
|
||||
#include "bar_ltsymbol.h"
|
||||
//#include "bar_status.h"
|
||||
#include "bar_tags.h"
|
||||
#include "bar_wintitle.h"
|
||||
#include "bar_status2d.h"
|
||||
#include "bar_dwmblocks.h"
|
||||
#include "bar_statuscmd.h"
|
29
config.def.h
29
config.def.h
|
@ -5,6 +5,7 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
|
|||
static const unsigned int snap = 32; /* snap pixel */
|
||||
static const int showbar = 1; /* 0 means no bar */
|
||||
static const int topbar = 1; /* 0 means bottom bar */
|
||||
static const char statussep = ';'; /* separator between status bars */
|
||||
static char font[] = "monospace 10";
|
||||
static const char dmenufont[] = "monospace:size=10";
|
||||
static char col_gray1[] = "#222222";
|
||||
|
@ -26,6 +27,28 @@ static const Rule rules[] = {
|
|||
{ "Firefox", NULL, NULL, 1 << 8, 0, -1 },
|
||||
};
|
||||
|
||||
/* Bar rules allow you to configure what is shown where on the bar, as well as
|
||||
* introducing your own bar modules.
|
||||
*
|
||||
* monitor:
|
||||
* -1 show on all monitors
|
||||
* 0 show on monitor 0
|
||||
* 'A' show on active monitor (i.e. focused / selected) (or just -1 for active?)
|
||||
* bar - bar index, 0 is default, 1 is extrabar
|
||||
* alignment - how the module is aligned compared to other modules
|
||||
* widthfunc, drawfunc, clickfunc - providing bar module width, draw and click functions
|
||||
* name - does nothing, intended for visual clue and for logging / debugging
|
||||
*/
|
||||
static const BarRule barrules[] = {
|
||||
/* monitor bar alignment widthfunc drawfunc clickfunc name */
|
||||
{ -1, 0, BAR_ALIGN_LEFT, width_tags, draw_tags, click_tags, "tags" },
|
||||
{ -1, 0, BAR_ALIGN_LEFT, width_ltsymbol, draw_ltsymbol, click_ltsymbol, "layout" },
|
||||
{ 'A', 0, BAR_ALIGN_RIGHT, width_status2d, draw_status2d, click_statuscmd, "status2d" },
|
||||
{ -1, 0, BAR_ALIGN_NONE, width_wintitle, draw_wintitle, click_wintitle, "wintitle" },
|
||||
{ 0, 1, BAR_ALIGN_CENTER, width_status2d_es, draw_status2d_es, click_statuscmd_es, "status2d_es" },
|
||||
|
||||
};
|
||||
|
||||
/* layout(s) */
|
||||
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
||||
static const int nmaster = 1; /* number of clients in master area */
|
||||
|
@ -99,7 +122,11 @@ static const Button buttons[] = {
|
|||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
||||
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
||||
{ ClkStatusText, 0, Button1, sigdwmblocks, {.i = 1 } },
|
||||
{ ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2 } },
|
||||
{ ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3 } },
|
||||
{ ClkStatusText, 0, Button4, sigdwmblocks, {.i = 4 } },
|
||||
{ ClkStatusText, 0, Button5, sigdwmblocks, {.i = 5 } },
|
||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||
|
|
384
dwm.c
384
dwm.c
|
@ -45,6 +45,7 @@
|
|||
#include "util.h"
|
||||
|
||||
/* macros */
|
||||
#define BARRULES 20
|
||||
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
|
||||
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
|
||||
#define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
|
||||
|
@ -66,6 +67,19 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
|||
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
||||
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||||
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
||||
enum {
|
||||
BAR_ALIGN_LEFT,
|
||||
BAR_ALIGN_CENTER,
|
||||
BAR_ALIGN_RIGHT,
|
||||
BAR_ALIGN_LEFT_LEFT,
|
||||
BAR_ALIGN_LEFT_RIGHT,
|
||||
BAR_ALIGN_LEFT_CENTER,
|
||||
BAR_ALIGN_NONE,
|
||||
BAR_ALIGN_RIGHT_LEFT,
|
||||
BAR_ALIGN_RIGHT_RIGHT,
|
||||
BAR_ALIGN_RIGHT_CENTER,
|
||||
BAR_ALIGN_LAST
|
||||
}; /* bar alignment */
|
||||
|
||||
typedef union {
|
||||
int i;
|
||||
|
@ -74,6 +88,46 @@ typedef union {
|
|||
const void *v;
|
||||
} Arg;
|
||||
|
||||
typedef struct Monitor Monitor;
|
||||
typedef struct Bar Bar;
|
||||
struct Bar {
|
||||
Window win;
|
||||
Monitor *mon;
|
||||
Bar *next;
|
||||
int idx;
|
||||
int topbar;
|
||||
int bx, by, bw, bh; /* bar geometry */
|
||||
int w[BARRULES]; // module width
|
||||
int x[BARRULES]; // module position
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
int max_width;
|
||||
} BarWidthArg;
|
||||
|
||||
typedef struct {
|
||||
int x;
|
||||
int w;
|
||||
} BarDrawArg;
|
||||
|
||||
typedef struct {
|
||||
int rel_x;
|
||||
int rel_y;
|
||||
int rel_w;
|
||||
int rel_h;
|
||||
} BarClickArg;
|
||||
|
||||
typedef struct {
|
||||
int monitor;
|
||||
int bar;
|
||||
int alignment; // see bar alignment enum
|
||||
int (*widthfunc)(Bar *bar, BarWidthArg *a);
|
||||
int (*drawfunc)(Bar *bar, BarDrawArg *a);
|
||||
int (*clickfunc)(Bar *bar, Arg *arg, BarClickArg *a);
|
||||
char *name; // for debugging
|
||||
int x, w; // position, width for internal use
|
||||
} BarRule;
|
||||
|
||||
typedef struct {
|
||||
unsigned int click;
|
||||
unsigned int mask;
|
||||
|
@ -82,7 +136,6 @@ typedef struct {
|
|||
const Arg arg;
|
||||
} Button;
|
||||
|
||||
typedef struct Monitor Monitor;
|
||||
typedef struct Client Client;
|
||||
struct Client {
|
||||
char name[256];
|
||||
|
@ -116,19 +169,17 @@ struct Monitor {
|
|||
float mfact;
|
||||
int nmaster;
|
||||
int num;
|
||||
int by; /* bar geometry */
|
||||
int mx, my, mw, mh; /* screen size */
|
||||
int wx, wy, ww, wh; /* window area */
|
||||
unsigned int seltags;
|
||||
unsigned int sellt;
|
||||
unsigned int tagset[2];
|
||||
int showbar;
|
||||
int topbar;
|
||||
Client *clients;
|
||||
Client *sel;
|
||||
Client *stack;
|
||||
Monitor *next;
|
||||
Window barwin;
|
||||
Bar *bar;
|
||||
const Layout *lt[2];
|
||||
};
|
||||
|
||||
|
@ -163,6 +214,7 @@ static void detachstack(Client *c);
|
|||
static Monitor *dirtomon(int dir);
|
||||
static void drawbar(Monitor *m);
|
||||
static void drawbars(void);
|
||||
static void drawbarwin(Bar *bar);
|
||||
static void enternotify(XEvent *e);
|
||||
static void expose(XEvent *e);
|
||||
static void focus(Client *c);
|
||||
|
@ -236,9 +288,13 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
|||
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
||||
static void zoom(const Arg *arg);
|
||||
|
||||
#include "bar/include.h"
|
||||
/* variables */
|
||||
static const char broken[] = "broken";
|
||||
static char stext[256];
|
||||
static char stext[1024];
|
||||
static char rawstext[1024];
|
||||
static char estext[1024];
|
||||
static char rawestext[1024];
|
||||
static int screen;
|
||||
static int sw, sh; /* X display screen geometry width, height */
|
||||
static int bh; /* bar height */
|
||||
|
@ -278,6 +334,8 @@ static Colormap cmap;
|
|||
|
||||
static char *fonts[] = { font };
|
||||
|
||||
#include "bar/include.c"
|
||||
|
||||
/* compile-time check if all tags fit into an unsigned int bit array. */
|
||||
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
|
||||
|
||||
|
@ -425,11 +483,14 @@ attachstack(Client *c)
|
|||
void
|
||||
buttonpress(XEvent *e)
|
||||
{
|
||||
unsigned int i, x, click;
|
||||
int click, i, r, mi;
|
||||
Arg arg = {0};
|
||||
Client *c;
|
||||
Monitor *m;
|
||||
Bar *bar;
|
||||
XButtonPressedEvent *ev = &e->xbutton;
|
||||
const BarRule *br;
|
||||
BarClickArg carg = { 0, 0, 0, 0 };
|
||||
|
||||
click = ClkRootWin;
|
||||
/* focus monitor if necessary */
|
||||
|
@ -438,26 +499,40 @@ buttonpress(XEvent *e)
|
|||
selmon = m;
|
||||
focus(NULL);
|
||||
}
|
||||
if (ev->window == selmon->barwin) {
|
||||
i = x = 0;
|
||||
do
|
||||
x += TEXTW(tags[i]);
|
||||
while (ev->x >= x && ++i < LENGTH(tags));
|
||||
if (i < LENGTH(tags)) {
|
||||
click = ClkTagBar;
|
||||
arg.ui = 1 << i;
|
||||
} else if (ev->x < x + TEXTW(selmon->ltsymbol))
|
||||
click = ClkLtSymbol;
|
||||
else if (ev->x > selmon->ww - (int)TEXTWM(stext))
|
||||
click = ClkStatusText;
|
||||
else
|
||||
click = ClkWinTitle;
|
||||
} else if ((c = wintoclient(ev->window))) {
|
||||
for (mi = 0, m = mons; m && m != selmon; m = m->next, mi++) {
|
||||
; // get the monitor index
|
||||
}
|
||||
|
||||
for (bar = selmon->bar; bar; bar = bar->next) {
|
||||
if (ev->window == bar->win) {
|
||||
for (r = 0; r < LENGTH(barrules); r++) {
|
||||
br = &barrules[r];
|
||||
if (br->bar != bar->idx || (br->monitor == 'A' && m != selmon) || br->clickfunc == NULL)
|
||||
continue;
|
||||
if (br->monitor != 'A' && br->monitor != -1 && br->monitor != mi)
|
||||
continue;
|
||||
if (bar->x[r] <= ev->x && ev->x <= bar->x[r] + bar->w[r]) {
|
||||
carg.rel_x = ev->x - bar->x[r];
|
||||
carg.rel_y = ev->y;
|
||||
carg.rel_w = bar->w[r];
|
||||
carg.rel_h = bar->bh;
|
||||
click = br->clickfunc(bar, &arg, &carg);
|
||||
if (click < 0)
|
||||
return;
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (click == ClkRootWin && (c = wintoclient(ev->window))) {
|
||||
focus(c);
|
||||
restack(selmon);
|
||||
XAllowEvents(dpy, ReplayPointer, CurrentTime);
|
||||
click = ClkClientWin;
|
||||
}
|
||||
|
||||
for (i = 0; i < LENGTH(buttons); i++)
|
||||
if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
|
||||
&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
|
||||
|
@ -504,6 +579,7 @@ void
|
|||
cleanupmon(Monitor *mon)
|
||||
{
|
||||
Monitor *m;
|
||||
Bar *bar;
|
||||
|
||||
if (mon == mons)
|
||||
mons = mons->next;
|
||||
|
@ -511,8 +587,12 @@ cleanupmon(Monitor *mon)
|
|||
for (m = mons; m && m->next != mon; m = m->next);
|
||||
m->next = mon->next;
|
||||
}
|
||||
XUnmapWindow(dpy, mon->barwin);
|
||||
XDestroyWindow(dpy, mon->barwin);
|
||||
for (bar = mon->bar; bar; bar = mon->bar) {
|
||||
XUnmapWindow(dpy, bar->win);
|
||||
XDestroyWindow(dpy, bar->win);
|
||||
mon->bar = bar->next;
|
||||
free(bar);
|
||||
}
|
||||
free(mon);
|
||||
}
|
||||
|
||||
|
@ -558,6 +638,7 @@ void
|
|||
configurenotify(XEvent *e)
|
||||
{
|
||||
Monitor *m;
|
||||
Bar *bar;
|
||||
Client *c;
|
||||
XConfigureEvent *ev = &e->xconfigure;
|
||||
int dirty;
|
||||
|
@ -574,7 +655,8 @@ configurenotify(XEvent *e)
|
|||
for (c = m->clients; c; c = c->next)
|
||||
if (c->isfullscreen)
|
||||
resizeclient(c, m->mx, m->my, m->mw, m->mh);
|
||||
XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
|
||||
for (bar = m->bar; bar; bar = bar->next)
|
||||
XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh);
|
||||
}
|
||||
focus(NULL);
|
||||
arrange(NULL);
|
||||
|
@ -637,17 +719,40 @@ configurerequest(XEvent *e)
|
|||
Monitor *
|
||||
createmon(void)
|
||||
{
|
||||
Monitor *m;
|
||||
Monitor *m, *mon;
|
||||
int i, n, mi, max_bars = 2, istopbar = topbar;
|
||||
|
||||
const BarRule *br;
|
||||
Bar *bar;
|
||||
|
||||
m = ecalloc(1, sizeof(Monitor));
|
||||
m->tagset[0] = m->tagset[1] = 1;
|
||||
m->mfact = mfact;
|
||||
m->nmaster = nmaster;
|
||||
m->showbar = showbar;
|
||||
m->topbar = topbar;
|
||||
|
||||
for (mi = 0, mon = mons; mon; mon = mon->next, mi++); // monitor index
|
||||
m->lt[0] = &layouts[0];
|
||||
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
||||
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
||||
|
||||
/* Derive the number of bars for this monitor based on bar rules */
|
||||
for (n = -1, i = 0; i < LENGTH(barrules); i++) {
|
||||
br = &barrules[i];
|
||||
if (br->monitor == 'A' || br->monitor == -1 || br->monitor == mi)
|
||||
n = MAX(br->bar, n);
|
||||
}
|
||||
|
||||
for (i = 0; i <= n && i < max_bars; i++) {
|
||||
bar = ecalloc(1, sizeof(Bar));
|
||||
bar->mon = m;
|
||||
bar->idx = i;
|
||||
bar->next = m->bar;
|
||||
bar->topbar = istopbar;
|
||||
m->bar = bar;
|
||||
istopbar = !istopbar;
|
||||
}
|
||||
|
||||
return m;
|
||||
}
|
||||
|
||||
|
@ -702,53 +807,9 @@ dirtomon(int dir)
|
|||
void
|
||||
drawbar(Monitor *m)
|
||||
{
|
||||
int x, w, tw = 0;
|
||||
int boxs = drw->font->h / 9;
|
||||
int boxw = drw->font->h / 6 + 2;
|
||||
unsigned int i, occ = 0, urg = 0;
|
||||
Client *c;
|
||||
|
||||
if (!m->showbar)
|
||||
return;
|
||||
|
||||
/* draw status first so it can be overdrawn by tags later */
|
||||
if (m == selmon) { /* status is only drawn on selected monitor */
|
||||
tw = TEXTWM(stext) - lrpad + 2; /* 2px right padding */
|
||||
drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0, True, col_gray3, col_gray1, 255, 255);
|
||||
}
|
||||
|
||||
for (c = m->clients; c; c = c->next) {
|
||||
occ |= c->tags;
|
||||
if (c->isurgent)
|
||||
urg |= c->tags;
|
||||
}
|
||||
x = 0;
|
||||
|
||||
for (i = 0; i < LENGTH(tags); i++) {
|
||||
w = TEXTW(tags[i]);
|
||||
int ts = m->tagset[m->seltags] & 1 << i ? 1 : 0;
|
||||
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i, False, ts ? col_gray4 : col_gray3, ts ? col_cyan : col_gray1, 255, 255);
|
||||
if (occ & 1 << i)
|
||||
drw_rect(drw, x + boxs, boxs, boxw, boxw,
|
||||
m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
|
||||
urg & 1 << i, ts ? col_gray4 : col_gray3, ts ? col_cyan : col_gray1, 255, 255);
|
||||
|
||||
x += w;
|
||||
}
|
||||
w = TEXTW(m->ltsymbol);
|
||||
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0, False, col_gray3, col_gray1, 255, 255);
|
||||
|
||||
if ((w = m->ww - tw - x) > bh) {
|
||||
if (m->sel) {
|
||||
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0, False, m == selmon ? col_gray4 : col_gray3, m == selmon ? col_cyan : col_gray1, 255, 255);
|
||||
if (m->sel->isfloating)
|
||||
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0, m == selmon ? col_gray4 : col_gray3, m == selmon ? col_cyan : col_gray1, 255, 255);
|
||||
} else {
|
||||
drw_rect(drw, x, 0, w, bh, 1, 1, col_gray3, col_gray1, 255, 255);
|
||||
}
|
||||
}
|
||||
|
||||
drw_map(drw, m->barwin, 0, 0, m->ww, bh);
|
||||
Bar *bar;
|
||||
for (bar = m->bar; bar; bar = bar->next)
|
||||
drawbarwin(bar);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -760,6 +821,102 @@ drawbars(void)
|
|||
drawbar(m);
|
||||
}
|
||||
|
||||
void
|
||||
drawbarwin(Bar *bar)
|
||||
{
|
||||
if (!bar->win)
|
||||
return;
|
||||
Monitor *mon;
|
||||
int r, w, mi;
|
||||
int rx, lx, rw, lw; // bar size, split between left and right if a center module is added
|
||||
const BarRule *br;
|
||||
BarWidthArg warg = { 0 };
|
||||
BarDrawArg darg = { 0, 0 };
|
||||
|
||||
for (mi = 0, mon = mons; mon && mon != bar->mon; mon = mon->next, mi++); // get the monitor index
|
||||
rw = lw = bar->bw;
|
||||
rx = lx = 0;
|
||||
|
||||
drw_rect(drw, lx, 0, lw, bh, 1, 1, col_gray3, col_gray1, 255, 255);
|
||||
for (r = 0; r < LENGTH(barrules); r++) {
|
||||
br = &barrules[r];
|
||||
if (br->bar != bar->idx || br->drawfunc == NULL || (br->monitor == 'A' && bar->mon != selmon))
|
||||
continue;
|
||||
if (br->monitor != 'A' && br->monitor != -1 && br->monitor != mi)
|
||||
continue;
|
||||
warg.max_width = (br->alignment < BAR_ALIGN_RIGHT_LEFT ? lw : rw);
|
||||
w = br->widthfunc(bar, &warg);
|
||||
w = MIN(warg.max_width, w);
|
||||
|
||||
if (lw <= 0) { // if left is exhausted then switch to right side, and vice versa
|
||||
lw = rw;
|
||||
lx = rx;
|
||||
} else if (rw <= 0) {
|
||||
rw = lw;
|
||||
rx = lx;
|
||||
}
|
||||
|
||||
switch(br->alignment) {
|
||||
default:
|
||||
case BAR_ALIGN_NONE:
|
||||
case BAR_ALIGN_LEFT_LEFT:
|
||||
case BAR_ALIGN_LEFT:
|
||||
bar->x[r] = lx;
|
||||
if (lx == rx) {
|
||||
rx += w;
|
||||
rw -= w;
|
||||
}
|
||||
lx += w;
|
||||
lw -= w;
|
||||
break;
|
||||
case BAR_ALIGN_LEFT_RIGHT:
|
||||
case BAR_ALIGN_RIGHT:
|
||||
bar->x[r] = lx + lw - w;
|
||||
if (lx == rx)
|
||||
rw -= w;
|
||||
lw -= w;
|
||||
break;
|
||||
case BAR_ALIGN_LEFT_CENTER:
|
||||
case BAR_ALIGN_CENTER:
|
||||
bar->x[r] = lx + lw / 2 - w / 2;
|
||||
if (lx == rx) {
|
||||
rw = rx + rw - bar->x[r] - w;
|
||||
rx = bar->x[r] + w;
|
||||
}
|
||||
lw = bar->x[r] - lx;
|
||||
break;
|
||||
case BAR_ALIGN_RIGHT_LEFT:
|
||||
bar->x[r] = rx;
|
||||
if (lx == rx) {
|
||||
lx += w;
|
||||
lw -= w;
|
||||
}
|
||||
rx += w;
|
||||
rw -= w;
|
||||
break;
|
||||
case BAR_ALIGN_RIGHT_RIGHT:
|
||||
bar->x[r] = rx + rw - w;
|
||||
if (lx == rx)
|
||||
lw -= w;
|
||||
rw -= w;
|
||||
break;
|
||||
case BAR_ALIGN_RIGHT_CENTER:
|
||||
bar->x[r] = rx + rw / 2 - w / 2;
|
||||
if (lx == rx) {
|
||||
lw = lx + lw - bar->x[r] + w;
|
||||
lx = bar->x[r] + w;
|
||||
}
|
||||
rw = bar->x[r] - rx;
|
||||
break;
|
||||
}
|
||||
bar->w[r] = w;
|
||||
darg.x = bar->x[r];
|
||||
darg.w = bar->w[r];
|
||||
br->drawfunc(bar, &darg);
|
||||
}
|
||||
drw_map(drw, bar->win, 0, 0, bar->bw, bar->bh);
|
||||
}
|
||||
|
||||
void
|
||||
enternotify(XEvent *e)
|
||||
{
|
||||
|
@ -1293,7 +1450,8 @@ propertynotify(XEvent *e)
|
|||
break;
|
||||
case XA_WM_HINTS:
|
||||
updatewmhints(c);
|
||||
drawbars();
|
||||
if (c->isurgent)
|
||||
drawbars();
|
||||
break;
|
||||
}
|
||||
if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
|
||||
|
@ -1419,7 +1577,7 @@ restack(Monitor *m)
|
|||
XRaiseWindow(dpy, m->sel->win);
|
||||
if (m->lt[m->sellt]->arrange) {
|
||||
wc.stack_mode = Below;
|
||||
wc.sibling = m->barwin;
|
||||
wc.sibling = m->bar->win;
|
||||
for (c = m->stack; c; c = c->snext)
|
||||
if (!c->isfloating && ISVISIBLE(c)) {
|
||||
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
|
||||
|
@ -1762,9 +1920,11 @@ tile(Monitor *m)
|
|||
void
|
||||
togglebar(const Arg *arg)
|
||||
{
|
||||
Bar *bar;
|
||||
selmon->showbar = !selmon->showbar;
|
||||
updatebarpos(selmon);
|
||||
XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
|
||||
for (bar = selmon->bar; bar; bar = bar->next)
|
||||
XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh);
|
||||
arrange(selmon);
|
||||
}
|
||||
|
||||
|
@ -1925,6 +2085,7 @@ xinitvisual(void)
|
|||
void
|
||||
updatebars(void)
|
||||
{
|
||||
Bar *bar;
|
||||
Monitor *m;
|
||||
XSetWindowAttributes wa = {
|
||||
.override_redirect = True,
|
||||
|
@ -1935,14 +2096,16 @@ updatebars(void)
|
|||
};
|
||||
XClassHint ch = {"dwm", "dwm"};
|
||||
for (m = mons; m; m = m->next) {
|
||||
if (m->barwin)
|
||||
continue;
|
||||
m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, depth,
|
||||
InputOutput, visual,
|
||||
CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa);
|
||||
XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
|
||||
XMapRaised(dpy, m->barwin);
|
||||
XSetClassHint(dpy, m->barwin, &ch);
|
||||
for (bar = m->bar; bar; bar = bar->next) {
|
||||
if (!bar->win) {
|
||||
bar->win = XCreateWindow(dpy, root, bar->bx, bar->by, bar->bw, bar->bh, 0, depth,
|
||||
InputOutput, visual,
|
||||
CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa);
|
||||
XDefineCursor(dpy, bar->win, cursor[CurNormal]->cursor);
|
||||
XMapRaised(dpy, bar->win);
|
||||
XSetClassHint(dpy, bar->win, &ch);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1951,12 +2114,30 @@ updatebarpos(Monitor *m)
|
|||
{
|
||||
m->wy = m->my;
|
||||
m->wh = m->mh;
|
||||
if (m->showbar) {
|
||||
m->wh -= bh;
|
||||
m->by = m->topbar ? m->wy : m->wy + m->wh;
|
||||
m->wy = m->topbar ? m->wy + bh : m->wy;
|
||||
} else
|
||||
m->by = -bh;
|
||||
int num_bars;
|
||||
Bar *bar;
|
||||
int y_pad = 0;
|
||||
int x_pad = 0;
|
||||
|
||||
for (bar = m->bar; bar; bar = bar->next) {
|
||||
bar->bx = m->mx + x_pad;
|
||||
bar->bw = m->ww - 2 * x_pad;
|
||||
bar->bh = bh;
|
||||
}
|
||||
|
||||
if (!m->showbar) {
|
||||
for (bar = m->bar; bar; bar = bar->next)
|
||||
bar->by = -bh - y_pad;
|
||||
return;
|
||||
}
|
||||
|
||||
for (num_bars = 0, bar = m->bar; bar; bar = bar->next, num_bars++)
|
||||
if (bar->topbar)
|
||||
m->wy = m->my + bh + y_pad;
|
||||
m->wh = m->wh - y_pad * num_bars - bh * num_bars;
|
||||
|
||||
for (bar = m->bar; bar; bar = bar->next)
|
||||
bar->by = (bar->topbar ? m->wy - bh : m->wy + m->wh);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -2114,9 +2295,22 @@ updatesizehints(Client *c)
|
|||
void
|
||||
updatestatus(void)
|
||||
{
|
||||
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
||||
Monitor *m;
|
||||
if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext))) {
|
||||
strcpy(stext, "dwm-"VERSION);
|
||||
drawbar(selmon);
|
||||
estext[0] = '\0';
|
||||
} else {
|
||||
char *e = strchr(rawstext, statussep);
|
||||
if (e) {
|
||||
*e = '\0'; e++;
|
||||
strncpy(rawestext, e, sizeof(estext) - 1);
|
||||
copyvalidchars(estext, rawestext);
|
||||
} else
|
||||
estext[0] = '\0';
|
||||
copyvalidchars(stext, rawstext);
|
||||
}
|
||||
for (m = mons; m; m = m->next)
|
||||
drawbar(m);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -2190,12 +2384,14 @@ wintomon(Window w)
|
|||
int x, y;
|
||||
Client *c;
|
||||
Monitor *m;
|
||||
Bar *bar;
|
||||
|
||||
if (w == root && getrootptr(&x, &y))
|
||||
return recttomon(x, y, 1, 1);
|
||||
for (m = mons; m; m = m->next)
|
||||
if (w == m->barwin)
|
||||
return m;
|
||||
for (bar = m->bar; bar; bar = bar->next)
|
||||
if (w == bar->win)
|
||||
return m;
|
||||
if ((c = wintoclient(w)))
|
||||
return c->mon;
|
||||
return selmon;
|
||||
|
|
Loading…
Reference in a new issue