clemens fischer wrote:
> Hi,
>
> I am very glad that tmux has rectangular copies now! But a problem as
> well: in the following, try to cut out the block
>
> >bbb < from >aaa bbb
> >yyyyy< >xxx yyyyy
> >22 < >111 22
>
> At least in vi-copy mode on linux, the shortest line determines the
> right border of the block.
Here's a patch to solve this one.
--
Micah J. Cowan
http://micah.cowan.name/
Index: sf/window-copy.c
===================================================================
--- sf.orig/window-copy.c 2010-02-18 17:19:20.000000000 -0800
+++ sf/window-copy.c 2010-02-18 18:06:21.000000000 -0800
@@ -53,6 +53,7 @@ void window_copy_update_cursor(struct wi
void window_copy_start_selection(struct window_pane *);
int window_copy_update_selection(struct window_pane *);
void window_copy_copy_selection(struct window_pane *, struct client *);
+void window_copy_clear_selection(struct window_pane *);
void window_copy_copy_line(
struct window_pane *, char **, size_t *, u_int, u_int, u_int);
int window_copy_in_set(struct window_pane *, u_int, u_int, const char *);
@@ -223,7 +224,7 @@ window_copy_resize(struct window_pane *w
if (data->cx > sx)
data->cx = sx;
- screen_clear_selection(&data->screen);
+ window_copy_clear_selection(wp);
screen_write_start(&ctx, NULL, s);
window_copy_write_lines(wp, &ctx, 0, screen_size_y(s) - 1);
@@ -378,7 +379,7 @@ window_copy_key(struct window_pane *wp,
window_copy_redraw_screen(wp);
break;
case MODEKEYCOPY_CLEARSELECTION:
- screen_clear_selection(&data->screen);
+ window_copy_clear_selection(wp);
window_copy_redraw_screen(wp);
break;
case MODEKEYCOPY_COPYSELECTION:
@@ -1211,6 +1212,20 @@ window_copy_copy_line(struct window_pane
}
}
+void
+window_copy_clear_selection(struct window_pane *wp)
+{
+ struct window_copy_mode_data *data = wp->modedata;
+ u_int px, py;
+
+ screen_clear_selection(&data->screen);
+
+ py = screen_hsize(&wp->base) + data->cy - data->oy;
+ px = window_copy_find_length(wp, py);
+ if (data->cx > px)
+ window_copy_update_cursor(wp, px, data->cy);
+}
+
int
window_copy_in_set(struct window_pane *wp, u_int px, u_int py, const char *set)
{
@@ -1320,8 +1335,12 @@ window_copy_cursor_right(struct window_p
struct window_copy_mode_data *data = wp->modedata;
u_int px, py;
- py = screen_hsize(&wp->base) + data->cy - data->oy;
- px = window_copy_find_length(wp, py);
+ if (data->screen.sel.flag && data->rectflag)
+ px = screen_size_x(&data->screen);
+ else {
+ py = screen_hsize(&wp->base) + data->cy - data->oy;
+ px = window_copy_find_length(wp, py);
+ }
if (data->cx >= px) {
window_copy_cursor_start_of_line(wp);
@@ -1366,10 +1385,12 @@ window_copy_cursor_up(struct window_pane
}
}
- py = screen_hsize(&wp->base) + data->cy - data->oy;
- px = window_copy_find_length(wp, py);
- if (data->cx >= data->lastsx || data->cx > px)
- window_copy_cursor_end_of_line(wp);
+ if (!data->screen.sel.flag || !data->rectflag) {
+ py = screen_hsize(&wp->base) + data->cy - data->oy;
+ px = window_copy_find_length(wp, py);
+ if (data->cx >= data->lastsx || data->cx > px)
+ window_copy_cursor_end_of_line(wp);
+ }
}
void
@@ -1397,10 +1418,12 @@ window_copy_cursor_down(struct window_pa
window_copy_redraw_lines(wp, data->cy - 1, 2);
}
- py = screen_hsize(&wp->base) + data->cy - data->oy;
- px = window_copy_find_length(wp, py);
- if (data->cx >= data->lastsx || data->cx > px)
- window_copy_cursor_end_of_line(wp);
+ if (!data->screen.sel.flag || !data->rectflag) {
+ py = screen_hsize(&wp->base) + data->cy - data->oy;
+ px = window_copy_find_length(wp, py);
+ if (data->cx >= data->lastsx || data->cx > px)
+ window_copy_cursor_end_of_line(wp);
+ }
}
void
@@ -1648,9 +1671,15 @@ void
window_copy_rectangle_toggle(struct window_pane *wp)
{
struct window_copy_mode_data *data = wp->modedata;
+ u_int px, py;
data->rectflag = !data->rectflag;
+ py = screen_hsize(&wp->base) + data->cy - data->oy;
+ px = window_copy_find_length(wp, py);
+ if (data->cx > px)
+ window_copy_update_cursor(wp, px, data->cy);
+
window_copy_update_selection(wp);
window_copy_redraw_screen(wp);
}
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
