Move Xeviestr.h to evieproto.h for consistency with other modules.

A stub Xeviestr.h is provided to avoid breaking clients.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

3 files changed, 168 insertions, 164 deletions

diff --git a/Makefile.am b/Makefile.am
index b918dfd..5b4a727 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 eviedir = $(includedir)/X11/extensions
 evie_HEADERS = \
+	evieproto.h \
 	Xeviestr.h
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/Xeviestr.h b/Xeviestr.h
index b172ee7..78871f1 100644
--- a/Xeviestr.h
+++ b/Xeviestr.h
@@ -1,164 +1,3 @@
-/************************************************************          
-                                                                       
-Copyright 2003 Sun Microsystems, Inc.                                  
-                                                                       
-All rights reserved.                                                   
-                                                                       
-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, and/or sell copies of the Software, and to permit persons  
-to whom the Software is furnished to do so, provided that the above    
-copyright notice(s) and this permission notice appear in all copies of 
-the Software and that both the above copyright notice(s) and this      
-permission notice appear in supporting documentation.                  
-                                                                       
-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  
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR       
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.                          
-                                                                       
-Except as contained in this notice, the name of a copyright holder     
-shall not be used in advertising or otherwise to promote the sale, use 
-or other dealings in this Software without prior written authorization 
-of the copyright holder.                                               
-                                                                       
-************************************************************/          
-                                                                       
-#ifndef _XEVIESTR_H_                                                   
-#define _XEVIESTR_H_                                                   
-
-#define XEVIENAME "XEVIE"                                              
-                                                                       
-#define XEVIE_MAJOR_VERSION 1                                          
-#define XEVIE_MINOR_VERSION 0                                          
-
-#define X_XevieQueryVersion			0
-#define X_XevieStart				1
-#define X_XevieEnd				2
-#define X_XevieSend				3
-#define X_XevieSelectInput			4
-
-#define XevieNumberErrors			0
-
-typedef struct _XevieQueryVersion {                                    
-    CARD8   reqType;                                                   
-    CARD8   xevieReqType;                                              
-    CARD16  length B16;                                                
-    CARD16  client_major_version B16;                                  
-    CARD16  client_minor_version B16;                                  
-} xXevieQueryVersionReq;                                               
-#define sz_xXevieQueryVersionReq            8                          
-                                                                       
-typedef struct {                                                       
-    BYTE    type;                                                      
-    BOOL    pad1;                                                      
-    CARD16  sequence_number B16;                                       
-    CARD32  length B32;                                                
-    CARD16  server_major_version B16;                                  
-    CARD16  server_minor_version B16;                                  
-    CARD32  pad2 B32;                                                  
-    CARD32  pad3 B32;                                                  
-    CARD32  pad4 B32;                                                  
-    CARD32  pad5 B32;                                                  
-    CARD32  pad6 B32;                                                  
-} xXevieQueryVersionReply;                                             
-#define sz_xXevieQueryVersionReply  32                                 
-                                                                       
-typedef struct _XevieStart {                                           
-    CARD8   reqType;                                                   
-    CARD8   xevieReqType;                                              
-    CARD16  length B16;                                                
-    CARD32  screen B32;                                                
-} xXevieStartReq;                                                      
-#define sz_xXevieStartReq 8                                            
-                                                                       
-typedef struct {                                                       
-    BYTE    type;                                                      
-    BOOL    pad1;                                                      
-    CARD16  sequence_number B16;                                       
-    CARD32  length B32;                                                
-    CARD32  pad2 B32;                                                  
-    CARD32  pad3 B32;                                                  
-    CARD32  pad4 B32;                                                  
-    CARD32  pad5 B32;                                                  
-    CARD32  pad6 B32;                                                  
-    CARD32  pad7 B32;                                                  
-} xXevieStartReply;                                                    
-#define sz_xXevieStartReply         32                                 
-                                                                       
-typedef struct _XevieEnd {                                             
-    CARD8   reqType;                                                   
-    CARD8   xevieReqType;                                              
-    CARD16  length B16;                                                
-    CARD32  cmap B32;                                                  
-} xXevieEndReq;                                                        
-#define sz_xXevieEndReq             8                                  
-                                                                       
-typedef struct {                                                       
-    BYTE    type;           /* X_Reply */                              
-    BOOL    pad1;                                                      
-    CARD16  sequence_number B16;                                       
-    CARD32  length B32;                                                
-    CARD32  pad2 B32;                                                  
-    CARD32  pad3 B32;                                                  
-    CARD32  pad4 B32;                                                  
-    CARD32  pad5 B32;                                                  
-    CARD32  pad6 B32;                                                  
-    CARD32  pad7 B32;                                                  
-} xXevieEndReply;                                                      
-#define sz_xXevieEndReply   32                                         
-                                                                       
-typedef struct _XevieSend {                                            
-    CARD8       reqType;                                               
-    CARD8       xevieReqType;                                          
-    CARD16      length B16;                                            
-    xEvent      event;                                                 
-    CARD32      dataType B32;                                          
-} xXevieSendReq;                                                       
-#define sz_xXevieSendReq           104                                 
-                                                                       
-typedef struct {                                                       
-    BYTE        type;                                                  
-    BOOL        pad1;                                                  
-    CARD16      sequence_number B16;                                   
-    CARD32      length B32;                                            
-    CARD32      pad2 B32;                                              
-    CARD32      pad3 B32;                                              
-    CARD32      pad4 B32;                                              
-    CARD32      pad5 B32;                                              
-    CARD32      pad6 B32;                                              
-    CARD32      pad7 B32;                                              
-} xXevieSendReply;                                                     
-#define sz_xXevieSendReply        32                                   
-                                                                       
-typedef struct _XevieSelectInput {                                     
-    CARD8  reqType;                                                    
-    CARD8  xevieReqType;                                               
-    CARD16      length B16;                                            
-    CARD32 event_mask B32;                                             
-} xXevieSelectInputReq;                                                
-#define sz_xXevieSelectInputReq          8                             
-                                                                       
-typedef struct {                                                       
-    BYTE   type;                                                       
-    BOOL   pad1;                                                       
-    CARD16 sequence_number B16;                                        
-    CARD32 length B32;                                                 
-    CARD32 pad2 B32;                                                   
-    CARD32 pad3 B32;                                                   
-    CARD32 pad4 B32;                                                   
-    CARD32 pad5 B32;                                                   
-    CARD32 pad6 B32;                                                   
-    CARD32 pad7 B32;                                                   
-} xXevieSelectInputReply;                                              
-#define sz_xXevieSelectInputReply        32                            
-                                                                       
-#endif /* } _XEVIESTR_H_ */                                            
-                                                                       
+#warning "Xeviestr.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/evieproto.h> for the protocol defines."
+#include <X11/extensions/evieproto.h>
diff --git a/evieproto.h b/evieproto.h
new file mode 100644
index 0000000..e006cb1
--- /dev/null
+++ b/evieproto.h
@@ -0,0 +1,164 @@
+/************************************************************          
+                                                                       
+Copyright 2003 Sun Microsystems, Inc.                                  
+                                                                       
+All rights reserved.                                                   
+                                                                       
+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, and/or sell copies of the Software, and to permit persons  
+to whom the Software is furnished to do so, provided that the above    
+copyright notice(s) and this permission notice appear in all copies of 
+the Software and that both the above copyright notice(s) and this      
+permission notice appear in supporting documentation.                  
+                                                                       
+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  
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR       
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.                          
+                                                                       
+Except as contained in this notice, the name of a copyright holder     
+shall not be used in advertising or otherwise to promote the sale, use 
+or other dealings in this Software without prior written authorization 
+of the copyright holder.                                               
+                                                                       
+************************************************************/          
+                                                                       
+#ifndef _XEVIEPROTO_H_                                                   
+#define _XEVIEPROTO_H_                                                   
+
+#define XEVIENAME "XEVIE"                                              
+                                                                       
+#define XEVIE_MAJOR_VERSION 1                                          
+#define XEVIE_MINOR_VERSION 0                                          
+
+#define X_XevieQueryVersion			0
+#define X_XevieStart				1
+#define X_XevieEnd				2
+#define X_XevieSend				3
+#define X_XevieSelectInput			4
+
+#define XevieNumberErrors			0
+
+typedef struct _XevieQueryVersion {                                    
+    CARD8   reqType;                                                   
+    CARD8   xevieReqType;                                              
+    CARD16  length B16;                                                
+    CARD16  client_major_version B16;                                  
+    CARD16  client_minor_version B16;                                  
+} xXevieQueryVersionReq;                                               
+#define sz_xXevieQueryVersionReq            8                          
+                                                                       
+typedef struct {                                                       
+    BYTE    type;                                                      
+    BOOL    pad1;                                                      
+    CARD16  sequence_number B16;                                       
+    CARD32  length B32;                                                
+    CARD16  server_major_version B16;                                  
+    CARD16  server_minor_version B16;                                  
+    CARD32  pad2 B32;                                                  
+    CARD32  pad3 B32;                                                  
+    CARD32  pad4 B32;                                                  
+    CARD32  pad5 B32;                                                  
+    CARD32  pad6 B32;                                                  
+} xXevieQueryVersionReply;                                             
+#define sz_xXevieQueryVersionReply  32                                 
+                                                                       
+typedef struct _XevieStart {                                           
+    CARD8   reqType;                                                   
+    CARD8   xevieReqType;                                              
+    CARD16  length B16;                                                
+    CARD32  screen B32;                                                
+} xXevieStartReq;                                                      
+#define sz_xXevieStartReq 8                                            
+                                                                       
+typedef struct {                                                       
+    BYTE    type;                                                      
+    BOOL    pad1;                                                      
+    CARD16  sequence_number B16;                                       
+    CARD32  length B32;                                                
+    CARD32  pad2 B32;                                                  
+    CARD32  pad3 B32;                                                  
+    CARD32  pad4 B32;                                                  
+    CARD32  pad5 B32;                                                  
+    CARD32  pad6 B32;                                                  
+    CARD32  pad7 B32;                                                  
+} xXevieStartReply;                                                    
+#define sz_xXevieStartReply         32                                 
+                                                                       
+typedef struct _XevieEnd {                                             
+    CARD8   reqType;                                                   
+    CARD8   xevieReqType;                                              
+    CARD16  length B16;                                                
+    CARD32  cmap B32;                                                  
+} xXevieEndReq;                                                        
+#define sz_xXevieEndReq             8                                  
+                                                                       
+typedef struct {                                                       
+    BYTE    type;           /* X_Reply */                              
+    BOOL    pad1;                                                      
+    CARD16  sequence_number B16;                                       
+    CARD32  length B32;                                                
+    CARD32  pad2 B32;                                                  
+    CARD32  pad3 B32;                                                  
+    CARD32  pad4 B32;                                                  
+    CARD32  pad5 B32;                                                  
+    CARD32  pad6 B32;                                                  
+    CARD32  pad7 B32;                                                  
+} xXevieEndReply;                                                      
+#define sz_xXevieEndReply   32                                         
+                                                                       
+typedef struct _XevieSend {                                            
+    CARD8       reqType;                                               
+    CARD8       xevieReqType;                                          
+    CARD16      length B16;                                            
+    xEvent      event;                                                 
+    CARD32      dataType B32;                                          
+} xXevieSendReq;                                                       
+#define sz_xXevieSendReq           104                                 
+                                                                       
+typedef struct {                                                       
+    BYTE        type;                                                  
+    BOOL        pad1;                                                  
+    CARD16      sequence_number B16;                                   
+    CARD32      length B32;                                            
+    CARD32      pad2 B32;                                              
+    CARD32      pad3 B32;                                              
+    CARD32      pad4 B32;                                              
+    CARD32      pad5 B32;                                              
+    CARD32      pad6 B32;                                              
+    CARD32      pad7 B32;                                              
+} xXevieSendReply;                                                     
+#define sz_xXevieSendReply        32                                   
+                                                                       
+typedef struct _XevieSelectInput {                                     
+    CARD8  reqType;                                                    
+    CARD8  xevieReqType;                                               
+    CARD16      length B16;                                            
+    CARD32 event_mask B32;                                             
+} xXevieSelectInputReq;                                                
+#define sz_xXevieSelectInputReq          8                             
+                                                                       
+typedef struct {                                                       
+    BYTE   type;                                                       
+    BOOL   pad1;                                                       
+    CARD16 sequence_number B16;                                        
+    CARD32 length B32;                                                 
+    CARD32 pad2 B32;                                                   
+    CARD32 pad3 B32;                                                   
+    CARD32 pad4 B32;                                                   
+    CARD32 pad5 B32;                                                   
+    CARD32 pad6 B32;                                                   
+    CARD32 pad7 B32;                                                   
+} xXevieSelectInputReply;                                              
+#define sz_xXevieSelectInputReply        32                            
+                                                                       
+#endif /* } _XEVIEPROTO_H_ */                                          
+