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]
/
menu.c
diff --git
a/menu.c
b/menu.c
index
25d7468
..
ab3ce23
100644
(file)
--- a/
menu.c
+++ b/
menu.c
@@
-1,7
+1,9
@@
/*
* Copyright notice from original mutt:
* Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
/*
* 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.
* 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.
@@
-36,7
+38,7
@@
static void print_enriched_string (int attr, unsigned char *s, int do_color)
{
wchar_t wc;
size_t k;
{
wchar_t wc;
size_t k;
- size_t n =
safe
_strlen ((char *) s);
+ size_t n =
mutt
_strlen ((char *) s);
mbstate_t mbstate;
memset (&mbstate, 0, sizeof (mbstate));
mbstate_t mbstate;
memset (&mbstate, 0, sizeof (mbstate));
@@
-155,7
+157,7
@@
void menu_pad_string (char *s, size_t n)
cols = COLS - shift - SidebarWidth;
else
cols = COLS - shift;
cols = COLS - shift - SidebarWidth;
else
cols = COLS - shift;
- mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s,
safe
_strlen (s), 1);
+ mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s,
mutt
_strlen (s), 1);
tmpbuf[n - 1] = 0;
snprintf (s, n, "%s", tmpbuf); /* overkill */
FREE (&tmpbuf);
tmpbuf[n - 1] = 0;
snprintf (s, n, "%s", tmpbuf); /* overkill */
FREE (&tmpbuf);
@@
-167,6
+169,8
@@
void menu_redraw_full (MUTTMENU * menu)
/* clear() doesn't optimize screen redraws */
move (0, 0);
clrtobot ();
/* clear() doesn't optimize screen redraws */
move (0, 0);
clrtobot ();
+
+ if (!option(OPTMBOXPANE)) SidebarWidth=0;
if (option (OPTHELP)) {
SETCOLOR (MT_COLOR_STATUS);
if (option (OPTHELP)) {
SETCOLOR (MT_COLOR_STATUS);
@@
-203,6
+207,7
@@
void menu_redraw_index (MUTTMENU * menu)
char buf[STRING];
int i;
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) {
sidebar_draw (1);
for (i = menu->top; i < menu->top + menu->pagelen; i++) {
if (i < menu->max) {
@@
-317,6
+322,8
@@
void menu_redraw_current (MUTTMENU * menu)
menu_make_entry (buf, sizeof (buf), menu, menu->current);
menu_pad_string (buf, sizeof (buf));
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);
if (option (OPTARROWCURSOR)) {
int attr = menu->color (menu->current);