[PATCH 10/11] xkb: remove XkbFoobar -> SrvXkbFoobar defines.
Peter Hutterer
peter.hutterer at who-t.net
Thu Jan 14 21:32:18 PST 2010
These functions have the same names as the client-side functions as a legacy
of the shared header files. Remove the define, rename all functions to
XkbSrvFoobar. XkbSrvFoobar is preferable to SrvXkbFoobar for namespacing.
This technically changes the ABI for all given defines from SrvXkbFoobar to
XkbSrvFoobar.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
hw/xnest/Keyboard.c | 2 +-
include/xkbsrv.h | 73 +++++++++++++++------------------------------
xkb/XKBAlloc.c | 24 +++++++-------
xkb/XKBMAlloc.c | 20 ++++++------
xkb/XKBMisc.c | 42 +++++++++++++-------------
xkb/ddxLoad.c | 2 +-
xkb/xkb.c | 22 +++++++-------
xkb/xkbAccessX.c | 2 +-
xkb/xkbActions.c | 16 +++++-----
xkb/xkbInit.c | 26 ++++++++--------
xkb/xkbLEDs.c | 6 ++--
xkb/xkbUtils.c | 16 +++++-----
xkb/xkbgeom.h | 82 +++++++++++++++++++++++++-------------------------
xkb/xkmread.c | 34 ++++++++++----------
14 files changed, 171 insertions(+), 196 deletions(-)
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 1835c70..20c50d4 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -167,7 +167,7 @@ xnestKeyboardProc(DeviceIntPtr pDev, int onoff)
InitKeyboardDeviceStruct(pDev, NULL,
xnestBell, xnestChangeKeyboardControl);
XkbDDXChangeControls(pDev, xkb->ctrls, xkb->ctrls);
- XkbFreeKeyboard(xkb, 0, False);
+ XkbSrvFreeKeyboard(xkb, 0, False);
xfree(keymap);
break;
case DEVICE_ON:
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index bd3a5cb..d5a811d 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -27,31 +27,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef _XKBSRV_H_
#define _XKBSRV_H_
-#define XkbAllocClientMap SrvXkbAllocClientMap
-#define XkbAllocServerMap SrvXkbAllocServerMap
-#define XkbChangeTypesOfKey SrvXkbChangeTypesOfKey
-#define XkbCopyKeyTypes SrvXkbCopyKeyTypes
-#define XkbFreeClientMap SrvXkbFreeClientMap
-#define XkbFreeServerMap SrvXkbFreeServerMap
-#define XkbKeyTypesForCoreSymbols SrvXkbKeyTypesForCoreSymbols
-#define XkbApplyCompatMapToKey SrvXkbApplyCompatMapToKey
-#define XkbResizeKeyActions SrvXkbResizeKeyActions
-#define XkbResizeKeySyms SrvXkbResizeKeySyms
-#define XkbResizeKeyType SrvXkbResizeKeyType
-#define XkbAllocCompatMap SrvXkbAllocCompatMap
-#define XkbAllocControls SrvXkbAllocControls
-#define XkbAllocIndicatorMaps SrvXkbAllocIndicatorMaps
-#define XkbAllocKeyboard SrvXkbAllocKeyboard
-#define XkbAllocNames SrvXkbAllocNames
-#define XkbFreeCompatMap SrvXkbFreeCompatMap
-#define XkbFreeKeyboard SrvXkbFreeKeyboard
-#define XkbFreeNames SrvXkbFreeNames
-#define XkbLatchModifiers SrvXkbLatchModifiers
-#define XkbLatchGroup SrvXkbLatchGroup
-#define XkbVirtualModsToReal SrvXkbVirtualModsToReal
-#define XkbChangeKeycodeRange SrvXkbChangeKeycodeRange
-#define XkbApplyVirtualModChanges SrvXkbApplyVirtualModChanges
-
#include <X11/extensions/XKBproto.h>
#include "xkbstr.h"
#include "xkbrules.h"
@@ -320,13 +295,13 @@ extern _X_EXPORT int XkbProcessArguments(
extern _X_EXPORT void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc);
-extern _X_EXPORT void XkbFreeCompatMap(
+extern _X_EXPORT void XkbSrvFreeCompatMap(
XkbDescPtr /* xkb */,
unsigned int /* which */,
Bool /* freeMap */
);
-extern _X_EXPORT void XkbFreeNames(
+extern _X_EXPORT void XkbSrvFreeNames(
XkbDescPtr /* xkb */,
unsigned int /* which */,
Bool /* freeMap */
@@ -372,63 +347,63 @@ extern _X_EXPORT int _XkbLookupButtonDevice(
int *xkb_err
);
-extern _X_EXPORT XkbDescPtr XkbAllocKeyboard(
+extern _X_EXPORT XkbDescPtr XkbSrvAllocKeyboard(
void
);
-extern _X_EXPORT Status XkbAllocClientMap(
+extern _X_EXPORT Status XkbSrvAllocClientMap(
XkbDescPtr /* xkb */,
unsigned int /* which */,
unsigned int /* nTypes */
);
-extern _X_EXPORT Status XkbAllocServerMap(
+extern _X_EXPORT Status XkbSrvAllocServerMap(
XkbDescPtr /* xkb */,
unsigned int /* which */,
unsigned int /* nNewActions */
);
-extern _X_EXPORT void XkbFreeClientMap(
+extern _X_EXPORT void XkbSrvFreeClientMap(
XkbDescPtr /* xkb */,
unsigned int /* what */,
Bool /* freeMap */
);
-extern _X_EXPORT void XkbFreeServerMap(
+extern _X_EXPORT void XkbSrvFreeServerMap(
XkbDescPtr /* xkb */,
unsigned int /* what */,
Bool /* freeMap */
);
-extern _X_EXPORT Status XkbAllocIndicatorMaps(
+extern _X_EXPORT Status XkbSrvAllocIndicatorMaps(
XkbDescPtr /* xkb */
);
-extern _X_EXPORT Status XkbAllocCompatMap(
+extern _X_EXPORT Status XkbSrvAllocCompatMap(
XkbDescPtr /* xkb */,
unsigned int /* which */,
unsigned int /* nInterpret */
);
-extern _X_EXPORT Status XkbAllocNames(
+extern _X_EXPORT Status XkbSrvAllocNames(
XkbDescPtr /* xkb */,
unsigned int /* which */,
int /* nTotalRG */,
int /* nTotalAliases */
);
-extern _X_EXPORT Status XkbAllocControls(
+extern _X_EXPORT Status XkbSrvAllocControls(
XkbDescPtr /* xkb */,
unsigned int /* which*/
);
-extern _X_EXPORT Status XkbCopyKeyTypes(
+extern _X_EXPORT Status XkbSrvCopyKeyTypes(
XkbKeyTypePtr /* from */,
XkbKeyTypePtr /* into */,
int /* num_types */
);
-extern _X_EXPORT Status XkbResizeKeyType(
+extern _X_EXPORT Status XkbSrvResizeKeyType(
XkbDescPtr /* xkb */,
int /* type_ndx */,
int /* map_count */,
@@ -436,7 +411,7 @@ extern _X_EXPORT Status XkbResizeKeyType(
int /* new_num_lvls */
);
-extern _X_EXPORT void XkbFreeKeyboard(
+extern _X_EXPORT void XkbSrvFreeKeyboard(
XkbDescPtr /* xkb */,
unsigned int /* which */,
Bool /* freeDesc */
@@ -453,7 +428,7 @@ extern _X_EXPORT unsigned int XkbMaskForVMask(
unsigned int /* vmask */
);
-extern _X_EXPORT Bool XkbVirtualModsToReal(
+extern _X_EXPORT Bool XkbSrvVirtualModsToReal(
XkbDescPtr /* xkb */,
unsigned int /* virtua_mask */,
unsigned int * /* mask_rtrn */
@@ -464,13 +439,13 @@ extern _X_EXPORT unsigned int XkbAdjustGroup(
XkbControlsPtr /* ctrls */
);
-extern _X_EXPORT KeySym *XkbResizeKeySyms(
+extern _X_EXPORT KeySym *XkbSrvResizeKeySyms(
XkbDescPtr /* xkb */,
int /* key */,
int /* needed */
);
-extern _X_EXPORT XkbAction *XkbResizeKeyActions(
+extern _X_EXPORT XkbAction *XkbSrvResizeKeyActions(
XkbDescPtr /* xkb */,
int /* key */,
int /* needed */
@@ -808,13 +783,13 @@ extern _X_EXPORT void XkbSetRepeatKeys(
int /* onoff */
);
-extern _X_EXPORT int XkbLatchModifiers(
+extern _X_EXPORT int XkbSrvLatchModifiers(
DeviceIntPtr /* pXDev */,
CARD8 /* mask */,
CARD8 /* latches */
);
-extern _X_EXPORT int XkbLatchGroup(
+extern _X_EXPORT int XkbSrvLatchGroup(
DeviceIntPtr /* pXDev */,
int /* group */
);
@@ -863,7 +838,7 @@ extern _X_EXPORT void XkbConvertCase(
KeySym * /* upper */
);
-extern _X_EXPORT Status XkbChangeKeycodeRange(
+extern _X_EXPORT Status XkbSrvChangeKeycodeRange(
XkbDescPtr /* xkb */,
int /* minKC */,
int /* maxKC */,
@@ -878,7 +853,7 @@ extern _X_EXPORT void XkbFreeInfo(
XkbSrvInfoPtr /* xkbi */
);
-extern _X_EXPORT Status XkbChangeTypesOfKey(
+extern _X_EXPORT Status XkbSrvChangeTypesOfKey(
XkbDescPtr /* xkb */,
int /* key */,
int /* nGroups */,
@@ -887,7 +862,7 @@ extern _X_EXPORT Status XkbChangeTypesOfKey(
XkbMapChangesPtr /* changes */
);
-extern _X_EXPORT int XkbKeyTypesForCoreSymbols(
+extern _X_EXPORT int XkbSrvKeyTypesForCoreSymbols(
XkbDescPtr /* xkb */,
int /* map_width */,
KeySym * /* core_syms */,
@@ -896,13 +871,13 @@ extern _X_EXPORT int XkbKeyTypesForCoreSymbols(
KeySym * /* xkb_syms_rtrn */
);
-extern _X_EXPORT Bool XkbApplyCompatMapToKey(
+extern _X_EXPORT Bool XkbSrvApplyCompatMapToKey(
XkbDescPtr /* xkb */,
KeyCode /* key */,
XkbChangesPtr /* changes */
);
-extern _X_EXPORT Bool XkbApplyVirtualModChanges(
+extern _X_EXPORT Bool XkbSrvApplyVirtualModChanges(
XkbDescPtr /* xkb */,
unsigned int /* changed */,
XkbChangesPtr /* changes */
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index d40aa33..403257f 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -42,7 +42,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
/*ARGSUSED*/
Status
-XkbAllocCompatMap(XkbDescPtr xkb,unsigned which,unsigned nSI)
+XkbSrvAllocCompatMap(XkbDescPtr xkb,unsigned which,unsigned nSI)
{
XkbCompatMapPtr compat;
XkbSymInterpretRec *prev_interpret;
@@ -89,7 +89,7 @@ XkbSymInterpretRec *prev_interpret;
void
-XkbFreeCompatMap(XkbDescPtr xkb,unsigned which,Bool freeMap)
+XkbSrvFreeCompatMap(XkbDescPtr xkb,unsigned which,Bool freeMap)
{
register XkbCompatMapPtr compat;
@@ -116,7 +116,7 @@ register XkbCompatMapPtr compat;
/***===================================================================***/
Status
-XkbAllocNames(XkbDescPtr xkb,unsigned which,int nTotalRG,int nTotalAliases)
+XkbSrvAllocNames(XkbDescPtr xkb,unsigned which,int nTotalRG,int nTotalAliases)
{
XkbNamesPtr names;
@@ -196,7 +196,7 @@ XkbNamesPtr names;
}
void
-XkbFreeNames(XkbDescPtr xkb,unsigned which,Bool freeMap)
+XkbSrvFreeNames(XkbDescPtr xkb,unsigned which,Bool freeMap)
{
XkbNamesPtr names;
@@ -245,7 +245,7 @@ XkbNamesPtr names;
/*ARGSUSED*/
Status
-XkbAllocControls(XkbDescPtr xkb,unsigned which)
+XkbSrvAllocControls(XkbDescPtr xkb,unsigned which)
{
if (xkb==NULL)
return BadMatch;
@@ -272,7 +272,7 @@ XkbFreeControls(XkbDescPtr xkb,unsigned which,Bool freeMap)
/***===================================================================***/
Status
-XkbAllocIndicatorMaps(XkbDescPtr xkb)
+XkbSrvAllocIndicatorMaps(XkbDescPtr xkb)
{
if (xkb==NULL)
return BadMatch;
@@ -297,7 +297,7 @@ XkbFreeIndicatorMaps(XkbDescPtr xkb)
/***====================================================================***/
XkbDescRec *
-XkbAllocKeyboard(void)
+XkbSrvAllocKeyboard(void)
{
XkbDescRec *xkb;
@@ -308,22 +308,22 @@ XkbDescRec *xkb;
}
void
-XkbFreeKeyboard(XkbDescPtr xkb,unsigned which,Bool freeAll)
+XkbSrvFreeKeyboard(XkbDescPtr xkb,unsigned which,Bool freeAll)
{
if (xkb==NULL)
return;
if (freeAll)
which= XkbAllComponentsMask;
if (which&XkbClientMapMask)
- XkbFreeClientMap(xkb,XkbAllClientInfoMask,TRUE);
+ XkbSrvFreeClientMap(xkb,XkbAllClientInfoMask,TRUE);
if (which&XkbServerMapMask)
- XkbFreeServerMap(xkb,XkbAllServerInfoMask,TRUE);
+ XkbSrvFreeServerMap(xkb,XkbAllServerInfoMask,TRUE);
if (which&XkbCompatMapMask)
- XkbFreeCompatMap(xkb,XkbAllCompatMask,TRUE);
+ XkbSrvFreeCompatMap(xkb,XkbAllCompatMask,TRUE);
if (which&XkbIndicatorMapMask)
XkbFreeIndicatorMaps(xkb);
if (which&XkbNamesMask)
- XkbFreeNames(xkb,XkbAllNamesMask,TRUE);
+ XkbSrvFreeNames(xkb,XkbAllNamesMask,TRUE);
if ((which&XkbGeometryMask) && (xkb->geom!=NULL)) {
XkbFreeGeometry(xkb->geom,XkbGeomAllMask,TRUE);
/* PERHAPS BONGHITS etc */
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index fd12e2b..e0d4772 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -42,7 +42,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
/***====================================================================***/
Status
-XkbAllocClientMap(XkbDescPtr xkb,unsigned which,unsigned nTotalTypes)
+XkbSrvAllocClientMap(XkbDescPtr xkb,unsigned which,unsigned nTotalTypes)
{
register int i;
XkbClientMapPtr map;
@@ -53,7 +53,7 @@ XkbClientMapPtr map;
((!XkbIsLegalKeycode(xkb->min_key_code))||
(!XkbIsLegalKeycode(xkb->max_key_code))||
(xkb->max_key_code<xkb->min_key_code))) {
- DebugF("bad keycode (%d,%d) in XkbAllocClientMap\n",
+ DebugF("bad keycode (%d,%d) in XkbSrvAllocClientMap\n",
xkb->min_key_code,xkb->max_key_code);
return BadValue;
}
@@ -123,7 +123,7 @@ XkbClientMapPtr map;
}
Status
-XkbAllocServerMap(XkbDescPtr xkb,unsigned which,unsigned nNewActions)
+XkbSrvAllocServerMap(XkbDescPtr xkb,unsigned which,unsigned nNewActions)
{
register int i;
XkbServerMapPtr map;
@@ -258,7 +258,7 @@ XkbCopyKeyType(XkbKeyTypePtr from,XkbKeyTypePtr into)
}
Status
-XkbCopyKeyTypes(XkbKeyTypePtr from,XkbKeyTypePtr into,int num_types)
+XkbSrvCopyKeyTypes(XkbKeyTypePtr from,XkbKeyTypePtr into,int num_types)
{
register int i,rtrn;
@@ -272,7 +272,7 @@ register int i,rtrn;
}
Status
-XkbResizeKeyType( XkbDescPtr xkb,
+XkbSrvResizeKeyType( XkbDescPtr xkb,
int type_ndx,
int map_count,
Bool want_preserve,
@@ -471,7 +471,7 @@ KeyCode matchingKeys[XkbMaxKeyCount],nMatchingKeys;
}
KeySym *
-XkbResizeKeySyms(XkbDescPtr xkb,int key,int needed)
+XkbSrvResizeKeySyms(XkbDescPtr xkb,int key,int needed)
{
register int i,nSyms,nKeySyms;
unsigned nOldSyms;
@@ -551,7 +551,7 @@ _ExtendRange( unsigned int old_flags,
}
Status
-XkbChangeKeycodeRange( XkbDescPtr xkb,
+XkbSrvChangeKeycodeRange( XkbDescPtr xkb,
int minKC,
int maxKC,
XkbChangesPtr changes)
@@ -751,7 +751,7 @@ int tmp;
}
XkbAction *
-XkbResizeKeyActions(XkbDescPtr xkb,int key,int needed)
+XkbSrvResizeKeyActions(XkbDescPtr xkb,int key,int needed)
{
register int i,nActs;
XkbAction *newActs;
@@ -801,7 +801,7 @@ XkbAction *newActs;
}
void
-XkbFreeClientMap(XkbDescPtr xkb,unsigned what,Bool freeMap)
+XkbSrvFreeClientMap(XkbDescPtr xkb,unsigned what,Bool freeMap)
{
XkbClientMapPtr map;
@@ -859,7 +859,7 @@ XkbClientMapPtr map;
}
void
-XkbFreeServerMap(XkbDescPtr xkb,unsigned what,Bool freeMap)
+XkbSrvFreeServerMap(XkbDescPtr xkb,unsigned what,Bool freeMap)
{
XkbServerMapPtr map;
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 2bb4a24..6d3d376 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -45,7 +45,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XKB_OFFSET(g,l) (((g)*groupsWidth)+(l))
int
-XkbKeyTypesForCoreSymbols( XkbDescPtr xkb,
+XkbSrvKeyTypesForCoreSymbols( XkbDescPtr xkb,
int map_width,
KeySym * core_syms,
unsigned int protected,
@@ -344,7 +344,7 @@ unsigned tmp;
if (act->mods.flags&XkbSA_UseModMapMods)
act->mods.real_mods= act->mods.mask= mods;
if ((tmp= XkbModActionVMods(&act->mods))!=0) {
- XkbVirtualModsToReal(xkb,tmp,&tmp);
+ XkbSrvVirtualModsToReal(xkb,tmp,&tmp);
act->mods.mask|= tmp;
}
break;
@@ -352,7 +352,7 @@ unsigned tmp;
if (act->iso.flags&XkbSA_UseModMapMods)
act->iso.real_mods= act->iso.mask= mods;
if ((tmp= XkbModActionVMods(&act->iso))!=0) {
- XkbVirtualModsToReal(xkb,tmp,&tmp);
+ XkbSrvVirtualModsToReal(xkb,tmp,&tmp);
act->iso.mask|= tmp;
}
break;
@@ -363,7 +363,7 @@ unsigned tmp;
#define IBUF_SIZE 8
Bool
-XkbApplyCompatMapToKey(XkbDescPtr xkb,KeyCode key,XkbChangesPtr changes)
+XkbSrvApplyCompatMapToKey(XkbDescPtr xkb,KeyCode key,XkbChangesPtr changes)
{
KeySym * syms;
unsigned char explicit,mods;
@@ -377,7 +377,7 @@ unsigned changed,tmp;
return FALSE;
}
if (((!xkb->server)||(!xkb->server->key_acts))&&
- (XkbAllocServerMap(xkb,XkbAllServerInfoMask,0)!=Success)) {
+ (XkbSrvAllocServerMap(xkb,XkbAllServerInfoMask,0)!=Success)) {
return FALSE;
}
changed= 0; /* keeps track of what has changed in _this_ call */
@@ -419,7 +419,7 @@ unsigned changed,tmp;
XkbAction *pActs;
unsigned int new_vmodmask;
changed|= XkbKeyActionsMask;
- pActs= XkbResizeKeyActions(xkb,key,nSyms);
+ pActs= XkbSrvResizeKeyActions(xkb,key,nSyms);
if (!pActs) {
if (nSyms > IBUF_SIZE)
xfree(interps);
@@ -512,7 +512,7 @@ unsigned changed,tmp;
}
Status
-XkbChangeTypesOfKey( XkbDescPtr xkb,
+XkbSrvChangeTypesOfKey( XkbDescPtr xkb,
int key,
int nGroups,
unsigned groups,
@@ -535,7 +535,7 @@ int width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
i= xkb->map->key_sym_map[key].group_info;
i= XkbSetNumGroups(i,0);
xkb->map->key_sym_map[key].group_info= i;
- XkbResizeKeySyms(xkb,key,0);
+ XkbSrvResizeKeySyms(xkb,key,0);
return Success;
}
@@ -562,7 +562,7 @@ int width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
int nCopy;
if (nOldGroups==0) {
- pSyms= XkbResizeKeySyms(xkb,key,width*nGroups);
+ pSyms= XkbSrvResizeKeySyms(xkb,key,width*nGroups);
if (pSyms!=NULL) {
i= xkb->map->key_sym_map[key].group_info;
i= XkbSetNumGroups(i,nGroups);
@@ -577,7 +577,7 @@ int width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
}
pSyms= XkbKeySymsPtr(xkb,key);
memcpy(oldSyms,pSyms,XkbKeyNumSyms(xkb,key)*sizeof(KeySym));
- pSyms= XkbResizeKeySyms(xkb,key,width*nGroups);
+ pSyms= XkbSrvResizeKeySyms(xkb,key,width*nGroups);
if (pSyms==NULL)
return BadAlloc;
bzero(pSyms,width*nGroups*sizeof(KeySym));
@@ -593,7 +593,7 @@ int width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
XkbAction oldActs[XkbMaxSymsPerKey],*pActs;
pActs= XkbKeyActionsPtr(xkb,key);
memcpy(oldActs,pActs,XkbKeyNumSyms(xkb,key)*sizeof(XkbAction));
- pActs= XkbResizeKeyActions(xkb,key,width*nGroups);
+ pActs= XkbSrvResizeKeyActions(xkb,key,width*nGroups);
if (pActs==NULL)
return BadAlloc;
bzero(pActs,width*nGroups*sizeof(XkbAction));
@@ -636,7 +636,7 @@ int width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
/***====================================================================***/
Bool
-XkbVirtualModsToReal(XkbDescPtr xkb,unsigned virtual_mask,unsigned *mask_rtrn)
+XkbSrvVirtualModsToReal(XkbDescPtr xkb,unsigned virtual_mask,unsigned *mask_rtrn)
{
register int i,bit;
register unsigned mask;
@@ -667,7 +667,7 @@ unsigned int tmp;
switch (act->type) {
case XkbSA_SetMods: case XkbSA_LatchMods: case XkbSA_LockMods:
if (((tmp= XkbModActionVMods(&act->mods))&changed)!=0) {
- XkbVirtualModsToReal(xkb,tmp,&tmp);
+ XkbSrvVirtualModsToReal(xkb,tmp,&tmp);
act->mods.mask= act->mods.real_mods;
act->mods.mask|= tmp;
return TRUE;
@@ -675,7 +675,7 @@ unsigned int tmp;
break;
case XkbSA_ISOLock:
if ((((tmp= XkbModActionVMods(&act->iso))!=0)&changed)!=0) {
- XkbVirtualModsToReal(xkb,tmp,&tmp);
+ XkbSrvVirtualModsToReal(xkb,tmp,&tmp);
act->iso.mask= act->iso.real_mods;
act->iso.mask|= tmp;
return TRUE;
@@ -694,13 +694,13 @@ XkbUpdateKeyTypeVirtualMods( XkbDescPtr xkb,
register unsigned int i;
unsigned int mask;
- XkbVirtualModsToReal(xkb,type->mods.vmods,&mask);
+ XkbSrvVirtualModsToReal(xkb,type->mods.vmods,&mask);
type->mods.mask= type->mods.real_mods|mask;
if ((type->map_count>0)&&(type->mods.vmods!=0)) {
XkbKTMapEntryPtr entry;
for (i=0,entry=type->map;i<type->map_count;i++,entry++) {
if (entry->mods.vmods!=0) {
- XkbVirtualModsToReal(xkb,entry->mods.vmods,&mask);
+ XkbSrvVirtualModsToReal(xkb,entry->mods.vmods,&mask);
entry->mods.mask=entry->mods.real_mods|mask;
/* entry is active if vmods are bound*/
entry->active= (mask!=0);
@@ -734,7 +734,7 @@ unsigned int mask;
}
Bool
-XkbApplyVirtualModChanges(XkbDescPtr xkb,unsigned changed,XkbChangesPtr changes)
+XkbSrvApplyVirtualModChanges(XkbDescPtr xkb,unsigned changed,XkbChangesPtr changes)
{
register int i;
unsigned int checkState = 0;
@@ -747,7 +747,7 @@ unsigned int checkState = 0;
}
if (changed&xkb->ctrls->internal.vmods) {
unsigned int newMask;
- XkbVirtualModsToReal(xkb,xkb->ctrls->internal.vmods,&newMask);
+ XkbSrvVirtualModsToReal(xkb,xkb->ctrls->internal.vmods,&newMask);
newMask|= xkb->ctrls->internal.real_mods;
if (xkb->ctrls->internal.mask!=newMask) {
xkb->ctrls->internal.mask= newMask;
@@ -759,7 +759,7 @@ unsigned int checkState = 0;
}
if (changed&xkb->ctrls->ignore_lock.vmods) {
unsigned int newMask;
- XkbVirtualModsToReal(xkb,xkb->ctrls->ignore_lock.vmods,&newMask);
+ XkbSrvVirtualModsToReal(xkb,xkb->ctrls->ignore_lock.vmods,&newMask);
newMask|= xkb->ctrls->ignore_lock.real_mods;
if (xkb->ctrls->ignore_lock.mask!=newMask) {
xkb->ctrls->ignore_lock.mask= newMask;
@@ -775,7 +775,7 @@ unsigned int checkState = 0;
for (i=0;i<XkbNumIndicators;i++,map++) {
if (map->mods.vmods&changed) {
unsigned int newMask;
- XkbVirtualModsToReal(xkb,map->mods.vmods,&newMask);
+ XkbSrvVirtualModsToReal(xkb,map->mods.vmods,&newMask);
newMask|= map->mods.real_mods;
if (newMask!=map->mods.mask) {
map->mods.mask= newMask;
@@ -792,7 +792,7 @@ unsigned int checkState = 0;
compat= xkb->compat;
for (i=0;i<XkbNumKbdGroups;i++) {
unsigned int newMask;
- XkbVirtualModsToReal(xkb,compat->groups[i].vmods,&newMask);
+ XkbSrvVirtualModsToReal(xkb,compat->groups[i].vmods,&newMask);
newMask|= compat->groups[i].real_mods;
if (compat->groups[i].mask!=newMask) {
compat->groups[i].mask= newMask;
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 4ccddda..cfef9ad 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -451,7 +451,7 @@ XkbCompileKeymap(DeviceIntPtr dev, XkbRMLVOSet *rmlvo)
if (!XkbDDXLoadKeymapByNames(dev, &kccgst, XkmAllIndicesMask, 0, &xkb, name,
PATH_MAX)) {
if (xkb)
- XkbFreeKeyboard(xkb, 0, TRUE);
+ XkbSrvFreeKeyboard(xkb, 0, TRUE);
return NULL;
}
diff --git a/xkb/xkb.c b/xkb/xkb.c
index e9d01f0..9922f2a 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -622,10 +622,10 @@ ProcXkbLatchLockState(ClientPtr client)
if (status == Success && stuff->lockGroup)
newState->locked_group = stuff->groupLock;
if (status == Success && stuff->affectModLatches)
- status = XkbLatchModifiers(tmpd, stuff->affectModLatches,
+ status = XkbSrvLatchModifiers(tmpd, stuff->affectModLatches,
stuff->modLatches);
if (status == Success && stuff->latchGroup)
- status = XkbLatchGroup(tmpd, stuff->groupLatch);
+ status = XkbSrvLatchGroup(tmpd, stuff->groupLatch);
if (status != Success)
return status;
@@ -1981,7 +1981,7 @@ CARD8 *map;
if ((unsigned)(req->firstType+req->nTypes)>xkb->map->size_types) {
i= req->firstType+req->nTypes;
- if (XkbAllocClientMap(xkb,XkbKeyTypesMask,i)!=Success) {
+ if (XkbSrvAllocClientMap(xkb,XkbKeyTypesMask,i)!=Success) {
return NULL;
}
}
@@ -1992,7 +1992,7 @@ CARD8 *map;
XkbKeyTypePtr pOld;
register unsigned n;
- if (XkbResizeKeyType(xkb,i+req->firstType,wire->nMapEntries,
+ if (XkbSrvResizeKeyType(xkb,i+req->firstType,wire->nMapEntries,
wire->preserve,wire->numLevels)!=Success) {
return NULL;
}
@@ -2072,7 +2072,7 @@ unsigned first,last;
for (i=0;i<req->nKeySyms;i++,oldMap++) {
pSyms = (KeySym *)&wire[1];
if (wire->nSyms>0) {
- newSyms = XkbResizeKeySyms(xkb,i+req->firstKeySym,wire->nSyms);
+ newSyms = XkbSrvResizeKeySyms(xkb,i+req->firstKeySym,wire->nSyms);
for (s=0;s<wire->nSyms;s++) {
newSyms[s]= pSyms[s];
}
@@ -2139,7 +2139,7 @@ XkbAction * newActs;
if (nActs[i]==0)
xkb->server->key_acts[i+req->firstKeyAct]= 0;
else {
- newActs= XkbResizeKeyActions(xkb,i+req->firstKeyAct,nActs[i]);
+ newActs= XkbSrvResizeKeyActions(xkb,i+req->firstKeyAct,nActs[i]);
memcpy((char *)newActs,(char *)wire,
nActs[i]*SIZEOF(xkbActionWireDesc));
wire+= nActs[i]*SIZEOF(xkbActionWireDesc);
@@ -2450,7 +2450,7 @@ _XkbSetMap(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq *req, char *values)
nkn.deviceID = nkn.oldDeviceID = dev->id;
nkn.oldMinKeyCode = xkb->min_key_code;
nkn.oldMaxKeyCode = xkb->max_key_code;
- status= XkbChangeKeycodeRange(xkb, req->minKeyCode,
+ status= XkbSrvChangeKeycodeRange(xkb, req->minKeyCode,
req->maxKeyCode, &change);
if (status != Success)
return status; /* oh-oh. what about the other keyboards? */
@@ -4036,7 +4036,7 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq *stuff)
xkb = dev->key->xkbInfo->desc;
names = xkb->names;
- if (XkbAllocNames(xkb,stuff->which,stuff->nRadioGroups,
+ if (XkbSrvAllocNames(xkb,stuff->which,stuff->nRadioGroups,
stuff->nKeyAliases)!=Success) {
return BadAlloc;
}
@@ -4114,7 +4114,7 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq *stuff)
if (stuff->which&XkbKeyAliasesMask) {
if (stuff->nKeyAliases>0) {
register int na= stuff->nKeyAliases;
- if (XkbAllocNames(xkb,XkbKeyAliasesMask,0,na)!=Success)
+ if (XkbSrvAllocNames(xkb,XkbKeyAliasesMask,0,na)!=Success)
return BadAlloc;
memcpy((char *)names->key_aliases,(char *)tmp,
stuff->nKeyAliases*sizeof(XkbKeyAliasRec));
@@ -4131,7 +4131,7 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq *stuff)
if (stuff->nRadioGroups>0) {
register unsigned i,nrg;
nrg= stuff->nRadioGroups;
- if (XkbAllocNames(xkb,XkbRGNamesMask,nrg,0)!=Success)
+ if (XkbSrvAllocNames(xkb,XkbRGNamesMask,nrg,0)!=Success)
return BadAlloc;
for (i=0;i<stuff->nRadioGroups;i++) {
@@ -5886,7 +5886,7 @@ ProcXkbGetKbdByName(ClientPtr client)
}
}
if ((new!=NULL)&&(new!=xkb)) {
- XkbFreeKeyboard(new,XkbAllComponentsMask,TRUE);
+ XkbSrvFreeKeyboard(new,XkbAllComponentsMask,TRUE);
new= NULL;
}
if (names.keycodes) { xfree(names.keycodes); names.keycodes= NULL; }
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index be1dcee..feb4395 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -746,7 +746,7 @@ DeviceEvent *event = &ev->device_event;
sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0);
oldState= xkbi->state;
- XkbLatchModifiers(dev,0xFF,0x00);
+ XkbSrvLatchModifiers(dev,0xFF,0x00);
XkbComputeDerivedState(xkbi);
changed |= XkbStateChangedFlags(&oldState,&xkbi->state);
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 2cdb6fc..ab664e3 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -818,8 +818,8 @@ ProcessInputProc backupproc;
mask= XkbSARedirectVModsMask(&pAction->redirect);
mods= XkbSARedirectVMods(&pAction->redirect);
- if (mask) XkbVirtualModsToReal(xkbi->desc,mask,&mask);
- if (mods) XkbVirtualModsToReal(xkbi->desc,mods,&mods);
+ if (mask) XkbSrvVirtualModsToReal(xkbi->desc,mask,&mask);
+ if (mods) XkbSrvVirtualModsToReal(xkbi->desc,mods,&mods);
mask|= pAction->redirect.mods_mask;
mods|= pAction->redirect.mods;
@@ -849,8 +849,8 @@ ProcessInputProc backupproc;
mask= XkbSARedirectVModsMask(&filter->upAction.redirect);
mods= XkbSARedirectVMods(&filter->upAction.redirect);
- if (mask) XkbVirtualModsToReal(xkbi->desc,mask,&mask);
- if (mods) XkbVirtualModsToReal(xkbi->desc,mods,&mods);
+ if (mask) XkbSrvVirtualModsToReal(xkbi->desc,mask,&mask);
+ if (mods) XkbSrvVirtualModsToReal(xkbi->desc,mods,&mods);
mask|= filter->upAction.redirect.mods_mask;
mods|= filter->upAction.redirect.mods;
@@ -1223,7 +1223,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
}
int
-XkbLatchModifiers(DeviceIntPtr pXDev,CARD8 mask,CARD8 latches)
+XkbSrvLatchModifiers(DeviceIntPtr pXDev,CARD8 mask,CARD8 latches)
{
XkbSrvInfoPtr xkbi;
XkbFilterPtr filter;
@@ -1250,7 +1250,7 @@ unsigned clear;
}
int
-XkbLatchGroup(DeviceIntPtr pXDev,int group)
+XkbSrvLatchGroup(DeviceIntPtr pXDev,int group)
{
XkbSrvInfoPtr xkbi;
XkbFilterPtr filter;
@@ -1283,11 +1283,11 @@ xkbStateNotify sn;
sn.changed= 0;
os= xkbi->state;
if (os.latched_mods) { /* clear all latches */
- XkbLatchModifiers(dev,~0,0);
+ XkbSrvLatchModifiers(dev,~0,0);
sn.changed|= XkbModifierLatchMask;
}
if (os.latched_group) {
- XkbLatchGroup(dev,0);
+ XkbSrvLatchGroup(dev,0);
sn.changed|= XkbGroupLatchMask;
}
if (os.locked_mods) {
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 4a3219e..7136b6e 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -284,7 +284,7 @@ XkbDeleteRulesDflts(void)
xfree(XkbOptionsDflt);
XkbOptionsDflt = NULL;
- XkbFreeKeyboard(xkb_cached_map, XkbAllComponentsMask, TRUE);
+ XkbSrvFreeKeyboard(xkb_cached_map, XkbAllComponentsMask, TRUE);
xkb_cached_map = NULL;
}
@@ -315,9 +315,9 @@ XkbInitKeyTypes(XkbDescPtr xkb)
return TRUE;
initTypeNames(NULL);
- if (XkbAllocClientMap(xkb,XkbKeyTypesMask,num_dflt_types)!=Success)
+ if (XkbSrvAllocClientMap(xkb,XkbKeyTypesMask,num_dflt_types)!=Success)
return FALSE;
- if (XkbCopyKeyTypes(dflt_types,xkb->map->types,num_dflt_types)!=
+ if (XkbSrvCopyKeyTypes(dflt_types,xkb->map->types,num_dflt_types)!=
Success) {
return FALSE;
}
@@ -343,7 +343,7 @@ XkbCompatMapPtr compat;
if (xkb->defined & XkmCompatMapMask)
return TRUE;
- if (XkbAllocCompatMap(xkb,XkbAllCompatMask,num_dfltSI)!=Success)
+ if (XkbSrvAllocCompatMap(xkb,XkbAllCompatMask,num_dfltSI)!=Success)
return BadAlloc;
compat = xkb->compat;
if (compat->sym_interpret) {
@@ -381,7 +381,7 @@ Status rtrn;
Atom unknown;
xkb= xkbi->desc;
- if ((rtrn=XkbAllocNames(xkb,XkbAllNamesMask,0,0))!=Success)
+ if ((rtrn=XkbSrvAllocNames(xkb,XkbAllNamesMask,0,0))!=Success)
return rtrn;
unknown= CREATE_ATOM("unknown");
names = xkb->names;
@@ -430,7 +430,7 @@ XkbIndicatorPtr map;
XkbSrvLedInfoPtr sli;
xkb= xkbi->desc;
- if (XkbAllocIndicatorMaps(xkb)!=Success)
+ if (XkbSrvAllocIndicatorMaps(xkb)!=Success)
return BadAlloc;
if (!(xkb->defined & XkmIndicatorsMask)) {
@@ -468,7 +468,7 @@ XkbControlsPtr ctrls;
xkb= xkbi->desc;
/* 12/31/94 (ef) -- XXX! Should check if controls loaded from file */
- if (XkbAllocControls(xkb,XkbAllControlsMask)!=Success)
+ if (XkbSrvAllocControls(xkb,XkbAllControlsMask)!=Success)
FatalError("Couldn't allocate keyboard controls\n");
ctrls= xkb->ctrls;
if (!(xkb->defined & XkmSymbolsMask))
@@ -536,7 +536,7 @@ InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet *rmlvo,
dev->key->xkbInfo = xkbi;
if (xkb_cached_map && !XkbCompareUsedRMLVO(rmlvo)) {
- XkbFreeKeyboard(xkb_cached_map, XkbAllComponentsMask, TRUE);
+ XkbSrvFreeKeyboard(xkb_cached_map, XkbAllComponentsMask, TRUE);
xkb_cached_map = NULL;
}
@@ -550,7 +550,7 @@ InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet *rmlvo,
}
}
- xkb = XkbAllocKeyboard();
+ xkb = XkbSrvAllocKeyboard();
if (!xkb) {
ErrorF("XKB: Failed to allocate keyboard description\n");
goto unwind_info;
@@ -571,9 +571,9 @@ InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet *rmlvo,
xkb->max_key_code = 255;
i = XkbNumKeys(xkb) / 3 + 1;
- if (XkbAllocClientMap(xkb, XkbAllClientInfoMask, 0) != Success)
+ if (XkbSrvAllocClientMap(xkb, XkbAllClientInfoMask, 0) != Success)
goto unwind_desc;
- if (XkbAllocServerMap(xkb, XkbAllServerInfoMask, i) != Success)
+ if (XkbSrvAllocServerMap(xkb, XkbAllServerInfoMask, i) != Success)
goto unwind_desc;
xkbi->dfltPtrDelta = 1;
@@ -618,7 +618,7 @@ InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet *rmlvo,
return TRUE;
unwind_desc:
- XkbFreeKeyboard(xkb, 0, TRUE);
+ XkbSrvFreeKeyboard(xkb, 0, TRUE);
unwind_info:
xfree(xkbi);
dev->key->xkbInfo = NULL;
@@ -674,7 +674,7 @@ XkbFreeInfo(XkbSrvInfoPtr xkbi)
xkbi->beepTimer= NULL;
}
if (xkbi->desc) {
- XkbFreeKeyboard(xkbi->desc,XkbAllComponentsMask,TRUE);
+ XkbSrvFreeKeyboard(xkbi->desc,XkbAllComponentsMask,TRUE);
xkbi->desc= NULL;
}
xfree(xkbi);
diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index 8c28513..187c2e4 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -131,7 +131,7 @@ XkbStatePtr state;
break;
}
if (map->which_groups&XkbIM_UseLatched)
- XkbLatchGroup(xkbi->device,0); /* unlatch group */
+ XkbSrvLatchGroup(xkbi->device,0); /* unlatch group */
state->locked_group= i;
stateChange= TRUE;
}
@@ -141,7 +141,7 @@ XkbStatePtr state;
break;
}
state->locked_group= 0;
- XkbLatchGroup(xkbi->device,i);
+ XkbSrvLatchGroup(xkbi->device,i);
stateChange= TRUE;
}
}
@@ -161,7 +161,7 @@ XkbStatePtr state;
else newmods&= ~map->mods.mask;
if (newmods!=state->locked_mods) {
newmods&= map->mods.mask;
- XkbLatchModifiers(xkbi->device,map->mods.mask,newmods);
+ XkbSrvLatchModifiers(xkbi->device,map->mods.mask,newmods);
stateChange= TRUE;
}
}
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 5b317c9..6e76102 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -240,9 +240,9 @@ XkbMapChangesPtr mc;
types[XkbGroup2Index]= XkbKeyKeyTypeIndex(xkb,key,XkbGroup2Index);
types[XkbGroup3Index]= XkbKeyKeyTypeIndex(xkb,key,XkbGroup3Index);
types[XkbGroup4Index]= XkbKeyKeyTypeIndex(xkb,key,XkbGroup4Index);
- nG= XkbKeyTypesForCoreSymbols(xkb,pCore->mapWidth,syms,explicit,types,
+ nG= XkbSrvKeyTypesForCoreSymbols(xkb,pCore->mapWidth,syms,explicit,types,
tsyms);
- XkbChangeTypesOfKey(xkb,key,nG,XkbAllGroupsMask,types,mc);
+ XkbSrvChangeTypesOfKey(xkb,key,nG,XkbAllGroupsMask,types,mc);
memcpy((char *)XkbKeySymsPtr(xkb,key),(char *)tsyms,
XkbKeyNumSyms(xkb,key)*sizeof(KeySym));
}
@@ -274,7 +274,7 @@ XkbUpdateDescActions( XkbDescPtr xkb,
register unsigned key;
for (key=first;key<(first+num);key++) {
- XkbApplyCompatMapToKey(xkb,key,changes);
+ XkbSrvApplyCompatMapToKey(xkb,key,changes);
}
if (changes->map.changed&(XkbVirtualModMapMask|XkbModifierMapMask)) {
@@ -303,7 +303,7 @@ register unsigned key;
}
}
if (changes->map.changed&XkbVirtualModsMask)
- XkbApplyVirtualModChanges(xkb,changes->map.vmods,changes);
+ XkbSrvApplyVirtualModChanges(xkb,changes->map.vmods,changes);
if (changes->map.changed&XkbKeyActionsMask) {
CARD8 oldLast,newLast;
@@ -1152,7 +1152,7 @@ _XkbCopyClientMap(XkbDescPtr src, XkbDescPtr dst)
}
else {
if (dst->map)
- XkbFreeClientMap(dst, XkbAllClientInfoMask, TRUE);
+ XkbSrvFreeClientMap(dst, XkbAllClientInfoMask, TRUE);
}
return TRUE;
@@ -1288,7 +1288,7 @@ _XkbCopyServerMap(XkbDescPtr src, XkbDescPtr dst)
}
else {
if (dst->server)
- XkbFreeServerMap(dst, XkbAllServerInfoMask, TRUE);
+ XkbSrvFreeServerMap(dst, XkbAllServerInfoMask, TRUE);
}
return TRUE;
@@ -1389,7 +1389,7 @@ _XkbCopyNames(XkbDescPtr src, XkbDescPtr dst)
}
else {
if (dst->names)
- XkbFreeNames(dst, XkbAllNamesMask, TRUE);
+ XkbSrvFreeNames(dst, XkbAllNamesMask, TRUE);
}
return TRUE;
@@ -1441,7 +1441,7 @@ _XkbCopyCompat(XkbDescPtr src, XkbDescPtr dst)
}
else {
if (dst->compat)
- XkbFreeCompatMap(dst, XkbAllCompatMask, TRUE);
+ XkbSrvFreeCompatMap(dst, XkbAllCompatMask, TRUE);
}
return TRUE;
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index fe4da38..1062ff4 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -29,47 +29,47 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h"
-#define XkbAddGeomKeyAlias SrvXkbAddGeomKeyAlias
-#define XkbAddGeomColor SrvXkbAddGeomColor
-#define XkbAddGeomDoodad SrvXkbAddGeomDoodad
-#define XkbAddGeomKey SrvXkbAddGeomKey
-#define XkbAddGeomOutline SrvXkbAddGeomOutline
-#define XkbAddGeomOverlay SrvXkbAddGeomOverlay
-#define XkbAddGeomOverlayRow SrvXkbAddGeomOverlayRow
-#define XkbAddGeomOverlayKey SrvXkbAddGeomOverlayKey
-#define XkbAddGeomProperty SrvXkbAddGeomProperty
-#define XkbAddGeomRow SrvXkbAddGeomRow
-#define XkbAddGeomSection SrvXkbAddGeomSection
-#define XkbAddGeomShape SrvXkbAddGeomShape
-#define XkbAllocGeomKeyAliases SrvXkbAllocGeomKeyAliases
-#define XkbAllocGeomColors SrvXkbAllocGeomColors
-#define XkbAllocGeomDoodads SrvXkbAllocGeomDoodads
-#define XkbAllocGeomKeys SrvXkbAllocGeomKeys
-#define XkbAllocGeomOutlines SrvXkbAllocGeomOutlines
-#define XkbAllocGeomPoints SrvXkbAllocGeomPoints
-#define XkbAllocGeomProps SrvXkbAllocGeomProps
-#define XkbAllocGeomRows SrvXkbAllocGeomRows
-#define XkbAllocGeomSectionDoodads SrvXkbAllocGeomSectionDoodads
-#define XkbAllocGeomSections SrvXkbAllocGeomSections
-#define XkbAllocGeomOverlays SrvXkbAllocGeomOverlays
-#define XkbAllocGeomOverlayRows SrvXkbAllocGeomOverlayRows
-#define XkbAllocGeomOverlayKeys SrvXkbAllocGeomOverlayKeys
-#define XkbAllocGeomShapes SrvXkbAllocGeomShapes
-#define XkbAllocGeometry SrvXkbAllocGeometry
-#define XkbFreeGeomKeyAliases SrvXkbFreeGeomKeyAliases
-#define XkbFreeGeomColors SrvXkbFreeGeomColors
-#define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads
-#define XkbFreeGeomProperties SrvXkbFreeGeomProperties
-#define XkbFreeGeomOverlayKeys SrvXkbFreeGeomOverlayKeys
-#define XkbFreeGeomOverlayRows SrvXkbFreeGeomOverlayRows
-#define XkbFreeGeomOverlays SrvXkbFreeGeomOverlays
-#define XkbFreeGeomKeys SrvXkbFreeGeomKeys
-#define XkbFreeGeomRows SrvXkbFreeGeomRows
-#define XkbFreeGeomSections SrvXkbFreeGeomSections
-#define XkbFreeGeomPoints SrvXkbFreeGeomPoints
-#define XkbFreeGeomOutlines SrvXkbFreeGeomOutlines
-#define XkbFreeGeomShapes SrvXkbFreeGeomShapes
-#define XkbFreeGeometry SrvXkbFreeGeometry
+#define XkbAddGeomKeyAlias XkbSrvAddGeomKeyAlias
+#define XkbAddGeomColor XkbSrvAddGeomColor
+#define XkbAddGeomDoodad XkbSrvAddGeomDoodad
+#define XkbAddGeomKey XkbSrvAddGeomKey
+#define XkbAddGeomOutline XkbSrvAddGeomOutline
+#define XkbAddGeomOverlay XkbSrvAddGeomOverlay
+#define XkbAddGeomOverlayRow XkbSrvAddGeomOverlayRow
+#define XkbAddGeomOverlayKey XkbSrvAddGeomOverlayKey
+#define XkbAddGeomProperty XkbSrvAddGeomProperty
+#define XkbAddGeomRow XkbSrvAddGeomRow
+#define XkbAddGeomSection XkbSrvAddGeomSection
+#define XkbAddGeomShape XkbSrvAddGeomShape
+#define XkbAllocGeomKeyAliases XkbSrvAllocGeomKeyAliases
+#define XkbAllocGeomColors XkbSrvAllocGeomColors
+#define XkbAllocGeomDoodads XkbSrvAllocGeomDoodads
+#define XkbAllocGeomKeys XkbSrvAllocGeomKeys
+#define XkbAllocGeomOutlines XkbSrvAllocGeomOutlines
+#define XkbAllocGeomPoints XkbSrvAllocGeomPoints
+#define XkbAllocGeomProps XkbSrvAllocGeomProps
+#define XkbAllocGeomRows XkbSrvAllocGeomRows
+#define XkbAllocGeomSectionDoodads XkbSrvAllocGeomSectionDoodads
+#define XkbAllocGeomSections XkbSrvAllocGeomSections
+#define XkbAllocGeomOverlays XkbSrvAllocGeomOverlays
+#define XkbAllocGeomOverlayRows XkbSrvAllocGeomOverlayRows
+#define XkbAllocGeomOverlayKeys XkbSrvAllocGeomOverlayKeys
+#define XkbAllocGeomShapes XkbSrvAllocGeomShapes
+#define XkbAllocGeometry XkbSrvAllocGeometry
+#define XkbFreeGeomKeyAliases XkbSrvFreeGeomKeyAliases
+#define XkbFreeGeomColors XkbSrvFreeGeomColors
+#define XkbFreeGeomDoodads XkbSrvFreeGeomDoodads
+#define XkbFreeGeomProperties XkbSrvFreeGeomProperties
+#define XkbFreeGeomOverlayKeys XkbSrvFreeGeomOverlayKeys
+#define XkbFreeGeomOverlayRows XkbSrvFreeGeomOverlayRows
+#define XkbFreeGeomOverlays XkbSrvFreeGeomOverlays
+#define XkbFreeGeomKeys XkbSrvFreeGeomKeys
+#define XkbFreeGeomRows XkbSrvFreeGeomRows
+#define XkbFreeGeomSections XkbSrvFreeGeomSections
+#define XkbFreeGeomPoints XkbSrvFreeGeomPoints
+#define XkbFreeGeomOutlines XkbSrvFreeGeomOutlines
+#define XkbFreeGeomShapes XkbSrvFreeGeomShapes
+#define XkbFreeGeometry XkbSrvFreeGeometry
typedef struct _XkbProperty {
char *name;
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index cb67339..95d3402 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -171,7 +171,7 @@ register unsigned int i,bit;
unsigned int bound,named,tmp;
int nRead=0;
- if (XkbAllocServerMap(xkb,XkbVirtualModsMask,0)!=Success)
+ if (XkbSrvAllocServerMap(xkb,XkbVirtualModsMask,0)!=Success)
return -1;
bound= XkmGetCARD16(file,&nRead);
named= XkmGetCARD16(file,&nRead);
@@ -185,7 +185,7 @@ int nRead=0;
}
if ((i= XkbPaddedSize(tmp)-tmp)>0)
nRead+= XkmSkipPadding(file,i);
- if (XkbAllocNames(xkb,XkbVirtualModNamesMask,0,0)!=Success)
+ if (XkbSrvAllocNames(xkb,XkbVirtualModNamesMask,0,0)!=Success)
return -1;
for (i=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
char name[100];
@@ -229,7 +229,7 @@ XkbKeyNamePtr pN;
nRead+= XkmSkipPadding(file,1);
#define WANTED (XkbKeycodesNameMask|XkbKeyNamesMask|XkbKeyAliasesMask)
- if (XkbAllocNames(xkb,WANTED,0,nAl)!=Success)
+ if (XkbSrvAllocNames(xkb,WANTED,0,nAl)!=Success)
return -1;
if (name[0]!='\0') {
xkb->names->keycodes= XkbInternAtom(name,FALSE);
@@ -276,7 +276,7 @@ char buf[100];
return -1;
nRead+= tmp;
if (buf[0]!='\0') {
- if (XkbAllocNames(xkb,XkbTypesNameMask,0,0)!=Success)
+ if (XkbSrvAllocNames(xkb,XkbTypesNameMask,0,0)!=Success)
return -1;
xkb->names->types= XkbInternAtom(buf,FALSE);
}
@@ -284,7 +284,7 @@ char buf[100];
nRead+= XkmSkipPadding(file,2);
if (num_types<1)
return nRead;
- if (XkbAllocClientMap(xkb,XkbKeyTypesMask,num_types)!=Success)
+ if (XkbSrvAllocClientMap(xkb,XkbKeyTypesMask,num_types)!=Success)
return nRead;
xkb->map->num_types= num_types;
@@ -389,14 +389,14 @@ XkbAction *act;
return -1;
nRead+= tmp;
if (name[0]!='\0') {
- if (XkbAllocNames(xkb,XkbCompatNameMask,0,0)!=Success)
+ if (XkbSrvAllocNames(xkb,XkbCompatNameMask,0,0)!=Success)
return -1;
xkb->names->compat= XkbInternAtom(name,FALSE);
}
num_si= XkmGetCARD16(file,&nRead);
groups= XkmGetCARD8(file,&nRead);
nRead+= XkmSkipPadding(file,1);
- if (XkbAllocCompatMap(xkb,XkbAllCompatMask,num_si)!=Success)
+ if (XkbSrvAllocCompatMap(xkb,XkbAllCompatMask,num_si)!=Success)
return -1;
compat= xkb->compat;
compat->num_si= num_si;
@@ -522,7 +522,7 @@ XkbAction *act;
xkb->compat->groups[i].vmods= md.virtualMods;
if (md.virtualMods != 0) {
unsigned mask;
- if (XkbVirtualModsToReal(xkb,md.virtualMods,&mask))
+ if (XkbSrvVirtualModsToReal(xkb,md.virtualMods,&mask))
xkb->compat->groups[i].mask= md.realMods|mask;
}
else xkb->compat->groups[i].mask= md.realMods;
@@ -543,9 +543,9 @@ char buf[100];
unsigned tmp;
int nRead=0;
- if ((xkb->indicators==NULL)&&(XkbAllocIndicatorMaps(xkb)!=Success))
+ if ((xkb->indicators==NULL)&&(XkbSrvAllocIndicatorMaps(xkb)!=Success))
return -1;
- if (XkbAllocNames(xkb,XkbIndicatorNamesMask,0,0)!=Success)
+ if (XkbSrvAllocNames(xkb,XkbIndicatorNamesMask,0,0)!=Success)
return -1;
nLEDs= XkmGetCARD8(file,&nRead);
nRead+= XkmSkipPadding(file,3);
@@ -623,7 +623,7 @@ int nRead=0;
maxKC= XkmGetCARD8(file,&nRead);
groupNames= XkmGetCARD8(file,&nRead);
totalVModMaps= XkmGetCARD8(file,&nRead);
- if (XkbAllocNames(xkb,
+ if (XkbSrvAllocNames(xkb,
XkbSymbolsNameMask|XkbPhysSymbolsNameMask|XkbGroupNamesMask,
0,0)!=Success)
return -1;
@@ -646,11 +646,11 @@ int nRead=0;
else xkb->names->groups[i]= None;
}
}
- if (XkbAllocServerMap(xkb,XkbAllServerInfoMask,0)!=Success)
+ if (XkbSrvAllocServerMap(xkb,XkbAllServerInfoMask,0)!=Success)
return -1;
- if (XkbAllocClientMap(xkb,XkbAllClientInfoMask,0)!=Success)
+ if (XkbSrvAllocClientMap(xkb,XkbAllClientInfoMask,0)!=Success)
return -1;
- if (XkbAllocControls(xkb,XkbAllControlsMask)!=Success)
+ if (XkbSrvAllocControls(xkb,XkbAllControlsMask)!=Success)
return -1;
if ((xkb->map==NULL)||(xkb->server==NULL))
return -1;
@@ -699,7 +699,7 @@ int nRead=0;
if (XkbNumGroups(wireMap.num_groups)>xkb->ctrls->num_groups)
xkb->ctrls->num_groups= wireMap.num_groups;
nSyms= XkbNumGroups(wireMap.num_groups)*wireMap.width;
- sym= XkbResizeKeySyms(xkb,i,nSyms);
+ sym= XkbSrvResizeKeySyms(xkb,i,nSyms);
if (!sym)
return -1;
for (s=0;s<nSyms;s++) {
@@ -707,7 +707,7 @@ int nRead=0;
}
if (wireMap.flags&XkmKeyHasActions) {
XkbAction * act;
- act= XkbResizeKeyActions(xkb,i,nSyms);
+ act= XkbSrvResizeKeyActions(xkb,i,nSyms);
for (s=0;s<nSyms;s++,act++) {
tmp=fread(act,SIZEOF(xkmActionDesc),1,file);
nRead+= tmp*SIZEOF(xkmActionDesc);
@@ -1092,7 +1092,7 @@ unsigned which= need|want;
if ((fileInfo.present&need)!=need)
return which;
if (*xkb==NULL)
- *xkb= XkbAllocKeyboard();
+ *xkb= XkbSrvAllocKeyboard();
for (i=0;i<fileInfo.num_toc;i++) {
fseek(file,toc[i].offset,SEEK_SET);
tmp= fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file);
--
1.6.6
More information about the xorg-devel
mailing list