comparison mcabber/screen.c @ 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 eb31418b48df
children b8815158a45d
comparison
equal deleted inserted replaced
8:4c1affca7aea 9:455ab6bc14ac
165 165
166 tmp->win = newwin(lines, cols, y, x); 166 tmp->win = newwin(lines, cols, y, x);
167 tmp->panel = new_panel(tmp->win); 167 tmp->panel = new_panel(tmp->win);
168 tmp->name = (char *) calloc(1, 1024); 168 tmp->name = (char *) calloc(1, 1024);
169 strncpy(tmp->name, title, 1024); 169 strncpy(tmp->name, title, 1024);
170 /* 170
171 if (!dont_show) {
172 currentWindow = tmp;
173 scr_draw_box(tmp->win, 0, 0, lines, cols, COLOR_GENERAL, 0, 0);
174 mvwprintw(tmp->win, 0, (cols - (2 + strlen(title))) / 2, " %s ", title);
175 }
176 */
177 // ***
178 scr_draw_box(tmp->win, 0, 0, lines, cols, COLOR_GENERAL, 0, 0); 171 scr_draw_box(tmp->win, 0, 0, lines, cols, COLOR_GENERAL, 0, 0);
179 mvwprintw(tmp->win, 0, (cols - (2 + strlen(title))) / 2, " %s ", title); 172 mvwprintw(tmp->win, 0, (cols - (2 + strlen(title))) / 2, " %s ", title);
180 if (!dont_show) { 173 if (!dont_show) {
181 currentWindow = tmp; 174 currentWindow = tmp;
182 } else { 175 } else {
183 top_panel(currentWindow->panel); 176 if (currentWindow)
184 } 177 top_panel(currentWindow->panel);
185 // *** 178 else
179 top_panel(chatPanel);
180 }
181
186 list_add_tail(&tmp->list, &window_list); 182 list_add_tail(&tmp->list, &window_list);
187 update_panels(); 183 update_panels();
188 184
189 return tmp; 185 return tmp;
190 } 186 }
351 mvwprintw(tmp->win, n + 1, 1, ""); 347 mvwprintw(tmp->win, n + 1, 1, "");
352 for (i = 0; i < width - 2; i++) 348 for (i = 0; i < width - 2; i++)
353 waddch(tmp->win, ' '); 349 waddch(tmp->win, ' ');
354 mvwprintw(tmp->win, n + 1, 1, "%s", tmp->texto[n]); 350 mvwprintw(tmp->win, n + 1, 1, "%s", tmp->texto[n]);
355 } 351 }
356 move(CHAT_WIN_HEIGHT - 1, maxX - 1); 352 //move(CHAT_WIN_HEIGHT - 1, maxX - 1);
357 update_panels(); 353 update_panels();
358 doupdate(); 354 doupdate();
359 } 355 }
360 } 356 }
361 357
372 time_t ahora; 368 time_t ahora;
373 int n; 369 int n;
374 int i; 370 int i;
375 int width; 371 int width;
376 window_entry_t *tmp; 372 window_entry_t *tmp;
377 int dont_show = 0; 373 int dont_show = FALSE;
378 374
379 375
380 tmp = scr_SearchWindow(winId); 376 tmp = scr_SearchWindow(winId);
381 377
382 if ((currentWindow) && (currentWindow != tmp)) 378 if (!currentWindow || (currentWindow != tmp))
383 dont_show = 1; 379 dont_show = TRUE;
380 scr_LogPrint("dont_show=%d", dont_show);
384 381
385 if (tmp == NULL) { 382 if (tmp == NULL) {
386 tmp = scr_CreatePanel(winId, 20, 0, CHAT_WIN_HEIGHT, maxX - 20, dont_show); 383 tmp = scr_CreatePanel(winId, 20, 0, CHAT_WIN_HEIGHT, maxX - 20, dont_show);
387 tmp->texto = (char **) calloc((CHAT_WIN_HEIGHT+1) * 3, sizeof(char *)); 384 tmp->texto = (char **) calloc((CHAT_WIN_HEIGHT+1) * 3, sizeof(char *));
388 for (n = 0; n < CHAT_WIN_HEIGHT * 3; n++) 385 for (n = 0; n < CHAT_WIN_HEIGHT * 3; n++)
718 *ptr_inputline = 0; 715 *ptr_inputline = 0;
719 break; 716 break;
720 case KEY_UP: 717 case KEY_UP:
721 bud_RosterUp(); 718 bud_RosterUp();
722 scr_ShowBuddyWindow(); 719 scr_ShowBuddyWindow();
720 top_panel(inputPanel);
723 break; 721 break;
724 case KEY_DOWN: 722 case KEY_DOWN:
725 bud_RosterDown(); 723 bud_RosterDown();
726 scr_ShowBuddyWindow(); 724 scr_ShowBuddyWindow();
725 top_panel(inputPanel);
727 break; 726 break;
728 case KEY_PPAGE: 727 case KEY_PPAGE:
729 scr_LogPrint("PageUp??"); 728 scr_LogPrint("PageUp??");
730 break; 729 break;
731 case KEY_NPAGE: 730 case KEY_NPAGE: