aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-03-31 20:01:34 +0100
committerThomas Adam <thomas@xteddy.org>2020-03-31 20:01:34 +0100
commitdfd29977e0ab289615eae0b4275763a3082bda24 (patch)
tree9e1753f4e3748cddfce46356d57044fe7ba49bf0 /server-client.c
parent0bb1a50b88ac319e8f499fa95500f373123594d1 (diff)
parentcc8b41f294974cdfb1ddfe3b907da58374ff130f (diff)
downloadrtmux-dfd29977e0ab289615eae0b4275763a3082bda24.tar.gz
rtmux-dfd29977e0ab289615eae0b4275763a3082bda24.tar.bz2
rtmux-dfd29977e0ab289615eae0b4275763a3082bda24.zip
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c
index 412df67a..1aeed16c 100644
--- a/server-client.c
+++ b/server-client.c
@@ -518,6 +518,7 @@ server_client_check_mouse(struct client *c, struct key_event *event)
memcpy(&c->click_event, m, sizeof c->click_event);
c->click_button = m->b;
+ log_debug("click timer started");
tv.tv_sec = KEYC_CLICK_TIMEOUT / 1000;
tv.tv_usec = (KEYC_CLICK_TIMEOUT % 1000) * 1000L;
evtimer_del(&c->click_timer);
@@ -2018,7 +2019,7 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg)
if (datalen == 0 || data[datalen - 1] != '\0')
fatalx("bad MSG_IDENTIFY_ENVIRON string");
if (strchr(data, '=') != NULL)
- environ_put(c->environ, data);
+ environ_put(c->environ, data, 0);
log_debug("client %p IDENTIFY_ENVIRON %s", c, data);
break;
case MSG_IDENTIFY_CLIENTPID: