2019-08-27 17:23:28 +02:00
|
|
|
#include "search.h"
|
|
|
|
|
|
2019-12-01 19:22:45 +01:00
|
|
|
#include <string.h>
|
2019-08-27 17:23:28 +02:00
|
|
|
#include <wchar.h>
|
2019-08-30 19:36:37 +02:00
|
|
|
#include <wctype.h>
|
2019-08-29 19:34:41 +02:00
|
|
|
|
|
|
|
|
#include <wayland-client.h>
|
2019-08-27 17:23:28 +02:00
|
|
|
#include <xkbcommon/xkbcommon-compose.h>
|
|
|
|
|
|
|
|
|
|
#define LOG_MODULE "search"
|
2019-08-27 21:11:29 +02:00
|
|
|
#define LOG_ENABLE_DBG 0
|
2019-08-27 17:23:28 +02:00
|
|
|
#include "log.h"
|
2020-10-09 19:44:23 +02:00
|
|
|
#include "config.h"
|
2021-03-28 21:06:21 +02:00
|
|
|
#include "extract.h"
|
2019-08-27 21:11:40 +02:00
|
|
|
#include "grid.h"
|
2020-03-08 15:28:47 +01:00
|
|
|
#include "input.h"
|
2019-12-03 19:22:47 +01:00
|
|
|
#include "misc.h"
|
2019-08-27 17:23:28 +02:00
|
|
|
#include "render.h"
|
2019-08-27 19:33:19 +02:00
|
|
|
#include "selection.h"
|
2019-08-29 19:34:41 +02:00
|
|
|
#include "shm.h"
|
2020-05-01 11:46:24 +02:00
|
|
|
#include "util.h"
|
2020-12-05 23:29:12 +01:00
|
|
|
#include "xmalloc.h"
|
2019-08-29 19:34:41 +02:00
|
|
|
|
2020-08-12 18:45:35 +02:00
|
|
|
/*
|
|
|
|
|
* Ensures a "new" viewport doesn't contain any unallocated rows.
|
|
|
|
|
*
|
|
|
|
|
* This is done by first checking if the *first* row is NULL. If so,
|
|
|
|
|
* we move the viewport *forward*, until the first row is non-NULL. At
|
|
|
|
|
* this point, the entire viewport should be allocated rows only.
|
|
|
|
|
*
|
|
|
|
|
* If the first row already was non-NULL, we instead check the *last*
|
|
|
|
|
* row, and if it is NULL, we move the viewport *backward* until the
|
|
|
|
|
* last row is non-NULL.
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
ensure_view_is_allocated(struct terminal *term, int new_view)
|
|
|
|
|
{
|
|
|
|
|
int view_end = (new_view + term->rows - 1) & (term->grid->num_rows - 1);
|
|
|
|
|
|
|
|
|
|
if (term->grid->rows[new_view] == NULL) {
|
|
|
|
|
while (term->grid->rows[new_view] == NULL)
|
|
|
|
|
new_view = (new_view + 1) & (term->grid->num_rows - 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
else if (term->grid->rows[view_end] == NULL) {
|
|
|
|
|
while (term->grid->rows[view_end] == NULL) {
|
|
|
|
|
new_view--;
|
|
|
|
|
if (new_view < 0)
|
|
|
|
|
new_view += term->grid->num_rows;
|
|
|
|
|
view_end = (new_view + term->rows - 1) & (term->grid->num_rows - 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if defined(_DEBUG)
|
|
|
|
|
for (size_t r = 0; r < term->rows; r++)
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(term->grid->rows[(new_view + r) & (term->grid->num_rows - 1)] != NULL);
|
2020-08-12 18:45:35 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return new_view;
|
|
|
|
|
}
|
|
|
|
|
|
2019-12-03 19:17:34 +01:00
|
|
|
static bool
|
|
|
|
|
search_ensure_size(struct terminal *term, size_t wanted_size)
|
|
|
|
|
{
|
|
|
|
|
while (wanted_size >= term->search.sz) {
|
|
|
|
|
size_t new_sz = term->search.sz == 0 ? 64 : term->search.sz * 2;
|
|
|
|
|
wchar_t *new_buf = realloc(term->search.buf, new_sz * sizeof(term->search.buf[0]));
|
|
|
|
|
|
|
|
|
|
if (new_buf == NULL) {
|
|
|
|
|
LOG_ERRNO("failed to resize search buffer");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
term->search.buf = new_buf;
|
|
|
|
|
term->search.sz = new_sz;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-28 20:59:35 +02:00
|
|
|
static bool
|
|
|
|
|
has_wrapped_around(const struct terminal *term, int abs_row_no)
|
|
|
|
|
{
|
|
|
|
|
int scrollback_start = term->grid->offset + term->rows;
|
|
|
|
|
int rebased_row = abs_row_no - scrollback_start + term->grid->num_rows;
|
|
|
|
|
rebased_row &= term->grid->num_rows - 1;
|
|
|
|
|
|
|
|
|
|
return rebased_row == 0;
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-29 19:34:41 +02:00
|
|
|
static void
|
|
|
|
|
search_cancel_keep_selection(struct terminal *term)
|
|
|
|
|
{
|
wayland: instantiate sub-surfaces on-demand
While most compositors handle instantiated but not-yet-mapped
sub-surfaces correctly, e.g. kwin does not.
For example, it will incorrectly offset the main surface both
horizontally and vertically with a couple of pixels, leaving two
transparent areas at the top and left, between the SSDs and the main
surface.
Note that a workaround is to position the sub-surfaces inside the main
surface while they're unmapped. However, since the surfaces may be
larger than the main surface (the CSDs, for examples, always are),
this doesn't quite work since kwin, at least, resizes the window to
include the sub-surfaces, even when unmapped.
So, instead we instantiate all sub-surfaces on demand, when we know
where to position them, and when they should be mapped.
2020-02-26 12:22:16 +01:00
|
|
|
struct wl_window *win = term->window;
|
2021-02-12 12:00:40 +01:00
|
|
|
wayl_win_subsurface_destroy(&win->search);
|
2019-08-27 17:23:28 +02:00
|
|
|
|
|
|
|
|
free(term->search.buf);
|
|
|
|
|
term->search.buf = NULL;
|
|
|
|
|
term->search.len = 0;
|
|
|
|
|
term->search.sz = 0;
|
2019-08-29 21:03:16 +02:00
|
|
|
term->search.cursor = 0;
|
2019-08-27 19:33:19 +02:00
|
|
|
term->search.match = (struct coord){-1, -1};
|
|
|
|
|
term->search.match_len = 0;
|
2019-08-29 19:34:41 +02:00
|
|
|
term->is_searching = false;
|
2020-01-05 15:25:24 +01:00
|
|
|
term->render.search_glyph_offset = 0;
|
2019-08-29 19:34:41 +02:00
|
|
|
|
2020-12-07 18:57:16 +01:00
|
|
|
/* Reset IME state */
|
|
|
|
|
if (term_ime_is_enabled(term)) {
|
|
|
|
|
term_ime_disable(term);
|
|
|
|
|
term_ime_enable(term);
|
|
|
|
|
}
|
|
|
|
|
|
2019-11-29 22:11:15 +01:00
|
|
|
term_xcursor_update(term);
|
2019-08-29 19:34:41 +02:00
|
|
|
render_refresh(term);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
search_begin(struct terminal *term)
|
|
|
|
|
{
|
|
|
|
|
LOG_DBG("search: begin");
|
|
|
|
|
|
|
|
|
|
search_cancel_keep_selection(term);
|
|
|
|
|
selection_cancel(term);
|
|
|
|
|
|
2020-12-07 18:57:16 +01:00
|
|
|
/* Reset IME state */
|
|
|
|
|
if (term_ime_is_enabled(term)) {
|
|
|
|
|
term_ime_disable(term);
|
|
|
|
|
term_ime_enable(term);
|
|
|
|
|
}
|
|
|
|
|
|
wayland: instantiate sub-surfaces on-demand
While most compositors handle instantiated but not-yet-mapped
sub-surfaces correctly, e.g. kwin does not.
For example, it will incorrectly offset the main surface both
horizontally and vertically with a couple of pixels, leaving two
transparent areas at the top and left, between the SSDs and the main
surface.
Note that a workaround is to position the sub-surfaces inside the main
surface while they're unmapped. However, since the surfaces may be
larger than the main surface (the CSDs, for examples, always are),
this doesn't quite work since kwin, at least, resizes the window to
include the sub-surfaces, even when unmapped.
So, instead we instantiate all sub-surfaces on demand, when we know
where to position them, and when they should be mapped.
2020-02-26 12:22:16 +01:00
|
|
|
/* On-demand instantiate wayland surface */
|
2021-02-12 12:00:40 +01:00
|
|
|
bool ret = wayl_win_subsurface_new(term->window, &term->window->search);
|
2021-02-12 11:47:49 +01:00
|
|
|
xassert(ret);
|
wayland: instantiate sub-surfaces on-demand
While most compositors handle instantiated but not-yet-mapped
sub-surfaces correctly, e.g. kwin does not.
For example, it will incorrectly offset the main surface both
horizontally and vertically with a couple of pixels, leaving two
transparent areas at the top and left, between the SSDs and the main
surface.
Note that a workaround is to position the sub-surfaces inside the main
surface while they're unmapped. However, since the surfaces may be
larger than the main surface (the CSDs, for examples, always are),
this doesn't quite work since kwin, at least, resizes the window to
include the sub-surfaces, even when unmapped.
So, instead we instantiate all sub-surfaces on demand, when we know
where to position them, and when they should be mapped.
2020-02-26 12:22:16 +01:00
|
|
|
|
2019-08-27 19:33:19 +02:00
|
|
|
term->search.original_view = term->grid->view;
|
|
|
|
|
term->search.view_followed_offset = term->grid->view == term->grid->offset;
|
2019-08-27 17:23:28 +02:00
|
|
|
term->is_searching = true;
|
|
|
|
|
|
2020-12-05 23:29:12 +01:00
|
|
|
term->search.len = 0;
|
|
|
|
|
term->search.sz = 64;
|
|
|
|
|
term->search.buf = xmalloc(term->search.sz * sizeof(term->search.buf[0]));
|
|
|
|
|
term->search.buf[0] = L'\0';
|
|
|
|
|
|
2019-11-29 22:11:15 +01:00
|
|
|
term_xcursor_update(term);
|
2020-03-06 19:16:54 +01:00
|
|
|
render_refresh_search(term);
|
2019-08-27 17:23:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
search_cancel(struct terminal *term)
|
|
|
|
|
{
|
2019-08-29 19:34:41 +02:00
|
|
|
if (!term->is_searching)
|
|
|
|
|
return;
|
2019-08-27 17:23:28 +02:00
|
|
|
|
2019-08-29 19:34:41 +02:00
|
|
|
search_cancel_keep_selection(term);
|
|
|
|
|
selection_cancel(term);
|
2019-08-27 17:23:28 +02:00
|
|
|
}
|
|
|
|
|
|
2021-07-22 17:53:29 +02:00
|
|
|
void
|
|
|
|
|
search_selection_cancelled(struct terminal *term)
|
|
|
|
|
{
|
|
|
|
|
term->search.match = (struct coord){-1, -1};
|
|
|
|
|
term->search.match_len = 0;
|
2021-07-22 17:57:25 +02:00
|
|
|
render_refresh_search(term);
|
2021-07-22 17:53:29 +02:00
|
|
|
}
|
|
|
|
|
|
2019-12-03 19:40:22 +01:00
|
|
|
static void
|
|
|
|
|
search_update_selection(struct terminal *term,
|
|
|
|
|
int start_row, int start_col,
|
|
|
|
|
int end_row, int end_col)
|
|
|
|
|
{
|
2020-07-25 11:23:54 +02:00
|
|
|
bool move_viewport = true;
|
|
|
|
|
|
|
|
|
|
int view_end = (term->grid->view + term->rows - 1) & (term->grid->num_rows - 1);
|
|
|
|
|
if (view_end >= term->grid->view) {
|
|
|
|
|
/* Viewport does *not* wrap around */
|
|
|
|
|
if (start_row >= term->grid->view && end_row <= view_end)
|
|
|
|
|
move_viewport = false;
|
|
|
|
|
} else {
|
|
|
|
|
/* Viewport wraps */
|
|
|
|
|
if (start_row >= term->grid->view || end_row <= view_end)
|
|
|
|
|
move_viewport = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (move_viewport) {
|
|
|
|
|
int old_view = term->grid->view;
|
|
|
|
|
int new_view = start_row - term->rows / 2;
|
|
|
|
|
|
|
|
|
|
while (new_view < 0)
|
|
|
|
|
new_view += term->grid->num_rows;
|
|
|
|
|
|
2020-08-12 18:45:35 +02:00
|
|
|
new_view = ensure_view_is_allocated(term, new_view);
|
2020-07-25 11:23:54 +02:00
|
|
|
|
|
|
|
|
/* Don't scroll past scrollback history */
|
2020-08-12 18:45:35 +02:00
|
|
|
int end = (term->grid->offset + term->rows - 1) & (term->grid->num_rows - 1);
|
2020-07-25 11:23:54 +02:00
|
|
|
if (end >= term->grid->offset) {
|
|
|
|
|
/* Not wrapped */
|
|
|
|
|
if (new_view >= term->grid->offset && new_view <= end)
|
|
|
|
|
new_view = term->grid->offset;
|
|
|
|
|
} else {
|
|
|
|
|
if (new_view >= term->grid->offset || new_view <= end)
|
|
|
|
|
new_view = term->grid->offset;
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-12 18:45:35 +02:00
|
|
|
#if defined(_DEBUG)
|
|
|
|
|
/* Verify all to-be-visible rows have been allocated */
|
|
|
|
|
for (int r = 0; r < term->rows; r++)
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(term->grid->rows[(new_view + r) & (term->grid->num_rows - 1)] != NULL);
|
2020-08-12 18:45:35 +02:00
|
|
|
#endif
|
|
|
|
|
|
2020-07-25 11:23:54 +02:00
|
|
|
/* Update view */
|
|
|
|
|
term->grid->view = new_view;
|
|
|
|
|
if (new_view != old_view)
|
|
|
|
|
term_damage_view(term);
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-24 17:49:50 +02:00
|
|
|
/* Selection endpoint is inclusive */
|
|
|
|
|
if (--end_col < 0) {
|
|
|
|
|
end_col = term->cols - 1;
|
|
|
|
|
end_row--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Begin a new selection if the start coords changed */
|
|
|
|
|
if (start_row != term->search.match.row ||
|
|
|
|
|
start_col != term->search.match.col)
|
|
|
|
|
{
|
|
|
|
|
int selection_row = start_row - term->grid->view;
|
|
|
|
|
while (selection_row < 0)
|
|
|
|
|
selection_row += term->grid->num_rows;
|
|
|
|
|
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(selection_row >= 0 &&
|
2020-07-24 17:49:50 +02:00
|
|
|
selection_row < term->grid->num_rows);
|
2021-01-06 10:53:27 +01:00
|
|
|
selection_start(
|
|
|
|
|
term, start_col, selection_row, SELECTION_CHAR_WISE, false);
|
2020-07-24 17:49:50 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Update selection endpoint */
|
|
|
|
|
{
|
|
|
|
|
int selection_row = end_row - term->grid->view;
|
|
|
|
|
while (selection_row < 0)
|
|
|
|
|
selection_row += term->grid->num_rows;
|
|
|
|
|
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(selection_row >= 0 &&
|
2020-07-24 17:49:50 +02:00
|
|
|
selection_row < term->grid->num_rows);
|
|
|
|
|
selection_update(term, end_col, selection_row);
|
|
|
|
|
}
|
2019-12-03 19:40:22 +01:00
|
|
|
}
|
2020-07-08 18:20:34 +02:00
|
|
|
|
2021-01-24 12:02:20 +01:00
|
|
|
static ssize_t
|
|
|
|
|
matches_cell(const struct terminal *term, const struct cell *cell, size_t search_ofs)
|
|
|
|
|
{
|
|
|
|
|
assert(search_ofs < term->search.len);
|
|
|
|
|
|
|
|
|
|
wchar_t base = cell->wc;
|
|
|
|
|
const struct composed *composed = NULL;
|
|
|
|
|
|
composed: store compose chains in a binary search tree
The previous implementation stored compose chains in a dynamically
allocated array. Adding a chain was easy: resize the array and append
the new chain at the end. Looking up a compose chain given a compose
chain key/index was also easy: just index into the array.
However, searching for a pre-existing chain given a codepoint sequence
was very slow. Since the array wasn’t sorted, we typically had to scan
through the entire array, just to realize that there is no
pre-existing chain, and that we need to add a new one.
Since this happens for *each* codepoint in a grapheme cluster, things
quickly became really slow.
Things were ok:ish as long as the compose chain struct was small, as
that made it possible to hold all the chains in the cache. Once the
number of chains reached a certain point, or when we were forced to
bump maximum number of allowed codepoints in a chain, we started
thrashing the cache and things got much much worse.
So what can we do?
We can’t sort the array, because
a) that would invalidate all existing chain keys in the grid (and
iterating the entire scrollback and updating compose keys is *not* an
option).
b) inserting a chain becomes slow as we need to first find _where_ to
insert it, and then memmove() the rest of the array.
This patch uses a binary search tree to store the chains instead of a
simple array.
The tree is sorted on a “key”, which is the XOR of all codepoints,
truncated to the CELL_COMB_CHARS_HI-CELL_COMB_CHARS_LO range.
The grid now stores CELL_COMB_CHARS_LO+key, instead of
CELL_COMB_CHARS_LO+index.
Since the key is truncated, collisions may occur. This is handled by
incrementing the key by 1.
Lookup is of course slower than before, O(log n) instead of
O(1).
Insertion is slightly slower as well: technically it’s O(log n)
instead of O(1). However, we also need to take into account the
re-allocating the array will occasionally force a full copy of the
array when it cannot simply be growed.
But finding a pre-existing chain is now *much* faster: O(log n)
instead of O(n). In most cases, the first lookup will either
succeed (return a true match), or fail (return NULL). However, since
key collisions are possible, it may also return false matches. This
means we need to verify the contents of the chain before deciding to
use it instead of inserting a new chain. But remember that this
comparison was being done for each and every chain in the previous
implementation.
With lookups being much faster, and in particular, no longer requiring
us to check the chain contents for every singlec chain, we can now use
a dynamically allocated ‘chars’ array in the chain. This was
previously a hardcoded array of 10 chars.
Using a dynamic allocated array means looking in the array is slower,
since we now need two loads: one to load the pointer, and a second to
load _from_ the pointer.
As a result, the base size of a compose chain (i.e. an “empty” chain)
has now been reduced from 48 bytes to 32. A chain with two codepoints
is 40 bytes. This means we have up to 4 codepoints while still using
less, or the same amount, of memory as before.
Furthermore, the Unicode random test (i.e. write random “unicode”
chars) is now **faster** than current master (i.e. before text-shaping
support was added), **with** test-shaping enabled. With text-shaping
disabled, we’re _even_ faster.
2021-06-24 13:17:07 +02:00
|
|
|
if (base >= CELL_COMB_CHARS_LO && base <= CELL_COMB_CHARS_HI)
|
2021-01-24 12:02:20 +01:00
|
|
|
{
|
composed: store compose chains in a binary search tree
The previous implementation stored compose chains in a dynamically
allocated array. Adding a chain was easy: resize the array and append
the new chain at the end. Looking up a compose chain given a compose
chain key/index was also easy: just index into the array.
However, searching for a pre-existing chain given a codepoint sequence
was very slow. Since the array wasn’t sorted, we typically had to scan
through the entire array, just to realize that there is no
pre-existing chain, and that we need to add a new one.
Since this happens for *each* codepoint in a grapheme cluster, things
quickly became really slow.
Things were ok:ish as long as the compose chain struct was small, as
that made it possible to hold all the chains in the cache. Once the
number of chains reached a certain point, or when we were forced to
bump maximum number of allowed codepoints in a chain, we started
thrashing the cache and things got much much worse.
So what can we do?
We can’t sort the array, because
a) that would invalidate all existing chain keys in the grid (and
iterating the entire scrollback and updating compose keys is *not* an
option).
b) inserting a chain becomes slow as we need to first find _where_ to
insert it, and then memmove() the rest of the array.
This patch uses a binary search tree to store the chains instead of a
simple array.
The tree is sorted on a “key”, which is the XOR of all codepoints,
truncated to the CELL_COMB_CHARS_HI-CELL_COMB_CHARS_LO range.
The grid now stores CELL_COMB_CHARS_LO+key, instead of
CELL_COMB_CHARS_LO+index.
Since the key is truncated, collisions may occur. This is handled by
incrementing the key by 1.
Lookup is of course slower than before, O(log n) instead of
O(1).
Insertion is slightly slower as well: technically it’s O(log n)
instead of O(1). However, we also need to take into account the
re-allocating the array will occasionally force a full copy of the
array when it cannot simply be growed.
But finding a pre-existing chain is now *much* faster: O(log n)
instead of O(n). In most cases, the first lookup will either
succeed (return a true match), or fail (return NULL). However, since
key collisions are possible, it may also return false matches. This
means we need to verify the contents of the chain before deciding to
use it instead of inserting a new chain. But remember that this
comparison was being done for each and every chain in the previous
implementation.
With lookups being much faster, and in particular, no longer requiring
us to check the chain contents for every singlec chain, we can now use
a dynamically allocated ‘chars’ array in the chain. This was
previously a hardcoded array of 10 chars.
Using a dynamic allocated array means looking in the array is slower,
since we now need two loads: one to load the pointer, and a second to
load _from_ the pointer.
As a result, the base size of a compose chain (i.e. an “empty” chain)
has now been reduced from 48 bytes to 32. A chain with two codepoints
is 40 bytes. This means we have up to 4 codepoints while still using
less, or the same amount, of memory as before.
Furthermore, the Unicode random test (i.e. write random “unicode”
chars) is now **faster** than current master (i.e. before text-shaping
support was added), **with** test-shaping enabled. With text-shaping
disabled, we’re _even_ faster.
2021-06-24 13:17:07 +02:00
|
|
|
composed = composed_lookup(term->composed, base - CELL_COMB_CHARS_LO);
|
2020-08-20 19:25:35 +02:00
|
|
|
base = composed->chars[0];
|
2021-01-24 12:02:20 +01:00
|
|
|
}
|
|
|
|
|
|
2021-03-27 22:15:44 +01:00
|
|
|
if (composed == NULL && base == 0 && term->search.buf[search_ofs] == L' ')
|
|
|
|
|
return 1;
|
|
|
|
|
|
2021-01-24 12:02:20 +01:00
|
|
|
if (wcsncasecmp(&base, &term->search.buf[search_ofs], 1) != 0)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
if (composed != NULL) {
|
|
|
|
|
if (search_ofs + 1 + composed->count > term->search.len)
|
|
|
|
|
return -1;
|
|
|
|
|
|
2020-08-20 19:25:35 +02:00
|
|
|
for (size_t j = 1; j < composed->count; j++) {
|
|
|
|
|
if (composed->chars[j] != term->search.buf[search_ofs + 1 + j])
|
2021-01-24 12:02:20 +01:00
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return composed != NULL ? 1 + composed->count : 1;
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-27 19:33:19 +02:00
|
|
|
static void
|
2019-12-03 19:24:33 +01:00
|
|
|
search_find_next(struct terminal *term)
|
2019-08-27 19:33:19 +02:00
|
|
|
{
|
2019-08-30 20:15:12 +02:00
|
|
|
bool backward = term->search.direction == SEARCH_BACKWARD;
|
|
|
|
|
term->search.direction = SEARCH_BACKWARD;
|
|
|
|
|
|
2019-08-27 19:33:19 +02:00
|
|
|
if (term->search.len == 0) {
|
|
|
|
|
term->search.match = (struct coord){-1, -1};
|
|
|
|
|
term->search.match_len = 0;
|
|
|
|
|
selection_cancel(term);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int start_row = term->search.match.row;
|
|
|
|
|
int start_col = term->search.match.col;
|
2020-07-24 17:49:50 +02:00
|
|
|
size_t len = term->search.match_len;
|
2019-08-27 19:33:19 +02:00
|
|
|
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert((len == 0 && start_row == -1 && start_col == -1) ||
|
2019-08-27 19:33:19 +02:00
|
|
|
(len > 0 && start_row >= 0 && start_col >= 0));
|
|
|
|
|
|
|
|
|
|
if (len == 0) {
|
2019-08-30 20:15:12 +02:00
|
|
|
if (backward) {
|
|
|
|
|
start_row = grid_row_absolute_in_view(term->grid, term->rows - 1);
|
|
|
|
|
start_col = term->cols - 1;
|
|
|
|
|
} else {
|
|
|
|
|
start_row = grid_row_absolute_in_view(term->grid, 0);
|
|
|
|
|
start_col = 0;
|
|
|
|
|
}
|
2019-08-27 19:33:19 +02:00
|
|
|
}
|
|
|
|
|
|
2019-08-30 20:15:12 +02:00
|
|
|
LOG_DBG("search: update: %s: starting at row=%d col=%d (offset = %d, view = %d)",
|
|
|
|
|
backward ? "backward" : "forward", start_row, start_col,
|
|
|
|
|
term->grid->offset, term->grid->view);
|
2019-08-27 19:33:19 +02:00
|
|
|
|
2020-08-12 18:45:35 +02:00
|
|
|
#define ROW_DEC(_r) ((_r) = ((_r) - 1 + term->grid->num_rows) & (term->grid->num_rows - 1))
|
|
|
|
|
#define ROW_INC(_r) ((_r) = ((_r) + 1) & (term->grid->num_rows - 1))
|
2019-08-27 21:09:37 +02:00
|
|
|
|
2019-08-27 19:33:19 +02:00
|
|
|
/* Scan backward from current end-of-output */
|
2019-08-28 17:26:30 +02:00
|
|
|
/* TODO: don't search "scrollback" in alt screen? */
|
2019-08-30 20:15:12 +02:00
|
|
|
for (size_t r = 0;
|
|
|
|
|
r < term->grid->num_rows;
|
|
|
|
|
backward ? ROW_DEC(start_row) : ROW_INC(start_row), r++)
|
|
|
|
|
{
|
|
|
|
|
for (;
|
|
|
|
|
backward ? start_col >= 0 : start_col < term->cols;
|
|
|
|
|
backward ? start_col-- : start_col++)
|
|
|
|
|
{
|
2019-12-03 20:00:38 +01:00
|
|
|
const struct row *row = term->grid->rows[start_row];
|
|
|
|
|
if (row == NULL)
|
|
|
|
|
continue;
|
|
|
|
|
|
2021-01-24 12:02:20 +01:00
|
|
|
if (matches_cell(term, &row->cells[start_col], 0) < 0)
|
2019-08-27 19:33:19 +02:00
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Got a match on the first letter. Now we'll see if the
|
|
|
|
|
* rest of the search buffer matches.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
LOG_DBG("search: initial match at row=%d, col=%d", start_row, start_col);
|
|
|
|
|
|
|
|
|
|
int end_row = start_row;
|
|
|
|
|
int end_col = start_col;
|
|
|
|
|
size_t match_len = 0;
|
|
|
|
|
|
2021-01-24 12:02:20 +01:00
|
|
|
for (size_t i = 0; i < term->search.len;) {
|
2019-12-03 19:17:51 +01:00
|
|
|
if (end_col >= term->cols) {
|
2021-03-30 14:29:48 +02:00
|
|
|
end_row = (end_row + 1) & (term->grid->num_rows - 1);
|
2019-08-27 19:33:19 +02:00
|
|
|
end_col = 0;
|
2021-03-28 20:59:35 +02:00
|
|
|
|
|
|
|
|
if (has_wrapped_around(term, end_row))
|
|
|
|
|
break;
|
|
|
|
|
|
2019-08-27 19:33:19 +02:00
|
|
|
row = term->grid->rows[end_row];
|
|
|
|
|
}
|
2019-12-03 19:17:51 +01:00
|
|
|
|
term: rename CELL_MULT_COL_SPACER -> CELL_SPACER, and change its definition
Instead of using CELL_SPACER for *all* cells that previously used
CELL_MULT_COL_SPACER, include the remaining number of spacers
following, and including, itself. This is encoded by adding to the
CELL_SPACER value.
So, a double width character will now store the character itself in
the first cell (just like before), and CELL_SPACER+1 in the second
cell.
A three-cell character would store the character itself, then
CELL_SPACER+2, and finally CELL_SPACER+1.
In other words, the last spacer is always CELL_SPACER+1.
CELL_SPACER+0 is used when padding at the right margin. I.e. when
writing e.g. a double width character in the last column, we insert a
CELL_SPACER+0 pad character, and then write the double width character
in the first column on the next row.
2021-05-14 14:41:02 +02:00
|
|
|
if (row->cells[end_col].wc >= CELL_SPACER) {
|
2021-01-26 20:05:14 +01:00
|
|
|
end_col++;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-24 12:02:20 +01:00
|
|
|
ssize_t additional_chars = matches_cell(term, &row->cells[end_col], i);
|
|
|
|
|
if (additional_chars < 0)
|
2019-12-03 19:17:51 +01:00
|
|
|
break;
|
|
|
|
|
|
2021-01-24 12:02:20 +01:00
|
|
|
i += additional_chars;
|
|
|
|
|
match_len += additional_chars;
|
2019-12-03 19:17:51 +01:00
|
|
|
end_col++;
|
2019-08-27 19:33:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (match_len != term->search.len) {
|
|
|
|
|
/* Didn't match (completely) */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* We matched the entire buffer. Move view to ensure the
|
|
|
|
|
* match is visible, create a selection and return.
|
|
|
|
|
*/
|
2019-12-03 19:40:22 +01:00
|
|
|
search_update_selection(term, start_row, start_col, end_row, end_col);
|
2019-08-27 19:33:19 +02:00
|
|
|
|
|
|
|
|
/* Update match state */
|
|
|
|
|
term->search.match.row = start_row;
|
|
|
|
|
term->search.match.col = start_col;
|
|
|
|
|
term->search.match_len = match_len;
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-30 20:15:12 +02:00
|
|
|
start_col = backward ? term->cols - 1 : 0;
|
2019-08-27 19:33:19 +02:00
|
|
|
}
|
2019-08-27 19:58:44 +02:00
|
|
|
|
|
|
|
|
/* No match */
|
2019-08-27 21:09:37 +02:00
|
|
|
LOG_DBG("no match");
|
2019-08-27 19:58:44 +02:00
|
|
|
term->search.match = (struct coord){-1, -1};
|
|
|
|
|
term->search.match_len = 0;
|
|
|
|
|
selection_cancel(term);
|
2019-08-27 21:09:37 +02:00
|
|
|
#undef ROW_DEC
|
2019-08-27 19:33:19 +02:00
|
|
|
}
|
2020-07-08 18:20:34 +02:00
|
|
|
|
2020-12-05 11:49:32 +01:00
|
|
|
void
|
|
|
|
|
search_add_chars(struct terminal *term, const char *src, size_t count)
|
2020-11-01 12:39:57 +01:00
|
|
|
{
|
2021-01-24 11:32:45 +01:00
|
|
|
const char *_src = src;
|
2020-11-01 12:39:57 +01:00
|
|
|
mbstate_t ps = {0};
|
2021-01-24 11:32:45 +01:00
|
|
|
size_t wchars = mbsnrtowcs(NULL, &_src, count, 0, &ps);
|
2020-11-01 12:39:57 +01:00
|
|
|
|
|
|
|
|
if (wchars == -1) {
|
|
|
|
|
LOG_ERRNO("failed to convert %.*s to wchars", (int)count, src);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-24 11:32:45 +01:00
|
|
|
_src = src;
|
|
|
|
|
ps = (mbstate_t){0};
|
|
|
|
|
wchar_t wcs[wchars + 1];
|
|
|
|
|
mbsnrtowcs(wcs, &_src, count, wchars, &ps);
|
|
|
|
|
|
|
|
|
|
/* Strip non-printable characters */
|
|
|
|
|
for (size_t i = 0, j = 0, orig_wchars = wchars; i < orig_wchars; i++) {
|
|
|
|
|
if (iswprint(wcs[i]))
|
|
|
|
|
wcs[j++] = wcs[i];
|
|
|
|
|
else
|
|
|
|
|
wchars--;
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-01 12:39:57 +01:00
|
|
|
if (!search_ensure_size(term, term->search.len + wchars))
|
|
|
|
|
return;
|
|
|
|
|
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(term->search.len + wchars < term->search.sz);
|
2020-11-01 12:39:57 +01:00
|
|
|
|
|
|
|
|
memmove(&term->search.buf[term->search.cursor + wchars],
|
|
|
|
|
&term->search.buf[term->search.cursor],
|
|
|
|
|
(term->search.len - term->search.cursor) * sizeof(wchar_t));
|
|
|
|
|
|
2021-01-24 11:32:45 +01:00
|
|
|
memcpy(&term->search.buf[term->search.cursor], wcs, wchars * sizeof(wchar_t));
|
2020-11-01 12:39:57 +01:00
|
|
|
|
|
|
|
|
term->search.len += wchars;
|
|
|
|
|
term->search.cursor += wchars;
|
|
|
|
|
term->search.buf[term->search.len] = L'\0';
|
|
|
|
|
}
|
|
|
|
|
|
2019-12-03 19:22:47 +01:00
|
|
|
static void
|
2019-12-03 19:43:45 +01:00
|
|
|
search_match_to_end_of_word(struct terminal *term, bool spaces_only)
|
2019-12-03 19:22:47 +01:00
|
|
|
{
|
|
|
|
|
if (term->search.match_len == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
2021-03-28 21:06:21 +02:00
|
|
|
xassert(term->selection.end.row != -1);
|
2019-12-03 19:22:47 +01:00
|
|
|
|
2021-03-28 21:06:21 +02:00
|
|
|
const bool move_cursor = term->search.cursor == term->search.len;
|
2019-12-03 19:22:47 +01:00
|
|
|
|
2021-03-28 21:06:21 +02:00
|
|
|
const struct coord old_end = term->selection.end;
|
|
|
|
|
struct coord new_end = old_end;
|
2021-03-30 13:49:30 +02:00
|
|
|
struct row *row = NULL;
|
|
|
|
|
|
|
|
|
|
#define newline(coord) __extension__ \
|
|
|
|
|
({ \
|
|
|
|
|
bool wrapped_around = false; \
|
|
|
|
|
if (++(coord).col >= term->cols) { \
|
|
|
|
|
(coord).row = ((coord).row + 1) & (term->grid->num_rows - 1); \
|
|
|
|
|
(coord).col = 0; \
|
|
|
|
|
row = term->grid->rows[(coord).row]; \
|
|
|
|
|
if (has_wrapped_around(term, (coord.row))) \
|
|
|
|
|
wrapped_around = true; \
|
|
|
|
|
} \
|
|
|
|
|
wrapped_around; \
|
|
|
|
|
})
|
2019-12-03 19:22:47 +01:00
|
|
|
|
2021-03-28 21:06:21 +02:00
|
|
|
/* First character to consider is the *next* character */
|
2021-03-30 13:49:30 +02:00
|
|
|
if (newline(new_end))
|
|
|
|
|
return;
|
2019-12-03 19:22:47 +01:00
|
|
|
|
2021-03-28 21:06:21 +02:00
|
|
|
xassert(term->grid->rows[new_end.row] != NULL);
|
2019-12-03 19:22:47 +01:00
|
|
|
|
2021-03-28 21:15:39 +02:00
|
|
|
/* Find next word boundary */
|
2021-03-28 21:06:21 +02:00
|
|
|
new_end.row -= term->grid->view;
|
|
|
|
|
selection_find_word_boundary_right(term, &new_end, spaces_only);
|
|
|
|
|
new_end.row += term->grid->view;
|
2021-01-26 20:05:14 +01:00
|
|
|
|
2021-03-28 21:06:21 +02:00
|
|
|
struct coord pos = old_end;
|
2021-03-30 13:49:30 +02:00
|
|
|
row = term->grid->rows[pos.row];
|
2019-12-03 19:22:47 +01:00
|
|
|
|
2021-03-30 14:40:21 +02:00
|
|
|
struct extraction_context *ctx = extract_begin(SELECTION_NONE, false);
|
2021-03-28 21:06:21 +02:00
|
|
|
if (ctx == NULL)
|
|
|
|
|
return;
|
2021-01-26 20:26:34 +01:00
|
|
|
|
2021-03-28 21:06:21 +02:00
|
|
|
do {
|
2021-03-30 13:49:30 +02:00
|
|
|
if (newline(pos))
|
|
|
|
|
break;
|
2021-03-28 21:06:21 +02:00
|
|
|
if (!extract_one(term, row, &row->cells[pos.col], pos.col, ctx))
|
2019-12-03 19:22:47 +01:00
|
|
|
break;
|
2021-03-28 21:06:21 +02:00
|
|
|
} while (pos.col != new_end.col || pos.row != new_end.row);
|
2019-12-03 20:26:32 +01:00
|
|
|
|
2021-03-28 21:06:21 +02:00
|
|
|
wchar_t *new_text;
|
|
|
|
|
size_t new_len;
|
2019-12-03 19:22:47 +01:00
|
|
|
|
2021-03-30 14:40:21 +02:00
|
|
|
if (!extract_finish_wide(ctx, &new_text, &new_len))
|
2019-12-03 19:22:47 +01:00
|
|
|
return;
|
|
|
|
|
|
2021-03-28 21:06:21 +02:00
|
|
|
if (!search_ensure_size(term, term->search.len + new_len))
|
2019-12-03 19:22:47 +01:00
|
|
|
return;
|
|
|
|
|
|
2021-03-28 21:11:07 +02:00
|
|
|
for (size_t i = 0; i < new_len; i++) {
|
|
|
|
|
if (new_text[i] == L'\n') {
|
|
|
|
|
/* extract() adds newlines, which we never match against */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-28 21:06:21 +02:00
|
|
|
term->search.buf[term->search.len++] = new_text[i];
|
2021-03-28 21:11:07 +02:00
|
|
|
}
|
2019-12-03 19:22:47 +01:00
|
|
|
|
|
|
|
|
term->search.buf[term->search.len] = L'\0';
|
2021-03-28 21:06:21 +02:00
|
|
|
free(new_text);
|
2019-12-03 19:22:47 +01:00
|
|
|
|
|
|
|
|
if (move_cursor)
|
2021-03-28 21:06:21 +02:00
|
|
|
term->search.cursor = term->search.len;
|
2019-12-03 19:22:47 +01:00
|
|
|
|
2021-03-30 14:40:59 +02:00
|
|
|
/* search_update_selection() expected end coordinate to be *exclusive* */
|
|
|
|
|
newline(new_end);
|
2019-12-03 19:40:22 +01:00
|
|
|
search_update_selection(
|
2021-03-28 21:06:21 +02:00
|
|
|
term, term->search.match.row, term->search.match.col,
|
|
|
|
|
new_end.row, new_end.col);
|
2021-03-30 13:49:30 +02:00
|
|
|
|
2021-03-30 14:40:59 +02:00
|
|
|
term->search.match_len = term->search.len;
|
|
|
|
|
|
2021-03-30 13:49:30 +02:00
|
|
|
#undef newline
|
2019-12-03 19:22:47 +01:00
|
|
|
}
|
2020-07-08 18:20:34 +02:00
|
|
|
|
2019-08-30 19:36:37 +02:00
|
|
|
static size_t
|
|
|
|
|
distance_next_word(const struct terminal *term)
|
|
|
|
|
{
|
|
|
|
|
size_t cursor = term->search.cursor;
|
|
|
|
|
|
|
|
|
|
/* First eat non-whitespace. This is the word we're skipping past */
|
|
|
|
|
while (cursor < term->search.len) {
|
|
|
|
|
if (iswspace(term->search.buf[cursor++]))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(cursor == term->search.len || iswspace(term->search.buf[cursor - 1]));
|
2019-08-30 19:36:37 +02:00
|
|
|
|
|
|
|
|
/* Now skip past whitespace, so that we end up at the beginning of
|
|
|
|
|
* the next word */
|
|
|
|
|
while (cursor < term->search.len) {
|
|
|
|
|
if (!iswspace(term->search.buf[cursor++]))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(cursor == term->search.len || !iswspace(term->search.buf[cursor - 1]));
|
2019-08-30 19:36:37 +02:00
|
|
|
|
|
|
|
|
if (cursor < term->search.len && !iswspace(term->search.buf[cursor]))
|
|
|
|
|
cursor--;
|
|
|
|
|
|
|
|
|
|
return cursor - term->search.cursor;
|
|
|
|
|
}
|
2020-07-08 18:20:34 +02:00
|
|
|
|
2019-08-30 19:36:37 +02:00
|
|
|
static size_t
|
|
|
|
|
distance_prev_word(const struct terminal *term)
|
|
|
|
|
{
|
|
|
|
|
int cursor = term->search.cursor;
|
|
|
|
|
|
|
|
|
|
/* First, eat whitespace prefix */
|
|
|
|
|
while (cursor > 0) {
|
|
|
|
|
if (!iswspace(term->search.buf[--cursor]))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(cursor == 0 || !iswspace(term->search.buf[cursor]));
|
2019-08-30 19:36:37 +02:00
|
|
|
|
|
|
|
|
/* Now eat non-whitespace. This is the word we're skipping past */
|
|
|
|
|
while (cursor > 0) {
|
|
|
|
|
if (iswspace(term->search.buf[--cursor]))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(cursor == 0 || iswspace(term->search.buf[cursor]));
|
2019-08-30 19:42:48 +02:00
|
|
|
if (cursor > 0 && iswspace(term->search.buf[cursor]))
|
2019-08-30 19:36:37 +02:00
|
|
|
cursor++;
|
|
|
|
|
|
|
|
|
|
return term->search.cursor - cursor;
|
|
|
|
|
}
|
2020-07-08 18:20:34 +02:00
|
|
|
|
2020-11-01 12:39:57 +01:00
|
|
|
static void
|
|
|
|
|
from_clipboard_cb(char *text, size_t size, void *user)
|
|
|
|
|
{
|
|
|
|
|
struct terminal *term = user;
|
2020-12-05 11:49:32 +01:00
|
|
|
search_add_chars(term, text, size);
|
2020-11-01 12:39:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
from_clipboard_done(void *user)
|
|
|
|
|
{
|
|
|
|
|
struct terminal *term = user;
|
|
|
|
|
|
|
|
|
|
LOG_DBG("search: buffer: %ls", term->search.buf);
|
|
|
|
|
search_find_next(term);
|
|
|
|
|
render_refresh_search(term);
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
static bool
|
2020-07-22 17:51:27 +02:00
|
|
|
execute_binding(struct seat *seat, struct terminal *term,
|
2021-01-24 20:31:22 +01:00
|
|
|
enum bind_action_search action, uint32_t serial,
|
|
|
|
|
bool *update_search_result, bool *redraw)
|
2019-08-27 17:23:28 +02:00
|
|
|
{
|
2021-01-24 20:31:22 +01:00
|
|
|
*update_search_result = *redraw = false;
|
|
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
switch (action) {
|
|
|
|
|
case BIND_ACTION_SEARCH_NONE:
|
|
|
|
|
return false;
|
2020-03-08 15:28:47 +01:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_CANCEL:
|
2019-08-27 19:33:19 +02:00
|
|
|
if (term->search.view_followed_offset)
|
|
|
|
|
term->grid->view = term->grid->offset;
|
2020-08-12 18:45:35 +02:00
|
|
|
else {
|
|
|
|
|
term->grid->view = ensure_view_is_allocated(
|
|
|
|
|
term, term->search.original_view);
|
|
|
|
|
}
|
2019-08-27 19:33:19 +02:00
|
|
|
term_damage_view(term);
|
2019-08-27 17:23:28 +02:00
|
|
|
search_cancel(term);
|
2020-03-18 15:30:14 +01:00
|
|
|
return true;
|
2019-08-27 19:33:19 +02:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_COMMIT:
|
2020-07-22 17:51:27 +02:00
|
|
|
selection_finalize(seat, term, serial);
|
2019-08-29 19:34:41 +02:00
|
|
|
search_cancel_keep_selection(term);
|
2020-03-18 15:30:14 +01:00
|
|
|
return true;
|
2019-08-27 19:33:19 +02:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_FIND_PREV:
|
2019-08-27 19:33:19 +02:00
|
|
|
if (term->search.match_len > 0) {
|
|
|
|
|
int new_col = term->search.match.col - 1;
|
|
|
|
|
int new_row = term->search.match.row;
|
|
|
|
|
|
|
|
|
|
if (new_col < 0) {
|
|
|
|
|
new_col = term->cols - 1;
|
|
|
|
|
new_row--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (new_row >= 0) {
|
|
|
|
|
term->search.match.col = new_col;
|
|
|
|
|
term->search.match.row = new_row;
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-01-24 20:31:22 +01:00
|
|
|
*update_search_result = *redraw = true;
|
|
|
|
|
return true;
|
2019-08-27 17:23:28 +02:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_FIND_NEXT:
|
2019-08-30 20:15:36 +02:00
|
|
|
if (term->search.match_len > 0) {
|
|
|
|
|
int new_col = term->search.match.col + 1;
|
|
|
|
|
int new_row = term->search.match.row;
|
|
|
|
|
|
|
|
|
|
if (new_col >= term->cols) {
|
|
|
|
|
new_col = 0;
|
|
|
|
|
new_row++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (new_row < term->grid->num_rows) {
|
|
|
|
|
term->search.match.col = new_col;
|
|
|
|
|
term->search.match.row = new_row;
|
|
|
|
|
term->search.direction = SEARCH_FORWARD;
|
2021-01-24 20:31:22 +01:00
|
|
|
}
|
2019-08-30 20:15:36 +02:00
|
|
|
}
|
2021-01-24 20:31:22 +01:00
|
|
|
*update_search_result = *redraw = true;
|
|
|
|
|
return true;
|
2019-08-30 20:15:36 +02:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_EDIT_LEFT:
|
2021-01-24 20:31:22 +01:00
|
|
|
if (term->search.cursor > 0) {
|
2019-08-29 21:05:18 +02:00
|
|
|
term->search.cursor--;
|
2021-01-24 20:31:22 +01:00
|
|
|
*redraw = true;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
2019-08-29 21:05:18 +02:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_EDIT_LEFT_WORD: {
|
2019-08-30 19:37:18 +02:00
|
|
|
size_t diff = distance_prev_word(term);
|
|
|
|
|
term->search.cursor -= diff;
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(term->search.cursor <= term->search.len);
|
2021-01-24 20:31:22 +01:00
|
|
|
|
|
|
|
|
if (diff > 0)
|
|
|
|
|
*redraw = true;
|
|
|
|
|
return true;
|
2019-08-30 19:37:18 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_EDIT_RIGHT:
|
2021-01-24 20:31:22 +01:00
|
|
|
if (term->search.cursor < term->search.len) {
|
2019-08-29 21:05:18 +02:00
|
|
|
term->search.cursor++;
|
2021-01-24 20:31:22 +01:00
|
|
|
*redraw = true;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
2019-08-29 21:05:18 +02:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_EDIT_RIGHT_WORD: {
|
2019-08-30 19:37:18 +02:00
|
|
|
size_t diff = distance_next_word(term);
|
|
|
|
|
term->search.cursor += diff;
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(term->search.cursor <= term->search.len);
|
2021-01-24 20:31:22 +01:00
|
|
|
|
|
|
|
|
if (diff > 0)
|
|
|
|
|
*redraw = true;
|
|
|
|
|
return true;
|
2019-08-30 19:37:18 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_EDIT_HOME:
|
2021-01-24 20:31:22 +01:00
|
|
|
if (term->search.cursor != 0) {
|
|
|
|
|
term->search.cursor = 0;
|
|
|
|
|
*redraw = true;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
2019-08-29 21:05:18 +02:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_EDIT_END:
|
2021-01-24 20:31:22 +01:00
|
|
|
if (term->search.cursor != term->search.len) {
|
|
|
|
|
term->search.cursor = term->search.len;
|
|
|
|
|
*redraw = true;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
2019-08-29 21:05:18 +02:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_DELETE_PREV:
|
2019-08-29 21:05:18 +02:00
|
|
|
if (term->search.cursor > 0) {
|
|
|
|
|
memmove(
|
|
|
|
|
&term->search.buf[term->search.cursor - 1],
|
|
|
|
|
&term->search.buf[term->search.cursor],
|
|
|
|
|
(term->search.len - term->search.cursor) * sizeof(wchar_t));
|
|
|
|
|
term->search.cursor--;
|
2019-08-27 17:23:28 +02:00
|
|
|
term->search.buf[--term->search.len] = L'\0';
|
2021-01-24 20:31:22 +01:00
|
|
|
*update_search_result = *redraw = true;
|
2019-08-29 21:05:18 +02:00
|
|
|
}
|
2021-01-24 20:31:22 +01:00
|
|
|
return true;
|
2019-08-29 21:05:18 +02:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_DELETE_PREV_WORD: {
|
2019-08-30 19:37:06 +02:00
|
|
|
size_t diff = distance_prev_word(term);
|
|
|
|
|
size_t old_cursor = term->search.cursor;
|
|
|
|
|
size_t new_cursor = old_cursor - diff;
|
|
|
|
|
|
2021-01-24 20:31:22 +01:00
|
|
|
if (diff > 0) {
|
|
|
|
|
memmove(&term->search.buf[new_cursor],
|
|
|
|
|
&term->search.buf[old_cursor],
|
|
|
|
|
(term->search.len - old_cursor) * sizeof(wchar_t));
|
2019-08-30 19:37:06 +02:00
|
|
|
|
2021-01-24 20:31:22 +01:00
|
|
|
term->search.len -= diff;
|
|
|
|
|
term->search.cursor = new_cursor;
|
|
|
|
|
*update_search_result = *redraw = true;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
2019-08-29 21:05:18 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_DELETE_NEXT:
|
|
|
|
|
if (term->search.cursor < term->search.len) {
|
|
|
|
|
memmove(
|
|
|
|
|
&term->search.buf[term->search.cursor],
|
|
|
|
|
&term->search.buf[term->search.cursor + 1],
|
|
|
|
|
(term->search.len - term->search.cursor - 1) * sizeof(wchar_t));
|
|
|
|
|
term->search.buf[--term->search.len] = L'\0';
|
2021-01-24 20:31:22 +01:00
|
|
|
*update_search_result = *redraw = true;
|
2020-03-18 15:30:14 +01:00
|
|
|
}
|
2021-01-24 20:31:22 +01:00
|
|
|
return true;
|
2020-03-18 15:30:14 +01:00
|
|
|
|
|
|
|
|
case BIND_ACTION_SEARCH_DELETE_NEXT_WORD: {
|
2019-08-30 19:37:06 +02:00
|
|
|
size_t diff = distance_next_word(term);
|
|
|
|
|
size_t cursor = term->search.cursor;
|
|
|
|
|
|
2021-01-24 20:31:22 +01:00
|
|
|
if (diff > 0) {
|
|
|
|
|
memmove(&term->search.buf[cursor],
|
|
|
|
|
&term->search.buf[cursor + diff],
|
|
|
|
|
(term->search.len - (cursor + diff)) * sizeof(wchar_t));
|
2019-08-30 19:37:06 +02:00
|
|
|
|
2021-01-24 20:31:22 +01:00
|
|
|
term->search.len -= diff;
|
|
|
|
|
*update_search_result = *redraw = true;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
2019-08-29 21:05:18 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_EXTEND_WORD:
|
2019-12-03 19:43:45 +01:00
|
|
|
search_match_to_end_of_word(term, false);
|
2021-03-30 14:40:59 +02:00
|
|
|
*update_search_result = false;
|
|
|
|
|
*redraw = true;
|
2021-01-24 20:31:22 +01:00
|
|
|
return true;
|
2019-12-03 19:43:45 +01:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_EXTEND_WORD_WS:
|
2019-12-03 19:43:45 +01:00
|
|
|
search_match_to_end_of_word(term, true);
|
2021-03-30 14:40:59 +02:00
|
|
|
*update_search_result = false;
|
|
|
|
|
*redraw = true;
|
2021-01-24 20:31:22 +01:00
|
|
|
return true;
|
2019-12-03 19:22:47 +01:00
|
|
|
|
2020-11-01 12:39:57 +01:00
|
|
|
case BIND_ACTION_SEARCH_CLIPBOARD_PASTE:
|
|
|
|
|
text_from_clipboard(
|
|
|
|
|
seat, term, &from_clipboard_cb, &from_clipboard_done, term);
|
2021-01-24 20:31:22 +01:00
|
|
|
*update_search_result = *redraw = true;
|
|
|
|
|
return true;
|
2020-11-01 12:39:57 +01:00
|
|
|
|
|
|
|
|
case BIND_ACTION_SEARCH_PRIMARY_PASTE:
|
|
|
|
|
text_from_primary(
|
|
|
|
|
seat, term, &from_clipboard_cb, &from_clipboard_done, term);
|
2021-01-24 20:31:22 +01:00
|
|
|
*update_search_result = *redraw = true;
|
|
|
|
|
return true;
|
2020-11-01 12:39:57 +01:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
case BIND_ACTION_SEARCH_COUNT:
|
2021-02-09 15:16:19 +00:00
|
|
|
BUG("Invalid action type");
|
2021-01-24 20:31:22 +01:00
|
|
|
return true;
|
2020-03-18 15:30:14 +01:00
|
|
|
}
|
2019-08-27 17:23:28 +02:00
|
|
|
|
2021-02-09 15:16:19 +00:00
|
|
|
BUG("Unhandled action type");
|
2020-03-18 15:30:14 +01:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2020-07-08 18:20:34 +02:00
|
|
|
search_input(struct seat *seat, struct terminal *term, uint32_t key,
|
input: rewrite of how we match foot’s own key bindings
Bindings are matched in one out of three ways:
* By translated (by XKB) symbols
* By untranslated symbols
* By raw key codes
A translated symbol is affected by pressed modifiers, some of which
can be “consumed”. Consumed modifiers to not partake in the comparison
with the binding’s modifiers. In this mode, ctrl+shift+2 maps to
ctrl+@ on a US layout.
Untranslated symbols, or un-shifted symbols refer to the “base” symbol
of the pressed key, i.e. it’s unaffected by modifiers. In this mode,
consumed modifiers *do* partake in the comparison with the binding’s
modifiers, and ctrl+shift+2 maps to ctrl+shift+2 on a US layout.
More examples: ctrl+shift+u maps to ctrl+U in the translated lookup,
while ctrl+shift+u maps to ctrl+shift+u in the untranslated lookup.
Finally, we also match raw key codes. This allows our bindings to work
using the same physical keys when the user switches between latin and
non-latin layouts.
This means key bindings in foot.ini *must* not include both +shift+
and a *shifted* key. I.e. ctrl+shift+U is not a valid combo as it
cannot be triggered. Unfortunately, this was how you were supposed to
write bindings up until now... so, we try to detect such bindings, log
a deprecation warning and then “fix” the binding for the user.
When specifying bindings in foot.ini, both ctrl+U and ctrl+shift+u are
valid, and will work. The latter is preferred though, since we cannot
detect the raw key code for the former variant. Personally, I also
prefer the latter one because it is more explicit; it’s more obvious
which keys are involved.
However, in some cases it makes more sense to use the other
variant. Typically for non-letter combos.
2021-02-27 20:42:31 +01:00
|
|
|
xkb_keysym_t sym, xkb_mod_mask_t mods, xkb_mod_mask_t consumed,
|
|
|
|
|
const xkb_keysym_t *raw_syms, size_t raw_count,
|
|
|
|
|
uint32_t serial)
|
2020-03-18 15:30:14 +01:00
|
|
|
{
|
|
|
|
|
LOG_DBG("search: input: sym=%d/0x%x, mods=0x%08x", sym, sym, mods);
|
|
|
|
|
|
2021-06-16 17:44:14 +02:00
|
|
|
enum xkb_compose_status compose_status = seat->kbd.xkb_compose_state != NULL
|
|
|
|
|
? xkb_compose_state_get_status(seat->kbd.xkb_compose_state)
|
|
|
|
|
: XKB_COMPOSE_NOTHING;
|
2019-08-27 17:23:28 +02:00
|
|
|
|
2021-01-24 20:31:22 +01:00
|
|
|
bool update_search_result = false;
|
|
|
|
|
bool redraw = false;
|
|
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
/* Key bindings */
|
2020-07-08 18:20:34 +02:00
|
|
|
tll_foreach(seat->kbd.bindings.search, it) {
|
input: rewrite of how we match foot’s own key bindings
Bindings are matched in one out of three ways:
* By translated (by XKB) symbols
* By untranslated symbols
* By raw key codes
A translated symbol is affected by pressed modifiers, some of which
can be “consumed”. Consumed modifiers to not partake in the comparison
with the binding’s modifiers. In this mode, ctrl+shift+2 maps to
ctrl+@ on a US layout.
Untranslated symbols, or un-shifted symbols refer to the “base” symbol
of the pressed key, i.e. it’s unaffected by modifiers. In this mode,
consumed modifiers *do* partake in the comparison with the binding’s
modifiers, and ctrl+shift+2 maps to ctrl+shift+2 on a US layout.
More examples: ctrl+shift+u maps to ctrl+U in the translated lookup,
while ctrl+shift+u maps to ctrl+shift+u in the untranslated lookup.
Finally, we also match raw key codes. This allows our bindings to work
using the same physical keys when the user switches between latin and
non-latin layouts.
This means key bindings in foot.ini *must* not include both +shift+
and a *shifted* key. I.e. ctrl+shift+U is not a valid combo as it
cannot be triggered. Unfortunately, this was how you were supposed to
write bindings up until now... so, we try to detect such bindings, log
a deprecation warning and then “fix” the binding for the user.
When specifying bindings in foot.ini, both ctrl+U and ctrl+shift+u are
valid, and will work. The latter is preferred though, since we cannot
detect the raw key code for the former variant. Personally, I also
prefer the latter one because it is more explicit; it’s more obvious
which keys are involved.
However, in some cases it makes more sense to use the other
variant. Typically for non-letter combos.
2021-02-27 20:42:31 +01:00
|
|
|
const struct key_binding *bind = &it->item;
|
|
|
|
|
|
|
|
|
|
/* Match translated symbol */
|
|
|
|
|
if (bind->sym == sym &&
|
|
|
|
|
bind->mods == (mods & ~consumed)) {
|
2019-08-27 17:23:28 +02:00
|
|
|
|
input: rewrite of how we match foot’s own key bindings
Bindings are matched in one out of three ways:
* By translated (by XKB) symbols
* By untranslated symbols
* By raw key codes
A translated symbol is affected by pressed modifiers, some of which
can be “consumed”. Consumed modifiers to not partake in the comparison
with the binding’s modifiers. In this mode, ctrl+shift+2 maps to
ctrl+@ on a US layout.
Untranslated symbols, or un-shifted symbols refer to the “base” symbol
of the pressed key, i.e. it’s unaffected by modifiers. In this mode,
consumed modifiers *do* partake in the comparison with the binding’s
modifiers, and ctrl+shift+2 maps to ctrl+shift+2 on a US layout.
More examples: ctrl+shift+u maps to ctrl+U in the translated lookup,
while ctrl+shift+u maps to ctrl+shift+u in the untranslated lookup.
Finally, we also match raw key codes. This allows our bindings to work
using the same physical keys when the user switches between latin and
non-latin layouts.
This means key bindings in foot.ini *must* not include both +shift+
and a *shifted* key. I.e. ctrl+shift+U is not a valid combo as it
cannot be triggered. Unfortunately, this was how you were supposed to
write bindings up until now... so, we try to detect such bindings, log
a deprecation warning and then “fix” the binding for the user.
When specifying bindings in foot.ini, both ctrl+U and ctrl+shift+u are
valid, and will work. The latter is preferred though, since we cannot
detect the raw key code for the former variant. Personally, I also
prefer the latter one because it is more explicit; it’s more obvious
which keys are involved.
However, in some cases it makes more sense to use the other
variant. Typically for non-letter combos.
2021-02-27 20:42:31 +01:00
|
|
|
if (execute_binding(seat, term, bind->action, serial,
|
2021-01-24 20:31:22 +01:00
|
|
|
&update_search_result, &redraw))
|
|
|
|
|
{
|
2020-03-18 15:30:14 +01:00
|
|
|
goto update_search;
|
2021-01-24 20:31:22 +01:00
|
|
|
}
|
2019-08-27 17:23:28 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
input: rewrite of how we match foot’s own key bindings
Bindings are matched in one out of three ways:
* By translated (by XKB) symbols
* By untranslated symbols
* By raw key codes
A translated symbol is affected by pressed modifiers, some of which
can be “consumed”. Consumed modifiers to not partake in the comparison
with the binding’s modifiers. In this mode, ctrl+shift+2 maps to
ctrl+@ on a US layout.
Untranslated symbols, or un-shifted symbols refer to the “base” symbol
of the pressed key, i.e. it’s unaffected by modifiers. In this mode,
consumed modifiers *do* partake in the comparison with the binding’s
modifiers, and ctrl+shift+2 maps to ctrl+shift+2 on a US layout.
More examples: ctrl+shift+u maps to ctrl+U in the translated lookup,
while ctrl+shift+u maps to ctrl+shift+u in the untranslated lookup.
Finally, we also match raw key codes. This allows our bindings to work
using the same physical keys when the user switches between latin and
non-latin layouts.
This means key bindings in foot.ini *must* not include both +shift+
and a *shifted* key. I.e. ctrl+shift+U is not a valid combo as it
cannot be triggered. Unfortunately, this was how you were supposed to
write bindings up until now... so, we try to detect such bindings, log
a deprecation warning and then “fix” the binding for the user.
When specifying bindings in foot.ini, both ctrl+U and ctrl+shift+u are
valid, and will work. The latter is preferred though, since we cannot
detect the raw key code for the former variant. Personally, I also
prefer the latter one because it is more explicit; it’s more obvious
which keys are involved.
However, in some cases it makes more sense to use the other
variant. Typically for non-letter combos.
2021-02-27 20:42:31 +01:00
|
|
|
if (bind->mods != mods)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* Match untranslated symbols */
|
|
|
|
|
for (size_t i = 0; i < raw_count; i++) {
|
|
|
|
|
if (bind->sym == raw_syms[i]) {
|
|
|
|
|
if (execute_binding(seat, term, bind->action, serial,
|
|
|
|
|
&update_search_result, &redraw))
|
|
|
|
|
{
|
|
|
|
|
goto update_search;
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
/* Match raw key code */
|
input: rewrite of how we match foot’s own key bindings
Bindings are matched in one out of three ways:
* By translated (by XKB) symbols
* By untranslated symbols
* By raw key codes
A translated symbol is affected by pressed modifiers, some of which
can be “consumed”. Consumed modifiers to not partake in the comparison
with the binding’s modifiers. In this mode, ctrl+shift+2 maps to
ctrl+@ on a US layout.
Untranslated symbols, or un-shifted symbols refer to the “base” symbol
of the pressed key, i.e. it’s unaffected by modifiers. In this mode,
consumed modifiers *do* partake in the comparison with the binding’s
modifiers, and ctrl+shift+2 maps to ctrl+shift+2 on a US layout.
More examples: ctrl+shift+u maps to ctrl+U in the translated lookup,
while ctrl+shift+u maps to ctrl+shift+u in the untranslated lookup.
Finally, we also match raw key codes. This allows our bindings to work
using the same physical keys when the user switches between latin and
non-latin layouts.
This means key bindings in foot.ini *must* not include both +shift+
and a *shifted* key. I.e. ctrl+shift+U is not a valid combo as it
cannot be triggered. Unfortunately, this was how you were supposed to
write bindings up until now... so, we try to detect such bindings, log
a deprecation warning and then “fix” the binding for the user.
When specifying bindings in foot.ini, both ctrl+U and ctrl+shift+u are
valid, and will work. The latter is preferred though, since we cannot
detect the raw key code for the former variant. Personally, I also
prefer the latter one because it is more explicit; it’s more obvious
which keys are involved.
However, in some cases it makes more sense to use the other
variant. Typically for non-letter combos.
2021-02-27 20:42:31 +01:00
|
|
|
tll_foreach(bind->key_codes, code) {
|
2020-03-18 15:30:14 +01:00
|
|
|
if (code->item == key) {
|
input: rewrite of how we match foot’s own key bindings
Bindings are matched in one out of three ways:
* By translated (by XKB) symbols
* By untranslated symbols
* By raw key codes
A translated symbol is affected by pressed modifiers, some of which
can be “consumed”. Consumed modifiers to not partake in the comparison
with the binding’s modifiers. In this mode, ctrl+shift+2 maps to
ctrl+@ on a US layout.
Untranslated symbols, or un-shifted symbols refer to the “base” symbol
of the pressed key, i.e. it’s unaffected by modifiers. In this mode,
consumed modifiers *do* partake in the comparison with the binding’s
modifiers, and ctrl+shift+2 maps to ctrl+shift+2 on a US layout.
More examples: ctrl+shift+u maps to ctrl+U in the translated lookup,
while ctrl+shift+u maps to ctrl+shift+u in the untranslated lookup.
Finally, we also match raw key codes. This allows our bindings to work
using the same physical keys when the user switches between latin and
non-latin layouts.
This means key bindings in foot.ini *must* not include both +shift+
and a *shifted* key. I.e. ctrl+shift+U is not a valid combo as it
cannot be triggered. Unfortunately, this was how you were supposed to
write bindings up until now... so, we try to detect such bindings, log
a deprecation warning and then “fix” the binding for the user.
When specifying bindings in foot.ini, both ctrl+U and ctrl+shift+u are
valid, and will work. The latter is preferred though, since we cannot
detect the raw key code for the former variant. Personally, I also
prefer the latter one because it is more explicit; it’s more obvious
which keys are involved.
However, in some cases it makes more sense to use the other
variant. Typically for non-letter combos.
2021-02-27 20:42:31 +01:00
|
|
|
if (execute_binding(seat, term, bind->action, serial,
|
2021-01-24 20:31:22 +01:00
|
|
|
&update_search_result, &redraw))
|
|
|
|
|
{
|
2020-03-18 15:30:14 +01:00
|
|
|
goto update_search;
|
2021-01-24 20:31:22 +01:00
|
|
|
}
|
2020-03-18 15:30:14 +01:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-08-27 17:23:28 +02:00
|
|
|
|
2020-08-23 07:42:20 +02:00
|
|
|
uint8_t buf[64] = {0};
|
2020-03-18 15:30:14 +01:00
|
|
|
int count = 0;
|
2019-08-27 17:23:28 +02:00
|
|
|
|
2020-03-18 15:30:14 +01:00
|
|
|
if (compose_status == XKB_COMPOSE_COMPOSED) {
|
|
|
|
|
count = xkb_compose_state_get_utf8(
|
2020-07-08 18:20:34 +02:00
|
|
|
seat->kbd.xkb_compose_state, (char *)buf, sizeof(buf));
|
|
|
|
|
xkb_compose_state_reset(seat->kbd.xkb_compose_state);
|
2020-03-18 15:30:14 +01:00
|
|
|
} else if (compose_status == XKB_COMPOSE_CANCELLED) {
|
|
|
|
|
count = 0;
|
|
|
|
|
} else {
|
|
|
|
|
count = xkb_state_key_get_utf8(
|
2020-07-08 18:20:34 +02:00
|
|
|
seat->kbd.xkb_state, key, (char *)buf, sizeof(buf));
|
2020-03-18 15:30:14 +01:00
|
|
|
}
|
2019-08-29 21:03:46 +02:00
|
|
|
|
2021-01-24 20:31:22 +01:00
|
|
|
update_search_result = redraw = count > 0;
|
|
|
|
|
|
2020-08-12 18:47:54 +02:00
|
|
|
if (count == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
2020-12-05 11:49:32 +01:00
|
|
|
search_add_chars(term, (const char *)buf, count);
|
2020-03-18 15:30:14 +01:00
|
|
|
|
|
|
|
|
update_search:
|
2020-08-06 23:20:46 +02:00
|
|
|
LOG_DBG("search: buffer: %ls", term->search.buf);
|
2021-01-24 20:31:22 +01:00
|
|
|
if (update_search_result)
|
|
|
|
|
search_find_next(term);
|
|
|
|
|
if (redraw)
|
|
|
|
|
render_refresh_search(term);
|
2019-08-27 17:23:28 +02:00
|
|
|
}
|