diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-06-16 14:01:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-06-16 14:01:11 +0100 |
| commit | 93f42d360b8dbeff738992c15067d608ead16c21 (patch) | |
| tree | 4f9cc77ac128f028a343bcc73651a8f12c61d099 /server-fn.c | |
| parent | d35a9ac5f20f65eecd1822e9a4ace2033756656a (diff) | |
| parent | 325cbe90d925d3deb90559463b6d968c31fa5924 (diff) | |
| download | rtmux-93f42d360b8dbeff738992c15067d608ead16c21.tar.gz rtmux-93f42d360b8dbeff738992c15067d608ead16c21.tar.bz2 rtmux-93f42d360b8dbeff738992c15067d608ead16c21.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-fn.c')
| -rw-r--r-- | server-fn.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/server-fn.c b/server-fn.c index 78bc2bea..53d6a7c2 100644 --- a/server-fn.c +++ b/server-fn.c @@ -442,21 +442,23 @@ server_set_identify(struct client *c) } void -server_clear_identify(struct client *c) +server_clear_identify(struct client *c, struct window_pane *wp) { - if (c->flags & CLIENT_IDENTIFY) { - c->flags &= ~CLIENT_IDENTIFY; - c->tty.flags &= ~(TTY_FREEZE|TTY_NOCURSOR); - server_redraw_client(c); - } + if (~c->flags & CLIENT_IDENTIFY) + return; + c->flags &= ~CLIENT_IDENTIFY; + + if (c->identify_callback != NULL) + c->identify_callback(c, wp); + + c->tty.flags &= ~(TTY_FREEZE|TTY_NOCURSOR); + server_redraw_client(c); } void server_callback_identify(__unused int fd, __unused short events, void *data) { - struct client *c = data; - - server_clear_identify(c); + server_clear_identify(data, NULL); } /* Set stdin callback. */ |