circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 373:

Browse Source 
New option, mouse-select-pane. If on, the mouse may be used to select the
current pane.

Suggested by sthen@ and also by someone else ages ago who I have forgotten.
This commit is contained in:
Tiago Cunha
2009-10-11 23:46:02 +00:00
parent 2486a36af3
commit ea1721bcb0
6 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server.c
View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.198 2009-10-11 23:38:16 tcunha Exp $ */
/* $Id: server.c,v 1.199 2009-10-11 23:46:02 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -828,6 +828,7 @@ server_handle_client(struct client *c)
struct window *w;
struct window_pane *wp;
struct screen *s;
struct options *oo;
struct timeval tv;
struct key_binding *bd;
struct keylist *keylist;
@ -852,6 +853,7 @@ server_handle_client(struct client *c)
c->session->activity = time(NULL);
w = c->session->curw->window;
wp = w->active; /* could die */
oo = &c->session->options;
/* Special case: number keys jump to pane in identify mode. */
if (c->flags & CLIENT_IDENTIFY && key >= '0' && key <= '9') {
@ -871,6 +873,10 @@ server_handle_client(struct client *c)
/* Check for mouse keys. */
if (key == KEYC_MOUSE) {
if (options_get_number(oo, "mouse-select-pane")) {
window_set_active_at(w, mouse[1], mouse[2]);
wp = w->active;
}
window_pane_mouse(wp, c, mouse[0], mouse[1], mouse[2]);
continue;
}
@ -938,7 +944,9 @@ server_handle_client(struct client *c)
}
if (c->session == NULL)
return;
wp = c->session->curw->window->active; /* could die - do each loop */
w = c->session->curw->window;
wp = w->active;
oo = &c->session->options;
s = wp->screen;
/*
@ -951,7 +959,7 @@ server_handle_client(struct client *c)
* tty_region/tty_reset/tty_update_mode already take care of not
* resetting things that are already in their default state.
*/
status = options_get_number(&c->session->options, "status");
status = options_get_number(oo, "status");
tty_region(&c->tty, 0, c->tty.sy - 1, 0);
if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status)
tty_cursor(&c->tty, 0, 0, 0, 0);
@ -959,6 +967,9 @@ server_handle_client(struct client *c)
tty_cursor(&c->tty, s->cx, s->cy, wp->xoff, wp->yoff);
mode = s->mode;
if (TAILQ_NEXT(TAILQ_FIRST(&w->panes), entry) != NULL &&
options_get_number(oo, "mouse-select-pane"))
mode |= MODE_MOUSE;
tty_update_mode(&c->tty, mode);
tty_reset(&c->tty);
}