further adjustments to new compose layers for simple layout

This commit is contained in:
Maarten van Gompel 2021-08-24 00:04:20 +02:00 committed by John Sullivan
parent 57c688c218
commit 918c22646c

View File

@ -1258,14 +1258,14 @@ static struct key keys_compose_math[] = {
{"", "", 0.0, EndRow}, {"", "", 0.0, EndRow},
{"", "", 10.0, Pad }, {"", "", 10.0, Pad },
{"", "", 0.0, EndRow}, {"", "", 0.0, EndRow},
{"", "", 1, Mod, Shift}, {"", "", 2, Mod, Shift, .scheme=1},
{"-", "-", 1, Code, KEY_MINUS }, {"-", "-", 1, Code, KEY_MINUS },
{"+", "+", 1, Code, KEY_EQUAL, 0, Shift }, {"+", "+", 1, Code, KEY_EQUAL, 0, Shift },
{"/", "/", 1, Code, KEY_SLASH}, {"/", "/", 1, Code, KEY_SLASH},
{"*", "*", 1, Code, KEY_8, 0, Shift }, {"*", "*", 1, Code, KEY_8, 0, Shift },
{"=", "=", 1, Code, KEY_EQUAL}, {"=", "=", 1, Code, KEY_EQUAL},
{"_", "_", 1, Code, KEY_MINUS, 0, Shift }, {"_", "_", 1, Code, KEY_MINUS, 0, Shift },
{"", "", 4, Pad }, {"", "", 2, Pad },
{"", "", 0.0, EndRow}, {"", "", 0.0, EndRow},
{"Abc", "Abc", 1.0, Layout, 0, &layouts[(DefaultLayout == Simple) ? Special : Cyrillic], .scheme=1 }, {"Abc", "Abc", 1.0, Layout, 0, &layouts[(DefaultLayout == Simple) ? Special : Cyrillic], .scheme=1 },
{"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme=1}, {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme=1},
@ -1288,8 +1288,8 @@ static struct key keys_compose_punctuation[] = {
{"9", "(", 1.0, Code, KEY_9}, {"9", "(", 1.0, Code, KEY_9},
{"0", ")", 1.0, Code, KEY_0}, {"0", ")", 1.0, Code, KEY_0},
{"", "", 0.0, EndRow}, {"", "", 0.0, EndRow},
{"", "", 1, Mod, Shift}, {"", "", 2, Mod, Shift, .scheme=1},
{"", "", 2, Pad }, {"", "", 1, Pad },
{ ":", ":", 1, Code, KEY_SEMICOLON, 0, Shift }, { ":", ":", 1, Code, KEY_SEMICOLON, 0, Shift },
{ ";", ";", 1, Code, KEY_SEMICOLON, 0}, { ";", ";", 1, Code, KEY_SEMICOLON, 0},
{ "!", "!", 1, Code, KEY_1, 0, Shift}, { "!", "!", 1, Code, KEY_1, 0, Shift},
@ -1320,8 +1320,8 @@ static struct key keys_compose_bracket[] = {
{ "\"", "\"", 1, Code, KEY_APOSTROPHE, 0, Shift }, { "\"", "\"", 1, Code, KEY_APOSTROPHE, 0, Shift },
{ "'", "'", 1, Code, KEY_APOSTROPHE }, { "'", "'", 1, Code, KEY_APOSTROPHE },
{"", "", 0.0, EndRow}, {"", "", 0.0, EndRow},
{"", "", 1, Mod, Shift}, {"", "", 2, Mod, Shift, .scheme=1},
{"", "", 9, Pad }, {"", "", 8, Pad },
{"", "", 0.0, EndRow}, {"", "", 0.0, EndRow},
{"Abc", "Abc", 1.0, Layout, 0, &layouts[(DefaultLayout == Simple) ? Special : Cyrillic], .scheme=1 }, {"Abc", "Abc", 1.0, Layout, 0, &layouts[(DefaultLayout == Simple) ? Special : Cyrillic], .scheme=1 },
{"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme=1}, {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme=1},