frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xkb: unexport server/client map alloc/free funtions 

Not used by any drivers, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-03 17:44:12 +02:00
parent b7d10e3e8d
commit 969ed42208
5 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/xkbsrv.h
View File

@ -27,12 +27,8 @@ 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
@ -239,26 +235,6 @@ extern _X_EXPORT void XkbFreeNames(XkbDescPtr /* xkb */ ,
extern _X_EXPORT XkbDescPtr XkbAllocKeyboard(void
);
extern _X_EXPORT Status XkbAllocClientMap(XkbDescPtr /* xkb */ ,
unsigned int /* which */ ,
unsigned int /* nTypes */
);
extern _X_EXPORT Status XkbAllocServerMap(XkbDescPtr /* xkb */ ,
unsigned int /* which */ ,
unsigned int /* nNewActions */
);
extern _X_EXPORT void XkbFreeClientMap(XkbDescPtr /* xkb */ ,
unsigned int /* what */ ,
Bool /* freeMap */
);
extern _X_EXPORT void XkbFreeServerMap(XkbDescPtr /* xkb */ ,
unsigned int /* what */ ,
Bool /* freeMap */
);
extern _X_EXPORT Status XkbAllocIndicatorMaps(XkbDescPtr /* xkb */
);

2
xkb/XKBAlloc.c
View File

@ -36,6 +36,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <os.h>
#include <string.h>
#include "xkb/xkbsrv_priv.h"
/***===================================================================***/
/*ARGSUSED*/ Status

10
xkb/XKBMAlloc.c
View File

@ -29,14 +29,16 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
#include "xkb/xkbsrv_priv.h"
#include "misc.h"
#include "inputstr.h"
#include <X11/keysym.h>
#include <xkbsrv.h>
/***====================================================================***/
Status
int
XkbAllocClientMap(XkbDescPtr xkb, unsigned which, unsigned nTotalTypes)
{
XkbClientMapPtr map;
@ -119,7 +121,7 @@ XkbAllocClientMap(XkbDescPtr xkb, unsigned which, unsigned nTotalTypes)
return Success;
}
Status
int
XkbAllocServerMap(XkbDescPtr xkb, unsigned which, unsigned nNewActions)
{
register int i;

2
xkb/XKBMisc.c
View File

@ -32,10 +32,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/keysym.h>
#include "xkb/xkbfmisc_priv.h"
#include "xkb/xkbsrv_priv.h"
#include "misc.h"
#include "inputstr.h"
#include <xkbsrv.h>
/***====================================================================***/

8
xkb/xkbsrv_priv.h
View File

@ -198,4 +198,12 @@ XkbDescPtr XkbCompileKeymap(DeviceIntPtr dev, XkbRMLVOSet *rmlvo);
XkbDescPtr XkbCompileKeymapFromString(DeviceIntPtr dev, const char *keymap,
int keymap_length);
/* client map */
int XkbAllocClientMap(XkbDescPtr xkb, unsigned int which, unsigned int nTypes);
void XkbFreeClientMap(XkbDescPtr xkb, unsigned int what, Bool freeMap);
/* server map */
int XkbAllocServerMap(XkbDescPtr xkb, unsigned int which, unsigned int nNewActions);
void XkbFreeServerMap(XkbDescPtr xkb, unsigned int what, Bool freeMap);
#endif /* _XSERVER_XKBSRV_PRIV_H_ */