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

xkb: unexport functions from xkbtext.c 

These are only used inside xkb/*, so no need to export them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1475>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-04-05 14:52:05 +02:00 committed by Marge Bot
parent a4d298d855
commit 434044cb08
4 changed files with 38 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
include/xkbfile.h
View File

@ -78,84 +78,6 @@ typedef void (*XkbFileAddOnFunc) (FILE * /* file */ ,
_XFUNCPROTOBEGIN
extern _X_EXPORT char *XkbIndentText(unsigned /* size */
);
extern _X_EXPORT char *XkbAtomText(Atom /* atm */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbKeysymText(KeySym /* sym */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbStringText(char * /* str */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbKeyNameText(char * /* name */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbModIndexText(unsigned /* ndx */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbModMaskText(unsigned /* mask */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbVModIndexText(XkbDescPtr /* xkb */ ,
unsigned /* ndx */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbVModMaskText(XkbDescPtr /* xkb */ ,
unsigned /* modMask */ ,
unsigned /* mask */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbConfigText(unsigned /* config */ ,
unsigned /* format */
);
extern _X_EXPORT const char *XkbSIMatchText(unsigned /* type */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbIMWhichStateMaskText(unsigned /* use_which */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbControlsMaskText(unsigned /* ctrls */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbGeomFPText(int /* val */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbDoodadTypeText(unsigned /* type */ ,
unsigned /* format */
);
extern _X_EXPORT const char *XkbActionTypeText(unsigned /* type */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbActionText(XkbDescPtr /* xkb */ ,
XkbAction * /* action */ ,
unsigned /* format */
);
extern _X_EXPORT char *XkbBehaviorText(XkbDescPtr /* xkb */ ,
XkbBehavior * /* behavior */ ,
unsigned /* format */
);
/***====================================================================***/
#define _XkbKSLower (1<<0)
#define _XkbKSUpper (1<<1)

4
xkb/xkbout.c
View File

@ -32,11 +32,13 @@
#include <ctype.h>
#include <stdlib.h>
#include <X11/Xfuncs.h>
#include <X11/X.h>
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include <X11/extensions/XKMformat.h>
#include "xkb/xkbtext_priv.h"
#include "misc.h"
#include "inputstr.h"
#include "dix.h"

5
xkb/xkbtext.c
View File

@ -31,12 +31,13 @@
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
#include <X11/Xos.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/extensions/XKMformat.h>
#include "xkb/xkbtext_priv.h"
#include "misc.h"
#include "inputstr.h"
#include "dix.h"

32
xkb/xkbtext_priv.h Normal file
View File

@ -0,0 +1,32 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_XKB_XKBTEXT_PRIV_H
#define _XSERVER_XKB_XKBTEXt_PRIV_H
#include <X11/X.h>
#include "xkbstr.h"
char *XkbIndentText(unsigned size);
char *XkbAtomText(Atom atm, unsigned format);
char *XkbKeysymText(KeySym sym, unsigned format);
char *XkbStringText(char *str, unsigned format);
char *XkbKeyNameText(char *name, unsigned format);
char *XkbModIndexText(unsigned ndx, unsigned format);
char *XkbModMaskText(unsigned mask, unsigned format);
char *XkbVModIndexText(XkbDescPtr xkb, unsigned ndx, unsigned format);
char *XkbVModMaskText(XkbDescPtr xkb, unsigned modMask, unsigned mask,
unsigned format);
char *XkbConfigText(unsigned config, unsigned format);
const char *XkbSIMatchText(unsigned type, unsigned format);
char *XkbIMWhichStateMaskText(unsigned use_which, unsigned format);
char *XkbControlsMaskText(unsigned ctrls, unsigned format);
char *XkbGeomFPText(int val, unsigned format);
char *XkbDoodadTypeText(unsigned type, unsigned format);
const char *XkbActionTypeText(unsigned type, unsigned format);
char *XkbActionText(XkbDescPtr xkb, XkbAction *action, unsigned format);
char *XkbBehaviorText(XkbDescPtr xkb, XkbBehavior *behavior, unsigned format);
#endif /* _XSERVER_XKB_XKBTEXT_PRIV_H */