devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Moved cons_show_caps() to console module

Browse Source
This commit is contained in:
James Booth
2013-04-21 00:47:05 +01:00
parent a3c241b3a8
commit d5bb600a04
2 changed files with 76 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/ui/console.c
View File

@@ -384,6 +384,82 @@ cons_show_info(PContact pcontact)
} }
} }
void
cons_show_caps(const char * const contact, Resource *resource)
{
WINDOW *win = console->win;
cons_show("");
const char *resource_presence = string_from_resource_presence(resource->presence);
window_show_time(console, '-');
window_presence_colour_on(console, resource_presence);
wprintw(console->win, "%s", contact);
window_presence_colour_off(console, resource_presence);
wprintw(win, ":\n");
if (resource->caps_str != NULL) {
Capabilities *caps = caps_get(resource->caps_str);
if (caps != NULL) {
// show identity
if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) {
window_show_time(console, '-');
wprintw(win, "Identity: ");
if (caps->name != NULL) {
wprintw(win, "%s", caps->name);
if ((caps->category != NULL) || (caps->type != NULL)) {
wprintw(win, " ");
}
}
if (caps->type != NULL) {
wprintw(win, "%s", caps->type);
if (caps->category != NULL) {
wprintw(win, " ");
}
}
if (caps->category != NULL) {
wprintw(win, "%s", caps->category);
}
wprintw(win, "\n");
}
if (caps->software != NULL) {
window_show_time(console, '-');
wprintw(win, "Software: %s", caps->software);
}
if (caps->software_version != NULL) {
wprintw(win, ", %s", caps->software_version);
}
if ((caps->software != NULL) || (caps->software_version != NULL)) {
wprintw(win, "\n");
}
if (caps->os != NULL) {
window_show_time(console, '-');
wprintw(win, "OS: %s", caps->os);
}
if (caps->os_version != NULL) {
wprintw(win, ", %s", caps->os_version);
}
if ((caps->os != NULL) || (caps->os_version != NULL)) {
wprintw(win, "\n");
}
if (caps->features != NULL) {
window_show_time(console, '-');
wprintw(win, "Features:\n");
GSList *feature = caps->features;
while (feature != NULL) {
window_show_time(console, '-');
wprintw(win, " %s\n", feature->data);
feature = g_slist_next(feature);
}
}
}
}
dirty = TRUE;
if (!win_current_is_console()) {
status_bar_new(0);
}
}
static void static void
_cons_splash_logo(void) _cons_splash_logo(void)
{ {

80
src/ui/windows.c
View File

@@ -1106,86 +1106,6 @@ win_show_room_broadcast(const char * const room_jid, const char * const message)
} }
} }
void
cons_show_caps(const char * const contact, Resource *resource)
{
WINDOW *win = console->win;
cons_show("");
const char *resource_presence = string_from_resource_presence(resource->presence);
window_show_time(console, '-');
window_presence_colour_on(console, resource_presence);
wprintw(console->win, "%s", contact);
window_presence_colour_off(console, resource_presence);
wprintw(win, ":\n");
if (resource->caps_str != NULL) {
log_debug("Getting caps, caps_str: %s", resource->caps_str);
Capabilities *caps = caps_get(resource->caps_str);
if (caps != NULL) {
// show identity
if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) {
window_show_time(console, '-');
wprintw(win, "Identity: ");
if (caps->name != NULL) {
wprintw(win, "%s", caps->name);
if ((caps->category != NULL) || (caps->type != NULL)) {
wprintw(win, " ");
}
}
if (caps->type != NULL) {
wprintw(win, "%s", caps->type);
if (caps->category != NULL) {
wprintw(win, " ");
}
}
if (caps->category != NULL) {
wprintw(win, "%s", caps->category);
}
wprintw(win, "\n");
}
if (caps->software != NULL) {
window_show_time(console, '-');
wprintw(win, "Software: %s", caps->software);
}
if (caps->software_version != NULL) {
wprintw(win, ", %s", caps->software_version);
}
if ((caps->software != NULL) || (caps->software_version != NULL)) {
wprintw(win, "\n");
}
if (caps->os != NULL) {
window_show_time(console, '-');
wprintw(win, "OS: %s", caps->os);
}
if (caps->os_version != NULL) {
wprintw(win, ", %s", caps->os_version);
}
if ((caps->os != NULL) || (caps->os_version != NULL)) {
wprintw(win, "\n");
}
if (caps->features != NULL) {
window_show_time(console, '-');
wprintw(win, "Features:\n");
GSList *feature = caps->features;
while (feature != NULL) {
window_show_time(console, '-');
wprintw(win, " %s\n", feature->data);
feature = g_slist_next(feature);
}
}
}
} else {
log_debug("No caps string found in resource");
}
if (current_index == 0) {
dirty = TRUE;
} else {
status_bar_new(0);
}
}
void void
cons_show_software_version(const char * const jid, const char * const presence, cons_show_software_version(const char * const jid, const char * const presence,
const char * const name, const char * const version, const char * const os) const char * const name, const char * const version, const char * const os)