circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-13 23:08:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam 2022-03-09 00:01:12 +00:00
commit ee3f1d25d5
2 changed files with 73 additions and 25 deletions

31
cmd-split-window.c
View File

@ -60,6 +60,7 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
struct client *tc = cmdq_get_target_client(item); struct client *tc = cmdq_get_target_client(item);
struct session *s = target->s; struct session *s = target->s;
struct winlink *wl = target->wl; struct winlink *wl = target->wl;
struct window *w = wl->window;
struct window_pane *wp = target->wp, *new_wp; struct window_pane *wp = target->wp, *new_wp;
enum layout_type type; enum layout_type type;
struct layout_cell *lc; struct layout_cell *lc;
@ -86,10 +87,17 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
cmdq_error(item, "percentage %s", errstr); cmdq_error(item, "percentage %s", errstr);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
if (type == LAYOUT_TOPBOTTOM) if (args_has(args, 'f')) {
size = (wp->sy * percentage) / 100; if (type == LAYOUT_TOPBOTTOM)
else size = (w->sy * percentage) / 100;
size = (wp->sx * percentage) / 100; else
size = (w->sx * percentage) / 100;
} else {
if (type == LAYOUT_TOPBOTTOM)
size = (wp->sy * percentage) / 100;
else
size = (wp->sx * percentage) / 100;
}
} else { } else {
size = args_strtonum(args, 'l', 0, INT_MAX, &cause); size = args_strtonum(args, 'l', 0, INT_MAX, &cause);
if (cause != NULL) { if (cause != NULL) {
@ -105,10 +113,17 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
free(cause); free(cause);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
if (type == LAYOUT_TOPBOTTOM) if (args_has(args, 'f')) {
size = (wp->sy * percentage) / 100; if (type == LAYOUT_TOPBOTTOM)
else size = (w->sy * percentage) / 100;
size = (wp->sx * percentage) / 100; else
size = (w->sx * percentage) / 100;
} else {
if (type == LAYOUT_TOPBOTTOM)
size = (wp->sy * percentage) / 100;
else
size = (wp->sx * percentage) / 100;
}
} else } else
size = -1; size = -1;

67
notify.c
View File

@ -34,18 +34,37 @@ struct notify_entry {
int pane; int pane;
}; };
static struct cmdq_item *
notify_insert_one_hook(struct cmdq_item *item, struct notify_entry *ne,
struct cmd_list *cmdlist, struct cmdq_state *state)
{
struct cmdq_item *new_item;
char *s;
if (cmdlist == NULL)
return (item);
if (log_get_level() != 0) {
s = cmd_list_print(cmdlist, 0);
log_debug("%s: hook %s is: %s", __func__, ne->name, s);
free (s);
}
new_item = cmdq_get_command(cmdlist, state);
return (cmdq_insert_after(item, new_item));
}
static void static void
notify_insert_hook(struct cmdq_item *item, struct notify_entry *ne) notify_insert_hook(struct cmdq_item *item, struct notify_entry *ne)
{ {
struct cmd_find_state fs; struct cmd_find_state fs;
struct options *oo; struct options *oo;
struct cmdq_item *new_item; struct cmdq_state *state;
struct cmdq_state *new_state;
struct options_entry *o; struct options_entry *o;
struct options_array_item *a; struct options_array_item *a;
struct cmd_list *cmdlist; struct cmd_list *cmdlist;
const char *value;
struct cmd_parse_result *pr;
log_debug("%s: %s", __func__, ne->name); log_debug("%s: inserting hook %s", __func__, ne->name);
cmd_find_clear_state(&fs, 0); cmd_find_clear_state(&fs, 0);
if (cmd_find_empty_state(&ne->fs) || !cmd_find_valid_state(&ne->fs)) if (cmd_find_empty_state(&ne->fs) || !cmd_find_valid_state(&ne->fs))
@ -66,23 +85,37 @@ notify_insert_hook(struct cmdq_item *item, struct notify_entry *ne)
oo = fs.wl->window->options; oo = fs.wl->window->options;
o = options_get(oo, ne->name); o = options_get(oo, ne->name);
} }
if (o == NULL) if (o == NULL) {
log_debug("%s: hook %s not found", __func__, ne->name);
return; return;
new_state = cmdq_new_state(&fs, NULL, CMDQ_STATE_NOHOOKS);
cmdq_add_formats(new_state, ne->formats);
a = options_array_first(o);
while (a != NULL) {
cmdlist = options_array_item_value(a)->cmdlist;
if (cmdlist != NULL) {
new_item = cmdq_get_command(cmdlist, new_state);
item = cmdq_insert_after(item, new_item);
}
a = options_array_next(a);
} }
cmdq_free_state(new_state); state = cmdq_new_state(&fs, NULL, CMDQ_STATE_NOHOOKS);
cmdq_add_formats(state, ne->formats);
if (*ne->name == '@') {
value = options_get_string(oo, ne->name);
pr = cmd_parse_from_string(value, NULL);
switch (pr->status) {
case CMD_PARSE_ERROR:
log_debug("%s: can't parse hook %s: %s", __func__,
ne->name, pr->error);
free(pr->error);
break;
case CMD_PARSE_SUCCESS:
notify_insert_one_hook(item, ne, pr->cmdlist, state);
break;
}
} else {
a = options_array_first(o);
while (a != NULL) {
cmdlist = options_array_item_value(a)->cmdlist;
item = notify_insert_one_hook(item, ne, cmdlist, state);
a = options_array_next(a);
}
}
cmdq_free_state(state);
} }
static enum cmd_retval static enum cmd_retval