Compare commits
1 Commits
statuscmd-
...
distrosymb
Author | SHA1 | Date | |
---|---|---|---|
|
a004cdd76d |
@@ -5,6 +5,7 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
|
|||||||
static const unsigned int snap = 32; /* snap pixel */
|
static const unsigned int snap = 32; /* snap pixel */
|
||||||
static const int showbar = 1; /* 0 means no bar */
|
static const int showbar = 1; /* 0 means no bar */
|
||||||
static const int topbar = 1; /* 0 means bottom bar */
|
static const int topbar = 1; /* 0 means bottom bar */
|
||||||
|
static const char *distrosymbol = "";
|
||||||
static const char *fonts[] = { "monospace:size=10" };
|
static const char *fonts[] = { "monospace:size=10" };
|
||||||
static const char dmenufont[] = "monospace:size=10";
|
static const char dmenufont[] = "monospace:size=10";
|
||||||
static const char col_gray1[] = "#222222";
|
static const char col_gray1[] = "#222222";
|
||||||
@@ -103,9 +104,7 @@ static Button buttons[] = {
|
|||||||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
||||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
||||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
||||||
{ ClkStatusText, 0, Button1, sigdwmblocks, {.i = 1} },
|
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
||||||
{ ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2} },
|
|
||||||
{ ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3} },
|
|
||||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||||
|
80
dwm.c
80
dwm.c
@@ -113,6 +113,7 @@ typedef struct {
|
|||||||
|
|
||||||
struct Monitor {
|
struct Monitor {
|
||||||
char ltsymbol[16];
|
char ltsymbol[16];
|
||||||
|
char distrosymbol[16];
|
||||||
float mfact;
|
float mfact;
|
||||||
int nmaster;
|
int nmaster;
|
||||||
int num;
|
int num;
|
||||||
@@ -156,7 +157,6 @@ static void clientmessage(XEvent *e);
|
|||||||
static void configure(Client *c);
|
static void configure(Client *c);
|
||||||
static void configurenotify(XEvent *e);
|
static void configurenotify(XEvent *e);
|
||||||
static void configurerequest(XEvent *e);
|
static void configurerequest(XEvent *e);
|
||||||
static void copyvalidchars(char *text, char *rawtext);
|
|
||||||
static Monitor *createmon(void);
|
static Monitor *createmon(void);
|
||||||
static void destroynotify(XEvent *e);
|
static void destroynotify(XEvent *e);
|
||||||
static void detach(Client *c);
|
static void detach(Client *c);
|
||||||
@@ -170,7 +170,6 @@ static void focus(Client *c);
|
|||||||
static void focusin(XEvent *e);
|
static void focusin(XEvent *e);
|
||||||
static void focusmon(const Arg *arg);
|
static void focusmon(const Arg *arg);
|
||||||
static void focusstack(const Arg *arg);
|
static void focusstack(const Arg *arg);
|
||||||
static int getdwmblockspid();
|
|
||||||
static Atom getatomprop(Client *c, Atom prop);
|
static Atom getatomprop(Client *c, Atom prop);
|
||||||
static int getrootptr(int *x, int *y);
|
static int getrootptr(int *x, int *y);
|
||||||
static long getstate(Window w);
|
static long getstate(Window w);
|
||||||
@@ -208,7 +207,6 @@ static void setup(void);
|
|||||||
static void seturgent(Client *c, int urg);
|
static void seturgent(Client *c, int urg);
|
||||||
static void showhide(Client *c);
|
static void showhide(Client *c);
|
||||||
static void sigchld(int unused);
|
static void sigchld(int unused);
|
||||||
static void sigdwmblocks(const Arg *arg);
|
|
||||||
static void spawn(const Arg *arg);
|
static void spawn(const Arg *arg);
|
||||||
static void tag(const Arg *arg);
|
static void tag(const Arg *arg);
|
||||||
static void tagmon(const Arg *arg);
|
static void tagmon(const Arg *arg);
|
||||||
@@ -241,9 +239,6 @@ static void zoom(const Arg *arg);
|
|||||||
/* variables */
|
/* variables */
|
||||||
static const char broken[] = "broken";
|
static const char broken[] = "broken";
|
||||||
static char stext[256];
|
static char stext[256];
|
||||||
static char rawstext[256];
|
|
||||||
static int dwmblockssig;
|
|
||||||
pid_t dwmblockspid = 0;
|
|
||||||
static int screen;
|
static int screen;
|
||||||
static int sw, sh; /* X display screen geometry width, height */
|
static int sw, sh; /* X display screen geometry width, height */
|
||||||
static int bh, blw = 0; /* bar geometry */
|
static int bh, blw = 0; /* bar geometry */
|
||||||
@@ -437,7 +432,8 @@ buttonpress(XEvent *e)
|
|||||||
focus(NULL);
|
focus(NULL);
|
||||||
}
|
}
|
||||||
if (ev->window == selmon->barwin) {
|
if (ev->window == selmon->barwin) {
|
||||||
i = x = 0;
|
x = TEXTW(m->distrosymbol);
|
||||||
|
i = 0;
|
||||||
do
|
do
|
||||||
x += TEXTW(tags[i]);
|
x += TEXTW(tags[i]);
|
||||||
while (ev->x >= x && ++i < LENGTH(tags));
|
while (ev->x >= x && ++i < LENGTH(tags));
|
||||||
@@ -446,25 +442,9 @@ buttonpress(XEvent *e)
|
|||||||
arg.ui = 1 << i;
|
arg.ui = 1 << i;
|
||||||
} else if (ev->x < x + blw)
|
} else if (ev->x < x + blw)
|
||||||
click = ClkLtSymbol;
|
click = ClkLtSymbol;
|
||||||
else if (ev->x > (x = selmon->ww - TEXTW(stext) + lrpad)) {
|
else if (ev->x > selmon->ww - TEXTW(stext))
|
||||||
click = ClkStatusText;
|
click = ClkStatusText;
|
||||||
char *text = rawstext;
|
else
|
||||||
int i = -1;
|
|
||||||
char ch;
|
|
||||||
dwmblockssig = 0;
|
|
||||||
while (text[++i]) {
|
|
||||||
if ((unsigned char)text[i] < ' ') {
|
|
||||||
ch = text[i];
|
|
||||||
text[i] = '\0';
|
|
||||||
x += TEXTW(text) - lrpad;
|
|
||||||
text[i] = ch;
|
|
||||||
text += i+1;
|
|
||||||
i = -1;
|
|
||||||
if (x >= ev->x) break;
|
|
||||||
dwmblockssig = ch;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
click = ClkWinTitle;
|
click = ClkWinTitle;
|
||||||
} else if ((c = wintoclient(ev->window))) {
|
} else if ((c = wintoclient(ev->window))) {
|
||||||
focus(c);
|
focus(c);
|
||||||
@@ -650,19 +630,6 @@ configurerequest(XEvent *e)
|
|||||||
XSync(dpy, False);
|
XSync(dpy, False);
|
||||||
}
|
}
|
||||||
|
|
||||||
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';
|
|
||||||
}
|
|
||||||
|
|
||||||
Monitor *
|
Monitor *
|
||||||
createmon(void)
|
createmon(void)
|
||||||
{
|
{
|
||||||
@@ -677,6 +644,7 @@ createmon(void)
|
|||||||
m->lt[0] = &layouts[0];
|
m->lt[0] = &layouts[0];
|
||||||
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
||||||
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
||||||
|
strncpy(m->distrosymbol, distrosymbol, sizeof m->distrosymbol);
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -750,6 +718,9 @@ drawbar(Monitor *m)
|
|||||||
urg |= c->tags;
|
urg |= c->tags;
|
||||||
}
|
}
|
||||||
x = 0;
|
x = 0;
|
||||||
|
w = blw = TEXTW(m->distrosymbol);
|
||||||
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->distrosymbol, 0);
|
||||||
for (i = 0; i < LENGTH(tags); i++) {
|
for (i = 0; i < LENGTH(tags); i++) {
|
||||||
w = TEXTW(tags[i]);
|
w = TEXTW(tags[i]);
|
||||||
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
|
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
|
||||||
@@ -907,18 +878,6 @@ getatomprop(Client *c, Atom prop)
|
|||||||
return atom;
|
return atom;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
|
||||||
getdwmblockspid()
|
|
||||||
{
|
|
||||||
char buf[16];
|
|
||||||
FILE *fp = popen("pidof -s dwmblocks", "r");
|
|
||||||
fgets(buf, sizeof(buf), fp);
|
|
||||||
pid_t pid = strtoul(buf, NULL, 10);
|
|
||||||
pclose(fp);
|
|
||||||
dwmblockspid = pid;
|
|
||||||
return pid != 0 ? 0 : -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
int
|
||||||
getrootptr(int *x, int *y)
|
getrootptr(int *x, int *y)
|
||||||
{
|
{
|
||||||
@@ -1684,23 +1643,6 @@ sigchld(int unused)
|
|||||||
while (0 < waitpid(-1, NULL, WNOHANG));
|
while (0 < waitpid(-1, NULL, WNOHANG));
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
spawn(const Arg *arg)
|
spawn(const Arg *arg)
|
||||||
{
|
{
|
||||||
@@ -2054,10 +1996,8 @@ updatesizehints(Client *c)
|
|||||||
void
|
void
|
||||||
updatestatus(void)
|
updatestatus(void)
|
||||||
{
|
{
|
||||||
if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext)))
|
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
||||||
strcpy(stext, "dwm-"VERSION);
|
strcpy(stext, "dwm-"VERSION);
|
||||||
else
|
|
||||||
copyvalidchars(stext, rawstext);
|
|
||||||
drawbar(selmon);
|
drawbar(selmon);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user