[Xorg-commit] xc/programs/Xserver/hw/xwin winwin32rootless.c,1.1.2.5,1.1.2.6 winwin32rootlesswndproc.c,1.1.2.4,1.1.2.5 winwindowswm.c,1.1.2.3,1.1.2.4

[Kensuke Matsuzaki]

Committed by: zakki

Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/tmp/cvs-serv6938

Modified Files:
      Tag: CYGWIN
	winwin32rootless.c winwin32rootlesswndproc.c winwindowswm.c 
Log Message:
Fix window moving and resizing for rootless mode


Index: winwin32rootless.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winwin32rootless.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- winwin32rootless.c	15 Jan 2004 21:20:30 -0000	1.1.2.5
+++ winwin32rootless.c	31 Jan 2004 16:28:54 -0000	1.1.2.6
@@ -519,33 +519,12 @@
 
   pRLWinPriv->fRestackingNow = TRUE;
 
-  /* Show window */    
+  /* Show window */
   if(!IsWindowVisible (pRLWinPriv->hWnd))
-    ShowWindow (pRLWinPriv->hWnd, SW_SHOWNA);
+    ShowWindow (pRLWinPriv->hWnd, SW_SHOWNOACTIVATE);
+
+  pScreenPriv->fWindowOrderChanged = TRUE;
 
-  if (pRLNextWinPriv == NULL)
-    {
-      //ErrorF ("Win %08x is top\n", pRLWinPriv);
-      pScreenPriv->widTop = wid;
-      SetWindowPos (pRLWinPriv->hWnd, HWND_TOP,
-		    0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
-    }
-  else
-    {
-      //ErrorF ("Win %08x is not top\n", pRLWinPriv);
-      hWnd = GetNextWindow (pRLWinPriv->hWnd, GW_HWNDPREV);
-      do
-	{
-	  if (hWnd == pRLNextWinPriv->hWnd)
-	    {
-	      SetWindowPos (pRLWinPriv->hWnd, pRLNextWinPriv->hWnd,
-			    0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
-	      break;
-	    }
-	  hWnd = GetNextWindow (hWnd, GW_HWNDPREV);
-	}
-      while (hWnd);
-    }
   pRLWinPriv->fRestackingNow = FALSE;
 }
 

Index: winwin32rootlesswndproc.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winwin32rootlesswndproc.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- winwin32rootlesswndproc.c	29 Dec 2003 05:56:44 -0000	1.1.2.4
+++ winwin32rootlesswndproc.c	31 Jan 2004 16:28:54 -0000	1.1.2.5
@@ -840,7 +840,7 @@
 #if CYGMULTIWINDOW_DEBUG
 	      ErrorF ("Win %08x is now restacking.\n", (unsigned int)pRLWinPriv);
 #endif
-	      return 0;
+	      break;
 	    }
 
 	  if (IsRaiseOnClick (pWin))
@@ -848,7 +848,7 @@
 #if CYGMULTIWINDOW_DEBUG
 	      ErrorF ("Win %08x has WINDOWSWM_RAISE_ON_CLICK.\n", (unsigned int)pRLWinPriv);
 #endif
-	      return 0;
+	      break;
 	    }
 
 #if CYGMULTIWINDOW_DEBUG
@@ -952,7 +952,7 @@
 	if (pScreenPriv != NULL)
 	  pScreenPriv->fWindowOrderChanged = TRUE;
       }
-      return 0;
+      break;
 
     case WM_SIZE:
       /* see dix/window.c */
@@ -1089,7 +1089,7 @@
 					 rcClient.bottom - rcClient.top
 					 - wBorderWidth (pWin)*2);
       break;
-   
+
     default:
       break;
     }

Index: winwindowswm.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winwindowswm.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- winwindowswm.c	6 Jan 2004 00:40:30 -0000	1.1.2.3
+++ winwindowswm.c	31 Jan 2004 16:28:54 -0000	1.1.2.4
@@ -496,10 +496,9 @@
   
   /* Flush the window style */
   if (!SetWindowPos (pRLWinPriv->hWnd, NULL,
-		     0, 0,
+		     rcNew.left, rcNew.top,
 		     rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
-		     SWP_NOMOVE | SWP_NOZORDER | SWP_FRAMECHANGED
-		     /* | SWP_SHOWWINDOW*/ | SWP_NOACTIVATE))
+		     SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOACTIVATE))
     {
       return BadValue;
     }