NapoleonDynamite/dwm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #103 from Spooky309/master

Browse source 
Don't try and signal dwmblocks on OpenBSD
This commit is contained in:
Luke Smith 2020-08-27 14:28:57 -04:00 committed by GitHub
commit 6995e5e189
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.h
View file

@ -278,6 +278,7 @@ static Key keys[] = {
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
static Button buttons[] = {
/* click event mask button function argument */
#ifndef __OpenBSD__
{ ClkWinTitle, 0, Button2, zoom, {0} },
{ ClkStatusText, 0, Button1, sigdwmblocks, {.i = 1} },
{ ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2} },
@ -285,6 +286,7 @@ static Button buttons[] = {
{ ClkStatusText, 0, Button4, sigdwmblocks, {.i = 4} },
{ ClkStatusText, 0, Button5, sigdwmblocks, {.i = 5} },
{ ClkStatusText, ShiftMask, Button1, sigdwmblocks, {.i = 6} },
#endif
{ ClkStatusText, ShiftMask, Button3, spawn, SHCMD("st -e nvim ~/.local/src/dwmblocks/config.h") },
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
{ ClkClientWin, MODKEY, Button2, defaultgaps, {0} },

8
dwm.c
View file

@ -206,7 +206,6 @@ static void focusin(XEvent *e);
static void focusmon(const Arg *arg);
static void focusstack(const Arg *arg);
static Atom getatomprop(Client *c, Atom prop);
static int getdwmblockspid();
static int getrootptr(int *x, int *y);
static long getstate(Window w);
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
@ -246,7 +245,10 @@ static void setup(void);
static void seturgent(Client *c, int urg);
static void showhide(Client *c);
static void sigchld(int unused);
#ifndef __OpenBSD__
static int getdwmblockspid();
static void sigdwmblocks(const Arg *arg);
#endif
static void sighup(int unused);
static void sigterm(int unused);
static void spawn(const Arg *arg);
@ -1016,6 +1018,7 @@ getatomprop(Client *c, Atom prop)
return atom;
}
#ifndef __OpenBSD__
int
getdwmblockspid()
{
@ -1027,6 +1030,7 @@ getdwmblockspid()
dwmblockspid = pid;
return pid != 0 ? 0 : -1;
}
#endif
int
getrootptr(int *x, int *y)
@ -1908,6 +1912,7 @@ sigterm(int unused)
quit(&a);
}
#ifndef __OpenBSD__
void
sigdwmblocks(const Arg *arg)
{
@ -1924,6 +1929,7 @@ sigdwmblocks(const Arg *arg)
}
}
}
#endif
void
spawn(const Arg *arg)