# HG changeset patch
# User mikael
# Date 1111358456 0
# Node ID b8815158a45d144232eee1abd8e75ca00474bbb4
# Parent  3489a75cb115fecfdc1b930244966f63b73b9fd6
[/trunk] Changeset 26 by mikael

* Solve some display problems by introducing "force_show" parameter in
  the scr_WriteInWindow() function.  (Ugly, yes...)
* Do not display title for Status/Chat window


diff -r 3489a75cb115 -r b8815158a45d mcabber/screen.c
--- a/mcabber/screen.c	Sun Mar 20 22:36:00 2005 +0000
+++ b/mcabber/screen.c	Sun Mar 20 22:40:56 2005 +0000
@@ -37,8 +37,8 @@
 static int maxY, maxX;
 static window_entry_t *currentWindow;
 
-char inputLine[INPUTLINE_LENGTH];
-char *ptr_inputline;
+static char inputLine[INPUTLINE_LENGTH];
+static char *ptr_inputline;
 
 
 /* Funciones */
@@ -169,8 +169,8 @@
   strncpy(tmp->name, title, 1024);
 
   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) {
+  //mvwprintw(tmp->win, 0, (cols - (2 + strlen(title))) / 2, " %s ", title);
+  if ((!dont_show)) {
     currentWindow = tmp;
   } else {
     if (currentWindow)
@@ -352,6 +352,9 @@
     //move(CHAT_WIN_HEIGHT - 1, maxX - 1);
     update_panels();
     doupdate();
+  } else {
+    top_panel(chatPanel);
+    currentWindow = tmp;
   }
 }
 
@@ -360,10 +363,11 @@
   buddy_entry_t *tmp = bud_SelectedInfo();
   if (tmp->jid != NULL)
     scr_ShowWindow(tmp->jid);
+  top_panel(inputPanel);
 }
 
 
-void scr_WriteInWindow(char *winId, char *texto, int TimeStamp)
+void scr_WriteInWindow(char *winId, char *texto, int TimeStamp, int force_show)
 {
   time_t ahora;
   int n;
@@ -375,7 +379,7 @@
 
   tmp = scr_SearchWindow(winId);
 
-  if (!currentWindow || (currentWindow != tmp))
+  if ((!force_show) && ((!currentWindow || (currentWindow != tmp))))
     dont_show = TRUE;
   scr_LogPrint("dont_show=%d", dont_show);
 
@@ -466,9 +470,9 @@
   chatWnd = newwin(CHAT_WIN_HEIGHT, maxX - 20, 0, 20);
   chatPanel = new_panel(chatWnd);
   scr_draw_box(chatWnd, 0, 0, CHAT_WIN_HEIGHT, maxX - 20, COLOR_GENERAL, 0, 0);
-  mvwprintw(chatWnd, 0,
-	    ((maxX - 20) - strlen(i18n("Status Window"))) / 2,
-	    i18n("Status Window"));
+  //mvwprintw(chatWnd, 0,
+	//    ((maxX - 20) - strlen(i18n("Status Window"))) / 2,
+	//    i18n("Status Window"));
   //wbkgd(chatWnd, COLOR_PAIR(COLOR_GENERAL));
 
   logWnd_border = newwin(LOG_WIN_HEIGHT, maxX - 20, CHAT_WIN_HEIGHT, 20);
@@ -519,9 +523,9 @@
 
   for (i = 0; i < n; i++) {
     if (i == 0)
-      scr_WriteInWindow(jidfrom, submsgs[i], TRUE);
+      scr_WriteInWindow(jidfrom, submsgs[i], TRUE, FALSE);
     else
-      scr_WriteInWindow(jidfrom, submsgs[i], FALSE);
+      scr_WriteInWindow(jidfrom, submsgs[i], FALSE, FALSE);
   }
 
   for (i = 0; i < n; i++)
@@ -558,9 +562,9 @@
 			maxX - scr_WindowHeight(rosterWnd) - 20);
     for (i = 0; i < n; i++) {
       if (i == 0)
-	scr_WriteInWindow(tmp->jid, submsgs[i], TRUE);
+	scr_WriteInWindow(tmp->jid, submsgs[i], TRUE, TRUE);
       else
-	scr_WriteInWindow(tmp->jid, submsgs[i], FALSE);
+	scr_WriteInWindow(tmp->jid, submsgs[i], FALSE, TRUE);
     }
 
     for (i = 0; i < n; i++)
@@ -618,6 +622,9 @@
 
   wprintw(logWnd, "%s", buffer);
   free(buffer);
+
+  update_panels();
+  doupdate();
 }
 
 
@@ -638,9 +645,9 @@
 			maxX - scr_WindowHeight(rosterWnd) - 20);
   for (i = 0; i < n; i++) {
     if (i == 0)
-      scr_WriteInWindow(tmp->jid, submsgs[i], TRUE);
+      scr_WriteInWindow(tmp->jid, submsgs[i], TRUE, TRUE);
     else
-      scr_WriteInWindow(tmp->jid, submsgs[i], FALSE);
+      scr_WriteInWindow(tmp->jid, submsgs[i], FALSE, TRUE);
   }
 
   for (i = 0; i < n; i++)
@@ -717,12 +724,10 @@
       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??");
diff -r 3489a75cb115 -r b8815158a45d mcabber/screen.h
--- a/mcabber/screen.h	Sun Mar 20 22:36:00 2005 +0000
+++ b/mcabber/screen.h	Sun Mar 20 22:40:56 2005 +0000
@@ -20,7 +20,8 @@
 void scr_TerminateCurses(void);
 void scr_CreatePopup(char *title, char *texto, int corte, int type,
 		     char *returnstring);
-void scr_WriteInWindow(char *nombreVentana, char *texto, int TimeStamp);
+void scr_WriteInWindow(char *nombreVentana, char *texto, int TimeStamp,
+                       int force_show);
 void scr_WriteMessage(int sock);
 void scr_WriteIncomingMessage(char *jidfrom, char *text);
 void scr_RoolWindow(void);