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

View file

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