aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Moved cons_show_wins() to console module

Browse Source
This commit is contained in:
James Booth 2013-04-21 00:32:31 +01:00
parent a234ba0cd6
commit 867774ce57
3 changed files with 86 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/ui/console.c
View File

@ -31,6 +31,7 @@
#include "common.h"
#include "config/preferences.h"
#include "contact_list.h"
#include "config/theme.h"
#include "ui/window.h"
#include "ui/ui.h"
@ -119,6 +120,9 @@ cons_about(void)
prefresh(console->win, 0, 0, 1, 0, rows-3, cols-1);
dirty = TRUE;
if (!win_current_is_console()) {
status_bar_new(0);
}
}
void
@ -146,6 +150,9 @@ cons_check_version(gboolean not_available_msg)
}
dirty = TRUE;
if (!win_current_is_console()) {
status_bar_new(0);
}
}
}
}
@ -167,6 +174,81 @@ cons_show_login_success(ProfAccount *account)
wprintw(console->win, ".\n");
}
void
cons_show_wins(void)
{
int i = 0;
int count = 0;
cons_show("");
cons_show("Active windows:");
window_show_time(console, '-');
wprintw(console->win, "1: Console\n");
for (i = 1; i < NUM_WINS; i++) {
if (windows[i] != NULL) {
count++;
}
}
if (count != 0) {
for (i = 1; i < NUM_WINS; i++) {
if (windows[i] != NULL) {
ProfWin *window = windows[i];
window_show_time(console, '-');
switch (window->type)
{
case WIN_CHAT:
wprintw(console->win, "%d: chat %s", i + 1, window->from);
PContact contact = contact_list_get_contact(window->from);
if (contact != NULL) {
if (p_contact_name(contact) != NULL) {
wprintw(console->win, " (%s)", p_contact_name(contact));
}
wprintw(console->win, " - %s", p_contact_presence(contact));
}
if (window->unread > 0) {
wprintw(console->win, ", %d unread", window->unread);
}
break;
case WIN_PRIVATE:
wprintw(console->win, "%d: private %s", i + 1, window->from);
if (window->unread > 0) {
wprintw(console->win, ", %d unread", window->unread);
}
break;
case WIN_MUC:
wprintw(console->win, "%d: room %s", i + 1, window->from);
if (window->unread > 0) {
wprintw(console->win, ", %d unread", window->unread);
}
break;
default:
break;
}
wprintw(console->win, "\n");
}
}
}
cons_show("");
dirty = TRUE;
if (!win_current_is_console()) {
status_bar_new(0);
}
}
static void
_cons_splash_logo(void)

4
src/ui/ui.h
View File

@ -40,6 +40,10 @@
#include "xmpp/xmpp.h"
#define INP_WIN_MAX 1000
#define NUM_WINS 10
// holds console at index 0 and chat wins 1 through to 9
ProfWin* windows[NUM_WINS];
// gui startup and shutdown, resize
void ui_init(void);

77
src/ui/windows.c
View File

@ -53,11 +53,6 @@
#include "ui/ui.h"
#include "ui/window.h"
#define NUM_WINS 10
// holds console at index 0 and chat wins 1 through to 9
static ProfWin* windows[NUM_WINS];
// the window currently being displayed
static int current_index = 0;
static ProfWin *current;
@ -1113,78 +1108,6 @@ win_show_room_broadcast(const char * const room_jid, const char * const message)
}
void
cons_show_wins(void)
{
int i = 0;
int count = 0;
cons_show("");
cons_show("Active windows:");
window_show_time(console, '-');
wprintw(console->win, "1: Console\n");
for (i = 1; i < NUM_WINS; i++) {
if (windows[i] != NULL) {
count++;
}
}
if (count != 0) {
for (i = 1; i < NUM_WINS; i++) {
if (windows[i] != NULL) {
ProfWin *window = windows[i];
window_show_time(console, '-');
switch (window->type)
{
case WIN_CHAT:
wprintw(console->win, "%d: chat %s", i + 1, window->from);
PContact contact = contact_list_get_contact(window->from);
if (contact != NULL) {
if (p_contact_name(contact) != NULL) {
wprintw(console->win, " (%s)", p_contact_name(contact));
}
wprintw(console->win, " - %s", p_contact_presence(contact));
}
if (window->unread > 0) {
wprintw(console->win, ", %d unread", window->unread);
}
break;
case WIN_PRIVATE:
wprintw(console->win, "%d: private %s", i + 1, window->from);
if (window->unread > 0) {
wprintw(console->win, ", %d unread", window->unread);
}
break;
case WIN_MUC:
wprintw(console->win, "%d: room %s", i + 1, window->from);
if (window->unread > 0) {
wprintw(console->win, ", %d unread", window->unread);
}
break;
default:
break;
}
wprintw(console->win, "\n");
}
}
}
cons_show("");
}
void
cons_show_info(PContact pcontact)
{