1 --- xc/programs/Xserver/hw/kdrive/linux/tslib.c.orig 2002-11-05 05:28:06.000000000 +0000
2 +++ xc/programs/Xserver/hw/kdrive/linux/tslib.c 2003-03-11 21:11:37.000000000 +0000
7 +TslibEnable (int not_needed_fd, void *closure)
9 + KdMouseInfo *mi = closure;
12 + if(!(tsDev = ts_open(mi->name, 0))) {
13 + fprintf(stderr, "%s() failed to open %s\n", __func__, mi->name );
14 + return -1; /* XXX Not sure what to return here */
24 +TslibDisable (int fd, void *closure)
36 TsInputType = KdAllocInputType ();
39 for (mi = kdMouseInfo; mi; mi = next)
48 + if(!(tsDev = ts_open(mi->name,0)))
55 if (fd > 0 && tsDev != 0)
57 mi->driver = (void *) fd;
58 mi->inputType = TsInputType;
59 - if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi))
61 + if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi))
64 + /* Set callbacks for vt switches etc */
65 + KdRegisterFdEnableDisable (fd, TslibEnable, TslibDisable);
69 if (fd > 0) close(fd);