aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-09-27 02:56:18 -04:00
Code

[iframe] do not reset current_link

Browse Source
This commit is contained in:
Witold Filipczyk 2023-06-04 17:46:22 +02:00
parent cdcb32af8a
commit 2aa34e0f22
5 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/document/html/parser/link.c
View File

@ -519,7 +519,7 @@ html_iframe_do(char *a, char *object_src,
}
if (height > 0) {
int y = html_context->part->cy + 1;
int y = html_context->part->cy + 2;
char *url2;
ln_break(html_context, height + 3);

13
src/viewer/text/draw.c
View File

@ -459,8 +459,8 @@ draw_doc(struct session *ses, struct document_view *doc_view, int active)
if (document_has_iframes(doc_view->document)) {
draw_iframe_lines(term, doc_view->document->iframe_desc, box->x, box->y, &color);
if (vs->current_link == -1)
vs->current_link = 0;
// if (vs->current_link == -1)
// vs->current_link = 0;
}
#ifdef CONFIG_LIBSIXEL
while (!list_empty(term->images)) {
@ -517,11 +517,14 @@ draw_frames(struct session *ses)
}
foreach (doc_view, ses->scrn_iframes) {
doc_view->last_x = doc_view->last_y = -1;
n++;
//n++;
}
if (n) {
l = &cur_loc(ses)->vs.current_link;
*l = int_max(*l, 0) % int_max(n, 1);
}
l = &cur_loc(ses)->vs.current_link;
*l = int_max(*l, 0) % int_max(n, 1);
current_doc_view = current_frame(ses);
d = 0;

8
src/viewer/text/view.cpp
View File

@ -1510,10 +1510,10 @@ current_frame(struct session *ses)
if (!current_frame_number--) return doc_view;
}
foreach (doc_view, ses->scrn_iframes) {
if (document_has_iframes(doc_view->document)) continue;
if (!current_frame_number--) return doc_view;
}
// foreach (doc_view, ses->scrn_iframes) {
// if (document_has_iframes(doc_view->document)) continue;
// if (!current_frame_number--) return doc_view;
// }
doc_view = ses->doc_view;

13
src/viewer/text/vs.cpp
View File

@ -26,7 +26,6 @@
#include "viewer/text/view.h"
#include "viewer/text/vs.h"
/** @relates view_state */
void
init_vs(struct view_state *vs, struct uri *uri, int plain)
@ -176,8 +175,8 @@ next_frame(struct session *ses, int p)
int n;
if (!have_location(ses)
|| (ses->doc_view && !document_has_frames(ses->doc_view->document)
&& !document_has_iframes(ses->doc_view->document)))
|| (ses->doc_view && !document_has_frames(ses->doc_view->document)))
// && !document_has_iframes(ses->doc_view->document)))
return;
ses->navigate_mode = NAVIGATE_LINKWISE;
@ -189,10 +188,10 @@ next_frame(struct session *ses, int p)
if (!document_has_frames(doc_view->document))
n++;
}
foreach (doc_view, ses->scrn_iframes) {
if (!document_has_iframes(doc_view->document))
n++;
}
// foreach (doc_view, ses->scrn_iframes) {
// if (!document_has_frames(doc_view->document))
// n++;
// }
vs->current_link += p;
if (!n) n = 1;

7
test/iframe.html
View File

@ -1,9 +1,10 @@
<html>
<body>
TESTY1
<iframe src="file:///" height="200" width="800" name="t1"></iframe><hr>
TESTY2
<br>TTTEST<a href="/">TESTY1</a>TTEST<br>
<!--<iframe src="file:///" height="200" width="800" name="t1"></iframe> -->
<br>TTTEST<a href="/home">TESTY2</a>TTEST<br>
<iframe src="file:///usr/share/doc/" height="400" width="800" name="t2"></iframe><hr>
TESTY3
<br>TTTEST<a href="/home/witekfl">TESTY3</a>TTEST<br>
</body>
</html>