BitHeaven
/
dmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed -m bug (thanks Rob)

This commit is contained in:
Connor Lane Smith 2011-05-11 12:25:50 +01:00
parent e0e6b071c6
commit 0291c722fb
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dmenu.c
View File

@ -76,10 +76,10 @@ main(int argc, char *argv[]) {
} }
else if(!strcmp(argv[i], "-b")) else if(!strcmp(argv[i], "-b"))
topbar = False; topbar = False;
else if(!strcmp(argv[i], "-i"))
fstrncmp = strncasecmp;
else if(!strcmp(argv[i], "-f")) else if(!strcmp(argv[i], "-f"))
fast = True; fast = True;
else if(!strcmp(argv[i], "-i"))
fstrncmp = strncasecmp;
else if(i == argc-1) else if(i == argc-1)
goto usage; goto usage;
/* double flags */ /* double flags */
@ -506,18 +506,18 @@ setup(void) {
mh = (lines + 1) * bh; mh = (lines + 1) * bh;
#ifdef XINERAMA #ifdef XINERAMA
if((info = XineramaQueryScreens(dc->dpy, &n))) { if((info = XineramaQueryScreens(dc->dpy, &n))) {
int i, di; int i, m, di;
unsigned int du; unsigned int du;
Window dw; Window dw;
XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du); XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
for(i = 0; i < n; i++) for(i = 0, m = -1; i < n; i++)
if((monitor == info[i].screen_number) if((monitor == info[i].screen_number)
|| (monitor < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))) || (m < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))
break; m = i;
x = info[i].x_org; x = info[m].x_org;
y = info[i].y_org + (topbar ? 0 : info[i].height - mh); y = info[m].y_org + (topbar ? 0 : info[m].height - mh);
mw = info[i].width; mw = info[m].width;
XFree(info); XFree(info);
} }
else else

6
draw.c
View File

@ -7,9 +7,9 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include "draw.h" #include "draw.h"
#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b))
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
#define DEFFONT "fixed" #define DEFFONT "fixed"
static Bool loadfont(DC *dc, const char *fontstr); static Bool loadfont(DC *dc, const char *fontstr);