extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-09 13:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 498:

Browse Source 
Convert the window pane (pty master side) fd over to use a bufferevent.

The evbuffer API is very similar to the existing tmux buffer API so this was
remarkably painless. Not many possible ways to do it, I suppose.
This commit is contained in:
Tiago Cunha
2009-11-08 23:02:56 +00:00
parent 70b2f1981e
commit 2df0882722
8 changed files with 89 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
input-keys.c
View File

@ -1,4 +1,4 @@
/* $Id: input-keys.c,v 1.39 2009-10-28 23:05:01 tcunha Exp $ */
/* $Id: input-keys.c,v 1.40 2009-11-08 23:02:56 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -163,6 +163,7 @@ input_key(struct window_pane *wp, int key)
u_int i;
size_t dlen;
char *out;
u_char ch;
log_debug2("writing key 0x%x", key);
@ -172,8 +173,10 @@ input_key(struct window_pane *wp, int key)
*/
if (key != KEYC_NONE && (key & ~KEYC_ESCAPE) < 0x100) {
if (key & KEYC_ESCAPE)
buffer_write8(wp->out, '\033');
buffer_write8(wp->out, (uint8_t) (key & ~KEYC_ESCAPE));
ch = '\033';
else
ch = key & ~KEYC_ESCAPE;
bufferevent_write(wp->event, &ch, 1);
return;
}
@ -183,7 +186,7 @@ input_key(struct window_pane *wp, int key)
*/
if (options_get_number(&wp->window->options, "xterm-keys")) {
if ((out = xterm_keys_lookup(key)) != NULL) {
buffer_write(wp->out, out, strlen(out));
bufferevent_write(wp->event, out, strlen(out));
xfree(out);
return;
}
@ -214,18 +217,19 @@ input_key(struct window_pane *wp, int key)
/* Prefix a \033 for escape. */
if (key & KEYC_ESCAPE)
buffer_write8(wp->out, '\033');
buffer_write(wp->out, ike->data, dlen);
bufferevent_write(wp->event, "\033", 1);
bufferevent_write(wp->event, ike->data, dlen);
}
/* Translate mouse and output. */
void
input_mouse(struct window_pane *wp, struct mouse_event *m)
{
char out[8];
if (wp->screen->mode & MODE_MOUSE) {
buffer_write(wp->out, "\033[M", 3);
buffer_write8(wp->out, m->b + 32);
buffer_write8(wp->out, m->x + 33);
buffer_write8(wp->out, m->y + 33);
xsnprintf(out, sizeof out,
"\033[M%c%c%c", m->b + 32, m->x + 33, m->y + 33);
bufferevent_write(wp->event, out, strlen(out));
}
}