xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/vfb/InitOutput.c               |    2 +-
 hw/xwin/winwin32rootless.c        |    7 +++++++
 hw/xwin/winwin32rootlesswndproc.c |    6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 0782894b5702adcf6f4a90861793b717f3856fa5
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Apr 21 16:00:28 2010 -0700

    Xvfb: Usage message typo fix.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 0428f0a..60915fd 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -248,7 +248,7 @@ ddxUseMsg(void)
 {
     ErrorF("-screen scrn WxHxD     set screen's width, height, depth\n");
     ErrorF("-pixdepths list-of-int support given pixmap depths\n");
-    ErrorF("+/-render		   turn on/of RENDER extension support"
+    ErrorF("+/-render		   turn on/off RENDER extension support"
 	   "(default on)\n");
     ErrorF("-linebias n            adjust thin line pixelization\n");
     ErrorF("-blackpixel n          pixel value for black\n");
commit ee3412b8702072c3a0b006bd20dd3bc7071d721c
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Apr 21 15:58:23 2010 -0700

    Restore some unused win32 debug code accidentally removed with unifdef
    
    unifdef found some code covered by
    
    which it decided to remove. This patch simply restores that in case
    someone wants it back.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c
index ac30621..c225a44 100755
--- a/hw/xwin/winwin32rootless.c
+++ b/hw/xwin/winwin32rootless.c
@@ -894,6 +894,9 @@ winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage)
   SIZE szWin;
   POINT ptSrc;
 #endif
+#if CYGMULTIWINDOW_DEBUG && 0
+  winDebug ("winMWExtWMUpdateRegion (%08x)\n", pRLWinPriv);
+#endif
 #if 0
   szWin.cx = pRLWinPriv->dwWidth;
   szWin.cy = pRLWinPriv->dwHeight;
@@ -935,6 +938,10 @@ winMWExtWMDamageRects (RootlessFrameID wid, int nCount, const BoxRec *pRects,
 {
   win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
   const BoxRec *pEnd;
+#if CYGMULTIWINDOW_DEBUG && 0
+  winDebug ("winMWExtWMDamageRects (%08x, %d, %08x, %d, %d)\n",
+	    pRLWinPriv, nCount, pRects, shift_x, shift_y);
+#endif
 
   for (pEnd = pRects + nCount; pRects < pEnd; pRects++) {
         RECT rcDmg;
diff --git a/hw/xwin/winwin32rootlesswndproc.c b/hw/xwin/winwin32rootlesswndproc.c
index a985c20..4d7afee 100755
--- a/hw/xwin/winwin32rootlesswndproc.c
+++ b/hw/xwin/winwin32rootlesswndproc.c
@@ -519,6 +519,9 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
       break;
 
     case WM_MOUSEMOVE:
+#if CYGMULTIWINDOW_DEBUG && 0
+      winDebug ("winMWExtWMWindowProc - WM_MOUSEMOVE\n");
+#endif
       /* Unpack the client area mouse coordinates */
       ptMouse.x = GET_X_LPARAM(lParam);
       ptMouse.y = GET_Y_LPARAM(lParam);
@@ -573,6 +576,9 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
       return 0;
       
     case WM_NCMOUSEMOVE:
+#if CYGMULTIWINDOW_DEBUG && 0
+      winDebug ("winMWExtWMWindowProc - WM_NCMOUSEMOVE\n");
+#endif
       /*
        * We break instead of returning 0 since we need to call
        * DefWindowProc to get the mouse cursor changes