projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make rx_t be chaine-able so that we can get rid of list2_t (stage 1).
[apps/madmutt.git]
/
lib-ui
/
menu.c
diff --git
a/lib-ui/menu.c
b/lib-ui/menu.c
index
f91fecd
..
aa1501a
100644
(file)
--- a/
lib-ui/menu.c
+++ b/
lib-ui/menu.c
@@
-7,13
+7,7
@@
* please see the file GPL in the top level source directory.
*/
* 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 <lib-lib/lib-lib.h>
#include "curses.h"
#include "enter.h"
#include "curses.h"
#include "enter.h"
@@
-21,12
+15,9
@@
#include "mutt.h"
#include "charset.h"
#include "mutt.h"
#include "charset.h"
-#include "sidebar.h"
#include <imap/imap.h>
#include <imap/imap.h>
-
-#include <string.h>
-#include <stdlib.h>
+#include <lib-ui/sidebar.h>
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
@@
-145,7
+136,7
@@
static void menu_make_entry (char *s, int l, MUTTMENU * menu, int i)
menu->make_entry (s, l, menu, i);
}
menu->make_entry (s, l, menu, i);
}
-void menu_pad_string (char *s, size_t n)
+
static
void menu_pad_string (char *s, size_t n)
{
int shift = option (OPTARROWCURSOR) ? 3 : 0;
int cols;
{
int shift = option (OPTARROWCURSOR) ? 3 : 0;
int cols;
@@
-253,8
+244,7
@@
void menu_redraw_index (MUTTMENU * menu)
else
CLEARLINE_WIN (i - menu->top + menu->offset);
}
else
CLEARLINE_WIN (i - menu->top + menu->offset);
}
- sidebar_draw (1);
-/* sidebar_draw_frames(); */
+ sidebar_draw ();
menu->redraw = 0;
}
menu->redraw = 0;
}
@@
-355,7
+345,7
@@
void menu_redraw_current (MUTTMENU * menu)
menu->redraw &= REDRAW_STATUS;
}
menu->redraw &= REDRAW_STATUS;
}
-void menu_redraw_prompt (MUTTMENU * menu)
+
static
void menu_redraw_prompt (MUTTMENU * menu)
{
if (menu->dialog) {
if (option (OPTMSGERR)) {
{
if (menu->dialog) {
if (option (OPTMSGERR)) {
@@
-468,7
+458,7
@@
void menu_prev_line (MUTTMENU * menu)
* halfdown: jumplen == pagelen/2
*/
#define DIRECTION ((neg * 2) + 1)
* halfdown: jumplen == pagelen/2
*/
#define DIRECTION ((neg * 2) + 1)
-void menu_length_jump (MUTTMENU *menu, int jumplen) {
+
static
void menu_length_jump (MUTTMENU *menu, int jumplen) {
int tmp, neg = (jumplen >= 0) ? 0 : -1;
int c = MIN (MenuContext, menu->pagelen / 2);
int tmp, neg = (jumplen >= 0) ? 0 : -1;
int c = MIN (MenuContext, menu->pagelen / 2);
@@
-606,7
+596,7
@@
void menu_current_bottom (MUTTMENU * menu)
mutt_error _("No entries.");
}
mutt_error _("No entries.");
}
-void menu_next_entry (MUTTMENU * menu)
+
static
void menu_next_entry (MUTTMENU * menu)
{
if (menu->current < menu->max - 1) {
menu->current++;
{
if (menu->current < menu->max - 1) {
menu->current++;
@@
-616,7
+606,7
@@
void menu_next_entry (MUTTMENU * menu)
mutt_error _("You are on the last entry.");
}
mutt_error _("You are on the last entry.");
}
-void menu_prev_entry (MUTTMENU * menu)
+
static
void menu_prev_entry (MUTTMENU * menu)
{
if (menu->current) {
menu->current--;
{
if (menu->current) {
menu->current--;