/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * 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.
*/
#if HAVE_CONFIG_H
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
+#include "enter.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mbyte.h"
#include "sidebar.h"
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
+#include <imap/imap.h>
#include <string.h>
#include <stdlib.h>
-extern int Charset_is_utf8; /* FIXME: bad modularisation */
+#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
extern size_t UngetCount;
static void print_enriched_string (int attr, unsigned char *s, int do_color)
{
+ wchar_t wc;
size_t k;
- size_t n = mutt_strlen ((char *)s);
+ size_t n = m_strlen((char *) s);
+ mbstate_t mbstate;
- while (*s)
- {
- if (*s < M_TREE_MAX)
- {
+ p_clear(&mbstate, 1);
+ while (*s) {
+ if (*s < M_TREE_MAX) {
if (do_color)
SETCOLOR (MT_COLOR_TREE);
- while (*s && *s < M_TREE_MAX)
- {
- switch (*s)
- {
- case M_TREE_LLCORNER:
- if (option (OPTASCIICHARS))
- addch ('`');
- else if (Charset_is_utf8)
- addstr ("\342\224\224"); /* WACS_LLCORNER */
- else
- addch (ACS_LLCORNER);
- break;
- case M_TREE_ULCORNER:
- if (option (OPTASCIICHARS))
- addch (',');
- else if (Charset_is_utf8)
- addstr ("\342\224\214"); /* WACS_ULCORNER */
- else
- addch (ACS_ULCORNER);
- break;
- case M_TREE_LTEE:
- if (option (OPTASCIICHARS))
- addch ('|');
- else if (Charset_is_utf8)
- addstr ("\342\224\234"); /* WACS_LTEE */
- else
- addch (ACS_LTEE);
- break;
- case M_TREE_HLINE:
- if (option (OPTASCIICHARS))
- addch ('-');
- else if (Charset_is_utf8)
- addstr ("\342\224\200"); /* WACS_HLINE */
- else
- addch (ACS_HLINE);
- break;
- case M_TREE_VLINE:
- if (option (OPTASCIICHARS))
- addch ('|');
- else if (Charset_is_utf8)
- addstr ("\342\224\202"); /* WACS_VLINE */
- else
- addch (ACS_VLINE);
- break;
- case M_TREE_TTEE:
- if (option (OPTASCIICHARS))
- addch ('-');
- else if (Charset_is_utf8)
- addstr ("\342\224\254"); /* WACS_TTEE */
- else
- addch (ACS_TTEE);
- break;
- case M_TREE_BTEE:
- if (option (OPTASCIICHARS))
- addch ('-');
- else if (Charset_is_utf8)
- addstr ("\342\224\264"); /* WACS_BTEE */
- else
- addch (ACS_BTEE);
- break;
- case M_TREE_SPACE:
- addch (' ');
- break;
- case M_TREE_RARROW:
- addch ('>');
- break;
- case M_TREE_STAR:
- addch ('*'); /* fake thread indicator */
- break;
- case M_TREE_HIDDEN:
- addch ('&');
- break;
- case M_TREE_EQUALS:
- addch ('=');
- break;
- case M_TREE_MISSING:
- addch ('?');
- break;
+ while (*s && *s < M_TREE_MAX) {
+ switch (*s) {
+ case M_TREE_LLCORNER:
+ if (option (OPTASCIICHARS))
+ addch ('`');
+ else if (Charset_is_utf8)
+ addstr ("\342\224\224"); /* WACS_LLCORNER */
+ else
+ addch (ACS_LLCORNER);
+ break;
+ case M_TREE_ULCORNER:
+ if (option (OPTASCIICHARS))
+ addch (',');
+ else if (Charset_is_utf8)
+ addstr ("\342\224\214"); /* WACS_ULCORNER */
+ else
+ addch (ACS_ULCORNER);
+ break;
+ case M_TREE_LTEE:
+ if (option (OPTASCIICHARS))
+ addch ('|');
+ else if (Charset_is_utf8)
+ addstr ("\342\224\234"); /* WACS_LTEE */
+ else
+ addch (ACS_LTEE);
+ break;
+ case M_TREE_HLINE:
+ if (option (OPTASCIICHARS))
+ addch ('-');
+ else if (Charset_is_utf8)
+ addstr ("\342\224\200"); /* WACS_HLINE */
+ else
+ addch (ACS_HLINE);
+ break;
+ case M_TREE_VLINE:
+ if (option (OPTASCIICHARS))
+ addch ('|');
+ else if (Charset_is_utf8)
+ addstr ("\342\224\202"); /* WACS_VLINE */
+ else
+ addch (ACS_VLINE);
+ break;
+ case M_TREE_TTEE:
+ if (option (OPTASCIICHARS))
+ addch ('-');
+ else if (Charset_is_utf8)
+ addstr ("\342\224\254"); /* WACS_TTEE */
+ else
+ addch (ACS_TTEE);
+ break;
+ case M_TREE_BTEE:
+ if (option (OPTASCIICHARS))
+ addch ('-');
+ else if (Charset_is_utf8)
+ addstr ("\342\224\264"); /* WACS_BTEE */
+ else
+ addch (ACS_BTEE);
+ break;
+ case M_TREE_SPACE:
+ addch (' ');
+ break;
+ case M_TREE_RARROW:
+ addch ('>');
+ break;
+ case M_TREE_STAR:
+ addch ('*'); /* fake thread indicator */
+ break;
+ case M_TREE_HIDDEN:
+ addch ('&');
+ break;
+ case M_TREE_EQUALS:
+ addch ('=');
+ break;
+ case M_TREE_MISSING:
+ addch ('?');
+ break;
}
s++, n--;
}
- if (do_color) attrset(attr);
+ if (do_color)
+ attrset (attr);
}
- else if (*s > 0)
- {
- addnstr ((char *)s, 1);
- s += 1, n-= 1;
+ else if ((k = mbrtowc (&wc, (char *) s, n, &mbstate)) > 0) {
+ addnstr ((char *) s, k);
+ s += k, n -= k;
}
else
break;
}
}
-static void menu_make_entry (char *s, int l, MUTTMENU *menu, int i)
+static void menu_make_entry (char *s, int l, MUTTMENU * menu, int i)
{
- if (menu->dialog)
- {
- strncpy (s, menu->dialog[i], l);
- menu->current = -1; /* hide menubar */
+ if (menu->dialog) {
+ m_strcpy(s, l, menu->dialog[i]);
+ menu->current = -1; /* hide menubar */
}
else
menu->make_entry (s, l, menu, i);
void menu_pad_string (char *s, size_t n)
{
int shift = option (OPTARROWCURSOR) ? 3 : 0;
- int cols = COLS - shift - SidebarWidth;
-
- char tmpbuf[n];
+ int cols;
+ char *tmpbuf = p_new(char, n);
- mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, strlen (s), 1);
+ if (option (OPTMBOXPANE))
+ cols = COLS - shift - SidebarWidth;
+ else
+ cols = COLS - shift;
+ mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, m_strlen(s), 1);
tmpbuf[n - 1] = 0;
-
- snprintf(s,n,"%s",tmpbuf); /* overkill */
+ snprintf (s, n, "%s", tmpbuf); /* overkill */
+ p_delete(&tmpbuf);
}
-void menu_redraw_full (MUTTMENU *menu)
+void menu_redraw_full (MUTTMENU * menu)
{
SETCOLOR (MT_COLOR_NORMAL);
/* clear() doesn't optimize screen redraws */
move (0, 0);
clrtobot ();
- if (option (OPTHELP))
- {
+ if (option (OPTHELP)) {
SETCOLOR (MT_COLOR_STATUS);
- move (option (OPTSTATUSONTOP) ? LINES-2 : 0, 0);
- mutt_paddstr (COLS, menu->help);
+ move (option (OPTSTATUSONTOP) ? LINES - 2 : 0, SW);
+ mutt_paddstr (COLS-SW, menu->help);
SETCOLOR (MT_COLOR_NORMAL);
menu->offset = 1;
menu->pagelen = LINES - 3;
}
- else
- {
+ else {
menu->offset = option (OPTSTATUSONTOP) ? 1 : 0;
menu->pagelen = LINES - 2;
}
+ sidebar_draw_frames();
+
mutt_show_error ();
menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
}
-void menu_redraw_status (MUTTMENU *menu)
+void menu_redraw_status (MUTTMENU * menu)
{
char buf[STRING];
snprintf (buf, sizeof (buf), M_MODEFMT, menu->title);
SETCOLOR (MT_COLOR_STATUS);
- move (option (OPTSTATUSONTOP) ? 0 : LINES - 2, 0);
- mutt_paddstr (COLS, buf);
+ move (option (OPTSTATUSONTOP) ? 0 : LINES - 2, SW);
+ mutt_paddstr (COLS-SW, buf);
SETCOLOR (MT_COLOR_NORMAL);
menu->redraw &= ~REDRAW_STATUS;
+ sidebar_draw_frames();
}
-void menu_redraw_index (MUTTMENU *menu)
+void menu_redraw_index (MUTTMENU * menu)
{
char buf[STRING];
int i;
- draw_sidebar(1);
- for (i = menu->top; i < menu->top + menu->pagelen; i++)
- {
- if (i < menu->max)
- {
+ for (i = menu->top; i < menu->top + menu->pagelen; i++) {
+ if (i < menu->max) {
menu_make_entry (buf, sizeof (buf), menu, i);
menu_pad_string (buf, sizeof (buf));
- if (option (OPTARROWCURSOR))
- {
+ if (option (OPTARROWCURSOR)) {
attrset (menu->color (i));
CLEARLINE_WIN (i - menu->top + menu->offset);
- if (i == menu->current)
- {
+ if (i == menu->current) {
attrset (menu->color (i));
ADDCOLOR (MT_COLOR_INDICATOR);
+ BKGDSET (MT_COLOR_INDICATOR);
addstr ("->");
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, SW);
+ addstr (" ");
+ }
- print_enriched_string (menu->color(i), (unsigned char *) buf, 1);
- SETCOLOR (MT_COLOR_NORMAL);
+ print_enriched_string (menu->color (i), (unsigned char *) buf, 1);
+ SETCOLOR (MT_COLOR_NORMAL);
+ BKGDSET (MT_COLOR_NORMAL);
}
- else
- {
+ else {
attrset (menu->color (i));
-
- if (i == menu->current)
- {
+
+ if (i == menu->current) {
ADDCOLOR (MT_COLOR_INDICATOR);
BKGDSET (MT_COLOR_INDICATOR);
}
CLEARLINE_WIN (i - menu->top + menu->offset);
- print_enriched_string (menu->color(i), (unsigned char *) buf, i != menu->current);
+
+ move (i - menu->top + menu->offset, SW);
+ print_enriched_string (menu->color (i), (unsigned char *) buf,
+ i != menu->current);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
}
else
CLEARLINE_WIN (i - menu->top + menu->offset);
}
+ sidebar_draw (1);
+/* sidebar_draw_frames(); */
+
menu->redraw = 0;
}
-void menu_redraw_motion (MUTTMENU *menu)
+void menu_redraw_motion (MUTTMENU * menu)
{
char buf[STRING];
- if (menu->dialog)
- {
+ if (menu->dialog) {
menu->redraw &= ~REDRAW_MOTION;
return;
}
-
- move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
+
+ move (menu->oldcurrent + menu->offset - menu->top, SW);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
- if (option (OPTARROWCURSOR))
- {
+ if (option (OPTARROWCURSOR)) {
/* clear the pointer */
attrset (menu->color (menu->oldcurrent));
addstr (" ");
- if (menu->redraw & REDRAW_MOTION_RESYNCH)
- {
+ if (menu->redraw & REDRAW_MOTION_RESYNCH) {
clrtoeol ();
menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
menu_pad_string (buf, sizeof (buf));
- move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3);
- print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
+ move (menu->oldcurrent + menu->offset - menu->top, SW + 3);
+ print_enriched_string (menu->color (menu->oldcurrent),
+ (unsigned char *) buf, 1);
SETCOLOR (MT_COLOR_NORMAL);
}
/* now draw it in the new location */
- move (menu->current + menu->offset - menu->top, SidebarWidth);
+ move (menu->current + menu->offset - menu->top, SW);
attrset (menu->color (menu->current));
ADDCOLOR (MT_COLOR_INDICATOR);
addstr ("->");
SETCOLOR (MT_COLOR_NORMAL);
}
- else
- {
+ else {
/* erase the current indicator */
attrset (menu->color (menu->oldcurrent));
clrtoeol ();
menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
menu_pad_string (buf, sizeof (buf));
- print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
+ print_enriched_string (menu->color (menu->oldcurrent),
+ (unsigned char *) buf, 1);
/* now draw the new one to reflect the change */
menu_make_entry (buf, sizeof (buf), menu, menu->current);
ADDCOLOR (MT_COLOR_INDICATOR);
BKGDSET (MT_COLOR_INDICATOR);
CLEARLINE_WIN (menu->current - menu->top + menu->offset);
- print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
+ move (menu->current + menu->offset - menu->top, SW);
+ print_enriched_string (menu->color (menu->current), (unsigned char *) buf,
+ 0);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
}
menu->redraw &= REDRAW_STATUS;
}
-void menu_redraw_current (MUTTMENU *menu)
+void menu_redraw_current (MUTTMENU * menu)
{
char buf[STRING];
-
- move (menu->current + menu->offset - menu->top, SidebarWidth);
+
+ move (menu->current + menu->offset - menu->top, SW);
menu_make_entry (buf, sizeof (buf), menu, menu->current);
menu_pad_string (buf, sizeof (buf));
- if (option (OPTARROWCURSOR))
- {
+ if (option (OPTARROWCURSOR)) {
int attr = menu->color (menu->current);
+
attrset (attr);
clrtoeol ();
attrset (menu->color (menu->current));
attrset (attr);
addch (' ');
menu_pad_string (buf, sizeof (buf));
- print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 1);
+ print_enriched_string (menu->color (menu->current), (unsigned char *) buf,
+ 1);
SETCOLOR (MT_COLOR_NORMAL);
}
- else
- {
+ else {
attrset (menu->color (menu->current));
ADDCOLOR (MT_COLOR_INDICATOR);
BKGDSET (MT_COLOR_INDICATOR);
clrtoeol ();
- print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
+ print_enriched_string (menu->color (menu->current), (unsigned char *) buf,
+ 0);
SETCOLOR (MT_COLOR_NORMAL);
BKGDSET (MT_COLOR_NORMAL);
}
menu->redraw &= REDRAW_STATUS;
}
-void menu_redraw_prompt (MUTTMENU *menu)
+void menu_redraw_prompt (MUTTMENU * menu)
{
- if (menu->dialog)
- {
- if (option (OPTMSGERR))
- {
+ if (menu->dialog) {
+ if (option (OPTMSGERR)) {
mutt_sleep (1);
unset_option (OPTMSGERR);
}
}
}
-void menu_check_recenter (MUTTMENU *menu)
+void menu_check_recenter (MUTTMENU * menu)
{
int c = MIN (MenuContext, menu->pagelen / 2);
int old_top = menu->top;
- if (menu->max <= menu->pagelen) /* less entries than lines */
- {
+ if (!option (OPTMENUMOVEOFF) && menu->max <= menu->pagelen) { /* less entries than lines */
if (menu->top != 0) {
menu->top = 0;
set_option (OPTNEEDREDRAW);
}
- }
- else if (menu->current >= menu->top + menu->pagelen - c) /* indicator below bottom threshold */
- {
- if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
- menu->top = menu->current - menu->pagelen + c + 1;
- else
- menu->top += (menu->pagelen - c) * ((menu->current - menu->top) / (menu->pagelen - c)) - c;
- }
- else if (menu->current < menu->top + c) /* indicator above top threshold */
- {
- if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
- menu->top = menu->current - c;
- else
- menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - menu->current) / (menu->pagelen - c)) - c;
+ } else {
+ if (option (OPTMENUSCROLL) || (menu->pagelen <= 0) || (c < MenuContext)) {
+ if (menu->current < menu->top + c)
+ menu->top = menu->current - c;
+ else if (menu->current >= menu->top + menu->pagelen - c)
+ menu->top = menu->current - menu->pagelen + c + 1;
+ } else {
+ if (menu->current < menu->top + c)
+ menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - menu->current) / (menu->pagelen - c)) - c;
+ else if ((menu->current >= menu->top + menu->pagelen - c))
+ menu->top += (menu->pagelen - c) * ((menu->current - menu->top) / (menu->pagelen - c)) - c;
+ }
}
- /* make entries stick to bottom */
- menu->top = MIN (menu->top, menu->max - menu->pagelen);
+ if (!option (OPTMENUMOVEOFF)) /* make entries stick to bottom */
+ menu->top = MIN (menu->top, menu->max - menu->pagelen);
menu->top = MAX (menu->top, 0);
if (menu->top != old_top)
menu->redraw |= REDRAW_INDEX;
}
-void menu_jump (MUTTMENU *menu)
+void menu_jump (MUTTMENU * menu)
{
int n;
char buf[SHORT_STRING];
- if (menu->max)
- {
+ if (menu->max) {
mutt_ungetch (LastKey, 0);
buf[0] = 0;
- if (mutt_get_field (_("Jump to: "), buf, sizeof (buf), 0) == 0 && buf[0])
- {
+ if (mutt_get_field (_("Jump to: "), buf, sizeof (buf), 0) == 0 && buf[0]) {
n = atoi (buf) - 1;
- if (n >= 0 && n < menu->max)
- {
+ if (n >= 0 && n < menu->max) {
menu->current = n;
menu->redraw = REDRAW_MOTION;
}
mutt_error _("No entries.");
}
-void menu_next_line (MUTTMENU *menu)
+void menu_next_line (MUTTMENU * menu)
{
- if (menu->max)
- {
- if (menu->top + 1 < menu->max)
- {
+ if (menu->max) {
+ int c = MIN (MenuContext, menu->pagelen / 2);
+
+ if (menu->top + 1 < menu->max - c && (option (OPTMENUMOVEOFF)
+ || (menu->max > menu->pagelen
+ && menu->top <
+ menu->max - menu->pagelen))) {
menu->top++;
- if (menu->current < menu->top)
+ if (menu->current < menu->top + c && menu->current < menu->max - 1)
menu->current++;
menu->redraw = REDRAW_INDEX;
}
mutt_error _("No entries.");
}
-void menu_prev_line (MUTTMENU *menu)
+void menu_prev_line (MUTTMENU * menu)
{
- if (menu->top > 0)
- {
+ if (menu->top > 0) {
+ int c = MIN (MenuContext, menu->pagelen / 2);
+
menu->top--;
- if (menu->current >= menu->top + menu->pagelen)
+ if (menu->current >= menu->top + menu->pagelen - c && menu->current > 1)
menu->current--;
menu->redraw = REDRAW_INDEX;
}
mutt_error _("You cannot scroll up farther.");
}
-void menu_next_page (MUTTMENU *menu)
-{
- if (menu->max)
- {
- if (menu->top + menu->pagelen < menu->max)
- {
- menu->top += menu->pagelen;
- if (menu->current < menu->top)
- menu->current = menu->top;
+/*
+ * pageup: jumplen == -pagelen
+ * pagedown: jumplen == pagelen
+ * halfup: jumplen == -pagelen/2
+ * halfdown: jumplen == pagelen/2
+ */
+#define DIRECTION ((neg * 2) + 1)
+void menu_length_jump (MUTTMENU *menu, int jumplen) {
+ int tmp, neg = (jumplen >= 0) ? 0 : -1;
+ int c = MIN (MenuContext, menu->pagelen / 2);
+
+ if (menu->max) {
+ /* possible to scroll? */
+ if (DIRECTION * menu->top <
+ (tmp = (neg ? 0 : (menu->max /*-1*/) - (menu->pagelen /*-1*/)))) {
+ menu->top += jumplen;
+
+ /* jumped too long? */
+ if ((neg || !option (OPTMENUMOVEOFF)) && DIRECTION * menu->top > tmp)
+ menu->top = tmp;
+
+ /* need to move the cursor? */
+ if ((DIRECTION *
+ (tmp = (menu->current - (menu->top +
+ (neg ? (menu->pagelen - 1) - c : c))))) < 0)
+ menu->current -= tmp;
+
menu->redraw = REDRAW_INDEX;
}
- else if (menu->current != menu->max - 1 && !menu->dialog)
- {
- menu->current = menu->max - 1;
+ else if (menu->current != (neg ? 0 : menu->max - 1) && !menu->dialog) {
+ menu->current += jumplen;
menu->redraw = REDRAW_MOTION;
}
else
- mutt_error _("You are on the last page.");
+ mutt_error (neg ? _("You are on the first page.")
+ : _("You are on the last page."));
+
+ menu->current = MIN (menu->current, menu->max - 1);
+ menu->current = MAX (menu->current, 0);
}
else
mutt_error _("No entries.");
}
+#undef DIRECTION
-void menu_prev_page (MUTTMENU *menu)
-{
- int c = MIN (MenuContext, menu->pagelen / 2);
+void menu_next_page (MUTTMENU *menu) {
+ menu_length_jump (menu, MAX (menu->pagelen /* - MenuOverlap */, 0));
+}
- if (menu->top > c)
- {
- if ((menu->top -= menu->pagelen) < 0)
- menu->top = 0;
- if (menu->current >= menu->top + menu->pagelen)
- menu->current = menu->top + menu->pagelen - 1;
- menu->redraw = REDRAW_INDEX;
- }
- else if (menu->current && !menu->dialog)
- {
- menu->current = 0;
- menu->redraw = REDRAW_MOTION;
- }
- else
- mutt_error _("You are on the first page.");
+void menu_prev_page (MUTTMENU *menu) {
+ menu_length_jump (menu, 0 - MAX (menu->pagelen /* - MenuOverlap */, 0));
}
-void menu_top_page (MUTTMENU *menu)
-{
- if (menu->current != menu->top)
- {
+void menu_half_down (MUTTMENU *menu) {
+ menu_length_jump (menu, menu->pagelen / 2);
+}
+
+void menu_half_up (MUTTMENU *menu) {
+ menu_length_jump (menu, 0 - menu->pagelen / 2);
+}
+
+void menu_top_page (MUTTMENU *menu) {
+ if (menu->current != menu->top) {
menu->current = menu->top;
menu->redraw = REDRAW_MOTION;
}
}
-void menu_bottom_page (MUTTMENU *menu)
-{
- if (menu->max)
- {
+void menu_bottom_page (MUTTMENU *menu) {
+ if (menu->max) {
menu->current = menu->top + menu->pagelen - 1;
if (menu->current > menu->max - 1)
menu->current = menu->max - 1;
mutt_error _("No entries.");
}
-void menu_middle_page (MUTTMENU *menu)
-{
+void menu_middle_page (MUTTMENU *menu) {
int i;
- if (menu->max)
- {
+ if (menu->max) {
i = menu->top + menu->pagelen;
if (i > menu->max - 1)
i = menu->max - 1;
mutt_error _("No entries.");
}
-void menu_first_entry (MUTTMENU *menu)
-{
- if (menu->max)
- {
+void menu_first_entry (MUTTMENU *menu) {
+ if (menu->max) {
menu->current = 0;
menu->redraw = REDRAW_MOTION;
}
mutt_error _("No entries.");
}
-void menu_last_entry (MUTTMENU *menu)
-{
- if (menu->max)
- {
+void menu_last_entry (MUTTMENU *menu) {
+ if (menu->max) {
menu->current = menu->max - 1;
menu->redraw = REDRAW_MOTION;
}
mutt_error _("No entries.");
}
-void menu_half_up (MUTTMENU *menu)
+void menu_current_top (MUTTMENU * menu)
{
- if (menu->top > 0)
- {
- if ((menu->top -= menu->pagelen / 2) < 0)
- menu->top = 0;
- if (menu->current >= menu->top + menu->pagelen)
- menu->current = menu->top + menu->pagelen - 1;
- menu->redraw = REDRAW_INDEX;
- }
- else if (menu->current && !menu->dialog)
- {
- menu->current = 0;
- menu->redraw = REDRAW_MOTION;
- }
- else
- mutt_error _("First entry is shown.");
-}
-
-void menu_half_down (MUTTMENU *menu)
-{
- if (menu->max)
- {
- if (menu->top + menu->pagelen < menu->max)
- {
- menu->top += menu->pagelen / 2;
- if (menu->current < menu->top)
- menu->current = menu->top;
- menu->redraw = REDRAW_INDEX;
- }
- else if (menu->current != menu->max - 1 && !menu->dialog)
- {
- menu->current = menu->max - 1;
- menu->redraw = REDRAW_INDEX;
- }
- else
- mutt_error _("Last entry is shown.");
- }
- else
- mutt_error _("No entries.");
-}
-
-void menu_current_top (MUTTMENU *menu)
-{
- if (menu->max)
- {
+ if (menu->max) {
menu->top = menu->current;
menu->redraw = REDRAW_INDEX;
}
mutt_error _("No entries.");
}
-void menu_current_middle (MUTTMENU *menu)
+void menu_current_middle (MUTTMENU * menu)
{
- if (menu->max)
- {
+ if (menu->max) {
menu->top = menu->current - menu->pagelen / 2;
if (menu->top < 0)
menu->top = 0;
mutt_error _("No entries.");
}
-void menu_current_bottom (MUTTMENU *menu)
+void menu_current_bottom (MUTTMENU * menu)
{
- if (menu->max)
- {
+ if (menu->max) {
menu->top = menu->current - menu->pagelen + 1;
if (menu->top < 0)
menu->top = 0;
mutt_error _("No entries.");
}
-void menu_next_entry (MUTTMENU *menu)
+void menu_next_entry (MUTTMENU * menu)
{
- if (menu->current < menu->max - 1)
- {
+ if (menu->current < menu->max - 1) {
menu->current++;
menu->redraw = REDRAW_MOTION;
}
mutt_error _("You are on the last entry.");
}
-void menu_prev_entry (MUTTMENU *menu)
+void menu_prev_entry (MUTTMENU * menu)
{
- if (menu->current)
- {
+ if (menu->current) {
menu->current--;
menu->redraw = REDRAW_MOTION;
}
mutt_error _("You are on the first entry.");
}
-static int default_color (int i)
+static int default_color (int i __attribute__ ((unused)))
{
- return ColorDefs[MT_COLOR_NORMAL];
+ return ColorDefs[MT_COLOR_NORMAL];
}
-static int menu_search_generic (MUTTMENU *m, regex_t *re, int n)
+static int menu_search_generic (MUTTMENU * m, regex_t * re, int n)
{
char buf[LONG_STRING];
MUTTMENU *mutt_new_menu (void)
{
- MUTTMENU *p = (MUTTMENU *) safe_calloc (1, sizeof (MUTTMENU));
+ MUTTMENU *p = p_new(MUTTMENU, 1);
p->current = 0;
p->top = 0;
return (p);
}
-void mutt_menuDestroy (MUTTMENU **p)
+void mutt_menuDestroy (MUTTMENU ** p)
{
int i;
- FREE (&(*p)->searchBuf);
+ p_delete(&(*p)->searchBuf);
- if ((*p)->dialog)
- {
- for (i=0; i < (*p)->max; i++)
- FREE (&(*p)->dialog[i]);
+ if ((*p)->dialog) {
+ for (i = 0; i < (*p)->max; i++)
+ p_delete(&(*p)->dialog[i]);
- FREE (& (*p)->dialog);
+ p_delete(&(*p)->dialog);
}
- FREE (p);
+ p_delete(p);
}
#define M_SEARCH_UP 1
#define M_SEARCH_DOWN 2
-static int menu_search (MUTTMENU *menu, int op)
+static int menu_search (MUTTMENU * menu, int op)
{
int r;
int searchDir;
regex_t re;
char buf[SHORT_STRING];
- if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE)
- {
- strfcpy (buf, menu->searchBuf ? menu->searchBuf : "", sizeof (buf));
- if (mutt_get_field ((op == OP_SEARCH) ? _("Search for: ") :
- _("Reverse search for: "),
- buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
+ if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE) {
+ m_strcpy(buf, sizeof(buf), NONULL(menu->searchBuf));
+ if (mutt_get_field ((op == OP_SEARCH) ? _("Search for: ") :
+ _("Reverse search for: "),
+ buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
return (-1);
- mutt_str_replace (&menu->searchBuf, buf);
+ m_strreplace(&menu->searchBuf, buf);
menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
}
- else
- {
- if (!menu->searchBuf)
- {
+ else {
+ if (!menu->searchBuf) {
mutt_error _("No search pattern.");
+
return (-1);
}
}
if (op == OP_SEARCH_OPPOSITE)
searchDir = -searchDir;
- if ((r = REGCOMP (&re, menu->searchBuf, REG_NOSUB | mutt_which_case (menu->searchBuf))) != 0)
- {
+ if ((r =
+ REGCOMP (&re, menu->searchBuf,
+ REG_NOSUB | mutt_which_case (menu->searchBuf))) != 0) {
regerror (r, &re, buf, sizeof (buf));
regfree (&re);
mutt_error ("%s", buf);
}
r = menu->current + searchDir;
- while (r >= 0 && r < menu->max)
- {
- if (menu->search (menu, &re, r) == 0)
- {
+ while (r >= 0 && r < menu->max) {
+ if (menu->search (menu, &re, r) == 0) {
regfree (&re);
return r;
}
regfree (&re);
mutt_error _("Not found.");
+
return (-1);
}
static int menu_dialog_translate_op (int i)
{
- switch (i)
- {
- case OP_NEXT_ENTRY:
- return OP_NEXT_LINE;
- case OP_PREV_ENTRY:
- return OP_PREV_LINE;
- case OP_CURRENT_TOP: case OP_FIRST_ENTRY:
- return OP_TOP_PAGE;
- case OP_CURRENT_BOTTOM: case OP_LAST_ENTRY:
- return OP_BOTTOM_PAGE;
- case OP_CURRENT_MIDDLE:
- return OP_MIDDLE_PAGE;
+ switch (i) {
+ case OP_NEXT_ENTRY:
+ return OP_NEXT_LINE;
+ case OP_PREV_ENTRY:
+ return OP_PREV_LINE;
+ case OP_CURRENT_TOP:
+ case OP_FIRST_ENTRY:
+ return OP_TOP_PAGE;
+ case OP_CURRENT_BOTTOM:
+ case OP_LAST_ENTRY:
+ return OP_BOTTOM_PAGE;
+ case OP_CURRENT_MIDDLE:
+ return OP_MIDDLE_PAGE;
}
-
+
return i;
}
-static int menu_dialog_dokey (MUTTMENU *menu, int *ip)
+static int menu_dialog_dokey (MUTTMENU * menu, int *ip)
{
event_t ch;
char *p;
ch = mutt_getch ();
- if (ch.ch == -1)
- {
+ if (ch.ch == -1) {
*ip = -1;
return 0;
}
- if (ch.ch && (p = strchr (menu->keys, ch.ch)))
- {
+ if (ch.ch && (p = strchr (menu->keys, ch.ch))) {
*ip = OP_MAX + (p - menu->keys + 1);
return 0;
}
- else
- {
+ else {
mutt_ungetch (ch.op ? 0 : ch.ch, ch.op ? ch.op : 0);
return -1;
}
}
-int menu_redraw (MUTTMENU *menu)
+int menu_redraw (MUTTMENU * menu)
{
/* See if all or part of the screen needs to be updated. */
- if (menu->redraw & REDRAW_FULL)
- {
+ if (menu->redraw & REDRAW_FULL) {
menu_redraw_full (menu);
/* allow the caller to do any local configuration */
return (OP_REDRAW);
}
-
+
if (!menu->dialog)
menu_check_recenter (menu);
-
+
if (menu->redraw & REDRAW_STATUS)
menu_redraw_status (menu);
if (menu->redraw & REDRAW_INDEX)
menu_redraw_motion (menu);
else if (menu->redraw == REDRAW_CURRENT)
menu_redraw_current (menu);
-
+
if (menu->dialog)
menu_redraw_prompt (menu);
-
+
return OP_NULL;
}
-int mutt_menuLoop (MUTTMENU *menu)
+int mutt_menuLoop (MUTTMENU * menu)
{
int i = OP_NULL;
- FOREVER
- {
- if (option (OPTMENUCALLER))
- {
+ for (;;) {
+ if (option (OPTMENUCALLER)) {
unset_option (OPTMENUCALLER);
return OP_NULL;
}
-
-
- mutt_curs_set (0);
-#ifdef USE_IMAP
+
+ mutt_curs_set (0);
imap_keepalive ();
-#endif
if (menu_redraw (menu) == OP_REDRAW)
return OP_REDRAW;
-
- menu->oldcurrent = menu->current;
+ 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, SW + 2);
+ else if (option (OPTBRAILLEFRIENDLY))
+ move (menu->current - menu->top + menu->offset, SW);
+ 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;
-
+
i = km_dokey (menu->menu);
- if (i == OP_TAG_PREFIX || i == OP_TAG_PREFIX_COND)
- {
- if (menu->tagged)
- {
+ if (i == OP_TAG_PREFIX || i == OP_TAG_PREFIX_COND) {
+ if (menu->tagged) {
mvaddstr (LINES - 1, 0, "Tag-");
clrtoeol ();
i = km_dokey (menu->menu);
menu->tagprefix = 1;
CLEARLINE (LINES - 1);
}
- else if (i == OP_TAG_PREFIX)
- {
+ else if (i == OP_TAG_PREFIX) {
mutt_error _("No tagged entries.");
+
i = -1;
}
- else /* None tagged, OP_TAG_PREFIX_COND */
- {
+ else { /* None tagged, OP_TAG_PREFIX_COND */
+
event_t tmp;
- while(UngetCount>0)
- {
- tmp=mutt_getch();
- if(tmp.op==OP_END_COND)break;
+
+ while (UngetCount > 0) {
+ tmp = mutt_getch ();
+ if (tmp.op == OP_END_COND)
+ break;
}
mutt_message _("Nothing to do.");
+
i = -1;
}
}
mutt_curs_set (1);
#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
- if (SigWinch)
- {
+ if (SigWinch) {
mutt_resize_screen ();
menu->redraw = REDRAW_FULL;
SigWinch = 0;
- clearok(stdscr,TRUE);/*force complete redraw*/
+ clearok (stdscr, TRUE); /*force complete redraw */
}
#endif
mutt_clear_error ();
/* Convert menubar movement to scrolling */
- if (menu->dialog)
+ if (menu->dialog)
i = menu_dialog_translate_op (i);
- switch (i)
- {
- case OP_NEXT_ENTRY:
- menu_next_entry (menu);
- break;
- case OP_PREV_ENTRY:
- menu_prev_entry (menu);
- break;
- case OP_HALF_DOWN:
- menu_half_down (menu);
- break;
- case OP_HALF_UP:
- menu_half_up (menu);
- break;
- case OP_NEXT_PAGE:
- menu_next_page (menu);
- break;
- case OP_PREV_PAGE:
- menu_prev_page (menu);
- break;
- case OP_NEXT_LINE:
- menu_next_line (menu);
- break;
- case OP_PREV_LINE:
- menu_prev_line (menu);
- break;
- case OP_FIRST_ENTRY:
- menu_first_entry (menu);
- break;
- case OP_LAST_ENTRY:
- menu_last_entry (menu);
- break;
- case OP_TOP_PAGE:
- menu_top_page (menu);
- break;
- case OP_MIDDLE_PAGE:
- menu_middle_page (menu);
- break;
- case OP_BOTTOM_PAGE:
- menu_bottom_page (menu);
- break;
- case OP_CURRENT_TOP:
- menu_current_top (menu);
- break;
- case OP_CURRENT_MIDDLE:
- menu_current_middle (menu);
- break;
- case OP_CURRENT_BOTTOM:
- menu_current_bottom (menu);
- break;
- case OP_SEARCH:
- case OP_SEARCH_REVERSE:
- case OP_SEARCH_NEXT:
- case OP_SEARCH_OPPOSITE:
- if (menu->search && !menu->dialog) /* Searching dialogs won't work */
- {
- menu->oldcurrent = menu->current;
- if ((menu->current = menu_search (menu, i)) != -1)
- menu->redraw = REDRAW_MOTION;
- else
- menu->current = menu->oldcurrent;
- }
+ switch (i) {
+ case OP_NEXT_ENTRY:
+ menu_next_entry (menu);
+ break;
+ case OP_PREV_ENTRY:
+ menu_prev_entry (menu);
+ break;
+ case OP_HALF_DOWN:
+ menu_half_down (menu);
+ break;
+ case OP_HALF_UP:
+ menu_half_up (menu);
+ break;
+ case OP_NEXT_PAGE:
+ menu_next_page (menu);
+ break;
+ case OP_PREV_PAGE:
+ menu_prev_page (menu);
+ break;
+ case OP_NEXT_LINE:
+ menu_next_line (menu);
+ break;
+ case OP_PREV_LINE:
+ menu_prev_line (menu);
+ break;
+ case OP_FIRST_ENTRY:
+ menu_first_entry (menu);
+ break;
+ case OP_LAST_ENTRY:
+ menu_last_entry (menu);
+ break;
+ case OP_TOP_PAGE:
+ menu_top_page (menu);
+ break;
+ case OP_MIDDLE_PAGE:
+ menu_middle_page (menu);
+ break;
+ case OP_BOTTOM_PAGE:
+ menu_bottom_page (menu);
+ break;
+ case OP_CURRENT_TOP:
+ menu_current_top (menu);
+ break;
+ case OP_CURRENT_MIDDLE:
+ menu_current_middle (menu);
+ break;
+ case OP_CURRENT_BOTTOM:
+ menu_current_bottom (menu);
+ break;
+ case OP_SEARCH:
+ case OP_SEARCH_REVERSE:
+ case OP_SEARCH_NEXT:
+ case OP_SEARCH_OPPOSITE:
+ if (menu->search && !menu->dialog) { /* Searching dialogs won't work */
+ menu->oldcurrent = menu->current;
+ if ((menu->current = menu_search (menu, i)) != -1)
+ menu->redraw = REDRAW_MOTION;
else
- mutt_error _("Search is not implemented for this menu.");
- break;
+ menu->current = menu->oldcurrent;
+ }
+ else
+ mutt_error _("Search is not implemented for this menu.");
+ break;
- case OP_JUMP:
- if (menu->dialog)
- mutt_error _("Jumping is not implemented for dialogs.");
- else
- menu_jump (menu);
- break;
-
- case OP_ENTER_COMMAND:
- CurrentMenu = menu->menu;
- mutt_enter_command ();
- if (option (OPTFORCEREDRAWINDEX))
- {
- menu->redraw = REDRAW_FULL;
- unset_option (OPTFORCEREDRAWINDEX);
- unset_option (OPTFORCEREDRAWPAGER);
+ case OP_JUMP:
+ if (menu->dialog)
+ mutt_error (_("Jumping is not implemented for dialogs."));
+
+ else
+ menu_jump (menu);
+ break;
+
+ case OP_ENTER_COMMAND:
+ CurrentMenu = menu->menu;
+ mutt_enter_command ();
+ if (option (OPTFORCEREDRAWINDEX)) {
+ menu->redraw = REDRAW_FULL;
+ unset_option (OPTFORCEREDRAWINDEX);
+ unset_option (OPTFORCEREDRAWPAGER);
+ }
+ break;
+
+ case OP_TAG:
+ if (menu->tag && !menu->dialog) {
+ if (menu->tagprefix && !option (OPTAUTOTAG)) {
+ for (i = 0; i < menu->max; i++)
+ menu->tagged += menu->tag (menu, i, 0);
+ menu->redraw = REDRAW_INDEX;
}
- break;
-
- case OP_TAG:
- if (menu->tag && !menu->dialog)
- {
- if (menu->tagprefix && !option (OPTAUTOTAG))
- {
- for (i = 0; i < menu->max; i++)
- menu->tagged += menu->tag (menu, i, 0);
- menu->redraw = REDRAW_INDEX;
- }
- else if (menu->max)
- {
- int i = menu->tag (menu, menu->current, -1);
- menu->tagged += i;
- if (i && option (OPTRESOLVE) && menu->current < menu->max - 1)
- {
- menu->current++;
- menu->redraw = REDRAW_MOTION_RESYNCH;
- }
- else
- menu->redraw = REDRAW_CURRENT;
+ else if (menu->max) {
+ int t = menu->tag (menu, menu->current, -1);
+
+ menu->tagged += t;
+ if (t && option (OPTRESOLVE) && menu->current < menu->max - 1) {
+ menu->current++;
+ menu->redraw = REDRAW_MOTION_RESYNCH;
}
else
- mutt_error _("No entries.");
+ menu->redraw = REDRAW_CURRENT;
}
else
- mutt_error _("Tagging is not supported.");
- break;
+ mutt_error _("No entries.");
+ }
+ else
+ mutt_error _("Tagging is not supported.");
+ break;
- case OP_SHELL_ESCAPE:
- mutt_shell_escape ();
- MAYBE_REDRAW (menu->redraw);
- break;
+ case OP_SHELL_ESCAPE:
+ mutt_shell_escape ();
+ MAYBE_REDRAW (menu->redraw);
+ break;
- case OP_WHAT_KEY:
- mutt_what_key ();
- break;
+ case OP_WHAT_KEY:
+ mutt_what_key ();
+ break;
- case OP_REDRAW:
- clearok (stdscr, TRUE);
- menu->redraw = REDRAW_FULL;
- break;
+ case OP_REBUILD_CACHE:
+ mx_rebuild_cache ();
+ break;
- case OP_HELP:
- mutt_help (menu->menu);
- menu->redraw = REDRAW_FULL;
- break;
+ case OP_REDRAW:
+ clearok (stdscr, TRUE);
+ menu->redraw = REDRAW_FULL;
+ break;
- case OP_NULL:
- km_error_key (menu->menu);
- break;
+ case OP_HELP:
+ mutt_help (menu->menu);
+ menu->redraw = REDRAW_FULL;
+ break;
- case OP_END_COND:
- break;
+ case OP_NULL:
+ km_error_key (menu->menu);
+ break;
+
+ case OP_END_COND:
+ break;
- default:
- return (i);
+ default:
+ return (i);
}
}
/* not reached */
projects / apps / madmutt.git / blobdiff