1 files changed, 89 insertions, 22 deletions

diff --git a/include/X11/Xmu/EditresP.h b/include/X11/Xmu/EditresP.h
index 44dfd38..b65b1c1 100644
--- a/include/X11/Xmu/EditresP.h
+++ b/include/X11/Xmu/EditresP.h
@@ -25,6 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86: xc/lib/Xmu/EditresP.h,v 1.6 2001/12/14 19:55:44 dawes Exp $ */
 
 /*
  * Author:  Chris D. Peterson, MIT X Consortium
@@ -43,8 +44,8 @@ in this Software without prior written authorization from The Open Group.
 
   l[0] = timestamp
   l[1] = command atom name
-  l[2] = ident of command.
-  l[3] = protocol version number to use.
+  l[2] = ident of command
+  l[3] = protocol version number to use
 
 
 
@@ -279,43 +280,48 @@ in this Software without prior written authorization from The Open Group.
 #define EDITRES_IS_UNREALIZED 0
 
 /*
- * Format for atoms.
+ * Format for atoms
  */
-
 #define EDITRES_FORMAT             8
 #define EDITRES_SEND_EVENT_FORMAT 32
 
 /*
  * Atoms
  */
-
 #define EDITRES_NAME         "Editres"
 #define EDITRES_COMMAND_ATOM "EditresCommand"
 #define EDITRES_COMM_ATOM    "EditresComm"
 #define EDITRES_CLIENT_VALUE "EditresClientVal"
 #define EDITRES_PROTOCOL_ATOM "EditresProtocol"
 
-typedef enum { SendWidgetTree = 0, 
+typedef enum {
+  SendWidgetTree = 0,
 	       SetValues      = 1,
 	       GetResources   = 2,
 	       GetGeometry    = 3, 
 	       FindChild      = 4,
 	       GetValues      = 5
-	     } EditresCommand;
+} EditresCommand;
 
-typedef enum {NormalResource = 0, ConstraintResource = 1} ResourceType;
+typedef enum {
+  NormalResource     = 0,
+  ConstraintResource = 1
+} ResourceType;
 
 /*
- * The type of a resource identifier.
+ * The type of a resource identifier
  */
-
 typedef unsigned char ResIdent;
 
-typedef enum {PartialSuccess= 0, Failure= 1, ProtocolMismatch= 2} EditResError;
+typedef enum {
+  PartialSuccess   = 0,
+  Failure	   = 1,
+  ProtocolMismatch = 2
+} EditResError;
 
 typedef struct _WidgetInfo {
     unsigned short num_widgets;
-    unsigned long * ids;
+  unsigned long *ids;
     Widget real_widget;
 } WidgetInfo;
 
@@ -325,18 +331,79 @@ typedef struct _ProtocolStream {
 } ProtocolStream;
 
 /************************************************************
- *
- * Function definitions for reading and writing protocol requests.
- *
+ * Function definitions for reading and writing protocol requests
  ************************************************************/
-
 _XFUNCPROTOBEGIN
 
-void _XEditResPutString8(), _XEditResPut8(), _XEditResPut16();
-void _XEditResPut32(), _XEditResPutWidgetInfo(), _XEditResPutWidget();
-void _XEditResResetStream();
-
-Boolean _XEditResGet8(), _XEditResGet16(), _XEditResGetSigned16();
-Boolean _XEditResGet32(), _XEditResGetString8(), _XEditResGetWidgetInfo();
+void _XEditResPutString8
+(
+ ProtocolStream		*stream,
+ char			*str
+ );
+
+void _XEditResPut8
+(
+ ProtocolStream		*stream,
+ unsigned int		value
+ );
+
+void _XEditResPut16
+(
+ ProtocolStream		*stream,
+ unsigned int		value
+ );
+
+void _XEditResPut32
+(
+ ProtocolStream		*stream,
+ unsigned long		value
+ );
+
+void _XEditResPutWidgetInfo
+(
+ ProtocolStream		*stream,
+ WidgetInfo		*info
+ );
+
+void _XEditResResetStream
+(
+ ProtocolStream		*stream
+ );
+
+Bool _XEditResGet8
+(
+ ProtocolStream		*stream,
+ unsigned char		*value
+ );
+
+Bool _XEditResGet16
+(
+ ProtocolStream		*stream,
+ unsigned short		*value
+ );
+
+Bool _XEditResGetSigned16
+(
+ ProtocolStream		*stream,
+ short			*value
+ );
+
+Bool _XEditResGet32
+(
+ ProtocolStream		*stream,
+ unsigned long		*value
+ );
+
+Bool _XEditResGetString8
+(
+ ProtocolStream		*stream,
+ char			**str
+ );
+
+Bool _XEditResGetWidgetInfo
+(
+ ProtocolStream		*stream,
+ WidgetInfo		*info
+ );
 
 _XFUNCPROTOEND