fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 05:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "xkb: unexport remaining internal declarations"

Browse source 
This reverts commit 3f8a5475c9.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046>
This commit is contained in:
Alan Coopersmith 2025-07-12 11:47:06 -07:00
parent 8540bda07a
commit f666efd73a
4 changed files with 49 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
include/xkbfile.h
View file

@ -29,4 +29,53 @@
#include "xkbstr.h"
typedef void (*XkbFileAddOnFunc) (FILE * /* file */ ,
XkbDescPtr /* result */ ,
Bool /* topLevel */ ,
Bool /* showImplicit */ ,
int /* fileSection */ ,
void * /* priv */
);
/***====================================================================***/
#define _XkbSuccess 0 /* unused */
#define _XkbErrMissingNames 1
#define _XkbErrMissingTypes 2
#define _XkbErrMissingReqTypes 3
#define _XkbErrMissingSymbols 4
#define _XkbErrMissingVMods 5 /* unused */
#define _XkbErrMissingIndicators 6 /* unused */
#define _XkbErrMissingCompatMap 7
#define _XkbErrMissingSymInterps 8 /* unused */
#define _XkbErrMissingGeometry 9
#define _XkbErrIllegalDoodad 10 /* unused */
#define _XkbErrIllegalTOCType 11 /* unused */
#define _XkbErrIllegalContents 12
#define _XkbErrEmptyFile 13 /* unused */
#define _XkbErrFileNotFound 14 /* unused */
#define _XkbErrFileCannotOpen 15 /* unused */
#define _XkbErrBadValue 16
#define _XkbErrBadMatch 17
#define _XkbErrBadTypeName 18
#define _XkbErrBadTypeWidth 19
#define _XkbErrBadFileType 20
#define _XkbErrBadFileVersion 21
#define _XkbErrBadFileFormat 22 /* unused */
#define _XkbErrBadAlloc 23
#define _XkbErrBadLength 24
#define _XkbErrXReqFailure 25 /* unused */
#define _XkbErrBadImplementation 26
/***====================================================================***/
_XFUNCPROTOBEGIN
extern _X_EXPORT unsigned XkmReadFile(FILE * /* file */ ,
unsigned /* need */ ,
unsigned /* want */ ,
XkbDescPtr * /* result */
);
_XFUNCPROTOEND
#endif /* _XKBFILE_H_ */

1
xkb/ddxLoad.c
View file

@ -40,7 +40,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "dix/dix_priv.h"
#include "os/osdep.h"
#include "xkb/xkbfile_priv.h"
#include "xkb/xkbfmisc_priv.h"
#include "inputstr.h"

45
xkb/xkbfile_priv.h
View file

@ -1,45 +0,0 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
* Copyright © 1994 by Silicon Graphics Computer Systems, Inc.
*/
#ifndef _XSERVER_XKB_XKBFILE_PRIV_H
#define _XSERVER_XKB_XKBFILE_PRIV_H
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
#include "xkbstr.h"
/* XKB error codes */
#define _XkbErrMissingNames 1
#define _XkbErrMissingTypes 2
#define _XkbErrMissingReqTypes 3
#define _XkbErrMissingSymbols 4
#define _XkbErrMissingCompatMap 7
#define _XkbErrMissingGeometry 9
#define _XkbErrIllegalContents 12
#define _XkbErrBadValue 16
#define _XkbErrBadMatch 17
#define _XkbErrBadTypeName 18
#define _XkbErrBadTypeWidth 19
#define _XkbErrBadFileType 20
#define _XkbErrBadFileVersion 21
#define _XkbErrBadAlloc 23
#define _XkbErrBadLength 24
#define _XkbErrBadImplementation 26
/*
* read xkm file
*
* @param file the FILE to read from
* @param need mask of needed elements (fails if some are missing)
* @param want mask of wanted elements
* @param result pointer to xkb descriptor to load the data into
* @return mask of elements missing (from need | want)
*/
unsigned XkmReadFile(FILE *file, unsigned need, unsigned want,
XkbDescPtr *result);
#endif /* _XSERVER_XKB_XKBFILE_PRIV_H */

1
xkb/xkmread.c
View file

@ -34,7 +34,6 @@
#include <X11/keysym.h>
#include <X11/extensions/XKMformat.h>
#include "xkb/xkbfile_priv.h"
#include "xkb/xkbfmisc_priv.h"
#include "misc.h"