aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-02-02 15:09:23 -05:00
Code

actions: Fixed moving in frames.

Browse Source 
(cherry picked from commit 2045574edca170a47b1e9f1e05cd210bdae8a49a)
This commit is contained in:
Witold Filipczyk 2007-08-12 10:34:00 +02:00 committed by Kalle Olavi Niemitalo
parent 2eb3532416
commit 02af6696f5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,7 @@ move_link_prev_line(struct session *ses, struct document_view *doc_view)
{ {
struct view_state *vs; struct view_state *vs;
struct document *document; struct document *document;
struct box *box;
struct link *link, *last = NULL; struct link *link, *last = NULL;
int y1, y, min_x, max_x, x1; int y1, y, min_x, max_x, x1;
@ -178,10 +179,10 @@ move_link_prev_line(struct session *ses, struct document_view *doc_view)
vs = doc_view->vs; vs = doc_view->vs;
document = doc_view->document; document = doc_view->document;
if (!document->lines1) return FRAME_EVENT_OK; if (!document->lines1) return FRAME_EVENT_OK;
box = &doc_view->box;
y = y1 = vs->y + ses->tab->y - ses->status.show_title_bar y = y1 = vs->y + ses->tab->y - box->y;
- (ses->status.show_tabs_bar && ses->status.show_tabs_bar_at_top); x1 = vs->x + ses->tab->x - box->x;
x1 = vs->x + ses->tab->x;
link = get_current_link(doc_view); link = get_current_link(doc_view);
if (link) { if (link) {
@ -212,6 +213,7 @@ move_link_next_line(struct session *ses, struct document_view *doc_view)
{ {
struct view_state *vs; struct view_state *vs;
struct document *document; struct document *document;
struct box *box;
struct link *link, *last = NULL; struct link *link, *last = NULL;
int y1, y, min_x, max_x, x1; int y1, y, min_x, max_x, x1;
@ -221,10 +223,10 @@ move_link_next_line(struct session *ses, struct document_view *doc_view)
vs = doc_view->vs; vs = doc_view->vs;
document = doc_view->document; document = doc_view->document;
if (!document->lines1) return FRAME_EVENT_OK; if (!document->lines1) return FRAME_EVENT_OK;
box = &doc_view->box;
y = y1 = vs->y + ses->tab->y - ses->status.show_title_bar y = y1 = vs->y + ses->tab->y - box->y;
- (ses->status.show_tabs_bar && ses->status.show_tabs_bar_at_top); x1 = vs->x + ses->tab->x - box->x;
x1 = vs->x + ses->tab->x;
link = get_current_link(doc_view); link = get_current_link(doc_view);
if (link) { if (link) {
@ -684,6 +686,7 @@ move_link_vertical(struct session *ses, struct document_view *doc_view, int dir_
{ {
struct document *document; struct document *document;
struct view_state *vs; struct view_state *vs;
struct box *box;
int y, y1; int y, y1;
assert(ses && doc_view && doc_view->vs && doc_view->document); assert(ses && doc_view && doc_view->vs && doc_view->document);
@ -692,8 +695,8 @@ move_link_vertical(struct session *ses, struct document_view *doc_view, int dir_
document = doc_view->document; document = doc_view->document;
if (!document->lines1) return FRAME_EVENT_OK; if (!document->lines1) return FRAME_EVENT_OK;
y1 = vs->y + ses->tab->y - ses->status.show_status_bar box = &doc_view->box;
- (ses->status.show_tabs_bar && ses->status.show_tabs_bar_at_top); y1 = vs->y + ses->tab->y - box->y;
y = y1 + dir_y; y = y1 + dir_y;
if (dir_y < 0) if (dir_y < 0)
int_upper_bound(&y, document->height - 1); int_upper_bound(&y, document->height - 1);