*** curs_main.c.orig Thu Apr 3 09:57:33 1997 --- curs_main.c Thu Apr 3 09:57:38 1997 *************** *** 126,132 **** menu = mutt_new_menu (); menu->menu = MENU_MAIN; ! menu->offset = 1; menu->pagelen = LINES - 3; menu->make_entry = index_make_entry; menu->current = ci_first_message (); --- 126,132 ---- menu = mutt_new_menu (); menu->menu = MENU_MAIN; ! menu->offset = FIRSTLINE; menu->pagelen = LINES - 3; menu->make_entry = index_make_entry; menu->current = ci_first_message (); *** menu.c.orig Thu Apr 3 10:01:28 1997 --- menu.c Thu Apr 3 10:01:31 1997 *************** *** 96,108 **** SETCOLOR (MT_COLOR_STATUS); mvprintw (option (OPTSTATUSONTOP) ? LINES-2 : 0, 0, "%-*.*s", COLS, COLS, menu->help); SETCOLOR (MT_COLOR_NORMAL); ! menu->offset = 1; ! menu->pagelen = LINES - 3; } else { ! menu->offset = option (OPTSTATUSONTOP) ? 1 : 0; ! menu->pagelen = LINES - 2; } menu->redraw = REDRAW_INDEX | REDRAW_STATUS; --- 96,106 ---- SETCOLOR (MT_COLOR_STATUS); mvprintw (option (OPTSTATUSONTOP) ? LINES-2 : 0, 0, "%-*.*s", COLS, COLS, menu->help); SETCOLOR (MT_COLOR_NORMAL); ! OFFSET_PAGELEN_H(menu->offset,menu->pagelen); } else { ! OFFSET_PAGELEN_N(menu->offset,menu->pagelen); } menu->redraw = REDRAW_INDEX | REDRAW_STATUS; *** mutt_curses.h.orig Thu Apr 3 09:56:55 1997 --- mutt_curses.h Thu Apr 3 09:56:58 1997 *************** *** 64,69 **** --- 64,76 ---- #define PAGELEN (LINES-3) + /* firstline for menu/pager/etc */ + /* ca@informatik.uni-kiel.de, 1997-03-23 */ + /* should be an option? */ + #define FIRSTLINE 2 + #define OFFSET_PAGELEN_H(off,pl) off = FIRSTLINE; pl = LINES-3-off + #define OFFSET_PAGELEN_N(off,pl) off = option (OPTSTATUSONTOP) ? FIRSTLINE : 0; pl = LINES-2-off + #define ctrl(c) ((c)-'@') int ci_getch (void); *** mutt.h.orig Sat Apr 12 18:00:42 1997 --- mutt.h Sat Apr 12 18:02:24 1997 *************** *** 276,281 **** --- 276,282 ---- OPTNOCURSES, /* pseudo option when sending in batch mode */ OPTNEEDREDRAW, /* pseudo option to notify caller of a submenu */ OPTMAX + ,OPTBLANK }; #define set_option(x) Options[(x)/8] |= (1 << ((x) % 8)) *** pager.c.orig Mon Apr 6 10:56:31 1998 --- pager.c Sun Apr 12 11:59:44 1998 *************** *** 1352,1358 **** { indexoffset = 0; statusoffset = IsHeader (extra) ? indexlen : 0; ! bodyoffset = statusoffset + 1; helpoffset = LINES - 2; bodylen = helpoffset - bodyoffset; if (!option (OPTHELP)) --- 1352,1358 ---- { indexoffset = 0; statusoffset = IsHeader (extra) ? indexlen : 0; ! bodyoffset = statusoffset + 2; helpoffset = LINES - 2; ! bodylen = helpoffset - bodyoffset - 1; if (!option (OPTHELP))