fix some leaks; update lock.sh

This commit is contained in:
Chris Guillott 2017-12-05 13:27:43 -05:00
parent 1ecd26e59c
commit ef9d84128f
2 changed files with 9 additions and 3 deletions

View File

@ -216,11 +216,15 @@ char* get_keylayoutname(int mode) {
if (XkbGetNames(display, XkbGroupNamesMask, keyboard) != Success ) {
DEBUG("Error obtaining symbolic names");
XCloseDisplay(display);
XkbFreeClientMap(keyboard, 0, true);
return NULL;
}
if(XkbGetState(display, XkbUseCoreKbd, &state) != Success) {
DEBUG("Error getting keyboard state");
XCloseDisplay(display);
XkbFreeClientMap(keyboard, 0, true);
return NULL;
}
@ -258,10 +262,12 @@ char* get_keylayoutname(int mode) {
default:
break;
}
// note: this is called in option parsing, so this debug() may not trigger unless --debug is the first option
DEBUG("answer after mode parsing: [%s]\n", answer);
// Free symbolic names structures
XkbFreeNames(keyboard, XkbGroupNamesMask, True);
// note: this is called in option parsing, so this debug() may not trigger unless --debug is the first option
XkbFreeClientMap(keyboard, 0, true);
XCloseDisplay(display);
display = NULL;
return answer;
}

View File

@ -7,7 +7,7 @@ T='#ee00eeee' # text
W='#880000bb' # wrong
V='#bb00bbbb' # verifying
./i3lock \
./x86_64-pc-linux-gnu/i3lock \
--insidevercolor=$C \
--ringvercolor=$V \
\