aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnselm R. Garbe <arg@suckless.org>2007-01-17 11:10:26 +0100
committerAnselm R. Garbe <arg@suckless.org>2007-01-17 11:10:26 +0100
commit6175a39e8e743dce985c5ba80801d88df9ee2dce (patch)
tree41104e2091757b6957676cc1b991422840d200c7
parent2c7ff85f242781083a44067c2156a96efef849c7 (diff)
downloaddmenu-6175a39e8e743dce985c5ba80801d88df9ee2dce.tar.gz
dmenu-6175a39e8e743dce985c5ba80801d88df9ee2dce.tar.bz2
dmenu-6175a39e8e743dce985c5ba80801d88df9ee2dce.zip
hotfix changes2.1
-rw-r--r--.hgtags1
-rw-r--r--config.mk2
-rw-r--r--main.c8
3 files changed, 4 insertions, 7 deletions
diff --git a/.hgtags b/.hgtags
index 98ac4a1..cade777 100644
--- a/.hgtags
+++ b/.hgtags
@@ -19,4 +19,3 @@ dcc5427f99f51a978386a0dd770467cd911ac84b 1.6
d3e6fa22ae45b38b1bdb0d813390365e5930360b 1.8
c7f5f4d543170f03d70468e98a3a0ec8d2c4161b 1.9
1fce5c464fcd870b9f024aa1853d5cf3a3eb371b 2.0
-d91c79020430b9707f7c572563021a62468a34b3 2.1
diff --git a/config.mk b/config.mk
index 771082a..7860a39 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
# dmenu version
-VERSION = 2.0
+VERSION = 2.1
# Customize below to fit your system
diff --git a/main.c b/main.c
index 4dff207..f1f71fd 100644
--- a/main.c
+++ b/main.c
@@ -350,7 +350,7 @@ main(int argc, char *argv[]) {
char *selbg = SELBGCOLOR;
char *selfg = SELFGCOLOR;
fd_set rd;
- int i, j, my;
+ int i, j;
struct timeval timeout;
Item *itm;
XEvent ev;
@@ -431,12 +431,10 @@ main(int argc, char *argv[]) {
wa.override_redirect = 1;
wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
- my = 0;
mw = DisplayWidth(dpy, screen);
mh = dc.font.height + 2;
- if(bottom)
- my += DisplayHeight(dpy, screen) - mh;
- win = XCreateWindow(dpy, root, 0, 0, mw, mh, 0,
+ win = XCreateWindow(dpy, root, 0,
+ bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);