mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 01:34:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 506:

Browse Source 
Change window name change to use a timer event rather than a gettimeofday()
check every loop.
This commit is contained in:
Tiago Cunha
2009-11-08 23:22:24 +00:00
parent 915031b049
commit ab38d91913
4 changed files with 60 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
names.c
View File

@@ -1,4 +1,4 @@
/* $Id: names.c,v 1.17 2009-10-12 00:03:04 tcunha Exp $ */
/* $Id: names.c,v 1.18 2009-11-08 23:22:24 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -25,45 +25,43 @@
#include "tmux.h"
void window_name_callback(unused int, unused short, void *);
char *parse_window_name(const char *);
void
set_window_names(void)
queue_window_name(struct window *w)
{
struct window *w;
u_int i;
struct timeval tv;
tv.tv_sec = 0;
tv.tv_usec = NAME_INTERVAL * 1000L;
evtimer_del(&w->name_timer);
evtimer_set(&w->name_timer, window_name_callback, w);
evtimer_add(&w->name_timer, &tv);
}
void
window_name_callback(unused int fd, unused short events, void *data)
{
struct window *w = data;
char *name, *wname;
struct timeval tv, tv2;
if (gettimeofday(&tv, NULL) != 0)
fatal("gettimeofday failed");
for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
w = ARRAY_ITEM(&windows, i);
if (w == NULL || w->active == NULL)
continue;
if (timercmp(&tv, &w->name_timer, <))
continue;
memcpy(&w->name_timer, &tv, sizeof w->name_timer);
tv2.tv_sec = 0;
tv2.tv_usec = NAME_INTERVAL * 1000L;
timeradd(&w->name_timer, &tv2, &w->name_timer);
queue_window_name(w); /* XXX even if the option is off? */
if (!options_get_number(&w->options, "automatic-rename"))
continue;
return;
if (w->active->screen != &w->active->base)
name = NULL;
else
name = osdep_get_name(w->active->fd, w->active->tty);
name = get_proc_name(w->active->fd, w->active->tty);
if (name == NULL)
wname = default_window_name(w);
else {
/*
* If tmux is using the default command, it will be a
* login shell and argv[0] may have a - prefix. Remove
* this if it is present. Ick.
* If tmux is using the default command, it will be a login
* shell and argv[0] may have a - prefix. Remove this if it is
* present. Ick.
*/
if (w->active->cmd != NULL && *w->active->cmd == '\0' &&
name != NULL && name[0] == '-' && name[1] != '\0')
@@ -86,7 +84,6 @@ set_window_names(void)
w->name = wname;
server_status_window(w);
}
}
}
char *

4
server-window.c
View File

@@ -1,4 +1,4 @@
/* $Id: server-window.c,v 1.9 2009-11-08 23:02:56 tcunha Exp $ */
/* $Id: server-window.c,v 1.10 2009-11-08 23:22:24 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -91,8 +91,6 @@ server_window_loop(void)
server_window_check_alive(w);
}
set_window_names();
}
/* Check for bell in window. */

6
tmux.h
View File

@@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.505 2009-11-08 23:12:35 tcunha Exp $ */
/* $Id: tmux.h,v 1.506 2009-11-08 23:22:24 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -809,7 +809,7 @@ TAILQ_HEAD(window_panes, window_pane);
/* Window structure. */
struct window {
char *name;
struct timeval name_timer;
struct event name_timer;
struct window_pane *active;
struct window_panes panes;
@@ -1850,7 +1850,7 @@ void window_choose_ready(struct window_pane *,
u_int, void (*)(void *, int), void (*)(void *), void *);
/* names.c */
void set_window_names(void);
void queue_window_name(struct window *);
char *default_window_name(struct window *);
/* session.c */

15
window.c
View File

@@ -1,4 +1,4 @@
/* $Id: window.c,v 1.120 2009-11-08 23:02:56 tcunha Exp $ */
/* $Id: window.c,v 1.121 2009-11-08 23:22:24 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -210,7 +210,7 @@ window_create1(u_int sx, u_int sy)
struct window *w;
u_int i;
w = xmalloc(sizeof *w);
w = xcalloc(1, sizeof *w);
w->name = NULL;
w->flags = 0;
@@ -223,6 +223,8 @@ window_create1(u_int sx, u_int sy)
w->sx = sx;
w->sy = sy;
queue_window_name(w);
options_init(&w->options, &global_w_options);
for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
@@ -276,6 +278,8 @@ window_destroy(struct window *w)
if (w->layout_root != NULL)
layout_free(w);
evtimer_del(&w->name_timer);
options_free(&w->options);
window_destroy_panes(w);
@@ -478,7 +482,6 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
ARRAY_DECL(, char *) varlist;
struct environ_entry *envent;
const char *ptr;
struct timeval tv;
struct termios tio2;
u_int i;
@@ -506,12 +509,6 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
ws.ws_col = screen_size_x(&wp->base);
ws.ws_row = screen_size_y(&wp->base);
if (gettimeofday(&wp->window->name_timer, NULL) != 0)
fatal("gettimeofday failed");
tv.tv_sec = 0;
tv.tv_usec = NAME_INTERVAL * 1000L;
timeradd(&wp->window->name_timer, &tv, &wp->window->name_timer);
switch (wp->pid = forkpty(&wp->fd, wp->tty, NULL, &ws)) {
case -1:
wp->fd = -1;