mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Notifys can go via the command queue instead of using their own queue.

Browse Source
This commit is contained in:
nicm
2016-10-16 19:15:02 +00:00
parent b342bd0b46
commit 026ad08b56
3 changed files with 51 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
notify.c
View File

@@ -51,17 +51,10 @@ struct notify_entry {
struct client *client;
struct session *session;
struct window *window;
TAILQ_ENTRY(notify_entry) entry;
};
TAILQ_HEAD(notify_queue, notify_entry);
static struct notify_queue notify_queue = TAILQ_HEAD_INITIALIZER(notify_queue);
static void notify_add(enum notify_type, struct client *, struct session *,
struct window *);
static void
notify_hook(struct notify_entry *ne)
notify_hook(struct cmdq_item *item, struct notify_entry *ne)
{
const char *name;
struct cmd_find_state fs;
@@ -79,6 +72,8 @@ notify_hook(struct notify_entry *ne)
cmd_find_from_window(&fs, ne->window);
else if (ne->session != NULL)
cmd_find_from_session(&fs, ne->session);
else
cmd_find_current(&fs, item, CMD_FIND_QUIET);
if (cmd_find_empty_state(&fs) || !cmd_find_valid_state(&fs))
return;
@@ -92,7 +87,51 @@ notify_hook(struct notify_entry *ne)
for (loop = new_item; loop != NULL; loop = loop->next)
loop->hook = xstrdup(name);
cmdq_append(NULL, new_item);
cmdq_insert_after(item, new_item);
}
static enum cmd_retval
notify_callback(struct cmdq_item *item, void *data)
{
struct notify_entry *ne = data;
switch (ne->type) {
case NOTIFY_WINDOW_LAYOUT_CHANGED:
control_notify_window_layout_changed(ne->window);
break;
case NOTIFY_WINDOW_UNLINKED:
control_notify_window_unlinked(ne->session, ne->window);
break;
case NOTIFY_WINDOW_LINKED:
control_notify_window_linked(ne->session, ne->window);
break;
case NOTIFY_WINDOW_RENAMED:
control_notify_window_renamed(ne->window);
break;
case NOTIFY_ATTACHED_SESSION_CHANGED:
control_notify_attached_session_changed(ne->client);
break;
case NOTIFY_SESSION_RENAMED:
control_notify_session_renamed(ne->session);
break;
case NOTIFY_SESSION_CREATED:
control_notify_session_created(ne->session);
break;
case NOTIFY_SESSION_CLOSED:
control_notify_session_closed(ne->session);
break;
}
notify_hook(item, ne);
if (ne->client != NULL)
server_client_unref(ne->client);
if (ne->session != NULL)
session_unref(ne->session);
if (ne->window != NULL)
window_remove_ref(ne->window);
free(ne);
return (CMD_RETURN_NORMAL);
}
static void
@@ -100,13 +139,13 @@ notify_add(enum notify_type type, struct client *c, struct session *s,
struct window *w)
{
struct notify_entry *ne;
struct cmdq_item *new_item;
ne = xcalloc(1, sizeof *ne);
ne->type = type;
ne->client = c;
ne->session = s;
ne->window = w;
TAILQ_INSERT_TAIL(&notify_queue, ne, entry);
if (c != NULL)
c->references++;
@@ -114,51 +153,9 @@ notify_add(enum notify_type type, struct client *c, struct session *s,
s->references++;
if (w != NULL)
w->references++;
}
void
notify_drain(void)
{
struct notify_entry *ne, *ne1;
TAILQ_FOREACH_SAFE(ne, &notify_queue, entry, ne1) {
switch (ne->type) {
case NOTIFY_WINDOW_LAYOUT_CHANGED:
control_notify_window_layout_changed(ne->window);
break;
case NOTIFY_WINDOW_UNLINKED:
control_notify_window_unlinked(ne->session, ne->window);
break;
case NOTIFY_WINDOW_LINKED:
control_notify_window_linked(ne->session, ne->window);
break;
case NOTIFY_WINDOW_RENAMED:
control_notify_window_renamed(ne->window);
break;
case NOTIFY_ATTACHED_SESSION_CHANGED:
control_notify_attached_session_changed(ne->client);
break;
case NOTIFY_SESSION_RENAMED:
control_notify_session_renamed(ne->session);
break;
case NOTIFY_SESSION_CREATED:
control_notify_session_created(ne->session);
break;
case NOTIFY_SESSION_CLOSED:
control_notify_session_closed(ne->session);
break;
}
TAILQ_REMOVE(&notify_queue, ne, entry);
notify_hook(ne);
if (ne->client != NULL)
server_client_unref(ne->client);
if (ne->session != NULL)
session_unref(ne->session);
if (ne->window != NULL)
window_remove_ref(ne->window);
free(ne);
}
new_item = cmdq_get_callback(notify_callback, ne);
cmdq_append(NULL, new_item);
}
void
@@ -176,54 +173,46 @@ void
notify_window_layout_changed(struct window *w)
{
notify_add(NOTIFY_WINDOW_LAYOUT_CHANGED, NULL, NULL, w);
notify_drain();
}
void
notify_window_unlinked(struct session *s, struct window *w)
{
notify_add(NOTIFY_WINDOW_UNLINKED, NULL, s, w);
notify_drain();
}
void
notify_window_linked(struct session *s, struct window *w)
{
notify_add(NOTIFY_WINDOW_LINKED, NULL, s, w);
notify_drain();
}
void
notify_window_renamed(struct window *w)
{
notify_add(NOTIFY_WINDOW_RENAMED, NULL, NULL, w);
notify_drain();
}
void
notify_attached_session_changed(struct client *c)
{
notify_add(NOTIFY_ATTACHED_SESSION_CHANGED, c, NULL, NULL);
notify_drain();
}
void
notify_session_renamed(struct session *s)
{
notify_add(NOTIFY_SESSION_RENAMED, NULL, s, NULL);
notify_drain();
}
void
notify_session_created(struct session *s)
{
notify_add(NOTIFY_SESSION_CREATED, NULL, s, NULL);
notify_drain();
}
void
notify_session_closed(struct session *s)
{
notify_add(NOTIFY_SESSION_CLOSED, NULL, s, NULL);
notify_drain();
}

2
server.c
View File

@@ -192,8 +192,6 @@ server_loop(void)
struct client *c;
u_int items;
notify_drain();
do {
items = cmdq_next(NULL);
TAILQ_FOREACH(c, &clients, entry)

1
tmux.h
View File

@@ -1581,7 +1581,6 @@ void mode_key_init(struct mode_key_data *, struct mode_key_tree *);
enum mode_key_cmd mode_key_lookup(struct mode_key_data *, key_code);
/* notify.c */
void notify_drain(void);
void notify_input(struct window_pane *, struct evbuffer *);
void notify_window_layout_changed(struct window *);
void notify_window_unlinked(struct session *, struct window *);