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

xkb: move XkbSetCause* macros into private header. 

These aren't used by any drivers/modules, so no need to keep them 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 15:14:45 +02:00
parent c4c2150423
commit e4f93dd59a
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/xkbsrv.h
View File

@ -96,16 +96,6 @@ typedef struct _XkbEventCause {
ClientPtr client; ClientPtr client;
} XkbEventCauseRec, *XkbEventCausePtr; } XkbEventCauseRec, *XkbEventCausePtr;
#define XkbSetCauseKey(c,k,e) { (c)->kc= (k),(c)->event= (e),\
(c)->mjr= (c)->mnr= 0; \
(c)->client= NULL; }
#define XkbSetCauseReq(c,j,n,cl) { (c)->kc= (c)->event= 0,\
(c)->mjr= (j),(c)->mnr= (n);\
(c)->client= (cl); }
#define XkbSetCauseCoreReq(c,e,cl) XkbSetCauseReq(c,e,0,cl)
#define XkbSetCauseXkbReq(c,e,cl) XkbSetCauseReq(c,XkbReqCode,e,cl)
#define XkbSetCauseUnknown(c) XkbSetCauseKey(c,0,0)
typedef struct _XkbFilter { typedef struct _XkbFilter {
CARD16 keycode; CARD16 keycode;
CARD8 what; CARD8 what;

2
xkb/xkb.c
View File

@ -35,10 +35,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "os/osdep.h" #include "os/osdep.h"
#include "xkb/xkbfmisc_priv.h" #include "xkb/xkbfmisc_priv.h"
#include "xkb/xkbsrv_priv.h"
#include "misc.h" #include "misc.h"
#include "inputstr.h" #include "inputstr.h"
#include <xkbsrv.h>
#include "extnsionst.h" #include "extnsionst.h"
#include "extinit_priv.h" #include "extinit_priv.h"
#include "xace.h" #include "xace.h"

2
xkb/xkbEvents.c
View File

@ -35,11 +35,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "dix/exevents_priv.h" #include "dix/exevents_priv.h"
#include "dix/input_priv.h" #include "dix/input_priv.h"
#include "xkb/xkbsrv_priv.h"
#include "inputstr.h" #include "inputstr.h"
#include "exglobals.h" #include "exglobals.h"
#include "windowstr.h" #include "windowstr.h"
#include "xkbsrv_priv.h"
/***====================================================================***/ /***====================================================================***/

10
xkb/xkbsrv_priv.h
View File

@ -31,6 +31,16 @@
#define _BEEP_LED_CHANGE 14 #define _BEEP_LED_CHANGE 14
#define _BEEP_BOUNCE_REJECT 15 #define _BEEP_BOUNCE_REJECT 15
#define XkbSetCauseKey(c,k,e) { (c)->kc= (k),(c)->event= (e),\
(c)->mjr= (c)->mnr= 0; \
(c)->client= NULL; }
#define XkbSetCauseReq(c,j,n,cl) { (c)->kc= (c)->event= 0,\
(c)->mjr= (j),(c)->mnr= (n);\
(c)->client= (cl); }
#define XkbSetCauseCoreReq(c,e,cl) XkbSetCauseReq(c,e,0,cl)
#define XkbSetCauseXkbReq(c,e,cl) XkbSetCauseReq(c,XkbReqCode,e,cl)
#define XkbSetCauseUnknown(c) XkbSetCauseKey(c,0,0)
void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *); void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);
void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd); void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd);