devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-29 08:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

small refactoring in statusbar.c

Browse Source
This commit is contained in:
Dmitry Podgorny
2013-08-24 00:39:03 +03:00
parent 1ef361684f
commit 021d095536
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ui/statusbar.c
View File

@@ -22,6 +22,7 @@
#include "config.h" #include "config.h"
#include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -63,6 +64,8 @@ create_status_bar(void)
mvwprintw(status_bar, 0, cols - 31, _active); mvwprintw(status_bar, 0, cols - 31, _active);
wattroff(status_bar, COLOUR_STATUS_BRACKET); wattroff(status_bar, COLOUR_STATUS_BRACKET);
if (last_time != NULL)
g_date_time_unref(last_time);
last_time = g_date_time_new_now_local(); last_time = g_date_time_new_now_local();
dirty = TRUE; dirty = TRUE;
@@ -76,6 +79,8 @@ status_bar_refresh(void)
if (elapsed >= 60000000) { if (elapsed >= 60000000) {
dirty = TRUE; dirty = TRUE;
if (last_time != NULL)
g_date_time_unref(last_time);
last_time = g_date_time_new_now_local(); last_time = g_date_time_new_now_local();
} }
@@ -113,6 +118,8 @@ status_bar_resize(void)
if (message != NULL) if (message != NULL)
mvwprintw(status_bar, 0, 10, message); mvwprintw(status_bar, 0, 10, message);
if (last_time != NULL)
g_date_time_unref(last_time);
last_time = g_date_time_new_now_local(); last_time = g_date_time_new_now_local();
dirty = TRUE; dirty = TRUE;
} }
@@ -184,13 +191,11 @@ status_bar_get_password(void)
void void
status_bar_print_message(const char * const msg) status_bar_print_message(const char * const msg)
{ {
if (message != NULL) {
free(message);
message = NULL;
}
werase(status_bar); werase(status_bar);
if (message != NULL) {
free(message);
}
message = (char *) malloc(strlen(msg) + 1); message = (char *) malloc(strlen(msg) + 1);
strcpy(message, msg); strcpy(message, msg);
mvwprintw(status_bar, 0, 10, message); mvwprintw(status_bar, 0, 10, message);
@@ -270,6 +275,7 @@ static void
_status_bar_update_time(void) _status_bar_update_time(void)
{ {
gchar *date_fmt = g_date_time_format(last_time, "%H:%M"); gchar *date_fmt = g_date_time_format(last_time, "%H:%M");
assert(date_fmt != NULL);
wattron(status_bar, COLOUR_STATUS_BRACKET); wattron(status_bar, COLOUR_STATUS_BRACKET);
mvwaddch(status_bar, 0, 1, '['); mvwaddch(status_bar, 0, 1, '[');
@@ -279,7 +285,7 @@ _status_bar_update_time(void)
mvwaddch(status_bar, 0, 7, ']'); mvwaddch(status_bar, 0, 7, ']');
wattroff(status_bar, COLOUR_STATUS_BRACKET); wattroff(status_bar, COLOUR_STATUS_BRACKET);
free(date_fmt); g_free(date_fmt);
dirty = TRUE; dirty = TRUE;
} }