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

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

Browse Source 
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
This commit is contained in:
Keith Packard 2003-10-04 02:43:16 +00:00
parent efbf205a2a
commit aae3e6dcb3
6 changed files with 9 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/kdrive/Makefile.am
View File

@ -1,11 +1,9 @@
if KDRIVEVESA if KDRIVEVESA
VESA_SUBDIRS = vesa mach64 VESA_SUBDIRS = vesa mach64 mga smi
endif endif
SUBDIRS = \ SUBDIRS = \
src \ src \
linux \ linux \
fbdev \ fbdev \
mga \
smi \
$(VESA_SUBDIRS) $(VESA_SUBDIRS)

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

@ -36,17 +36,7 @@
#include "scrnintstr.h" #include "scrnintstr.h"
#include "kdrive.h" #include "kdrive.h"
#include <sys/ioctl.h> #include <sys/ioctl.h>
#if 1
#include <linux/h3600_ts.h> /* touch screen events */ #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; 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, * 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. * then we send delta's so that we can track the entire vga screen.
*/ */
if (KdTsCurScreen == KdTsPhyScreen) { if (KdCurScreen == KdTsPhyScreen) {
flags = KD_BUTTON_1; flags = KD_BUTTON_1;
x = event.x; x = event.x;
y = event.y; y = event.y;

1
hw/kdrive/src/Makefile.am
View File

@ -12,7 +12,6 @@ libkdrive_a_SOURCES = \
kaa.c \ kaa.c \
kasync.c \ kasync.c \
kcmap.c \ kcmap.c \
kcolor.c \
kcurscol.c \ kcurscol.c \
kdrive.c \ kdrive.c \
kinfo.c \ kinfo.c \

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

@ -209,15 +209,7 @@ typedef struct _KdMouseInfo {
extern KdMouseInfo *kdMouseInfo; extern KdMouseInfo *kdMouseInfo;
#ifdef TOUCHSCREEN extern int KdCurScreen;
/*
* 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
KdMouseInfo *KdMouseInfoAdd (void); KdMouseInfo *KdMouseInfoAdd (void);
void KdParseMouse (char *); void KdParseMouse (char *);

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

@ -1610,19 +1610,13 @@ KdCrossScreen(ScreenPtr pScreen, Bool entering)
#endif #endif
} }
#ifdef TOUCHSCREEN int KdCurScreen; /* current event screen */
/* HACK! */
int KdTsCurScreen; /* current event screen */
int KdTsPhyScreen = -1; /* screen associated with touch screen */
#endif
static void static void
KdWarpCursor (ScreenPtr pScreen, int x, int y) KdWarpCursor (ScreenPtr pScreen, int x, int y)
{ {
KdBlockSigio (); KdBlockSigio ();
#ifdef TOUCHSCREEN KdCurScreen = pScreen->myNum;
KdTsCurScreen = pScreen->myNum;
#endif
miPointerWarpCursor (pScreen, x, y); miPointerWarpCursor (pScreen, x, y);
KdUnblockSigio (); KdUnblockSigio ();
} }

16
hw/kdrive/src/kmap.c
View File

@ -23,21 +23,13 @@
*/ */
/* $RCSId: xc/programs/Xserver/hw/kdrive/kmap.c,v 1.10 2001/07/24 21:26:17 keithp Exp $ */ /* $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> #include <config.h>
#endif
#include "kdrive.h" #include "kdrive.h"
#ifdef linux
#ifdef __i386__
#define HAS_MTRR
#endif
#endif
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <sys/mman.h> #include <sys/mman.h>
#ifdef HAS_MTRR #ifdef HAVE_ASM_MTRR_H
#include <asm/mtrr.h> #include <asm/mtrr.h>
#endif #endif
@ -106,14 +98,14 @@ KdUnmapDevice (void *addr, CARD32 size)
#endif #endif
} }
#ifdef HAS_MTRR #ifdef HAVE_ASM_MTRR_H
static int mtrr; static int mtrr;
#endif #endif
void void
KdSetMappedMode (CARD32 addr, CARD32 size, int mode) KdSetMappedMode (CARD32 addr, CARD32 size, int mode)
{ {
#ifdef HAS_MTRR #ifdef HAVE_ASM_MTRR_H
struct mtrr_sentry sentry; struct mtrr_sentry sentry;
unsigned long base, bound; unsigned long base, bound;
unsigned int type; unsigned int type;
@ -152,7 +144,7 @@ KdSetMappedMode (CARD32 addr, CARD32 size, int mode)
void void
KdResetMappedMode (CARD32 addr, CARD32 size, int mode) KdResetMappedMode (CARD32 addr, CARD32 size, int mode)
{ {
#ifdef HAS_MTRR #ifdef HAVE_ASM_MTRR_H
struct mtrr_sentry sentry; struct mtrr_sentry sentry;
unsigned long base, bound; unsigned long base, bound;
unsigned int type; unsigned int type;