circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-12 17:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-05-12 21:02:27 +01:00
commit 699d9d2fac
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-show-options.c
View File

@ -90,7 +90,7 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
window = (self->entry == &cmd_show_window_options_entry);
if (args->argc == 0) {
scope = options_scope_from_flags(args, window, fs, &oo, &cause);
options_scope_from_flags(args, window, fs, &oo, &cause);
return (cmd_show_options_all(self, item, oo));
}
argument = format_single(item, args->argv[0], c, s, wl, NULL);

2
mode-tree.c
View File

@ -819,7 +819,7 @@ mode_tree_display_menu(struct mode_tree_data *mtd, struct client *c, u_int x,
line = mtd->current;
else
line = mtd->offset + y;
mti = mtd->line_list[line].item;
mti = mtd->line_list[line].item;
if (!outside) {
s = mtd->menu;

13
options.c
View File

@ -354,16 +354,23 @@ options_array_set(struct options_entry *o, u_int idx, const char *value,
struct options_array_item *a;
char *new;
struct cmd_list *cmdlist;
char *error;
if (!OPTIONS_IS_ARRAY(o)) {
*cause = xstrdup("not an array");
if (cause != NULL)
*cause = xstrdup("not an array");
return (-1);
}
if (OPTIONS_IS_COMMAND(o)) {
cmdlist = cmd_string_parse(value, NULL, 0, cause);
if (cmdlist == NULL && *cause != NULL)
cmdlist = cmd_string_parse(value, NULL, 0, &error);
if (cmdlist == NULL && error != NULL) {
if (cause != NULL)
*cause = error;
else
free(error);
return (-1);
}
}
a = options_array_item(o, idx);

16
server-client.c
View File

@ -424,17 +424,21 @@ server_client_check_mouse(struct client *c, struct key_event *event)
key_code key;
struct timeval tv;
struct style_range *sr;
enum { NOTYPE, MOVE, DOWN, UP, DRAG, WHEEL, DOUBLE, TRIPLE } type;
enum { NOTYPE,
MOVE,
DOWN,
UP,
DRAG,
WHEEL,
DOUBLE,
TRIPLE } type = NOTYPE;
enum { NOWHERE,
PANE,
STATUS,
STATUS_LEFT,
STATUS_RIGHT,
STATUS_DEFAULT,
BORDER } where;
type = NOTYPE;
where = NOWHERE;
BORDER } where = NOWHERE;
log_debug("%s mouse %02x at %u,%u (last %u,%u) (%d)", c->name, m->b,
m->x, m->y, m->lx, m->ly, c->tty.mouse_drag_flag);
@ -1001,7 +1005,6 @@ server_client_key_callback(struct cmdq_item *item, void *data)
struct mouse_event *m = &event->m;
struct session *s = c->session;
struct winlink *wl;
struct window *w;
struct window_pane *wp;
struct window_mode_entry *wme;
struct timeval tv;
@ -1015,7 +1018,6 @@ server_client_key_callback(struct cmdq_item *item, void *data)
if (s == NULL || (c->flags & (CLIENT_DEAD|CLIENT_SUSPENDED)) != 0)
goto out;
wl = s->curw;
w = wl->window;
/* Update the activity timer. */
if (gettimeofday(&c->activity_time, NULL) != 0)

4
style.c
View File

@ -57,10 +57,8 @@ style_parse(struct style *sy, const struct grid_cell *base, const char *in)
style_copy(&saved, sy);
do {
while (*in != '\0' && strchr(delimiters, *in) != NULL) {
while (*in != '\0' && strchr(delimiters, *in) != NULL)
in++;
end--;
}
if (*in == '\0')
break;

3
window-copy.c
View File

@ -1046,8 +1046,6 @@ window_copy_cmd_previous_matching_bracket(struct window_copy_cmd_state *cs)
goto retry;
}
window_copy_cursor_previous_word(wme, "}]) ");
px = data->cx;
continue;
}
continue;
}
@ -1161,7 +1159,6 @@ window_copy_cmd_next_matching_bracket(struct window_copy_cmd_state *cs)
goto retry;
}
window_copy_cursor_next_word_end(wme, "{[( ");
px = data->cx;
continue;
}
/* For vi, continue searching for bracket until EOL. */