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)
hotfix changes
-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
19d3e6fa22ae45b38b1bdb0d813390365e5930360b 1.8 19d3e6fa22ae45b38b1bdb0d813390365e5930360b 1.8
20c7f5f4d543170f03d70468e98a3a0ec8d2c4161b 1.9 20c7f5f4d543170f03d70468e98a3a0ec8d2c4161b 1.9
211fce5c464fcd870b9f024aa1853d5cf3a3eb371b 2.0 211fce5c464fcd870b9f024aa1853d5cf3a3eb371b 2.0
22d91c79020430b9707f7c572563021a62468a34b3 2.1
diff --git a/config.mk b/config.mk
index 771082a..7860a39 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
1# dmenu version 1# dmenu version
2VERSION = 2.0 2VERSION = 2.1
3 3
4# Customize below to fit your system 4# Customize below to fit your system
5 5
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[]) {
350 char *selbg = SELBGCOLOR; 350 char *selbg = SELBGCOLOR;
351 char *selfg = SELFGCOLOR; 351 char *selfg = SELFGCOLOR;
352 fd_set rd; 352 fd_set rd;
353 int i, j, my; 353 int i, j;
354 struct timeval timeout; 354 struct timeval timeout;
355 Item *itm; 355 Item *itm;
356 XEvent ev; 356 XEvent ev;
@@ -431,12 +431,10 @@ main(int argc, char *argv[]) {
431 wa.override_redirect = 1; 431 wa.override_redirect = 1;
432 wa.background_pixmap = ParentRelative; 432 wa.background_pixmap = ParentRelative;
433 wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; 433 wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
434 my = 0;
435 mw = DisplayWidth(dpy, screen); 434 mw = DisplayWidth(dpy, screen);
436 mh = dc.font.height + 2; 435 mh = dc.font.height + 2;
437 if(bottom) 436 win = XCreateWindow(dpy, root, 0,
438 my += DisplayHeight(dpy, screen) - mh; 437 bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
439 win = XCreateWindow(dpy, root, 0, 0, mw, mh, 0,
440 DefaultDepth(dpy, screen), CopyFromParent, 438 DefaultDepth(dpy, screen), CopyFromParent,
441 DefaultVisual(dpy, screen), 439 DefaultVisual(dpy, screen),
442 CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); 440 CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);