1 files changed, 62 insertions, 105 deletions

diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c
index 3d23e9746..3ba110956 100644
--- a/xorg-server/hw/xwin/winmultiwindowwndproc.c
+++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c
@@ -35,6 +35,10 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
+#define GC tempGC  // This is to avoid name conflicts when including the next headers which also define GC
+#include <X11/Xutil.h>
+#undef GC
+
 #include "win.h"
 #include "dixevents.h"
 #include "winmultiwindowclass.h"
@@ -42,6 +46,13 @@
 #include "winmsg.h"
 #include "inputstr.h"
 
+#ifdef XKB
+#ifndef XKB_IN_SERVER
+#define XKB_IN_SERVER
+#endif
+#include <xkbsrv.h>
+#endif
+
 extern void winUpdateWindowPosition (HWND hWnd, Bool reshape, HWND *zstyle);
 
 
@@ -322,9 +333,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
   Bool			needRestack = FALSE;
   LRESULT		ret;
 
-#if CYGDEBUG
   winDebugWin32Message("winTopLevelWindowProc", hwnd, message, wParam, lParam);
-#endif
   
   /* Check if the Windows window property for our X window pointer is valid */
   if ((pWin = GetProp (hwnd, WIN_WINDOW_PROP)) != NULL)
@@ -357,32 +366,13 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 
       fWMMsgInitialized = TRUE;
 
-#if 0
-      /*
-       * Print some debugging information
-       */
-
-      ErrorF ("hWnd %08X\n", hwnd);
-      ErrorF ("pWin %08X\n", pWin);
-      ErrorF ("pDraw %08X\n", pDraw);
-      ErrorF ("\ttype %08X\n", pWin->drawable.type);
-      ErrorF ("\tclass %08X\n", pWin->drawable.class);
-      ErrorF ("\tdepth %08X\n", pWin->drawable.depth);
-      ErrorF ("\tbitsPerPixel %08X\n", pWin->drawable.bitsPerPixel);
-      ErrorF ("\tid %08X\n", pWin->drawable.id);
-      ErrorF ("\tx %08X\n", pWin->drawable.x);
-      ErrorF ("\ty %08X\n", pWin->drawable.y);
-      ErrorF ("\twidth %08X\n", pWin->drawable.width);
-      ErrorF ("\thenght %08X\n", pWin->drawable.height);
-      ErrorF ("\tpScreen %08X\n", pWin->drawable.pScreen);
-      ErrorF ("\tserialNumber %08X\n", pWin->drawable.serialNumber);
-      ErrorF ("g_iWindowPrivateKey %p\n", g_iWindowPrivateKey);
-      ErrorF ("pWinPriv %08X\n", pWinPriv);
-      ErrorF ("s_pScreenPriv %08X\n", s_pScreenPriv);
-      ErrorF ("s_pScreenInfo %08X\n", s_pScreenInfo);
-      ErrorF ("hwndScreen %08X\n", hwndScreen);
-#endif
     }
+  #ifdef _DEBUG
+  else if (message!=WM_CREATE)
+    {
+      winDebug("Warning: message 0x%x received when WIN_WINDOW_PROP NULL\n",message);
+    }
+  #endif
 
   /* Branch on message type */
   switch (message)
@@ -413,10 +403,9 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
         GetWindowRect(hwnd, &rWindow);
         hRgnWindow = CreateRectRgnIndirect(&rWindow);
         SetWindowRgn (hwnd, hRgnWindow, TRUE);
-        DeleteObject(hRgnWindow);
       }
 
-      SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)XMING_SIGNATURE);
+      SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)VCXSRV_SIGNATURE);
 
       return 0;
 
@@ -603,7 +592,10 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       break;
 
     case WM_MOUSELEAVE:
-      /* Mouse has left our client area */
+       /* We can't do anything without privates */
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+     /* Mouse has left our client area */
 
       /* Flag that we are no longer tracking */
       s_fTracking = FALSE;
@@ -713,9 +705,10 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 
       /* Remove our keyboard hook if it is installed */
       winRemoveKeyboardHookLL ();
+       /* Revert the X focus as well, but only if the Windows focus is going to another window */
       if (!wParam)
-	/* Revert the X focus as well, but only if the Windows focus is going to another window */
-	DeleteWindowFromAnyEvents(pWin, FALSE);
+	if (pWin)
+	  DeleteWindowFromAnyEvents(pWin, FALSE);
       return 0;
 
     case WM_SYSDEADCHAR:      
@@ -746,7 +739,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       if (wParam == VK_F4 && (GetKeyState (VK_MENU) & 0x8000))
 	  break;
 
-#if CYGWINDOWING_DEBUG
+#ifdef WINDBG
       if (wParam == VK_ESCAPE)
 	{
 	  /* Place for debug: put any tests and dumps here */
@@ -757,27 +750,27 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 	  windPlace.length = sizeof (WINDOWPLACEMENT);
 	  GetWindowPlacement (hwnd, &windPlace);
 	  pRect = &windPlace.rcNormalPosition;
-	  ErrorF ("\nCYGWINDOWING Dump:\n"
+	  winDebug ("\nCYGWINDOWING Dump:\n"
 		  "\tdrawable: (%hd, %hd) - %hdx%hd\n", pDraw->x,
 		  pDraw->y, pDraw->width, pDraw->height);
-	  ErrorF ("\twindPlace: (%ld, %ld) - %ldx%ld\n", pRect->left,
+	  winDebug ("\twindPlace: (%ld, %ld) - %ldx%ld\n", pRect->left,
 		  pRect->top, pRect->right - pRect->left,
 		  pRect->bottom - pRect->top);
 	  if (GetClientRect (hwnd, &rc))
 	    {
 	      pRect = &rc;
-	      ErrorF ("\tClientRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
+	      winDebug ("\tClientRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
 		      pRect->top, pRect->right - pRect->left,
 		      pRect->bottom - pRect->top);
 	    }
 	  if (GetWindowRect (hwnd, &rc))
 	    {
 	      pRect = &rc;
-	      ErrorF ("\tWindowRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
+	      winDebug ("\tWindowRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
 		      pRect->top, pRect->right - pRect->left,
 		      pRect->bottom - pRect->top);
 	    }
-	  ErrorF ("\n");
+	  winDebug ("\n");
 	}
 #endif
       
@@ -814,9 +807,8 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 	  
 	  /* Tell our Window Manager thread to activate the window */
 	  wmMsg.msg = WM_WM_ACTIVATE;
-	  if (fWMMsgInitialized)
-	    if (!pWin || !pWin->overrideRedirect) /* for OOo menus */
-	      winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
+	  if (fWMMsgInitialized && pWin->realized && !pWin->overrideRedirect /* for OOo menus */)
+	    winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
 	}
       /* Prevent the mouse wheel from stalling when another window is minimized */
       if (HIWORD(wParam) == 0 && LOWORD(wParam) == WA_ACTIVE &&
@@ -852,7 +844,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       /* Branch on if the window was killed in X already */
       if (pWinPriv && !pWinPriv->fXKilled)
 	{
-	  ErrorF ("winTopLevelWindowProc - WM_DESTROY - WM_WM_KILL\n");
+	  winDebug ("winTopLevelWindowProc - WM_DESTROY - WM_WM_KILL\n");
 	  
 	  /* Tell our Window Manager thread to kill the window */
 	  wmMsg.msg = WM_WM_KILL;
@@ -898,19 +890,32 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 		   & ~WS_CAPTION & ~WS_SIZEBOX);
 
 	      winUpdateWindowPosition (hwnd, FALSE, &zstyle);
-	      SetForegroundWindow (hwnd);
+
+	      {
+	        WinXWMHints hints;
+	        if (winMultiWindowGetWMHints(pWin, &hints))
+	        {
+	            /*
+	              Give the window focus, unless it has an InputHint
+	              which is FALSE (this is used by e.g. glean to
+	              avoid every test window grabbing the focus)
+	             */
+	            if (!((hints.flags & InputHint) && (!hints.input)))
+	              {
+	                SetForegroundWindow (hwnd);
+	              }
+	          }
+	      }
 	    }
 	  wmMsg.msg = WM_WM_MAP3;
 	}
       else /* It is an overridden window so make it top of Z stack */
 	{
 	  HWND forHwnd = GetForegroundWindow();
-#if CYGWINDOWING_DEBUG
-	  ErrorF ("overridden window is shown\n");
-#endif
+	  winDebug ("overridden window is shown\n");
 	  if (forHwnd != NULL)
 	  {
-	    if (GetWindowLongPtr(forHwnd, GWLP_USERDATA) & (LONG_PTR)XMING_SIGNATURE)
+	    if (GetWindowLongPtr(forHwnd, GWLP_USERDATA) & (LONG_PTR)VCXSRV_SIGNATURE)
 	    {
 	      if (GetWindowLongPtr(forHwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)
 		SetWindowPos (hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
@@ -996,7 +1001,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 
     case WM_SIZE:
       /* see dix/window.c */
-#if CYGWINDOWING_DEBUG
+#ifdef WINDBG
       {
 	char buf[64];
 	switch (wParam)
@@ -1013,70 +1018,24 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 	  default:
 	    strcpy(buf, "UNKNOWN_FLAG");
 	  }
-	ErrorF ("winTopLevelWindowProc - WM_SIZE to %dx%d (%s) - %d ms\n",
+	winDebug ("winTopLevelWindowProc - WM_SIZE to %dx%d (%s) - %d ms\n",
 		(int)LOWORD(lParam), (int)HIWORD(lParam), buf,
 		(int)(GetTickCount ()));
       }
 #endif
       /* Adjust the X Window to the moved Windows window */
       winAdjustXWindow (pWin, hwnd);
+      if (wParam == SIZE_MINIMIZED) winReorderWindowsMultiWindow();
       return 0; /* end of WM_SIZE handler */
 
-    case WM_STYLECHANGING:
-      /*
-        When the style changes, adjust the Windows window size so the client area remains the same size,
-        and adjust the Windows window position so that the client area remains in the same place.
-      */
-      {
-        RECT newWinRect;
-        DWORD dwExStyle;
-        DWORD dwStyle;
-        DWORD newStyle = ((STYLESTRUCT *)lParam)->styleNew;
-        WINDOWINFO wi;
-
-        dwExStyle = GetWindowLongPtr (hwnd, GWL_EXSTYLE);
-        dwStyle = GetWindowLongPtr (hwnd, GWL_STYLE);
-
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGING from %08x %08x\n", dwStyle, dwExStyle);
-
-        if (wParam == GWL_EXSTYLE)
-          dwExStyle = newStyle;
-
-        if (wParam == GWL_STYLE)
-          dwStyle = newStyle;
-
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGING to %08x %08x\n", dwStyle, dwExStyle);
-
-        /* Get client rect in screen coordinates */
-        wi.cbSize = sizeof(WINDOWINFO);
-        GetWindowInfo(hwnd, &wi);
-
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGING client area {%d, %d, %d, %d}, {%d x %d}\n", wi.rcClient.left, wi.rcClient.top, wi.rcClient.right, wi.rcClient.bottom, wi.rcClient.right - wi.rcClient.left, wi.rcClient.bottom - wi.rcClient.top);
-
-        newWinRect = wi.rcClient;
-        if (!AdjustWindowRectEx(&newWinRect, dwStyle, FALSE, dwExStyle))
-          winDebug("winTopLevelWindowProc - WM_STYLECHANGING AdjustWindowRectEx failed\n");
-
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGING window area should be {%d, %d, %d, %d}, {%d x %d}\n", newWinRect.left, newWinRect.top, newWinRect.right, newWinRect.bottom, newWinRect.right - newWinRect.left, newWinRect.bottom - newWinRect.top);
-
-        /*
-          Style change hasn't happened yet, so we can't adjust the window size yet, as the winAdjustXWindow()
-          which WM_SIZE does will use the current (unchanged) style.  Instead make a note to change it when
-          WM_STYLECHANGED is received...
-        */
-        pWinPriv->hDwp = BeginDeferWindowPos(1);
-        pWinPriv->hDwp = DeferWindowPos(pWinPriv->hDwp, hwnd, NULL, newWinRect.left, newWinRect.top, newWinRect.right - newWinRect.left, newWinRect.bottom - newWinRect.top, SWP_NOACTIVATE | SWP_NOZORDER);
-      }
-      return 0;
-
     case WM_STYLECHANGED:
+      /* when the style changes, adjust the window size so the client area remains the same */
       {
-        if (pWinPriv->hDwp)
-          {
-            EndDeferWindowPos(pWinPriv->hDwp);
-            pWinPriv->hDwp = NULL;
-          }
-        winDebug("winTopLevelWindowProc - WM_STYLECHANGED done\n");
+	LONG x,y;
+	DrawablePtr pDraw = &pWin->drawable;
+	x =  pDraw->x - wBorderWidth(pWin);
+	y = pDraw->y - wBorderWidth(pWin);
+	winPositionWindowMultiWindow(pWin, x, y);
       }
       return 0;
 
@@ -1085,10 +1044,8 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       /* Check if this window needs to be made active when clicked */
       if (!GetProp (pWinPriv->hWnd, WIN_NEEDMANAGE_PROP))
 	{
-#if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("winTopLevelWindowProc - WM_MOUSEACTIVATE - "
+	  winDebug ("winTopLevelWindowProc - WM_MOUSEACTIVATE - "
 		  "MA_NOACTIVATE\n");
-#endif
 
 	  /* */
 	  return MA_NOACTIVATE;