Remove the --managed option, and make wine use the managed mode by

default.

dlls/x11drv/event.c

@@ -376,12 +376,11 @@ static void EVENT_FocusIn( HWND hWnd, XFocusChangeEvent *event )
 
     bIsDisabled = GetWindowLongA( hWnd, GWL_STYLE ) & WS_DISABLED;
 
-    /* If the window has been disabled and we are in managed mode,
-       * revert the X focus back to the last focus window. This is to disallow
-       * the window manager from switching focus away while the app is
-       * in a modal state.
-       */
-    if ( Options.managed && bIsDisabled && glastXFocusWin)
+    /* If the window has been disabled, revert the X focus back to the last
+     * focus window. This is to disallow the window manager from switching 
+     * focus away while the app is in a modal state.
+     */
+    if (bIsDisabled && glastXFocusWin)
     {
         /* Change focus only if saved focus window is registered and viewable */
         wine_tsx11_lock();

dlls/x11drv/window.c

@@ -74,8 +74,6 @@ static LPCSTR icon_window_atom;
  */
 inline static BOOL is_window_managed( WND *win )
 {
-    if (!Options.managed) 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

@@ -224,14 +224,6 @@ static void setup_options(void)
         putenv( strdup(buffer) );
     }
 
-    /* check --managed option in wine config file if it was not set on command line */
-
-    if (!Options.managed)
-    {
-        if (!get_config_key( hkey, appkey, "Managed", buffer, sizeof(buffer) ))
-            Options.managed = IS_OPTION_TRUE( buffer[0] );
-    }
-
     if (!get_config_key( hkey, appkey, "Desktop", buffer, sizeof(buffer) ))
     {
         /* Imperfect validation:  If Desktop=N, then we don't turn on
@@ -356,10 +348,7 @@ static void process_attach(void)
     screen_height = HeightOfScreen( screen );
 
     if (desktop_geometry)
-    {
-        Options.managed = FALSE;
         root_window = X11DRV_create_desktop( desktop_vi, desktop_geometry );
-    }
 
     /* initialize GDI */
     if(!X11DRV_GDI_Initialize( display ))

documentation/wine.man.in

@@ -161,10 +161,6 @@ Specify the DOS version
 should imitate (e.g. 6.22) This option
 is only valid when used in conjunction with --winver win31.
 .TP
-.I --managed
-Create each top-level window as a properly managed X window instead of
-creating our own "sticky" window.
-.TP
 .I --winver version
 Specify which Windows version 
 .B wine 
@@ -205,7 +201,7 @@ by
 For example, if you want to execute 
 .B wine 
 with the options 
-.I --managed --dll riched32=n
+.I --dll riched32=n
 and if 
 .B wine 
 should run the program 
@@ -215,7 +211,7 @@ with the arguments
 , then you could use the following command line to invoke 
 .B wine:
 .PP
-.I wine --managed --dll riched32=n -- myapp.exe --display 3d somefile
+.I wine --dll riched32=n -- myapp.exe --display 3d somefile
 .PP 
 Note that in contrast to previous versions of 
 .B wine, 

graphics/x11drv/graphics.c

@@ -1316,7 +1316,7 @@ BOOL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp )
        Window root;
        int x, y, w, h, border, depth;
 
-       /* FIXME: this is not correct for managed windows */
+       FIXME("this is not correct for managed windows");
        TSXGetGeometry( gdi_display, physDev->drawable, &root,
                        &x, &y, &w, &h, &border, &depth );
        lpp->x = x;

include/options.h

@@ -23,12 +23,6 @@
 
 #include "windef.h"
 
-struct options
-{
-    int    managed;	    /* Managed windows */
-};
-
-extern struct options Options;
 extern const char *argv0;
 extern const char *full_argv0;
 extern unsigned int server_startticks;

misc/options.c

@@ -40,12 +40,6 @@ struct option_descr
     const char *usage;
 };
 
-/* default options */
-struct options Options =
-{
-    FALSE           /* Managed windows */
-};
-
 const char *argv0;       /* the original argv[0] */
 const char *full_argv0;  /* the full path of argv[0] (if known) */
 
@@ -60,7 +54,6 @@ static void out_of_memory(void)
 
 static void do_debugmsg( const char *arg );
 static void do_help( const char *arg );
-static void do_managed( const char *arg );
 static void do_version( const char *arg );
 
 static const struct option_descr option_table[] =
@@ -74,8 +67,6 @@ static const struct option_descr option_table[] =
       "                    Only valid with --winver win31" },
     { "help",       'h', 0, 0, do_help,
       "--help,-h        Show this help message" },
-    { "managed",      0, 0, 0, do_managed,
-      "--managed        Allow the window manager to manage created windows" },
     { "version",    'v', 0, 0, do_version,
       "--version,-v     Display the Wine version" },
     { "winver",       0, 1, 1, VERSION_ParseWinVersion,
@@ -95,11 +86,6 @@ static void do_version( const char *arg )
     ExitProcess(0);
 }
 
-static void do_managed( const char *arg )
-{
-    Options.managed = TRUE;
-}
-
 static void do_debugmsg( const char *arg )
 {
     static const char * const debug_class_names[__WINE_DBCL_COUNT] = { "fixme", "err", "warn", "trace" };