diff options
Diffstat (limited to 'nx-X11/include')
| -rw-r--r-- | nx-X11/include/Imakefile | 3 | ||||
| -rw-r--r-- | nx-X11/include/XWDFile.h | 113 | ||||
| -rw-r--r-- | nx-X11/include/Xalloca.h | 139 | ||||
| -rw-r--r-- | nx-X11/include/extensions/Imakefile | 4 | ||||
| -rw-r--r-- | nx-X11/include/extensions/XKBfile.h | 492 | ||||
| -rw-r--r-- | nx-X11/include/extensions/XKBrules.h | 199 | ||||
| -rw-r--r-- | nx-X11/include/extensions/XKBsrv.h | 90 | ||||
| -rw-r--r-- | nx-X11/include/extensions/scrnsaver.h | 131 |
8 files changed, 2 insertions, 1169 deletions
diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile index 4ef28f913..89a5833b1 100644 --- a/nx-X11/include/Imakefile +++ b/nx-X11/include/Imakefile @@ -23,8 +23,6 @@ HEADERS = \ Sunkeysym.h \ X.h \ XF86keysym.h \ - XWDFile.h \ - Xalloca.h \ Xarch.h \ Xatom.h \ Xdefs.h \ @@ -59,7 +57,6 @@ MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) InstallDriverSDKNonExecFile(X.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xalloca.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(Xarch.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(Xdefs.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(Xdefs.h,$(DRIVERSDKINCLUDEDIR)/X11) diff --git a/nx-X11/include/XWDFile.h b/nx-X11/include/XWDFile.h deleted file mode 100644 index b5c2349c5..000000000 --- a/nx-X11/include/XWDFile.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - -Copyright 1985, 1986, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -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 -OPEN GROUP 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 name of The Open Group 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 Open Group. - -*/ - -/* - * XWDFile.h MIT Project Athena, X Window system window raster - * image dumper, dump file format header file. - * - * Author: Tony Della Fera, DEC - * 27-Jun-85 - * - * Modifier: William F. Wyatt, SAO - * 18-Nov-86 - version 6 for saving/restoring color maps - */ - -#ifndef XWDFILE_H -#define XWDFILE_H - -#include <nx-X11/Xmd.h> - -#define XWD_FILE_VERSION 7 -#define sz_XWDheader 100 -#define sz_XWDColor 12 - -typedef CARD32 xwdval; /* for old broken programs */ - -/* Values in the file are most significant byte first. */ - -typedef struct _xwd_file_header { - /* header_size = SIZEOF(XWDheader) + length of null-terminated - * window name. */ - CARD32 header_size B32; - - CARD32 file_version B32; /* = XWD_FILE_VERSION above */ - CARD32 pixmap_format B32; /* ZPixmap or XYPixmap */ - CARD32 pixmap_depth B32; /* Pixmap depth */ - CARD32 pixmap_width B32; /* Pixmap width */ - CARD32 pixmap_height B32; /* Pixmap height */ - CARD32 xoffset B32; /* Bitmap x offset, normally 0 */ - CARD32 byte_order B32; /* of image data: MSBFirst, LSBFirst */ - - /* bitmap_unit applies to bitmaps (depth 1 format XY) only. - * It is the number of bits that each scanline is padded to. */ - CARD32 bitmap_unit B32; - - CARD32 bitmap_bit_order B32; /* bitmaps only: MSBFirst, LSBFirst */ - - /* bitmap_pad applies to pixmaps (non-bitmaps) only. - * It is the number of bits that each scanline is padded to. */ - CARD32 bitmap_pad B32; - - CARD32 bits_per_pixel B32; /* Bits per pixel */ - - /* bytes_per_line is pixmap_width padded to bitmap_unit (bitmaps) - * or bitmap_pad (pixmaps). It is the delta (in bytes) to get - * to the same x position on an adjacent row. */ - CARD32 bytes_per_line B32; - CARD32 visual_class B32; /* Class of colormap */ - CARD32 red_mask B32; /* Z red mask */ - CARD32 green_mask B32; /* Z green mask */ - CARD32 blue_mask B32; /* Z blue mask */ - CARD32 bits_per_rgb B32; /* Log2 of distinct color values */ - CARD32 colormap_entries B32; /* Number of entries in colormap; not used? */ - CARD32 ncolors B32; /* Number of XWDColor structures */ - CARD32 window_width B32; /* Window width */ - CARD32 window_height B32; /* Window height */ - CARD32 window_x B32; /* Window upper left X coordinate */ - CARD32 window_y B32; /* Window upper left Y coordinate */ - CARD32 window_bdrwidth B32; /* Window border width */ -} XWDFileHeader; - -/* Null-terminated window name follows the above structure. */ - -/* Next comes XWDColor structures, at offset XWDFileHeader.header_size in - * the file. XWDFileHeader.ncolors tells how many XWDColor structures - * there are. - */ - -typedef struct { - CARD32 pixel B32; - CARD16 red B16; - CARD16 green B16; - CARD16 blue B16; - CARD8 flags; - CARD8 pad; -} XWDColor; - -/* Last comes the image data in the format described by XWDFileHeader. */ - -#endif /* XWDFILE_H */ - diff --git a/nx-X11/include/Xalloca.h b/nx-X11/include/Xalloca.h deleted file mode 100644 index ef1bf7b96..000000000 --- a/nx-X11/include/Xalloca.h +++ /dev/null @@ -1,139 +0,0 @@ - -/* - -Copyright 1995, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -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 OPEN GROUP 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 name of The Open Group 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 Open Group. - -*/ - -/* - * The purpose of this header is to define the macros ALLOCATE_LOCAL and - * DEALLOCATE_LOCAL appropriately for the platform being compiled on. - * These macros are used to make fast, function-local memory allocations. - * Their characteristics are as follows: - * - * void *ALLOCATE_LOCAL(int size) - * Returns a pointer to size bytes of memory, or NULL if the allocation - * failed. The memory must be freed with DEALLOCATE_LOCAL before the - * function that made the allocation returns. You should not ask for - * large blocks of memory with this function, since on many platforms - * the memory comes from the stack, which may have limited size. - * - * void DEALLOCATE_LOCAL(void *) - * Frees the memory allocated by ALLOCATE_LOCAL. Omission of this - * step may be harmless on some platforms, but will result in - * memory leaks or worse on others. - * - * Before including this file, you should define two macros, - * ALLOCATE_LOCAL_FALLBACK and DEALLOCATE_LOCAL_FALLBACK, that have the - * same characteristics as ALLOCATE_LOCAL and DEALLOCATE_LOCAL. The - * header uses the fallbacks if it doesn't know a "better" way to define - * ALLOCATE_LOCAL and DEALLOCATE_LOCAL. Typical usage would be: - * - * #define ALLOCATE_LOCAL_FALLBACK(_size) malloc(_size) - * #define DEALLOCATE_LOCAL_FALLBACK(_ptr) free(_ptr) - * #include "Xalloca.h" - */ - -#ifndef XALLOCA_H -#define XALLOCA_H 1 - -#ifndef INCLUDE_ALLOCA_H -# if defined(__SUNPRO_C) /* Need to add more here to match Imake *.cf's */ -# define INCLUDE_ALLOCA_H -# endif -#endif - -#ifdef INCLUDE_ALLOCA_H -# include <alloca.h> -#endif - -#ifndef NO_ALLOCA -/* - * os-dependent definition of local allocation and deallocation - * If you want something other than (DE)ALLOCATE_LOCAL_FALLBACK - * for ALLOCATE/DEALLOCATE_LOCAL then you add that in here. - */ -# if defined(__HIGHC__) -# ifndef NCR - extern char *alloca(); -# if HCVERSION < 21003 -# define ALLOCATE_LOCAL(size) alloca((int)(size)) - pragma on(alloca); -# else /* HCVERSION >= 21003 */ -# define ALLOCATE_LOCAL(size) _Alloca((int)(size)) -# endif /* HCVERSION < 21003 */ -# else /* NCR */ -# define ALLOCATE_LOCAL(size) alloca(size) -# endif -# endif /* defined(__HIGHC__) */ - - -# ifdef __GNUC__ -# ifndef alloca -# define alloca __builtin_alloca -# endif /* !alloca */ -# define ALLOCATE_LOCAL(size) alloca((int)(size)) -# else /* ! __GNUC__ */ - -/* - * warning: old mips alloca (pre 2.10) is unusable, new one is built in - * Test is easy, the new one is named __builtin_alloca and comes - * from alloca.h which #defines alloca. - */ -# ifndef NCR -# if defined(vax) || defined(sun) || defined(apollo) || defined(stellar) || defined(alloca) -/* - * Some System V boxes extract alloca.o from /lib/libPW.a; if you - * decide that you don't want to use alloca, you might want to fix it here. - */ -/* alloca might be a macro taking one arg (hi, Sun!), so give it one. */ -# define __Xnullarg /* as nothing */ -# ifndef X_NOT_STDC_ENV - extern void *alloca(__Xnullarg); -# else - extern char *alloca(__Xnullarg); -# endif -# define ALLOCATE_LOCAL(size) alloca((int)(size)) -# endif /* who does alloca */ -# endif /* NCR */ -# endif /* __GNUC__ */ - -#endif /* NO_ALLOCA */ - -#if !defined(ALLOCATE_LOCAL) -# if defined(ALLOCATE_LOCAL_FALLBACK) && defined(DEALLOCATE_LOCAL_FALLBACK) -# define ALLOCATE_LOCAL(_size) ALLOCATE_LOCAL_FALLBACK(_size) -# define DEALLOCATE_LOCAL(_ptr) DEALLOCATE_LOCAL_FALLBACK(_ptr) -# else /* no fallbacks supplied; error */ -# define ALLOCATE_LOCAL(_size) ALLOCATE_LOCAL_FALLBACK undefined! -# define DEALLOCATE_LOCAL(_ptr) DEALLOCATE_LOCAL_FALLBACK undefined! -# endif /* defined(ALLOCATE_LOCAL_FALLBACK && DEALLOCATE_LOCAL_FALLBACK) */ -#else -# if !defined(DEALLOCATE_LOCAL) -# define DEALLOCATE_LOCAL(_ptr) do {} while(0) -# endif -#endif /* defined(ALLOCATE_LOCAL) */ - -#endif /* XALLOCA_H */ diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 29f3b97fa..277ca634f 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -1,7 +1,7 @@ NULL = #if BuildScreenSaverExt -SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h +SCREENSAVERHEADERS = saver.h saverproto.h #endif #if BuildXF86BigfontExt @@ -33,7 +33,7 @@ DAMAGEHEADERS = damagewire.h damageproto.h XRESHEADERS = XResproto.h #endif -XKBFILEHEADERS = XKMformat.h XKM.h XKBconfig.h XKBfile.h XKBrules.h +XKBFILEHEADERS = XKMformat.h XKM.h XKBconfig.h EXTRAHEADERS = \ $(SCREENSAVERHEADERS) \ diff --git a/nx-X11/include/extensions/XKBfile.h b/nx-X11/include/extensions/XKBfile.h deleted file mode 100644 index 045193813..000000000 --- a/nx-X11/include/extensions/XKBfile.h +++ /dev/null @@ -1,492 +0,0 @@ - -#ifndef _XKBFILE_H_ -#define _XKBFILE_H_ 1 - -/************************************************************ - Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. - - Permission to use, copy, modify, and distribute this - software and its documentation for any purpose and without - fee is hereby granted, provided that the above copyright - notice appear in all copies and that both that copyright - notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution - of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability - of this software for any purpose. It is provided "as is" - without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH - THE USE OR PERFORMANCE OF THIS SOFTWARE. - - ********************************************************/ - -/***====================================================================***/ - -#define XkbXKMFile 0 -#define XkbCFile 1 -#define XkbXKBFile 2 -#define XkbMessage 3 - -#define XkbMapDefined (1<<0) -#define XkbStateDefined (1<<1) - -typedef struct _XkbFileInfo { - unsigned type; - unsigned defined; - XkbDescPtr xkb; -} XkbFileInfo,*XkbFileInfoPtr; - -typedef void (*XkbFileAddOnFunc)( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - int /* fileSection */, - void * /* priv */ -); - -/***====================================================================***/ - -#define _XkbSuccess 0 -#define _XkbErrMissingNames 1 -#define _XkbErrMissingTypes 2 -#define _XkbErrMissingReqTypes 3 -#define _XkbErrMissingSymbols 4 -#define _XkbErrMissingVMods 5 -#define _XkbErrMissingIndicators 6 -#define _XkbErrMissingCompatMap 7 -#define _XkbErrMissingSymInterps 8 -#define _XkbErrMissingGeometry 9 -#define _XkbErrIllegalDoodad 10 -#define _XkbErrIllegalTOCType 11 -#define _XkbErrIllegalContents 12 -#define _XkbErrEmptyFile 13 -#define _XkbErrFileNotFound 14 -#define _XkbErrFileCannotOpen 15 -#define _XkbErrBadValue 16 -#define _XkbErrBadMatch 17 -#define _XkbErrBadTypeName 18 -#define _XkbErrBadTypeWidth 19 -#define _XkbErrBadFileType 20 -#define _XkbErrBadFileVersion 21 -#define _XkbErrBadFileFormat 22 -#define _XkbErrBadAlloc 23 -#define _XkbErrBadLength 24 -#define _XkbErrXReqFailure 25 -#define _XkbErrBadImplementation 26 - -extern char * _XkbErrMessages[]; -extern unsigned _XkbErrCode; -extern char * _XkbErrLocation; -extern unsigned _XkbErrData; - -/***====================================================================***/ - -_XFUNCPROTOBEGIN - -extern char * XkbIndentText( - unsigned /* size */ -); - -extern char * XkbAtomText( - Display * /* dpy */, - Atom /* atm */, - unsigned /* format */ -); - -extern char * XkbKeysymText( - KeySym /* sym */, - unsigned /* format */ -); - -extern char * XkbStringText( - char * /* str */, - unsigned /* format */ -); - -extern char * XkbKeyNameText( - char * /* name */, - unsigned /* format */ -); - -extern char * -XkbModIndexText( - unsigned /* ndx */, - unsigned /* format */ -); - -extern char * -XkbModMaskText( - unsigned /* mask */, - unsigned /* format */ -); - -extern char * XkbVModIndexText( - Display * /* dpy */, - XkbDescPtr /* xkb */, - unsigned /* ndx */, - unsigned /* format */ -); - -extern char * XkbVModMaskText( - Display * /* dpy */, - XkbDescPtr /* xkb */, - unsigned /* modMask */, - unsigned /* mask */, - unsigned /* format */ -); - -extern char * XkbConfigText( - unsigned /* config */, - unsigned /* format */ -); - -extern char * XkbSIMatchText( - unsigned /* type */, - unsigned /* format */ -); - -extern char * XkbIMWhichStateMaskText( - unsigned /* use_which */, - unsigned /* format */ -); - -extern char * XkbAccessXDetailText( - unsigned /* state */, - unsigned /* format */ -); - -extern char * XkbNKNDetailMaskText( - unsigned /* detail */, - unsigned /* format */ -); - -extern char * XkbControlsMaskText( - unsigned /* ctrls */, - unsigned /* format */ -); - -extern char * XkbGeomFPText( - int /* val */, - unsigned /* format */ -); - -extern char * XkbDoodadTypeText( - unsigned /* type */, - unsigned /* format */ -); - -extern char * XkbActionTypeText( - unsigned /* type */, - unsigned /* format */ -); - -extern char * XkbActionText( - Display * /* dpy */, - XkbDescPtr /* xkb */, - XkbAction * /* action */, - unsigned /* format */ -); - -extern char * XkbBehaviorText( - XkbDescPtr /* xkb */, - XkbBehavior * /* behavior */, - unsigned /* format */ -); - -/***====================================================================***/ - -#define _XkbKSLower (1<<0) -#define _XkbKSUpper (1<<1) - -#define XkbKSIsLower(k) (_XkbKSCheckCase(k)&_XkbKSLower) -#define XkbKSIsUpper(k) (_XkbKSCheckCase(k)&_XkbKSUpper) -#define XkbKSIsKeypad(k) (((k)>=XK_KP_Space)&&((k)<=XK_KP_Equal)) -#define XkbKSIsDeadKey(k) \ - (((k)>=XK_dead_grave)&&((k)<=XK_dead_semivoiced_sound)) - -extern unsigned _XkbKSCheckCase( - KeySym /* sym */ -); - -extern int XkbFindKeycodeByName( - XkbDescPtr /* xkb */, - char * /* name */, - Bool /* use_aliases */ -); - -extern Bool XkbLookupGroupAndLevel( - XkbDescPtr /* xkb */, - int /* key */, - int * /* mods_inout */, - int * /* grp_inout */, - int * /* lvl_rtrn */ -); - -/***====================================================================***/ - -#ifndef XKB_IN_SERVER - -extern Bool XkbLookupCanonicalRGBColor( - char * /* def */, - XColor * /* color */ -); - -#endif - -/***====================================================================***/ - -extern char * XkbAtomGetString( - Display * /* dpy */, - Atom /* atm */ -); - -extern Atom XkbInternAtom( - Display * /* dpy */, - char * /* name */, - Bool /* onlyIfExists */ -); - -extern Status XkbChangeKbdDisplay( - Display * /* newDpy */, - XkbFileInfo * /* result */ -); - -extern Atom XkbChangeAtomDisplay( - Display * /* oldDpy */, - Display * /* newDpy */, - Atom /* atm */ -); - -extern void XkbInitAtoms( - Display * /* dpy */ -); - -/***====================================================================***/ - -#ifdef _XKBGEOM_H_ - -#define XkbDW_Unknown 0 -#define XkbDW_Doodad 1 -#define XkbDW_Section 2 -typedef struct _XkbDrawable { - int type; - int priority; - union { - XkbDoodadPtr doodad; - XkbSectionPtr section; - } u; - struct _XkbDrawable * next; -} XkbDrawableRec,*XkbDrawablePtr; - -extern XkbDrawablePtr -XkbGetOrderedDrawables( - XkbGeometryPtr /* geom */, - XkbSectionPtr /* section */ -); - -extern void -XkbFreeOrderedDrawables( - XkbDrawablePtr /* draw */ -); - -#endif - -/***====================================================================***/ - -extern unsigned XkbConvertGetByNameComponents( - Bool /* toXkm */, - unsigned /* orig */ -); - -extern unsigned XkbConvertXkbComponents( - Bool /* toXkm */, - unsigned /* orig */ -); - -extern Bool XkbDetermineFileType( - XkbFileInfo * /* xkb */, - int /* format */, - int * /* opts_missing */ -); - -extern Bool XkbNameMatchesPattern( - char * /* name */, - char * /* pattern */ -); - -/***====================================================================***/ - -extern Bool XkbWriteXKBKeycodes( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBKeyTypes( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBCompatMap( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBSymbols( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBGeometry( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBSemantics( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBLayout( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBKeymap( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* topLevel */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteXKBFile( - FILE * /* file */, - XkbFileInfo * /* result */, - Bool /* showImplicit */, - XkbFileAddOnFunc /* addOn */, - void * /* priv */ -); - -extern Bool XkbWriteCFile( - FILE * /* file */, - char * /* name */, - XkbFileInfo * /* info */ -); - -extern Bool XkbWriteXKMFile( - FILE * /* file */, - XkbFileInfo * /* result */ -); - -extern Bool XkbWriteToServer( - XkbFileInfo * /* result */ -); - -extern void XkbEnsureSafeMapName( - char * /* name */ -); - -extern Bool XkbWriteXKBKeymapForNames( - FILE * /* file */, - XkbComponentNamesPtr /* names */, - Display * /* dpy */, - XkbDescPtr /* xkb */, - unsigned /* want */, - unsigned /* need */ -); - -extern Status XkbMergeFile( - XkbDescPtr /* xkb */, - XkbFileInfo /* finfo */ -); - -/***====================================================================***/ - -extern Bool XkmProbe( - FILE * /* file */ -); - -extern unsigned XkbReadFromServer( - Display * /* dpy */, - unsigned /* need */, - unsigned /* want */, - XkbFileInfo * /* result */ -); - -extern unsigned XkmReadFile( - FILE * /* file */, - unsigned /* need */, - unsigned /* want */, - XkbFileInfo * /* result */ -); - -#ifdef _XKMFORMAT_H_ - -extern Bool XkmReadTOC( - FILE * /* file */, - xkmFileInfo * /* file_info */, - int /* max_toc */, - xkmSectionInfo * /* toc */ -); - -extern xkmSectionInfo *XkmFindTOCEntry( - xkmFileInfo * /* finfo */, - xkmSectionInfo * /* toc */, - unsigned /* type */ -); - -extern Bool XkmReadFileSection( - FILE * /* file */, - xkmSectionInfo * /* toc */, - XkbFileInfo * /* result */, - unsigned * /* loaded_rtrn */ -); - -extern char * XkmReadFileSectionName( - FILE * /* file */, - xkmSectionInfo * /* toc */ -); - -#endif /* _XKMFORMAT_H */ - -_XFUNCPROTOEND - -#endif /* _XKBFILE_H_ */ diff --git a/nx-X11/include/extensions/XKBrules.h b/nx-X11/include/extensions/XKBrules.h deleted file mode 100644 index 59d11cd88..000000000 --- a/nx-X11/include/extensions/XKBrules.h +++ /dev/null @@ -1,199 +0,0 @@ -#ifndef _XKBRULES_H_ -#define _XKBRULES_H_ 1 - -/************************************************************ - Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. - - Permission to use, copy, modify, and distribute this - software and its documentation for any purpose and without - fee is hereby granted, provided that the above copyright - notice appear in all copies and that both that copyright - notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution - of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability - of this software for any purpose. It is provided "as is" - without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH - THE USE OR PERFORMANCE OF THIS SOFTWARE. - - ********************************************************/ - -/***====================================================================***/ - -typedef struct _XkbRF_VarDefs { - char * model; - char * layout; - char * variant; - char * options; - unsigned short sz_extra; - unsigned short num_extra; - char * extra_names; - char ** extra_values; -} XkbRF_VarDefsRec,*XkbRF_VarDefsPtr; - -typedef struct _XkbRF_VarDesc { - char * name; - char * desc; -} XkbRF_VarDescRec, *XkbRF_VarDescPtr; - -typedef struct _XkbRF_DescribeVars { - int sz_desc; - int num_desc; - XkbRF_VarDescPtr desc; -} XkbRF_DescribeVarsRec,*XkbRF_DescribeVarsPtr; - -typedef struct _XkbRF_Rule { - int number; - int layout_num; - int variant_num; - char * model; - char * layout; - char * variant; - char * option; - /* yields */ - char * keycodes; - char * symbols; - char * types; - char * compat; - char * geometry; - char * keymap; - unsigned flags; -} XkbRF_RuleRec,*XkbRF_RulePtr; - -typedef struct _XkbRF_Group { - int number; - char * name; - char * words; -} XkbRF_GroupRec, *XkbRF_GroupPtr; - -#define XkbRF_PendingMatch (1L<<1) -#define XkbRF_Option (1L<<2) -#define XkbRF_Append (1L<<3) -#define XkbRF_Normal (1L<<4) -#define XkbRF_Invalid (1L<<5) - -typedef struct _XkbRF_Rules { - XkbRF_DescribeVarsRec models; - XkbRF_DescribeVarsRec layouts; - XkbRF_DescribeVarsRec variants; - XkbRF_DescribeVarsRec options; - unsigned short sz_extra; - unsigned short num_extra; - char ** extra_names; - XkbRF_DescribeVarsPtr extra; - - unsigned short sz_rules; - unsigned short num_rules; - XkbRF_RulePtr rules; - unsigned short sz_groups; - unsigned short num_groups; - XkbRF_GroupPtr groups; -} XkbRF_RulesRec, *XkbRF_RulesPtr; - -/***====================================================================***/ - -_XFUNCPROTOBEGIN - -extern Bool XkbRF_GetComponents( - XkbRF_RulesPtr /* rules */, - XkbRF_VarDefsPtr /* var_defs */, - XkbComponentNamesPtr /* names */ -); - -extern XkbRF_RulePtr XkbRF_AddRule( - XkbRF_RulesPtr /* rules */ -); - -extern XkbRF_GroupPtr XkbRF_AddGroup(XkbRF_RulesPtr rules); - -extern Bool XkbRF_LoadRules( - FILE * /* file */, - XkbRF_RulesPtr /* rules */ -); - -extern Bool XkbRF_LoadRulesByName( - char * /* base */, - char * /* locale */, - XkbRF_RulesPtr /* rules */ -); - -/***====================================================================***/ - -extern XkbRF_VarDescPtr XkbRF_AddVarDesc( - XkbRF_DescribeVarsPtr /* vars */ -); - -extern XkbRF_VarDescPtr XkbRF_AddVarDescCopy( - XkbRF_DescribeVarsPtr /* vars */, - XkbRF_VarDescPtr /* copy_from */ -); - -extern XkbRF_DescribeVarsPtr XkbRF_AddVarToDescribe( - XkbRF_RulesPtr /* rules */, - char * /* name */ -); - -extern Bool XkbRF_LoadDescriptions( - FILE * /* file */, - XkbRF_RulesPtr /* rules */ -); - -extern Bool XkbRF_LoadDescriptionsByName( - char * /* base */, - char * /* locale */, - XkbRF_RulesPtr /* rules */ -); - -extern XkbRF_RulesPtr XkbRF_Load( - char * /* base */, - char * /* locale */, - Bool /* wantDesc */, - Bool /* wantRules */ -); - -extern XkbRF_RulesPtr XkbRF_Create( - int /* sz_rules */, - int /* sz_extra */ -); - -/***====================================================================***/ - -extern void XkbRF_Free( - XkbRF_RulesPtr /* rules */, - Bool /* freeRules */ -); - - -/***====================================================================***/ - -#define _XKB_RF_NAMES_PROP_ATOM "_XKB_RULES_NAMES" -#define _XKB_RF_NAMES_PROP_MAXLEN 1024 - -#ifndef XKB_IN_SERVER - -extern Bool XkbRF_GetNamesProp( - Display * /* dpy */, - char ** /* rules_file_rtrn */, - XkbRF_VarDefsPtr /* var_defs_rtrn */ -); - -extern Bool XkbRF_SetNamesProp( - Display * /* dpy */, - char * /* rules_file */, - XkbRF_VarDefsPtr /* var_defs */ -); - -#endif - -_XFUNCPROTOEND - -#endif /* _XKBRULES_H_ */ diff --git a/nx-X11/include/extensions/XKBsrv.h b/nx-X11/include/extensions/XKBsrv.h index db9c1d59e..6d369e2b2 100644 --- a/nx-X11/include/extensions/XKBsrv.h +++ b/nx-X11/include/extensions/XKBsrv.h @@ -70,11 +70,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <nx-X11/extensions/XKBproto.h> #include "inputstr.h" -#ifdef NXAGENT_SERVER -extern char *_NXGetXkbBasePath(const char *path); -extern char *_NXGetXkbCompPath(const char *path); -#endif - typedef struct _XkbInterest { DeviceIntPtr dev; ClientPtr client; @@ -1111,91 +1106,6 @@ extern void XkbSendNewKeyboardNotify( xkbNewKeyboardNotify * /* pNKN */ ); -#ifdef XKBSRV_NEED_FILE_FUNCS - -#include <nx-X11/extensions/XKMformat.h> -#include <nx-X11/extensions/XKBfile.h> -#include <nx-X11/extensions/XKBrules.h> - -#define _XkbListKeymaps 0 -#define _XkbListKeycodes 1 -#define _XkbListTypes 2 -#define _XkbListCompat 3 -#define _XkbListSymbols 4 -#define _XkbListGeometry 5 -#define _XkbListNumComponents 6 - -typedef struct _XkbSrvListInfo { - int szPool; - int nPool; - char * pool; - - int maxRtrn; - int nTotal; - - char * pattern[_XkbListNumComponents]; - int nFound[_XkbListNumComponents]; -} XkbSrvListInfoRec,*XkbSrvListInfoPtr; - -char * -XkbGetRulesDflts( - XkbRF_VarDefsPtr /* defs */ -); - -extern void XkbSetRulesUsed( - XkbRF_VarDefsPtr /* defs */ -); - - -extern Status XkbDDXList( - DeviceIntPtr /* dev */, - XkbSrvListInfoPtr /* listing */, - ClientPtr /* client */ -); - -extern unsigned int XkbDDXLoadKeymapByNames( - DeviceIntPtr /* keybd */, - XkbComponentNamesPtr /* names */, - unsigned int /* want */, - unsigned int /* need */, - XkbFileInfoPtr /* finfoRtrn */, - char * /* keymapNameRtrn */, - int /* keymapNameRtrnLen */ -); - -extern Bool XkbDDXNamesFromRules( - DeviceIntPtr /* keybd */, - char * /* rules */, - XkbRF_VarDefsPtr /* defs */, - XkbComponentNamesPtr /* names */ -); - -extern FILE *XkbDDXOpenConfigFile( - char * /* mapName */, - char * /* fileNameRtrn */, - int /* fileNameRtrnLen */ -); - -extern Bool XkbDDXApplyConfig( - XPointer /* cfg_in */, - XkbSrvInfoPtr /* xkbi */ -); - -extern XPointer XkbDDXPreloadConfig( - char ** /* rulesFileRtrn */, - XkbRF_VarDefsPtr /* defs */, - XkbComponentNamesPtr /* names */, - DeviceIntPtr /* dev */ -); - -extern int _XkbStrCaseCmp( - char * /* str1 */, - char * /* str2 */ -); - -#endif /* XKBSRV_NEED_FILE_FUNCS */ - - _XFUNCPROTOEND #define XkbAtomGetString(d,s) NameForAtom(s) diff --git a/nx-X11/include/extensions/scrnsaver.h b/nx-X11/include/extensions/scrnsaver.h deleted file mode 100644 index 38e5e24df..000000000 --- a/nx-X11/include/extensions/scrnsaver.h +++ /dev/null @@ -1,131 +0,0 @@ -/* - * $XConsortium: scrnsaver.h,v 1.6 94/04/17 20:59:34 keith Exp $ - * -Copyright (c) 1992 X Consortium - -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 -X CONSORTIUM 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 name of the X Consortium 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 X Consortium. - * - * Author: Keith Packard, MIT X Consortium - */ -/* $XFree86$ */ - -#ifndef _SCRNSAVER_H_ -#define _SCRNSAVER_H_ - -#include <nx-X11/Xfuncproto.h> -#include <nx-X11/Xlib.h> -#include <nx-X11/extensions/saver.h> - -typedef struct { - int type; /* of event */ - unsigned long serial; /* # of last request processed by server */ - Bool send_event; /* true if this came frome a SendEvent request */ - Display *display; /* Display the event was read from */ - Window window; /* screen saver window */ - Window root; /* root window of event screen */ - int state; /* ScreenSaverOff, ScreenSaverOn, ScreenSaverCycle*/ - int kind; /* ScreenSaverBlanked, ...Internal, ...External */ - Bool forced; /* extents of new region */ - Time time; /* event timestamp */ -} XScreenSaverNotifyEvent; - -typedef struct { - Window window; /* screen saver window - may not exist */ - int state; /* ScreenSaverOff, ScreenSaverOn, ScreenSaverDisabled*/ - int kind; /* ScreenSaverBlanked, ...Internal, ...External */ - unsigned long til_or_since; /* time til or since screen saver */ - unsigned long idle; /* total time since last user input */ - unsigned long eventMask; /* currently selected events for this client */ -} XScreenSaverInfo; - -_XFUNCPROTOBEGIN - -extern Bool XScreenSaverQueryExtension ( - Display* /* display */, - int* /* event_base */, - int* /* error_base */ -); - -extern Status XScreenSaverQueryVersion ( - Display* /* display */, - int* /* major_version */, - int* /* minor_version */ -); - -extern XScreenSaverInfo *XScreenSaverAllocInfo ( - void -); - -extern Status XScreenSaverQueryInfo ( - Display* /* display */, - Drawable /* drawable */, - XScreenSaverInfo* /* info */ -); - -extern void XScreenSaverSelectInput ( - Display* /* display */, - Drawable /* drawable */, - unsigned long /* eventMask */ -); - -extern void XScreenSaverSetAttributes ( - Display* /* display */, - Drawable /* drawable */, - int /* x */, - int /* y */, - unsigned int /* width */, - unsigned int /* height */, - unsigned int /* border_width */, - int /* depth */, - unsigned int /* class */, - Visual * /* visual */, - unsigned long /* valuemask */, - XSetWindowAttributes * /* attributes */ -); - -extern void XScreenSaverUnsetAttributes ( - Display* /* display */, - Drawable /* drawable */ -); - -extern Status XScreenSaverRegister ( - Display* /* display */, - int /* screen */, - XID /* xid */, - Atom /* type */ -); - -extern Status XScreenSaverUnregister ( - Display* /* display */, - int /* screen */ -); - -extern Status XScreenSaverGetRegistered ( - Display* /* display */, - int /* screen */, - XID* /* xid */, - Atom* /* type */ -); - -_XFUNCPROTOEND - -#endif /* _SCRNSAVER_H_ */ |