[xorg-commit-diffs] xc/programs/xdpyinfo xdpyinfo.c, 1.1.4.4.2.1, 1.1.4.4.2.1.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/xdpyinfo
In directory pdx:/tmp/cvs-serv7662/xc/programs/xdpyinfo

Modified Files:
      Tag: XPRINT
	xdpyinfo.c 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: xdpyinfo.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xdpyinfo/xdpyinfo.c,v
retrieving revision 1.1.4.4.2.1
retrieving revision 1.1.4.4.2.1.6.1
diff -u -d -r1.1.4.4.2.1 -r1.1.4.4.2.1.6.1
--- a/xdpyinfo.c	4 Mar 2004 17:48:56 -0000	1.1.4.4.2.1
+++ b/xdpyinfo.c	10 Apr 2004 09:05:49 -0000	1.1.4.4.2.1.6.1
@@ -174,6 +174,18 @@
 	printf("\n");
     }
 
+    if (strstr(ServerVendor (dpy), "X.Org")) {
+	int vendrel = VendorRelease(dpy);
+
+	printf("X.Org version: ");
+	printf("%d.%d.%d", vendrel / 10000000,
+	       (vendrel /   100000) % 100,
+	       (vendrel /     1000) % 100);
+	if (vendrel % 1000)
+	    printf(".%d", vendrel % 1000);
+	printf("\n");
+    }
+
     req_size = XExtendedMaxRequestSize (dpy);
     if (!req_size) req_size = XMaxRequestSize (dpy);
     printf ("maximum request size:  %ld bytes\n", req_size * 4);