Changeset 1337

Timestamp:

09/14/11 08:25:24 (21 months ago)

Author:

philmoz

Message:

Fix for text reader when opening a new file.
Change made in changeset 1310 to fix crash when selecting fonts caused problem for text reader.

Location:

trunk/core

Files:

• gui.c (modified) (1 diff)
• gui_fselect.c (modified) (6 diffs)

trunk/core/gui.c

@@ -2970 +2970 @@
     }
     gui_fselect_init(LANG_STR_SELECT_TEXT_FILE, path, gui_draw_read_selected);
+    void gui_fselect_set_key_redraw(int n);
+    gui_fselect_set_key_redraw(1);
 }
 

trunk/core/gui_fselect.c

@@ -69 +69 @@
 static void (*fselect_on_select)(const char *fn);
 static char raw_operation;
+static int set_key_redraw_mode;
 
 //-------------------------------------------------------------------
@@ -200 +201 @@
 
 //-------------------------------------------------------------------
+// Set flag to control how the erase/redraw happens when the set key
+// is pressed.
+// 0 - screen erase & mode restore done after call to fselect_on_select
+// 1 - screen erase & mode restore done before call to fselect_on_select
+// Needed for text reader to work correctly and to stop intermittent
+// crashes when selecting fonts (hack - whole gui/kbd system needs an overhaul).
+void gui_fselect_set_key_redraw(int n)
+{
+    set_key_redraw_mode = n;
+}
+
 void gui_fselect_init(int title, const char* dir, void (*on_select)(const char *fn)) {
     int i;
@@ -229 +241 @@
     gui_fselect_redraw = 2;
     gui_set_mode(GUI_MODE_FSELECT);
+    gui_fselect_set_key_redraw(0);
 }
 
@@ -973 +986 @@
 
 //-------------------------------------------------------------------
+static void exit_fselect()
+{
+    gui_fselect_free_data();
+    gui_fselect_marked_free_data();
+    if (set_key_redraw_mode)
+    {
+        gui_set_mode(gui_fselect_mode_old);
+        draw_restore();
+    }
+    if (fselect_on_select) 
+    {
+        fselect_on_select(selected_file);
+    }
+    if (!set_key_redraw_mode)
+    {
+        gui_set_mode(gui_fselect_mode_old);
+        draw_restore();
+    }
+}
+
 void gui_fselect_kbd_process() {
     int i;
@@ -1050 +1083 @@
                 } else  {
                     sprintf(selected_file, "%s/%s", current_dir, selected->name);
-                    gui_fselect_free_data();
-                    gui_fselect_marked_free_data();
-                    if (fselect_on_select) 
-                        fselect_on_select(selected_file);
-                    gui_set_mode(gui_fselect_mode_old);
-                    draw_restore();
+                    exit_fselect();
                 }
             }
@@ -1076 +1104 @@
             break;
         case KEY_MENU:
-            gui_fselect_free_data();
-            gui_fselect_marked_free_data();
-            if (fselect_on_select) 
-                fselect_on_select(NULL);
-            gui_set_mode(gui_fselect_mode_old);
-            draw_restore();
-            break;
-    }
-}
-
-//-------------------------------------------------------------------
+            exit_fselect();
+            break;
+    }
+}
+
+//-------------------------------------------------------------------