circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-24 10:08:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-08-28 10:01:08 +01:00
commit 031d7ce840
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input.c
View File

@ -844,6 +844,8 @@ input_parse(struct window_pane *wp)
if (EVBUFFER_LENGTH(evb) == 0) if (EVBUFFER_LENGTH(evb) == 0)
return; return;
wp->flags |= PANE_CHANGED;
wp->window->flags |= WINDOW_ACTIVITY; wp->window->flags |= WINDOW_ACTIVITY;
wp->window->flags &= ~WINDOW_SILENCE; wp->window->flags &= ~WINDOW_SILENCE;

4
names.c
View File

@ -50,6 +50,10 @@ window_name_callback(unused int fd, unused short events, void *data)
if (w->active == NULL) if (w->active == NULL)
return; return;
if (~w->active->flags & PANE_CHANGED)
return;
w->active->flags &= ~PANE_CHANGED;
if (!options_get_number(&w->options, "automatic-rename")) { if (!options_get_number(&w->options, "automatic-rename")) {
if (event_initialized(&w->name_timer)) if (event_initialized(&w->name_timer))
event_del(&w->name_timer); event_del(&w->name_timer);

2
server-window.c
View File

@ -147,7 +147,7 @@ server_window_check_silence(struct session *s, struct winlink *wl)
* from this window. * from this window.
*/ */
if (gettimeofday(&w->silence_timer, NULL) != 0) if (gettimeofday(&w->silence_timer, NULL) != 0)
fatal("gettimeofday failed."); fatal("gettimeofday failed");
return (0); return (0);
} }

1
tmux.h
View File

@ -830,6 +830,7 @@ struct window_pane {
#define PANE_RESIZE 0x8 #define PANE_RESIZE 0x8
#define PANE_FOCUSPUSH 0x10 #define PANE_FOCUSPUSH 0x10
#define PANE_INPUTOFF 0x20 #define PANE_INPUTOFF 0x20
#define PANE_CHANGED 0x40
int argc; int argc;
char **argv; char **argv;

3
window.c
View File

@ -411,6 +411,7 @@ window_set_active_pane(struct window *w, struct window_pane *wp)
return (1); return (1);
} }
w->active->active_point = next_active_point++; w->active->active_point = next_active_point++;
w->active->flags |= PANE_CHANGED;
return (1); return (1);
} }
@ -947,7 +948,7 @@ window_pane_read_callback(unused struct bufferevent *bufev, void *data)
*/ */
wp->window->flags |= WINDOW_SILENCE; wp->window->flags |= WINDOW_SILENCE;
if (gettimeofday(&wp->window->silence_timer, NULL) != 0) if (gettimeofday(&wp->window->silence_timer, NULL) != 0)
fatal("gettimeofday failed."); fatal("gettimeofday failed");
return; return;
start_timer: start_timer: