mirror of
https://github.com/tmux/tmux.git
synced 2025-09-01 20:57:00 +00:00
Add helpers for the simple case of parse string and add to command queue.
This commit is contained in:
@ -197,11 +197,10 @@ static int
|
||||
cmd_display_panes_key(struct client *c, struct key_event *event)
|
||||
{
|
||||
struct cmd_display_panes_data *cdata = c->overlay_data;
|
||||
struct cmdq_item *new_item;
|
||||
char *cmd, *expanded;
|
||||
char *cmd, *expanded, *error;
|
||||
struct window *w = c->session->curw->window;
|
||||
struct window_pane *wp;
|
||||
struct cmd_parse_result *pr;
|
||||
enum cmd_parse_status status;
|
||||
|
||||
if (event->key < '0' || event->key > '9')
|
||||
return (-1);
|
||||
@ -214,21 +213,10 @@ cmd_display_panes_key(struct client *c, struct key_event *event)
|
||||
xasprintf(&expanded, "%%%u", wp->id);
|
||||
cmd = cmd_template_replace(cdata->command, expanded, 1);
|
||||
|
||||
pr = cmd_parse_from_string(cmd, NULL);
|
||||
switch (pr->status) {
|
||||
case CMD_PARSE_EMPTY:
|
||||
new_item = NULL;
|
||||
break;
|
||||
case CMD_PARSE_ERROR:
|
||||
new_item = cmdq_get_error(pr->error);
|
||||
free(pr->error);
|
||||
cmdq_append(c, new_item);
|
||||
break;
|
||||
case CMD_PARSE_SUCCESS:
|
||||
new_item = cmdq_get_command(pr->cmdlist, NULL);
|
||||
cmd_list_free(pr->cmdlist);
|
||||
cmdq_append(c, new_item);
|
||||
break;
|
||||
status = cmd_parse_and_append(cmd, NULL, c, NULL, &error);
|
||||
if (status == CMD_PARSE_ERROR) {
|
||||
cmdq_append(c, cmdq_get_error(error));
|
||||
free(error);
|
||||
}
|
||||
|
||||
free(cmd);
|
||||
|
Reference in New Issue
Block a user