* please see the file GPL in the top level source directory.
*/
-#include <lib-lib/lib-lib.h>
+#include <lib-ui/lib-ui.h>
#include <libgen.h>
-#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
#include <lib-ui/sidebar.h>
return m_strdup(hbox);
}
-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,
- anytype data, format_flag flags) {
+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,
+ anytype data, format_flag flags)
+{
char tmp[STRING];
BUFFY* b = Incoming.arr[data.i];
int opt = flags & M_FORMAT_OPTIONAL;
}
if (flags & M_FORMAT_OPTIONAL)
- m_strformat(dest, destlen, opt ? ifstr : elstr, sidebar_number_format,
- data, flags);
+ m_strformat(dest, destlen, 0, opt ? ifstr : elstr,
+ sidebar_number_format, data, flags);
return src;
}
{
int shortened = 0, lencnt = 0;
char no[STRING], entry[STRING];
- int l = m_strlen(ImapHomeNamespace);
int l_m = m_strlen(Maildir);
if (SidebarWidth > COLS)
* (i.e. always display the currently opened) */
return 0;
- m_strformat(no, len, SidebarNumberFormat, sidebar_number_format, idx, 0);
+ m_strformat(no, len, SidebarWidth, SidebarNumberFormat, sidebar_number_format, idx, 0);
lencnt = m_strlen(no);
- if (l > 0 && m_strncmp(sbox, ImapHomeNamespace, l) == 0 &&
- m_strlen(sbox) > l)
- sbox += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
- else
if (l_m > 0 && m_strncmp(sbox, Maildir, l_m) == 0 &&
m_strlen(sbox) > l_m) {
sbox += l_m;
snprintf(entry, sizeof(entry), "%*s", (int)len, no);
memcpy(entry, sbox, MIN(len - 1, m_strlen(sbox)));
- addnstr(entry, len);
+ waddnstr(stdscr, entry, len);
if (shortened)
p_delete(&sbox);
/* 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");
+ wmove (stdscr, i, SidebarWidth - delim_len);
+ if (!m_strcmp(SidebarDelim, "|"))
+ waddch (stdscr, ACS_VLINE);
else
- addstr (NONULL (SidebarDelim));
+ waddstr (stdscr, NONULL (SidebarDelim));
}
/* fill "gaps" at top+bottom */
* gap with spaces to get bg color
*/
if (option(OPTSTATUSONTOP) || option(OPTHELP)) {
- move(0,i);
- addch(' ');
+ wmove(stdscr, 0,i);
+ waddch(stdscr, ' ');
}
/*
* 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(' ');
+ wmove(stdscr, LINES-2,i);
+ waddch(stdscr, ' ');
}
}
SETCOLOR (MT_COLOR_NORMAL);
else
SETCOLOR (MT_COLOR_NORMAL);
- move (line, 0);
+ wmove (stdscr, line, 0);
line += make_sidebar_entry (tmp->path, i, SidebarWidth-delim_len);
}
/* fill with blanks to bottom */
memset(&blank, ' ', sizeof(blank));
for (; line < last_line; line++) {
- move (line, 0);
- addnstr (blank, SidebarWidth-delim_len);
+ wmove (stdscr, line, 0);
+ waddnstr (stdscr, blank, SidebarWidth-delim_len);
}
return 0;
}