aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

/WINDOW MOVE UP|DOWN might have crashed.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1780 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-09-09 12:12:28 +00:00 committed by cras
parent 5c45593f02
commit 8e3005a1c1
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/fe-text/mainwindows.c
View File

@ -108,15 +108,24 @@ static GSList *get_sticky_windows_sorted(MAIN_WINDOW_REC *mainwin)
void mainwindow_change_active(MAIN_WINDOW_REC *mainwin, void mainwindow_change_active(MAIN_WINDOW_REC *mainwin,
WINDOW_REC *skip_window) WINDOW_REC *skip_window)
{ {
WINDOW_REC *window;
GSList *tmp; GSList *tmp;
mainwin->active = NULL; mainwin->active = NULL;
if (mainwin->sticky_windows) { if (mainwin->sticky_windows) {
/* sticky window */ /* sticky window */
tmp = get_sticky_windows_sorted(mainwin); tmp = get_sticky_windows_sorted(mainwin);
window_set_active(tmp->data); window = tmp->data;
if (window == skip_window) {
window = tmp->next == NULL ? NULL :
tmp->next->data;
}
g_slist_free(tmp); g_slist_free(tmp);
return;
if (window != NULL) {
window_set_active(window);
return;
}
} }
for (tmp = windows; tmp != NULL; tmp = tmp->next) { for (tmp = windows; tmp != NULL; tmp = tmp->next) {
@ -129,7 +138,7 @@ void mainwindow_change_active(MAIN_WINDOW_REC *mainwin,
} }
/* no more non-sticky windows, remove main window */ /* no more non-sticky windows, remove main window */
mainwindow_destroy(mainwin); mainwindow_destroy(mainwin);
} }
void mainwindows_recreate(void) void mainwindows_recreate(void)
@ -814,11 +823,18 @@ static void window_reparent(WINDOW_REC *win, MAIN_WINDOW_REC *mainwin)
old_mainwin = WINDOW_MAIN(win); old_mainwin = WINDOW_MAIN(win);
if (old_mainwin != mainwin) { if (old_mainwin != mainwin) {
gui_window_set_unsticky(win);
if (old_mainwin->active == win) {
mainwindow_change_active(old_mainwin, win);
if (active_mainwin == NULL) {
active_mainwin = mainwin;
window_set_active(mainwin->active);
}
}
gui_window_reparent(win, mainwin); gui_window_reparent(win, mainwin);
window_set_active(win); window_set_active(win);
if (old_mainwin->active == win)
mainwindow_change_active(old_mainwin, win);
} }
} }
@ -890,7 +906,7 @@ static void cmd_window_move_up(void)
MAIN_WINDOW_REC *rec; MAIN_WINDOW_REC *rec;
rec = mainwindows_find_upper(active_mainwin->first_line); rec = mainwindows_find_upper(active_mainwin->first_line);
if (rec != NULL) if (rec != NULL)
window_reparent(active_win, rec); window_reparent(active_win, rec);
} }