summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2002-08-15 18:07:57 +0000
committerKeith Packard <keithp@keithp.com>2002-08-15 18:07:57 +0000
commit2698ee9f29189a44de1c92df99f48d45f0111577 (patch)
treed29ef64ef2d8f72cb265bcbb048f7a2c5477f1d6
parentfe477855d7d714c154dc9fcb1d0aa67fb8e4e5a5 (diff)
Prefer touchscreen to mousedhd-20020916
-rw-r--r--hw/kdrive/linux/ts.c4
-rw-r--r--hw/kdrive/src/kinput.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c
index 07a676982..c6fad1bd1 100644
--- a/hw/kdrive/linux/ts.c
+++ b/hw/kdrive/linux/ts.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/hw/kdrive/linux/ts.c,v 1.7 2002/08/02 16:11:35 keithp Exp $
+ * $XFree86: xc/programs/Xserver/hw/kdrive/linux/ts.c,v 1.8 2002/08/02 16:30:50 keithp Exp $
*
* Derived from ps2.c by Jim Gettys
*
@@ -183,6 +183,8 @@ TsInit (void)
if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi))
n++;
}
+ else
+ close (fd);
}
}
}
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 21ac69ca6..f6eef0dca 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -309,12 +309,12 @@ KdMouseProc(DeviceIntPtr pDevice, int onoff)
case DEVICE_ON:
pDev->on = TRUE;
pKdPointer = pDevice;
- if (kdMouseFuncs)
- (*kdMouseFuncs->Init) ();
#ifdef TOUCHSCREEN
if (kdTsFuncs)
(*kdTsFuncs->Init) ();
#endif
+ if (kdMouseFuncs)
+ (*kdMouseFuncs->Init) ();
break;
case DEVICE_OFF:
case DEVICE_CLOSE: