setlines and setcolumns now work in insert mode as well

This commit is contained in:
speedie 2023-06-19 02:36:28 +02:00
parent ef4400d844
commit 3c59249fbd
4 changed files with 120 additions and 120 deletions

View file

@ -746,6 +746,14 @@ These are the default keybinds. You can generate these yourself from a
| -1 | 0 | Left | movecursor | -1 |
| -1 | 0 | Right | movecursor | +1 |
| -1 | Ctrl+Shift | p | setprofile | 0 |
| -1 | Ctrl | k | setlines | +1 |
| -1 | Ctrl | j | setlines | -1 |
| -1 | Ctrl+Alt+Shift | k | setlines | +5 |
| -1 | Ctrl+Alt+Shift | j | setlines | -5 |
| -1 | Ctrl | h | setcolumns | +1 |
| -1 | Ctrl | l | setcolumns | -1 |
| -1 | Ctrl+Alt+Shift | h | setcolumns | +5 |
| -1 | Ctrl+Alt+Shift | l | setcolumns | -5 |
| 0 | 0 | i | switchmode | 0 |
| 0 | 0 | slash | switchmode | 0 |
| 0 | Ctrl | equal | setimgsize | +1 |
@ -773,14 +781,6 @@ These are the default keybinds. You can generate these yourself from a
| 0 | 0 | l | moveright | 0 |
| 0 | Ctrl | u | moveup | 5 |
| 0 | Ctrl | d | movedown | 5 |
| 0 | Ctrl | k | setlines | +1 |
| 0 | Ctrl | j | setlines | -1 |
| 0 | Ctrl+Alt+Shift | k | setlines | +5 |
| 0 | Ctrl+Alt+Shift | j | setlines | -5 |
| 0 | Ctrl | h | setcolumns | +1 |
| 0 | Ctrl | l | setcolumns | -1 |
| 0 | Ctrl+Alt+Shift | h | setcolumns | +5 |
| 0 | Ctrl+Alt+Shift | l | setcolumns | -5 |
| 0 | 0 | u | togglehighlight | 0 |
| 0 | Ctrl+Shift | h | viewhist | 0 |
| 0 | 0 | d | clear | 0 |

View file

@ -284,6 +284,14 @@ spmenu = {
{ mode = -1; modifier = "Ctrl"; key = "Right"; function = "moveword"; argument = "+1"; }, // Ctrl+Right: Move caret (cursor) one word to the right
{ mode = -1; modifier = "None"; key = "Left"; function = "movecursor"; argument = "-1"; }, // Left: Move caret (cursor) one character to the left
{ mode = -1; modifier = "None"; key = "Right"; function = "movecursor"; argument = "+1"; }, // Right: Move caret (cursor) one character to the right
{ mode = -1; modifier = "Ctrl"; key = "k"; function = "setlines"; argument = "+1"; }, // Ctrl+k: Increase lines by 1
{ mode = -1; modifier = "Ctrl"; key = "j"; function = "setlines"; argument = "-1"; }, // Ctrl+j: Decrease lines by 1
{ mode = -1; modifier = "Ctrl+Alt+Shift"; key = "k"; function = "setlines"; argument = "+5"; }, // Ctrl+Alt+Shift+k: Increase lines by 5
{ mode = -1; modifier = "Ctrl+Alt+Shift"; key = "j"; function = "setlines"; argument = "-5"; }, // Ctrl+Alt+Shift+j: Decrease lines by 5
{ mode = -1; modifier = "Ctrl"; key = "l"; function = "setcolumns"; argument = "+1"; }, // Ctrl+l: Increase columns by 1
{ mode = -1; modifier = "Ctrl"; key = "h"; function = "setcolumns"; argument = "-1"; }, // Ctrl+h: Decrease columns by 1
{ 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+Shift"; key = "p"; function = "setprofile"; argument = "0"; }, // Ctrl+Shift+p: Open profile menu
{ 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
@ -313,14 +321,6 @@ spmenu = {
{ mode = 0; modifier = "None"; key = "l"; function = "moveright"; argument = "0"; }, // l: Move right 1 item
{ mode = 0; modifier = "Ctrl"; key = "u"; function = "moveup"; argument = "5"; }, // Ctrl+u: Move up 5 items
{ mode = 0; modifier = "Ctrl"; key = "d"; function = "movedown"; argument = "5"; }, // Ctrl+d: Move down 5 items
{ mode = 0; modifier = "Ctrl"; key = "k"; function = "setlines"; argument = "+1"; }, // Ctrl+k: Increase lines by 1
{ mode = 0; modifier = "Ctrl"; key = "j"; function = "setlines"; argument = "-1"; }, // Ctrl+j: Decrease lines by 1
{ mode = 0; modifier = "Ctrl+Alt+Shift"; key = "k"; function = "setlines"; argument = "+5"; }, // Ctrl+Alt+Shift+k: Increase lines by 5
{ mode = 0; modifier = "Ctrl+Alt+Shift"; key = "j"; function = "setlines"; argument = "-5"; }, // Ctrl+Alt+Shift+j: Decrease lines by 5
{ mode = 0; modifier = "Ctrl"; key = "l"; function = "setcolumns"; argument = "+1"; }, // Ctrl+l: Increase columns by 1
{ mode = 0; modifier = "Ctrl"; key = "h"; function = "setcolumns"; argument = "-1"; }, // Ctrl+h: Decrease columns by 1
{ mode = 0; modifier = "Ctrl+Alt+Shift"; key = "h"; function = "setcolumns"; argument = "+5"; }, // Ctrl+Alt+Shift+h: Increase columns by 5
{ mode = 0; modifier = "Ctrl+Alt+Shift"; key = "l"; function = "setcolumns"; argument = "-5"; }, // Ctrl+Alt+Shift+l: Decrease columns by 5
{ mode = 0; modifier = "None"; key = "u"; function = "togglehighlight"; argument = "0"; }, // Ctrl+u: Toggle highlighting
{ mode = 0; modifier = "Ctrl+Shift"; key = "h"; function = "viewhist"; argument = "0"; }, // Ctrl+h: Toggle viewing history buffer
{ mode = 0; modifier = "None"; key = "d"; function = "clear"; argument = "0"; }, // d: Clear the input

View file

@ -21,6 +21,14 @@ static Key keys[] = {
{ -1, Ctrl, XK_Right, moveword, {.i = +1 } },
{ -1, 0, XK_Left, movecursor, {.i = -1 } },
{ -1, 0, XK_Right, movecursor, {.i = +1 } },
{ -1, Ctrl, XK_k, setlines, {.i = +1 } },
{ -1, Ctrl, XK_j, setlines, {.i = -1 } },
{ -1, Ctrl|Alt|Shift, XK_k, setlines, {.i = +5 } },
{ -1, Ctrl|Alt|Shift, XK_j, setlines, {.i = -5 } },
{ -1, Ctrl, XK_h, setcolumns, {.i = +1 } },
{ -1, Ctrl, XK_l, setcolumns, {.i = -1 } },
{ -1, Ctrl|Alt|Shift, XK_h, setcolumns, {.i = +5 } },
{ -1, Ctrl|Alt|Shift, XK_l, setcolumns, {.i = -5 } },
{ -1, Ctrl|Shift, XK_p, setprofile, {0} },
/* normal mode */
@ -51,14 +59,6 @@ static Key keys[] = {
{ 0, 0, XK_l, moveright, {0} },
{ 0, Ctrl, XK_u, moveup, {.i = 5 } },
{ 0, Ctrl, XK_d, movedown, {.i = 5 } },
{ 0, Ctrl, XK_k, setlines, {.i = +1 } },
{ 0, Ctrl, XK_j, setlines, {.i = -1 } },
{ 0, Ctrl|Alt|Shift, XK_k, setlines, {.i = +5 } },
{ 0, Ctrl|Alt|Shift, XK_j, setlines, {.i = -5 } },
{ 0, Ctrl, XK_h, setcolumns, {.i = +1 } },
{ 0, Ctrl, XK_l, setcolumns, {.i = -1 } },
{ 0, Ctrl|Alt|Shift, XK_h, setcolumns, {.i = +5 } },
{ 0, Ctrl|Alt|Shift, XK_l, setcolumns, {.i = -5 } },
{ 0, 0, XK_u, togglehighlight, {0} },
{ 0, Ctrl|Shift, XK_h, viewhist, {0} },
{ 0, 0, XK_d, clear, {0} },
@ -97,6 +97,14 @@ static WlKey wl_keys[] = {
{ -1, WL_Ctrl, XKB_KEY_Right, moveword, {.i = +1 } },
{ -1, WL_None, XKB_KEY_Left, movecursor, {.i = -1 } },
{ -1, WL_None, XKB_KEY_Right, movecursor, {.i = +1 } },
{ -1, WL_Ctrl, XKB_KEY_k, setlines, {.i = +1 } },
{ -1, WL_Ctrl, XKB_KEY_j, setlines, {.i = -1 } },
{ -1, WL_CtrlAltShift, XKB_KEY_k, setlines, {.i = +5 } },
{ -1, WL_CtrlAltShift, XKB_KEY_j, setlines, {.i = -5 } },
{ -1, WL_Ctrl, XKB_KEY_h, setcolumns, {.i = +1 } },
{ -1, WL_Ctrl, XKB_KEY_l, setcolumns, {.i = -1 } },
{ -1, WL_CtrlAltShift, XKB_KEY_h, setcolumns, {.i = +5 } },
{ -1, WL_CtrlAltShift, XKB_KEY_l, setcolumns, {.i = -5 } },
{ -1, WL_CtrlShift, XKB_KEY_p, setprofile, {0} },
/* normal mode */
@ -127,14 +135,6 @@ static WlKey wl_keys[] = {
{ 0, WL_None, XKB_KEY_l, moveright, {0} },
{ 0, WL_Ctrl, XKB_KEY_u, moveup, {.i = 5 } },
{ 0, WL_Ctrl, XKB_KEY_d, movedown, {.i = 5 } },
{ 0, WL_Ctrl, XKB_KEY_k, setlines, {.i = +1 } },
{ 0, WL_Ctrl, XKB_KEY_j, setlines, {.i = -1 } },
{ 0, WL_CtrlAltShift, XKB_KEY_k, setlines, {.i = +5 } },
{ 0, WL_CtrlAltShift, XKB_KEY_j, setlines, {.i = -5 } },
{ 0, WL_Ctrl, XKB_KEY_h, setcolumns, {.i = +1 } },
{ 0, WL_Ctrl, XKB_KEY_l, setcolumns, {.i = -1 } },
{ 0, WL_CtrlAltShift, XKB_KEY_h, setcolumns, {.i = +5 } },
{ 0, WL_CtrlAltShift, XKB_KEY_l, setcolumns, {.i = -5 } },
{ 0, WL_None, XKB_KEY_u, togglehighlight, {0} },
{ 0, WL_CtrlShift, XKB_KEY_h, viewhist, {0} },
{ 0, WL_None, XKB_KEY_d, clear, {0} },

176
spmenu.1
View file

@ -941,6 +941,94 @@ T}@T{
0
T}
T{
-1
T}@T{
Ctrl
T}@T{
k
T}@T{
setlines
T}@T{
+1
T}
T{
-1
T}@T{
Ctrl
T}@T{
j
T}@T{
setlines
T}@T{
-1
T}
T{
-1
T}@T{
Ctrl+Alt+Shift
T}@T{
k
T}@T{
setlines
T}@T{
+5
T}
T{
-1
T}@T{
Ctrl+Alt+Shift
T}@T{
j
T}@T{
setlines
T}@T{
-5
T}
T{
-1
T}@T{
Ctrl
T}@T{
h
T}@T{
setcolumns
T}@T{
+1
T}
T{
-1
T}@T{
Ctrl
T}@T{
l
T}@T{
setcolumns
T}@T{
-1
T}
T{
-1
T}@T{
Ctrl+Alt+Shift
T}@T{
h
T}@T{
setcolumns
T}@T{
+5
T}
T{
-1
T}@T{
Ctrl+Alt+Shift
T}@T{
l
T}@T{
setcolumns
T}@T{
-5
T}
T{
0
T}@T{
0
@ -1240,94 +1328,6 @@ T}
T{
0
T}@T{
Ctrl
T}@T{
k
T}@T{
setlines
T}@T{
+1
T}
T{
0
T}@T{
Ctrl
T}@T{
j
T}@T{
setlines
T}@T{
-1
T}
T{
0
T}@T{
Ctrl+Alt+Shift
T}@T{
k
T}@T{
setlines
T}@T{
+5
T}
T{
0
T}@T{
Ctrl+Alt+Shift
T}@T{
j
T}@T{
setlines
T}@T{
-5
T}
T{
0
T}@T{
Ctrl
T}@T{
h
T}@T{
setcolumns
T}@T{
+1
T}
T{
0
T}@T{
Ctrl
T}@T{
l
T}@T{
setcolumns
T}@T{
-1
T}
T{
0
T}@T{
Ctrl+Alt+Shift
T}@T{
h
T}@T{
setcolumns
T}@T{
+5
T}
T{
0
T}@T{
Ctrl+Alt+Shift
T}@T{
l
T}@T{
setcolumns
T}@T{
-5
T}
T{
0
T}@T{
0
T}@T{
u