diff --git a/layout.h b/layout.h index 62f6d18..18c0740 100644 --- a/layout.h +++ b/layout.h @@ -1,18 +1,21 @@ //    -#define KEYS 82 +#define KEYS 85 static Key keys_en[KEYS] = { -{ "F1", XK_F1, 1 }, - { "F2", XK_F2, 1 }, - { "F3", XK_F3, 1 }, - { "F4", XK_F4, 1 }, - { "F5", XK_F5, 1 }, - { "F6", XK_F6, 1 }, - { "F7", XK_F7, 1 }, - { "F8", XK_F8, 1 }, - { "F9", XK_F9, 1 }, - { "F10", XK_F10, 1 }, - { "F11", XK_F11, 1 }, - { "F12", XK_F12, 1 }, + { "F1", XK_F1, 1 }, + { "F2", XK_F2, 1 }, + { "F3", XK_F3, 1 }, + { "F4", XK_F4, 1 }, + { "F5", XK_F5, 1 }, + { "F6", XK_F6, 1 }, + { "F7", XK_F7, 1 }, + { "F8", XK_F8, 1 }, + { "F9", XK_F9, 1 }, + { "F10", XK_F10, 1 }, + { "F11", XK_F11, 1 }, + { "F12", XK_F12, 1 }, + { "PgUp",XK_Page_Up, 1}, + { "PgDn",XK_Page_Down, 1}, + { "Del", XK_Delete, 1 }, { 0 }, /* New row */ { "`~", XK_grave, 1 }, { "1!", XK_1, 1 }, @@ -56,7 +59,6 @@ static Key keys_en[KEYS] = { { 0, XK_l, 1 }, { ":;", XK_semicolon, 1 }, { "'\"", XK_apostrophe, 1 }, - //{ "'\"", XK_exclam, 1 }, { "↵", XK_Return, 1 }, { 0 }, /* New row */ { "Shift", XK_Shift_L, 3 }, @@ -114,7 +116,6 @@ static Key keys_emoji [KEYS] = { { "😭", 0x101f62d ,1 },//26 { "😳", 0x101f633 ,1 },//27 { "😴", 0x101f634 ,1 },//28 - { "Del", XK_Delete, 1 },//29 {0}, { "▶", XF86XK_AudioPlay, 1 },//30 { "●", XF86XK_AudioRecord, 1 },//31 @@ -126,23 +127,47 @@ static Key keys_emoji [KEYS] = { { "♫+", XF86XK_AudioRaiseVolume, 1 },//37 { "☀-", XF86XK_MonBrightnessDown, 1 },//38 { "☀+", XF86XK_MonBrightnessUp, 1 },//39 - { "", XK_Cancel, 1},//52 - { "", XK_space, 5 },//53 - {0}, - { "", XK_space, 10 },//54 - {0}, - { "", XK_space, 10 },//55 - {0}, - { "", XK_space, 10 },//56 - {0}, - { "", XK_space, 10 },//57 - {0}, - { "", XK_space, 10 },//58 - {0}, - { "", XK_space, 10 },//59 -{0}, -{0}, +{ "й", XK_Cyrillic_shorti, 1 }, +{ "ц", XK_Cyrillic_tse, 1 }, +{ "у", XK_Cyrillic_u, 1 }, +{ "к", XK_Cyrillic_ka, 1 }, +{ "е", XK_Cyrillic_ie, 1 }, +{ "н", XK_Cyrillic_en, 1 }, +{ "г", XK_Cyrillic_ghe, 1 }, +{ "ш", XK_Cyrillic_sha, 1 }, +{ "щ", XK_Cyrillic_shcha, 1 }, +{ "з", XK_Cyrillic_ze, 1 }, +{ "х", XK_Cyrillic_ha, 1 }, +{ 0 }, /* New row */ + +{ "ф", XK_Cyrillic_ef, 1 }, +{ "ы", XK_Cyrillic_yeru, 1 }, +{ "в", XK_Cyrillic_ve, 1 }, +{ "а", XK_Cyrillic_a, 1 }, +{ "п", XK_Cyrillic_pe, 1 }, +{ "р", XK_Cyrillic_er, 1 }, +{ "о", XK_Cyrillic_o, 1 }, +{ "л", XK_Cyrillic_el, 1 }, +{ "д", XK_Cyrillic_de, 1 }, +{ "ж", XK_Cyrillic_zhe, 1 }, +{ "ю", XK_Cyrillic_yu, 1 }, + +{ 0 }, /* New row */ + +{ "я", XK_Cyrillic_ya, 1 }, +{ "ч", XK_Cyrillic_che, 1 }, +{ "с", XK_Cyrillic_es, 1 }, +{ "м", XK_Cyrillic_em, 1 }, +{ "и", XK_Cyrillic_i, 1 }, +{ "т", XK_Cyrillic_te, 1 }, +{ "ь", XK_Cyrillic_softsign, 1 }, +{ "б", XK_Cyrillic_be, 1 }, + { "", XK_Cancel, 1},//52 +{0}, + { "", XK_space, 5 }, +{0}, + { "", XK_space, 5 }, }; Buttonmod buttonmods[] = { diff --git a/svkbd b/svkbd index 44afa99..07c10e4 100755 Binary files a/svkbd and b/svkbd differ diff --git a/svkbd.o b/svkbd.o index e4af52a..223e653 100644 Binary files a/svkbd.o and b/svkbd.o differ