config.def.h
parent
aa1346ff27
commit
3d08dc7337
9
config.h
9
config.h
|
|
@ -37,7 +37,9 @@ static const char *const autostart[] = {
|
||||||
"dwmblocks", NULL,
|
"dwmblocks", NULL,
|
||||||
"setxkbmap", "-layout", "us,ru", NULL,
|
"setxkbmap", "-layout", "us,ru", NULL,
|
||||||
"bg-set-image", NULL,
|
"bg-set-image", NULL,
|
||||||
"sh", "-c", "CM_SELECTIONS=\"clipboard\" clipmenud", NULL,
|
"sh", "-c", "CM_SELECTIONS=\"clipboard\" CM_OWN_CLIPBOARD=1 clipmenud", NULL,
|
||||||
|
"/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1", NULL,
|
||||||
|
"picom", "--experimental-backends", NULL,
|
||||||
NULL /* terminate */
|
NULL /* terminate */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -87,6 +89,7 @@ static const Layout layouts[] = {
|
||||||
|
|
||||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
||||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
||||||
|
#define STATUSBAR "dwmblocks"
|
||||||
|
|
||||||
/* commands */
|
/* commands */
|
||||||
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
|
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
|
||||||
|
|
@ -149,7 +152,9 @@ 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, Button2, spawn, {.v = termcmd } },
|
{ ClkStatusText, 0, Button1, sigstatusbar, {.i = 1 } },
|
||||||
|
{ ClkStatusText, 0, Button2, sigstatusbar, {.i = 2 } },
|
||||||
|
{ ClkStatusText, 0, Button3, sigstatusbar, {.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} },
|
||||||
|
|
|
||||||
102
dwm.c
102
dwm.c
|
|
@ -182,6 +182,7 @@ static void focusstack(const Arg *arg);
|
||||||
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);
|
||||||
|
static pid_t getstatusbarpid();
|
||||||
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
||||||
static void grabbuttons(Client *c, int focused);
|
static void grabbuttons(Client *c, int focused);
|
||||||
static void grabkeys(void);
|
static void grabkeys(void);
|
||||||
|
|
@ -216,6 +217,7 @@ 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 sigstatusbar(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);
|
||||||
|
|
@ -255,6 +257,9 @@ static pid_t winpid(Window w);
|
||||||
/* variables */
|
/* variables */
|
||||||
static const char broken[] = "broken";
|
static const char broken[] = "broken";
|
||||||
static char stext[256];
|
static char stext[256];
|
||||||
|
static int statusw;
|
||||||
|
static int statussig;
|
||||||
|
static pid_t statuspid = -1;
|
||||||
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 */
|
||||||
|
|
@ -520,6 +525,7 @@ buttonpress(XEvent *e)
|
||||||
Client *c;
|
Client *c;
|
||||||
Monitor *m;
|
Monitor *m;
|
||||||
XButtonPressedEvent *ev = &e->xbutton;
|
XButtonPressedEvent *ev = &e->xbutton;
|
||||||
|
char *text, *s, ch;
|
||||||
|
|
||||||
click = ClkRootWin;
|
click = ClkRootWin;
|
||||||
/* focus monitor if necessary */
|
/* focus monitor if necessary */
|
||||||
|
|
@ -538,9 +544,23 @@ 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 > selmon->ww - (int)TEXTW(stext))
|
else if (ev->x > selmon->ww - statusw) {
|
||||||
|
x = selmon->ww - statusw;
|
||||||
click = ClkStatusText;
|
click = ClkStatusText;
|
||||||
else
|
statussig = 0;
|
||||||
|
for (text = s = stext; *s && x <= ev->x; s++) {
|
||||||
|
if ((unsigned char)(*s) < ' ') {
|
||||||
|
ch = *s;
|
||||||
|
*s = '\0';
|
||||||
|
x += TEXTW(text) - lrpad;
|
||||||
|
*s = ch;
|
||||||
|
text = s + 1;
|
||||||
|
if (x >= ev->x)
|
||||||
|
break;
|
||||||
|
statussig = ch;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else
|
||||||
click = ClkWinTitle;
|
click = ClkWinTitle;
|
||||||
} else if ((c = wintoclient(ev->window))) {
|
} else if ((c = wintoclient(ev->window))) {
|
||||||
focus(c);
|
focus(c);
|
||||||
|
|
@ -809,9 +829,24 @@ drawbar(Monitor *m)
|
||||||
|
|
||||||
/* draw status first so it can be overdrawn by tags later */
|
/* draw status first so it can be overdrawn by tags later */
|
||||||
if (m == selmon) { /* status is only drawn on selected monitor */
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
||||||
|
char *text, *s, ch;
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
|
||||||
drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
|
x = 0;
|
||||||
|
for (text = s = stext; *s; s++) {
|
||||||
|
if ((unsigned char)(*s) < ' ') {
|
||||||
|
ch = *s;
|
||||||
|
*s = '\0';
|
||||||
|
tw = TEXTW(text) - lrpad;
|
||||||
|
drw_text(drw, m->ww - statusw + x, 0, tw, bh, 0, text, 0);
|
||||||
|
x += tw;
|
||||||
|
*s = ch;
|
||||||
|
text = s + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tw = TEXTW(text) - lrpad + 2;
|
||||||
|
drw_text(drw, m->ww - statusw + x, 0, tw, bh, 0, text, 0);
|
||||||
|
tw = statusw;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (c = m->clients; c; c = c->next) {
|
for (c = m->clients; c; c = c->next) {
|
||||||
|
|
@ -979,6 +1014,31 @@ getatomprop(Client *c, Atom prop)
|
||||||
return atom;
|
return atom;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pid_t
|
||||||
|
getstatusbarpid()
|
||||||
|
{
|
||||||
|
char buf[32], *str = buf, *c;
|
||||||
|
FILE *fp;
|
||||||
|
|
||||||
|
if (statuspid > 0) {
|
||||||
|
snprintf(buf, sizeof(buf), "/proc/%u/cmdline", statuspid);
|
||||||
|
if ((fp = fopen(buf, "r"))) {
|
||||||
|
fgets(buf, sizeof(buf), fp);
|
||||||
|
while ((c = strchr(str, '/')))
|
||||||
|
str = c + 1;
|
||||||
|
fclose(fp);
|
||||||
|
if (!strcmp(str, STATUSBAR))
|
||||||
|
return statuspid;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!(fp = popen("pidof -s "STATUSBAR, "r")))
|
||||||
|
return -1;
|
||||||
|
fgets(buf, sizeof(buf), fp);
|
||||||
|
pclose(fp);
|
||||||
|
|
||||||
|
return strtol(buf, NULL, 10);
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
getrootptr(int *x, int *y)
|
getrootptr(int *x, int *y)
|
||||||
{
|
{
|
||||||
|
|
@ -1774,6 +1834,21 @@ sigchld(int unused)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
sigstatusbar(const Arg *arg)
|
||||||
|
{
|
||||||
|
union sigval sv;
|
||||||
|
|
||||||
|
if (!statussig)
|
||||||
|
return;
|
||||||
|
sv.sival_int = (statussig << 8) | arg->i;
|
||||||
|
if ((statuspid = getstatusbarpid()) <= 0){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
sigqueue(statuspid, SIGUSR1, sv);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
spawn(const Arg *arg)
|
spawn(const Arg *arg)
|
||||||
{
|
{
|
||||||
|
|
@ -2145,8 +2220,25 @@ updatesizehints(Client *c)
|
||||||
void
|
void
|
||||||
updatestatus(void)
|
updatestatus(void)
|
||||||
{
|
{
|
||||||
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) {
|
||||||
strcpy(stext, "dwm-"VERSION);
|
strcpy(stext, "dwm-"VERSION);
|
||||||
|
statusw = TEXTW(stext) - lrpad + 2;
|
||||||
|
} else {
|
||||||
|
char *text, *s, ch;
|
||||||
|
|
||||||
|
statusw = 0;
|
||||||
|
for (text = s = stext; *s; s++) {
|
||||||
|
if ((unsigned char)(*s) < ' ') {
|
||||||
|
ch = *s;
|
||||||
|
*s = '\0';
|
||||||
|
statusw += TEXTW(text) - lrpad;
|
||||||
|
*s = ch;
|
||||||
|
text = s + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
statusw += TEXTW(text) - lrpad + 2;
|
||||||
|
|
||||||
|
}
|
||||||
drawbar(selmon);
|
drawbar(selmon);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue