diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-12-26 18:38:25 +1100 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:08:51 +1100 |
| commit | 08363c5830bdea34012dcd954b45ccfdc79a3a7e (patch) | |
| tree | 67475a96ca4c23bcacb626b02eb4ab2f8602a742 /xkb/xkbUtils.c | |
| parent | 40877c6680863bd6a8475f2bb0c54df55bcf0b0e (diff) | |
Input: Overhaul keyboard initialisation process
XkbInitKeyboardDeviceStruct is now the only valid keyboard
initialisation: all the details are hidden behind here. This now makes
it impossible to supply a core keymap at startup.
If dev->key is valid, dev->key->xkbInfo->desc is also valid.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'xkb/xkbUtils.c')
| -rw-r--r-- | xkb/xkbUtils.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index abfd6fb97..c7a6d99d0 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -382,10 +382,6 @@ int maxNumberOfGroups; else if (resize) { keyc->curKeySyms.minKeyCode= xkb->min_key_code; keyc->curKeySyms.maxKeyCode= xkb->max_key_code; - tmp= keyc->curKeySyms.mapWidth*_XkbCoreNumKeys(keyc); - keyc->curKeySyms.map= _XkbTypedRealloc(keyc->curKeySyms.map,tmp,KeySym); - if (!keyc->curKeySyms.map) - FatalError("Couldn't allocate keysyms\n"); first= firstCommon= xkb->min_key_code; last= lastCommon= xkb->max_key_code; } @@ -622,8 +618,6 @@ XkbEventCauseRec cause; XkbChangesRec changes; unsigned check; - if (kbd->key->xkbInfo==NULL) - XkbInitDevice(kbd); bzero(&changes,sizeof(XkbChangesRec)); check= 0; if (request==MappingKeyboard) { |