Changeset 1905

Timestamp:

06/10/12 08:03:57 (11 months ago)

Author:

philmoz

Message:

Merged revision(s) 1900-1901 from trunk:
Add @range and @values options for script parameters.
​http://chdk.setepontos.com/index.php?topic=8151.msg86221#msg86221
​http://chdk.setepontos.com/index.php?topic=8151.msg86294#msg86294

Location:

branches/release-1_0

Files:

• . (modified) (1 prop)
• core/gui.c (modified) (1 diff)
• core/gui_menu.h (modified) (1 diff)
• core/script.c (modified) (11 diffs)
• include/script.h (modified) (1 diff)
• lib/ubasic/tokenizer.c (modified) (1 diff)

branches/release-1_0/core/gui.c

@@ -1366 +1366 @@
     register int p=0, i;
 
-    for (i=0; i<sizeof(script_submenu_items_top)/sizeof(script_submenu_items_top[0]); ++p, ++i) {
+    for (i=0; i<sizeof(script_submenu_items_top)/sizeof(script_submenu_items_top[0]); ++p, ++i)
+    {
         script_submenu_items[p]=script_submenu_items_top[i];
     }
-    for (i=0; i<SCRIPT_NUM_PARAMS; ++i) {
-        if (script_param_order[i]) {
-            script_submenu_items[p].symbol=0x0;
-            script_submenu_items[p].text=(int)script_params[script_param_order[i]-1];
-            script_submenu_items[p].type=MENUITEM_INT;
-            script_submenu_items[p].value=&conf.script_vars[script_param_order[i]-1];
+    for (i=0; i<SCRIPT_NUM_PARAMS; ++i)
+    {
+        if (script_param_order[i])
+        {
+            int n = script_param_order[i]-1;
+
+            script_submenu_items[p].symbol = 0x0;
+            script_submenu_items[p].text = (int)script_params[n];
+            script_submenu_items[p].type = MENUITEM_INT;
+            script_submenu_items[p].value = &conf.script_vars[n];
+
+            if (script_range_values[n] != 0)
+            {
+                if (script_range_values[n] == MENU_MINMAX(0,1))
+                {
+                    script_submenu_items[p].type = MENUITEM_BOOL;
+                }
+                else
+                {
+                    script_submenu_items[p].type |= MENUITEM_F_MINMAX;
+                    script_submenu_items[p].arg = script_range_values[n];
+                }
+            }
+            else if (script_named_counts[n] != 0)
+            {
+                script_submenu_items[p].type = MENUITEM_ENUM2;
+                script_submenu_items[p].opt_len = script_named_counts[n];
+                script_submenu_items[p].arg = (int)script_named_values[n];
+            }
+
             ++p;
         }
     }
-    for (i=0; i<sizeof(script_submenu_items_bottom)/sizeof(script_submenu_items_bottom[0]); ++p, ++i) {
+    for (i=0; i<sizeof(script_submenu_items_bottom)/sizeof(script_submenu_items_bottom[0]); ++p, ++i)
+    {
         script_submenu_items[p]=script_submenu_items_bottom[i];
     }

branches/release-1_0/core/gui_menu.h

@@ -32 +32 @@
 #define MENUITEM_ARG_CALLBACK   0x0300
 
-#define MENU_MINMAX(min, max)   (((max)<<16)|(min))
+#define MENU_MINMAX(min, max)   (((max)<<16)|(min&0xFFFF))
 
 //-------------------------------------------------------------------

branches/release-1_0/core/script.c

@@ -5 +5 @@
 #include "gui.h"
 #include "gui_draw.h"
+#include "gui_menu.h"
 #include "conf.h"
 #include "script.h"
@@ -106 +107 @@
 int script_param_order[SCRIPT_NUM_PARAMS];                  // Ordered as_in_script list of variables ( [idx] = id_of_var )
                                                             // to display in same order in script
+int script_range_values[SCRIPT_NUM_PARAMS];                 // Min/Max values for param validation
+const char **script_named_values[SCRIPT_NUM_PARAMS];        // Array of list values for named parameters
+int script_named_counts[SCRIPT_NUM_PARAMS];                 // Count of # of entries in each script_list_values array
+char *script_named_strings[SCRIPT_NUM_PARAMS];              // Base storage for named value string data
 static char script_params_update[SCRIPT_NUM_PARAMS];        // Flag is such parameter exist
 static int script_loaded_params[SCRIPT_NUM_PARAMS];         // Copy of original values of parameters 
@@ -113 +118 @@
 
 //-------------------------------------------------------------------
+
+const char* skip_whitespace(const char* p)  { while (*p==' ' || *p=='\t') p++; return p; }  // Skip past whitespace
+const char* skip_token(const char* p)       { while (*p && *p!='\r' && *p!='\n' && *p!=' ' && *p!='\t') p++; return p; }  // Skip past current token value
+const char* skip_toeol(const char* p)       { while (*p!='\r' && *p!='\n') p++; return p; } // Skip to end of line
+
+//-------------------------------------------------------------------
 static void process_title(const char *title) {
     register const char *ptr = title;
     register int i=0;
 
-    while (ptr[0]==' ' || ptr[0]=='\t') ++ptr; // whitespaces
+    ptr = skip_whitespace(ptr);
     while (i<(sizeof(script_title)-1) && ptr[i] && ptr[i]!='\r' && ptr[i]!='\n') {
         script_title[i]=ptr[i];
@@ -134 +145 @@
 // RETURN VALUE: 0 if err, 1..26 = id of var
 //-------------------------------------------------------------------
-static int process_param(const char *param, int update) {
+static int process_param(const char *param, int update)
+{
     register const char *ptr = param;
     register int n, i=0;
 
-    while (ptr[0]==' ' || ptr[0]=='\t') ++ptr; // whitespaces
+    ptr = skip_whitespace(ptr);
     if (ptr[0] && (ptr[0]>='a' && ptr[0]<='a'+SCRIPT_NUM_PARAMS) && (ptr[1]==' ' || ptr[1]=='\t')) {
         n=ptr[0]-'a';
-        ptr+=2;
-        while (ptr[0]==' ' || ptr[0]=='\t') ++ptr; // whitespaces
+        ptr = skip_whitespace(ptr+2);
         script_params_update[n] = 1;
         while (i<(sizeof(script_params[0])-1) && ptr[i] && ptr[i]!='\r' && ptr[i]!='\n') {
@@ -165 +176 @@
 //               1 - only if updated
 //-------------------------------------------------------------------
-static void process_default(const char *param, char update) {
+static void process_default(const char *param, char update)
+{
     register const char *ptr = param;
     register int n;
 
-    while (ptr[0]==' ' || ptr[0]=='\t') ++ptr; // whitespaces
+    ptr = skip_whitespace(ptr);
     if (ptr[0] && (ptr[0]>='a' && ptr[0]<='a'+SCRIPT_NUM_PARAMS) && (ptr[1]==' ' || ptr[1]=='\t')) {
         n=ptr[0]-'a';
-        ptr+=2;
+        ptr = skip_whitespace(ptr+2);
         if (!update || script_params_update[n])
         {
             conf.script_vars[n] = strtol(ptr, NULL, 0);
             script_loaded_params[n] = conf.script_vars[n];
+        }
+    } // ??? else produce error message
+}
+
+//-------------------------------------------------------------------
+// Process one entry "@range VAR MIN MAX"
+//      param = ptr right after descriptor (should point to var)
+//      update = 0 - get
+//               1 - only if updated
+//-------------------------------------------------------------------
+static void process_range(const char *param, char update)
+{
+    register const char *ptr = param;
+    register int n;
+
+    ptr = skip_whitespace(ptr);
+    if (ptr[0] && (ptr[0]>='a' && ptr[0]<='a'+SCRIPT_NUM_PARAMS) && (ptr[1]==' ' || ptr[1]=='\t'))
+    {
+        n=ptr[0]-'a';
+        ptr = skip_whitespace(ptr+2);
+        if (!update || script_params_update[n])
+        {
+            short min = strtol(ptr,NULL,0);
+            ptr = skip_whitespace(skip_token(ptr));
+            short max = strtol(ptr,NULL,0);
+            script_range_values[n] = MENU_MINMAX(min,max);
+        }
+    } // ??? else produce error message
+}
+
+//-------------------------------------------------------------------
+// Process one entry "@values VAR A B C D ..."
+//      param = ptr right after descriptor (should point to var)
+//      update = 0 - get
+//               1 - only if updated
+//-------------------------------------------------------------------
+static void process_values(const char *param, char update)
+{
+    register const char *ptr = param;
+    register int n;
+
+    ptr = skip_whitespace(ptr);
+    if (ptr[0] && (ptr[0]>='a' && ptr[0]<='a'+SCRIPT_NUM_PARAMS) && (ptr[1]==' ' || ptr[1]=='\t'))
+    {
+        n=ptr[0]-'a';
+        ptr = skip_whitespace(ptr+2);
+        if (!update || script_params_update[n])
+        {
+            int len = skip_toeol(ptr) - ptr;
+            script_named_strings[n] = malloc(len+1);
+            strncpy(script_named_strings[n], ptr, len);
+            script_named_strings[n][len] = 0;
+
+            const char *p = script_named_strings[n];
+            int cnt = 0;
+            while (*p)
+            {
+                p = skip_whitespace(skip_token(p));
+                cnt++;
+            }
+            script_named_counts[n] = cnt;
+            script_named_values[n] = malloc(cnt * sizeof(char*));
+
+            p = script_named_strings[n];
+            cnt = 0;
+            while (*p)
+            {
+                script_named_values[n][cnt] = p;
+                p = skip_token(p);
+                if (*p)
+                {
+                    *((char*)p) = 0;
+                    p = skip_whitespace(p+1);
+                }
+                cnt++;
+            }
         }
     } // ??? else produce error message
@@ -201 +289 @@
         script_params[i][0]=0;
         script_param_order[i]=0;
+        script_range_values[i] = 0;
+        if (script_named_values[i]) free(script_named_values[i]);
+        script_named_values[i] = 0;
+        if (script_named_strings[i]) free(script_named_strings[i]);
+        script_named_strings[i] = 0;
+        script_named_counts[i] = 0;
     }
 
     while (ptr[0]) {
-        while (ptr[0]==' ' || ptr[0]=='\t') ++ptr; // whitespaces
+        ptr = skip_whitespace(ptr);
         if (ptr[0]=='@') {
             if (strncmp("@title", ptr, 6)==0) {
@@ -219 +313 @@
                 ptr+=8;
                 process_default(ptr, 0);
+            } else if (update_vars && strncmp("@range", ptr, 6)==0) {
+                ptr+=6;
+                process_range(ptr, 0);
+            } else if (update_vars && strncmp("@values", ptr, 7)==0) {
+                ptr+=7;
+                process_values(ptr, 0);
             }
         }
@@ -329 +429 @@
                 ptr+=8;
                 process_default(ptr, 1);
+            } else if (strncmp("@range", ptr, 6)==0) {
+                ptr+=6;
+                process_range(ptr, 1);
+            } else if (strncmp("@values", ptr, 7)==0) {
+                ptr+=7;
+                process_values(ptr, 0);
             }
         }
@@ -353 +459 @@
 {
     int i, n, fd, changed=0;
-    char *buf,*p;
+    char *buf;
     for(i = 0; i < SCRIPT_NUM_PARAMS; i++)
     {
@@ -375 +481 @@
 
     // max possible params * (param description + some extra for @default etc)
-    buf=umalloc(SCRIPT_NUM_PARAMS*(28 + 20));
+    buf=umalloc(256);
     if(!buf)
         return;
@@ -385 +491 @@
     }
     buf[0] = 0;
-    p=buf;
     for(n = 0; n < SCRIPT_NUM_PARAMS; ++n)
     {
         if (script_params[n][0] != 0)
         {
-            p+=sprintf(p,"@param %c %s\n@default %c %d\n",'a'+n,script_params[n],'a'+n,conf.script_vars[n]);
-        }
-    }
-    write(fd, buf, strlen(buf));
+            sprintf(buf,"@param %c %s\n@default %c %d\n",'a'+n,script_params[n],'a'+n,conf.script_vars[n]);
+            if (script_range_values[n] != 0)
+                sprintf(buf+strlen(buf),"@range %c %d %d\n",'a'+n,(short)(script_range_values[n]&0xFFFF),(short)(script_range_values[n]>>16));
+            if (script_named_counts[n] != 0)
+            {
+                sprintf(buf+strlen(buf),"@values %c",'a'+n);
+                for (i=0; i<script_named_counts[n]; i++)
+                    sprintf(buf+strlen(buf)," %s",script_named_values[n][i]);
+                strcat(buf,"\n");
+            }
+            write(fd, buf, strlen(buf));
+        }
+    }
     close(fd);
     ufree(buf);

branches/release-1_0/include/script.h

@@ -20 +20 @@
 extern char script_title[36];
 extern char script_params[SCRIPT_NUM_PARAMS][28];
+extern int script_range_values[SCRIPT_NUM_PARAMS];
 extern int script_param_order[SCRIPT_NUM_PARAMS];
+extern const char **script_named_values[SCRIPT_NUM_PARAMS];
+extern int script_named_counts[SCRIPT_NUM_PARAMS];
 
 //-------------------------------------------------------------------

branches/release-1_0/lib/ubasic/tokenizer.c

@@ -202 +202 @@
   {"@param",                  TOKENIZER_REM},
   {"@default",                TOKENIZER_REM},
+  {"@range",                  TOKENIZER_REM},
+  {"@values",                 TOKENIZER_REM},
 
   {"md_detect_motion",        TOKENIZER_MD_DETECT_MOTION},