xserver/hw/kdrive/linux Makefile.am,1.8,1.9 linux.c,1.18,1.19

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/linux
In directory gabe:/tmp/cvs-serv18753/hw/kdrive/linux

Modified Files:
	Makefile.am linux.c 
Log Message:
2005-02-08  Keith Packard  <keithp at keithp.com>

	* hw/kdrive/ati/radeon_composite.c 
	Support linear filtering
	
	* hw/kdrive/fbdev/fbinit.c: (InitInput):
	* hw/kdrive/ipaq/ipaq.c: (InitInput):
	* hw/kdrive/linux/Makefile.am:
	* hw/kdrive/linux/linux.c: (LinuxFini):
	* hw/kdrive/mach64/mach64stub.c: (InitCard):
	* hw/kdrive/src/kaa.c: (kaaFillTiled):
	* hw/kdrive/src/kaa.h:
	* hw/kdrive/src/kdrive.h:
	* hw/kdrive/src/kinput.c: (KdMouseProc), (KdAddMouseDriver),
	(KdInitInput):
	Change how touch screens work -- make them just another 'mouse'
	device.
	Add unfinished (and unused) code to accelerate tiled fills.



Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	11 Nov 2003 05:46:10 -0000	1.8
+++ Makefile.am	8 Feb 2005 22:43:54 -0000	1.9
@@ -21,6 +21,7 @@
 	klinux.h	\
 	linux.c		\
 	mouse.c		\
+	evdev.c		\
 	ms.c		\
 	ps2.c		\
 	$(TSLIB_C)	\
@@ -32,6 +33,7 @@
 	keyboard.c	\
 	linux.c		\
 	mouse.c		\
+	evdev.c		\
 	ms.c		\
 	ps2.c		\
 	$(TSLIB_C)	\

Index: linux.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/linux.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- linux.c	5 Feb 2004 09:09:51 -0000	1.18
+++ linux.c	8 Feb 2005 22:43:54 -0000	1.19
@@ -429,28 +429,31 @@
     }
     memset (&vts, '\0', sizeof (vts));	/* valgrind */
     ioctl (LinuxConsoleFd, VT_GETSTATE, &vts);
-    /*
-     * Find a legal VT to switch to, either the one we started from
-     * or the lowest active one that isn't ours
-     */
-    if (activeVT < 0 || 
-	activeVT == vts.v_active || 
-	!(vts.v_state & (1 << activeVT)))
+    if (vtno == vts.v_active)
     {
-	for (activeVT = 1; activeVT < 16; activeVT++)
-	    if (activeVT != vtno && (vts.v_state & (1 << activeVT)))
-		break;
-	if (activeVT == 16)
+	/*
+	 * Find a legal VT to switch to, either the one we started from
+	 * or the lowest active one that isn't ours
+	 */
+	if (activeVT < 0 || 
+	    activeVT == vts.v_active || 
+	    !(vts.v_state & (1 << activeVT)))
+	{
+	    for (activeVT = 1; activeVT < 16; activeVT++)
+		if (activeVT != vtno && (vts.v_state & (1 << activeVT)))
+		    break;
+	    if (activeVT == 16)
+		activeVT = -1;
+	}
+	/*
+	 * Perform a switch back to the active VT when we were started
+	 */
+	if (activeVT >= -1)
+	{
+	    ioctl (LinuxConsoleFd, VT_ACTIVATE, activeVT);
+	    ioctl (LinuxConsoleFd, VT_WAITACTIVE, activeVT);
 	    activeVT = -1;
-    }
-    /*
-     * Perform a switch back to the active VT when we were started
-     */
-    if (activeVT >= -1)
-    {
-	ioctl (LinuxConsoleFd, VT_ACTIVATE, activeVT);
-	ioctl (LinuxConsoleFd, VT_WAITACTIVE, activeVT);
-	activeVT = -1;
+	}
     }
     close(LinuxConsoleFd);                /* make the vt-manager happy */
     fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0);