diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml index 4585be04125..7f49ef0c6b5 100644 --- a/documentation/configuring.sgml +++ b/documentation/configuring.sgml @@ -906,7 +906,12 @@ OPTIONAL: x11drv modes of operation - + + + + Note: This is now all done in the config file. Needs an update... + + The x11drv driver consists of two conceptually distinct pieces, the graphics driver (GDI part), and the windowing @@ -1120,6 +1125,33 @@ OPTIONAL: + + TextCP + + + + To be documented... + + + + + XVideoPort + + + + To be documented... + + + + + Synchronous + + + + To be documented... + + + diff --git a/documentation/running.sgml b/documentation/running.sgml index 55a4d2f0b91..a07d991a9a0 100644 --- a/documentation/running.sgml +++ b/documentation/running.sgml @@ -27,16 +27,11 @@ Usage: ./wine [options] program_name [arguments] Options: --debugmsg name Turn debugging-messages on or off - --desktop geom Use a desktop window of the given geometry - --display name Use the specified display --dll name Enable or disable built-in DLLs --dosver x.xx DOS version to imitate (e.g. 6.22) Only valid with --winver win31 --help,-h Show this help message - --language xx Set the language (one of Br,Ca,Cs,Cy,Da,De,En,Eo,Es,Fi,Fr,Ga,Gd,Gv, - Hr,Hu,It,Ja,Ko,Kw,Nl,No,Pl,Pt,Sk,Sv,Ru,Wa) --managed Allow the window manager to manage created windows - --synchronous Turn on synchronous display mode --version,-v Display the Wine version --winver Version to imitate (win95,nt40,win31,nt2k,win98,nt351,win30,win20) @@ -205,83 +200,6 @@ wing wininet winsock winspool wnet x11 x11drv - - --desktop [geometry] - - By default, wine runs applications on - your regular desktop. Wine application windows intermingle - with native X11 applications. Windows overlap each other, - and you can resize them in relation to each other. - Normally, when you minimize Wine windows, they collapse into - a small icon at the lower left corner of your desktop, - circumventing the behavior of your other non-Wine windows. - However, if you're running in - --managed mode, your Wine applications will minimize - just like your other windows. - - - Sometimes, you may want to restrict Wine windows to a - smaller area of your desktop. This is what the - --desktop option controls. Whenever - you pass this option to wine, it will - create a window of that size and use that as Wine's desktop - instead of borrowing the regular desktop space. Wine will - then place the application window inside the new desktop - window. If you minimize the application, it will iconize to - the bottom left corner of its own desktop window. - - - The --desktop option geometry info in - the standard X11 geometry format, e.g., "640x480" for a - desktop window 640 pixels wide and 480 pixels high. You can - also in theory specify the coordinates of the upper left - corner of the desktop window, but your window manager may - choose to override that request. The following invocation - would open a new 640 x 480 desktop window at coordinates - (10, 25): - -$ wine --desktop 640x480+10+25 foo.exe - - - - More commonly, you'll leave off the starting coordinates, - and only use the height and width: - -$ wine --desktop 640x480 foo.exe - - - - - - --display - - By default, wine will display its windows on whichever X - Display you have in the $DISPLAY environment - variable. Often, $DISPLAY is set to - :0, which sends all windows to the - primary video monitor on the current host machine. - - - To send windows to a different monitor on the same system, - you could change :0 to a different - number, for example :1 to send output to - the second monitor. You can also specify other systems. If - you were logged into the system alpha, but wanted wine to - run on another system on the network, beta, you might use a - $DISPLAY of beta:0. - - - You can also declare display values on the wine command - line, using the --display option. - The last example above might look like this: - - -$ wine --display="beta:0" foo.exe - - - --dll @@ -303,13 +221,6 @@ wing wininet winsock winspool wnet x11 x11drv - - --language - - - - - --managed @@ -317,13 +228,6 @@ wing wininet winsock winspool wnet x11 x11drv - - --synchronous - - - - - --version