mirror of https://github.com/tmux/tmux.git
Disable/enable window activity monitoring with set-window-option command.
Nicholas Marriott
parent
14b9512546
commit
0f95671fe3
5
CHANGES
5
CHANGES
|
|
@ -1,5 +1,8 @@
|
|||
04 June 2008
|
||||
|
||||
* New command set-window-option (alias setw) to set the single current window
|
||||
option: monitor-activity to determine whether window activity is shown in
|
||||
the status bar for that window (default off).
|
||||
* Change so active/bell windows are inverted in status line.
|
||||
* Activity monitoring - window with activity are marked in status line. No
|
||||
way to disable this/filter windows yet.
|
||||
|
|
@ -396,4 +399,4 @@
|
|||
(including mutt, emacs). No status bar yet and no key remapping or other
|
||||
customisation.
|
||||
|
||||
$Id: CHANGES,v 1.106 2008-06-04 16:46:23 nicm Exp $
|
||||
$Id: CHANGES,v 1.107 2008-06-04 17:54:26 nicm Exp $
|
||||
|
|
|
|||
4
Makefile
4
Makefile
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile,v 1.57 2008-06-03 21:42:37 nicm Exp $
|
||||
# $Id: Makefile,v 1.58 2008-06-04 17:54:26 nicm Exp $
|
||||
|
||||
.SUFFIXES: .c .o .y .h
|
||||
.PHONY: clean update-index.html upload-index.html
|
||||
|
|
@ -28,7 +28,7 @@ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \
|
|||
cmd-swap-window.c cmd-rename-session.c cmd-kill-session.c \
|
||||
cmd-switch-client.c cmd-has-session.c cmd-scroll-mode.c cmd-copy-mode.c \
|
||||
cmd-paste-buffer.c cmd-new-session.c cmd-start-server.c \
|
||||
cmd-kill-server.c \
|
||||
cmd-kill-server.c cmd-set-window-option.c \
|
||||
window-scroll.c window-more.c window-copy.c options.c \
|
||||
tty.c tty-keys.c tty-write.c screen-write.c screen-redraw.c
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: cmd-rename-window.c,v 1.18 2008-06-03 16:55:09 nicm Exp $ */
|
||||
/* $Id: cmd-rename-window.c,v 1.19 2008-06-04 17:54:26 nicm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
|
|
@ -118,15 +118,10 @@ cmd_rename_window_exec(void *ptr, struct cmd_ctx *ctx)
|
|||
if (data == NULL)
|
||||
return;
|
||||
|
||||
if ((s = cmd_find_session(ctx, data->cname, data->sname)) == NULL)
|
||||
wl = cmd_find_window(ctx, data->cname, data->sname, data->idx, &s);
|
||||
if (wl == NULL)
|
||||
return;
|
||||
|
||||
if (data->idx == -1)
|
||||
wl = s->curw;
|
||||
else if ((wl = winlink_find_by_index(&s->windows, data->idx)) == NULL) {
|
||||
ctx->error(ctx, "no window %d", data->idx);
|
||||
return;
|
||||
}
|
||||
xfree(wl->window->name);
|
||||
wl->window->name = xstrdup(data->newname);
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,220 @@
|
|||
/* $Id: cmd-set-window-option.c,v 1.1 2008-06-04 17:54:26 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 <string.h>
|
||||
|
||||
#include "tmux.h"
|
||||
|
||||
/*
|
||||
* Set a window option.
|
||||
*/
|
||||
|
||||
int cmd_set_window_option_parse(
|
||||
struct cmd *, void **, int, char **, char **);
|
||||
void cmd_set_window_option_exec(void *, struct cmd_ctx *);
|
||||
void cmd_set_window_option_send(void *, struct buffer *);
|
||||
void cmd_set_window_option_recv(void **, struct buffer *);
|
||||
void cmd_set_window_option_free(void *);
|
||||
|
||||
struct cmd_set_window_option_data {
|
||||
char *cname;
|
||||
char *sname;
|
||||
int idx;
|
||||
char *option;
|
||||
char *value;
|
||||
};
|
||||
|
||||
const struct cmd_entry cmd_set_window_option_entry = {
|
||||
"set-window-option", "setw",
|
||||
"[-c client-tty|-s session-name] [-i index] option value",
|
||||
0,
|
||||
cmd_set_window_option_parse,
|
||||
cmd_set_window_option_exec,
|
||||
cmd_set_window_option_send,
|
||||
cmd_set_window_option_recv,
|
||||
cmd_set_window_option_free,
|
||||
NULL
|
||||
};
|
||||
|
||||
int
|
||||
cmd_set_window_option_parse(
|
||||
struct cmd *self, void **ptr, int argc, char **argv, char **cause)
|
||||
{
|
||||
struct cmd_set_window_option_data *data;
|
||||
int opt;
|
||||
const char *errstr;
|
||||
|
||||
*ptr = data = xmalloc(sizeof *data);
|
||||
data->cname = NULL;
|
||||
data->sname = NULL;
|
||||
data->idx = -1;
|
||||
data->option = NULL;
|
||||
data->value = NULL;
|
||||
|
||||
while ((opt = getopt(argc, argv, "c:i:s:")) != EOF) {
|
||||
switch (opt) {
|
||||
case 'c':
|
||||
if (data->sname != NULL)
|
||||
goto usage;
|
||||
if (data->cname == NULL)
|
||||
data->cname = xstrdup(optarg);
|
||||
break;
|
||||
case 'i':
|
||||
data->idx = strtonum(optarg, 0, INT_MAX, &errstr);
|
||||
if (errstr != NULL) {
|
||||
xasprintf(cause, "index %s", errstr);
|
||||
goto error;
|
||||
}
|
||||
break;
|
||||
case 's':
|
||||
if (data->cname != NULL)
|
||||
goto usage;
|
||||
if (data->sname == NULL)
|
||||
data->sname = xstrdup(optarg);
|
||||
break;
|
||||
default:
|
||||
goto usage;
|
||||
}
|
||||
}
|
||||
argc -= optind;
|
||||
argv += optind;
|
||||
if (argc != 1 && argc != 2)
|
||||
goto usage;
|
||||
|
||||
data->option = xstrdup(argv[0]);
|
||||
if (argc == 2)
|
||||
data->value = xstrdup(argv[1]);
|
||||
|
||||
return (0);
|
||||
|
||||
usage:
|
||||
xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage);
|
||||
|
||||
error:
|
||||
cmd_set_window_option_free(data);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
void
|
||||
cmd_set_window_option_exec(void *ptr, unused struct cmd_ctx *ctx)
|
||||
{
|
||||
struct cmd_set_window_option_data *data = ptr;
|
||||
struct winlink *wl;
|
||||
struct session *s;
|
||||
const char *errstr;
|
||||
int number, bool;
|
||||
u_int i;
|
||||
|
||||
if (data == NULL)
|
||||
return;
|
||||
|
||||
if (data == NULL)
|
||||
return;
|
||||
|
||||
wl = cmd_find_window(ctx, data->cname, data->sname, data->idx, &s);
|
||||
if (wl == NULL)
|
||||
return;
|
||||
|
||||
if (*data->option == '\0') {
|
||||
ctx->error(ctx, "invalid option");
|
||||
return;
|
||||
}
|
||||
|
||||
number = -1;
|
||||
if (data->value != NULL) {
|
||||
number = strtonum(data->value, 0, INT_MAX, &errstr);
|
||||
|
||||
bool = -1;
|
||||
if (number == 1 || strcasecmp(data->value, "on") == 0 ||
|
||||
strcasecmp(data->value, "yes") == 0)
|
||||
bool = 1;
|
||||
else if (number == 0 || strcasecmp(data->value, "off") == 0 ||
|
||||
strcasecmp(data->value, "no") == 0)
|
||||
bool = 0;
|
||||
} else
|
||||
bool = 1;
|
||||
|
||||
if (strcmp(data->option, "monitor-activity") == 0) {
|
||||
if (bool == -1) {
|
||||
ctx->error(ctx, "bad value: %s", data->value);
|
||||
return;
|
||||
}
|
||||
|
||||
if (bool)
|
||||
wl->window->flags |= WINDOW_MONITOR;
|
||||
else
|
||||
wl->window->flags &= ~WINDOW_MONITOR;
|
||||
|
||||
for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
|
||||
s = ARRAY_ITEM(&sessions, i);
|
||||
if (s != NULL)
|
||||
session_alert_cancel(s, wl);
|
||||
}
|
||||
} else {
|
||||
ctx->error(ctx, "unknown option: %s", data->option);
|
||||
return;
|
||||
}
|
||||
|
||||
if (ctx->cmdclient != NULL)
|
||||
server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0);
|
||||
}
|
||||
|
||||
void
|
||||
cmd_set_window_option_send(void *ptr, struct buffer *b)
|
||||
{
|
||||
struct cmd_set_window_option_data *data = ptr;
|
||||
|
||||
buffer_write(b, data, sizeof *data);
|
||||
cmd_send_string(b, data->cname);
|
||||
cmd_send_string(b, data->sname);
|
||||
cmd_send_string(b, data->option);
|
||||
cmd_send_string(b, data->value);
|
||||
}
|
||||
|
||||
void
|
||||
cmd_set_window_option_recv(void **ptr, struct buffer *b)
|
||||
{
|
||||
struct cmd_set_window_option_data *data;
|
||||
|
||||
*ptr = data = xmalloc(sizeof *data);
|
||||
buffer_read(b, data, sizeof *data);
|
||||
data->cname = cmd_recv_string(b);
|
||||
data->sname = cmd_recv_string(b);
|
||||
data->option = cmd_recv_string(b);
|
||||
data->value = cmd_recv_string(b);
|
||||
}
|
||||
|
||||
void
|
||||
cmd_set_window_option_free(void *ptr)
|
||||
{
|
||||
struct cmd_set_window_option_data *data = ptr;
|
||||
|
||||
if (data->cname != NULL)
|
||||
xfree(data->cname);
|
||||
if (data->sname != NULL)
|
||||
xfree(data->sname);
|
||||
if (data->option != NULL)
|
||||
xfree(data->option);
|
||||
if (data->value != NULL)
|
||||
xfree(data->value);
|
||||
xfree(data);
|
||||
}
|
||||
3
cmd.c
3
cmd.c
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: cmd.c,v 1.40 2008-06-03 18:13:54 nicm Exp $ */
|
||||
/* $Id: cmd.c,v 1.41 2008-06-04 17:54:26 nicm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
|
|
@ -51,6 +51,7 @@ const struct cmd_entry *cmd_table[] = {
|
|||
&cmd_rename_window_entry,
|
||||
&cmd_scroll_mode_entry,
|
||||
&cmd_select_window_entry,
|
||||
&cmd_set_window_option_entry,
|
||||
&cmd_send_keys_entry,
|
||||
&cmd_send_prefix_entry,
|
||||
&cmd_set_option_entry,
|
||||
|
|
|
|||
6
server.c
6
server.c
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: server.c,v 1.52 2008-06-04 16:46:23 nicm Exp $ */
|
||||
/* $Id: server.c,v 1.53 2008-06-04 17:54:26 nicm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
|
|
@ -419,7 +419,7 @@ server_handle_window(struct window *w)
|
|||
|
||||
window_parse(w);
|
||||
|
||||
if (!(w->flags & (WINDOW_BELL|WINDOW_ACTIVITY)))
|
||||
if (!(w->flags & WINDOW_BELL) && !(w->flags & WINDOW_ACTIVITY))
|
||||
return;
|
||||
|
||||
for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
|
||||
|
|
@ -443,7 +443,7 @@ server_handle_window(struct window *w)
|
|||
}
|
||||
}
|
||||
|
||||
if (w->flags & WINDOW_ACTIVITY)
|
||||
if ((w->flags & WINDOW_MONITOR) && (w->flags & WINDOW_ACTIVITY))
|
||||
session_alert_add(s, w, WINDOW_ACTIVITY);
|
||||
}
|
||||
server_status_window(w);
|
||||
|
|
|
|||
4
tmux.h
4
tmux.h
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: tmux.h,v 1.128 2008-06-04 16:46:23 nicm Exp $ */
|
||||
/* $Id: tmux.h,v 1.129 2008-06-04 17:54:26 nicm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
|
|
@ -519,6 +519,7 @@ struct window {
|
|||
#define WINDOW_BELL 0x1
|
||||
#define WINDOW_HIDDEN 0x2
|
||||
#define WINDOW_ACTIVITY 0x4
|
||||
#define WINDOW_MONITOR 0x8
|
||||
|
||||
struct screen *screen;
|
||||
struct screen base;
|
||||
|
|
@ -818,6 +819,7 @@ extern const struct cmd_entry cmd_select_window_entry;
|
|||
extern const struct cmd_entry cmd_send_keys_entry;
|
||||
extern const struct cmd_entry cmd_send_prefix_entry;
|
||||
extern const struct cmd_entry cmd_set_option_entry;
|
||||
extern const struct cmd_entry cmd_set_window_option_entry;
|
||||
extern const struct cmd_entry cmd_start_server_entry;
|
||||
extern const struct cmd_entry cmd_swap_window_entry;
|
||||
extern const struct cmd_entry cmd_switch_client_entry;
|
||||
|
|
|
|||
3
window.c
3
window.c
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: window.c,v 1.38 2008-06-03 21:42:37 nicm Exp $ */
|
||||
/* $Id: window.c,v 1.39 2008-06-04 17:54:27 nicm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
|
|
@ -186,6 +186,7 @@ window_create(const char *name,
|
|||
w->in = buffer_create(BUFSIZ);
|
||||
w->out = buffer_create(BUFSIZ);
|
||||
w->mode = NULL;
|
||||
w->flags = 0;
|
||||
screen_create(&w->base, sx, sy, hlimit);
|
||||
w->screen = &w->base;
|
||||
input_init(w);
|
||||
|
|
|
|||
Loading…
Reference in New Issue