Index: data/rc.xsd
===================================================================
RCS file: /cvs/cvsroot/openbox/data/rc.xsd,v
retrieving revision 1.15
diff -u -u -r1.15 rc.xsd
--- data/rc.xsd	4 Sep 2004 19:45:38 -0000	1.15
+++ data/rc.xsd	28 Oct 2004 16:20:03 -0000
@@ -113,6 +113,7 @@
             <xs:element name="drawContents" type="ob:yesorno"/>
             <xs:element name="popupShow" type="ob:popupshow"/>
             <xs:element name="popupPosition" type="ob:popupposition"/>
+            <xs:element name="xineramaFullscreen" type="ob:yesorno"/>
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="dock">
Index: openbox/client.c
===================================================================
RCS file: /cvs/cvsroot/openbox/openbox/client.c,v
retrieving revision 1.329
diff -u -u -r1.329 client.c
--- openbox/client.c	21 Oct 2004 20:54:59 -0000	1.329
+++ openbox/client.c	28 Oct 2004 16:20:17 -0000
@@ -1957,6 +1957,7 @@
 
 #ifdef VIDMODE
         if (i == 0 && /* primary head */
+	    config_resize_xinerama_fullscreen &&
             extensions_vidmode &&
             XF86VidModeGetViewPort(ob_display, ob_screen, &x, &y) &&
             /* get the mode last so the mode.privsize isnt freed incorrectly */
Index: openbox/config.c
===================================================================
RCS file: /cvs/cvsroot/openbox/openbox/config.c,v
retrieving revision 1.84
diff -u -u -r1.84 config.c
--- openbox/config.c	6 Oct 2004 12:42:46 -0000	1.84
+++ openbox/config.c	28 Oct 2004 16:20:17 -0000
@@ -45,6 +45,7 @@
 gboolean config_resize_redraw;
 gint     config_resize_popup_show;
 gint     config_resize_popup_pos;
+gboolean config_resize_xinerama_fullscreen;
 
 ObStackingLayer config_dock_layer;
 gboolean        config_dock_floating;
@@ -315,6 +316,8 @@
         else if (parse_contains("Center", doc, n))
             config_resize_popup_pos = 0;
     }
+    if ((n = parse_find_node("xineramaFullscreen", node)))
+        config_resize_xinerama_fullscreen = parse_bool(doc, n);
 }
 
 static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -558,6 +561,7 @@
     config_resize_redraw = TRUE;
     config_resize_popup_show = 1; /* nonpixel increments */
     config_resize_popup_pos = 0;  /* center of client */
+    config_resize_xinerama_fullscreen = TRUE;
 
     parse_register(i, "resize", parse_resize, NULL);
 
Index: openbox/config.h
===================================================================
RCS file: /cvs/cvsroot/openbox/openbox/config.h,v
retrieving revision 1.52
diff -u -u -r1.52 config.h
--- openbox/config.h	6 Oct 2004 12:42:46 -0000	1.52
+++ openbox/config.h	28 Oct 2004 16:20:17 -0000
@@ -50,6 +50,8 @@
 extern gint config_resize_popup_show;
 /*! where to show the popup, currently above the window or centered */
 extern gint config_resize_popup_pos;
+/*! expand fullscreen windows across all monitors */
+extern gboolean config_resize_xinerama_fullscreen;
 
 /*! The stacking layer the dock will reside in */
 extern ObStackingLayer config_dock_layer;