projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
pager.c
diff --git
a/pager.c
b/pager.c
index
0e975e4
..
c2f784b
100644
(file)
--- a/
pager.c
+++ b/
pager.c
@@
-1042,8
+1042,11
@@
static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
wchar_t wc;
mbstate_t mbstate;
wchar_t wc;
mbstate_t mbstate;
- int wrap_cols = COLS - WrapMargin - SidebarWidth;
-
+ int wrap_cols = COLS;
+ if (!(flags & (M_SHOWFLAT)))
+ wrap_cols -= WrapMargin;
+ wrap_cols -= SidebarWidth;
+
if (wrap_cols <= 0)
wrap_cols = COLS;
if (wrap_cols <= 0)
wrap_cols = COLS;
@@
-1751,8
+1754,10
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
_mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt),
Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
}
_mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt),
Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
}
- mutt_paddstr (COLS-10-SidebarWidth, IsHeader (extra) || IsMsgAttach (extra) ?
- buffer : banner);
+ move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),option(OPTSTATUSONTOP)?0:SidebarWidth);
+ mutt_paddstr (COLS-10, IsHeader (extra) || IsMsgAttach (extra) ?
+ buffer : banner);
+
addstr (" -- (");
if (last_pos < sb.st_size - 1)
printw ("%d%%)", (int) (100 * last_offset / sb.st_size));
addstr (" -- (");
if (last_pos < sb.st_size - 1)
printw ("%d%%)", (int) (100 * last_offset / sb.st_size));
@@
-1770,13
+1775,12
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
/* redraw the pager_index indicator, because the
* flags for this message might have changed. */
menu_redraw_current (index);
/* redraw the pager_index indicator, because the
* flags for this message might have changed. */
menu_redraw_current (index);
-
draw_sidebar(MENU_PAGER);
+ draw_sidebar(MENU_PAGER);
/* print out the index status bar */
menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
/* print out the index status bar */
menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
- move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
- SidebarWidth);
+ move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),option(OPTSTATUSONTOP)?0:SidebarWidth);
SETCOLOR (MT_COLOR_STATUS);
SETCOLOR (MT_COLOR_STATUS);
- mutt_paddstr (COLS-
SidebarWidth
, buffer);
+ mutt_paddstr (COLS-
(option(OPTSTATUSONTOP)?0:SidebarWidth)
, buffer);
SETCOLOR (MT_COLOR_NORMAL);
}
/* if we're not using the index, update every time */
SETCOLOR (MT_COLOR_NORMAL);
}
/* if we're not using the index, update every time */
@@
-2697,6
+2701,7
@@
CHECK_IMAP_ACL(IMAP_ACL_DELETE);
case OP_BUFFY_LIST:
mutt_buffy_list ();
case OP_BUFFY_LIST:
mutt_buffy_list ();
+ redraw |= REDRAW_SIDEBAR;
break;
case OP_VIEW_ATTACHMENTS:
break;
case OP_VIEW_ATTACHMENTS:
@@
-2745,7
+2750,9
@@
CHECK_IMAP_ACL(IMAP_ACL_DELETE);
case OP_SIDEBAR_SCROLL_UP:
case OP_SIDEBAR_SCROLL_DOWN:
case OP_SIDEBAR_NEXT:
case OP_SIDEBAR_SCROLL_UP:
case OP_SIDEBAR_SCROLL_DOWN:
case OP_SIDEBAR_NEXT:
+ case OP_SIDEBAR_NEXT_NEW:
case OP_SIDEBAR_PREV:
case OP_SIDEBAR_PREV:
+ case OP_SIDEBAR_PREV_NEW:
scroll_sidebar(ch, MENU_PAGER);
break;
default:
scroll_sidebar(ch, MENU_PAGER);
break;
default: