sergiotarxz
/
svkbd_dvorak
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing segment fault while resizing.

This commit is contained in:
Enno Boland (Gottox) 2011-04-04 13:47:27 +02:00
parent 3619838eb7
commit fb55e57fc1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -6,7 +6,7 @@ include config.mk
SRC = svkbd.c SRC = svkbd.c
LAYOUTS = en de arrows LAYOUTS = en de arrows
all: options svkbd.en all: options svkbd-en
options: options:
@echo svkbd build options: @echo svkbd build options:
@ -19,7 +19,7 @@ config.h: config.mk
@echo creating $@ from config.def.h @echo creating $@ from config.def.h
@cp config.def.h $@ @cp config.def.h $@
svkbd.%: layout.%.h config.h ${SRC} svkbd-%: layout.%.h config.h ${SRC}
@echo creating layout.h from $< @echo creating layout.h from $<
@cp $< layout.h @cp $< layout.h
@echo CC -o $@ @echo CC -o $@
@ -29,7 +29,7 @@ clean:
@echo cleaning @echo cleaning
@for i in ${LAYOUTS}; \ @for i in ${LAYOUTS}; \
do \ do \
rm -f svkbd.$$i 2> /dev/null; \ rm -f svkbd-$$i 2> /dev/null; \
done; true done; true
@rm -f ${OBJ} svkbd-${VERSION}.tar.gz 2> /dev/null; true @rm -f ${OBJ} svkbd-${VERSION}.tar.gz 2> /dev/null; true

10
svkbd.c
View File

@ -91,7 +91,7 @@ static DC dc;
static Window root, win; static Window root, win;
static Bool running = True; static Bool running = True;
static KeySym pressedmod = 0; static KeySym pressedmod = 0;
static int rows, ww = 0, wh = 0, wx = 0, wy = 0; static int rows = 0, ww = 0, wh = 0, wx = 0, wy = 0;
static char *name = "svkbd"; static char *name = "svkbd";
static char *wintype = "_NET_WM_WINDOW_TYPE_TOOLBAR"; static char *wintype = "_NET_WM_WINDOW_TYPE_TOOLBAR";
/* configuration, allows nested code to access above variables */ /* configuration, allows nested code to access above variables */
@ -445,17 +445,17 @@ updatekeys() {
int x = 0, y = 0, h, base; int x = 0, y = 0, h, base;
h = wh / rows; h = wh / rows;
for(i = 0; i < LENGTH(keys); i++, rows--) { 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++) { for(x = 0; i < LENGTH(keys) && keys[i].keysym != 0; i++) {
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 / base;
if(rows != 1) if(rows == i + 1)
keys[i].h = h;
else
keys[i].h = wh - y; keys[i].h = wh - y;
else
keys[i].h = h;
x += keys[i].w; x += keys[i].w;
} }
if(base != 0) if(base != 0)