adopt make config for FreeBSD

added /usr/local/lib for LIBS and /usr/local/include for INC

config.h

@@ -5,6 +5,8 @@ static int bottom = 0;
 static int embedded = 0;
 static int minpwlen = 32;
 static int mon = -1;
+static int lineheight = 0;
+static int min_lineheight = 8;
 
 static const char *asterisk = "*";
 static const char *fonts[] = {

config.mk

@@ -16,13 +16,16 @@ XINERAMAFLAGS = -DXINERAMA
 
 # Freetype
 FREETYPELIBS = -lfontconfig -lXft
-FREETYPEINC = /usr/include/freetype2
+#FREETYPEINC = /usr/include/freetype2
 # OpenBSD (uncomment)
 #FREETYPEINC = ${X11INC}/freetype2
+# FreeBSD
+FREETYPEINC = /usr/local/include/freetype2
 
 # Includes and libs
-INCS = -I${X11INC} -I${FREETYPEINC}
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+# FreeBSD has this within /usr/local/{include,lib}
+INCS = -I/usr/local/include -I${X11INC} -I${FREETYPEINC}
+LIBS = -L/usr/local/lib -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
 
 # Flags
 CPPFLAGS = -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -DPACKAGE_VERSION=\"${VERSION}\" -DPACKAGE_BUGREPORT=\"${BUGREPORT}\"

pinentry-dmenu.1

@@ -37,6 +37,9 @@ pinentry-dmenu appears at the bottom of the screen.
 .BI "min_password_length =" " 32"
 The minimal space of the password field. This value has affect to the description field after the password field.
 .TP
+.BI "height =" " 8"
+Height of pinentry-dmenu in pixels (no less than 8)
+.TP
 .BI "monitor =" " -1"
 pinentry-dmenu is displayed on the monitor number supplied. Monitor numbers are starting from 0.
 .TP

pinentry-dmenu.c

@@ -183,7 +183,7 @@ insert(const char *str, ssize_t n) {
 static void
 drawwin(void) {
 	unsigned int curpos;
-	int x = 0, pb, pbw = 0, i;
+	int x = 0, fh = drw->fonts->h, pb, pbw = 0, i;
 	size_t asterlen = strlen(asterisk);
 	size_t pdesclen;
 	int leftinput;
@@ -255,7 +255,7 @@ drawwin(void) {
 
 		if ((curpos += lrpad / 2 - 1) < leftinput) {
 			drw_setscheme(drw, scheme[SchemeNormal]);
-			drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
+			drw_rect(drw, x + curpos, 2 + (bh - fh) / 2, 2, fh - 4, 1, 0);
 		}
 
 		free(censort);
@@ -293,6 +293,7 @@ setup(void) {
 
 	/* Calculate menu geometry */
 	bh = drw->fonts->h + 2;
+	bh = MAX(bh, lineheight);
 	mh = bh;
 #ifdef XINERAMA
 	info = XineramaQueryScreens(dpy, &n);
@@ -744,6 +745,9 @@ main(int argc, char *argv[]) {
 		if (config_lookup_int(&cfg, "min_password_length", &val)) {
 			minpwlen = val;
 		}
+		if (config_lookup_int(&cfg, "height", &val)) {
+			lineheight = MAX(val, min_lineheight);
+		}
 		if (config_lookup_int(&cfg, "monitor", &val)) {
 			mon = val;
 		}
@@ -784,8 +788,6 @@ main(int argc, char *argv[]) {
 		fprintf(stderr, "%s:%d: %s\n", config_error_file(&cfg),
 		        config_error_line(&cfg), config_error_text(&cfg));
 		return(EXIT_FAILURE);
-	} else {
-		printf("No config file found. Use defaults.\n");
 	}
 
 	pinentry_init("pinentry-dmenu");