[xorg-commit-diffs] xc/programs/xdpyinfo Imakefile, 1.1.4.4, 1.1.4.5 xdpyinfo.c, 1.1.4.5, 1.1.4.6

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/xdpyinfo
In directory pdx:/home/eich/tstbuild/xc/programs/xdpyinfo

Modified Files:
      Tag: XORG-CURRENT
	Imakefile xdpyinfo.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xdpyinfo/Imakefile,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/Imakefile	5 Mar 2004 13:41:21 -0000	1.1.4.4
+++ b/Imakefile	15 Apr 2004 10:17:40 -0000	1.1.4.5
@@ -53,7 +53,7 @@
 #endif
 
 #if BuildXineramaLibrary
-   XINERAMADEFINES = -DXINERAMA
+   XINERAMADEFINES = -DPANORAMIX
       XINERAMALIBS = $(XINERAMALIB)
 #endif
 

Index: xdpyinfo.c
===================================================================
RCS file: /cvs/xorg/xc/programs/xdpyinfo/xdpyinfo.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/xdpyinfo.c	5 Mar 2004 13:41:21 -0000	1.1.4.5
+++ b/xdpyinfo.c	15 Apr 2004 10:17:41 -0000	1.1.4.6
@@ -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);