Re: [elinks-dev] [PATCH v2] Add half-page-down and half-page-up commands

[أحمد المحمودي]

Hello,

  I tried it, it's a nice feature really, thanks !

  I hope it gets accepted upstream.

-- 
 ‎أحمد المحمودي (Ahmed El-Mahmoudy)
  Digital design engineer
 GPG KeyID: 0xEDDDA1B7 (@ subkeys.pgp.net)
 GPG Fingerprint: 8206 A196 2084 7E6D 0DF8  B176 BC19 6A94 EDDD A1B7
___
elinks-dev mailing list
elinks-dev@linuxfromscratch.org
http://linuxfromscratch.org/mailman/listinfo/elinks-dev

[elinks-dev] [PATCH v2] Add half-page-down and half-page-up commands

[Fabienne Ducroquet]

Signed-off-by: Fabienne Ducroquet 
---
This is better than the patch I sent last week.

 src/config/actions-main.inc |2 +
 src/viewer/action.c |8 ++
 src/viewer/text/view.c  |   51 ---
 src/viewer/text/view.h  |2 +
 4 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/src/config/actions-main.inc b/src/config/actions-main.inc
index 6620d3f..cb6c6bb 100644
--- a/src/config/actions-main.inc
+++ b/src/config/actions-main.inc
@@ -71,7 +71,9 @@ ACTION_(MAIN, "move-link-right-line", MOVE_LINK_RIGHT_LINE, 
N__("Move one link r
 ACTION_(MAIN, "move-link-up", MOVE_LINK_UP, N__("Move one link up"), 
ACTION_REQUIRE_VIEW_STATE),
 ACTION_(MAIN, "move-link-up-line", MOVE_LINK_UP_LINE, N__("Move to the 
previous line with a link"), ACTION_REQUIRE_VIEW_STATE),
 ACTION_(MAIN, "move-page-down", MOVE_PAGE_DOWN, N__("Move downwards by a 
page"), ACTION_REQUIRE_VIEW_STATE),
+ACTION_(MAIN, "move-half-page-down", MOVE_HALF_PAGE_DOWN, N__("Move downwards 
by half a page"), ACTION_REQUIRE_VIEW_STATE),
 ACTION_(MAIN, "move-page-up", MOVE_PAGE_UP, N__("Move upwards by a page"), 
ACTION_REQUIRE_VIEW_STATE),
+ACTION_(MAIN, "move-half-page-up", MOVE_HALF_PAGE_UP, N__("Move upwards by 
half a page"), ACTION_REQUIRE_VIEW_STATE),
 ACTION_(MAIN, "open-link-in-new-tab", OPEN_LINK_IN_NEW_TAB, N__("Open the 
current link in a new tab"), ACTION_REQUIRE_VIEW_STATE | ACTION_JUMP_TO_LINK | 
ACTION_REQUIRE_LINK),
 ACTION_(MAIN, "open-link-in-new-tab-in-background", 
OPEN_LINK_IN_NEW_TAB_IN_BACKGROUND, N__("Open the current link in a new tab in 
the background"), ACTION_REQUIRE_VIEW_STATE | ACTION_JUMP_TO_LINK | 
ACTION_REQUIRE_LINK),
 ACTION_(MAIN, "open-link-in-new-window", OPEN_LINK_IN_NEW_WINDOW, N__("Open 
the current link in a new window"), ACTION_RESTRICT_ANONYMOUS | 
ACTION_REQUIRE_VIEW_STATE | ACTION_JUMP_TO_LINK | ACTION_REQUIRE_LINK),
diff --git a/src/viewer/action.c b/src/viewer/action.c
index 66e20bb..d22db6d 100644
--- a/src/viewer/action.c
+++ b/src/viewer/action.c
@@ -408,10 +408,18 @@ do_action(struct session *ses, enum main_action 
action_id, int verbose)
status = move_page_down(ses, doc_view);
break;
 
+   case ACT_MAIN_MOVE_HALF_PAGE_DOWN:
+   status = move_half_page_down(ses, doc_view);
+   break;
+
case ACT_MAIN_MOVE_PAGE_UP:
status = move_page_up(ses, doc_view);
break;
 
+   case ACT_MAIN_MOVE_HALF_PAGE_UP:
+   status = move_half_page_up(ses, doc_view);
+   break;
+
case ACT_MAIN_MOVE_DOCUMENT_START:
status = move_document_start(ses, doc_view);
break;
diff --git a/src/viewer/text/view.c b/src/viewer/text/view.c
index 686daee..ecdb8a8 100644
--- a/src/viewer/text/view.c
+++ b/src/viewer/text/view.c
@@ -85,7 +85,7 @@ detach_formatted(struct document_view *doc_view)
 /*! @a type == 0 -> PAGE_DOWN;
  * @a type == 1 -> DOWN */
 static void
-move_down(struct session *ses, struct document_view *doc_view, int type)
+move_down(struct session *ses, struct document_view *doc_view, int type, int 
overlap)
 {
int newpos;
 
@@ -94,7 +94,8 @@ move_down(struct session *ses, struct document_view 
*doc_view, int type)
 
assert(ses->navigate_mode == NAVIGATE_LINKWISE);/* XXX: drop it 
at some time. --Zas */
 
-   newpos = doc_view->vs->y + doc_view->box.height - 
get_opt_int("document.browse.scrolling.vertical_overlap", ses);
+   newpos = doc_view->vs->y + doc_view->box.height - overlap;
+
if (newpos < doc_view->document->height)
doc_view->vs->y = newpos;
 
@@ -109,23 +110,35 @@ move_down(struct session *ses, struct document_view 
*doc_view, int type)
return;
 }
 
-enum frame_event_status
-move_page_down(struct session *ses, struct document_view *doc_view)
+static enum frame_event_status
+move_part_page_down(struct session *ses, struct document_view *doc_view, int 
overlap)
 {
int oldy = doc_view->vs->y;
int count = eat_kbd_repeat_count(ses);
 
ses->navigate_mode = NAVIGATE_LINKWISE;
 
-   do move_down(ses, doc_view, 0); while (--count > 0);
+   do move_down(ses, doc_view, 0, overlap); while (--count > 0);
 
return doc_view->vs->y == oldy ? FRAME_EVENT_OK : FRAME_EVENT_REFRESH;
 }
 
+enum frame_event_status
+move_page_down(struct session *ses, struct document_view *doc_view)
+{
+   return move_part_page_down(ses, doc_view, 
get_opt_int("document.browse.scrolling.vertical_overlap", ses));
+}
+
+enum frame_event_status
+move_half_page_down(struct session *ses, struct document_view *doc_view)
+{
+   return move_part_page_down(ses, doc_view, doc_view->box.height / 2);
+}
+
 /*! @a type == 0 -> PAGE_UP;
  * @a type == 1 -> UP */
 static void
-move_up(struct session *ses, struct docu