frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer touchscreen to mouse

This commit is contained in:
Keith Packard 2002-08-15 18:07:57 +00:00
parent fe477855d7
commit 2698ee9f29
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 * Derived from ps2.c by Jim Gettys
* *
@ -183,6 +183,8 @@ TsInit (void)
if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi)) if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi))
n++; n++;
} }
else
close (fd);
} }
} }
} }

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

@ -309,12 +309,12 @@ KdMouseProc(DeviceIntPtr pDevice, int onoff)
case DEVICE_ON: case DEVICE_ON:
pDev->on = TRUE; pDev->on = TRUE;
pKdPointer = pDevice; pKdPointer = pDevice;
if (kdMouseFuncs)
(*kdMouseFuncs->Init) ();
#ifdef TOUCHSCREEN #ifdef TOUCHSCREEN
if (kdTsFuncs) if (kdTsFuncs)
(*kdTsFuncs->Init) (); (*kdTsFuncs->Init) ();
#endif #endif
if (kdMouseFuncs)
(*kdMouseFuncs->Init) ();
break; break;
case DEVICE_OFF: case DEVICE_OFF:
case DEVICE_CLOSE: case DEVICE_CLOSE: