aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-01-03 14:56:47 -05:00
Code

When server is disconnected, change to use some other server in windows

Browse Source 
where the server was active, instead of just setting the server to NULL.

Ctrl-X didn't work right if there was no active server in window.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@574 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-08-04 15:52:32 +00:00 committed by cras
parent 8209e131d9
commit bcd7b636ed
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fe-common/core/windows.c
View File

@ -382,14 +382,16 @@ static void sig_server_looking(void *server)
static void sig_server_disconnected(void *server) static void sig_server_disconnected(void *server)
{ {
GSList *tmp; GSList *tmp;
SERVER_REC *new_server;
g_return_if_fail(server != NULL); g_return_if_fail(server != NULL);
new_server = servers == NULL ? NULL : servers->data;
for (tmp = windows; tmp != NULL; tmp = tmp->next) { for (tmp = windows; tmp != NULL; tmp = tmp->next) {
WINDOW_REC *rec = tmp->data; WINDOW_REC *rec = tmp->data;
if (rec->active_server == server) if (rec->active_server == server)
window_change_server(rec, NULL); window_change_server(rec, new_server);
} }
} }

12
src/fe-text/gui-readline.c
View File

@ -451,10 +451,14 @@ static void key_previous_window_item(void)
if (active_win->items != NULL) if (active_win->items != NULL)
signal_emit("command window item prev", 3, "", active_win->active_server, active_win->active); signal_emit("command window item prev", 3, "", active_win->active_server, active_win->active);
else if (active_win->active_server != NULL) { else if (servers != NULL) {
/* change server */ /* change server */
if (active_win->active_server == NULL)
server = servers->data;
else {
pos = g_slist_find(servers, active_win->active_server); pos = g_slist_find(servers, active_win->active_server);
server = pos->next != NULL ? pos->next->data : servers->data; server = pos->next != NULL ? pos->next->data : servers->data;
}
signal_emit("command window server", 3, server->tag, active_win->active_server, active_win->active); signal_emit("command window server", 3, server->tag, active_win->active_server, active_win->active);
} }
} }
@ -466,11 +470,15 @@ static void key_next_window_item(void)
if (active_win->items != NULL) if (active_win->items != NULL)
signal_emit("command window item next", 3, "", active_win->active_server, active_win->active); signal_emit("command window item next", 3, "", active_win->active_server, active_win->active);
else if (active_win->active_server != NULL) { else if (servers != NULL) {
/* change server */ /* change server */
if (active_win->active_server == NULL)
server = servers->data;
else {
index = g_slist_index(servers, active_win->active_server); index = g_slist_index(servers, active_win->active_server);
server = index > 0 ? g_slist_nth(servers, index-1)->data : server = index > 0 ? g_slist_nth(servers, index-1)->data :
g_slist_last(servers)->data; g_slist_last(servers)->data;
}
signal_emit("command window server", 3, server->tag, active_win->active_server, active_win->active); signal_emit("command window server", 3, server->tag, active_win->active_server, active_win->active);
} }
} }