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

Remove libxkbfile dependency for real this time

master
Kristian Høgsberg 2010-09-03 20:35:28 -04:00
parent 20bfe1280d
commit fb05ee47bf
3 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/X11/extensions/XKBcommon.h
View File

@ -64,24 +64,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
typedef unsigned char KeyCode; typedef unsigned char KeyCode;
#endif #endif
#define XkmFileVersion 15
#define XkmIllegalFile -1
#define XkmSemanticsFile 20
#define XkmLayoutFile 21
#define XkmKeymapFile 22
#define XkmGeometryFile 23
#define XkmRulesFile 24
#define XkmTypesIndex 0
#define XkmCompatMapIndex 1
#define XkmSymbolsIndex 2
#define XkmIndicatorsIndex 3
#define XkmKeyNamesIndex 4
#define XkmGeometryIndex 5
#define XkmVirtualModsIndex 6
#define XkmLastIndex XkmVirtualModsIndex
struct xkb_rule_names { struct xkb_rule_names {
const char * rules; const char * rules;
const char * model; const char * model;

42
src/XKBcommonint.h
View File

@ -44,4 +44,46 @@ authorization from the authors.
#define _XkbDupString(s) ((s) ? strdup(s) : NULL) #define _XkbDupString(s) ((s) ? strdup(s) : NULL)
#define _XkbStrCaseCmp strcasecmp #define _XkbStrCaseCmp strcasecmp
/* From XKM.h */
#define XkmFileVersion 15
#define XkmIllegalFile -1
#define XkmSemanticsFile 20
#define XkmLayoutFile 21
#define XkmKeymapFile 22
#define XkmGeometryFile 23
#define XkmRulesFile 24
#define XkmTypesIndex 0
#define XkmCompatMapIndex 1
#define XkmSymbolsIndex 2
#define XkmIndicatorsIndex 3
#define XkmKeyNamesIndex 4
#define XkmGeometryIndex 5
#define XkmVirtualModsIndex 6
#define XkmLastIndex XkmVirtualModsIndex
#define XkmTypesMask (1<<0)
#define XkmCompatMapMask (1<<1)
#define XkmSymbolsMask (1<<2)
#define XkmIndicatorsMask (1<<3)
#define XkmKeyNamesMask (1<<4)
#define XkmGeometryMask (1<<5)
#define XkmVirtualModsMask (1<<6)
#define XkmLegalIndexMask (0x7f)
#define XkmAllIndicesMask (0x7f)
#define XkmSemanticsRequired (XkmCompatMapMask)
#define XkmSemanticsOptional (XkmTypesMask|XkmVirtualModsMask|XkmIndicatorsMask)
#define XkmSemanticsLegal (XkmSemanticsRequired|XkmSemanticsOptional)
#define XkmLayoutRequired (XkmKeyNamesMask|XkmSymbolsMask|XkmTypesMask)
#define XkmLayoutOptional (XkmVirtualModsMask|XkmGeometryMask)
#define XkmLayoutLegal (XkmLayoutRequired|XkmLayoutOptional)
#define XkmKeymapRequired (XkmSemanticsRequired|XkmLayoutRequired)
#define XkmKeymapOptional ((XkmSemanticsOptional|XkmLayoutOptional)&(~XkmKeymapRequired))
#define XkmKeymapLegal (XkmKeymapRequired|XkmKeymapOptional)
#define XkmLegalSection(m) (((m)&(~XkmKeymapLegal))==0)
#define XkmSingleSection(m) (XkmLegalSection(m)&&(((m)&(~(m)+1))==(m)))
#endif /* _XKBCOMMONINT_H_ */ #endif /* _XKBCOMMONINT_H_ */

1
src/xkbcomp/xkbcomp.h
View File

@ -36,7 +36,6 @@
#include "utils.h" #include "utils.h"
#include <X11/extensions/XKM.h>
#include "X11/extensions/XKBcommon.h" #include "X11/extensions/XKBcommon.h"
#include "XKBcommonint.h" #include "XKBcommonint.h"