Changeset 525

Timestamp:

09/25/08 04:19:39 (5 years ago)

Author:

reyalp

Message:

• lua print: truncate messages longer than 127, don't use tostring for numbers, use spaces instead of tabs between values
• make script console a circular buffer.

Location:

trunk

Files:

• core/script.c (modified) (3 diffs)
• lib/lua/lbaselib.c (modified) (1 diff)

trunk/core/script.c

@@ -74 +74 @@
 char script_params[SCRIPT_NUM_PARAMS][28];
 int script_param_order[SCRIPT_NUM_PARAMS];
-char script_params_update[SCRIPT_NUM_PARAMS];
-int script_loaded_params[SCRIPT_NUM_PARAMS];
-char script_console_buf[SCRIPT_CONSOLE_NUM_LINES][SCRIPT_CONSOLE_LINE_LENGTH+1];
-static int script_console_lines=0;
+static char script_params_update[SCRIPT_NUM_PARAMS];
+static int script_loaded_params[SCRIPT_NUM_PARAMS];
+static char script_console_buf[SCRIPT_CONSOLE_NUM_LINES][SCRIPT_CONSOLE_LINE_LENGTH+1];
+static int script_con_start_line=0; // oldest valid line in console
+static int script_con_num_lines=0; // number of valid lines
+
 //-------------------------------------------------------------------
 static void process_title(const char *title) {
@@ -393 +395 @@
         script_console_buf[i][0]=0;
     }
-    script_console_lines=0;
+    script_con_num_lines=script_con_start_line=0;
     draw_restore();
 }
 
 //-------------------------------------------------------------------
+static inline int script_con_line_index(int i) {
+    return i%SCRIPT_CONSOLE_NUM_LINES;
+}
+
 void script_console_draw() {
-    register int i, l;
-    static char buf[8];
-
-    for (i=0; i<script_console_lines; ++i) {
+    int i,c,l;
+    for(c = 0; c < script_con_num_lines; ++c) {
+        i=script_con_line_index(script_con_start_line+c);
         l=strlen(script_console_buf[i]);
-        draw_txt_string(SCRIPT_CONSOLE_X, SCRIPT_CONSOLE_Y+SCRIPT_CONSOLE_NUM_LINES-script_console_lines+i, script_console_buf[i], MAKE_COLOR(COLOR_BG, COLOR_FG));
+        draw_txt_string(SCRIPT_CONSOLE_X, SCRIPT_CONSOLE_Y+SCRIPT_CONSOLE_NUM_LINES-script_con_num_lines+c, script_console_buf[i], MAKE_COLOR(COLOR_BG, COLOR_FG));
         for (; l<SCRIPT_CONSOLE_LINE_LENGTH; ++l)
-            draw_txt_char(SCRIPT_CONSOLE_X+l, SCRIPT_CONSOLE_Y+SCRIPT_CONSOLE_NUM_LINES-script_console_lines+i, ' ', MAKE_COLOR(COLOR_BG, COLOR_FG));
-    }
-
+            draw_txt_char(SCRIPT_CONSOLE_X+l, SCRIPT_CONSOLE_Y+SCRIPT_CONSOLE_NUM_LINES-script_con_num_lines+c, ' ', MAKE_COLOR(COLOR_BG, COLOR_FG));
+    }
 }
 
@@ -457 +461 @@
 
 //-------------------------------------------------------------------
-
-static void script_console_add_impl(const char *str) {
-    register int i;
-
-    if (script_console_lines == SCRIPT_CONSOLE_NUM_LINES ) {
-        for (i=1; i<SCRIPT_CONSOLE_NUM_LINES; ++i) {
-            strcpy(script_console_buf[i-1], script_console_buf[i]);
-        }
-        --script_console_lines;
-    }
-
-    if (strlen(str) > SCRIPT_CONSOLE_LINE_LENGTH) {
-      // let overlong lines wrap to the next line
-      memcpy(script_console_buf[script_console_lines], str, SCRIPT_CONSOLE_LINE_LENGTH);
-      script_console_buf[script_console_lines][SCRIPT_CONSOLE_LINE_LENGTH]=0;
-      ++script_console_lines;
-      script_console_add_impl(str+SCRIPT_CONSOLE_LINE_LENGTH);
-      return;
-    }
-    else
-      strcpy(script_console_buf[script_console_lines], str);
-    
-    ++script_console_lines;
+void script_console_start_line() {
+    if (SCRIPT_CONSOLE_NUM_LINES==script_con_num_lines) {
+        script_con_start_line=script_con_line_index(script_con_start_line+1);
+    }
+    else {
+        ++script_con_num_lines;
+    }
+     script_console_buf[script_con_line_index(script_con_start_line+script_con_num_lines-1)][0]=0;
+}
+
+void script_console_add_text(const char *str) {
+    char *cur;
+    int curlen;
+    int left;
+
+    do {
+        cur = script_console_buf[script_con_line_index(script_con_start_line+script_con_num_lines-1)];
+        curlen = strlen(cur);
+        left = SCRIPT_CONSOLE_LINE_LENGTH-curlen;
+        if(strlen(str) > left) {
+            strncpy(cur+curlen,str,left);
+            cur[SCRIPT_CONSOLE_LINE_LENGTH]=0;
+            script_console_start_line();
+            str+=left;
+        }
+        else {
+            strcat(cur,str);
+            break;
+        }
+    } while(1);
 }
 
 void script_console_add_line(const char *str) {
-    script_console_add_impl(str);
-
+    script_console_start_line();
+    script_console_add_text(str);
     if (print_screen_p && print_screen_d>=0) {
-      char nl = '\n';
-      write(print_screen_d, str, strlen(str) );
-      write(print_screen_d, &nl, 1);
-    }
-
+        char nl = '\n';
+        write(print_screen_d, str, strlen(str) );
+        write(print_screen_d, &nl, 1);
+    }
     script_console_draw();
 }
-
-//-------------------------------------------------------------------
-//-------------------------------------------------------------------
-//-------------------------------------------------------------------
+//-------------------------------------------------------------------
+//-------------------------------------------------------------------
+//-------------------------------------------------------------------

trunk/lib/lua/lbaselib.c

@@ -34 +34 @@
   lua_getglobal(L, "tostring");
   char buf[128];
+  const int max_buf_chars=sizeof(buf)-1;
+  char numbuf[16];
   buf[0] = 0;
+  int buf_chars = 0;
   for (i=1; i<=n; i++) {
     const char *s;
-    lua_pushvalue(L, -1);  /* function to be called */
-    lua_pushvalue(L, i);   /* value to print */
-    lua_call(L, 1, 1);
-    s = lua_tostring(L, -1);  /* get result */
-    if (s == NULL)
-      return luaL_error(L, LUA_QL("tostring") " must return a string to "
-                           LUA_QL("print"));
-    if (i>1) strcat( buf, "\t" );
-    strcat( buf, s );
-    lua_pop(L, 1);  /* pop result */
+    /* avoid calling tostring on numbers, so we don't
+     generate new string for each unique number */
+    if(lua_type(L,i) == LUA_TNUMBER) {
+      sprintf(numbuf,LUA_NUMBER_FMT,lua_tonumber(L,i));
+      s=numbuf;
+    }
+    else {
+      lua_pushvalue(L, -1);  /* function to be called */
+      lua_pushvalue(L, i);   /* value to print */
+      lua_call(L, 1, 1);
+      s = lua_tostring(L, -1);  /* get result */
+      if (s == NULL)
+        return luaL_error(L, LUA_QL("tostring") " must return a string to "
+                          LUA_QL("print"));
+      lua_pop(L, 1);  /* pop result */
+    }
+    if(i>1) {
+      strcpy(buf+buf_chars," ");
+      ++buf_chars;
+    }
+    if(buf_chars+strlen(s) >= max_buf_chars) {
+      strncpy(buf+buf_chars,s,max_buf_chars-buf_chars);
+      buf[max_buf_chars]=0;
+      break;
+    }
+    strcpy(buf+buf_chars,s);
+    buf_chars = strlen(buf);
+    if(buf_chars >= max_buf_chars-1) // -1 allow for space
+       break;
+
   }
   script_console_add_line(buf);
+
   return 0;
 }