projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4f83a15
)
dont assert when there is no valid key layout present
author
Dana Jansens
<danakj@orodu.net>
Tue, 9 Feb 2010 00:29:02 +0000
(19:29 -0500)
committer
Dana Jansens
<danakj@orodu.net>
Wed, 10 Feb 2010 02:01:58 +0000
(21:01 -0500)
obt/keyboard.c
patch
|
blob
|
history
diff --git
a/obt/keyboard.c
b/obt/keyboard.c
index
264201a
..
6bb1386
100644
(file)
--- a/
obt/keyboard.c
+++ b/
obt/keyboard.c
@@
-61,7
+61,8
@@
void obt_keyboard_reload(void)
modkeys_keys[i] = 0;
modmap = XGetModifierMapping(obt_display);
- g_assert(modmap->max_keypermod > 0);
+ /* note: modmap->max_keypermod can be 0 when there is no valid key layout
+ available */
XDisplayKeycodes(obt_display, &min_keycode, &max_keycode);
keymap = XGetKeyboardMapping(obt_display, min_keycode,