circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-01 21:41:44 +00:00
Code Issues Projects Releases Wiki Activity

Support "neww; neww" as well "neww ; neww".

Browse Source
This commit is contained in:
Nicholas Marriott 2009-04-30 21:53:32 +00:00
parent 044e6f7660
commit 827fac4c0b
2 changed files with 34 additions and 16 deletions

5
CHANGES
View File

@ -1,5 +1,8 @@
30 April 2009 30 April 2009
* Support command sequences without a space before the semicolon, for example
"neww; neww" now works as well as "neww ; neww". "neww;neww" is still an
error.
* previous-layout command. * previous-layout command.
* Display the layout name in window lists. * Display the layout name in window lists.
* Merge resize-pane-up and resize-pane-down into resize-pane with -U and -D * Merge resize-pane-up and resize-pane-down into resize-pane with -U and -D
@ -1236,7 +1239,7 @@
(including mutt, emacs). No status bar yet and no key remapping or other (including mutt, emacs). No status bar yet and no key remapping or other
customisation. customisation.
$Id: CHANGES,v 1.281 2009-04-30 21:17:06 nicm Exp $ $Id: CHANGES,v 1.282 2009-04-30 21:53:32 nicm Exp $
LocalWords: showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr LocalWords: showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr
LocalWords: rivo nurges lscm Erdely eol smysession mysession ek dstname RB ms LocalWords: rivo nurges lscm Erdely eol smysession mysession ek dstname RB ms

43
cmd-list.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-list.c,v 1.3 2009-02-16 18:57:16 nicm Exp $ */ /* $Id: cmd-list.c,v 1.4 2009-04-30 21:53:32 nicm Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -28,28 +28,43 @@ cmd_list_parse(int argc, char **argv, char **cause)
struct cmd_list *cmdlist; struct cmd_list *cmdlist;
struct cmd *cmd; struct cmd *cmd;
int i, lastsplit; int i, lastsplit;
size_t arglen, new_argc;
char **new_argv;
cmdlist = xmalloc(sizeof *cmdlist); cmdlist = xmalloc(sizeof *cmdlist);
TAILQ_INIT(cmdlist); TAILQ_INIT(cmdlist);
lastsplit = 0; lastsplit = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
if (strcmp(argv[i], "\\;") == 0) { arglen = strlen(argv[i]);
argv[i][0] = ';'; if (arglen == 0 || argv[i][arglen - 1] != ';')
argv[i][1] = '\0'; continue;
} else if (strcmp(argv[i], ";") == 0) { argv[i][arglen - 1] = '\0';
cmd = cmd_parse(i - lastsplit, argv + lastsplit, cause);
if (cmd == NULL) if (arglen > 1 && argv[i][arglen - 2] == '\\') {
goto bad; argv[i][arglen - 2] = ';';
TAILQ_INSERT_TAIL(cmdlist, cmd, qentry); continue;
lastsplit = i + 1;
} }
new_argc = i - lastsplit;
new_argv = argv + lastsplit;
if (arglen != 1)
new_argc++;
cmd = cmd_parse(new_argc, new_argv, cause);
if (cmd == NULL)
goto bad;
TAILQ_INSERT_TAIL(cmdlist, cmd, qentry);
lastsplit = i + 1;
} }
cmd = cmd_parse(argc - lastsplit, argv + lastsplit, cause); if (lastsplit != argc) {
if (cmd == NULL) cmd = cmd_parse(argc - lastsplit, argv + lastsplit, cause);
goto bad; if (cmd == NULL)
TAILQ_INSERT_TAIL(cmdlist, cmd, qentry); goto bad;
TAILQ_INSERT_TAIL(cmdlist, cmd, qentry);
}
return (cmdlist); return (cmdlist);