Attachment 6603 Details for Bug 7919 – Patch to achieve this

[patch] Patch to achieve this

multiwindow.patch (text/plain), 2.29 KB, created by Colin Harrison on 2006-08-19 03:32:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Harrison

Created: 2006-08-19 03:32:13 UTC

Size: 2.29 KB

patch

obsolete

>--- ./programs/Xserver/hw/xwin/save_winmultiwindowwndproc.c	2006-07-09 22:49:10.000000000 +0100
>+++ ./programs/Xserver/hw/xwin/winmultiwindowwndproc.c	2006-07-09 22:48:34.000000000 +0100
>@@ -304,7 +304,6 @@
>   winScreenInfo		*s_pScreenInfo = NULL;
>   HWND			hwndScreen = NULL;
>   DrawablePtr		pDraw = NULL;
>-  int		        iX, iY, iWidth, iHeight, iBorder;
>   winWMMessageRec	wmMsg;
>   Bool                  fWMMsgInitialized = FALSE;
>   static Bool		s_fTracking = FALSE;
>@@ -442,20 +450,19 @@
> 
>       /* BeginPaint gives us an hdc that clips to the invalidated region */
>       hdcUpdate = BeginPaint (hwnd, &ps);
>-
>-      /* Get the position and dimensions of the window */
>-      iBorder = wBorderWidth (pWin);
>-      iX = pWin->drawable.x;
>-      iY = pWin->drawable.y;
>-      iWidth = pWin->drawable.width;
>-      iHeight = pWin->drawable.height;
>+      /* Avoid the BitBlt's if the PAINTSTRUCT is bogus */
>+      if (ps.rcPaint.right==0 && ps.rcPaint.bottom==0 && ps.rcPaint.left==0 && ps.rcPaint.top==0)
>+      {
>+	EndPaint (hwndScreen, &ps);
>+	return 0;
>+      }
> 
>       /* Try to copy from the shadow buffer */
>       if (!BitBlt (hdcUpdate,
>-		   0, 0,
>-		   iWidth, iHeight,
>+		   ps.rcPaint.left, ps.rcPaint.top,
>+		   ps.rcPaint.right - ps.rcPaint.left, ps.rcPaint.bottom - ps.rcPaint.top,
> 		   s_pScreenPriv->hdcShadow,
>-		   iX, iY,
>+		   ps.rcPaint.left + pWin->drawable.x, ps.rcPaint.top + pWin->drawable.y,
> 		   SRCCOPY))
> 	{
> 	  LPVOID lpMsgBuf;
>--- ./programs/Xserver/hw/xwin/save_winshadgdi.c	2006-07-10 16:19:05.000000000 +0100
>+++ ./programs/Xserver/hw/xwin/winshadgdi.c	2006-07-10 16:18:27.000000000 +0100
>@@ -540,8 +540,9 @@
>    * handle large regions by creating a clipping region and 
>    * doing a single blit constrained to that clipping region.
>    */
>-  if (pScreenInfo->dwClipUpdatesNBoxes == 0
>-      || dwBox < pScreenInfo->dwClipUpdatesNBoxes)
>+  if (!pScreenInfo->fMultiWindow &&
>+      (pScreenInfo->dwClipUpdatesNBoxes == 0 ||
>+      dwBox < pScreenInfo->dwClipUpdatesNBoxes))
>     {
>       /* Loop through all boxes in the damaged region */
>       while (dwBox--)
>@@ -566,7 +567,7 @@
> 	  ++pBox;
> 	}
>     }
>-  else
>+  else if (!pScreenInfo->fMultiWindow)
>     {
>       /* Compute a GDI region from the damaged region */
>       hrgnCombined = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);

Actions: View | Splinter Review

Attachments on bug 7919: 6603

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.