summaryrefslogtreecommitdiff
path: root/src/xkb/XKB.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xkb/XKB.c')
-rw-r--r--src/xkb/XKB.c165
1 files changed, 1 insertions, 164 deletions
diff --git a/src/xkb/XKB.c b/src/xkb/XKB.c
index b407bcc..8f81695 100644
--- a/src/xkb/XKB.c
+++ b/src/xkb/XKB.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKB.c,v 1.7 2002/12/10 04:30:39 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKB.c,v 1.10 2003/11/17 22:20:09 dawes Exp $ */
#include <stdio.h>
#define NEED_REPLIES
@@ -37,23 +37,12 @@ XkbInternAtomFunc _XkbInternAtomFunc= XInternAtom;
XkbGetAtomNameFunc _XkbGetAtomNameFunc= XGetAtomName;
Bool
-#if NeedFunctionPrototypes
XkbQueryExtension( Display *dpy,
int * opcodeReturn,
int * eventBaseReturn,
int * errorBaseReturn,
int * majorReturn,
int * minorReturn)
-#else
-XkbQueryExtension(dpy,opcodeReturn,eventBaseReturn,errorBaseReturn,
- majorReturn,minorReturn)
- Display *dpy;
- int *opcodeReturn;
- int *eventBaseReturn;
- int *errorBaseReturn;
- int *majorReturn;
- int *minorReturn;
-#endif
{
if (!XkbUseExtension(dpy,majorReturn,minorReturn))
return False;
@@ -71,13 +60,7 @@ XkbQueryExtension(dpy,opcodeReturn,eventBaseReturn,errorBaseReturn,
}
Bool
-#if NeedFunctionPrototypes
XkbLibraryVersion(int *libMajorRtrn,int *libMinorRtrn)
-#else
-XkbLibraryVersion(libMajorRtrn,libMinorRtrn)
- int *libMajorRtrn;
- int *libMinorRtrn;
-#endif
{
int supported;
@@ -97,18 +80,10 @@ int supported;
}
Bool
-#if NeedFunctionPrototypes
XkbSelectEvents( Display * dpy,
unsigned int deviceSpec,
unsigned int affect,
unsigned int selectAll)
-#else
-XkbSelectEvents(dpy,deviceSpec,affect,selectAll)
- Display *dpy;
- unsigned int deviceSpec;
- unsigned int affect;
- unsigned int selectAll;
-#endif
{
register xkbSelectEventsReq *req;
XkbInfoPtr xkbi;
@@ -155,20 +130,11 @@ XkbSelectEvents(dpy,deviceSpec,affect,selectAll)
}
Bool
-#if NeedFunctionPrototypes
XkbSelectEventDetails( Display * dpy,
unsigned deviceSpec,
unsigned eventType,
unsigned long int affect,
unsigned long int details)
-#else
-XkbSelectEventDetails(dpy,deviceSpec,eventType,affect,details)
- Display *dpy;
- unsigned deviceSpec;
- unsigned eventType;
- unsigned long int affect;
- unsigned long int details;
-#endif
{
register xkbSelectEventsReq *req;
XkbInfoPtr xkbi;
@@ -256,18 +222,10 @@ XkbSelectEventDetails(dpy,deviceSpec,eventType,affect,details)
}
Bool
-#if NeedFunctionPrototypes
XkbLockModifiers( Display * dpy,
unsigned int deviceSpec,
unsigned int affect,
unsigned int values)
-#else
-XkbLockModifiers(dpy,deviceSpec,affect,values)
- Display *dpy;
- unsigned int deviceSpec;
- unsigned int affect;
- unsigned int values;
-#endif
{
register xkbLatchLockStateReq *req;
XkbInfoPtr xkbi;
@@ -295,18 +253,10 @@ XkbLockModifiers(dpy,deviceSpec,affect,values)
}
Bool
-#if NeedFunctionPrototypes
XkbLatchModifiers( Display * dpy,
unsigned int deviceSpec,
unsigned int affect,
unsigned int values)
-#else
-XkbLatchModifiers(dpy,deviceSpec,affect,values)
- Display *dpy;
- unsigned int deviceSpec;
- unsigned int affect;
- unsigned int values;
-#endif
{
register xkbLatchLockStateReq *req;
XkbInfoPtr xkbi;
@@ -336,14 +286,7 @@ XkbLatchModifiers(dpy,deviceSpec,affect,values)
}
Bool
-#if NeedFunctionPrototypes
XkbLockGroup(Display *dpy,unsigned int deviceSpec,unsigned int group)
-#else
-XkbLockGroup(dpy,deviceSpec,group)
- Display *dpy;
- unsigned int deviceSpec;
- unsigned int group;
-#endif
{
register xkbLatchLockStateReq *req;
XkbInfoPtr xkbi;
@@ -371,14 +314,7 @@ XkbLockGroup(dpy,deviceSpec,group)
}
Bool
-#if NeedFunctionPrototypes
XkbLatchGroup(Display *dpy,unsigned int deviceSpec,unsigned int group)
-#else
-XkbLatchGroup(dpy,deviceSpec,group)
- Display *dpy;
- unsigned int deviceSpec;
- unsigned int group;
-#endif
{
register xkbLatchLockStateReq *req;
XkbInfoPtr xkbi;
@@ -408,14 +344,7 @@ XkbLatchGroup(dpy,deviceSpec,group)
}
unsigned
-#if NeedFunctionPrototypes
XkbSetXlibControls(Display *dpy,unsigned affect,unsigned values)
-#else
-XkbSetXlibControls(dpy,affect,values)
- Display * dpy;
- unsigned affect;
- unsigned values;
-#endif
{
if (!dpy->xkb_info)
XkbUseExtension(dpy,NULL,NULL);
@@ -428,12 +357,7 @@ XkbSetXlibControls(dpy,affect,values)
}
unsigned
-#if NeedFunctionPrototypes
XkbGetXlibControls(Display *dpy)
-#else
-XkbGetXlibControls(dpy)
- Display * dpy;
-#endif
{
if (!dpy->xkb_info)
XkbUseExtension(dpy,NULL,NULL);
@@ -443,11 +367,7 @@ XkbGetXlibControls(dpy)
}
unsigned int
-#if NeedFunctionPrototypes
XkbXlibControlsImplemented(void)
-#else
-XkbXlibControlsImplemented()
-#endif
{
#ifdef __sgi
return XkbLC_AllControls;
@@ -457,7 +377,6 @@ XkbXlibControlsImplemented()
}
Bool
-#if NeedFunctionPrototypes
XkbSetDebuggingFlags( Display * dpy,
unsigned int mask,
unsigned int flags,
@@ -466,17 +385,6 @@ XkbSetDebuggingFlags( Display * dpy,
unsigned int ctrls,
unsigned int * rtrn_flags,
unsigned int * rtrn_ctrls)
-#else
-XkbSetDebuggingFlags(dpy,mask,flags,msg,ctrls_mask,ctrls,rtrn_flags,rtrn_ctrls)
- Display * dpy;
- unsigned int mask;
- unsigned int flags;
- char * msg;
- unsigned int ctrls_mask;
- unsigned int ctrls;
- unsigned int * rtrn_flags;
- unsigned int * rtrn_ctrls;
-#endif
{
register xkbSetDebuggingFlagsReq *req;
xkbSetDebuggingFlagsReply rep;
@@ -518,16 +426,9 @@ XkbSetDebuggingFlags(dpy,mask,flags,msg,ctrls_mask,ctrls,rtrn_flags,rtrn_ctrls)
}
Bool
-#if NeedFunctionPrototypes
XkbComputeEffectiveMap( XkbDescPtr xkb,
XkbKeyTypePtr type,
unsigned char * map_rtrn)
-#else
-XkbComputeEffectiveMap(xkb,type,map_rtrn)
- XkbDescPtr xkb;
- XkbKeyTypePtr type;
- unsigned char * map_rtrn;
-#endif
{
register int i;
unsigned tmp;
@@ -571,14 +472,7 @@ XkbKTMapEntryPtr entry = NULL;
}
Status
-#if NeedFunctionPrototypes
XkbGetState(Display *dpy,unsigned deviceSpec,XkbStatePtr rtrn)
-#else
-XkbGetState(dpy,deviceSpec,rtrn)
- Display * dpy;
- unsigned deviceSpec;
- XkbStatePtr rtrn;
-#endif
{
register xkbGetStateReq *req;
xkbGetStateReply rep;
@@ -618,14 +512,7 @@ XkbGetState(dpy,deviceSpec,rtrn)
}
Bool
-#if NeedFunctionPrototypes
XkbSetDetectableAutoRepeat(Display *dpy,Bool detectable,Bool *supported)
-#else
-XkbSetDetectableAutoRepeat(dpy,detectable,supported)
- Display * dpy;
- Bool detectable;
- Bool * supported;
-#endif
{
register xkbPerClientFlagsReq * req;
xkbPerClientFlagsReply rep;
@@ -658,13 +545,7 @@ XkbInfoPtr xkbi;
}
Bool
-#if NeedFunctionPrototypes
XkbGetDetectableAutoRepeat(Display *dpy,Bool *supported)
-#else
-XkbGetDetectableAutoRepeat(dpy,supported)
- Display * dpy;
- Bool * supported;
-#endif
{
register xkbPerClientFlagsReq * req;
xkbPerClientFlagsReply rep;
@@ -695,18 +576,10 @@ XkbInfoPtr xkbi;
}
Bool
-#if NeedFunctionPrototypes
XkbSetAutoResetControls( Display * dpy,
unsigned changes,
unsigned * auto_ctrls,
unsigned * auto_values)
-#else
-XkbSetAutoResetControls(dpy,changes,auto_ctrls,auto_values)
- Display * dpy;
- unsigned changes;
- unsigned * auto_ctrls;
- unsigned * auto_values;
-#endif
{
register xkbPerClientFlagsReq * req;
xkbPerClientFlagsReply rep;
@@ -739,16 +612,9 @@ XkbInfoPtr xkbi;
}
Bool
-#if NeedFunctionPrototypes
XkbGetAutoResetControls( Display * dpy,
unsigned * auto_ctrls,
unsigned * auto_ctrl_values)
-#else
-XkbGetAutoResetControls(dpy,auto_ctrls,auto_ctrl_values)
- Display * dpy;
- unsigned * auto_ctrls;
- unsigned * auto_ctrl_values;
-#endif
{
register xkbPerClientFlagsReq * req;
xkbPerClientFlagsReply rep;
@@ -781,16 +647,9 @@ XkbInfoPtr xkbi;
}
Bool
-#if NeedFunctionPrototypes
XkbSetPerClientControls( Display * dpy,
unsigned change,
unsigned * values)
-#else
-XkbSetPerClientControls(dpy,change,values)
- Display * dpy;
- unsigned change;
- unsigned * values;
-#endif
{
register xkbPerClientFlagsReq * req;
xkbPerClientFlagsReply rep;
@@ -822,14 +681,8 @@ unsigned value_hold = *values;
}
Bool
-#if NeedFunctionPrototypes
XkbGetPerClientControls( Display * dpy,
unsigned * ctrls)
-#else
-XkbGetPerClientControls(dpy,ctrls)
- Display * dpy;
- unsigned * ctrls;
-#endif
{
register xkbPerClientFlagsReq * req;
xkbPerClientFlagsReply rep;
@@ -863,22 +716,12 @@ XkbInfoPtr xkbi;
}
Display *
-#if NeedFunctionPrototypes
XkbOpenDisplay( char * name,
int * ev_rtrn,
int * err_rtrn,
int * major_rtrn,
int * minor_rtrn,
int * reason)
-#else
-XkbOpenDisplay(name,ev_rtrn,err_rtrn,major_rtrn,minor_rtrn,reason)
- char * name;
- int * ev_rtrn;
- int * err_rtrn;
- int * major_rtrn;
- int * minor_rtrn;
- int * reason;
-#endif
{
Display* dpy;
int major_num,minor_num;
@@ -917,13 +760,7 @@ XkbOpenDisplay(name,ev_rtrn,err_rtrn,major_rtrn,minor_rtrn,reason)
}
void
-#if NeedFunctionPrototypes
XkbSetAtomFuncs(XkbInternAtomFunc getAtom,XkbGetAtomNameFunc getName)
-#else
-XkbSetAtomFuncs(getAtom,getName)
- XkbInternAtomFunc getAtom;
- XkbGetAtomNameFunc getName;
-#endif
{
_XkbInternAtomFunc= (getAtom?getAtom:XInternAtom);
_XkbGetAtomNameFunc= (getName?getName:XGetAtomName);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 16:02:25 +0000