mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-05-05 15:48:07 +02:00
allow screen combinations with XWin -query host -screen 0 -screen 1
-multiwindow This gives an xdmcp session and a second screen where i
can display single windows
This commit is contained in:
parent
7134a68c3a
commit
1ec083711c
1 changed files with 7 additions and 1 deletions
|
|
@ -58,6 +58,7 @@ winValidateArgs (void)
|
|||
{
|
||||
int i;
|
||||
int iMaxConsecutiveScreen = 0;
|
||||
BOOL fHasNormalScreen0 = FALSE;
|
||||
|
||||
/*
|
||||
* Check for a malformed set of -screen parameters.
|
||||
|
|
@ -108,6 +109,10 @@ winValidateArgs (void)
|
|||
if (g_ScreenInfo[i].fRootless)
|
||||
++iCount;
|
||||
|
||||
/* Check if the first screen is without rootless and multiwindow */
|
||||
if (iCount == 0 && i == 0)
|
||||
fHasNormalScreen0 = TRUE;
|
||||
|
||||
/* Fail if two or more conflicting options */
|
||||
if (iCount > 1)
|
||||
{
|
||||
|
|
@ -118,7 +123,8 @@ winValidateArgs (void)
|
|||
}
|
||||
|
||||
/* Check for -multiwindow or -mwextwm and Xdmcp */
|
||||
if (g_fXdmcpEnabled
|
||||
/* allow xdmcp if screen 0 is normal. */
|
||||
if (g_fXdmcpEnabled && !fHasNormalScreen0
|
||||
&& (FALSE
|
||||
#ifdef XWIN_MULTIWINDOW
|
||||
|| g_ScreenInfo[i].fMultiWindow
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue