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

Sync OpenBSD patchset 598:

Browse Source 
Fix selection behaviour when the cursor is moved backwards (ie so the selection
start is after the end).
This commit is contained in:
Tiago Cunha 2010-01-05 23:54:53 +00:00
parent b8bc525afe
commit 4d8d70a846
1 changed files with 24 additions and 4 deletions

28
screen.c
View File

@ -1,4 +1,4 @@
/* $Id: screen.c,v 1.97 2009-12-04 22:14:47 tcunha Exp $ */ /* $Id: screen.c,v 1.98 2010-01-05 23:54:53 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -233,11 +233,31 @@ screen_set_selection(struct screen *s,
struct screen_sel *sel = &s->sel; struct screen_sel *sel = &s->sel;
memcpy(&sel->cell, gc, sizeof sel->cell); memcpy(&sel->cell, gc, sizeof sel->cell);
sel->flag = 1; sel->flag = 1;
if (ey < sy || (sy == ey && ex < sx)) {
/* starting line < ending line -- downward selection. */
if (sy < ey) {
sel->sx = sx; sel->sy = sy;
sel->ex = ex; sel->ey = ey;
return;
}
/* starting line > ending line -- upward selection. */
if (sy > ey) {
if (sx > 0) {
sel->sx = ex; sel->sy = ey;
sel->ex = sx - 1; sel->ey = sy;
} else {
sel->sx = ex; sel->sy = ey;
sel->ex = -1; sel->ey = sy - 1;
}
return;
}
/* starting line == ending line. */
if (ex < sx) {
sel->sx = ex; sel->sy = ey; sel->sx = ex; sel->sy = ey;
sel->ex = sx; sel->ey = sy; sel->ex = sx - 1; sel->ey = sy;
} else { } else {
sel->sx = sx; sel->sy = sy; sel->sx = sx; sel->sy = sy;
sel->ex = ex; sel->ey = ey; sel->ex = ex; sel->ey = ey;