Commit efc17535 authored by Andreas Mohr's avatar Andreas Mohr Committed by Alexandre Julliard

Implemented the Desktop=XXXxYYY setting in the [x11drv] section of the

config file.
parent 5394ab83
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
...@@ -113,15 +114,25 @@ static void setup_options(void) ...@@ -113,15 +114,25 @@ static void setup_options(void)
RegSetValueExA( hkey, "display", 0, REG_SZ, Options.display, strlen(Options.display)+1 ); RegSetValueExA( hkey, "display", 0, REG_SZ, Options.display, strlen(Options.display)+1 );
} }
/* --managed option */ /* check and set --managed and --desktop options in wine config file
* if it was not set on command line */
if (!Options.managed) if ((!Options.managed) && (Options.desktopGeometry == NULL))
{ {
count = sizeof(buffer); count = sizeof(buffer);
if (!RegQueryValueExA( hkey, "managed", 0, &type, buffer, &count )) if (!RegQueryValueExA( hkey, "managed", 0, &type, buffer, &count ))
Options.managed = IS_OPTION_TRUE( buffer[0] ); Options.managed = IS_OPTION_TRUE( buffer[0] );
count = sizeof(buffer);
if (!RegQueryValueExA( hkey, "Desktop", 0, &type, buffer, &count ))
Options.desktopGeometry = strdup(buffer);
} }
else RegSetValueExA( hkey, "managed", 0, REG_SZ, "y", 2 );
if (Options.managed)
RegSetValueExA( hkey, "managed", 0, REG_SZ, "y", 2 );
if (Options.desktopGeometry)
RegSetValueExA( hkey, "desktop", 0, REG_SZ, Options.desktopGeometry, strlen(Options.desktopGeometry)+1 );
RegCloseKey( hkey ); RegCloseKey( hkey );
} }
......
...@@ -106,6 +106,8 @@ PerfectGraphics = N ...@@ -106,6 +106,8 @@ PerfectGraphics = N
;;Display = :0.0 ;;Display = :0.0
; Allow the window manager to manage created windows ; Allow the window manager to manage created windows
Managed = N Managed = N
; Use a desktop window of 640x480 for Wine
;Desktop = 640x480
; Use XFree86 DGA extension if present ; Use XFree86 DGA extension if present
UseDGA = Y UseDGA = Y
; Use XShm extension if present ; Use XShm extension if present
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment