diff -rupN xkb.orig/keymap/xfree86 xkb/keymap/xfree86 --- xkb.orig/keymap/xfree86 Sun Mar 17 16:00:59 2002 +++ xkb/keymap/xfree86 Fri Feb 22 16:34:54 2002 @@ -180,6 +180,13 @@ xkb_keymap "ru" { xkb_symbols { include "en_US(pc105)+ru(winkeys)+group(alt_shift_toggle)" }; xkb_geometry { include "pc(pc102)" }; }; +xkb_keymap "ru_ua" { + xkb_keycodes { include "xfree86" }; + xkb_types { include "default" }; + xkb_compatibility { include "default" }; + xkb_symbols { include "en_US(pc105)+ru(winkeys)+ru_group3(winkeys)+group(alt_shift_toggle)" }; + xkb_geometry { include "pc(pc102)" }; +}; xkb_keymap "se_FI" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; diff -rupN xkb.orig/keymap.dir xkb/keymap.dir --- xkb.orig/keymap.dir Sun Mar 17 16:00:44 2002 +++ xkb/keymap.dir Fri Feb 22 16:35:53 2002 @@ -201,6 +201,7 @@ -------- -------- xfree86(pl) -------- -------- xfree86(pt) -------- -------- xfree86(ru) +-------- -------- xfree86(ru_ua) -------- -------- xfree86(se_FI) -------- -------- xfree86(se_SE) -------- -------- xfree86(th) diff -rupN xkb.orig/symbols/ru_group3 xkb/symbols/ru_group3 --- xkb.orig/symbols/ru_group3 Thu Jan 1 03:00:00 1970 +++ xkb/symbols/ru_group3 Sun Mar 17 15:57:32 2002 @@ -0,0 +1,153 @@ +// ukrainian group3 keyboard +// based on xc/programs/xkbcomp/symbols/ua by +// AEN , Leon Kanter , +// Andriy Rysin , Yury Umanets (Banshee) + +// $XFree86: xc/programs/xkbcomp/symbols/ru_group3,v 0.2 2002/03/17 15:54:13 + +partial hidden alphanumeric_keys modifier_keys +xkb_symbols "basic" { + + name[Group3]= "Ukrainian"; + + key { [], [], [ apostrophe, asciitilde ] }; + key { [], [], [ 1, exclam ] }; + key { [], [], [ 2, quotedbl ] }; + key { [], [], [ 3, numbersign ] }; + key { [], [], [ 4, asterisk ] }; + key { [], [], [ 5, colon ] }; + key { [], [], [ 6, comma ] }; + key { [], [], [ 7, period ] }; + key { [], [], [ 8, semicolon ] }; + key { [], [], [ 9, parenleft ] }; + key { [], [], [ 0, parenright ] }; + key { [], [], [ minus, underscore ] }; + key { [], [], [ equal, plus ] }; + + key { [], [], [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [], [], [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [], [], [ Cyrillic_u, Cyrillic_U ] }; + key { [], [], [ Cyrillic_ka, Cyrillic_KA ] }; + key { [], [], [ Cyrillic_ie, Cyrillic_IE ] }; + key { [], [], [ Cyrillic_en, Cyrillic_EN ] }; + key { [], [], [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [], [], [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [], [], [ Cyrillic_shcha, Cyrillic_SHCHA ] }; + key { [], [], [ Cyrillic_ze, Cyrillic_ZE ] }; + key { [], [], [ Cyrillic_ha, Cyrillic_HA ] }; + key { [], [], [ Ukrainian_yi, Ukrainian_YI ] }; + key { [], [], [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + + key { [], [], [ Cyrillic_ef, Cyrillic_EF ] }; + key { [], [], [ Ukrainian_i, Ukrainian_I ] }; + key { [], [], [ Cyrillic_ve, Cyrillic_VE ] }; + key { [], [], [ Cyrillic_a, Cyrillic_A ] }; + key { [], [], [ Cyrillic_pe, Cyrillic_PE ] }; + key { [], [], [ Cyrillic_er, Cyrillic_ER ] }; + key { [], [], [ Cyrillic_o, Cyrillic_O ] }; + key { [], [], [ Cyrillic_el, Cyrillic_EL ] }; + key { [], [], [ Cyrillic_de, Cyrillic_DE ] }; + key { [], [], [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [], [], [ Ukrainian_ie, Ukrainian_IE ] }; + + key { [], [], [ Cyrillic_ya, Cyrillic_YA ] }; + key { [], [], [ Cyrillic_che, Cyrillic_CHE ] }; + key { [], [], [ Cyrillic_es, Cyrillic_ES ] }; + key { [], [], [ Cyrillic_em, Cyrillic_EM ] }; + key { [], [], [ Cyrillic_te, Cyrillic_TE ] }; + key { [], [], [ Cyrillic_i, Cyrillic_I ] }; + key { [], [], [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; + key { [], [], [ Cyrillic_be, Cyrillic_BE ] }; + key { [], [], [ Cyrillic_yu, Cyrillic_YU ] }; + key { [], [], [ slash, question ] }; + + key { [], [], [ slash, bar ] }; + // End alphanumeric section + + // Begin modifier mappings + + modifier_map Shift { Shift_L }; + modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Control{ Control_L }; + modifier_map Mod3 { Mode_switch }; +}; + +partial alphanumeric_keys +xkb_symbols "winkeys" { + include "ru_group3(basic)" + key { [], [], [ 3, numerosign ] }; + key { [], [], [ 4, semicolon ] }; + key { [], [], [ 5, percent ] }; + key { [], [], [ 6, colon ] }; + key { [], [], [ 7, question ] }; + key { [], [], [ 8, asterisk ] }; + key { [], [], [ period, comma ] }; +}; + +partial alphanumeric_keys +xkb_symbols "typewriter" { + include "ru_group3(basic)" + key { [], [], [ apostrophe, quotedbl ] }; + key { [], [], [ exclam, 1 ] }; + key { [], [], [ numerosign, 2 ] }; + key { [], [], [ slash, 3 ] }; + key { [], [], [ semicolon, 4 ] }; + key { [], [], [ colon, 5 ] }; + key { [], [], [ comma, 6 ] }; + key { [], [], [ period, 7 ] }; + key { [], [], [ underscore, 8 ] }; + key { [], [], [ question, 9 ] }; + key { [], [], [ percent, 0 ] }; + + key { [], [], [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + + key { [], [], [ Cyrillic_i, Cyrillic_I ] }; + + key { [], [], [ Ukrainian_i, Ukrainian_I ] }; + + key { [], [], [ Ukrainian_yi, Ukrainian_YI ] }; + + key { [], [], [ parenleft, parenright ] }; +}; + +partial alphanumeric_keys +xkb_symbols "phonetic" { + include "ru_group3(basic)" + + key { [], [], [ Cyrillic_ya, Cyrillic_YA ] }; + key { [], [], [ Cyrillic_ve, Cyrillic_VE ] }; + key { [], [], [ Cyrillic_ie, Cyrillic_IE ] }; + key { [], [], [ Cyrillic_er, Cyrillic_ER ] }; + key { [], [], [ Cyrillic_te, Cyrillic_TE ] }; + key { [], [], [ Cyrillic_i, Cyrillic_i ] }; + key { [], [], [ Cyrillic_u, Cyrillic_U ] }; + key { [], [], [ Ukrainian_i, Ukrainian_I ] }; + key { [], [], [ Cyrillic_o, Cyrillic_O ] }; + key { [], [], [ Cyrillic_pe, Cyrillic_PE ] }; + key { [], [], [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [], [], [ Cyrillic_shcha, Cyrillic_SHCHA ] }; + + key { [], [], [ Cyrillic_a, Cyrillic_A ] }; + key { [], [], [ Cyrillic_es, Cyrillic_ES ] }; + key { [], [], [ Cyrillic_de, Cyrillic_DE ] }; + key { [], [], [ Cyrillic_ef, Cyrillic_EF ] }; + key { [], [], [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [], [], [ Cyrillic_ha, Cyrillic_HA ] }; + key { [], [], [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [], [], [ Cyrillic_ka, Cyrillic_KA ] }; + key { [], [], [ Cyrillic_el, Cyrillic_EL ] }; + key { [], [], [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + key { [], [], [ quoteright, quotedbl ] }; + key { [], [], [ Cyrillic_yu, Cyrillic_YU ] }; + + key { [], [], [ Cyrillic_ze, Cyrillic_ZE ] }; + key { [], [], [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; + key { [], [], [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [], [], [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [], [], [ Cyrillic_be, Cyrillic_BE ] }; + key { [], [], [ Cyrillic_en, Cyrillic_EN ] }; + key { [], [], [ Cyrillic_em, Cyrillic_EM ] }; + key { [], [], [ comma, less ] }; + key { [], [], [ period, greater ] }; + key { [], [], [ slash, question ] }; +}; diff -rupN xkb.orig/symbols.dir xkb/symbols.dir --- xkb.orig/symbols.dir Sun Mar 17 16:01:15 2002 +++ xkb/symbols.dir Fri Feb 22 16:33:43 2002 @@ -153,6 +153,8 @@ h-p----- am------ hu(def_common) -dp----- a------- si(basic) -dp----- a------- ru(basic) --p----- a------- ru(winkeys) +-dp----- a------- ru_group3(basic) +--p----- a------- ru_group3(winkeys) --p----- a------- ru(typewriter) --p----- a------- ru(phonetic) --p----- a------- sk(basic)