From 8ba5d68e5aee4dda4ec2cb67dcf56eb782e7a39d Mon Sep 17 00:00:00 2001 From: libjared Date: Sun, 10 Mar 2024 17:31:54 -0500 Subject: [PATCH] Update keyboard.yaml (#14) - update virtual key list URL - remove references to xmodmap - ensure layouts are consistent with length - remove alt_layout for now --- src/res/keyboard.yaml | 44 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/src/res/keyboard.yaml b/src/res/keyboard.yaml index 1fc8878..ae4b1b8 100644 --- a/src/res/keyboard.yaml +++ b/src/res/keyboard.yaml @@ -22,47 +22,27 @@ row_size: 23 # Specifies the size of each key. The sum of any given row must equal RowSize key_sizes: - - [1.5,0.5, 1, 1, 1, 1,0.5,1, 1, 1, 1,0.5,1, 1, 1, 1, 0.5, 1, 1, 1, 4.5] - - [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 0.5, 1, 1, 1, 0.5, 1, 1, 1, 1] - - [1.5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.5, 0.5, 1, 1, 1, 0.5, 1, 1, 1, 1] - - [1.75, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2.25, 4, 1, 1, 1, 1] - - [2.25, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2.75, 1.5, 1, 1.5, 1, 1, 1, 1] - - [1.25, 1.25, 1.25, 6.25, 1.25, 1.25, 1.25, 1.25, 0.5, 1, 1, 1, 0.5, 2, 1, 1] + - [1.5,0.5, 1, 1, 1, 1,0.5,1, 1, 1, 1,0.5,1, 1, 1, 1, 0.5, 1, 1, 1, 0.5, 1, 1, 1, 1] + - [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 0.5, 1, 1, 1, 0.5, 1, 1, 1, 1] + - [1.5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.5, 0.5, 1, 1, 1, 0.5, 1, 1, 1, 1] + - [1.75, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2.25, 4, 1, 1, 1, 1] + - [2.25, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2.75, 1.5, 1, 1.5, 1, 1, 1, 1] + - [1.25, 1.25, 1.25, 6.25, 1.25, 1.25, 1.25, 1.25, 0.5, 1, 1, 1, 0.5, 2, 1, 1] # The main (blue) layout of the keyboard. # Accepted are: -# - virtual keys, for a full list go to https://github.com/galister/X11Overlay/blob/master/Types/VirtualKey.cs -# - ExecCommands (defined below) -# - Macros (defined below) +# - virtual keys. For a full list, look at enum VirtualKey in https://github.com/galister/wlx-overlay-s/blob/main/src/hid.rs +# - exec_commands (defined below) +# - macros (defined below) # - ~ (null) will leave an empty space with the corresponding size from key_sizes main_layout: - - ["Escape", ~, "F1", "F2", "F3", "F4", ~, "F5", "F6", "F7", "F8", ~, "F9", "F10", "F11", "F12", ~, "Print", "Scroll", "Pause", ~] + - ["Escape", ~, "F1", "F2", "F3", "F4", ~, "F5", "F6", "F7", "F8", ~, "F9", "F10", "F11", "F12", ~, "Print", "Scroll", "Pause", ~, "COPY", "PASTE", ~, "KILL"] - ["Oem3", "N1", "N2", "N3", "N4", "N5", "N6", "N7", "N8", "N9", "N0", "Minus", "Plus", "BackSpace", ~, "Insert", "Home", "Prior", ~, "NumLock", "KP_Divide", "KP_Multiply", "KP_Subtract"] - ["Tab", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "Oem4", "Oem6", "Oem5", ~, "Delete", "End", "Next", ~, "KP_7", "KP_8", "KP_9", "KP_Add"] - ["XF86Favorites", "A", "S", "D", "F", "G", "H", "J", "K", "L", "Oem1", "Oem7", "Return", ~, "KP_4", "KP_5", "KP_6", ~] - ["LShift", "Z", "X", "C", "V", "B", "N", "M", "Comma", "Period", "Oem2", "RShift", ~, "Up", ~, "KP_1", "KP_2", "KP_3", "KP_Enter"] - ["LCtrl", "LSuper", "LAlt", "Space", "Meta", "RSuper", "Menu", "RCtrl", ~, "Left", "Down", "Right", ~, "KP_0", "KP_Decimal", ~] -# When using the purple pointer... -# None - No special functionality when using purple pointer -# Shift - Use same functionality as the orange pointer -# Ctrl - Use Main layout with Ctrl modifier -# Super - Use Main layout with Super (WinKey) modifier -# Meta - Use Main layout with Meta (AltGr) modifier -# Layout - Use the alt_layout defined below -alt_layout_mode: Ctrl - -# The alt (fn) layout of the keyboard. Only takes effect when alt_layout_mode: Layout -# Accepted values are the same as for MainLayout. -# The default layout here is a dummy. Change it to fit your liking. -alt_layout: - - ["Escape", ~, "F1", "F2", "F3", "F4", ~, "F5", "F6", "F7", "F8", ~, "F9", "F10", "F11", "F12", ~, "Print", "Scroll", "Pause", ~, "COPY", "PASTE"] - - ["Oem3", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "Minus", "Plus", "BackSpace", ~, "Insert", "Home", "Prior", ~, "NumLock", "KP_Divide", "KP_Multiply", "KP_Subtract"] - - ["Tab", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "Oem4", "Oem6", "Oem5", ~, "Delete", "End", "Next", ~, "KP_7", "KP_8", "KP_9", "KP_Add"] - - ["XF86Favorites", "A", "S", "D", "F", "G", "H", "J", "K", "L", "Oem1", "Oem7", "Return", ~, "KP_4", "KP_5", "KP_6", ~] - - ["LShift", "Oem102", "Z", "X", "C", "V", "B", "N", "M", "Comma", "Period", "Oem2", "RShift", ~, "Up", ~, "KP_1", "KP_2", "KP_3", "KP_Enter"] - - ["LCtrl", "LSuper", "LAlt", "Space", "Meta", "RSuper", "Menu", "RCtrl", ~, "Left", "Down", "Right", ~, "KP_0", "KP_Decimal", ~] - # Shell commands to be used in a layout. # Value is an array of string arguments. exec_commands: @@ -70,7 +50,7 @@ exec_commands: # Series of keypresses to be used in a layout. # Format: keyName [DOWN|UP] -# keyName must be a valid key from `xmodmap -pke` +# keyName must be a valid virtual key from the VirtualKey enum (see above) # DOWN|UP: can be omitted for an implicit "keyName DOWN, keyName UP" macros: KILL: [ "LSuper DOWN", "LCtrl DOWN", "Escape", "LCtrl UP", "LSuper UP" ] @@ -78,7 +58,7 @@ macros: PASTE: [ "LCtrl DOWN", "V", "LCtrl UP" ] # Custom labels to use. -# Key: element of MainLayout / AltLayout +# Key: element of main_layout # Value: Array of strings. 0th element is the upper row, 1st element is lower row. # For empty labels, use [] (do not use ~) labels: