1
0
mirror of https://github.com/tmux/tmux.git synced 2025-04-23 04:48:47 +00:00

Fix rectangle copy to behave like emacs - the cursor is not part of the

selection on the right edge but on the left it is.
This commit is contained in:
Nicholas Marriott 2010-12-11 17:57:28 +00:00
parent 095ffe9cd1
commit 0b8ce56d73
2 changed files with 6 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $Id: screen.c,v 1.102 2010-07-19 18:31:42 nicm Exp $ */ /* $Id: screen.c,v 1.103 2010-12-11 17:57:28 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -287,7 +287,7 @@ screen_check_selection(struct screen *s, u_int px, u_int py)
*/ */
if (sel->ex < sel->sx) { if (sel->ex < sel->sx) {
/* Cursor (ex) is on the left. */ /* Cursor (ex) is on the left. */
if (px <= sel->ex) if (px < sel->ex)
return (0); return (0);
if (px > sel->sx) if (px > sel->sx)
@ -297,7 +297,7 @@ screen_check_selection(struct screen *s, u_int px, u_int py)
if (px < sel->sx) if (px < sel->sx)
return (0); return (0);
if (px >= sel->ex) if (px > sel->ex)
return (0); return (0);
} }
} else { } else {

View File

@ -1,4 +1,4 @@
/* $Id: window-copy.c,v 1.124 2010-09-18 15:41:18 tcunha Exp $ */ /* $Id: window-copy.c,v 1.125 2010-12-11 17:57:28 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1267,8 +1267,8 @@ window_copy_copy_selection(struct window_pane *wp, struct session *sess)
/* Cursor is on the left. */ /* Cursor is on the left. */
lastex = data->selx + 1; lastex = data->selx + 1;
restex = data->selx + 1; restex = data->selx + 1;
firstsx = data->cx + 1; firstsx = data->cx;
restsx = data->cx + 1; restsx = data->cx;
} }
} else { } else {
/* /*