redo tslib
This commit is contained in:
parent
5e863851a6
commit
a668b6c11a
|
@ -7,6 +7,7 @@
|
||||||
* Copyright © 1999 Keith Packard
|
* Copyright © 1999 Keith Packard
|
||||||
* Copyright © 2000 Compaq Computer Corporation
|
* Copyright © 2000 Compaq Computer Corporation
|
||||||
* Copyright © 2002 MontaVista Software Inc.
|
* Copyright © 2002 MontaVista Software Inc.
|
||||||
|
* Copyright © 2005 OpenedHand Ltd.
|
||||||
*
|
*
|
||||||
* Permission to use, copy, modify, distribute, and sell this software and its
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
||||||
* documentation for any purpose is hereby granted without fee, provided that
|
* documentation for any purpose is hereby granted without fee, provided that
|
||||||
|
@ -43,6 +44,24 @@
|
||||||
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||||
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
* PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
*
|
||||||
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
||||||
|
* documentation for any purpose is hereby granted without fee, provided that
|
||||||
|
* the above copyright notice appear in all copies and that both that
|
||||||
|
* copyright notice and this permission notice appear in supporting
|
||||||
|
* documentation, and that the name of Matthew Allum or OpenedHand not be used in
|
||||||
|
* advertising or publicity pertaining to distribution of the software without
|
||||||
|
* specific, written prior permission. Matthew Allum and OpenedHand make no
|
||||||
|
* representations about the suitability of this software for any purpose. It
|
||||||
|
* is provided "as is" without express or implied warranty.
|
||||||
|
*
|
||||||
|
* MATTHEW ALLUM AND OPENEDHAND DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
|
||||||
|
* SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
|
||||||
|
* IN NO EVENT SHALL EITHER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||||
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
||||||
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||||
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||||
|
* PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
@ -59,79 +78,65 @@
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <tslib.h>
|
#include <tslib.h>
|
||||||
|
|
||||||
static long lastx = 0, lasty = 0;
|
|
||||||
static struct tsdev *tsDev = NULL;
|
static struct tsdev *tsDev = NULL;
|
||||||
|
|
||||||
|
static char *TsNames[] = {
|
||||||
|
NULL, /* set via TSLIB_TSDEVICE */
|
||||||
|
"/dev/ts",
|
||||||
|
"/dev/touchscreen/0",
|
||||||
|
};
|
||||||
|
|
||||||
|
#define NUM_TS_NAMES (sizeof (TsNames) / sizeof (TsNames[0]))
|
||||||
|
|
||||||
|
/* For XCalibrate extension */
|
||||||
void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
|
void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
|
||||||
void *tslib_raw_event_closure;
|
void *tslib_raw_event_closure;
|
||||||
|
|
||||||
int KdTsPhyScreen = 0;
|
int TsInputType = 0;
|
||||||
|
int KdTsPhyScreen = 0; /* XXX Togo .. */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
TsRead (int tsPort, void *closure)
|
TsRead (int tsPort, void *closure)
|
||||||
{
|
{
|
||||||
KdMouseInfo *mi = closure;
|
KdMouseInfo *mi = closure;
|
||||||
struct ts_sample event;
|
struct ts_sample event;
|
||||||
int n;
|
|
||||||
long x, y;
|
long x, y;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
if (tslib_raw_event_hook)
|
if (tslib_raw_event_hook)
|
||||||
{
|
{
|
||||||
|
/* XCalibrate Ext */
|
||||||
if (ts_read_raw(tsDev, &event, 1) == 1)
|
if (ts_read_raw(tsDev, &event, 1) == 1)
|
||||||
{
|
{
|
||||||
tslib_raw_event_hook (event.x, event.y, event.pressure, tslib_raw_event_closure);
|
tslib_raw_event_hook (event.x,
|
||||||
|
event.y,
|
||||||
|
event.pressure,
|
||||||
|
tslib_raw_event_closure);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (ts_read(tsDev, &event, 1) == 1)
|
while (ts_read(tsDev, &event, 1) == 1)
|
||||||
{
|
{
|
||||||
if (event.pressure)
|
flags = (event.pressure) ? KD_BUTTON_1 : 0;
|
||||||
{
|
x = event.x;
|
||||||
/*
|
y = event.y;
|
||||||
* HACK ATTACK. (static global variables used !)
|
|
||||||
* Here we test for the touch screen driver actually being on the
|
|
||||||
* touch screen, if it is we send absolute coordinates. If not,
|
|
||||||
* then we send delta's so that we can track the entire vga screen.
|
|
||||||
*/
|
|
||||||
if (KdCurScreen == KdTsPhyScreen) {
|
|
||||||
flags = KD_BUTTON_1;
|
|
||||||
x = event.x;
|
|
||||||
y = event.y;
|
|
||||||
} else {
|
|
||||||
flags = /* KD_BUTTON_1 |*/ KD_MOUSE_DELTA;
|
|
||||||
if ((lastx == 0) || (lasty == 0)) {
|
|
||||||
x = 0;
|
|
||||||
y = 0;
|
|
||||||
} else {
|
|
||||||
x = event.x - lastx;
|
|
||||||
y = event.y - lasty;
|
|
||||||
}
|
|
||||||
lastx = event.x;
|
|
||||||
lasty = event.y;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
flags = KD_MOUSE_DELTA;
|
|
||||||
x = 0;
|
|
||||||
y = 0;
|
|
||||||
lastx = 0;
|
|
||||||
lasty = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
KdEnqueueMouseEvent (mi, flags, x, y);
|
KdEnqueueMouseEvent (mi, flags, x, y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *TsNames[] = {
|
static int
|
||||||
NULL,
|
TsLibOpen(char *dev)
|
||||||
"/dev/ts",
|
{
|
||||||
"/dev/touchscreen/0",
|
if(!(tsDev = ts_open(dev, 0)))
|
||||||
};
|
return -1;
|
||||||
|
|
||||||
#define NUM_TS_NAMES (sizeof (TsNames) / sizeof (TsNames[0]))
|
if (ts_config(tsDev))
|
||||||
|
return -1;
|
||||||
|
|
||||||
int TsInputType;
|
return ts_fd(tsDev);
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
TslibEnable (int not_needed_fd, void *closure)
|
TslibEnable (int not_needed_fd, void *closure)
|
||||||
|
@ -139,16 +144,8 @@ TslibEnable (int not_needed_fd, void *closure)
|
||||||
KdMouseInfo *mi = closure;
|
KdMouseInfo *mi = closure;
|
||||||
int fd = 0;
|
int fd = 0;
|
||||||
|
|
||||||
fprintf(stderr, "%s() called\n", __func__);
|
if ((fd = TsLibOpen(mi->name)) == -1)
|
||||||
|
ErrorF ("Unable to re-enable TSLib ( on %s )", mi->name);
|
||||||
if(!(tsDev = ts_open(mi->name, 0))) {
|
|
||||||
fprintf(stderr, "%s() failed to open %s\n", __func__, mi->name );
|
|
||||||
return -1; /* XXX Not sure what to return here */
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ts_config(tsDev))
|
|
||||||
return -1;
|
|
||||||
fd=ts_fd(tsDev);
|
|
||||||
|
|
||||||
return fd;
|
return fd;
|
||||||
}
|
}
|
||||||
|
@ -156,79 +153,80 @@ TslibEnable (int not_needed_fd, void *closure)
|
||||||
static void
|
static void
|
||||||
TslibDisable (int fd, void *closure)
|
TslibDisable (int fd, void *closure)
|
||||||
{
|
{
|
||||||
ts_close(tsDev);
|
if (tsDev)
|
||||||
|
ts_close(tsDev);
|
||||||
tsDev = NULL;
|
tsDev = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
TslibInit (void)
|
TslibInit (void)
|
||||||
{
|
{
|
||||||
int i, j = 0;
|
int i, j = 0;
|
||||||
KdMouseInfo *mi, *next;
|
KdMouseInfo *mi, *next;
|
||||||
int fd= 0;
|
int fd = 0;
|
||||||
int n = 0;
|
int req_type;
|
||||||
|
|
||||||
if (!TsInputType)
|
if (!TsInputType)
|
||||||
TsInputType = KdAllocInputType ();
|
|
||||||
|
|
||||||
KdMouseInfoAdd(); /* allocate empty kdMouseInfo entry for ts */
|
|
||||||
|
|
||||||
for (mi = kdMouseInfo; mi; mi = next)
|
|
||||||
{
|
{
|
||||||
next = mi->next;
|
TsInputType = KdAllocInputType ();
|
||||||
if (mi->inputType)
|
KdParseMouse(0); /* allocate safe slot in kdMouseInfo */
|
||||||
continue;
|
req_type = 0;
|
||||||
|
}
|
||||||
/* Check for tslib env var device setting */
|
else req_type = TsInputType; /* is being re-inited */
|
||||||
if ((TsNames[0] = getenv("TSLIB_TSDEVICE")) == NULL)
|
|
||||||
j++;
|
for (mi = kdMouseInfo; mi; mi = next)
|
||||||
|
{
|
||||||
if (!mi->name)
|
next = mi->next;
|
||||||
|
|
||||||
|
/* find a usuable slot */
|
||||||
|
if (mi->inputType != req_type)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* Check for tslib env var device setting */
|
||||||
|
if ((TsNames[0] = getenv("TSLIB_TSDEVICE")) == NULL)
|
||||||
|
j++;
|
||||||
|
|
||||||
|
if (!mi->name)
|
||||||
{
|
{
|
||||||
for (i = j; i < NUM_TS_NAMES; i++)
|
for (i = j; i < NUM_TS_NAMES; i++)
|
||||||
{
|
{
|
||||||
|
fd = TsLibOpen(TsNames[i]);
|
||||||
/* XXX Should check for */
|
|
||||||
|
if (fd >= 0)
|
||||||
if(!(tsDev = ts_open(TsNames[i],0))) continue;
|
|
||||||
if (ts_config(tsDev)) continue;
|
|
||||||
fd=ts_fd(tsDev);
|
|
||||||
if (fd >= 0)
|
|
||||||
{
|
{
|
||||||
mi->name = KdSaveString (TsNames[i]);
|
mi->name = KdSaveString (TsNames[i]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
if(!(tsDev = ts_open(mi->name,0)))
|
fd = TsLibOpen(mi->name);
|
||||||
continue;
|
|
||||||
if (ts_config(tsDev)) continue;
|
if (fd >= 0 && tsDev != NULL)
|
||||||
fd=ts_fd(tsDev);
|
{
|
||||||
|
mi->driver = (void *) fd;
|
||||||
}
|
mi->inputType = TsInputType;
|
||||||
|
|
||||||
if (fd > 0 && tsDev != 0)
|
KdRegisterFd (TsInputType, fd, TsRead, (void *) mi);
|
||||||
{
|
|
||||||
mi->driver = (void *) fd;
|
/* Set callbacks for vt switches etc */
|
||||||
mi->inputType = TsInputType;
|
KdRegisterFdEnableDisable (fd, TslibEnable, TslibDisable);
|
||||||
if (KdRegisterFd (TsInputType, fd, TsRead, (void *) mi))
|
|
||||||
n++;
|
return TRUE;
|
||||||
|
}
|
||||||
/* Set callbacks for vt switches etc */
|
}
|
||||||
KdRegisterFdEnableDisable (fd, TslibEnable, TslibDisable);
|
|
||||||
|
ErrorF ("Failed to open TSLib device, tried ");
|
||||||
}
|
for (i = j; i < NUM_TS_NAMES; i++)
|
||||||
else
|
ErrorF ("%s ", TsNames[i]);
|
||||||
{
|
ErrorF (".\n");
|
||||||
fprintf(stderr, "%s() failed to open tslib\n", __func__);
|
if (!TsNames[0])
|
||||||
if (fd > 0) close(fd);
|
ErrorF ("Try setting TSLIB_TSDEVICE to valid /dev entry?\n");
|
||||||
}
|
|
||||||
|
if (fd > 0)
|
||||||
|
close(fd);
|
||||||
}
|
|
||||||
|
return FALSE;
|
||||||
return n;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -241,12 +239,19 @@ TslibFini (void)
|
||||||
{
|
{
|
||||||
if (mi->inputType == TsInputType)
|
if (mi->inputType == TsInputType)
|
||||||
{
|
{
|
||||||
if(mi->driver) {
|
if(mi->driver)
|
||||||
|
{
|
||||||
ts_close(tsDev);
|
ts_close(tsDev);
|
||||||
tsDev = NULL;
|
tsDev = NULL;
|
||||||
}
|
}
|
||||||
mi->driver = 0;
|
mi->driver = 0;
|
||||||
mi->inputType = 0;
|
|
||||||
|
/* If below is set to 0, then MouseInit() will trash it,
|
||||||
|
* setting to 'mouse type' ( via server reset). Therefore
|
||||||
|
* Leave it alone and work around in TslibInit() ( see
|
||||||
|
* req_type ).
|
||||||
|
*/
|
||||||
|
/* mi->inputType = 0; */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user