Various indentation fixes for a more consistent style - svkbd - simple virtual keyboard
(HTM) git clone git://git.suckless.org/svkbd
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit b80819aa3f7eea32252d7885b09763d340540e4c
(DIR) parent 02f13a74c3e78f56d14919c3d41542c612121e8c
(HTM) Author: Maarten van Gompel <proycon@anaproy.nl>
Date: Sat, 27 Mar 2021 17:57:32 +0100
Various indentation fixes for a more consistent style
Diffstat:
M layout.en.h | 7 +++----
M layout.mobile-intl.h | 1047 +++++++++++++++----------------
M layout.mobile-plain.h | 142 ++++++++++++++++----------------
M svkbd.c | 45 +++++++++++++++----------------
4 files changed, 619 insertions(+), 622 deletions(-)
---
(DIR) diff --git a/layout.en.h b/layout.en.h
@@ -70,15 +70,14 @@ Buttonmod buttonmods[] = {
#define OVERLAYS 1
static Key overlay[OVERLAYS] = {
- { 0, XK_Cancel },
+ { 0, XK_Cancel },
};
#define LAYERS 1
static char* layer_names[LAYERS] = {
- "en",
+ "en",
};
static Key* available_layers[LAYERS] = {
- keys_en,
+ keys_en,
};
-
(DIR) diff --git a/layout.mobile-intl.h b/layout.mobile-intl.h
@@ -1,340 +1,340 @@
#define KEYS 55
static Key keys_en[KEYS] = {
- { "Esc", "", XK_Escape, 1 },
- { "1", "!", XK_1, 1 },
- { "2", "@", XK_2, 1 },
- { "3", "#", XK_3, 1 },
- { "4", "$", XK_4, 1 },
- { "5", "%", XK_5, 1 },
- { "6", "^", XK_6, 1 },
- { "7", "&", XK_7, 1 },
- { "8", "*", XK_8, 1 },
- { "9", "(", XK_9, 1 },
- { "0", ")", XK_0, 1 },
-
- { 0 }, /* New row */
-
- { 0, 0, XK_q, 1 },
- { 0, 0, XK_w, 1 },
- { 0, 0, XK_e, 1 },
- { 0, 0, XK_r, 1 },
- { 0, 0, XK_t, 1 },
- { 0, 0, XK_y, 1 },
- { 0, 0, XK_u, 1 },
- { 0, 0, XK_i, 1 },
- { 0, 0, XK_o, 1 },
- { 0, 0, XK_p, 1 },
- { "'", "\"", XK_apostrophe, 1 },
-
- { 0 }, /* New row */
-
- { 0, 0, XK_a, 1 },
- { 0, 0, XK_s, 1 },
- { 0, 0, XK_d, 1 },
- { 0, 0, XK_f, 1 },
- { 0, 0, XK_g, 1 },
- { 0, 0, XK_h, 1 },
- { 0, 0, XK_j, 1 },
- { 0, 0, XK_k, 1 },
- { 0, 0, XK_l, 1 },
- { "/", "?", XK_slash, 1 },
- { "Tab", 0, XK_Tab, 1 },
-
- { 0 }, /* New row */
-
- { 0, 0, XK_z, 1 },
- { 0, 0, XK_x, 1 },
- { 0, 0, XK_c, 1 },
- { 0, 0, XK_v, 1 },
- { 0, 0, XK_b, 1 },
- { 0, 0, XK_n, 1 },
- { 0, 0, XK_m, 1 },
- { ",", "<", XK_comma, 1 },
- { ".", ">", XK_period, 1 },
- { "⌫Bksp", 0, XK_BackSpace, 2 },
-
- { 0 }, /* New row */
- { "↺", 0, XK_Cancel, 1},
- { "Shift", 0, XK_Shift_L, 2 },
- { "Ctrl", 0, XK_Control_L, 1 },
- { "Alt", 0, XK_Alt_L, 1 },
- { "", 0, XK_space, 2 },
- { "↓", 0, XK_Down, 1 },
- { "↑", 0, XK_Up, 1 },
- { "↲ Enter", 0, XK_Return, 2 },
+ { "Esc", "", XK_Escape, 1 },
+ { "1", "!", XK_1, 1 },
+ { "2", "@", XK_2, 1 },
+ { "3", "#", XK_3, 1 },
+ { "4", "$", XK_4, 1 },
+ { "5", "%", XK_5, 1 },
+ { "6", "^", XK_6, 1 },
+ { "7", "&", XK_7, 1 },
+ { "8", "*", XK_8, 1 },
+ { "9", "(", XK_9, 1 },
+ { "0", ")", XK_0, 1 },
+
+ { 0 }, /* New row */
+
+ { 0, 0, XK_q, 1 },
+ { 0, 0, XK_w, 1 },
+ { 0, 0, XK_e, 1 },
+ { 0, 0, XK_r, 1 },
+ { 0, 0, XK_t, 1 },
+ { 0, 0, XK_y, 1 },
+ { 0, 0, XK_u, 1 },
+ { 0, 0, XK_i, 1 },
+ { 0, 0, XK_o, 1 },
+ { 0, 0, XK_p, 1 },
+ { "'", "\"", XK_apostrophe, 1 },
+
+ { 0 }, /* New row */
+
+ { 0, 0, XK_a, 1 },
+ { 0, 0, XK_s, 1 },
+ { 0, 0, XK_d, 1 },
+ { 0, 0, XK_f, 1 },
+ { 0, 0, XK_g, 1 },
+ { 0, 0, XK_h, 1 },
+ { 0, 0, XK_j, 1 },
+ { 0, 0, XK_k, 1 },
+ { 0, 0, XK_l, 1 },
+ { "/", "?", XK_slash, 1 },
+ { "Tab", 0, XK_Tab, 1 },
+
+ { 0 }, /* New row */
+
+ { 0, 0, XK_z, 1 },
+ { 0, 0, XK_x, 1 },
+ { 0, 0, XK_c, 1 },
+ { 0, 0, XK_v, 1 },
+ { 0, 0, XK_b, 1 },
+ { 0, 0, XK_n, 1 },
+ { 0, 0, XK_m, 1 },
+ { ",", "<", XK_comma, 1 },
+ { ".", ">", XK_period, 1 },
+ { "⌫Bksp", 0, XK_BackSpace, 2 },
+
+ { 0 }, /* New row */
+ { "↺", 0, XK_Cancel, 1},
+ { "Shift", 0, XK_Shift_L, 2 },
+ { "Ctrl", 0, XK_Control_L, 1 },
+ { "Alt", 0, XK_Alt_L, 1 },
+ { "", 0, XK_space, 2 },
+ { "↓", 0, XK_Down, 1 },
+ { "↑", 0, XK_Up, 1 },
+ { "↲ Enter", 0, XK_Return, 2 },
};
#define OVERLAYS 197
static Key overlay[OVERLAYS] = {
- { 0, 0, XK_a }, //Overlay for a
- //---
- { "à", 0, XK_agrave },
- { "á", 0, XK_aacute },
- { "â", 0, XK_acircumflex },
- { "ä", 0, XK_adiaeresis },
- { "ą", 0, XK_aogonek },
- { "ã", 0, XK_atilde },
- { "ā", 0, XK_amacron },
- { "ă", 0, XK_abreve },
- { "å", 0, XK_aring },
- { "æ", 0, XK_ae },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //--
- { 0, 0, XK_e }, //Overlay for e (first item after boundary defines the trigger)
- //---
- { "è", 0, XK_egrave },
- { "é", 0, XK_eacute },
- { "ê", 0, XK_ecircumflex },
- { "ë", 0, XK_ediaeresis },
- { "ę", 0, XK_eogonek },
- { "ē", 0, XK_emacron },
- { "ė", 0, XK_eabovedot },
- { 0, 0, XK_Cancel },
- //--
- { 0, 0, XK_y }, //New overlay
- //---
- { "ỳ", 0, XK_ygrave },
- { "ý", 0, XK_yacute },
- { "ŷ", 0, XK_ycircumflex },
- { "ÿ", 0, XK_ydiaeresis },
- { 0, 0, XK_Cancel },
- //--
- { 0, 0, XK_u }, //New overlay
- //---
- { "ù", 0, XK_ugrave },
- { "ú", 0, XK_uacute },
- { "û", 0, XK_ucircumflex },
- { "ü", 0, XK_udiaeresis },
- { "ų", 0, XK_uogonek },
- { "ū", 0, XK_umacron },
- { "ů", 0, XK_uring},
- { "ŭ", 0, XK_ubreve},
- { "ű", 0, XK_udoubleacute },
- { 0, 0, XK_Cancel },
- //--
- { 0, 0, XK_i }, //New overlay
- //---
- { "ì", 0, XK_igrave },
- { "í", 0, XK_iacute },
- { "î", 0, XK_icircumflex },
- { "ï", 0, XK_idiaeresis },
- { "į", 0, XK_iogonek },
- { "ī", 0, XK_imacron },
- { "ı", 0, XK_idotless },
- { 0, 0, XK_Cancel },
- //--
- { 0, 0, XK_o }, //New overlay
- //---
- { "ò", 0, XK_ograve },
- { "ó", 0, XK_oacute },
- { "ô", 0, XK_ocircumflex },
- { "ö", 0, XK_odiaeresis },
- { "ǫ", 0, XK_ogonek },
- { "õ", 0, XK_otilde },
- { "ō", 0, XK_omacron },
- { "ø", 0, XK_oslash },
- { "ő", 0, XK_odoubleacute },
- { "œ", 0, XK_oe },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //--
- { 0, 0, XK_d }, //New overlay
- //---
- { "ď", 0, XK_dcaron },
- { "ð", 0, XK_eth },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //--
- { 0, 0, XK_c }, //New overlay
- //---
- { "ç", 0, XK_ccedilla },
- { "ĉ", 0, XK_ccircumflex },
- { "č", 0, XK_ccaron },
- { "ć", 0, XK_cacute },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //--
- { 0, 0, XK_s }, //New overlay
- //---
- { "ş", 0, XK_scedilla },
- { "ŝ", 0, XK_scircumflex },
- { "š", 0, XK_scaron },
- { "ś", 0, XK_sacute },
- { "ß", 0, XK_ssharp },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //---
- { 0, 0, XK_z }, //New overlay
- //---
- { "ž", 0, XK_zcaron },
- { "ż", 0, XK_zabovedot },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //--
- { 0, 0, XK_n }, //New overlay
- //---
- { "ñ", 0, XK_ntilde },
- { "ń", 0, XK_nacute },
- { "ň", 0, XK_ncaron },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //
- { 0, 0, XK_t }, //New overlay
- //---
- { "ț", 0, XK_tcedilla },
- { "ť", 0, XK_tcaron },
- { "þ", 0, XK_thorn },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //----
- { 0, 0, XK_g }, //New overlay
- //---
- { "ĝ", 0, XK_gcircumflex },
- { "ğ", 0, XK_gbreve },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //
- { 0, 0, XK_h }, //New overlay
- //---
- { "ĥ", 0, XK_hcircumflex },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //
- { 0, 0, XK_j }, //New overlay
- //---
- { "ĵ", 0, XK_jcircumflex },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //--
- { 0, 0, XK_l }, //New overlay
- //---
- { "ł", 0, XK_lstroke },
- { "ľ", 0, XK_lcaron },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //--
- { 0, 0, XK_r }, //New overlay
- //---
- { "ř", 0, XK_rcaron },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //---
- { 0, 0, XK_Cyrillic_softsign }, //New overlay
- //---
- { "ъ", 0, XK_Cyrillic_hardsign },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //---
- { 0, 0, XK_Cyrillic_ie }, //New overlay
- //---
- { "ё", 0, XK_Cyrillic_io },
- { "э", 0, XK_Cyrillic_e },
- { "Є", 0, XK_Ukrainian_ie },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //---
- { 0, 0, XK_Cyrillic_i }, //New overlay
- //---
- { "і", 0, XK_Ukrainian_i },
- { "ї", 0, XK_Ukrainian_yi },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //---
- { 0, 0, XK_Cyrillic_u }, //New overlay
- //---
- { "ў", 0, XK_Byelorussian_shortu },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //---
- { 0, 0, XK_Cyrillic_shorti }, //New overlay
- //---
- { "ј", 0, XK_Cyrillic_je },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //---
- { 0, 0, XK_Cyrillic_el }, //New overlay
- //---
- { "љ", 0, XK_Cyrillic_lje },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //---
- { 0, 0, XK_Cyrillic_en }, //New overlay
- //---
- { "њ", 0, XK_Cyrillic_nje },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //---
- { 0, 0, XK_Cyrillic_tse }, //New overlay
- //---
- { "џ", 0, XK_Cyrillic_dzhe },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //---
- { 0, 0, XK_Cyrillic_che }, //New overlay
- //---
- { "ћ", 0, XK_Serbian_tshe },
- { "ђ", 0, XK_Serbian_dje },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //---
- { "🙂", 0, 0x101f642 }, //emoji overlay
- //---
- { "😀", 0, 0x101f600 },
- { "😁", 0, 0x101f601 },
- { "😂", 0, 0x101f602 },
- { "😃", 0, 0x101f603 },
- { "😄", 0, 0x101f604 },
- { "😅", 0, 0x101f605 },
- { "😆", 0, 0x101f606 },
- { "😇", 0, 0x101f607 },
- { "😈", 0, 0x101f608 },
- { "😉", 0, 0x101f609 },
- { "😊", 0, 0x101f60a },
- { "😋", 0, 0x101f60b },
- { "😌", 0, 0x101f60c },
- { "😍", 0, 0x101f60d },
- { "😎", 0, 0x101f60e },
- { "😏", 0, 0x101f60f },
- { "😐", 0, 0x101f610 },
- { "😒", 0, 0x101f612 },
- { "😓", 0, 0x101f613 },
- { "😛", 0, 0x101f61b },
- { "😮", 0, 0x101f62e },
- { "😟", 0, 0x101f61f },
- { "😟", 0, 0x101f620 },
- { "😢", 0, 0x101f622 },
- { "😭", 0, 0x101f62d },
- { "😳", 0, 0x101f633 },
- { "😴", 0, 0x101f634 },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
- //--
- { "/?", 0, XK_slash }, //punctuation overlay
- //--
- { "1", "!", XK_1, 1 },
- { "2", "@", XK_2, 1 },
- { "3", "#", XK_3, 1 },
- { "4", "$", XK_4, 1 },
- { "5", "%", XK_5, 1 },
- { "6", "^", XK_6, 1 },
- { "7", "&", XK_7, 1 },
- { "8", "*", XK_8, 1 },
- { "9", "(", XK_9, 1 },
- { "0", ")", XK_0, 1 },
- { "'", "\"", XK_apostrophe, 1 },
- { "`", "~", XK_grave, 1 },
- { "-", "_", XK_minus, 1 },
- { "=", "+", XK_plus, 1 },
- { "[", "{", XK_bracketleft, 1 },
- { "]", "}", XK_bracketright, 1 },
- { ",", "<", XK_comma, 1 },
- { ".", ">", XK_period, 1 },
- { "/", "?", XK_slash, 1 },
- { "\\", "|", XK_backslash, 1 },
- { "¡", 0, XK_exclamdown, 1 },
- { "?", 0, XK_questiondown, 1 },
- { "°", 0, XK_degree, 1 },
- { "£", 0, XK_sterling, 1 },
- { "€", 0, XK_EuroSign, 1 },
- { "¥", 0, XK_yen, 1 },
- { ";", ":", XK_colon, 1 },
- { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ { 0, 0, XK_a }, //Overlay for a
+ //---
+ { "à", 0, XK_agrave },
+ { "á", 0, XK_aacute },
+ { "â", 0, XK_acircumflex },
+ { "ä", 0, XK_adiaeresis },
+ { "ą", 0, XK_aogonek },
+ { "ã", 0, XK_atilde },
+ { "ā", 0, XK_amacron },
+ { "ă", 0, XK_abreve },
+ { "å", 0, XK_aring },
+ { "æ", 0, XK_ae },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //--
+ { 0, 0, XK_e }, //Overlay for e (first item after boundary defines the trigger)
+ //---
+ { "è", 0, XK_egrave },
+ { "é", 0, XK_eacute },
+ { "ê", 0, XK_ecircumflex },
+ { "ë", 0, XK_ediaeresis },
+ { "ę", 0, XK_eogonek },
+ { "ē", 0, XK_emacron },
+ { "ė", 0, XK_eabovedot },
+ { 0, 0, XK_Cancel },
+ //--
+ { 0, 0, XK_y }, //New overlay
+ //---
+ { "ỳ", 0, XK_ygrave },
+ { "ý", 0, XK_yacute },
+ { "ŷ", 0, XK_ycircumflex },
+ { "ÿ", 0, XK_ydiaeresis },
+ { 0, 0, XK_Cancel },
+ //--
+ { 0, 0, XK_u }, //New overlay
+ //---
+ { "ù", 0, XK_ugrave },
+ { "ú", 0, XK_uacute },
+ { "û", 0, XK_ucircumflex },
+ { "ü", 0, XK_udiaeresis },
+ { "ų", 0, XK_uogonek },
+ { "ū", 0, XK_umacron },
+ { "ů", 0, XK_uring},
+ { "ŭ", 0, XK_ubreve},
+ { "ű", 0, XK_udoubleacute },
+ { 0, 0, XK_Cancel },
+ //--
+ { 0, 0, XK_i }, //New overlay
+ //---
+ { "ì", 0, XK_igrave },
+ { "í", 0, XK_iacute },
+ { "î", 0, XK_icircumflex },
+ { "ï", 0, XK_idiaeresis },
+ { "į", 0, XK_iogonek },
+ { "ī", 0, XK_imacron },
+ { "ı", 0, XK_idotless },
+ { 0, 0, XK_Cancel },
+ //--
+ { 0, 0, XK_o }, //New overlay
+ //---
+ { "ò", 0, XK_ograve },
+ { "ó", 0, XK_oacute },
+ { "ô", 0, XK_ocircumflex },
+ { "ö", 0, XK_odiaeresis },
+ { "ǫ", 0, XK_ogonek },
+ { "õ", 0, XK_otilde },
+ { "ō", 0, XK_omacron },
+ { "ø", 0, XK_oslash },
+ { "ő", 0, XK_odoubleacute },
+ { "œ", 0, XK_oe },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //--
+ { 0, 0, XK_d }, //New overlay
+ //---
+ { "ď", 0, XK_dcaron },
+ { "ð", 0, XK_eth },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //--
+ { 0, 0, XK_c }, //New overlay
+ //---
+ { "ç", 0, XK_ccedilla },
+ { "ĉ", 0, XK_ccircumflex },
+ { "č", 0, XK_ccaron },
+ { "ć", 0, XK_cacute },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //--
+ { 0, 0, XK_s }, //New overlay
+ //---
+ { "ş", 0, XK_scedilla },
+ { "ŝ", 0, XK_scircumflex },
+ { "š", 0, XK_scaron },
+ { "ś", 0, XK_sacute },
+ { "ß", 0, XK_ssharp },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //---
+ { 0, 0, XK_z }, //New overlay
+ //---
+ { "ž", 0, XK_zcaron },
+ { "ż", 0, XK_zabovedot },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //--
+ { 0, 0, XK_n }, //New overlay
+ //---
+ { "ñ", 0, XK_ntilde },
+ { "ń", 0, XK_nacute },
+ { "ň", 0, XK_ncaron },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //
+ { 0, 0, XK_t }, //New overlay
+ //---
+ { "ț", 0, XK_tcedilla },
+ { "ť", 0, XK_tcaron },
+ { "þ", 0, XK_thorn },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //----
+ { 0, 0, XK_g }, //New overlay
+ //---
+ { "ĝ", 0, XK_gcircumflex },
+ { "ğ", 0, XK_gbreve },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //
+ { 0, 0, XK_h }, //New overlay
+ //---
+ { "ĥ", 0, XK_hcircumflex },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //
+ { 0, 0, XK_j }, //New overlay
+ //---
+ { "ĵ", 0, XK_jcircumflex },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //--
+ { 0, 0, XK_l }, //New overlay
+ //---
+ { "ł", 0, XK_lstroke },
+ { "ľ", 0, XK_lcaron },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //--
+ { 0, 0, XK_r }, //New overlay
+ //---
+ { "ř", 0, XK_rcaron },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //---
+ { 0, 0, XK_Cyrillic_softsign }, //New overlay
+ //---
+ { "ъ", 0, XK_Cyrillic_hardsign },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //---
+ { 0, 0, XK_Cyrillic_ie }, //New overlay
+ //---
+ { "ё", 0, XK_Cyrillic_io },
+ { "э", 0, XK_Cyrillic_e },
+ { "Є", 0, XK_Ukrainian_ie },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //---
+ { 0, 0, XK_Cyrillic_i }, //New overlay
+ //---
+ { "і", 0, XK_Ukrainian_i },
+ { "ї", 0, XK_Ukrainian_yi },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //---
+ { 0, 0, XK_Cyrillic_u }, //New overlay
+ //---
+ { "ў", 0, XK_Byelorussian_shortu },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //---
+ { 0, 0, XK_Cyrillic_shorti }, //New overlay
+ //---
+ { "ј", 0, XK_Cyrillic_je },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //---
+ { 0, 0, XK_Cyrillic_el }, //New overlay
+ //---
+ { "љ", 0, XK_Cyrillic_lje },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //---
+ { 0, 0, XK_Cyrillic_en }, //New overlay
+ //---
+ { "њ", 0, XK_Cyrillic_nje },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //---
+ { 0, 0, XK_Cyrillic_tse }, //New overlay
+ //---
+ { "џ", 0, XK_Cyrillic_dzhe },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //---
+ { 0, 0, XK_Cyrillic_che }, //New overlay
+ //---
+ { "ћ", 0, XK_Serbian_tshe },
+ { "ђ", 0, XK_Serbian_dje },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //---
+ { "🙂", 0, 0x101f642 }, //emoji overlay
+ //---
+ { "😀", 0, 0x101f600 },
+ { "😁", 0, 0x101f601 },
+ { "😂", 0, 0x101f602 },
+ { "😃", 0, 0x101f603 },
+ { "😄", 0, 0x101f604 },
+ { "😅", 0, 0x101f605 },
+ { "😆", 0, 0x101f606 },
+ { "😇", 0, 0x101f607 },
+ { "😈", 0, 0x101f608 },
+ { "😉", 0, 0x101f609 },
+ { "😊", 0, 0x101f60a },
+ { "😋", 0, 0x101f60b },
+ { "😌", 0, 0x101f60c },
+ { "😍", 0, 0x101f60d },
+ { "😎", 0, 0x101f60e },
+ { "😏", 0, 0x101f60f },
+ { "😐", 0, 0x101f610 },
+ { "😒", 0, 0x101f612 },
+ { "😓", 0, 0x101f613 },
+ { "😛", 0, 0x101f61b },
+ { "😮", 0, 0x101f62e },
+ { "😟", 0, 0x101f61f },
+ { "😟", 0, 0x101f620 },
+ { "😢", 0, 0x101f622 },
+ { "😭", 0, 0x101f62d },
+ { "😳", 0, 0x101f633 },
+ { "😴", 0, 0x101f634 },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
+ //--
+ { "/?", 0, XK_slash }, //punctuation overlay
+ //--
+ { "1", "!", XK_1, 1 },
+ { "2", "@", XK_2, 1 },
+ { "3", "#", XK_3, 1 },
+ { "4", "$", XK_4, 1 },
+ { "5", "%", XK_5, 1 },
+ { "6", "^", XK_6, 1 },
+ { "7", "&", XK_7, 1 },
+ { "8", "*", XK_8, 1 },
+ { "9", "(", XK_9, 1 },
+ { "0", ")", XK_0, 1 },
+ { "'", "\"", XK_apostrophe, 1 },
+ { "`", "~", XK_grave, 1 },
+ { "-", "_", XK_minus, 1 },
+ { "=", "+", XK_plus, 1 },
+ { "[", "{", XK_bracketleft, 1 },
+ { "]", "}", XK_bracketright, 1 },
+ { ",", "<", XK_comma, 1 },
+ { ".", ">", XK_period, 1 },
+ { "/", "?", XK_slash, 1 },
+ { "\\", "|", XK_backslash, 1 },
+ { "¡", 0, XK_exclamdown, 1 },
+ { "?", 0, XK_questiondown, 1 },
+ { "°", 0, XK_degree, 1 },
+ { "£", 0, XK_sterling, 1 },
+ { "€", 0, XK_EuroSign, 1 },
+ { "¥", 0, XK_yen, 1 },
+ { ";", ":", XK_colon, 1 },
+ { 0, 0, XK_Cancel }, /* XK_Cancel signifies overlay boundary */
};
static Key keys_symbols[KEYS] = {
- { "Esc", 0, XK_Escape, 1 },
- { "F1", 0, XK_F1, 1 },
- { "F2", 0, XK_F2, 1 },
- { "F3", 0, XK_F3, 1 },
- { "F4", 0, XK_F4, 1 },
- { "F5", 0, XK_F5, 1 },
- { "F6", 0, XK_F6, 1 },
- { "F7", 0, XK_F7, 1 },
- { "F8", 0, XK_F8, 1 },
- { "F9", 0, XK_F9, 1 },
- { "F10", 0, XK_F10, 1 },
- { 0 }, /* New row */
-
- { "'\"", 0, XK_apostrophe, 1 },
+ { "Esc", 0, XK_Escape, 1 },
+ { "F1", 0, XK_F1, 1 },
+ { "F2", 0, XK_F2, 1 },
+ { "F3", 0, XK_F3, 1 },
+ { "F4", 0, XK_F4, 1 },
+ { "F5", 0, XK_F5, 1 },
+ { "F6", 0, XK_F6, 1 },
+ { "F7", 0, XK_F7, 1 },
+ { "F8", 0, XK_F8, 1 },
+ { "F9", 0, XK_F9, 1 },
+ { "F10", 0, XK_F10, 1 },
+ { 0 }, /* New row */
+
+ { "'\"", 0, XK_apostrophe, 1 },
{ "1", "!", XK_1, 1 },
{ "2", "@", XK_2, 1 },
{ "3", "#", XK_3, 1 },
@@ -346,228 +346,227 @@ static Key keys_symbols[KEYS] = {
{ "9", "(", XK_9, 1 },
{ "0", ")", XK_0, 1 },
- { 0 }, /* New row */
-
- { ".", ">", XK_period, 1 },
- { ",", "<", XK_comma, 1 },
- { "`", "~", XK_grave, 1 },
- { "-", "_", XK_minus, 1 },
- { "=", "+", XK_plus, 1 },
- { "\\", "|", XK_backslash, 1 },
- { ";", ":", XK_colon, 1 },
- { "/", "?", XK_slash, 1 },
- { "[", "{", XK_bracketleft, 1 },
- { "]", "}", XK_bracketright, 1 },
- { "Del", 0, XK_Delete, 1 },
-
- { 0 }, /* New row */
-
- { "abc", 0, XK_Mode_switch, 1 },
- { "☺", 0, 0x101f642, 1 },
- { "⇤", 0, XK_Home, 1 },
- { "←", 0, XK_Left, 1 },
- { "→", 0, XK_Right, 1 },
- { "⇥", 0, XK_End, 1 },
- { "⇊", 0, XK_Next, 1 },
- { "⇈", 0, XK_Prior, 1 },
- { "Tab", 0, XK_Tab, 1 },
- { "⌫Bksp", 0, XK_BackSpace, 2 },
-
- { 0 }, /* New row */
- { "↺", 0, XK_Cancel, 1},
- { "Shift", 0, XK_Shift_L, 2 },
- { "Ctrl", 0, XK_Control_L, 1 },
- { "Alt", 0, XK_Alt_L, 1 },
- { "", 0, XK_space, 2 },
- { "↓", 0, XK_Down, 1 },
- { "↑", 0, XK_Up, 1 },
- { "↲ Enter", 0, XK_Return, 2 },
+ { 0 }, /* New row */
+
+ { ".", ">", XK_period, 1 },
+ { ",", "<", XK_comma, 1 },
+ { "`", "~", XK_grave, 1 },
+ { "-", "_", XK_minus, 1 },
+ { "=", "+", XK_plus, 1 },
+ { "\\", "|", XK_backslash, 1 },
+ { ";", ":", XK_colon, 1 },
+ { "/", "?", XK_slash, 1 },
+ { "[", "{", XK_bracketleft, 1 },
+ { "]", "}", XK_bracketright, 1 },
+ { "Del", 0, XK_Delete, 1 },
+
+ { 0 }, /* New row */
+
+ { "abc", 0, XK_Mode_switch, 1 },
+ { "☺", 0, 0x101f642, 1 },
+ { "⇤", 0, XK_Home, 1 },
+ { "←", 0, XK_Left, 1 },
+ { "→", 0, XK_Right, 1 },
+ { "⇥", 0, XK_End, 1 },
+ { "⇊", 0, XK_Next, 1 },
+ { "⇈", 0, XK_Prior, 1 },
+ { "Tab", 0, XK_Tab, 1 },
+ { "⌫Bksp", 0, XK_BackSpace, 2 },
+
+ { 0 }, /* New row */
+ { "↺", 0, XK_Cancel, 1},
+ { "Shift", 0, XK_Shift_L, 2 },
+ { "Ctrl", 0, XK_Control_L, 1 },
+ { "Alt", 0, XK_Alt_L, 1 },
+ { "", 0, XK_space, 2 },
+ { "↓", 0, XK_Down, 1 },
+ { "↑", 0, XK_Up, 1 },
+ { "↲ Enter", 0, XK_Return, 2 },
};
static Key keys_functions[KEYS] = {
- { "Esc", 0, XK_Escape, 1 },
- { "▶", 0, XF86XK_AudioPlay, 1 },
- { "●", 0, XF86XK_AudioRecord, 1 },
- { "■", 0, XF86XK_AudioStop, 1 },
- { "◂◂", 0, XF86XK_AudioPrev, 1 },
- { "▸▸", 0, XF86XK_AudioNext, 1 },
- { "♫M", 0, XF86XK_AudioMute, 1 },
- { "♫-", 0, XF86XK_AudioLowerVolume, 1 },
- { "♫+", 0, XF86XK_AudioRaiseVolume, 1 },
- { "☀-", 0, XF86XK_MonBrightnessDown, 1 },
- { "☀+", 0, XF86XK_MonBrightnessUp, 1 },
-
- { 0 }, /* New row */
-
- { "≅", 0, XK_KP_Insert, 1 },
- { "Del", 0, XK_Delete, 1 },
- { "⇤", 0, XK_Home, 1 },
- { "←", 0, XK_Left, 1 },
- { "→", 0, XK_Right, 1 },
- { "⇥", 0, XK_End, 1 },
- { "⇊", 0, XK_Next, 1 },
- { "⇈", 0, XK_Prior, 1 },
- { "Tab", 0, XK_Tab, 1 },
- { "⌫Bksp", 0, XK_BackSpace, 2 },
-
- { 0 }, /* New row */
- { "↺", 0, XK_Cancel, 1},
- { "Shift", 0, XK_Shift_L, 2 },
- { "Ctrl", 0, XK_Control_L, 1 },
- { "Alt", 0, XK_Alt_L, 1 },
- { "", 0, XK_space, 2 },
- { "↓", 0, XK_Down, 1 },
- { "↑", 0, XK_Up, 1 },
- { "↲ Enter", 0, XK_Return, 2 },
-
- { 0 }, /* Last item (double 0) */
- { 0 }, /* Last item (double 0) */
+ { "Esc", 0, XK_Escape, 1 },
+ { "▶", 0, XF86XK_AudioPlay, 1 },
+ { "●", 0, XF86XK_AudioRecord, 1 },
+ { "■", 0, XF86XK_AudioStop, 1 },
+ { "◂◂", 0, XF86XK_AudioPrev, 1 },
+ { "▸▸", 0, XF86XK_AudioNext, 1 },
+ { "♫M", 0, XF86XK_AudioMute, 1 },
+ { "♫-", 0, XF86XK_AudioLowerVolume, 1 },
+ { "♫+", 0, XF86XK_AudioRaiseVolume, 1 },
+ { "☀-", 0, XF86XK_MonBrightnessDown, 1 },
+ { "☀+", 0, XF86XK_MonBrightnessUp, 1 },
+
+ { 0 }, /* New row */
+
+ { "≅", 0, XK_KP_Insert, 1 },
+ { "Del", 0, XK_Delete, 1 },
+ { "⇤", 0, XK_Home, 1 },
+ { "←", 0, XK_Left, 1 },
+ { "→", 0, XK_Right, 1 },
+ { "⇥", 0, XK_End, 1 },
+ { "⇊", 0, XK_Next, 1 },
+ { "⇈", 0, XK_Prior, 1 },
+ { "Tab", 0, XK_Tab, 1 },
+ { "⌫Bksp", 0, XK_BackSpace, 2 },
+
+ { 0 }, /* New row */
+ { "↺", 0, XK_Cancel, 1},
+ { "Shift", 0, XK_Shift_L, 2 },
+ { "Ctrl", 0, XK_Control_L, 1 },
+ { "Alt", 0, XK_Alt_L, 1 },
+ { "", 0, XK_space, 2 },
+ { "↓", 0, XK_Down, 1 },
+ { "↑", 0, XK_Up, 1 },
+ { "↲ Enter", 0, XK_Return, 2 },
+
+ { 0 }, /* Last item (double 0) */
+ { 0 }, /* Last item (double 0) */
};
static Key keys_navigation[KEYS] = {
- { "Esc", 0, XK_Escape, 1 },
- { "⇤", 0, XK_Home, 1 },
- { "↑", 0, XK_Up, 1 },
- { "⇥", 0, XK_End, 1 },
- { "⇈", 0, XK_Prior, 1 },
- { 0 }, /* New row */
-
- { "Shift", 0, XK_Shift_L, 1 },
- { "←", 0, XK_Left, 1 },
- { "", 0, XK_space, 1 },
- { "→", 0, XK_Right, 1 },
- { "⇊", 0, XK_Next, 1 },
-
- { 0 }, /* New row */
-
- { "↺", 0, XK_Cancel, 1},
- { "⌫Bksp", 0, XK_BackSpace, 1 },
- { "↓", 0, XK_Down, 1 },
- { "Tab", 0, XK_Tab, 1 },
- { "↲ Enter", 0, XK_Return, 1},
+ { "Esc", 0, XK_Escape, 1 },
+ { "⇤", 0, XK_Home, 1 },
+ { "↑", 0, XK_Up, 1 },
+ { "⇥", 0, XK_End, 1 },
+ { "⇈", 0, XK_Prior, 1 },
+ { 0 }, /* New row */
+
+ { "Shift", 0, XK_Shift_L, 1 },
+ { "←", 0, XK_Left, 1 },
+ { "", 0, XK_space, 1 },
+ { "→", 0, XK_Right, 1 },
+ { "⇊", 0, XK_Next, 1 },
+
+ { 0 }, /* New row */
+
+ { "↺", 0, XK_Cancel, 1},
+ { "⌫Bksp", 0, XK_BackSpace, 1 },
+ { "↓", 0, XK_Down, 1 },
+ { "Tab", 0, XK_Tab, 1 },
+ { "↲ Enter", 0, XK_Return, 1},
{ 0 }, /* Last item (double 0) */
{ 0 }, /* Last item (double 0) */
};
static Key keys_ru[KEYS] = {
- { "Esc", 0, XK_Escape, 1 },
- { "1", "!", XK_1, 1 },
- { "2", "@", XK_2, 1 },
- { "3", "#", XK_3, 1 },
- { "4", "$", XK_4, 1 },
- { "5", "%", XK_5, 1 },
- { "6", "^", XK_6, 1 },
- { "7", "&", XK_7, 1 },
- { "8", "*", XK_8, 1 },
- { "9", "(", XK_9, 1 },
- { "0", ")", XK_0, 1 },
- { 0 }, /* New row */
-
- { "й", 0, XK_Cyrillic_shorti, 1 },
- { "ц", 0, XK_Cyrillic_tse, 1 },
- { "у", 0, XK_Cyrillic_u, 1 },
- { "к", 0, XK_Cyrillic_ka, 1 },
- { "е", 0, XK_Cyrillic_ie, 1 },
- { "н", 0, XK_Cyrillic_en, 1 },
- { "г", 0, XK_Cyrillic_ghe, 1 },
- { "ш", 0, XK_Cyrillic_sha, 1 },
- { "щ", 0, XK_Cyrillic_shcha, 1 },
- { "з", 0, XK_Cyrillic_ze, 1 },
- { "х", 0, XK_Cyrillic_ha, 1 },
-
- { 0 }, /* New row */
-
- { "ф", 0, XK_Cyrillic_ef, 1 },
- { "ы", 0, XK_Cyrillic_yeru, 1 },
- { "в", 0, XK_Cyrillic_ve, 1 },
- { "а", 0, XK_Cyrillic_a, 1 },
- { "п", 0, XK_Cyrillic_pe, 1 },
- { "р", 0, XK_Cyrillic_er, 1 },
- { "о", 0, XK_Cyrillic_o, 1 },
- { "л", 0, XK_Cyrillic_el, 1 },
- { "д", 0, XK_Cyrillic_de, 1 },
- { "ж", 0, XK_Cyrillic_zhe, 1 },
- { "ю", 0, XK_Cyrillic_yu, 1 },
-
- { 0 }, /* New row */
-
- { "123", 0, XK_Mode_switch, 1 },
- { "я", 0, XK_Cyrillic_ya, 1 },
- { "ч", 0, XK_Cyrillic_che, 1 },
- { "с", 0, XK_Cyrillic_es, 1 },
- { "м", 0, XK_Cyrillic_em, 1 },
- { "и", 0, XK_Cyrillic_i, 1 },
- { "т", 0, XK_Cyrillic_te, 1 },
- { "ь", 0, XK_Cyrillic_softsign, 1 },
- { "б", 0, XK_Cyrillic_be, 1 },
- { "⌫Bksp", 0, XK_BackSpace, 2 },
-
- { 0 }, /* New row */
- { "↺", 0, XK_Cancel, 1},
- { "Shift", 0, XK_Shift_L, 2 },
- { "Ctrl", 0, XK_Control_L, 1 },
- { "Alt", 0, XK_Alt_L, 1 },
- { "", 0, XK_space, 2 },
- { "↓", 0, XK_Down, 1 },
- { "↑", 0, XK_Up, 1 },
- { "↲ Enter", 0, XK_Return, 2 },
+ { "Esc", 0, XK_Escape, 1 },
+ { "1", "!", XK_1, 1 },
+ { "2", "@", XK_2, 1 },
+ { "3", "#", XK_3, 1 },
+ { "4", "$", XK_4, 1 },
+ { "5", "%", XK_5, 1 },
+ { "6", "^", XK_6, 1 },
+ { "7", "&", XK_7, 1 },
+ { "8", "*", XK_8, 1 },
+ { "9", "(", XK_9, 1 },
+ { "0", ")", XK_0, 1 },
+ { 0 }, /* New row */
+
+ { "й", 0, XK_Cyrillic_shorti, 1 },
+ { "ц", 0, XK_Cyrillic_tse, 1 },
+ { "у", 0, XK_Cyrillic_u, 1 },
+ { "к", 0, XK_Cyrillic_ka, 1 },
+ { "е", 0, XK_Cyrillic_ie, 1 },
+ { "н", 0, XK_Cyrillic_en, 1 },
+ { "г", 0, XK_Cyrillic_ghe, 1 },
+ { "ш", 0, XK_Cyrillic_sha, 1 },
+ { "щ", 0, XK_Cyrillic_shcha, 1 },
+ { "з", 0, XK_Cyrillic_ze, 1 },
+ { "х", 0, XK_Cyrillic_ha, 1 },
+
+ { 0 }, /* New row */
+
+ { "ф", 0, XK_Cyrillic_ef, 1 },
+ { "ы", 0, XK_Cyrillic_yeru, 1 },
+ { "в", 0, XK_Cyrillic_ve, 1 },
+ { "а", 0, XK_Cyrillic_a, 1 },
+ { "п", 0, XK_Cyrillic_pe, 1 },
+ { "р", 0, XK_Cyrillic_er, 1 },
+ { "о", 0, XK_Cyrillic_o, 1 },
+ { "л", 0, XK_Cyrillic_el, 1 },
+ { "д", 0, XK_Cyrillic_de, 1 },
+ { "ж", 0, XK_Cyrillic_zhe, 1 },
+ { "ю", 0, XK_Cyrillic_yu, 1 },
+
+ { 0 }, /* New row */
+
+ { "123", 0, XK_Mode_switch, 1 },
+ { "я", 0, XK_Cyrillic_ya, 1 },
+ { "ч", 0, XK_Cyrillic_che, 1 },
+ { "с", 0, XK_Cyrillic_es, 1 },
+ { "м", 0, XK_Cyrillic_em, 1 },
+ { "и", 0, XK_Cyrillic_i, 1 },
+ { "т", 0, XK_Cyrillic_te, 1 },
+ { "ь", 0, XK_Cyrillic_softsign, 1 },
+ { "б", 0, XK_Cyrillic_be, 1 },
+ { "⌫Bksp", 0, XK_BackSpace, 2 },
+
+ { 0 }, /* New row */
+ { "↺", 0, XK_Cancel, 1},
+ { "Shift", 0, XK_Shift_L, 2 },
+ { "Ctrl", 0, XK_Control_L, 1 },
+ { "Alt", 0, XK_Alt_L, 1 },
+ { "", 0, XK_space, 2 },
+ { "↓", 0, XK_Down, 1 },
+ { "↑", 0, XK_Up, 1 },
+ { "↲ Enter", 0, XK_Return, 2 },
};
static Key keys_dialer[KEYS] = {
- { "Esc", 0, XK_Escape, 1 },
- { "1", "!" , XK_1, 1 },
- { "2", "@", XK_2, 1 },
- { "3", "#", XK_3, 1 },
- { "⌫Bksp", 0, XK_BackSpace, 2 },
- { 0 }, /* New row */
-
- { "Shift", 0, XK_Shift_L, 1 },
- { "4", "$", XK_4, 1 },
- { "5", "%", XK_5, 1 },
- { "6", "^", XK_6, 1 },
- { "-", "_", XK_minus, 1 },
- { ",", "<", XK_comma, 1 },
- { 0 }, /* New row */
-
- { "abc", 0, XK_Mode_switch, 1 },
- { "7", "&", XK_7, 1 },
- { "8", "*", XK_8, 1 },
- { "9", "(", XK_9, 1 },
- { "=", "+", XK_equal, 1 },
- { "/", "?", XK_slash, 1 },
- { 0 }, /* New row */
-
- { "↺", 0, XK_Cancel, 1},
- { "", 0, XK_space, 1 },
- { "0", ")", XK_0, 1 },
- { ".", ">", XK_period, 1 },
- { "↲ Enter", 0, XK_Return, 2},
- { 0 }, /* New row */
- { 0 }, /* Last item (double 0) */
+ { "Esc", 0, XK_Escape, 1 },
+ { "1", "!" , XK_1, 1 },
+ { "2", "@", XK_2, 1 },
+ { "3", "#", XK_3, 1 },
+ { "⌫Bksp", 0, XK_BackSpace, 2 },
+ { 0 }, /* New row */
+
+ { "Shift", 0, XK_Shift_L, 1 },
+ { "4", "$", XK_4, 1 },
+ { "5", "%", XK_5, 1 },
+ { "6", "^", XK_6, 1 },
+ { "-", "_", XK_minus, 1 },
+ { ",", "<", XK_comma, 1 },
+ { 0 }, /* New row */
+
+ { "abc", 0, XK_Mode_switch, 1 },
+ { "7", "&", XK_7, 1 },
+ { "8", "*", XK_8, 1 },
+ { "9", "(", XK_9, 1 },
+ { "=", "+", XK_equal, 1 },
+ { "/", "?", XK_slash, 1 },
+ { 0 }, /* New row */
+
+ { "↺", 0, XK_Cancel, 1},
+ { "", 0, XK_space, 1 },
+ { "0", ")", XK_0, 1 },
+ { ".", ">", XK_period, 1 },
+ { "↲ Enter", 0, XK_Return, 2},
+ { 0 }, /* New row */
+ { 0 }, /* Last item (double 0) */
};
#define LAYERS 5
static char* layer_names[LAYERS] = {
- "en",
- "symbols",
- "navigation",
- "dialer",
- "ru",
+ "en",
+ "symbols",
+ "navigation",
+ "dialer",
+ "ru",
};
static Key* available_layers[LAYERS] = {
- keys_en,
- keys_symbols,
- keys_navigation,
- keys_dialer,
- keys_ru
+ keys_en,
+ keys_symbols,
+ keys_navigation,
+ keys_dialer,
+ keys_ru
};
Buttonmod buttonmods[] = {
- { XK_Shift_L, Button2 },
- { XK_Alt_L, Button3 },
+ { XK_Shift_L, Button2 },
+ { XK_Alt_L, Button3 },
};
-
(DIR) diff --git a/layout.mobile-plain.h b/layout.mobile-plain.h
@@ -1,55 +1,55 @@
#define KEYS 44
static Key keys_en[KEYS] = {
- { 0, 0, XK_q, 1 },
- { 0, 0, XK_w, 1 },
- { 0, 0, XK_e, 1 },
- { 0, 0, XK_r, 1 },
- { 0, 0, XK_t, 1 },
- { 0, 0, XK_y, 1 },
- { 0, 0, XK_u, 1 },
- { 0, 0, XK_i, 1 },
- { 0, 0, XK_o, 1 },
- { 0, 0, XK_p, 1 },
+ { 0, 0, XK_q, 1 },
+ { 0, 0, XK_w, 1 },
+ { 0, 0, XK_e, 1 },
+ { 0, 0, XK_r, 1 },
+ { 0, 0, XK_t, 1 },
+ { 0, 0, XK_y, 1 },
+ { 0, 0, XK_u, 1 },
+ { 0, 0, XK_i, 1 },
+ { 0, 0, XK_o, 1 },
+ { 0, 0, XK_p, 1 },
- { 0 }, /* New row */
+ { 0 }, /* New row */
- { 0, 0, XK_a, 1 },
- { 0, 0, XK_s, 1 },
- { 0, 0, XK_d, 1 },
- { 0, 0, XK_f, 1 },
- { 0, 0, XK_g, 1 },
- { 0, 0, XK_h, 1 },
- { 0, 0, XK_j, 1 },
- { 0, 0, XK_k, 1 },
- { 0, 0, XK_l, 1 },
- { ";",":", XK_colon, 1 },
- /*{ "'", XK_apostrophe, 2 },*/
+ { 0, 0, XK_a, 1 },
+ { 0, 0, XK_s, 1 },
+ { 0, 0, XK_d, 1 },
+ { 0, 0, XK_f, 1 },
+ { 0, 0, XK_g, 1 },
+ { 0, 0, XK_h, 1 },
+ { 0, 0, XK_j, 1 },
+ { 0, 0, XK_k, 1 },
+ { 0, 0, XK_l, 1 },
+ { ";",":", XK_colon, 1 },
+ /*{ "'", XK_apostrophe, 2 },*/
- { 0 }, /* New row */
+ { 0 }, /* New row */
- { 0, 0, XK_z, 1 },
- { 0, 0, XK_x, 1 },
- { 0, 0, XK_c, 1 },
- { 0, 0, XK_v, 1 },
- { 0, 0, XK_b, 1 },
- { 0, 0, XK_n, 1 },
- { 0, 0, XK_m, 1 },
- /*{ "/?", XK_slash, 1 },*/
- { "Tab", 0, XK_Tab, 1 },
- { "⇍ Bksp", 0, XK_BackSpace, 2 },
+ { 0, 0, XK_z, 1 },
+ { 0, 0, XK_x, 1 },
+ { 0, 0, XK_c, 1 },
+ { 0, 0, XK_v, 1 },
+ { 0, 0, XK_b, 1 },
+ { 0, 0, XK_n, 1 },
+ { 0, 0, XK_m, 1 },
+ /*{ "/?", XK_slash, 1 },*/
+ { "Tab", 0, XK_Tab, 1 },
+ { "⇍ Bksp", 0, XK_BackSpace, 2 },
- { 0 }, /* New row */
- { "↺", 0, XK_Cancel, 1},
- { "Shft", 0, XK_Shift_L, 1 },
- /*{ "L", XK_Left, 1 },*/
- { "↓", 0, XK_Down, 1 },
- { "↑", 0, XK_Up, 1 },
- /*{ "R", XK_Right, 1 },*/
- { "", 0, XK_space, 2 },
- { "Esc", 0, XK_Escape, 1 },
- { "Ctrl", 0, XK_Control_L, 1 },
- /*{ "Alt", XK_Alt_L, 1 },*/
- { "↲ Enter", 0, XK_Return, 2 },
+ { 0 }, /* New row */
+ { "↺", 0, XK_Cancel, 1},
+ { "Shft", 0, XK_Shift_L, 1 },
+ /*{ "L", XK_Left, 1 },*/
+ { "↓", 0, XK_Down, 1 },
+ { "↑", 0, XK_Up, 1 },
+ /*{ "R", XK_Right, 1 },*/
+ { "", 0, XK_space, 2 },
+ { "Esc", 0, XK_Escape, 1 },
+ { "Ctrl", 0, XK_Control_L, 1 },
+ /*{ "Alt", XK_Alt_L, 1 },*/
+ { "↲ Enter", 0, XK_Return, 2 },
};
static Key keys_symbols[KEYS] = {
@@ -77,46 +77,46 @@ static Key keys_symbols[KEYS] = {
{ "/", "?", XK_slash, 1 },
{ "\\", "|", XK_backslash, 1 },
- { 0 }, /* New row */
+ { 0 }, /* New row */
- { "", 0, XK_Shift_L|XK_bar, 1 },
- { "⇤", 0, XK_Home, 1 },
- { "←", 0, XK_Left, 1 },
- { "→", 0, XK_Right, 1 },
- { "⇥", 0, XK_End, 1 },
- { "⇊", 0, XK_Next, 1 },
- { "⇈", 0, XK_Prior, 1 },
- { "Tab", 0, XK_Tab, 1 },
- { "⇍ Bksp", 0, XK_BackSpace, 2 },
+ { "", 0, XK_Shift_L|XK_bar, 1 },
+ { "⇤", 0, XK_Home, 1 },
+ { "←", 0, XK_Left, 1 },
+ { "→", 0, XK_Right, 1 },
+ { "⇥", 0, XK_End, 1 },
+ { "⇊", 0, XK_Next, 1 },
+ { "⇈", 0, XK_Prior, 1 },
+ { "Tab", 0, XK_Tab, 1 },
+ { "⇍ Bksp", 0, XK_BackSpace, 2 },
- { 0 }, /* New row */
- { "↺", 0, XK_Cancel, 1},
- { "Shft", 0, XK_Shift_L, 1 },
- { "↓", 0, XK_Down, 1 },
- { "↑", 0, XK_Up, 1 },
- { "", 0, XK_space, 2 },
- { "Esc", 0, XK_Escape, 1 },
- { "Ctrl", 0, XK_Control_L, 1 },
- { "↲ Enter", 0, XK_Return, 2 },
+ { 0 }, /* New row */
+ { "↺", 0, XK_Cancel, 1},
+ { "Shft", 0, XK_Shift_L, 1 },
+ { "↓", 0, XK_Down, 1 },
+ { "↑", 0, XK_Up, 1 },
+ { "", 0, XK_space, 2 },
+ { "Esc", 0, XK_Escape, 1 },
+ { "Ctrl", 0, XK_Control_L, 1 },
+ { "↲ Enter", 0, XK_Return, 2 },
};
Buttonmod buttonmods[] = {
- { XK_Shift_L, Button2 },
- { XK_Alt_L, Button3 },
+ { XK_Shift_L, Button2 },
+ { XK_Alt_L, Button3 },
};
#define OVERLAYS 1
static Key overlay[OVERLAYS] = {
- { 0, 0, XK_Cancel },
+ { 0, 0, XK_Cancel },
};
#define LAYERS 2
static char* layer_names[LAYERS] = {
- "en",
- "symbols",
+ "en",
+ "symbols",
};
static Key* available_layers[LAYERS] = {
- keys_en,
- keys_symbols,
+ keys_en,
+ keys_symbols,
};
(DIR) diff --git a/svkbd.c b/svkbd.c
@@ -712,57 +712,57 @@ readxresources(void) {
XrmValue xval;
if (XrmGetResource(xdb, "svkbd.font", "*", &type, &xval) && !fonts[0])
- fonts[0] = estrdup(xval.addr);
+ fonts[0] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.background", "*", &type, &xval) && !colors[SchemeNorm][ColBg] )
- colors[SchemeNorm][ColBg] = estrdup(xval.addr);
+ colors[SchemeNorm][ColBg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.foreground", "*", &type, &xval) && !colors[SchemeNorm][ColFg] )
- colors[SchemeNorm][ColFg] = estrdup(xval.addr);
+ colors[SchemeNorm][ColFg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.shiftforeground", "*", &type, &xval) && !colors[SchemeNormShift][ColFg] )
- colors[SchemeNormShift][ColFg] = estrdup(xval.addr);
+ colors[SchemeNormShift][ColFg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.shiftbackground", "*", &type, &xval) && !colors[SchemeNormShift][ColBg] )
- colors[SchemeNormShift][ColBg] = estrdup(xval.addr);
+ colors[SchemeNormShift][ColBg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.ABCforeground", "*", &type, &xval) && !colors[SchemeNormABC][ColFg] )
- colors[SchemeNormABC][ColFg] = estrdup(xval.addr);
+ colors[SchemeNormABC][ColFg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.ABCbackground", "*", &type, &xval) && !colors[SchemeNormABC][ColBg] )
- colors[SchemeNormABC][ColBg] = estrdup(xval.addr);
+ colors[SchemeNormABC][ColBg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.ABCshiftforeground", "*", &type, &xval) && !colors[SchemeNormShift][ColFg] )
- colors[SchemeNormShift][ColFg] = estrdup(xval.addr);
+ colors[SchemeNormShift][ColFg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.ABCshiftbackground", "*", &type, &xval) && !colors[SchemeNormShift][ColBg] )
- colors[SchemeNormShift][ColBg] = estrdup(xval.addr);
+ colors[SchemeNormShift][ColBg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.pressbackground", "*", &type, &xval) && !colors[SchemePress][ColBg] )
- colors[SchemePress][ColBg] = estrdup(xval.addr);
+ colors[SchemePress][ColBg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.pressforeground", "*", &type, &xval) && !colors[SchemePress][ColFg] )
- colors[SchemePress][ColFg] = estrdup(xval.addr);
+ colors[SchemePress][ColFg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.pressshiftbackground", "*", &type, &xval) && !colors[SchemePressShift][ColBg] )
- colors[SchemePressShift][ColBg] = estrdup(xval.addr);
+ colors[SchemePressShift][ColBg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.pressshiftforeground", "*", &type, &xval) && !colors[SchemePressShift][ColFg] )
- colors[SchemePressShift][ColFg] = estrdup(xval.addr);
+ colors[SchemePressShift][ColFg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.highlightbackground", "*", &type, &xval) && !colors[SchemeHighlight][ColBg] )
- colors[SchemeHighlight][ColBg] = estrdup(xval.addr);
+ colors[SchemeHighlight][ColBg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.highlightforeground", "*", &type, &xval) && !colors[SchemeHighlight][ColFg] )
- colors[SchemeHighlight][ColFg] = estrdup(xval.addr);
+ colors[SchemeHighlight][ColFg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.highlightshiftbackground", "*", &type, &xval) && !colors[SchemeHighlightShift][ColBg] )
- colors[SchemeHighlightShift][ColBg] = estrdup(xval.addr);
+ colors[SchemeHighlightShift][ColBg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.highlightshiftforeground", "*", &type, &xval) && !colors[SchemeHighlightShift][ColFg] )
- colors[SchemeHighlightShift][ColFg] = estrdup(xval.addr);
+ colors[SchemeHighlightShift][ColFg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.overlaybackground", "*", &type, &xval) && !colors[SchemeOverlay][ColBg] )
- colors[SchemeOverlay][ColBg] = estrdup(xval.addr);
+ colors[SchemeOverlay][ColBg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.overlayforeground", "*", &type, &xval) && !colors[SchemeOverlay][ColFg] )
- colors[SchemeOverlay][ColFg] = estrdup(xval.addr);
+ colors[SchemeOverlay][ColFg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.overlayshiftbackground", "*", &type, &xval) && !colors[SchemeOverlayShift][ColBg] )
- colors[SchemeOverlayShift][ColBg] = estrdup(xval.addr);
+ colors[SchemeOverlayShift][ColBg] = estrdup(xval.addr);
if (XrmGetResource(xdb, "svkbd.overlayshiftforeground", "*", &type, &xval) && !colors[SchemeOverlayShift][ColFg] )
- colors[SchemeOverlayShift][ColFg] = estrdup(xval.addr);
+ colors[SchemeOverlayShift][ColFg] = estrdup(xval.addr);
XrmDestroyDatabase(xdb);
@@ -906,8 +906,7 @@ setup(void)
ch->res_class = name;
ch->res_name = name;
- XSetWMProperties(dpy, win, &str, &str, NULL, 0, sizeh, wmh,
- ch);
+ XSetWMProperties(dpy, win, &str, &str, NULL, 0, sizeh, wmh, ch);
XFree(keysyms);
XFree(ch);