From 4428987e955da1c56d1fcd98d2130f6a02738f1a Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 28 Jan 2009 19:52:21 +0000 Subject: * Better support for at least the most common variant of mouse input: parse it and adjust for different panes. Also support mouse in window/session choice mode. * Bring back the fancy window titles with session/window names: it is easy to work around problems with elinks (see FAQ). --- window-choose.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) (limited to 'window-choose.c') diff --git a/window-choose.c b/window-choose.c index f865b156..2141fb1b 100644 --- a/window-choose.c +++ b/window-choose.c @@ -1,4 +1,4 @@ -/* $Id: window-choose.c,v 1.7 2009-01-27 20:22:33 nicm Exp $ */ +/* $Id: window-choose.c,v 1.8 2009-01-28 19:52:21 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -26,6 +26,8 @@ struct screen *window_choose_init(struct window_pane *); void window_choose_free(struct window_pane *); void window_choose_resize(struct window_pane *, u_int, u_int); void window_choose_key(struct window_pane *, struct client *, int); +void window_choose_mouse( + struct window_pane *, struct client *, u_char, u_char, u_char); void window_choose_redraw_screen(struct window_pane *); void window_choose_write_line( @@ -39,7 +41,8 @@ const struct window_mode window_choose_mode = { window_choose_free, window_choose_resize, window_choose_key, - NULL + window_choose_mouse, + NULL, }; struct window_choose_mode_item { @@ -111,6 +114,7 @@ window_choose_init(struct window_pane *wp) s = &data->screen; screen_init(s, screen_size_x(&wp->base), screen_size_y(&wp->base), 0); s->mode &= ~MODE_CURSOR; + s->mode |= MODE_MOUSE; return (s); } @@ -220,7 +224,7 @@ window_choose_key(struct window_pane *wp, unused struct client *c, int key) else data->top -= screen_size_y(s); } - window_choose_redraw_screen(wp); + window_choose_redraw_screen(wp); break; case MODEKEY_NONE: if (key != ' ') @@ -244,6 +248,32 @@ window_choose_key(struct window_pane *wp, unused struct client *c, int key) } } +void +window_choose_mouse(struct window_pane *wp, + unused struct client *c, u_char b, u_char x, u_char y) +{ + struct window_choose_mode_data *data = wp->modedata; + struct screen *s = &data->screen; + struct window_choose_mode_item *item; + u_int idx; + + if ((b & 3) == 0) + return; + if (x >= screen_size_x(s)) + return; + if (y >= screen_size_y(s)) + return; + + idx = data->top + y; + if (idx >= ARRAY_LENGTH(&data->list)) + return; + data->selected = idx; + + item = &ARRAY_ITEM(&data->list, data->selected); + data->callback(data->data, item->idx); + window_pane_reset_mode(wp); +} + void window_choose_write_line( struct window_pane *wp, struct screen_write_ctx *ctx, u_int py) -- cgit