svn merge "^/branches/released" .

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

4 files changed, 17 insertions, 90 deletions

diff --git a/xorg-server/hw/xquartz/bundle/Makefile.am b/xorg-server/hw/xquartz/bundle/Makefile.am
index 3a09f7427..34598aa6a 100644
--- a/xorg-server/hw/xquartz/bundle/Makefile.am
+++ b/xorg-server/hw/xquartz/bundle/Makefile.am
@@ -12,7 +12,9 @@ install-data-hook:
 	$(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install

 

 uninstall-hook:

-	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app	

+	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Resources

+	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Info.plist

+	$(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/PkgInfo

 

 noinst_PRE = Info.plist.cpp

 noinst_DATA = $(noinst_PRE:plist.cpp=plist)

diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index 7814967b8..f217f4c33 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -314,10 +314,9 @@ static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
                                     (PtrCtrlProcPtr)NoopDDA,

                                     GetMotionHistorySize(), NAXES,

                                     axes_labels);

-            pPointer->valuator->mode = Absolute; // Relative

             InitAbsoluteClassDeviceStruct(pPointer);

-//            InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1);

-//            InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1);

+//            InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

+//            InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

             break;

         case DEVICE_ON:

             pPointer->public.on = TRUE;

@@ -362,15 +361,14 @@ static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {
                                     (PtrCtrlProcPtr)NoopDDA,

                                     GetMotionHistorySize(), NAXES,

                                     axes_labels);

-            pPointer->valuator->mode = Absolute; // Relative

             InitProximityClassDeviceStruct(pPointer);

 			InitAbsoluteClassDeviceStruct(pPointer);

 

-            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1);

-            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1);

-            InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1);

-            InitValuatorAxisStruct(pPointer, 3, axes_labels[3], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1);

-            InitValuatorAxisStruct(pPointer, 4, axes_labels[4], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1);

+            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

+            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

+            InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

+            InitValuatorAxisStruct(pPointer, 3, axes_labels[3], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

+            InitValuatorAxisStruct(pPointer, 4, axes_labels[4], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

 //          pPointer->use = IsXExtensionDevice;

             break;

         case DEVICE_ON:

@@ -468,7 +466,6 @@ void InitInput( int argc, char **argv )
     XkbSetRulesDflts(&rmlvo);

 

     darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);

-    RegisterKeyboardDevice( darwinKeyboard );

     darwinKeyboard->name = strdup("keyboard");

 

     /* here's the snippet from the current gdk sources:

@@ -486,19 +483,15 @@ void InitInput( int argc, char **argv )
     */

 

     darwinPointer = AddInputDevice(serverClient, DarwinMouseProc, TRUE);

-    RegisterPointerDevice( darwinPointer );

     darwinPointer->name = strdup("pointer");

 

     darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    RegisterPointerDevice( darwinTabletStylus );

     darwinTabletStylus->name = strdup("pen");

 

     darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    RegisterPointerDevice( darwinTabletCursor );

     darwinTabletCursor->name = strdup("cursor");

 

     darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    RegisterPointerDevice( darwinTabletEraser );

     darwinTabletEraser->name = strdup("eraser");

 

     darwinTabletCurrent = darwinTabletStylus;

diff --git a/xorg-server/hw/xquartz/darwinEvents.c b/xorg-server/hw/xquartz/darwinEvents.c
index a00c89ecd..ec320b3a5 100644
--- a/xorg-server/hw/xquartz/darwinEvents.c
+++ b/xorg-server/hw/xquartz/darwinEvents.c
@@ -43,6 +43,7 @@ in this Software without prior written authorization from The Open Group.
 #include   "windowstr.h"

 #include   "pixmapstr.h"

 #include   "inputstr.h"

+#include   "inpututils.h"

 #include   "eventstr.h"

 #include   "mi.h"

 #include   "scrnintstr.h"

@@ -464,8 +465,10 @@ void DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button, floa
 

     DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, pressure, tilt_x, tilt_y);

     darwinEvents_lock(); {

+        ValuatorMask mask;

+        valuator_mask_set_range(&mask, 0, (pDev == darwinTabletCurrent) ? 5 : 2, valuators);

         num_events = GetPointerEvents(darwinEvents, pDev, ev_type, ev_button, 

-                                      POINTER_ABSOLUTE, 0, pDev==darwinTabletCurrent?5:2, valuators);

+                                      POINTER_ABSOLUTE, &mask);

         for(i=0; i<num_events; i++) mieqEnqueue (pDev, (InternalEvent*)darwinEvents[i].event);

         if(num_events > 0) DarwinPokeEQ();

     } darwinEvents_unlock();

@@ -507,8 +510,9 @@ void DarwinSendProximityEvents(int ev_type, float pointer_x, float pointer_y) {
 

     DarwinPrepareValuators(pDev, valuators, screen, pointer_x, pointer_y, 0.0f, 0.0f, 0.0f);

     darwinEvents_lock(); {

-        num_events = GetProximityEvents(darwinEvents, pDev, ev_type,

-                                        0, 5, valuators);

+        ValuatorMask mask;

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

+        num_events = GetProximityEvents(darwinEvents, pDev, ev_type, &mask);

         for(i=0; i<num_events; i++) mieqEnqueue (pDev, (InternalEvent*)darwinEvents[i].event);

         if(num_events > 0) DarwinPokeEQ();

     } darwinEvents_unlock();

diff --git a/xorg-server/hw/xquartz/darwinXinput.c b/xorg-server/hw/xquartz/darwinXinput.c
index 958c7cdd4..85ce9d608 100644
--- a/xorg-server/hw/xquartz/darwinXinput.c
+++ b/xorg-server/hw/xquartz/darwinXinput.c
@@ -82,78 +82,6 @@ CloseInputDevice(DeviceIntPtr d, ClientPtr client)
   DEBUG_LOG("CloseInputDevice(%p, %p)\n", d, client);

 }

 

-/***********************************************************************

- *

- * Caller:	ProcXListInputDevices

- *

- * This is the implementation-dependent routine to initialize an input 

- * device to the point that information about it can be listed.

- * Some implementations open all input devices when the server is first

- * initialized, and never close them.  Other implementations open only

- * the X pointer and keyboard devices during server initialization,

- * and only open other input devices when some client makes an

- * XOpenDevice request.  If some other process has the device open, the

- * server may not be able to get information about the device to list it.

- *

- * This procedure should be used by implementations that do not initialize

- * all input devices at server startup.  It should do device-dependent

- * initialization for any devices not previously initialized, and call

- * AddInputDevice for each of those devices so that a DeviceIntRec will be 

- * created for them.

- *

- * The default implementation is to do nothing (assume all input devices

- * are initialized during X server initialization and kept open).

- * The commented-out sample code shows what you might do if you don't want 

- * the default.

- *

- */

-

-void

-AddOtherInputDevices(void)

-{

-    /**********************************************************************

-     for each uninitialized device, do something like: 

-

-    DeviceIntPtr dev;

-    DeviceProc deviceProc;

-    pointer private;

-

-    dev = (DeviceIntPtr) AddInputDevice(deviceProc, TRUE);

-    dev->public.devicePrivate = private;

-    RegisterOtherDevice(dev);

-    dev->inited = ((*dev->deviceProc)(dev, DEVICE_INIT) == Success);

-    ************************************************************************/

-  DEBUG_LOG("AddOtherInputDevices\n");

-}

-

-/***********************************************************************

- *

- * Caller:	ProcXOpenDevice

- *

- * This is the implementation-dependent routine to open an input device.

- * Some implementations open all input devices when the server is first

- * initialized, and never close them.  Other implementations open only

- * the X pointer and keyboard devices during server initialization,

- * and only open other input devices when some client makes an

- * XOpenDevice request.  This entry point is for the latter type of 

- * implementation.

- *

- * If the physical device is not already open, do it here.  In this case,

- * you need to keep track of the fact that one or more clients has the

- * device open, and physically close it when the last client that has

- * it open does an XCloseDevice.

- *

- * The default implementation is to do nothing (assume all input devices

- * are opened during X server initialization and kept open).

- *

- */

-

-void

-OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status)

-{

-  DEBUG_LOG("OpenInputDevice(%p, %p, %p)\n", dev, client, status);

-}

-

 /****************************************************************************

  *

  * Caller:	ProcXSetDeviceMode