Mercurial > hg
changeset 9:455ab6bc14ac
[/trunk] Changeset 24 by mikael
* Dont show incoming message if we are in the Status Window (no automatic
switching)
* Some cleanup...
author | mikael |
---|---|
date | Sat, 19 Mar 2005 16:30:33 +0000 |
parents | 4c1affca7aea |
children | 3489a75cb115 |
files | mcabber/buddies.c mcabber/screen.c |
diffstat | 2 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/buddies.c Sat Mar 19 12:45:11 2005 +0000 +++ b/mcabber/buddies.c Sat Mar 19 16:30:33 2005 +0000 @@ -49,7 +49,8 @@ sprintf(buffer, "--> %s %s!", jidfrom, i18n("connected")); break; } - scr_WriteInWindow(i18n("status window"), buffer, TRUE); + //scr_WriteInWindow(i18n("status window"), buffer, TRUE); + scr_LogPrint("%s", buffer); } free(buffer); }
--- a/mcabber/screen.c Sat Mar 19 12:45:11 2005 +0000 +++ b/mcabber/screen.c Sat Mar 19 16:30:33 2005 +0000 @@ -167,22 +167,18 @@ tmp->panel = new_panel(tmp->win); tmp->name = (char *) calloc(1, 1024); strncpy(tmp->name, title, 1024); - /* - if (!dont_show) { - currentWindow = tmp; - scr_draw_box(tmp->win, 0, 0, lines, cols, COLOR_GENERAL, 0, 0); - mvwprintw(tmp->win, 0, (cols - (2 + strlen(title))) / 2, " %s ", title); - } - */ - // *** + scr_draw_box(tmp->win, 0, 0, lines, cols, COLOR_GENERAL, 0, 0); mvwprintw(tmp->win, 0, (cols - (2 + strlen(title))) / 2, " %s ", title); if (!dont_show) { currentWindow = tmp; } else { - top_panel(currentWindow->panel); + if (currentWindow) + top_panel(currentWindow->panel); + else + top_panel(chatPanel); } - // *** + list_add_tail(&tmp->list, &window_list); update_panels(); @@ -353,7 +349,7 @@ waddch(tmp->win, ' '); mvwprintw(tmp->win, n + 1, 1, "%s", tmp->texto[n]); } - move(CHAT_WIN_HEIGHT - 1, maxX - 1); + //move(CHAT_WIN_HEIGHT - 1, maxX - 1); update_panels(); doupdate(); } @@ -374,13 +370,14 @@ int i; int width; window_entry_t *tmp; - int dont_show = 0; + int dont_show = FALSE; tmp = scr_SearchWindow(winId); - if ((currentWindow) && (currentWindow != tmp)) - dont_show = 1; + if (!currentWindow || (currentWindow != tmp)) + dont_show = TRUE; + scr_LogPrint("dont_show=%d", dont_show); if (tmp == NULL) { tmp = scr_CreatePanel(winId, 20, 0, CHAT_WIN_HEIGHT, maxX - 20, dont_show); @@ -720,10 +717,12 @@ case KEY_UP: bud_RosterUp(); scr_ShowBuddyWindow(); + top_panel(inputPanel); break; case KEY_DOWN: bud_RosterDown(); scr_ShowBuddyWindow(); + top_panel(inputPanel); break; case KEY_PPAGE: scr_LogPrint("PageUp??");