Xrandr

[Alexander Gottwald <Alexander dot Gottwald at informatik dot tu-chemnitz dot de>]

Since Xrandr is new in the CVS tree and it was not prepared to compile on
cygwin, I've done some changes, to get the libs tree compiling again.


--------------8<-------------
Index: X11.tmpl
===================================================================
RCS file: /cvs/xc/config/cf/X11.tmpl,v
retrieving revision 1.120
diff -U3 -r1.120 X11.tmpl
--- X11.tmpl	2001/06/18 21:28:49	1.120
+++ X11.tmpl	2001/07/27 07:54:59
@@ -1663,7 +1663,7 @@
 #endif
 
 #if BuildRandRLibrary
-#ifndef SharedLibXandr
+#ifndef SharedLibXrandr
 #define SharedLibXrandr		HasSharedLibraries
 #endif
 #ifndef NormalLibXrandr
Index: cygwin.rules
===================================================================
RCS file: /cvs/xc/config/cf/cygwin.rules,v
retrieving revision 3.12
diff -U3 -r3.12 cygwin.rules
--- cygwin.rules	2001/06/25 11:02:26	3.12
+++ cygwin.rules	2001/07/27 07:56:02
@@ -26,6 +26,7 @@
 #define SharedLibDps		YES
 #define SharedLibDpsTk		YES
 #define SharedLibGlu		YES
+#define SharedLibXrandr		YES
 #ifndef SharedDataSeparation
 #define SharedDataSeparation	NO
 #endif
Index: cygwin.tmpl
===================================================================
RCS file: /cvs/xc/config/cf/cygwin.tmpl,v
retrieving revision 3.6
diff -U3 -r3.6 cygwin.tmpl
--- cygwin.tmpl	2001/06/25 08:12:30	3.6
+++ cygwin.tmpl	2001/07/27 07:56:02
@@ -29,6 +29,7 @@
 #define SharedXrenderReqs $(LDPRELIB) $(EXTENSIONLIB) $(XLIB)
 #define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
 #define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
+#define SharedXrandrReqs $(LDPRELIB) $(XLIB)
 
 
 #ifndef FixupLibReferences
-----------------8<-----------
And Xrandr-def.cpp (hope this is correct)

LIBRARY Xrandr
VERSION LIBRARY_VERSION
EXPORTS
 XRRQueryExtension
 XRRQueryVersion
 XRRGetScreenInfo
 XRRFreeScreenInfo
 XRRSetScreenConfig
 XRRSizes
 XRRScreenChangeSelectInput
 XRRVisualIDToVisual
 XRRVisualToDepth
 XRRTimes
 XRRCurrentConfig
 XRRRootToScreen
 XRRRotations

For getting the programs tree to compile again, I had to make bigger changes:

Index: Xrandr.h
===================================================================
RCS file: /cvs/xc/lib/Xrandr/Xrandr.h,v
retrieving revision 1.6
diff -U3 -r1.6 Xrandr.h
--- Xrandr.h    2001/06/11 01:37:53     1.6
+++ Xrandr.h    2001/07/27 08:15:04
@@ -26,7 +26,7 @@
 #ifndef _XRANDR_H_
 #define _XRANDR_H_
 
-#include "randr.h"
+#include "extensions/randr.h"
 
 typedef struct {
     int            nvisuals;
-------------8<------------

I think the extra header file is just for development, since it's placed
only in xc/include/extensions which will not be installed on client systems.
So the Xrandr.h will always be broken when used outside the xc tree.

Index: Imake.tmpl
===================================================================
RCS file: /cvs/xc/config/cf/Imake.tmpl,v
retrieving revision 3.103
diff -U3 -r3.103 Imake.tmpl
--- Imake.tmpl	2001/07/24 08:32:59	3.103
+++ Imake.tmpl	2001/07/27 08:19:52
@@ -1673,7 +1673,7 @@
 #  define TopInclude	/**/
 # endif
 #else
-# define TopInclude	-I$(TOP)
+# define TopInclude	-I$(TOP)/include
 #endif
       CDEBUGFLAGS = DefaultCDebugFlags
         CCOPTIONS = DefaultCCOptions	/* to distinguish from param flags */
-------------------8<--------------
I don't know why this worked before, but using the topdir as include search
path is strange. But maybe I missed something and this is correct...

I hope this were all changes and I forgot no changes.

bye
    ago
-- 
Alexander.Gottwald@s1999.tu-chemnitz.de
http://www.gotti.org
phone: +49 3725 3498080     mobile: +49 172 7854017