don't use all lowercase for mouse click names
This commit is contained in:
parent
8e8c359d00
commit
104d46640b
|
@ -223,35 +223,35 @@ spmenu = {
|
|||
* See https://spmenu.speedie.site/index.php/Configurable+keybindings for a list of valid options.
|
||||
*/
|
||||
mouse = ( // Left click on input: Clear the input
|
||||
{ click = "clickinput";
|
||||
{ click = "ClickInput";
|
||||
modifier = "None";
|
||||
button = "Left Click";
|
||||
function = "clear";
|
||||
argument = "0";
|
||||
},
|
||||
// Left click on prompt: Clear the input
|
||||
{ click = "clickprompt";
|
||||
{ click = "ClickPrompt";
|
||||
modifier = "None";
|
||||
button = "Left Click";
|
||||
function = "clear";
|
||||
argument = "0";
|
||||
},
|
||||
// Left click on the mode indicator: Toggle mode
|
||||
{ click = "clickmode";
|
||||
{ click = "ClickMode";
|
||||
modifier = "None";
|
||||
button = "Left Click";
|
||||
function = "switchmode";
|
||||
argument = "0";
|
||||
},
|
||||
// Click on the match count: Toggle viewing history buffer
|
||||
{ click = "clicknumber";
|
||||
{ click = "ClickNumber";
|
||||
modifier = "None";
|
||||
button = "Left Click";
|
||||
function = "viewhist";
|
||||
argument = "0";
|
||||
},
|
||||
// Left click on an item: Select it
|
||||
{ click = "clickselitem";
|
||||
{ click = "ClickSelItem";
|
||||
modifier = "None";
|
||||
button = "Left Click";
|
||||
function = "None";
|
||||
|
|
|
@ -515,16 +515,28 @@ static ButtonType btp[] = {
|
|||
};
|
||||
|
||||
static ClickType ctp[] = {
|
||||
{ "clickwindow", clickwindow },
|
||||
{ "clickprompt", clickprompt },
|
||||
{ "clickinput", clickinput },
|
||||
{ "clicklarrow", clicklarrow },
|
||||
{ "clickitem", clickitem },
|
||||
{ "clickselitem", clickselitem },
|
||||
{ "clickrarrow", clickrarrow },
|
||||
{ "clicknumber", clicknumber },
|
||||
{ "clickcaps", clickcaps },
|
||||
{ "clickmode", clickmode },
|
||||
{ "ClickWindow", ClickWindow },
|
||||
{ "ClickPrompt", ClickPrompt },
|
||||
{ "ClickInput", ClickInput },
|
||||
{ "ClickLArrow", ClickLArrow },
|
||||
{ "ClickItem", ClickItem },
|
||||
{ "ClickSelItem", ClickSelItem },
|
||||
{ "ClickRArrow", ClickRArrow },
|
||||
{ "ClickNumber", ClickNumber },
|
||||
{ "ClickCaps", ClickCaps },
|
||||
{ "ClickMode", ClickMode },
|
||||
|
||||
// compatibility
|
||||
{ "clickwindow", ClickWindow },
|
||||
{ "clickprompt", ClickPrompt },
|
||||
{ "clickinput", ClickInput },
|
||||
{ "clicklarrow", ClickLArrow },
|
||||
{ "clickitem", ClickItem },
|
||||
{ "clickselitem", ClickSelItem },
|
||||
{ "clickrarrow", ClickRArrow },
|
||||
{ "clicknumber", ClickNumber },
|
||||
{ "clickcaps", ClickCaps },
|
||||
{ "clickmode", ClickMode },
|
||||
};
|
||||
|
||||
static void conf_init(void);
|
||||
|
|
42
libs/mouse.c
42
libs/mouse.c
|
@ -29,17 +29,17 @@ buttonpress(XEvent *e)
|
|||
if (!strcmp(capstext, "")) capsWidth = 0; // no caps lock width for no chars
|
||||
if (ev->window != win) return; // if incorrect or wrong window, return
|
||||
|
||||
click = clickwindow; // clicking anywhere, we use this and override it if we clicked on something specific
|
||||
click = ClickWindow; // clicking anywhere, we use this and override it if we clicked on something specific
|
||||
|
||||
// check click position and override the value of click
|
||||
if (ev->x < x + promptw + powerlineprompt ? plw : 0) { // prompt
|
||||
click = clickprompt;
|
||||
click = ClickPrompt;
|
||||
} else if ((ev->x > mw - capsWidth - 2 * sp - 2 * borderwidth - menumarginh) && !hidecaps && capsWidth) { // caps lock indicator
|
||||
click = clickcaps;
|
||||
click = ClickCaps;
|
||||
} else if (ev->x > mw - modeWidth - capsWidth - 2 * sp - 2 * borderwidth - menumarginh) { // mode indicator
|
||||
click = clickmode;
|
||||
click = ClickMode;
|
||||
} else if (ev->x > mw - modeWidth - numberWidth - capsWidth - 2 * sp - 2 * borderwidth - menumarginh) { // match count
|
||||
click = clicknumber;
|
||||
click = ClickNumber;
|
||||
} else { // input
|
||||
w = (lines > 0 || !matches) ? mw - x : inputw;
|
||||
|
||||
|
@ -47,7 +47,7 @@ buttonpress(XEvent *e)
|
|||
((!prev || !curr->left) ? larrowWidth : 0)) ||
|
||||
(lines > 0 && ev->y >= y && ev->y <= y + h)) {
|
||||
|
||||
click = clickinput;
|
||||
click = ClickInput;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -64,24 +64,24 @@ buttonpress(XEvent *e)
|
|||
|
||||
y += h;
|
||||
|
||||
// clickselitem, called function doesn't matter
|
||||
// ClickSelItem, called function doesn't matter
|
||||
if (ev->y >= y && ev->y <= (y + h) && ev->x >= x && ev->x <= (x + w / columns)) {
|
||||
for (i = 0; i < LENGTH(buttons); i++) {
|
||||
if (ignoreglobalmouse) break;
|
||||
if (buttons[i].click == clickselitem && buttons[i].button == ev->button && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) {
|
||||
if (buttons[i].click == ClickSelItem && buttons[i].button == ev->button && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) {
|
||||
puts(item->text);
|
||||
exit(0);
|
||||
} else if (buttons[i].click == clickitem) {
|
||||
click = clickitem;
|
||||
} else if (buttons[i].click == ClickItem) {
|
||||
click = ClickItem;
|
||||
}
|
||||
}
|
||||
for (i = 0; i < LENGTH(cbuttons); i++) {
|
||||
if (ignoreconfmouse) break;
|
||||
if (cbuttons[i].click == clickselitem && cbuttons[i].button == ev->button && CLEANMASK(cbuttons[i].mask) == CLEANMASK(ev->state)) {
|
||||
if (cbuttons[i].click == ClickSelItem && cbuttons[i].button == ev->button && CLEANMASK(cbuttons[i].mask) == CLEANMASK(ev->state)) {
|
||||
puts(item->text);
|
||||
exit(0);
|
||||
} else if (cbuttons[i].click == clickitem) {
|
||||
click = clickitem;
|
||||
} else if (cbuttons[i].click == ClickItem) {
|
||||
click = ClickItem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ buttonpress(XEvent *e)
|
|||
w = larrowWidth;
|
||||
if (prev && curr->left) {
|
||||
if (ev->x >= x && ev->x <= x + w) {
|
||||
click = clicklarrow;
|
||||
click = ClickLArrow;
|
||||
}
|
||||
}
|
||||
// item click
|
||||
|
@ -103,20 +103,20 @@ buttonpress(XEvent *e)
|
|||
if (ev->x >= x && ev->x <= x + w) {
|
||||
for (i = 0; i < LENGTH(buttons); i++) {
|
||||
if (ignoreglobalmouse) break;
|
||||
if (buttons[i].click == clickselitem && buttons[i].button == ev->button && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) {
|
||||
if (buttons[i].click == ClickSelItem && buttons[i].button == ev->button && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) {
|
||||
puts(item->text);
|
||||
exit(0);
|
||||
} else if (buttons[i].click == clickitem) {
|
||||
click = clickitem;
|
||||
} else if (buttons[i].click == ClickItem) {
|
||||
click = ClickItem;
|
||||
}
|
||||
}
|
||||
for (i = 0; i < LENGTH(cbuttons); i++) {
|
||||
if (ignoreconfmouse) break;
|
||||
if (cbuttons[i].click == clickselitem && cbuttons[i].button == ev->button && CLEANMASK(cbuttons[i].mask) == CLEANMASK(ev->state)) {
|
||||
if (cbuttons[i].click == ClickSelItem && cbuttons[i].button == ev->button && CLEANMASK(cbuttons[i].mask) == CLEANMASK(ev->state)) {
|
||||
puts(item->text);
|
||||
exit(0);
|
||||
} else if (cbuttons[i].click == clickitem) {
|
||||
click = clickitem;
|
||||
} else if (cbuttons[i].click == ClickItem) {
|
||||
click = ClickItem;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -126,7 +126,7 @@ buttonpress(XEvent *e)
|
|||
w = rarrowWidth;
|
||||
x = mw - w;
|
||||
if (next && ev->x >= x && ev->x <= x + w) {
|
||||
click = clickrarrow;
|
||||
click = ClickRArrow;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
20
libs/mouse.h
20
libs/mouse.h
|
@ -1,15 +1,15 @@
|
|||
// clicks
|
||||
enum {
|
||||
clickwindow,
|
||||
clickprompt,
|
||||
clickinput,
|
||||
clicklarrow,
|
||||
clickitem,
|
||||
clickselitem,
|
||||
clickrarrow,
|
||||
clicknumber,
|
||||
clickcaps,
|
||||
clickmode,
|
||||
ClickWindow,
|
||||
ClickPrompt,
|
||||
ClickInput,
|
||||
ClickLArrow,
|
||||
ClickItem,
|
||||
ClickSelItem,
|
||||
ClickRArrow,
|
||||
ClickNumber,
|
||||
ClickCaps,
|
||||
ClickMode,
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
|
|
10
mouse.h
10
mouse.h
|
@ -4,9 +4,9 @@
|
|||
*/
|
||||
|
||||
static Mouse buttons[] = {
|
||||
{ clickinput, 0, Button1, clear, {0} },
|
||||
{ clickprompt, 0, Button1, clear, {0} },
|
||||
{ clickmode, 0, Button1, switchmode, {0} },
|
||||
{ clicknumber, 0, Button1, viewhist, {0} },
|
||||
{ clickselitem, 0, Button1, NULL, {0} },
|
||||
{ ClickInput, 0, Button1, clear, {0} },
|
||||
{ ClickPrompt, 0, Button1, clear, {0} },
|
||||
{ ClickMode, 0, Button1, switchmode, {0} },
|
||||
{ ClickNumber, 0, Button1, viewhist, {0} },
|
||||
{ ClickSelItem, 0, Button1, NULL, {0} },
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue