StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
libxkbcommon/include/X11/extensions/XKBcommon.h

381 lines
10 KiB
C
Raw Normal View History

Initial implementation of keysym handlers Add the xkbcommon implementations of XKeysymToString and XStringToKeysym. These symbols have the namespace prefix of Xkbc and are declared in X11/XkbCommon.h. The implementation is taken directly from Xlib, but does not include the XKeysymDB parsing and hashing yet (if it ever will). A couple type conversions were needed to keep from using Xlib.h. See original files: libX11/src/KeysymStr.c libX11/src/StrKeysym.c
2009-01-20 08:46:12 -07:00
/*
Copyright 1985, 1987, 1990, 1998 The Open Group
Copyright 2008 Dan Nicholson
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the names of the authors or their
institutions shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the authors.
*/
#ifndef _XKBCOMMON_H_
#define _XKBCOMMON_H_
Add rules file parsing from xkbfile Copy over the Xkb_RF* rules parsing functions from xkbfile's maprules.c. Eventually, this will be tied into xkbcomp's path searching utilities so you don't need to supply a full path to the rules file. Also, it this should eventually incorporate the server's RMLVOSet.
2009-03-29 12:25:44 -06:00
#include <stdio.h>
Initial implementation of keysym handlers Add the xkbcommon implementations of XKeysymToString and XStringToKeysym. These symbols have the namespace prefix of Xkbc and are declared in X11/XkbCommon.h. The implementation is taken directly from Xlib, but does not include the XKeysymDB parsing and hashing yet (if it ever will). A couple type conversions were needed to keep from using Xlib.h. See original files: libX11/src/KeysymStr.c libX11/src/StrKeysym.c
2009-01-20 08:46:12 -07:00
#include <X11/X.h>
Use common XKB headers and add common type XkbcDescRec Switched to the common XKB headers which don't contain Xlib pollution. A new common keyboard description type, XkbcDescRec, has been added. This is the XkbDescRec definitions in xkbstr.h in the xserver since it contains the defined field we'll need.
2009-03-19 18:16:13 -06:00
#include <X11/Xdefs.h>
Use X extern "C" guards around function declarations for public header
2009-03-17 07:19:56 -06:00
#include <X11/Xfuncproto.h>
Copy xkbfile IsUpper/IsLower macros xkbcomp was using Xlib's XConvertCase to check upper/lowercase. That's a lot of code, so hopefully the xkbfile macros using _XkbKSCheckCase are good enough. This also required that <X11/keysym.h> is included to get all the XK_* definitions.
2009-03-28 20:21:18 -06:00
#include <X11/keysym.h>
Use common XKB headers and add common type XkbcDescRec Switched to the common XKB headers which don't contain Xlib pollution. A new common keyboard description type, XkbcDescRec, has been added. This is the XkbDescRec definitions in xkbstr.h in the xserver since it contains the defined field we'll need.
2009-03-19 18:16:13 -06:00
#include <X11/extensions/XKBstrcommon.h>
Add XkbDescRec initializers and destructors Copies the code to initialize and destroy an XkbDescRec from libX11. The original code is in libX11/src/xkb/XKBAlloc.c libX11/src/xkb/XKBGAlloc.c libX11/src/xkb/XKBMAlloc.c
2009-03-19 17:57:01 -06:00
#include <X11/extensions/XKBgeomcommon.h>
Add rules file parsing from xkbfile Copy over the Xkb_RF* rules parsing functions from xkbfile's maprules.c. Eventually, this will be tied into xkbcomp's path searching utilities so you don't need to supply a full path to the rules file. Also, it this should eventually incorporate the server's RMLVOSet.
2009-03-29 12:25:44 -06:00
#include <X11/extensions/XKBrulescommon.h>
Use common XKB headers and add common type XkbcDescRec Switched to the common XKB headers which don't contain Xlib pollution. A new common keyboard description type, XkbcDescRec, has been added. This is the XkbDescRec definitions in xkbstr.h in the xserver since it contains the defined field we'll need.
2009-03-19 18:16:13 -06:00
/* Common keyboard description structure */
typedef struct _XkbcDesc {
unsigned int defined;
unsigned short flags;
unsigned short device_spec;
KeyCode min_key_code;
KeyCode max_key_code;
XkbControlsPtr ctrls;
XkbServerMapPtr server;
XkbClientMapPtr map;
XkbIndicatorPtr indicators;
XkbNamesPtr names;
XkbCompatMapPtr compat;
XkbGeometryPtr geom;
} XkbcDescRec, *XkbcDescPtr;
Initial implementation of keysym handlers Add the xkbcommon implementations of XKeysymToString and XStringToKeysym. These symbols have the namespace prefix of Xkbc and are declared in X11/XkbCommon.h. The implementation is taken directly from Xlib, but does not include the XKeysymDB parsing and hashing yet (if it ever will). A couple type conversions were needed to keep from using Xlib.h. See original files: libX11/src/KeysymStr.c libX11/src/StrKeysym.c
2009-01-20 08:46:12 -07:00
Copy xkbfile IsUpper/IsLower macros xkbcomp was using Xlib's XConvertCase to check upper/lowercase. That's a lot of code, so hopefully the xkbfile macros using _XkbKSCheckCase are good enough. This also required that <X11/keysym.h> is included to get all the XK_* definitions.
2009-03-28 20:21:18 -06:00
#define _XkbcKSLower (1 << 0)
#define _XkbcKSUpper (1 << 1)
#define XkbcKSIsLower(k) (_XkbcKSCheckCase(k) & _XkbcKSLower)
#define XkbcKSIsUpper(k) (_XkbcKSCheckCase(k) & _XkbcKSUpper)
Add xkbcommon macro for XkbKSIsKeypad and XkbKSIsDeadKey(k) IsKeypad is used in symbols, but we'll just grab them both. It might be better to split parts of XKBfile.h out eventually.
2009-03-28 16:51:06 -06:00
#define XkbcKSIsKeypad(k) \
(((k) >= XK_KP_Space) && ((k) <= XK_KP_Equal))
#define XkbcKSIsDeadKey(k) \
(((k) >= XK_dead_grave) && ((k) <= XK_dead_semivoiced_sound))
Use X extern "C" guards around function declarations for public header
2009-03-17 07:19:56 -06:00
_XFUNCPROTOBEGIN
Generate keyboard description from components Finally, we can generate a XkbcDescPtr from a XkbComponentNamesPtr. This involves turning the components into a parsed XKB file and then passing it into the compiler. This first conversion needs more error handling.
2009-03-29 09:55:18 -06:00
extern XkbcDescPtr
XkbcCompileKeymap(XkbComponentNamesPtr ktcsg);
Initial implementation of keysym handlers Add the xkbcommon implementations of XKeysymToString and XStringToKeysym. These symbols have the namespace prefix of Xkbc and are declared in X11/XkbCommon.h. The implementation is taken directly from Xlib, but does not include the XKeysymDB parsing and hashing yet (if it ever will). A couple type conversions were needed to keep from using Xlib.h. See original files: libX11/src/KeysymStr.c libX11/src/StrKeysym.c
2009-01-20 08:46:12 -07:00
extern char *
XkbcKeysymToString(KeySym ks);
extern KeySym
XkbcStringToKeysym(const char *s);
Add XkbDescRec initializers and destructors Copies the code to initialize and destroy an XkbDescRec from libX11. The original code is in libX11/src/xkb/XKBAlloc.c libX11/src/xkb/XKBGAlloc.c libX11/src/xkb/XKBMAlloc.c
2009-03-19 17:57:01 -06:00
extern int
XkbcAllocCompatMap(XkbcDescPtr xkb, unsigned which, unsigned nSI);
extern void
XkbcFreeCompatMap(XkbcDescPtr xkb, unsigned which, Bool freeMap);
extern int
XkbcAllocNames(XkbcDescPtr xkb, unsigned which, int nTotalRG, int nTotalAliases);
extern void
XkbcFreeNames(XkbcDescPtr xkb, unsigned which, Bool freeMap);
extern int
XkbcAllocControls(XkbcDescPtr xkb, unsigned which);
extern void
XkbcFreeControls(XkbcDescPtr xkb, unsigned which, Bool freeMap);
extern int
XkbcAllocIndicatorMaps(XkbcDescPtr xkb);
extern void
XkbcFreeIndicatorMaps(XkbcDescPtr xkb);
extern XkbcDescRec *
XkbcAllocKeyboard(void);
Add XKBlib API to support keytypes Added common variants of XkbComputeEffectiveMap, XkbInitCanonicalKeyTypes and all their needed functions. A couple functions that were in alloc.c moved to malloc.c to mirror the libX11 sources better. Original code in libX11/src/xkb/XKBMalloc.c libX11/src/xkb/XKBMisc.c libX11/src/xkb/XKB.c
2009-03-28 18:55:46 -06:00
extern void
XkbcFreeKeyboard(XkbcDescPtr xkb, unsigned which, Bool freeAll);
Add XkbDescRec initializers and destructors Copies the code to initialize and destroy an XkbDescRec from libX11. The original code is in libX11/src/xkb/XKBAlloc.c libX11/src/xkb/XKBGAlloc.c libX11/src/xkb/XKBMAlloc.c
2009-03-19 17:57:01 -06:00
extern int
XkbcAllocClientMap(XkbcDescPtr xkb, unsigned which, unsigned nTotalTypes);
extern int
XkbcAllocServerMap(XkbcDescPtr xkb, unsigned which, unsigned nNewActions);
Add XKBlib API to support keytypes Added common variants of XkbComputeEffectiveMap, XkbInitCanonicalKeyTypes and all their needed functions. A couple functions that were in alloc.c moved to malloc.c to mirror the libX11 sources better. Original code in libX11/src/xkb/XKBMalloc.c libX11/src/xkb/XKBMisc.c libX11/src/xkb/XKB.c
2009-03-28 18:55:46 -06:00
extern int
XkbcCopyKeyType(XkbKeyTypePtr from, XkbKeyTypePtr into);
extern int
XkbcCopyKeyTypes(XkbKeyTypePtr from, XkbKeyTypePtr into, int num_types);
Add XKBlib resizing functions These were originally in XKBMalloc.c.
2009-03-29 09:11:25 -06:00
extern int
XkbcResizeKeyType(XkbcDescPtr xkb, int type_ndx, int map_count,
Bool want_preserve, int new_num_lvls);
extern KeySym *
XkbcResizeKeySyms(XkbcDescPtr xkb, int key, int needed);
extern int
XkbcChangeKeycodeRange(XkbcDescPtr xkb, int minKC, int maxKC,
XkbChangesPtr changes);
extern XkbAction *
XkbcResizeKeyActions(XkbcDescPtr xkb, int key, int needed);
Add XkbDescRec initializers and destructors Copies the code to initialize and destroy an XkbDescRec from libX11. The original code is in libX11/src/xkb/XKBAlloc.c libX11/src/xkb/XKBGAlloc.c libX11/src/xkb/XKBMAlloc.c
2009-03-19 17:57:01 -06:00
extern void
XkbcFreeClientMap(XkbcDescPtr xkb, unsigned what, Bool freeMap);
extern void
XkbcFreeServerMap(XkbcDescPtr xkb, unsigned what, Bool freeMap);
extern void
XkbcFreeGeomProperties(XkbGeometryPtr geom, int first, int count, Bool freeAll);
extern void
XkbcFreeGeomKeyAliases(XkbGeometryPtr geom, int first, int count, Bool freeAll);
extern void
XkbcFreeGeomColors(XkbGeometryPtr geom, int first, int count, Bool freeAll);
extern void
XkbcFreeGeomPoints(XkbOutlinePtr outline, int first, int count, Bool freeAll);
extern void
XkbcFreeGeomOutlines(XkbShapePtr shape, int first, int count, Bool freeAll);
extern void
XkbcFreeGeomShapes(XkbGeometryPtr geom, int first, int count, Bool freeAll);
extern void
XkbcFreeGeomOverlayKeys(XkbOverlayRowPtr row, int first, int count,
Bool freeAll);
extern void
XkbcFreeGeomOverlayRows(XkbOverlayPtr overlay, int first, int count,
Bool freeAll);
extern void
XkbcFreeGeomOverlays(XkbSectionPtr section, int first, int count, Bool freeAll);
extern void
XkbcFreeGeomKeys(XkbRowPtr row, int first, int count, Bool freeAll);
extern void
XkbcFreeGeomRows(XkbSectionPtr section, int first, int count, Bool freeAll);
extern void
XkbcFreeGeomSections(XkbGeometryPtr geom, int first, int count, Bool freeAll);
extern void
XkbcFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll);
extern void
XkbcFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap);
Expose all the geometry allocation subroutines We need a couple in xkbcomp, but they might also be needed externally, too.
2009-03-28 12:56:35 -06:00
extern int
XkbcAllocGeomProps(XkbGeometryPtr geom, int nProps);
extern int
XkbcAllocGeomColors(XkbGeometryPtr geom, int nColors);
extern int
XkbcAllocGeomKeyAliases(XkbGeometryPtr geom, int nKeyAliases);
extern int
XkbcAllocGeomShapes(XkbGeometryPtr geom, int nShapes);
extern int
XkbcAllocGeomSections(XkbGeometryPtr geom, int nSections);
extern int
XkbcAllocGeomOverlays(XkbSectionPtr section, int nOverlays);
extern int
XkbcAllocGeomOverlayRows(XkbOverlayPtr overlay, int nRows);
extern int
XkbcAllocGeomOverlayKeys(XkbOverlayRowPtr row, int nKeys);
extern int
XkbcAllocGeomDoodads(XkbGeometryPtr geom, int nDoodads);
extern int
XkbcAllocGeomSectionDoodads(XkbSectionPtr section, int nDoodads);
extern int
XkbcAllocGeomOutlines(XkbShapePtr shape, int nOL);
extern int
XkbcAllocGeomRows(XkbSectionPtr section, int nRows);
extern int
XkbcAllocGeomPoints(XkbOutlinePtr ol, int nPts);
extern int
XkbcAllocGeomKeys(XkbRowPtr row, int nKeys);
Add XkbDescRec initializers and destructors Copies the code to initialize and destroy an XkbDescRec from libX11. The original code is in libX11/src/xkb/XKBAlloc.c libX11/src/xkb/XKBGAlloc.c libX11/src/xkb/XKBMAlloc.c
2009-03-19 17:57:01 -06:00
extern int
XkbcAllocGeometry(XkbcDescPtr xkb, XkbGeometrySizesPtr sizes);
Copy XkbAddGeom* functions from XKBlib These are needed by the geometry compiler in xkbcomp.
2009-03-28 13:39:21 -06:00
extern XkbPropertyPtr
XkbcAddGeomProperty(XkbGeometryPtr geom, char *name, char *value);
extern XkbKeyAliasPtr
XkbcAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr);
extern XkbColorPtr
XkbcAddGeomColor(XkbGeometryPtr geom, char *spec, unsigned int pixel);
extern XkbOutlinePtr
XkbcAddGeomOutline(XkbShapePtr shape, int sz_points);
extern XkbShapePtr
XkbcAddGeomShape(XkbGeometryPtr geom, Atom name, int sz_outlines);
extern XkbKeyPtr
XkbcAddGeomKey(XkbRowPtr row);
extern XkbRowPtr
XkbcAddGeomRow(XkbSectionPtr section, int sz_keys);
extern XkbSectionPtr
XkbcAddGeomSection(XkbGeometryPtr geom, Atom name,
int sz_rows, int sz_doodads, int sz_over);
extern XkbDoodadPtr
XkbcAddGeomDoodad(XkbGeometryPtr geom, XkbSectionPtr section, Atom name);
extern XkbOverlayKeyPtr
XkbcAddGeomOverlayKey(XkbOverlayPtr overlay, XkbOverlayRowPtr row,
char *over, char *under);
extern XkbOverlayRowPtr
XkbcAddGeomOverlayRow(XkbOverlayPtr overlay, int row_under, int sz_keys);
extern XkbOverlayPtr
XkbcAddGeomOverlay(XkbSectionPtr section, Atom name, int sz_rows);
Borrow atom implementation from libxkbfile We need an atom implementation not relying on XInternAtom and friends. The original code is in libxkbfile/src/xkbatom.c
2009-03-25 20:00:49 -06:00
extern void
XkbcInitAtoms(void);
extern char *
XkbcAtomGetString(Atom atom);
extern Atom
XkbcInternAtom(char *name, Bool onlyIfExists);
Move *Text APIs into libxkbcommon These seem like they might be generally useful, and more will be needed from xkbfile.
2009-03-28 07:32:08 -06:00
extern char *
Add more *Text functions from xkbfile This should cover all the usage in xkbcomp. The format arguments were dropped except for the special case of XkbModMaskText, which needs to write in XkbCFile format in HandleVModDef. This was just changed to a Bool to avoid the need for the macros in XKBfile.h. The function prefixes have been renamed to be unique from xkbfile.
2009-03-28 15:06:26 -06:00
XkbcAtomText(Atom atm);
Move *Text APIs into libxkbcommon These seem like they might be generally useful, and more will be needed from xkbfile.
2009-03-28 07:32:08 -06:00
Add VMod Text functions from xkbfile
2009-03-28 16:12:30 -06:00
extern char *
XkbcVModIndexText(XkbcDescPtr xkb, unsigned ndx);
extern char *
XkbcVModMaskText(XkbcDescPtr xkb, unsigned modMask, unsigned mask);
Add XkbModIndexText replacement Now, I think we should have all the *Text functions we need.
2009-03-28 16:32:51 -06:00
extern char *
XkbcModIndexText(unsigned ndx);
Move *Text APIs into libxkbcommon These seem like they might be generally useful, and more will be needed from xkbfile.
2009-03-28 07:32:08 -06:00
extern char *
Add more *Text functions from xkbfile This should cover all the usage in xkbcomp. The format arguments were dropped except for the special case of XkbModMaskText, which needs to write in XkbCFile format in HandleVModDef. This was just changed to a Bool to avoid the need for the macros in XKBfile.h. The function prefixes have been renamed to be unique from xkbfile.
2009-03-28 15:06:26 -06:00
XkbcModMaskText(unsigned mask, Bool cFormat);
extern char *
XkbcConfigText(unsigned config);
extern char *
XkbcGeomFPText(int val);
extern char *
XkbcActionTypeText(unsigned type);
extern char *
XkbcKeysymText(KeySym sym);
extern char *
XkbcKeyNameText(char *name);
extern char *
XkbcSIMatchText(unsigned type);
Move *Text APIs into libxkbcommon These seem like they might be generally useful, and more will be needed from xkbfile.
2009-03-28 07:32:08 -06:00
Add geometry Compute API from XKBlib A small needed subset from libX11/src/xkb/XKBGeom.c.
2009-03-28 17:08:46 -06:00
extern Bool
XkbcComputeShapeBounds(XkbShapePtr shape);
extern Bool
XkbcComputeShapeTop(XkbShapePtr shape, XkbBoundsPtr bounds);
extern Bool
XkbcComputeRowBounds(XkbGeometryPtr geom, XkbSectionPtr section, XkbRowPtr row);
extern Bool
XkbcComputeSectionBounds(XkbGeometryPtr geom, XkbSectionPtr section);
Add rules file parsing from xkbfile Copy over the Xkb_RF* rules parsing functions from xkbfile's maprules.c. Eventually, this will be tied into xkbcomp's path searching utilities so you don't need to supply a full path to the rules file. Also, it this should eventually incorporate the server's RMLVOSet.
2009-03-29 12:25:44 -06:00
extern Bool
XkbcRF_GetComponents(XkbRF_RulesPtr rules, XkbRF_VarDefsPtr defs,
XkbComponentNamesPtr names);
extern XkbRF_RulePtr
XkbcRF_AddRule(XkbRF_RulesPtr rules);
extern XkbRF_GroupPtr
XkbcRF_AddGroup(XkbRF_RulesPtr rules);
extern Bool
XkbcRF_LoadRules(FILE *file, XkbRF_RulesPtr rules);
extern Bool
XkbcRF_LoadRulesByName(char *base, char *locale, XkbRF_RulesPtr rules);
extern XkbRF_VarDescPtr
XkbcRF_AddVarDesc(XkbRF_DescribeVarsPtr vars);
extern XkbRF_VarDescPtr
XkbcRF_AddVarDescCopy(XkbRF_DescribeVarsPtr vars, XkbRF_VarDescPtr from);
extern XkbRF_DescribeVarsPtr
XkbcRF_AddVarToDescribe(XkbRF_RulesPtr rules, char *name);
extern Bool
XkbcRF_LoadDescriptions(FILE *file, XkbRF_RulesPtr rules);
extern Bool
XkbcRF_LoadDescriptionsByName(char *base, char *locale, XkbRF_RulesPtr rules);
extern XkbRF_RulesPtr
XkbcRF_Load(char *base, char *locale, Bool wantDesc, Bool wantRules);
extern XkbRF_RulesPtr
XkbcRF_Create(int szRules, int szExtra);
extern void
XkbcRF_Free(XkbRF_RulesPtr rules, Bool freeRules);
Add XKBlib API to support keytypes Added common variants of XkbComputeEffectiveMap, XkbInitCanonicalKeyTypes and all their needed functions. A couple functions that were in alloc.c moved to malloc.c to mirror the libX11 sources better. Original code in libX11/src/xkb/XKBMalloc.c libX11/src/xkb/XKBMisc.c libX11/src/xkb/XKB.c
2009-03-28 18:55:46 -06:00
extern int
XkbcInitCanonicalKeyTypes(XkbcDescPtr xkb, unsigned which, int keypadVMod);
extern Bool
XkbcVirtualModsToReal(XkbcDescPtr xkb, unsigned virtual_mask,
unsigned *mask_rtrn);
extern Bool
XkbcComputeEffectiveMap(XkbcDescPtr xkb, XkbKeyTypePtr type,
unsigned char *map_rtrn);
Copy XkbEnsureSafeMapName from xkbfile
2009-03-28 20:00:13 -06:00
extern void
XkbcEnsureSafeMapName(char *name);
Copy xkbfile IsUpper/IsLower macros xkbcomp was using Xlib's XConvertCase to check upper/lowercase. That's a lot of code, so hopefully the xkbfile macros using _XkbKSCheckCase are good enough. This also required that <X11/keysym.h> is included to get all the XK_* definitions.
2009-03-28 20:21:18 -06:00
extern unsigned
_XkbcKSCheckCase(KeySym sym);
Use X extern "C" guards around function declarations for public header
2009-03-17 07:19:56 -06:00
_XFUNCPROTOEND
Initial implementation of keysym handlers Add the xkbcommon implementations of XKeysymToString and XStringToKeysym. These symbols have the namespace prefix of Xkbc and are declared in X11/XkbCommon.h. The implementation is taken directly from Xlib, but does not include the XKeysymDB parsing and hashing yet (if it ever will). A couple type conversions were needed to keep from using Xlib.h. See original files: libX11/src/KeysymStr.c libX11/src/StrKeysym.c
2009-01-20 08:46:12 -07:00
#endif /* _XKBCOMMON_H_ */