circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename window.

pull/1/head
Nicholas Marriott 2007-10-04 10:39:07 +00:00
parent adc5f80bf9
commit 19c1e1a800
7 changed files with 172 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,5 +1,6 @@
04 October 2007
* (nicm) rename-window command.
* (nicm) set-option command (alias set): "tmux set-option prefix ^A".
* (nicm) Key binding and unbinding is back.
@ -109,5 +110,5 @@
(including mutt, emacs). No status bar yet and no key remapping or other
customisation.
$Id: CHANGES,v 1.28 2007-10-04 10:11:32 nicm Exp $
$Id: CHANGES,v 1.29 2007-10-04 10:39:06 nicm Exp $

4
Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.18 2007-10-04 10:11:32 nicm Exp $
# $Id: Makefile,v 1.19 2007-10-04 10:39:06 nicm Exp $
.SUFFIXES: .c .o .y .h
.PHONY: clean
@ -22,7 +22,7 @@ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \
key-bindings.c cmd.c cmd-new-session.c cmd-detach-session.c \
cmd-list-sessions.c cmd-new-window.c cmd-next-window.c cmd-bind-key.c \
cmd-unbind-key.c cmd-previous-window.c cmd-last-window.c cmd-list-keys.c \
cmd-set-option.c
cmd-set-option.c cmd-rename-window.c
YACC= yacc -d

3
cmd-new-window.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-new-window.c,v 1.3 2007-10-04 10:11:32 nicm Exp $ */
/* $Id: cmd-new-window.c,v 1.4 2007-10-04 10:39:06 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -77,7 +77,6 @@ cmd_new_window_parse(void **ptr, int argc, char **argv, char **cause)
if (argc != 0 && argc != 1)
goto usage;
data->cmd = NULL;
if (argc == 1)
data->cmd = xstrdup(argv[0]);

158
cmd-rename-window.c Normal file
View File

@ -0,0 +1,158 @@
/* $Id: cmd-rename-window.c,v 1.1 2007-10-04 10:39:06 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/types.h>
#include <getopt.h>
#include <stdlib.h>
#include "tmux.h"
/*
* Rename window by index.
*/
int cmd_rename_window_parse(void **, int, char **, char **);
const char *cmd_rename_window_usage(void);
void cmd_rename_window_exec(void *, struct cmd_ctx *);
void cmd_rename_window_send(void *, struct buffer *);
void cmd_rename_window_recv(void **, struct buffer *);
void cmd_rename_window_free(void *);
struct cmd_rename_window_data {
int idx;
char *newname;
};
const struct cmd_entry cmd_rename_window_entry = {
CMD_RENAMEWINDOW, "rename-window", "renamew", 0,
cmd_rename_window_parse,
cmd_rename_window_usage,
cmd_rename_window_exec,
cmd_rename_window_send,
cmd_rename_window_recv,
cmd_rename_window_free
};
int
cmd_rename_window_parse(void **ptr, int argc, char **argv, char **cause)
{
struct cmd_rename_window_data *data;
const char *errstr;
int opt;
*ptr = data = xmalloc(sizeof *data);
data->idx = -1;
data->newname = NULL;
while ((opt = getopt(argc, argv, "i:")) != EOF) {
switch (opt) {
case 'i':
data->idx = strtonum(optarg, 0, UINT_MAX, &errstr);
if (errstr != NULL) {
xasprintf(cause, "index %s", errstr);
goto error;
}
break;
default:
goto usage;
}
}
argc -= optind;
argv += optind;
if (argc != 1)
goto usage;
data->newname = xstrdup(argv[0]);
return (0);
usage:
usage(cause, "%s", cmd_rename_window_usage());
error:
cmd_rename_window_free(data);
return (-1);
}
const char *
cmd_rename_window_usage(void)
{
return ("rename-window [-i index] newname");
}
void
cmd_rename_window_exec(void *ptr, struct cmd_ctx *ctx)
{
struct cmd_rename_window_data *data = ptr;
struct client *c = ctx->client;
struct session *s = ctx->session;
struct window *w;
u_int i;
if (data == NULL)
return;
if (data->idx == -1)
w = s->window;
else if ((w = window_at(&s->windows, data->idx)) == NULL) {
ctx->error(ctx, "no window at index %u", data->idx);
return;
}
xfree(w->name);
w->name = xstrdup(data->newname);
/*XXX*/
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
if (c != NULL && c->session == s)
server_redraw_status(c);
}
if (!(ctx->flags & CMD_KEY))
server_write_client(c, MSG_EXIT, NULL, 0);
}
void
cmd_rename_window_send(void *ptr, struct buffer *b)
{
struct cmd_rename_window_data *data = ptr;
buffer_write(b, data, sizeof *data);
cmd_send_string(b, data->newname);
}
void
cmd_rename_window_recv(void **ptr, struct buffer *b)
{
struct cmd_rename_window_data *data;
*ptr = data = xmalloc(sizeof *data);
buffer_read(b, data, sizeof *data);
data->newname = cmd_recv_string(b);
}
void
cmd_rename_window_free(void *ptr)
{
struct cmd_rename_window_data *data = ptr;
if (data->newname != NULL)
xfree(data->newname);
xfree(data);
}

3
cmd.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd.c,v 1.8 2007-10-04 10:11:32 nicm Exp $ */
/* $Id: cmd.c,v 1.9 2007-10-04 10:39:07 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -33,6 +33,7 @@ const struct cmd_entry *cmd_table[] = {
&cmd_new_window_entry,
&cmd_next_window_entry,
&cmd_previous_window_entry,
&cmd_rename_window_entry,
&cmd_set_option_entry,
&cmd_unbind_key_entry,
NULL

7
server-fn.c
View File

@ -1,4 +1,4 @@
/* $Id: server-fn.c,v 1.16 2007-10-04 00:02:10 nicm Exp $ */
/* $Id: server-fn.c,v 1.17 2007-10-04 10:39:07 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -113,7 +113,8 @@ server_write_window(
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
if (c != NULL && c->session->window == w) {
if (c != NULL &&
c->session != NULL && c->session->window == w) {
if (c->flags & CLIENT_HOLD) /* XXX OUTPUT only */
continue;
server_write_client(c, type, buf, len);
@ -188,7 +189,7 @@ server_redraw_window(struct window *w)
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
if (c != NULL && c->session->window == w)
if (c != NULL && c->session != NULL && c->session->window == w)
server_redraw_client(c);
}
}

4
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.43 2007-10-04 10:11:32 nicm Exp $ */
/* $Id: tmux.h,v 1.44 2007-10-04 10:39:07 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -466,6 +466,7 @@ enum cmd_type {
CMD_NEWWINDOW,
CMD_NEXTWINDOW,
CMD_PREVIOUSWINDOW,
CMD_RENAMEWINDOW,
CMD_SETOPTION,
CMD_UNBINDKEY,
};
@ -539,6 +540,7 @@ extern const struct cmd_entry cmd_new_session_entry;
extern const struct cmd_entry cmd_new_window_entry;
extern const struct cmd_entry cmd_next_window_entry;
extern const struct cmd_entry cmd_previous_window_entry;
extern const struct cmd_entry cmd_rename_window_entry;
extern const struct cmd_entry cmd_set_option_entry;
extern const struct cmd_entry cmd_unbind_key_entry;