diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-07-18 16:29:35 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:08:56 +1100 |
| commit | 1ad80678d88525159e55bb814205fd4eaca060a3 (patch) | |
| tree | 1c44006af6a88624333e1f6ec46bd14d21607a73 /xkb/xkbfmisc.c | |
| parent | 133e0bd6f1cc147a2ddbbe1519d10300e7dbe669 (diff) | |
XKB: Remove support for setting combined keymaps
We don't do full keymaps anymore. Deal.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'xkb/xkbfmisc.c')
| -rw-r--r-- | xkb/xkbfmisc.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index dd403eaff..349c79a86 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -170,7 +170,7 @@ int multi_section; unsigned wantNames,wantConfig,wantDflts; complete= 0; - if ((name=names->keymap)==NULL) name= "default"; + name= "default"; if (COMPLETE(names->keycodes)) complete|= XkmKeyNamesMask; if (COMPLETE(names->types)) complete|= XkmTypesMask; if (COMPLETE(names->compat)) complete|= XkmCompatMapMask; @@ -412,29 +412,6 @@ unsigned rtrn; return rtrn; } -/* all latin-1 alphanumerics, plus parens, slash, minus, underscore and */ -/* wildcards */ - -static unsigned char componentSpecLegal[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0xa7, 0xff, 0x83, - 0xfe, 0xff, 0xff, 0x87, 0xfe, 0xff, 0xff, 0x07, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0xff -}; - -void -XkbEnsureSafeMapName(char *name) -{ - if (name==NULL) - return; - while (*name!='\0') { - if ((componentSpecLegal[(*name)/8]&(1<<((*name)%8)))==0) - *name= '_'; - name++; - } - return; -} - /***====================================================================***/ #define UNMATCHABLE(c) (((c)=='(')||((c)==')')||((c)=='/')) |