suckless
/
svkbd
mirror of git://git.suckless.org/svkbd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merging christophs "Fixing border and sizes now for real."-patch

This commit is contained in:
Enno Boland (Gottox) 2011-04-10 13:36:41 +02:00
parent 7223d56428
commit 6f0e75ccc0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
svkbd.c
View File

@ -340,8 +340,8 @@ setup(void) {
/* init screen */ /* init screen */
screen = DefaultScreen(dpy); screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen); root = RootWindow(dpy, screen);
sw = DisplayWidth(dpy, screen) - 1; sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen) - 1; sh = DisplayHeight(dpy, screen);
initfont(font); initfont(font);
/* init atoms */ /* init atoms */
@ -356,7 +356,7 @@ setup(void) {
if(!ww) if(!ww)
ww = sw - wx; ww = sw - wx;
if(ww < 0) if(ww < 0)
ww = sw + ww; ww = sw + ww + 1;
if(!wx) if(!wx)
wx = 0; wx = 0;
if(wx < 0) if(wx < 0)
@ -364,7 +364,7 @@ setup(void) {
if(!wh) if(!wh)
wh = sh * rows / 32; wh = sh * rows / 32;
if(wh < 0) if(wh < 0)
wh = sh + wh; wh = sh + wh + 1;
if(!wy) if(!wy)
wy = sh - wh; wy = sh - wh;
if(wy < 0) if(wy < 0)
@ -454,22 +454,22 @@ updatekeys() {
int i, j; int i, j;
int x = 0, y = 0, h, base, r = 0; int x = 0, y = 0, h, base, r = 0;
h = wh / rows; h = (wh - 1) / rows;
for(i = 0; i < LENGTH(keys); i++) { for(i = 0; i < LENGTH(keys); i++) {
for(j = i, base = 0; j < LENGTH(keys) && keys[j].keysym != 0; j++) for(j = i, base = 0; j < LENGTH(keys) && keys[j].keysym != 0; j++)
base += keys[j].width; base += keys[j].width;
for(x = 0; i < LENGTH(keys) && keys[i].keysym != 0; i++, r++) { for(x = 0; i < LENGTH(keys) && keys[i].keysym != 0; i++, r++) {
keys[i].x = x; keys[i].x = x;
keys[i].y = y; keys[i].y = y;
keys[i].w = keys[i].width * ww / base; keys[i].w = keys[i].width * (ww - 1) / base;
if(rows == r - 1) if(rows == r - 1)
keys[i].h = wh - y; keys[i].h = wh - 1 - y;
else else
keys[i].h = h; keys[i].h = h;
x += keys[i].w; x += keys[i].w;
} }
if(base != 0) if(base != 0)
keys[i - 1].w = ww - keys[i - 1].x; keys[i - 1].w = ww - 1 - keys[i - 1].x;
y += h; y += h;
} }
} }