From 38ed9188d30b5968fc6b311597e82d8648b73819 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 15 Jun 2015 19:26:28 +0100 Subject: Moved ui/windows -> window_list --- Makefile.am | 4 +- src/command/command.c | 2 +- src/command/commands.c | 2 +- src/event/client_events.c | 2 +- src/event/ui_events.c | 4 +- src/muc.c | 4 +- src/profanity.c | 2 +- src/ui/console.c | 2 +- src/ui/core.c | 2 +- src/ui/inputwin.c | 2 +- src/ui/notifier.c | 2 +- src/ui/occupantswin.c | 4 +- src/ui/rosterwin.c | 4 +- src/ui/titlebar.c | 2 +- src/ui/windows.c | 810 ---------------------------------------------- src/ui/windows.h | 85 ----- src/window_list.c | 810 ++++++++++++++++++++++++++++++++++++++++++++++ src/window_list.h | 85 +++++ 18 files changed, 914 insertions(+), 914 deletions(-) delete mode 100644 src/ui/windows.c delete mode 100644 src/ui/windows.h create mode 100644 src/window_list.c create mode 100644 src/window_list.h diff --git a/Makefile.am b/Makefile.am index ef1477f3..987a4784 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ core_sources = \ src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \ src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ src/ui/console.c src/ui/notifier.c \ - src/ui/windows.c src/ui/windows.h \ + src/window_list.c src/window_list.h \ src/ui/rosterwin.c src/ui/occupantswin.c \ src/ui/buffer.c src/ui/buffer.h \ src/command/command.h src/command/command.c \ @@ -57,7 +57,7 @@ unittest_sources = \ src/config/account.c src/config/account.h \ src/config/preferences.c src/config/preferences.h \ src/config/theme.c src/config/theme.h \ - src/ui/windows.c src/ui/windows.h \ + src/window_list.c src/window_list.h \ src/ui/window.c src/ui/window.h \ src/ui/buffer.c \ src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \ diff --git a/src/command/command.c b/src/command/command.c index c62c7784..00223b29 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -66,7 +66,7 @@ #include "xmpp/xmpp.h" #include "xmpp/bookmark.h" #include "ui/ui.h" -#include "ui/windows.h" +#include "window_list.h" typedef char*(*autocompleter)(char*, int*); diff --git a/src/command/commands.c b/src/command/commands.c index 28cba7d7..e439c198 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -64,7 +64,7 @@ #include "xmpp/xmpp.h" #include "xmpp/bookmark.h" #include "ui/ui.h" -#include "ui/windows.h" +#include "window_list.h" #include "event/client_events.h" #include "event/ui_events.h" diff --git a/src/event/client_events.c b/src/event/client_events.c index 8f8501e1..7936a446 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -37,7 +37,7 @@ #include "config.h" #include "log.h" #include "ui/ui.h" -#include "ui/windows.h" +#include "window_list.h" #include "xmpp/xmpp.h" #ifdef HAVE_LIBOTR #include "otr/otr.h" diff --git a/src/event/ui_events.c b/src/event/ui_events.c index ff1d7273..11296739 100644 --- a/src/event/ui_events.c +++ b/src/event/ui_events.c @@ -33,7 +33,7 @@ */ #include "ui/ui.h" -#include "ui/windows.h" +#include "window_list.h" void ui_ev_focus_win(ProfWin *win) @@ -53,4 +53,4 @@ ProfPrivateWin* ui_ev_new_private_win(const char * const fulljid) { return ui_new_private_win(fulljid); -} \ No newline at end of file +} diff --git a/src/muc.c b/src/muc.c index d283b55e..8110f9a5 100644 --- a/src/muc.c +++ b/src/muc.c @@ -42,7 +42,7 @@ #include "jid.h" #include "tools/autocomplete.h" #include "ui/ui.h" -#include "ui/windows.h" +#include "window_list.h" #include "muc.h" typedef struct _muc_room_t { @@ -978,4 +978,4 @@ _occupant_free(Occupant *occupant) free(occupant); occupant = NULL; } -} \ No newline at end of file +} diff --git a/src/profanity.c b/src/profanity.c index 0908c658..e2372548 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -62,7 +62,7 @@ #include "resource.h" #include "xmpp/xmpp.h" #include "ui/ui.h" -#include "ui/windows.h" +#include "window_list.h" #include "event/client_events.h" static void _check_autoaway(void); diff --git a/src/ui/console.c b/src/ui/console.c index 1fa8b7b1..5f6b1ef0 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -50,7 +50,7 @@ #include "config/preferences.h" #include "config/theme.h" #include "ui/window.h" -#include "ui/windows.h" +#include "window_list.h" #include "ui/ui.h" #include "ui/statusbar.h" #include "xmpp/xmpp.h" diff --git a/src/ui/core.c b/src/ui/core.c index e2efcb55..78a5e026 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -72,7 +72,7 @@ #include "ui/statusbar.h" #include "ui/inputwin.h" #include "ui/window.h" -#include "ui/windows.h" +#include "window_list.h" #include "xmpp/xmpp.h" #include "event/ui_events.h" diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c index 6ef829a7..1cbf5249 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -62,7 +62,7 @@ #include "ui/ui.h" #include "ui/statusbar.h" #include "ui/inputwin.h" -#include "ui/windows.h" +#include "window_list.h" #include "event/ui_events.h" #include "xmpp/xmpp.h" diff --git a/src/ui/notifier.c b/src/ui/notifier.c index 76290daf..12367190 100644 --- a/src/ui/notifier.c +++ b/src/ui/notifier.c @@ -48,7 +48,7 @@ #include "log.h" #include "muc.h" #include "ui/ui.h" -#include "ui/windows.h" +#include "window_list.h" #include "config/preferences.h" static void _notify(const char * const message, int timeout, const char * const category); diff --git a/src/ui/occupantswin.c b/src/ui/occupantswin.c index bba9d0b9..fe4a600c 100644 --- a/src/ui/occupantswin.c +++ b/src/ui/occupantswin.c @@ -36,7 +36,7 @@ #include "ui/ui.h" #include "ui/window.h" -#include "ui/windows.h" +#include "window_list.h" #include "config/preferences.h" static void @@ -124,4 +124,4 @@ occupantswin_occupants(const char * const roomjid) g_list_free(occupants); } -} \ No newline at end of file +} diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c index 763490c3..00bc28a4 100644 --- a/src/ui/rosterwin.c +++ b/src/ui/rosterwin.c @@ -38,7 +38,7 @@ #include "contact.h" #include "ui/ui.h" #include "ui/window.h" -#include "ui/windows.h" +#include "window_list.h" #include "config/preferences.h" #include "roster_list.h" @@ -192,4 +192,4 @@ rosterwin_roster(void) } free(by); } -} \ No newline at end of file +} diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c index 55710c7a..746d2782 100644 --- a/src/ui/titlebar.c +++ b/src/ui/titlebar.c @@ -44,7 +44,7 @@ #include "ui/ui.h" #include "ui/titlebar.h" #include "ui/inputwin.h" -#include "ui/windows.h" +#include "window_list.h" #include "ui/window.h" #include "roster_list.h" #include "chat_session.h" diff --git a/src/ui/windows.c b/src/ui/windows.c deleted file mode 100644 index 6472ce0c..00000000 --- a/src/ui/windows.c +++ /dev/null @@ -1,810 +0,0 @@ -/* - * windows.c - * - * Copyright (C) 2012 - 2015 James Booth - * - * This file is part of Profanity. - * - * Profanity is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Profanity is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Profanity. If not, see . - * - * In addition, as a special exception, the copyright holders give permission to - * link the code of portions of this program with the OpenSSL library under - * certain conditions as described in each individual source file, and - * distribute linked combinations including the two. - * - * You must obey the GNU General Public License in all respects for all of the - * code used other than OpenSSL. If you modify file(s) with this exception, you - * may extend this exception to your version of the file(s), but you are not - * obligated to do so. If you do not wish to do so, delete this exception - * statement from your version. If you delete this exception statement from all - * source files in the program, then also delete it here. - * - */ - -#include "config.h" - -#include -#include -#include - -#include - -#include "common.h" -#include "roster_list.h" -#include "config/theme.h" -#include "ui/ui.h" -#include "ui/statusbar.h" -#include "ui/window.h" -#include "ui/windows.h" -#include "event/ui_events.h" - -static GHashTable *windows; -static int current; - -void -wins_init(void) -{ - windows = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, - (GDestroyNotify)win_free); - - ProfWin *console = win_create_console(); - g_hash_table_insert(windows, GINT_TO_POINTER(1), console); - - current = 1; -} - -ProfWin * -wins_get_console(void) -{ - return g_hash_table_lookup(windows, GINT_TO_POINTER(1)); -} - -ProfChatWin * -wins_get_chat(const char * const barejid) -{ - GList *values = g_hash_table_get_values(windows); - GList *curr = values; - - while (curr) { - ProfWin *window = curr->data; - if (window->type == WIN_CHAT) { - ProfChatWin *chatwin = (ProfChatWin*)window; - if (g_strcmp0(chatwin->barejid, barejid) == 0) { - g_list_free(values); - return chatwin; - } - } - curr = g_list_next(curr); - } - - g_list_free(values); - return NULL; -} - -ProfMucConfWin * -wins_get_muc_conf(const char * const roomjid) -{ - GList *values = g_hash_table_get_values(windows); - GList *curr = values; - - while (curr) { - ProfWin *window = curr->data; - if (window->type == WIN_MUC_CONFIG) { - ProfMucConfWin *confwin = (ProfMucConfWin*)window; - if (g_strcmp0(confwin->roomjid, roomjid) == 0) { - g_list_free(values); - return confwin; - } - } - curr = g_list_next(curr); - } - - g_list_free(values); - return NULL; -} - -ProfMucWin * -wins_get_muc(const char * const roomjid) -{ - GList *values = g_hash_table_get_values(windows); - GList *curr = values; - - while (curr) { - ProfWin *window = curr->data; - if (window->type == WIN_MUC) { - ProfMucWin *mucwin = (ProfMucWin*)window; - if (g_strcmp0(mucwin->roomjid, roomjid) == 0) { - g_list_free(values); - return mucwin; - } - } - curr = g_list_next(curr); - } - - g_list_free(values); - return NULL; -} - -ProfPrivateWin * -wins_get_private(const char * const fulljid) -{ - GList *values = g_hash_table_get_values(windows); - GList *curr = values; - - while (curr) { - ProfWin *window = curr->data; - if (window->type == WIN_PRIVATE) { - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; - if (g_strcmp0(privatewin->fulljid, fulljid) == 0) { - g_list_free(values); - return privatewin; - } - } - curr = g_list_next(curr); - } - - g_list_free(values); - return NULL; -} - -ProfWin * -wins_get_current(void) -{ - if (windows) { - return g_hash_table_lookup(windows, GINT_TO_POINTER(current)); - } else { - return NULL; - } -} - -ProfChatWin * -wins_get_current_chat(void) -{ - if (windows) { - ProfWin *window = g_hash_table_lookup(windows, GINT_TO_POINTER(current)); - if (window) { - ProfChatWin *chatwin = (ProfChatWin*)window; - assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); - return chatwin; - } else { - return NULL; - } - } else { - return NULL; - } -} - -ProfMucWin * -wins_get_current_muc(void) -{ - if (windows) { - ProfWin *window = g_hash_table_lookup(windows, GINT_TO_POINTER(current)); - if (window) { - ProfMucWin *mucwin = (ProfMucWin*)window; - assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - return mucwin; - } else { - return NULL; - } - } else { - return NULL; - } -} - -ProfPrivateWin * -wins_get_current_private(void) -{ - if (windows) { - ProfWin *window = g_hash_table_lookup(windows, GINT_TO_POINTER(current)); - if (window) { - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; - assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); - return privatewin; - } else { - return NULL; - } - } else { - return NULL; - } -} - -ProfMucConfWin * -wins_get_current_muc_conf(void) -{ - if (windows) { - ProfWin *window = g_hash_table_lookup(windows, GINT_TO_POINTER(current)); - if (window) { - ProfMucConfWin *confwin = (ProfMucConfWin*)window; - assert(confwin->memcheck == PROFCONFWIN_MEMCHECK); - return confwin; - } else { - return NULL; - } - } else { - return NULL; - } -} - -GList * -wins_get_nums(void) -{ - return g_hash_table_get_keys(windows); -} - -void -wins_set_current_by_num(int i) -{ - ProfWin *window = g_hash_table_lookup(windows, GINT_TO_POINTER(i)); - if (window) { - current = i; - if (window->type == WIN_CHAT) { - ProfChatWin *chatwin = (ProfChatWin*) window; - assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); - chatwin->unread = 0; - } else if (window->type == WIN_MUC) { - ProfMucWin *mucwin = (ProfMucWin*) window; - assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - mucwin->unread = 0; - } else if (window->type == WIN_PRIVATE) { - ProfPrivateWin *privatewin = (ProfPrivateWin*) window; - privatewin->unread = 0; - } - } -} - -ProfWin * -wins_get_by_num(int i) -{ - return g_hash_table_lookup(windows, GINT_TO_POINTER(i)); -} - -ProfWin * -wins_get_next(void) -{ - // get and sort win nums - GList *keys = g_hash_table_get_keys(windows); - keys = g_list_sort(keys, cmp_win_num); - GList *curr = keys; - - // find our place in the list - while (curr) { - if (current == GPOINTER_TO_INT(curr->data)) { - break; - } - curr = g_list_next(curr); - } - - // if there is a next window return it - curr = g_list_next(curr); - if (curr) { - int next = GPOINTER_TO_INT(curr->data); - g_list_free(keys); - return wins_get_by_num(next); - // otherwise return the first window (console) - } else { - g_list_free(keys); - return wins_get_console(); - } -} - -ProfWin * -wins_get_previous(void) -{ - // get and sort win nums - GList *keys = g_hash_table_get_keys(windows); - keys = g_list_sort(keys, cmp_win_num); - GList *curr = keys; - - // find our place in the list - while (curr) { - if (current == GPOINTER_TO_INT(curr->data)) { - break; - } - curr = g_list_next(curr); - } - - // if there is a previous window return it - curr = g_list_previous(curr); - if (curr) { - int previous = GPOINTER_TO_INT(curr->data); - g_list_free(keys); - return wins_get_by_num(previous); - // otherwise return the last window - } else { - int new_num = GPOINTER_TO_INT(g_list_last(keys)->data); - g_list_free(keys); - return wins_get_by_num(new_num); - } -} - -int -wins_get_num(ProfWin *window) -{ - GList *keys = g_hash_table_get_keys(windows); - GList *curr = keys; - - while (curr) { - gconstpointer num_p = curr->data; - ProfWin *curr_win = g_hash_table_lookup(windows, num_p); - if (curr_win == window) { - g_list_free(keys); - return GPOINTER_TO_INT(num_p); - } - curr = g_list_next(curr); - } - - g_list_free(keys); - return -1; -} - -int -wins_get_current_num(void) -{ - return current; -} - -void -wins_close_current(void) -{ - wins_close_by_num(current); -} - -void -wins_close_by_num(int i) -{ - // console cannot be closed - if (i != 1) { - - // go to console if closing current window - if (i == current) { - current = 1; - ProfWin *window = wins_get_current(); - win_update_virtual(window); - } - - g_hash_table_remove(windows, GINT_TO_POINTER(i)); - status_bar_inactive(i); - } -} - -gboolean -wins_is_current(ProfWin *window) -{ - ProfWin *current_window = wins_get_current(); - - if (current_window == window) { - return TRUE; - } else { - return FALSE; - } -} - -ProfWin * -wins_new_xmlconsole(void) -{ - GList *keys = g_hash_table_get_keys(windows); - int result = get_next_available_win_num(keys); - g_list_free(keys); - ProfWin *newwin = win_create_xmlconsole(); - g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin); - return newwin; -} - -ProfWin * -wins_new_chat(const char * const barejid) -{ - GList *keys = g_hash_table_get_keys(windows); - int result = get_next_available_win_num(keys); - g_list_free(keys); - ProfWin *newwin = win_create_chat(barejid); - g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin); - return newwin; -} - -ProfWin * -wins_new_muc(const char * const roomjid) -{ - GList *keys = g_hash_table_get_keys(windows); - int result = get_next_available_win_num(keys); - g_list_free(keys); - ProfWin *newwin = win_create_muc(roomjid); - g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin); - return newwin; -} - -ProfWin * -wins_new_muc_config(const char * const roomjid, DataForm *form) -{ - GList *keys = g_hash_table_get_keys(windows); - int result = get_next_available_win_num(keys); - g_list_free(keys); - ProfWin *newwin = win_create_muc_config(roomjid, form); - g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin); - return newwin; -} - -ProfWin * -wins_new_private(const char * const fulljid) -{ - GList *keys = g_hash_table_get_keys(windows); - int result = get_next_available_win_num(keys); - g_list_free(keys); - ProfWin *newwin = win_create_private(fulljid); - g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin); - return newwin; -} - -int -wins_get_total_unread(void) -{ - int result = 0; - GList *values = g_hash_table_get_values(windows); - GList *curr = values; - - while (curr) { - ProfWin *window = curr->data; - result += win_unread(window); - curr = g_list_next(curr); - } - g_list_free(values); - return result; -} - -void -wins_resize_all(void) -{ - GList *values = g_hash_table_get_values(windows); - GList *curr = values; - while (curr) { - ProfWin *window = curr->data; - win_resize(window); - curr = g_list_next(curr); - } - g_list_free(values); - - ProfWin *current_win = wins_get_current(); - win_update_virtual(current_win); -} - -void -wins_hide_subwin(ProfWin *window) -{ - win_hide_subwin(window); - - ProfWin *current_win = wins_get_current(); - win_refresh_without_subwin(current_win); -} - -void -wins_show_subwin(ProfWin *window) -{ - win_show_subwin(window); - - ProfWin *current_win = wins_get_current(); - win_refresh_with_subwin(current_win); -} - -ProfXMLWin * -wins_get_xmlconsole(void) -{ - GList *values = g_hash_table_get_values(windows); - GList *curr = values; - - while (curr) { - ProfWin *window = curr->data; - if (window->type == WIN_XML) { - ProfXMLWin *xmlwin = (ProfXMLWin*)window; - assert(xmlwin->memcheck == PROFXMLWIN_MEMCHECK); - g_list_free(values); - return xmlwin; - } - curr = g_list_next(curr); - } - - g_list_free(values); - return NULL; -} - -GSList * -wins_get_chat_recipients(void) -{ - GSList *result = NULL; - GList *values = g_hash_table_get_values(windows); - GList *curr = values; - - while (curr) { - ProfWin *window = curr->data; - if (window->type == WIN_CHAT) { - ProfChatWin *chatwin = (ProfChatWin*)window; - result = g_slist_append(result, chatwin->barejid); - } - curr = g_list_next(curr); - } - g_list_free(values); - return result; -} - -GSList * -wins_get_prune_wins(void) -{ - GSList *result = NULL; - GList *values = g_hash_table_get_values(windows); - GList *curr = values; - - while (curr) { - ProfWin *window = curr->data; - if (win_unread(window) == 0 && - window->type != WIN_MUC && - window->type != WIN_MUC_CONFIG && - window->type != WIN_XML && - window->type != WIN_CONSOLE) { - result = g_slist_append(result, window); - } - curr = g_list_next(curr); - } - g_list_free(values); - return result; -} - -void -wins_lost_connection(void) -{ - GList *values = g_hash_table_get_values(windows); - GList *curr = values; - - while (curr) { - ProfWin *window = curr->data; - if (window->type != WIN_CONSOLE) { - win_print(window, '-', NULL, 0, THEME_ERROR, "", "Lost connection."); - - // if current win, set current_win_dirty - if (wins_is_current(window)) { - win_update_virtual(window); - } - } - curr = g_list_next(curr); - } - g_list_free(values); -} - -gboolean -wins_swap(int source_win, int target_win) -{ - ProfWin *source = g_hash_table_lookup(windows, GINT_TO_POINTER(source_win)); - ProfWin *console = wins_get_console(); - - if (source) { - ProfWin *target = g_hash_table_lookup(windows, GINT_TO_POINTER(target_win)); - - // target window empty - if (!target) { - g_hash_table_steal(windows, GINT_TO_POINTER(source_win)); - g_hash_table_insert(windows, GINT_TO_POINTER(target_win), source); - status_bar_inactive(source_win); - if (win_unread(source) > 0) { - status_bar_new(target_win); - } else { - status_bar_active(target_win); - } - if (wins_get_current_num() == source_win) { - wins_set_current_by_num(target_win); - ui_ev_focus_win(console); - } - return TRUE; - - // target window occupied - } else { - g_hash_table_steal(windows, GINT_TO_POINTER(source_win)); - g_hash_table_steal(windows, GINT_TO_POINTER(target_win)); - g_hash_table_insert(windows, GINT_TO_POINTER(source_win), target); - g_hash_table_insert(windows, GINT_TO_POINTER(target_win), source); - if (win_unread(source) > 0) { - status_bar_new(target_win); - } else { - status_bar_active(target_win); - } - if (win_unread(target) > 0) { - status_bar_new(source_win); - } else { - status_bar_active(source_win); - } - if ((wins_get_current_num() == source_win) || (wins_get_current_num() == target_win)) { - ui_ev_focus_win(console); - } - return TRUE; - } - } else { - return FALSE; - } -} - -gboolean -wins_tidy(void) -{ - gboolean tidy_required = FALSE; - // check for gaps - GList *keys = g_hash_table_get_keys(windows); - keys = g_list_sort(keys, cmp_win_num); - - // get last used - GList *last = g_list_last(keys); - int last_num = GPOINTER_TO_INT(last->data); - - // find first free num TODO - Will sort again - int next_available = get_next_available_win_num(keys); - - // found gap (next available before last window) - if (cmp_win_num(GINT_TO_POINTER(next_available), GINT_TO_POINTER(last_num)) < 0) { - tidy_required = TRUE; - } - - if (tidy_required) { - status_bar_set_all_inactive(); - GHashTable *new_windows = g_hash_table_new_full(g_direct_hash, - g_direct_equal, NULL, (GDestroyNotify)win_free); - - int num = 1; - GList *curr = keys; - while (curr) { - ProfWin *window = g_hash_table_lookup(windows, curr->data); - if (num == 10) { - g_hash_table_insert(new_windows, GINT_TO_POINTER(0), window); - if (win_unread(window) > 0) { - status_bar_new(0); - } else { - status_bar_active(0); - } - } else { - g_hash_table_insert(new_windows, GINT_TO_POINTER(num), window); - if (win_unread(window) > 0) { - status_bar_new(num); - } else { - status_bar_active(num); - } - } - num++; - curr = g_list_next(curr); - } - - windows = new_windows; - current = 1; - ProfWin *console = wins_get_console(); - ui_ev_focus_win(console); - g_list_free(keys); - return TRUE; - } else { - g_list_free(keys); - return FALSE; - } -} - -GSList * -wins_create_summary(void) -{ - GSList *result = NULL; - - GList *keys = g_hash_table_get_keys(windows); - keys = g_list_sort(keys, cmp_win_num); - GList *curr = keys; - - while (curr) { - ProfWin *window = g_hash_table_lookup(windows, curr->data); - int ui_index = GPOINTER_TO_INT(curr->data); - - GString *chat_string; - GString *priv_string; - GString *muc_string; - GString *muc_config_string; - GString *xml_string; - - switch (window->type) - { - case WIN_CONSOLE: - result = g_slist_append(result, strdup("1: Console")); - break; - case WIN_CHAT: - chat_string = g_string_new(""); - - ProfChatWin *chatwin = (ProfChatWin*)window; - PContact contact = roster_get_contact(chatwin->barejid); - if (contact == NULL) { - g_string_printf(chat_string, "%d: Chat %s", ui_index, chatwin->barejid); - } else { - const char *display_name = p_contact_name_or_jid(contact); - g_string_printf(chat_string, "%d: Chat %s", ui_index, display_name); - GString *chat_presence = g_string_new(""); - g_string_printf(chat_presence, " - %s", p_contact_presence(contact)); - g_string_append(chat_string, chat_presence->str); - g_string_free(chat_presence, TRUE); - } - - if (chatwin->unread > 0) { - GString *chat_unread = g_string_new(""); - g_string_printf(chat_unread, ", %d unread", chatwin->unread); - g_string_append(chat_string, chat_unread->str); - g_string_free(chat_unread, TRUE); - } - - result = g_slist_append(result, strdup(chat_string->str)); - g_string_free(chat_string, TRUE); - - break; - - case WIN_PRIVATE: - priv_string = g_string_new(""); - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; - g_string_printf(priv_string, "%d: Private %s", ui_index, privatewin->fulljid); - - if (privatewin->unread > 0) { - GString *priv_unread = g_string_new(""); - g_string_printf(priv_unread, ", %d unread", privatewin->unread); - g_string_append(priv_string, priv_unread->str); - g_string_free(priv_unread, TRUE); - } - - result = g_slist_append(result, strdup(priv_string->str)); - g_string_free(priv_string, TRUE); - - break; - - case WIN_MUC: - muc_string = g_string_new(""); - ProfMucWin *mucwin = (ProfMucWin*)window; - g_string_printf(muc_string, "%d: Room %s", ui_index, mucwin->roomjid); - - if (mucwin->unread > 0) { - GString *muc_unread = g_string_new(""); - g_string_printf(muc_unread, ", %d unread", mucwin->unread); - g_string_append(muc_string, muc_unread->str); - g_string_free(muc_unread, TRUE); - } - - result = g_slist_append(result, strdup(muc_string->str)); - g_string_free(muc_string, TRUE); - - break; - - case WIN_MUC_CONFIG: - muc_config_string = g_string_new(""); - char *title = win_get_title(window); - g_string_printf(muc_config_string, "%d: %s", ui_index, title); - result = g_slist_append(result, strdup(muc_config_string->str)); - g_string_free(muc_config_string, TRUE); - free(title); - - break; - - case WIN_XML: - xml_string = g_string_new(""); - g_string_printf(xml_string, "%d: XML console", ui_index); - result = g_slist_append(result, strdup(xml_string->str)); - g_string_free(xml_string, TRUE); - - break; - - default: - break; - } - curr = g_list_next(curr); - } - - g_list_free(keys); - return result; -} - -void -wins_destroy(void) -{ - g_hash_table_destroy(windows); -} diff --git a/src/ui/windows.h b/src/ui/windows.h deleted file mode 100644 index 4c753c03..00000000 --- a/src/ui/windows.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * windows.h - * - * Copyright (C) 2012 - 2015 James Booth - * - * This file is part of Profanity. - * - * Profanity is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Profanity is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Profanity. If not, see . - * - * In addition, as a special exception, the copyright holders give permission to - * link the code of portions of this program with the OpenSSL library under - * certain conditions as described in each individual source file, and - * distribute linked combinations including the two. - * - * You must obey the GNU General Public License in all respects for all of the - * code used other than OpenSSL. If you modify file(s) with this exception, you - * may extend this exception to your version of the file(s), but you are not - * obligated to do so. If you do not wish to do so, delete this exception - * statement from your version. If you delete this exception statement from all - * source files in the program, then also delete it here. - * - */ - -#ifndef UI_WINDOWS_H -#define UI_WINDOWS_H - -#include "ui/window.h" - -void wins_init(void); - -ProfWin * wins_new_xmlconsole(void); -ProfWin * wins_new_chat(const char * const barejid); -ProfWin * wins_new_muc(const char * const roomjid); -ProfWin * wins_new_muc_config(const char * const roomjid, DataForm *form); -ProfWin * wins_new_private(const char * const fulljid); - -ProfWin * wins_get_console(void); -ProfChatWin *wins_get_chat(const char * const barejid); -ProfMucWin * wins_get_muc(const char * const roomjid); -ProfMucConfWin * wins_get_muc_conf(const char * const roomjid); -ProfPrivateWin *wins_get_private(const char * const fulljid); -ProfXMLWin * wins_get_xmlconsole(void); - -ProfWin * wins_get_current(void); -ProfChatWin * wins_get_current_chat(void); -ProfMucWin * wins_get_current_muc(void); -ProfPrivateWin * wins_get_current_private(void); -ProfMucConfWin * wins_get_current_muc_conf(void); - -void wins_set_current_by_num(int i); - -ProfWin * wins_get_by_num(int i); - -ProfWin * wins_get_next(void); -ProfWin * wins_get_previous(void); -int wins_get_num(ProfWin *window); -int wins_get_current_num(void); -void wins_close_current(void); -void wins_close_by_num(int i); -gboolean wins_is_current(ProfWin *window); -int wins_get_total_unread(void); -void wins_resize_all(void); -GSList * wins_get_chat_recipients(void); -GSList * wins_get_prune_wins(void); -void wins_lost_connection(void); -gboolean wins_tidy(void); -GSList * wins_create_summary(void); -void wins_destroy(void); -GList * wins_get_nums(void); -gboolean wins_swap(int source_win, int target_win); -void wins_hide_subwin(ProfWin *window); -void wins_show_subwin(ProfWin *window); - -#endif diff --git a/src/window_list.c b/src/window_list.c new file mode 100644 index 00000000..40bc30e2 --- /dev/null +++ b/src/window_list.c @@ -0,0 +1,810 @@ +/* + * window_list.c + * + * Copyright (C) 2012 - 2015 James Booth + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see . + * + * In addition, as a special exception, the copyright holders give permission to + * link the code of portions of this program with the OpenSSL library under + * certain conditions as described in each individual source file, and + * distribute linked combinations including the two. + * + * You must obey the GNU General Public License in all respects for all of the + * code used other than OpenSSL. If you modify file(s) with this exception, you + * may extend this exception to your version of the file(s), but you are not + * obligated to do so. If you do not wish to do so, delete this exception + * statement from your version. If you delete this exception statement from all + * source files in the program, then also delete it here. + * + */ + +#include "config.h" + +#include +#include +#include + +#include + +#include "common.h" +#include "roster_list.h" +#include "config/theme.h" +#include "ui/ui.h" +#include "ui/statusbar.h" +#include "ui/window.h" +#include "window_list.h" +#include "event/ui_events.h" + +static GHashTable *windows; +static int current; + +void +wins_init(void) +{ + windows = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, + (GDestroyNotify)win_free); + + ProfWin *console = win_create_console(); + g_hash_table_insert(windows, GINT_TO_POINTER(1), console); + + current = 1; +} + +ProfWin * +wins_get_console(void) +{ + return g_hash_table_lookup(windows, GINT_TO_POINTER(1)); +} + +ProfChatWin * +wins_get_chat(const char * const barejid) +{ + GList *values = g_hash_table_get_values(windows); + GList *curr = values; + + while (curr) { + ProfWin *window = curr->data; + if (window->type == WIN_CHAT) { + ProfChatWin *chatwin = (ProfChatWin*)window; + if (g_strcmp0(chatwin->barejid, barejid) == 0) { + g_list_free(values); + return chatwin; + } + } + curr = g_list_next(curr); + } + + g_list_free(values); + return NULL; +} + +ProfMucConfWin * +wins_get_muc_conf(const char * const roomjid) +{ + GList *values = g_hash_table_get_values(windows); + GList *curr = values; + + while (curr) { + ProfWin *window = curr->data; + if (window->type == WIN_MUC_CONFIG) { + ProfMucConfWin *confwin = (ProfMucConfWin*)window; + if (g_strcmp0(confwin->roomjid, roomjid) == 0) { + g_list_free(values); + return confwin; + } + } + curr = g_list_next(curr); + } + + g_list_free(values); + return NULL; +} + +ProfMucWin * +wins_get_muc(const char * const roomjid) +{ + GList *values = g_hash_table_get_values(windows); + GList *curr = values; + + while (curr) { + ProfWin *window = curr->data; + if (window->type == WIN_MUC) { + ProfMucWin *mucwin = (ProfMucWin*)window; + if (g_strcmp0(mucwin->roomjid, roomjid) == 0) { + g_list_free(values); + return mucwin; + } + } + curr = g_list_next(curr); + } + + g_list_free(values); + return NULL; +} + +ProfPrivateWin * +wins_get_private(const char * const fulljid) +{ + GList *values = g_hash_table_get_values(windows); + GList *curr = values; + + while (curr) { + ProfWin *window = curr->data; + if (window->type == WIN_PRIVATE) { + ProfPrivateWin *privatewin = (ProfPrivateWin*)window; + if (g_strcmp0(privatewin->fulljid, fulljid) == 0) { + g_list_free(values); + return privatewin; + } + } + curr = g_list_next(curr); + } + + g_list_free(values); + return NULL; +} + +ProfWin * +wins_get_current(void) +{ + if (windows) { + return g_hash_table_lookup(windows, GINT_TO_POINTER(current)); + } else { + return NULL; + } +} + +ProfChatWin * +wins_get_current_chat(void) +{ + if (windows) { + ProfWin *window = g_hash_table_lookup(windows, GINT_TO_POINTER(current)); + if (window) { + ProfChatWin *chatwin = (ProfChatWin*)window; + assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); + return chatwin; + } else { + return NULL; + } + } else { + return NULL; + } +} + +ProfMucWin * +wins_get_current_muc(void) +{ + if (windows) { + ProfWin *window = g_hash_table_lookup(windows, GINT_TO_POINTER(current)); + if (window) { + ProfMucWin *mucwin = (ProfMucWin*)window; + assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); + return mucwin; + } else { + return NULL; + } + } else { + return NULL; + } +} + +ProfPrivateWin * +wins_get_current_private(void) +{ + if (windows) { + ProfWin *window = g_hash_table_lookup(windows, GINT_TO_POINTER(current)); + if (window) { + ProfPrivateWin *privatewin = (ProfPrivateWin*)window; + assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); + return privatewin; + } else { + return NULL; + } + } else { + return NULL; + } +} + +ProfMucConfWin * +wins_get_current_muc_conf(void) +{ + if (windows) { + ProfWin *window = g_hash_table_lookup(windows, GINT_TO_POINTER(current)); + if (window) { + ProfMucConfWin *confwin = (ProfMucConfWin*)window; + assert(confwin->memcheck == PROFCONFWIN_MEMCHECK); + return confwin; + } else { + return NULL; + } + } else { + return NULL; + } +} + +GList * +wins_get_nums(void) +{ + return g_hash_table_get_keys(windows); +} + +void +wins_set_current_by_num(int i) +{ + ProfWin *window = g_hash_table_lookup(windows, GINT_TO_POINTER(i)); + if (window) { + current = i; + if (window->type == WIN_CHAT) { + ProfChatWin *chatwin = (ProfChatWin*) window; + assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); + chatwin->unread = 0; + } else if (window->type == WIN_MUC) { + ProfMucWin *mucwin = (ProfMucWin*) window; + assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); + mucwin->unread = 0; + } else if (window->type == WIN_PRIVATE) { + ProfPrivateWin *privatewin = (ProfPrivateWin*) window; + privatewin->unread = 0; + } + } +} + +ProfWin * +wins_get_by_num(int i) +{ + return g_hash_table_lookup(windows, GINT_TO_POINTER(i)); +} + +ProfWin * +wins_get_next(void) +{ + // get and sort win nums + GList *keys = g_hash_table_get_keys(windows); + keys = g_list_sort(keys, cmp_win_num); + GList *curr = keys; + + // find our place in the list + while (curr) { + if (current == GPOINTER_TO_INT(curr->data)) { + break; + } + curr = g_list_next(curr); + } + + // if there is a next window return it + curr = g_list_next(curr); + if (curr) { + int next = GPOINTER_TO_INT(curr->data); + g_list_free(keys); + return wins_get_by_num(next); + // otherwise return the first window (console) + } else { + g_list_free(keys); + return wins_get_console(); + } +} + +ProfWin * +wins_get_previous(void) +{ + // get and sort win nums + GList *keys = g_hash_table_get_keys(windows); + keys = g_list_sort(keys, cmp_win_num); + GList *curr = keys; + + // find our place in the list + while (curr) { + if (current == GPOINTER_TO_INT(curr->data)) { + break; + } + curr = g_list_next(curr); + } + + // if there is a previous window return it + curr = g_list_previous(curr); + if (curr) { + int previous = GPOINTER_TO_INT(curr->data); + g_list_free(keys); + return wins_get_by_num(previous); + // otherwise return the last window + } else { + int new_num = GPOINTER_TO_INT(g_list_last(keys)->data); + g_list_free(keys); + return wins_get_by_num(new_num); + } +} + +int +wins_get_num(ProfWin *window) +{ + GList *keys = g_hash_table_get_keys(windows); + GList *curr = keys; + + while (curr) { + gconstpointer num_p = curr->data; + ProfWin *curr_win = g_hash_table_lookup(windows, num_p); + if (curr_win == window) { + g_list_free(keys); + return GPOINTER_TO_INT(num_p); + } + curr = g_list_next(curr); + } + + g_list_free(keys); + return -1; +} + +int +wins_get_current_num(void) +{ + return current; +} + +void +wins_close_current(void) +{ + wins_close_by_num(current); +} + +void +wins_close_by_num(int i) +{ + // console cannot be closed + if (i != 1) { + + // go to console if closing current window + if (i == current) { + current = 1; + ProfWin *window = wins_get_current(); + win_update_virtual(window); + } + + g_hash_table_remove(windows, GINT_TO_POINTER(i)); + status_bar_inactive(i); + } +} + +gboolean +wins_is_current(ProfWin *window) +{ + ProfWin *current_window = wins_get_current(); + + if (current_window == window) { + return TRUE; + } else { + return FALSE; + } +} + +ProfWin * +wins_new_xmlconsole(void) +{ + GList *keys = g_hash_table_get_keys(windows); + int result = get_next_available_win_num(keys); + g_list_free(keys); + ProfWin *newwin = win_create_xmlconsole(); + g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin); + return newwin; +} + +ProfWin * +wins_new_chat(const char * const barejid) +{ + GList *keys = g_hash_table_get_keys(windows); + int result = get_next_available_win_num(keys); + g_list_free(keys); + ProfWin *newwin = win_create_chat(barejid); + g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin); + return newwin; +} + +ProfWin * +wins_new_muc(const char * const roomjid) +{ + GList *keys = g_hash_table_get_keys(windows); + int result = get_next_available_win_num(keys); + g_list_free(keys); + ProfWin *newwin = win_create_muc(roomjid); + g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin); + return newwin; +} + +ProfWin * +wins_new_muc_config(const char * const roomjid, DataForm *form) +{ + GList *keys = g_hash_table_get_keys(windows); + int result = get_next_available_win_num(keys); + g_list_free(keys); + ProfWin *newwin = win_create_muc_config(roomjid, form); + g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin); + return newwin; +} + +ProfWin * +wins_new_private(const char * const fulljid) +{ + GList *keys = g_hash_table_get_keys(windows); + int result = get_next_available_win_num(keys); + g_list_free(keys); + ProfWin *newwin = win_create_private(fulljid); + g_hash_table_insert(windows, GINT_TO_POINTER(result), newwin); + return newwin; +} + +int +wins_get_total_unread(void) +{ + int result = 0; + GList *values = g_hash_table_get_values(windows); + GList *curr = values; + + while (curr) { + ProfWin *window = curr->data; + result += win_unread(window); + curr = g_list_next(curr); + } + g_list_free(values); + return result; +} + +void +wins_resize_all(void) +{ + GList *values = g_hash_table_get_values(windows); + GList *curr = values; + while (curr) { + ProfWin *window = curr->data; + win_resize(window); + curr = g_list_next(curr); + } + g_list_free(values); + + ProfWin *current_win = wins_get_current(); + win_update_virtual(current_win); +} + +void +wins_hide_subwin(ProfWin *window) +{ + win_hide_subwin(window); + + ProfWin *current_win = wins_get_current(); + win_refresh_without_subwin(current_win); +} + +void +wins_show_subwin(ProfWin *window) +{ + win_show_subwin(window); + + ProfWin *current_win = wins_get_current(); + win_refresh_with_subwin(current_win); +} + +ProfXMLWin * +wins_get_xmlconsole(void) +{ + GList *values = g_hash_table_get_values(windows); + GList *curr = values; + + while (curr) { + ProfWin *window = curr->data; + if (window->type == WIN_XML) { + ProfXMLWin *xmlwin = (ProfXMLWin*)window; + assert(xmlwin->memcheck == PROFXMLWIN_MEMCHECK); + g_list_free(values); + return xmlwin; + } + curr = g_list_next(curr); + } + + g_list_free(values); + return NULL; +} + +GSList * +wins_get_chat_recipients(void) +{ + GSList *result = NULL; + GList *values = g_hash_table_get_values(windows); + GList *curr = values; + + while (curr) { + ProfWin *window = curr->data; + if (window->type == WIN_CHAT) { + ProfChatWin *chatwin = (ProfChatWin*)window; + result = g_slist_append(result, chatwin->barejid); + } + curr = g_list_next(curr); + } + g_list_free(values); + return result; +} + +GSList * +wins_get_prune_wins(void) +{ + GSList *result = NULL; + GList *values = g_hash_table_get_values(windows); + GList *curr = values; + + while (curr) { + ProfWin *window = curr->data; + if (win_unread(window) == 0 && + window->type != WIN_MUC && + window->type != WIN_MUC_CONFIG && + window->type != WIN_XML && + window->type != WIN_CONSOLE) { + result = g_slist_append(result, window); + } + curr = g_list_next(curr); + } + g_list_free(values); + return result; +} + +void +wins_lost_connection(void) +{ + GList *values = g_hash_table_get_values(windows); + GList *curr = values; + + while (curr) { + ProfWin *window = curr->data; + if (window->type != WIN_CONSOLE) { + win_print(window, '-', NULL, 0, THEME_ERROR, "", "Lost connection."); + + // if current win, set current_win_dirty + if (wins_is_current(window)) { + win_update_virtual(window); + } + } + curr = g_list_next(curr); + } + g_list_free(values); +} + +gboolean +wins_swap(int source_win, int target_win) +{ + ProfWin *source = g_hash_table_lookup(windows, GINT_TO_POINTER(source_win)); + ProfWin *console = wins_get_console(); + + if (source) { + ProfWin *target = g_hash_table_lookup(windows, GINT_TO_POINTER(target_win)); + + // target window empty + if (!target) { + g_hash_table_steal(windows, GINT_TO_POINTER(source_win)); + g_hash_table_insert(windows, GINT_TO_POINTER(target_win), source); + status_bar_inactive(source_win); + if (win_unread(source) > 0) { + status_bar_new(target_win); + } else { + status_bar_active(target_win); + } + if (wins_get_current_num() == source_win) { + wins_set_current_by_num(target_win); + ui_ev_focus_win(console); + } + return TRUE; + + // target window occupied + } else { + g_hash_table_steal(windows, GINT_TO_POINTER(source_win)); + g_hash_table_steal(windows, GINT_TO_POINTER(target_win)); + g_hash_table_insert(windows, GINT_TO_POINTER(source_win), target); + g_hash_table_insert(windows, GINT_TO_POINTER(target_win), source); + if (win_unread(source) > 0) { + status_bar_new(target_win); + } else { + status_bar_active(target_win); + } + if (win_unread(target) > 0) { + status_bar_new(source_win); + } else { + status_bar_active(source_win); + } + if ((wins_get_current_num() == source_win) || (wins_get_current_num() == target_win)) { + ui_ev_focus_win(console); + } + return TRUE; + } + } else { + return FALSE; + } +} + +gboolean +wins_tidy(void) +{ + gboolean tidy_required = FALSE; + // check for gaps + GList *keys = g_hash_table_get_keys(windows); + keys = g_list_sort(keys, cmp_win_num); + + // get last used + GList *last = g_list_last(keys); + int last_num = GPOINTER_TO_INT(last->data); + + // find first free num TODO - Will sort again + int next_available = get_next_available_win_num(keys); + + // found gap (next available before last window) + if (cmp_win_num(GINT_TO_POINTER(next_available), GINT_TO_POINTER(last_num)) < 0) { + tidy_required = TRUE; + } + + if (tidy_required) { + status_bar_set_all_inactive(); + GHashTable *new_windows = g_hash_table_new_full(g_direct_hash, + g_direct_equal, NULL, (GDestroyNotify)win_free); + + int num = 1; + GList *curr = keys; + while (curr) { + ProfWin *window = g_hash_table_lookup(windows, curr->data); + if (num == 10) { + g_hash_table_insert(new_windows, GINT_TO_POINTER(0), window); + if (win_unread(window) > 0) { + status_bar_new(0); + } else { + status_bar_active(0); + } + } else { + g_hash_table_insert(new_windows, GINT_TO_POINTER(num), window); + if (win_unread(window) > 0) { + status_bar_new(num); + } else { + status_bar_active(num); + } + } + num++; + curr = g_list_next(curr); + } + + windows = new_windows; + current = 1; + ProfWin *console = wins_get_console(); + ui_ev_focus_win(console); + g_list_free(keys); + return TRUE; + } else { + g_list_free(keys); + return FALSE; + } +} + +GSList * +wins_create_summary(void) +{ + GSList *result = NULL; + + GList *keys = g_hash_table_get_keys(windows); + keys = g_list_sort(keys, cmp_win_num); + GList *curr = keys; + + while (curr) { + ProfWin *window = g_hash_table_lookup(windows, curr->data); + int ui_index = GPOINTER_TO_INT(curr->data); + + GString *chat_string; + GString *priv_string; + GString *muc_string; + GString *muc_config_string; + GString *xml_string; + + switch (window->type) + { + case WIN_CONSOLE: + result = g_slist_append(result, strdup("1: Console")); + break; + case WIN_CHAT: + chat_string = g_string_new(""); + + ProfChatWin *chatwin = (ProfChatWin*)window; + PContact contact = roster_get_contact(chatwin->barejid); + if (contact == NULL) { + g_string_printf(chat_string, "%d: Chat %s", ui_index, chatwin->barejid); + } else { + const char *display_name = p_contact_name_or_jid(contact); + g_string_printf(chat_string, "%d: Chat %s", ui_index, display_name); + GString *chat_presence = g_string_new(""); + g_string_printf(chat_presence, " - %s", p_contact_presence(contact)); + g_string_append(chat_string, chat_presence->str); + g_string_free(chat_presence, TRUE); + } + + if (chatwin->unread > 0) { + GString *chat_unread = g_string_new(""); + g_string_printf(chat_unread, ", %d unread", chatwin->unread); + g_string_append(chat_string, chat_unread->str); + g_string_free(chat_unread, TRUE); + } + + result = g_slist_append(result, strdup(chat_string->str)); + g_string_free(chat_string, TRUE); + + break; + + case WIN_PRIVATE: + priv_string = g_string_new(""); + ProfPrivateWin *privatewin = (ProfPrivateWin*)window; + g_string_printf(priv_string, "%d: Private %s", ui_index, privatewin->fulljid); + + if (privatewin->unread > 0) { + GString *priv_unread = g_string_new(""); + g_string_printf(priv_unread, ", %d unread", privatewin->unread); + g_string_append(priv_string, priv_unread->str); + g_string_free(priv_unread, TRUE); + } + + result = g_slist_append(result, strdup(priv_string->str)); + g_string_free(priv_string, TRUE); + + break; + + case WIN_MUC: + muc_string = g_string_new(""); + ProfMucWin *mucwin = (ProfMucWin*)window; + g_string_printf(muc_string, "%d: Room %s", ui_index, mucwin->roomjid); + + if (mucwin->unread > 0) { + GString *muc_unread = g_string_new(""); + g_string_printf(muc_unread, ", %d unread", mucwin->unread); + g_string_append(muc_string, muc_unread->str); + g_string_free(muc_unread, TRUE); + } + + result = g_slist_append(result, strdup(muc_string->str)); + g_string_free(muc_string, TRUE); + + break; + + case WIN_MUC_CONFIG: + muc_config_string = g_string_new(""); + char *title = win_get_title(window); + g_string_printf(muc_config_string, "%d: %s", ui_index, title); + result = g_slist_append(result, strdup(muc_config_string->str)); + g_string_free(muc_config_string, TRUE); + free(title); + + break; + + case WIN_XML: + xml_string = g_string_new(""); + g_string_printf(xml_string, "%d: XML console", ui_index); + result = g_slist_append(result, strdup(xml_string->str)); + g_string_free(xml_string, TRUE); + + break; + + default: + break; + } + curr = g_list_next(curr); + } + + g_list_free(keys); + return result; +} + +void +wins_destroy(void) +{ + g_hash_table_destroy(windows); +} diff --git a/src/window_list.h b/src/window_list.h new file mode 100644 index 00000000..48910461 --- /dev/null +++ b/src/window_list.h @@ -0,0 +1,85 @@ +/* + * window_list.h + * + * Copyright (C) 2012 - 2015 James Booth + * + * This file is part of Profanity. + * + * Profanity is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Profanity is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see . + * + * In addition, as a special exception, the copyright holders give permission to + * link the code of portions of this program with the OpenSSL library under + * certain conditions as described in each individual source file, and + * distribute linked combinations including the two. + * + * You must obey the GNU General Public License in all respects for all of the + * code used other than OpenSSL. If you modify file(s) with this exception, you + * may extend this exception to your version of the file(s), but you are not + * obligated to do so. If you do not wish to do so, delete this exception + * statement from your version. If you delete this exception statement from all + * source files in the program, then also delete it here. + * + */ + +#ifndef WINDOW_LIST_H +#define WINDOW_LIST_H + +#include "ui/window.h" + +void wins_init(void); + +ProfWin * wins_new_xmlconsole(void); +ProfWin * wins_new_chat(const char * const barejid); +ProfWin * wins_new_muc(const char * const roomjid); +ProfWin * wins_new_muc_config(const char * const roomjid, DataForm *form); +ProfWin * wins_new_private(const char * const fulljid); + +ProfWin * wins_get_console(void); +ProfChatWin *wins_get_chat(const char * const barejid); +ProfMucWin * wins_get_muc(const char * const roomjid); +ProfMucConfWin * wins_get_muc_conf(const char * const roomjid); +ProfPrivateWin *wins_get_private(const char * const fulljid); +ProfXMLWin * wins_get_xmlconsole(void); + +ProfWin * wins_get_current(void); +ProfChatWin * wins_get_current_chat(void); +ProfMucWin * wins_get_current_muc(void); +ProfPrivateWin * wins_get_current_private(void); +ProfMucConfWin * wins_get_current_muc_conf(void); + +void wins_set_current_by_num(int i); + +ProfWin * wins_get_by_num(int i); + +ProfWin * wins_get_next(void); +ProfWin * wins_get_previous(void); +int wins_get_num(ProfWin *window); +int wins_get_current_num(void); +void wins_close_current(void); +void wins_close_by_num(int i); +gboolean wins_is_current(ProfWin *window); +int wins_get_total_unread(void); +void wins_resize_all(void); +GSList * wins_get_chat_recipients(void); +GSList * wins_get_prune_wins(void); +void wins_lost_connection(void); +gboolean wins_tidy(void); +GSList * wins_create_summary(void); +void wins_destroy(void); +GList * wins_get_nums(void); +gboolean wins_swap(int source_win, int target_win); +void wins_hide_subwin(ProfWin *window); +void wins_show_subwin(ProfWin *window); + +#endif -- cgit 1.4.1-2-gfad0