aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-03-12 09:20:05 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-03-12 09:20:05 +0000
commit45384839f0e9627cd5b376b045e11c14277d40d0 (patch)
treee727a5dbd8d984c121113f665f5bf815104c062c /input.c
parentconfig: 'invalid key' is always an error, not a warning (diff)
config/input: implement mouse bindings
* New config section, "mouse-bindings", where bindings are defined on the form "action=BTN_<name> * pointer_button() handler now scans the bindings list instead of hardcoding primary-paste to BTN_MIDDLE. * The implementation handles single- double- and triple clicks in the bindings, but there is currently no way to define anything but a single-click binding in the configuration.
Diffstat (limited to 'input.c')
-rw-r--r--input.c30
1 files changed, 21 insertions, 9 deletions
diff --git a/input.c b/input.c
index 399d9d26..8fbb02cd 100644
--- a/input.c
+++ b/input.c
@@ -31,6 +31,8 @@
#include "terminal.h"
#include "vt.h"
+#define ALEN(v) (sizeof(v) / sizeof(v[0]))
+
void
input_execute_binding(struct terminal *term, enum binding_action action,
uint32_t serial)
@@ -54,8 +56,7 @@ input_execute_binding(struct terminal *term, enum binding_action action,
break;
case BIND_ACTION_PRIMARY_PASTE:
- LOG_ERR("unimplemented");
- assert(false);
+ selection_from_primary(term);
break;
case BIND_ACTION_SEARCH_START:
@@ -321,7 +322,6 @@ keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
static const struct key_data *
keymap_data_for_sym(xkb_keysym_t sym, size_t *count)
{
-#define ALEN(a) (sizeof(a) / sizeof(a[0]))
switch (sym) {
case XKB_KEY_Escape: *count = ALEN(key_escape); return key_escape;
case XKB_KEY_Return: *count = ALEN(key_return); return key_return;
@@ -402,7 +402,6 @@ keymap_data_for_sym(xkb_keysym_t sym, size_t *count)
case XKB_KEY_KP_9: *count = ALEN(key_kp_9); return key_kp_9;
}
- #undef ALEN
return NULL;
}
@@ -1151,11 +1150,24 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
selection_mark_row(term, wayl->mouse.row, serial);
break;
}
- } else {
- if (wayl->mouse.count == 1 && button == BTN_MIDDLE &&
- selection_enabled(term))
- {
- selection_from_primary(term);
+ }
+
+ else {
+ for (size_t i = 0; i < ALEN(wayl->conf->bindings.mouse); i++) {
+ const struct mouse_binding *binding =
+ &wayl->conf->bindings.mouse[i];
+
+ if (binding->button != button) {
+ /* Wrong button */
+ continue;
+ }
+
+ if (binding->count != wayl->mouse.count) {
+ /* Not correct click count */
+ continue;
+ }
+
+ input_execute_binding(term, binding->action, serial);
}
selection_cancel(term);
}