Fixing the geometry parsing.
This commit is contained in:
parent
cfe0f2d84e
commit
3a5d2f3ed8
25
svkbd.c
25
svkbd.c
@ -449,24 +449,27 @@ setup(void) {
|
|||||||
initfont(font);
|
initfont(font);
|
||||||
|
|
||||||
/* init atoms */
|
/* init atoms */
|
||||||
netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
|
if(isdock) {
|
||||||
if(isdock)
|
netatom[NetWMWindowType] = XInternAtom(dpy,
|
||||||
|
"_NET_WM_WINDOW_TYPE", False);
|
||||||
atype = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DOCK", False);
|
atype = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DOCK", False);
|
||||||
|
}
|
||||||
|
|
||||||
/* init appearance */
|
/* init appearance */
|
||||||
countrows();
|
countrows();
|
||||||
if(!ww)
|
if(!ww)
|
||||||
ww = sw - wx;
|
ww = sw;
|
||||||
if(ww < 0)
|
if(ww < 0)
|
||||||
ww = sw + ww + 1;
|
ww = sw + ww + 1;
|
||||||
if(!wx)
|
|
||||||
wx = 0;
|
|
||||||
if(wx < 0)
|
|
||||||
wx = sw + wx;
|
|
||||||
if(!wh)
|
if(!wh)
|
||||||
wh = sh * rows / 32;
|
wh = sh * rows / 32;
|
||||||
if(wh < 0)
|
if(wh < 0)
|
||||||
wh = sh + wh + 1;
|
wh = sh + wh + 1;
|
||||||
|
|
||||||
|
if(!wx)
|
||||||
|
wx = 0;
|
||||||
|
if(wx < 0)
|
||||||
|
wx = sw + wx - ww;
|
||||||
if(!wy)
|
if(!wy)
|
||||||
wy = sh - wh;
|
wy = sh - wh;
|
||||||
if(wy < 0)
|
if(wy < 0)
|
||||||
@ -592,10 +595,10 @@ main(int argc, char *argv[]) {
|
|||||||
ww = (int)wr;
|
ww = (int)wr;
|
||||||
if(bitm & HeightValue)
|
if(bitm & HeightValue)
|
||||||
wh = (int)hr;
|
wh = (int)hr;
|
||||||
if(bitm & XNegative)
|
if(bitm & XNegative && wx == 0)
|
||||||
wx *= -1;
|
wx = -1;
|
||||||
if(bitm & YNegative)
|
if(bitm & YNegative && wy == 0)
|
||||||
wy *= -1;
|
wy = -1;
|
||||||
} else if(!strcmp(argv[i], "-h")) {
|
} else if(!strcmp(argv[i], "-h")) {
|
||||||
usage(argv[0]);
|
usage(argv[0]);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user