Clean up by introducing a wrapper struct for mouse clicks rather than passing

three u_chars around.

As a side-effect this fixes incorrectly rejecting high cursor positions
(because it was comparing them as signed char), reported by Tom Doherty.
This commit is contained in:
Nicholas Marriott
2009-10-11 07:01:10 +00:00
parent f68ade7b1d
commit 4bc0f6e7e9
7 changed files with 52 additions and 45 deletions

View File

@ -27,7 +27,7 @@ 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);
struct window_pane *, struct client *, struct mouse_event *);
void window_choose_redraw_screen(struct window_pane *);
void window_choose_write_line(
@ -264,22 +264,22 @@ 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)
window_choose_mouse(
struct window_pane *wp, unused struct client *c, struct mouse_event *m)
{
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) == 3)
if ((m->b & 3) == 3)
return;
if (x >= screen_size_x(s))
if (m->x >= screen_size_x(s))
return;
if (y >= screen_size_y(s))
if (m->y >= screen_size_y(s))
return;
idx = data->top + y;
idx = data->top + m->y;
if (idx >= ARRAY_LENGTH(&data->list))
return;
data->selected = idx;