Changeset 487

Timestamp:

08/17/08 10:22:09 (5 years ago)

Author:

Jucifer

Message:

• applied reyalp's lua-hex-warnings.patch (​http://chdk.setepontos.com/index.php/topic,688.msg19975.html#msg19975)
• followed bperrybap's suggestion to modify a couple of (user) menu symbols (​http://chdk.setepontos.com/index.php/topic,688.msg19776.html#msg19776)
• fixed screen not redrawn when entering main menu from user menu -issue

Location:

branches/juciphox

Files:

• core/gui.c (modified) (2 diffs)
• doc/version.txt (modified) (2 diffs)
• include/luaconf.h (modified) (3 diffs)
• lib/lua/lobject.c (modified) (1 diff)
• version.inc (modified) (1 diff)

branches/juciphox/core/gui.c

@@ -584 +584 @@
         {0x0,LANG_MENU_ITEM_BLANK,      MENUITEM_PROC,  (int*)blank_menu,0},
         {0x0,LANG_MENU_ITEM_BLANK,      MENUITEM_PROC,  (int*)blank_menu,0},
-        {0x0,LANG_MENU_MAIN_TITLE,      MENUITEM_PROC,  (int*)rinit},
+        {0x20,LANG_MENU_MAIN_TITLE,      MENUITEM_PROC,  (int*)rinit},
     {0}
 };
@@ -733 +733 @@
 void rinit(){
         gui_menu_init(&root_menu);
-}
-
-static CMenuItem blank_menu_item = {'0',LANG_MENU_ITEM_BLANK, MENUITEM_PROC, (int*)blank_menu,0};
+    draw_restore();
+    gui_force_restore();
+}
+
+static CMenuItem blank_menu_item = {0x0,LANG_MENU_ITEM_BLANK, MENUITEM_PROC, (int*)blank_menu,0};
 
 void add_user_menu(CMenuItem curr_menu_item, int* gui_menu_add_item, int del) {

branches/juciphox/doc/version.txt

@@ -6 +6 @@
 log
 
+
+487 / 0.3.7
+Jucifer
+
+- applied reyalp's lua-hex-warnings.patch (http://chdk.setepontos.com/index.php/topic,688.msg19975.html#msg19975)
+- followed bperrybap's suggestion to modify a couple of (user) menu symbols  (http://chdk.setepontos.com/index.php/topic,688.msg19776.html#msg19776)
+- fixed screen not redrawn when entering main menu from user menu -issue
+
+
+
 486 / 0.3.6
 Jucifer
@@ -11 +21 @@
 + added LjL's cropped zebra -mod (http://chdk.setepontos.com/index.php/topic,1849.msg17467.html#msg17467)
 + added get_time("unit") for Lua, where unit can be Y[ear], M[onth], D[ay], h[our], m[inute] or s[econd] ([]=optional/example)
+
 
 

branches/juciphox/include/luaconf.h

@@ -540 +540 @@
 #define luai_numdiv(a,b)        ((a)/(b))
 #define luai_nummod(a,b)        ((a)%(b))
-LUA_NUMBER luai_ipow(LUA_NUMBER, LUA_NUMBER);
 #define luai_numpow(a,b)        (luai_ipow(a,b))
 #define luai_numunm(a)          (-(a))
@@ -549 +548 @@
 #endif
 
+// reyalp - used in lib too
+#if defined(LUA_CORE) || defined(LUA_LIB)
+LUA_NUMBER luai_ipow(LUA_NUMBER, LUA_NUMBER);
+#endif
 
 /*
@@ -767 +770 @@
 #endif
 
+

branches/juciphox/lib/lua/lobject.c

@@ -92 +92 @@
   *result = lua_str2number(s, &endptr);
   if (endptr == s) return 0;  /* conversion failed */
-#if 0
   if (*endptr == 'x' || *endptr == 'X')  /* maybe an hexadecimal constant? */
-    *result = cast_num(strtoul(s, &endptr, 16));
-#endif
+// reyalp - use strtol
+    *result = cast_num(strtol(s, &endptr, 16));
   if (*endptr == '\0') return 1;  /* most common case */
   while (isspace(cast(unsigned char, *endptr))) endptr++;

branches/juciphox/version.inc

@@ -1 @@
-BUILD_NUMBER := 0.3.6
+BUILD_NUMBER := 0.3.7