Pledge on OpenBSD

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index ff893df..09feae3 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -56,7 +56,6 @@
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
 #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
 #define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
 #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
 #define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)

-#define ColBorder               2

 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */


@@ -217,15 +216,15 @@ static void toggleview(const Arg *arg);
 static void unfocus(Client *c, int setfocus);
 static void unmanage(Client *c, int destroyed);
 static void unmapnotify(XEvent *e);
 static void unfocus(Client *c, int setfocus);
 static void unmanage(Client *c, int destroyed);
 static void unmapnotify(XEvent *e);

-static int updategeom(void);

 static void updatebarpos(Monitor *m);
 static void updatebars(void);
 static void updateclientlist(void);
 static void updatebarpos(Monitor *m);
 static void updatebars(void);
 static void updateclientlist(void);

+static int updategeom(void);

 static void updatenumlockmask(void);
 static void updatesizehints(Client *c);
 static void updatestatus(void);
 static void updatenumlockmask(void);
 static void updatesizehints(Client *c);
 static void updatestatus(void);

-static void updatewindowtype(Client *c);

 static void updatetitle(Client *c);
 static void updatetitle(Client *c);

+static void updatewindowtype(Client *c);

 static void updatewmhints(Client *c);
 static void view(const Arg *arg);
 static Client *wintoclient(Window w);
 static void updatewmhints(Client *c);
 static void view(const Arg *arg);
 static Client *wintoclient(Window w);


@@ -1579,7 +1578,7 @@ setup(void)
        XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32,
                PropModeReplace, (unsigned char *) &wmcheckwin, 1);
        XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8,
        XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32,
                PropModeReplace, (unsigned char *) &wmcheckwin, 1);
        XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8,

-               PropModeReplace, (unsigned char *) "dwm", 4);
+               PropModeReplace, (unsigned char *) "dwm", 3);

        XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
                PropModeReplace, (unsigned char *) &wmcheckwin, 1);
        /* EWMH support per view */
        XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
                PropModeReplace, (unsigned char *) &wmcheckwin, 1);
        /* EWMH support per view */


@@ -1985,6 +1984,14 @@ updatesizehints(Client *c)
        c->isfixed = (c->maxw && c->maxh && c->maxw == c->minw && c->maxh == c->minh);
 }
 
        c->isfixed = (c->maxw && c->maxh && c->maxw == c->minw && c->maxh == c->minh);
 }
 

+void
+updatestatus(void)
+{
+       if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
+               strcpy(stext, "dwm-"VERSION);
+       drawbar(selmon);
+}
+

 void
 updatetitle(Client *c)
 {
 void
 updatetitle(Client *c)
 {


@@ -1994,14 +2001,6 @@ updatetitle(Client *c)
                strcpy(c->name, broken);
 }
 
                strcpy(c->name, broken);
 }
 

-void
-updatestatus(void)
-{
-       if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
-               strcpy(stext, "dwm-"VERSION);
-       drawbar(selmon);
-}
-

 void
 updatewindowtype(Client *c)
 {
 void
 updatewindowtype(Client *c)
 {


@@ -2138,6 +2137,10 @@ main(int argc, char *argv[])
                die("dwm: cannot open display");
        checkotherwm();
        setup();
                die("dwm: cannot open display");
        checkotherwm();
        setup();

+#ifdef __OpenBSD__
+       if (pledge("stdio proc exec", NULL) == -1)
+               die("pledge");
+#endif /* __OpenBSD__ */

        scan();
        run();
        cleanup();
        scan();
        run();
        cleanup();