update: dwmblocks icons; add: correct versions

dmenu/config.mk

@@ -1,8 +1,8 @@
 # dmenu version
-VERSION = 5.4
+VERSION = 5.4-odweta
 
 # paths
-PREFIX = /usr/local
+PREFIX = /usr
 MANPREFIX = $(PREFIX)/share/man
 
 X11INC = /usr/X11R6/include
@@ -15,9 +15,6 @@ XINERAMAFLAGS = -DXINERAMA
 # freetype
 FREETYPELIBS = -lfontconfig -lXft
 FREETYPEINC = /usr/include/freetype2
-# OpenBSD (uncomment)
-#FREETYPEINC = $(X11INC)/freetype2
-#MANPREFIX = ${PREFIX}/man
 
 # includes and libs
 INCS = -I$(X11INC) -I$(FREETYPEINC)

dmenu/dmenu.c

@@ -158,7 +158,7 @@ drawmenu(void)
 {
     unsigned int curpos;
     struct item *item;
-    int x = 0, y = 0, w;
+    int x = 0, y = 0, w = (lines > 0 || !matches) ? mw - x : inputw;
 
     drw_setscheme(drw, scheme[SchemeNorm]);
     drw_rect(drw, 0, 0, mw, mh, 1, 1);