diff --git a/layout.mobintl.h b/layout.mobintl.h index f8f975b..4c217b1 100644 --- a/layout.mobintl.h +++ b/layout.mobintl.h @@ -941,8 +941,7 @@ static struct key keys_compose_a[] = { {"", "", 9.0, Pad}, {"", "", 0.0, EndRow}, {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, - {"", "", 7, Pad}, - {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1}, + {"", "", 8.5, Pad}, {"", "", 0.0, EndRow}, {"Abc", "Abc", 1.0, BackLayer, .scheme = 1}, {"", "", 9, Pad}, @@ -959,14 +958,14 @@ static struct key keys_compose_e[] = { {"ė", "Ė", 1.0, Copy, 0x0117, 0, 0x0116}, {"ę", "Ę", 1.0, Copy, 0x0119, 0, 0x0118}, {"ě", "Ě", 1.0, Copy, 0x011B, 0, 0x011A}, + {"", "", 1.0, Pad}, {"", "", 0.0, EndRow}, {"ε", "Ε", 1.0, Copy, 0x03B5, 0, 0x0395}, {"ǝ", "Ə", 1.0, Copy, 0x0259, 0, 0x018F}, {"", "", 8.0, Pad}, {"", "", 0.0, EndRow}, - {"⇧", "⇫", 1.5, Mod, Shift}, - {"", "", 7, Pad}, - {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE}, + {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, + {"", "", 8.5, Pad}, {"", "", 0.0, EndRow}, {"Abc", "Abc", 1.0, BackLayer, .scheme = 1}, {"", "", 9, Pad}, @@ -980,10 +979,10 @@ static struct key keys_compose_y[] = { {"", "", 7.0, Pad}, {"", "", 0.0, EndRow}, {"υ", "Υ", 1.0, Copy, 0x03C5, 0, 0x03A5}, + {"", "", 9.0, Pad}, {"", "", 0.0, EndRow}, {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, - {"", "", 7, Pad}, - {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1}, + {"", "", 8.5, Pad}, {"", "", 0.0, EndRow}, {"Abc", "Abc", 1.0, BackLayer, .scheme = 1}, {"", "", 9, Pad}, @@ -1006,8 +1005,7 @@ static struct key keys_compose_u[] = { {"", "", 9.0, Pad}, {"", "", 0.0, EndRow}, {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, - {"", "", 7, Pad}, - {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1}, + {"", "", 8.5, Pad}, {"", "", 0.0, EndRow}, {"Abc", "Abc", 1.0, BackLayer, .scheme = 1}, {"", "", 9, Pad}, @@ -1031,8 +1029,7 @@ static struct key keys_compose_o[] = { {"", "", 8.0, Pad}, {"", "", 0.0, EndRow}, {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, - {"", "", 7, Pad}, - {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1}, + {"", "", 8.5, Pad}, {"", "", 0.0, EndRow}, {"Abc", "Abc", 1.0, BackLayer, .scheme = 1}, {"", "", 9, Pad}, @@ -1056,8 +1053,7 @@ static struct key keys_compose_i[] = { {"", "", 8.0, Pad}, {"", "", 0.0, EndRow}, {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, - {"", "", 7, Pad}, - {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1}, + {"", "", 8.5, Pad}, {"", "", 0.0, EndRow}, {"Abc", "Abc", 1.0, BackLayer, .scheme = 1}, {"", "", 9, Pad}, @@ -1325,11 +1321,10 @@ static struct key keys_compose_t[] = { }; static struct key keys_compose_p[] = { - {"", "", 10.0, Pad}, - {"", "", 0.0, EndRow}, {"π", "Π", 1.0, Copy, 0x03C0, 0, 0x03A0}, {"", "", 9.0, Pad}, {"", "", 0.0, EndRow}, + {"", "", 0.0, EndRow}, {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, {"", "", 8.5, Pad}, {"", "", 0.0, EndRow}, @@ -1376,11 +1371,10 @@ static struct key keys_compose_d[] = { }; static struct key keys_compose_f[] = { - {"", "", 10.0, Pad}, - {"", "", 0.0, EndRow}, {"φ", "Φ", 1.0, Copy, 0x03C6, 0, 0x03A6}, {"", "", 9.0, Pad}, {"", "", 0.0, EndRow}, + {"", "", 0.0, EndRow}, {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, {"", "", 8.5, Pad}, {"", "", 0.0, EndRow}, @@ -1486,12 +1480,11 @@ static struct key keys_compose_z[] = { }; static struct key keys_compose_x[] = { - {"", "", 10.0, Pad}, - {"", "", 0.0, EndRow}, {"χ", "Χ", 1.0, Copy, 0x03C7, 0, 0x03A7}, {"ξ", "Ξ", 1.0, Copy, 0x03BE, 0, 0x039E}, {"", "", 9.0, Pad}, {"", "", 0.0, EndRow}, + {"", "", 0.0, EndRow}, {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, {"", "", 8.5, Pad}, {"", "", 0.0, EndRow}, @@ -1506,7 +1499,7 @@ static struct key keys_compose_c[] = { {"ĉ", "Ĉ", 1.0, Copy, 0x0109, 0, 0x0108}, {"ċ", "Ċ", 1.0, Copy, 0x010B, 0, 0x010A}, {"č", "Č", 1.0, Copy, 0x010D, 0, 0x010C}, - {"", "", 9.0, Pad}, + {"", "", 5.0, Pad}, {"", "", 0.0, EndRow}, {"χ", "Χ", 1.0, Copy, 0x03C7, 0, 0x03A7}, {"", "", 9.0, Pad}, @@ -1520,9 +1513,7 @@ static struct key keys_compose_c[] = { }; static struct key keys_compose_v[] = { - {"", "", 10.0, Pad}, {"", "", 0.0, EndRow}, - {"", "", 10.0, Pad}, {"", "", 0.0, EndRow}, {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, {"", "", 8.5, Pad}, @@ -1533,11 +1524,10 @@ static struct key keys_compose_v[] = { }; static struct key keys_compose_b[] = { - {"", "", 10.0, Pad}, - {"", "", 0.0, EndRow}, {"β", "Β", 1.0, Copy, 0x03B2, 0, 0x0392}, {"", "", 9.0, Pad}, {"", "", 0.0, EndRow}, + {"", "", 0.0, EndRow}, {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, {"", "", 8.5, Pad}, {"", "", 0.0, EndRow}, @@ -1566,11 +1556,10 @@ static struct key keys_compose_n[] = { }; static struct key keys_compose_m[] = { - {"", "", 10.0, Pad}, - {"", "", 0.0, EndRow}, {"μ", "Μ", 1.0, Copy, 0x03BC, 0, 0x039C}, {"", "", 9.0, Pad}, {"", "", 0.0, EndRow}, + {"", "", 0.0, EndRow}, {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, {"", "", 8.5, Pad}, {"", "", 0.0, EndRow}, @@ -1713,21 +1702,9 @@ static struct key keys_compose_cyr_k[] = { }; static struct key keys_compose_math[] = { - {"1", "!", 1.0, Code, KEY_1}, - {"2", "@", 1.0, Code, KEY_2}, - {"3", "#", 1.0, Code, KEY_3}, - {"4", "$", 1.0, Code, KEY_4}, - {"5", "%", 1.0, Code, KEY_5}, - {"6", "^", 1.0, Code, KEY_6}, - {"7", "&", 1.0, Code, KEY_7}, - {"8", "*", 1.0, Code, KEY_8}, - {"9", "(", 1.0, Code, KEY_9}, - {"0", ")", 1.0, Code, KEY_0}, {"", "", 0.0, EndRow}, - {"Tab", "Tab", 1.0, Code, KEY_TAB}, - {"", "", 9.0, Pad}, {"", "", 0.0, EndRow}, - {"⇧", "⇫", 2, Mod, Shift, .scheme = 1}, + {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, {"+", "+", 1, Code, KEY_EQUAL, 0, Shift}, {"/", "/", 1, Code, KEY_SLASH}, {"*", "*", 1, Code, KEY_8, 0, Shift}, @@ -1735,46 +1712,28 @@ static struct key keys_compose_math[] = { {"=", "=", 1, Code, KEY_EQUAL}, {"_", "_", 1, Code, KEY_MINUS, 0, Shift}, {"—", "—", 1, Copy, 0x2014, 0, 0x2014}, - {"", "", 1, Pad}, + {"", "", 1.5, Pad}, {"", "", 0.0, EndRow}, {"Abc", "Abc", 1.0, BackLayer, .scheme = 1}, - {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1}, - {"Alt", "Alt", 1.0, Mod, Alt, .scheme = 1}, - {"Sup", "Sup", 1.0, Mod, Super, .scheme = 1}, - {"", "", 6, Pad}, + {"", "", 9, Pad}, {"", "", 0.0, Last}, }; static struct key keys_compose_punctuation[] = { - {"1", "!", 1.0, Code, KEY_1}, - {"2", "@", 1.0, Code, KEY_2}, - {"3", "#", 1.0, Code, KEY_3}, - {"4", "$", 1.0, Code, KEY_4}, - {"5", "%", 1.0, Code, KEY_5}, - {"6", "^", 1.0, Code, KEY_6}, - {"7", "&", 1.0, Code, KEY_7}, - {"8", "*", 1.0, Code, KEY_8}, - {"9", "(", 1.0, Code, KEY_9}, - {"0", ")", 1.0, Code, KEY_0}, {"", "", 0.0, EndRow}, - {"Tab", "Tab", 1.0, Code, KEY_TAB}, - {"", "", 9.0, Pad}, {"", "", 0.0, EndRow}, - {"⇧", "⇫", 2, Mod, Shift, .scheme = 1}, + {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1}, {"…", "…", 1, Copy, 0x2026, 0, 0x2026}, {":", ":", 1, Code, KEY_SEMICOLON, 0, Shift}, {";", ";", 1, Code, KEY_SEMICOLON, 0}, {"!", "!", 1, Code, KEY_1, 0, Shift}, {"?", "?", 1, Code, KEY_DOT, 0, Shift}, - {",", ",", 1, Code, KEY_COMMA}, {"·", "·", 1, Copy, 0x2027, 0, 0x2027}, - {"", "", 1, Pad}, + {",", ",", 1, Code, KEY_COMMA}, + {"", "", 1.5, Pad}, {"", "", 0.0, EndRow}, {"Abc", "Abc", 1.0, BackLayer, .scheme = 1}, - {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1}, - {"Alt", "Alt", 1.0, Mod, Alt, .scheme = 1}, - {"Sup", "Sup", 1.0, Mod, Super, .scheme = 1}, - {"", "", 6, Pad}, + {"", "", 9, Pad}, {"", "", 0.0, Last}, };