Fix some issues with the image gaps, fix image gaps size, remove some
more keybinds
This commit is contained in:
speedie
parent
7e963db38e
commit
fbfbc44dec
12
docs/docs.md
12
docs/docs.md
|
|
@ -753,28 +753,18 @@ These are the default keybinds. You can generate these yourself from a
|
|||
| -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 |
|
||||
| -1 | 0 | Print | screenshot | 0 |
|
||||
| 0 | 0 | i | switchmode | 0 |
|
||||
| 0 | Ctrl | equal | setimgsize | +1 |
|
||||
| 0 | Ctrl | minus | setimgsize | -1 |
|
||||
| 0 | 0 | equal | setimgsize | +10 |
|
||||
| 0 | 0 | minus | setimgsize | -10 |
|
||||
| 0 | Shift | equal | setimgsize | +100 |
|
||||
| 0 | Shift | minus | setimgsize | -100 |
|
||||
| 0 | Shift | 0 | defaultimg | 0 |
|
||||
| 0 | 0 | o | setimgpos | +1 |
|
||||
| 0 | Ctrl | 1 | setimggaps | -1 |
|
||||
| 0 | Ctrl | 2 | setimggaps | +1 |
|
||||
| 0 | 0 | 1 | setimggaps | -10 |
|
||||
| 0 | 0 | 2 | setimggaps | +10 |
|
||||
| 0 | Shift | 1 | setimggaps | -100 |
|
||||
| 0 | Shift | 2 | setimggaps | +100 |
|
||||
| 0 | 0 | t | toggleimg | 0 |
|
||||
| 0 | 0 | p | paste | 2 |
|
||||
| 0 | 0 | q | flipimg | 1 |
|
||||
|
|
@ -792,8 +782,6 @@ These are the default keybinds. You can generate these yourself from a
|
|||
| 0 | 0 | Escape | quit | 0 |
|
||||
| 0 | 0 | g | movestart | 0 |
|
||||
| 0 | Shift | g | moveend | 0 |
|
||||
| 0 | 0 | Next | movenext | 0 |
|
||||
| 0 | 0 | Prior | moveprev | 0 |
|
||||
| 0 | Ctrl | p | navhistory | -1 |
|
||||
| 0 | Ctrl | n | navhistory | +1 |
|
||||
| 1 | 0 | Escape | switchmode | 0 |
|
||||
|
|
|
|||
107
docs/spmenu.conf
107
docs/spmenu.conf
|
|
@ -268,6 +268,11 @@ spmenu = {
|
|||
{ ignoreglobalmouse = 1; } ); // Ignore hardcoded mouse binds (0/1)
|
||||
|
||||
/* Keys
|
||||
*
|
||||
* It is strongly recommended that you do NOT unbind any switchmode or quit
|
||||
* function keybinds unless you know exactly what you're doing.
|
||||
* If you ignore this warning and find that you can't exit spmenu,
|
||||
* press Ctrl+Alt+Delete. Doing so will exit spmenu, even if no key is bound.
|
||||
*
|
||||
* Please note that at least on the US standard keyboard layout,
|
||||
* `key` will differ if Shift is held down and the key is a number or symbol.
|
||||
|
|
@ -276,65 +281,53 @@ spmenu = {
|
|||
*/
|
||||
keys = (
|
||||
/* Mode Modifier Key Function Argument */
|
||||
{ mode = -1; modifier = "None"; key = "Enter"; function = "selectitem"; argument = "+1"; }, // Enter: Select item
|
||||
{ mode = -1; modifier = "Shift"; key = "Enter"; function = "selectitem"; argument = "0"; }, // Shift+Enter: Select input
|
||||
{ mode = -1; modifier = "Ctrl"; key = "Enter"; function = "markitem"; argument = "0"; }, // Ctrl+Enter: Mark input
|
||||
{ mode = -1; modifier = "None"; key = "Tab"; function = "complete"; argument = "0"; }, // Tab: Tab complete
|
||||
{ mode = -1; modifier = "Ctrl"; key = "v"; function = "paste"; argument = "2"; }, // Ctrl+v: Paste from clipboard
|
||||
{ mode = -1; modifier = "Ctrl+Shift"; key = "v"; function = "paste"; argument = "1"; }, // Ctrl+Shift+v: Paste from selection
|
||||
{ mode = -1; modifier = "None"; key = "Backspace"; function = "backspace"; argument = "0"; }, // Backspace: Backspace
|
||||
{ mode = -1; modifier = "Ctrl"; key = "Backspace"; function = "deleteword"; argument = "0"; }, // Ctrl+Backspace: Delete word
|
||||
{ mode = -1; modifier = "Ctrl"; key = "Left"; function = "moveword"; argument = "-1"; }, // Ctrl+Left: Move caret (cursor) one word to the left
|
||||
{ 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 = "PrintScr"; function = "screenshot"; argument = "0"; }, // Print Screen: Screenshot spmenu
|
||||
{ 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 = "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 = -1; modifier = "None"; key = "Enter"; function = "selectitem"; argument = "+1"; }, // Enter: Select item
|
||||
{ mode = -1; modifier = "Shift"; key = "Enter"; function = "selectitem"; argument = "0"; }, // Shift+Enter: Select input
|
||||
{ mode = -1; modifier = "Ctrl"; key = "Enter"; function = "markitem"; argument = "0"; }, // Ctrl+Enter: Mark input
|
||||
{ mode = -1; modifier = "None"; key = "Tab"; function = "complete"; argument = "0"; }, // Tab: Tab complete
|
||||
{ mode = -1; modifier = "Ctrl"; key = "v"; function = "paste"; argument = "2"; }, // Ctrl+v: Paste from clipboard
|
||||
{ mode = -1; modifier = "Ctrl+Shift"; key = "v"; function = "paste"; argument = "1"; }, // Ctrl+Shift+v: Paste from selection
|
||||
{ mode = -1; modifier = "None"; key = "Backspace"; function = "backspace"; argument = "0"; }, // Backspace: Backspace
|
||||
{ mode = -1; modifier = "Ctrl"; key = "Backspace"; function = "deleteword"; argument = "0"; }, // Ctrl+Backspace: Delete word
|
||||
{ mode = -1; modifier = "Ctrl"; key = "Left"; function = "moveword"; argument = "-1"; }, // Ctrl+Left: Move caret (cursor) one word to the left
|
||||
{ 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"; 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+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 = 0; modifier = "None"; key = "i"; function = "switchmode"; argument = "0"; }, // i: 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+-: 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"; }, // =: Decrease image size by 10
|
||||
{ mode = 0; modifier = "Shift"; key = "+"; function = "setimgsize"; argument = "+100"; }, // Shift+=: Increase image size by 100
|
||||
{ mode = 0; modifier = "Shift"; key = "_"; function = "setimgsize"; argument = "-100"; }, // Shift+-: Decrease image size by 100
|
||||
{ mode = 0; modifier = "Shift"; key = ")"; function = "defaultimg"; argument = "0"; }, // Shift+0: Set image size to the default
|
||||
{ mode = 0; modifier = "None"; key = "o"; function = "setimgpos"; argument = "+1"; }, // o: Toggle image position
|
||||
{ mode = 0; modifier = "None"; key = "p"; function = "paste"; argument = "2"; }, // p: Paste from clipboard
|
||||
{ mode = 0; modifier = "Ctrl"; key = "1"; function = "setimggaps"; argument = "-1"; }, // Ctrl+1: Decrease image gaps by 1
|
||||
{ mode = 0; modifier = "Ctrl"; key = "2"; function = "setimggaps"; argument = "+1"; }, // Ctrl+2: Increase image gaps by 1
|
||||
{ mode = 0; modifier = "None"; key = "1"; function = "setimggaps"; argument = "-10"; }, // 1: Decrease image gaps by 10
|
||||
{ mode = 0; modifier = "None"; key = "2"; function = "setimggaps"; argument = "+10"; }, // 2: Increase image gaps by 10
|
||||
{ mode = 0; modifier = "Shift"; key = "!"; function = "setimggaps"; argument = "-100"; }, // Shift+1: Decrease image gaps by 100
|
||||
{ mode = 0; modifier = "Shift"; key = "@"; function = "setimggaps"; argument = "+100"; }, // Shift+2: Increase image gaps by 100
|
||||
{ mode = 0; modifier = "None"; key = "t"; function = "toggleimg"; argument = "0"; }, // t: Toggle image
|
||||
{ mode = 0; modifier = "None"; key = "q"; function = "flipimg"; argument = "1"; }, // q: Flip image horizontally
|
||||
{ mode = 0; modifier = "None"; key = "w"; function = "flipimg"; argument = "0"; }, // w: Flip image vertically
|
||||
{ mode = 0; modifier = "None"; key = "k"; function = "moveup"; argument = "0"; }, // k: Move up 1 item
|
||||
{ mode = 0; modifier = "None"; key = "j"; function = "movedown"; argument = "0"; }, // j: Move down 1 item
|
||||
{ mode = 0; modifier = "None"; key = "h"; function = "moveleft"; argument = "0"; }, // h: Move left 1 item
|
||||
{ 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 = "None"; key = "u"; function = "togglehighlight"; argument = "0"; }, // Ctrl+u: Toggle highlighting
|
||||
{ mode = 0; modifier = "Shift"; key = "h"; function = "viewhist"; argument = "0"; }, // Shift+h: Toggle viewing history buffer
|
||||
{ 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 = "None"; key = "Esc"; function = "quit"; argument = "0"; }, // Esc: Exit
|
||||
{ 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 = "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 = "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"; }, // Ctrl+n: Navigate to the next entry in the history buffer
|
||||
{ mode = 0; modifier = "Shift"; key = ")"; function = "defaultimg"; argument = "0"; }, // Shift+0: Set image size to the default
|
||||
{ mode = 0; modifier = "None"; key = "o"; function = "setimgpos"; argument = "+1"; }, // o: Toggle image position
|
||||
{ mode = 0; modifier = "None"; key = "p"; function = "paste"; argument = "2"; }, // p: Paste from clipboard
|
||||
{ mode = 0; modifier = "Ctrl"; key = "1"; function = "setimggaps"; argument = "-1"; }, // Ctrl+1: Decrease image gaps by 1
|
||||
{ mode = 0; modifier = "Ctrl"; key = "2"; function = "setimggaps"; argument = "+1"; }, // Ctrl+2: Increase image gaps by 1
|
||||
{ mode = 0; modifier = "None"; key = "t"; function = "toggleimg"; argument = "0"; }, // t: Toggle image
|
||||
{ mode = 0; modifier = "None"; key = "q"; function = "flipimg"; argument = "1"; }, // q: Flip image horizontally
|
||||
{ mode = 0; modifier = "None"; key = "w"; function = "flipimg"; argument = "0"; }, // w: Flip image vertically
|
||||
{ mode = 0; modifier = "None"; key = "k"; function = "moveup"; argument = "0"; }, // k: Move up 1 item
|
||||
{ mode = 0; modifier = "None"; key = "j"; function = "movedown"; argument = "0"; }, // j: Move down 1 item
|
||||
{ mode = 0; modifier = "None"; key = "h"; function = "moveleft"; argument = "0"; }, // h: Move left 1 item
|
||||
{ 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 = "None"; key = "u"; function = "togglehighlight"; argument = "0"; }, // Ctrl+u: Toggle highlighting
|
||||
{ mode = 0; modifier = "Shift"; key = "h"; function = "viewhist"; argument = "0"; }, // Shift+h: Toggle viewing history buffer
|
||||
{ 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 = "None"; key = "Esc"; function = "quit"; argument = "0"; }, // Esc: Exit
|
||||
{ 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 = "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"; }, // Ctrl+n: Navigate to the next entry in the history buffer
|
||||
|
||||
{ ignoreglobalkeys = 1; } ), // Ignore hardcoded keybinds (0/1)
|
||||
};
|
||||
|
|
|
|||
|
|
@ -403,13 +403,11 @@ void setimggaps(Arg *arg) {
|
|||
#if USEIMAGE
|
||||
img.imagegaps += arg->i;
|
||||
|
||||
if (!image || hideimage) return;
|
||||
|
||||
if (img.imagegaps < 0)
|
||||
img.imagegaps = 0;
|
||||
|
||||
// limitation to make sure we have a reasonable gap size
|
||||
if (img.imagegaps > img.imagewidth / 2)
|
||||
if (img.imagegaps > (sp.mw - 2 * img.imagegaps) / 3)
|
||||
img.imagegaps -= arg->i;
|
||||
|
||||
drawmenu();
|
||||
|
|
|
|||
|
|
@ -362,11 +362,8 @@ static FuncList fl[] = {
|
|||
{ "clearins", clearins },
|
||||
{ "viewhist", viewhist },
|
||||
{ "moveword", moveword },
|
||||
{ "moveword", moveword },
|
||||
{ "deleteword", deleteword },
|
||||
{ "movecursor", movecursor },
|
||||
{ "movecursor", movecursor },
|
||||
{ "navhistory", navhistory },
|
||||
{ "navhistory", navhistory },
|
||||
{ "backspace", backspace },
|
||||
{ "selectitem", selectitem },
|
||||
|
|
@ -374,15 +371,11 @@ static FuncList fl[] = {
|
|||
{ "quit", quit },
|
||||
{ "complete", complete },
|
||||
{ "setimgsize", setimgsize },
|
||||
{ "setimgsize", setimgsize },
|
||||
{ "toggleimg", toggleimg },
|
||||
{ "defaultimg", defaultimg },
|
||||
{ "flipimg", flipimg },
|
||||
{ "setimgpos", setimgpos },
|
||||
{ "setimgpos", setimgpos },
|
||||
{ "setimggaps", setimggaps },
|
||||
{ "setimggaps", setimggaps },
|
||||
{ "setlines", setlines },
|
||||
{ "setlines", setlines },
|
||||
{ "screenshot", screenshot },
|
||||
{ "setcolumns", setcolumns },
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ int drawitem(int x, int y, int w) {
|
|||
#if USEIMAGE
|
||||
if (!hideimage && img.longestedge != 0 && imagetype) {
|
||||
rx = ox;
|
||||
rx += MAX((imagegaps * 2) + img.imagewidth + menumarginh, indentitems ? x : 0);
|
||||
rx += MAX((img.imagegaps * 2) + img.imagewidth + menumarginh, indentitems ? x : 0);
|
||||
} else
|
||||
#endif
|
||||
if (!indentitems) {
|
||||
|
|
|
|||
10
libs/img.c
10
libs/img.c
|
|
@ -56,7 +56,7 @@ void drawimage(void) {
|
|||
if (img.longestedge && width && height) {
|
||||
flipimage();
|
||||
|
||||
int leftmargin = imagegaps; // gaps between image and menu
|
||||
int leftmargin = img.imagegaps; // gaps between image and menu
|
||||
int wtr = 0; // remove from w
|
||||
int wta = 0; // add to w
|
||||
int xta = 0; // add to x
|
||||
|
|
@ -332,8 +332,8 @@ void resizetoimageheight_x11(int imageheight) {
|
|||
|
||||
int x, y;
|
||||
|
||||
if (lines * sp.bh < imageheight + imagegaps * 2) {
|
||||
lines = (imageheight + imagegaps * 2) / sp.bh;
|
||||
if (lines * sp.bh < imageheight + img.imagegaps * 2) {
|
||||
lines = (imageheight + img.imagegaps * 2) / sp.bh;
|
||||
}
|
||||
|
||||
get_mh();
|
||||
|
|
@ -377,8 +377,8 @@ void resizetoimageheight_wl(int imageheight) {
|
|||
int mh = sp.mh, olines = lines;
|
||||
lines = img.setlines;
|
||||
|
||||
if (lines * sp.bh < imageheight + imagegaps * 2) {
|
||||
lines = (imageheight + imagegaps * 2) / sp.bh;
|
||||
if (lines * sp.bh < imageheight + img.imagegaps * 2) {
|
||||
lines = (imageheight + img.imagegaps * 2) / sp.bh;
|
||||
}
|
||||
|
||||
get_mh();
|
||||
|
|
|
|||
|
|
@ -23,12 +23,8 @@ static Key keys[] = {
|
|||
{ -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} },
|
||||
{ -1, 0, XK_Print, screenshot, {0} },
|
||||
|
||||
|
|
@ -38,16 +34,10 @@ static Key keys[] = {
|
|||
{ 0, Ctrl, XK_minus, setimgsize, {.i = -1 } },
|
||||
{ 0, 0, XK_equal, setimgsize, {.i = +10 } },
|
||||
{ 0, 0, XK_minus, setimgsize, {.i = -10 } },
|
||||
{ 0, Shift, XK_equal, setimgsize, {.i = +100 } },
|
||||
{ 0, Shift, XK_minus, setimgsize, {.i = -100 } },
|
||||
{ 0, Shift, XK_0, defaultimg, {0} },
|
||||
{ 0, 0, XK_o, setimgpos, {.i = +1 } },
|
||||
{ 0, Ctrl, XK_1, setimggaps, {.i = -1 } },
|
||||
{ 0, Ctrl, XK_2, setimggaps, {.i = +1 } },
|
||||
{ 0, 0, XK_1, setimggaps, {.i = -10 } },
|
||||
{ 0, 0, XK_2, setimggaps, {.i = +10 } },
|
||||
{ 0, Shift, XK_1, setimggaps, {.i = -100 } },
|
||||
{ 0, Shift, XK_2, setimggaps, {.i = +100 } },
|
||||
{ 0, 0, XK_t, toggleimg, {0} },
|
||||
{ 0, 0, XK_p, paste, {.i = 2 } },
|
||||
{ 0, 0, XK_q, flipimg, {.i = 1 } },
|
||||
|
|
@ -65,8 +55,6 @@ static Key keys[] = {
|
|||
{ 0, 0, XK_Escape, quit, {0} },
|
||||
{ 0, 0, XK_g, movestart, {0} },
|
||||
{ 0, Shift, XK_g, moveend, {0} },
|
||||
{ 0, 0, XK_Next, movenext, {0} },
|
||||
{ 0, 0, XK_Prior, moveprev, {0} },
|
||||
{ 0, Ctrl, XK_p, navhistory, {.i = -1 } },
|
||||
{ 0, Ctrl, XK_n, navhistory, {.i = +1 } },
|
||||
|
||||
|
|
@ -96,12 +84,8 @@ static WlKey wl_keys[] = {
|
|||
{ -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} },
|
||||
{ -1, WL_None, XKB_KEY_Print, screenshot, {0} },
|
||||
|
||||
|
|
@ -111,16 +95,10 @@ static WlKey wl_keys[] = {
|
|||
{ 0, WL_Ctrl, XKB_KEY_minus, setimgsize, {.i = -1 } },
|
||||
{ 0, WL_None, XKB_KEY_equal, setimgsize, {.i = +10 } },
|
||||
{ 0, WL_None, XKB_KEY_minus, setimgsize, {.i = -10 } },
|
||||
{ 0, WL_Shift, XKB_KEY_equal, setimgsize, {.i = +100 } },
|
||||
{ 0, WL_Shift, XKB_KEY_minus, setimgsize, {.i = -100 } },
|
||||
{ 0, WL_Shift, XKB_KEY_0, defaultimg, {0} },
|
||||
{ 0, WL_None, XKB_KEY_o, setimgpos, {.i = +1 } },
|
||||
{ 0, WL_Ctrl, XKB_KEY_1, setimggaps, {.i = -1 } },
|
||||
{ 0, WL_Ctrl, XKB_KEY_2, setimggaps, {.i = +1 } },
|
||||
{ 0, WL_None, XKB_KEY_1, setimggaps, {.i = -10 } },
|
||||
{ 0, WL_None, XKB_KEY_2, setimggaps, {.i = +10 } },
|
||||
{ 0, WL_Shift, XKB_KEY_1, setimggaps, {.i = -100 } },
|
||||
{ 0, WL_Shift, XKB_KEY_2, setimggaps, {.i = +100 } },
|
||||
{ 0, WL_None, XKB_KEY_t, toggleimg, {0} },
|
||||
{ 0, WL_None, XKB_KEY_p, paste, {.i = 2 } },
|
||||
{ 0, WL_None, XKB_KEY_q, flipimg, {.i = 1 } },
|
||||
|
|
@ -140,8 +118,6 @@ static WlKey wl_keys[] = {
|
|||
{ 0, WL_None, XKB_KEY_End, moveend, {0} },
|
||||
{ 0, WL_None, XKB_KEY_g, movestart, {0} },
|
||||
{ 0, WL_Shift, XKB_KEY_g, moveend, {0} },
|
||||
{ 0, WL_None, XKB_KEY_Next, movenext, {0} },
|
||||
{ 0, WL_None, XKB_KEY_Prior, moveprev, {0} },
|
||||
{ 0, WL_Ctrl, XKB_KEY_p, navhistory, {.i = -1 } },
|
||||
{ 0, WL_Ctrl, XKB_KEY_n, navhistory, {.i = +1 } },
|
||||
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ void buttonpress_wl(uint32_t button, double ex, double ey) {
|
|||
|
||||
#if USEIMAGE
|
||||
if (!hideimage && img.longestedge != 0 && imagetype) {
|
||||
x += MAX((imagegaps * 2) + img.imagewidth, indentitems ? sp.promptw : 0);
|
||||
x += MAX((img.imagegaps * 2) + img.imagewidth, indentitems ? sp.promptw : 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -319,7 +319,7 @@ void buttonpress_wl(uint32_t button, double ex, double ey) {
|
|||
}
|
||||
}
|
||||
#if USEIMAGE
|
||||
} else if (ey >= y && ey <= (y + h) && ex >= x + (powerlineitems ? sp.plw : 0) - MAX((imagegaps * 2) + img.imagewidth, indentitems ? sp.promptw : 0) && ex <= (x - MAX((imagegaps * 2) + img.imagewidth, indentitems ? sp.promptw : 0) + w / columns) + (powerlineitems ? sp.plw : 0)) {
|
||||
} else if (ey >= y && ey <= (y + h) && ex >= x + (powerlineitems ? sp.plw : 0) - MAX((img.imagegaps * 2) + img.imagewidth, indentitems ? sp.promptw : 0) && ex <= (x - MAX((img.imagegaps * 2) + img.imagewidth, indentitems ? sp.promptw : 0) + w / columns) + (powerlineitems ? sp.plw : 0)) {
|
||||
click = ClickImage;
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
132
spmenu.1
132
spmenu.1
|
|
@ -971,28 +971,6 @@ 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
|
||||
|
|
@ -1015,28 +993,6 @@ 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{
|
||||
-1
|
||||
T}@T{
|
||||
0
|
||||
T}@T{
|
||||
Print
|
||||
|
|
@ -1105,28 +1061,6 @@ T{
|
|||
T}@T{
|
||||
Shift
|
||||
T}@T{
|
||||
equal
|
||||
T}@T{
|
||||
setimgsize
|
||||
T}@T{
|
||||
+100
|
||||
T}
|
||||
T{
|
||||
0
|
||||
T}@T{
|
||||
Shift
|
||||
T}@T{
|
||||
minus
|
||||
T}@T{
|
||||
setimgsize
|
||||
T}@T{
|
||||
-100
|
||||
T}
|
||||
T{
|
||||
0
|
||||
T}@T{
|
||||
Shift
|
||||
T}@T{
|
||||
0
|
||||
T}@T{
|
||||
defaultimg
|
||||
|
|
@ -1171,50 +1105,6 @@ T{
|
|||
T}@T{
|
||||
0
|
||||
T}@T{
|
||||
1
|
||||
T}@T{
|
||||
setimggaps
|
||||
T}@T{
|
||||
-10
|
||||
T}
|
||||
T{
|
||||
0
|
||||
T}@T{
|
||||
0
|
||||
T}@T{
|
||||
2
|
||||
T}@T{
|
||||
setimggaps
|
||||
T}@T{
|
||||
+10
|
||||
T}
|
||||
T{
|
||||
0
|
||||
T}@T{
|
||||
Shift
|
||||
T}@T{
|
||||
1
|
||||
T}@T{
|
||||
setimggaps
|
||||
T}@T{
|
||||
-100
|
||||
T}
|
||||
T{
|
||||
0
|
||||
T}@T{
|
||||
Shift
|
||||
T}@T{
|
||||
2
|
||||
T}@T{
|
||||
setimggaps
|
||||
T}@T{
|
||||
+100
|
||||
T}
|
||||
T{
|
||||
0
|
||||
T}@T{
|
||||
0
|
||||
T}@T{
|
||||
t
|
||||
T}@T{
|
||||
toggleimg
|
||||
|
|
@ -1400,28 +1290,6 @@ T}
|
|||
T{
|
||||
0
|
||||
T}@T{
|
||||
0
|
||||
T}@T{
|
||||
Next
|
||||
T}@T{
|
||||
movenext
|
||||
T}@T{
|
||||
0
|
||||
T}
|
||||
T{
|
||||
0
|
||||
T}@T{
|
||||
0
|
||||
T}@T{
|
||||
Prior
|
||||
T}@T{
|
||||
moveprev
|
||||
T}@T{
|
||||
0
|
||||
T}
|
||||
T{
|
||||
0
|
||||
T}@T{
|
||||
Ctrl
|
||||
T}@T{
|
||||
p
|
||||
|
|
|
|||
Loading…
Reference in a new issue