projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we use glibc, and gconv. Don't need our own transcoding stuff, glibc does
[apps/madmutt.git]
/
pager.c
diff --git
a/pager.c
b/pager.c
index
19a8c70
..
3bed820
100644
(file)
--- a/
pager.c
+++ b/
pager.c
@@
-14,9
+14,8
@@
#include <lib-lib/lib-lib.h>
#include <lib-ui/lib-ui.h>
#include <lib-lib/lib-lib.h>
#include <lib-ui/lib-ui.h>
-#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-ui/menu.h>
-#include <lib-ui/
sidebar
.h>
+#include <lib-ui/
madtty
.h>
#include <lib-mx/mx.h>
#include "mutt.h"
#include <lib-mx/mx.h>
#include "mutt.h"
@@
-216,7
+215,7
@@
resolve_color (struct line_t *lineInfo, int n, int cnt, int flags,
if (special || a->attr) {
if ((a->attr & ANSI_COLOR)) {
if (a->pair == -1)
if (special || a->attr) {
if ((a->attr & ANSI_COLOR)) {
if (a->pair == -1)
- a->pair = m
utt_alloc_color
(a->fg, a->bg);
+ a->pair = m
adtty_color_pair
(a->fg, a->bg);
color = a->pair;
if (a->attr & ANSI_BOLD)
color |= A_BOLD;
color = a->pair;
if (a->attr & ANSI_BOLD)
color |= A_BOLD;
@@
-1230,7
+1229,6
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
int bodyoffset = 1; /* offset of first line of real text */
int statusoffset = 0; /* offset for the status bar */
int bodyoffset = 1; /* offset of first line of real text */
int statusoffset = 0; /* offset for the status bar */
- int helpoffset = LINES - 2; /* offset for the help bar. */
int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */
MUTTMENU *pager_index = NULL; /* the Pager Index (PI) */
int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */
MUTTMENU *pager_index = NULL; /* the Pager Index (PI) */
@@
-1276,9
+1274,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
if (redraw & REDRAW_FULL) {
SETCOLOR(main_w, MT_COLOR_NORMAL);
if (redraw & REDRAW_FULL) {
SETCOLOR(main_w, MT_COLOR_NORMAL);
- /* wclear(main_w) doesn't optimize screen redraws */
- wmove(main_w, 0, 0);
- wclrtobot(main_w);
+ werase(main_w);
if (IsHeader (extra) && Context->vcount + 1 < PagerIndexLines)
indexlen = Context->vcount + 1;
if (IsHeader (extra) && Context->vcount + 1 < PagerIndexLines)
indexlen = Context->vcount + 1;
@@
-1289,12
+1285,10
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
statusoffset = IsHeader (extra) ? indexlen : 0;
bodyoffset = statusoffset + 1;
statusoffset = IsHeader (extra) ? indexlen : 0;
bodyoffset = statusoffset + 1;
- helpoffset = LINES - 2;
- bodylen = helpoffset - bodyoffset;
+ bodylen = LINES - 2 - bodyoffset;
- SETCOLOR(main_w, MT_COLOR_STATUS);
- wmove(main_w, helpoffset, 0);
- mutt_paddstr(main_w, getmaxx(main_w), "");
+ SETCOLOR(main_w, MT_COLOR_SIDEBAR);
+ mvwhline(main_w, LINES - 2, 0, ACS_HLINE, getmaxx(main_w));
SETCOLOR(main_w, MT_COLOR_NORMAL);
if (Resize != NULL) {
SETCOLOR(main_w, MT_COLOR_NORMAL);
if (Resize != NULL) {
@@
-2208,10
+2202,6
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
}
break;
}
break;
- case OP_VERSION:
- mutt_version ();
- break;
-
case OP_BUFFY_LIST:
if (option (OPTFORCEBUFFYCHECK))
buffy_check (1);
case OP_BUFFY_LIST:
if (option (OPTFORCEBUFFYCHECK))
buffy_check (1);