Commit aae3e6dc authored by Keith Packard's avatar Keith Packard

configure.ac Makefile.am os/oscolor.c Xext/saver.c Xext/Makefile.am

    hw/kdrive/linux/ts.c hw/kdrive/src/Makefile.am hw/kdrive/src/kdrive.h
    hw/kdrive/src/kinput.c hw/kdrive/src/kmap.c Autodetect VM86 (for vesa),
    AGPGART, APM, MTRR, tslib and handhelds.org touch screen. Add
    USE_RGB_BUILTIN and code for fileless RGB database. Add
    MIT-SCREEN-SAVER
parent efbf205a
if KDRIVEVESA
VESA_SUBDIRS = vesa mach64
VESA_SUBDIRS = vesa mach64 mga smi
endif
SUBDIRS = \
src \
linux \
fbdev \
mga \
smi \
$(VESA_SUBDIRS)
......@@ -36,17 +36,7 @@
#include "scrnintstr.h"
#include "kdrive.h"
#include <sys/ioctl.h>
#if 1
#include <linux/h3600_ts.h> /* touch screen events */
#else
/* inline for non-arm debug builds */
typedef struct {
unsigned short pressure;
unsigned short x;
unsigned short y;
unsigned short pad; /* TODO TODO word boundary pad */
} TS_EVENT;
#endif
static long lastx = 0, lasty = 0;
......@@ -104,7 +94,7 @@ TsRead (int tsPort, void *closure)
* 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 (KdTsCurScreen == KdTsPhyScreen) {
if (KdCurScreen == KdTsPhyScreen) {
flags = KD_BUTTON_1;
x = event.x;
y = event.y;
......
......@@ -12,7 +12,6 @@ libkdrive_a_SOURCES = \
kaa.c \
kasync.c \
kcmap.c \
kcolor.c \
kcurscol.c \
kdrive.c \
kinfo.c \
......
......@@ -209,15 +209,7 @@ typedef struct _KdMouseInfo {
extern KdMouseInfo *kdMouseInfo;
#ifdef TOUCHSCREEN
/*
* HACK! Send absolute events when touch screen is current,
* else send relative events. Used to drive pointers on
* alternate screens with the touch screen
*/
extern int KdTsCurScreen;
extern int KdTsPhyScreen;
#endif
extern int KdCurScreen;
KdMouseInfo *KdMouseInfoAdd (void);
void KdParseMouse (char *);
......
......@@ -1610,19 +1610,13 @@ KdCrossScreen(ScreenPtr pScreen, Bool entering)
#endif
}
#ifdef TOUCHSCREEN
/* HACK! */
int KdTsCurScreen; /* current event screen */
int KdTsPhyScreen = -1; /* screen associated with touch screen */
#endif
int KdCurScreen; /* current event screen */
static void
KdWarpCursor (ScreenPtr pScreen, int x, int y)
{
KdBlockSigio ();
#ifdef TOUCHSCREEN
KdTsCurScreen = pScreen->myNum;
#endif
KdCurScreen = pScreen->myNum;
miPointerWarpCursor (pScreen, x, y);
KdUnblockSigio ();
}
......
......@@ -23,21 +23,13 @@
*/
/* $RCSId: xc/programs/Xserver/hw/kdrive/kmap.c,v 1.10 2001/07/24 21:26:17 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "kdrive.h"
#ifdef linux
#ifdef __i386__
#define HAS_MTRR
#endif
#endif
#include <errno.h>
#include <unistd.h>
#include <sys/mman.h>
#ifdef HAS_MTRR
#ifdef HAVE_ASM_MTRR_H
#include <asm/mtrr.h>
#endif
......@@ -106,14 +98,14 @@ KdUnmapDevice (void *addr, CARD32 size)
#endif
}
#ifdef HAS_MTRR
#ifdef HAVE_ASM_MTRR_H
static int mtrr;
#endif
void
KdSetMappedMode (CARD32 addr, CARD32 size, int mode)
{
#ifdef HAS_MTRR
#ifdef HAVE_ASM_MTRR_H
struct mtrr_sentry sentry;
unsigned long base, bound;
unsigned int type;
......@@ -152,7 +144,7 @@ KdSetMappedMode (CARD32 addr, CARD32 size, int mode)
void
KdResetMappedMode (CARD32 addr, CARD32 size, int mode)
{
#ifdef HAS_MTRR
#ifdef HAVE_ASM_MTRR_H
struct mtrr_sentry sentry;
unsigned long base, bound;
unsigned int type;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment