aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/xkbrules.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-06 18:48:27 +0000
committermarha <marha@users.sourceforge.net>2009-09-06 18:48:27 +0000
commita915739887477b28d924ecc8417ee107d125bd6c (patch)
treec02f315476b61892d1fd89182e18943dce8d6277 /xorg-server/include/xkbrules.h
parent6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff)
downloadvcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.tar.gz
vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.tar.bz2
vcxsrv-a915739887477b28d924ecc8417ee107d125bd6c.zip
Switched to xorg-server-1.6.99.900.tar.gz
Diffstat (limited to 'xorg-server/include/xkbrules.h')
-rw-r--r--xorg-server/include/xkbrules.h92
1 files changed, 17 insertions, 75 deletions
diff --git a/xorg-server/include/xkbrules.h b/xorg-server/include/xkbrules.h
index 648e2e9c6..0f3f93490 100644
--- a/xorg-server/include/xkbrules.h
+++ b/xorg-server/include/xkbrules.h
@@ -29,28 +29,21 @@
/***====================================================================***/
+typedef struct _XkbRMLVOSet {
+ char * rules;
+ char * model;
+ char * layout;
+ char * variant;
+ char * options;
+} XkbRMLVOSet;
+
typedef struct _XkbRF_VarDefs {
char * model;
char * layout;
char * variant;
char * options;
- unsigned short sz_extra;
- unsigned short num_extra;
- char * extra_names;
- char ** extra_values;
} XkbRF_VarDefsRec,*XkbRF_VarDefsPtr;
-typedef struct _XkbRF_VarDesc {
- char * name;
- char * desc;
-} XkbRF_VarDescRec, *XkbRF_VarDescPtr;
-
-typedef struct _XkbRF_DescribeVars {
- int sz_desc;
- int num_desc;
- XkbRF_VarDescPtr desc;
-} XkbRF_DescribeVarsRec,*XkbRF_DescribeVarsPtr;
-
typedef struct _XkbRF_Rule {
int number;
int layout_num;
@@ -65,7 +58,6 @@ typedef struct _XkbRF_Rule {
char * types;
char * compat;
char * geometry;
- char * keymap;
unsigned flags;
} XkbRF_RuleRec,*XkbRF_RulePtr;
@@ -82,15 +74,6 @@ typedef struct _XkbRF_Group {
#define XkbRF_Invalid (1L<<5)
typedef struct _XkbRF_Rules {
- XkbRF_DescribeVarsRec models;
- 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;
unsigned short num_rules;
XkbRF_RulePtr rules;
@@ -103,24 +86,21 @@ typedef struct _XkbRF_Rules {
_XFUNCPROTOBEGIN
-extern Bool XkbRF_GetComponents(
+/* Seems preferable to dragging xkbstr.h in. */
+struct _XkbComponentNames;
+
+extern _X_EXPORT Bool XkbRF_GetComponents(
XkbRF_RulesPtr /* rules */,
XkbRF_VarDefsPtr /* var_defs */,
- XkbComponentNamesPtr /* names */
-);
-
-extern XkbRF_RulePtr XkbRF_AddRule(
- XkbRF_RulesPtr /* rules */
+ struct _XkbComponentNames * /* names */
);
-extern XkbRF_GroupPtr XkbRF_AddGroup(XkbRF_RulesPtr rules);
-
-extern Bool XkbRF_LoadRules(
+extern _X_EXPORT Bool XkbRF_LoadRules(
FILE * /* file */,
XkbRF_RulesPtr /* rules */
);
-extern Bool XkbRF_LoadRulesByName(
+extern _X_EXPORT Bool XkbRF_LoadRulesByName(
char * /* base */,
char * /* locale */,
XkbRF_RulesPtr /* rules */
@@ -128,51 +108,13 @@ extern Bool XkbRF_LoadRulesByName(
/***====================================================================***/
-extern XkbRF_VarDescPtr XkbRF_AddVarDesc(
- XkbRF_DescribeVarsPtr /* vars */
-);
-
-extern XkbRF_VarDescPtr XkbRF_AddVarDescCopy(
- XkbRF_DescribeVarsPtr /* vars */,
- XkbRF_VarDescPtr /* copy_from */
-);
-
-extern XkbRF_DescribeVarsPtr XkbRF_AddVarToDescribe(
- XkbRF_RulesPtr /* rules */,
- char * /* name */
-);
-
-extern Bool XkbRF_LoadDescriptions(
- FILE * /* file */,
- XkbRF_RulesPtr /* rules */
-);
+extern _X_EXPORT XkbRF_RulesPtr XkbRF_Create(void);
-extern Bool XkbRF_LoadDescriptionsByName(
- char * /* base */,
- char * /* locale */,
- XkbRF_RulesPtr /* rules */
-);
-
-extern XkbRF_RulesPtr XkbRF_Load(
- char * /* base */,
- char * /* locale */,
- Bool /* wantDesc */,
- Bool /* wantRules */
-);
-
-extern XkbRF_RulesPtr XkbRF_Create(
- int /* sz_rules */,
- int /* sz_extra */
-);
-
-/***====================================================================***/
-
-extern void XkbRF_Free(
+extern _X_EXPORT void XkbRF_Free(
XkbRF_RulesPtr /* rules */,
Bool /* freeRules */
);
-
/***====================================================================***/
#define _XKB_RF_NAMES_PROP_ATOM "_XKB_RULES_NAMES"