Move DMX randr code into dmxrandr.c and dmxrandr.h.

hw/dmx/Makefile.am

@@ -84,6 +84,8 @@ Xdmx_SOURCES = dmx.c \
                dmxlaunch.h \
                dmxcomp.c \
                dmxcomp.h \
+               dmxrandr.c \
+               dmxrandr.h \
                dmxxv.c \
                dmxxv.h \
                $(top_srcdir)/mi/miinitext.c \

hw/dmx/dmxextension.c

@@ -55,7 +55,7 @@
 #include "dmxpict.h"
 #endif
 #ifdef RANDR
-#include "randrstr.h"
+#include "dmxrandr.h"
 #endif
 #include "dmxinput.h"
 #include "dmxsync.h"
@@ -2440,6 +2440,10 @@ int dmxDetachScreen(int idx)
     dmxBEXvScreenFini (screenInfo.screens[idx]);
 #endif
 
+#ifdef RANDR
+    dmxBERRScreenFini (screenInfo.screens[idx]);
+#endif
+
     /* Detach input */
     dmxInputDetachAll(dmxScreen);
 

hw/dmx/dmxrandr.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2008 Novell, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: David Reveman <davidr@novell.com>
+ */
+
+#ifndef DMXRANDR_H
+#define DMXRANDR_H
+
+#include "randrstr.h"
+
+extern Bool dmxRRScreenInit (ScreenPtr pScreen);
+extern void dmxRRCheckScreen (ScreenPtr pScreen);
+extern Bool dmxBERRScreenInit (ScreenPtr pScreen);
+extern void dmxBERRScreenFini (ScreenPtr pScreen);
+
+#endif /* DMXRANDR_H */

hw/dmx/dmxxv.h

@@ -31,5 +31,3 @@ extern void dmxBEXvScreenInit (ScreenPtr pScreen);
 extern void dmxBEXvScreenFini (ScreenPtr pScreen);
 
 #endif /* DMXXV_H */
-
-