Author: branden
Date: 2004-04-11 23:32:43 -0500 (Sun, 11 Apr 2004)
New Revision: 1240
Added:
trunk/debian/patches/084_xkb_implement_grp:sclk_toggle.diff
Modified:
trunk/debian/TODO
trunk/debian/changelog
Log:
Implement XkbOption "grp:sclk_toggle" (pressing Scroll Lock toggles the
key group), courtesy of Michal Kaspar. (Closes: #242209)
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-04-12 04:05:20 UTC (rev 1239)
+++ trunk/debian/TODO 2004-04-12 04:32:43 UTC (rev 1240)
@@ -71,7 +71,6 @@
* #239991: Fix SEGV in xc/lib/X11/imDefIc.c:_XimRegisterKeyPressFilter().
* Make xserver-xfree86.config.in bail with a message if the config files we'll
be asking questions about have been diddled.
-* #242209: xlibs: re-implement "grp:sclk_toggle" option
Do opportunistically, only in conjuction with other fixes
=========================================================
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-12 04:05:20 UTC (rev 1239)
+++ trunk/debian/changelog 2004-04-12 04:32:43 UTC (rev 1240)
@@ -161,8 +161,11 @@
* Disable RandR extension support in siliconmotion driver when the driver's
"Rotate" option is used (thanks, Jim Paris). (Closes: #241286)
- -- Branden Robinson <[EMAIL PROTECTED]> Sun, 11 Apr 2004 22:57:26 -0500
+ * Implement XkbOption "grp:sclk_toggle" (pressing Scroll Lock toggles the
+ key group), courtesy of Michal Kaspar. (Closes: #242209)
+ -- Branden Robinson <[EMAIL PROTECTED]> Sun, 11 Apr 2004 23:22:45 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Added: trunk/debian/patches/084_xkb_implement_grp:sclk_toggle.diff
===================================================================
--- trunk/debian/patches/084_xkb_implement_grp:sclk_toggle.diff 2004-04-12
04:05:20 UTC (rev 1239)
+++ trunk/debian/patches/084_xkb_implement_grp:sclk_toggle.diff 2004-04-12
04:32:43 UTC (rev 1240)
@@ -0,0 +1,71 @@
+$Id$
+
+Provide XKB configuration option for Scroll Lock to be used as a group
+toggle key.
+
+This patch by Michal Kaspar.
+
+Not submitted upstream.
+
+diff -urN xc/programs/xkbcomp~/rules/xfree86 xc/programs/xkbcomp/rules/xfree86
+--- xc/programs/xkbcomp~/rules/xfree86 2003-02-19 23:36:09.000000000 -0500
++++ xc/programs/xkbcomp/rules/xfree86 2004-04-11 23:12:00.000000000 -0500
+@@ -146,6 +146,7 @@
+ grp:menu_toggle = +group(menu_toggle)
+ grp:lwin_toggle = +group(lwin_toggle)
+ grp:rwin_toggle = +group(rwin_toggle)
++ grp:sclk_toggle = +group(sclk_toggle)
+ grp:lshift_toggle = +group(lshift_toggle)
+ grp:rshift_toggle = +group(rshift_toggle)
+ grp:lctrl_toggle = +group(lctrl_toggle)
+diff -urN xc/programs/xkbcomp~/rules/xfree86.lst
xc/programs/xkbcomp/rules/xfree86.lst
+--- xc/programs/xkbcomp~/rules/xfree86.lst 2003-02-27 00:07:39.000000000
-0500
++++ xc/programs/xkbcomp/rules/xfree86.lst 2004-04-11 23:12:16.000000000
-0500
+@@ -211,6 +211,7 @@
+ grp:menu_toggle Menu key changes group
+ grp:lwin_toggle Left Win-key changes group
+ grp:rwin_toggle Right Win-key changes group
++ grp:sclk_toggle Scroll Lock changes group
+ grp:lshift_toggle Left Shift key changes group
+ grp:rshift_toggle Right Shift key changes group
+ grp:lctrl_toggle Left Ctrl key changes group
+diff -urN xc/programs/xkbcomp~/rules/xfree86.xml
xc/programs/xkbcomp/rules/xfree86.xml
+--- xc/programs/xkbcomp~/rules/xfree86.xml 2003-02-27 00:07:39.000000000
-0500
++++ xc/programs/xkbcomp/rules/xfree86.xml 2004-04-11 23:12:35.000000000
-0500
+@@ -2338,6 +2338,14 @@
+ </option>
+ <option>
+ <configItem>
++ <name>grp:sclk_toggle</name>
++ <description>Scroll Lock changes group</description>
++ <description xml:lang="bg">Scroll Lock сменя групата</description>
++ <description xml:lang="ru">Scroll Lock меняет группу</description>
++ </configItem>
++ </option>
++ <option>
++ <configItem>
+ <name>grp:lshift_toggle</name>
+ <description>Left Shift key changes group</description>
+ <description xml:lang="ru">Левая клавиша Shift меняет
группу</description>
+diff -urN xc/programs/xkbcomp~/symbols/group xc/programs/xkbcomp/symbols/group
+--- xc/programs/xkbcomp~/symbols/group 2003-01-19 22:48:39.000000000 -0500
++++ xc/programs/xkbcomp/symbols/group 2004-04-11 23:11:26.000000000 -0500
+@@ -195,6 +195,18 @@
+ };
+ };
+
++// using the group(sclk_toggle) map, pressing the Scroll Lock key
++// toggles groups.
++partial modifier_keys
++xkb_symbols "sclk_toggle" {
++ virtual_modifiers AltGr;
++ key <SCLK> {
++ virtualMods= AltGr,
++ symbols[Group1] = [ ISO_Next_Group ]
++ };
++};
++
++
+ // Both Ctrls pressed together toggle group
+ partial modifier_keys
+ xkb_symbols "ctrls_toggle" {
Property changes on: trunk/debian/patches/084_xkb_implement_grp:sclk_toggle.diff
___________________________________________________________________
Name: svn:keywords
+ Id
