minor indentation change and name change for button types

This commit is contained in:
speedie 2023-04-25 17:52:52 +02:00
parent 8800adbc04
commit b2e933e1a9
2 changed files with 372 additions and 378 deletions

View file

@ -216,31 +216,31 @@ spmenu =
// Mouse
mouse = ( { click = "clickinput";
modifier = "None";
button = "left-click";
button = "Left Click";
function = "clear";
argument = "0";
},
{ click = "clickprompt";
modifier = "None";
button = "left-click";
button = "Left Click";
function = "clear";
argument = "0";
},
{ click = "clickmode";
modifier = "None";
button = "left-click";
button = "Left Click";
function = "switchmode";
argument = "0";
},
{ click = "clicknumber";
modifier = "None";
button = "left-click";
button = "Left Click";
function = "viewhist";
argument = "0";
},
{ click = "clickselitem";
modifier = "None";
button = "left-click";
button = "Left Click";
function = "None";
argument = "0";
},
@ -253,367 +253,367 @@ spmenu =
key = "Enter";
function = "selectitem";
argument = "+1";
},
{ mode = -1;
modifier = "Shift";
key = "Enter";
function = "selectitem";
argument = "0";
},
{ mode = -1;
modifier = "None";
key = "Tab";
function = "complete";
argument = "0";
},
{ mode = -1;
modifier = "Ctrl";
key = "v";
function = "paste";
argument = "2";
},
{ mode = -1;
modifier = "Ctrl+Shift";
key = "v";
function = "paste";
argument = "1";
},
{ mode = -1;
modifier = "None";
key = "Backspace";
function = "backspace";
argument = "0";
},
{ mode = -1;
modifier = "Ctrl";
key = "Backspace";
function = "deleteword";
argument = "0";
},
{ mode = -1;
modifier = "Ctrl";
key = "Left";
function = "moveword";
argument = "-1";
},
{ mode = -1;
modifier = "Ctrl";
key = "Right";
function = "moveword";
argument = "+1";
},
{ mode = -1;
modifier = "None";
key = "Left";
function = "movecursor";
argument = "-1";
},
{ mode = -1;
modifier = "None";
key = "Right";
function = "movecursor";
argument = "+1";
},
{ mode = -1;
modifier = "Control+Shift";
key = "p";
function = "spawn";
argument = "setprofile";
},
{ mode = 1;
modifier = "None";
key = "Esc";
function = "switchmode";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "i";
function = "switchmode";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "/";
function = "switchmode";
argument = "0";
},
{ mode = 0;
modifier = "Ctrl";
key = "=";
function = "setimgsize";
argument = "+1";
},
{ mode = 0;
modifier = "Ctrl";
key = "-";
function = "setimgsize";
argument = "-1";
},
{ mode = 0;
modifier = "None";
key = "-";
function = "setimgsize";
argument = "-10";
},
{ mode = 0;
modifier = "None";
key = "=";
function = "setimgsize";
argument = "+10";
},
{ mode = 0;
modifier = "Shift";
key = "-";
function = "setimgsize";
argument = "-100";
},
{ mode = 0;
modifier = "Shift";
key = "=";
function = "setimgsize";
argument = "+100";
},
{ mode = 0;
modifier = "Shift";
key = "0";
function = "defaultimg";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "r";
function = "rotateimg";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "p";
function = "setimgpos";
argument = "+1";
},
{ mode = 0;
modifier = "Ctrl";
key = "1";
function = "setimggaps";
argument = "-1";
},
{ mode = 0;
modifier = "Ctrl";
key = "2";
function = "setimggaps";
argument = "+1";
},
{ mode = 0;
modifier = "None";
key = "1";
function = "setimggaps";
argument = "-10";
},
{ mode = 0;
modifier = "None";
key = "2";
function = "setimggaps";
argument = "+10";
},
{ mode = 0;
modifier = "Shift";
key = "1";
function = "setimggaps";
argument = "-100";
},
{ mode = 0;
modifier = "Shift";
key = "2";
function = "setimggaps";
argument = "+100";
},
{ mode = 0;
modifier = "None";
key = "t";
function = "toggleimg";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "h";
function = "flipimg";
argument = "1";
},
{ mode = 0;
modifier = "None";
key = "v";
function = "flipimg";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "k";
function = "moveup";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "j";
function = "movedown";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "h";
function = "moveleft";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "l";
function = "moveright";
argument = "0";
},
{ mode = 0;
modifier = "Ctrl";
key = "u";
function = "moveup";
argument = "5";
},
{ mode = 0;
modifier = "Ctrl";
key = "d";
function = "movedown";
argument = "5";
},
{ mode = 0;
modifier = "Ctrl";
key = "k";
function = "setlines";
argument = "+1";
},
{ mode = 0;
modifier = "Ctrl";
key = "j";
function = "setlines";
argument = "-1";
},
{ mode = 0;
modifier = "Ctrl+Alt+Shift";
key = "k";
function = "setlines";
argument = "+5";
},
{ mode = 0;
modifier = "Ctrl+Alt+Shift";
key = "j";
function = "setlines";
argument = "-5";
},
{ mode = 0;
modifier = "Ctrl";
key = "h";
function = "setcolumns";
argument = "+1";
},
{ mode = 0;
modifier = "Ctrl";
key = "h";
function = "setcolumns";
argument = "-1";
},
{ mode = 0;
modifier = "Ctrl+Alt+Shift";
key = "h";
function = "setcolumns";
argument = "+5";
},
{ mode = 0;
modifier = "Ctrl+Alt+Shift";
key = "l";
function = "setcolumns";
argument = "-5";
},
{ mode = 0;
modifier = "Ctrl";
key = "k";
function = "restoresel";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "u";
function = "togglehighlight";
argument = "0";
},
{ mode = 0;
modifier = "Ctrl+Shift";
key = "h";
function = "viewhist";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "d";
function = "clear";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "c";
function = "clearins";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "Esc";
function = "quit";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "Home";
function = "movestart";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "End";
function = "moveend";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "g";
function = "movestart";
argument = "0";
},
{ mode = 0;
modifier = "Shift";
key = "g";
function = "moveend";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "Next";
function = "movenext";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "Prior";
function = "moveprev";
argument = "0";
},
{ mode = 0;
modifier = "Alt";
key = "p";
function = "navhistory";
argument = "-1";
},
{ mode = 0;
modifier = "Alt";
key = "n";
function = "navhistory";
argument = "+1";
},
},
{ mode = -1;
modifier = "Shift";
key = "Enter";
function = "selectitem";
argument = "0";
},
{ mode = -1;
modifier = "None";
key = "Tab";
function = "complete";
argument = "0";
},
{ mode = -1;
modifier = "Ctrl";
key = "v";
function = "paste";
argument = "2";
},
{ mode = -1;
modifier = "Ctrl+Shift";
key = "v";
function = "paste";
argument = "1";
},
{ mode = -1;
modifier = "None";
key = "Backspace";
function = "backspace";
argument = "0";
},
{ mode = -1;
modifier = "Ctrl";
key = "Backspace";
function = "deleteword";
argument = "0";
},
{ mode = -1;
modifier = "Ctrl";
key = "Left";
function = "moveword";
argument = "-1";
},
{ mode = -1;
modifier = "Ctrl";
key = "Right";
function = "moveword";
argument = "+1";
},
{ mode = -1;
modifier = "None";
key = "Left";
function = "movecursor";
argument = "-1";
},
{ mode = -1;
modifier = "None";
key = "Right";
function = "movecursor";
argument = "+1";
},
{ mode = -1;
modifier = "Control+Shift";
key = "p";
function = "spawn";
argument = "setprofile";
},
{ mode = 1;
modifier = "None";
key = "Esc";
function = "switchmode";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "i";
function = "switchmode";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "/";
function = "switchmode";
argument = "0";
},
{ mode = 0;
modifier = "Ctrl";
key = "=";
function = "setimgsize";
argument = "+1";
},
{ mode = 0;
modifier = "Ctrl";
key = "-";
function = "setimgsize";
argument = "-1";
},
{ mode = 0;
modifier = "None";
key = "-";
function = "setimgsize";
argument = "-10";
},
{ mode = 0;
modifier = "None";
key = "=";
function = "setimgsize";
argument = "+10";
},
{ mode = 0;
modifier = "Shift";
key = "-";
function = "setimgsize";
argument = "-100";
},
{ mode = 0;
modifier = "Shift";
key = "=";
function = "setimgsize";
argument = "+100";
},
{ mode = 0;
modifier = "Shift";
key = "0";
function = "defaultimg";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "r";
function = "rotateimg";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "p";
function = "setimgpos";
argument = "+1";
},
{ mode = 0;
modifier = "Ctrl";
key = "1";
function = "setimggaps";
argument = "-1";
},
{ mode = 0;
modifier = "Ctrl";
key = "2";
function = "setimggaps";
argument = "+1";
},
{ mode = 0;
modifier = "None";
key = "1";
function = "setimggaps";
argument = "-10";
},
{ mode = 0;
modifier = "None";
key = "2";
function = "setimggaps";
argument = "+10";
},
{ mode = 0;
modifier = "Shift";
key = "1";
function = "setimggaps";
argument = "-100";
},
{ mode = 0;
modifier = "Shift";
key = "2";
function = "setimggaps";
argument = "+100";
},
{ mode = 0;
modifier = "None";
key = "t";
function = "toggleimg";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "h";
function = "flipimg";
argument = "1";
},
{ mode = 0;
modifier = "None";
key = "v";
function = "flipimg";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "k";
function = "moveup";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "j";
function = "movedown";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "h";
function = "moveleft";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "l";
function = "moveright";
argument = "0";
},
{ mode = 0;
modifier = "Ctrl";
key = "u";
function = "moveup";
argument = "5";
},
{ mode = 0;
modifier = "Ctrl";
key = "d";
function = "movedown";
argument = "5";
},
{ mode = 0;
modifier = "Ctrl";
key = "k";
function = "setlines";
argument = "+1";
},
{ mode = 0;
modifier = "Ctrl";
key = "j";
function = "setlines";
argument = "-1";
},
{ mode = 0;
modifier = "Ctrl+Alt+Shift";
key = "k";
function = "setlines";
argument = "+5";
},
{ mode = 0;
modifier = "Ctrl+Alt+Shift";
key = "j";
function = "setlines";
argument = "-5";
},
{ mode = 0;
modifier = "Ctrl";
key = "h";
function = "setcolumns";
argument = "+1";
},
{ mode = 0;
modifier = "Ctrl";
key = "h";
function = "setcolumns";
argument = "-1";
},
{ mode = 0;
modifier = "Ctrl+Alt+Shift";
key = "h";
function = "setcolumns";
argument = "+5";
},
{ mode = 0;
modifier = "Ctrl+Alt+Shift";
key = "l";
function = "setcolumns";
argument = "-5";
},
{ mode = 0;
modifier = "Ctrl";
key = "k";
function = "restoresel";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "u";
function = "togglehighlight";
argument = "0";
},
{ mode = 0;
modifier = "Ctrl+Shift";
key = "h";
function = "viewhist";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "d";
function = "clear";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "c";
function = "clearins";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "Esc";
function = "quit";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "Home";
function = "movestart";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "End";
function = "moveend";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "g";
function = "movestart";
argument = "0";
},
{ mode = 0;
modifier = "Shift";
key = "g";
function = "moveend";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "Next";
function = "movenext";
argument = "0";
},
{ mode = 0;
modifier = "None";
key = "Prior";
function = "moveprev";
argument = "0";
},
{ mode = 0;
modifier = "Alt";
key = "p";
function = "navhistory";
argument = "-1";
},
{ mode = 0;
modifier = "Alt";
key = "n";
function = "navhistory";
argument = "+1";
},
{ ignoreglobalkeys = 1; } ),
{ ignoreglobalkeys = 1; } ),
};

View file

@ -31,17 +31,11 @@ typedef struct {
} ClickType;
static ButtonType btp[] = {
{ "button1", Button1 },
{ "button2", Button2 },
{ "button3", Button3 },
{ "button4", Button4 },
{ "button5", Button5 },
{ "left-click", Button1 },
{ "middle-click", Button2 },
{ "right-click", Button3 },
{ "scroll-up", Button4 },
{ "scroll-down", Button5 },
{ "Left Click", Button1 },
{ "Middle Click", Button2 },
{ "Right Click", Button3 },
{ "Scroll Up", Button4 },
{ "Scroll Down", Button5 },
};
static ClickType ctp[] = {