andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/xwin: Enable RANDR resize by default

Browse Source 
Also fix erroneous use of '--resize' not '-resize', and document '-noresize' in man page

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2012-01-04 17:40:14 +00:00
parent 4445806732
commit 19d875187a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwin/InitOutput.c
View File

@ -807,7 +807,7 @@ winUseMsg(void)
ErrorF("-resize=none|scrollbars|randr" ErrorF("-resize=none|scrollbars|randr"
"\tIn windowed mode, [don't] allow resizing of the window. 'scrollbars'\n" "\tIn windowed mode, [don't] allow resizing of the window. 'scrollbars'\n"
"\tmode gives the window scrollbars as needed, 'randr' mode uses the RANR\n" "\tmode gives the window scrollbars as needed, 'randr' mode uses the RANR\n"
"\textension to resize the X screen.\n"); "\textension to resize the X screen. 'randr' is the default.\n");
ErrorF("-rootless\n" "\tRun the server in rootless mode.\n"); ErrorF("-rootless\n" "\tRun the server in rootless mode.\n");

10
hw/xwin/man/XWin.man
View File

@ -121,14 +121,16 @@ Alternative name for \fB\-resize=scrollbars\fP.
.SH OPTIONS CONTROLLING RESIZE BEHAVIOUR .SH OPTIONS CONTROLLING RESIZE BEHAVIOUR
.TP 8 .TP 8
.B \-resize[=none|scrollbars|randr] .B \-resize[=none|scrollbars|randr]
Select the resize mode of an X screen. Select the resize mode of an X screen. The default is randr.
.RS .RS
.IP \fB\-resize=none\fP 8 .IP \fB\-resize=none\fP 8
(default). The screen is not resizable. The screen is not resizable.
In windowed mode, if the window has decorations, a fixed frame is used. In windowed mode, if the window has decorations, a fixed frame is used.
Alternative name is \fB\-noresize\fP.
.IP \fB\-resize=scrollbars\fP 8 .IP \fB\-resize=scrollbars\fP 8
The screen window is resizeable, but the screen is not resizable. The screen window is resizeable, but the screen is not resizable.
@ -159,8 +161,8 @@ of the X screen using the RANDR extension is not permitted.
The maximum dimensions of the screen are the dimensions of the \fIWindows\fP virtual desktop. The maximum dimensions of the screen are the dimensions of the \fIWindows\fP virtual desktop.
.IP \fB\--resize\fP 8 .IP \fB\-resize\fP 8
on its own is equivalent to \fB\--resize=randr\fP on its own is equivalent to \fB\-resize=randr\fP
.RE .RE
.SH OPTIONS CONTROLLING WINDOWS INTEGRATION .SH OPTIONS CONTROLLING WINDOWS INTEGRATION

2
hw/xwin/winprocarg.c
View File

@ -142,7 +142,7 @@ winInitializeScreenDefaults(void)
#endif #endif
defaultScreenInfo.fMultipleMonitors = FALSE; defaultScreenInfo.fMultipleMonitors = FALSE;
defaultScreenInfo.fLessPointer = FALSE; defaultScreenInfo.fLessPointer = FALSE;
defaultScreenInfo.iResizeMode = notAllowed; defaultScreenInfo.iResizeMode = resizeWithRandr;
defaultScreenInfo.fNoTrayIcon = FALSE; defaultScreenInfo.fNoTrayIcon = FALSE;
defaultScreenInfo.iE3BTimeout = WIN_E3B_DEFAULT; defaultScreenInfo.iE3BTimeout = WIN_E3B_DEFAULT;
defaultScreenInfo.fUseWinKillKey = WIN_DEFAULT_WIN_KILL; defaultScreenInfo.fUseWinKillKey = WIN_DEFAULT_WIN_KILL;