applied Markus' clarify status text padding patch

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index b2bc9bd..dbff59b 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -717,8 +717,8 @@ drawbar(Monitor *m)
        /* draw status first so it can be overdrawn by tags later */
        if (m == selmon) { /* status is only drawn on selected monitor */
                drw_setscheme(drw, scheme[SchemeNorm]);
-               sw = TEXTW(stext) - lrpad / 2; /* no right padding so status text hugs the corner */
-               drw_text(drw, m->ww - sw, 0, sw, bh, lrpad / 2 - 2, stext, 0);
+               sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
+               drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
        }
 
        for (c = m->clients; c; c = c->next) {
@@ -1561,7 +1561,7 @@ setup(void)
        root = RootWindow(dpy, screen);
        drw = drw_create(dpy, screen, root, sw, sh);
        if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
-               die("no fonts could be loaded.\n");
+               die("no fonts could be loaded.");
        lrpad = drw->fonts->h;
        bh = drw->fonts->h + 2;
        updategeom();
@@ -2101,7 +2101,7 @@ xerrordummy(Display *dpy, XErrorEvent *ee)
 int
 xerrorstart(Display *dpy, XErrorEvent *ee)
 {
-       die("dwm: another window manager is already running\n");
+       die("dwm: another window manager is already running");
        return -1;
 }
 
@@ -2123,13 +2123,13 @@ int
 main(int argc, char *argv[])
 {
        if (argc == 2 && !strcmp("-v", argv[1]))
-               die("dwm-"VERSION "\n");
+               die("dwm-"VERSION);
        else if (argc != 1)
-               die("usage: dwm [-v]\n");
+               die("usage: dwm [-v]");
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
        if (!(dpy = XOpenDisplay(NULL)))
-               die("dwm: cannot open display\n");
+               die("dwm: cannot open display");
        checkotherwm();
        setup();
        scan();