4 files changed, 28 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index 4569b4e..30090dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ patches/*
 *.orig
 *.rej
 *.diff
+*.swo
+*.swp
diff --git a/config.h b/config.h
index 89a0675..477e13d 100644
--- a/config.h
+++ b/config.h
@@ -5,15 +5,17 @@
 /* appearance */
 static const unsigned int borderpx  = 0;        /* border pixel of windows */
 static const unsigned int snap      = 32;       /* snap pixel */
-static const unsigned int gappih    = 20;       /* horiz inner gap between windows */
+static const unsigned int gappih    = 10;       /* horiz inner gap between windows */
 static const unsigned int gappiv    = 10;       /* vert inner gap between windows */
 static const unsigned int gappoh    = 10;       /* horiz outer gap between windows and screen edge */
-static const unsigned int gappov    = 30;       /* vert outer gap between windows and screen edge */
+static const unsigned int gappov    = 10;       /* vert outer gap between windows and screen edge */
 static const int swallowfloating        = 0;            /* 1 means swallow floating windows by default */
 static       int smartgaps          = 0;        /* 1 means no outer gap when there is only one window */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
 static const char *fonts[]          = { "monospace:size=10"};
+static const int vertpad            = 5;       /* vertical padding of bar */
+static const int sidepad            = 10;       /* horizontal padding of bar */
 static const char dmenufont[]       = "monospace:size=10";
 static const char col_gray1[]       = "#282828";
 static const char col_gray2[]       = "#3c3836";
@@ -47,7 +49,7 @@ static const Rule rules[] = {
 };
 
 /* layout(s) */
-static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
+static const float mfact     = 0.50; /* factor of master area size [0.05..0.95] */
 static const int nmaster     = 1;    /* number of clients in master area */
 static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
 
diff --git a/config.mk b/config.mk
index 0c20086..fa0755b 100644
--- a/config.mk
+++ b/config.mk
@@ -27,7 +27,7 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-r
 # flags
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
 #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
-CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
+CFLAGS   = -w -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
 LDFLAGS  = ${LIBS}
 
 # Solaris
diff --git a/dwm.c b/dwm.c
index fb36ace..24ad1a8 100644
--- a/dwm.c
+++ b/dwm.c
@@ -263,6 +263,8 @@ static int screen;
 static int sw, sh;           /* X display screen geometry width, height */
 static int bh, blw = 0;      /* bar geometry */
 static int lrpad;            /* sum of left and right padding for text */
+static int vp;               /* vertical padding for bar */
+static int sp;               /* side padding for bar */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
@@ -663,7 +665,7 @@ configurenotify(XEvent *e)
                                 for (c = m->clients; c; c = c->next)
                                         if (c->isfullscreen)
                                                 resizeclient(c, m->mx, m->my, m->mw, m->mh);
-                                XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
+                                XMoveResizeWindow(dpy, m->barwin, m->wx + sp, m->by + vp, m->ww -  2 * sp, bh);
                         }
                         focus(NULL);
                         arrange(NULL);
@@ -800,7 +802,7 @@ dirtomon(int dir)
 void
 drawbar(Monitor *m)
 {
-        int x, w, sw = 0;
+        int x, w, sw, tw = 0;
         int boxs = drw->fonts->h / 9;
         int boxw = drw->fonts->h / 6 + 2;
         unsigned int i, occ = 0, urg = 0;
@@ -826,6 +828,11 @@ drawbar(Monitor *m)
                 drw_text(drw, m->ww - statusw + x, 0, sw, bh, 0, text, 0);
                 sw = statusw;
         }
+        if (m == selmon) { /* status is only drawn on selected monitor */
+                drw_setscheme(drw, scheme[SchemeNorm]);
+                tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
+                drw_text(drw, m->ww - tw - 2 * sp, 0, tw, bh, 0, stext, 0);
+        }
 
         for (c = m->clients; c; c = c->next) {
                 occ |= c->tags;
@@ -855,12 +862,12 @@ drawbar(Monitor *m)
         if ((w = m->ww - sw - x) > bh) {
                 if (m->sel) {
                         drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
-                        drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
+                        drw_text(drw, x, 0, w - 2 * sp, bh, lrpad / 2, m->sel->name, 0);
                         if (m->sel->isfloating)
                                 drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
                 } else {
                         drw_setscheme(drw, scheme[SchemeNorm]);
-                        drw_rect(drw, x, 0, w, bh, 1, 1);
+                        drw_rect(drw, x, 0, w - 2 * sp, bh, 1, 1);
                 }
         }
         drw_map(drw, m->barwin, 0, 0, m->ww, bh);
@@ -1719,7 +1726,10 @@ setup(void)
                 die("no fonts could be loaded.");
         lrpad = drw->fonts->h;
         bh = drw->fonts->h + 2;
+        sp = sidepad;
+        vp = (topbar == 1) ? vertpad : - vertpad;
         updategeom();
+
         /* init atoms */
         utf8string = XInternAtom(dpy, "UTF8_STRING", False);
         wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1873,7 +1883,7 @@ togglebar(const Arg *arg)
 {
         selmon->showbar = !selmon->showbar;
         updatebarpos(selmon);
-        XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
+        XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + sp, selmon->by + vp, selmon->ww - 2 * sp, bh);
         arrange(selmon);
 }
 
@@ -2001,7 +2011,7 @@ updatebars(void)
         for (m = mons; m; m = m->next) {
                 if (m->barwin)
                         continue;
-                m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
+                m->barwin = XCreateWindow(dpy, root, m->wx + sp, m->by + vp, m->ww - 2 * sp, bh, 0, DefaultDepth(dpy, screen),
                                 CopyFromParent, DefaultVisual(dpy, screen),
                                 CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
                 XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
@@ -2016,11 +2026,11 @@ updatebarpos(Monitor *m)
         m->wy = m->my;
         m->wh = m->mh;
         if (m->showbar) {
-                m->wh -= bh;
-                m->by = m->topbar ? m->wy : m->wy + m->wh;
-                m->wy = m->topbar ? m->wy + bh : m->wy;
+                m->wh = m->wh - vertpad - bh;
+                m->by = m->topbar ? m->wy : m->wy + m->wh + vertpad;
+                m->wy = m->topbar ? m->wy + bh + vp : m->wy;
         } else
-                m->by = -bh;
+                m->by = -bh - vp;
 }
 
 void