Import of XFree86 4.0.1

17 files changed, 80 insertions, 436 deletions

diff --git a/xc/include/DPS/ColorSB.h b/xc/include/DPS/ColorSB.h
index b8c4310f0..f995930d3 100644
--- a/xc/include/DPS/ColorSB.h
+++ b/xc/include/DPS/ColorSB.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/ColorSB.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */
 
 #ifndef _ColorSelectionBox_h
 #define _ColorSelectionBox_h
@@ -117,7 +118,9 @@
 #define XtNokCallback "okCallback"
 #define XtNapplyCallback "applyCallback"
 #define XtNresetCallback "resetCallback"
+#ifndef XtNcancelCallback
 #define XtNcancelCallback "cancelCallback"
+#endif
 #define XtNvalueChangedCallback "valueChangedCallback"
 
 /* New resource types */
@@ -149,13 +152,6 @@ typedef struct _ColorSelectionBoxRec *ColorSelectionBoxWidget;
 
 /* Convenience routine */
 
-#ifdef _NO_PROTO
-
-extern Boolean CSBSetColor();
-extern void CSBGetColor();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -169,7 +165,9 @@ extern Boolean CSBSetColor(Widget w, CSBColorSpace space, double c1,
 extern void CSBGetColor(Widget w, CSBColorSpace space, float *c1,
 			float *c2, float *c3, float *c4);
 
-#endif /* _NO_PROTO */
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" }
+#endif
 
 #endif /* _ColorSelectionBox_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
diff --git a/xc/include/DPS/ColorSBP.h b/xc/include/DPS/ColorSBP.h
index 26ade8075..128a716d2 100644
--- a/xc/include/DPS/ColorSBP.h
+++ b/xc/include/DPS/ColorSBP.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/ColorSBP.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */
 
 #ifndef _ColorSelectionBoxP_H
 #define _ColorSelectionBoxP_H
@@ -142,13 +143,6 @@ typedef struct _ColorSelectionBoxRec {
     ColorSelectionBoxPart	csb;
 } ColorSelectionBoxRec;
 
-#ifdef _NO_PROTO
-
-typedef Boolean (*CSBSetColorProc) ();
-typedef void (*CSBGetColorProc) ();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -165,7 +159,6 @@ typedef void (*CSBGetColorProc) (Widget w, CSBColorSpace space, float *c1,
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif /* _NO_PROTO */
 
 #define InheritSetColor ((CSBSetColorProc) _XtInherit)
 #define InheritGetColor ((CSBGetColorProc) _XtInherit)
diff --git a/xc/include/DPS/DPSScrollW.h b/xc/include/DPS/DPSScrollW.h
index c7a2f7ec2..451cafde8 100644
--- a/xc/include/DPS/DPSScrollW.h
+++ b/xc/include/DPS/DPSScrollW.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/DPSScrollW.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */
 
 #ifndef _DPSScrolledWindow_h
 #define _DPSScrolledWindow_h
@@ -148,29 +149,6 @@ typedef struct _DPSScrolledWindowRec *DPSScrolledWindowWidget;
 
 /* Interface routines */
 
-#ifdef _NO_PROTO
-
-extern void DSWSetScale();
-extern void DSWScrollPoint();
-extern void DSWScrollBy();
-extern void DSWScrollTo();
-extern void DSWSetScaleAndScroll();
-extern void DSWConvertXToPS();
-extern void DSWConvertPSToX();
-extern void DSWAddToDirtyArea();
-extern Boolean DSWTakeFeedbackPixmap();
-extern Boolean DSWGiveFeedbackPixmap();
-extern void DSWStartFeedbackDrawing();
-extern void DSWEndFeedbackDrawing();
-extern void DSWSetFeedbackDirtyArea();
-extern void DSWFinishPendingDrawing();
-extern void DSWAbortPendingDrawing();
-extern void DSWGetDrawingInfo();
-extern void DSWUpdateDrawing();
-extern void DSWGetScrollInfo();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -210,7 +188,5 @@ extern void DSWGetScrollInfo(Widget w, int *h_value, int *h_size, int *h_max,
 };
 #endif
 
-#endif /* _NO_PROTO */
-
 #endif /* _DPSScrolledWindow_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
diff --git a/xc/include/DPS/DPSScrollWP.h b/xc/include/DPS/DPSScrollWP.h
index 10726c775..7a363c78d 100644
--- a/xc/include/DPS/DPSScrollWP.h
+++ b/xc/include/DPS/DPSScrollWP.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/DPSScrollWP.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */
 
 #ifndef _DPSScrolledWindowP_H
 #define _DPSScrolledWindowP_H
@@ -159,29 +160,6 @@ typedef struct _DPSScrolledWindowRec {
    scratch:  Used to hold temporary copies of rectangle lists.
 */
 
-#ifdef _NO_PROTO
-
-typedef void (*DSWSetScaleProc) ();
-typedef void (*DSWScrollPointProc) ();
-typedef void (*DSWScrollByProc) ();
-typedef void (*DSWScrollToProc) ();
-typedef void (*DSWSetScaleAndScrollProc) ();
-typedef void (*DSWConvertXToPSProc) ();
-typedef void (*DSWConvertPSToXProc) ();
-typedef void (*DSWAddToDirtyAreaProc) ();
-typedef Boolean (*DSWTakeFeedbackPixmapProc) ();
-typedef Boolean (*DSWGiveFeedbackPixmapProc) ();
-typedef void (*DSWStartFeedbackDrawingProc) ();
-typedef void (*DSWEndFeedbackDrawingProc) ();
-typedef void (*DSWSetFeedbackDirtyAreaProc) ();
-typedef void (*DSWFinishPendingDrawingProc) ();
-typedef void (*DSWAbortPendingDrawingProc) ();
-typedef void (*DSWGetDrawingInfoProc) ();
-typedef void (*DSWUpdateDrawingProc) ();
-typedef void (*DSWGetScrollInfoProc)();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 typedef "C" {
 #endif
@@ -226,7 +204,6 @@ typedef void (*DSWGetScrollInfoProc) (Widget w, int *h_value, int *h_size,
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif /* _NO_PROTO */
 
 #define InheritSetScale ((DSWSetScaleProc) _XtInherit)
 #define InheritScrollPoint ((DSWScrollPointProc) _XtInherit)
diff --git a/xc/include/DPS/FontSB.h b/xc/include/DPS/FontSB.h
index ef6895b8b..767fb5d27 100644
--- a/xc/include/DPS/FontSB.h
+++ b/xc/include/DPS/FontSB.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/FontSB.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */
 
 #ifndef _FontSelectionBox_h
 #define _FontSelectionBox_h
@@ -96,7 +97,9 @@
 #define XtNokCallback "okCallback"
 #define XtNapplyCallback "applyCallback"
 #define XtNresetCallback "resetCallback"
+#ifndef XtNcancelCallback
 #define XtNcancelCallback "cancelCallback"
+#endif
 #define XtNvalidateCallback "validateCallback"
 #define XtNfaceSelectCallback "faceSelectCallback"
 #define XtNvalueChangedCallback "valueChangedCallback"
@@ -199,31 +202,6 @@ typedef enum {FSBAddBlend, FSBReplaceBlend, FSBDeleteBlend} FSBBlendAction;
 
 /* Convenience and info routines */
 
-#ifdef _NO_PROTO
-
-extern void FSBSetFontName();
-extern void FSBSetFontFamilyFace();
-extern void FSBSetFontSize();
-extern void FSBRefreshFontList();
-extern void FSBGetFamilyList();
-extern void FSBGetFaceList();
-extern void FSBUndefineUnusedFonts();
-extern Boolean FSBDownloadFontName();
-extern Boolean FSBMatchFontFace();
-extern void FSBFontNameToFamilyFace();
-extern void FSBFontFamilyFaceToName();
-extern String FSBFindAFM();
-extern String FSBFindFontFile();
-extern void FSBGetTextDimensions();
-extern void FSBSetFontFamilyFaceBlend();
-extern void FSBFontNameToFamilyFaceBlend();
-extern void FSBFontFamilyFaceBlendToName();
-extern void FSBGetBlendList();
-extern void FSBGetBlendInfo();
-extern Boolean FSBChangeBlends();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -304,7 +282,6 @@ extern Boolean FSBChangeBlends(Widget w, String base_name, String blend_name,
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif /* _NO_PROTO */
 
 #endif /* _FontSelectionBox_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
diff --git a/xc/include/DPS/FontSBP.h b/xc/include/DPS/FontSBP.h
index 62c1b1c76..2c1730f4f 100644
--- a/xc/include/DPS/FontSBP.h
+++ b/xc/include/DPS/FontSBP.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/FontSBP.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
 
 #ifndef _FontSelectionBoxP_H
 #define _FontSelectionBoxP_H
@@ -186,31 +187,6 @@ typedef struct _FontSelectionBoxRec {
     FontSelectionBoxPart	fsb;
 } FontSelectionBoxRec;
 
-#ifdef _NO_PROTO
-
-typedef void (*FSBSetFontNameProc) ();
-typedef void (*FSBSetFontFamilyFaceProc) ();
-typedef void (*FSBSetFontSizeProc) ();
-typedef void (*FSBRefreshFontListProc) ();
-typedef void (*FSBGetFamilyListProc) ();
-typedef void (*FSBGetFaceListProc) ();
-typedef void (*FSBUndefUnusedFontsProc) ();
-typedef Boolean (*FSBDownloadFontNameProc) ();
-typedef Boolean (*FSBMatchFontFaceProc) ();
-typedef void (*FSBFontNameToFamilyFaceProc) ();
-typedef void (*FSBFontFamilyFaceToNameProc) ();
-typedef String (*FSBFindAFMProc) ();
-typedef String (*FSBFindFontFileProc) ();
-typedef void (*FSBGetTextDimensionsProc) ();
-typedef void (*FSBSetFontFamilyFaceBlendProc) ();
-typedef void (*FSBFontNameToFamilyFaceBlendProc) ();
-typedef void (*FSBFontFamilyFaceBlendToNameProc) ();
-typedef void (*FSBGetBlendListProc) ();
-typedef void (*FSBGetBlendInfoProc) ();
-typedef Boolean (*FSBChangeBlendsProc) ();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -296,7 +272,6 @@ typedef Boolean (*FSBChangeBlendsProc) (Widget w, String base_name,
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif /* _NO_PROTO */
 
 #define InheritSetFontName ((FSBSetFontNameProc) _XtInherit)
 #define InheritSetFontFamilyFace ((FSBSetFontFamilyFaceProc) _XtInherit)
diff --git a/xc/include/DPS/FontSamplP.h b/xc/include/DPS/FontSamplP.h
index 0f92b7903..2f9017eb9 100644
--- a/xc/include/DPS/FontSamplP.h
+++ b/xc/include/DPS/FontSamplP.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/FontSamplP.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
 
 #ifndef _FontSamplerP_H
 #define _FontSamplerP_H
@@ -136,12 +137,6 @@ typedef struct _FontSamplerRec {
     FontSamplerPart		sampler;
 } FontSamplerRec;
 
-#ifdef _NO_PROTO
-
-typedef void (*FSBCancelProc) ();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -151,7 +146,6 @@ typedef void (*FSBCancelProc) (Widget w);
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
-#endif /* _NO_PROTO */
 
 #define InheritCancel ((FSBCancelProc) _XtInherit)
 
diff --git a/xc/include/DPS/FontSample.h b/xc/include/DPS/FontSample.h
index 6af716c66..46cef3897 100644
--- a/xc/include/DPS/FontSample.h
+++ b/xc/include/DPS/FontSample.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/FontSample.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
 
 #ifndef _FontSampler_h
 #define _FontSampler_h
@@ -90,15 +91,7 @@ extern WidgetClass fontSamplerWidgetClass;
 
 typedef struct _FontSamplerRec *FontSamplerWidget;
 
-#ifdef _NO_PROTO
-
-extern void FSBCancelSampler();
-
-#else /* _NO_PROTO */
-
 extern void FSBCancelSampler(Widget w);
 
-#endif /* _NO_PROTO */
-
 #endif /* _FontSampler_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
diff --git a/xc/include/DPS/PSres.h b/xc/include/DPS/PSres.h
index 41f74e1b0..887fff621 100644
--- a/xc/include/DPS/PSres.h
+++ b/xc/include/DPS/PSres.h
@@ -35,6 +35,10 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/PSres.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
+
+#ifndef _PSres_h
+#define _PSres_h
 
 extern char *PSResFontOutline, *PSResFontPrebuilt, *PSResFontAFM,
 	*PSResFontBDF, *PSResFontFamily, *PSResFontBDFSizes,
@@ -43,22 +47,6 @@ extern char *PSResFontOutline, *PSResFontPrebuilt, *PSResFontAFM,
 typedef enum {PSSaveReturnValues, PSSaveByType, PSSaveEverything}
 	PSResourceSavePolicy;
 
-#ifdef _NO_PROTO
-
-extern int ListPSResourceFiles();
-extern int ListPSResourceTypes();
-extern void FreePSResourceStorage();
-extern void SetPSResourcePolicy();
-typedef int (*PSResourceEnumerator)();
-extern void EnumeratePSResourceFiles();
-extern int CheckPSResourceTime();
-typedef char *(*PSResMallocProc)();
-typedef char *(*PSResReallocProc)();
-typedef void (*PSResFreeProc)();
-typedef void (*PSResFileWarningHandlerProc)();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -108,8 +96,6 @@ typedef void (*PSResFileWarningHandlerProc)(char *fileNamem, char *extraInfo);
 }
 #endif
 
-#endif /* _NO_PROTO */
-
 extern PSResMallocProc PSResMalloc;
 
 extern PSResReallocProc PSResRealloc;
@@ -117,3 +103,5 @@ extern PSResReallocProc PSResRealloc;
 extern PSResFreeProc PSResFree;
 
 extern PSResFileWarningHandlerProc PSResFileWarningHandler;
+
+#endif /* _PSres_h */
diff --git a/xc/include/DPS/XDPSlib.h b/xc/include/DPS/XDPSlib.h
index 62b6e3db1..e467f76f2 100644
--- a/xc/include/DPS/XDPSlib.h
+++ b/xc/include/DPS/XDPSlib.h
@@ -34,16 +34,15 @@
  *
  * Author: Adobe Systems Incorporated and Digital Equipment Corporation
  */
+/* $XFree86: xc/include/DPS/XDPSlib.h,v 1.3 2000/06/07 22:02:55 tsi Exp $ */
  
 #ifndef _XDPSlib_h
 #define _XDPSlib_h
 
-#ifndef _NO_PROTO
 #undef _XEVENT_
-#endif
 
 #include <X11/Xlib.h>
-#include "DPS/XDPS.h"
+#include <DPS/XDPS.h>
 #include <X11/Xutil.h>
 
 /*
@@ -83,72 +82,6 @@ typedef enum {
 
 #define DPSCAP_SYNCMASK_DFLT	DPSCAP_SYNCMASK_RECONCILE
 
-#ifdef _NO_PROTO
-
-typedef void (*XDPSLEventHandler)();
-
-extern int XDPSLInit();
-extern ContextXID XDPSLCreateContextAndSpace();
-extern SpaceXID XDPSLCreateSpace();
-extern void XDPSLGiveInput();
-extern int XDPSLGetStatus();
-extern void XDPSLDestroySpace();
-extern void XDPSLReset();
-extern void XDPSLNotifyContext();
-extern ContextXID XDPSLCreateContextFromID();
-extern Status XDPSLIDFromContext();
-extern ContextPSID XDPSLContextFromXID();
-extern void XDPSLSetStatusMask();
-extern XExtCodes *XDPSLGetCodes();
-extern void XDPSLSetTextEventHandler();
-extern void XDPSLCallOutputEventHandler();
-extern void XDPSLSetStatusEventHandler();
-extern void XDPSLCallStatusEventHandler();
-extern void XDPSLInitDisplayFlags();
-extern Bool XDPSLGetPassEventsFlag();
-extern void XDPSLSetPassEventsFlag();
-extern Bool XDPSLGetWrapWaitingFlag();
-extern void XDPSLSetWrapWaitingFlag();
-/* L2-DPS/PROTO 9 additions */
-extern void XDPSLNotifyWhenReady();
-extern XDPSLPSErrors XDPSLTestErrorCode();
-extern int XDPSLGetVersion();
-extern void XDPSLSetReadyEventHandler();
-extern void XDPSLCallReadyEventHandler();
-/* DPS NX additions */
-extern char * XDPSLSetAgentName();
-extern void XDPSLSetCodes();
-extern Display * XDPSLGetShunt();
-extern void XDPSLSetShunt();
-extern void XDPSLSetVersion();
-extern void XDPSLSetClientMessageHandler();
-extern CSDPSFakeEventTypes XDPSLGetCSDPSFakeEventType();
-extern Bool XDPSLDispatchCSDPSFakeEvent();
-extern void XDPSLGetCSDPSStatus();
-extern void XDPSLSetXErrorConvertProc();
-extern void XDPSLCAPNotify();
-extern void XDPSLSync();
-extern void *XDPSLEnumerateEvents();
-extern void XDPSLSetAfterProc();
-extern int XDPSLGetSyncMask();
-extern void XDPSLSetSyncMask();
-extern void XDPSLFlush();
-extern void XDPSLGetCSDPSReady();
-extern void XDPSLReconcileRequests();
-extern Status XDPSLSetAgentArg();
-extern void XDPSLCleanAll();
-extern void XDPSLUpdateAgentArgs();
-extern void XDPSLCleanContext();
-#ifdef VMS
-extern void XDPSLSetDisplay();
-#endif /* VMS */
-/* DPS NX 2.0 */
-extern void XDPSLFlushGC();
-extern void XDPSLSetGCFlushMode();
-extern int XDPSLGetGCFlushMode();
-
-#else /* _NO_PROTO */
-
 typedef void (*XDPSLEventHandler)(XEvent *event);
 
 #if defined(__cplusplus) || defined(c_plusplus)
@@ -307,6 +240,8 @@ extern void XDPSLSetSyncMask(Display *dpy, int mask);
 
 extern void XDPSLFlush(Display *dpy);
 
+extern void XDPSLSyncGCClip(Display *xdpy, GC gc);
+
 extern void XDPSLGetCSDPSReady(Display *xdpy,
                                  XEvent *event,
                                  void **ret_ctxt,
@@ -322,13 +257,6 @@ extern void XDPSLUpdateAgentArgs(Display *xdpy);
 
 extern void XDPSLCleanContext(Display *xdpy, ContextXID cxid);
 
-/* L2-DPS/PROTO 9 additions for DPS NX */
-extern void XDPSLGetCSDPSReady(Display *dpy,
-                                XEvent *event,
-				void **ret_ctxt,
-				int *ret_val);
-
-
 #ifdef VMS
 extern void XDPSLSetDisplay(Display *dpy);
 #endif /* VMS */
@@ -344,8 +272,6 @@ extern int XDPSLGetGCFlushMode(Display *dpy);
 }
 #endif
 
-#endif /* _NO_PROTO */
-
 typedef struct _XDPSLOutputEvent {
     int type;			/* of event. */
     unsigned long serial;       /* # of last request processed by server. */
diff --git a/xc/include/DPS/dpsXclient.h b/xc/include/DPS/dpsXclient.h
index 5d3528bc9..afd06f0de 100644
--- a/xc/include/DPS/dpsXclient.h
+++ b/xc/include/DPS/dpsXclient.h
@@ -116,48 +116,6 @@ typedef enum {dps_event_pass_through, dps_event_internal_dispatch,
 
 /* Event delivery types for XDPSSetEventDelivery */
 
-#ifdef _NO_PROTO
-
-extern DPSContext XDPSCreateContext();
-extern DPSContext XDPSCreateSimpleContext();
-extern DPSContext XDPSCreateSecureContext();
-extern DPSContext DPSCreateTextContext();
-extern DPSContext DPSContextFromContextID();
-extern DPSContext XDPSFindContext ();
-extern void DPSDefaultTextBackstop ();
-extern void DPSChangeEncoding ();
-typedef void (*XDPSStatusProc)();
-extern XDPSStatusProc XDPSRegisterStatusProc();
-extern int XDPSGetContextStatus();
-extern long int DPSNewUserObjectIndex();
-extern DPSContext XDPSContextFromSharedID();
-extern DPSSpace XDPSSpaceFromSharedID();
-extern XID XDPSXIDFromContext();
-extern XID XDPSXIDFromSpace();
-extern DPSContext XDPSContextFromXID();
-extern DPSSpace XDPSSpaceFromXID();
-extern void XDPSUnfreezeContext();
-extern void XDPSSetStatusMask();
-extern DPSEventDelivery XDPSSetEventDelivery();
-extern Bool XDPSIsStatusEvent();
-extern Bool XDPSIsOutputEvent();
-extern Bool XDPSIsReadyEvent();
-extern Bool XDPSIsDPSEvent();
-extern Bool XDPSDispatchEvent();
-extern void XDPSSyncGCClip();
-extern void XDPSReconcileRequests();
-extern Status XDPSNXSetClientArg();
-extern Status XDPSNXSetAgentArg();
-extern void XDPSNotifyWhenReady();	/* L2 DPS/PROTO 9 */
-typedef void (*XDPSReadyProc)();
-extern XDPSReadyProc XDPSRegisterReadyProc();
-extern int XDPSGetProtocolVersion();
-extern Status XDPSCreateStandardColormaps();
-extern void XDPSGetDefaultColorMaps();
-extern void XDPSFlushGC();	/* DPS NX 2.0 */
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -285,7 +243,7 @@ extern int XDPSGetContextStatus(DPSContext ctxt);
 
   /* Returns the status of 'ctxt' as defined in XDPS.h. */
 
-extern long int DPSNewUserObjectIndex();
+extern long int DPSNewUserObjectIndex(void);
 
   /* Returns a new user object index.  The Client Library is
      the sole allocator of new user object indices.  User object
@@ -462,6 +420,4 @@ extern void XDPSFlushGC(Display *dpy, GC gc);
 }
 #endif
 
-#endif /* _NO_PROTO */
-
 #endif /* DPSXCLIENT_H */
diff --git a/xc/include/DPS/dpsXpreview.h b/xc/include/DPS/dpsXpreview.h
index e14e1062e..4eaf3ac4f 100644
--- a/xc/include/DPS/dpsXpreview.h
+++ b/xc/include/DPS/dpsXpreview.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsXpreview.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
 
 #ifndef DPS_X_PREVIEW_H
 #define DPS_X_PREVIEW_H
@@ -48,23 +49,6 @@ typedef struct {
 	Bool continuedLine;
 } XDPSPosition;
 
-#ifdef _NO_PROTO
-
-typedef void (*XDPSRewindFunction)();
-typedef char *(*XDPSGetsFunction)();
-extern int XDPSSetFileFunctions();
-extern void XDPSFileRewindFunc();
-extern char *XDPSFileGetsFunc();
-extern void XDPSEmbeddedEPSFRewindFunc();
-extern char *XDPSEmbeddedEPSFGetsFunc();
-extern int XDPSCreatePixmapForEPSF();
-extern double XDPSPixelsPerPoint();
-extern int XDPSImageFileIntoDrawable();
-extern int XDPSCheckImagingResults();
-extern void XDPSSetImagingTimeout();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -126,6 +110,8 @@ extern char *XDPSFileGetsFunc(char *buf,
 extern void XDPSEmbeddedEPSFRewindFunc(FILE *f,
 				       DPSPointer data);
 
+extern char *XDPSEmbeddedGetsFunc(char *buf, int n, FILE *f, DPSPointer data);
+
 extern char *XDPSEmbeddedEPSFGetsFunc(char *buf,
 				      int n,
 				      FILE *f,
@@ -233,6 +219,4 @@ extern void XDPSSetImagingTimeout(int timeout,
 }
 #endif
 
-#endif /* _NO_PROTO */
-
 #endif /* DPS_X_PREVIEW_H */
diff --git a/xc/include/DPS/dpsXshare.h b/xc/include/DPS/dpsXshare.h
index 25068f4a3..9e0ca3b00 100644
--- a/xc/include/DPS/dpsXshare.h
+++ b/xc/include/DPS/dpsXshare.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsXshare.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */
 
 #ifndef DPS_X_SHARE_H
 #define DPS_X_SHARE_H
@@ -63,41 +64,6 @@ typedef unsigned int DPSGState;
 #define XDPSContextRGBMap		(1L<<2)
 #define XDPSContextGrayMap		(1L<<3)
 
-#ifdef _NO_PROTO
-
-extern void XDPSRegisterContext();
-extern DPSContext XDPSGetSharedContext();
-extern void XDPSDestroySharedContext();
-extern void XDPSUnregisterContext();
-extern void XDPSFreeDisplayInfo();
-extern int XDPSChainTextContext();
-extern int XDPSSetContextDepth();
-extern int XDPSSetContextDrawable();
-extern int XDPSSetContextRGBMap();
-extern int XDPSSetContextGrayMap();
-extern int XDPSSetContextParameters();
-extern int XDPSPushContextParameters();
-extern int XDPSPopContextParameters();
-extern int XDPSCaptureContextGState();
-extern int XDPSUpdateContextGState();
-extern int XDPSFreeContextGState();
-extern int XDPSSetContextGState();
-extern int XDPSPushContextGState();
-extern int XDPSPopContextGState();
-extern Bool XDPSExtensionPresent();
-extern int PSDefineAsUserObj();
-extern int DPSDefineAsUserObj();
-extern void PSRedefineUserObj();
-extern void DPSRedefineUserObj();
-extern void PSUndefineUserObj();
-extern void DPSUndefineUserObj();
-extern int PSReserveUserObjIndices();
-extern int DPSReserveUserObjIndices();
-extern void PSReturnUserObjIndices();
-extern void DPSReturnUserObjIndices();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -264,7 +230,7 @@ extern Bool XDPSExtensionPresent(Display *display);
 /* Define, redefine, and undefine user objects.  In all cases the DPS versions
    take a context and the PS versions don't */
 
-extern int PSDefineAsUserObj();
+extern int PSDefineAsUserObj(void);
 extern int DPSDefineAsUserObj(DPSContext context);
 
 extern void PSRedefineUserObj(int userObj);
@@ -285,6 +251,4 @@ extern void DPSReturnUserObjIndices(DPSContext context, int start, int number);
 }
 #endif
 
-#endif /* _NO_PROTO */
-
 #endif /* DPS_X_SHARE_H */
diff --git a/xc/include/DPS/dpsXuserpath.h b/xc/include/DPS/dpsXuserpath.h
index a7892b9f7..2fa42fa4c 100644
--- a/xc/include/DPS/dpsXuserpath.h
+++ b/xc/include/DPS/dpsXuserpath.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsXuserpath.h,v 1.2 2000/06/07 22:02:56 tsi Exp $ */
 
 #ifndef DPS_X_DOUSERPATH_H
 #define DPS_X_DOUSERPATH_H
@@ -105,18 +106,6 @@ typedef enum _DPSUserPathAction {
     dps_send = 113	/* This is really the null operator */
 } DPSUserPathAction;
  
-#ifdef _NO_PROTO
-
-extern void PSDoUserPath();
-
-extern void DPSDoUserPath();
-
-extern Bool PSHitUserPath();
-
-extern Bool DPSHitUserPath();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -165,6 +154,4 @@ extern Bool DPSHitUserPath(DPSContext ctx,
 }
 #endif
 
-#endif /* _NO_PROTO */
-
 #endif /* DPS_X_DOUSERPATH_H */
diff --git a/xc/include/DPS/dpsclient.h b/xc/include/DPS/dpsclient.h
index f47a82372..0a009a046 100644
--- a/xc/include/DPS/dpsclient.h
+++ b/xc/include/DPS/dpsclient.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsclient.h,v 1.3 2000/06/07 22:02:56 tsi Exp $ */
 
 #ifndef DPSCLIENT_H
 #define DPSCLIENT_H
@@ -92,19 +93,19 @@ typedef int DPSErrorCode;
        values on a text context.
   */
 
-typedef void (*DPSTextProc)(/*
-			    struct _t_DPSContext *ctxt, char *buf,
+typedef void (*DPSTextProc)(
+			    struct _t_DPSContextRec *ctxt, char *buf,
 			    long unsigned int count
-*/);
+);
 
   /* Call-back procedure to handle text from the PostScript interpreter.
      'buf' contains 'count' bytes of ASCII text. */
 
-typedef void (*DPSErrorProc)(/*
-			     struct _t_DPSContext *ctxt,
+typedef void (*DPSErrorProc)(
+			     struct _t_DPSContextRec *ctxt,
 			     DPSErrorCode errorCode,
 			     long unsigned int arg1, long unsigned int arg2
-*/);
+);
   
   /* Call-back procedure to report errors from the PostScript interpreter.
      The meaning of arg1 and arg2 depend on 'errorCode', as described above.
@@ -127,41 +128,12 @@ typedef enum {dps_context_execution, dps_context_text} DPSContextType;
 
 /*=== PROCEDURES ===*/
 
-#ifdef _NO_PROTO
-
-extern void DPSDefaultErrorProc();
-extern void DPSSetTextBackstop();
-extern DPSTextProc DPSGetCurrentTextBackstop();
-extern void DPSSetErrorBackstop();
-extern DPSErrorProc DPSGetCurrentErrorBackstop();
-extern DPSContext DPSGetCurrentContext();
-extern void DPSSetContext();
-extern void DPSWritePostScript();
-extern void DPSPrintf();
-extern void DPSWriteData();
-extern void DPSFlushContext();
-extern int DPSChainContext();
-extern void DPSUnchainContext();
-extern void DPSResetContext();
-extern void DPSWaitContext();
-extern void DPSInterruptContext();
-extern void DPSDestroyContext();
-extern void DPSDestroySpace();
-extern void DPSSetNumStringConversion();
-extern void DPSSetWrapSynchronization();
-extern void DPSSuppressBinaryConversion();
-extern void DPSSetAbbrevMode();
-extern void DPSFetchAbbrevList();
-extern char *DPSGetSysnameAbbrev();
-extern char *DPSGetOperatorAbbrev();
-extern DPSContextType DPSGetContextType();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
+extern void DPSversion(DPSContext ctxt, int bufsize, char buf[]);
+
 extern void DPSDefaultErrorProc(DPSContext ctxt, DPSErrorCode errorCode,
 				long unsigned int arg1,
 				long unsigned int arg2);
@@ -198,7 +170,7 @@ extern void DPSSetTextBackstop(DPSTextProc textProc);
      not made known to the dps client library. NULL will be passed as the ctxt
      argument to textProc in the latter case. */
 
-extern DPSTextProc DPSGetCurrentTextBackstop();
+extern DPSTextProc DPSGetCurrentTextBackstop(void);
 
   /* Returns the textProc passed most recently to DPSSetTextBackstop, or NULL
      if none */
@@ -210,12 +182,12 @@ extern void DPSSetErrorBackstop(DPSErrorProc errorProc);
      known to the dps client library. NULL will be passed as the ctxt
      argument to errorProc. */
 
-extern DPSErrorProc DPSGetCurrentErrorBackstop();
+extern DPSErrorProc DPSGetCurrentErrorBackstop(void);
 
   /* Returns the errorProc passed most recently to DPSSetErrorBackstop, or NULL
      if none */
 
-extern DPSContext DPSGetCurrentContext();
+extern DPSContext DPSGetCurrentContext(void);
 
   /* Get the default context. Used in conjunction with psops.h and with
      wraps that are defined without an explicit DPSContext argument. 
@@ -399,12 +371,22 @@ extern DPSContextType DPSGetContextType(DPSContext ctxt);
 
   /* Returns whether a context is a text context or an execution context */
 
+  /* generated functions used in dpstk */
+extern void DPSrectfill(DPSContext ctxt, double x, double y, double w, double h);
+extern void DPSsetcmykcolor(DPSContext ctxt, double c, double m, double y, double k);
+extern void DPSsetgray(DPSContext ctxt, double gray);
+extern void DPSsethsbcolor(DPSContext ctxt, double h, double s, double b);
+extern void DPSsetrgbcolor(DPSContext ctxt, double r, double g, double b);
+extern void DPSsetXoffset(DPSContext ctxt, int x, int y);
+extern void DPSinitviewclip(DPSContext ctxt);
+extern void DPSinitgraphics(DPSContext ctxt);
+extern void DPSscale(DPSContext ctxt, double x, double y);
+extern void DPSinitclip(DPSContext ctxt);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
 
-#endif /* _NO_PROTO */
-
 #define DPSSetTextProc(ctxt, tp) ((ctxt)->textProc = (tp))
 
   /* Change ctxt's textProc. */
diff --git a/xc/include/DPS/dpsexcept.h b/xc/include/DPS/dpsexcept.h
index 7eeefff38..365819a73 100644
--- a/xc/include/DPS/dpsexcept.h
+++ b/xc/include/DPS/dpsexcept.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsexcept.h,v 1.3 2000/06/07 22:02:56 tsi Exp $ */
 
 /*
 Original version: Jeffrey Mogul, Stanford, 18 February 1983
@@ -163,17 +164,6 @@ extern _Exc_Buf *_Exc_Header;	/* global exception chain header */
 
 /* Exported Procedures */
 
-#ifdef _NO_PROTO
-
-extern void DPSRaise();
-extern void DPSCantHappen();
-#if 0
-extern int setjmp();
-extern void longjmp();
-#endif /* 0 */
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -196,7 +186,7 @@ extern void DPSRaise(int Code, char *Message);
    writes an error message to os_stderr and aborts with DPSCantHappen.
  */
 
-extern void DPSCantHappen();
+extern void DPSCantHappen(void);
 /* Calls abort. This is used only to handle "impossible" errors;
    there is no recovery, and DPSCantHappen does not return.
  */
@@ -241,8 +231,6 @@ extern void longjmp(jmp_buf buf, int value);
 }
 #endif
 
-#endif /* _NO_PROTO */
-
 /* In-line Procedures */
 
 #define RAISE DPSRaise
diff --git a/xc/include/DPS/dpsfriends.h b/xc/include/DPS/dpsfriends.h
index 3eb45db76..eb4850d99 100644
--- a/xc/include/DPS/dpsfriends.h
+++ b/xc/include/DPS/dpsfriends.h
@@ -35,6 +35,7 @@
  * 
  * Author:  Adobe Systems Incorporated
  */
+/* $XFree86: xc/include/DPS/dpsfriends.h,v 1.3 2000/06/07 22:02:56 tsi Exp $ */
 
 #ifndef	DPSFRIENDS_H
 #define	DPSFRIENDS_H
@@ -130,31 +131,33 @@ typedef enum {
   dps_tInt,	dps_tUInt,
   dps_tLong,	dps_tULong } DPSDefinedType;
   
+struct _t_DPSContextRec;
+
   /* Enumerates the C data types that can be used to describe wrap
      parameters. */
 
-typedef void (*DPSContextProc)(/*
+typedef void (*DPSContextProc)(
 			       struct _t_DPSContextRec *ctxt
-*/);
+);
 
-typedef void (*DPSContextBufProc)(/*
+typedef void (*DPSContextBufProc)(
 				  struct _t_DPSContextRec *ctxt, char *buf,
 				  unsigned int count
-*/);
+);
 
-typedef void (*DPSContextTypedArrayProc)(/*
+typedef void (*DPSContextTypedArrayProc)(
 					 struct _t_DPSContextRec *ctxt,
 					 DPSDefinedType type,
 					 char *array, unsigned int length
-*/);
+);
 
-typedef void (*DPSWriteNumStringProc)(/*
-				         struct _t_DPSContextRec ctxt,
+typedef void (*DPSWriteNumStringProc)(
+				         struct _t_DPSContextRec *ctxt,
 					 DPSDefinedType type,
 					 const void *array,
 					 unsigned int count,
 					 int scale
-*/);
+);
 
 typedef struct {
   DPSContextBufProc BinObjSeqWrite;
@@ -227,9 +230,11 @@ typedef struct {
 
   /* The DPSProcsRec may be extended to include system-specific items */
 
-typedef void (*DPSSpaceProc)(/*
+struct _t_DPSSpaceRec;
+
+typedef void (*DPSSpaceProc)(
 			     struct _t_DPSSpaceRec *space
-*/);
+);
 
 typedef struct {
   DPSSpaceProc DestroySpace;
@@ -270,14 +275,16 @@ typedef struct _t_DPSContextExtensionRec {
   struct _t_DPSContextExtensionRec *next;
 } DPSContextExtensionRec;
 
+struct _t_DPSContextRec;
+
 typedef struct _t_DPSContextRec {
   char *priv;
   DPSSpace space;
   DPSProgramEncoding programEncoding;
   DPSNameEncoding nameEncoding;
   DPSProcs procs;
-  void (*textProc)();
-  void (*errorProc)();
+  void (*textProc)(struct _t_DPSContextRec *, char *, long unsigned);
+  void (*errorProc)(struct _t_DPSContextRec *, int, long unsigned, long unsigned);
   DPSResults resultTable;
   unsigned int resultTableLength;
   struct _t_DPSContextRec *chainParent, *chainChild;
@@ -390,25 +397,6 @@ typedef struct {
 
 /*=== PROCEDURES ===*/
 
-#ifdef _NO_PROTO
-
-extern void DPSAwaitReturnValues();
-extern void DPSUpdateNameMap();
-extern void DPSBinObjSeqWrite();
-extern DPSContext DPSPrivCurrentContext();
-extern void DPSWriteStringChars();
-extern void DPSWriteNumString();
-extern void DPSWriteTypedObjectArray();
-extern void DPSSetResultTable();
-extern void DPSMapNames();
-extern char *DPSNameFromIndex();
-extern DPSContextExtensionRec *DPSGetContextExtensionRec();
-extern void DPSAddContextExtensionRec();
-extern DPSContextExtensionRec *DPSRemoveContextExtensionRec();
-extern int DPSGenerateExtensionRecID();
-
-#else /* _NO_PROTO */
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
@@ -419,7 +407,7 @@ extern void DPSUpdateNameMap(DPSContext ctxt);
   
 extern void DPSBinObjSeqWrite(DPSContext ctxt, char *buf, unsigned int count);
   
-extern DPSContext DPSPrivCurrentContext();
+extern DPSContext DPSPrivCurrentContext(void);
     
 extern void DPSWriteStringChars(DPSContext ctxt, char *buf,
 				unsigned int count);
@@ -472,7 +460,7 @@ extern DPSContextExtensionRec *DPSRemoveContextExtensionRec(DPSContext ctxt,
 
   /* This procedure removes a context extension record */
 
-extern int DPSGenerateExtensionRecID();
+extern int DPSGenerateExtensionRecID(void);
 
   /* This procedure generates a unique extension record id. */
 
@@ -480,6 +468,4 @@ extern int DPSGenerateExtensionRecID();
 }
 #endif
 
-#endif /* _NO_PROTO */
-
 #endif /* DPSFRIENDS_H */