Restored managed mode config file option.

dlls/x11drv/window.c

@@ -38,7 +38,6 @@
 #include "win.h"
 #include "winpos.h"
 #include "dce.h"
-#include "options.h"
 #include "hook.h"
 #include "mwm.h"
 
@@ -74,6 +73,7 @@ static LPCSTR icon_window_atom;
  */
 inline static BOOL is_window_managed( WND *win )
 {
+    if (!managed_mode) return FALSE;
     /* tray window is always managed */
     if (win->dwExStyle & WS_EX_TRAYWINDOW) return TRUE;
     /* child windows are not managed */

dlls/x11drv/x11drv_main.c

@@ -39,7 +39,6 @@
 #include "wine/debug.h"
 #include "gdi.h"
 #include "file.h"
-#include "options.h"
 #include "user.h"
 #include "win.h"
 #include "wine_gl.h"
@@ -61,6 +60,7 @@ unsigned int screen_height;
 unsigned int screen_depth;
 Window root_window;
 int dxgrab, usedga, usexvidmode;
+int managed_mode = 1;
 
 unsigned int X11DRV_server_startticks;
 
@@ -232,6 +232,9 @@ static void setup_options(void)
         if (!IS_OPTION_FALSE(buffer[0])) desktop_geometry = strdup(buffer);
     }
 
+    if (!get_config_key( hkey, appkey, "Managed", buffer, sizeof(buffer) ))
+        managed_mode = IS_OPTION_TRUE( buffer[0] );
+
     if (!get_config_key( hkey, appkey, "DXGrab", buffer, sizeof(buffer) ))
         dxgrab = IS_OPTION_TRUE( buffer[0] );
 

include/x11drv.h

@@ -351,6 +351,7 @@ extern unsigned int screen_width;
 extern unsigned int screen_height;
 extern unsigned int screen_depth;
 extern unsigned int text_caps;
+extern int managed_mode;
 
 extern Atom wmProtocols;
 extern Atom wmDeleteWindow;