projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
menu.c
diff --git
a/menu.c
b/menu.c
index
2243919
..
15eccce
100644
(file)
--- a/
menu.c
+++ b/
menu.c
@@
-16,6
+16,10
@@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
@@
-35,9
+39,12
@@
extern size_t UngetCount;
static void print_enriched_string (int attr, unsigned char *s, int do_color)
{
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 k;
size_t n = mutt_strlen ((char *)s);
+ mbstate_t mbstate;
+ memset (&mbstate, 0, sizeof (mbstate));
while (*s)
{
if (*s < M_TREE_MAX)
while (*s)
{
if (*s < M_TREE_MAX)
@@
-127,10
+134,10
@@
static void print_enriched_string (int attr, unsigned char *s, int do_color)
}
if (do_color) attrset(attr);
}
}
if (do_color) attrset(attr);
}
- else if (
*s
> 0)
+ else if (
(k = mbrtowc (&wc, (char *)s, n, &mbstate))
> 0)
{
{
- addnstr ((char *)s,
1
);
- s +=
1, n-= 1
;
+ addnstr ((char *)s,
k
);
+ s +=
k, n-= k
;
}
else
break;
}
else
break;
@@
-153,8
+160,12
@@
void menu_pad_string (char *s, size_t n)
int shift = option (OPTARROWCURSOR) ? 3 : 0;
int cols = COLS - shift - SidebarWidth;
int shift = option (OPTARROWCURSOR) ? 3 : 0;
int cols = COLS - shift - SidebarWidth;
- mutt_format_string (s, n, cols, cols, 0, ' ', s, strlen (s), 1);
- s[n - 1] = 0;
+ char tmpbuf[n];
+
+ mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, strlen (s), 1);
+ tmpbuf[n - 1] = 0;
+
+ snprintf(s,n,"%s",tmpbuf); /* overkill */
}
void menu_redraw_full (MUTTMENU *menu)
}
void menu_redraw_full (MUTTMENU *menu)
@@
-366,32
+377,37
@@
void menu_redraw_prompt (MUTTMENU *menu)
void menu_check_recenter (MUTTMENU *menu)
{
void menu_check_recenter (MUTTMENU *menu)
{
- if (menu->max <= menu->pagelen && menu->top != 0)
+ int c = MIN (MenuContext, menu->pagelen / 2);
+ int old_top = menu->top;
+
+ if (menu->max <= menu->pagelen) /* less entries than lines */
{
{
- menu->top = 0;
- set_option (OPTNEEDREDRAW);
- menu->redraw |= REDRAW_INDEX;
+ if (menu->top != 0) {
+ menu->top = 0;
+ set_option (OPTNEEDREDRAW);
+ }
}
}
- else if (menu->current >= menu->top + menu->pagelen
)
+ else if (menu->current >= menu->top + menu->pagelen
- c) /* indicator below bottom threshold */
{
if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
{
if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
- menu->top = menu->current - menu->pagelen + 1;
+ menu->top = menu->current - menu->pagelen +
c +
1;
else
else
- menu->top += menu->pagelen * ((menu->current - menu->top) / menu->pagelen);
- menu->redraw |= REDRAW_INDEX;
+ menu->top += (menu->pagelen - c) * ((menu->current - menu->top) / (menu->pagelen - c)) - c;
}
}
- else if (menu->current < menu->top
)
+ else if (menu->current < menu->top
+ c) /* indicator above top threshold */
{
if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
{
if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
- menu->top = menu->current;
+ menu->top = menu->current
- c
;
else
else
- {
- menu->top -= menu->pagelen * ((menu->top + menu->pagelen - 1 - menu->current) / menu->pagelen);
- if (menu->top < 0)
- menu->top = 0;
- }
- menu->redraw |= REDRAW_INDEX;
+ menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - menu->current) / (menu->pagelen - c)) - c;
}
}
+
+ /* 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)
@@
-475,7
+491,9
@@
void menu_next_page (MUTTMENU *menu)
void menu_prev_page (MUTTMENU *menu)
{
void menu_prev_page (MUTTMENU *menu)
{
- if (menu->top > 0)
+ int c = MIN (MenuContext, menu->pagelen / 2);
+
+ if (menu->top > c)
{
if ((menu->top -= menu->pagelen) < 0)
menu->top = 0;
{
if ((menu->top -= menu->pagelen) < 0)
menu->top = 0;