Brought the patch in-line with IRC feedback from Nicholas.
--
Micah J. Cowan
http://micah.cowan.name/
Index: mode-key.c
===================================================================
--- mode-key.c.orig 2010-03-09 09:58:37.000000000 -0800
+++ mode-key.c 2010-03-09 12:17:36.000000000 -0800
@@ -88,6 +88,12 @@ struct mode_key_cmdstr mode_key_cmdstr_c
{ MODEKEYCOPY_GOTOLINE, "goto-line" },
{ MODEKEYCOPY_HISTORYBOTTOM, "history-bottom" },
{ MODEKEYCOPY_HISTORYTOP, "history-top" },
+ { MODEKEYCOPY_JUMP, "jump" },
+ { MODEKEYCOPY_JUMPAGAIN, "jump-again" },
+ { MODEKEYCOPY_JUMPAGAINREVERSE, "jump-again-reverse" },
+ { MODEKEYCOPY_JUMPBACK, "jump-back" },
+ { MODEKEYCOPY_JUMPBEFOREBACK, "jump-before-back" },
+ { MODEKEYCOPY_JUMPBEFORE, "jump-before" },
{ MODEKEYCOPY_LEFT, "cursor-left" },
{ MODEKEYCOPY_RECTANGLETOGGLE, "rectangle-toggle" },
{ MODEKEYCOPY_MIDDLELINE, "middle-line" },
@@ -177,6 +183,8 @@ struct mode_key_tree mode_key_tree_vi_ch
const struct mode_key_entry mode_key_vi_copy[] = {
{ ' ', 0, MODEKEYCOPY_STARTSELECTION },
{ '$', 0, MODEKEYCOPY_ENDOFLINE },
+ { ',', 0, MODEKEYCOPY_JUMPAGAINREVERSE },
+ { ';', 0, MODEKEYCOPY_JUMPAGAIN },
{ '/', 0, MODEKEYCOPY_SEARCHDOWN },
{ '0', 0, MODEKEYCOPY_STARTOFLINE },
{ '1', 0, MODEKEYCOPY_STARTNUMBERPREFIX },
@@ -192,6 +200,7 @@ const struct mode_key_entry mode_key_vi_
{ '?', 0, MODEKEYCOPY_SEARCHUP },
{ 'B', 0, MODEKEYCOPY_PREVIOUSSPACE },
{ 'E', 0, MODEKEYCOPY_NEXTSPACEEND },
+ { 'F', 0, MODEKEYCOPY_JUMPBACK },
{ 'G', 0, MODEKEYCOPY_HISTORYBOTTOM },
{ 'H', 0, MODEKEYCOPY_TOPLINE },
{ 'J', 0, MODEKEYCOPY_SCROLLDOWN },
@@ -199,6 +208,7 @@ const struct mode_key_entry mode_key_vi_
{ 'L', 0, MODEKEYCOPY_BOTTOMLINE },
{ 'M', 0, MODEKEYCOPY_MIDDLELINE },
{ 'N', 0, MODEKEYCOPY_SEARCHREVERSE },
+ { 'T', 0, MODEKEYCOPY_JUMPBEFOREBACK },
{ 'W', 0, MODEKEYCOPY_NEXTSPACE },
{ '\002' /* C-b */, 0, MODEKEYCOPY_PREVIOUSPAGE },
{ '\003' /* C-c */, 0, MODEKEYCOPY_CANCEL },
@@ -213,6 +223,7 @@ const struct mode_key_entry mode_key_vi_
{ '^', 0, MODEKEYCOPY_BACKTOINDENTATION },
{ 'b', 0, MODEKEYCOPY_PREVIOUSWORD },
{ 'e', 0, MODEKEYCOPY_NEXTWORDEND },
+ { 'f', 0, MODEKEYCOPY_JUMP },
{ 'g', 0, MODEKEYCOPY_HISTORYTOP },
{ 'h', 0, MODEKEYCOPY_LEFT },
{ 'j', 0, MODEKEYCOPY_DOWN },
@@ -220,6 +231,7 @@ const struct mode_key_entry mode_key_vi_
{ 'l', 0, MODEKEYCOPY_RIGHT },
{ 'n', 0, MODEKEYCOPY_SEARCHAGAIN },
{ 'q', 0, MODEKEYCOPY_CANCEL },
+ { 't', 0, MODEKEYCOPY_JUMPBEFORE },
{ 'v', 0, MODEKEYCOPY_RECTANGLETOGGLE },
{ 'w', 0, MODEKEYCOPY_NEXTWORD },
{ KEYC_BSPACE, 0, MODEKEYCOPY_LEFT },
@@ -290,6 +302,8 @@ struct mode_key_tree mode_key_tree_emacs
/* emacs copy mode keys. */
const struct mode_key_entry mode_key_emacs_copy[] = {
{ ' ', 0, MODEKEYCOPY_NEXTPAGE },
+ { ',', 0, MODEKEYCOPY_JUMPAGAINREVERSE },
+ { ';', 0, MODEKEYCOPY_JUMPAGAIN },
{ '1' | KEYC_ESCAPE, 0, MODEKEYCOPY_STARTNUMBERPREFIX },
{ '2' | KEYC_ESCAPE, 0, MODEKEYCOPY_STARTNUMBERPREFIX },
{ '3' | KEYC_ESCAPE, 0, MODEKEYCOPY_STARTNUMBERPREFIX },
@@ -301,8 +315,11 @@ const struct mode_key_entry mode_key_ema
{ '9' | KEYC_ESCAPE, 0, MODEKEYCOPY_STARTNUMBERPREFIX },
{ '<' | KEYC_ESCAPE, 0, MODEKEYCOPY_HISTORYTOP },
{ '>' | KEYC_ESCAPE, 0, MODEKEYCOPY_HISTORYBOTTOM },
+ { 'F', 0, MODEKEYCOPY_JUMPBACK },
+ { 'N', 0, MODEKEYCOPY_SEARCHREVERSE },
{ 'R' | KEYC_ESCAPE, 0, MODEKEYCOPY_TOPLINE },
{ 'R', 0, MODEKEYCOPY_RECTANGLETOGGLE },
+ { 'T', 0, MODEKEYCOPY_JUMPBEFOREBACK },
{ '\000' /* C-Space */, 0, MODEKEYCOPY_STARTSELECTION },
{ '\001' /* C-a */, 0, MODEKEYCOPY_STARTOFLINE },
{ '\002' /* C-b */, 0, MODEKEYCOPY_LEFT },
@@ -319,12 +336,14 @@ const struct mode_key_entry mode_key_ema
{ '\033' /* Escape */, 0, MODEKEYCOPY_CANCEL },
{ 'N', 0, MODEKEYCOPY_SEARCHREVERSE },
{ 'b' | KEYC_ESCAPE, 0, MODEKEYCOPY_PREVIOUSWORD },
+ { 'f', 0, MODEKEYCOPY_JUMP },
{ 'f' | KEYC_ESCAPE, 0, MODEKEYCOPY_NEXTWORDEND },
{ 'g', 0, MODEKEYCOPY_GOTOLINE },
{ 'm' | KEYC_ESCAPE, 0, MODEKEYCOPY_BACKTOINDENTATION },
{ 'n', 0, MODEKEYCOPY_SEARCHAGAIN },
{ 'q', 0, MODEKEYCOPY_CANCEL },
{ 'r' | KEYC_ESCAPE, 0, MODEKEYCOPY_MIDDLELINE },
+ { 't', 0, MODEKEYCOPY_JUMPBEFORE },
{ 'v' | KEYC_ESCAPE, 0, MODEKEYCOPY_PREVIOUSPAGE },
{ 'w' | KEYC_ESCAPE, 0, MODEKEYCOPY_COPYSELECTION },
{ KEYC_DOWN | KEYC_CTRL,0, MODEKEYCOPY_SCROLLDOWN },
Index: tmux.h
===================================================================
--- tmux.h.orig 2010-03-09 09:58:37.000000000 -0800
+++ tmux.h 2010-03-09 12:49:56.000000000 -0800
@@ -458,6 +458,12 @@ enum mode_key_cmd {
MODEKEYCOPY_HALFPAGEUP,
MODEKEYCOPY_HISTORYBOTTOM,
MODEKEYCOPY_HISTORYTOP,
+ MODEKEYCOPY_JUMP,
+ MODEKEYCOPY_JUMPAGAIN,
+ MODEKEYCOPY_JUMPAGAINREVERSE,
+ MODEKEYCOPY_JUMPBACK,
+ MODEKEYCOPY_JUMPBEFOREBACK,
+ MODEKEYCOPY_JUMPBEFORE,
MODEKEYCOPY_LEFT,
MODEKEYCOPY_MIDDLELINE,
MODEKEYCOPY_NEXTPAGE,
Index: window-copy.c
===================================================================
--- window-copy.c.orig 2010-03-09 09:58:37.000000000 -0800
+++ window-copy.c 2010-03-09 13:09:24.000000000 -0800
@@ -65,6 +65,8 @@ void window_copy_cursor_left(struct wind
void window_copy_cursor_right(struct window_pane *);
void window_copy_cursor_up(struct window_pane *, int);
void window_copy_cursor_down(struct window_pane *, int);
+void window_copy_cursor_jump(struct window_pane *);
+void window_copy_cursor_jump_back(struct window_pane *);
void window_copy_cursor_next_word(struct window_pane *, const char *);
void window_copy_cursor_next_word_end(struct window_pane *, const char *);
void window_copy_cursor_previous_word(struct window_pane *, const char *);
@@ -86,6 +88,8 @@ enum window_copy_input_type {
WINDOW_COPY_NUMERICPREFIX,
WINDOW_COPY_SEARCHUP,
WINDOW_COPY_SEARCHDOWN,
+ WINDOW_COPY_JUMPFORWARD,
+ WINDOW_COPY_JUMPBACK,
WINDOW_COPY_GOTOLINE,
};
@@ -115,6 +119,10 @@ struct window_copy_mode_data {
enum window_copy_input_type searchtype;
char *searchstr;
+
+ enum window_copy_input_type jumptype;
+ int jumpbefore;
+ char jumpchar;
};
struct screen *
@@ -147,6 +155,10 @@ window_copy_init(struct window_pane *wp)
wp->flags |= PANE_FREEZE;
bufferevent_disable(wp->event, EV_READ|EV_WRITE);
+ data->jumptype = WINDOW_COPY_OFF;
+ data->jumpbefore = 0;
+ data->jumpchar = '\0';
+
s = &data->screen;
screen_init(s, screen_size_x(&wp->base), screen_size_y(&wp->base), 0);
if (options_get_number(&wp->window->options, "mode-mouse"))
@@ -242,7 +254,24 @@ window_copy_key(struct window_pane *wp,
if (np == 0)
np = 1;
- if (data->inputtype == WINDOW_COPY_NUMERICPREFIX) {
+ if (data->inputtype == WINDOW_COPY_JUMPFORWARD
+ || data->inputtype == WINDOW_COPY_JUMPBACK) {
+ /* Ignore keys with modifiers. */
+ if ((key & 0xff00) == 0) {
+ data->jumpchar = key;
+ if (data->inputtype == WINDOW_COPY_JUMPFORWARD) {
+ for ( ; np != 0; np--)
+ window_copy_cursor_jump(wp);
+ } else {
+ for ( ; np != 0; np--)
+ window_copy_cursor_jump_back(wp);
+ }
+ }
+ data->jumptype = data->inputtype;
+ data->inputtype = WINDOW_COPY_OFF;
+ window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1);
+ return;
+ } if (data->inputtype == WINDOW_COPY_NUMERICPREFIX) {
if (window_copy_key_numeric_prefix(wp, key) == 0)
return;
data->inputtype = WINDOW_COPY_OFF;
@@ -407,6 +436,52 @@ window_copy_key(struct window_pane *wp,
for (; np != 0; np--)
window_copy_cursor_previous_word(wp, word_separators);
break;
+ case MODEKEYCOPY_JUMP:
+ data->jumpbefore = 0;
+ data->inputtype = WINDOW_COPY_JUMPFORWARD;
+ data->inputprompt = "Jump Forward";
+ *data->inputstr = '\0';
+ window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1);
+ return; /* skip numprefix reset */
+ case MODEKEYCOPY_JUMPAGAIN:
+ if (data->jumptype == WINDOW_COPY_JUMPFORWARD) {
+ for ( ; np != 0; np--)
+ window_copy_cursor_jump(wp);
+ } else if (data->jumptype == WINDOW_COPY_JUMPBACK) {
+ for ( ; np != 0; np--)
+ window_copy_cursor_jump_back(wp);
+ }
+ break;
+ case MODEKEYCOPY_JUMPAGAINREVERSE:
+ if (data->jumptype == WINDOW_COPY_JUMPFORWARD) {
+ for ( ; np != 0; np--)
+ window_copy_cursor_jump_back(wp);
+ } else if (data->jumptype == WINDOW_COPY_JUMPBACK) {
+ for ( ; np != 0; np--)
+ window_copy_cursor_jump(wp);
+ }
+ break;
+ case MODEKEYCOPY_JUMPBACK:
+ data->jumpbefore = 0;
+ data->inputtype = WINDOW_COPY_JUMPBACK;
+ data->inputprompt = "Jump Back";
+ *data->inputstr = '\0';
+ window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1);
+ return; /* skip numprefix reset */
+ case MODEKEYCOPY_JUMPBEFOREBACK:
+ data->jumpbefore = 1;
+ data->inputtype = WINDOW_COPY_JUMPBACK;
+ data->inputprompt = "Jump Before Back";
+ *data->inputstr = '\0';
+ window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1);
+ return; /* skip numprefix reset */
+ case MODEKEYCOPY_JUMPBEFORE:
+ data->jumpbefore = 1;
+ data->inputtype = WINDOW_COPY_JUMPFORWARD;
+ data->inputprompt = "Jump Before";
+ *data->inputstr = '\0';
+ window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1);
+ return; /* skip numprefix reset */
case MODEKEYCOPY_SEARCHUP:
data->inputtype = WINDOW_COPY_SEARCHUP;
data->inputprompt = "Search Up";
@@ -420,6 +495,8 @@ window_copy_key(struct window_pane *wp,
switch (data->searchtype) {
case WINDOW_COPY_OFF:
case WINDOW_COPY_GOTOLINE:
+ case WINDOW_COPY_JUMPFORWARD:
+ case WINDOW_COPY_JUMPBACK:
case WINDOW_COPY_NUMERICPREFIX:
break;
case WINDOW_COPY_SEARCHUP:
@@ -524,6 +601,8 @@ window_copy_key_input(struct window_pane
switch (data->inputtype) {
case WINDOW_COPY_OFF:
+ case WINDOW_COPY_JUMPFORWARD:
+ case WINDOW_COPY_JUMPBACK:
case WINDOW_COPY_NUMERICPREFIX:
break;
case WINDOW_COPY_SEARCHUP:
@@ -1381,6 +1460,70 @@ window_copy_cursor_down(struct window_pa
}
void
+window_copy_cursor_jump(struct window_pane *wp)
+{
+ struct window_copy_mode_data *data = wp->modedata;
+ struct screen *base_s = &wp->base;
+ const struct grid_cell *gc;
+ uint px, py, xx;
+
+ px = data->cx + 1;
+ py = screen_hsize(base_s) + data->cy - data->oy;
+ xx = window_copy_find_length(wp, py);
+ if (data->jumpbefore)
+ px++;
+
+ while (px < xx) {
+ gc = grid_peek_cell(base_s->grid, px, py);
+ if ((gc->flags & (GRID_FLAG_PADDING|GRID_FLAG_UTF8)) == 0
+ && gc->data == data->jumpchar) {
+
+ if (data->jumpbefore)
+ px--;
+ window_copy_update_cursor(wp, px, data->cy);
+ if (window_copy_update_selection(wp))
+ window_copy_redraw_lines(wp, data->cy, 1);
+ return;
+ }
+ px++;
+ }
+}
+
+void
+window_copy_cursor_jump_back(struct window_pane *wp)
+{
+ struct window_copy_mode_data *data = wp->modedata;
+ struct screen *base_s = &wp->base;
+ const struct grid_cell *gc;
+ uint px, py;
+
+ px = data->cx;
+ py = screen_hsize(base_s) + data->cy - data->oy;
+
+ if (px > 0)
+ px--;
+ if (data->jumpbefore && px > 0)
+ px--;
+
+ for (;;) {
+ gc = grid_peek_cell(base_s->grid, px, py);
+ if ((gc->flags & (GRID_FLAG_PADDING|GRID_FLAG_UTF8)) == 0
+ && gc->data == data->jumpchar) {
+
+ if (data->jumpbefore)
+ px++;
+ window_copy_update_cursor(wp, px, data->cy);
+ if (window_copy_update_selection(wp))
+ window_copy_redraw_lines(wp, data->cy, 1);
+ return;
+ }
+ if (px == 0)
+ break;
+ px--;
+ }
+}
+
+void
window_copy_cursor_next_word(struct window_pane *wp, const char *separators)
{
struct window_copy_mode_data *data = wp->modedata;
Index: tmux.1
===================================================================
--- tmux.1.orig 2010-03-09 09:58:37.000000000 -0800
+++ tmux.1 2010-03-09 12:47:57.000000000 -0800
@@ -605,7 +605,7 @@ The keys available depend on whether ema
.Ic mode-keys
option).
The following keys are supported as appropriate for the mode:
-.Bl -column "FunctionXXXXXXXXXXXXXX" "viXXXXXXXXXX" "emacs" -offset indent
+.Bl -column "FunctionXXXXXXXXXXXXXXXXX" "viXXXXXXXXXX" "emacs" -offset indent
.It Sy "Function" Ta Sy "vi" Ta Sy "emacs"
.It Li "Back to indentation" Ta "^" Ta "M-m"
.It Li "Bottom of history" Ta "G" Ta "M-<"
@@ -624,6 +624,12 @@ The following keys are supported as appr
.It Li "Go to line" Ta ":" Ta "g"
.It Li "Half page down" Ta "C-d" Ta "M-Down"
.It Li "Half page up" Ta "C-u" Ta "M-Up"
+.It Li "Jump" Ta "f" Ta "f"
+.It Li "Jump back" Ta "F" Ta "F"
+.It Li "Jump before" Ta "t" Ta "t"
+.It Li "Jump before back" Ta "T" Ta "T"
+.It Li "Jump again" Ta ";" Ta ";"
+.It Li "Jump again, reverse" Ta "," Ta ","
.It Li "Next page" Ta "C-f" Ta "Page down"
.It Li "Next space" Ta "W" Ta ""
.It Li "Next space, end of word" Ta "E" Ta ""
@@ -661,6 +667,16 @@ next word and previous word to the start
The three next and previous space keys work similarly but use a space alone as
the word separator.
.Pp
+The jump commands enable quick movement within a line.
+For instance, with the default bindings (in either vi or emacs mode),
+you can type
+.Ql f/ ,
+and the cursor will jump to the next slash character on the current line.
+You can then type
+.Ql \&;
+to cause the cursor to jump to the next occurrence of a slash.
+(These are based vi editor commands.)
+.Pp
Commands in copy mode may be prefaced by an optional repeat count.
With vi key bindings, a prefix is entered using the number keys; with
emacs, the Alt (meta) key and a number begins prefix entry.
------------------------------------------------------------------------------
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
