aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-08-30 18:16:12 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-08-30 18:16:12 +0000
commite673bd4ab03d8faca2282a1bc134455458b8d3fe (patch)
tree1cb7f2fdd891183a8a68e81e8d01ae84293ce404 /input.c
parentosc: xparsecolor: parse 'legacy' colors (diff)
parentsearch: ctrl+s searches forward (diff)
Merge branch 'scrollback-search'
Diffstat (limited to 'input.c')
-rw-r--r--input.c33
1 files changed, 20 insertions, 13 deletions
diff --git a/input.c b/input.c
index dc48b44d..76bc5812 100644
--- a/input.c
+++ b/input.c
@@ -18,11 +18,12 @@
#define LOG_MODULE "input"
#define LOG_ENABLE_DBG 0
#include "log.h"
-#include "terminal.h"
-#include "render.h"
-#include "keymap.h"
#include "commands.h"
+#include "keymap.h"
+#include "render.h"
+#include "search.h"
#include "selection.h"
+#include "terminal.h"
#include "vt.h"
static void
@@ -178,6 +179,12 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
xkb_mod_mask_t significant = ctrl | alt | shift | meta;
xkb_mod_mask_t effective_mods = mods & ~consumed & significant;
+ if (term->is_searching) {
+ start_repeater(term, key - 8);
+ search_input(term, key, sym, effective_mods);
+ return;
+ }
+
#if 0
for (size_t i = 0; i < 32; i++) {
if (mods & (1 << i)) {
@@ -218,6 +225,12 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
else if (sym == XKB_KEY_V) {
selection_from_clipboard(term, serial);
+ term_reset_view(term);
+ found_map = true;
+ }
+
+ else if (sym == XKB_KEY_R) {
+ search_begin(term);
found_map = true;
}
}
@@ -243,11 +256,7 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
vt_to_slave(term, info->seq, strlen(info->seq));
found_map = true;
- if (term->grid->view != term->grid->offset) {
- term->grid->view = term->grid->offset;
- term_damage_all(term);
- }
-
+ term_reset_view(term);
selection_cancel(term);
break;
}
@@ -308,13 +317,9 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
vt_to_slave(term, "\x1b", 1);
vt_to_slave(term, buf, count);
-
- if (term->grid->view != term->grid->offset) {
- term->grid->view = term->grid->offset;
- term_damage_all(term);
- }
}
+ term_reset_view(term);
selection_cancel(term);
}
}
@@ -436,6 +441,8 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
struct terminal *term = data;
+ search_cancel(term);
+
switch (state) {
case WL_POINTER_BUTTON_STATE_PRESSED: {
/* Time since last click */