XKB: Deprecate XKBSRV_NEED_FILE_FUNCS
There's no point in having the function definitions be conditional, so whatever.
This commit is contained in:
parent
68bd7ac193
commit
0f12a448dc
|
@ -124,8 +124,6 @@ typedef struct _XkbEventCause {
|
||||||
#define _BEEP_LED_CHANGE 14
|
#define _BEEP_LED_CHANGE 14
|
||||||
#define _BEEP_BOUNCE_REJECT 15
|
#define _BEEP_BOUNCE_REJECT 15
|
||||||
|
|
||||||
struct _XkbSrvInfo; /* definition see below */
|
|
||||||
|
|
||||||
typedef struct _XkbFilter {
|
typedef struct _XkbFilter {
|
||||||
CARD16 keycode;
|
CARD16 keycode;
|
||||||
CARD8 what;
|
CARD8 what;
|
||||||
|
@ -317,13 +315,8 @@ extern int DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify;
|
||||||
extern int DeviceButtonPress,DeviceButtonRelease;
|
extern int DeviceButtonPress,DeviceButtonRelease;
|
||||||
extern int DeviceEnterNotify,DeviceLeaveNotify;
|
extern int DeviceEnterNotify,DeviceLeaveNotify;
|
||||||
|
|
||||||
#ifdef XINPUT
|
|
||||||
#define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress))
|
#define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress))
|
||||||
#define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease))
|
#define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease))
|
||||||
#else
|
|
||||||
#define _XkbIsPressEvent(t) ((t)==KeyPress)
|
|
||||||
#define _XkbIsReleaseEvent(t) ((t)==KeyRelease)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define _XkbCoreKeycodeInRange(c,k) (((k)>=(c)->curKeySyms.minKeyCode)&&\
|
#define _XkbCoreKeycodeInRange(c,k) (((k)>=(c)->curKeySyms.minKeyCode)&&\
|
||||||
((k)<=(c)->curKeySyms.maxKeyCode))
|
((k)<=(c)->curKeySyms.maxKeyCode))
|
||||||
|
@ -343,14 +336,6 @@ extern int DeviceEnterNotify,DeviceLeaveNotify;
|
||||||
#define False 0
|
#define False 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef PATH_MAX
|
|
||||||
#ifdef MAXPATHLEN
|
|
||||||
#define PATH_MAX MAXPATHLEN
|
|
||||||
#else
|
|
||||||
#define PATH_MAX 1024
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
_XFUNCPROTOBEGIN
|
_XFUNCPROTOBEGIN
|
||||||
|
|
||||||
extern void XkbUseMsg(
|
extern void XkbUseMsg(
|
||||||
|
@ -987,10 +972,8 @@ extern void XkbSendNewKeyboardNotify(
|
||||||
xkbNewKeyboardNotify * /* pNKN */
|
xkbNewKeyboardNotify * /* pNKN */
|
||||||
);
|
);
|
||||||
|
|
||||||
#ifdef XKBSRV_NEED_FILE_FUNCS
|
#include "xkbfile.h"
|
||||||
|
|
||||||
#include <X11/extensions/XKMformat.h>
|
#include <X11/extensions/XKMformat.h>
|
||||||
#include <X11/extensions/XKBfile.h>
|
|
||||||
#include <X11/extensions/XKBrules.h>
|
#include <X11/extensions/XKBrules.h>
|
||||||
|
|
||||||
#define _XkbListKeymaps 0
|
#define _XkbListKeymaps 0
|
||||||
|
@ -1053,8 +1036,6 @@ extern int _XkbStrCaseCmp(
|
||||||
char * /* str2 */
|
char * /* str2 */
|
||||||
);
|
);
|
||||||
|
|
||||||
#endif /* XKBSRV_NEED_FILE_FUNCS */
|
|
||||||
|
|
||||||
_XFUNCPROTOEND
|
_XFUNCPROTOEND
|
||||||
|
|
||||||
#define XkbAtomGetString(d,s) NameForAtom(s)
|
#define XkbAtomGetString(d,s) NameForAtom(s)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user