mirror of
https://github.com/irssi/irssi.git
synced 2024-09-08 04:26:01 -04:00
statusbar is now also updated for connecting-servers.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2922 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
a83366069f
commit
3dda9ab2df
@ -591,6 +591,7 @@ void expandos_init(void)
|
|||||||
"channel mode changed", EXPANDO_ARG_WINDOW_ITEM, NULL);
|
"channel mode changed", EXPANDO_ARG_WINDOW_ITEM, NULL);
|
||||||
expando_create("N", expando_nick,
|
expando_create("N", expando_nick,
|
||||||
"window changed", EXPANDO_ARG_NONE,
|
"window changed", EXPANDO_ARG_NONE,
|
||||||
|
"window connect changed", EXPANDO_ARG_WINDOW, NULL,
|
||||||
"window server changed", EXPANDO_ARG_WINDOW,
|
"window server changed", EXPANDO_ARG_WINDOW,
|
||||||
"server nick changed", EXPANDO_ARG_SERVER, NULL);
|
"server nick changed", EXPANDO_ARG_SERVER, NULL);
|
||||||
expando_create("O", expando_statusoper,
|
expando_create("O", expando_statusoper,
|
||||||
@ -618,6 +619,7 @@ void expandos_init(void)
|
|||||||
expando_create("W", expando_workdir, NULL);
|
expando_create("W", expando_workdir, NULL);
|
||||||
expando_create("Y", expando_realname,
|
expando_create("Y", expando_realname,
|
||||||
"window changed", EXPANDO_ARG_NONE,
|
"window changed", EXPANDO_ARG_NONE,
|
||||||
|
"window connect changed", EXPANDO_ARG_WINDOW, NULL,
|
||||||
"window server changed", EXPANDO_ARG_WINDOW, NULL);
|
"window server changed", EXPANDO_ARG_WINDOW, NULL);
|
||||||
expando_create("Z", expando_time,
|
expando_create("Z", expando_time,
|
||||||
"time changed", EXPANDO_ARG_NONE, NULL);
|
"time changed", EXPANDO_ARG_NONE, NULL);
|
||||||
@ -637,9 +639,11 @@ void expandos_init(void)
|
|||||||
"query address changed", EXPANDO_ARG_WINDOW_ITEM, NULL);
|
"query address changed", EXPANDO_ARG_WINDOW_ITEM, NULL);
|
||||||
expando_create("tag", expando_servertag,
|
expando_create("tag", expando_servertag,
|
||||||
"window changed", EXPANDO_ARG_NONE,
|
"window changed", EXPANDO_ARG_NONE,
|
||||||
|
"window connect changed", EXPANDO_ARG_WINDOW, NULL,
|
||||||
"window server changed", EXPANDO_ARG_WINDOW, NULL);
|
"window server changed", EXPANDO_ARG_WINDOW, NULL);
|
||||||
expando_create("chatnet", expando_chatnet,
|
expando_create("chatnet", expando_chatnet,
|
||||||
"window changed", EXPANDO_ARG_NONE,
|
"window changed", EXPANDO_ARG_NONE,
|
||||||
|
"window connect changed", EXPANDO_ARG_WINDOW, NULL,
|
||||||
"window server changed", EXPANDO_ARG_WINDOW, NULL);
|
"window server changed", EXPANDO_ARG_WINDOW, NULL);
|
||||||
expando_create("itemname", expando_itemname,
|
expando_create("itemname", expando_itemname,
|
||||||
"window changed", EXPANDO_ARG_NONE,
|
"window changed", EXPANDO_ARG_NONE,
|
||||||
|
@ -253,10 +253,11 @@ static int data_is_empty(const char **data)
|
|||||||
{
|
{
|
||||||
/* since we don't know the real argument list, assume there's always
|
/* since we don't know the real argument list, assume there's always
|
||||||
an argument in them */
|
an argument in them */
|
||||||
char *arglist[] = {
|
static char *arglist[] = {
|
||||||
"x", "x", "x", "x", "x", "x","x", "x", "x", "x",
|
"x", "x", "x", "x", "x", "x","x", "x", "x", "x",
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
SERVER_REC *server;
|
||||||
const char *p;
|
const char *p;
|
||||||
char *ret;
|
char *ret;
|
||||||
int free_ret, empty;
|
int free_ret, empty;
|
||||||
@ -277,8 +278,12 @@ static int data_is_empty(const char **data)
|
|||||||
|
|
||||||
/* variable - check if it's empty */
|
/* variable - check if it's empty */
|
||||||
p++;
|
p++;
|
||||||
ret = parse_special((char **) &p,
|
|
||||||
active_win == NULL ? NULL : active_win->active_server,
|
server = active_win == NULL ? NULL :
|
||||||
|
active_win->active_server != NULL ?
|
||||||
|
active_win->active_server : active_win->connect_server;
|
||||||
|
|
||||||
|
ret = parse_special((char **) &p, server,
|
||||||
active_win == NULL ? NULL : active_win->active,
|
active_win == NULL ? NULL : active_win->active,
|
||||||
arglist, &free_ret, NULL, 0);
|
arglist, &free_ret, NULL, 0);
|
||||||
p++;
|
p++;
|
||||||
|
@ -699,8 +699,9 @@ void statusbar_item_default_handler(SBAR_ITEM_REC *item, int get_size_only,
|
|||||||
server = NULL;
|
server = NULL;
|
||||||
wiitem = NULL;
|
wiitem = NULL;
|
||||||
} else {
|
} else {
|
||||||
server = active_win->active_server;
|
server = active_win->active_server != NULL ?
|
||||||
wiitem = active_win->active;
|
active_win->active_server : active_win->connect_server;
|
||||||
|
wiitem = active_win->active;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* expand templates */
|
/* expand templates */
|
||||||
|
Loading…
Reference in New Issue
Block a user