Changeset 1614

Timestamp:

01/26/12 07:50:34 (16 months ago)

Author:

philmoz

Message:

Update to text box test version.

Location:

branches/tbox_test/core

Files:

• gui_fselect.c (modified) (2 diffs)
• gui_tbox.c (modified) (5 diffs)
• gui_tbox.h (modified) (1 diff)
• luascript.c (modified) (1 diff)

branches/tbox_test/core/gui_fselect.c

@@ -1132 +1132 @@
             case MPOPUP_MKDIR:
             if (module_tbox_load())
-                module_tbox_load()->textbox_init(LANG_POPUP_MKDIR, LANG_PROMPT_MKDIR, "", 15, mkdir_cb);
+                module_tbox_load()->textbox_init(LANG_POPUP_MKDIR, LANG_PROMPT_MKDIR, "", 15, mkdir_cb, 0);
             break;
         case MPOPUP_RMDIR:
@@ -1139 +1139 @@
         case MPOPUP_RENAME:
             if (module_tbox_load())
-                module_tbox_load()->textbox_init(LANG_POPUP_RENAME, LANG_PROMPT_RENAME, selected->name, 15, rename_cb);
+                module_tbox_load()->textbox_init(LANG_POPUP_RENAME, LANG_PROMPT_RENAME, selected->name, 15, rename_cb, 0);
             break;
         }

branches/tbox_test/core/gui_tbox.c

@@ -97 +97 @@
 cmap *charmaps[] = { &tbox_chars_default, &tbox_chars_russian };
 
-int lines = 0;              // num of valid lines in active charmap
+int lines = 0;                  // num of valid lines in active charmap
 
 int tbox_button_active, line;
-int curchar;     // idx of current entered char in current tmap
+int curchar;                    // idx of current entered char in current tmap
 int curgroup;
 int cursor;
-char lastKey;    // Last pressed key (Left, Right, Up, Down)
-char Mode;       // K=keyboard, T=textnavigate, B=button
-
-char *text = 0;  // Entered text
+char lastKey;                   // Last pressed key (Left, Right, Up, Down)
+char Mode;                      // K=keyboard, T=textnavigate, B=button
+
+char text_buf[MAX_TEXT_SIZE+1]; // Default buffer if not supplied by caller
+char *text = 0;                 // Entered text
 int maxlen, offset;
 coord text_offset_x, text_offset_y, key_offset_x;
@@ -134 +135 @@
 
 //-------------------------------------------------------
-int textbox_init(int title, int msg, const char* defaultstr, unsigned int maxsize, void (*on_select)(const char* newstr)) {
-
-    text = malloc(sizeof(char)*(maxsize+1));
-    if ( text==0 ) {
-        // fatal failure
-        if (on_select)
-            on_select(0);    // notify callback about exit as cancel
-        module_async_unload(module_idx);
-        return 0;
+int textbox_init(int title, int msg, const char* defaultstr, unsigned int maxsize, void (*on_select)(const char* newstr), char *input_buffer)
+{
+    if (input_buffer)
+        text = input_buffer;
+    else
+    {
+        if (maxsize > MAX_TEXT_SIZE) maxsize = MAX_TEXT_SIZE;
+        text = text_buf;
     }
 
@@ -538 +538 @@
                         tbox_on_select(0); // cancel
                     }
-                    free(text);
                     text=0;
                 }
@@ -555 +554 @@
 
 static const char* gui_text_box_charmap[] = { "Default", "Russian" };
-static CMenuItem zebra_submenu_items[] = {
+static CMenuItem textbox_submenu_items[] = {
     MENU_ENUM2(0x5f,LANG_MENU_VIS_CHARMAP,              &tconf.char_map, gui_text_box_charmap ),
     MENU_ITEM(0x51,LANG_MENU_BACK,                      MENUITEM_UP, 0, 0 ),
     {0}
 };
-static CMenu textbox_submenu = {0x26,LANG_STR_TEXTBOX_SETTINGS, NULL, zebra_submenu_items };
+static CMenu textbox_submenu = {0x26,LANG_STR_TEXTBOX_SETTINGS, NULL, textbox_submenu_items };
 
 
@@ -610 +609 @@
 
     // clean allocated resource
-    if ( text!=0 )
-    {
-        free(text);
-        if (tbox_on_select)
-            tbox_on_select(0);    // notify callback about exit as cancel
-        text = 0;
-    }
+    if (tbox_on_select)
+        tbox_on_select(0);    // notify callback about exit as cancel
 
     //sanity clean to prevent accidentaly assign/restore guimode to unloaded module

branches/tbox_test/core/gui_tbox.h

@@ -2 +2 @@
 #define TEXTBOX_H
 
+#define MAX_TEXT_SIZE   100
+
+// Note: if using the text box module pass in a function to the 'on_select' parameter
+// the text box will call this function with the user entered text in 'newstr'
+
+// If supplied the 'input_buffer' array will be used to store the user input text,
+// this will also be the address passed to 'on_select' in 'newstr' - in this case
+// the calling function owns the data buffer. Ensure that the size of 'input_buffer'
+// is at least 'maxsize + 1'.
+
+// If 'input_buffer' is null then a local buffer in the module will be used to
+// store the text, the maximum size of this buffer is MAX_TEXT_SIZE.
+// In this case the module owns the buffer and the contents must be copied to local
+// storage in the 'on_select' code.
+
 struct libtextbox_sym {
         int version;
-    int (*textbox_init)(int title, int msg, const char* defaultstr, unsigned int maxsize, void (*on_select)(const char* newstr));
+    int (*textbox_init)(int title, int msg, const char* defaultstr, unsigned int maxsize, void (*on_select)(const char* newstr), char *input_buffer);
 };
 

branches/tbox_test/core/luascript.c

@@ -853 +853 @@
                                          luaL_optstring( L, 3, ""  ),               //default string
                                          luaL_optnumber( L, 4, 30),                 //max size of a text
-                                         return_string_selected);    }
+                                         return_string_selected, 0);
+    }
     else
         return_string_selected(0);