mirror of
https://github.com/irssi/irssi.git
synced 2025-02-02 15:08:01 -05:00
Statusbar rewrites. Colors are currently not configurable at all, but other
than that, it should work better. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1379 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen
cras
parent
ef1d2e3b43
commit
4d5da596c9
@ -1,7 +1,7 @@
|
||||
/*
|
||||
gui-statusbar-items.c : irssi
|
||||
statusbar-items.c : irssi
|
||||
|
||||
Copyright (C) 1999 Timo Sirainen
|
||||
Copyright (C) 1999-2001 Timo Sirainen
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -23,6 +23,7 @@
|
||||
#include "servers.h"
|
||||
#include "misc.h"
|
||||
#include "settings.h"
|
||||
#include "special-vars.h"
|
||||
|
||||
#include "irc.h"
|
||||
#include "channels.h"
|
||||
@ -90,23 +91,45 @@ static off_t mail_last_size = -1;
|
||||
static SBAR_ITEM_REC *topic_item;
|
||||
static STATUSBAR_REC *topic_bar;
|
||||
|
||||
/* redraw clock */
|
||||
static void statusbar_clock(SBAR_ITEM_REC *item, int ypos)
|
||||
static void item_default(SBAR_ITEM_REC *item, int get_size_only,
|
||||
const char *str)
|
||||
{
|
||||
struct tm *tm;
|
||||
char str[6];
|
||||
SERVER_REC *server;
|
||||
WI_ITEM_REC *wiitem;
|
||||
char *parsed, *printstr;
|
||||
int len;
|
||||
|
||||
clock_last = time(NULL);
|
||||
tm = localtime(&clock_last);
|
||||
if (active_win == NULL) {
|
||||
server = NULL;
|
||||
wiitem = NULL;
|
||||
} else {
|
||||
server = active_win->active_server;
|
||||
wiitem = active_win->active;
|
||||
}
|
||||
|
||||
g_snprintf(str, sizeof(str), "%02d:%02d", tm->tm_hour, tm->tm_min);
|
||||
parsed = parse_special_string(str, server, wiitem, "", NULL,
|
||||
PARSE_FLAG_ESCAPE_VARS);
|
||||
|
||||
move(ypos, item->xpos);
|
||||
set_color(stdscr, sbar_color_dim); addch('[');
|
||||
set_color(stdscr, sbar_color_bold); addstr(str);
|
||||
set_color(stdscr, sbar_color_dim); addch(']');
|
||||
if (get_size_only) {
|
||||
item->min_size = item->max_size = format_get_length(parsed);
|
||||
} else {
|
||||
if (item->size < item->min_size) {
|
||||
/* they're forcing us smaller than minimum size.. */
|
||||
len = format_real_length(parsed, item->size);
|
||||
parsed[len] = '\0';
|
||||
}
|
||||
|
||||
screen_refresh(NULL);
|
||||
printstr = g_strconcat("%4", parsed, NULL);
|
||||
gui_printtext(item->xpos, item->bar->ypos, printstr);
|
||||
g_free(printstr);
|
||||
}
|
||||
g_free(parsed);
|
||||
}
|
||||
|
||||
/* redraw clock */
|
||||
static void statusbar_clock(SBAR_ITEM_REC *item, int get_size_only)
|
||||
{
|
||||
item_default(item, get_size_only, "%c[%w$Z%c]");
|
||||
}
|
||||
|
||||
/* check if we need to redraw clock.. */
|
||||
@ -130,67 +153,22 @@ static int statusbar_clock_timeout(void)
|
||||
}
|
||||
|
||||
/* redraw nick */
|
||||
static void statusbar_nick(SBAR_ITEM_REC *item, int ypos)
|
||||
static void statusbar_nick(SBAR_ITEM_REC *item, int get_size_only)
|
||||
{
|
||||
CHANNEL_REC *channel;
|
||||
SERVER_REC *server;
|
||||
IRC_SERVER_REC *ircserver;
|
||||
NICK_REC *nickrec;
|
||||
int size_needed;
|
||||
int umode_size;
|
||||
char nick[10];
|
||||
IRC_SERVER_REC *server;
|
||||
char *str, *usermode, *away;
|
||||
|
||||
server = active_win == NULL ? NULL : active_win->active_server;
|
||||
ircserver = IRC_SERVER(server);
|
||||
server = IRC_SERVER(active_win->active_server);
|
||||
usermode = server == NULL || server->usermode == NULL ||
|
||||
*server->usermode == '\0' ? "" :
|
||||
g_strdup_printf("(%%c+%%w%s)", server->usermode);
|
||||
away = server == NULL || !server->usermode_away ? "" :
|
||||
"(%GzZzZ%w)";
|
||||
|
||||
umode_size = ircserver == NULL || ircserver->usermode == NULL ||
|
||||
ircserver->usermode[0] == '\0' ? 0 :
|
||||
strlen(ircserver->usermode)+3;
|
||||
|
||||
/* nick */
|
||||
if (server == NULL || server->nick == NULL) {
|
||||
nick[0] = '\0';
|
||||
nickrec = NULL;
|
||||
} else {
|
||||
strncpy(nick, server->nick, 9);
|
||||
nick[9] = '\0';
|
||||
|
||||
channel = CHANNEL(active_win->active);
|
||||
nickrec = channel == NULL ? NULL : channel->ownnick;
|
||||
}
|
||||
|
||||
size_needed = 2 + strlen(nick) + umode_size +
|
||||
(server != NULL && server->usermode_away ? 7 : 0) +
|
||||
(nickrec != NULL && (nickrec->op || nickrec->voice) ? 1 : 0); /* @ + */
|
||||
|
||||
if (item->size != size_needed) {
|
||||
/* we need more (or less..) space! */
|
||||
statusbar_item_resize(item, size_needed);
|
||||
return;
|
||||
}
|
||||
|
||||
/* size ok, draw the nick */
|
||||
move(ypos, item->xpos);
|
||||
|
||||
set_color(stdscr, sbar_color_dim); addch('[');
|
||||
if (nickrec != NULL && (nickrec->op || nickrec->voice)) {
|
||||
set_color(stdscr, sbar_color_bold);
|
||||
addch(nickrec->op ? '@' : '+');
|
||||
}
|
||||
set_color(stdscr, sbar_color_normal); addstr(nick);
|
||||
if (umode_size) {
|
||||
set_color(stdscr, sbar_color_bold); addch('(');
|
||||
set_color(stdscr, sbar_color_dim); addch('+');
|
||||
set_color(stdscr, sbar_color_normal); addstr(ircserver->usermode);
|
||||
set_color(stdscr, sbar_color_bold); addch(')');
|
||||
}
|
||||
if (server != NULL && server->usermode_away) {
|
||||
set_color(stdscr, sbar_color_normal); addstr(" (");
|
||||
set_color(stdscr, sbar_color_away); addstr("zZzZ");
|
||||
set_color(stdscr, sbar_color_normal); addch(')');
|
||||
}
|
||||
set_color(stdscr, sbar_color_dim); addch(']');
|
||||
screen_refresh(NULL);
|
||||
str = g_strconcat("%c[%w$P$N", usermode, away, "%c]", NULL);
|
||||
item_default(item, get_size_only, str);
|
||||
g_free(str);
|
||||
if (*usermode != '\0') g_free(usermode);
|
||||
}
|
||||
|
||||
static void sig_statusbar_nick_redraw(void)
|
||||
@ -198,100 +176,32 @@ static void sig_statusbar_nick_redraw(void)
|
||||
statusbar_item_redraw(nick_item);
|
||||
}
|
||||
|
||||
static WINDOW_REC *mainwindow_find_sbar(SBAR_ITEM_REC *item)
|
||||
{
|
||||
GSList *tmp;
|
||||
|
||||
for (tmp = mainwindows; tmp != NULL; tmp = tmp->next) {
|
||||
MAIN_WINDOW_REC *rec = tmp->data;
|
||||
|
||||
if (rec->statusbar_channel_item == item)
|
||||
return rec->active;
|
||||
}
|
||||
|
||||
return active_win;
|
||||
}
|
||||
|
||||
/* redraw channel */
|
||||
static void statusbar_channel(SBAR_ITEM_REC *item, int ypos)
|
||||
static void statusbar_channel(SBAR_ITEM_REC *item, int get_size_only)
|
||||
{
|
||||
WINDOW_REC *window;
|
||||
WI_ITEM_REC *witem;
|
||||
CHANNEL_REC *channel;
|
||||
SERVER_REC *server;
|
||||
gchar channame[21], winnum[MAX_INT_STRLEN], *tmpname;
|
||||
int size_needed;
|
||||
int mode_size;
|
||||
CHANNEL_REC *channel;
|
||||
char *str, *tmp;
|
||||
|
||||
window = item->bar->pos != STATUSBAR_POS_MIDDLE ? active_win :
|
||||
mainwindow_find_sbar(item);
|
||||
server = window == NULL ? NULL : window->active_server;
|
||||
|
||||
ltoa(winnum, window == NULL ? 0 : window->refnum);
|
||||
|
||||
witem = window != NULL && (IS_CHANNEL(window->active) || IS_QUERY(window->active)) ?
|
||||
window->active : NULL;
|
||||
if (witem == NULL)
|
||||
{
|
||||
/* display server tag */
|
||||
channame[0] = '\0';
|
||||
mode_size = 0;
|
||||
channel = NULL;
|
||||
|
||||
size_needed = 3 + strlen(winnum) + (server == NULL ? 0 : (17+strlen(server->tag)));
|
||||
}
|
||||
else
|
||||
{
|
||||
/* display channel + mode */
|
||||
tmpname = show_lowascii(witem->name);
|
||||
strncpy(channame, tmpname, 20); channame[20] = '\0';
|
||||
g_free(tmpname);
|
||||
|
||||
channel = CHANNEL(witem);
|
||||
if (channel == NULL) {
|
||||
mode_size = 0;
|
||||
if (active_win->active != NULL) {
|
||||
/* channel/query */
|
||||
channel = CHANNEL(active_win->active);
|
||||
tmp = channel == NULL || channel->mode == NULL ||
|
||||
*channel->mode == '\0' ? "" :
|
||||
g_strdup_printf("(%%c+%%w%s)", channel->mode);
|
||||
str = g_strconcat("%c[%w$winref:$[.15]T", tmp, "%c]", NULL);
|
||||
} else {
|
||||
mode_size = strlen(channel->mode);
|
||||
if (mode_size > 0) mode_size += 3; /* (+) */
|
||||
/* empty window */
|
||||
server = active_win->active_server;
|
||||
tmp = server == NULL ? "" :
|
||||
g_strdup_printf(":%s (change with ^X)", server->tag);
|
||||
str = g_strconcat("%c[%w$winref", tmp, "%c]", NULL);
|
||||
}
|
||||
|
||||
size_needed = 3 + strlen(winnum) + strlen(channame) + mode_size;
|
||||
}
|
||||
item_default(item, get_size_only, str);
|
||||
|
||||
if (item->size != size_needed)
|
||||
{
|
||||
/* we need more (or less..) space! */
|
||||
statusbar_item_resize(item, size_needed);
|
||||
return;
|
||||
}
|
||||
|
||||
move(ypos, item->xpos);
|
||||
set_color(stdscr, sbar_color_dim); addch('[');
|
||||
|
||||
/* window number */
|
||||
set_color(stdscr, sbar_color_normal); addstr(winnum);
|
||||
set_color(stdscr, sbar_color_dim); addch(':');
|
||||
|
||||
if (channame[0] == '\0' && server != NULL)
|
||||
{
|
||||
/* server tag */
|
||||
set_color(stdscr, sbar_color_normal); addstr(server->tag);
|
||||
addstr(" (change with ^X)");
|
||||
}
|
||||
else if (channame[0] != '\0')
|
||||
{
|
||||
/* channel + mode */
|
||||
set_color(stdscr, sbar_color_normal); addstr(channame);
|
||||
if (mode_size)
|
||||
{
|
||||
set_color(stdscr, sbar_color_bold); addch('(');
|
||||
set_color(stdscr, sbar_color_dim); addch('+');
|
||||
set_color(stdscr, sbar_color_normal); addstr(channel->mode);
|
||||
set_color(stdscr, sbar_color_bold); addch(')');
|
||||
}
|
||||
}
|
||||
set_color(stdscr, sbar_color_dim); addch(']');
|
||||
screen_refresh(NULL);
|
||||
g_free(str);
|
||||
if (*tmp != '\0') g_free(tmp);
|
||||
}
|
||||
|
||||
static void sig_statusbar_channel_redraw(void)
|
||||
@ -314,110 +224,94 @@ static void sig_statusbar_channel_redraw_window_item(WI_ITEM_REC *item)
|
||||
statusbar_item_redraw(channel_item);
|
||||
}
|
||||
|
||||
static void draw_activity(gchar *title, gboolean act, gboolean det, int size)
|
||||
static char *get_activity_list(int normal, int hilight)
|
||||
{
|
||||
WINDOW_REC *window;
|
||||
GString *str;
|
||||
GList *tmp;
|
||||
gchar str[MAX_INT_STRLEN];
|
||||
gboolean first, is_det;
|
||||
char *ret;
|
||||
int is_det;
|
||||
|
||||
set_color(stdscr, sbar_color_normal); addstr(title);
|
||||
str = g_string_new(NULL);
|
||||
|
||||
first = TRUE;
|
||||
for (tmp = activity_list; tmp != NULL && size > 0; tmp = tmp->next)
|
||||
{
|
||||
window = tmp->data;
|
||||
for (tmp = activity_list; tmp != NULL; tmp = tmp->next) {
|
||||
WINDOW_REC *window = tmp->data;
|
||||
|
||||
is_det = window->data_level >= DATA_LEVEL_HILIGHT;
|
||||
if (is_det && !det) continue;
|
||||
if (!is_det && !act) continue;
|
||||
if ((!is_det && !normal) || (is_det && !hilight))
|
||||
continue;
|
||||
|
||||
if (first)
|
||||
first = FALSE;
|
||||
else
|
||||
{
|
||||
set_color(stdscr, sbar_color_dim);
|
||||
addch(',');
|
||||
size--;
|
||||
}
|
||||
if (str->len > 0)
|
||||
g_string_append(str, "%c,");
|
||||
|
||||
ltoa(str, window->refnum);
|
||||
switch (window->data_level)
|
||||
{
|
||||
switch (window->data_level) {
|
||||
case DATA_LEVEL_NONE:
|
||||
break;
|
||||
case DATA_LEVEL_TEXT:
|
||||
set_color(stdscr, sbar_color_dim);
|
||||
break;
|
||||
case DATA_LEVEL_MSG:
|
||||
set_color(stdscr, sbar_color_bold);
|
||||
g_string_append(str, "%W");
|
||||
break;
|
||||
default:
|
||||
if (window->hilight_color > 0) {
|
||||
/*FIXME:if (window->hilight_color > 0) {
|
||||
int bg;
|
||||
|
||||
bg = window->hilight_bg_color == -1 ?
|
||||
sbar_color_background :
|
||||
(window->hilight_bg_color << 4);
|
||||
set_color(stdscr, bg | mirc_colors[window->hilight_color%16]);
|
||||
} else
|
||||
set_color(stdscr, sbar_color_act_highlight);
|
||||
g_string_append(str, "%M");
|
||||
} else */{
|
||||
g_string_append(str, "%M");
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (strlen(str) > size)
|
||||
break;
|
||||
g_string_sprintfa(str, "%d", window->refnum);
|
||||
}
|
||||
|
||||
size -= strlen(str);
|
||||
addstr(str);
|
||||
}
|
||||
ret = str->len == 0 ? NULL : str->str;
|
||||
g_string_free(str, ret == NULL);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* redraw activity, FIXME: if we didn't get enough size, this gets buggy.
|
||||
At least "Det:" isn't printed properly. also we should rearrange the
|
||||
act list so that the highest priority items comes first. */
|
||||
static void statusbar_activity(SBAR_ITEM_REC *item, int ypos)
|
||||
static void statusbar_activity(SBAR_ITEM_REC *item, int get_size_only)
|
||||
{
|
||||
WINDOW_REC *window;
|
||||
GList *tmp;
|
||||
gchar str[MAX_INT_STRLEN];
|
||||
int size_needed;
|
||||
gboolean act, det;
|
||||
GString *str;
|
||||
char *actlist, *detlist;
|
||||
|
||||
size_needed = 0; act = det = FALSE;
|
||||
for (tmp = activity_list; tmp != NULL; tmp = tmp->next)
|
||||
{
|
||||
window = tmp->data;
|
||||
|
||||
size_needed += 1+ltoa(str, window->refnum);
|
||||
|
||||
if (!use_colors && window->data_level >= DATA_LEVEL_HILIGHT)
|
||||
det = TRUE;
|
||||
else
|
||||
act = TRUE;
|
||||
if (use_colors) {
|
||||
actlist = get_activity_list(TRUE, TRUE);
|
||||
detlist = NULL;
|
||||
} else {
|
||||
actlist = get_activity_list(TRUE, FALSE);
|
||||
detlist = get_activity_list(FALSE, TRUE);
|
||||
}
|
||||
|
||||
if (act) size_needed += 6; /* [Act: ], -1 */
|
||||
if (det) size_needed += 6; /* [Det: ], -1 */
|
||||
if (act && det) size_needed--;
|
||||
|
||||
if (!item->shrinked && item->size != size_needed)
|
||||
{
|
||||
/* we need more (or less..) space! */
|
||||
if (statusbar_item_resize(item, size_needed))
|
||||
if (actlist == NULL && detlist == NULL) {
|
||||
if (get_size_only)
|
||||
item->min_size = item->max_size = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
if (item->size <= 7)
|
||||
return;
|
||||
str = g_string_new("%c[%w");
|
||||
|
||||
move(ypos, item->xpos);
|
||||
set_color(stdscr, sbar_color_dim); addch('[');
|
||||
if (act) draw_activity("Act: ", TRUE, !det, item->size-7);
|
||||
if (act && det) addch(' ');
|
||||
if (det) draw_activity("Det: ", FALSE, TRUE, item->size-7);
|
||||
set_color(stdscr, sbar_color_dim); addch(']');
|
||||
if (actlist != NULL) {
|
||||
g_string_append(str, "Act: ");
|
||||
g_string_append(str, actlist);
|
||||
g_free(actlist);
|
||||
}
|
||||
if (detlist != NULL) {
|
||||
if (actlist != NULL)
|
||||
g_string_append(str, " ");
|
||||
g_string_append(str, "Det: ");
|
||||
g_string_append(str, detlist);
|
||||
g_free(detlist);
|
||||
}
|
||||
|
||||
screen_refresh(NULL);
|
||||
g_string_append(str, "%c]");
|
||||
item_default(item, get_size_only, str->str);
|
||||
g_string_free(str, TRUE);
|
||||
}
|
||||
|
||||
static void sig_statusbar_activity_hilight(WINDOW_REC *window, gpointer oldlevel)
|
||||
@ -427,8 +321,7 @@ static void sig_statusbar_activity_hilight(WINDOW_REC *window, gpointer oldlevel
|
||||
|
||||
g_return_if_fail(window != NULL);
|
||||
|
||||
if (settings_get_bool("actlist_moves"))
|
||||
{
|
||||
if (settings_get_bool("actlist_moves")) {
|
||||
/* Move the window to the first in the activity list */
|
||||
if (g_list_find(activity_list, window) != NULL)
|
||||
activity_list = g_list_remove(activity_list, window);
|
||||
@ -438,18 +331,14 @@ static void sig_statusbar_activity_hilight(WINDOW_REC *window, gpointer oldlevel
|
||||
return;
|
||||
}
|
||||
|
||||
if (g_list_find(activity_list, window) != NULL)
|
||||
{
|
||||
if (g_list_find(activity_list, window) != NULL) {
|
||||
/* already in activity list */
|
||||
if (window->data_level == 0)
|
||||
{
|
||||
if (window->data_level == 0) {
|
||||
/* remove from activity list */
|
||||
activity_list = g_list_remove(activity_list, window);
|
||||
statusbar_item_redraw(activity_item);
|
||||
}
|
||||
else if (window->data_level != GPOINTER_TO_INT(oldlevel) ||
|
||||
window->hilight_color != 0)
|
||||
{
|
||||
} else if (window->data_level != GPOINTER_TO_INT(oldlevel) ||
|
||||
window->hilight_color != 0) {
|
||||
/* different level as last time (or maybe different
|
||||
hilight color?), just redraw it. */
|
||||
statusbar_item_redraw(activity_item);
|
||||
@ -462,13 +351,12 @@ static void sig_statusbar_activity_hilight(WINDOW_REC *window, gpointer oldlevel
|
||||
|
||||
/* add window to activity list .. */
|
||||
inspos = 0;
|
||||
for (tmp = activity_list; tmp != NULL; tmp = tmp->next, inspos++)
|
||||
{
|
||||
for (tmp = activity_list; tmp != NULL; tmp = tmp->next, inspos++) {
|
||||
WINDOW_REC *rec = tmp->data;
|
||||
|
||||
if (window->refnum < rec->refnum)
|
||||
{
|
||||
activity_list = g_list_insert(activity_list, window, inspos);
|
||||
if (window->refnum < rec->refnum) {
|
||||
activity_list =
|
||||
g_list_insert(activity_list, window, inspos);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -493,13 +381,9 @@ static void sig_statusbar_activity_updated(void)
|
||||
}
|
||||
|
||||
/* redraw -- more -- */
|
||||
static void statusbar_more(SBAR_ITEM_REC *item, int ypos)
|
||||
static void statusbar_more(SBAR_ITEM_REC *item, int get_size_only)
|
||||
{
|
||||
if (item->size != 10) return;
|
||||
|
||||
move(ypos, item->xpos);
|
||||
set_color(stdscr, sbar_color_bold); addstr("-- more --");
|
||||
screen_refresh(NULL);
|
||||
item_default(item, get_size_only, "%_-- more --%_");
|
||||
}
|
||||
|
||||
static void sig_statusbar_more_check_remove(WINDOW_REC *window)
|
||||
@ -522,7 +406,7 @@ static void sig_statusbar_more_check(WINDOW_REC *window)
|
||||
|
||||
if (!WINDOW_GUI(window)->bottom) {
|
||||
if (more_item == NULL) {
|
||||
more_item = statusbar_item_create(mainbar, 10, FALSE, statusbar_more);
|
||||
more_item = statusbar_item_create(mainbar, SBAR_PRIORITY_LOW, FALSE, statusbar_more);
|
||||
statusbar_redraw(mainbar);
|
||||
}
|
||||
} else if (more_item != NULL) {
|
||||
@ -531,55 +415,49 @@ static void sig_statusbar_more_check(WINDOW_REC *window)
|
||||
}
|
||||
}
|
||||
|
||||
static void statusbar_lag(SBAR_ITEM_REC *item, int ypos)
|
||||
static void statusbar_lag(SBAR_ITEM_REC *item, int get_size_only)
|
||||
{
|
||||
SERVER_REC *server;
|
||||
GString *str;
|
||||
int size_needed, lag_unknown;
|
||||
int lag_unknown;
|
||||
time_t now;
|
||||
|
||||
now = time(NULL);
|
||||
str = g_string_new(NULL);
|
||||
|
||||
server = active_win == NULL ? NULL : active_win->active_server;
|
||||
if (server == NULL || server->lag_last_check == 0)
|
||||
size_needed = 0;
|
||||
else if (server->lag_sent == 0 || now-server->lag_sent < 5) {
|
||||
lag_unknown = now-server->lag_last_check >
|
||||
MAX_LAG_UNKNOWN_TIME+settings_get_int("lag_check_time");
|
||||
|
||||
if (lag_min_show < 0 || (server->lag < lag_min_show && !lag_unknown))
|
||||
size_needed = 0; /* small lag, don't display */
|
||||
else {
|
||||
g_string_sprintf(str, "%d.%02d", server->lag/1000, (server->lag % 1000)/10);
|
||||
if (lag_unknown)
|
||||
g_string_append(str, " (??)");
|
||||
size_needed = str->len+7;
|
||||
}
|
||||
} else {
|
||||
/* big lag, still waiting .. */
|
||||
g_string_sprintf(str, "%ld (??)", (long) (now-server->lag_sent));
|
||||
size_needed = str->len+7;
|
||||
}
|
||||
|
||||
if (item->size != size_needed) {
|
||||
/* we need more (or less..) space! */
|
||||
statusbar_item_resize(item, size_needed);
|
||||
g_string_free(str, TRUE);
|
||||
if (server == NULL || server->lag_last_check == 0) {
|
||||
/* No lag information */
|
||||
if (get_size_only)
|
||||
item->min_size = item->max_size = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
if (item->size != 0) {
|
||||
lag_last_draw = now;
|
||||
move(ypos, item->xpos);
|
||||
set_color(stdscr, sbar_color_dim); addch('[');
|
||||
set_color(stdscr, sbar_color_normal); addstr("Lag: ");
|
||||
now = time(NULL);
|
||||
str = g_string_new("%c[%wLag: %_");
|
||||
|
||||
set_color(stdscr, sbar_color_bold); addstr(str->str);
|
||||
set_color(stdscr, sbar_color_dim); addch(']');
|
||||
/* FIXME: ugly ugly.. */
|
||||
if (server->lag_sent == 0 || now-server->lag_sent < 5) {
|
||||
lag_unknown = now-server->lag_last_check >
|
||||
MAX_LAG_UNKNOWN_TIME+settings_get_int("lag_check_time");
|
||||
|
||||
screen_refresh(NULL);
|
||||
if (lag_min_show < 0 || (server->lag < lag_min_show && !lag_unknown)) {
|
||||
/* small, lag, don't display */
|
||||
g_string_truncate(str, 0);
|
||||
} else {
|
||||
g_string_sprintfa(str, "%d.%02d", server->lag/1000,
|
||||
(server->lag % 1000)/10);
|
||||
if (lag_unknown)
|
||||
g_string_append(str, " (??)");
|
||||
}
|
||||
} else {
|
||||
/* big lag, still waiting .. */
|
||||
g_string_sprintfa(str, "%ld (??)",
|
||||
(long) (now-server->lag_sent));
|
||||
}
|
||||
|
||||
if (str->len > 0)
|
||||
g_string_append(str, "%c]");
|
||||
|
||||
item_default(item, get_size_only, str->str);
|
||||
|
||||
g_string_free(str, TRUE);
|
||||
}
|
||||
|
||||
@ -647,36 +525,24 @@ static int get_mail_count(void)
|
||||
return count;
|
||||
}
|
||||
|
||||
static void statusbar_mail(SBAR_ITEM_REC *item, int ypos)
|
||||
static void statusbar_mail(SBAR_ITEM_REC *item, int get_size_only)
|
||||
{
|
||||
char str[MAX_INT_STRLEN];
|
||||
int size_needed, mail_count;
|
||||
char countstr[MAX_INT_STRLEN], *str;
|
||||
int mail_count;
|
||||
|
||||
mail_count = settings_get_bool("mail_counter") ? get_mail_count() : 0;
|
||||
|
||||
ltoa(str, mail_count);
|
||||
if (*str == '\0' || mail_count <= 0)
|
||||
size_needed = 0;
|
||||
else
|
||||
size_needed = strlen(str) + 8;
|
||||
|
||||
if (item->size != size_needed) {
|
||||
/* we need more (or less..) space! */
|
||||
statusbar_item_resize(item, size_needed);
|
||||
if (mail_count <= 0) {
|
||||
if (get_size_only)
|
||||
item->min_size = item->max_size = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
if (size_needed == 0)
|
||||
return;
|
||||
ltoa(countstr, mail_count);
|
||||
str = g_strconcat("%c[%wMail: %_", countstr, "%_%c]", NULL);
|
||||
|
||||
move(ypos, item->xpos);
|
||||
set_color(stdscr, sbar_color_dim); addch('[');
|
||||
set_color(stdscr, sbar_color_normal); addstr("Mail: ");
|
||||
|
||||
set_color(stdscr, sbar_color_bold); addstr(str);
|
||||
set_color(stdscr, sbar_color_dim); addch(']');
|
||||
|
||||
screen_refresh(NULL);
|
||||
item_default(item, get_size_only, str);
|
||||
g_free(str);
|
||||
}
|
||||
|
||||
static int statusbar_mail_timeout(void)
|
||||
@ -685,40 +551,9 @@ static int statusbar_mail_timeout(void)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void statusbar_topic(SBAR_ITEM_REC *item, int ypos)
|
||||
static void statusbar_topic(SBAR_ITEM_REC *item, int get_size_only)
|
||||
{
|
||||
CHANNEL_REC *channel;
|
||||
QUERY_REC *query;
|
||||
char *str, *topic;
|
||||
|
||||
if (item->size != COLS-2) {
|
||||
/* get all space for topic */
|
||||
statusbar_item_resize(item, COLS-2);
|
||||
return;
|
||||
}
|
||||
|
||||
move(ypos, item->xpos);
|
||||
set_bg(stdscr, settings_get_int("statusbar_background") << 4);
|
||||
clrtoeol(); set_bg(stdscr, 0);
|
||||
|
||||
if (active_win == NULL)
|
||||
return;
|
||||
|
||||
topic = NULL;
|
||||
channel = CHANNEL(active_win->active);
|
||||
query = QUERY(active_win->active);
|
||||
if (channel != NULL && channel->topic != NULL) topic = channel->topic;
|
||||
if (query != NULL && query->address != NULL) topic = query->address;
|
||||
|
||||
if (topic != NULL) {
|
||||
topic = strip_codes(topic);
|
||||
str = g_strdup_printf("%.*s", item->size, topic);
|
||||
set_color(stdscr, sbar_color_normal); addstr(str);
|
||||
g_free(str);
|
||||
g_free(topic);
|
||||
}
|
||||
|
||||
screen_refresh(NULL);
|
||||
item_default(item, get_size_only, "$topic");
|
||||
}
|
||||
|
||||
static void sig_statusbar_topic_redraw(void)
|
||||
@ -744,7 +579,7 @@ static void topicbar_create(void)
|
||||
return;
|
||||
|
||||
topic_bar = statusbar_create(STATUSBAR_POS_UP, 0);
|
||||
topic_item = statusbar_item_create(topic_bar, 0, FALSE, statusbar_topic);
|
||||
topic_item = statusbar_item_create(topic_bar, SBAR_PRIORITY_NORMAL, FALSE, statusbar_topic);
|
||||
topic_item->max_size = TRUE;
|
||||
statusbar_redraw(topic_bar);
|
||||
|
||||
@ -784,18 +619,18 @@ static void mainbar_add_items(MAIN_WINDOW_REC *window)
|
||||
mainbar = window->statusbar;
|
||||
mainbar_window = window;
|
||||
|
||||
clock_item = statusbar_item_create(mainbar, 7, FALSE, statusbar_clock);
|
||||
nick_item = statusbar_item_create(mainbar, 2, FALSE, statusbar_nick);
|
||||
channel_item = statusbar_item_create(mainbar, 2, FALSE, statusbar_channel);
|
||||
mail_item = statusbar_item_create(mainbar, 0, FALSE, statusbar_mail);
|
||||
lag_item = statusbar_item_create(mainbar, 0, FALSE, statusbar_lag);
|
||||
activity_item = statusbar_item_create(mainbar, 0, FALSE, statusbar_activity);
|
||||
clock_item = statusbar_item_create(mainbar, SBAR_PRIORITY_HIGH, FALSE, statusbar_clock);
|
||||
nick_item = statusbar_item_create(mainbar, SBAR_PRIORITY_NORMAL, FALSE, statusbar_nick);
|
||||
channel_item = statusbar_item_create(mainbar, SBAR_PRIORITY_NORMAL, FALSE, statusbar_channel);
|
||||
mail_item = statusbar_item_create(mainbar, SBAR_PRIORITY_LOW, FALSE, statusbar_mail);
|
||||
lag_item = statusbar_item_create(mainbar, SBAR_PRIORITY_LOW, FALSE, statusbar_lag);
|
||||
activity_item = statusbar_item_create(mainbar, SBAR_PRIORITY_HIGH, FALSE, statusbar_activity);
|
||||
}
|
||||
|
||||
static void sidebar_add_items(MAIN_WINDOW_REC *window)
|
||||
{
|
||||
window->statusbar_channel_item =
|
||||
statusbar_item_create(window->statusbar, 3, FALSE, statusbar_channel);
|
||||
statusbar_item_create(window->statusbar, SBAR_PRIORITY_NORMAL, FALSE, statusbar_channel);
|
||||
}
|
||||
|
||||
static void sidebar_remove_items(MAIN_WINDOW_REC *window)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
gui-statusbar.c : irssi
|
||||
statusbar.c : irssi
|
||||
|
||||
Copyright (C) 1999 Timo Sirainen
|
||||
Copyright (C) 1999-2001 Timo Sirainen
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -34,7 +34,6 @@ void statusbar_items_deinit(void);
|
||||
|
||||
static GSList *statusbars;
|
||||
static int sbar_uppest, sbar_lowest, sbars_up, sbars_down;
|
||||
static int item_max_size;
|
||||
|
||||
static void statusbar_item_destroy(SBAR_ITEM_REC *rec)
|
||||
{
|
||||
@ -42,37 +41,112 @@ static void statusbar_item_destroy(SBAR_ITEM_REC *rec)
|
||||
g_free(rec);
|
||||
}
|
||||
|
||||
static int sbar_item_cmp(SBAR_ITEM_REC *item1, SBAR_ITEM_REC *item2)
|
||||
{
|
||||
return item1->priority == item2->priority ? 0 :
|
||||
item1->priority < item2->priority ? -1 : 1;
|
||||
}
|
||||
|
||||
static int statusbar_shrink_to_min(GSList *items, int size, int max_width)
|
||||
{
|
||||
GSList *tmp;
|
||||
|
||||
for (tmp = items; tmp != NULL; tmp = tmp->next) {
|
||||
SBAR_ITEM_REC *rec = tmp->data;
|
||||
|
||||
size -= (rec->max_size-rec->min_size);
|
||||
rec->size = rec->min_size;
|
||||
|
||||
if (size <= max_width) {
|
||||
rec->size += max_width-size;
|
||||
break;
|
||||
}
|
||||
|
||||
if (rec->size == 0) {
|
||||
/* min_size was 0, item removed.
|
||||
remove the marginal too */
|
||||
size--;
|
||||
}
|
||||
}
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
static void statusbar_shrink_forced(GSList *items, int size, int max_width)
|
||||
{
|
||||
GSList *tmp;
|
||||
|
||||
for (tmp = items; tmp != NULL; tmp = tmp->next) {
|
||||
SBAR_ITEM_REC *rec = tmp->data;
|
||||
|
||||
if (size-rec->size > max_width) {
|
||||
/* remove the whole item */
|
||||
size -= rec->size-1; /* -1 == the marginal */
|
||||
rec->size = 0;
|
||||
} else {
|
||||
/* shrink the item */
|
||||
rec->size -= size-max_width;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void statusbar_get_sizes(STATUSBAR_REC *bar, int max_width)
|
||||
{
|
||||
GSList *tmp, *prior_sorted;
|
||||
int width;
|
||||
|
||||
/* first give items their max. size */
|
||||
prior_sorted = NULL;
|
||||
width = -1; /* -1 because of the marginals */
|
||||
for (tmp = bar->items; tmp != NULL; tmp = tmp->next) {
|
||||
SBAR_ITEM_REC *rec = tmp->data;
|
||||
|
||||
rec->func(rec, TRUE);
|
||||
rec->size = rec->max_size;
|
||||
|
||||
if (rec->size > 0) {
|
||||
/* +1 == marginal between items */
|
||||
width += rec->max_size+1;
|
||||
|
||||
prior_sorted = g_slist_insert_sorted(prior_sorted, rec,
|
||||
(GCompareFunc)
|
||||
sbar_item_cmp);
|
||||
}
|
||||
}
|
||||
|
||||
if (width > max_width) {
|
||||
/* too big, start shrinking from items with lowest priority
|
||||
and shrink until everything fits or until we've shrinked
|
||||
all items. */
|
||||
width = statusbar_shrink_to_min(prior_sorted, width,
|
||||
max_width);
|
||||
if (width > max_width) {
|
||||
/* still need to shrink, remove the items with lowest
|
||||
priority until everything fits to screen */
|
||||
statusbar_shrink_forced(prior_sorted, width,
|
||||
max_width);
|
||||
}
|
||||
}
|
||||
|
||||
g_slist_free(prior_sorted);
|
||||
}
|
||||
|
||||
static void statusbar_redraw_line(STATUSBAR_REC *bar)
|
||||
{
|
||||
static int recurses = 0, resized = FALSE;
|
||||
STATUSBAR_FUNC func;
|
||||
GSList *tmp;
|
||||
int xpos, rxpos, old_resized;
|
||||
int xpos, rxpos;
|
||||
|
||||
old_resized = resized;
|
||||
resized = FALSE;
|
||||
recurses++;
|
||||
statusbar_get_sizes(bar, COLS-2);
|
||||
|
||||
xpos = 1;
|
||||
for (tmp = bar->items; tmp != NULL; tmp = tmp->next) {
|
||||
SBAR_ITEM_REC *rec = tmp->data;
|
||||
|
||||
if (!rec->right_justify &&
|
||||
(rec->max_size || xpos < COLS)) {
|
||||
if (!rec->right_justify && rec->size > 0) {
|
||||
rec->xpos = xpos;
|
||||
if (rec->max_size)
|
||||
rec->size = COLS-1-xpos;
|
||||
|
||||
rec->shrinked = xpos+rec->size >= COLS;
|
||||
if (rec->shrinked)
|
||||
rec->size = COLS-1-xpos;
|
||||
|
||||
item_max_size = COLS-1-xpos;
|
||||
func = (STATUSBAR_FUNC) rec->func;
|
||||
func(rec, bar->ypos);
|
||||
|
||||
if (resized) break;
|
||||
if (rec->size > 0) xpos += rec->size+1;
|
||||
xpos += rec->size+1;
|
||||
rec->func(rec, FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,31 +154,18 @@ static void statusbar_redraw_line(STATUSBAR_REC *bar)
|
||||
for (tmp = bar->items; tmp != NULL; tmp = tmp->next) {
|
||||
SBAR_ITEM_REC *rec = tmp->data;
|
||||
|
||||
if (rec->right_justify && rxpos-rec->size > xpos) {
|
||||
rec->xpos = rxpos-rec->size;
|
||||
|
||||
item_max_size = rxpos-xpos;
|
||||
func = (STATUSBAR_FUNC) rec->func;
|
||||
func(rec, bar->ypos);
|
||||
|
||||
if (resized) break;
|
||||
if (rec->size > 0) rxpos -= rec->size+1;
|
||||
if (rec->right_justify && rec->size > 0) {
|
||||
rxpos -= rec->size+1;
|
||||
rec->xpos = rxpos+1;
|
||||
rec->func(rec, FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
resized = old_resized;
|
||||
if (--recurses > 0) resized = TRUE;
|
||||
}
|
||||
|
||||
static void statusbar_redraw_all(void)
|
||||
{
|
||||
GSList *tmp;
|
||||
|
||||
screen_refresh_freeze();
|
||||
|
||||
for (tmp = statusbars; tmp != NULL; tmp = tmp->next)
|
||||
statusbar_redraw(tmp->data);
|
||||
|
||||
g_slist_foreach(statusbars, (GFunc) statusbar_redraw, NULL);
|
||||
screen_refresh_thaw();
|
||||
}
|
||||
|
||||
@ -134,16 +195,21 @@ void statusbar_redraw(STATUSBAR_REC *bar)
|
||||
set_bg(stdscr, 0);
|
||||
|
||||
statusbar_redraw_line(bar);
|
||||
|
||||
screen_refresh(NULL);
|
||||
}
|
||||
|
||||
void statusbar_item_redraw(SBAR_ITEM_REC *item)
|
||||
{
|
||||
STATUSBAR_FUNC func;
|
||||
|
||||
g_return_if_fail(item != NULL);
|
||||
|
||||
func = (STATUSBAR_FUNC) item->func;
|
||||
func(item, item->bar->ypos);
|
||||
item->func(item, TRUE);
|
||||
if (item->max_size != item->size)
|
||||
statusbar_redraw(item->bar);
|
||||
else {
|
||||
item->func(item, FALSE);
|
||||
screen_refresh(NULL);
|
||||
}
|
||||
}
|
||||
|
||||
/* ypos is used only when pos == STATUSBAR_POS_MIDDLE */
|
||||
@ -186,7 +252,7 @@ static void statusbars_pack(int pos, int line)
|
||||
|
||||
if (rec->pos == pos && rec->line > line) {
|
||||
rec->line--;
|
||||
rec->ypos += pos == STATUSBAR_POS_UP ? -1 : 1;
|
||||
rec->ypos += (pos == STATUSBAR_POS_UP ? -1 : 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -212,7 +278,9 @@ void statusbar_destroy(STATUSBAR_REC *bar)
|
||||
if (!quitting) statusbar_redraw_all();
|
||||
}
|
||||
|
||||
SBAR_ITEM_REC *statusbar_item_create(STATUSBAR_REC *bar, int size, int right_justify, STATUSBAR_FUNC func)
|
||||
SBAR_ITEM_REC *statusbar_item_create(STATUSBAR_REC *bar,
|
||||
int priority, int right_justify,
|
||||
STATUSBAR_FUNC func)
|
||||
{
|
||||
SBAR_ITEM_REC *rec;
|
||||
|
||||
@ -223,29 +291,13 @@ SBAR_ITEM_REC *statusbar_item_create(STATUSBAR_REC *bar, int size, int right_jus
|
||||
rec->bar = bar;
|
||||
bar->items = g_slist_append(bar->items, rec);
|
||||
|
||||
rec->xpos = -1;
|
||||
rec->size = size;
|
||||
rec->priority = priority;
|
||||
rec->right_justify = right_justify;
|
||||
rec->func = (void *) func;
|
||||
rec->func = func;
|
||||
|
||||
return rec;
|
||||
}
|
||||
|
||||
int statusbar_item_resize(SBAR_ITEM_REC *item, int size)
|
||||
{
|
||||
g_return_val_if_fail(item != NULL, FALSE);
|
||||
|
||||
if (item->size >= item_max_size)
|
||||
return FALSE;
|
||||
|
||||
if (size > item_max_size)
|
||||
size = item_max_size;
|
||||
|
||||
item->size = size;
|
||||
statusbar_redraw_all();
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void statusbar_item_remove(SBAR_ITEM_REC *item)
|
||||
{
|
||||
g_return_if_fail(item != NULL);
|
||||
|
||||
@ -1,12 +1,19 @@
|
||||
#ifndef __STATUSBAR_H
|
||||
#define __STATUSBAR_H
|
||||
|
||||
#define SBAR_PRIORITY_HIGH 100
|
||||
#define SBAR_PRIORITY_NORMAL 0
|
||||
#define SBAR_PRIORITY_LOW -100
|
||||
|
||||
enum {
|
||||
STATUSBAR_POS_UP,
|
||||
STATUSBAR_POS_MIDDLE,
|
||||
STATUSBAR_POS_DOWN
|
||||
};
|
||||
|
||||
typedef struct SBAR_ITEM_REC SBAR_ITEM_REC;
|
||||
typedef void (*STATUSBAR_FUNC) (SBAR_ITEM_REC *item, int get_size_only);
|
||||
|
||||
typedef struct {
|
||||
int pos;
|
||||
int line;
|
||||
@ -15,16 +22,18 @@ typedef struct {
|
||||
GSList *items;
|
||||
} STATUSBAR_REC;
|
||||
|
||||
typedef struct {
|
||||
struct SBAR_ITEM_REC {
|
||||
STATUSBAR_REC *bar;
|
||||
STATUSBAR_FUNC func;
|
||||
|
||||
/* what item wants */
|
||||
int priority;
|
||||
int min_size, max_size;
|
||||
unsigned int right_justify:1;
|
||||
|
||||
/* what item gets */
|
||||
int xpos, size;
|
||||
int shrinked; /* couldn't give the requested size */
|
||||
int right_justify, max_size;
|
||||
void *func;
|
||||
} SBAR_ITEM_REC;
|
||||
|
||||
typedef void (*STATUSBAR_FUNC) (SBAR_ITEM_REC *item, int ypos);
|
||||
};
|
||||
|
||||
/* ypos is used only when pos == STATUSBAR_POS_MIDDLE */
|
||||
STATUSBAR_REC *statusbar_create(int pos, int ypos);
|
||||
@ -32,8 +41,9 @@ void statusbar_destroy(STATUSBAR_REC *bar);
|
||||
|
||||
STATUSBAR_REC *statusbar_find(int pos, int line);
|
||||
|
||||
SBAR_ITEM_REC *statusbar_item_create(STATUSBAR_REC *bar, int size, gboolean right_justify, STATUSBAR_FUNC func);
|
||||
int statusbar_item_resize(SBAR_ITEM_REC *item, int size);
|
||||
SBAR_ITEM_REC *statusbar_item_create(STATUSBAR_REC *bar,
|
||||
int priority, int right_justify,
|
||||
STATUSBAR_FUNC func);
|
||||
void statusbar_item_remove(SBAR_ITEM_REC *item);
|
||||
|
||||
/* redraw statusbar, NULL = all */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user