Changeset 1513

Timestamp:

12/29/11 04:24:30 (18 months ago)

Author:

philmoz

Message:

Cleanup of code for handling CHDK 'gui' mode.

Location:

branches/reyalp-flt

Files:

• core/dng.c (modified) (1 diff)
• core/gui.c (modified) (21 diffs)
• core/gui_4wins.c (modified) (2 diffs)
• core/gui_4wins.h (modified) (1 diff)
• core/gui_bench.c (modified) (2 diffs)
• core/gui_calendar.c (modified) (2 diffs)
• core/gui_calendar.h (modified) (1 diff)
• core/gui_debug.c (modified) (2 diffs)
• core/gui_draw.h (modified) (1 diff)
• core/gui_fselect.c (modified) (5 diffs)
• core/gui_fselect.h (modified) (1 diff)
• core/gui_mastermind.c (modified) (2 diffs)
• core/gui_mastermind.h (modified) (1 diff)
• core/gui_mbox.c (modified) (3 diffs)
• core/gui_mbox.h (modified) (1 diff)
• core/gui_menu.c (modified) (1 diff)
• core/gui_mpopup.c (modified) (4 diffs)
• core/gui_mpopup.h (modified) (1 diff)
• core/gui_osd.c (modified) (2 diffs)
• core/gui_osd.h (modified) (1 diff)
• core/gui_palette.c (modified) (4 diffs)
• core/gui_palette.h (modified) (1 diff)
• core/gui_read.c (modified) (3 diffs)
• core/gui_read.h (modified) (1 diff)
• core/gui_reversi.c (modified) (2 diffs)
• core/gui_reversi.h (modified) (1 diff)
• core/gui_snake.c (modified) (2 diffs)
• core/gui_sokoban.c (modified) (2 diffs)
• core/gui_sokoban.h (modified) (1 diff)
• core/gui_tetris.c (modified) (2 diffs)
• core/luascript.c (modified) (1 diff)
• core/module_exportlist.c (modified) (2 diffs)
• core/modules/module_inspector.c (modified) (2 diffs)
• include/gui.h (modified) (4 diffs)

branches/reyalp-flt/core/dng.c

@@ -714 +714 @@
     }
 
-    gui_set_mode(GUI_MODE_ALT);
+    gui_set_mode(&altGuiHandler);
     action_stack_create(&badpixel_task_stack, BADPIX_START);
 }

branches/reyalp-flt/core/gui.c

@@ -155 +155 @@
 #endif
 static void gui_draw_fselect(int arg);
-static void gui_draw_osd_le(int arg);
 #ifdef OPT_TEXTREADER
 static void gui_draw_read(int arg);
@@ -1588 +1587 @@
 
 //-------------------------------------------------------------------
-static volatile gui_mode_t gui_mode;    // current gui mode. if <GUI_MODE_LASTIDX - idx in guiHandlers (core modes), otherwise pointer to gui_handler object (module modes)
+static gui_handler *gui_mode;   // current gui mode. pointer to gui_handler structure
 
 static volatile int gui_restore;
@@ -1598 +1597 @@
 #endif
 
-extern gui_handler guiHandlers[];
-
 //-------------------------------------------------------------------
 void gui_init()
 {
-    gui_set_mode(GUI_MODE_NONE);
+    gui_set_mode(&defaultGuiHandler);
     gui_restore = 0;
     gui_in_redraw = 0;
@@ -1662 +1659 @@
 
 
-// Small hack: use understandable name to reused data member
-#define binded_gui_mode_ptr kbd_process
-
-//-------------------------------------------------------------------
-gui_mode_t gui_get_mode() {
-    if ( gui_mode >= GUI_MODE_COUNT )
-        {
-                int mode;
-                for (mode=0;mode<GUI_MODE_COUNT;mode++)
-                {
-                        if ( (guiHandlers[mode].flags & GUI_MODE_FLAG_ALIAS) && 
-                                        guiHandlers[mode].binded_gui_mode_ptr == (void*)gui_mode ) 
-                                return mode;
-                }
-        }
-    return gui_mode;
-}
-
-//-------------------------------------------------------------------
-void gui_set_mode(gui_mode_t mode) 
+//-------------------------------------------------------------------
+gui_mode_t gui_get_mode() { return ((gui_handler*)gui_mode)->mode; }
+
+//-------------------------------------------------------------------
+// Set new GUI mode, returns old mode
+gui_handler* gui_set_mode(gui_handler *mode) 
 {
         if ( gui_mode == mode )
-                return;
-
-        if (  mode < GUI_MODE_COUNT && 
-                  (guiHandlers[mode].flags & GUI_MODE_FLAG_ALIAS) ) 
-        {
-                mode = (unsigned int)guiHandlers[mode].binded_gui_mode_ptr; 
-        }
+                return gui_mode;
 
         // Sanity check for case module pointer - is this really gui_handler
-    if ( mode >= GUI_MODE_COUNT && ((gui_handler*)mode)->magicnum != GUI_MODE_MAGICNUM ) {
+    if ( mode->magicnum != GUI_MODE_MAGICNUM ) {
                 // If sanity failed (module is unload) - set to default mode
-        gui_mode = GUI_MODE_NONE;
+        gui_mode = &defaultGuiHandler;
                 draw_restore();
-                return;
+                return gui_mode;
         }
         
 #ifdef CAM_TOUCHSCREEN_UI
-    if (((gui_mode == 0) != (mode == 0)) ||                         // Change from GUI_MODE_NONE to any other or vice-versa
-        ((gui_mode > GUI_MODE_MENU) != (mode > GUI_MODE_MENU)))     // Switch in & out of menu mode
+    if (((gui_mode->mode == GUI_MODE_NONE) != (mode->mode == GUI_MODE_NONE)) ||    // Change from GUI_MODE_NONE to any other or vice-versa
+        ((gui_mode->mode > GUI_MODE_MENU)  != (mode->mode > GUI_MODE_MENU)))       // Switch in & out of menu mode
         redraw_buttons = 1;
 #endif
+
+    gui_handler *old_mode = gui_mode;
     gui_mode = mode;
-}
-
-//-------------------------------------------------------------------
-// PURPOSE: bind module struct to 
-// RETUN: 0 - fail, 1 - ok
-int gui_bind_mode(int core_mode, gui_handler* handler) {
-
-        // sanity checks
-    if ( core_mode >= GUI_MODE_COUNT ||
-                (guiHandlers[core_mode].flags & GUI_MODE_FLAG_ALIAS)==0
-           )
-                return 0;
-
-        if ( handler && handler->magicnum != GUI_MODE_MAGICNUM )
-                return 0;
-
-        // check is this module is already binded (loaded with different name)
-        gui_handler* bind_gui_handler = (gui_handler*)guiHandlers[core_mode].binded_gui_mode_ptr;
-        if ( bind_gui_handler && bind_gui_handler->magicnum == GUI_MODE_MAGICNUM )
-                return 0;
-
-        guiHandlers[core_mode].binded_gui_mode_ptr = (void*)handler;
-        return 1;
-}
-
-#undef binded_gui_mode_ptr
-
+
+    return old_mode;
+}
 
 //-------------------------------------------------------------------
@@ -1768 +1723 @@
             gui_draw_splash(logo,logo_size);
            //   conf.show_osd = 0;
-        } else if (gui_splash==1 && (mode_get()&MODE_MASK) == gui_splash_mode && (gui_mode==GUI_MODE_NONE || gui_mode==GUI_MODE_ALT)) {
+        } else if (gui_splash==1 && (mode_get()&MODE_MASK) == gui_splash_mode && (gui_get_mode()==GUI_MODE_NONE || gui_get_mode()==GUI_MODE_ALT)) {
             draw_restore();
            // conf.show_osd = 1; //had to uncomment in order to fix a bug with disappearing osd...
@@ -1806 +1761 @@
 
 #ifdef CAM_DISP_ALT_TEXT
-    draw_txt_string(20, 14, "<ALT>", MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+    draw_txt_string(20, 14, "<ALT>", MAKE_COLOR(COLOR_RED, COLOR_WHITE));
 #endif
 
@@ -1829 +1784 @@
 void gui_default_kbd_process_menu_btn()
 {
-    gui_set_mode(GUI_MODE_MENU);
+    gui_set_mode(&menuGuiHandler);
     draw_restore();
 }
@@ -2003 +1958 @@
     if (gui_user_menu_flag)
     {
-        gui_set_mode(GUI_MODE_MENU);
+        gui_set_mode(&menuGuiHandler);
         gui_user_menu_flag = 0;
         gui_menu_init(&root_menu);
     }
     else
-        gui_set_mode(GUI_MODE_ALT);
+        gui_set_mode(&altGuiHandler);
     draw_restore();
 }
 
 //-------------------------------------------------------------------
-// GUI handler table (entries must be in the same order and have the same number of entries as Gui_Mode enum)
-gui_handler guiHandlers[GUI_MODE_COUNT] =
-{
-    /*GUI_MODE_NONE*/           { gui_draw_osd,         0,                          0,                                                          0,                                                                      GUI_MODE_MAGICNUM },
-    /*GUI_MODE_ALT*/            { gui_chdk_draw,        gui_chdk_kbd_process,       gui_chdk_kbd_process_menu_btn,      0,                                                                      GUI_MODE_MAGICNUM },            
-    /*GUI_MODE_MENU*/           { gui_menu_draw,        gui_menu_kbd_process,       gui_menu_kbd_process_menu_btn,      0,                                                                      GUI_MODE_MAGICNUM },
-    /*GUI_MODE_ALIAS_PALETTE*/  { 0,                                    0,                                              0,                                                              GUI_MODE_FLAG_ALIAS,                            GUI_MODE_MAGICNUM },
-    /*GUI_MODE_MBOX*/           { gui_mbox_draw,        gui_mbox_kbd_process,       0,                                                          GUI_MODE_FLAG_NORESTORE_ON_SWITCH,      GUI_MODE_MAGICNUM },
-    /*GUI_MODE_ALIAS_FSELECT*/  { 0,                                    0,                                              0,                                                              GUI_MODE_FLAG_ALIAS,                            GUI_MODE_MAGICNUM },
-    /*GUI_MODE_OSD*/            { gui_osd_draw,         gui_osd_kbd_process,        gui_default_kbd_process_menu_btn, 0,                                                                 GUI_MODE_MAGICNUM },           // THIS IS OSD LAYOUT EDITOR
-    /*GUI_MODE_ALIAS_MPOPUP*/   { 0,                                    0,                                              0,                                                              GUI_MODE_FLAG_ALIAS,                            GUI_MODE_MAGICNUM },
-};
-
+// GUI handlers
+gui_handler defaultGuiHandler = { GUI_MODE_NONE,    gui_draw_osd,   0,                      0,                                0,                                    GUI_MODE_MAGICNUM };
+gui_handler altGuiHandler =     { GUI_MODE_ALT,     gui_chdk_draw,  gui_chdk_kbd_process,   gui_chdk_kbd_process_menu_btn,    0,                                    GUI_MODE_MAGICNUM };            
+gui_handler menuGuiHandler =    { GUI_MODE_MENU,    gui_menu_draw,  gui_menu_kbd_process,   gui_menu_kbd_process_menu_btn,    0,                                    GUI_MODE_MAGICNUM };
 
 //-------------------------------------------------------------------
@@ -2037 +1983 @@
 
 #ifdef CAM_DETECT_SCREEN_ERASE
-    if (!draw_test_guard() && gui_mode)     // Attempt to detect screen erase in <Alt> mode, redraw if needed
+    if (!draw_test_guard() && gui_get_mode())     // Attempt to detect screen erase in <Alt> mode, redraw if needed
     {
         draw_set_guard();
 
-                flag_gui_enforce_redraw |= GUI_REDRAWFLAG_ERASEGUARD;
+        flag_gui_enforce_redraw |= GUI_REDRAWFLAG_ERASEGUARD;
         //gui_menu_force_redraw();
         //gui_fselect_force_redraw();   //@tsv
@@ -2054 +2000 @@
 
     gui_in_redraw = 1;
-    gui_mode_old = gui_mode;
+    gui_mode_old = gui_get_mode();
 
 #ifdef CAM_TOUCHSCREEN_UI
@@ -2062 +2008 @@
 
     // Call redraw handler
-        gui_handler* cur_gui_handler = (gui_mode<GUI_MODE_COUNT)? (&guiHandlers[gui_mode]) : (gui_handler*)gui_mode;
-    if (cur_gui_handler->redraw) cur_gui_handler->redraw(flag_gui_enforce_redraw);
+    if (gui_mode->redraw) gui_mode->redraw(flag_gui_enforce_redraw);
         flag_gui_enforce_redraw=0;
 
     // Forced redraw if needed
     gui_in_redraw = 0;
-        cur_gui_handler = (gui_mode<GUI_MODE_COUNT)? (&guiHandlers[gui_mode]) : (gui_handler*)gui_mode;
-    if ((gui_mode_old != gui_mode 
+    if ((gui_mode_old != gui_get_mode() 
                         && (gui_mode_old != GUI_MODE_NONE && gui_mode_old != GUI_MODE_ALT) 
-                        && !(cur_gui_handler->flags & GUI_MODE_FLAG_NORESTORE_ON_SWITCH)) 
+                        && !(gui_mode->flags & GUI_MODE_FLAG_NORESTORE_ON_SWITCH)) 
             || gui_restore ) 
         {
-
         if (gui_restore)
                         flag_gui_enforce_redraw |= GUI_REDRAWFLAG_DRAW_RESTORED;
         gui_restore = 0;
 
-        if ( !( cur_gui_handler->flags & GUI_MODE_FLAG_NODRAWRESTORE) )
+        if ( !( gui_mode->flags & GUI_MODE_FLAG_NODRAWRESTORE) )
             draw_restore();
     }
 
-        if ( gui_mode_prev_tick != gui_mode ) {
+        if ( gui_mode_prev_tick != gui_get_mode() ) {
                 flag_gui_enforce_redraw |= GUI_REDRAWFLAG_MODE_WAS_CHANGED;
-                gui_mode_prev_tick = gui_mode;
+                gui_mode_prev_tick = gui_get_mode();
         }
 }
@@ -2093 +2036 @@
 void gui_kbd_process()
 {
-        gui_handler* cur_gui_handler = (gui_mode<GUI_MODE_COUNT)? (&guiHandlers[gui_mode]) : (gui_handler*)gui_mode;    
-
     // Call menu button handler if menu button pressed
     if (kbd_is_key_clicked(KEY_MENU))
     {
-        if (cur_gui_handler->kbd_process_menu_btn) cur_gui_handler->kbd_process_menu_btn();
+        if (gui_mode->kbd_process_menu_btn) gui_mode->kbd_process_menu_btn();
         return;
     }
 
     // Call mode handler for other buttons
-    if (cur_gui_handler->kbd_process) cur_gui_handler->kbd_process();
+    if (gui_mode->kbd_process) gui_mode->kbd_process();
 }
 
@@ -2113 +2054 @@
     conf_store_old_settings();
 #endif
-    gui_set_mode(GUI_MODE_ALT);
+    gui_set_mode(&altGuiHandler);
 
         conf_update_prevent_shutdown();
@@ -2125 +2066 @@
         if ((conf.user_menu_enable == 2) && !state_kbd_script_run) {
                 gui_menu_init(&user_submenu);
-                gui_set_mode(GUI_MODE_MENU);
+                gui_set_mode(&menuGuiHandler);
                 draw_restore();
                 gui_user_menu_flag = 1;
@@ -2145 +2086 @@
     rbf_set_codepage(FONT_CP_WIN);
     vid_turn_on_updates();
-    gui_set_mode(GUI_MODE_NONE);
+    gui_set_mode(&defaultGuiHandler);
 
         // Unload all modules which are marked as safe to unload
@@ -2426 +2367 @@
 
 #if CAM_SWIVEL_SCREEN
-    if (conf.flashlight && (m&MODE_SCREEN_OPENED) && (m&MODE_SCREEN_ROTATED) && (gui_mode==GUI_MODE_NONE /* || gui_mode==GUI_MODE_ALT */)) {
+    if (conf.flashlight && (m&MODE_SCREEN_OPENED) && (m&MODE_SCREEN_ROTATED) && (gui_get_mode()==GUI_MODE_NONE /* || gui_get_mode()==GUI_MODE_ALT */)) {
         draw_filled_rect(0, 0, screen_width-1, screen_height-1, MAKE_COLOR(COLOR_WHITE, COLOR_WHITE));
         flashlight = 1;
     }
     if (flashlight) {
-        if ((!((m&MODE_SCREEN_OPENED) && (m&MODE_SCREEN_ROTATED))) || (gui_mode!=GUI_MODE_NONE /* && gui_mode!=GUI_MODE_ALT */)) {
+        if ((!((m&MODE_SCREEN_OPENED) && (m&MODE_SCREEN_ROTATED))) || (gui_get_mode()!=GUI_MODE_NONE /* && gui_get_mode()!=GUI_MODE_ALT */)) {
             flashlight = 0;
                         need_restore = 1;
@@ -2498 +2439 @@
                 return;
 
-        if (gui_osd_draw_zebra(conf.zebra_draw && gui_mode==GUI_MODE_NONE &&
+        if (gui_osd_draw_zebra(conf.zebra_draw && gui_get_mode()==GUI_MODE_NONE &&
                                                         kbd_is_key_pressed(KEY_SHOOT_HALF) && mode_photo &&
                                                         !state_kbd_script_run)) {// no zebra when script running, to save mem
@@ -2510 +2451 @@
 
 
-    if ((gui_mode==GUI_MODE_NONE || gui_mode==GUI_MODE_ALT) && (
+    if ((gui_get_mode()==GUI_MODE_NONE || gui_get_mode()==GUI_MODE_ALT) && (
      (kbd_is_key_pressed(KEY_SHOOT_HALF) && ((conf.show_histo==SHOW_HALF)/* || (m&MODE_MASK) == MODE_PLAY*/)) ||
      ((conf.show_histo==SHOW_ALWAYS)  &&  !((m&MODE_MASK) == MODE_PLAY) && (recreview_hold==0))
@@ -2522 +2463 @@
             gui_grid_draw_osd(1);
         }
-        if ((gui_mode==GUI_MODE_NONE || gui_mode==GUI_MODE_ALT) && (((kbd_is_key_pressed(KEY_SHOOT_HALF) || (state_kbd_script_run) || (shooting_get_common_focus_mode())) && (mode_photo || (m&MODE_SHOOTING_MASK)==MODE_STITCH )) || ((mode_video || movie_status > 1) && conf.show_values_in_video) )) {
+        if ((gui_get_mode()==GUI_MODE_NONE || gui_get_mode()==GUI_MODE_ALT) && (((kbd_is_key_pressed(KEY_SHOOT_HALF) || (state_kbd_script_run) || (shooting_get_common_focus_mode())) && (mode_photo || (m&MODE_SHOOTING_MASK)==MODE_STITCH )) || ((mode_video || movie_status > 1) && conf.show_values_in_video) )) {
 
            if (conf.show_dof!=DOF_DONT_SHOW) gui_osd_calc_dof();
@@ -2558 +2499 @@
     if ( conf.show_movie_time > 0 && (mode_video || movie_status > 1)) gui_osd_draw_movie_time_left();
 #if CAM_DRAW_EXPOSITION
-    if (gui_mode==GUI_MODE_NONE && kbd_is_key_pressed(KEY_SHOOT_HALF) && ((m&MODE_MASK)==MODE_REC) && ((m&MODE_SHOOTING_MASK))!=MODE_VIDEO_STD && (m&MODE_SHOOTING_MASK)!=MODE_VIDEO_COMPACT) {
+    if (gui_get_mode()==GUI_MODE_NONE && kbd_is_key_pressed(KEY_SHOOT_HALF) && ((m&MODE_MASK)==MODE_REC) && ((m&MODE_SHOOTING_MASK))!=MODE_VIDEO_STD && (m&MODE_SHOOTING_MASK)!=MODE_VIDEO_COMPACT) {
      strcpy(osd_buf,shooting_get_tv_str());
      strcat(osd_buf,"\"  F");
@@ -2706 +2647 @@
 void gui_grid_lines_load(int arg) {
     module_fselect_init(LANG_STR_SELECT_GRID_FILE, conf.grid_lines_file, "A/CHDK/GRIDS", gui_grid_lines_load_selected);
-}
-
-//-------------------------------------------------------------------
-void gui_draw_osd_le(int arg) {
-    gui_set_mode(GUI_MODE_OSD);
-    gui_osd_init();
 }
 

branches/reyalp-flt/core/gui_4wins.c

@@ -15 +15 @@
 
 #include "module_load.h"
+
 void gui_module_menu_kbd_process();
+void gui_4wins_kbd_process();
+void gui_4wins_draw(int enforce_redraw);
 
 gui_handler GUI_MODE_4WINS = 
-    /*GUI_MODE_4WINS*/          { gui_4wins_draw,       gui_4wins_kbd_process,      gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_4WINS*/  { GUI_MODE_MODULE,  gui_4wins_draw,       gui_4wins_kbd_process,      gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
 
 
@@ -339 +342 @@
         if(cur_player==2&&!mode_rival) set();
 
-    gui_set_mode((unsigned int)&GUI_MODE_4WINS);
+    gui_set_mode(&GUI_MODE_4WINS);
 
         return 1;

branches/reyalp-flt/core/gui_4wins.h

@@ -4 +4 @@
 //-------------------------------------------------------------------
 extern int gui_4wins_init();
-extern void gui_4wins_kbd_process();
-extern void gui_4wins_draw(int enforce_redraw);
 
 //-------------------------------------------------------------------

branches/reyalp-flt/core/gui_bench.c

@@ -14 +14 @@
 
 gui_handler GUI_MODE_BENCH = 
-    /*GUI_MODE_BENCH*/          { gui_bench_draw_callback,   gui_bench_kbd_process,      gui_bench_menu_kbd_process, 0, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_BENCH*/  { GUI_MODE_MODULE,   gui_bench_draw_callback,   gui_bench_kbd_process,      gui_bench_menu_kbd_process, 0, GUI_MODE_MAGICNUM };
 
 
@@ -244 +244 @@
 int basic_module_init() {
         gui_bench_init();
-    gui_set_mode( (unsigned int)&GUI_MODE_BENCH );
+    gui_set_mode(&GUI_MODE_BENCH);
         return 1;
 }

branches/reyalp-flt/core/gui_calendar.c

@@ -11 +11 @@
 
 #include "module_load.h"
+
 void gui_calendar_menu_kbd_process();
+void gui_calendar_kbd_process();
+void gui_calendar_draw(int enforce_redraw);
 
 gui_handler GUI_MODE_CALENDAR = 
-    /*GUI_MODE_CALENDAR*/       { gui_calendar_draw,    gui_calendar_kbd_process,   gui_calendar_menu_kbd_process, 0, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_CALENDAR*/   { GUI_MODE_MODULE,   gui_calendar_draw,    gui_calendar_kbd_process,   gui_calendar_menu_kbd_process, 0, GUI_MODE_MAGICNUM };
 
 //-------------------------------------------------------------------
@@ -83 +86 @@
 int basic_module_init() {
 
-    gui_set_mode( (unsigned int)&GUI_MODE_CALENDAR );
+    gui_set_mode(&GUI_MODE_CALENDAR);
 
     calendar_goto_today();

branches/reyalp-flt/core/gui_calendar.h

@@ -4 +4 @@
 //-------------------------------------------------------------------
 extern void gui_calendar_init();
-extern void gui_calendar_kbd_process();
-extern void gui_calendar_draw(int enforce_redraw);
 
 //-------------------------------------------------------------------

branches/reyalp-flt/core/gui_debug.c

@@ -14 +14 @@
 
 gui_handler GUI_MODE_DEBUG = 
-    /*GUI_MODE_DEBUG*/          { gui_debug_draw,       gui_debug_kbd_process,      gui_module_menu_kbd_process, 0, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_DEBUG*/  { GUI_MODE_MODULE,   gui_debug_draw,       gui_debug_kbd_process,      gui_module_menu_kbd_process, 0, GUI_MODE_MAGICNUM };
 
 //-------------------------------------------------------------------
@@ -30 +30 @@
     debug_cont_update = 1;
     step = 4;
-    gui_set_mode((unsigned int)&GUI_MODE_DEBUG);
+    gui_set_mode(&GUI_MODE_DEBUG);
 }
 

branches/reyalp-flt/core/gui_draw.h

@@ -790 +790 @@
 extern color draw_get_pixel(coord x, coord y);
 
+extern void draw_pixel(coord x, coord y, color cl);
+
 extern void draw_line(coord x1, coord y1, coord x2, coord y2, color cl);
 extern void draw_hline(coord x, coord y, int len, color cl);

branches/reyalp-flt/core/gui_fselect.c

@@ -17 +17 @@
 #include "module_load.h"
 
+void gui_fselect_kbd_process();
+void gui_fselect_draw(int enforce_redraw);
+
 gui_handler GUI_MODE_FSELECT_MODULE = 
-    /*GUI_MODE_FSELECT*/        { gui_fselect_draw,     gui_fselect_kbd_process,    gui_fselect_kbd_process,            0,      GUI_MODE_MAGICNUM };
+    /*GUI_MODE_FSELECT*/    { GUI_MODE_FSELECT, gui_fselect_draw,     gui_fselect_kbd_process,    gui_fselect_kbd_process,              0,      GUI_MODE_MAGICNUM };
 
 extern int module_idx;
@@ -60 +63 @@
 static char selected_file[100];     // This full path to current file. So it is return value
 static char buf[100];
-static gui_mode_t gui_fselect_mode_old; // stored previous gui_mode
+static gui_handler *gui_fselect_mode_old; // stored previous gui_mode
 
 // basic element of file list
@@ -390 +393 @@
     fselect_on_select = on_select;
     marked_operation = MARKED_OP_NONE;
-    gui_fselect_mode_old = gui_get_mode();
     gui_fselect_redraw = 2;
-    gui_set_mode((unsigned int)&GUI_MODE_FSELECT_MODULE);
+    gui_fselect_mode_old = gui_set_mode(&GUI_MODE_FSELECT_MODULE);
     gui_fselect_set_key_redraw(0);
 }
@@ -1327 +1329 @@
   CONF_BIND_INT(210, conf_sub_batch_ext);
 
-  // Try to bind to generic gui mode alias
-  if (!gui_bind_mode( GUI_MODE_FSELECT, &GUI_MODE_FSELECT_MODULE))
-        return 1;
-
   return 0;
 }
@@ -1347 +1345 @@
         GUI_MODE_FSELECT_MODULE.magicnum = 0;
 
-    // Unbind generic alias
-        gui_bind_mode( GUI_MODE_FSELECT, 0);
-
     return 0;
 }

branches/reyalp-flt/core/gui_fselect.h

@@ -5 +5 @@
 extern void gui_fselect_init(int title, const char* prev_dir, const char* default_dir, void (*on_select)(const char *fn));
 extern char* gui_fselect_result();
-extern void gui_fselect_kbd_process();
-extern void gui_fselect_draw(int enforce_redraw);
 extern void gui_fselect_force_redraw();
 extern void finalize_fselect();

branches/reyalp-flt/core/gui_mastermind.c

@@ -13 +13 @@
 
 #include "module_load.h"
+
 void gui_module_menu_kbd_process();
+void gui_mastermind_kbd_process();
+void gui_mastermind_draw(int enforce_redraw);
 
 gui_handler GUI_MODE_MASTERMIND = 
-    /*GUI_MODE_MASTERMIND*/     { gui_mastermind_draw,  gui_mastermind_kbd_process, gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_MASTERMIND*/ { GUI_MODE_MODULE,   gui_mastermind_draw,  gui_mastermind_kbd_process, gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
 
 
@@ -140 +143 @@
         for(i=0;i<4;i++) curr_color[i]=99;
         
-    gui_set_mode((unsigned int)&GUI_MODE_MASTERMIND);
+    gui_set_mode(&GUI_MODE_MASTERMIND);
         return 1;
 }

branches/reyalp-flt/core/gui_mastermind.h

@@ -4 +4 @@
 //-------------------------------------------------------------------
 extern int gui_mastermind_init();
-extern void gui_mastermind_kbd_process();
-extern void gui_mastermind_draw(int enforce_redraw);
 
 //-------------------------------------------------------------------

branches/reyalp-flt/core/gui_mbox.c

@@ -11 +11 @@
 
 //-------------------------------------------------------------------
-static gui_mode_t       gui_mbox_mode_old;
+void gui_mbox_draw(int enforce_redraw);
+void gui_mbox_kbd_process();
+
+static gui_handler mboxGuiHandler =    { GUI_MODE_MBOX,    gui_mbox_draw,  gui_mbox_kbd_process,   0,   GUI_MODE_FLAG_NORESTORE_ON_SWITCH,    GUI_MODE_MAGICNUM };
+
+static gui_handler      *gui_mbox_mode_old;
 static const char*      mbox_title;
 static const char*      mbox_msg;
@@ -56 +61 @@
     }
 
-    gui_mbox_mode_old = gui_get_mode();
     mbox_title = lang_str(title);
     mbox_msg = lang_str(msg);
@@ -62 +66 @@
     mbox_flags = flags;
     mbox_on_select = on_select;
-    gui_set_mode(GUI_MODE_MBOX);
+    gui_mbox_mode_old = gui_set_mode(&mboxGuiHandler);
 }
 

branches/reyalp-flt/core/gui_mbox.h

@@ -26 +26 @@
 //-------------------------------------------------------------------
 extern void gui_mbox_init(int title, int msg, const unsigned int flags, void (*on_select)(unsigned int btn));
-extern void gui_mbox_kbd_process();
-extern void gui_mbox_draw(int enforce_redraw);
 
 extern void gui_browser_progress_show(const char* msg, const unsigned int perc);

branches/reyalp-flt/core/gui_menu.c

@@ -111 +111 @@
         // Occurs when script menu opened using 'Func/Set' button
         // Return to normal <ALT> mode.
-        gui_set_mode(GUI_MODE_ALT);
+        gui_set_mode(&altGuiHandler);
         kbd_reset_autoclicked_key();    // Need this to stop 'Func/Set' registering twice???
         draw_restore();

branches/reyalp-flt/core/gui_mpopup.c

@@ -13 +13 @@
 extern int module_idx;
 
+void gui_mpopup_kbd_process();
+void gui_mpopup_draw(int enforce_redraw);
+
 gui_handler GUI_MODE_MPOPUP_MODULE = 
-    /*GUI_MODE_MPOPUP*/         { gui_mpopup_draw,      gui_mpopup_kbd_process,     gui_mpopup_kbd_process, GUI_MODE_FLAG_NORESTORE_ON_SWITCH, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_MPOPUP*/ { GUI_MODE_MPOPUP,  gui_mpopup_draw,      gui_mpopup_kbd_process,     gui_mpopup_kbd_process, GUI_MODE_FLAG_NORESTORE_ON_SWITCH, GUI_MODE_MAGICNUM };
 
 // Simple popup menu. No title, no separators, only processing items
 
 //-------------------------------------------------------------------
-static gui_mode_t          gui_mpopup_mode_old;
+static gui_handler              *gui_mpopup_mode_old;
 static char                     mpopup_to_draw;
 
@@ -51 +54 @@
     mpopup_actions_active = 0;
 
-    gui_mpopup_mode_old = gui_get_mode();
     mpopup_to_draw = 1;
     mpopup_on_select = on_select;
-    gui_set_mode((unsigned int)&GUI_MODE_MPOPUP_MODULE);
+    gui_mpopup_mode_old = gui_set_mode(&GUI_MODE_MPOPUP_MODULE);
 }
 
@@ -171 +173 @@
      return 1;
 
-  // Try to bind to generic gui mode alias
-  if (!gui_bind_mode( GUI_MODE_MPOPUP, &GUI_MODE_MPOPUP_MODULE))
-     return 1;
-
   return 0;
 }
@@ -191 +189 @@
         //sanity clean to prevent accidentaly assign/restore guimode to unloaded module 
         GUI_MODE_MPOPUP_MODULE.magicnum = 0;
-
-        // unbind generic alias
-        gui_bind_mode( GUI_MODE_MPOPUP, 0 );
 
     return 0;

branches/reyalp-flt/core/gui_mpopup.h

@@ -13 +13 @@
 //-------------------------------------------------------------------
 extern void gui_mpopup_init(struct mpopup_item* popup_actions, const unsigned int flags, void (*on_select)(unsigned int actn), int mode);
-extern void gui_mpopup_kbd_process();
-extern void gui_mpopup_draw(int enforce_redraw);
 
 //-------------------------------------------------------------------

branches/reyalp-flt/core/gui_osd.c

@@ -15 +15 @@
 #include "gui_grid.h"
 #include "gui_osd.h"
+
+//-------------------------------------------------------------------
+void gui_osd_kbd_process();
+void gui_osd_draw(int enforce_redraw);
+
+gui_handler layoutGuiHandler =  { GUI_MODE_OSD,     gui_osd_draw,   gui_osd_kbd_process,    gui_default_kbd_process_menu_btn, 0,                                    GUI_MODE_MAGICNUM };    // THIS IS OSD LAYOUT EDITOR
 
 //-------------------------------------------------------------------
@@ -102 +108 @@
     step = 10;
     draw_restore();
+}
+
+//-------------------------------------------------------------------
+void gui_draw_osd_le(int arg) {
+    gui_set_mode(&layoutGuiHandler);
+    gui_osd_init();
 }
 

branches/reyalp-flt/core/gui_osd.h

@@ -34 +34 @@
 
 //-------------------------------------------------------------------
-extern void gui_osd_init();
-extern void gui_osd_kbd_process();
-extern void gui_osd_draw(int enforce_redraw);
+extern void gui_draw_osd_le(int arg);
 
 extern void gui_osd_draw_histo();

branches/reyalp-flt/core/gui_palette.c

@@ -12 +12 @@
 
 #include "module_load.h"
+
 void gui_module_menu_kbd_process();
+void gui_palette_kbd_process();
+void gui_palette_draw(int enforce_redraw);
 
 gui_handler GUI_MODE_PALETTE_MODULE = 
-    /*GUI_MODE_PALETTE*/        { gui_palette_draw,     gui_palette_kbd_process,    gui_module_menu_kbd_process, 0, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_PALETTE*/    { GUI_MODE_PALETTE, gui_palette_draw,     gui_palette_kbd_process,    gui_module_menu_kbd_process, 0, GUI_MODE_MAGICNUM };
 
 //-------------------------------------------------------------------
@@ -30 +33 @@
     palette_on_select = on_select;
     gui_palette_redraw = 1;
-        gui_set_mode((unsigned int)&GUI_MODE_PALETTE_MODULE);
+        gui_set_mode(&GUI_MODE_PALETTE_MODULE);
 }
 
@@ -148 +151 @@
      return 1;
 
-  // Try to bind to generic gui mode alias
-  if (!gui_bind_mode( GUI_MODE_PALETTE, &GUI_MODE_PALETTE_MODULE))
-        return 1;
-
   return 0;
 }
@@ -165 +164 @@
   //sanity clean to prevent accidentaly assign/restore guimode to unloaded module 
   GUI_MODE_PALETTE_MODULE.magicnum = 0;
-
-  // unbind generic alias
-  gui_bind_mode( GUI_MODE_PALETTE, 0);
 
   return 0;

branches/reyalp-flt/core/gui_palette.h

@@ -11 +11 @@
 //-------------------------------------------------------------------
 extern void gui_palette_init(int mode, color st_color, void (*on_select)(color clr));
-extern void gui_palette_kbd_process();
-extern void gui_palette_draw(int enforce_redraw);
 
 //-------------------------------------------------------------------

branches/reyalp-flt/core/gui_read.c

@@ -14 +14 @@
 
 extern void gui_read_kbd_process_menu_btn();
+void gui_read_kbd_process();
+void gui_read_draw(int enforce_redraw);
+void gui_read_kbd_leave();
 
 int *conf_reader_autoscroll;
@@ -24 +27 @@
 
 gui_handler GUI_MODE_READ = 
-    /*GUI_MODE_READ*/           { gui_read_draw,        gui_read_kbd_process,       gui_read_kbd_process_menu_btn,      0,      GUI_MODE_MAGICNUM };
+    /*GUI_MODE_READ*/   { GUI_MODE_MODULE,   gui_read_draw,        gui_read_kbd_process,       gui_read_kbd_process_menu_btn,   0,      GUI_MODE_MAGICNUM };
 
 //-------------------------------------------------------------------
@@ -85 +88 @@
     
         reader_is_active=1;    
-    gui_set_mode((unsigned int)&GUI_MODE_READ);
+    gui_set_mode(&GUI_MODE_READ);
 
     draw_filled_rect(0, 0, screen_width-1, y-1, MAKE_COLOR(COLOR_BLACK, COLOR_BLACK));

branches/reyalp-flt/core/gui_read.h

@@ -3 +3 @@
 
 //-------------------------------------------------------------------
-
-//-------------------------------------------------------------------
 extern int gui_read_init(const char* file);
-extern void gui_read_kbd_process();
-extern void gui_read_draw(int enforce_redraw);
-extern void gui_read_kbd_leave();
 
 //-------------------------------------------------------------------

branches/reyalp-flt/core/gui_reversi.c

@@ -12 +12 @@
 
 #include "module_load.h"
+
 void gui_module_menu_kbd_process();
+void gui_reversi_kbd_process();
+void gui_reversi_draw(int enforce_redraw);
 
 gui_handler GUI_MODE_REVERSI = 
-    /*GUI_MODE_REVERSI*/        { gui_reversi_draw,     gui_reversi_kbd_process,    gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_REVERSI*/    { GUI_MODE_MODULE,   gui_reversi_draw,     gui_reversi_kbd_process,    gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
 
 
@@ -352 +355 @@
 //-------------------------------------------------------------------
 int basic_module_init() {
-    gui_set_mode((unsigned int)&GUI_MODE_REVERSI);
+    gui_set_mode(&GUI_MODE_REVERSI);
     InitMainWindow();
     NewGame();

branches/reyalp-flt/core/gui_reversi.h

@@ -4 +4 @@
 //-------------------------------------------------------------------
 extern void gui_reversi_init();
-extern void gui_reversi_kbd_process();
-extern void gui_reversi_draw(int enforce_redraw);
 
 //-------------------------------------------------------------------

branches/reyalp-flt/core/gui_snake.c

@@ -18 +18 @@
 
 gui_handler GUI_MODE_SNAKE = 
-    /*GUI_MODE_SNAKE*/        { gui_snake_draw,     gui_snake_kbd_process,    gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_SNAKE*/  { GUI_MODE_MODULE,   gui_snake_draw,     gui_snake_kbd_process,    gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
 
 
@@ -425 +425 @@
     draw_filled_rect(0,0,screen_width,screen_height, COLOR_WHITE);
     snake_start();
-        gui_set_mode((unsigned int)&GUI_MODE_SNAKE);
+        gui_set_mode(&GUI_MODE_SNAKE);
     return 1;
 }

branches/reyalp-flt/core/gui_sokoban.c

@@ -13 +13 @@
 
 #include "module_load.h"
+
 void gui_module_menu_kbd_process();
+void gui_sokoban_kbd_process();
+void gui_sokoban_draw(int enforce_redraw);
 
 int *conf_sokoban_level;
 
 gui_handler GUI_MODE_SOKOBAN = 
-    /*GUI_MODE_SOKOBAN*/        { gui_sokoban_draw,     gui_sokoban_kbd_process,    gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_SOKOBAN*/    { GUI_MODE_MODULE,   gui_sokoban_draw,     gui_sokoban_kbd_process,    gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
 
 
@@ -333 +336 @@
     need_redraw_all = 1;
 
-    gui_set_mode((unsigned int)&GUI_MODE_SOKOBAN);
+    gui_set_mode(&GUI_MODE_SOKOBAN);
     return 1;
 }

branches/reyalp-flt/core/gui_sokoban.h

@@ -4 +4 @@
 //-------------------------------------------------------------------
 extern int gui_sokoban_init();
-extern void gui_sokoban_kbd_process();
-extern void gui_sokoban_draw(int enforce_redraw);
 
 //-------------------------------------------------------------------

branches/reyalp-flt/core/gui_tetris.c

@@ -17 +17 @@
 
 gui_handler GUI_MODE_TETRIS = 
-    /*GUI_MODE_TETRIS*/          { gui_tetris_draw,       gui_tetris_kbd_process,      gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_TETRIS*/ { GUI_MODE_MODULE,   gui_tetris_draw,       gui_tetris_kbd_process,      gui_module_menu_kbd_process, GUI_MODE_FLAG_NODRAWRESTORE, GUI_MODE_MAGICNUM };
 
 
@@ -783 +783 @@
   module_idx=moduleidx;
 
-  gui_set_mode ((unsigned int)&GUI_MODE_TETRIS);
+  gui_set_mode(&GUI_MODE_TETRIS);
   gui_tetris_init();
 

branches/reyalp-flt/core/luascript.c

@@ -2356 +2356 @@
    FUNC(draw_string)
 
-   FUNC(draw_pixel)
-   FUNC(draw_line)
-   FUNC(draw_rect)
-   FUNC(draw_rect_filled)
-   FUNC(draw_ellipse)
-   FUNC(draw_ellipse_filled)
-   FUNC(draw_clear)
-   FUNC(draw_string)
-
    FUNC(set_yield)
 

branches/reyalp-flt/core/module_exportlist.c

@@ -235 +235 @@
                         TurnOffBackLight,
                         mkdir,
-
-                        gui_bind_mode,
 
                         // modlist.flt
@@ -303 +301 @@
 
             &camera_info,
+            &altGuiHandler,
                         0
 };

branches/reyalp-flt/core/modules/module_inspector.c

@@ -94 +94 @@
 
 gui_handler GUI_MODE_MODULE_INSPECTOR = 
-    /*GUI_MODE_MODULE_INSPECTOR*/          { gui_module_draw,       gui_module_kbd_process,      gui_module_menu_kbd_process, 0, GUI_MODE_MAGICNUM };
+    /*GUI_MODE_MODULE_INSPECTOR*/   { GUI_MODE_MODULE,   gui_module_draw,       gui_module_kbd_process,      gui_module_menu_kbd_process, 0, GUI_MODE_MAGICNUM };
 
 
 int modinspect_redraw;
-int modinspect_old_guimode;
+gui_handler *modinspect_old_guimode;
 
 static void modinspect_unload_cb(unsigned int btn) {
     if (btn==MBOX_BTN_YES) {
                 module_async_unload_allrunned(0);
-                if (modinspect_old_guimode<GUI_MODE_COUNT)
-                        gui_set_mode(modinspect_old_guimode);   // if core gui - return to it
-                else
-                        gui_default_kbd_process_menu_btn();             // if not - return to menu
+        gui_set_mode(modinspect_old_guimode);   // if core gui - return to it
     }
     modinspect_redraw=2;
@@ -128 +125 @@
 int basic_module_init() {
         modinspect_redraw=2;
-        modinspect_old_guimode=gui_get_mode();
-    gui_set_mode( (unsigned int)&GUI_MODE_MODULE_INSPECTOR );
+    modinspect_old_guimode = gui_set_mode(&GUI_MODE_MODULE_INSPECTOR);
         return 1;
 }

branches/reyalp-flt/include/gui.h

@@ -7 +7 @@
 #define MAKE_COLOR(bg, fg)    ((color)((((char)(bg))<<8)|((char)(fg))))
 
-// Don't delete or re-order entries unless guiHandlers (gui.c) table is updated to match 
+// Module ID's for specific modules that we need to be able to detect
+// use GUI_MODE_MODULE for generic module modes (e.g.games)
 enum Gui_Mode_ {
     GUI_MODE_NONE = 0,
     GUI_MODE_ALT,
     GUI_MODE_MENU,
+    GUI_MODE_MBOX,
+    GUI_MODE_OSD,
     GUI_MODE_PALETTE,
-    GUI_MODE_MBOX,
     GUI_MODE_FSELECT,
-    GUI_MODE_OSD,
     GUI_MODE_MPOPUP,
-        GUI_MODE_COUNT
+    GUI_MODE_MODULE,    // generic module
 };
 
@@ -40 +41 @@
 typedef struct
 {
+    // Gui_Mode enum value
+    int mode;
+
         // Called to redraw screen. Argument is GUI_REDRAWFLAG_* set
     void (*redraw)(int);
 
         // Main button handler for mode
-        // Note: this pointer reused as gui_handler* for 
-        //    GUI_MODE_FLAG_ALIAS entries
-        // Do not use union because warning on initializer
     void (*kbd_process)(void);
 
@@ -58 +59 @@
 } gui_handler;
 
-
+extern gui_handler defaultGuiHandler;
+extern gui_handler altGuiHandler;
+extern gui_handler menuGuiHandler;
 
 void gui_default_kbd_process_menu_btn();
@@ -65 +68 @@
 extern void gui_force_restore();
 
-extern void draw_pixel(coord x, coord y, color cl);
-
 extern gui_mode_t gui_get_mode();
-extern void gui_set_mode(gui_mode_t mode);
-
-extern int gui_bind_mode(int core_mode, gui_handler* handler);
-
+extern gui_handler* gui_set_mode(gui_handler *mode);