xserver/hw/kdrive/src kdrive.c, 1.39, 1.40 kdrive.h, 1.57, 1.58 kinput.c, 1.41, 1.42

[Phil Blundell]

Committed by: pb

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory gabe:/tmp/cvs-serv28408/hw/kdrive/src

Modified Files:
	kdrive.c kdrive.h kinput.c 
Log Message:
2004-11-13  Phil Blundell  <pb at nexus.co.uk>

	* hw/kdrive/src/kdrive.c (dontZap): New global variable.
	(KdProcessArgument): Set it to TRUE on -nozap switch.
	(KdUseMsg): Add help for -nozap and -rgba switches.
	* hw/kdrive/src/kdrive.h (dontZap): Declare.
	* hw/kdrive/src/kinput.c (KdCheckSpecialKeys): Honour dontZap
	flag.



Index: kdrive.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kdrive.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- kdrive.c	21 May 2004 03:32:27 -0000	1.39
+++ kdrive.c	13 Nov 2004 16:41:00 -0000	1.40
@@ -68,6 +68,7 @@
 Bool		    kdEmulateMiddleButton;
 Bool		    kdRawPointerCoordinates;
 Bool		    kdDisableZaphod;
+Bool                kdDontZap;
 Bool		    kdEnabled;
 int		    kdSubpixelOrder;
 int		    kdVirtualTerminal = -1;
@@ -673,6 +674,7 @@
     ErrorF("\nTinyX Device Dependent Usage:\n");
     ErrorF("-card pcmcia     Use PCMCIA card as additional screen\n");
     ErrorF("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM][@ROTATION][X][Y][xDEPTH/BPP{,DEPTH/BPP}[xFREQ]]  Specify screen characteristics\n");
+    ErrorF("-rgba rgb/bgr/vrgb/vbgr/none   Specify subpixel ordering for LCD panels\n");
     ErrorF("-zaphod          Disable cursor screen switching\n");
     ErrorF("-2button         Emulate 3 button mouse\n");
     ErrorF("-3button         Disable 3 button mouse emulation\n");
@@ -683,8 +685,8 @@
     ErrorF("-origin X,Y      Locates the next screen in the the virtual screen (Xinerama)\n");
     ErrorF("-mouse path[,n]  Filename of mouse device, n is number of buttons\n");
     ErrorF("-switchCmd       Command to execute on vt switch\n");
+    ErrorF("-nozap           Don't terminate server on Ctrl+Alt+Backspace\n");
     ErrorF("vtxx             Use virtual terminal xx instead of the next available\n");
-    /* XXX: what does -rgba do? */
 #ifdef PSEUDO8
     p8UseMsg ();
 #endif
@@ -729,6 +731,11 @@
 	kdDisableZaphod = TRUE;
 	return 1;
     }
+    if (!strcmp (argv[i], "-nozap"))
+    {
+	kdDontZap = TRUE;
+	return 1;
+    }
     if (!strcmp (argv[i], "-3button"))
     {
 	kdEmulateMiddleButton = FALSE;

Index: kdrive.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kdrive.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- kdrive.h	30 Aug 2004 22:16:46 -0000	1.57
+++ kdrive.h	13 Nov 2004 16:41:00 -0000	1.58
@@ -410,6 +410,7 @@
 extern Bool		kdSwitchPending;
 extern Bool		kdEmulateMiddleButton;
 extern Bool		kdDisableZaphod;
+extern Bool		kdDontZap;
 extern int		kdVirtualTerminal;
 extern char		*kdSwitchCmd;
 extern KdOsFuncs	*kdOsFuncs;

Index: kinput.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kinput.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- kinput.c	20 Oct 2004 18:02:32 -0000	1.41
+++ kinput.c	13 Nov 2004 16:41:00 -0000	1.42
@@ -1209,7 +1209,8 @@
 	 * Set the dispatch exception flag so the server will terminate the
 	 * next time through the dispatch loop.
 	 */
-	dispatchException |= DE_TERMINATE;
+	if (kdDontZap == FALSE)
+	    dispatchException |= DE_TERMINATE;
 	break;
     }
 }