# HG changeset patch
# User mikael
# Date 1112648103 0
# Node ID 416fd026d76d5c299f104f596528c2c10cb72424
# Parent  881d8eb379c632a1cc12db812c540be4def5fc4c
[/trunk] Changeset 55 by mikael

* Increase roster's weight.  Fixed weight of ROSTER_WEIGHT=24 for now.


diff -r 881d8eb379c6 -r 416fd026d76d mcabber/src/buddies.c
--- a/mcabber/src/buddies.c	Mon Apr 04 20:18:18 2005 +0000
+++ b/mcabber/src/buddies.c	Mon Apr 04 20:55:03 2005 +0000
@@ -126,9 +126,10 @@
   int n;
   int maxx, maxy;
   int fakeOffset = buddyOffset;
+  char name[ROSTER_WEIGHT];
 
   getmaxyx(win, maxy, maxx);
-
+  name[ROSTER_WEIGHT-8] = 0;
 
   /* cleanup of roster window */
   wattrset(win, COLOR_PAIR(COLOR_GENERAL));
@@ -171,8 +172,8 @@
     mvwprintw(win, i, 1, "");
     for (n = 2; n < maxx; n++)
       waddch(win, ' ');
-    //mvwprintw(win, i, (maxx - strlen(tmp->name)) / 2, "%s", tmp->name);
-    mvwprintw(win, i, 1, " %c[%c] %.12s", pending, status, tmp->name);
+    strncpy(name, tmp->name, ROSTER_WEIGHT-8);
+    mvwprintw(win, i, 1, " %c[%c] %s", pending, status, name);
     i++;
     if (i >= maxy - 1)
       break;
diff -r 881d8eb379c6 -r 416fd026d76d mcabber/src/screen.c
--- a/mcabber/src/screen.c	Mon Apr 04 20:18:18 2005 +0000
+++ b/mcabber/src/screen.c	Mon Apr 04 20:55:03 2005 +0000
@@ -391,7 +391,8 @@
   // scr_LogPrint("dont_show=%d", dont_show);
 
   if (tmp == NULL) {
-    tmp = scr_CreatePanel(winId, 20, 0, CHAT_WIN_HEIGHT, maxX - 20, dont_show);
+    tmp = scr_CreatePanel(winId, ROSTER_WEIGHT, 0, CHAT_WIN_HEIGHT,
+                          maxX - ROSTER_WEIGHT, dont_show);
     tmp->texto = (char **) calloc((CHAT_WIN_HEIGHT+1) * 3, sizeof(char *));
     for (n = 0; n < CHAT_WIN_HEIGHT * 3; n++)
       tmp->texto[n] = (char *) calloc(1, 1024);
@@ -473,15 +474,15 @@
 void scr_DrawMainWindow(void)
 {
   /* Draw main panels */
-  rosterWnd = newwin(CHAT_WIN_HEIGHT, 20, 0, 0);
+  rosterWnd = newwin(CHAT_WIN_HEIGHT, ROSTER_WEIGHT, 0, 0);
   rosterPanel = new_panel(rosterWnd);
-  scr_draw_box(rosterWnd, 0, 0, CHAT_WIN_HEIGHT, 20, COLOR_GENERAL, 0, 0);
-  mvwprintw(rosterWnd, 0, (20 - strlen(i18n("Roster"))) / 2,
+  scr_draw_box(rosterWnd, 0, 0, CHAT_WIN_HEIGHT, ROSTER_WEIGHT, COLOR_GENERAL, 0, 0);
+  mvwprintw(rosterWnd, 0, (ROSTER_WEIGHT - strlen(i18n("Roster"))) / 2,
 	    i18n("Roster"));
 
-  chatWnd = newwin(CHAT_WIN_HEIGHT, maxX - 20, 0, 20);
+  chatWnd = newwin(CHAT_WIN_HEIGHT, maxX - ROSTER_WEIGHT, 0, ROSTER_WEIGHT);
   chatPanel = new_panel(chatWnd);
-  scr_draw_box(chatWnd, 0, 0, CHAT_WIN_HEIGHT, maxX - 20, COLOR_GENERAL, 0, 0);
+  scr_draw_box(chatWnd, 0, 0, CHAT_WIN_HEIGHT, maxX - ROSTER_WEIGHT, COLOR_GENERAL, 0, 0);
   //mvwprintw(chatWnd, 0,
 	//    ((maxX - 20) - strlen(i18n("Status Window"))) / 2,
 	//    i18n("Status Window"));
@@ -530,7 +531,7 @@
   sprintf(buffer, "<== %s", utf8_decode(text));
 
   submsgs =
-      ut_SplitMessage(buffer, &n, maxX - scr_WindowHeight(rosterWnd) - 20);
+      ut_SplitMessage(buffer, &n, maxX - scr_WindowHeight(rosterWnd) - ROSTER_WEIGHT);
 
   for (i = 0; i < n; i++) {
     if (i == 0)
@@ -624,7 +625,7 @@
 
   submsgs =
 	ut_SplitMessage(buffer, &n,
-			maxX - scr_WindowHeight(rosterWnd) - 20);
+			maxX - scr_WindowHeight(rosterWnd) - ROSTER_WEIGHT);
   for (i = 0; i < n; i++) {
     if (i == 0)
       scr_WriteInWindow(tmp->jid, submsgs[i], TRUE, TRUE);
diff -r 881d8eb379c6 -r 416fd026d76d mcabber/src/screen.h
--- a/mcabber/src/screen.h	Mon Apr 04 20:18:18 2005 +0000
+++ b/mcabber/src/screen.h	Mon Apr 04 20:55:03 2005 +0000
@@ -11,6 +11,7 @@
 #define COLOR_BD_DES    7
 
 #define LOG_WIN_HEIGHT  (5+2)
+#define ROSTER_WEIGHT   24
 #define CHAT_WIN_HEIGHT (maxY-1-LOG_WIN_HEIGHT)
 
 #define INPUTLINE_LENGTH  1024