extended cleanup

diff --git a/config.arg.h b/config.arg.h
index 8b3c59b..c9c2ad8 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -20,8 +20,11 @@ static Key key[] = { \
        /* modifier                     key             function        arguments */ \
        { MODKEY|ShiftMask,             XK_Return,      spawn, \
                { .cmd = "exec urxvt +sb -tr -bg black -fg '#eeeeee' -fn '"FONT"'" } }, \
        /* modifier                     key             function        arguments */ \
        { MODKEY|ShiftMask,             XK_Return,      spawn, \
                { .cmd = "exec urxvt +sb -tr -bg black -fg '#eeeeee' -fn '"FONT"'" } }, \

-       { MODKEY,                       XK_Tab,         focusnext,      { 0 } }, \
-       { MODKEY|ShiftMask,             XK_Tab,         focusprev,      { 0 } }, \
+       { MODKEY,                       XK_p,           spawn, \
+               { .cmd = "exec `ls -lL /usr/bin /usr/local/bin 2>/dev/null | " \
+                       "awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort | uniq | dmenu`" } }, \
+       { MODKEY,                       XK_j,           focusnext,      { 0 } }, \
+       { MODKEY,                       XK_k,           focusprev,      { 0 } }, \

        { MODKEY,                       XK_Return,      zoom,           { 0 } }, \
        { MODKEY,                       XK_m,           togglemax,      { 0 } }, \
        { MODKEY|ShiftMask,             XK_1,           tag,            { .i = 0 } }, \
        { MODKEY,                       XK_Return,      zoom,           { 0 } }, \
        { MODKEY,                       XK_m,           togglemax,      { 0 } }, \
        { MODKEY|ShiftMask,             XK_1,           tag,            { .i = 0 } }, \

diff --git a/main.c b/main.c
index d0048be..545efe9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -27,7 +27,14 @@ cleanup()
                resize(sel, True, TopLeft);
                unmanage(sel);
        }
                resize(sel, True, TopLeft);
                unmanage(sel);
        }

+       if(dc.font.set)
+               XFreeFontSet(dpy, dc.font.set);
+       else
+               XFreeFont(dpy, dc.font.xfont);

        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XUngrabKey(dpy, AnyKey, AnyModifier, root);

+       XDestroyWindow(dpy, barwin);
+       XFreePixmap(dpy, dc.drawable);
+       XFreeGC(dpy, dc.gc);

        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
 }
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
 }