* Opaque keymap object; may only be created, accessed, manipulated and
* destroyed through the xkb_state_*() API.
*/
-struct xkb_desc;
+struct xkb_keymap;
/**
* Opaque state object; may only be created, accessed, manipulated and
* You should almost certainly be using this and nothing else to create
* keymaps.
*/
-_X_EXPORT extern struct xkb_desc *
+_X_EXPORT extern struct xkb_keymap *
xkb_map_new_from_names(struct xkb_context *context,
const struct xkb_rule_names *names);
*
* Geometry will be ignored since xkbcommon does not support it in any way.
*/
-_X_EXPORT extern struct xkb_desc *
+_X_EXPORT extern struct xkb_keymap *
xkb_map_new_from_kccgst(struct xkb_context *context,
const struct xkb_component_names *kccgst);
* Creates an XKB keymap from a full text XKB keymap passed into the
* file descriptor.
*/
-_X_EXPORT extern struct xkb_desc *
+_X_EXPORT extern struct xkb_keymap *
xkb_map_new_from_fd(struct xkb_context *context,
int fd, enum xkb_keymap_format format);
* Creates an XKB keymap from a full text XKB keymap serialised into one
* enormous string.
*/
-_X_EXPORT extern struct xkb_desc *
+_X_EXPORT extern struct xkb_keymap *
xkb_map_new_from_string(struct xkb_context *context,
const char *string,
enum xkb_keymap_format format);
* Takes a new reference on a keymap.
*/
_X_EXPORT extern void
-xkb_map_ref(struct xkb_desc *xkb);
+xkb_map_ref(struct xkb_keymap *xkb);
/**
* Releases a reference on a keymap.
*/
_X_EXPORT extern void
-xkb_map_unref(struct xkb_desc *xkb);
+xkb_map_unref(struct xkb_keymap *xkb);
/** @} */
* Returns the number of modifiers active in the keymap.
*/
_X_EXPORT xkb_mod_index_t
-xkb_map_num_mods(struct xkb_desc *xkb);
+xkb_map_num_mods(struct xkb_keymap *xkb);
/**
* Returns the name of the modifier specified by 'idx', or NULL if invalid.
*/
_X_EXPORT const char *
-xkb_map_mod_get_name(struct xkb_desc *xkb, xkb_mod_index_t idx);
+xkb_map_mod_get_name(struct xkb_keymap *xkb, xkb_mod_index_t idx);
/**
* Returns the index of the modifier specified by 'name', or XKB_MOD_INVALID.
*/
_X_EXPORT xkb_mod_index_t
-xkb_map_mod_get_index(struct xkb_desc *xkb, const char *name);
+xkb_map_mod_get_index(struct xkb_keymap *xkb, const char *name);
/**
* Returns the number of groups active in the keymap.
*/
_X_EXPORT xkb_group_index_t
-xkb_map_num_groups(struct xkb_desc *xkb);
+xkb_map_num_groups(struct xkb_keymap *xkb);
/**
* Returns the name of the group specified by 'idx', or NULL if invalid.
*/
_X_EXPORT const char *
-xkb_map_group_get_name(struct xkb_desc *xkb, xkb_group_index_t idx);
+xkb_map_group_get_name(struct xkb_keymap *xkb, xkb_group_index_t idx);
/**
* Returns the index of the group specified by 'name', or XKB_GROUP_INVALID.
*/
_X_EXPORT xkb_group_index_t
-xkb_map_group_get_index(struct xkb_desc *xkb, const char *name);
+xkb_map_group_get_index(struct xkb_keymap *xkb, const char *name);
/**
* Returns the number of groups active for the specified key.
*/
_X_EXPORT xkb_group_index_t
-xkb_key_num_groups(struct xkb_desc *xkb, xkb_keycode_t key);
+xkb_key_num_groups(struct xkb_keymap *xkb, xkb_keycode_t key);
/**
* Returns the number of LEDs in the given map.
*/
_X_EXPORT xkb_led_index_t
-xkb_map_num_leds(struct xkb_desc *xkb);
+xkb_map_num_leds(struct xkb_keymap *xkb);
/**
* Returns the name of the LED specified by 'idx', or NULL if invalid.
*/
_X_EXPORT const char *
-xkb_map_led_get_name(struct xkb_desc *xkb, xkb_led_index_t idx);
+xkb_map_led_get_name(struct xkb_keymap *xkb, xkb_led_index_t idx);
/**
* Returns the index of the LED specified by 'name', or XKB_LED_INVALID.
*/
_X_EXPORT xkb_led_index_t
-xkb_map_led_get_index(struct xkb_desc *xkb, const char *name);
+xkb_map_led_get_index(struct xkb_keymap *xkb, const char *name);
/** @} */
* failure.
*/
_X_EXPORT struct xkb_state *
-xkb_state_new(struct xkb_desc *xkb);
+xkb_state_new(struct xkb_keymap *xkb);
/**
* Adds a reference to a state object, so it will not be freed until unref.
};
/* Common keyboard description structure */
-struct xkb_desc {
+struct xkb_keymap {
struct xkb_context *context;
unsigned int refcnt;
int refcnt;
void *filters;
int num_filters;
- struct xkb_desc *xkb;
+ struct xkb_keymap *xkb;
};
#define XkbStateFieldFromRec(s) XkbBuildCoreState((s)->lookup_mods,(s)->group)
#include <X11/extensions/XKB.h>
int
-XkbcAllocCompatMap(struct xkb_desc * xkb, unsigned which, unsigned nSI)
+XkbcAllocCompatMap(struct xkb_keymap * xkb, unsigned which, unsigned nSI)
{
struct xkb_compat_map * compat;
struct xkb_sym_interpret *prev_interpret;
static void
-XkbcFreeCompatMap(struct xkb_desc * xkb)
+XkbcFreeCompatMap(struct xkb_keymap * xkb)
{
struct xkb_compat_map * compat;
}
int
-XkbcAllocNames(struct xkb_desc * xkb, unsigned which, unsigned nTotalAliases)
+XkbcAllocNames(struct xkb_keymap * xkb, unsigned which, unsigned nTotalAliases)
{
struct xkb_names * names;
}
static void
-XkbcFreeNames(struct xkb_desc * xkb)
+XkbcFreeNames(struct xkb_keymap * xkb)
{
struct xkb_names * names;
struct xkb_client_map * map;
}
int
-XkbcAllocControls(struct xkb_desc * xkb, unsigned which)
+XkbcAllocControls(struct xkb_keymap * xkb, unsigned which)
{
if (!xkb)
return BadMatch;
}
static void
-XkbcFreeControls(struct xkb_desc * xkb)
+XkbcFreeControls(struct xkb_keymap * xkb)
{
if (xkb && xkb->ctrls) {
free(xkb->ctrls->per_key_repeat);
}
int
-XkbcAllocIndicatorMaps(struct xkb_desc * xkb)
+XkbcAllocIndicatorMaps(struct xkb_keymap * xkb)
{
if (!xkb)
return BadMatch;
}
static void
-XkbcFreeIndicatorMaps(struct xkb_desc * xkb)
+XkbcFreeIndicatorMaps(struct xkb_keymap * xkb)
{
if (xkb) {
free(xkb->indicators);
}
}
-struct xkb_desc *
+struct xkb_keymap *
XkbcAllocKeyboard(struct xkb_context *context)
{
- struct xkb_desc *xkb;
+ struct xkb_keymap *xkb;
- xkb = uTypedCalloc(1, struct xkb_desc);
+ xkb = uTypedCalloc(1, struct xkb_keymap);
if (!xkb)
return NULL;
}
void
-XkbcFreeKeyboard(struct xkb_desc * xkb)
+XkbcFreeKeyboard(struct xkb_keymap * xkb)
{
if (!xkb)
return;
#include "XKBcommonint.h"
int
-XkbcAllocClientMap(struct xkb_desc * xkb, unsigned which, unsigned nTotalTypes)
+XkbcAllocClientMap(struct xkb_keymap * xkb, unsigned which, unsigned nTotalTypes)
{
struct xkb_client_map * map;
}
int
-XkbcAllocServerMap(struct xkb_desc * xkb, unsigned which, unsigned nNewActions)
+XkbcAllocServerMap(struct xkb_keymap * xkb, unsigned which, unsigned nNewActions)
{
unsigned i;
struct xkb_server_map * map;
}
Bool
-XkbcResizeKeySyms(struct xkb_desc * xkb, xkb_keycode_t key,
+XkbcResizeKeySyms(struct xkb_keymap * xkb, xkb_keycode_t key,
unsigned int needed)
{
if (xkb->map->key_sym_map[key].size_syms >= needed)
}
union xkb_action *
-XkbcResizeKeyActions(struct xkb_desc * xkb, xkb_keycode_t key, uint32_t needed)
+XkbcResizeKeyActions(struct xkb_keymap * xkb, xkb_keycode_t key, uint32_t needed)
{
xkb_keycode_t i, nActs;
union xkb_action *newActs;
}
void
-XkbcFreeClientMap(struct xkb_desc * xkb)
+XkbcFreeClientMap(struct xkb_keymap * xkb)
{
struct xkb_client_map * map;
struct xkb_key_type * type;
}
void
-XkbcFreeServerMap(struct xkb_desc * xkb)
+XkbcFreeServerMap(struct xkb_keymap * xkb)
{
struct xkb_server_map * map;
* Returns the total number of modifiers active in the keymap.
*/
xkb_mod_index_t
-xkb_map_num_mods(struct xkb_desc *xkb)
+xkb_map_num_mods(struct xkb_keymap *xkb)
{
xkb_mod_index_t i;
* Return the name for a given modifier.
*/
const char *
-xkb_map_mod_get_name(struct xkb_desc *xkb, xkb_mod_index_t idx)
+xkb_map_mod_get_name(struct xkb_keymap *xkb, xkb_mod_index_t idx)
{
if (idx >= xkb_map_num_mods(xkb))
return NULL;
* Returns the index for a named modifier.
*/
xkb_mod_index_t
-xkb_map_mod_get_index(struct xkb_desc *xkb, const char *name)
+xkb_map_mod_get_index(struct xkb_keymap *xkb, const char *name)
{
xkb_mod_index_t i;
* Return the total number of active groups in the keymap.
*/
xkb_group_index_t
-xkb_map_num_groups(struct xkb_desc *xkb)
+xkb_map_num_groups(struct xkb_keymap *xkb)
{
xkb_group_index_t ret = 0;
xkb_group_index_t i;
* Returns the name for a given group.
*/
const char *
-xkb_map_group_get_name(struct xkb_desc *xkb, xkb_group_index_t idx)
+xkb_map_group_get_name(struct xkb_keymap *xkb, xkb_group_index_t idx)
{
if (idx >= xkb_map_num_groups(xkb))
return NULL;
* Returns the index for a named group.
*/
xkb_group_index_t
-xkb_map_group_get_index(struct xkb_desc *xkb, const char *name)
+xkb_map_group_get_index(struct xkb_keymap *xkb, const char *name)
{
xkb_group_index_t num_groups = xkb_map_num_groups(xkb);
xkb_group_index_t i;
* Returns the number of groups active for a particular key.
*/
xkb_group_index_t
-xkb_key_num_groups(struct xkb_desc *xkb, xkb_keycode_t key)
+xkb_key_num_groups(struct xkb_keymap *xkb, xkb_keycode_t key)
{
return XkbKeyNumGroups(xkb, key);
}
* Return the total number of active LEDs in the keymap.
*/
xkb_led_index_t
-xkb_map_num_leds(struct xkb_desc *xkb)
+xkb_map_num_leds(struct xkb_keymap *xkb)
{
xkb_led_index_t ret = 0;
xkb_led_index_t i;
* Returns the name for a given group.
*/
const char *
-xkb_map_led_get_name(struct xkb_desc *xkb, xkb_led_index_t idx)
+xkb_map_led_get_name(struct xkb_keymap *xkb, xkb_led_index_t idx)
{
if (idx >= xkb_map_num_leds(xkb))
return NULL;
* Returns the index for a named group.
*/
xkb_group_index_t
-xkb_map_led_get_index(struct xkb_desc *xkb, const char *name)
+xkb_map_led_get_index(struct xkb_keymap *xkb, const char *name)
{
xkb_led_index_t num_leds = xkb_map_num_leds(xkb);
xkb_led_index_t i;
* As below, but takes an explicit group/level rather than state.
*/
unsigned int
-xkb_key_get_syms_by_level(struct xkb_desc *xkb, xkb_keycode_t key, unsigned int group,
+xkb_key_get_syms_by_level(struct xkb_keymap *xkb, xkb_keycode_t key, unsigned int group,
unsigned int level, xkb_keysym_t **syms_out)
{
int num_syms;
xkb_key_get_syms(struct xkb_state *state, xkb_keycode_t key,
xkb_keysym_t **syms_out)
{
- struct xkb_desc *xkb = state->xkb;
+ struct xkb_keymap *xkb = state->xkb;
int group;
int level;
};
int
-XkbcInitCanonicalKeyTypes(struct xkb_desc * xkb, unsigned which, int keypadVMod)
+XkbcInitCanonicalKeyTypes(struct xkb_keymap * xkb, unsigned which, int keypadVMod)
{
struct xkb_client_map * map;
struct xkb_key_type *from, *to;
}
Bool
-XkbcVirtualModsToReal(struct xkb_desc * xkb, unsigned virtual_mask,
+XkbcVirtualModsToReal(struct xkb_keymap * xkb, unsigned virtual_mask,
unsigned *mask_rtrn)
{
int i, bit;
}
struct xkb_state *
-xkb_state_new(struct xkb_desc *xkb)
+xkb_state_new(struct xkb_keymap *xkb)
{
struct xkb_state *ret;
}
static const char *
-XkbcVModIndexText(struct xkb_desc * xkb, unsigned ndx)
+XkbcVModIndexText(struct xkb_keymap * xkb, unsigned ndx)
{
int len;
char *rtrn;
}
const char *
-XkbcVModMaskText(struct xkb_desc * xkb, unsigned modMask, unsigned mask)
+XkbcVModMaskText(struct xkb_keymap * xkb, unsigned modMask, unsigned mask)
{
int i, bit, len, rem;
const char *mm = NULL;
}
Bool
-XkbcComputeEffectiveMap(struct xkb_desc * xkb, struct xkb_key_type * type,
+XkbcComputeEffectiveMap(struct xkb_keymap * xkb, struct xkb_key_type * type,
unsigned char *map_rtrn)
{
int i;
#include "XKBcommonint.h"
extern int
-XkbcAllocCompatMap(struct xkb_desc * xkb, unsigned which, unsigned nSI);
+XkbcAllocCompatMap(struct xkb_keymap * xkb, unsigned which, unsigned nSI);
extern int
-XkbcAllocNames(struct xkb_desc * xkb, unsigned which, unsigned nTotalAliases);
+XkbcAllocNames(struct xkb_keymap * xkb, unsigned which, unsigned nTotalAliases);
extern int
-XkbcAllocControls(struct xkb_desc * xkb, unsigned which);
+XkbcAllocControls(struct xkb_keymap * xkb, unsigned which);
extern int
-XkbcAllocIndicatorMaps(struct xkb_desc * xkb);
+XkbcAllocIndicatorMaps(struct xkb_keymap * xkb);
-extern struct xkb_desc *
+extern struct xkb_keymap *
XkbcAllocKeyboard(struct xkb_context *context);
extern void
-XkbcFreeKeyboard(struct xkb_desc * xkb);
+XkbcFreeKeyboard(struct xkb_keymap * xkb);
/***====================================================================***/
extern int
-XkbcAllocClientMap(struct xkb_desc * xkb, unsigned which, unsigned nTotalTypes);
+XkbcAllocClientMap(struct xkb_keymap * xkb, unsigned which, unsigned nTotalTypes);
extern int
-XkbcAllocServerMap(struct xkb_desc * xkb, unsigned which, unsigned nNewActions);
+XkbcAllocServerMap(struct xkb_keymap * xkb, unsigned which, unsigned nNewActions);
extern int
XkbcCopyKeyType(struct xkb_key_type * from, struct xkb_key_type *into);
extern Bool
-XkbcResizeKeySyms(struct xkb_desc * xkb, xkb_keycode_t key, uint32_t needed);
+XkbcResizeKeySyms(struct xkb_keymap * xkb, xkb_keycode_t key, uint32_t needed);
extern union xkb_action *
-XkbcResizeKeyActions(struct xkb_desc * xkb, xkb_keycode_t key, uint32_t needed);
+XkbcResizeKeyActions(struct xkb_keymap * xkb, xkb_keycode_t key, uint32_t needed);
extern void
-XkbcFreeClientMap(struct xkb_desc * xkb);
+XkbcFreeClientMap(struct xkb_keymap * xkb);
extern void
-XkbcFreeServerMap(struct xkb_desc * xkb);
+XkbcFreeServerMap(struct xkb_keymap * xkb);
extern unsigned int
-xkb_key_get_syms_by_level(struct xkb_desc *xkb, xkb_keycode_t key,
+xkb_key_get_syms_by_level(struct xkb_keymap *xkb, xkb_keycode_t key,
unsigned int group, unsigned int level,
xkb_keysym_t **syms_out);
}
static Bool
-HandleNoAction(struct xkb_desc * xkb,
+HandleNoAction(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-CheckModifierField(struct xkb_desc * xkb,
+CheckModifierField(struct xkb_keymap * xkb,
unsigned action,
ExprDef * value,
unsigned *flags_inout, unsigned *mods_rtrn)
}
static Bool
-HandleSetLatchMods(struct xkb_desc * xkb,
+HandleSetLatchMods(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleLockMods(struct xkb_desc * xkb,
+HandleLockMods(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleSetLatchGroup(struct xkb_desc * xkb,
+HandleSetLatchGroup(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleLockGroup(struct xkb_desc * xkb,
+HandleLockGroup(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleMovePtr(struct xkb_desc * xkb,
+HandleMovePtr(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
};
static Bool
-HandlePtrBtn(struct xkb_desc * xkb,
+HandlePtrBtn(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
};
static Bool
-HandleSetPtrDflt(struct xkb_desc * xkb,
+HandleSetPtrDflt(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
};
static Bool
-HandleISOLock(struct xkb_desc * xkb,
+HandleISOLock(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleSwitchScreen(struct xkb_desc * xkb,
+HandleSwitchScreen(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
};
static Bool
-HandleSetLockControls(struct xkb_desc * xkb,
+HandleSetLockControls(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
};
static Bool
-HandleActionMessage(struct xkb_desc * xkb,
+HandleActionMessage(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleRedirectKey(struct xkb_desc * xkb,
+HandleRedirectKey(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleDeviceBtn(struct xkb_desc * xkb,
+HandleDeviceBtn(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandleDeviceValuator(struct xkb_desc * xkb,
+HandleDeviceValuator(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
}
static Bool
-HandlePrivate(struct xkb_desc * xkb,
+HandlePrivate(struct xkb_keymap * xkb,
struct xkb_any_action * action,
unsigned field, ExprDef * array_ndx, ExprDef * value)
{
return ReportIllegal(PrivateAction, field);
}
-typedef Bool(*actionHandler) (struct xkb_desc * /* xkb */ ,
+typedef Bool(*actionHandler) (struct xkb_keymap * /* xkb */ ,
struct xkb_any_action * /* action */ ,
unsigned /* field */ ,
ExprDef * /* array_ndx */ ,
int
HandleActionDef(ExprDef * def,
- struct xkb_desc * xkb,
+ struct xkb_keymap * xkb,
struct xkb_any_action * action, unsigned mergeMode, ActionInfo * info)
{
ExprDef *arg;
/***====================================================================***/
int
-SetActionField(struct xkb_desc * xkb,
+SetActionField(struct xkb_keymap * xkb,
char *elem,
char *field,
ExprDef * array_ndx, ExprDef * value, ActionInfo ** info_rtrn)
} ActionInfo;
extern int HandleActionDef(ExprDef * /* def */ ,
- struct xkb_desc * /* xkb */ ,
+ struct xkb_keymap * /* xkb */ ,
struct xkb_any_action * /* action */ ,
unsigned /* mergeMode */ ,
ActionInfo * /* info */
);
-extern int SetActionField(struct xkb_desc * /* xkb */ ,
+extern int SetActionField(struct xkb_keymap * /* xkb */ ,
char * /* elem */ ,
char * /* field */ ,
ExprDef * /* index */ ,
}
int
-ApplyAliases(struct xkb_desc * xkb, AliasInfo ** info_in)
+ApplyAliases(struct xkb_keymap * xkb, AliasInfo ** info_in)
{
int i;
struct xkb_key_alias *old, *a;
unsigned /* how_merge */
);
-extern int ApplyAliases(struct xkb_desc * /* xkb */ ,
+extern int ApplyAliases(struct xkb_keymap * /* xkb */ ,
AliasInfo ** /* info */
);
LEDInfo *leds;
VModInfo vmods;
ActionInfo *act;
- struct xkb_desc * xkb;
+ struct xkb_keymap * xkb;
} CompatInfo;
/***====================================================================***/
}
static void
-InitCompatInfo(CompatInfo * info, struct xkb_desc * xkb)
+InitCompatInfo(CompatInfo * info, struct xkb_keymap * xkb)
{
unsigned int i;
}
static void
-ClearCompatInfo(CompatInfo * info, struct xkb_desc * xkb)
+ClearCompatInfo(CompatInfo * info, struct xkb_keymap * xkb)
{
unsigned int i;
ActionInfo *next;
}
typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
- struct xkb_desc * /* xkb */ ,
+ struct xkb_keymap * /* xkb */ ,
unsigned /* merge */ ,
CompatInfo * /* info */
);
static Bool
HandleIncludeCompatMap(IncludeStmt * stmt,
- struct xkb_desc * xkb, CompatInfo * info, FileHandler hndlr)
+ struct xkb_keymap * xkb, CompatInfo * info, FileHandler hndlr)
{
unsigned newMerge;
XkbFile *rtrn;
static int
SetInterpField(SymInterpInfo * si,
- struct xkb_desc * xkb,
+ struct xkb_keymap * xkb,
char *field,
ExprDef * arrayNdx, ExprDef * value, CompatInfo * info)
{
}
static int
-HandleInterpVar(VarDef * stmt, struct xkb_desc * xkb, CompatInfo * info)
+HandleInterpVar(VarDef * stmt, struct xkb_keymap * xkb, CompatInfo * info)
{
ExprResult elem, field;
ExprDef *ndx;
}
static int
-HandleInterpBody(VarDef * def, struct xkb_desc * xkb, SymInterpInfo * si,
+HandleInterpBody(VarDef * def, struct xkb_keymap * xkb, SymInterpInfo * si,
CompatInfo * info)
{
int ok = 1;
}
static int
-HandleInterpDef(InterpDef * def, struct xkb_desc * xkb, unsigned merge,
+HandleInterpDef(InterpDef * def, struct xkb_keymap * xkb, unsigned merge,
CompatInfo * info)
{
unsigned pred, mods;
static int
HandleGroupCompatDef(GroupCompatDef * def,
- struct xkb_desc * xkb, unsigned merge, CompatInfo * info)
+ struct xkb_keymap * xkb, unsigned merge, CompatInfo * info)
{
ExprResult val;
GroupCompatInfo tmp;
static void
HandleCompatMapFile(XkbFile * file,
- struct xkb_desc * xkb, unsigned merge, CompatInfo * info)
+ struct xkb_keymap * xkb, unsigned merge, CompatInfo * info)
{
ParseCommon *stmt;
}
Bool
-CompileCompatMap(XkbFile *file, struct xkb_desc * xkb, unsigned merge,
+CompileCompatMap(XkbFile *file, struct xkb_keymap * xkb, unsigned merge,
LEDInfoPtr *unboundLEDs)
{
int i;
}
static uint32_t
-VModsToReal(struct xkb_desc *xkb, uint32_t vmodmask)
+VModsToReal(struct xkb_keymap *xkb, uint32_t vmodmask)
{
uint32_t ret = 0;
int i;
}
static void
-UpdateActionMods(struct xkb_desc *xkb, union xkb_action *act, uint32_t rmodmask)
+UpdateActionMods(struct xkb_keymap *xkb, union xkb_action *act, uint32_t rmodmask)
{
switch (act->type) {
case XkbSA_SetMods:
* generic XKB_KEYSYM_NO_SYMBOL match.
*/
static struct xkb_sym_interpret *
-FindInterpForKey(struct xkb_desc *xkb, xkb_keycode_t key, uint32_t group, uint32_t level)
+FindInterpForKey(struct xkb_keymap *xkb, xkb_keycode_t key, uint32_t group, uint32_t level)
{
struct xkb_sym_interpret *ret = NULL;
xkb_keysym_t *syms;
/**
*/
static Bool
-ApplyInterpsToKey(struct xkb_desc *xkb, xkb_keycode_t key)
+ApplyInterpsToKey(struct xkb_keymap *xkb, xkb_keycode_t key)
{
#define INTERP_SIZE (8 * 4)
struct xkb_sym_interpret *interps[INTERP_SIZE];
* other than Shift actually do something ...
*/
Bool
-UpdateModifiersFromCompat(struct xkb_desc *xkb)
+UpdateModifiersFromCompat(struct xkb_keymap *xkb)
{
xkb_keycode_t key;
int i;
int
ExprResolveVModMask(ExprDef * expr,
ExprResult * val_rtrn,
- struct xkb_desc *xkb)
+ struct xkb_keymap *xkb)
{
return ExprResolveMaskLookup(expr, val_rtrn, LookupVModMask, xkb);
}
extern int ExprResolveVModMask(ExprDef * /* expr */ ,
ExprResult * /* val_rtrn */ ,
- struct xkb_desc * /* xkb */
+ struct xkb_keymap * /* xkb */
);
extern int ExprResolveBoolean(ExprDef * /* expr */ ,
int
SetIndicatorMapField(LEDInfo * led,
- struct xkb_desc * xkb,
+ struct xkb_keymap * xkb,
char *field, ExprDef * arrayNdx, ExprDef * value)
{
ExprResult rtrn;
LEDInfo *
HandleIndicatorMapDef(IndicatorMapDef * def,
- struct xkb_desc * xkb,
+ struct xkb_keymap * xkb,
LEDInfo * dflt, LEDInfo * oldLEDs, unsigned merge)
{
LEDInfo led, *rtrn;
}
Bool
-CopyIndicatorMapDefs(struct xkb_desc * xkb, LEDInfo *leds, LEDInfo **unboundRtrn)
+CopyIndicatorMapDefs(struct xkb_keymap * xkb, LEDInfo *leds, LEDInfo **unboundRtrn)
{
LEDInfo *led, *next;
LEDInfo *unbound, *last;
}
Bool
-BindIndicators(struct xkb_desc * xkb, Bool force, LEDInfo *unbound,
+BindIndicators(struct xkb_keymap * xkb, Bool force, LEDInfo *unbound,
LEDInfo **unboundRtrn)
{
int i;
);
extern int SetIndicatorMapField(LEDInfo * /* led */ ,
- struct xkb_desc * /* xkb */ ,
+ struct xkb_keymap * /* xkb */ ,
char * /* field */ ,
ExprDef * /* arrayNdx */ ,
ExprDef * /* value */
);
extern LEDInfo *HandleIndicatorMapDef(IndicatorMapDef * /* stmt */ ,
- struct xkb_desc * /* xkb */ ,
+ struct xkb_keymap * /* xkb */ ,
LEDInfo * /* dflt */ ,
LEDInfo * /* oldLEDs */ ,
unsigned /* mergeMode */
);
extern Bool
-CopyIndicatorMapDefs(struct xkb_desc * xkb, LEDInfo *leds, LEDInfo **unboundRtrn);
+CopyIndicatorMapDefs(struct xkb_keymap * xkb, LEDInfo *leds, LEDInfo **unboundRtrn);
extern Bool
-BindIndicators(struct xkb_desc * xkb, Bool force, LEDInfo *unbound,
+BindIndicators(struct xkb_keymap * xkb, Bool force, LEDInfo *unbound,
LEDInfo **unboundRtrn);
#endif /* INDICATORS_H */
} KeyNamesInfo;
static void HandleKeycodesFile(XkbFile * file,
- struct xkb_desc * xkb,
+ struct xkb_keymap * xkb,
unsigned merge,
KeyNamesInfo * info);
* @param info Struct to store the key info in.
*/
static Bool
-HandleIncludeKeycodes(IncludeStmt * stmt, struct xkb_desc * xkb, KeyNamesInfo * info)
+HandleIncludeKeycodes(IncludeStmt * stmt, struct xkb_keymap * xkb, KeyNamesInfo * info)
{
unsigned newMerge;
XkbFile *rtrn;
*/
static void
HandleKeycodesFile(XkbFile * file,
- struct xkb_desc * xkb, unsigned merge, KeyNamesInfo * info)
+ struct xkb_keymap * xkb, unsigned merge, KeyNamesInfo * info)
{
ParseCommon *stmt;
* @return True on success, False otherwise.
*/
Bool
-CompileKeycodes(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
+CompileKeycodes(XkbFile *file, struct xkb_keymap * xkb, unsigned merge)
{
KeyNamesInfo info; /* contains all the info after parsing */
* @param file A list of XkbFiles, each denoting one type (e.g.
* XkmKeyNamesIdx, etc.)
*/
-struct xkb_desc *
+struct xkb_keymap *
CompileKeymap(struct xkb_context *context, XkbFile *file, unsigned merge)
{
unsigned have;
unsigned mainType;
const char *mainName;
LEDInfo *unbound = NULL, *next;
- struct xkb_desc *xkb = XkbcAllocKeyboard(context);
+ struct xkb_keymap *xkb = XkbcAllocKeyboard(context);
struct {
XkbFile *keycodes;
XkbFile *types;
/***====================================================================***/
static void
-InitKeyTypesInfo(KeyTypesInfo * info, struct xkb_desc * xkb, KeyTypesInfo * from)
+InitKeyTypesInfo(KeyTypesInfo * info, struct xkb_keymap * xkb, KeyTypesInfo * from)
{
tok_ONE_LEVEL = xkb_intern_atom("ONE_LEVEL");
tok_TWO_LEVEL = xkb_intern_atom("TWO_LEVEL");
}
static Bool
-AddKeyType(struct xkb_desc * xkb, KeyTypesInfo * info, KeyTypeInfo * new)
+AddKeyType(struct xkb_keymap * xkb, KeyTypesInfo * info, KeyTypeInfo * new)
{
KeyTypeInfo *old;
static void
MergeIncludedKeyTypes(KeyTypesInfo * into,
- KeyTypesInfo * from, unsigned merge, struct xkb_desc * xkb)
+ KeyTypesInfo * from, unsigned merge, struct xkb_keymap * xkb)
{
KeyTypeInfo *type;
}
typedef void (*FileHandler) (XkbFile * /* file */ ,
- struct xkb_desc * /* xkb */ ,
+ struct xkb_keymap * /* xkb */ ,
unsigned /* merge */ ,
KeyTypesInfo * /* included */
);
static Bool
HandleIncludeKeyTypes(IncludeStmt * stmt,
- struct xkb_desc * xkb, KeyTypesInfo * info, FileHandler hndlr)
+ struct xkb_keymap * xkb, KeyTypesInfo * info, FileHandler hndlr)
{
unsigned newMerge;
XkbFile *rtrn;
}
static Bool
-AddPreserve(struct xkb_desc * xkb,
+AddPreserve(struct xkb_keymap * xkb,
KeyTypeInfo * type, PreserveInfo * new, Bool clobber, Bool report)
{
PreserveInfo *old;
* @param report True if a warning is to be printed on.
*/
static Bool
-AddMapEntry(struct xkb_desc * xkb,
+AddMapEntry(struct xkb_keymap * xkb,
KeyTypeInfo * type,
struct xkb_kt_map_entry * new, Bool clobber, Bool report)
{
static Bool
SetMapEntry(KeyTypeInfo * type,
- struct xkb_desc * xkb, ExprDef * arrayNdx, ExprDef * value)
+ struct xkb_keymap * xkb, ExprDef * arrayNdx, ExprDef * value)
{
ExprResult rtrn;
struct xkb_kt_map_entry entry;
static Bool
SetPreserve(KeyTypeInfo * type,
- struct xkb_desc * xkb, ExprDef * arrayNdx, ExprDef * value)
+ struct xkb_keymap * xkb, ExprDef * arrayNdx, ExprDef * value)
{
ExprResult rtrn;
PreserveInfo new;
*/
static Bool
SetKeyTypeField(KeyTypeInfo * type,
- struct xkb_desc * xkb,
+ struct xkb_keymap * xkb,
char *field,
ExprDef * arrayNdx, ExprDef * value, KeyTypesInfo * info)
{
}
static Bool
-HandleKeyTypeVar(VarDef * stmt, struct xkb_desc * xkb, KeyTypesInfo * info)
+HandleKeyTypeVar(VarDef * stmt, struct xkb_keymap * xkb, KeyTypesInfo * info)
{
ExprResult elem, field;
ExprDef *arrayNdx;
static int
HandleKeyTypeBody(VarDef * def,
- struct xkb_desc * xkb, KeyTypeInfo * type, KeyTypesInfo * info)
+ struct xkb_keymap * xkb, KeyTypeInfo * type, KeyTypesInfo * info)
{
int ok = 1;
ExprResult tmp, field;
*/
static int
HandleKeyTypeDef(KeyTypeDef * def,
- struct xkb_desc * xkb, unsigned merge, KeyTypesInfo * info)
+ struct xkb_keymap * xkb, unsigned merge, KeyTypesInfo * info)
{
unsigned int i;
KeyTypeInfo type;
*/
static void
HandleKeyTypesFile(XkbFile * file,
- struct xkb_desc * xkb, unsigned merge, KeyTypesInfo * info)
+ struct xkb_keymap * xkb, unsigned merge, KeyTypesInfo * info)
{
ParseCommon *stmt;
}
static Bool
-CopyDefToKeyType(struct xkb_desc * xkb, struct xkb_key_type * type, KeyTypeInfo * def)
+CopyDefToKeyType(struct xkb_keymap * xkb, struct xkb_key_type * type, KeyTypeInfo * def)
{
unsigned int i;
PreserveInfo *pre;
}
Bool
-CompileKeyTypes(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
+CompileKeyTypes(XkbFile *file, struct xkb_keymap * xkb, unsigned merge)
{
KeyTypesInfo info;
* @return True if found, False otherwise.
*/
Bool
-FindNamedKey(struct xkb_desc * xkb,
+FindNamedKey(struct xkb_keymap * xkb,
unsigned long name,
xkb_keycode_t *kc_rtrn,
Bool use_aliases, Bool create, xkb_keycode_t start_from)
}
Bool
-FindKeyNameForAlias(struct xkb_desc * xkb, unsigned long lname,
+FindKeyNameForAlias(struct xkb_keymap * xkb, unsigned long lname,
unsigned long *real_name)
{
unsigned int i;
unsigned * /* merge_rtrn */
);
-extern Bool FindNamedKey(struct xkb_desc * /* xkb */ ,
+extern Bool FindNamedKey(struct xkb_keymap * /* xkb */ ,
unsigned long /* name */ ,
xkb_keycode_t * /* kc_rtrn */ ,
Bool /* use_aliases */ ,
xkb_keycode_t /* start_from */
);
-extern Bool FindKeyNameForAlias(struct xkb_desc * /* xkb */ ,
+extern Bool FindKeyNameForAlias(struct xkb_keymap * /* xkb */ ,
unsigned long /* lname */ ,
unsigned long * /* real_name */
);
} SymbolsInfo;
static void
-InitSymbolsInfo(SymbolsInfo * info, struct xkb_desc * xkb)
+InitSymbolsInfo(SymbolsInfo * info, struct xkb_keymap * xkb)
{
int i;
}
static Bool
-AddKeySymbols(SymbolsInfo * info, KeyInfo * key, struct xkb_desc * xkb)
+AddKeySymbols(SymbolsInfo * info, KeyInfo * key, struct xkb_keymap * xkb)
{
unsigned int i;
unsigned long real_name;
static void
MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from,
- unsigned merge, struct xkb_desc * xkb)
+ unsigned merge, struct xkb_keymap * xkb)
{
unsigned int i;
KeyInfo *key;
}
typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
- struct xkb_desc * /* xkb */ ,
+ struct xkb_keymap * /* xkb */ ,
unsigned /* merge */ ,
SymbolsInfo * /* included */
);
static Bool
HandleIncludeSymbols(IncludeStmt * stmt,
- struct xkb_desc * xkb, SymbolsInfo * info, FileHandler hndlr)
+ struct xkb_keymap * xkb, SymbolsInfo * info, FileHandler hndlr)
{
unsigned newMerge;
XkbFile *rtrn;
static Bool
AddSymbolsToKey(KeyInfo * key,
- struct xkb_desc * xkb,
+ struct xkb_keymap * xkb,
char *field,
ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info)
{
static Bool
AddActionsToKey(KeyInfo * key,
- struct xkb_desc * xkb,
+ struct xkb_keymap * xkb,
char *field,
ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info)
{
static Bool
SetSymbolsField(KeyInfo * key,
- struct xkb_desc * xkb,
+ struct xkb_keymap * xkb,
char *field,
ExprDef * arrayNdx, ExprDef * value, SymbolsInfo * info)
{
}
static int
-HandleSymbolsVar(VarDef * stmt, struct xkb_desc * xkb, SymbolsInfo * info)
+HandleSymbolsVar(VarDef * stmt, struct xkb_keymap * xkb, SymbolsInfo * info)
{
ExprResult elem, field, tmp;
ExprDef *arrayNdx;
static Bool
HandleSymbolsBody(VarDef * def,
- struct xkb_desc * xkb, KeyInfo * key, SymbolsInfo * info)
+ struct xkb_keymap * xkb, KeyInfo * key, SymbolsInfo * info)
{
Bool ok = True;
ExprResult tmp, field;
static int
HandleSymbolsDef(SymbolsDef * stmt,
- struct xkb_desc * xkb, unsigned merge, SymbolsInfo * info)
+ struct xkb_keymap * xkb, unsigned merge, SymbolsInfo * info)
{
KeyInfo key;
static Bool
HandleModMapDef(ModMapDef * def,
- struct xkb_desc * xkb, unsigned merge, SymbolsInfo * info)
+ struct xkb_keymap * xkb, unsigned merge, SymbolsInfo * info)
{
ExprDef *key;
ModMapEntry tmp;
static void
HandleSymbolsFile(XkbFile * file,
- struct xkb_desc * xkb, unsigned merge, SymbolsInfo * info)
+ struct xkb_keymap * xkb, unsigned merge, SymbolsInfo * info)
{
ParseCommon *stmt;
}
static Bool
-FindKeyForSymbol(struct xkb_desc * xkb, xkb_keysym_t sym, xkb_keycode_t *kc_rtrn)
+FindKeyForSymbol(struct xkb_keymap * xkb, xkb_keysym_t sym, xkb_keycode_t *kc_rtrn)
{
xkb_keycode_t key;
unsigned int group, level;
* @return True if found, False otherwise.
*/
static Bool
-FindNamedType(struct xkb_desc * xkb, xkb_atom_t atom, unsigned *type_rtrn)
+FindNamedType(struct xkb_keymap * xkb, xkb_atom_t atom, unsigned *type_rtrn)
{
unsigned n;
const char *name = XkbcAtomText(atom);
* This function recurses.
*/
static Bool
-CopySymbolsDef(struct xkb_desc * xkb, KeyInfo *key, int start_from)
+CopySymbolsDef(struct xkb_keymap * xkb, KeyInfo *key, int start_from)
{
unsigned int i;
xkb_keycode_t kc;
}
static Bool
-CopyModMapDef(struct xkb_desc * xkb, ModMapEntry *entry)
+CopyModMapDef(struct xkb_keymap * xkb, ModMapEntry *entry)
{
xkb_keycode_t kc;
* @param merge Merge strategy (e.g. MergeOverride).
*/
Bool
-CompileSymbols(XkbFile *file, struct xkb_desc * xkb, unsigned merge)
+CompileSymbols(XkbFile *file, struct xkb_keymap * xkb, unsigned merge)
{
unsigned int i;
SymbolsInfo info;
#include "vmod.h"
void
-InitVModInfo(VModInfo * info, struct xkb_desc * xkb)
+InitVModInfo(VModInfo * info, struct xkb_keymap * xkb)
{
ClearVModInfo(info, xkb);
info->errorCount = 0;
}
void
-ClearVModInfo(VModInfo * info, struct xkb_desc * xkb)
+ClearVModInfo(VModInfo * info, struct xkb_keymap * xkb)
{
int i;
* @param mergeMode Merge strategy (e.g. MergeOverride)
*/
Bool
-HandleVModDef(VModDef * stmt, struct xkb_desc *xkb, unsigned mergeMode,
+HandleVModDef(VModDef * stmt, struct xkb_keymap *xkb, unsigned mergeMode,
VModInfo * info)
{
int i, bit, nextFree;
* undefined.
*/
static int
-LookupVModIndex(const struct xkb_desc *xkb, xkb_atom_t field, unsigned type,
+LookupVModIndex(const struct xkb_keymap *xkb, xkb_atom_t field, unsigned type,
ExprResult * val_rtrn)
{
int i;
}
int
-FindKeypadVMod(struct xkb_desc * xkb)
+FindKeypadVMod(struct xkb_keymap * xkb)
{
xkb_atom_t name;
ExprResult rtrn;
}
Bool
-ResolveVirtualModifier(ExprDef * def, struct xkb_desc *xkb,
+ResolveVirtualModifier(ExprDef * def, struct xkb_keymap *xkb,
ExprResult * val_rtrn, VModInfo * info)
{
struct xkb_names * names;
typedef struct _VModInfo
{
- struct xkb_desc * xkb;
+ struct xkb_keymap * xkb;
unsigned defined;
unsigned available;
unsigned newlyDefined;
} VModInfo;
extern void InitVModInfo(VModInfo * /* info */ ,
- struct xkb_desc * /* xkb */
+ struct xkb_keymap * /* xkb */
);
extern void ClearVModInfo(VModInfo * /* info */ ,
- struct xkb_desc * /* xkb */
+ struct xkb_keymap * /* xkb */
);
extern Bool HandleVModDef(VModDef * /* stmt */ ,
- struct xkb_desc * /* xkb */ ,
+ struct xkb_keymap * /* xkb */ ,
unsigned /* mergeMode */ ,
VModInfo * /* info */
);
extern Bool ApplyVModDefs(VModInfo * /* info */ ,
- struct xkb_desc * /* xkb */
+ struct xkb_keymap * /* xkb */
);
-extern int FindKeypadVMod(struct xkb_desc * /* xkb */
+extern int FindKeypadVMod(struct xkb_keymap * /* xkb */
);
extern Bool ResolveVirtualModifier(ExprDef * /* def */ ,
- struct xkb_desc * /* xkb */ ,
+ struct xkb_keymap * /* xkb */ ,
ExprResult * /* value_rtrn */ ,
VModInfo * /* info */
);
return names;
}
-struct xkb_desc *
+struct xkb_keymap *
xkb_map_new_from_names(struct xkb_context *context,
const struct xkb_rule_names *rmlvo)
{
XkbRF_VarDefsRec defs;
struct xkb_component_names *names;
- struct xkb_desc *xkb;
+ struct xkb_keymap *xkb;
if (!rmlvo || ISEMPTY(rmlvo->rules) || ISEMPTY(rmlvo->layout)) {
ERROR("rules and layout required to generate XKB keymap\n");
return map;
}
-static struct xkb_desc *
+static struct xkb_keymap *
compile_keymap(struct xkb_context *context, XkbFile *file)
{
XkbFile *mapToUse;
- struct xkb_desc * xkb = NULL;
+ struct xkb_keymap * xkb = NULL;
/* Find map to use */
mapToUse = XkbChooseMap(file, NULL);
return xkb;
}
-struct xkb_desc *
+struct xkb_keymap *
xkb_map_new_from_kccgst(struct xkb_context *context,
const struct xkb_component_names *kccgst)
{
return compile_keymap(context, file);
}
-struct xkb_desc *
+struct xkb_keymap *
xkb_map_new_from_string(struct xkb_context *context,
const char *string,
enum xkb_keymap_format format)
return compile_keymap(context, file);
}
-struct xkb_desc *
+struct xkb_keymap *
xkb_map_new_from_fd(struct xkb_context *context,
int fd,
enum xkb_keymap_format format)
}
void
-xkb_map_ref(struct xkb_desc *xkb)
+xkb_map_ref(struct xkb_keymap *xkb)
{
xkb->refcnt++;
}
void
-xkb_map_unref(struct xkb_desc *xkb)
+xkb_map_unref(struct xkb_keymap *xkb)
{
if (--xkb->refcnt > 0)
return;
Bool compiled;
} XkbFile;
-extern struct xkb_desc *
+extern struct xkb_keymap *
CompileKeymap(struct xkb_context *context, XkbFile *file, unsigned merge);
extern Bool
-CompileKeycodes(XkbFile *file, struct xkb_desc * xkb, unsigned merge);
+CompileKeycodes(XkbFile *file, struct xkb_keymap * xkb, unsigned merge);
extern Bool
-CompileKeyTypes(XkbFile *file, struct xkb_desc * xkb, unsigned merge);
+CompileKeyTypes(XkbFile *file, struct xkb_keymap * xkb, unsigned merge);
typedef struct _LEDInfo *LEDInfoPtr;
extern Bool
-CompileCompatMap(XkbFile *file, struct xkb_desc * xkb, unsigned merge,
+CompileCompatMap(XkbFile *file, struct xkb_keymap * xkb, unsigned merge,
LEDInfoPtr *unboundLEDs);
extern Bool
-CompileSymbols(XkbFile *file, struct xkb_desc * xkb, unsigned merge);
+CompileSymbols(XkbFile *file, struct xkb_keymap * xkb, unsigned merge);
extern Bool
-UpdateModifiersFromCompat(struct xkb_desc *xkb);
+UpdateModifiersFromCompat(struct xkb_keymap *xkb);
#endif /* XKBCOMP_H */
/***====================================================================***/
extern Bool
-XkbcComputeEffectiveMap(struct xkb_desc * xkb, struct xkb_key_type * type,
+XkbcComputeEffectiveMap(struct xkb_keymap * xkb, struct xkb_key_type * type,
unsigned char *map_rtrn);
/***====================================================================***/
extern int
-XkbcInitCanonicalKeyTypes(struct xkb_desc * xkb, unsigned which, int keypadVMod);
+XkbcInitCanonicalKeyTypes(struct xkb_keymap * xkb, unsigned which, int keypadVMod);
extern Bool
-XkbcVirtualModsToReal(struct xkb_desc * xkb, unsigned virtual_mask,
+XkbcVirtualModsToReal(struct xkb_keymap * xkb, unsigned virtual_mask,
unsigned *mask_rtrn);
extern void
XkbcAtomText(xkb_atom_t atm);
extern const char *
-XkbcVModMaskText(struct xkb_desc * xkb, unsigned modMask, unsigned mask);
+XkbcVModMaskText(struct xkb_keymap * xkb, unsigned modMask, unsigned mask);
extern const char *
XkbcModIndexText(unsigned ndx);
int main(int argc, char *argv[])
{
struct xkb_context *context;
- struct xkb_desc *xkb;
+ struct xkb_keymap *xkb;
char *path;
int fd;
int i, len, from_string = 0;
int main(int argc, char *argv[])
{
struct xkb_context *context;
- struct xkb_desc *xkb;
+ struct xkb_keymap *xkb;
struct xkb_component_names kccgst;
/* Require Kc + T + C + S */
int main(int argc, char *argv[])
{
struct xkb_context *context;
- struct xkb_desc *xkb;
+ struct xkb_keymap *xkb;
struct xkb_rule_names rmlvo;
/* Require rmlvo */
}
static void
-test_update_key(struct xkb_desc *xkb)
+test_update_key(struct xkb_keymap *xkb)
{
struct xkb_state *state = xkb_state_new(xkb);
xkb_keysym_t *syms;
}
static void
-test_serialisation(struct xkb_desc *xkb)
+test_serialisation(struct xkb_keymap *xkb)
{
struct xkb_state *state = xkb_state_new(xkb);
xkb_mod_mask_t base_mods;
main(int argc, char *argv[])
{
struct xkb_context *context;
- struct xkb_desc *xkb;
+ struct xkb_keymap *xkb;
struct xkb_rule_names rmlvo;
rmlvo.rules = "evdev";