You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
64 lines
2.2 KiB
64 lines
2.2 KiB
18 years ago
|
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# T2 SDE: package/.../vnc/compile.patch
|
||
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- T2-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
Due to 2.6 kernel headers we have to mess a bit with the older XFree86
|
||
|
|
linux support files ... :-(
|
||
|
|
|
||
|
|
- Rene Rebe <rene@exactcode.de>
|
||
|
|
|
||
|
|
--- ./xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig 2004-11-07 19:11:14.037468118 +0000
|
||
|
|
+++ ./xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-11-07 19:12:40.379726573 +0000
|
||
|
|
@@ -73,11 +73,7 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
/* Deal with spurious kernel header change */
|
||
|
|
-#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
|
||
|
|
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
|
||
|
|
-# define rate period
|
||
|
|
-# endif
|
||
|
|
-#endif
|
||
|
|
+#define rate period
|
||
|
|
|
||
|
|
static int
|
||
|
|
KDKBDREP_ioctl_ok(int rate, int delay) {
|
||
|
|
--- ./xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig 2004-11-07 19:13:59.942061811 +0000
|
||
|
|
+++ ./xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-11-07 19:19:09.523762656 +0000
|
||
|
|
@@ -107,7 +107,7 @@
|
||
|
|
struct kbd_repeat kbdrep_s;
|
||
|
|
|
||
|
|
/* don't change, just test */
|
||
|
|
- kbdrep_s.rate = -1;
|
||
|
|
+ kbdrep_s.period = -1;
|
||
|
|
kbdrep_s.delay = -1;
|
||
|
|
if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
|
||
|
|
return 0;
|
||
|
|
@@ -115,11 +115,11 @@
|
||
|
|
|
||
|
|
/* do the change */
|
||
|
|
if (rate == 0) /* switch repeat off */
|
||
|
|
- kbdrep_s.rate = 0;
|
||
|
|
+ kbdrep_s.period = 0;
|
||
|
|
else
|
||
|
|
- kbdrep_s.rate = 10000 / rate; /* convert cps to msec */
|
||
|
|
- if (kbdrep_s.rate < 1)
|
||
|
|
- kbdrep_s.rate = 1;
|
||
|
|
+ kbdrep_s.period = 10000 / rate; /* convert cps to msec */
|
||
|
|
+ if (kbdrep_s.period < 1)
|
||
|
|
+ kbdrep_s.period = 1;
|
||
|
|
kbdrep_s.delay = delay;
|
||
|
|
if (kbdrep_s.delay < 1)
|
||
|
|
kbdrep_s.delay = 1;
|