circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-04 15:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 1120:

Browse Source 
Store mouse data in tty structure not on the stack.
This commit is contained in:
Tiago Cunha
2012-05-22 21:04:25 +00:00
parent 5cc4961fd2
commit fff7c0b276
2 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tty-keys.c
View File

@ -40,8 +40,7 @@ struct tty_key *tty_keys_find1(
struct tty_key *, const char *, size_t, size_t *);
struct tty_key *tty_keys_find(struct tty *, const char *, size_t, size_t *);
void tty_keys_callback(int, short, void *);
int tty_keys_mouse(struct tty *,
const char *, size_t, size_t *, struct mouse_event *);
int tty_keys_mouse(struct tty *, const char *, size_t, size_t *);
int tty_keys_device(struct tty *, const char *, size_t, size_t *);
struct tty_key_ent {
@ -434,13 +433,12 @@ tty_keys_find1(struct tty_key *tk, const char *buf, size_t len, size_t *size)
int
tty_keys_next(struct tty *tty)
{
struct tty_key *tk;
struct timeval tv;
struct mouse_event mouse;
const char *buf;
size_t len, size;
cc_t bspace;
int key, delay;
struct tty_key *tk;
struct timeval tv;
const char *buf;
size_t len, size;
cc_t bspace;
int key, delay;
buf = EVBUFFER_DATA(tty->event->input);
len = EVBUFFER_LENGTH(tty->event->input);
@ -477,7 +475,7 @@ tty_keys_next(struct tty *tty)
}
/* Is this a mouse key press? */
switch (tty_keys_mouse(tty, buf, len, &size, &mouse)) {
switch (tty_keys_mouse(tty, buf, len, &size)) {
case 0: /* yes */
evbuffer_drain(tty->event->input, size);
key = KEYC_MOUSE;
@ -582,7 +580,7 @@ handle_key:
evtimer_del(&tty->key_timer);
if (key != KEYC_NONE)
tty->key_callback(key, &mouse, tty->key_data);
tty->key_callback(key, &tty->mouse_event, tty->key_data);
tty->flags &= ~TTY_ESCAPE;
return (1);
@ -607,11 +605,11 @@ tty_keys_callback(unused int fd, unused short events, void *data)
* (probably a mouse sequence but need more data).
*/
int
tty_keys_mouse(struct tty *tty,
const char *buf, size_t len, size_t *size, struct mouse_event *m)
tty_keys_mouse(struct tty *tty, const char *buf, size_t len, size_t *size)
{
struct utf8_data utf8data;
u_int i, value;
struct mouse_event *m = &tty->mouse_event;
struct utf8_data utf8data;
u_int i, value;
/*
* Standard mouse sequences are \033[M followed by three characters