andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix TOUCHSCREEN support in kdrive

Browse Source
This commit is contained in:
Keith Packard 2001-07-11 02:58:19 +00:00
parent 67cd53abfc
commit 562474091a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/kdrive/linux/ts.c
View File

@ -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
};

6
hw/kdrive/src/kdrive.h
View File

@ -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;

6
hw/kdrive/src/kinput.c
View File

@ -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;
}