summaryrefslogtreecommitdiff
path: root/libxklavier/xklavier_private_xkb.h
diff options
context:
space:
mode:
Diffstat (limited to 'libxklavier/xklavier_private_xkb.h')
-rw-r--r--libxklavier/xklavier_private_xkb.h20
1 files changed, 13 insertions, 7 deletions
diff --git a/libxklavier/xklavier_private_xkb.h b/libxklavier/xklavier_private_xkb.h
index 6f6033d..5f3d399 100644
--- a/libxklavier/xklavier_private_xkb.h
+++ b/libxklavier/xklavier_private_xkb.h
@@ -8,15 +8,23 @@
#define ForPhysIndicators( i, bit ) \
for ( i=0, bit=1; i<XkbNumIndicators; i++, bit<<=1 ) \
- if ( xkl_xkb_desc->indicators->phys_indicators & bit )
+ if ( xkl_engine_backend(engine,XklXkb,cached_desc)->indicators->phys_indicators & bit )
-extern gint xkl_xkb_event_type, xkl_xkb_error_code;
+typedef struct _XklXkb {
-extern XkbRF_VarDefsRec xkl_var_defs;
+ gint event_type;
-extern XkbDescPtr xkl_xkb_desc;
+ gint error_code;
-extern gchar *xkl_xkb_indicator_names[];
+ XkbDescPtr cached_desc;
+
+ gchar *indicator_names[XkbNumIndicators];
+
+ XkbDescPtr actual_desc;
+
+ gchar *group_names[XkbNumKbdGroups];
+
+} XklXkb;
extern void xkl_engine_dump_xkb_desc(XklEngine * engine,
const char *file_name,
@@ -90,6 +98,4 @@ extern void xkl_xkb_config_cleanup_native(gpointer component_names);
#endif
-extern gboolean xkl_xkb_ext_present;
-
#endif