StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use common XKB headers and add common type XkbcDescRec 

Switched to the common XKB headers which don't contain Xlib pollution.
A new common keyboard description type, XkbcDescRec, has been added.
This is the XkbDescRec definitions in xkbstr.h in the xserver since it
contains the defined field we'll need.
master
Dan Nicholson 2009-03-19 17:16:13 -07:00
parent d4ddac2b8d
commit 3a700f8123
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -48,7 +48,7 @@ if test "x$CC_FOR_BUILD" = x; then
fi fi
fi fi
PKG_CHECK_MODULES([X11], [xproto]) PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.99.1])
dnl Ensure we have keysym headers dnl Ensure we have keysym headers
AC_MSG_CHECKING([for X11 includedir]) AC_MSG_CHECKING([for X11 includedir])

19
include/X11/XkbCommon.h
View File

@ -29,7 +29,26 @@ authorization from the authors.
#define _XKBCOMMON_H_ #define _XKBCOMMON_H_
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xdefs.h>
#include <X11/keysymdef.h> #include <X11/keysymdef.h>
#include <X11/extensions/XKBstrcommon.h>
/* Common keyboard description structure */
typedef struct _XkbcDesc {
unsigned int defined;
unsigned short flags;
unsigned short device_spec;
KeyCode min_key_code;
KeyCode max_key_code;
XkbControlsPtr ctrls;
XkbServerMapPtr server;
XkbClientMapPtr map;
XkbIndicatorPtr indicators;
XkbNamesPtr names;
XkbCompatMapPtr compat;
XkbGeometryPtr geom;
} XkbcDescRec, *XkbcDescPtr;
extern char * extern char *
XkbcKeysymToString(KeySym ks); XkbcKeysymToString(KeySym ks);