/*
* Copyright notice from original mutt:
* Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- *
+ * * Parts of it were written/modified by:
+ * Nico Golde <nico@ngolde.de>
+ *
* This file is part of mutt-ng, see http://www.muttng.org/.
* It's licensed under the GNU General Public License,
* please see the file GPL in the top level source directory.
{
wchar_t wc;
size_t k;
- size_t n = mutt_strlen ((char *) s);
+ size_t n = safe_strlen ((char *) s);
mbstate_t mbstate;
memset (&mbstate, 0, sizeof (mbstate));
cols = COLS - shift - SidebarWidth;
else
cols = COLS - shift;
- mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, mutt_strlen (s), 1);
+ mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, safe_strlen (s), 1);
tmpbuf[n - 1] = 0;
snprintf (s, n, "%s", tmpbuf); /* overkill */
FREE (&tmpbuf);
/* clear() doesn't optimize screen redraws */
move (0, 0);
clrtobot ();
+
+ if (!option(OPTMBOXPANE)) SidebarWidth=0;
if (option (OPTHELP)) {
SETCOLOR (MT_COLOR_STATUS);
char buf[STRING];
int i;
+ if (!option(OPTMBOXPANE)) SidebarWidth=0;
sidebar_draw (1);
for (i = menu->top; i < menu->top + menu->pagelen; i++) {
if (i < menu->max) {
attrset (menu->color (i));
addch (' ');
}
- else
- move (i - menu->top + menu->offset, SidebarWidth + 3);
+ else {
+ attrset (menu->color (i));
+ move (i - menu->top + menu->offset, SidebarWidth);
+ addstr (" ");
+ }
print_enriched_string (menu->color (i), (unsigned char *) buf, 1);
SETCOLOR (MT_COLOR_NORMAL);
menu_make_entry (buf, sizeof (buf), menu, menu->current);
menu_pad_string (buf, sizeof (buf));
+ if (!option(OPTMBOXPANE)) SidebarWidth=0;
+
if (option (OPTARROWCURSOR)) {
int attr = menu->color (menu->current);
_("Reverse search for: "),
buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
return (-1);
- mutt_str_replace (&menu->searchBuf, buf);
+ str_replace (&menu->searchBuf, buf);
menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
}
else {
menu->oldcurrent = menu->current;
-
- /* move the cursor out of the way */
- move (menu->current - menu->top + menu->offset,
- (option (OPTARROWCURSOR) ? 2 : COLS - 1));
+ if (option (OPTARROWCURSOR))
+ move (menu->current - menu->top + menu->offset, 2);
+ else if (option (OPTBRAILLEFRIENDLY))
+ move (menu->current - menu->top + menu->offset, 0);
+ else
+ move (menu->current - menu->top + menu->offset, COLS - 1);
mutt_refresh ();
+
/* try to catch dialog keys before ops */
if (menu->dialog && menu_dialog_dokey (menu, &i) == 0)
return i;