devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-28 19:16:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed title_bar_draw from UI module

Browse Source
This commit is contained in:
James Booth
2014-01-16 20:09:54 +00:00
parent 682601d479
commit f0e5e585f8
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ui/core.c
View File

@@ -191,7 +191,6 @@ _ui_contact_typing(const char * const barejid)
// in chat window with user // in chat window with user
} else { } else {
title_bar_set_typing(TRUE); title_bar_set_typing(TRUE);
title_bar_draw();
int num = wins_get_num(window); int num = wins_get_num(window);
status_bar_active(num); status_bar_active(num);
@@ -260,7 +259,6 @@ _ui_incoming_msg(const char * const from, const char * const message,
if (wins_is_current(window)) { if (wins_is_current(window)) {
win_print_incoming_message(window, tv_stamp, display_from, message); win_print_incoming_message(window, tv_stamp, display_from, message);
title_bar_set_typing(FALSE); title_bar_set_typing(FALSE);
title_bar_draw();
status_bar_active(num); status_bar_active(num);
wins_refresh_current(); wins_refresh_current();
@@ -558,7 +556,6 @@ _ui_switch_win(const int i)
GString *recipient_str = _get_recipient_string(new_current); GString *recipient_str = _get_recipient_string(new_current);
title_bar_set_recipient(recipient_str->str); title_bar_set_recipient(recipient_str->str);
g_string_free(recipient_str, TRUE); g_string_free(recipient_str, TRUE);
title_bar_draw();
status_bar_current(i); status_bar_current(i);
status_bar_active(i); status_bar_active(i);
} }
@@ -585,7 +582,6 @@ _ui_next_win(void)
GString *recipient_str = _get_recipient_string(new_current); GString *recipient_str = _get_recipient_string(new_current);
title_bar_set_recipient(recipient_str->str); title_bar_set_recipient(recipient_str->str);
g_string_free(recipient_str, TRUE); g_string_free(recipient_str, TRUE);
title_bar_draw();
status_bar_current(i); status_bar_current(i);
status_bar_active(i); status_bar_active(i);
} }
@@ -605,7 +601,6 @@ _ui_gone_secure(const char * const recipient, gboolean trusted)
GString *recipient_str = _get_recipient_string(window); GString *recipient_str = _get_recipient_string(window);
title_bar_set_recipient(recipient_str->str); title_bar_set_recipient(recipient_str->str);
g_string_free(recipient_str, TRUE); g_string_free(recipient_str, TRUE);
title_bar_draw();
wins_refresh_current(); wins_refresh_current();
} }
} }
@@ -624,7 +619,6 @@ _ui_gone_insecure(const char * const recipient)
GString *recipient_str = _get_recipient_string(window); GString *recipient_str = _get_recipient_string(window);
title_bar_set_recipient(recipient_str->str); title_bar_set_recipient(recipient_str->str);
g_string_free(recipient_str, TRUE); g_string_free(recipient_str, TRUE);
title_bar_draw();
wins_refresh_current(); wins_refresh_current();
} }
} }
@@ -642,7 +636,6 @@ _ui_trust(const char * const recipient)
GString *recipient_str = _get_recipient_string(window); GString *recipient_str = _get_recipient_string(window);
title_bar_set_recipient(recipient_str->str); title_bar_set_recipient(recipient_str->str);
g_string_free(recipient_str, TRUE); g_string_free(recipient_str, TRUE);
title_bar_draw();
wins_refresh_current(); wins_refresh_current();
} }
} }
@@ -660,7 +653,6 @@ _ui_untrust(const char * const recipient)
GString *recipient_str = _get_recipient_string(window); GString *recipient_str = _get_recipient_string(window);
title_bar_set_recipient(recipient_str->str); title_bar_set_recipient(recipient_str->str);
g_string_free(recipient_str, TRUE); g_string_free(recipient_str, TRUE);
title_bar_draw();
wins_refresh_current(); wins_refresh_current();
} }
} }
@@ -685,7 +677,6 @@ _ui_previous_win(void)
GString *recipient_str = _get_recipient_string(new_current); GString *recipient_str = _get_recipient_string(new_current);
title_bar_set_recipient(recipient_str->str); title_bar_set_recipient(recipient_str->str);
g_string_free(recipient_str, TRUE); g_string_free(recipient_str, TRUE);
title_bar_draw();
status_bar_current(i); status_bar_current(i);
status_bar_active(i); status_bar_active(i);
} }

17
src/ui/titlebar.c
View File

@@ -36,6 +36,8 @@ static contact_presence_t current_presence;
static GTimer *typing_elapsed; static GTimer *typing_elapsed;
static void _title_bar_draw(void);
static void static void
_create_title_bar(void) _create_title_bar(void)
{ {
@@ -59,7 +61,7 @@ _title_bar_console(void)
free(current_title); free(current_title);
current_title = strdup(CONSOLE_TITLE); current_title = strdup(CONSOLE_TITLE);
title_bar_draw(); _title_bar_draw();
} }
static void static void
@@ -70,7 +72,7 @@ _title_bar_resize(void)
wresize(win, 1, cols); wresize(win, 1, cols);
wbkgd(win, COLOUR_TITLE_TEXT); wbkgd(win, COLOUR_TITLE_TEXT);
title_bar_draw(); _title_bar_draw();
} }
static void static void
@@ -89,7 +91,7 @@ _title_bar_refresh(void)
g_timer_destroy(typing_elapsed); g_timer_destroy(typing_elapsed);
typing_elapsed = NULL; typing_elapsed = NULL;
title_bar_draw(); _title_bar_draw();
} }
} }
} }
@@ -99,7 +101,7 @@ static void
_title_bar_set_presence(contact_presence_t presence) _title_bar_set_presence(contact_presence_t presence)
{ {
current_presence = presence; current_presence = presence;
title_bar_draw(); _title_bar_draw();
} }
static void static void
@@ -116,8 +118,7 @@ _title_bar_set_recipient(const char * const recipient)
free(current_title); free(current_title);
current_title = strdup(recipient); current_title = strdup(recipient);
wrefresh(win); _title_bar_draw();
inp_put_back();
} }
static void static void
@@ -139,8 +140,7 @@ _title_bar_set_typing(gboolean is_typing)
current_title = strdup(new_title->str); current_title = strdup(new_title->str);
g_string_free(new_title, TRUE); g_string_free(new_title, TRUE);
wrefresh(win); _title_bar_draw();
inp_put_back();
} }
static void static void
@@ -202,5 +202,4 @@ titlebar_init_module(void)
title_bar_set_presence = _title_bar_set_presence; title_bar_set_presence = _title_bar_set_presence;
title_bar_set_recipient = _title_bar_set_recipient; title_bar_set_recipient = _title_bar_set_recipient;
title_bar_set_typing = _title_bar_set_typing; title_bar_set_typing = _title_bar_set_typing;
title_bar_draw = _title_bar_draw;
} }

1
src/ui/ui.h
View File

@@ -158,7 +158,6 @@ void (*title_bar_console)(void);
void (*title_bar_set_presence)(contact_presence_t presence); void (*title_bar_set_presence)(contact_presence_t presence);
void (*title_bar_set_recipient)(const char * const from); void (*title_bar_set_recipient)(const char * const from);
void (*title_bar_set_typing)(gboolean is_typing); void (*title_bar_set_typing)(gboolean is_typing);
void (*title_bar_draw)(void);
// console window actions // console window actions
void (*cons_show)(const char * const msg, ...); void (*cons_show)(const char * const msg, ...);