Apply patch kbd-1.08-compose.patch from ALT Linux

Map the PrintScreen key and Alt+AltGr to Compose

Signed-off-by: Alexey Gladkov <legion@altlinux.org>

diff --git a/data/keymaps/i386/include/compose.inc b/data/keymaps/i386/include/compose.inc
new file mode 100644 (file)
index 0000000..c86d2da
--- /dev/null
+++ b/data/keymaps/i386/include/compose.inc
@@ -0,0 +1,8 @@
+# We map the PrintScreen key (useless) and Alt+AltGr to the Compose key...
+# A really useful thing not found on normal keyboards. :/
+#
+# (c) 2001 Bernhard Rosenkränzer <bero@arklinux.org>
+
+keycode  99 = Compose          # SysRq/PrintScrn
+keycode 100 = AltGr            
+alt keycode 100 = Compose

diff --git a/data/keymaps/i386/include/linux-keys-bare.inc b/data/keymaps/i386/include/linux-keys-bare.inc
index 7a3cb82..cfbba20 100644 (file)
--- a/data/keymaps/i386/include/linux-keys-bare.inc
+++ b/data/keymaps/i386/include/linux-keys-bare.inc
@@ -148,7 +148,8 @@ control     alt keycode 111 = Boot
 # The three system keys
 #
 keycode  84 = Last_Console             # Alt+SysRq/PrintScrn
-keycode  99 = VoidSymbol               # SysRq/PrintScrn
+#keycode  99 = VoidSymbol              # SysRq/PrintScrn
+keycode  99 = Compose                  # SysRq/PrintScrn
 alt    keycode 99 = Control_backslash
 control        keycode 99 = Control_backslash
 

diff --git a/data/keymaps/i386/include/linux-with-alt-and-altgr.inc b/data/keymaps/i386/include/linux-with-alt-and-altgr.inc
index ba7178a..ea3279e 100644 (file)
--- a/data/keymaps/i386/include/linux-with-alt-and-altgr.inc
+++ b/data/keymaps/i386/include/linux-with-alt-and-altgr.inc
@@ -1,6 +1,7 @@
 include "linux-keys-bare"
 
 keycode 100 = AltGr
+alt keycode 100 = Compose
 
 altgr keycode 70 = Show_Registers
 alt keycode 70 = Scroll_Lock

diff --git a/data/keymaps/i386/include/qwerty-layout.inc b/data/keymaps/i386/include/qwerty-layout.inc
index 0cd573c..5a467b8 100644 (file)
--- a/data/keymaps/i386/include/qwerty-layout.inc
+++ b/data/keymaps/i386/include/qwerty-layout.inc
@@ -28,3 +28,4 @@ keycode 48 = b
 keycode 49 = n
 keycode 50 = m
 #
+include "compose"

diff --git a/data/keymaps/i386/include/qwertz-layout.inc b/data/keymaps/i386/include/qwertz-layout.inc
index 91ea77d..6d2ba5a 100644 (file)
--- a/data/keymaps/i386/include/qwertz-layout.inc
+++ b/data/keymaps/i386/include/qwertz-layout.inc
@@ -28,3 +28,4 @@ keycode 48 = b
 keycode 49 = n
 keycode 50 = m
 #
+include "compose"