From 4c42ce9701fa4df960a8b20d704ac611e4866dfa Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 1 Nov 2015 18:38:21 +0000
Subject: [PATCH 1/6] Removed ui_readline()

---
 src/profanity.c              | 2 +-
 src/ui/core.c                | 6 ------
 src/ui/inputwin.h            | 1 -
 src/ui/ui.h                  | 3 ++-
 tests/unittests/ui/stub_ui.c | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/profanity.c b/src/profanity.c
index d316ba2f..07dcc332 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -108,7 +108,7 @@ prof_run(char *log_level, char *account_name)
         log_stderr_handler();
         _check_autoaway();
 
-        line = ui_readline();
+        line = inp_readline();
         if (line) {
             ProfWin *window = wins_get_current();
             cont = cmd_process_input(window, line);
diff --git a/src/ui/core.c b/src/ui/core.c
index a48d987b..af395831 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -185,12 +185,6 @@ ui_close(void)
     endwin();
 }
 
-char*
-ui_readline(void)
-{
-    return inp_readline();
-}
-
 void
 ui_page_up(void)
 {
diff --git a/src/ui/inputwin.h b/src/ui/inputwin.h
index 25faba38..7a45afde 100644
--- a/src/ui/inputwin.h
+++ b/src/ui/inputwin.h
@@ -40,7 +40,6 @@
 #define INP_WIN_MAX 1000
 
 void create_input_window(void);
-char* inp_readline(void);
 void inp_nonblocking(gboolean reset);
 void inp_close(void);
 void inp_win_clear(void);
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 70c02da0..388f37ed 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -85,6 +85,8 @@ void chatwin_outgoing_carbon(ProfChatWin *chatwin, const char *const message);
 void chatwin_contact_online(ProfChatWin *chatwin, Resource *resource, GDateTime *last_activity);
 void chatwin_contact_offline(ProfChatWin *chatwin, char *resource, char *status);
 
+char* inp_readline(void);
+
 void ui_handle_otr_error(const char *const barejid, const char *const message);
 
 unsigned long ui_get_idle_time(void);
@@ -228,7 +230,6 @@ void ui_update_presence(const resource_presence_t resource_presence,
     const char *const message, const char *const show);
 void ui_statusbar_new(const int win);
 
-char* ui_readline(void);
 void ui_input_clear(void);
 void ui_input_nonblocking(gboolean);
 void ui_write(char *line, int offset);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 39f4445a..c71780bb 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -313,7 +313,7 @@ void ui_update_presence(const resource_presence_t resource_presence,
     const char * const message, const char * const show) {}
 void ui_statusbar_new(const int win) {}
 
-char*  ui_readline(void)
+char* inp_readline(void)
 {
     return NULL;
 }

From be4b07102cf0973091d11db44f9acd0135da36c7 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 1 Nov 2015 18:42:42 +0000
Subject: [PATCH 2/6] Removed ui_input_clear()

---
 src/ui/core.c                | 6 ------
 src/ui/ui.h                  | 1 -
 tests/unittests/ui/stub_ui.c | 1 -
 3 files changed, 8 deletions(-)

diff --git a/src/ui/core.c b/src/ui/core.c
index af395831..63e6e464 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -213,12 +213,6 @@ ui_subwin_page_down(void)
     win_sub_page_down(current);
 }
 
-void
-ui_input_clear(void)
-{
-    inp_win_clear();
-}
-
 void
 ui_input_nonblocking(gboolean reset)
 {
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 388f37ed..5e9516d5 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -230,7 +230,6 @@ void ui_update_presence(const resource_presence_t resource_presence,
     const char *const message, const char *const show);
 void ui_statusbar_new(const int win);
 
-void ui_input_clear(void);
 void ui_input_nonblocking(gboolean);
 void ui_write(char *line, int offset);
 
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index c71780bb..2f97dbdb 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -320,7 +320,6 @@ char* inp_readline(void)
 
 void ui_inp_history_append(char *inp) {}
 
-void ui_input_clear(void) {}
 void ui_input_nonblocking(gboolean reset) {}
 
 void ui_invalid_command_usage(const char * const usage, void (*setting_func)(void)) {}

From 4fa2efc7caa4362cd172ef9d69cf9324b928e1d3 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 1 Nov 2015 18:45:57 +0000
Subject: [PATCH 3/6] Removed inp_win_clear()

---
 src/ui/inputwin.c | 9 ---------
 src/ui/inputwin.h | 1 -
 2 files changed, 10 deletions(-)

diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index 038e1dda..b6f69220 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -264,15 +264,6 @@ inp_put_back(void)
     _inp_win_update_virtual();
 }
 
-void
-inp_win_clear(void)
-{
-    werase(inp_win);
-    wmove(inp_win, 0, 0);
-    pad_start = 0;
-    _inp_win_update_virtual();
-}
-
 static void
 _inp_win_update_virtual(void)
 {
diff --git a/src/ui/inputwin.h b/src/ui/inputwin.h
index 7a45afde..8a2991f8 100644
--- a/src/ui/inputwin.h
+++ b/src/ui/inputwin.h
@@ -42,7 +42,6 @@
 void create_input_window(void);
 void inp_nonblocking(gboolean reset);
 void inp_close(void);
-void inp_win_clear(void);
 void inp_win_resize(void);
 void inp_put_back(void);
 char* inp_get_password(void);

From 8195ab42cb97c5597f4deb48f92be04afe933abc Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 1 Nov 2015 18:49:53 +0000
Subject: [PATCH 4/6] Removed ui_ paging functions

---
 src/ui/core.c                | 28 ----------------------------
 src/ui/inputwin.c            | 12 ++++++++----
 src/ui/ui.h                  |  4 ----
 tests/unittests/ui/stub_ui.c |  4 ----
 4 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/src/ui/core.c b/src/ui/core.c
index 63e6e464..2d925169 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -185,34 +185,6 @@ ui_close(void)
     endwin();
 }
 
-void
-ui_page_up(void)
-{
-    ProfWin *current = wins_get_current();
-    win_page_up(current);
-}
-
-void
-ui_page_down(void)
-{
-    ProfWin *current = wins_get_current();
-    win_page_down(current);
-}
-
-void
-ui_subwin_page_up(void)
-{
-    ProfWin *current = wins_get_current();
-    win_sub_page_up(current);
-}
-
-void
-ui_subwin_page_down(void)
-{
-    ProfWin *current = wins_get_current();
-    win_sub_page_down(current);
-}
-
 void
 ui_input_nonblocking(gboolean reset)
 {
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index b6f69220..d875b77d 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -553,27 +553,31 @@ _inp_rl_altright_handler(int count, int key)
 static int
 _inp_rl_pageup_handler(int count, int key)
 {
-    ui_page_up();
+    ProfWin *current = wins_get_current();
+    win_page_up(current);
     return 0;
 }
 
 static int
 _inp_rl_pagedown_handler(int count, int key)
 {
-    ui_page_down();
+    ProfWin *current = wins_get_current();
+    win_page_down(current);
     return 0;
 }
 
 static int
 _inp_rl_altpageup_handler(int count, int key)
 {
-    ui_subwin_page_up();
+    ProfWin *current = wins_get_current();
+    win_sub_page_up(current);
     return 0;
 }
 
 static int
 _inp_rl_altpagedown_handler(int count, int key)
 {
-    ui_subwin_page_down();
+    ProfWin *current = wins_get_current();
+    win_sub_page_down(current);
     return 0;
 }
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 5e9516d5..ae44d921 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -217,10 +217,6 @@ gboolean ui_tidy_wins(void);
 void ui_prune_wins(void);
 gboolean ui_swap_wins(int source_win, int target_win);
 
-void ui_page_up(void);
-void ui_page_down(void);
-void ui_subwin_page_up(void);
-void ui_subwin_page_down(void);
 void ui_clear_win(ProfWin *window);
 
 void ui_auto_away(char *message, gint time, resource_presence_t res_presence);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 2f97dbdb..c60746d2 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -153,10 +153,6 @@ int ui_win_unread(int index)
     return 0;
 }
 
-void ui_page_up(void) {}
-void ui_page_down(void) {}
-void ui_subwin_page_up(void) {}
-void ui_subwin_page_down(void) {}
 void ui_clear_win(ProfWin *window) {}
 
 char * ui_ask_password(void)

From d6e4b74802cdfb4336c20b3041a892186f9a3dc6 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 1 Nov 2015 18:56:34 +0000
Subject: [PATCH 5/6] Removed ui_input_nonblocking()

---
 src/command/commands.c       | 2 +-
 src/profanity.c              | 2 +-
 src/ui/core.c                | 6 ------
 src/ui/inputwin.h            | 1 -
 src/ui/ui.h                  | 2 +-
 src/ui/window.c              | 4 ++--
 src/xmpp/presence.c          | 6 +++---
 tests/unittests/ui/stub_ui.c | 4 ++--
 8 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/command/commands.c b/src/command/commands.c
index 8a0787b8..5da5f3f8 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -4044,7 +4044,7 @@ cmd_inpblock(ProfWin *window, const char *const command, gchar **args)
         if (res) {
             cons_show("Input blocking set to %d milliseconds.", intval);
             prefs_set_inpblock(intval);
-            ui_input_nonblocking(FALSE);
+            inp_nonblocking(FALSE);
         } else {
             cons_show(err_msg);
             free(err_msg);
diff --git a/src/profanity.c b/src/profanity.c
index 07dcc332..28eb4bf4 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -340,7 +340,7 @@ _init(char *log_level)
     p_gpg_init();
 #endif
     atexit(_shutdown);
-    ui_input_nonblocking(TRUE);
+    inp_nonblocking(TRUE);
 }
 
 static void
diff --git a/src/ui/core.c b/src/ui/core.c
index 2d925169..f5b365be 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -185,12 +185,6 @@ ui_close(void)
     endwin();
 }
 
-void
-ui_input_nonblocking(gboolean reset)
-{
-    inp_nonblocking(reset);
-}
-
 void
 ui_resize(void)
 {
diff --git a/src/ui/inputwin.h b/src/ui/inputwin.h
index 8a2991f8..a5cbf23f 100644
--- a/src/ui/inputwin.h
+++ b/src/ui/inputwin.h
@@ -40,7 +40,6 @@
 #define INP_WIN_MAX 1000
 
 void create_input_window(void);
-void inp_nonblocking(gboolean reset);
 void inp_close(void);
 void inp_win_resize(void);
 void inp_put_back(void);
diff --git a/src/ui/ui.h b/src/ui/ui.h
index ae44d921..0d53ee5e 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -86,6 +86,7 @@ void chatwin_contact_online(ProfChatWin *chatwin, Resource *resource, GDateTime
 void chatwin_contact_offline(ProfChatWin *chatwin, char *resource, char *status);
 
 char* inp_readline(void);
+void inp_nonblocking(gboolean reset);
 
 void ui_handle_otr_error(const char *const barejid, const char *const message);
 
@@ -226,7 +227,6 @@ void ui_update_presence(const resource_presence_t resource_presence,
     const char *const message, const char *const show);
 void ui_statusbar_new(const int win);
 
-void ui_input_nonblocking(gboolean);
 void ui_write(char *line, int offset);
 
 void ui_invalid_command_usage(const char *const cmd, void (*setting_func)(void));
diff --git a/src/ui/window.c b/src/ui/window.c
index 24baa63a..91e8b6c2 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -921,7 +921,7 @@ win_print(ProfWin *window, const char show_char, int pad_indent, GDateTime *time
     buffer_push(window->layout->buffer, show_char, pad_indent, timestamp, flags, theme_item, from, message, NULL);
     _win_print(window, show_char, pad_indent, timestamp, flags, theme_item, from, message, NULL);
     // TODO: cross-reference.. this should be replaced by a real event-based system
-    ui_input_nonblocking(TRUE);
+    inp_nonblocking(TRUE);
     g_date_time_unref(timestamp);
 }
 
@@ -944,7 +944,7 @@ win_print_with_receipt(ProfWin *window, const char show_char, int pad_indent, GT
     buffer_push(window->layout->buffer, show_char, pad_indent, time, flags, theme_item, from, message, receipt);
     _win_print(window, show_char, pad_indent, time, flags, theme_item, from, message, receipt);
     // TODO: cross-reference.. this should be replaced by a real event-based system
-    ui_input_nonblocking(TRUE);
+    inp_nonblocking(TRUE);
     g_date_time_unref(time);
 }
 
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index 1cfa9e4e..e335dbff 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -486,7 +486,7 @@ static int
 _unavailable_handler(xmpp_conn_t *const conn,
     xmpp_stanza_t *const stanza, void *const userdata)
 {
-    ui_input_nonblocking(TRUE);
+    inp_nonblocking(TRUE);
 
     const char *jid = xmpp_conn_get_jid(conn);
     char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
@@ -563,7 +563,7 @@ static int
 _available_handler(xmpp_conn_t *const conn,
     xmpp_stanza_t *const stanza, void *const userdata)
 {
-    ui_input_nonblocking(TRUE);
+    inp_nonblocking(TRUE);
 
     // handler still fires if error
     if (g_strcmp0(xmpp_stanza_get_type(stanza), STANZA_TYPE_ERROR) == 0) {
@@ -662,7 +662,7 @@ _send_caps_request(char *node, char *caps_key, char *id, char *from)
 static int
 _muc_user_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata)
 {
-    ui_input_nonblocking(TRUE);
+    inp_nonblocking(TRUE);
 
     char *type = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_TYPE);
     char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index c60746d2..eaba66fc 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -314,9 +314,9 @@ char* inp_readline(void)
     return NULL;
 }
 
-void ui_inp_history_append(char *inp) {}
+void inp_nonblocking(gboolean reset) {}
 
-void ui_input_nonblocking(gboolean reset) {}
+void ui_inp_history_append(char *inp) {}
 
 void ui_invalid_command_usage(const char * const usage, void (*setting_func)(void)) {}
 

From be90e44d4af3d40bea3991e72086da110417352e Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 1 Nov 2015 19:02:09 +0000
Subject: [PATCH 6/6] Tidy ui.h

---
 src/ui/ui.h | 111 +++++++++++++++++++---------------------------------
 1 file changed, 41 insertions(+), 70 deletions(-)

diff --git a/src/ui/ui.h b/src/ui/ui.h
index 0d53ee5e..5ea836c5 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -56,7 +56,7 @@ typedef enum {
     PROF_MSG_PGP
 } prof_enc_t;
 
-// ui startup and control
+// core UI
 void ui_init(void);
 void ui_load_colours(void);
 void ui_update(void);
@@ -66,30 +66,7 @@ void ui_resize(void);
 GSList* ui_get_chat_recipients(void);
 void ui_switch_win(ProfWin *window);
 void ui_sigwinch_handler(int sig);
-
-ProfChatWin* chatwin_new(const char *const barejid);
-void chatwin_incoming_msg(ProfChatWin *chatwin, const char *const resource,  const char *const message, GDateTime *timestamp, gboolean win_created, prof_enc_t enc_mode);
-
-#ifdef HAVE_LIBOTR
-void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted);
-void chatwin_otr_unsecured(ProfChatWin *chatwin);
-void chatwin_otr_trust(ProfChatWin *chatwin);
-void chatwin_otr_untrust(ProfChatWin *chatwin);
-void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, void *data);
-#endif
-
-void chatwin_receipt_received(ProfChatWin *chatwin, const char *const id);
-void chatwin_recipient_gone(ProfChatWin *chatwin);
-void chatwin_outgoing_msg(ProfChatWin *chatwin, const char *const message, char *id, prof_enc_t enc_mode);
-void chatwin_outgoing_carbon(ProfChatWin *chatwin, const char *const message);
-void chatwin_contact_online(ProfChatWin *chatwin, Resource *resource, GDateTime *last_activity);
-void chatwin_contact_offline(ProfChatWin *chatwin, char *resource, char *status);
-
-char* inp_readline(void);
-void inp_nonblocking(gboolean reset);
-
 void ui_handle_otr_error(const char *const barejid, const char *const message);
-
 unsigned long ui_get_idle_time(void);
 void ui_reset_idle_time(void);
 ProfPrivateWin* ui_new_private_win(const char *const fulljid);
@@ -98,34 +75,24 @@ gint ui_unread(void);
 void ui_close_connected_win(int index);
 int ui_close_all_wins(void);
 int ui_close_read_wins(void);
-
-// current window actions
 void ui_current_print_line(const char *const msg, ...);
 void ui_current_print_formatted_line(const char show_char, int attrs, const char *const msg, ...);
 void ui_current_error_line(const char *const msg);
 void ui_win_error_line(ProfWin *window, const char *const msg);
-
 win_type_t ui_win_type(int index);
 void ui_close_win(int index);
 int ui_win_unread(int index);
 char* ui_ask_password(void);
 char* ui_get_line(void);
 char* ui_ask_pgp_passphrase(const char *hint, int prev_fail);
-
 void ui_handle_stanza(const char *const msg);
-
-// ui events
 void ui_contact_online(char *barejid, Resource *resource, GDateTime *last_activity);
 void ui_contact_typing(const char *const barejid, const char *const resource);
 void ui_incoming_private_msg(const char *const fulljid, const char *const message, GDateTime *timestamp);
-
 void ui_disconnected(void);
-
 void ui_outgoing_private_msg(ProfPrivateWin *privwin, const char *const message);
-
 void ui_room_join(const char *const roomjid, gboolean focus);
 void ui_switch_to_room(const char *const roomjid);
-
 void ui_room_role_change(const char *const roomjid, const char *const role, const char *const actor,
     const char *const reason);
 void ui_room_affiliation_change(const char *const roomjid, const char *const affiliation, const char *const actor,
@@ -134,15 +101,14 @@ void ui_room_role_and_affiliation_change(const char *const roomjid, const char *
     const char *const affiliation, const char *const actor, const char *const reason);
 void ui_room_occupant_role_change(const char *const roomjid, const char *const nick, const char *const role,
     const char *const actor, const char *const reason);
-void ui_room_occupant_affiliation_change(const char *const roomjid, const char *const nick, const char *const affiliation,
-    const char *const actor, const char *const reason);
-void ui_room_occupant_role_and_affiliation_change(const char *const roomjid, const char *const nick, const char *const role,
+void ui_room_occupant_affiliation_change(const char *const roomjid, const char *const nick,
     const char *const affiliation, const char *const actor, const char *const reason);
+void ui_room_occupant_role_and_affiliation_change(const char *const roomjid, const char *const nick,
+    const char *const role, const char *const affiliation, const char *const actor, const char *const reason);
 void ui_room_roster(const char *const roomjid, GList *occupants, const char *const presence);
-void ui_room_history(const char *const roomjid, const char *const nick,
-    GDateTime *timestamp, const char *const message);
-void ui_room_message(const char *const roomjid, const char *const nick,
+void ui_room_history(const char *const roomjid, const char *const nick, GDateTime *timestamp,
     const char *const message);
+void ui_room_message(const char *const roomjid, const char *const nick, const char *const message);
 void ui_room_subject(const char *const roomjid, const char *const nick, const char *const subject);
 void ui_room_requires_config(const char *const roomjid);
 void ui_room_destroy(const char *const roomjid);
@@ -160,16 +126,14 @@ void ui_room_banned(const char *const roomjid, const char *const actor, const ch
 void ui_room_member_banned(const char *const roomjid, const char *const nick, const char *const actor,
     const char *const reason);
 void ui_leave_room(const char *const roomjid);
-void ui_room_broadcast(const char *const roomjid,
-    const char *const message);
+void ui_room_broadcast(const char *const roomjid, const char *const message);
 void ui_room_member_offline(const char *const roomjid, const char *const nick);
 void ui_room_member_online(const char *const roomjid, const char *const nick, const char *const roles,
     const char *const affiliation, const char *const show, const char *const status);
-void ui_room_member_nick_change(const char *const roomjid,
-    const char *const old_nick, const char *const nick);
+void ui_room_member_nick_change(const char *const roomjid, const char *const old_nick, const char *const nick);
 void ui_room_nick_change(const char *const roomjid, const char *const nick);
-void ui_room_member_presence(const char *const roomjid,
-    const char *const nick, const char *const show, const char *const status);
+void ui_room_member_presence(const char *const roomjid, const char *const nick, const char *const show,
+    const char *const status);
 void ui_room_update_occupants(const char *const roomjid);
 void ui_room_show_occupants(const char *const roomjid);
 void ui_room_hide_occupants(const char *const roomjid);
@@ -211,35 +175,48 @@ void ui_redraw_all_room_rosters(void);
 void ui_show_all_room_rosters(void);
 void ui_hide_all_room_rosters(void);
 void ui_handle_software_version_error(const char *const roomjid, const char *const message);
-void ui_show_software_version(const char *const jid, const char *const  presence,
-    const char *const name, const char *const version, const char *const os);
-
+void ui_show_software_version(const char *const jid, const char *const  presence, const char *const name,
+    const char *const version, const char *const os);
 gboolean ui_tidy_wins(void);
 void ui_prune_wins(void);
 gboolean ui_swap_wins(int source_win, int target_win);
-
 void ui_clear_win(ProfWin *window);
-
 void ui_auto_away(char *message, gint time, resource_presence_t res_presence);
 void ui_titlebar_presence(contact_presence_t presence);
 void ui_handle_login_account_success(ProfAccount *account, int secured);
-void ui_update_presence(const resource_presence_t resource_presence,
-    const char *const message, const char *const show);
+void ui_update_presence(const resource_presence_t resource_presence, const char *const message, const char *const show);
 void ui_statusbar_new(const int win);
-
 void ui_write(char *line, int offset);
-
 void ui_invalid_command_usage(const char *const cmd, void (*setting_func)(void));
-
 void ui_create_xmlconsole_win(void);
 gboolean ui_xmlconsole_exists(void);
 void ui_open_xmlconsole_win(void);
-
 gboolean ui_win_has_unsaved_form(int num);
-
 void ui_inp_history_append(char *inp);
 
-// console window actions
+// Chat window
+ProfChatWin* chatwin_new(const char *const barejid);
+void chatwin_incoming_msg(ProfChatWin *chatwin, const char *const resource, const char *const message,
+    GDateTime *timestamp, gboolean win_created, prof_enc_t enc_mode);
+void chatwin_receipt_received(ProfChatWin *chatwin, const char *const id);
+void chatwin_recipient_gone(ProfChatWin *chatwin);
+void chatwin_outgoing_msg(ProfChatWin *chatwin, const char *const message, char *id, prof_enc_t enc_mode);
+void chatwin_outgoing_carbon(ProfChatWin *chatwin, const char *const message);
+void chatwin_contact_online(ProfChatWin *chatwin, Resource *resource, GDateTime *last_activity);
+void chatwin_contact_offline(ProfChatWin *chatwin, char *resource, char *status);
+#ifdef HAVE_LIBOTR
+void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted);
+void chatwin_otr_unsecured(ProfChatWin *chatwin);
+void chatwin_otr_trust(ProfChatWin *chatwin);
+void chatwin_otr_untrust(ProfChatWin *chatwin);
+void chatwin_otr_smp_event(ProfChatWin *chatwin, prof_otr_smp_event_t event, void *data);
+#endif
+
+// Input window
+char* inp_readline(void);
+void inp_nonblocking(gboolean reset);
+
+// Console window
 void cons_show(const char *const msg, ...);
 void cons_show_padded(int pad, const char *const msg, ...);
 void cons_about(void);
@@ -273,16 +250,14 @@ void cons_show_scripts(GSList *scripts);
 void cons_show_script(const char *const script, GSList *commands);
 void cons_show_aliases(GList *aliases);
 void cons_show_login_success(ProfAccount *account, int secured);
-void cons_show_software_version(const char *const jid,
-    const char *const presence, const char *const name,
+void cons_show_software_version(const char *const jid, const char *const presence, const char *const name,
     const char *const version, const char *const os);
 void cons_show_account_list(gchar **accounts);
 void cons_show_room_list(GSList *room, const char *const conference_node);
 void cons_show_bookmarks(const GList *list);
 void cons_show_disco_items(GSList *items, const char *const jid);
 void cons_show_disco_info(const char *from, GSList *identities, GSList *features);
-void cons_show_room_invite(const char *const invitor, const char *const room,
-    const char *const reason);
+void cons_show_room_invite(const char *const invitor, const char *const room, const char *const reason);
 void cons_check_version(gboolean not_available_msg);
 void cons_show_typing(const char *const barejid);
 void cons_show_incoming_message(const char *const short_from, const int win_index);
@@ -348,7 +323,6 @@ ProfWin* win_create_chat(const char *const barejid);
 ProfWin* win_create_muc(const char *const roomjid);
 ProfWin* win_create_muc_config(const char *const title, DataForm *form);
 ProfWin* win_create_private(const char *const fulljid);
-
 void win_update_virtual(ProfWin *window);
 void win_free(ProfWin *window);
 int win_unread(ProfWin *window);
@@ -367,17 +341,14 @@ void win_show_info(ProfWin *window, PContact contact);
 void win_println(ProfWin *window, int pad, const char *const message);
 void win_vprintln_ch(ProfWin *window, char ch, const char *const message, ...);
 
-// desktop notifier actions
+// desktop notifications
 void notifier_initialise(void);
 void notifier_uninit(void);
-
 void notify_typing(const char *const handle);
 void notify_message(ProfWin *window, const char *const name, const char *const text);
-void notify_room_message(const char *const handle, const char *const room,
-    int win, const char *const text);
+void notify_room_message(const char *const handle, const char *const room, int win, const char *const text);
 void notify_remind(void);
-void notify_invite(const char *const from, const char *const room,
-    const char *const reason);
+void notify_invite(const char *const from, const char *const room, const char *const reason);
 void notify_subscription(const char *const from);
 
 #endif