aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Added function move_cursor_rel_count and used it

Browse Source 
in move-link-left-line and others, so move-link-left-line ans others
do not use the keyboard prefix.
This commit is contained in:
Witold Filipczyk 2007-10-07 16:10:26 +02:00 committed by Witold Filipczyk
parent a76ecfb8ca
commit 8b281e1404
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/viewer/text/view.c
View File

@ -555,19 +555,27 @@ move_cursor(struct session *ses, struct document_view *doc_view, int x, int y)
} }
static enum frame_event_status static enum frame_event_status
move_cursor_rel(struct session *ses, struct document_view *view, move_cursor_rel_count(struct session *ses, struct document_view *view,
int rx, int ry) int rx, int ry, int count)
{ {
int count = eat_kbd_repeat_count(ses);
int x, y; int x, y;
int_lower_bound(&count, 1);
x = ses->tab->x + rx*count; x = ses->tab->x + rx*count;
y = ses->tab->y + ry*count; y = ses->tab->y + ry*count;
return move_cursor(ses, view, x, y); return move_cursor(ses, view, x, y);
} }
static enum frame_event_status
move_cursor_rel(struct session *ses, struct document_view *view,
int rx, int ry)
{
int count = eat_kbd_repeat_count(ses);
int_lower_bound(&count, 1);
return move_cursor_rel_count(ses, view, rx, ry, count);
}
enum frame_event_status enum frame_event_status
move_cursor_left(struct session *ses, struct document_view *view) move_cursor_left(struct session *ses, struct document_view *view)
{ {
@ -631,7 +639,7 @@ move_link_up_line(struct session *ses, struct document_view *doc_view)
vs->y -= mini; vs->y -= mini;
y += mini; y += mini;
} }
status = move_cursor_rel(ses, doc_view, 0, y - y1); status = move_cursor_rel_count(ses, doc_view, 0, y - y1, 1);
if (link == get_current_link(doc_view)) if (link == get_current_link(doc_view))
ses->navigate_mode = NAVIGATE_LINKWISE; ses->navigate_mode = NAVIGATE_LINKWISE;
return status; return status;
@ -683,7 +691,7 @@ move_link_down_line(struct session *ses, struct document_view *doc_view)
vs->y += mini; vs->y += mini;
y -= mini; y -= mini;
} }
status = move_cursor_rel(ses, doc_view, 0, y - y1); status = move_cursor_rel_count(ses, doc_view, 0, y - y1, 1);
if (link == get_current_link(doc_view)) if (link == get_current_link(doc_view))
ses->navigate_mode = NAVIGATE_LINKWISE; ses->navigate_mode = NAVIGATE_LINKWISE;
return status; return status;
@ -751,7 +759,7 @@ move_link_prev_line(struct session *ses, struct document_view *doc_view)
vs->y -= mini; vs->y -= mini;
y += mini; y += mini;
} }
status = move_cursor_rel(ses, doc_view, last->points[0].x - x1, y - y1); status = move_cursor_rel_count(ses, doc_view, last->points[0].x - x1, y - y1, 1);
if (last == get_current_link(doc_view)) if (last == get_current_link(doc_view))
ses->navigate_mode = NAVIGATE_LINKWISE; ses->navigate_mode = NAVIGATE_LINKWISE;
return status; return status;
@ -819,7 +827,7 @@ move_link_next_line(struct session *ses, struct document_view *doc_view)
vs->y += mini; vs->y += mini;
y -= mini; y -= mini;
} }
status = move_cursor_rel(ses, doc_view, last->points[0].x - x1, y - y1); status = move_cursor_rel_count(ses, doc_view, last->points[0].x - x1, y - y1, 1);
if (last == get_current_link(doc_view)) if (last == get_current_link(doc_view))
ses->navigate_mode = NAVIGATE_LINKWISE; ses->navigate_mode = NAVIGATE_LINKWISE;
return status; return status;