StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add XKBlib API to support keytypes 

Added common variants of XkbComputeEffectiveMap, XkbInitCanonicalKeyTypes
and all their needed functions. A couple functions that were in alloc.c
moved to malloc.c to mirror the libX11 sources better.

Original code in

libX11/src/xkb/XKBMalloc.c
libX11/src/xkb/XKBMisc.c
libX11/src/xkb/XKB.c
master
Dan Nicholson 2009-03-28 17:55:46 -07:00
parent baa9581d81
commit 5315e5d14a
7 changed files with 644 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/X11/extensions/XKBcommon.h
View File

@ -92,21 +92,27 @@ XkbcFreeIndicatorMaps(XkbcDescPtr xkb);
extern XkbcDescRec *
XkbcAllocKeyboard(void);
extern void
XkbcFreeKeyboard(XkbcDescPtr xkb, unsigned which, Bool freeAll);
extern int
XkbcAllocClientMap(XkbcDescPtr xkb, unsigned which, unsigned nTotalTypes);
extern int
XkbcAllocServerMap(XkbcDescPtr xkb, unsigned which, unsigned nNewActions);
extern int
XkbcCopyKeyType(XkbKeyTypePtr from, XkbKeyTypePtr into);
extern int
XkbcCopyKeyTypes(XkbKeyTypePtr from, XkbKeyTypePtr into, int num_types);
extern void
XkbcFreeClientMap(XkbcDescPtr xkb, unsigned what, Bool freeMap);
extern void
XkbcFreeServerMap(XkbcDescPtr xkb, unsigned what, Bool freeMap);
extern void
XkbcFreeKeyboard(XkbcDescPtr xkb, unsigned which, Bool freeAll);
extern void
XkbcFreeGeomProperties(XkbGeometryPtr geom, int first, int count, Bool freeAll);
@ -288,6 +294,17 @@ XkbcComputeRowBounds(XkbGeometryPtr geom, XkbSectionPtr section, XkbRowPtr row);
extern Bool
XkbcComputeSectionBounds(XkbGeometryPtr geom, XkbSectionPtr section);
extern int
XkbcInitCanonicalKeyTypes(XkbcDescPtr xkb, unsigned which, int keypadVMod);
extern Bool
XkbcVirtualModsToReal(XkbcDescPtr xkb, unsigned virtual_mask,
unsigned *mask_rtrn);
extern Bool
XkbcComputeEffectiveMap(XkbcDescPtr xkb, XkbKeyTypePtr type,
unsigned char *map_rtrn);
_XFUNCPROTOEND
#endif /* _XKBCOMMON_H_ */

5
src/Makefile.am
View File

@ -12,4 +12,7 @@ libxkbcommon_la_SOURCES = \
galloc.c \
geom.c \
keysym.c \
text.c
malloc.c \
misc.c \
text.c \
xkb.c

310
src/alloc.c
View File

@ -340,313 +340,3 @@ XkbcFreeKeyboard(XkbcDescPtr xkb, unsigned which, Bool freeAll)
if (freeAll)
_XkbFree(xkb);
}
int
XkbcAllocClientMap(XkbcDescPtr xkb, unsigned which, unsigned nTotalTypes)
{
int i;
XkbClientMapPtr map;
if (!xkb || ((nTotalTypes > 0) && (nTotalTypes < XkbNumRequiredTypes)))
return BadValue;
if ((which & XkbKeySymsMask) &&
((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))) {
#ifdef DEBUG
fprintf(stderr, "bad keycode (%d,%d) in XkbAllocClientMap\n",
xkb->min_key_code, xkb->max_key_code);
#endif
return BadValue;
}
if (!xkb->map) {
map = _XkbTypedCalloc(1, XkbClientMapRec);
if (!map)
return BadAlloc;
xkb->map = map;
}
else
map = xkb->map;
if ((which & XkbKeyTypesMask) && (nTotalTypes > 0)) {
if (!map->types) {
map->types = _XkbTypedCalloc(nTotalTypes, XkbKeyTypeRec);
if (!map->types)
return BadAlloc;
map->num_types = 0;
map->size_types = nTotalTypes;
}
else if (map->size_types < nTotalTypes) {
XkbKeyTypeRec *prev_types = map->types;
map->types = _XkbTypedRealloc(map->types, nTotalTypes,
XkbKeyTypeRec);
if (!map->types) {
_XkbFree(prev_types);
map->num_types = map->size_types = 0;
return BadAlloc;
}
map->size_types = nTotalTypes;
bzero(&map->types[map->num_types],
(map->size_types - map->num_types) * sizeof(XkbKeyTypeRec));
}
}
if (which & XkbKeySymsMask) {
int nKeys = XkbNumKeys(xkb);
if (!map->syms) {
map->size_syms = (nKeys * 15) / 10;
map->syms = _XkbTypedCalloc(map->size_syms, KeySym);
if (!map->syms) {
map->size_syms = 0;
return BadAlloc;
}
map->num_syms = 1;
map->syms[0] = NoSymbol;
}
if (!map->key_sym_map) {
i = xkb->max_key_code + 1;
map->key_sym_map = _XkbTypedCalloc(i, XkbSymMapRec);
if (!map->key_sym_map)
return BadAlloc;
}
}
if (which & XkbModifierMapMask) {
if ((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))
return BadMatch;
if (!map->modmap) {
i = xkb->max_key_code + 1;
map->modmap = _XkbTypedCalloc(i, unsigned char);
if (!map->modmap)
return BadAlloc;
}
}
return Success;
}
int
XkbcAllocServerMap(XkbcDescPtr xkb, unsigned which, unsigned nNewActions)
{
int i;
XkbServerMapPtr map;
if (!xkb)
return BadMatch;
if (!xkb->server) {
map = _XkbTypedCalloc(1, XkbServerMapRec);
if (!map)
return BadAlloc;
for (i = 0; i < XkbNumVirtualMods; i++)
map->vmods[i] = XkbNoModifierMask;
xkb->server = map;
}
else
map = xkb->server;
if (which & XkbExplicitComponentsMask) {
if ((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))
return BadMatch;
if (!map->explicit) {
i = xkb->max_key_code + 1;
map->explicit = _XkbTypedCalloc(i, unsigned char);
if (!map->explicit)
return BadAlloc;
}
}
if (which&XkbKeyActionsMask) {
if ((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))
return BadMatch;
if (nNewActions < 1)
nNewActions = 1;
if (!map->acts) {
map->acts = _XkbTypedCalloc(nNewActions + 1, XkbAction);
if (!map->acts)
return BadAlloc;
map->num_acts = 1;
map->size_acts = nNewActions + 1;
}
else if ((map->size_acts - map->num_acts) < nNewActions) {
unsigned need;
XkbAction *prev_acts = map->acts;
need = map->num_acts + nNewActions;
map->acts = _XkbTypedRealloc(map->acts, need, XkbAction);
if (!map->acts) {
_XkbFree(prev_acts);
map->num_acts = map->size_acts = 0;
return BadAlloc;
}
map->size_acts = need;
bzero(&map->acts[map->num_acts],
(map->size_acts - map->num_acts) * sizeof(XkbAction));
}
if (!map->key_acts) {
i = xkb->max_key_code + 1;
map->key_acts = _XkbTypedCalloc(i, unsigned short);
if (!map->key_acts)
return BadAlloc;
}
}
if (which & XkbKeyBehaviorsMask) {
if ((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))
return BadMatch;
if (!map->behaviors) {
i = xkb->max_key_code + 1;
map->behaviors = _XkbTypedCalloc(i, XkbBehavior);
if (!map->behaviors)
return BadAlloc;
}
}
if (which & XkbVirtualModMapMask) {
if ((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))
return BadMatch;
if (!map->vmodmap) {
i = xkb->max_key_code + 1;
map->vmodmap = _XkbTypedCalloc(i, unsigned short);
if (!map->vmodmap)
return BadAlloc;
}
}
return Success;
}
void
XkbcFreeClientMap(XkbcDescPtr xkb, unsigned what, Bool freeMap)
{
XkbClientMapPtr map;
if (!xkb || !xkb->map)
return;
if (freeMap)
what = XkbAllClientInfoMask;
map = xkb->map;
if (what & XkbKeyTypesMask) {
if (map->types) {
if (map->num_types > 0) {
int i;
XkbKeyTypePtr type;
for (i = 0, type = map->types; i < map->num_types; i++, type++) {
if (type->map) {
_XkbFree(type->map);
type->map = NULL;
}
if (type->preserve) {
_XkbFree(type->preserve);
type->preserve = NULL;
}
type->map_count = 0;
if (type->level_names) {
_XkbFree(type->level_names);
type->level_names = NULL;
}
}
}
_XkbFree(map->types);
map->num_types = map->size_types = 0;
map->types = NULL;
}
}
if (what & XkbKeySymsMask) {
if (map->key_sym_map) {
_XkbFree(map->key_sym_map);
map->key_sym_map = NULL;
}
if (map->syms) {
_XkbFree(map->syms);
map->size_syms = map->num_syms = 0;
map->syms = NULL;
}
}
if ((what & XkbModifierMapMask) && map->modmap) {
_XkbFree(map->modmap);
map->modmap = NULL;
}
if (freeMap) {
_XkbFree(xkb->map);
xkb->map = NULL;
}
}
void
XkbcFreeServerMap(XkbcDescPtr xkb, unsigned what, Bool freeMap)
{
XkbServerMapPtr map;
if (!xkb || !xkb->server)
return;
if (freeMap)
what = XkbAllServerInfoMask;
map = xkb->server;
if ((what & XkbExplicitComponentsMask) && map->explicit) {
_XkbFree(map->explicit);
map->explicit = NULL;
}
if (what & XkbKeyActionsMask) {
if (map->key_acts) {
_XkbFree(map->key_acts);
map->key_acts = NULL;
}
if (map->acts) {
_XkbFree(map->acts);
map->num_acts = map->size_acts = 0;
map->acts = NULL;
}
}
if ((what & XkbKeyBehaviorsMask) && map->behaviors) {
_XkbFree(map->behaviors);
map->behaviors = NULL;
}
if ((what & XkbVirtualModMapMask) && map->vmodmap) {
_XkbFree(map->vmodmap);
map->vmodmap = NULL;
}
if (freeMap) {
_XkbFree(xkb->server);
xkb->server = NULL;
}
}

393
src/malloc.c Normal file
View File

@ -0,0 +1,393 @@
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
Permission to use, copy, modify, and distribute this
software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
#include "X11/extensions/XKBcommon.h"
#include "XKBcommonint.h"
int
XkbcAllocClientMap(XkbcDescPtr xkb, unsigned which, unsigned nTotalTypes)
{
int i;
XkbClientMapPtr map;
if (!xkb || ((nTotalTypes > 0) && (nTotalTypes < XkbNumRequiredTypes)))
return BadValue;
if ((which & XkbKeySymsMask) &&
((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))) {
#ifdef DEBUG
fprintf(stderr, "bad keycode (%d,%d) in XkbAllocClientMap\n",
xkb->min_key_code, xkb->max_key_code);
#endif
return BadValue;
}
if (!xkb->map) {
map = _XkbTypedCalloc(1, XkbClientMapRec);
if (!map)
return BadAlloc;
xkb->map = map;
}
else
map = xkb->map;
if ((which & XkbKeyTypesMask) && (nTotalTypes > 0)) {
if (!map->types) {
map->types = _XkbTypedCalloc(nTotalTypes, XkbKeyTypeRec);
if (!map->types)
return BadAlloc;
map->num_types = 0;
map->size_types = nTotalTypes;
}
else if (map->size_types < nTotalTypes) {
XkbKeyTypeRec *prev_types = map->types;
map->types = _XkbTypedRealloc(map->types, nTotalTypes,
XkbKeyTypeRec);
if (!map->types) {
_XkbFree(prev_types);
map->num_types = map->size_types = 0;
return BadAlloc;
}
map->size_types = nTotalTypes;
bzero(&map->types[map->num_types],
(map->size_types - map->num_types) * sizeof(XkbKeyTypeRec));
}
}
if (which & XkbKeySymsMask) {
int nKeys = XkbNumKeys(xkb);
if (!map->syms) {
map->size_syms = (nKeys * 15) / 10;
map->syms = _XkbTypedCalloc(map->size_syms, KeySym);
if (!map->syms) {
map->size_syms = 0;
return BadAlloc;
}
map->num_syms = 1;
map->syms[0] = NoSymbol;
}
if (!map->key_sym_map) {
i = xkb->max_key_code + 1;
map->key_sym_map = _XkbTypedCalloc(i, XkbSymMapRec);
if (!map->key_sym_map)
return BadAlloc;
}
}
if (which & XkbModifierMapMask) {
if ((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))
return BadMatch;
if (!map->modmap) {
i = xkb->max_key_code + 1;
map->modmap = _XkbTypedCalloc(i, unsigned char);
if (!map->modmap)
return BadAlloc;
}
}
return Success;
}
int
XkbcAllocServerMap(XkbcDescPtr xkb, unsigned which, unsigned nNewActions)
{
int i;
XkbServerMapPtr map;
if (!xkb)
return BadMatch;
if (!xkb->server) {
map = _XkbTypedCalloc(1, XkbServerMapRec);
if (!map)
return BadAlloc;
for (i = 0; i < XkbNumVirtualMods; i++)
map->vmods[i] = XkbNoModifierMask;
xkb->server = map;
}
else
map = xkb->server;
if (which & XkbExplicitComponentsMask) {
if ((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))
return BadMatch;
if (!map->explicit) {
i = xkb->max_key_code + 1;
map->explicit = _XkbTypedCalloc(i, unsigned char);
if (!map->explicit)
return BadAlloc;
}
}
if (which&XkbKeyActionsMask) {
if ((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))
return BadMatch;
if (nNewActions < 1)
nNewActions = 1;
if (!map->acts) {
map->acts = _XkbTypedCalloc(nNewActions + 1, XkbAction);
if (!map->acts)
return BadAlloc;
map->num_acts = 1;
map->size_acts = nNewActions + 1;
}
else if ((map->size_acts - map->num_acts) < nNewActions) {
unsigned need;
XkbAction *prev_acts = map->acts;
need = map->num_acts + nNewActions;
map->acts = _XkbTypedRealloc(map->acts, need, XkbAction);
if (!map->acts) {
_XkbFree(prev_acts);
map->num_acts = map->size_acts = 0;
return BadAlloc;
}
map->size_acts = need;
bzero(&map->acts[map->num_acts],
(map->size_acts - map->num_acts) * sizeof(XkbAction));
}
if (!map->key_acts) {
i = xkb->max_key_code + 1;
map->key_acts = _XkbTypedCalloc(i, unsigned short);
if (!map->key_acts)
return BadAlloc;
}
}
if (which & XkbKeyBehaviorsMask) {
if ((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))
return BadMatch;
if (!map->behaviors) {
i = xkb->max_key_code + 1;
map->behaviors = _XkbTypedCalloc(i, XkbBehavior);
if (!map->behaviors)
return BadAlloc;
}
}
if (which & XkbVirtualModMapMask) {
if ((!XkbIsLegalKeycode(xkb->min_key_code)) ||
(!XkbIsLegalKeycode(xkb->max_key_code)) ||
(xkb->max_key_code < xkb->min_key_code))
return BadMatch;
if (!map->vmodmap) {
i = xkb->max_key_code + 1;
map->vmodmap = _XkbTypedCalloc(i, unsigned short);
if (!map->vmodmap)
return BadAlloc;
}
}
return Success;
}
int
XkbcCopyKeyType(XkbKeyTypePtr from,XkbKeyTypePtr into)
{
if ((!from)||(!into))
return BadMatch;
if (into->map) {
_XkbFree(into->map);
into->map= NULL;
}
if (into->preserve) {
_XkbFree(into->preserve);
into->preserve= NULL;
}
if (into->level_names) {
_XkbFree(into->level_names);
into->level_names= NULL;
}
*into= *from;
if ((from->map)&&(into->map_count>0)) {
into->map= _XkbTypedCalloc(into->map_count,XkbKTMapEntryRec);
if (!into->map)
return BadAlloc;
memcpy(into->map,from->map,into->map_count*sizeof(XkbKTMapEntryRec));
}
if ((from->preserve)&&(into->map_count>0)) {
into->preserve= _XkbTypedCalloc(into->map_count,XkbModsRec);
if (!into->preserve)
return BadAlloc;
memcpy(into->preserve,from->preserve,
into->map_count*sizeof(XkbModsRec));
}
if ((from->level_names)&&(into->num_levels>0)) {
into->level_names= _XkbTypedCalloc(into->num_levels,Atom);
if (!into->level_names)
return BadAlloc;
memcpy(into->level_names,from->level_names,
into->num_levels*sizeof(Atom));
}
return Success;
}
int
XkbcCopyKeyTypes(XkbKeyTypePtr from,XkbKeyTypePtr into,int num_types)
{
register int i,rtrn;
if ((!from)||(!into)||(num_types<0))
return BadMatch;
for (i=0;i<num_types;i++) {
if ((rtrn= XkbcCopyKeyType(from++,into++))!=Success)
return rtrn;
}
return Success;
}
void
XkbcFreeClientMap(XkbcDescPtr xkb, unsigned what, Bool freeMap)
{
XkbClientMapPtr map;
if (!xkb || !xkb->map)
return;
if (freeMap)
what = XkbAllClientInfoMask;
map = xkb->map;
if (what & XkbKeyTypesMask) {
if (map->types) {
if (map->num_types > 0) {
int i;
XkbKeyTypePtr type;
for (i = 0, type = map->types; i < map->num_types; i++, type++) {
if (type->map) {
_XkbFree(type->map);
type->map = NULL;
}
if (type->preserve) {
_XkbFree(type->preserve);
type->preserve = NULL;
}
type->map_count = 0;
if (type->level_names) {
_XkbFree(type->level_names);
type->level_names = NULL;
}
}
}
_XkbFree(map->types);
map->num_types = map->size_types = 0;
map->types = NULL;
}
}
if (what & XkbKeySymsMask) {
if (map->key_sym_map) {
_XkbFree(map->key_sym_map);
map->key_sym_map = NULL;
}
if (map->syms) {
_XkbFree(map->syms);
map->size_syms = map->num_syms = 0;
map->syms = NULL;
}
}
if ((what & XkbModifierMapMask) && map->modmap) {
_XkbFree(map->modmap);
map->modmap = NULL;
}
if (freeMap) {
_XkbFree(xkb->map);
xkb->map = NULL;
}
}
void
XkbcFreeServerMap(XkbcDescPtr xkb, unsigned what, Bool freeMap)
{
XkbServerMapPtr map;
if (!xkb || !xkb->server)
return;
if (freeMap)
what = XkbAllServerInfoMask;
map = xkb->server;
if ((what & XkbExplicitComponentsMask) && map->explicit) {
_XkbFree(map->explicit);
map->explicit = NULL;
}
if (what & XkbKeyActionsMask) {
if (map->key_acts) {
_XkbFree(map->key_acts);
map->key_acts = NULL;
}
if (map->acts) {
_XkbFree(map->acts);
map->num_acts = map->size_acts = 0;
map->acts = NULL;
}
}
if ((what & XkbKeyBehaviorsMask) && map->behaviors) {
_XkbFree(map->behaviors);
map->behaviors = NULL;
}
if ((what & XkbVirtualModMapMask) && map->vmodmap) {
_XkbFree(map->vmodmap);
map->vmodmap = NULL;
}
if (freeMap) {
_XkbFree(xkb->server);
xkb->server = NULL;
}
}

147
src/misc.c Normal file
View File

@ -0,0 +1,147 @@
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
Permission to use, copy, modify, and distribute this
software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "X11/extensions/XKBcommon.h"
#include "XKBcommonint.h"
#define mapSize(m) (sizeof(m)/sizeof(XkbKTMapEntryRec))
static XkbKTMapEntryRec map2Level[]= {
{ True, ShiftMask, {1, ShiftMask, 0} }
};
static XkbKTMapEntryRec mapAlpha[]= {
{ True, ShiftMask, { 1, ShiftMask, 0 } },
{ True, LockMask, { 0, LockMask, 0 } }
};
static XkbModsRec preAlpha[]= {
{ 0, 0, 0 },
{ LockMask, LockMask, 0 }
};
#define NL_VMOD_MASK 0
static XkbKTMapEntryRec mapKeypad[]= {
{ True, ShiftMask, { 1, ShiftMask, 0 } },
{ False, 0, { 1, 0, NL_VMOD_MASK } }
};
static XkbKeyTypeRec canonicalTypes[XkbNumRequiredTypes] = {
{ { 0, 0, 0 },
1, /* num_levels */
0, /* map_count */
NULL, NULL,
None, NULL
},
{ { ShiftMask, ShiftMask, 0 },
2, /* num_levels */
mapSize(map2Level), /* map_count */
map2Level, NULL,
None, NULL
},
{ { ShiftMask|LockMask, ShiftMask|LockMask, 0 },
2, /* num_levels */
mapSize(mapAlpha), /* map_count */
mapAlpha, preAlpha,
None, NULL
},
{ { ShiftMask, ShiftMask, NL_VMOD_MASK },
2, /* num_levels */
mapSize(mapKeypad), /* map_count */
mapKeypad, NULL,
None, NULL
}
};
int
XkbcInitCanonicalKeyTypes(XkbcDescPtr xkb,unsigned which,int keypadVMod)
{
XkbClientMapPtr map;
XkbKeyTypePtr from,to;
int rtrn;
if (!xkb)
return BadMatch;
rtrn= XkbcAllocClientMap(xkb,XkbKeyTypesMask,XkbNumRequiredTypes);
if (rtrn!=Success)
return rtrn;
map= xkb->map;
if ((which&XkbAllRequiredTypes)==0)
return Success;
rtrn= Success;
from= canonicalTypes;
to= map->types;
if (which&XkbOneLevelMask)
rtrn= XkbcCopyKeyType(&from[XkbOneLevelIndex],&to[XkbOneLevelIndex]);
if ((which&XkbTwoLevelMask)&&(rtrn==Success))
rtrn= XkbcCopyKeyType(&from[XkbTwoLevelIndex],&to[XkbTwoLevelIndex]);
if ((which&XkbAlphabeticMask)&&(rtrn==Success))
rtrn= XkbcCopyKeyType(&from[XkbAlphabeticIndex],&to[XkbAlphabeticIndex]);
if ((which&XkbKeypadMask)&&(rtrn==Success)) {
XkbKeyTypePtr type;
rtrn= XkbcCopyKeyType(&from[XkbKeypadIndex],&to[XkbKeypadIndex]);
type= &to[XkbKeypadIndex];
if ((keypadVMod>=0)&&(keypadVMod<XkbNumVirtualMods)&&(rtrn==Success)) {
type->mods.vmods= (1<<keypadVMod);
type->map[0].active= True;
type->map[0].mods.mask= ShiftMask;
type->map[0].mods.real_mods= ShiftMask;
type->map[0].mods.vmods= 0;
type->map[0].level= 1;
type->map[1].active= False;
type->map[1].mods.mask= 0;
type->map[1].mods.real_mods= 0;
type->map[1].mods.vmods= (1<<keypadVMod);
type->map[1].level= 1;
}
}
return Success;
}
Bool
XkbcVirtualModsToReal(XkbcDescPtr xkb,unsigned virtual_mask,unsigned *mask_rtrn)
{
register int i,bit;
register unsigned mask;
if (xkb==NULL)
return False;
if (virtual_mask==0) {
*mask_rtrn= 0;
return True;
}
if (xkb->server==NULL)
return False;
for (i=mask=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
if (virtual_mask&bit)
mask|= xkb->server->vmods[i];
}
*mask_rtrn= mask;
return True;
}

78
src/xkb.c Normal file
View File

@ -0,0 +1,78 @@
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
Permission to use, copy, modify, and distribute this
software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "X11/extensions/XKBcommon.h"
#include "XKBcommonint.h"
Bool
XkbcComputeEffectiveMap( XkbcDescPtr xkb,
XkbKeyTypePtr type,
unsigned char * map_rtrn)
{
register int i;
unsigned tmp;
XkbKTMapEntryPtr entry = NULL;
if ((!xkb)||(!type)||(!xkb->server))
return False;
if (type->mods.vmods!=0) {
if (!XkbcVirtualModsToReal(xkb,type->mods.vmods,&tmp))
return False;
type->mods.mask= tmp|type->mods.real_mods;
entry= type->map;
for (i=0;i<type->map_count;i++,entry++) {
tmp= 0;
if (entry->mods.vmods!=0) {
if (!XkbcVirtualModsToReal(xkb,entry->mods.vmods,&tmp))
return False;
if (tmp==0) {
entry->active= False;
continue;
}
}
entry->active= True;
entry->mods.mask= (entry->mods.real_mods|tmp)&type->mods.mask;
}
}
else {
type->mods.mask= type->mods.real_mods;
}
if (map_rtrn!=NULL) {
bzero(map_rtrn,type->mods.mask+1);
for (i=0;i<type->map_count;i++) {
if (entry->active) {
map_rtrn[type->map[i].mods.mask]= type->map[i].level;
}
}
}
return True;
}

4
src/xkbcomp/keytypes.c
View File

@ -1192,7 +1192,7 @@ CopyDefToKeyType(XkbcDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def)
def->nEntries = def->szEntries = 0;
def->entries = NULL;
return XkbComputeEffectiveMap(xkb, type, NULL);
return XkbcComputeEffectiveMap(xkb, type, NULL);
}
Bool
@ -1243,7 +1243,7 @@ CompileKeyTypes(XkbFile *file, XkbcDescPtr xkb, unsigned merge)
missing = XkbAllRequiredTypes & (~info.stdPresent);
keypadVMod = FindKeypadVMod(xkb);
if (XkbInitCanonicalKeyTypes(xkb, missing, keypadVMod) != Success)
if (XkbcInitCanonicalKeyTypes(xkb, missing, keypadVMod) != Success)
{
WSGO("Couldn't initialize canonical key types\n");
ACTION("Exiting\n");