Renamed remaining win_ functions

1 files changed, 49 insertions, 48 deletions

diff --git a/src/ui/ui.h b/src/ui/ui.h
index 11c91712..47c6fe82 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -45,28 +45,68 @@
 // holds console at index 0 and chat wins 1 through to 9
 ProfWin* windows[NUM_WINS];
 
-// gui startup and shutdown, resize
+// ui startup and control
 void ui_init(void);
 void ui_load_colours(void);
 void ui_refresh(void);
 void ui_close(void);
 void ui_resize(const int ch, const char * const input,
     const int size);
-void ui_show_typing(const char * const from);
 void ui_idle(void);
-void ui_show_incoming_msg(const char * const from, const char * const message,
-    GTimeVal *tv_stamp, gboolean priv);
-void ui_contact_online(const char * const barejid, const char * const resource,
-    const char * const show, const char * const status, GDateTime *last_activity);
-void ui_contact_offline(const char * const from, const char * const show,
-    const char * const status);
-void ui_disconnected(void);
 void ui_handle_special_keys(const wint_t * const ch, const char * const inp,
     const int size);
 void ui_switch_win(const int i);
 gboolean ui_windows_full(void);
 unsigned long ui_get_idle_time(void);
 void ui_reset_idle_time(void);
+void ui_new_chat_win(const char * const to);
+void ui_print_error_from_recipient(const char * const from, const char *err_msg);
+void ui_print_system_msg_from_recipient(const char * const from, const char *message);
+
+// current window actions
+void ui_close_current(void);
+void ui_clear_current(void);
+win_type_t ui_current_win_type(void);
+char* ui_current_recipient(void);
+void ui_current_print_line(const char * const msg, ...);
+void ui_current_error_line(const char * const msg);
+void ui_current_page_off(void);
+
+// ui events
+void ui_contact_typing(const char * const from);
+void ui_incoming_msg(const char * const from, const char * const message,
+    GTimeVal *tv_stamp, gboolean priv);
+void ui_contact_online(const char * const barejid, const char * const resource,
+    const char * const show, const char * const status, GDateTime *last_activity);
+void ui_contact_offline(const char * const from, const char * const show,
+    const char * const status);
+void ui_disconnected(void);
+void ui_recipient_gone(const char * const from);
+void ui_outgoing_msg(const char * const from, const char * const to,
+    const char * const message);
+void ui_room_join(Jid *jid);
+void ui_room_roster(const char * const room, GList *roster, const char * const presence);
+void ui_room_history(const char * const room_jid, const char * const nick,
+    GTimeVal tv_stamp, const char * const message);
+void ui_room_message(const char * const room_jid, const char * const nick,
+    const char * const message);
+void ui_room_subject(const char * const room_jid,
+    const char * const subject);
+void ui_room_broadcast(const char * const room_jid,
+    const char * const message);
+void ui_room_member_offline(const char * const room, const char * const nick);
+void ui_room_member_online(const char * const room,
+    const char * const nick, const char * const show, const char * const status);
+void ui_room_member_nick_change(const char * const room,
+    const char * const old_nick, const char * const nick);
+void ui_room_nick_change(const char * const room, const char * const nick);
+void ui_room_member_presence(const char * const room,
+    const char * const nick, const char * const show, const char * const status);
+
+// contact status functions
+void ui_status_room(const char * const contact);
+void ui_status(void);
+void ui_status_private(void);
 
 // create windows
 void create_title_bar(void);
@@ -83,45 +123,6 @@ void title_bar_set_recipient(char *from);
 void title_bar_set_typing(gboolean is_typing);
 void title_bar_draw(void);
 
-// current window actions
-void ui_close_current(void);
-void ui_clear_current(void);
-win_type_t ui_current_win_type(void);
-char* ui_current_win_recipient(void);
-void win_current_show(const char * const msg, ...);
-void win_current_bad_show(const char * const msg);
-void win_current_page_off(void);
-
-void win_show_error_msg(const char * const from, const char *err_msg);
-void win_show_gone(const char * const from);
-void win_show_system_msg(const char * const from, const char *message);
-void win_show_outgoing_msg(const char * const from, const char * const to,
-    const char * const message);
-void win_new_chat_win(const char * const to);
-
-void win_join_chat(Jid *jid);
-void win_show_room_roster(const char * const room, GList *roster, const char * const presence);
-void win_show_room_history(const char * const room_jid, const char * const nick,
-    GTimeVal tv_stamp, const char * const message);
-void win_show_room_message(const char * const room_jid, const char * const nick,
-    const char * const message);
-void win_show_room_subject(const char * const room_jid,
-    const char * const subject);
-void win_show_room_broadcast(const char * const room_jid,
-    const char * const message);
-void win_show_room_member_offline(const char * const room, const char * const nick);
-void win_show_room_member_online(const char * const room,
-    const char * const nick, const char * const show, const char * const status);
-void win_show_room_member_nick_change(const char * const room,
-    const char * const old_nick, const char * const nick);
-void win_show_room_nick_change(const char * const room, const char * const nick);
-void win_show_room_member_presence(const char * const room,
-    const char * const nick, const char * const show, const char * const status);
-void win_room_show_status(const char * const contact);
-void win_room_show_info(const char * const contact);
-void win_show_status(void);
-void win_private_show_status(void);
-
 // console window actions
 ProfWin* cons_create(void);
 void cons_refresh(void);