Commit aff531fb4db5bb5ae266b55e1f81abb939e4d059
2012-04-11T02:28:57
Remove unused stuff from xkbrules.h Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
diff --git a/src/xkbrules.h b/src/xkbrules.h
index 4312525..843c6ae 100644
--- a/src/xkbrules.h
+++ b/src/xkbrules.h
@@ -33,44 +33,6 @@ authorization from the authors.
/* From filecommon */
-#define XkbXKMFile 0
-#define XkbCFile 1
-#define XkbXKBFile 2
-#define XkbMessage 3
-
-#define XkbMapDefined (1 << 0)
-#define XkbStateDefined (1 << 1)
-
-/***====================================================================***/
-
-#define _XkbSuccess 0
-#define _XkbErrMissingNames 1
-#define _XkbErrMissingTypes 2
-#define _XkbErrMissingReqTypes 3
-#define _XkbErrMissingSymbols 4
-#define _XkbErrMissingVMods 5
-#define _XkbErrMissingIndicators 6
-#define _XkbErrMissingCompatMap 7
-#define _XkbErrMissingSymInterps 8
-#define _XkbErrMissingGeometry 9
-#define _XkbErrIllegalDoodad 10
-#define _XkbErrIllegalTOCType 11
-#define _XkbErrIllegalContents 12
-#define _XkbErrEmptyFile 13
-#define _XkbErrFileNotFound 14
-#define _XkbErrFileCannotOpen 15
-#define _XkbErrBadValue 16
-#define _XkbErrBadMatch 17
-#define _XkbErrBadTypeName 18
-#define _XkbErrBadTypeWidth 19
-#define _XkbErrBadFileType 20
-#define _XkbErrBadFileVersion 21
-#define _XkbErrBadFileFormat 22
-#define _XkbErrBadAlloc 23
-#define _XkbErrBadLength 24
-#define _XkbErrXReqFailure 25
-#define _XkbErrBadImplementation 26
-
typedef struct _XkbRF_VarDefs {
const char * model;
const char * layout;
@@ -106,7 +68,6 @@ typedef struct _XkbRF_Rule {
char * symbols;
char * types;
char * compat;
- char * geometry;
char * keymap;
unsigned flags;
} XkbRF_RuleRec,*XkbRF_RulePtr;
@@ -128,9 +89,7 @@ typedef struct _XkbRF_Rules {
XkbRF_DescribeVarsRec layouts;
XkbRF_DescribeVarsRec variants;
XkbRF_DescribeVarsRec options;
- unsigned short sz_extra;
unsigned short num_extra;
- char ** extra_names;
XkbRF_DescribeVarsPtr extra;
unsigned short sz_rules;
@@ -141,9 +100,6 @@ typedef struct _XkbRF_Rules {
XkbRF_GroupPtr groups;
} XkbRF_RulesRec, *XkbRF_RulesPtr;
-#define _XKB_RF_NAMES_PROP_ATOM "_XKB_RULES_NAMES"
-#define _XKB_RF_NAMES_PROP_MAXLEN 1024
-
/* Action structures used in the server */
extern bool