Patch: -multiplemonitors is default, -nomultiplemnoitors added

Patch: -multiplemonitors is default, -nomultiplemnoitors added

[Øyvind Harboe]

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

Ref. earlier post, here is the patch.

http://sources.redhat.com/ml/cygwin-xfree/2004-01/msg00160.html

I compiled&tested; works on my rocket.


Øyvind


[-- Attachment #2: multi-monitor.diff --]
[-- Type: text/plain, Size: 1549 bytes --]

? multi-monitor.diff
Index: winprocarg.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winprocarg.c,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 winprocarg.c
--- winprocarg.c	10 Jan 2004 07:50:57 -0000	1.1.2.3
+++ winprocarg.c	14 Jan 2004 13:57:15 -0000
@@ -107,7 +107,7 @@ winInitializeDefaultScreens (void)
       g_ScreenInfo[i].fRootless = FALSE;
       g_ScreenInfo[i].fPseudoRootless = FALSE;
       g_ScreenInfo[i].fMultiWindow = FALSE;
-      g_ScreenInfo[i].fMultipleMonitors = FALSE;
+      g_ScreenInfo[i].fMultipleMonitors = TRUE;
       g_ScreenInfo[i].fLessPointer = FALSE;
       g_ScreenInfo[i].fScrollbars = FALSE;
       g_ScreenInfo[i].fNoTrayIcon = FALSE;
@@ -526,6 +526,34 @@ ddxProcessArgument (int argc, char *argv
     }
 
   /*
+   * Look for the '-nomultiplemonitors' argument
+   */
+  if (IS_OPTION ("-nomultiplemonitors")
+      || IS_OPTION ("-nomultimonitors"))
+    {
+      /* Is this parameter attached to a screen or is it global? */
+      if (-1 == g_iLastScreen)
+	{
+	  int			j;
+
+	  /* Parameter is for all screens */
+	  for (j = 0; j < MAXSCREENS; j++)
+	    {
+	      g_ScreenInfo[j].fMultipleMonitors = FALSE;
+	    }
+	}
+      else
+	{
+	  /* Parameter is for a single screen */
+	  g_ScreenInfo[g_iLastScreen].fMultipleMonitors = FALSE;
+	}
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+
+  /*
    * Look for the '-scrollbars' argument
    */
   if (IS_OPTION ("-scrollbars"))

Re: Patch: -multiplemonitors is default, -nomultiplemnoitors added

[Harold L Hunt II]

Thanks, got it.  Will look at it soon.

Harold

Øyvind Harboe wrote:

> Ref. earlier post, here is the patch.
> 
> http://sources.redhat.com/ml/cygwin-xfree/2004-01/msg00160.html
> 
> I compiled&tested; works on my rocket.
> 
> 
> Øyvind
> 
> 
> 
> ------------------------------------------------------------------------
> 
> ? multi-monitor.diff
> Index: winprocarg.c
> ===================================================================
> RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winprocarg.c,v
> retrieving revision 1.1.2.3
> diff -u -p -r1.1.2.3 winprocarg.c
> --- winprocarg.c	10 Jan 2004 07:50:57 -0000	1.1.2.3
> +++ winprocarg.c	14 Jan 2004 13:57:15 -0000
> @@ -107,7 +107,7 @@ winInitializeDefaultScreens (void)
>        g_ScreenInfo[i].fRootless = FALSE;
>        g_ScreenInfo[i].fPseudoRootless = FALSE;
>        g_ScreenInfo[i].fMultiWindow = FALSE;
> -      g_ScreenInfo[i].fMultipleMonitors = FALSE;
> +      g_ScreenInfo[i].fMultipleMonitors = TRUE;
>        g_ScreenInfo[i].fLessPointer = FALSE;
>        g_ScreenInfo[i].fScrollbars = FALSE;
>        g_ScreenInfo[i].fNoTrayIcon = FALSE;
> @@ -526,6 +526,34 @@ ddxProcessArgument (int argc, char *argv
>      }
>  
>    /*
> +   * Look for the '-nomultiplemonitors' argument
> +   */
> +  if (IS_OPTION ("-nomultiplemonitors")
> +      || IS_OPTION ("-nomultimonitors"))
> +    {
> +      /* Is this parameter attached to a screen or is it global? */
> +      if (-1 == g_iLastScreen)
> +	{
> +	  int			j;
> +
> +	  /* Parameter is for all screens */
> +	  for (j = 0; j < MAXSCREENS; j++)
> +	    {
> +	      g_ScreenInfo[j].fMultipleMonitors = FALSE;
> +	    }
> +	}
> +      else
> +	{
> +	  /* Parameter is for a single screen */
> +	  g_ScreenInfo[g_iLastScreen].fMultipleMonitors = FALSE;
> +	}
> +
> +      /* Indicate that we have processed this argument */
> +      return 1;
> +    }
> +
> +
> +  /*
>     * Look for the '-scrollbars' argument
>     */
>    if (IS_OPTION ("-scrollbars"))

Re: Patch: -multiplemonitors is default, -nomultiplemnoitors added

[Earle F. Philhower III]

Hi Harold, Ayvind...
At 12:45 PM 1/15/2004 -0500, you wrote:
>Thanks, got it.  Will look at it soon.
>Harold
>Øyvind Harboe wrote:
>>Ref. earlier post, here is the patch.
>>http://sources.redhat.com/ml/cygwin-xfree/2004-01/msg00160.html
>>I compiled&tested; works on my rocket.

This is just my $0.02, but instead of changing the default behaviour
for non-multi window mode, why not just patch only the mode that
doesn't work properly in a multihead machine, multiwindow?  Folks
running single window on a multihead setup are probably doing it
for a good reason (i.e. left monitor=X, right=Windows) and would need
to change their startup scripts...

Unfortunately I don't have a working compile setup for the new XWIN .40
or I'd give the patch, but basically use everything Ayvind did except the
MultiMonitor mode value change, move that setting into the
if (ISOPTION("multiwindow")) {} block.

-Earle F. Philhower, III
  earle@ziplabel.com
  cdrlabel - ZipLabel - FlpLabel
  http://www.cdrlabel.com