Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2026-06-23 09:30:05 +01:00
2 changed files with 19 additions and 0 deletions

View File

@@ -1113,6 +1113,17 @@ mode_tree_filter_free(void *data)
mode_tree_remove_ref(data); mode_tree_remove_ref(data);
} }
static void
mode_tree_clear_filter(struct mode_tree_data *mtd)
{
free(mtd->filter);
mtd->filter = NULL;
mode_tree_build(mtd);
mode_tree_draw(mtd);
mtd->wp->flags |= PANE_REDRAW;
}
static void static void
mode_tree_menu_callback(__unused struct menu *menu, __unused u_int idx, mode_tree_menu_callback(__unused struct menu *menu, __unused u_int idx,
key_code key, void *data) key_code key, void *data)
@@ -1476,11 +1487,15 @@ mode_tree_key(struct mode_tree_data *mtd, struct client *c, key_code *key,
mode_tree_search_set(mtd); mode_tree_search_set(mtd);
break; break;
case 'f': case 'f':
case 'F':
mtd->references++; mtd->references++;
status_prompt_set(c, NULL, "(filter) ", mtd->filter, status_prompt_set(c, NULL, "(filter) ", mtd->filter,
mode_tree_filter_callback, mode_tree_filter_free, mtd, mode_tree_filter_callback, mode_tree_filter_free, mtd,
PROMPT_NOFORMAT, PROMPT_TYPE_SEARCH); PROMPT_NOFORMAT, PROMPT_TYPE_SEARCH);
break; break;
case 'c':
mode_tree_clear_filter(mtd);
break;
case 'v': case 'v':
switch (mtd->preview) { switch (mtd->preview) {
case MODE_TREE_PREVIEW_OFF: case MODE_TREE_PREVIEW_OFF:

4
tmux.1
View File

@@ -2833,6 +2833,7 @@ The following keys may be used in client mode:
.It Li "z" Ta "Suspend selected client" .It Li "z" Ta "Suspend selected client"
.It Li "Z" Ta "Suspend tagged clients" .It Li "Z" Ta "Suspend tagged clients"
.It Li "f" Ta "Enter a format to filter items" .It Li "f" Ta "Enter a format to filter items"
.It Li "c" Ta "Clear the current filter"
.It Li "O" Ta "Change sort order" .It Li "O" Ta "Change sort order"
.It Li "r" Ta "Reverse sort order" .It Li "r" Ta "Reverse sort order"
.It Li "v" Ta "Toggle preview" .It Li "v" Ta "Toggle preview"
@@ -2928,6 +2929,7 @@ The following keys may be used in tree mode:
.It Li "C\-t" Ta "Tag all items" .It Li "C\-t" Ta "Tag all items"
.It Li "\&:" Ta "Run a command for each tagged item" .It Li "\&:" Ta "Run a command for each tagged item"
.It Li "f" Ta "Enter a format to filter items" .It Li "f" Ta "Enter a format to filter items"
.It Li "c" Ta "Clear the current filter"
.It Li "H" Ta "Jump to the starting pane" .It Li "H" Ta "Jump to the starting pane"
.It Li "O" Ta "Change sort order" .It Li "O" Ta "Change sort order"
.It Li "r" Ta "Reverse sort order" .It Li "r" Ta "Reverse sort order"
@@ -3026,6 +3028,7 @@ The following keys may be used in customize mode:
.It Li "T" Ta "Tag no items" .It Li "T" Ta "Tag no items"
.It Li "C\-t" Ta "Tag all items" .It Li "C\-t" Ta "Tag all items"
.It Li "f" Ta "Enter a format to filter items" .It Li "f" Ta "Enter a format to filter items"
.It Li "c" Ta "Clear the current filter"
.It Li "v" Ta "Toggle option information" .It Li "v" Ta "Toggle option information"
.It Li "F1 or C\-h" Ta "Display help" .It Li "F1 or C\-h" Ta "Display help"
.It Li "q" Ta "Exit mode" .It Li "q" Ta "Exit mode"
@@ -7902,6 +7905,7 @@ The following keys may be used in buffer mode:
.It Li "D" Ta "Delete tagged buffers" .It Li "D" Ta "Delete tagged buffers"
.It Li "e" Ta "Open the buffer in an editor" .It Li "e" Ta "Open the buffer in an editor"
.It Li "f" Ta "Enter a format to filter items" .It Li "f" Ta "Enter a format to filter items"
.It Li "c" Ta "Clear the current filter"
.It Li "O" Ta "Change sort order" .It Li "O" Ta "Change sort order"
.It Li "r" Ta "Reverse sort order" .It Li "r" Ta "Reverse sort order"
.It Li "v" Ta "Toggle preview" .It Li "v" Ta "Toggle preview"