svn merge ^/branches/released .

6 files changed, 259 insertions, 250 deletions

diff --git a/xorg-server/Xi/listdev.c b/xorg-server/Xi/listdev.c
index 52fc85f57..d84dcd8d9 100644
--- a/xorg-server/Xi/listdev.c
+++ b/xorg-server/Xi/listdev.c
@@ -180,10 +180,10 @@ CopySwapDevice(ClientPtr client, DeviceIntPtr d, int num_classes,
 	dev->use = IsXKeyboard;

     else if (IsMaster(d) && IsPointerDevice(d))

 	dev->use = IsXPointer;

-    else if (d->key && d->kbdfeed)

-        dev->use = IsXExtensionKeyboard;

     else if (d->valuator && d->button)

         dev->use = IsXExtensionPointer;

+    else if (d->key && d->kbdfeed)

+        dev->use = IsXExtensionKeyboard;

     else

 	dev->use = IsXExtensionDevice;

 

diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c
index f4d6ca5d8..485c3caea 100644
--- a/xorg-server/dix/window.c
+++ b/xorg-server/dix/window.c
@@ -3660,9 +3660,9 @@ WindowParentHasDeviceCursor(WindowPtr pWin,
                     &pParentNode, &pParentPrev))

         {

             /* if there is a node in the list, the win has a dev cursor */

-            if (!pParentNode->cursor) /* inherited. loop needs to cont. */

-            {

-            } else if (pParentNode->cursor == pCursor) /* inherit */

+            if (!pParentNode->cursor) /* inherited. */

+                pParent = pParent->parent;

+            else if (pParentNode->cursor == pCursor) /* inherit */

                 return TRUE;

             else  /* different cursor */

                 return FALSE;

diff --git a/xorg-server/hw/kdrive/linux/tslib.c b/xorg-server/hw/kdrive/linux/tslib.c
index ee0f779f3..8d6007390 100644
--- a/xorg-server/hw/kdrive/linux/tslib.c
+++ b/xorg-server/hw/kdrive/linux/tslib.c
@@ -117,15 +117,22 @@ TslibEnable (KdPointerInfo *pi)
         pi->path = strdup("/dev/input/touchscreen0");

         ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", pi->path);

     }

+

     private->tsDev = ts_open(pi->path, 0);

-    private->fd = ts_fd(private->tsDev);

-    if (!private->tsDev || ts_config(private->tsDev) || private->fd < 0) {

+    if (!private->tsDev) {

         ErrorF("[tslib/TslibEnable] failed to open %s\n", pi->path);

-        if (private->fd >= 0)

-            close(private->fd);

         return BadAlloc;

     }

 

+    if (ts_config(private->tsDev)) {

+        ErrorF("[tslib/TslibEnable] failed to load configuration\n");

+        ts_close(private->tsDev);

+        private->tsDev = NULL;

+        return BadValue;

+    }

+

+    private->fd = ts_fd(private->tsDev);

+

     KdRegisterFd(private->fd, TsRead, pi);

 

     return Success;

diff --git a/xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c b/xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c
index ccef5f218..9d9b84a28 100644
--- a/xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c
+++ b/xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c
@@ -1,95 +1,95 @@
-/*
- * Copyright 1997 by UCHIYAMA Yasushi
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of UCHIYAMA Yasushi not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  UCHIYAMA Yasushi makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as is" without express or implied warranty.
- *
- * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- */
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include<mach.h>
-#include<device/device.h>
-#include<mach/machine/mach_i386.h>
-
-#include <X11/X.h>
-
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
-
-#define BIOS_SIZE 0x20000
-
-int 
-xf86ReadBIOS(unsigned long Base,unsigned long Offset,unsigned char *Buf,int Len)
-{
-    mach_port_t device,iopl_dev;
-    memory_object_t iopl_mem;
-    vm_address_t addr = (vm_address_t)0; /* serach starting address */
-    kern_return_t err;
-
-
-    err = get_privileged_ports (NULL, &device);
-    if( err )
-    {
-	errno = err;
-	FatalError("xf86ReadBIOS() can't get_privileged_ports. (%s)\n",strerror(errno));
-    }
-    err = device_open(device,D_READ|D_WRITE,"iopl",&iopl_dev);
-    mach_port_deallocate (mach_task_self (), device);
-    if( err )
-    {
-	errno = err;
-	FatalError("xf86ReadBIOS() can't device_open. (%s)\n",strerror(errno));
-    }
-    err = device_map(iopl_dev,VM_PROT_READ|VM_PROT_WRITE, Base , BIOS_SIZE ,&iopl_mem,0);
-    if( err )
-    {
-	errno = err;
-	FatalError("xf86ReadBIOS() can't device_map. (%s)\n",strerror(errno));
-    }
-    err = vm_map(mach_task_self(),
-		 &addr,
-		 BIOS_SIZE,
-		 0,
-		 TRUE,
-		 iopl_mem,
-		 Base,
-		 FALSE,
-		 VM_PROT_READ|VM_PROT_WRITE,
-		 VM_PROT_READ|VM_PROT_WRITE,
-		 VM_INHERIT_SHARE);
-    mach_port_deallocate(mach_task_self(),iopl_mem);
-    if( err )
-    {
-	errno = err;
-	FatalError("xf86ReadBIOS() can't vm_map. (%s)\n",strerror(errno));
-    }
-
-    memcpy(Buf,(void*)((int)addr + Offset), Len);
-    
-    err = vm_deallocate(mach_task_self(), addr, BIOS_SIZE);
-    if( err )
-    {
-	errno = err;
-	FatalError("xf86ReadBIOS() can't vm_deallocate. (%s)\n",strerror(errno));
-    }
-    
-    return Len;
-}
+/*

+ * Copyright 1997 by UCHIYAMA Yasushi

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name of UCHIYAMA Yasushi not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  UCHIYAMA Yasushi makes no representations

+ * about the suitability of this software for any purpose.  It is provided

+ * "as is" without express or implied warranty.

+ *

+ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ *

+ */

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include<mach.h>

+#include<device/device.h>

+#include<mach/machine/mach_i386.h>

+

+#include <X11/X.h>

+

+#include "xf86.h"

+#include "xf86Priv.h"

+#include "xf86_OSlib.h"

+

+#define BIOS_SIZE 0x20000

+

+int 

+xf86ReadBIOS(unsigned long Base,unsigned long Offset,unsigned char *Buf,int Len)

+{

+    mach_port_t device,mem_dev;

+    memory_object_t mem_obj;

+    vm_address_t addr = (vm_address_t)0; /* serach starting address */

+    kern_return_t err;

+

+

+    err = get_privileged_ports (NULL, &device);

+    if( err )

+    {

+	errno = err;

+	FatalError("xf86ReadBIOS() can't get_privileged_ports. (%s)\n",strerror(errno));

+    }

+    err = device_open(device,D_READ|D_WRITE,"mem",&mem_dev);

+    mach_port_deallocate (mach_task_self (), device);

+    if( err )

+    {

+	errno = err;

+	FatalError("xf86ReadBIOS() can't device_open. (%s)\n",strerror(errno));

+    }

+    err = device_map(mem_dev,VM_PROT_READ|VM_PROT_WRITE, Base , BIOS_SIZE ,&mem_obj,0);

+    if( err )

+    {

+	errno = err;

+	FatalError("xf86ReadBIOS() can't device_map. (%s)\n",strerror(errno));

+    }

+    err = vm_map(mach_task_self(),

+		 &addr,

+		 BIOS_SIZE,

+		 0,

+		 TRUE,

+		 mem_obj,

+		 Base,

+		 FALSE,

+		 VM_PROT_READ|VM_PROT_WRITE,

+		 VM_PROT_READ|VM_PROT_WRITE,

+		 VM_INHERIT_SHARE);

+    mach_port_deallocate(mach_task_self(),mem_obj);

+    if( err )

+    {

+	errno = err;

+	FatalError("xf86ReadBIOS() can't vm_map. (%s)\n",strerror(errno));

+    }

+

+    memcpy(Buf,(void*)((int)addr + Offset), Len);

+    

+    err = vm_deallocate(mach_task_self(), addr, BIOS_SIZE);

+    if( err )

+    {

+	errno = err;

+	FatalError("xf86ReadBIOS() can't vm_deallocate. (%s)\n",strerror(errno));

+    }

+    

+    return Len;

+}

diff --git a/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c b/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c
index 4a99db375..029d3a989 100644
--- a/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c
@@ -1,146 +1,146 @@
-/*
- * Copyright 1997, 1998 by UCHIYAMA Yasushi
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of UCHIYAMA Yasushi not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  UCHIYAMA Yasushi makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as is" without express or implied warranty.
- *
- * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <mach.h>
-#include <device/device.h>
-#include <mach/machine/mach_i386.h>
-
-#include <X11/X.h>
-#include "input.h"
-#include "scrnintstr.h"
-
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
-
-/**************************************************************************
- * Video Memory Mapping section                                            
- ***************************************************************************/
-static pointer
-mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
-{
-    mach_port_t device,iopl_dev;
-    memory_object_t iopl_mem;
-    kern_return_t err;
-    vm_address_t addr=(vm_address_t)0;
-
-    err = get_privileged_ports (NULL, &device);
-    if( err )
-    {
-	errno = err;
-	FatalError("xf86MapVidMem() can't get_privileged_ports. (%s)\n",strerror(errno));
-    }
-    err = device_open(device,D_READ|D_WRITE,"iopl",&iopl_dev);
-    mach_port_deallocate (mach_task_self(), device);
-    if( err )
-    {
-	errno = err;
-	FatalError("xf86MapVidMem() can't device_open. (%s)\n",strerror(errno));
-    }
-
-    err = device_map(iopl_dev,VM_PROT_READ|VM_PROT_WRITE, Base , Size ,&iopl_mem,0);
-    if( err )
-    {
-	errno = err;
-	FatalError("xf86MapVidMem() can't device_map. (%s)\n",strerror(errno));
-    }
-    err = vm_map(mach_task_self(),
-		 &addr,
-		 Size,
-		 0,     /* mask */
-		 TRUE,  /* anywhere */
-		 iopl_mem,
-		 (vm_offset_t)Base,
-		 FALSE, /* copy on write */
-		 VM_PROT_READ|VM_PROT_WRITE,
-		 VM_PROT_READ|VM_PROT_WRITE,
-		 VM_INHERIT_SHARE);
-    mach_port_deallocate(mach_task_self(),iopl_mem);
-    if( err )
-    {
-	errno = err;
-	FatalError("xf86MapVidMem() can't vm_map.(iopl_mem) (%s)\n",strerror(errno));
-    }
-    mach_port_deallocate(mach_task_self(),iopl_dev);
-    if( err )
-    {
-	errno = err;
-	FatalError("xf86MapVidMem() can't mach_port_deallocate.(iopl_dev) (%s)\n",strerror(errno));
-    }
-    return (pointer)addr;
-}
-
-static void
-unmapVidMem(int ScreenNum,pointer Base,unsigned long Size)
-{
-    kern_return_t err = vm_deallocate(mach_task_self(), (int)Base, Size);
-    if( err )
-    {
-	errno = err;
-	ErrorF("xf86UnMapVidMem: can't dealloc framebuffer space (%s)\n",strerror(errno));
-    }
-    return;
-}
-
-/**************************************************************************
- * I/O Permissions section                                                 
- ***************************************************************************/
-
-/*
- * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
- * this.
- */
-extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on);
-
-Bool
-xf86EnableIO()
-{
-    if (ioperm(0, 0x10000, 1)) {
-	FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
-	return FALSE;
-    }
-    ioperm(0x40,4,0); /* trap access to the timer chip */
-    ioperm(0x60,4,0); /* trap access to the keyboard controller */
-    return TRUE;
-}
-	
-void
-xf86DisableIO()
-{
-    ioperm(0,0x10000,0);
-    return;
-}
-
-void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
-	pVidMem->linearSupported = TRUE;
-	pVidMem->mapMem = mapVidMem;
-	pVidMem->unmapMem = unmapVidMem;
-	pVidMem->initialised = TRUE;
-}
+/*

+ * Copyright 1997, 1998 by UCHIYAMA Yasushi

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name of UCHIYAMA Yasushi not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  UCHIYAMA Yasushi makes no representations

+ * about the suitability of this software for any purpose.  It is provided

+ * "as is" without express or implied warranty.

+ *

+ * UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ *

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include <mach.h>

+#include <device/device.h>

+#include <mach/machine/mach_i386.h>

+

+#include <X11/X.h>

+#include "input.h"

+#include "scrnintstr.h"

+

+#include "xf86.h"

+#include "xf86Priv.h"

+#include "xf86_OSlib.h"

+#include "xf86OSpriv.h"

+

+/**************************************************************************

+ * Video Memory Mapping section                                            

+ ***************************************************************************/

+static pointer

+mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)

+{

+    mach_port_t device,mem_dev;

+    memory_object_t mem_obj;

+    kern_return_t err;

+    vm_address_t addr=(vm_address_t)0;

+

+    err = get_privileged_ports (NULL, &device);

+    if( err )

+    {

+	errno = err;

+	FatalError("xf86MapVidMem() can't get_privileged_ports. (%s)\n",strerror(errno));

+    }

+    err = device_open(device,D_READ|D_WRITE,"mem",&mem_dev);

+    mach_port_deallocate (mach_task_self(), device);

+    if( err )

+    {

+	errno = err;

+	FatalError("xf86MapVidMem() can't device_open. (%s)\n",strerror(errno));

+    }

+

+    err = device_map(mem_dev,VM_PROT_READ|VM_PROT_WRITE, Base , Size ,&mem_obj,0);

+    if( err )

+    {

+	errno = err;

+	FatalError("xf86MapVidMem() can't device_map. (%s)\n",strerror(errno));

+    }

+    err = vm_map(mach_task_self(),

+		 &addr,

+		 Size,

+		 0,     /* mask */

+		 TRUE,  /* anywhere */

+		 mem_obj,

+		 (vm_offset_t)Base,

+		 FALSE, /* copy on write */

+		 VM_PROT_READ|VM_PROT_WRITE,

+		 VM_PROT_READ|VM_PROT_WRITE,

+		 VM_INHERIT_SHARE);

+    mach_port_deallocate(mach_task_self(),mem_obj);

+    if( err )

+    {

+	errno = err;

+	FatalError("xf86MapVidMem() can't vm_map.(mem_obj) (%s)\n",strerror(errno));

+    }

+    mach_port_deallocate(mach_task_self(),mem_dev);

+    if( err )

+    {

+	errno = err;

+	FatalError("xf86MapVidMem() can't mach_port_deallocate.(mem_dev) (%s)\n",strerror(errno));

+    }

+    return (pointer)addr;

+}

+

+static void

+unmapVidMem(int ScreenNum,pointer Base,unsigned long Size)

+{

+    kern_return_t err = vm_deallocate(mach_task_self(), (int)Base, Size);

+    if( err )

+    {

+	errno = err;

+	ErrorF("xf86UnMapVidMem: can't dealloc framebuffer space (%s)\n",strerror(errno));

+    }

+    return;

+}

+

+/**************************************************************************

+ * I/O Permissions section                                                 

+ ***************************************************************************/

+

+/*

+ * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare

+ * this.

+ */

+extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on);

+

+Bool

+xf86EnableIO()

+{

+    if (ioperm(0, 0x10000, 1)) {

+	FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));

+	return FALSE;

+    }

+    ioperm(0x40,4,0); /* trap access to the timer chip */

+    ioperm(0x60,4,0); /* trap access to the keyboard controller */

+    return TRUE;

+}

+	

+void

+xf86DisableIO()

+{

+    ioperm(0,0x10000,0);

+    return;

+}

+

+void

+xf86OSInitVidMem(VidMemInfoPtr pVidMem)

+{

+	pVidMem->linearSupported = TRUE;

+	pVidMem->mapMem = mapVidMem;

+	pVidMem->unmapMem = unmapVidMem;

+	pVidMem->initialised = TRUE;

+}

diff --git a/xorg-server/test/input.c b/xorg-server/test/input.c
index 42435a9db..240c2905b 100644
--- a/xorg-server/test/input.c
+++ b/xorg-server/test/input.c
@@ -182,6 +182,8 @@ static void dix_event_to_core(int type)
     ev.time     = time;

     ev.root_y   = x;

     ev.root_x   = y;

+    SetBit(ev.valuators.mask, 0);

+    SetBit(ev.valuators.mask, 1);

     ev.root     = ROOT_WINDOW_ID;

     ev.corestate = state;

     ev.detail.key = detail;