devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'incertia/time'

Browse Source 
Conflicts:
	src/config/preferences.c
This commit is contained in:
James Booth
2015-07-01 20:16:09 +01:00
parent d5f79c7b35 837f8b1f10
commit 106e909fbd
6 changed files with 82 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui/console.c
View File

@@ -954,12 +954,10 @@ void
cons_time_setting(void)
{
char *pref_time = prefs_get_string(PREF_TIME);
if (g_strcmp0(pref_time, "minutes") == 0)
cons_show("Time (/time) : minutes");
else if (g_strcmp0(pref_time, "off") == 0)
if (g_strcmp0(pref_time, "off") == 0)
cons_show("Time (/time) : OFF");
else
cons_show("Time (/time) : seconds");
cons_show("Time (/time) : %s", pref_time);
prefs_free_string(pref_time);

40
src/ui/statusbar.c
View File

@@ -129,10 +129,14 @@ status_bar_resize(void)
if (message) {
char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR);
if (g_strcmp0(time_pref, "minutes") == 0) {
mvwprintw(status_bar, 0, 10, message);
} else if (g_strcmp0(time_pref, "seconds") == 0) {
mvwprintw(status_bar, 0, 13, message);
gchar *date_fmt = g_date_time_format(last_time, time_pref);
assert(date_fmt != NULL);
size_t len = strlen(date_fmt);
g_free(date_fmt);
if (g_strcmp0(time_pref, "") != 0) {
/* 01234567890123456
* [HH:MM] message */
mvwprintw(status_bar, 0, 5 + len, message);
} else {
mvwprintw(status_bar, 0, 1, message);
}
@@ -304,10 +308,12 @@ status_bar_print_message(const char * const msg)
message = strdup(msg);
char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR);
if (g_strcmp0(time_pref, "minutes") == 0) {
mvwprintw(status_bar, 0, 10, message);
} else if (g_strcmp0(time_pref, "seconds") == 0) {
mvwprintw(status_bar, 0, 13, message);
gchar *date_fmt = g_date_time_format(last_time, time_pref);
assert(date_fmt != NULL);
size_t len = strlen(date_fmt);
g_free(date_fmt);
if (g_strcmp0(time_pref, "") != 0) {
mvwprintw(status_bar, 0, 5 + len, message);
} else {
mvwprintw(status_bar, 0, 1, message);
}
@@ -438,26 +444,16 @@ _status_bar_draw(void)
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);
char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR);
if (g_strcmp0(time_pref, "minutes") == 0) {
gchar *date_fmt = g_date_time_format(last_time, "%H:%M");
if (g_strcmp0(time_pref, "") != 0) {
gchar *date_fmt = g_date_time_format(last_time, time_pref);
assert(date_fmt != NULL);
size_t len = strlen(date_fmt);
wattron(status_bar, bracket_attrs);
mvwaddch(status_bar, 0, 1, '[');
wattroff(status_bar, bracket_attrs);
mvwprintw(status_bar, 0, 2, date_fmt);
wattron(status_bar, bracket_attrs);
mvwaddch(status_bar, 0, 7, ']');
wattroff(status_bar, bracket_attrs);
g_free(date_fmt);
} else if (g_strcmp0(time_pref, "seconds") == 0) {
gchar *date_fmt = g_date_time_format(last_time, "%H:%M:%S");
assert(date_fmt != NULL);
wattron(status_bar, bracket_attrs);
mvwaddch(status_bar, 0, 1, '[');
wattroff(status_bar, bracket_attrs);
mvwprintw(status_bar, 0, 2, date_fmt);
wattron(status_bar, bracket_attrs);
mvwaddch(status_bar, 0, 10, ']');
mvwaddch(status_bar, 0, 2 + len, ']');
wattroff(status_bar, bracket_attrs);
g_free(date_fmt);
}

38
src/ui/window.c
View File

@@ -36,6 +36,7 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <assert.h>
#include <wchar.h>
@@ -60,7 +61,7 @@
static void _win_print(ProfWin *window, const char show_char, GDateTime *time,
int flags, theme_item_t theme_item, const char * const from, const char * const message, DeliveryReceipt *receipt);
static void _win_print_wrapped(WINDOW *win, const char * const message);
static void _win_print_wrapped(WINDOW *win, const char * const message, size_t indent);
int
win_roster_cols(void)
@@ -1016,18 +1017,20 @@ _win_print(ProfWin *window, const char show_char, GDateTime *time,
gboolean me_message = FALSE;
int offset = 0;
int colour = theme_attrs(THEME_ME);
size_t indent = 0;
gchar *date_fmt = NULL;
char *time_pref = prefs_get_string(PREF_TIME);
date_fmt = g_date_time_format(time, time_pref);
free(time_pref);
assert(date_fmt != NULL);
if(strlen(date_fmt) != 0){
indent = 3 + strlen(date_fmt);
}
if ((flags & NO_DATE) == 0) {
gchar *date_fmt = NULL;
char *time_pref = prefs_get_string(PREF_TIME);
if (g_strcmp0(time_pref, "minutes") == 0) {
date_fmt = g_date_time_format(time, "%H:%M");
} else if (g_strcmp0(time_pref, "seconds") == 0) {
date_fmt = g_date_time_format(time, "%H:%M:%S");
}
free(time_pref);
if (date_fmt) {
if (date_fmt && strlen(date_fmt)) {
if ((flags & NO_COLOUR_DATE) == 0) {
wattron(window->layout->win, theme_attrs(THEME_TIME));
}
@@ -1072,7 +1075,7 @@ _win_print(ProfWin *window, const char show_char, GDateTime *time,
}
if (prefs_get_boolean(PREF_WRAP)) {
_win_print_wrapped(window->layout->win, message+offset);
_win_print_wrapped(window->layout->win, message+offset, indent);
} else {
wprintw(window->layout->win, "%s", message+offset);
}
@@ -1102,20 +1105,11 @@ _win_indent(WINDOW *win, int size)
}
static void
_win_print_wrapped(WINDOW *win, const char * const message)
_win_print_wrapped(WINDOW *win, const char * const message, size_t indent)
{
int wordi = 0;
char *word = malloc(strlen(message) + 1);
char *time_pref = prefs_get_string(PREF_TIME);
int indent = 0;
if (g_strcmp0(time_pref, "minutes") == 0) {
indent = 8;
} else if (g_strcmp0(time_pref, "seconds") == 0) {
indent = 11;
}
free(time_pref);
gchar *curr_ch = g_utf8_offset_to_pointer(message, 0);
while (*curr_ch != '\0') {