[netrek-cvs] client/netrekxp/src data.c, 1.42, 1.43 defaults.c, 1.31, 1.32 mswindow.c, 1.38, 1.39

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24847/src

Modified Files:
	data.c defaults.c mswindow.c 
Log Message:
New option maxScrollLines in netrekrc, controls size of window scrollback buffer, rather than it being fixed in stone as before.
Updated help files on this option + metatype.

Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- mswindow.c	7 Aug 2006 08:04:05 -0000	1.38
+++ mswindow.c	29 Nov 2006 13:06:41 -0000	1.39
@@ -89,13 +89,6 @@
 #define WM_TERMINATE_WAIT 0x8000
 #define WM_CROSS_THREAD_DESTROY 0x8001
 
-#ifdef DEBUG
-#define MAX_SCROLLWINDOW_LINES 300
-#else
-#define MAX_SCROLLWINDOW_LINES 300 /* Was 100, but that's too small! - BB 7/2006*/
-#endif
-//The max # lines a scrollwindow will have
-
 #define EVENT_Q_SIZE 15
 //The number of events our custom queue will hold
 
@@ -4424,7 +4417,7 @@
         NumStrings = 0;
     }
 
-    if (NumStrings < MAX_SCROLLWINDOW_LINES)    //Create a new stringList item
+    if (NumStrings < maxScrollLines)    //Create a new stringList item
     {
         p2 = (struct stringList *) malloc (sizeof (struct stringList));
         if (!p2)
@@ -5738,7 +5731,7 @@
         NumStrings = 0;
     }
 
-    if (NumStrings < MAX_SCROLLWINDOW_LINES)    //Create a new stringList item
+    if (NumStrings < maxScrollLines)    //Create a new stringList item
     {
         p2 = (struct stringList *) malloc (sizeof (struct stringList));
         if (!p2)

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- defaults.c	29 Nov 2006 12:06:34 -0000	1.31
+++ defaults.c	29 Nov 2006 13:06:41 -0000	1.32
@@ -223,6 +223,12 @@
             NULL
         }
     },
+    {"maxScrollLines", &maxScrollLines, RC_INT,
+        {
+            "Maximum number of lines in message window scrollback",
+            NULL
+        }
+    },
 #ifdef XTRA_MESSAGE_UI
     {"messageHoldThresh", &messageHoldThresh, RC_INT,
         {
@@ -1513,6 +1519,11 @@
     planetHighlighting = booleanDefault ("planetHighlighting", planetHighlighting);
     rotatePlanets = booleanDefault ("rotatePlanets", rotatePlanets);
     logging = booleanDefault ("logging", logging);
+    maxScrollLines = intDefault ("maxScrollLines", maxScrollLines);
+    if (maxScrollLines > 500)
+        maxScrollLines = 500;
+    else if (maxScrollLines < 50)
+        maxScrollLines = 50;
 
     phaserShrink = intDefault ("phaserShrink", phaserShrink);
     if (phaserShrink > 16)

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- data.c	27 Nov 2006 07:08:41 -0000	1.42
+++ data.c	29 Nov 2006 13:06:41 -0000	1.43
@@ -735,6 +735,7 @@
 
 int windowMove = 0;
 int mainResizeable = 1;
+int maxScrollLines = 300;
 int mainTitleBar = 0;
 int observerMode = 0;
 int showHockeyScore = 1;