diff options
| author | Keith Packard <keithp@keithp.com> | 2001-07-11 02:58:19 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2001-07-11 02:58:19 +0000 |
| commit | 562474091a3d52a062eb89d25a7d38200a785425 (patch) | |
| tree | 41a3cd8f2eb8be80918ae39b065f9132cea9e5fc | |
| parent | 67cd53abfce7ed17ae4c428332a9e0fd908da97a (diff) | |
Fix TOUCHSCREEN support in kdrive
| -rw-r--r-- | hw/kdrive/linux/ts.c | 8 | ||||
| -rw-r--r-- | hw/kdrive/src/kdrive.h | 6 | ||||
| -rw-r--r-- | hw/kdrive/src/kinput.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c index 2481bb2df..92766ac67 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.3 2001/05/23 08:56:08 alanh Exp $ + * $XFree86: xc/programs/Xserver/hw/kdrive/linux/ts.c,v 1.4 2001/06/29 14:00:41 keithp Exp $ * * Derived from ps2.c by Jim Gettys * @@ -40,7 +40,7 @@ int TsScreen; extern int TsFbdev; void -TsRead (int tsPort) +TsRead (int tsPort, void *closure) { TS_EVENT event; long buf[3]; @@ -112,7 +112,7 @@ TsInit (void) TsPort = open (TsNames[i], 0); if (TsPort >= 0) { - if (KdRegisterFd (TsInputType, TsPort, TsRead)) + if (KdRegisterFd (TsInputType, TsPort, TsRead, 0)) return 1; } } @@ -126,7 +126,7 @@ TsFini (void) KdUnregisterFds (TsInputType, TRUE); } -KdTsFuncs TsFuncs = { +KdMouseFuncs TsFuncs = { TsInit, TsFini }; diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index a332d180a..116582496 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.15 2001/06/04 09:45:41 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.16 2001/06/29 14:00:40 keithp Exp $ */ #include <stdio.h> #include "X.h" @@ -543,7 +543,7 @@ KdUnregisterFds (int type, Bool do_close); #ifdef TOUCHSCREEN void -KdInitTouchScreen(KdTsFuncs *pTsFuncs); +KdInitTouchScreen(KdMouseFuncs *pTsFuncs); #endif void @@ -594,7 +594,7 @@ ProcessInputEvents (); extern KdMouseFuncs Ps2MouseFuncs; extern KdMouseFuncs BusMouseFuncs; #ifdef TOUCHSCREEN -extern KdTsFuncs TsFuncs; +extern KdMouseFuncs TsFuncs; #endif extern KdKeyboardFuncs LinuxKeyboardFuncs; extern KdOsFuncs LinuxFuncs; diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 5059eb02a..cae9d8e92 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.16 2001/05/25 18:40:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.17 2001/06/29 14:00:40 keithp Exp $ */ #include "kdrive.h" #include "inputstr.h" @@ -51,7 +51,7 @@ static KdMouseMatrix kdMouseMatrix = { }; #ifdef TOUCHSCREEN -static KdTsFuncs *kdTsFuncs; +static KdMouseFuncs *kdTsFuncs; #endif int kdMinScanCode; @@ -511,7 +511,7 @@ KdInitInput(KdMouseFuncs *pMouseFuncs, #ifdef TOUCHSCREEN void -KdInitTouchScreen(KdTsFuncs *pTsFuncs) +KdInitTouchScreen(KdMouseFuncs *pTsFuncs) { kdTsFuncs = pTsFuncs; } |