extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-02-17 10:50:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

new-window -k.

Browse Source
This commit is contained in:
Nicholas Marriott 2009-01-21 22:21:49 +00:00
parent 19987feaaa
commit 9acc26711d
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,5 +1,6 @@
21 January 2009 21 January 2009
* new-window now supports -k to kill target window if it exists.
* Bring back split-window -p and -l options to specify the height a percentage * Bring back split-window -p and -l options to specify the height a percentage
or as a number of lines. or as a number of lines.
* Make window and session choice modes allow you to choose items in vi keys * Make window and session choice modes allow you to choose items in vi keys
@ -994,7 +995,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.228 2009-01-21 19:38:51 nicm Exp $ $Id: CHANGES,v 1.229 2009-01-21 22:21:49 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

3
TODO
View File

@ -78,7 +78,6 @@
- command: load-buffer -b number filename - command: load-buffer -b number filename
- command: copy-buffer -s src-session -t dst-session -a src-index -b dst-index - command: copy-buffer -s src-session -t dst-session -a src-index -b dst-index
(copy from other session) (copy from other session)
- neww should support -k
- flag to scroll-mode/copy-mode to automatically scroll up a page - flag to scroll-mode/copy-mode to automatically scroll up a page
- key to switch to copy mode from scroll mode - key to switch to copy mode from scroll mode
- document suspend-client - document suspend-client
@ -87,3 +86,5 @@
- document split-window -p and -l - document split-window -p and -l
- UTF-8 combining characters don't work (probably should be width 1 but are - UTF-8 combining characters don't work (probably should be width 1 but are
listed as 2) listed as 2)
- better error reporting from session_new etc

32
cmd-new-window.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-new-window.c,v 1.29 2009-01-19 18:23:40 nicm Exp $ */ /* $Id: cmd-new-window.c,v 1.30 2009-01-21 22:21:49 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -39,11 +39,12 @@ struct cmd_new_window_data {
char *name; char *name;
char *cmd; char *cmd;
int flag_detached; int flag_detached;
int flag_kill;
}; };
const struct cmd_entry cmd_new_window_entry = { const struct cmd_entry cmd_new_window_entry = {
"new-window", "neww", "new-window", "neww",
"[-d] [-n window-name] [-t target-window] [command]", "[-dk] [-n window-name] [-t target-window] [command]",
0, 0,
cmd_new_window_init, cmd_new_window_init,
cmd_new_window_parse, cmd_new_window_parse,
@ -64,6 +65,7 @@ cmd_new_window_init(struct cmd *self, unused int arg)
data->name = NULL; data->name = NULL;
data->cmd = NULL; data->cmd = NULL;
data->flag_detached = 0; data->flag_detached = 0;
data->flag_kill = 0;
} }
int int
@ -75,11 +77,14 @@ cmd_new_window_parse(struct cmd *self, int argc, char **argv, char **cause)
self->entry->init(self, 0); self->entry->init(self, 0);
data = self->data; data = self->data;
while ((opt = getopt(argc, argv, "dt:n:")) != -1) { while ((opt = getopt(argc, argv, "dkt:n:")) != -1) {
switch (opt) { switch (opt) {
case 'd': case 'd':
data->flag_detached = 1; data->flag_detached = 1;
break; break;
case 'k':
data->flag_kill = 1;
break;
case 't': case 't':
if (data->target == NULL) if (data->target == NULL)
data->target = xstrdup(optarg); data->target = xstrdup(optarg);
@ -134,6 +139,27 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx)
return (-1); return (-1);
} }
wl = NULL;
if (idx != -1)
wl = winlink_find_by_index(&s->windows, idx);
if (wl != NULL) {
if (data->flag_kill) {
/*
* Can't use session_detach as it will destroy session
* if this makes it empty.
*/
session_alert_cancel(s, wl);
winlink_stack_remove(&s->lastw, wl);
winlink_remove(&s->windows, wl);
/* Force select/redraw if current. */
if (wl == s->curw) {
data->flag_detached = 0;
s->curw = NULL;
}
}
}
cmd = data->cmd; cmd = data->cmd;
if (cmd == NULL) if (cmd == NULL)
cmd = options_get_string(&s->options, "default-command"); cmd = options_get_string(&s->options, "default-command");