[hackers] [svkbd] code cleanup in overlay definitions (removed empty lines comments) || Maarten van Gompel

Mon, 12 Jul 2021 03:52:20 -0700 

commit 3cff4547c5360ccf5424a413c3558ca99e2ce487
Author:     Maarten van Gompel <proy...@anaproy.nl>
AuthorDate: Sun Jul 11 17:53:50 2021 +0200
Commit:     Hiltjo Posthuma <hil...@codemadness.org>
CommitDate: Mon Jul 12 12:34:03 2021 +0200

    code cleanup in overlay definitions (removed empty lines comments)

diff --git a/layout.mobile-intl.h b/layout.mobile-intl.h
index 8962e7e..97b914e 100644
--- a/layout.mobile-intl.h
+++ b/layout.mobile-intl.h
@@ -113,10 +113,9 @@ static Key keys_minimal[KEYS] = {
        { "↲ Enter", 0, XK_Return, 2 },
 };
 
-#define OVERLAYS 198
+#define OVERLAYS 197
 static Key overlay[OVERLAYS] = {
        { 0, 0, XK_a }, //Overlay for a
-       //---
        { "à", 0, XK_agrave },
        { "á", 0, XK_aacute },
        { "â", 0, XK_acircumflex },
@@ -128,9 +127,7 @@ static Key overlay[OVERLAYS] = {
        { "Ã¥", 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 },
@@ -140,17 +137,13 @@ static Key overlay[OVERLAYS] = {
        { "ė", 0, XK_eabovedot },
        { "ě", 0, XK_ecaron },
        { 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 },
@@ -161,9 +154,7 @@ static Key overlay[OVERLAYS] = {
        { "Å­", 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 },
@@ -172,9 +163,7 @@ static Key overlay[OVERLAYS] = {
        { "Ä«", 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 },
@@ -186,128 +175,86 @@ static Key overlay[OVERLAYS] = {
        { "ő", 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, 0x101f642 }, //New overlay -> emoji overlay
        { "😀", 0, 0x101f600 },
        { "😁", 0, 0x101f601 },
        { "😂", 0, 0x101f602 },
@@ -336,9 +283,7 @@ static Key overlay[OVERLAYS] = {
        { "😳", 0, 0x101f633 },
        { "😴", 0, 0x101f634 },
        { 0, 0, XK_Cancel }, /* XK_Cancel signifies  overlay boundary */
-       //--
-       { "/?", 0, XK_slash }, //punctuation overlay
-       //--
+       { "/?", 0, XK_slash }, //New overlay - punctuation overlay
        { "1", "!", XK_1, 1 },
        { "2", "@", XK_2, 1 },
        { "3", "#", XK_3, 1 },
diff --git a/layout.mobile-simple.h b/layout.mobile-simple.h
index 4d26226..6b23ff3 100644
--- a/layout.mobile-simple.h
+++ b/layout.mobile-simple.h
@@ -188,7 +188,7 @@ static Key keys_dialer[DIALER_KEYS] = {
        { "↲ Enter", 0, XK_Return, 2},
 };
 
-#define OVERLAYS 198
+#define OVERLAYS 193
 
 static Key overlay[OVERLAYS] = {
        { 0, 0, XK_a },
@@ -203,7 +203,6 @@ static Key overlay[OVERLAYS] = {
        { "Ã¥", 0, XK_aring },
        { "æ", 0, XK_ae },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_e },
        { "è", 0, XK_egrave },
        { "é", 0, XK_eacute },
@@ -214,14 +213,12 @@ static Key overlay[OVERLAYS] = {
        { "ė", 0, XK_eabovedot },
        { "ě", 0, XK_ecaron },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_y },
        { "ỳ", 0, XK_ygrave },
        { "ý", 0, XK_yacute },
        { "Å·", 0, XK_ycircumflex },
        { "ÿ", 0, XK_ydiaeresis },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_u },
        { "ù", 0, XK_ugrave },
        { "ú", 0, XK_uacute },
@@ -233,7 +230,6 @@ static Key overlay[OVERLAYS] = {
        { "Å­", 0, XK_ubreve},
        { "ű", 0, XK_udoubleacute },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_i },
        { "ì", 0, XK_igrave },
        { "í", 0, XK_iacute },
@@ -243,8 +239,6 @@ static Key overlay[OVERLAYS] = {
        { "Ä«", 0, XK_imacron },
        { "ı", 0, XK_idotless },
        { 0, 0, XK_Cancel },
-
-
        { 0, 0, XK_o },
        { "ò", 0, XK_ograve },
        { "ó", 0, XK_oacute },
@@ -257,19 +251,16 @@ static Key overlay[OVERLAYS] = {
        { "ő", 0, XK_odoubleacute },
        { "œ", 0, XK_oe },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_d },
        { "ď", 0, XK_dcaron },
        { "ð", 0, XK_eth },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_c },
        { "ç", 0, XK_ccedilla },
        { "ĉ", 0, XK_ccircumflex },
        { "č", 0, XK_ccaron },
        { "ć", 0, XK_cacute },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_s },
        { "ş", 0, XK_scedilla },
        { "ŝ", 0, XK_scircumflex },
@@ -277,86 +268,68 @@ static Key overlay[OVERLAYS] = {
        { "ś", 0, XK_sacute },
        { "ß", 0, XK_ssharp },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_z },
        { "ž", 0, XK_zcaron },
        { "ż", 0, XK_zabovedot },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_n },
        { "ñ", 0, XK_ntilde },
        { "ń", 0, XK_nacute },
        { "ň", 0, XK_ncaron },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_t },
        { "ț", 0, XK_tcedilla },
        { "Å¥", 0, XK_tcaron },
        { "þ", 0, XK_thorn },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_g },
        { "ĝ", 0, XK_gcircumflex },
        { "ğ", 0, XK_gbreve },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_h },
        { "Ä¥", 0, XK_hcircumflex },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_j },
        { "ĵ", 0, XK_jcircumflex },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_l },
        { "ł", 0, XK_lstroke },
        { "ľ", 0, XK_lcaron },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_r },
        { "ř", 0, XK_rcaron },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_Cyrillic_softsign },
        { "ъ", 0, XK_Cyrillic_hardsign },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_Cyrillic_ie },
        { "ё", 0, XK_Cyrillic_io },
        { "э", 0, XK_Cyrillic_e },
        { "Є", 0, XK_Ukrainian_ie },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_Cyrillic_i },
        { "і", 0, XK_Ukrainian_i },
        { "ї", 0, XK_Ukrainian_yi },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_Cyrillic_u },
        { "ў", 0, XK_Byelorussian_shortu },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_Cyrillic_shorti },
        { "ј", 0, XK_Cyrillic_je },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_Cyrillic_el },
        { "љ", 0, XK_Cyrillic_lje },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_Cyrillic_en },
        { "њ", 0, XK_Cyrillic_nje },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_Cyrillic_tse },
        { "џ", 0, XK_Cyrillic_dzhe },
        { 0, 0, XK_Cancel },
-
        { 0, 0, XK_Cyrillic_che },
        { "ћ", 0, XK_Serbian_tshe },
        { "ђ", 0, XK_Serbian_dje },
        { 0, 0, XK_Cancel },
-
        { "🙂", 0, 0x101f642 },
        { "😀", 0, 0x101f600 },
        { "😁", 0, 0x101f601 },
@@ -386,7 +359,6 @@ static Key overlay[OVERLAYS] = {
        { "😳", 0, 0x101f633 },
        { "😴", 0, 0x101f634 },
        { 0, 0, XK_Cancel },
-
        { ".", 0, XK_period, },
        { ":", 0, XK_colon, 26, XK_Shift_L },
        { ";", 0, XK_colon, 0 },
@@ -394,7 +366,6 @@ static Key overlay[OVERLAYS] = {
        { "?", 0, XK_slash, 0, XK_Shift_L },
        { ",", 0, XK_comma, 0 },
        { 0, 0, XK_Cancel },
-
        { "-", 0, XK_minus },
        { "_", 0, XK_minus, 24, XK_Shift_L },
        { "+", 0, XK_plus, 0, XK_Shift_L },
@@ -402,7 +373,6 @@ static Key overlay[OVERLAYS] = {
        { "*", 0, XK_8, 0, XK_Shift_L },
        { "=", 0, XK_plus },
        { 0, 0, XK_Cancel },
-
        { "'", 0, XK_apostrophe },
        { "{", 0, XK_bracketleft, 7, XK_Shift_L },
        { "}", 0, XK_bracketright, 0, XK_Shift_L },

Reply via email to