[xorg-commit-diffs] xc/programs/Xserver/hw/xwin winglobals.c, 1.1.2.15, 1.1.2.16 winprocarg.c, 1.1.2.13, 1.1.2.14

[Takuma Murakami]

Committed by: takuma

Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/tmp/cvs-serv27821

Modified Files:
      Tag: CYGWIN
	winglobals.c winprocarg.c 
Log Message:
Add runtime arguments "-keyhook" and "-nokeyhook" (default).


Index: winglobals.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winglobals.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -d -r1.1.2.15 -r1.1.2.16
--- a/winglobals.c	3 Apr 2004 05:00:46 -0000	1.1.2.15
+++ b/winglobals.c	3 Apr 2004 07:03:17 -0000	1.1.2.16
@@ -60,7 +60,7 @@
 char *		g_pszCommandLine = NULL;
 Bool		g_fUseMsg = FALSE;
 DWORD		g_dwCurrentThreadID = 0;
-Bool		g_fKeyboardHookLL = TRUE;
+Bool		g_fKeyboardHookLL = FALSE;
 HHOOK		g_hhookKeyboardLL = NULL;
 
 

Index: winprocarg.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winprocarg.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- a/winprocarg.c	29 Mar 2004 19:36:18 -0000	1.1.2.13
+++ b/winprocarg.c	3 Apr 2004 07:03:17 -0000	1.1.2.14
@@ -48,6 +48,7 @@
 extern char *			g_pszLogFile;
 extern Bool			g_fXdmcpEnabled;
 extern char *			g_pszCommandLine;
+extern Bool			g_fKeyboardHookLL;
 
 
 /*
@@ -1107,6 +1108,18 @@
     }
 #endif
 
+  if (IS_OPTION ("-keyhook"))
+    {
+      g_fKeyboardHookLL = TRUE;
+      return 1;
+    }
+  
+  if (IS_OPTION ("-nokeyhook"))
+    {
+      g_fKeyboardHookLL = FALSE;
+      return 1;
+    }
+  
   return 0;
 }