Changeset 899

Timestamp:

06/04/10 08:48:34 (3 years ago)

Author:

fe50

Message:

• added CHDKLover's customizable script console from ​http://chdk.kernreaktor.org/mantis/view.php?id=55 new uBasic & Lua script commands are:

• set_console_layout(x1,y1,x2,y2) --> set console position and size, range is x=0 to 45 and y=0 to 14
• set_console_autoredraw(0|1) --> enable or disable automatic rewrite/refresh of the console, 0=off (disable) or 1=on (enable)
• console_redraw() --> manually refresh/rewrite the script console

Location:

trunk

Files:

• core/gui.c (modified) (1 diff)
• core/luascript.c (modified) (2 diffs)
• core/script.c (modified) (8 diffs)
• include/script.h (modified) (3 diffs)
• lib/ubasic/camera_functions.c (modified) (1 diff)
• lib/ubasic/tokenizer.c (modified) (1 diff)
• lib/ubasic/tokenizer.h (modified) (1 diff)
• lib/ubasic/ubasic.c (modified) (2 diffs)

trunk/core/gui.c

@@ -2163 +2163 @@
                     --show_script_console;
                     md_draw_grid();
-                    script_console_draw();
+                    script_console_draw(auto_redraw);
                 }
             }

trunk/core/luascript.c

@@ -67 +67 @@
 }
 
+static int luaCB_set_console_layout( lua_State* L )
+{
+  script_console_set_layout(luaL_checknumber( L, 1 ),luaL_checknumber( L, 2 ),luaL_checknumber( L, 3 ),luaL_checknumber( L, 4 ));
+  return 0;
+}
+
+static int luaCB_set_console_autoredraw( lua_State* L )
+{
+  script_console_set_autoredraw(luaL_checknumber( L, 1 ));
+  return 0;
+}
+
+static int luaCB_console_redraw( lua_State* L )
+{
+  script_console_redraw();
+  return 0;
+}
 static int luaCB_get_av96( lua_State* L )
 {
@@ -1288 +1305 @@
   FUNC(sleep);
   FUNC(cls);
+  FUNC(set_console_layout);
+  FUNC(set_console_autoredraw);
+  FUNC(console_redraw);
 
   lua_pushlightuserdata( L, kbd_sched_click );

trunk/core/script.c

@@ -10 +10 @@
 //-------------------------------------------------------------------
 
-#define SCRIPT_CONSOLE_NUM_LINES    5
-#define SCRIPT_CONSOLE_LINE_LENGTH  25
-#define SCRIPT_CONSOLE_X            0
-#define SCRIPT_CONSOLE_Y            (14-SCRIPT_CONSOLE_NUM_LINES)
+#define SCRIPT_MAX_CONSOLE_LINES      14
+#define SCRIPT_MAX_LINE_LENGTH        45
 
 //-------------------------------------------------------------------
@@ -19 +17 @@
 char cfg_name[100] = "\0";
 char cfg_set_name[100] = "\0";
+int script_console_num_lines, script_console_line_length, script_console_x, script_console_y, auto_redraw=1;
 
 static const char *ubasic_script_default =
@@ -76 +75 @@
 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 char script_console_buf[script_console_num_lines][script_console_line_length+1];
+static char **script_console_buf;
 static int script_con_start_line=0; // oldest valid line in console
 static int script_con_num_lines=0; // number of valid lines
@@ -322 +322 @@
     struct stat st;
     
+    auto_redraw=1;
+    script_console_num_lines=5;
+    script_console_line_length=25;
+    script_console_y=SCRIPT_MAX_CONSOLE_LINES-script_console_num_lines;
+    script_console_x=0;
+    script_console_buf=malloc(script_console_num_lines*sizeof(char*));
+    for (i=0;i<script_console_num_lines;i++){ 
+      script_console_buf[i]=malloc(script_console_line_length*sizeof(char)+1); 
+    }
+    script_con_start_line=0;
+    script_con_num_lines=0;
+
 //    save_params_values(0);
 
@@ -394 +406 @@
     register int i;
 
-    for (i=0; i<SCRIPT_CONSOLE_NUM_LINES; ++i) {
+    for (i=0; i<script_console_num_lines; ++i) {
         script_console_buf[i][0]=0;
     }
     script_con_num_lines=script_con_start_line=0;
-    draw_restore();
+    if(auto_redraw) draw_restore();
 }
 
 //-------------------------------------------------------------------
 static inline int script_con_line_index(int i) {
-    return i%SCRIPT_CONSOLE_NUM_LINES;
-}
-
-void script_console_draw() {
-    int i,c,l;
+    return i%script_console_num_lines;
+}
+
+void script_console_draw(int drawing) {
+  int i,c,l;
+  if(drawing){
     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_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_con_num_lines+c, ' ', MAKE_COLOR(COLOR_BG, COLOR_FG));
-    }
+      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_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_con_num_lines+c, ' ', MAKE_COLOR(COLOR_BG, COLOR_FG));
+    }
+  }
 }
 
@@ -464 +478 @@
 //-------------------------------------------------------------------
 void script_console_start_line() {
-    if (SCRIPT_CONSOLE_NUM_LINES==script_con_num_lines) {
+    if (script_console_num_lines==script_con_num_lines) {
         script_con_start_line=script_con_line_index(script_con_start_line+1);
     }
@@ -481 +495 @@
         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;
+        left = script_console_line_length-curlen;
         if(strlen(str) > left) {
             strncpy(cur+curlen,str,left);
-            cur[SCRIPT_CONSOLE_LINE_LENGTH]=0;
+            cur[script_console_line_length]=0;
             script_console_start_line();
             str+=left;
@@ -504 +518 @@
         write(print_screen_d, &nl, 1);
     }
-    script_console_draw();
-}
-//-------------------------------------------------------------------
-//-------------------------------------------------------------------
-//-------------------------------------------------------------------
+    script_console_draw(auto_redraw);
+}
+//-------------------------------------------------------------------
+void script_console_set_layout(int x1, int y1, int x2, int y2) { //untere linke Ecke(x1,y1), obere reche Ecke(x2,y2) - lower left corner (x1,y1), upper right corner(x2,y2)
+  int i,len,newLinesCount,newLineLength,newNumLines,lineDelta,idx;
+  char **tmp;
+  if(x1>=0 && x1<x2 && x1<=SCRIPT_MAX_LINE_LENGTH && y1>=0 && y1<y2 && y1<=SCRIPT_MAX_CONSOLE_LINES && x2<=SCRIPT_MAX_LINE_LENGTH && y2<=SCRIPT_MAX_CONSOLE_LINES) {
+    //In neuen Puffer kopieren - copy to new buffer
+    newLineLength=x2-x1;
+    newLinesCount=y2-y1;
+    if(newLineLength!=script_console_line_length || newLinesCount!=script_console_num_lines) {
+      lineDelta=script_con_num_lines-newLinesCount;
+      if(lineDelta<0) lineDelta=0;
+      newNumLines=0;
+      tmp=malloc(newLinesCount*sizeof(char*)); //realloc Nachbildung - realloc emulation
+      for(i=0;i<newLinesCount;i++){
+        tmp[i]=malloc(newLineLength*sizeof(char)+1);
+        if(i<script_con_num_lines){
+          newNumLines++;
+          idx=script_con_line_index(script_con_start_line+i+lineDelta);
+          len=strlen(script_console_buf[idx]);
+          if(len>newLineLength) len=newLineLength;
+          strncpy(tmp[i],script_console_buf[idx],len);
+          tmp[i][len]=0x0;
+        } else tmp[i][0]=0x0;
+      }
+      //Speicher freigeben - free memory
+      for(i=0;i<script_console_num_lines;i++) {
+        free(script_console_buf[i]);
+      }
+      free(script_console_buf);
+      //neue Werte setzten - set new values
+      script_console_buf=tmp;
+      script_con_start_line=0;
+      script_con_num_lines=newNumLines;
+      script_console_num_lines=newLinesCount;
+      script_console_line_length=newLineLength;
+    }
+    script_console_x=x1;
+    script_console_y=SCRIPT_MAX_CONSOLE_LINES-y2;
+    if(auto_redraw) draw_restore();
+  }
+}
+//-------------------------------------------------------------------
+void script_console_set_autoredraw(int value){
+  auto_redraw=value;
+}
+//-------------------------------------------------------------------
+void script_console_redraw(){
+  draw_restore();
+  script_console_draw(1);
+}
+//-------------------------------------------------------------------

trunk/include/script.h

@@ -13 +13 @@
 extern char script_params[SCRIPT_NUM_PARAMS][28];
 extern int script_param_order[SCRIPT_NUM_PARAMS];
+extern int auto_redraw;
 
 //-------------------------------------------------------------------
@@ -18 +19 @@
 extern void script_console_clear();
 extern void script_console_add_line(const char *str);
-extern void script_console_draw();
+extern void script_console_draw(int drawing);
 extern void script_print_screen_init();
 extern void script_print_screen_end();
@@ -24 +25 @@
 extern int load_params_values(const char *fn, int update_vars, int read_param_set);
 extern void save_params_values(int unconditional);
+extern void script_console_set_layout(int x1, int y1, int x2, int y2);
+extern void script_console_set_autoredraw(int value);
+extern void script_console_redraw();
 //-------------------------------------------------------------------
 #endif

trunk/lib/ubasic/camera_functions.c

@@ -133 +133 @@
 }
 
+void script_console_set_layout(int x1, int y1, int x2, int y2) {
+    printf(">>> set console layout to %d %d %d %d\n", x1,y1,x2,y2);
+}
+
+void script_console_set_autoredraw(int value) {
+    printf(">>> set console auto_redraw to %d\n", x1);
+}
+
+void script_console_redraw() {
+    printf("*** console redraw ***\n");
+}
+
 void script_console_clear() {
     printf("*** clear console ***\n");

trunk/lib/ubasic/tokenizer.c

@@ -98 +98 @@
   //{"shot",                    TOKENIZER_SHOOT}, // for compatibility
   {"shoot",                   TOKENIZER_SHOOT},
+  {"set_console_layout",      TOKENIZER_SET_CONSOLE_LAYOUT},
+  {"set_console_autoredraw",  TOKENIZER_SET_CONSOLE_AUTOREDRAW},
+  {"console_redraw",          TOKENIZER_CONSOLE_REDRAW},
   {"sleep",                   TOKENIZER_SLEEP}, 
 

trunk/lib/ubasic/tokenizer.h

@@ -91 +91 @@
   TOKENIZER_RELEASE,
   TOKENIZER_SHOOT,
+  TOKENIZER_SET_CONSOLE_LAYOUT,
+  TOKENIZER_SET_CONSOLE_AUTOREDRAW,
+  TOKENIZER_CONSOLE_REDRAW,
   TOKENIZER_GET_TV96,
   TOKENIZER_GET_USER_TV96,

trunk/lib/ubasic/ubasic.c

@@ -362 +362 @@
     #elif CAM_PROPSET == 3
     r = 3;
+    #elif CAM_PROPSET == 3
+    r = 3;
     #endif
    break;
@@ -1465 +1467 @@
   accept_cr();
 }
-
+/*---------------------------------------------------------------------------*/
+static void set_console_layout(void)
+{
+  int x1,y1,x2,y2;
+  accept(TOKENIZER_SET_CONSOLE_LAYOUT);
+  x1 = expr();
+  y1 = expr();
+  x2 = expr();
+  y2 = expr();
+  script_console_set_layout(x1,y1,x2,y2);
+  accept_cr();
+}
+/*---------------------------------------------------------------------------*/
+static void set_console_autoredraw(void)
+{
+  accept(TOKENIZER_SET_CONSOLE_AUTOREDRAW);
+  script_console_set_autoredraw(expr());
+  accept_cr();
+}
+/*---------------------------------------------------------------------------*/
+static void console_redraw(void)
+{
+  accept(TOKENIZER_CONSOLE_REDRAW);
+  script_console_redraw();
+  accept_cr();
+}
 /*---------------------------------------------------------------------------*/