mirror of
https://github.com/jjsullivan5196/wvkbd.git
synced 2025-07-12 14:04:34 +02:00
Layout: Ad F* keys row. Rework Layout (Full Size)
-> Add F* key row (now compose yet)
-> Rework the layout to be more proper Full-Size layout.
TODO:
-> Adjust bottom two rows, as they don't feel quite 'right' yet.
-> Implement compose stuff, so that we get all of the brightness,
volume, audio, home, etc keys too.
At tha t point, we have a full-size && fully-featured keyboard. ;-)
Signed-off-by: jordan Johnston <johnstonljordan@gmail.com>
This commit is contained in:
jordan Johnston
Rdbo
parent
ff8bae7de0
commit
bdbad476e3
@ -1102,22 +1102,41 @@ static struct key keys_index[] = {
|
||||
};
|
||||
|
||||
static struct key keys_landscape[] = {
|
||||
{"", "", 0.041, Pad},
|
||||
{"Esc", "Esc", 1.2, Code, KEY_ESC, .scheme = 1},
|
||||
{"F1", "F1", 1.0, Code, KEY_F1, .scheme = 1},
|
||||
{"F2", "F2", 1.0, Code, KEY_F2, .scheme = 1},
|
||||
{"F3", "F3", 1.0, Code, KEY_F3, .scheme = 1},
|
||||
{"F4", "F4", 1.0, Code, KEY_F4, .scheme = 1},
|
||||
{"F5", "F5", 1.0, Code, KEY_F5, .scheme = 1},
|
||||
{"F6", "F6", 1.0, Code, KEY_F6, .scheme = 1},
|
||||
{"F7", "F7", 1.0, Code, KEY_F7, .scheme = 1},
|
||||
{"F8", "F8", 1.0, Code, KEY_F8, .scheme = 1},
|
||||
{"F9", "F9", 1.0, Code, KEY_F9, .scheme = 1},
|
||||
{"F10", "F10", 1.0, Code, KEY_F10, .scheme = 1},
|
||||
{"F11", "F11", 1.0, Code, KEY_F11, .scheme = 1},
|
||||
{"F12", "F12", 1.0, Code, KEY_F12, .scheme = 1},
|
||||
{"PgUp", "PgUp", 0.5, Code, KEY_PAGEUP, .scheme = 1, .scheme = 1},
|
||||
{"PgDn", "PgDn", 0.5, Code, KEY_PAGEDOWN, .scheme = 1, .scheme = 1},
|
||||
{"Del", "Del", 1.0, Code, KEY_DELETE, .scheme = 1},
|
||||
{"", "", 0.041, Pad},
|
||||
{"", "", 0.0, EndRow},
|
||||
|
||||
{"", "", 0.04, Pad},
|
||||
{"Esc", "Esc", 0.6, Code, KEY_ESC, .scheme = 1},
|
||||
{"`", "~", 1.0, Code, KEY_GRAVE, .scheme = 1},
|
||||
{"1", "!", 1.0, Code, KEY_1, .scheme = 1},
|
||||
{"2", "@", 1.0, Code, KEY_2, .scheme = 1},
|
||||
{"3", "#", 1.0, Code, KEY_3, .scheme = 1},
|
||||
{"4", "$", 1.0, Code, KEY_4, .scheme = 1},
|
||||
{"5", "%", 1.0, Code, KEY_5, .scheme = 1},
|
||||
{"6", "^", 1.0, Code, KEY_6, .scheme = 1},
|
||||
{"7", "&", 1.0, Code, KEY_7, .scheme = 1},
|
||||
{"8", "*", 1.0, Code, KEY_8, .scheme = 1},
|
||||
{"9", "(", 1.0, Code, KEY_9, &layouts[ComposeBracket], .scheme = 1},
|
||||
{"0", ")", 1.0, Code, KEY_0, &layouts[ComposeBracket], .scheme = 1},
|
||||
{"PgUp", "PgUp", 0.44, Code, KEY_PAGEUP, .scheme = 1, .scheme = 1},
|
||||
{"PgDn", "PgDn", 0.44, Code, KEY_PAGEDOWN, .scheme = 1, .scheme = 1},
|
||||
{"Del", "Del", 0.9, Code, KEY_DELETE, .scheme = 1},
|
||||
{"`", "~", 0.5, Code, KEY_GRAVE, .scheme = 1},
|
||||
{"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, &layouts[ComposeBracket]},
|
||||
{"0", ")", 1.0, Code, KEY_0, &layouts[ComposeBracket]},
|
||||
{"-", "_", 0.4, Code, KEY_MINUS, &layouts[ComposeBracket]},
|
||||
{"=", "+", 0.4, Code, KEY_EQUAL, &layouts[ComposeBracket]},
|
||||
{"⌫", "⌫", 0.9, Code, KEY_BACKSPACE, .scheme = 1},
|
||||
{"", "", 0.04, Pad},
|
||||
{"", "", 0.0, EndRow},
|
||||
|
||||
@ -1135,12 +1154,12 @@ static struct key keys_landscape[] = {
|
||||
{"p", "P", 1.0, Code, KEY_P, &layouts[ComposeP]},
|
||||
{"[", "{", 0.468, Code, KEY_LEFTBRACE},
|
||||
{"]", "}", 0.468, Code, KEY_RIGHTBRACE},
|
||||
{"⌫", "⌫", 0.52, Code, KEY_BACKSPACE, .scheme = 1},
|
||||
{"\\", "|", 0.468, Code, KEY_BACKSLASH, .scheme = 1},
|
||||
{"", "", 0.04, Pad},
|
||||
{"", "", 0.0, EndRow},
|
||||
|
||||
{"", "", 0.038, Pad},
|
||||
{"⌨͕", "⌨͔", 0.43, NextLayer, .scheme = 1},
|
||||
{"⌨͕", "⌨͔", 0.46, NextLayer, .scheme = 1},
|
||||
{"Caps", "Caps", 0.64, Mod, CapsLock, .scheme = 1},
|
||||
{"a", "A", 1.0, Code, KEY_A, &layouts[ComposeA]},
|
||||
{"s", "S", 1.0, Code, KEY_S, &layouts[ComposeS]},
|
||||
@ -1153,12 +1172,12 @@ static struct key keys_landscape[] = {
|
||||
{"l", "L", 1.0, Code, KEY_L, &layouts[ComposeL]},
|
||||
{";", ":", 0.468, Code, KEY_SEMICOLON},
|
||||
{"'", "''", 0.468, Code, KEY_APOSTROPHE, &layouts[ComposeBracket]},
|
||||
{"Enter", "Enter", 0.8, Code, KEY_ENTER, .scheme = 1},
|
||||
{"Enter", "Enter", 0.84, Code, KEY_ENTER, .scheme = 1},
|
||||
{"", "", 0.038, Pad},
|
||||
{"", "", 0.0, EndRow},
|
||||
|
||||
{"", "", 0.035, Pad},
|
||||
{"<>", "<>", 0.41, Layout, 0, &layouts[Special], .scheme = 1},
|
||||
{"<>", "<>", 0.44, Layout, 0, &layouts[Special], .scheme = 1},
|
||||
{"⇧", "⇫", 0.9, Mod, Shift, .scheme = 1},
|
||||
{"z", "Z", 1.0, Code, KEY_Z, &layouts[ComposeZ]},
|
||||
{"x", "X", 1.0, Code, KEY_X, &layouts[ComposeX]},
|
||||
@ -1167,26 +1186,23 @@ static struct key keys_landscape[] = {
|
||||
{"b", "B", 1.0, Code, KEY_B, &layouts[ComposeB]},
|
||||
{"n", "N", 1.0, Code, KEY_N, &layouts[ComposeN]},
|
||||
{"m", "M", 1.0, Code, KEY_M, &layouts[ComposeM]},
|
||||
{",", "<", 0.468, Code, KEY_COMMA, &layouts[ComposeMath]},
|
||||
{".", ">", 0.468, Code, KEY_DOT, &layouts[ComposePunctuation]},
|
||||
{"/", "?", 0.468, Code, KEY_SLASH},
|
||||
{"\\", "|", 0.468, Code, KEY_BACKSLASH},
|
||||
{"↑", "↑", 0.468, Code, KEY_UP, .scheme = 1},
|
||||
{"Cmp", "Cmp", 0.47, Compose, .scheme = 1},
|
||||
{",", "<", 0.46, Code, KEY_COMMA, &layouts[ComposeMath]},
|
||||
{".", ">", 0.46, Code, KEY_DOT, &layouts[ComposePunctuation]},
|
||||
{"/", "?", 0.46, Code, KEY_SLASH},
|
||||
{"↑", "↑", 0.8, Code, KEY_UP, .scheme = 1},
|
||||
{"Cmp", "Cmp", 0.8, Compose, .scheme = 1},
|
||||
{"", "", 0.035, Pad},
|
||||
{"", "", 0.0, EndRow},
|
||||
|
||||
{"", "", 0.03, Pad},
|
||||
{"Ctr", "Ctr", 0.56, Mod, Ctrl, .scheme = 1},
|
||||
{"Sup", "Sup", 0.56, Mod, Super, .scheme = 1},
|
||||
{"Alt", "Alt", 0.56, Mod, Alt, .scheme = 1},
|
||||
{"", "", 0.027, Pad},
|
||||
{"Ctr", "Ctr", 0.4, Mod, Ctrl, .scheme = 1},
|
||||
{"Sup", "Sup", 0.4, Mod, Super, .scheme = 1},
|
||||
{"Alt", "Alt", 0.4, Mod, Alt, .scheme = 1},
|
||||
{"", "Tab", 5.8, Code, KEY_SPACE},
|
||||
{"-", "_", 0.4, Code, KEY_MINUS, &layouts[ComposeBracket]},
|
||||
{"=", "+", 0.4, Code, KEY_EQUAL, &layouts[ComposeBracket]},
|
||||
{"←", "←", 0.4, Code, KEY_LEFT, .scheme = 1},
|
||||
{"↓", "↓", 0.4, Code, KEY_DOWN, .scheme = 1},
|
||||
{"→", "→", 0.4, Code, KEY_RIGHT, .scheme = 1},
|
||||
{"", "", 0.03, Pad},
|
||||
{"←", "←", 0.63, Code, KEY_LEFT, .scheme = 1},
|
||||
{"↓", "↓", 0.63, Code, KEY_DOWN, .scheme = 1},
|
||||
{"→", "→", 0.63, Code, KEY_RIGHT, .scheme = 1},
|
||||
{"", "", 0.027, Pad},
|
||||
/* end of layout */
|
||||
{"", "", 0.0, Last},
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user