|
|
@ -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
|
|
|
|