dmenu padding wie dmw-bar-patchHEADmaster

1 files changed, 11 insertions, 7 deletions

diff --git a/dmenu.c b/dmenu.c
index 6565563..346039d 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -1061,9 +1061,9 @@ setup(void)
 			x = info[i].x_org + ((info[i].width  - mw) / 2);
 			y = info[i].y_org + ((info[i].height - mh) / menu_height_ratio);
 		} else {
-			x = info[i].x_org + dmx;
-			y = info[i].y_org + (topbar ? dmy : info[i].height - mh - dmy);
-			mw = (dmw>0 ? dmw : info[i].width);;
+			x = info[i].x_org + dmx + sidepad;
+			y = info[i].y_org + (topbar ? dmy : info[i].height - mh - dmy) + vertpad;
+			mw = (dmw>0 ? dmw : info[i].width) - 2 * sidepad;;
 		}
 
 		XFree(info);
@@ -1079,9 +1079,9 @@ setup(void)
 			x = (wa.width  - mw) / 2;
 			y = (wa.height - mh) / 2;
 		} else {
-			x = dmx;
-			y = topbar ? dmy : wa.height - mh - dmy;
-			mw = (dmw>0 ? dmw : wa.width);
+			x = dmx + sidepad;
+			y = topbar ? dmy : wa.height - mh - dmy + vertpad;
+			mw = (dmw>0 ? dmw : wa.width) - 2 * sidepad;
 		}
 	}
 	promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
@@ -1127,7 +1127,7 @@ usage(void)
 {
 	die("usage: dmenu [-bfiv] [-noi] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
 	    "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n"
-	    "             [-x xoffset] [-y yoffset] [-z width]\n"
+	    "             [-x xoffset] [-y yoffset] [-z width] [-vp vertpad] [-sp sidepad]\n"
 	    "             [-it text]\n", stderr);
 }
 
@@ -1196,6 +1196,10 @@ main(int argc, char *argv[])
 			dmy = atoi(argv[++i]);
 		else if (!strcmp(argv[i], "-z"))   /* make dmenu this wide */
 			dmw = atoi(argv[++i]);
+		else if (!strcmp(argv[i], "-vp"))   /* vertical padding */
+			vertpad = atoi(argv[++i]);
+		else if (!strcmp(argv[i], "-sp"))   /* horizontal padding */
+			sidepad = atoi(argv[++i]);
 		else if (!strcmp(argv[i], "-bw"))
 			border_width = atoi(argv[++i]); /* border width */
 		else if (!strcmp(argv[i], "-it")) {   /* embedding window id */