[keymaps] ruwin_*: Use qwerty-layout.inc

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

diff --git a/data/keymaps/i386/qwerty/ruwin_alt-CP1251.map b/data/keymaps/i386/qwerty/ruwin_alt-CP1251.map
index 0a48a055d599d915eedaeeebcab0ac1549d83b9e..477597fa5576f4dec890e269bee09fb991f38b70 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_alt-CP1251.map
+++ b/data/keymaps/i386/qwerty/ruwin_alt-CP1251.map
@@ -16,6 +16,8 @@
 #  according to a report by Vitaly Lopatin <vitls@beshtau.ru>:
 #  - make it really conform to the win-layout (based on ruwin_cplk).
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -102,34 +104,34 @@ altgr     alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   +0xE9
 altgr  shift   keycode  16 =   +0xC9
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   +0xF6
 altgr  shift   keycode  17 =   +0xD6
-               keycode  18 =   +e
+
 altgr          keycode  18 =   +0xF3
 altgr  shift   keycode  18 =   +0xD3
-               keycode  19 =   +r
+
 altgr          keycode  19 =   +0xEA
 altgr  shift   keycode  19 =   +0xCA
-               keycode  20 =   +t
+
 altgr          keycode  20 =   +0xE5
 altgr  shift   keycode  20 =   +0xC5
-               keycode  21 =   +y
+
 altgr          keycode  21 =   +0xED
 altgr  shift   keycode  21 =   +0xCD
-               keycode  22 =   +u
+
 altgr          keycode  22 =   +0xE3
 altgr  shift   keycode  22 =   +0xC3
-               keycode  23 =   +i
+
 altgr          keycode  23 =   +0xF8
 altgr  shift   keycode  23 =   +0xD8
-               keycode  24 =   +o
+
 altgr          keycode  24 =   +0xF9
 altgr  shift   keycode  24 =   +0xD9
-               keycode  25 =   +p
+
 altgr          keycode  25 =   +0xE7
 altgr  shift   keycode  25 =   +0xC7
                keycode  26 =   bracketleft     braceleft
@@ -155,31 +157,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   +0xF4
 altgr  shift   keycode  30 =   +0xD4
-               keycode  31 =   +s
+
 altgr          keycode  31 =   +0xFB
 altgr  shift   keycode  31 =   +0xDB
-               keycode  32 =   +d
+
 altgr          keycode  32 =   +0xE2
 altgr  shift   keycode  32 =   +0xC2
-               keycode  33 =   +f
+
 altgr          keycode  33 =   +0xE0
 altgr  shift   keycode  33 =   +0xC0
-               keycode  34 =   +g
+
 altgr          keycode  34 =   +0xEF
 altgr  shift   keycode  34 =   +0xCF
-               keycode  35 =   +h
+
 altgr          keycode  35 =   +0xF0
 altgr  shift   keycode  35 =   +0xD0
-               keycode  36 =   +j
+
 altgr          keycode  36 =   +0xEE
 altgr  shift   keycode  36 =   +0xCE
-               keycode  37 =   +k
+
 altgr          keycode  37 =   +0xEB
 altgr  shift   keycode  37 =   +0xCB
-               keycode  38 =   +l
+
 altgr          keycode  38 =   +0xE4
 altgr  shift   keycode  38 =   +0xC4
                keycode  39 =   semicolon        colon
@@ -207,25 +209,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   +0xFF
 altgr  shift   keycode  44 =   +0xDF
-               keycode  45 =   +x
+
 altgr          keycode  45 =   +0xF7
 altgr  shift   keycode  45 =   +0xD7
-               keycode  46 =   +c
+
 altgr          keycode  46 =   +0xF1
 altgr  shift   keycode  46 =   +0xD1
-               keycode  47 =   +v
+
 altgr          keycode  47 =   +0xEC
 altgr  shift   keycode  47 =   +0xCC
-               keycode  48 =   +b
+
 altgr          keycode  48 =   +0xE8
 altgr  shift   keycode  48 =   +0xC8
-               keycode  49 =   +n
+
 altgr          keycode  49 =   +0xF2
 altgr  shift   keycode  49 =   +0xD2
-               keycode  50 =   +m
+
 altgr          keycode  50 =   +0xFC
 altgr  shift   keycode  50 =   +0xDC
                keycode  51 =   comma            less

diff --git a/data/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map b/data/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map
index 71f280cc1a41d261ef21be954e31383a859c5bf3..ee90aa81734b1b0c7ea03cba53efd336e3e50812 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map
+++ b/data/keymaps/i386/qwerty/ruwin_alt-KOI8-R.map
@@ -10,6 +10,8 @@
 # according to a report by Vitaly Lopatin <vitls@beshtau.ru>:
 # - make it really conform to the win-layout (based on ruwin_cplk).
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -96,34 +98,34 @@ altgr       alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   +0xCA
 altgr  shift   keycode  16 =   +0xEA
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   +0xC3
 altgr  shift   keycode  17 =   +0xE3
-               keycode  18 =   +e
+
 altgr          keycode  18 =   +0xD5
 altgr  shift   keycode  18 =   +0xF5
-               keycode  19 =   +r
+
 altgr          keycode  19 =   +0xCB
 altgr  shift   keycode  19 =   +0xEB
-               keycode  20 =   +t
+
 altgr          keycode  20 =   +0xC5
 altgr  shift   keycode  20 =   +0xE5
-               keycode  21 =   +y
+
 altgr          keycode  21 =   +0xCE
 altgr  shift   keycode  21 =   +0xEE
-               keycode  22 =   +u
+
 altgr          keycode  22 =   +0xC7
 altgr  shift   keycode  22 =   +0xE7
-               keycode  23 =   +i
+
 altgr          keycode  23 =   +0xDB
 altgr  shift   keycode  23 =   +0xFB
-               keycode  24 =   +o
+
 altgr          keycode  24 =   +0xDD
 altgr  shift   keycode  24 =   +0xFD
-               keycode  25 =   +p
+
 altgr          keycode  25 =   +0xDA
 altgr  shift   keycode  25 =   +0xFA
                keycode  26 =   bracketleft     braceleft
@@ -149,31 +151,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   +0xC6
 altgr  shift   keycode  30 =   +0xE6
-               keycode  31 =   +s
+
 altgr          keycode  31 =   +0xD9
 altgr  shift   keycode  31 =   +0xF9
-               keycode  32 =   +d
+
 altgr          keycode  32 =   +0xD7
 altgr  shift   keycode  32 =   +0xF7
-               keycode  33 =   +f
+
 altgr          keycode  33 =   +0xC1
 altgr  shift   keycode  33 =   +0xE1
-               keycode  34 =   +g
+
 altgr          keycode  34 =   +0xD0
 altgr  shift   keycode  34 =   +0xF0
-               keycode  35 =   +h
+
 altgr          keycode  35 =   +0xD2
 altgr  shift   keycode  35 =   +0xF2
-               keycode  36 =   +j
+
 altgr          keycode  36 =   +0xCF
 altgr  shift   keycode  36 =   +0xEF
-               keycode  37 =   +k
+
 altgr          keycode  37 =   +0xCC
 altgr  shift   keycode  37 =   +0xEC
-               keycode  38 =   +l
+
 altgr          keycode  38 =   +0xC4
 altgr  shift   keycode  38 =   +0xE4
                keycode  39 =   semicolon        colon
@@ -201,25 +203,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   +0xD1
 altgr  shift   keycode  44 =   +0xF1
-               keycode  45 =   +x
+
 altgr          keycode  45 =   +0xDE
 altgr  shift   keycode  45 =   +0xFE
-               keycode  46 =   +c
+
 altgr          keycode  46 =   +0xD3
 altgr  shift   keycode  46 =   +0xF3
-               keycode  47 =   +v
+
 altgr          keycode  47 =   +0xCD
 altgr  shift   keycode  47 =   +0xED
-               keycode  48 =   +b
+
 altgr          keycode  48 =   +0xC9
 altgr  shift   keycode  48 =   +0xE9
-               keycode  49 =   +n
+
 altgr          keycode  49 =   +0xD4
 altgr  shift   keycode  49 =   +0xF4
-               keycode  50 =   +m
+
 altgr          keycode  50 =   +0xD8
 altgr  shift   keycode  50 =   +0xF8
                keycode  51 =   comma            less

diff --git a/data/keymaps/i386/qwerty/ruwin_alt-UTF-8.map b/data/keymaps/i386/qwerty/ruwin_alt-UTF-8.map
index 443882df631fa97cb1b4d41e18184ce5c7197ab5..eb2266b8c65d8d821d26372138b8a1d07efff927 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_alt-UTF-8.map
+++ b/data/keymaps/i386/qwerty/ruwin_alt-UTF-8.map
@@ -16,6 +16,8 @@
 #  according to a report by Vitaly Lopatin <vitls@beshtau.ru>:
 #  - make it really conform to the win-layout (based on ruwin_cplk).
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -102,34 +104,34 @@ altgr     alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   U+0439
 altgr  shift   keycode  16 =   U+0419
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   U+0446
 altgr  shift   keycode  17 =   U+0426
-               keycode  18 =   +e
+
 altgr          keycode  18 =   U+0443
 altgr  shift   keycode  18 =   U+0423
-               keycode  19 =   +r
+
 altgr          keycode  19 =   U+043A
 altgr  shift   keycode  19 =   U+041A
-               keycode  20 =   +t
+
 altgr          keycode  20 =   U+0435
 altgr  shift   keycode  20 =   U+0415
-               keycode  21 =   +y
+
 altgr          keycode  21 =   U+043D
 altgr  shift   keycode  21 =   U+041D
-               keycode  22 =   +u
+
 altgr          keycode  22 =   U+0433
 altgr  shift   keycode  22 =   U+0413
-               keycode  23 =   +i
+
 altgr          keycode  23 =   U+0448
 altgr  shift   keycode  23 =   U+0428
-               keycode  24 =   +o
+
 altgr          keycode  24 =   U+0449
 altgr  shift   keycode  24 =   U+0429
-               keycode  25 =   +p
+
 altgr          keycode  25 =   U+0437
 altgr  shift   keycode  25 =   U+0417
                keycode  26 =   bracketleft     braceleft
@@ -155,31 +157,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   U+0444
 altgr  shift   keycode  30 =   U+0424
-               keycode  31 =   +s
+
 altgr          keycode  31 =   U+044B
 altgr  shift   keycode  31 =   U+042B
-               keycode  32 =   +d
+
 altgr          keycode  32 =   U+0432
 altgr  shift   keycode  32 =   U+0412
-               keycode  33 =   +f
+
 altgr          keycode  33 =   U+0430
 altgr  shift   keycode  33 =   U+0410
-               keycode  34 =   +g
+
 altgr          keycode  34 =   U+043F
 altgr  shift   keycode  34 =   U+041F
-               keycode  35 =   +h
+
 altgr          keycode  35 =   U+0440
 altgr  shift   keycode  35 =   U+0420
-               keycode  36 =   +j
+
 altgr          keycode  36 =   U+043E
 altgr  shift   keycode  36 =   U+041E
-               keycode  37 =   +k
+
 altgr          keycode  37 =   U+043B
 altgr  shift   keycode  37 =   U+041B
-               keycode  38 =   +l
+
 altgr          keycode  38 =   U+0434
 altgr  shift   keycode  38 =   U+0414
                keycode  39 =   semicolon        colon
@@ -207,25 +209,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   U+044F
 altgr  shift   keycode  44 =   U+042F
-               keycode  45 =   +x
+
 altgr          keycode  45 =   U+0447
 altgr  shift   keycode  45 =   U+0427
-               keycode  46 =   +c
+
 altgr          keycode  46 =   U+0441
 altgr  shift   keycode  46 =   U+0421
-               keycode  47 =   +v
+
 altgr          keycode  47 =   U+043C
 altgr  shift   keycode  47 =   U+041C
-               keycode  48 =   +b
+
 altgr          keycode  48 =   U+0438
 altgr  shift   keycode  48 =   U+0418
-               keycode  49 =   +n
+
 altgr          keycode  49 =   U+0442
 altgr  shift   keycode  49 =   U+0422
-               keycode  50 =   +m
+
 altgr          keycode  50 =   U+044C
 altgr  shift   keycode  50 =   U+042C
                keycode  51 =   comma            less

diff --git a/data/keymaps/i386/qwerty/ruwin_cplk-CP1251.map b/data/keymaps/i386/qwerty/ruwin_cplk-CP1251.map
index bcf9b632b91642c6d5d906fa035bf74e7b787067..62df90878fbc7a411af45cda662337bc933bc89c 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_cplk-CP1251.map
+++ b/data/keymaps/i386/qwerty/ruwin_cplk-CP1251.map
@@ -12,6 +12,8 @@
 #  CapsLock is used to change rus/lat, while Shift+CapsLock is used to 
 #  lock capitals.
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -98,34 +100,34 @@ altgr      alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   +0xE9
 altgr  shift   keycode  16 =   +0xC9
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   +0xF6
 altgr  shift   keycode  17 =   +0xD6
-               keycode  18 =   +e
+
 altgr          keycode  18 =   +0xF3
 altgr  shift   keycode  18 =   +0xD3
-               keycode  19 =   +r
+
 altgr          keycode  19 =   +0xEA
 altgr  shift   keycode  19 =   +0xCA
-               keycode  20 =   +t
+
 altgr          keycode  20 =   +0xE5
 altgr  shift   keycode  20 =   +0xC5
-               keycode  21 =   +y
+
 altgr          keycode  21 =   +0xED
 altgr  shift   keycode  21 =   +0xCD
-               keycode  22 =   +u
+
 altgr          keycode  22 =   +0xE3
 altgr  shift   keycode  22 =   +0xC3
-               keycode  23 =   +i
+
 altgr          keycode  23 =   +0xF8
 altgr  shift   keycode  23 =   +0xD8
-               keycode  24 =   +o
+
 altgr          keycode  24 =   +0xF9
 altgr  shift   keycode  24 =   +0xD9
-               keycode  25 =   +p
+
 altgr          keycode  25 =   +0xE7
 altgr  shift   keycode  25 =   +0xC7
                keycode  26 =   bracketleft     braceleft
@@ -151,31 +153,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   +0xF4
 altgr  shift   keycode  30 =   +0xD4
-               keycode  31 =   +s
+
 altgr          keycode  31 =   +0xFB
 altgr  shift   keycode  31 =   +0xDB
-               keycode  32 =   +d
+
 altgr          keycode  32 =   +0xE2
 altgr  shift   keycode  32 =   +0xC2
-               keycode  33 =   +f
+
 altgr          keycode  33 =   +0xE0
 altgr  shift   keycode  33 =   +0xC0
-               keycode  34 =   +g
+
 altgr          keycode  34 =   +0xEF
 altgr  shift   keycode  34 =   +0xCF
-               keycode  35 =   +h
+
 altgr          keycode  35 =   +0xF0
 altgr  shift   keycode  35 =   +0xD0
-               keycode  36 =   +j
+
 altgr          keycode  36 =   +0xEE
 altgr  shift   keycode  36 =   +0xCE
-               keycode  37 =   +k
+
 altgr          keycode  37 =   +0xEB
 altgr  shift   keycode  37 =   +0xCB
-               keycode  38 =   +l
+
 altgr          keycode  38 =   +0xE4
 altgr  shift   keycode  38 =   +0xC4
                keycode  39 =   semicolon        colon
@@ -203,25 +205,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   +0xFF
 altgr  shift   keycode  44 =   +0xDF
-               keycode  45 =   +x
+
 altgr          keycode  45 =   +0xF7
 altgr  shift   keycode  45 =   +0xD7
-               keycode  46 =   +c
+
 altgr          keycode  46 =   +0xF1
 altgr  shift   keycode  46 =   +0xD1
-               keycode  47 =   +v
+
 altgr          keycode  47 =   +0xEC
 altgr  shift   keycode  47 =   +0xCC
-               keycode  48 =   +b
+
 altgr          keycode  48 =   +0xE8
 altgr  shift   keycode  48 =   +0xC8
-               keycode  49 =   +n
+
 altgr          keycode  49 =   +0xF2
 altgr  shift   keycode  49 =   +0xD2
-               keycode  50 =   +m
+
 altgr          keycode  50 =   +0xFC
 altgr  shift   keycode  50 =   +0xDC
                keycode  51 =   comma            less
@@ -405,7 +407,6 @@ keycode  97 = Control
 altgr  control keycode  99 =   Control_backslash
        alt     keycode  99 =   Control_backslash
 altgr  alt     keycode  99 =   Control_backslash
-               keycode 100 = AltGr
                keycode 101 =   Break   
                keycode 102 =   Find    
                keycode 103 =   Up      

diff --git a/data/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map b/data/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map
index 55fc331ff17d34f8f12bddf26e585fd8993d9af1..288603f7290997967e1fa6df6bda9f7488b558da 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map
+++ b/data/keymaps/i386/qwerty/ruwin_cplk-KOI8-R.map
@@ -6,6 +6,8 @@
 # CapsLock is used to change rus/lat, while Shift+CapsLock is used to 
 # lock capitals.
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -92,34 +94,34 @@ altgr       alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   +0xCA
 altgr  shift   keycode  16 =   +0xEA
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   +0xC3
 altgr  shift   keycode  17 =   +0xE3
-               keycode  18 =   +e
+
 altgr          keycode  18 =   +0xD5
 altgr  shift   keycode  18 =   +0xF5
-               keycode  19 =   +r
+
 altgr          keycode  19 =   +0xCB
 altgr  shift   keycode  19 =   +0xEB
-               keycode  20 =   +t
+
 altgr          keycode  20 =   +0xC5
 altgr  shift   keycode  20 =   +0xE5
-               keycode  21 =   +y
+
 altgr          keycode  21 =   +0xCE
 altgr  shift   keycode  21 =   +0xEE
-               keycode  22 =   +u
+
 altgr          keycode  22 =   +0xC7
 altgr  shift   keycode  22 =   +0xE7
-               keycode  23 =   +i
+
 altgr          keycode  23 =   +0xDB
 altgr  shift   keycode  23 =   +0xFB
-               keycode  24 =   +o
+
 altgr          keycode  24 =   +0xDD
 altgr  shift   keycode  24 =   +0xFD
-               keycode  25 =   +p
+
 altgr          keycode  25 =   +0xDA
 altgr  shift   keycode  25 =   +0xFA
                keycode  26 =   bracketleft     braceleft
@@ -145,31 +147,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   +0xC6
 altgr  shift   keycode  30 =   +0xE6
-               keycode  31 =   +s
+
 altgr          keycode  31 =   +0xD9
 altgr  shift   keycode  31 =   +0xF9
-               keycode  32 =   +d
+
 altgr          keycode  32 =   +0xD7
 altgr  shift   keycode  32 =   +0xF7
-               keycode  33 =   +f
+
 altgr          keycode  33 =   +0xC1
 altgr  shift   keycode  33 =   +0xE1
-               keycode  34 =   +g
+
 altgr          keycode  34 =   +0xD0
 altgr  shift   keycode  34 =   +0xF0
-               keycode  35 =   +h
+
 altgr          keycode  35 =   +0xD2
 altgr  shift   keycode  35 =   +0xF2
-               keycode  36 =   +j
+
 altgr          keycode  36 =   +0xCF
 altgr  shift   keycode  36 =   +0xEF
-               keycode  37 =   +k
+
 altgr          keycode  37 =   +0xCC
 altgr  shift   keycode  37 =   +0xEC
-               keycode  38 =   +l
+
 altgr          keycode  38 =   +0xC4
 altgr  shift   keycode  38 =   +0xE4
                keycode  39 =   semicolon        colon
@@ -197,25 +199,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   +0xD1
 altgr  shift   keycode  44 =   +0xF1
-               keycode  45 =   +x
+
 altgr          keycode  45 =   +0xDE
 altgr  shift   keycode  45 =   +0xFE
-               keycode  46 =   +c
+
 altgr          keycode  46 =   +0xD3
 altgr  shift   keycode  46 =   +0xF3
-               keycode  47 =   +v
+
 altgr          keycode  47 =   +0xCD
 altgr  shift   keycode  47 =   +0xED
-               keycode  48 =   +b
+
 altgr          keycode  48 =   +0xC9
 altgr  shift   keycode  48 =   +0xE9
-               keycode  49 =   +n
+
 altgr          keycode  49 =   +0xD4
 altgr  shift   keycode  49 =   +0xF4
-               keycode  50 =   +m
+
 altgr          keycode  50 =   +0xD8
 altgr  shift   keycode  50 =   +0xF8
                keycode  51 =   comma            less
@@ -399,7 +401,6 @@ keycode  97 = Control
 altgr  control keycode  99 =   Control_backslash
        alt     keycode  99 =   Control_backslash
 altgr  alt     keycode  99 =   Control_backslash
-               keycode 100 = AltGr
                keycode 101 =   Break   
                keycode 102 =   Find    
                keycode 103 =   Up      

diff --git a/data/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map b/data/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map
index 5a8cdd3e069292c5300dd06468790005b6752d36..aa95f239ce5f92a123ce2543464bb2d18d4aad69 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map
+++ b/data/keymaps/i386/qwerty/ruwin_cplk-UTF-8.map
@@ -12,6 +12,8 @@
 #  CapsLock is used to change rus/lat, while Shift+CapsLock is used to 
 #  lock capitals.
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -98,34 +100,34 @@ altgr      alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   U+0439
 altgr  shift   keycode  16 =   U+0419
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   U+0446
 altgr  shift   keycode  17 =   U+0426
-               keycode  18 =   +e
+
 altgr          keycode  18 =   U+0443
 altgr  shift   keycode  18 =   U+0423
-               keycode  19 =   +r
+
 altgr          keycode  19 =   U+043A
 altgr  shift   keycode  19 =   U+041A
-               keycode  20 =   +t
+
 altgr          keycode  20 =   U+0435
 altgr  shift   keycode  20 =   U+0415
-               keycode  21 =   +y
+
 altgr          keycode  21 =   U+043D
 altgr  shift   keycode  21 =   U+041D
-               keycode  22 =   +u
+
 altgr          keycode  22 =   U+0433
 altgr  shift   keycode  22 =   U+0413
-               keycode  23 =   +i
+
 altgr          keycode  23 =   U+0448
 altgr  shift   keycode  23 =   U+0428
-               keycode  24 =   +o
+
 altgr          keycode  24 =   U+0449
 altgr  shift   keycode  24 =   U+0429
-               keycode  25 =   +p
+
 altgr          keycode  25 =   U+0437
 altgr  shift   keycode  25 =   U+0417
                keycode  26 =   bracketleft     braceleft
@@ -151,31 +153,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   U+0444
 altgr  shift   keycode  30 =   U+0424
-               keycode  31 =   +s
+
 altgr          keycode  31 =   U+044B
 altgr  shift   keycode  31 =   U+042B
-               keycode  32 =   +d
+
 altgr          keycode  32 =   U+0432
 altgr  shift   keycode  32 =   U+0412
-               keycode  33 =   +f
+
 altgr          keycode  33 =   U+0430
 altgr  shift   keycode  33 =   U+0410
-               keycode  34 =   +g
+
 altgr          keycode  34 =   U+043F
 altgr  shift   keycode  34 =   U+041F
-               keycode  35 =   +h
+
 altgr          keycode  35 =   U+0440
 altgr  shift   keycode  35 =   U+0420
-               keycode  36 =   +j
+
 altgr          keycode  36 =   U+043E
 altgr  shift   keycode  36 =   U+041E
-               keycode  37 =   +k
+
 altgr          keycode  37 =   U+043B
 altgr  shift   keycode  37 =   U+041B
-               keycode  38 =   +l
+
 altgr          keycode  38 =   U+0434
 altgr  shift   keycode  38 =   U+0414
                keycode  39 =   semicolon        colon
@@ -203,25 +205,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   U+044F
 altgr  shift   keycode  44 =   U+042F
-               keycode  45 =   +x
+
 altgr          keycode  45 =   U+0447
 altgr  shift   keycode  45 =   U+0427
-               keycode  46 =   +c
+
 altgr          keycode  46 =   U+0441
 altgr  shift   keycode  46 =   U+0421
-               keycode  47 =   +v
+
 altgr          keycode  47 =   U+043C
 altgr  shift   keycode  47 =   U+041C
-               keycode  48 =   +b
+
 altgr          keycode  48 =   U+0438
 altgr  shift   keycode  48 =   U+0418
-               keycode  49 =   +n
+
 altgr          keycode  49 =   U+0442
 altgr  shift   keycode  49 =   U+0422
-               keycode  50 =   +m
+
 altgr          keycode  50 =   U+044C
 altgr  shift   keycode  50 =   U+042C
                keycode  51 =   comma            less
@@ -405,7 +407,7 @@ keycode  97 = Control
 altgr  control keycode  99 =   Control_backslash
        alt     keycode  99 =   Control_backslash
 altgr  alt     keycode  99 =   Control_backslash
-               keycode 100 = AltGr
+
                keycode 101 =   Break   
                keycode 102 =   Find    
                keycode 103 =   Up      

diff --git a/data/keymaps/i386/qwerty/ruwin_ct_sh-CP1251.map b/data/keymaps/i386/qwerty/ruwin_ct_sh-CP1251.map
index 116e3f3c63a985fbcf2f0405046428e63f33bdc3..5c825357f374bb03b9fa23dd0bc0b53f657c38f5 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_ct_sh-CP1251.map
+++ b/data/keymaps/i386/qwerty/ruwin_ct_sh-CP1251.map
@@ -14,6 +14,8 @@
 #  Right+Shift is used to change rus/lat 
 #  
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -100,34 +102,34 @@ altgr     alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   +0xE9
 altgr  shift   keycode  16 =   +0xC9
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   +0xF6
 altgr  shift   keycode  17 =   +0xD6
-               keycode  18 =   +e
+
 altgr          keycode  18 =   +0xF3
 altgr  shift   keycode  18 =   +0xD3
-               keycode  19 =   +r
+
 altgr          keycode  19 =   +0xEA
 altgr  shift   keycode  19 =   +0xCA
-               keycode  20 =   +t
+
 altgr          keycode  20 =   +0xE5
 altgr  shift   keycode  20 =   +0xC5
-               keycode  21 =   +y
+
 altgr          keycode  21 =   +0xED
 altgr  shift   keycode  21 =   +0xCD
-               keycode  22 =   +u
+
 altgr          keycode  22 =   +0xE3
 altgr  shift   keycode  22 =   +0xC3
-               keycode  23 =   +i
+
 altgr          keycode  23 =   +0xF8
 altgr  shift   keycode  23 =   +0xD8
-               keycode  24 =   +o
+
 altgr          keycode  24 =   +0xF9
 altgr  shift   keycode  24 =   +0xD9
-               keycode  25 =   +p
+
 altgr          keycode  25 =   +0xE7
 altgr  shift   keycode  25 =   +0xC7
                keycode  26 =   bracketleft     braceleft
@@ -153,31 +155,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   +0xF4
 altgr  shift   keycode  30 =   +0xD4
-               keycode  31 =   +s
+
 altgr          keycode  31 =   +0xFB
 altgr  shift   keycode  31 =   +0xDB
-               keycode  32 =   +d
+
 altgr          keycode  32 =   +0xE2
 altgr  shift   keycode  32 =   +0xC2
-               keycode  33 =   +f
+
 altgr          keycode  33 =   +0xE0
 altgr  shift   keycode  33 =   +0xC0
-               keycode  34 =   +g
+
 altgr          keycode  34 =   +0xEF
 altgr  shift   keycode  34 =   +0xCF
-               keycode  35 =   +h
+
 altgr          keycode  35 =   +0xF0
 altgr  shift   keycode  35 =   +0xD0
-               keycode  36 =   +j
+
 altgr          keycode  36 =   +0xEE
 altgr  shift   keycode  36 =   +0xCE
-               keycode  37 =   +k
+
 altgr          keycode  37 =   +0xEB
 altgr  shift   keycode  37 =   +0xCB
-               keycode  38 =   +l
+
 altgr          keycode  38 =   +0xE4
 altgr  shift   keycode  38 =   +0xC4
                keycode  39 =   semicolon        colon
@@ -207,25 +209,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   +0xFF
 altgr  shift   keycode  44 =   +0xDF
-               keycode  45 =   +x
+
 altgr          keycode  45 =   +0xF7
 altgr  shift   keycode  45 =   +0xD7
-               keycode  46 =   +c
+
 altgr          keycode  46 =   +0xF1
 altgr  shift   keycode  46 =   +0xD1
-               keycode  47 =   +v
+
 altgr          keycode  47 =   +0xEC
 altgr  shift   keycode  47 =   +0xCC
-               keycode  48 =   +b
+
 altgr          keycode  48 =   +0xE8
 altgr  shift   keycode  48 =   +0xC8
-               keycode  49 =   +n
+
 altgr          keycode  49 =   +0xF2
 altgr  shift   keycode  49 =   +0xD2
-               keycode  50 =   +m
+
 altgr          keycode  50 =   +0xFC
 altgr  shift   keycode  50 =   +0xDC
                keycode  51 =   comma            less
@@ -409,7 +411,6 @@ keycode  97 = Control
 altgr  control keycode  99 =   Control_backslash
        alt     keycode  99 =   Control_backslash
 altgr  alt     keycode  99 =   Control_backslash
-               keycode 100 = AltGr
                keycode 101 =   Break   
                keycode 102 =   Find    
                keycode 103 =   Up      

diff --git a/data/keymaps/i386/qwerty/ruwin_ct_sh-KOI8-R.map b/data/keymaps/i386/qwerty/ruwin_ct_sh-KOI8-R.map
index 619426f5a61fad197745046b43fada3ca496d480..0aea5f9bc4684fbf0d66c41c7825ccd99979924c 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_ct_sh-KOI8-R.map
+++ b/data/keymaps/i386/qwerty/ruwin_ct_sh-KOI8-R.map
@@ -8,6 +8,8 @@
 # Right+Shift is used to change rus/lat 
 # 
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -94,34 +96,34 @@ altgr       alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   +0xCA
 altgr  shift   keycode  16 =   +0xEA
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   +0xC3
 altgr  shift   keycode  17 =   +0xE3
-               keycode  18 =   +e
+
 altgr          keycode  18 =   +0xD5
 altgr  shift   keycode  18 =   +0xF5
-               keycode  19 =   +r
+
 altgr          keycode  19 =   +0xCB
 altgr  shift   keycode  19 =   +0xEB
-               keycode  20 =   +t
+
 altgr          keycode  20 =   +0xC5
 altgr  shift   keycode  20 =   +0xE5
-               keycode  21 =   +y
+
 altgr          keycode  21 =   +0xCE
 altgr  shift   keycode  21 =   +0xEE
-               keycode  22 =   +u
+
 altgr          keycode  22 =   +0xC7
 altgr  shift   keycode  22 =   +0xE7
-               keycode  23 =   +i
+
 altgr          keycode  23 =   +0xDB
 altgr  shift   keycode  23 =   +0xFB
-               keycode  24 =   +o
+
 altgr          keycode  24 =   +0xDD
 altgr  shift   keycode  24 =   +0xFD
-               keycode  25 =   +p
+
 altgr          keycode  25 =   +0xDA
 altgr  shift   keycode  25 =   +0xFA
                keycode  26 =   bracketleft     braceleft
@@ -147,31 +149,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   +0xC6
 altgr  shift   keycode  30 =   +0xE6
-               keycode  31 =   +s
+
 altgr          keycode  31 =   +0xD9
 altgr  shift   keycode  31 =   +0xF9
-               keycode  32 =   +d
+
 altgr          keycode  32 =   +0xD7
 altgr  shift   keycode  32 =   +0xF7
-               keycode  33 =   +f
+
 altgr          keycode  33 =   +0xC1
 altgr  shift   keycode  33 =   +0xE1
-               keycode  34 =   +g
+
 altgr          keycode  34 =   +0xD0
 altgr  shift   keycode  34 =   +0xF0
-               keycode  35 =   +h
+
 altgr          keycode  35 =   +0xD2
 altgr  shift   keycode  35 =   +0xF2
-               keycode  36 =   +j
+
 altgr          keycode  36 =   +0xCF
 altgr  shift   keycode  36 =   +0xEF
-               keycode  37 =   +k
+
 altgr          keycode  37 =   +0xCC
 altgr  shift   keycode  37 =   +0xEC
-               keycode  38 =   +l
+
 altgr          keycode  38 =   +0xC4
 altgr  shift   keycode  38 =   +0xE4
                keycode  39 =   semicolon        colon
@@ -201,25 +203,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   +0xD1
 altgr  shift   keycode  44 =   +0xF1
-               keycode  45 =   +x
+
 altgr          keycode  45 =   +0xDE
 altgr  shift   keycode  45 =   +0xFE
-               keycode  46 =   +c
+
 altgr          keycode  46 =   +0xD3
 altgr  shift   keycode  46 =   +0xF3
-               keycode  47 =   +v
+
 altgr          keycode  47 =   +0xCD
 altgr  shift   keycode  47 =   +0xED
-               keycode  48 =   +b
+
 altgr          keycode  48 =   +0xC9
 altgr  shift   keycode  48 =   +0xE9
-               keycode  49 =   +n
+
 altgr          keycode  49 =   +0xD4
 altgr  shift   keycode  49 =   +0xF4
-               keycode  50 =   +m
+
 altgr          keycode  50 =   +0xD8
 altgr  shift   keycode  50 =   +0xF8
                keycode  51 =   comma            less
@@ -403,7 +405,6 @@ keycode  97 = Control
 altgr  control keycode  99 =   Control_backslash
        alt     keycode  99 =   Control_backslash
 altgr  alt     keycode  99 =   Control_backslash
-               keycode 100 = AltGr
                keycode 101 =   Break   
                keycode 102 =   Find    
                keycode 103 =   Up      

diff --git a/data/keymaps/i386/qwerty/ruwin_ct_sh-UTF-8.map b/data/keymaps/i386/qwerty/ruwin_ct_sh-UTF-8.map
index e636ea84ae1ef83ec773e80a82573bf0810042f3..c15454979a08dcfa6b4749dc49d992db61a18692 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_ct_sh-UTF-8.map
+++ b/data/keymaps/i386/qwerty/ruwin_ct_sh-UTF-8.map
@@ -14,6 +14,8 @@
 #  Right+Shift is used to change rus/lat 
 #  
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -100,34 +102,34 @@ altgr     alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   U+0439
 altgr  shift   keycode  16 =   U+0419
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   U+0446
 altgr  shift   keycode  17 =   U+0426
-               keycode  18 =   +e
+
 altgr          keycode  18 =   U+0443
 altgr  shift   keycode  18 =   U+0423
-               keycode  19 =   +r
+
 altgr          keycode  19 =   U+043A
 altgr  shift   keycode  19 =   U+041A
-               keycode  20 =   +t
+
 altgr          keycode  20 =   U+0435
 altgr  shift   keycode  20 =   U+0415
-               keycode  21 =   +y
+
 altgr          keycode  21 =   U+043D
 altgr  shift   keycode  21 =   U+041D
-               keycode  22 =   +u
+
 altgr          keycode  22 =   U+0433
 altgr  shift   keycode  22 =   U+0413
-               keycode  23 =   +i
+
 altgr          keycode  23 =   U+0448
 altgr  shift   keycode  23 =   U+0428
-               keycode  24 =   +o
+
 altgr          keycode  24 =   U+0449
 altgr  shift   keycode  24 =   U+0429
-               keycode  25 =   +p
+
 altgr          keycode  25 =   U+0437
 altgr  shift   keycode  25 =   U+0417
                keycode  26 =   bracketleft     braceleft
@@ -153,31 +155,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   U+0444
 altgr  shift   keycode  30 =   U+0424
-               keycode  31 =   +s
+
 altgr          keycode  31 =   U+044B
 altgr  shift   keycode  31 =   U+042B
-               keycode  32 =   +d
+
 altgr          keycode  32 =   U+0432
 altgr  shift   keycode  32 =   U+0412
-               keycode  33 =   +f
+
 altgr          keycode  33 =   U+0430
 altgr  shift   keycode  33 =   U+0410
-               keycode  34 =   +g
+
 altgr          keycode  34 =   U+043F
 altgr  shift   keycode  34 =   U+041F
-               keycode  35 =   +h
+
 altgr          keycode  35 =   U+0440
 altgr  shift   keycode  35 =   U+0420
-               keycode  36 =   +j
+
 altgr          keycode  36 =   U+043E
 altgr  shift   keycode  36 =   U+041E
-               keycode  37 =   +k
+
 altgr          keycode  37 =   U+043B
 altgr  shift   keycode  37 =   U+041B
-               keycode  38 =   +l
+
 altgr          keycode  38 =   U+0434
 altgr  shift   keycode  38 =   U+0414
                keycode  39 =   semicolon        colon
@@ -207,25 +209,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   U+044F
 altgr  shift   keycode  44 =   U+042F
-               keycode  45 =   +x
+
 altgr          keycode  45 =   U+0447
 altgr  shift   keycode  45 =   U+0427
-               keycode  46 =   +c
+
 altgr          keycode  46 =   U+0441
 altgr  shift   keycode  46 =   U+0421
-               keycode  47 =   +v
+
 altgr          keycode  47 =   U+043C
 altgr  shift   keycode  47 =   U+041C
-               keycode  48 =   +b
+
 altgr          keycode  48 =   U+0438
 altgr  shift   keycode  48 =   U+0418
-               keycode  49 =   +n
+
 altgr          keycode  49 =   U+0442
 altgr  shift   keycode  49 =   U+0422
-               keycode  50 =   +m
+
 altgr          keycode  50 =   U+044C
 altgr  shift   keycode  50 =   U+042C
                keycode  51 =   comma            less
@@ -409,7 +411,6 @@ keycode  97 = Control
 altgr  control keycode  99 =   Control_backslash
        alt     keycode  99 =   Control_backslash
 altgr  alt     keycode  99 =   Control_backslash
-               keycode 100 = AltGr
                keycode 101 =   Break   
                keycode 102 =   Find    
                keycode 103 =   Up      

diff --git a/data/keymaps/i386/qwerty/ruwin_ctrl-CP1251.map b/data/keymaps/i386/qwerty/ruwin_ctrl-CP1251.map
index 0ec6ee61af3185afac54005514952e5c61e14cff..e552f2dc7b5fa6dee4c849a42664751828f88f98 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_ctrl-CP1251.map
+++ b/data/keymaps/i386/qwerty/ruwin_ctrl-CP1251.map
@@ -12,6 +12,8 @@
 #  RightCtrl is used to change rus/lat
 #  
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -98,34 +100,34 @@ altgr      alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   +0xE9
 altgr  shift   keycode  16 =   +0xC9
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   +0xF6
 altgr  shift   keycode  17 =   +0xD6
-               keycode  18 =   +e
+
 altgr          keycode  18 =   +0xF3
 altgr  shift   keycode  18 =   +0xD3
-               keycode  19 =   +r
+
 altgr          keycode  19 =   +0xEA
 altgr  shift   keycode  19 =   +0xCA
-               keycode  20 =   +t
+
 altgr          keycode  20 =   +0xE5
 altgr  shift   keycode  20 =   +0xC5
-               keycode  21 =   +y
+
 altgr          keycode  21 =   +0xED
 altgr  shift   keycode  21 =   +0xCD
-               keycode  22 =   +u
+
 altgr          keycode  22 =   +0xE3
 altgr  shift   keycode  22 =   +0xC3
-               keycode  23 =   +i
+
 altgr          keycode  23 =   +0xF8
 altgr  shift   keycode  23 =   +0xD8
-               keycode  24 =   +o
+
 altgr          keycode  24 =   +0xF9
 altgr  shift   keycode  24 =   +0xD9
-               keycode  25 =   +p
+
 altgr          keycode  25 =   +0xE7
 altgr  shift   keycode  25 =   +0xC7
                keycode  26 =   bracketleft     braceleft
@@ -151,31 +153,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   +0xF4
 altgr  shift   keycode  30 =   +0xD4
-               keycode  31 =   +s
+
 altgr          keycode  31 =   +0xFB
 altgr  shift   keycode  31 =   +0xDB
-               keycode  32 =   +d
+
 altgr          keycode  32 =   +0xE2
 altgr  shift   keycode  32 =   +0xC2
-               keycode  33 =   +f
+
 altgr          keycode  33 =   +0xE0
 altgr  shift   keycode  33 =   +0xC0
-               keycode  34 =   +g
+
 altgr          keycode  34 =   +0xEF
 altgr  shift   keycode  34 =   +0xCF
-               keycode  35 =   +h
+
 altgr          keycode  35 =   +0xF0
 altgr  shift   keycode  35 =   +0xD0
-               keycode  36 =   +j
+
 altgr          keycode  36 =   +0xEE
 altgr  shift   keycode  36 =   +0xCE
-               keycode  37 =   +k
+
 altgr          keycode  37 =   +0xEB
 altgr  shift   keycode  37 =   +0xCB
-               keycode  38 =   +l
+
 altgr          keycode  38 =   +0xE4
 altgr  shift   keycode  38 =   +0xC4
                keycode  39 =   semicolon        colon
@@ -203,25 +205,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   +0xFF
 altgr  shift   keycode  44 =   +0xDF
-               keycode  45 =   +x
+
 altgr          keycode  45 =   +0xF7
 altgr  shift   keycode  45 =   +0xD7
-               keycode  46 =   +c
+
 altgr          keycode  46 =   +0xF1
 altgr  shift   keycode  46 =   +0xD1
-               keycode  47 =   +v
+
 altgr          keycode  47 =   +0xEC
 altgr  shift   keycode  47 =   +0xCC
-               keycode  48 =   +b
+
 altgr          keycode  48 =   +0xE8
 altgr  shift   keycode  48 =   +0xC8
-               keycode  49 =   +n
+
 altgr          keycode  49 =   +0xF2
 altgr  shift   keycode  49 =   +0xD2
-               keycode  50 =   +m
+
 altgr          keycode  50 =   +0xFC
 altgr  shift   keycode  50 =   +0xDC
                keycode  51 =   comma            less
@@ -403,7 +405,6 @@ altgr       control alt     keycode  88 = Console_12
 altgr  control keycode  99 =   Control_backslash
        alt     keycode  99 =   Control_backslash
 altgr  alt     keycode  99 =   Control_backslash
-               keycode 100 = AltGr
                keycode 101 =   Break   
                keycode 102 =   Find    
                keycode 103 =   Up      

diff --git a/data/keymaps/i386/qwerty/ruwin_ctrl-KOI8-R.map b/data/keymaps/i386/qwerty/ruwin_ctrl-KOI8-R.map
index 8529b512b8c270a45d863dc3db3a9cb699be2978..d6363c3e26bc151b6385d5e3ac1f23b36da79f22 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_ctrl-KOI8-R.map
+++ b/data/keymaps/i386/qwerty/ruwin_ctrl-KOI8-R.map
@@ -6,6 +6,8 @@
 # RightCtrl is used to change rus/lat
 # 
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -92,34 +94,34 @@ altgr       alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   +0xCA
 altgr  shift   keycode  16 =   +0xEA
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   +0xC3
 altgr  shift   keycode  17 =   +0xE3
-               keycode  18 =   +e
+
 altgr          keycode  18 =   +0xD5
 altgr  shift   keycode  18 =   +0xF5
-               keycode  19 =   +r
+
 altgr          keycode  19 =   +0xCB
 altgr  shift   keycode  19 =   +0xEB
-               keycode  20 =   +t
+
 altgr          keycode  20 =   +0xC5
 altgr  shift   keycode  20 =   +0xE5
-               keycode  21 =   +y
+
 altgr          keycode  21 =   +0xCE
 altgr  shift   keycode  21 =   +0xEE
-               keycode  22 =   +u
+
 altgr          keycode  22 =   +0xC7
 altgr  shift   keycode  22 =   +0xE7
-               keycode  23 =   +i
+
 altgr          keycode  23 =   +0xDB
 altgr  shift   keycode  23 =   +0xFB
-               keycode  24 =   +o
+
 altgr          keycode  24 =   +0xDD
 altgr  shift   keycode  24 =   +0xFD
-               keycode  25 =   +p
+
 altgr          keycode  25 =   +0xDA
 altgr  shift   keycode  25 =   +0xFA
                keycode  26 =   bracketleft     braceleft
@@ -145,31 +147,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   +0xC6
 altgr  shift   keycode  30 =   +0xE6
-               keycode  31 =   +s
+
 altgr          keycode  31 =   +0xD9
 altgr  shift   keycode  31 =   +0xF9
-               keycode  32 =   +d
+
 altgr          keycode  32 =   +0xD7
 altgr  shift   keycode  32 =   +0xF7
-               keycode  33 =   +f
+
 altgr          keycode  33 =   +0xC1
 altgr  shift   keycode  33 =   +0xE1
-               keycode  34 =   +g
+
 altgr          keycode  34 =   +0xD0
 altgr  shift   keycode  34 =   +0xF0
-               keycode  35 =   +h
+
 altgr          keycode  35 =   +0xD2
 altgr  shift   keycode  35 =   +0xF2
-               keycode  36 =   +j
+
 altgr          keycode  36 =   +0xCF
 altgr  shift   keycode  36 =   +0xEF
-               keycode  37 =   +k
+
 altgr          keycode  37 =   +0xCC
 altgr  shift   keycode  37 =   +0xEC
-               keycode  38 =   +l
+
 altgr          keycode  38 =   +0xC4
 altgr  shift   keycode  38 =   +0xE4
                keycode  39 =   semicolon        colon
@@ -197,25 +199,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   +0xD1
 altgr  shift   keycode  44 =   +0xF1
-               keycode  45 =   +x
+
 altgr          keycode  45 =   +0xDE
 altgr  shift   keycode  45 =   +0xFE
-               keycode  46 =   +c
+
 altgr          keycode  46 =   +0xD3
 altgr  shift   keycode  46 =   +0xF3
-               keycode  47 =   +v
+
 altgr          keycode  47 =   +0xCD
 altgr  shift   keycode  47 =   +0xED
-               keycode  48 =   +b
+
 altgr          keycode  48 =   +0xC9
 altgr  shift   keycode  48 =   +0xE9
-               keycode  49 =   +n
+
 altgr          keycode  49 =   +0xD4
 altgr  shift   keycode  49 =   +0xF4
-               keycode  50 =   +m
+
 altgr          keycode  50 =   +0xD8
 altgr  shift   keycode  50 =   +0xF8
                keycode  51 =   comma            less
@@ -397,7 +399,6 @@ altgr       control alt     keycode  88 = Console_12
 altgr  control keycode  99 =   Control_backslash
        alt     keycode  99 =   Control_backslash
 altgr  alt     keycode  99 =   Control_backslash
-               keycode 100 = AltGr
                keycode 101 =   Break   
                keycode 102 =   Find    
                keycode 103 =   Up      

diff --git a/data/keymaps/i386/qwerty/ruwin_ctrl-UTF-8.map b/data/keymaps/i386/qwerty/ruwin_ctrl-UTF-8.map
index e0fe8ebdffbad57d18bd2c10866065d57a8c37bd..7f49b15d9ace8e614dceccd61d0c294b7afa90e2 100644 (file)
--- a/data/keymaps/i386/qwerty/ruwin_ctrl-UTF-8.map
+++ b/data/keymaps/i386/qwerty/ruwin_ctrl-UTF-8.map
@@ -12,6 +12,8 @@
 #  RightCtrl is used to change rus/lat
 #  
 
+include "qwerty-layout"
+
                keycode   0 =
                keycode   1 =   Escape  Escape          Escape  Escape
        alt     keycode   1 =   Meta_Escape
@@ -98,34 +100,34 @@ altgr      alt     keycode  14 =   Meta_Delete
                keycode  15 =   Tab     Tab             Tab     Tab     
        alt     keycode  15 =   Meta_Tab        
 altgr  alt     keycode  15 =   Meta_Tab
-               keycode  16 =   +q      
+
 altgr          keycode  16 =   U+0439
 altgr  shift   keycode  16 =   U+0419
-               keycode  17 =   +w      
+
 altgr          keycode  17 =   U+0446
 altgr  shift   keycode  17 =   U+0426
-               keycode  18 =   +e
+
 altgr          keycode  18 =   U+0443
 altgr  shift   keycode  18 =   U+0423
-               keycode  19 =   +r
+
 altgr          keycode  19 =   U+043A
 altgr  shift   keycode  19 =   U+041A
-               keycode  20 =   +t
+
 altgr          keycode  20 =   U+0435
 altgr  shift   keycode  20 =   U+0415
-               keycode  21 =   +y
+
 altgr          keycode  21 =   U+043D
 altgr  shift   keycode  21 =   U+041D
-               keycode  22 =   +u
+
 altgr          keycode  22 =   U+0433
 altgr  shift   keycode  22 =   U+0413
-               keycode  23 =   +i
+
 altgr          keycode  23 =   U+0448
 altgr  shift   keycode  23 =   U+0428
-               keycode  24 =   +o
+
 altgr          keycode  24 =   U+0449
 altgr  shift   keycode  24 =   U+0429
-               keycode  25 =   +p
+
 altgr          keycode  25 =   U+0437
 altgr  shift   keycode  25 =   U+0417
                keycode  26 =   bracketleft     braceleft
@@ -151,31 +153,31 @@ altgr     alt     keycode  28 =   0x080d
        control keycode  28 =   Linefeed
 altgr  control keycode  28 =   Linefeed
                keycode  29 =   Control 
-               keycode  30 =   +a
+
 altgr          keycode  30 =   U+0444
 altgr  shift   keycode  30 =   U+0424
-               keycode  31 =   +s
+
 altgr          keycode  31 =   U+044B
 altgr  shift   keycode  31 =   U+042B
-               keycode  32 =   +d
+
 altgr          keycode  32 =   U+0432
 altgr  shift   keycode  32 =   U+0412
-               keycode  33 =   +f
+
 altgr          keycode  33 =   U+0430
 altgr  shift   keycode  33 =   U+0410
-               keycode  34 =   +g
+
 altgr          keycode  34 =   U+043F
 altgr  shift   keycode  34 =   U+041F
-               keycode  35 =   +h
+
 altgr          keycode  35 =   U+0440
 altgr  shift   keycode  35 =   U+0420
-               keycode  36 =   +j
+
 altgr          keycode  36 =   U+043E
 altgr  shift   keycode  36 =   U+041E
-               keycode  37 =   +k
+
 altgr          keycode  37 =   U+043B
 altgr  shift   keycode  37 =   U+041B
-               keycode  38 =   +l
+
 altgr          keycode  38 =   U+0434
 altgr  shift   keycode  38 =   U+0414
                keycode  39 =   semicolon        colon
@@ -203,25 +205,25 @@ altgr     control keycode  43 =   Control_backslash
 altgr  alt     keycode  43 =   Meta_backslash
        shift alt keycode  43 =         Meta_bar
 altgr  shift alt keycode  43 =         Meta_bar
-               keycode  44 =   +z
+
 altgr          keycode  44 =   U+044F
 altgr  shift   keycode  44 =   U+042F
-               keycode  45 =   +x
+
 altgr          keycode  45 =   U+0447
 altgr  shift   keycode  45 =   U+0427
-               keycode  46 =   +c
+
 altgr          keycode  46 =   U+0441
 altgr  shift   keycode  46 =   U+0421
-               keycode  47 =   +v
+
 altgr          keycode  47 =   U+043C
 altgr  shift   keycode  47 =   U+041C
-               keycode  48 =   +b
+
 altgr          keycode  48 =   U+0438
 altgr  shift   keycode  48 =   U+0418
-               keycode  49 =   +n
+
 altgr          keycode  49 =   U+0442
 altgr  shift   keycode  49 =   U+0422
-               keycode  50 =   +m
+
 altgr          keycode  50 =   U+044C
 altgr  shift   keycode  50 =   U+042C
                keycode  51 =   comma            less
@@ -403,7 +405,6 @@ altgr       control alt     keycode  88 = Console_12
 altgr  control keycode  99 =   Control_backslash
        alt     keycode  99 =   Control_backslash
 altgr  alt     keycode  99 =   Control_backslash
-               keycode 100 = AltGr
                keycode 101 =   Break   
                keycode 102 =   Find    
                keycode 103 =   Up