From 66aafd71e17dbaeb0ba7fa4bf72f17e57d9022e5 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Tue, 25 Nov 2003 19:28:02 +0000 Subject: XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks --- XKBgeom.h | 100 +---------------------- XKBsrv.h | 266 +------------------------------------------------------------- 2 files changed, 2 insertions(+), 364 deletions(-) diff --git a/XKBgeom.h b/XKBgeom.h index aff8917..f8f7e31 100644 --- a/XKBgeom.h +++ b/XKBgeom.h @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.9 2002/09/18 17:11:40 tsi Exp $ */ +/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.10 2003/11/17 22:20:02 dawes Exp $ */ #ifndef _XKBGEOM_H_ #define _XKBGEOM_H_ @@ -319,437 +319,339 @@ _XFUNCPROTOBEGIN extern XkbPropertyPtr XkbAddGeomProperty( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, char * /* name */, char * /* value */ -#endif ); extern XkbKeyAliasPtr XkbAddGeomKeyAlias( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, char * /* alias */, char * /* real */ -#endif ); extern XkbColorPtr XkbAddGeomColor( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, char * /* spec */, unsigned int /* pixel */ -#endif ); extern XkbOutlinePtr XkbAddGeomOutline( -#if NeedFunctionPrototypes XkbShapePtr /* shape */, int /* sz_points */ -#endif ); extern XkbShapePtr XkbAddGeomShape( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, Atom /* name */, int /* sz_outlines */ -#endif ); extern XkbKeyPtr XkbAddGeomKey( -#if NeedFunctionPrototypes XkbRowPtr /* row */ -#endif ); extern XkbRowPtr XkbAddGeomRow( -#if NeedFunctionPrototypes XkbSectionPtr /* section */, int /* sz_keys */ -#endif ); extern XkbSectionPtr XkbAddGeomSection( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, Atom /* name */, int /* sz_rows */, int /* sz_doodads */, int /* sz_overlays */ -#endif ); extern XkbOverlayPtr XkbAddGeomOverlay( -#if NeedFunctionPrototypes XkbSectionPtr /* section */, Atom /* name */, int /* sz_rows */ -#endif ); extern XkbOverlayRowPtr XkbAddGeomOverlayRow( -#if NeedFunctionPrototypes XkbOverlayPtr /* overlay */, int /* row_under */, int /* sz_keys */ -#endif ); extern XkbOverlayKeyPtr XkbAddGeomOverlayKey( -#if NeedFunctionPrototypes XkbOverlayPtr /* overlay */, XkbOverlayRowPtr /* row */, char * /* over */, char * /* under */ -#endif ); extern XkbDoodadPtr XkbAddGeomDoodad( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, XkbSectionPtr /* section */, Atom /* name */ -#endif ); extern void XkbFreeGeomKeyAliases( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomColors( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomDoodads( -#if NeedFunctionPrototypes XkbDoodadPtr /* doodads */, int /* nDoodads */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomProperties( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomOverlayKeys( -#if NeedFunctionPrototypes XkbOverlayRowPtr /* row */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomOverlayRows( -#if NeedFunctionPrototypes XkbOverlayPtr /* overlay */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomOverlays( -#if NeedFunctionPrototypes XkbSectionPtr /* section */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomKeys( -#if NeedFunctionPrototypes XkbRowPtr /* row */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomRows( -#if NeedFunctionPrototypes XkbSectionPtr /* section */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomSections( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomPoints( -#if NeedFunctionPrototypes XkbOutlinePtr /* outline */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomOutlines( -#if NeedFunctionPrototypes XkbShapePtr /* shape */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeomShapes( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, int /* first */, int /* count */, Bool /* freeAll */ -#endif ); extern void XkbFreeGeometry( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, unsigned int /* which */, Bool /* freeMap */ -#endif ); extern Status XkbAllocGeomProps( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, int /* nProps */ -#endif ); extern Status XkbAllocGeomKeyAliases( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, int /* nAliases */ -#endif ); extern Status XkbAllocGeomColors( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, int /* nColors */ -#endif ); extern Status XkbAllocGeomShapes( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, int /* nShapes */ -#endif ); extern Status XkbAllocGeomSections( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, int /* nSections */ -#endif ); extern Status XkbAllocGeomOverlays( -#if NeedFunctionPrototypes XkbSectionPtr /* section */, int /* num_needed */ -#endif ); extern Status XkbAllocGeomOverlayRows( -#if NeedFunctionPrototypes XkbOverlayPtr /* overlay */, int /* num_needed */ -#endif ); extern Status XkbAllocGeomOverlayKeys( -#if NeedFunctionPrototypes XkbOverlayRowPtr /* row */, int /* num_needed */ -#endif ); extern Status XkbAllocGeomDoodads( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, int /* nDoodads */ -#endif ); extern Status XkbAllocGeomSectionDoodads( -#if NeedFunctionPrototypes XkbSectionPtr /* section */, int /* nDoodads */ -#endif ); extern Status XkbAllocGeomOutlines( -#if NeedFunctionPrototypes XkbShapePtr /* shape */, int /* nOL */ -#endif ); extern Status XkbAllocGeomRows( -#if NeedFunctionPrototypes XkbSectionPtr /* section */, int /* nRows */ -#endif ); extern Status XkbAllocGeomPoints( -#if NeedFunctionPrototypes XkbOutlinePtr /* ol */, int /* nPts */ -#endif ); extern Status XkbAllocGeomKeys( -#if NeedFunctionPrototypes XkbRowPtr /* row */, int /* nKeys */ -#endif ); extern Status XkbAllocGeometry( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, XkbGeometrySizesPtr /* sizes */ -#endif ); extern Status XkbSetGeometry( -#if NeedFunctionPrototypes Display * /* dpy */, unsigned /* deviceSpec */, XkbGeometryPtr /* geom */ -#endif ); extern Bool XkbComputeShapeTop( -#if NeedFunctionPrototypes XkbShapePtr /* shape */, XkbBoundsPtr /* bounds */ -#endif ); extern Bool XkbComputeShapeBounds( -#if NeedFunctionPrototypes XkbShapePtr /* shape */ -#endif ); extern Bool XkbComputeRowBounds( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, XkbSectionPtr /* section */, XkbRowPtr /* row */ -#endif ); extern Bool XkbComputeSectionBounds( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, XkbSectionPtr /* section */ -#endif ); extern char * XkbFindOverlayForKey( -#if NeedFunctionPrototypes XkbGeometryPtr /* geom */, XkbSectionPtr /* wanted */, char * /* under */ -#endif ); extern Status XkbGetGeometry( -#if NeedFunctionPrototypes Display * /* dpy */, XkbDescPtr /* xkb */ -#endif ); extern Status XkbGetNamedGeometry( -#if NeedFunctionPrototypes Display * /* dpy */, XkbDescPtr /* xkb */, Atom /* name */ -#endif ); _XFUNCPROTOEND diff --git a/XKBsrv.h b/XKBsrv.h index fe05df3..bfbc7bc 100644 --- a/XKBsrv.h +++ b/XKBsrv.h @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.22 2002/11/20 04:49:01 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.23 2003/11/17 22:20:02 dawes Exp $ */ #ifndef _XKBSRV_H_ #define _XKBSRV_H_ @@ -314,475 +314,360 @@ extern int DeviceButtonPress,DeviceButtonRelease; _XFUNCPROTOBEGIN extern void XkbUseMsg( -#if NeedFunctionPrototypes void -#endif ); extern int XkbProcessArguments( -#if NeedFunctionPrototypes int /* argc */, char ** /* argv */, int /* i */ -#endif ); extern void XkbFreeCompatMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ -#endif ); extern void XkbFreeNames( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ -#endif ); extern DeviceIntPtr _XkbLookupAnyDevice( -#if NeedFunctionPrototypes int /* id */, int * /* why_rtrn */ -#endif ); extern DeviceIntPtr _XkbLookupKeyboard( -#if NeedFunctionPrototypes int /* id */, int * /* why_rtrn */ -#endif ); extern DeviceIntPtr _XkbLookupBellDevice( -#if NeedFunctionPrototypes int /* id */, int * /* why_rtrn */ -#endif ); extern DeviceIntPtr _XkbLookupLedDevice( -#if NeedFunctionPrototypes int /* id */, int * /* why_rtrn */ -#endif ); extern DeviceIntPtr _XkbLookupButtonDevice( -#if NeedFunctionPrototypes int /* id */, int * /* why_rtrn */ -#endif ); extern XkbDescPtr XkbAllocKeyboard( -#if NeedFunctionPrototypes void -#endif ); extern Status XkbAllocClientMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nTypes */ -#endif ); extern Status XkbAllocServerMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nNewActions */ -#endif ); extern void XkbFreeClientMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* what */, Bool /* freeMap */ -#endif ); extern void XkbFreeServerMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* what */, Bool /* freeMap */ -#endif ); extern Status XkbAllocIndicatorMaps( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */ -#endif ); extern Status XkbAllocCompatMap( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, unsigned int /* nInterpret */ -#endif ); extern Status XkbAllocNames( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, int /* nTotalRG */, int /* nTotalAliases */ -#endif ); extern Status XkbAllocControls( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which*/ -#endif ); extern Status XkbCopyKeyType( -#if NeedFunctionPrototypes XkbKeyTypePtr /* from */, XkbKeyTypePtr /* into */ -#endif ); extern Status XkbCopyKeyTypes( -#if NeedFunctionPrototypes XkbKeyTypePtr /* from */, XkbKeyTypePtr /* into */, int /* num_types */ -#endif ); extern Status XkbResizeKeyType( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, int /* type_ndx */, int /* map_count */, Bool /* want_preserve */, int /* new_num_lvls */ -#endif ); extern void XkbFreeKeyboard( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeDesc */ -#endif ); extern void XkbSetActionKeyMods( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, XkbAction * /* act */, unsigned int /* mods */ -#endif ); extern Bool XkbCheckActionVMods( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, XkbAction * /* act */, unsigned int /* changed */ -#endif ); extern Bool XkbApplyVModChanges( -#if NeedFunctionPrototypes XkbSrvInfoPtr /* xkbi */, unsigned int /* changed */, XkbChangesPtr /* pChanges */, unsigned int * /* needChecksRtrn */, XkbEventCausePtr /* cause */ -#endif ); extern void XkbApplyVModChangesToAllDevices( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, XkbDescPtr /* xkb */, unsigned int /* changed */, XkbEventCausePtr /* cause */ -#endif ); extern unsigned int XkbMaskForVMask( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* vmask */ -#endif ); extern Bool XkbVirtualModsToReal( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* virtua_mask */, unsigned int * /* mask_rtrn */ -#endif ); extern unsigned int XkbAdjustGroup( -#if NeedFunctionPrototypes int /* group */, XkbControlsPtr /* ctrls */ -#endif ); extern KeySym *XkbResizeKeySyms( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, int /* key */, int /* needed */ -#endif ); extern XkbAction *XkbResizeKeyActions( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, int /* key */, int /* needed */ -#endif ); extern void XkbUpdateKeyTypesFromCore( -#if NeedFunctionPrototypes DeviceIntPtr /* pXDev */, KeyCode /* first */, CARD8 /* num */, XkbChangesPtr /* pChanges */ -#endif ); extern void XkbUpdateDescActions( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, KeyCode /* first */, CARD8 /* num */, XkbChangesPtr /* changes */ -#endif ); extern void XkbUpdateActions( -#if NeedFunctionPrototypes DeviceIntPtr /* pXDev */, KeyCode /* first */, CARD8 /* num */, XkbChangesPtr /* pChanges */, unsigned int * /* needChecksRtrn */, XkbEventCausePtr /* cause */ -#endif ); extern void XkbUpdateCoreDescription( -#if NeedFunctionPrototypes DeviceIntPtr /* keybd */, Bool /* resize */ -#endif ); extern void XkbApplyMappingChange( -#if NeedFunctionPrototypes DeviceIntPtr /* pXDev */, CARD8 /* request */, KeyCode /* firstKey */, CARD8 /* num */, ClientPtr /* client */ -#endif ); extern void XkbSetIndicators( -#if NeedFunctionPrototypes DeviceIntPtr /* pXDev */, CARD32 /* affect */, CARD32 /* values */, XkbEventCausePtr /* cause */ -#endif ); extern void XkbUpdateIndicators( -#if NeedFunctionPrototypes DeviceIntPtr /* keybd */, CARD32 /* changed */, Bool /* check_edevs */, XkbChangesPtr /* pChanges */, XkbEventCausePtr /* cause */ -#endif ); extern XkbSrvLedInfoPtr XkbAllocSrvLedInfo( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, KbdFeedbackPtr /* kf */, LedFeedbackPtr /* lf */, unsigned int /* needed_parts */ -#endif ); extern XkbSrvLedInfoPtr XkbFindSrvLedInfo( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, unsigned int /* class */, unsigned int /* id */, unsigned int /* needed_parts */ -#endif ); extern void XkbApplyLedNameChanges( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* sli */, unsigned int /* changed_names */, xkbExtensionDeviceNotify * /* ed */, XkbChangesPtr /* changes */, XkbEventCausePtr /* cause */ -#endif ); extern void XkbApplyLedMapChanges( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* sli */, unsigned int /* changed_maps */, xkbExtensionDeviceNotify * /* ed */, XkbChangesPtr /* changes */, XkbEventCausePtr /* cause */ -#endif ); extern void XkbApplyLedStateChanges( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* sli */, unsigned int /* changed_leds */, xkbExtensionDeviceNotify * /* ed */, XkbChangesPtr /* changes */, XkbEventCausePtr /* cause */ -#endif ); extern void XkbUpdateLedAutoState( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* sli */, unsigned int /* maps_to_check */, xkbExtensionDeviceNotify * /* ed */, XkbChangesPtr /* changes */, XkbEventCausePtr /* cause */ -#endif ); extern void XkbFlushLedEvents( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, DeviceIntPtr /* kbd */, XkbSrvLedInfoPtr /* sli */, xkbExtensionDeviceNotify * /* ed */, XkbChangesPtr /* changes */, XkbEventCausePtr /* cause */ -#endif ); extern void XkbUpdateAllDeviceIndicators( -#if NeedFunctionPrototypes XkbChangesPtr /* changes */, XkbEventCausePtr /* cause */ -#endif ); extern unsigned int XkbIndicatorsToUpdate( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, unsigned long /* state_changes */, Bool /* enabled_ctrl_changes */ -#endif ); extern void XkbComputeDerivedState( -#if NeedFunctionPrototypes XkbSrvInfoPtr /* xkbi */ -#endif ); extern void XkbCheckSecondaryEffects( -#if NeedFunctionPrototypes XkbSrvInfoPtr /* xkbi */, unsigned int /* which */, XkbChangesPtr /* changes */, XkbEventCausePtr /* cause */ -#endif ); extern void XkbCheckIndicatorMaps( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* sli */, unsigned int /* which */ -#endif ); extern unsigned int XkbStateChangedFlags( -#if NeedFunctionPrototypes XkbStatePtr /* old */, XkbStatePtr /* new */ -#endif ); extern void XkbSendStateNotify( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, xkbStateNotify * /* pSN */ -#endif ); extern void XkbSendMapNotify( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, xkbMapNotify * /* ev */ -#endif ); extern int XkbComputeControlsNotify( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, XkbControlsPtr /* old */, XkbControlsPtr /* new */, xkbControlsNotify * /* pCN */, Bool /* forceCtrlProc */ -#endif ); extern void XkbSendControlsNotify( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, xkbControlsNotify * /* ev */ -#endif ); extern void XkbSendCompatMapNotify( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, xkbCompatMapNotify * /* ev */ -#endif ); extern void XkbSendIndicatorNotify( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, int /* xkbType */, xkbIndicatorNotify * /* ev */ -#endif ); extern void XkbHandleBell( -#if NeedFunctionPrototypes BOOL /* force */, BOOL /* eventOnly */, DeviceIntPtr /* kbd */, @@ -792,513 +677,382 @@ extern void XkbHandleBell( Atom /* name */, WindowPtr /* pWin */, ClientPtr /* pClient */ -#endif ); extern void XkbSendAccessXNotify( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, xkbAccessXNotify * /* pEv */ -#endif ); extern void XkbSendNamesNotify( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, xkbNamesNotify * /* ev */ -#endif ); extern void XkbSendCompatNotify( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, xkbCompatMapNotify * /* ev */ -#endif ); extern void XkbSendActionMessage( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, xkbActionMessage * /* ev */ -#endif ); extern void XkbSendExtensionDeviceNotify( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, ClientPtr /* client */, xkbExtensionDeviceNotify * /* ev */ -#endif ); extern void XkbSendNotification( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, XkbChangesPtr /* pChanges */, XkbEventCausePtr /* cause */ -#endif ); extern void XkbProcessKeyboardEvent( -#if NeedFunctionPrototypes struct _xEvent * /* xE */, DeviceIntPtr /* keybd */, int /* count */ -#endif ); extern void XkbProcessOtherEvent( -#if NeedFunctionPrototypes struct _xEvent * /* xE */, DeviceIntPtr /* keybd */, int /* count */ -#endif ); extern void XkbHandleActions( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, DeviceIntPtr /* kbd */, struct _xEvent * /* xE */, int /* count */ -#endif ); extern Bool XkbEnableDisableControls( -#if NeedFunctionPrototypes XkbSrvInfoPtr /* xkbi */, unsigned long /* change */, unsigned long /* newValues */, XkbChangesPtr /* changes */, XkbEventCausePtr /* cause */ -#endif ); extern void AccessXInit( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */ -#endif ); extern Bool AccessXFilterPressEvent( -#if NeedFunctionPrototypes register struct _xEvent * /* xE */, register DeviceIntPtr /* keybd */, int /* count */ -#endif ); extern Bool AccessXFilterReleaseEvent( -#if NeedFunctionPrototypes register struct _xEvent * /* xE */, register DeviceIntPtr /* keybd */, int /* count */ -#endif ); extern void AccessXCancelRepeatKey( -#if NeedFunctionPrototypes XkbSrvInfoPtr /* xkbi */, KeyCode /* key */ -#endif ); extern void AccessXComputeCurveFactor( -#if NeedFunctionPrototypes XkbSrvInfoPtr /* xkbi */, XkbControlsPtr /* ctrls */ -#endif ); extern XkbDeviceLedInfoPtr XkbAddDeviceLedInfo( -#if NeedFunctionPrototypes XkbDeviceInfoPtr /* devi */, unsigned int /* ledClass */, unsigned int /* ledId */ -#endif ); extern XkbDeviceInfoPtr XkbAllocDeviceInfo( -#if NeedFunctionPrototypes unsigned int /* deviceSpec */, unsigned int /* nButtons */, unsigned int /* szLeds */ -#endif ); extern void XkbFreeDeviceInfo( -#if NeedFunctionPrototypes XkbDeviceInfoPtr /* devi */, unsigned int /* which */, Bool /* freeDevI */ -#endif ); extern Status XkbResizeDeviceButtonActions( -#if NeedFunctionPrototypes XkbDeviceInfoPtr /* devi */, unsigned int /* newTotal */ -#endif ); extern XkbInterestPtr XkbFindClientResource( -#if NeedFunctionPrototypes DevicePtr /* inDev */, ClientPtr /* client */ -#endif ); extern XkbInterestPtr XkbAddClientResource( -#if NeedFunctionPrototypes DevicePtr /* inDev */, ClientPtr /* client */, XID /* id */ -#endif ); extern int XkbRemoveClient( -#if NeedFunctionPrototypes DevicePtr /* inDev */, ClientPtr /* client */ -#endif ); extern int XkbRemoveResourceClient( -#if NeedFunctionPrototypes DevicePtr /* inDev */, XID /* id */ -#endif ); extern int XkbDDXInitDevice( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */ -#endif ); extern int XkbDDXAccessXBeep( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, unsigned int /* what */, unsigned int /* which */ -#endif ); extern void XkbDDXKeyClick( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, int /* keycode */, int /* synthetic */ -#endif ); extern int XkbDDXUsesSoftRepeat( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */ -#endif ); extern void XkbDDXKeybdCtrlProc( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, KeybdCtrl * /* ctrl */ -#endif ); extern void XkbDDXChangeControls( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, XkbControlsPtr /* old */, XkbControlsPtr /* new */ -#endif ); extern void XkbDDXUpdateIndicators( -#if NeedFunctionPrototypes DeviceIntPtr /* keybd */, CARD32 /* newState */ -#endif ); extern void XkbDDXUpdateDeviceIndicators( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, XkbSrvLedInfoPtr /* sli */, CARD32 /* newState */ -#endif ); extern void XkbDDXFakePointerButton( -#if NeedFunctionPrototypes int /* event */, int /* button */ -#endif ); extern void XkbDDXFakePointerMotion( -#if NeedFunctionPrototypes unsigned int /* flags */, int /* x */, int /* y */ -#endif ); extern void XkbDDXFakeDeviceButton( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, Bool /* press */, int /* button */ -#endif ); extern int XkbDDXTerminateServer( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, KeyCode /* key */, XkbAction * /* act */ -#endif ); extern int XkbDDXSwitchScreen( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, KeyCode /* key */, XkbAction * /* act */ -#endif ); extern int XkbDDXPrivate( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, KeyCode /* key */, XkbAction * /* act */ -#endif ); extern void XkbDisableComputedAutoRepeats( -#if NeedFunctionPrototypes DeviceIntPtr /* pXDev */, unsigned int /* key */ -#endif ); extern void XkbSetRepeatKeys( -#if NeedFunctionPrototypes DeviceIntPtr /* pXDev */, int /* key */, int /* onoff */ -#endif ); extern int XkbLatchModifiers( -#if NeedFunctionPrototypes DeviceIntPtr /* pXDev */, CARD8 /* mask */, CARD8 /* latches */ -#endif ); extern int XkbLatchGroup( -#if NeedFunctionPrototypes DeviceIntPtr /* pXDev */, int /* group */ -#endif ); extern void XkbClearAllLatchesAndLocks( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, XkbSrvInfoPtr /* xkbi */, Bool /* genEv */, XkbEventCausePtr /* cause */ -#endif ); extern void XkbSetRulesDflts( -#if NeedFunctionPrototypes char * /* rulesFile */, char * /* model */, char * /* layout */, char * /* variant */, char * /* options */ -#endif ); extern void XkbInitDevice( -#if NeedFunctionPrototypes DeviceIntPtr /* pXDev */ -#endif ); extern Bool XkbInitKeyboardDeviceStruct( -#if NeedFunctionPrototypes DeviceIntPtr /* pXDev */, XkbComponentNamesPtr /* pNames */, KeySymsPtr /* pSyms */, CARD8 /* pMods */[], BellProcPtr /* bellProc */, KbdCtrlProcPtr /* ctrlProc */ -#endif ); extern int SProcXkbDispatch( -#if NeedFunctionPrototypes ClientPtr /* client */ -#endif ); extern XkbGeometryPtr XkbLookupNamedGeometry( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, Atom /* name */, Bool * /* shouldFree */ -#endif ); extern char * _XkbDupString( -#if NeedFunctionPrototypes char * /* str */ -#endif ); extern void XkbConvertCase( -#if NeedFunctionPrototypes KeySym /* sym */, KeySym * /* lower */, KeySym * /* upper */ -#endif ); extern Status XkbChangeKeycodeRange( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, int /* minKC */, int /* maxKC */, XkbChangesPtr /* changes */ -#endif ); extern int XkbFinishDeviceInit( -#if NeedFunctionPrototypes DeviceIntPtr /* pXDev */ -#endif ); extern void XkbFreeSrvLedInfo( -#if NeedFunctionPrototypes XkbSrvLedInfoPtr /* sli */ -#endif ); extern void XkbFreeInfo( -#if NeedFunctionPrototypes XkbSrvInfoPtr /* xkbi */ -#endif ); extern Status XkbChangeTypesOfKey( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, int /* key */, int /* nGroups */, unsigned int /* groups */, int * /* newTypesIn */, XkbMapChangesPtr /* changes */ -#endif ); extern XkbKeyTypePtr XkbAddKeyType( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, Atom /* name */, int /* map_count */, Bool /* want_preserve */, int /* num_lvls */ -#endif ); extern Status XkbInitCanonicalKeyTypes( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, int /* keypadVMod */ -#endif ); extern int XkbKeyTypesForCoreSymbols( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, int /* map_width */, KeySym * /* core_syms */, unsigned int /* protected */, int * /* types_inout */, KeySym * /* xkb_syms_rtrn */ -#endif ); extern Bool XkbApplyCompatMapToKey( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, KeyCode /* key */, XkbChangesPtr /* changes */ -#endif ); extern Bool XkbUpdateMapFromCore( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, KeyCode /* first_key */, int /* num_keys */, int /* map_width */, KeySym * /* core_keysyms */, XkbChangesPtr /* changes */ -#endif ); extern void XkbFreeControls( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* which */, Bool /* freeMap */ -#endif ); extern void XkbFreeIndicatorMaps( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */ -#endif ); extern Bool XkbApplyVirtualModChanges( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, unsigned int /* changed */, XkbChangesPtr /* changes */ -#endif ); extern Bool XkbUpdateActionVirtualMods( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, XkbAction * /* act */, unsigned int /* changed */ -#endif ); extern void XkbUpdateKeyTypeVirtualMods( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, XkbKeyTypePtr /* type */, unsigned int /* changed */, XkbChangesPtr /* changes */ -#endif ); extern void XkbSendNewKeyboardNotify( -#if NeedFunctionPrototypes DeviceIntPtr /* kbd */, xkbNewKeyboardNotify * /* pNKN */ -#endif ); #ifdef XKBSRV_NEED_FILE_FUNCS @@ -1329,28 +1083,21 @@ typedef struct _XkbSrvListInfo { char * XkbGetRulesDflts( -#if NeedFunctionPrototypes XkbRF_VarDefsPtr /* defs */ -#endif ); extern void XkbSetRulesUsed( -#if NeedFunctionPrototypes XkbRF_VarDefsPtr /* defs */ -#endif ); extern Status XkbDDXList( -#if NeedFunctionPrototypes DeviceIntPtr /* dev */, XkbSrvListInfoPtr /* listing */, ClientPtr /* client */ -#endif ); extern unsigned int XkbDDXLoadKeymapByNames( -#if NeedFunctionPrototypes DeviceIntPtr /* keybd */, XkbComponentNamesPtr /* names */, unsigned int /* want */, @@ -1358,47 +1105,36 @@ extern unsigned int XkbDDXLoadKeymapByNames( XkbFileInfoPtr /* finfoRtrn */, char * /* keymapNameRtrn */, int /* keymapNameRtrnLen */ -#endif ); extern Bool XkbDDXNamesFromRules( -#if NeedFunctionPrototypes DeviceIntPtr /* keybd */, char * /* rules */, XkbRF_VarDefsPtr /* defs */, XkbComponentNamesPtr /* names */ -#endif ); extern FILE *XkbDDXOpenConfigFile( -#if NeedFunctionPrototypes char * /* mapName */, char * /* fileNameRtrn */, int /* fileNameRtrnLen */ -#endif ); extern Bool XkbDDXApplyConfig( -#if NeedFunctionPrototypes XPointer /* cfg_in */, XkbSrvInfoPtr /* xkbi */ -#endif ); extern XPointer XkbDDXPreloadConfig( -#if NeedFunctionPrototypes char ** /* rulesFileRtrn */, XkbRF_VarDefsPtr /* defs */, XkbComponentNamesPtr /* names */, DeviceIntPtr /* dev */ -#endif ); extern int _XkbStrCaseCmp( -#if NeedFunctionPrototypes char * /* str1 */, char * /* str2 */ -#endif ); #endif /* XKBSRV_NEED_FILE_FUNCS */ -- cgit v1.2.3