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

XKB: Move XkbCopyKeymap definition to xkbsrv.h 

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Daniel Stone 2009-01-04 14:12:19 +11:00
parent 4f35a34f3c
commit 07c3bb922b
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Xi/exevents.c
View File

@ -77,7 +77,6 @@ SOFTWARE.
#ifdef XKB #ifdef XKB
#include <X11/extensions/XKBproto.h> #include <X11/extensions/XKBproto.h>
#include "xkbsrv.h" #include "xkbsrv.h"
extern Bool XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies);
#endif #endif
#define WID(w) ((w) ? ((w)->drawable.id) : 0) #define WID(w) ((w) ? ((w)->drawable.id) : 0)

2
dix/getevents.c
View File

@ -44,7 +44,7 @@
#ifdef XKB #ifdef XKB
#include <X11/extensions/XKBproto.h> #include <X11/extensions/XKBproto.h>
#include <xkbsrv.h> #include "xkbsrv.h"
#endif #endif
#ifdef PANORAMIX #ifdef PANORAMIX

5
include/xkbsrv.h
View File

@ -974,6 +974,11 @@ extern _X_EXPORT void XkbSendNewKeyboardNotify(
xkbNewKeyboardNotify * /* pNKN */ xkbNewKeyboardNotify * /* pNKN */
); );
extern Bool XkbCopyKeymap(
XkbDescPtr /* dst */,
XkbDescPtr /* src */,
Bool /* sendNotifies */);
#include "xkbfile.h" #include "xkbfile.h"
#include <X11/extensions/XKMformat.h> #include <X11/extensions/XKMformat.h>
#include "xkbrules.h" #include "xkbrules.h"

6
xkb/xkb.h
View File

@ -31,10 +31,4 @@ extern int ProcXkbSetDebuggingFlags(ClientPtr client);
extern void XkbExtensionInit(void); extern void XkbExtensionInit(void);
extern Bool XkbFilterEvents(ClientPtr pClient, int nEvents, xEvent *xE); extern Bool XkbFilterEvents(ClientPtr pClient, int nEvents, xEvent *xE);
extern Bool XkbCopyKeymap(
XkbDescPtr src,
XkbDescPtr dst,
Bool sendNotifies);
#endif #endif