projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More buffer functions.
[apps/madmutt.git]
/
lib-ui
/
status.c
diff --git
a/lib-ui/status.c
b/lib-ui/status.c
index
2ca8f9d
..
00ccde8
100644
(file)
--- a/
lib-ui/status.c
+++ b/
lib-ui/status.c
@@
-7,9
+7,8
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#include <lib-
lib/lib-lib
.h>
+#include <lib-
ui/lib-ui
.h>
-#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
#include <lib-ui/menu.h>
#include <lib-mx/mx.h>
@@
-17,8
+16,6
@@
#include "sort.h"
#include "buffy.h"
#include "sort.h"
#include "buffy.h"
-#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
-
static char *get_sort_str (char *buf, ssize_t buflen, int method)
{
snprintf (buf, buflen, "%s%s%s",
static char *get_sort_str (char *buf, ssize_t buflen, int method)
{
snprintf (buf, buflen, "%s%s%s",
@@
-98,7
+95,7
@@
status_format_str(char *buf, ssize_t buflen, char op, const char *src,
case 'h':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
case 'h':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- snprintf (buf, buflen, fmt, NONULL (
MC
ore.shorthost));
+ snprintf (buf, buflen, fmt, NONULL (
mod_c
ore.shorthost));
break;
case 'f':
break;
case 'f':
@@
-256,7
+253,7
@@
status_format_str(char *buf, ssize_t buflen, char op, const char *src,
break;
case 'v':
break;
case 'v':
- m_strcpy(buf, buflen, m
utt_make_version()
);
+ m_strcpy(buf, buflen, m
admutt_version
);
break;
case 'V':
break;
case 'V':
@@
-271,7
+268,7
@@
status_format_str(char *buf, ssize_t buflen, char op, const char *src,
case 0:
*buf = 0;
case 0:
*buf = 0;
- return
(src)
;
+ return
src
;
default:
*buf = 0;
default:
*buf = 0;
@@
-281,10
+278,10
@@
status_format_str(char *buf, ssize_t buflen, char op, const char *src,
if (flags & M_FORMAT_OPTIONAL)
menu_status_line(buf, buflen, menu, optional ? ifstr : elstr);
if (flags & M_FORMAT_OPTIONAL)
menu_status_line(buf, buflen, menu, optional ? ifstr : elstr);
- return
(src)
;
+ return
src
;
}
void menu_status_line(char* buf, ssize_t len, MUTTMENU* menu, const char* p)
{
}
void menu_status_line(char* buf, ssize_t len, MUTTMENU* menu, const char* p)
{
- m_strformat(buf, len,
COLS - SW
, p, status_format_str, menu, 0);
+ m_strformat(buf, len,
getmaxx(main_w)
, p, status_format_str, menu, 0);
}
}