X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=9eb354790b3cbfa993c25c5cbcb03b338888e0c1;hp=57a55098c72de52a04ebb8c66c433935c010fdc2;hb=d6988dab6bd378ccdf0f17aaa16de8aee1ceaf43;hpb=f0d5ecf432102dc3e6430ceb2a6c692ee856f4d4

diff --git a/pager.c b/pager.c
index 57a5509..9eb3547 100644
--- a/pager.c
+++ b/pager.c
@@ -64,6 +64,10 @@ static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
 static const char *Function_not_permitted_in_attach_message_mode =
 N_("Function not permitted in attach-message mode.");
 
+/* hack to return to position when returning from index to same message */
+static int TopLine = 0;
+static HEADER *OldHdr = NULL;
+
 #define CHECK_MODE(x)	if (!(x)) \
 			{ \
 			  	mutt_flushinp (); \
@@ -643,6 +647,9 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
   return class;
 }
 
+static int brailleLine = -1;
+static int brailleCol = -1;
+
 static int check_attachment_marker (char *);
 
 static void
@@ -655,8 +662,10 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
   int found, offset, null_rx, i;
 
   if (n == 0 || ISHEADER (lineInfo[n - 1].type)) {
-    if (buf[0] == '\n')
+    if (buf[0] == '\n') {
       lineInfo[n].type = MT_COLOR_NORMAL;
+      getyx(stdscr, brailleLine, brailleCol);
+    }
     else if (n > 0 && (buf[0] == ' ' || buf[0] == '\t')) {
       lineInfo[n].type = lineInfo[n - 1].type;  /* wrapped line */
       (lineInfo[n].syntax)[0].color = (lineInfo[n - 1].syntax)[0].color;
@@ -1691,8 +1700,26 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
     redraw = 0;
 
-    move (statusoffset, COLS - 1);
+    if (option(OPTBRAILLEFRIENDLY)) {
+      if (brailleLine!=-1) {
+        move(brailleLine+1, 0);
+        brailleLine = -1;
+      }
+    } else
+      move (statusoffset, COLS-1);
     mutt_refresh ();
+
+    if (IsHeader (extra) && OldHdr == extra->hdr && TopLine != topline
+        && lineInfo[curline].offset < sb.st_size-1) {
+      if (TopLine - topline > lines)
+        topline += lines;
+      else
+        topline = TopLine;
+      continue;
+    }
+    else
+      OldHdr = NULL;
+
     ch = km_dokey (MENU_PAGER);
     if (ch != -1)
       mutt_clear_error ();
@@ -2591,8 +2618,15 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
   }
 
   fclose (fp);
-  if (IsHeader (extra))
+  if (IsHeader (extra)) {
     Context->msgnotreadyet = -1;
+    if (rc == -1)
+      OldHdr = NULL;
+    else {
+      TopLine = topline;
+      OldHdr = extra->hdr;
+    }
+  }
 
   cleanup_quote (&QuoteList);