svn merge "^/branches/released" .

Solved mouse motion bug in new version of dix/getevents.c

7 files changed, 194 insertions, 204 deletions

diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c
index 0e71e1271..1f0ec477e 100644
--- a/xorg-server/hw/xwin/InitInput.c
+++ b/xorg-server/hw/xwin/InitInput.c
@@ -105,10 +105,6 @@ InitInput (int argc, char *argv[])
 

   g_pwinPointer = AddInputDevice (serverClient, winMouseProc, TRUE);

   g_pwinKeyboard = AddInputDevice (serverClient, winKeybdProc, TRUE);

-  

-  RegisterPointerDevice (g_pwinPointer);

-  RegisterKeyboardDevice (g_pwinKeyboard);

-

   g_pwinPointer->name = strdup("Windows mouse");

   g_pwinKeyboard->name = strdup("Windows keyboard");

 

diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index bf863b6c8..42a305f37 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -750,10 +750,7 @@ glxWinScreenProbe(ScreenPtr pScreen)
         unsigned int buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);

         if (buffer_size > 0)

           {

-            if (screen->base.GLXextensions != NULL)

-              {

-                free(screen->base.GLXextensions);

-              }

+            free(screen->base.GLXextensions);

 

             screen->base.GLXextensions = xnfalloc(buffer_size);

             __glXGetExtensionString(screen->glx_enable_bits, screen->base.GLXextensions);

diff --git a/xorg-server/hw/xwin/wincmap.c b/xorg-server/hw/xwin/wincmap.c
index 370a4c584..83279fd84 100644
--- a/xorg-server/hw/xwin/wincmap.c
+++ b/xorg-server/hw/xwin/wincmap.c
@@ -494,11 +494,8 @@ winGetPaletteDD (ScreenPtr pScreen, ColormapPtr pcmap)
   pScreen->blackPixel = 0;

 

   /* Free colormap */

-  if (ppeColors != NULL)

-    {

-      free (ppeColors);

-      ppeColors = NULL;

-    }

+  free(ppeColors);

+  ppeColors = NULL;

 

   /* Free the DC */

   if (hdc != NULL)

diff --git a/xorg-server/hw/xwin/winkeybd.c b/xorg-server/hw/xwin/winkeybd.c
index e69edf7c0..c72fbe275 100644
--- a/xorg-server/hw/xwin/winkeybd.c
+++ b/xorg-server/hw/xwin/winkeybd.c
@@ -182,7 +182,6 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState)
           winDebug ("winKeybdProc - Error initializing keyboard AutoRepeat\n");

         }

 

-	  XkbSetExtension(pDeviceInt, ProcessKeyboardEvent);

       break;

       

     case DEVICE_ON: 

diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c
index b37d5cf67..6dac21520 100644
--- a/xorg-server/hw/xwin/winmouse.c
+++ b/xorg-server/hw/xwin/winmouse.c
@@ -46,6 +46,7 @@
 #include "inputstr.h"

 #include "exevents.h" /* for button/axes labels */

 #include "xserver-properties.h"

+#include "inpututils.h"

 

 /* Peek the internal button mapping */

 static CARD8 const *g_winMouseButtonMap = NULL;

@@ -242,13 +243,15 @@ winMouseButtonsSendEvent (int iEventType, int iButton)
 {

   EventListPtr events;

   int i, nevents;

+  ValuatorMask mask;

 

   if (g_winMouseButtonMap)

     iButton = g_winMouseButtonMap[iButton];

 

+  valuator_mask_zero(&mask);

   GetEventList(&events);

   nevents = GetPointerEvents(events, g_pwinPointer, iEventType, iButton,

-			     POINTER_RELATIVE, 0, 0, NULL);

+			     POINTER_RELATIVE, &mask);

 

   for (i = 0; i < nevents; i++)

     mieqEnqueue(g_pwinPointer, (InternalEvent*)events[i].event);

@@ -371,15 +374,17 @@ void winEnqueueMotion(int x, int y)
 {

   int i, nevents;

   int valuators[2];

+  ValuatorMask mask;

   EventListPtr events;

 

   miPointerSetPosition(g_pwinPointer, &x, &y);

   valuators[0] = x;

   valuators[1] = y;

 

+  valuator_mask_set_range(&mask, 0, 2, valuators);

   GetEventList(&events);

   nevents = GetPointerEvents(events, g_pwinPointer, MotionNotify, 0,

-			     POINTER_ABSOLUTE | POINTER_SCREEN, 0, 2, valuators);

+			     POINTER_ABSOLUTE | POINTER_SCREEN, &mask);

 

   for (i = 0; i < nevents; i++)

     mieqEnqueue(g_pwinPointer, (InternalEvent*)events[i].event);

diff --git a/xorg-server/hw/xwin/winmultiwindowwindow.c b/xorg-server/hw/xwin/winmultiwindowwindow.c
index 3044eda9c..42b2d6221 100644
--- a/xorg-server/hw/xwin/winmultiwindowwindow.c
+++ b/xorg-server/hw/xwin/winmultiwindowwindow.c
@@ -482,7 +482,6 @@ winCreateWindowsWindow (WindowPtr pWin)
 

   dwStyle = WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;

   dwExStyle = WS_EX_TOOLWINDOW;

-  rc;

   rc.top = 0;

   rc.left = 0;

   rc.bottom = iHeight;

diff --git a/xorg-server/hw/xwin/winpixmap.c b/xorg-server/hw/xwin/winpixmap.c
index e5b36a000..2af95f225 100644
--- a/xorg-server/hw/xwin/winpixmap.c
+++ b/xorg-server/hw/xwin/winpixmap.c
@@ -1,187 +1,184 @@
-/*
- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation the rights to use, copy, modify, merge, publish,
- *distribute, sublicense, and/or sell copies of the Software, and to
- *permit persons to whom the Software is furnished to do so, subject to
- *the following conditions:
- *
- *The above copyright notice and this permission notice shall be
- *included in all copies or substantial portions of the Software.
- *
- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR
- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *Except as contained in this notice, the name of the XFree86 Project
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from the XFree86 Project.
- *
- * Authors:	drewry, september 1986
- *		Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-
-/*
- * Local prototypes
- */
-
-#if 0
-static void
-winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw);
-
-static void
-winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh);
-
-static void
-winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,
-			      int xrot, int yrot);
-#endif
-
-
-/* See Porting Layer Definition - p. 34 */
-/* See mfb/mfbpixmap.c - mfbCreatePixmap() */
-PixmapPtr
-winCreatePixmapNativeGDI (ScreenPtr pScreen,
-			  int iWidth, int iHeight,
-			  int iDepth, unsigned usage_hint)
-{
-  winPrivPixmapPtr	pPixmapPriv = NULL;
-  PixmapPtr		pPixmap = NULL;
-
-  /* Allocate pixmap memory */
-  pPixmap = AllocatePixmap (pScreen, 0);
-  if (!pPixmap)
-    {
-      ErrorF ("winCreatePixmapNativeGDI () - Couldn't allocate a pixmap\n");
-      return NullPixmap;
-    }
-
-  winDebug ("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",
-	  iWidth, iHeight, iDepth, usage_hint,
-	  PixmapBytePad (iWidth, iDepth));
-
-  /* Setup pixmap values */
-  pPixmap->drawable.type = DRAWABLE_PIXMAP;
-  pPixmap->drawable.class = 0;
-  pPixmap->drawable.pScreen = pScreen;
-  pPixmap->drawable.depth = iDepth;
-  pPixmap->drawable.bitsPerPixel = BitsPerPixel (iDepth);
-  pPixmap->drawable.id = 0;
-  pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
-  pPixmap->drawable.x = 0;
-  pPixmap->drawable.y = 0;
-  pPixmap->drawable.width = iWidth;
-  pPixmap->drawable.height = iHeight;
-  pPixmap->devKind = 0;
-  pPixmap->refcnt = 1;
-  pPixmap->devPrivate.ptr = NULL;
-  pPixmap->usage_hint = usage_hint;
-
-  /* Pixmap privates are allocated by AllocatePixmap */
-  pPixmapPriv = winGetPixmapPriv (pPixmap);
-
-  /* Initialize pixmap privates */
-  pPixmapPriv->hBitmap = NULL;
-  pPixmapPriv->hdcSelected = NULL;
-  pPixmapPriv->pbBits = NULL;
-  pPixmapPriv->dwScanlineBytes = PixmapBytePad (iWidth, iDepth);
-
-  /* Check for zero width or height pixmaps */
-  if (iWidth == 0 || iHeight == 0)
-    {
-      /* Don't allocate a real pixmap, just set fields and return */
-      return pPixmap;
-    }
-
-  /* Create a DIB for the pixmap */
-  pPixmapPriv->hBitmap = winCreateDIBNativeGDI (iWidth, iHeight, iDepth,
-						&pPixmapPriv->pbBits,
-						(BITMAPINFO **) &pPixmapPriv->pbmih);
-
-  winDebug ("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " \
-	  "screen: %08x\n",
-	  pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
-
-  return pPixmap;
-}
-
-
-/* 
- * See Porting Layer Definition - p. 35
- *
- * See mfb/mfbpixmap.c - mfbDestroyPixmap()
- */
-
-Bool
-winDestroyPixmapNativeGDI (PixmapPtr pPixmap)
-{
-  winPrivPixmapPtr		pPixmapPriv = NULL;
-  
-  winDebug ("winDestroyPixmapNativeGDI ()\n");
-
-  /* Bail early if there is not a pixmap to destroy */
-  if (pPixmap == NULL)
-    {
-      ErrorF ("winDestroyPixmapNativeGDI () - No pixmap to destroy\n");
-      return TRUE;
-    }
-
-  /* Get a handle to the pixmap privates */
-  pPixmapPriv = winGetPixmapPriv (pPixmap);
-
-  winDebug ("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
-	  pPixmapPriv->hBitmap);
-
-  /* Decrement reference count, return if nonzero */
-  --pPixmap->refcnt;
-  if (pPixmap->refcnt != 0)
-    return TRUE;
-
-  /* Free GDI bitmap */
-  if (pPixmapPriv->hBitmap) DeleteObject (pPixmapPriv->hBitmap);
-  
-  /* Free the bitmap info header memory */
-  if (pPixmapPriv->pbmih != NULL)
-    {
-      free (pPixmapPriv->pbmih);
-      pPixmapPriv->pbmih = NULL;
-    }
-
-  /* Free the pixmap memory */
-  free (pPixmap);
-  pPixmap = NULL;
-
-  return TRUE;
-}
-
-
-/* 
- * Not used yet
- */
-
-Bool
-winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,
-				int iWidth, int iHeight,
-				int iDepth,
-				int iBitsPerPixel,
-				int devKind,
-				pointer pPixData)
-{
-  FatalError ("winModifyPixmapHeaderNativeGDI ()\n");
-  return TRUE;
-}
-
+/*

+ *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.

+ *

+ *Permission is hereby granted, free of charge, to any person obtaining

+ * a copy of this software and associated documentation files (the

+ *"Software"), to deal in the Software without restriction, including

+ *without limitation the rights to use, copy, modify, merge, publish,

+ *distribute, sublicense, and/or sell copies of the Software, and to

+ *permit persons to whom the Software is furnished to do so, subject to

+ *the following conditions:

+ *

+ *The above copyright notice and this permission notice shall be

+ *included in all copies or substantial portions of the Software.

+ *

+ *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+ *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+ *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR

+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ *

+ *Except as contained in this notice, the name of the XFree86 Project

+ *shall not be used in advertising or otherwise to promote the sale, use

+ *or other dealings in this Software without prior written authorization

+ *from the XFree86 Project.

+ *

+ * Authors:	drewry, september 1986

+ *		Harold L Hunt II

+ */

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include "win.h"

+

+

+/*

+ * Local prototypes

+ */

+

+#if 0

+static void

+winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw);

+

+static void

+winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh);

+

+static void

+winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,

+			      int xrot, int yrot);

+#endif

+

+

+/* See Porting Layer Definition - p. 34 */

+/* See mfb/mfbpixmap.c - mfbCreatePixmap() */

+PixmapPtr

+winCreatePixmapNativeGDI (ScreenPtr pScreen,

+			  int iWidth, int iHeight,

+			  int iDepth, unsigned usage_hint)

+{

+  winPrivPixmapPtr	pPixmapPriv = NULL;

+  PixmapPtr		pPixmap = NULL;

+

+  /* Allocate pixmap memory */

+  pPixmap = AllocatePixmap (pScreen, 0);

+  if (!pPixmap)

+    {

+      ErrorF ("winCreatePixmapNativeGDI () - Couldn't allocate a pixmap\n");

+      return NullPixmap;

+    }

+

+  winDebug ("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",

+	  iWidth, iHeight, iDepth, usage_hint,

+	  PixmapBytePad (iWidth, iDepth));

+

+  /* Setup pixmap values */

+  pPixmap->drawable.type = DRAWABLE_PIXMAP;

+  pPixmap->drawable.class = 0;

+  pPixmap->drawable.pScreen = pScreen;

+  pPixmap->drawable.depth = iDepth;

+  pPixmap->drawable.bitsPerPixel = BitsPerPixel (iDepth);

+  pPixmap->drawable.id = 0;

+  pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;

+  pPixmap->drawable.x = 0;

+  pPixmap->drawable.y = 0;

+  pPixmap->drawable.width = iWidth;

+  pPixmap->drawable.height = iHeight;

+  pPixmap->devKind = 0;

+  pPixmap->refcnt = 1;

+  pPixmap->devPrivate.ptr = NULL;

+  pPixmap->usage_hint = usage_hint;

+

+  /* Pixmap privates are allocated by AllocatePixmap */

+  pPixmapPriv = winGetPixmapPriv (pPixmap);

+

+  /* Initialize pixmap privates */

+  pPixmapPriv->hBitmap = NULL;

+  pPixmapPriv->hdcSelected = NULL;

+  pPixmapPriv->pbBits = NULL;

+  pPixmapPriv->dwScanlineBytes = PixmapBytePad (iWidth, iDepth);

+

+  /* Check for zero width or height pixmaps */

+  if (iWidth == 0 || iHeight == 0)

+    {

+      /* Don't allocate a real pixmap, just set fields and return */

+      return pPixmap;

+    }

+

+  /* Create a DIB for the pixmap */

+  pPixmapPriv->hBitmap = winCreateDIBNativeGDI (iWidth, iHeight, iDepth,

+						&pPixmapPriv->pbBits,

+						(BITMAPINFO **) &pPixmapPriv->pbmih);

+

+  winDebug ("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " \

+	  "screen: %08x\n",

+	  pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);

+

+  return pPixmap;

+}

+

+

+/* 

+ * See Porting Layer Definition - p. 35

+ *

+ * See mfb/mfbpixmap.c - mfbDestroyPixmap()

+ */

+

+Bool

+winDestroyPixmapNativeGDI (PixmapPtr pPixmap)

+{

+  winPrivPixmapPtr		pPixmapPriv = NULL;

+  

+  winDebug ("winDestroyPixmapNativeGDI ()\n");

+

+  /* Bail early if there is not a pixmap to destroy */

+  if (pPixmap == NULL)

+    {

+      ErrorF ("winDestroyPixmapNativeGDI () - No pixmap to destroy\n");

+      return TRUE;

+    }

+

+  /* Get a handle to the pixmap privates */

+  pPixmapPriv = winGetPixmapPriv (pPixmap);

+

+  winDebug ("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",

+	  pPixmapPriv->hBitmap);

+

+  /* Decrement reference count, return if nonzero */

+  --pPixmap->refcnt;

+  if (pPixmap->refcnt != 0)

+    return TRUE;

+

+  /* Free GDI bitmap */

+  if (pPixmapPriv->hBitmap) DeleteObject (pPixmapPriv->hBitmap);

+  

+  /* Free the bitmap info header memory */

+  free(pPixmapPriv->pbmih);

+  pPixmapPriv->pbmih = NULL;

+

+  /* Free the pixmap memory */

+  free (pPixmap);

+  pPixmap = NULL;

+

+  return TRUE;

+}

+

+

+/* 

+ * Not used yet

+ */

+

+Bool

+winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,

+				int iWidth, int iHeight,

+				int iDepth,

+				int iBitsPerPixel,

+				int devKind,

+				pointer pPixData)

+{

+  FatalError ("winModifyPixmapHeaderNativeGDI ()\n");

+  return TRUE;

+}

+