[Dotgnu-pnet-commits] pnetlib/Xsharp Display.cs, 1.13, 1.14 Xlib.cs.in, 1.17, 1.18 XsharpSupport.c, 1.24, 1.25

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/Xsharp
In directory subversions:/tmp/cvs-serv26525/Xsharp

Modified Files:
        Display.cs Xlib.cs.in XsharpSupport.c 
Log Message:


Detect when XsharpSupport has been compiled incorrectly and
complain louder about it.


Index: XsharpSupport.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/XsharpSupport.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** XsharpSupport.c     29 Nov 2003 00:49:13 -0000      1.24
--- XsharpSupport.c     29 Nov 2003 10:34:54 -0000      1.25
***************
*** 53,56 ****
--- 53,61 ----
  #include <string.h>
  
+ int XSharpSupportPresent(void)
+ {
+       return 1;
+ }
+ 
  int XNextEventWithTimeout(Display *dpy, XEvent *event, int timeout)
  {
***************
*** 1372,1375 ****
--- 1377,1385 ----
  
  #else /* X_DISPLAY_MISSING || !HAVE_SELECT */
+ 
+ int XSharpSupportPresent(void)
+ {
+       return 0;
+ }
  
  int XNextEventWithTimeout(void *dpy, void *event, int timeout)

Index: Xlib.cs.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/Xlib.cs.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Xlib.cs.in  25 Nov 2003 22:24:45 -0000      1.17
--- Xlib.cs.in  29 Nov 2003 10:34:54 -0000      1.18
***************
*** 528,531 ****
--- 528,534 ----
  
        [DllImport("XsharpSupport")]
+       extern public static @X_int@ XSharpSupportPresent();
+ 
+       [DllImport("XsharpSupport")]
        extern public static @X_int@ XNextEventWithTimeout
                        (IntPtr display, out XEvent xevent, @X_int@ timeout);

Index: Display.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/Display.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Display.cs  21 Nov 2003 03:40:42 -0000      1.13
--- Display.cs  29 Nov 2003 10:34:54 -0000      1.14
***************
*** 150,153 ****
--- 150,165 ----
                                try
                                {
+                                       if(Xlib.XSharpSupportPresent() == 0)
+                                       {
+                                               Console.WriteLine();
+                                               Console.WriteLine
+                                                       ("The XsharpSupport 
library appears to have " +
+                                                        "been built without X 
support.");
+                                               Console.WriteLine
+                                                       ("Please rebuild 
pnetlib to rectify this problem.");
+                                               Console.WriteLine();
+                                               throw new 
XCannotConnectException
+                                                       
(S._("X_LibraryNotPresent"));
+                                       }
                                        try
                                        {