From 90d40e27daaf2d2e5e0ebeffa8b5865d9536df80 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 16 Dec 2009 01:09:01 +0000 Subject: Sync OpenBSD patchset 587: New server option, escape-time, to set the timeout used to detect if escapes are alone or part of a function key or meta sequence. --- tty-keys.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tty-keys.c') diff --git a/tty-keys.c b/tty-keys.c index 7b0632bb..db49e1d9 100644 --- a/tty-keys.c +++ b/tty-keys.c @@ -1,4 +1,4 @@ -/* $Id: tty-keys.c,v 1.53 2009-12-04 22:14:47 tcunha Exp $ */ +/* $Id: tty-keys.c,v 1.54 2009-12-16 01:09:01 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -429,7 +429,7 @@ tty_keys_next(struct tty *tty) const char *buf; size_t len, size; cc_t bspace; - int key; + int key, delay; buf = EVBUFFER_DATA(tty->event->input); len = EVBUFFER_LENGTH(tty->event->input); @@ -521,8 +521,9 @@ partial_key: start_timer: /* Start the timer and wait for expiry or more data. */ - tv.tv_sec = 0; - tv.tv_usec = ESCAPE_PERIOD * 1000L; + delay = options_get_number(&global_options, "escape-time"); + tv.tv_sec = delay / 1000; + tv.tv_usec = (delay % 1000) * 1000L; evtimer_del(&tty->key_timer); evtimer_set(&tty->key_timer, tty_keys_callback, tty); -- cgit