* please see the file GPL in the top level source directory.
*/
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
#include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
#include "sidebar.h"
#include "buffy.h"
#include "keymap.h"
-#include "lib/mem.h"
-#include "lib/str.h"
-#include "lib/intl.h"
#include <libgen.h>
#include <ctype.h>
static short prev_show_value;
/* computes first entry to be shown */
-void calc_boundaries (int menu)
-{
- int lines = 0;
-
+static void calc_boundaries (void) {
if (list_empty(Incoming))
return;
if (CurBuffy < 0 || CurBuffy >= Incoming->length)
if (TopBuffy < 0 || TopBuffy >= Incoming->length)
TopBuffy = 0;
- lines = LINES - 2 - (option (OPTSTATUSONTOP));
- known_lines = lines;
if (option (OPTSIDEBARNEWMAILONLY)) {
int i = CurBuffy;
TopBuffy = CurBuffy - 1;
TopBuffy = i;
i--;
}
- } else
- TopBuffy = CurBuffy - (CurBuffy % lines);
+ } else if (known_lines>0)
+ TopBuffy = CurBuffy - (CurBuffy % known_lines);
if (TopBuffy < 0)
TopBuffy = 0;
}
{
int dots = 0;
char *last_dot = NULL;
- int i, j, len = str_len (box);
+ int i, j, len = m_strlen(box);
char *new_box;
if (!SidebarBoundary || !*SidebarBoundary)
- return (str_dup (box));
+ return (m_strdup(box));
for (i = 0; i < len; ++i) {
if (strchr (SidebarBoundary, box[i])) {
if (last_dot) {
++last_dot;
- new_box = mem_malloc (maxlen + 1);
+ new_box = p_new(char, maxlen + 1);
new_box[0] = box[0];
for (i = 1, j = 1; j < maxlen && i < len; ++i) {
if (strchr (SidebarBoundary, box[i])) {
new_box[j++] = box[i];
new_box[j] = 0;
- if (&box[i + 1] != last_dot || j + str_len (last_dot) > maxlen) {
+ if (&box[i + 1] != last_dot || j + m_strlen(last_dot) > maxlen) {
new_box[j++] = box[i + 1];
new_box[j] = 0;
} else {
}
return new_box;
}
- return str_dup (box);
+ return m_strdup(box);
}
-static const char* sidebar_number_format (char* dest, size_t destlen, char op,
+static const char* sidebar_number_format (char* dest, ssize_t destlen, char op,
const char* src, const char* fmt,
const char* ifstr, const char* elstr,
unsigned long data, format_flag flags) {
char tmp[SHORT_STRING];
BUFFY* b = (BUFFY*) Incoming->data[data];
int opt = flags & M_FORMAT_OPTIONAL;
- int c = Context && str_eq (Context->path, b->path);
+ int c = Context && !m_strcmp(Context->path, b->path);
switch (op) {
/* deleted */
* 0 item was not printed ('cause of $sidebar_newmail_only)
* 1 item was printed
*/
-int make_sidebar_entry (char* box, int idx, size_t len)
+int make_sidebar_entry (char* box, int idx, ssize_t len)
{
int shortened = 0, lencnt = 0;
char no[SHORT_STRING], entry[SHORT_STRING];
-#if USE_IMAP
- int l = str_len (ImapHomeNamespace);
-#endif
- int l_m = str_len (Maildir);
+ int l = m_strlen(ImapHomeNamespace);
+ int l_m = m_strlen(Maildir);
if (SidebarWidth > COLS)
SidebarWidth = COLS;
if (option (OPTSIDEBARNEWMAILONLY) && box && Context && Context->path &&
- !str_eq (Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0)
+ m_strcmp(Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0)
/* if $sidebar_newmail_only is set, don't display the
* box only if it's not the currently opened
* (i.e. always display the currently opened) */
mutt_FormatString (no, len, NONULL (SidebarNumberFormat),
sidebar_number_format, idx, M_FORMAT_OPTIONAL);
- lencnt = str_len (no);
- memset (&entry, ' ', sizeof (entry));
+ lencnt = m_strlen(no);
+ memset(&entry, ' ', sizeof(entry));
-#if USE_IMAP
- if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 &&
- str_len (box) > l)
+ if (l > 0 && m_strncmp(box, ImapHomeNamespace, l) == 0 &&
+ m_strlen(box) > l)
box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
else
-#endif
- if (l_m > 0 && str_ncmp (box, Maildir, l_m) == 0 &&
- str_len (box) > l_m) {
+ if (l_m > 0 && m_strncmp(box, Maildir, l_m) == 0 &&
+ m_strlen(box) > l_m) {
box += l_m;
if (Maildir[strlen(Maildir)-1]!='/') {
box += 1;
} else
box = basename (box);
- if (option (OPTSHORTENHIERARCHY) && str_len (box) > len-lencnt-1) {
+ if (option (OPTSHORTENHIERARCHY) && m_strlen(box) > len-lencnt-1) {
box = shortened_hierarchy (box, len-lencnt-1);
shortened = 1;
}
- snprintf (entry, len-lencnt, "%s", box);
- entry[str_len (entry)] = ' ';
- strncpy (entry + (len - lencnt), no, lencnt);
+ m_strcpy(entry, len - lencnt, box);
+ entry[m_strlen(entry)] = ' ';
+ memcpy(entry + (len - lencnt), no, lencnt);
addnstr (entry, len);
if (shortened)
- mem_free(&box);
+ p_delete(&box);
return (1);
}
/* internally sets item to buf */
void sidebar_set_current (const char* buf) {
int i = buffy_lookup (buf);
- if (i >= 0)
+ if (i >= 0) {
CurBuffy = i;
+ calc_boundaries();
+ }
}
/* fix counters for a context
tmp->msg_flagged = Context->flagged;
}
+void sidebar_draw_frames (void) {
+ ssize_t i,delim_len;
+
+ if (!option(OPTMBOXPANE) || SidebarWidth==0)
+ return;
+
+ delim_len=m_strlen(NONULL(SidebarDelim));
+
+ /* draw vertical delimiter */
+ SETCOLOR (MT_COLOR_SIDEBAR);
+ for (i = 0; i < LINES-1; i++) {
+ move (i, SidebarWidth - delim_len);
+ if (option (OPTASCIICHARS))
+ addstr (NONULL (SidebarDelim));
+ else if (!option (OPTASCIICHARS) && !m_strcmp(SidebarDelim, "|"))
+ addch (ACS_VLINE);
+ else if ((Charset_is_utf8) && !m_strcmp(SidebarDelim, "|"))
+ addstr ("\342\224\202");
+ else
+ addstr (NONULL (SidebarDelim));
+ }
+
+ /* fill "gaps" at top+bottom */
+ SETCOLOR(MT_COLOR_STATUS);
+ for (i=0; i<SidebarWidth; i++) {
+ /*
+ * if we don't have $status_on_top and have $help, fill top
+ * gap with spaces to get bg color
+ */
+ if (option(OPTSTATUSONTOP) || option(OPTHELP)) {
+ move(0,i);
+ addch(' ');
+ }
+ /*
+ * if we don't have $status_on_top or we have $help, fill bottom
+ * gap with spaces to get bg color
+ */
+ if (!option(OPTSTATUSONTOP) || option(OPTHELP)) {
+ move(LINES-2,i);
+ addch(' ');
+ }
+ }
+ SETCOLOR (MT_COLOR_NORMAL);
+}
+
/* actually draws something
* FIXME this needs some clue when to do it
*/
-int sidebar_draw (int menu)
-{
-
- int lines = option (OPTHELP) ? 1 : 0, draw_devider = 1, i = 0;
+int sidebar_draw (int menu) {
+ int first_line = option (OPTSTATUSONTOP) ? 1 : option (OPTHELP) ? 1 : 0,
+ last_line = LINES - 2 + (option (OPTSTATUSONTOP) && !option (OPTHELP) ? 1 : 0),
+ i = 0,line;
BUFFY *tmp;
- short delim_len = str_len (SidebarDelim);
+ ssize_t delim_len = m_strlen(SidebarDelim);
char blank[SHORT_STRING];
+ known_lines=last_line-first_line;
+
/* initialize first time */
if (!initialized) {
prev_show_value = option (OPTMBOXPANE);
- if (!option (OPTMBOXPANE))
- draw_devider = 1;
initialized = 1;
}
+ if (TopBuffy==0 || CurBuffy==0)
+ calc_boundaries();
+
/* save or restore the value SidebarWidth */
if (prev_show_value != option (OPTMBOXPANE)) {
if (!prev_show_value && option (OPTMBOXPANE)) {
}
if (SidebarWidth > 0 && option (OPTMBOXPANE)
- && str_len (SidebarDelim) >= SidebarWidth) {
+ && m_strlen(SidebarDelim) >= SidebarWidth) {
mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
sleep (2);
unset_option (OPTMBOXPANE);
if (SidebarWidth == 0 || !option (OPTMBOXPANE))
return 0;
- /* draw devider only if necessary (if the sidebar becomes visible e.g.)*/
- if (draw_devider == 1){
- /* draw the divider */
- SETCOLOR (MT_COLOR_SIDEBAR);
- for (lines = 1;
- lines < LINES - 1 - (menu != MENU_PAGER || option (OPTSTATUSONTOP));
- lines++) {
- move (lines, SidebarWidth - delim_len);
- if (option (OPTASCIICHARS))
- addstr (NONULL (SidebarDelim));
- else if (!option (OPTASCIICHARS) && !str_cmp (SidebarDelim, "|"))
- addch (ACS_VLINE);
- else if ((Charset_is_utf8) && !str_cmp (SidebarDelim, "|"))
- addstr ("\342\224\202");
- else
- addstr (NONULL (SidebarDelim));
- }
- }
- SETCOLOR (MT_COLOR_NORMAL);
+
+ sidebar_draw_frames();
if (list_empty(Incoming))
return 0;
- lines = option (OPTHELP) ? 1 : 0; /* go back to the top */
- calc_boundaries (menu);
/* actually print items */
- for (i = TopBuffy; i < Incoming->length && lines < LINES - 1 -
- (menu != MENU_PAGER || option (OPTSTATUSONTOP)); i++) {
+ for (i = TopBuffy, line=first_line; i < Incoming->length && line < last_line; i++) {
tmp = (BUFFY*) Incoming->data[i];
if (i == CurBuffy)
else
SETCOLOR (MT_COLOR_NORMAL);
- move (lines, 0);
- lines += make_sidebar_entry (tmp->path, i, SidebarWidth-delim_len);
+ move (line, 0);
+ line += make_sidebar_entry (tmp->path, i, SidebarWidth-delim_len);
}
- /* fill with blanks to bottom */
- memset (&blank, ' ', sizeof (blank));
SETCOLOR (MT_COLOR_NORMAL);
- for (; lines < LINES - 1 - (menu != MENU_PAGER || option (OPTSTATUSONTOP)); lines++) {
- move (lines, 0);
+
+ /* fill with blanks to bottom */
+ memset(&blank, ' ', sizeof(blank));
+ for (; line < last_line; line++) {
+ move (line, 0);
addnstr (blank, SidebarWidth-delim_len);
}
return 0;
default:
return;
}
- calc_boundaries (menu);
+ calc_boundaries ();
sidebar_draw (menu);
}
projects / apps / madmutt.git / blobdiff