Simplify default keybinds

This commit is contained in:
speedie 2023-07-05 00:12:11 +02:00
parent ad96d3fbb3
commit 7e963db38e
4 changed files with 62 additions and 105 deletions

View file

@ -759,8 +759,8 @@ These are the default keybinds. You can generate these yourself from a
| -1 | Ctrl | l | setcolumns | -1 | | -1 | Ctrl | l | setcolumns | -1 |
| -1 | Ctrl+Alt+Shift | h | setcolumns | +5 | | -1 | Ctrl+Alt+Shift | h | setcolumns | +5 |
| -1 | Ctrl+Alt+Shift | l | setcolumns | -5 | | -1 | Ctrl+Alt+Shift | l | setcolumns | -5 |
| -1 | 0 | Print | screenshot | 0 |
| 0 | 0 | i | switchmode | 0 | | 0 | 0 | i | switchmode | 0 |
| 0 | 0 | slash | switchmode | 0 |
| 0 | Ctrl | equal | setimgsize | +1 | | 0 | Ctrl | equal | setimgsize | +1 |
| 0 | Ctrl | minus | setimgsize | -1 | | 0 | Ctrl | minus | setimgsize | -1 |
| 0 | 0 | equal | setimgsize | +10 | | 0 | 0 | equal | setimgsize | +10 |
@ -790,15 +790,12 @@ These are the default keybinds. You can generate these yourself from a
| 0 | 0 | d | clear | 0 | | 0 | 0 | d | clear | 0 |
| 0 | Shift | d | clearins | 0 | | 0 | Shift | d | clearins | 0 |
| 0 | 0 | Escape | quit | 0 | | 0 | 0 | Escape | quit | 0 |
| 0 | 0 | Home | movestart | 0 |
| 0 | 0 | End | moveend | 0 |
| 0 | 0 | g | movestart | 0 | | 0 | 0 | g | movestart | 0 |
| 0 | Shift | g | moveend | 0 | | 0 | Shift | g | moveend | 0 |
| 0 | 0 | Next | movenext | 0 | | 0 | 0 | Next | movenext | 0 |
| 0 | 0 | Prior | moveprev | 0 | | 0 | 0 | Prior | moveprev | 0 |
| 0 | Ctrl | p | navhistory | -1 | | 0 | Ctrl | p | navhistory | -1 |
| 0 | Ctrl | n | navhistory | +1 | | 0 | Ctrl | n | navhistory | +1 |
| 0 | 0 | Print | screenshot | 0 |
| 1 | 0 | Escape | switchmode | 0 | | 1 | 0 | Escape | switchmode | 0 |
## .Xresources ## .Xresources

View file

@ -297,9 +297,9 @@ spmenu = {
{ mode = -1; modifier = "Ctrl+Alt+Shift"; key = "h"; function = "setcolumns"; argument = "+5"; }, // Ctrl+Alt+Shift+h: Increase columns by 5 { mode = -1; modifier = "Ctrl+Alt+Shift"; key = "h"; function = "setcolumns"; argument = "+5"; }, // Ctrl+Alt+Shift+h: Increase columns by 5
{ mode = -1; modifier = "Ctrl+Alt+Shift"; key = "l"; function = "setcolumns"; argument = "-5"; }, // Ctrl+Alt+Shift+l: Decrease columns by 5 { mode = -1; modifier = "Ctrl+Alt+Shift"; key = "l"; function = "setcolumns"; argument = "-5"; }, // Ctrl+Alt+Shift+l: Decrease columns by 5
{ mode = -1; modifier = "Ctrl+Shift"; key = "p"; function = "setprofile"; argument = "0"; }, // Ctrl+Shift+p: Open profile menu { mode = -1; modifier = "Ctrl+Shift"; key = "p"; function = "setprofile"; argument = "0"; }, // Ctrl+Shift+p: Open profile menu
{ mode = -1; modifier = "None"; key = "PrintScr"; function = "screenshot"; argument = "0"; }, // Print Screen: Screenshot spmenu
{ mode = 1; modifier = "None"; key = "Esc"; function = "switchmode"; argument = "0"; }, // Escape: Switch mode { mode = 1; modifier = "None"; key = "Esc"; function = "switchmode"; argument = "0"; }, // Escape: Switch mode
{ mode = 0; modifier = "None"; key = "i"; function = "switchmode"; argument = "0"; }, // i: Switch mode { mode = 0; modifier = "None"; key = "i"; function = "switchmode"; argument = "0"; }, // i: Switch mode
{ mode = 0; modifier = "None"; key = "/"; function = "switchmode"; argument = "0"; }, // /: Switch mode
{ mode = 0; modifier = "Ctrl"; key = "="; function = "setimgsize"; argument = "+1"; }, // Ctrl+=: Increase image size by 1 { mode = 0; modifier = "Ctrl"; key = "="; function = "setimgsize"; argument = "+1"; }, // Ctrl+=: Increase image size by 1
{ mode = 0; modifier = "Ctrl"; key = "-"; function = "setimgsize"; argument = "-1"; }, // Ctrl+-: Decrease image size by 1 { mode = 0; modifier = "Ctrl"; key = "-"; function = "setimgsize"; argument = "-1"; }, // Ctrl+-: Decrease image size by 1
{ mode = 0; modifier = "None"; key = "="; function = "setimgsize"; argument = "+10"; }, // -: Increase image size by 10 { mode = 0; modifier = "None"; key = "="; function = "setimgsize"; argument = "+10"; }, // -: Increase image size by 10
@ -329,15 +329,12 @@ spmenu = {
{ mode = 0; modifier = "None"; key = "d"; function = "clear"; argument = "0"; }, // d: Clear the input { mode = 0; modifier = "None"; key = "d"; function = "clear"; argument = "0"; }, // d: Clear the input
{ mode = 0; modifier = "Shift"; key = "d"; function = "clearins"; argument = "0"; }, // Shift+d: Clear the input and enter insert mode { mode = 0; modifier = "Shift"; key = "d"; function = "clearins"; argument = "0"; }, // Shift+d: Clear the input and enter insert mode
{ mode = 0; modifier = "None"; key = "Esc"; function = "quit"; argument = "0"; }, // Esc: Exit { mode = 0; modifier = "None"; key = "Esc"; function = "quit"; argument = "0"; }, // Esc: Exit
{ mode = 0; modifier = "None"; key = "Home"; function = "movestart"; argument = "0"; }, // Home: Move to the start
{ mode = 0; modifier = "None"; key = "End"; function = "moveend"; argument = "0"; }, // End: Move to the end
{ mode = 0; modifier = "None"; key = "g"; function = "movestart"; argument = "0"; }, // g: Move to the start { mode = 0; modifier = "None"; key = "g"; function = "movestart"; argument = "0"; }, // g: Move to the start
{ mode = 0; modifier = "Shift"; key = "g"; function = "moveend"; argument = "0"; }, // Shift+g: Move to the end { mode = 0; modifier = "Shift"; key = "g"; function = "moveend"; argument = "0"; }, // Shift+g: Move to the end
{ mode = 0; modifier = "None"; key = "Next"; function = "movenext"; argument = "0"; }, // Next: Move to the next entry (redo) { mode = 0; modifier = "None"; key = "Next"; function = "movenext"; argument = "0"; }, // Next: Move to the next entry (redo)
{ mode = 0; modifier = "None"; key = "Prior"; function = "moveprev"; argument = "0"; }, // Prior: Move to the previous entry (undo) { mode = 0; modifier = "None"; key = "Prior"; function = "moveprev"; argument = "0"; }, // Prior: Move to the previous entry (undo)
{ mode = 0; modifier = "Ctrl"; key = "p"; function = "navhistory"; argument = "-1"; }, // Alt+p: Navigate to the previous entry in the history buffer { mode = 0; modifier = "Ctrl"; key = "p"; function = "navhistory"; argument = "-1"; }, // Ctrl+p: Navigate to the previous entry in the history buffer
{ mode = 0; modifier = "Ctrl"; key = "n"; function = "navhistory"; argument = "+1"; }, // Alt+n: Navigate to the next entry in the history buffer { mode = 0; modifier = "Ctrl"; key = "n"; function = "navhistory"; argument = "+1"; }, // Ctrl+n: Navigate to the next entry in the history buffer
{ mode = 0; modifier = "None"; key = "PrintScr"; function = "screenshot"; argument = "0"; }, // Print Screen: Screenshot spmenu
{ ignoreglobalkeys = 1; } ), // Ignore hardcoded keybinds (0/1) { ignoreglobalkeys = 1; } ), // Ignore hardcoded keybinds (0/1)
}; };

View file

@ -30,10 +30,10 @@ static Key keys[] = {
{ -1, Ctrl|Alt|Shift, XK_h, setcolumns, {.i = +5 } }, { -1, Ctrl|Alt|Shift, XK_h, setcolumns, {.i = +5 } },
{ -1, Ctrl|Alt|Shift, XK_l, setcolumns, {.i = -5 } }, { -1, Ctrl|Alt|Shift, XK_l, setcolumns, {.i = -5 } },
{ -1, Ctrl|Shift, XK_p, setprofile, {0} }, { -1, Ctrl|Shift, XK_p, setprofile, {0} },
{ -1, 0, XK_Print, screenshot, {0} },
/* normal mode */ /* normal mode */
{ 0, 0, XK_i, switchmode, {0} }, { 0, 0, XK_i, switchmode, {0} },
{ 0, 0, XK_slash, switchmode, {0} },
{ 0, Ctrl, XK_equal, setimgsize, {.i = +1 } }, { 0, Ctrl, XK_equal, setimgsize, {.i = +1 } },
{ 0, Ctrl, XK_minus, setimgsize, {.i = -1 } }, { 0, Ctrl, XK_minus, setimgsize, {.i = -1 } },
{ 0, 0, XK_equal, setimgsize, {.i = +10 } }, { 0, 0, XK_equal, setimgsize, {.i = +10 } },
@ -63,15 +63,12 @@ static Key keys[] = {
{ 0, 0, XK_d, clear, {0} }, { 0, 0, XK_d, clear, {0} },
{ 0, Shift, XK_d, clearins, {0} }, { 0, Shift, XK_d, clearins, {0} },
{ 0, 0, XK_Escape, quit, {0} }, { 0, 0, XK_Escape, quit, {0} },
{ 0, 0, XK_Home, movestart, {0} },
{ 0, 0, XK_End, moveend, {0} },
{ 0, 0, XK_g, movestart, {0} }, { 0, 0, XK_g, movestart, {0} },
{ 0, Shift, XK_g, moveend, {0} }, { 0, Shift, XK_g, moveend, {0} },
{ 0, 0, XK_Next, movenext, {0} }, { 0, 0, XK_Next, movenext, {0} },
{ 0, 0, XK_Prior, moveprev, {0} }, { 0, 0, XK_Prior, moveprev, {0} },
{ 0, Ctrl, XK_p, navhistory, {.i = -1 } }, { 0, Ctrl, XK_p, navhistory, {.i = -1 } },
{ 0, Ctrl, XK_n, navhistory, {.i = +1 } }, { 0, Ctrl, XK_n, navhistory, {.i = +1 } },
{ 0, 0, XK_Print, screenshot, {0} },
/* insert mode */ /* insert mode */
{ 1, 0, XK_Escape, switchmode, {0} }, { 1, 0, XK_Escape, switchmode, {0} },
@ -106,10 +103,10 @@ static WlKey wl_keys[] = {
{ -1, WL_CtrlAltShift, XKB_KEY_h, setcolumns, {.i = +5 } }, { -1, WL_CtrlAltShift, XKB_KEY_h, setcolumns, {.i = +5 } },
{ -1, WL_CtrlAltShift, XKB_KEY_l, setcolumns, {.i = -5 } }, { -1, WL_CtrlAltShift, XKB_KEY_l, setcolumns, {.i = -5 } },
{ -1, WL_CtrlShift, XKB_KEY_p, setprofile, {0} }, { -1, WL_CtrlShift, XKB_KEY_p, setprofile, {0} },
{ -1, WL_None, XKB_KEY_Print, screenshot, {0} },
/* normal mode */ /* normal mode */
{ 0, WL_None, XKB_KEY_i, switchmode, {0} }, { 0, WL_None, XKB_KEY_i, switchmode, {0} },
{ 0, WL_None, XKB_KEY_slash, switchmode, {0} },
{ 0, WL_Ctrl, XKB_KEY_equal, setimgsize, {.i = +1 } }, { 0, WL_Ctrl, XKB_KEY_equal, setimgsize, {.i = +1 } },
{ 0, WL_Ctrl, XKB_KEY_minus, setimgsize, {.i = -1 } }, { 0, WL_Ctrl, XKB_KEY_minus, setimgsize, {.i = -1 } },
{ 0, WL_None, XKB_KEY_equal, setimgsize, {.i = +10 } }, { 0, WL_None, XKB_KEY_equal, setimgsize, {.i = +10 } },
@ -147,7 +144,6 @@ static WlKey wl_keys[] = {
{ 0, WL_None, XKB_KEY_Prior, moveprev, {0} }, { 0, WL_None, XKB_KEY_Prior, moveprev, {0} },
{ 0, WL_Ctrl, XKB_KEY_p, navhistory, {.i = -1 } }, { 0, WL_Ctrl, XKB_KEY_p, navhistory, {.i = -1 } },
{ 0, WL_Ctrl, XKB_KEY_n, navhistory, {.i = +1 } }, { 0, WL_Ctrl, XKB_KEY_n, navhistory, {.i = +1 } },
{ 0, WL_None, XKB_KEY_Print, screenshot, {0} },
/* insert mode */ /* insert mode */
{ 1, WL_None, XKB_KEY_Escape, switchmode, {0} }, { 1, WL_None, XKB_KEY_Escape, switchmode, {0} },

View file

@ -1035,13 +1035,13 @@ T}@T{
-5 -5
T} T}
T{ T{
0 -1
T}@T{ T}@T{
0 0
T}@T{ T}@T{
i Print
T}@T{ T}@T{
switchmode screenshot
T}@T{ T}@T{
0 0
T} T}
@ -1050,7 +1050,7 @@ T{
T}@T{ T}@T{
0 0
T}@T{ T}@T{
slash i
T}@T{ T}@T{
switchmode switchmode
T}@T{ T}@T{
@ -1380,28 +1380,6 @@ T{
T}@T{ T}@T{
0 0
T}@T{ T}@T{
Home
T}@T{
movestart
T}@T{
0
T}
T{
0
T}@T{
0
T}@T{
End
T}@T{
moveend
T}@T{
0
T}
T{
0
T}@T{
0
T}@T{
g g
T}@T{ T}@T{
movestart movestart
@ -1464,17 +1442,6 @@ T}@T{
+1 +1
T} T}
T{ T{
0
T}@T{
0
T}@T{
Print
T}@T{
screenshot
T}@T{
0
T}
T{
1 1
T}@T{ T}@T{
0 0