*/
#include <lib-ui/lib-ui.h>
-#include <libgen.h>
-
#include <lib-ui/menu.h>
-#include <lib-ui/sidebar.h>
+
+#include <libgen.h>
#include "mutt.h"
#include "charset.h"
/* computes first entry to be shown */
static int calc_boundaries(void)
{
- int TopBuffy = 0;
-
if (CurBuffy < 0 || CurBuffy >= Incoming.len)
CurBuffy = 0;
return i;
}
}
+
+ return 0;
} else {
- TopBuffy = CurBuffy - (CurBuffy % (LINES - 3));
+ return CurBuffy - (CurBuffy % (LINES - 3));
}
-
- return TopBuffy < 0 ? 0 : TopBuffy;
}
-static char *shortened_hierarchy (char *hbox, int maxlen)
+static void shortened_hierarchy(char *dst, char *hbox, int maxlen)
{
- int dots = 0;
- char *last_dot = NULL;
- int i, j, len = m_strlen(hbox);
- char *new_box;
-
- if (!SidebarBoundary || !*SidebarBoundary)
- return (m_strdup(hbox));
-
- for (i = 0; i < len; ++i) {
- if (strchr (SidebarBoundary, hbox[i])) {
- ++dots;
- last_dot = &hbox[i];
+ int dots = 0, last_dot = 0, len = m_strlen(hbox);
+
+ if (m_strisempty(SidebarBoundary)) {
+ memcpy(dst, hbox, MIN(len, maxlen));
+ return;
}
- }
- if (last_dot) {
- ++last_dot;
- new_box = p_new(char, maxlen + 1);
- new_box[0] = hbox[0];
- for (i = 1, j = 1; j < maxlen && i < len; ++i) {
- if (strchr (SidebarBoundary, hbox[i])) {
- new_box[j++] = hbox[i];
- new_box[j] = 0;
- if (&hbox[i + 1] != last_dot || j + m_strlen(last_dot) > maxlen) {
- new_box[j++] = hbox[i + 1];
- new_box[j] = 0;
- } else {
- m_strcat(&new_box[j], maxlen + 1, last_dot);
- break;
+ for (int i = 0; i < len; ++i) {
+ if (strchr(SidebarBoundary, hbox[i])) {
+ ++dots;
+ last_dot = i;
}
- }
}
- return new_box;
- }
- return m_strdup(hbox);
+
+ if (dots == 0) {
+ memcpy(dst, hbox, MIN(len, maxlen));
+ return;
+ }
+
+ dst[0] = hbox[0];
+ for (int i = 1, j = 1; i < len && j < maxlen - 1; ++i) {
+ if (!strchr(SidebarBoundary, hbox[i]))
+ continue;
+
+ if (len - i <= maxlen - j) {
+ memcpy(dst, hbox + i, len - i);
+ return;
+ }
+
+ if (i == last_dot) {
+ memcpy(dst, hbox + i, maxlen - j);
+ return;
+ }
+
+ dst[j++] = hbox[i];
+ dst[j++] = hbox[i + 1];
+ }
}
static const char *
return src;
}
-int sidebar_need_count(void)
-{
- return ui_layout_sidebar_w() && !m_strisempty(SidebarNumberFormat);
-}
-
/* print single item
* returns:
* 0 item was not printed ('cause of $sidebar_newmail_only)
*/
static int make_sidebar_entry(WINDOW *sw, char *sbox, int idx, ssize_t len)
{
- int shortened = 0, lencnt = 0;
+ int lencnt = 0;
char no[STRING], entry[STRING];
int l_m = m_strlen(Maildir);
if (option(OPTSIDEBARNEWMAILONLY) && sbox && Context && Context->path
- && m_strcmp(Context->path, sbox) && Incoming.arr[idx]->new == 0)
+ && m_strcmp(Context->path, sbox) && Incoming.arr[idx]->new == 0
+ && idx != CurBuffy)
return 0;
m_strformat(no, sizeof(no), len, SidebarNumberFormat,
sbox = basename(sbox);
}
+ snprintf(entry, sizeof(entry), "%*s", (int)len, no);
if (option(OPTSHORTENHIERARCHY) && m_strlen(sbox) > len - lencnt - 1) {
- sbox = shortened_hierarchy(sbox, len - lencnt - 1);
- shortened = 1;
+ shortened_hierarchy(entry, sbox, len - lencnt - 1);
+ } else {
+ memcpy(entry, sbox, MIN(len - lencnt - 1, m_strlen(sbox)));
}
-
- snprintf(entry, sizeof(entry), "%*s", (int)len, no);
- memcpy(entry, sbox, MIN(len, m_strlen(sbox)));
waddnstr(sw, entry, len);
- if (shortened)
- p_delete(&sbox);
-
return 1;
}
*/
const char *sidebar_get_current(void)
{
- if (!Incoming.len)
- return NULL;
- return Incoming.arr[CurBuffy]->path;
+ if (0 <= CurBuffy && CurBuffy < Incoming.len)
+ return Incoming.arr[CurBuffy]->path;
+ return NULL;
}
/* internally sets item to buf */
/* fix counters for a context
* FIXME since ctx must not be of our business, move it elsewhere
*/
-void sidebar_set_buffystats (CONTEXT* curContext) {
- int i = 0;
- BUFFY* tmp = NULL;
- if (!curContext || !Incoming.len || (i = buffy_lookup (curContext->path)) < 0)
- return;
- tmp = Incoming.arr[i];
- tmp->new = curContext->new;
- tmp->msg_unread = curContext->unread;
- tmp->msgcount = curContext->msgcount;
- tmp->msg_flagged = curContext->flagged;
+void sidebar_set_buffystats(CONTEXT *curContext)
+{
+ int i = 0;
+ BUFFY *tmp;
+
+ if (!curContext || (i = buffy_lookup(curContext->path)) < 0)
+ return;
+ tmp = Incoming.arr[i];
+ tmp->new = curContext->new;
+ tmp->msg_unread = curContext->unread;
+ tmp->msgcount = curContext->msgcount;
+ tmp->msg_flagged = curContext->flagged;
}
int sidebar_draw(void)
{
- static short initialized = false, prev_show_value = 0;
- int x, y, i, line;
- char blank[STRING];
+ static short prev_show_value = -1;
+ int x, y, line;
WINDOW *sw;
/* initialize first time */
- if (!initialized) {
- prev_show_value = option(OPTMBOXPANE);
- initialized = 1;
- }
-
- /* save or restore the value SidebarWidth */
if (prev_show_value != option(OPTMBOXPANE)) {
- if (!prev_show_value && option(OPTMBOXPANE)) {
+ if ((prev_show_value = option(OPTMBOXPANE))) {
/* after toggle: force recounting of all mail */
- buffy_check (2);
+ buffy_check(2);
}
- prev_show_value = option(OPTMBOXPANE);
}
sw = ui_layout_sidebar_w();
return 0;
getmaxyx(sw, y, x);
- memset(&blank, ' ', sizeof(blank));
-
- wmove(sw, 0, 0);
- WSETCOLOR(sw, MT_COLOR_STATUS);
- waddnstr(sw, blank, x);
+ SETCOLOR(sw, MT_COLOR_SIDEBAR);
+ mvwhline(sw, 0, 0, ACS_HLINE, x - 1);
+ mvwaddch(sw, 0, x - 1, ACS_TTEE);
line = 1;
- for (i = calc_boundaries(); i < Incoming.len && line < y - 1; i++) {
+ for (int i = calc_boundaries(); i < Incoming.len && line < y - 1; i++) {
BUFFY *tmp = Incoming.arr[i];
if (i == CurBuffy)
- WSETCOLOR(sw, MT_COLOR_INDICATOR);
+ SETCOLOR(sw, MT_COLOR_INDICATOR);
else if (tmp->new > 0)
- WSETCOLOR(sw, MT_COLOR_NEW);
+ SETCOLOR(sw, MT_COLOR_NEW);
else if (tmp->msg_flagged > 0)
- WSETCOLOR(sw, MT_COLOR_FLAGGED);
+ SETCOLOR(sw, MT_COLOR_FLAGGED);
else
- WSETCOLOR(sw, MT_COLOR_NORMAL);
+ SETCOLOR(sw, MT_COLOR_NORMAL);
if (make_sidebar_entry(sw, tmp->path, i, x - 1)) {
- WSETCOLOR(sw, MT_COLOR_SIDEBAR);
+ SETCOLOR(sw, MT_COLOR_SIDEBAR);
waddch(sw, ACS_VLINE);
line++;
}
}
while (line < y - 1) {
- WSETCOLOR(sw, MT_COLOR_NORMAL);
- waddnstr(sw, blank, x - 1);
- WSETCOLOR(sw, MT_COLOR_SIDEBAR);
- waddch(sw, ACS_VLINE);
- line++;
+ SETCOLOR(sw, MT_COLOR_NORMAL);
+ whline(sw, ' ', x - 1);
+ SETCOLOR(sw, MT_COLOR_SIDEBAR);
+ mvwaddch(sw, line++, x - 1, ACS_VLINE);
}
- WSETCOLOR(sw, MT_COLOR_STATUS);
- waddnstr(sw, blank, x);
- WSETCOLOR(sw, MT_COLOR_NORMAL);
-
+ SETCOLOR(sw, MT_COLOR_SIDEBAR);
+ mvwhline(sw, y - 1, 0, ACS_HLINE, x - 1);
+ mvwaddch(sw, y - 1, x - 1, ACS_BTEE);
return 0;
}
projects / apps / madmutt.git / blobdiff