diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:43 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:43 +0000 |
| commit | 0f274e479e7825d535ab04aeadd475d47e1769a5 (patch) | |
| tree | 4855ac42058589a2f273147802bc76eb3c1cc86f | |
| parent | cccbebfe7ee498cd8beae22831b50d570d623a94 (diff) | |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
| -rw-r--r-- | xdpyinfo.c | 14 | ||||
| -rw-r--r-- | xdpyinfo.man | 2 |
2 files changed, 14 insertions, 2 deletions
@@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.30 2003/11/17 22:20:51 dawes Exp $ */ +/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.29 2003/04/14 20:38:10 herrb Exp $ */ #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -174,6 +174,18 @@ print_display_info(Display *dpy) 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); diff --git a/xdpyinfo.man b/xdpyinfo.man index 07a6e72..ca4326c 100644 --- a/xdpyinfo.man +++ b/xdpyinfo.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xdpyinfo/xdpyinfo.man,v 3.8 2001/12/14 20:01:30 dawes Exp $ +.\" $XFree86: xc/programs/xdpyinfo/xdpyinfo.man,v 3.7 2001/01/27 18:21:11 dawes Exp $ .\" .TH XDPYINFO 1 __xorgversion__ .SH NAME |