Changeset 1338 for trunk

Timestamp:

09/14/11 10:02:16 (21 months ago)

Author:

philmoz

Message:

Changes to core CHDK required to support IXUS310 (Elph500HS) & touch screen U/I.

Location:

trunk

Files:

• CHDK/LANG/english.lng (modified) (1 diff)
• core/conf.c (modified) (1 diff)
• core/gui.c (modified) (28 diffs)
• core/gui_4wins.c (modified) (11 diffs)
• core/gui_calendar.c (modified) (2 diffs)
• core/gui_draw.c (modified) (3 diffs)
• core/gui_draw.h (modified) (4 diffs)
• core/gui_lang.c (modified) (1 diff)
• core/gui_lang.h (modified) (1 diff)
• core/gui_mastermind.c (modified) (4 diffs)
• core/gui_palette.c (modified) (2 diffs)
• core/gui_read.c (modified) (4 diffs)
• core/gui_reversi.c (modified) (3 diffs)
• core/gui_sokoban.c (modified) (11 diffs)
• core/kbd.c (modified) (3 diffs)
• core/raw.c (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• include/conf.h (modified) (1 diff)
• include/gui.h (modified) (1 diff)
• include/keyboard.h (modified) (1 diff)
• include/lolevel.h (modified) (1 diff)
• include/modelist.h (modified) (1 diff)
• include/platform.h (modified) (1 diff)

trunk/CHDK/LANG/english.lng

@@ -598 +598 @@
 460 "You need to be in REC-mode\nfor this operation."
 461 "%s disabled in build"
+462 "Touchscreen overrides"
+463 "Video AE Controls"
+464 "<Alt> Shortcut Buttons"

trunk/core/conf.c

@@ -402 +402 @@
         CONF_INFO(242, conf.edge_overlay_show,     CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(243, conf.edge_overlay_pano_overlap,   CONF_DEF_VALUE, i:30, NULL),
+
+    // Touch screen U/I overrides
+    CONF_INFO(244, conf.touchscreen_disable_video_controls, CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(245, conf.touchscreen_disable_shortcut_controls, CONF_DEF_VALUE, i:0, NULL),
     };
 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))

trunk/core/gui.c

@@ -204 +204 @@
         static void gui_load_curve(int arg);
 #endif
-static const char* gui_histo_show_enum(int change, int arg);
+       const char* gui_histo_show_enum(int change, int arg);
 static const char* gui_histo_mode_enum(int change, int arg);
 static const char* gui_temp_mode_enum(int change, int arg);
@@ -254 +254 @@
 static const char* gui_iso_exposure_order_enum(int change, int arg);
 */
-static const char* gui_nd_filter_state_enum(int change, int arg);
+       const char* gui_nd_filter_state_enum(int change, int arg);
 //static const char* gui_tv_enum(int change, int arg);
 const char* gui_user_menu_show_enum(int change, int arg);
@@ -269 +269 @@
 static const char* gui_video_af_key_enum(int change, int arg);
 static const char* gui_show_movie_time(int change, int arg);
-static const char* gui_override_disable_enum(int change, int arg);
+       const char* gui_override_disable_enum(int change, int arg);
 #ifdef OPT_CURVES
         static const char* gui_conf_curve_enum(int change, int arg);
@@ -767 +767 @@
 static CMenu raw_state_submenu = {0x24,LANG_MENU_OSD_RAW_STATE_PARAMS_TITLE, NULL, raw_state_submenu_items };
 
+#ifdef  CAM_TOUCHSCREEN_UI
+static const char* gui_touchscreen_disable_video_enum(int change, int arg);
+static const char* gui_touchscreen_disable_shortcuts_enum(int change, int arg);
+static CMenuItem touchscreen_submenu_items[] = {
+    {0x5f,LANG_MENU_TS_VIDEO_AE_DISABLE,     MENUITEM_ENUM,    (int*)gui_touchscreen_disable_video_enum },
+    {0x5f,LANG_MENU_TS_ALT_SHORTCUTS_DISABLE,MENUITEM_ENUM,    (int*)gui_touchscreen_disable_shortcuts_enum },
+    {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
+    {0}
+};
+static CMenu touchscreen_submenu = {0x28,LANG_MENU_TOUCHSCREEN_VALUES, /*cb_values_menu_change*/ NULL, touchscreen_submenu_items };
+#endif
 
 static CMenuItem osd_submenu_items[] = {
@@ -792 +803 @@
     {0x5c,LANG_MENU_MAIN_SAVE_OPTIONS,       MENUITEM_PROC,      (int*)gui_menuproc_save },
 #endif
+#ifdef  CAM_TOUCHSCREEN_UI
+    {0x22,LANG_MENU_TOUCHSCREEN_VALUES,          MENUITEM_SUBMENU,   (int*)&touchscreen_submenu },
+#endif
     {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
     {0}
@@ -1233 +1247 @@
         return gui_change_simple_enum(&conf.sub_batch_ext,change,img_exts,NUM_IMG_EXTS);
 }
+
+//-------------------------------------------------------------------
+#ifdef  CAM_TOUCHSCREEN_UI
+
+const char* gui_on_off_enum(int change, int *conf_val)
+{
+    static const char* modes[]={ "Off", "On"};
+        return gui_change_simple_enum(conf_val,change,modes,sizeof(modes)/sizeof(modes[0]));
+}
+
+const char* gui_touchscreen_disable_video_enum(int change, int arg) {
+    static const char* modes[]={ "Enable", "Disable" };
+        return gui_change_simple_enum(&conf.touchscreen_disable_video_controls,change,modes,sizeof(modes)/sizeof(modes[0]));
+}
+
+const char* gui_touchscreen_disable_shortcuts_enum(int change, int arg) {
+    static const char* modes[]={ "Enable", "Disable" };
+        return gui_change_simple_enum(&conf.touchscreen_disable_shortcut_controls,change,modes,sizeof(modes)/sizeof(modes[0]));
+}
+
+#endif
 
 //-------------------------------------------------------------------
@@ -1819 +1854 @@
 void gui_init()
 {
-
-    gui_mode = GUI_MODE_NONE;
+    gui_set_mode(GUI_MODE_NONE);
     gui_restore = 0;
     gui_in_redraw = 0;
@@ -1881 +1915 @@
 //-------------------------------------------------------------------
 void gui_set_mode(enum Gui_Mode 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
+        redraw_buttons = 1;
+#endif
     gui_mode = mode;
 }
@@ -1930 +1969 @@
 
 //-------------------------------------------------------------------
+#ifdef OPTIONS_AUTOSAVE
+
+static void conf_store_old_settings() {
+    old_conf=conf;
+}
+
+static int conf_save_new_settings_if_changed() {
+    if (memcmp(&old_conf, &conf, sizeof(Conf)) != 0) {
+                user_menu_save();
+        conf_save();
+        conf_store_old_settings();
+        return 1;
+    }
+    return 0;
+}
+
+#endif
+
+//-------------------------------------------------------------------
+void gui_chdk_draw()
+{
+    static int show_md_grid=0;
+
+    gui_draw_osd();
+
+#ifdef CAM_DISP_ALT_TEXT
+    draw_txt_string(20, 14, "<ALT>", MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+#endif
+
+#ifdef OPT_SCRIPTING
+    if ((mode_get()&MODE_MASK) == MODE_REC)
+    {
+        draw_txt_string(0, 14, script_title, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+        if (state_kbd_script_run) show_md_grid=5;
+        if (show_md_grid)
+        {
+            --show_md_grid;
+            md_draw_grid();
+        }
+    }
+#endif
+
+    console_draw();
+}
+
+//-------------------------------------------------------------------
+// Handler for Menu button press default - enter Menu mode
+void gui_default_kbd_process_menu_btn()
+{
+    gui_set_mode(GUI_MODE_MENU);
+    draw_restore();
+}
+
+// Change SD override factor, direction = 1 to increase, -1 to decrease
+// Only applies if camera has a Zoom lever
+#if CAM_HAS_ZOOM_LEVER
+static void sd_override_koef(int direction)
+{
+    gui_subj_dist_override_koef_enum(direction,0);
+#if !CAM_HAS_MANUAL_FOCUS
+    if (conf.subj_dist_override_koef==0) conf.subj_dist_override_koef=1;
+#endif
+    shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
+}
+#endif
+
+// Change SD override by factor amount, direction = 1 to increase (zoom in), -1 to decrease (zoom out)
+static void sd_override(int direction)
+{
+    gui_subj_dist_override_value_enum(direction,0);
+    shooting_set_focus(shooting_get_subject_distance_override_value(),SET_NOW);
+}
+
+// Main button processing for CHDK Alt mode (not in MENU mode)
+// This needs to be cleaned up, re-organised and commented !!!!
+void gui_chdk_kbd_process()
+{
+#if !CAM_HAS_ERASE_BUTTON && CAM_CAN_SD_OVERRIDE        // ALT RAW toggle kbd processing if camera has SD override but no erase button
+    if (kbd_is_key_clicked(SHORTCUT_TOGGLE_RAW))
+    {
+        if (conf.debug_shortcut_action > 0)
+        {
+#ifdef OPT_DEBUGGING
+            gui_debug_shortcut();
+#endif
+        }
+        // Check in manual focus mode
+        else if (!shooting_get_common_focus_mode())
+        {
+            // Not manual focus mode so just update RAW save setting
+            conf.save_raw = !conf.save_raw;
+            draw_restore();
+        }
+        else
+        {
+            // In manual focus mode so update shooting distance
+#if CAM_HAS_ZOOM_LEVER
+            conf.subj_dist_override_value=MAX_DIST;
+            shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
+#else
+            if (conf.subj_dist_override_koef==4)
+                gui_subj_dist_override_koef_enum(-3,0);
+            else
+                gui_subj_dist_override_koef_enum(1,0);
+#endif
+        }
+    }
+#else                                                   // ALT RAW toggle kbd processing if can't SD override or has erase button
+    if (kbd_is_key_clicked(SHORTCUT_TOGGLE_RAW))
+    {
+        if (conf.debug_shortcut_action > 0)
+        {
+#ifdef OPT_DEBUGGING
+            gui_debug_shortcut();
+#endif
+        }
+        else
+        {
+            // Change RAW save state
+            conf.save_raw = !conf.save_raw;
+            draw_restore();
+        }
+    }
+#endif
+#ifdef OPT_SCRIPTING                                    // ALT Set button processing if scripting enabled - open script menu
+    else if (kbd_is_key_clicked(KEY_SET))
+    {
+        gui_menu_init(&script_submenu);
+        gui_default_kbd_process_menu_btn();
+    }
+#endif
+#if CAM_CAN_SD_OVERRIDE                                 // ALT button processing if camera has SD override
+    else
+    {
+#if !CAM_HAS_MANUAL_FOCUS
+        if (kbd_is_key_clicked(SHORTCUT_MF_TOGGLE))     // Camera does not have manual focus
+        {
+            if (conf.subj_dist_override_koef>0)
+                conf.subj_dist_override_koef=0;
+            else conf.subj_dist_override_koef=1;
+            draw_restore();
+        }
+        else
+#endif
+        if (shooting_get_common_focus_mode())           // Check in manual focus mode
+        {
+#if CAM_HAS_ZOOM_LEVER                                  // Camera has zoom lever, use left & right to change factor,up to set infinity
+            if (kbd_is_key_clicked(KEY_RIGHT))
+            {
+                sd_override_koef(1);
+            }
+            else if (kbd_is_key_clicked(KEY_LEFT))
+            {
+                sd_override_koef(-1);
+            }
+            else if (kbd_is_key_clicked(SHORTCUT_SET_INFINITY))
+            {
+                conf.subj_dist_override_value=MAX_DIST;
+                shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
+            }
+            else
+#endif
+            if (kbd_is_key_clicked(SHORTCUT_SET_HYPERFOCAL))    // Set hyperfocal distance if down pressed
+            {
+                int m=mode_get()&MODE_SHOOTING_MASK;
+                if ((m==MODE_M) || (m==MODE_AV))
+                     conf.subj_dist_override_value=(int)shooting_get_hyperfocal_distance_f(shooting_get_aperture_from_av96(shooting_get_user_av96()),get_focal_length(lens_get_zoom_point()));
+                else conf.subj_dist_override_value=(int)shooting_get_hyperfocal_distance();
+                shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
+            }
+            else
+            {
+                switch (kbd_get_autoclicked_key())
+                {
+#if CAM_HAS_ZOOM_LEVER
+                case KEY_ZOOM_IN:
+#else
+                case KEY_RIGHT:
+#endif
+                    sd_override(1);
+                    break;
+#if CAM_HAS_ZOOM_LEVER
+                case KEY_ZOOM_OUT:
+#else
+                case KEY_LEFT:
+#endif
+                    sd_override(-1);
+                    break;
+                }
+            }
+        }
+    }
+#endif
+}
+
+//-------------------------------------------------------------------
+// Handler for Menu button press in CHDK Alt mode (not in Menu mode)
+// Enter main menu or user menu based on configuration
+void gui_chdk_kbd_process_menu_btn()
+{
+    if (conf.user_menu_as_root && (conf.user_menu_enable != 0)) {
+        if (kbd_is_key_pressed(KEY_SHOOT_HALF))
+            gui_menu_init(&root_menu);
+        else
+            gui_menu_init(&user_submenu);
+    }
+    else {
+        if ((conf.user_menu_enable != 0) && kbd_is_key_pressed(KEY_SHOOT_HALF))
+            gui_menu_init(&user_submenu);
+        else
+            gui_menu_init(&root_menu);
+    }
+    gui_default_kbd_process_menu_btn();
+}
+
+// Menu button handled for text reader
+#ifdef OPT_TEXTREADER
+void gui_read_kbd_process_menu_btn()
+{
+    gui_read_kbd_process();
+    gui_default_kbd_process_menu_btn();
+}
+#endif
+
+// Menu button handled for Menu mode
+void gui_menu_kbd_process_menu_btn()
+{
+#ifdef OPTIONS_AUTOSAVE
+    conf_save_new_settings_if_changed();
+#endif
+    if (gui_user_menu_flag)
+    {
+        gui_set_mode(GUI_MODE_MENU);
+        gui_user_menu_flag = 0;
+        gui_menu_init(&root_menu);
+    }
+    else
+        gui_set_mode(GUI_MODE_ALT);
+    draw_restore();
+}
+
+//-------------------------------------------------------------------
+// Structure to store gui redraw and kbd process handlers for each mode
+typedef struct
+{
+    void (*redraw)(void);                   // Called to redraw screen
+    void (*kbd_process)(void);              // Main button handler for mode
+    void (*kbd_process_menu_btn)(void);     // Menu button handler for mode
+} gui_handler;
+
+// 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_NONE*/           { gui_draw_osd,         0,                          0 },
+    /*GUI_MODE_ALT*/            { gui_chdk_draw,        gui_chdk_kbd_process,       gui_chdk_kbd_process_menu_btn },
+    /*GUI_MODE_MENU*/           { gui_menu_draw,        gui_menu_kbd_process,       gui_menu_kbd_process_menu_btn },
+    /*GUI_MODE_PALETTE*/        { gui_palette_draw,     gui_palette_kbd_process,    gui_default_kbd_process_menu_btn },
+    /*GUI_MODE_MBOX*/           { gui_mbox_draw,        gui_mbox_kbd_process,       0 },
+#ifdef OPT_GAME_REVERSI
+    /*GUI_MODE_REVERSI*/        { gui_reversi_draw,     gui_reversi_kbd_process,    gui_default_kbd_process_menu_btn },
+#else
+                                { 0, 0, 0 },
+#endif
+#ifdef OPT_GAME_SOKOBAN
+    /*GUI_MODE_SOKOBAN*/        { gui_sokoban_draw,     gui_sokoban_kbd_process,    gui_default_kbd_process_menu_btn },
+#else
+                                { 0, 0, 0 },
+#endif
+#ifdef OPT_DEBUGGING
+    /*GUI_MODE_DEBUG*/          { gui_debug_draw,       gui_debug_kbd_process,      gui_default_kbd_process_menu_btn },
+#else
+                                { 0, 0, 0 },
+#endif
+    /*GUI_MODE_FSELECT*/        { gui_fselect_draw,     gui_fselect_kbd_process,    gui_fselect_kbd_process },
+#ifdef OPT_TEXTREADER
+    /*GUI_MODE_READ*/           { gui_read_draw,        gui_read_kbd_process,       gui_read_kbd_process_menu_btn },
+#else
+                                { 0, 0, 0 },
+#endif
+    /*GUI_MODE_OSD*/            { gui_osd_draw,         gui_osd_kbd_process,        gui_default_kbd_process_menu_btn },
+#ifdef OPT_CALENDAR
+    /*GUI_MODE_CALENDAR*/       { gui_calendar_draw,    gui_calendar_kbd_process,   gui_default_kbd_process_menu_btn },
+#else
+                                { 0, 0, 0 },
+#endif
+#ifdef OPT_DEBUGGING
+    /*GUI_MODE_BENCH*/          { gui_bench_draw,       gui_bench_kbd_process,      gui_default_kbd_process_menu_btn },
+#else
+                                { 0, 0, 0 },
+#endif
+    /*GUI_MODE_MPOPUP*/         { gui_mpopup_draw,      gui_mpopup_kbd_process,     0 },
+#ifdef OPT_GAME_CONNECT4
+    /*GUI_MODE_4WINS*/          { gui_4wins_draw,       gui_4wins_kbd_process,      gui_default_kbd_process_menu_btn },
+#else
+                                { 0, 0, 0 },
+#endif
+#ifdef OPT_GAME_MASTERMIND
+    /*GUI_MODE_MASTERMIND*/     { gui_mastermind_draw,  gui_mastermind_kbd_process, gui_default_kbd_process_menu_btn },
+#else
+                                { 0, 0, 0 },
+#endif
+};
+
+//-------------------------------------------------------------------
+// Main GUI redraw function, perform common initialisation then calls the redraw handler for the mode
 void gui_redraw()
 {
     enum Gui_Mode gui_mode_old;
-    static int show_md_grid=0;
 
 #ifdef CAM_DETECT_SCREEN_ERASE
@@ -1941 +2284 @@
         gui_menu_force_redraw();
         gui_fselect_force_redraw();
+#ifdef CAM_TOUCHSCREEN_UI
+        extern int redraw_buttons;
+        redraw_buttons = 1;
+#endif
     }
 #endif
@@ -1949 +2296 @@
     gui_mode_old = gui_mode;
 
-    #if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009
+#if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009
     //the different modes arises because games are designed on a 360x240 basis and are difficult to downscale to 320x240
     if (gui_mode == GUI_MODE_REVERSI || gui_mode == GUI_MODE_SOKOBAN || gui_mode == GUI_MODE_4WINS || gui_mode == GUI_MODE_MASTERMIND) {
       draw_set_environment(aspect_xcorrection_games_360, aspect_ycorrection_games_360, GAMES_SCREEN_WIDTH, GAMES_SCREEN_HEIGHT);
    } else { //default
-//      draw_set_environment(NULL, NULL, SCREENX, SCREENY);
       draw_set_environment(NULL, NULL, vid_get_bitmap_screen_width(), vid_get_bitmap_screen_height());
    }
-    #endif
-    switch (gui_mode) {
-        case GUI_MODE_MENU:
-            gui_menu_draw();
-//            draw_txt_string(20, 14, "<CNF>", MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
-            break;
-        case GUI_MODE_ALT:
-            gui_draw_osd();
-            draw_txt_string(20, 14, "<ALT>", MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
-#ifdef OPT_SCRIPTING
-            if ((mode_get()&MODE_MASK) == MODE_REC) {
-                draw_txt_string(0, 14, script_title, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
-                if (state_kbd_script_run) show_md_grid=5;
-                if (show_md_grid) {
-                    --show_md_grid;
-                    md_draw_grid();
-                }
-            }
-#endif
-            console_draw();
-            break;
-        case GUI_MODE_NONE:
-            gui_draw_osd();
-            break;
-        case GUI_MODE_PALETTE:
-            gui_palette_draw();
-            break;
-        case GUI_MODE_MBOX:
-            gui_mbox_draw();
-            break;
-#ifdef OPT_GAME_REVERSI
-        case GUI_MODE_REVERSI:
-            gui_reversi_draw();
-            break;
-#endif
-#ifdef OPT_GAME_SOKOBAN
-        case GUI_MODE_SOKOBAN:
-            gui_sokoban_draw();
-            break;
-#endif
-#ifdef OPT_GAME_CONNECT4
-        case GUI_MODE_4WINS:
-            gui_4wins_draw();
-            break;
-#endif
-#ifdef OPT_GAME_MASTERMIND
-        case GUI_MODE_MASTERMIND:
-            gui_mastermind_draw();
-            break;
-#endif
-#ifdef OPT_DEBUGGING
-        case GUI_MODE_DEBUG:
-            gui_debug_draw();
-            break;
-#endif
-        case GUI_MODE_FSELECT:
-            gui_fselect_draw();
-            break;
-#ifdef OPT_TEXTREADER
-        case GUI_MODE_READ:
-            gui_read_draw();
-            break;
-#endif
-        case GUI_MODE_OSD:
-            gui_osd_draw();
-//            draw_txt_string(20, 14, "<OSD>", MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
-            break;
-#ifdef OPT_CALENDAR
-        case GUI_MODE_CALENDAR:
-            gui_calendar_draw();
-            break;
-#endif
-#ifdef OPT_DEBUGGING
-        case GUI_MODE_BENCH:
-            gui_bench_draw();
-            break;
-#endif
-        case GUI_MODE_MPOPUP:
-            gui_mpopup_draw();
-            break;
-        default:
-            break;
-    }
-
+#endif
+
+#ifdef CAM_TOUCHSCREEN_UI
+    extern void virtual_buttons();
+    virtual_buttons();
+#endif
+
+    // Call redraw handler
+    if (guiHandlers[gui_mode].redraw) guiHandlers[gui_mode].redraw();
+
+    // Forced redraw if needed
     gui_in_redraw = 0;
     if ((gui_mode_old != gui_mode && (gui_mode_old != GUI_MODE_NONE && gui_mode_old != GUI_MODE_ALT) && (gui_mode != GUI_MODE_MBOX && gui_mode != GUI_MODE_MPOPUP)) || gui_restore) {
@@ -2050 +2323 @@
 }
 
-#ifdef OPTIONS_AUTOSAVE
-//-------------------------------------------------------------------
-static inline void conf_store_old_settings() {
-    old_conf=conf;
-}
-
-//-------------------------------------------------------------------
-static inline int conf_save_new_settings_if_changed() {
-    if (memcmp(&old_conf, &conf, sizeof(Conf)) != 0) {
-                user_menu_save();
-        conf_save();
-        conf_store_old_settings();
-        return 1;
-    }
-    return 0;
-}
-#endif
-
-
-//-------------------------------------------------------------------
+//-------------------------------------------------------------------
+// Main kbd processing for GUI modes
 void gui_kbd_process()
 {
-    int clicked_key;
-
-    if (kbd_is_key_clicked(KEY_MENU)){
-        switch (gui_mode) {
-            case GUI_MODE_ALT:
-                                if (conf.user_menu_as_root && (conf.user_menu_enable != 0)) {
-                                if (kbd_is_key_pressed(KEY_SHOOT_HALF))
-                                        gui_menu_init(&root_menu);
-                                else
-                gui_menu_init(&user_submenu);
-                                }
-                                else {
-                                if ((conf.user_menu_enable != 0) && kbd_is_key_pressed(KEY_SHOOT_HALF))
-                                        gui_menu_init(&user_submenu);
-                                else
-                gui_menu_init(&root_menu);
-                                }
-                gui_mode = GUI_MODE_MENU;
-                draw_restore();
-                break;
-            case GUI_MODE_MENU:
-#ifdef OPTIONS_AUTOSAVE
-                conf_save_new_settings_if_changed();
-#endif
-                                if (gui_user_menu_flag) {
-                        gui_mode = GUI_MODE_MENU;
-                                        gui_user_menu_flag = 0;
-                                        gui_menu_init(&root_menu);
-                                }
-                                else
-                gui_mode = GUI_MODE_ALT;
-                draw_restore();
-                break;
-            case GUI_MODE_PALETTE:
-            case GUI_MODE_REVERSI:
-            case GUI_MODE_SOKOBAN:
-            case GUI_MODE_4WINS:
-                        case GUI_MODE_MASTERMIND:
-#ifdef OPT_DEBUGGING
-            case GUI_MODE_DEBUG:
-#endif
-            case GUI_MODE_OSD:
-#ifdef OPT_CALENDAR
-            case GUI_MODE_CALENDAR:
-#endif
-            case GUI_MODE_BENCH:
-                draw_restore();
-                gui_mode = GUI_MODE_MENU;
-                break;
-            case GUI_MODE_FSELECT:
-                gui_fselect_kbd_process();
-                break;
-#ifdef OPT_TEXTREADER
-            case GUI_MODE_READ:
-                gui_read_kbd_process();
-                draw_restore();
-                gui_mode = GUI_MODE_MENU;
-                break;
-#endif
-            default:
-                break;
-        }
+    // Call menu button handler if menu button pressed
+    if (kbd_is_key_clicked(KEY_MENU))
+    {
+        if (guiHandlers[gui_mode].kbd_process_menu_btn) guiHandlers[gui_mode].kbd_process_menu_btn();
         return;
     }
 
-    switch (gui_mode) {
-        case GUI_MODE_ALT:
-            if (kbd_is_key_clicked(SHORTCUT_TOGGLE_RAW)) {
-                if (conf.debug_shortcut_action > 0) {
-#ifdef OPT_DEBUGGING
-                                        gui_debug_shortcut();
-#endif
-}
-#if !CAM_HAS_ERASE_BUTTON && CAM_CAN_SD_OVERRIDE
-                else if (!shooting_get_common_focus_mode())
-#else
-                                else
-#endif
-                                   {conf.save_raw = !conf.save_raw;
-                    draw_restore();
-                   }
-#if !CAM_HAS_ERASE_BUTTON && CAM_CAN_SD_OVERRIDE
-                                else {
-   #if CAM_HAS_ZOOM_LEVER
-               conf.subj_dist_override_value=MAX_DIST;
-               shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
-   #else
-               if (conf.subj_dist_override_koef==4)
-                  gui_subj_dist_override_koef_enum(-3,0);
-               else
-                  gui_subj_dist_override_koef_enum(1,0);
-   #endif
-                                }
-#endif
-#ifdef OPT_SCRIPTING
-            } else if (kbd_is_key_clicked(KEY_SET)) {
-                gui_menu_init(&script_submenu);
-                gui_mode = GUI_MODE_MENU;
-                draw_restore();
-#endif
-            } else {
-#if !CAM_HAS_MANUAL_FOCUS && CAM_CAN_SD_OVERRIDE
-                        if (kbd_is_key_clicked(SHORTCUT_MF_TOGGLE)) {
-                              if (conf.subj_dist_override_koef>0)
-                                     conf.subj_dist_override_koef=0;
-                              else conf.subj_dist_override_koef=1;
-                              draw_restore();
-                             }
-                else if (shooting_get_common_focus_mode())
-#elif CAM_CAN_SD_OVERRIDE
-               if (shooting_get_common_focus_mode())
-#endif
-
-#if CAM_CAN_SD_OVERRIDE
-                          {
-  #if CAM_HAS_ZOOM_LEVER
-                                if (kbd_is_key_clicked(KEY_RIGHT)) {
-                                  gui_subj_dist_override_koef_enum(1,0);
-    #if !CAM_HAS_MANUAL_FOCUS
-                  if (conf.subj_dist_override_koef==0) conf.subj_dist_override_koef=1;
-    #endif
-                  shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
-                                  }
-                                else if (kbd_is_key_clicked(KEY_LEFT))
-                                  {
-                                  gui_subj_dist_override_koef_enum(-1,0);
-    #if !CAM_HAS_MANUAL_FOCUS
-                  if (conf.subj_dist_override_koef==0) conf.subj_dist_override_koef=1;
-    #endif
-                  shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
-                                  }
-                                else if (kbd_is_key_clicked(SHORTCUT_SET_INFINITY))
-                                  {
-                                  conf.subj_dist_override_value=MAX_DIST;
-                  shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
-                                  }
-                                else
-  #endif
-                                if (kbd_is_key_clicked(SHORTCUT_SET_HYPERFOCAL))
-                                  {
-                                  int m=mode_get()&MODE_SHOOTING_MASK;
-                                  if ((m==MODE_M) || (m==MODE_AV))
-                                    conf.subj_dist_override_value=(int)shooting_get_hyperfocal_distance_f(shooting_get_aperture_from_av96(shooting_get_user_av96()),get_focal_length(lens_get_zoom_point()));
-                                  else conf.subj_dist_override_value=(int)shooting_get_hyperfocal_distance();
-                  shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
-                                  }
-                                else
-                  switch (kbd_get_autoclicked_key()) {
-  #if CAM_HAS_ZOOM_LEVER
-                    case KEY_ZOOM_IN:
-  #else
-                    case KEY_RIGHT:
-  #endif
-                        gui_subj_dist_override_value_enum(1,0);
-                        shooting_set_focus(shooting_get_subject_distance_override_value(),SET_NOW);
-                        break;
-  #if CAM_HAS_ZOOM_LEVER
-                    case KEY_ZOOM_OUT:
-  #else
-                    case KEY_LEFT:
-  #endif
-                        gui_subj_dist_override_value_enum(-1,0);
-                        shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
-                        break;
-                  }
-              }
-#endif
-            }
-            break;
-        case GUI_MODE_MENU:
-            gui_menu_kbd_process();
-            break;
-        case GUI_MODE_PALETTE:
-            gui_palette_kbd_process();
-            break;
-        case GUI_MODE_MBOX:
-            gui_mbox_kbd_process();
-            break;
-#ifdef OPT_GAME_REVERSI
-        case GUI_MODE_REVERSI:
-            gui_reversi_kbd_process();
-            break;
-#endif
-#ifdef OPT_GAME_SOKOBAN
-        case GUI_MODE_SOKOBAN:
-            gui_sokoban_kbd_process();
-            break;
-#endif
-#ifdef OPT_GAME_CONNECT4
-        case GUI_MODE_4WINS:
-            gui_4wins_kbd_process();
-            break;
-#endif
-#ifdef OPT_GAME_MASTERMIND
-        case GUI_MODE_MASTERMIND:
-            gui_mastermind_kbd_process();
-            break;
-#endif
-#ifdef OPT_DEBUGGING
-        case GUI_MODE_DEBUG:
-            gui_debug_kbd_process();
-            break;
-#endif
-        case GUI_MODE_FSELECT:
-            gui_fselect_kbd_process();
-            break;
-#ifdef OPT_TEXTREADER
-        case GUI_MODE_READ:
-            gui_read_kbd_process();
-            break;
-#endif
-        case GUI_MODE_OSD:
-            gui_osd_kbd_process();
-            break;
-#ifdef OPT_CALENDAR
-        case GUI_MODE_CALENDAR:
-            gui_calendar_kbd_process();
-            break;
-#endif
-#ifdef OPT_DEBUGGING
-        case GUI_MODE_BENCH:
-            gui_bench_kbd_process();
-            break;
-#endif
-        case GUI_MODE_MPOPUP:
-            gui_mpopup_kbd_process();
-             break;
-        default:
-            break;
-    }
+    // Call mode handler for other buttons
+    if (guiHandlers[gui_mode].kbd_process) guiHandlers[gui_mode].kbd_process();
 }
 
@@ -2311 +2345 @@
     conf_store_old_settings();
 #endif
-    gui_mode = GUI_MODE_ALT;
+    gui_set_mode(GUI_MODE_ALT);
 
         conf_update_prevent_shutdown();
@@ -2320 +2354 @@
         if (conf.user_menu_enable == 2) {
                 gui_menu_init(&user_submenu);
-                gui_mode = GUI_MODE_MENU;
+                gui_set_mode(GUI_MODE_MENU);
                 draw_restore();
                 gui_user_menu_flag = 1;
@@ -2342 +2376 @@
     rbf_set_codepage(FONT_CP_WIN);
     vid_turn_on_updates();
-    gui_mode = GUI_MODE_NONE;
+    gui_set_mode(GUI_MODE_NONE);
 
         conf_update_prevent_shutdown();
@@ -2381 +2415 @@
 
 #if CAM_EV_IN_VIDEO
- if ((movie_status==VIDEO_RECORD_IN_PROGRESS) && !kbd_is_key_pressed(KEY_SHOOT_HALF)){
-  #if CAM_HAS_ERASE_BUTTON
-  if (kbd_is_key_clicked(KEY_ERASE)){
-  #else
-  #if !defined (CAMERA_a480)
-  if (kbd_is_key_clicked(KEY_DISPLAY)){
-  #else
-  if (kbd_is_key_clicked(KEY_MENU)){
-  #endif
-  #endif
-   set_ev_video_avail(!get_ev_video_avail());
-  }
-  if (get_ev_video_avail()) {
-   if (kbd_is_key_clicked(KEY_LEFT)) {
-    set_ev_video(get_ev_video()-1);
-   }
-   if (kbd_is_key_clicked(KEY_RIGHT)){
-    set_ev_video(get_ev_video()+1);
-   }
-  }
- }
+    if ((movie_status==VIDEO_RECORD_IN_PROGRESS) && !kbd_is_key_pressed(KEY_SHOOT_HALF)){
+#if CAM_HAS_ERASE_BUTTON
+        if (kbd_is_key_clicked(KEY_ERASE)){
+#else
+#if !defined (CAMERA_a480)
+        if (kbd_is_key_clicked(KEY_DISPLAY)){
+#else
+        if (kbd_is_key_clicked(KEY_MENU)){
+#endif
+#endif
+            set_ev_video_avail(!get_ev_video_avail());
+#ifdef CAM_TOUCHSCREEN_UI
+            redraw_buttons = 1;
+#endif
+        }
+        if (get_ev_video_avail()) {
+            if (kbd_is_key_clicked(KEY_LEFT)) {
+                set_ev_video(get_ev_video()-1);
+            }
+            if (kbd_is_key_clicked(KEY_RIGHT)){
+                set_ev_video(get_ev_video()+1);
+            }
+        }
+    }
 #endif
 }
@@ -2409 +2446 @@
 
 #if defined(OPT_EXMEM_TESTING)
-        // If defined the exmem memory is allocated; but not used for CHDK.
-        // It is filled with a guard value (see wrappers.c) which is checked here
-    // Any corruption is reported, otherwise 'OK' is displayed on screen (along with the exmem memory start address).
-        extern void *exmem_start, *exmem_end;
-        // check exmem allocated memory for corruption
-        unsigned long* p = (unsigned long*)exmem_start;
-        unsigned long *f = 0, *l = 0;
-        long cnt = 0;
-        while (p < (unsigned long*)exmem_end)
-        {
-                if (p[0] != 0xDEADBEEF)
-                {
-                        l = p;
-                        if (f == 0) f = p;
-                        cnt++;
-                }
-                p++;
-        }
-        if (cnt != 0)
-        {
-                sprintf(osd_buf, "s:%8x e:%8x", exmem_start, exmem_end);
-                draw_txt_string(2, 12, osd_buf, conf.osd_color);
-                sprintf(osd_buf, "f:%8x l:%8x c:%d", f, l, cnt);
-        }
-        else
-        {
-                sprintf(osd_buf, "OK 0x%x", exmem_start);
-        }
-        draw_txt_string(2, 13, osd_buf, conf.osd_color);
-        // end of check 
+    // Only do memory corruption testing if not recording video
+    if (!MODE_IS_VIDEO(mode_get()))
+    {
+            // If defined the exmem memory is allocated; but not used for CHDK.
+            // It is filled with a guard value (see wrappers.c) which is checked here
+        // Any corruption is reported, otherwise 'OK' is displayed on screen (along with the exmem memory start address).
+            extern void *exmem_start, *exmem_end;
+            // check exmem allocated memory for corruption
+            unsigned long* p = (unsigned long*)exmem_start;
+            unsigned long *f = 0, *l = 0;
+            long cnt = 0;
+            while (p < (unsigned long*)exmem_end)
+            {
+                    if (p[0] != 0xDEADBEEF)
+                    {
+                            l = p;
+                            if (f == 0) f = p;
+                            cnt++;
+                    }
+                    p++;
+            }
+            if (cnt != 0)
+            {
+                    sprintf(osd_buf, "s:%8x e:%8x", exmem_start, exmem_end);
+                    draw_txt_string(2, 12, osd_buf, conf.osd_color);
+                    sprintf(osd_buf, "f:%8x l:%8x c:%d", f, l, cnt);
+            }
+            else
+            {
+                    sprintf(osd_buf, "OK 0x%x", exmem_start);
+            }
+            draw_txt_string(2, 13, osd_buf, conf.osd_color);
+            // end of check     
+    }
 #endif
 
@@ -2751 +2792 @@
     draw_restore();
     gui_palette_init(PALETTE_MODE_DEFAULT, 0x00, NULL);
-    gui_mode = GUI_MODE_PALETTE;
+    gui_set_mode(GUI_MODE_PALETTE);
 }
 
@@ -2791 +2832 @@
       draw_set_environment(aspect_xcorrection_games_360, aspect_ycorrection_games_360, GAMES_SCREEN_WIDTH, GAMES_SCREEN_HEIGHT);
     #endif
-    gui_mode = GUI_MODE_REVERSI;
+    gui_set_mode(GUI_MODE_REVERSI);
     gui_reversi_init();
 }
@@ -2808 +2849 @@
     #endif
     if ( gui_sokoban_init() )
-        gui_mode = GUI_MODE_SOKOBAN;
+        gui_set_mode(GUI_MODE_SOKOBAN);
 }
 #endif
@@ -2823 +2864 @@
     #endif
     if ( gui_4wins_init() )
-        gui_mode = GUI_MODE_4WINS;
+        gui_set_mode(GUI_MODE_4WINS);
 }
 #endif
@@ -2838 +2879 @@
     #endif
    if ( gui_mastermind_init() )
-        gui_mode = GUI_MODE_MASTERMIND;
+        gui_set_mode(GUI_MODE_MASTERMIND);
 }
 #endif
@@ -2854 +2895 @@
 #ifdef OPT_DEBUGGING
 void gui_draw_bench(int arg) {
-    gui_mode = GUI_MODE_BENCH;
+    gui_set_mode(GUI_MODE_BENCH);
     gui_bench_init();
 }
@@ -2943 +2984 @@
 //-------------------------------------------------------------------
 void gui_draw_osd_le(int arg) {
-    gui_mode = GUI_MODE_OSD;
+    gui_set_mode(GUI_MODE_OSD);
     gui_osd_init();
 }
@@ -2954 +2995 @@
             rbf_load_from_8x16(current_font);
         rbf_set_codepage(conf.reader_codepage);
-        gui_mode = GUI_MODE_READ;
+        gui_set_mode(GUI_MODE_READ);
         gui_read_init(fn);
     }
@@ -2991 +3032 @@
 void gui_menuproc_mkbootdisk(int arg) {
     mark_filesystem_bootable();
+    gui_mbox_init(LANG_INFORMATION, LANG_CONSOLE_TEXT_FINISHED, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
 }
 
@@ -3023 +3065 @@
 #ifdef OPT_CALENDAR
 void gui_draw_calendar(int arg) {
-    gui_mode = GUI_MODE_CALENDAR;
+    gui_set_mode(GUI_MODE_CALENDAR);
     gui_calendar_init();
 }
 #endif
 //-------------------------------------------------------------------
+#ifdef OPT_TEXTREADER
 static void gui_draw_rbf_selected(const char *fn) {
     if (fn) {
@@ -3033 +3076 @@
     }
 }
-#ifdef OPT_TEXTREADER
 void gui_draw_load_rbf(int arg) {
     DIR   *d;

trunk/core/gui_4wins.c

@@ -15 +15 @@
 
 #define BORDER           20
+#define XBORDER          (CAM_TS_BUTTON_BORDER+BORDER)
 #define RECT_SIZE        30
 #define BORDER_TOP       RECT_SIZE
@@ -52 +53 @@
                 for(i=1;field[column-1][i];i++);                        //1 ist wichtig (0=Fundament)
                 if (visible) {
-                        draw_filled_ellipse((BORDER+((column-1)*RECT_SIZE))+15, (BORDER+((6-i)*RECT_SIZE))+15+BORDER_TOP, 10,10, (cur_player==1)?P1_COLOR:P2_COLOR);
+                        draw_filled_ellipse((XBORDER+((column-1)*RECT_SIZE))+15, (BORDER+((6-i)*RECT_SIZE))+15+BORDER_TOP, 10,10, (cur_player==1)?P1_COLOR:P2_COLOR);
                 }
                 field[column-1][i]=player;
@@ -172 +173 @@
     w=l*FONT_WIDTH+10;
 
-    x = (screen_width-w)>>1; y = ((screen_height)>>1);
+    x = (screen_width-CAM_TS_BUTTON_BORDER-w)>>1; y = ((screen_height)>>1);
     draw_filled_round_rect(x, y, x+w, y+FONT_HEIGHT+6, MAKE_COLOR(COLOR_RED, COLOR_RED));
     draw_string(x+((w-strlen(text)*FONT_WIDTH)>>1), y+4, text, cl);
@@ -180 +181 @@
 {
         if (cur_player==1) cur_player=2; else cur_player=1;
-        draw_filled_ellipse((BORDER+((cursor_position)*RECT_SIZE))+15, BORDER+10, 10,10, (cur_player==1)?P1_COLOR:P2_COLOR);
+        draw_filled_ellipse((XBORDER+((cursor_position)*RECT_SIZE))+15, BORDER+10, 10,10, (cur_player==1)?P1_COLOR:P2_COLOR);
 }
 //-------------------------------------------------------------------
@@ -237 +238 @@
 void draw_mode()
 {
-        draw_txt_string(30, 4, "            ", TEXT_COLOR);
+    int x = (CAM_TS_BUTTON_BORDER/FONT_WIDTH) + 30;
+        draw_txt_string(x, 4, "            ", TEXT_COLOR);
         if (mode_rival==1)
-                draw_txt_string(30, 4, lang_str(LANG_CONNECT4_HUMAN), TEXT_COLOR);
+                draw_txt_string(x, 4, lang_str(LANG_CONNECT4_HUMAN), TEXT_COLOR);
         else
-                draw_txt_string(30, 4, PLATFORM, TEXT_COLOR);
+                draw_txt_string(x, 4, PLATFORM, TEXT_COLOR);
 }
 //-------------------------------------------------------------------
@@ -273 +275 @@
 static void move_cursor(int in_x_pos)
 {
-        draw_filled_ellipse((BORDER+((cursor_position)*RECT_SIZE))+15, BORDER+10, 10,10,BG_COLOR);
+        draw_filled_ellipse((XBORDER+((cursor_position)*RECT_SIZE))+15, BORDER+10, 10,10,BG_COLOR);
         if(in_game)
         {
@@ -288 +290 @@
                         cursor_position=(cursor_position+in_x_pos)%8;
         }
-        draw_filled_ellipse((BORDER+((cursor_position)*RECT_SIZE))+15, BORDER+10, 10,10, (cur_player==1)?P1_COLOR:P2_COLOR);
+        draw_filled_ellipse((XBORDER+((cursor_position)*RECT_SIZE))+15, BORDER+10, 10,10, (cur_player==1)?P1_COLOR:P2_COLOR);
 }
 //-------------------------------------------------------------------
@@ -300 +302 @@
         srand(time(NULL));
         
-        draw_filled_rect(0, 0, 360, 240, BG_COLOR);             // draw backgraund
-        draw_filled_rect(BORDER, BORDER+BORDER_TOP, BORDER+(7*RECT_SIZE), BORDER+(6*RECT_SIZE)+BORDER_TOP, FIELD_COLOR);
-        draw_filled_round_rect(240, 90, 360-BORDER, 240-10, INFO_COLOR);
-    draw_txt_string(12, 0, lang_str(LANG_MENU_GAMES_CONNECT4), TEXT_COLOR);
-    draw_line(0,15,360,15,0xEF);
+        draw_filled_rect(0, 0, screen_width, screen_height, BG_COLOR);          // draw backgraund
+        draw_filled_rect(XBORDER, BORDER+BORDER_TOP, XBORDER+(7*RECT_SIZE), BORDER+(6*RECT_SIZE)+BORDER_TOP, FIELD_COLOR);
+        draw_filled_round_rect(CAM_TS_BUTTON_BORDER+240, 90, CAM_TS_BUTTON_BORDER+360-BORDER, 240-10, INFO_COLOR);
+    draw_txt_string((CAM_TS_BUTTON_BORDER/FONT_WIDTH)+12, 0, lang_str(LANG_MENU_GAMES_CONNECT4), TEXT_COLOR);
+    draw_line(CAM_TS_BUTTON_BORDER,15,CAM_TS_BUTTON_BORDER+360,15,COLOR_SPLASH_GREY);
 
         for(i=0;i<7;i++)
@@ -311 +313 @@
                 {
                         field[i][j+1]=0;
-                        draw_filled_ellipse(BORDER+(i*RECT_SIZE)+(RECT_SIZE/2), BORDER+(j*RECT_SIZE)+(RECT_SIZE/2)+BORDER_TOP, 10, 10, BG_COLOR);
+                        draw_filled_ellipse(XBORDER+(i*RECT_SIZE)+(RECT_SIZE/2), BORDER+(j*RECT_SIZE)+(RECT_SIZE/2)+BORDER_TOP, 10, 10, BG_COLOR);
                 }
         }
@@ -320 +322 @@
 
         move_cursor(0);
-        draw_txt_string(30, 3, lang_str(LANG_CONNECT4_RIVAL), TEXT_COLOR);
+        draw_txt_string((CAM_TS_BUTTON_BORDER/FONT_WIDTH)+30, 3, lang_str(LANG_CONNECT4_RIVAL), TEXT_COLOR);
     sprintf(str, "%d",count_win[0]);
-        draw_txt_string(screen_width/FONT_WIDTH-2-10, screen_height/FONT_HEIGHT-9, str, MAKE_COLOR(INFO_COLOR, P1_COLOR));
+        draw_txt_string((screen_width-CAM_TS_BUTTON_BORDER)/FONT_WIDTH-2-10, screen_height/FONT_HEIGHT-9, str, MAKE_COLOR(INFO_COLOR, P1_COLOR));
     sprintf(str, ":");
-        draw_txt_string(screen_width/FONT_WIDTH-2-7, screen_height/FONT_HEIGHT-9, str, INFO_TEXT_COLOR);
+        draw_txt_string((screen_width-CAM_TS_BUTTON_BORDER)/FONT_WIDTH-2-7, screen_height/FONT_HEIGHT-9, str, INFO_TEXT_COLOR);
     sprintf(str, "%d",count_win[1]);
-        draw_txt_string(screen_width/FONT_WIDTH-2-4, screen_height/FONT_HEIGHT-9, str, MAKE_COLOR(INFO_COLOR, P2_COLOR));
+        draw_txt_string((screen_width-CAM_TS_BUTTON_BORDER)/FONT_WIDTH-2-4, screen_height/FONT_HEIGHT-9, str, MAKE_COLOR(INFO_COLOR, P2_COLOR));
         draw_mode();
         if(cur_player==2&&!mode_rival) set();
@@ -353 +355 @@
   static char str[16];
   sprintf(str, "%3d%%", get_batt_perc());
-  draw_txt_string(screen_width/FONT_WIDTH-2-13, screen_height/FONT_HEIGHT-2, str, INFO_TEXT_COLOR);
-  gui_osd_draw_clock(300,208,INFO_TEXT_COLOR);
-}
+  draw_txt_string((screen_width-CAM_TS_BUTTON_BORDER)/FONT_WIDTH-2-13, screen_height/FONT_HEIGHT-2, str, INFO_TEXT_COLOR);
+  gui_osd_draw_clock(CAM_TS_BUTTON_BORDER+290,208,INFO_TEXT_COLOR);
+}

trunk/core/gui_calendar.c

@@ -63 +63 @@
 
     draw_filled_rect(0, 0, screen_width-1, screen_height-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
-    draw_txt_string(1, 0, lang_str(LANG_CALENDAR_TODAY), MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
+    draw_txt_string((CAM_TS_BUTTON_BORDER/FONT_WIDTH)+1, 0, lang_str(LANG_CALENDAR_TODAY), MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
     draw_rect(cal_x-3, cal_y-3, cal_x+cal_w+2, cal_y+cal_h+2, CALENDAR_COLOR);
     draw_filled_rect(cal_x-1, cal_y-1, cal_x+cal_w, cal_y+FONT_HEIGHT+8, TITLE_COLOR);
@@ -132 +132 @@
     ttm = localtime(&t);
     sprintf(str, " %2u %s %04u  %2u:%02u:%02u   ", ttm->tm_mday, lang_str(months[ttm->tm_mon]), 1900+ttm->tm_year, ttm->tm_hour, ttm->tm_min, ttm->tm_sec);
-    draw_txt_string(8, 0, str, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
+    draw_txt_string((CAM_TS_BUTTON_BORDER/FONT_WIDTH)+8, 0, str, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
 
     if (need_redraw) {

trunk/core/gui_draw.c

@@ -317 +317 @@
     draw_rectangle(x1,y1,x2,y2,cl&0xff,1);
 } 
+
+void draw_round_rect_thick(coord x1, coord y1, coord x2, coord y2, color cl, int thickness) { 
+    int i;
+    cl = cl & 0xff;
+    draw_rectangle(x1,y1,x2,y2,cl,1);
+    for (i=1; i<thickness; i++)
+    {
+        draw_rectangle(x1+i,y1+i,x2-i,y2-i,cl,0);
+    }
+} 
 //-------------------------------------------------------------------
 static void fill_rect(color cl) {
@@ -344 +354 @@
 void draw_filled_round_rect(coord x1, coord y1, coord x2, coord y2, color cl) { 
     draw_round_rect(x1, y1, x2, y2, cl); 
+    fill_rect(cl);
+} 
+
+void draw_filled_round_rect_thick(coord x1, coord y1, coord x2, coord y2, color cl, int thickness) { 
+    draw_round_rect_thick(x1, y1, x2, y2, cl, thickness); 
     fill_rect(cl);
 } 
@@ -418 +433 @@
 #ifdef CAM_DETECT_SCREEN_ERASE
     draw_set_guard();
+#ifdef CAM_TOUCHSCREEN_UI
+    extern int redraw_buttons;
+    redraw_buttons = 1;
+#endif
 #endif
 }

trunk/core/gui_draw.h

@@ -208 +208 @@
 #define COLOR_BLUE_LT       0x10
 #define COLOR_BLUE          0x14
-#define COLOR_YELLOW        0x16
+#define COLOR_YELLOW        0x60
 #define COLOR_BLACK         0xFF
 #define COLOR_BG            0x62
@@ -229 +229 @@
 #define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB
 #define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT
-#define COLOR_HISTO_RG_PLAY COLOR_YELLOW
+#define COLOR_HISTO_RG_PLAY 0x80
 #undef SCREEN_COLOR
 #define SCREEN_COLOR            0x1D
@@ -366 +366 @@
 #define COLOR_HISTO_RG_PLAY COLOR_YELLOW
 
+#elif CAM_BITMAP_PALETTE==12    //(IXUS 310)
+#define COLOR_TRANSPARENT   0x00
+#define COLOR_WHITE         0x01
+#define COLOR_RED           0x1e
+#define COLOR_GREY          0x1a
+#define COLOR_GREEN         0x17
+#define COLOR_BLUE_LT       0x10
+#define COLOR_BLUE          0x14
+#define COLOR_YELLOW        0x74
+#define COLOR_BLACK         0xFF
+#define COLOR_BG            0x1b
+#define COLOR_FG            COLOR_WHITE
+#define COLOR_SELECTED_BG   0x0e
+#define COLOR_SELECTED_FG   COLOR_BLACK
+#define COLOR_ALT_BG        COLOR_BG
+#define COLOR_SPLASH_RED    COLOR_RED
+#define COLOR_SPLASH_PINK   0x1e                        // Orange
+#define COLOR_SPLASH_GREY   0x16
+#define COLOR_HISTO_R       0x7a
+#define COLOR_HISTO_R_PLAY  0x8f
+#define COLOR_HISTO_B       0x7b
+#define COLOR_HISTO_B_PLAY  0x90
+#define COLOR_HISTO_G       0x7d
+#define COLOR_HISTO_G_PLAY      0x91
+#define COLOR_HISTO_BG      COLOR_BLUE_LT
+#define COLOR_HISTO_RG      COLOR_YELLOW
+#define COLOR_HISTO_RB      COLOR_RED
+#define COLOR_HISTO_RB_PLAY COLOR_HISTO_RB
+#define COLOR_HISTO_BG_PLAY COLOR_BLUE_LT
+#define COLOR_HISTO_RG_PLAY 0x85
+#undef SCREEN_COLOR
+#define SCREEN_COLOR            0x1D
+
 #else
 #error CAM_BITMAP_PALETTE not defined
@@ -398 +431 @@
 extern void draw_rect_shadow(coord x1, coord y1, coord x2, coord y2, color cl, int thickness);
 extern void draw_round_rect(coord x1, coord y1, coord x2, coord y2, color cl);
+extern void draw_round_rect_thick(coord x1, coord y1, coord x2, coord y2, color cl, int thickness);
 // color: hi_byte - BG; lo_byte - FG
 extern void draw_filled_rect(coord x1, coord y1, coord x2, coord y2, color cl);
 extern void draw_filled_rect_thick(coord x1, coord y1, coord x2, coord y2, color cl, int thickness);
 extern void draw_filled_round_rect(coord x1, coord y1, coord x2, coord y2, color cl);
+extern void draw_filled_round_rect_thick(coord x1, coord y1, coord x2, coord y2, color cl, int thickness);
 
 extern void draw_char(coord x, coord y, const char ch, color cl);

trunk/core/gui_lang.c

@@ -583 +583 @@
 "460 \"You need to be in REC-mode\\nfor this operation.\"\n"
 "461 \"%s disabled in build\"\n"
+
+// Touch screen
+"462 \"Touchscreen overrides\"\n"
+"463 \"Video AE Controls\"\n"
+"464 \"<Alt> Shortcut Buttons\"\n"
 ;
 

trunk/core/gui_lang.h

@@ -571 +571 @@
 #define LANG_MENU_BADPIXEL_CREATE  459
 #define LANG_MSG_RECMODE_REQUIRED  460
-#define LANG_CONSOLE_SCRIPT_DISABLED_IN_BUILD  461
+#define LANG_CONSOLE_SCRIPT_DISABLED_IN_BUILD 461
 //-------------------------------------------------------------------
-
-#define GUI_LANG_ITEMS                  461
+// Touch screen
+#define LANG_MENU_TOUCHSCREEN_VALUES        462
+#define LANG_MENU_TS_VIDEO_AE_DISABLE       463
+#define LANG_MENU_TS_ALT_SHORTCUTS_DISABLE  464
+//-------------------------------------------------------------------
+
+#define GUI_LANG_ITEMS                  464
 
 //-------------------------------------------------------------------

trunk/core/gui_mastermind.c

@@ -21 +21 @@
 int curr_y;
 int answer[4];
-char colors[6];
+char colors[6] = { COLOR_HISTO_R_PLAY, COLOR_HISTO_G_PLAY, COLOR_HISTO_B_PLAY, COLOR_YELLOW, COLOR_WHITE, COLOR_BLACK };
 int curr_color[4];
 int GameGo;
 static char buf[128];
 
+static void guess_box(int pos, color col)
+{
+        draw_filled_rect(CAM_TS_BUTTON_BORDER+100+(pos*10), BORDER+(2*curr_y*10)+2+2*curr_y, CAM_TS_BUTTON_BORDER+100+(pos*10)+6, BORDER+(2*curr_y*10)+8+2*curr_y , MAKE_COLOR(col,col));
+}
+
 char WinQuary(){
         char pos=0;
-        int i=0;
-        
-        for(i=0;i<4;i++){
-                if(answer[i]==curr_color[i]){
-                        draw_filled_rect(100+(pos*10), BORDER+(2*curr_y*10)+2+2*curr_y, 100+(pos*10)+6, BORDER+(2*curr_y*10)+8+2*curr_y , MAKE_COLOR(COLOR_BLACK,COLOR_BLACK));
+        int i, j;
+        
+        for (i=0; i<4; i++)
+    {
+                if (answer[i] == curr_color[i])
+        {
+            guess_box(pos,COLOR_BLACK);
                         pos++;
                 }
         }
         
-        if(pos==4){
-                GameGo=0;
+        if (pos == 4)
+    {
+                GameGo = 0;
                 return 1;
         }
         
-        if(answer[0]==curr_color[1] || answer[0]==curr_color[2] || answer[0]==curr_color[3]){
-                draw_filled_rect(100+(pos*10), BORDER+(2*curr_y*10)+2+2*curr_y, 100+(pos*10)+6, BORDER+(2*curr_y*10)+8+2*curr_y , MAKE_COLOR(COLOR_WHITE,COLOR_WHITE));
-                pos++;
-        }
-        if(answer[1]==curr_color[0] || answer[1]==curr_color[2] || answer[1]==curr_color[3]){
-                draw_filled_rect(100+(pos*10), BORDER+(2*curr_y*10)+2+2*curr_y, 100+(pos*10)+6, BORDER+(2*curr_y*10)+8+2*curr_y , MAKE_COLOR(COLOR_WHITE,COLOR_WHITE));
-                pos++;
-        }
-        if(answer[2]==curr_color[0] || answer[2]==curr_color[1] || answer[2]==curr_color[3]){
-                draw_filled_rect(100+(pos*10), BORDER+(2*curr_y*10)+2+2*curr_y, 100+(pos*10)+6, BORDER+(2*curr_y*10)+8+2*curr_y , MAKE_COLOR(COLOR_WHITE,COLOR_WHITE));
-                pos++;
-        }
-        if(answer[3]==curr_color[0] || answer[3]==curr_color[1] || answer[3]==curr_color[2]){
-                draw_filled_rect(100+(pos*10), BORDER+(2*curr_y*10)+2+2*curr_y, 100+(pos*10)+6, BORDER+(2*curr_y*10)+8+2*curr_y , MAKE_COLOR(COLOR_WHITE,COLOR_WHITE));
-                pos++;
-        }
-
-        if(curr_y==0){
-                GameGo=0;
+        for (i=0; i<4; i++)
+    {
+        for (j=0; j<4; j++)
+        {
+                    if ((answer[i] == curr_color[j]) && (i != j))
+            {
+                guess_box(pos,COLOR_WHITE);
+                            pos++;
+            }
+                }
+        }
+
+        if(curr_y==0)
+    {
+                GameGo = 0;
                 return 2;
         }
+
         return 0;
 }
 
 char CanNext(){
-        if(curr_color[0]==99 || curr_color[1]==99 || curr_color[2]==99 || curr_color[3]==99)
+        if (curr_color[0]==99 || curr_color[1]==99 || curr_color[2]==99 || curr_color[3]==99)
                 return 0;
-        else if(curr_color[0]==curr_color[1] || curr_color[0]==curr_color[2] || curr_color[0]==curr_color[3] ||
-                curr_color[1]==curr_color[2] || curr_color[1]==curr_color[3] || curr_color[2]==curr_color[3]){
-                draw_string(167, 130 , lang_str(LANG_MENU_GAMES_DCOLOR), TEXT_COLOR);
+        else if (curr_color[0]==curr_color[1] || curr_color[0]==curr_color[2] || curr_color[0]==curr_color[3] ||
+                     curr_color[1]==curr_color[2] || curr_color[1]==curr_color[3] || curr_color[2]==curr_color[3])
+    {
+                draw_string(CAM_TS_BUTTON_BORDER+167, 130, lang_str(LANG_MENU_GAMES_DCOLOR), TEXT_COLOR);
                 return 0;
         }
@@ -81 +87 @@
         int i=0;
         
-        for(i=0;i<4;i++)answer[i]=99;
-        i=0;
-        while(i<4){
-                tmp=rand()%6;
-                if(answer[0]!=tmp && answer[1]!=tmp && answer[2]!=tmp && answer[3]!=tmp){
-                        answer[i]=tmp;
+        for (i=0; i<4; i++) answer[i] = 99;
+        i = 0;
+        while (i<4)
+    {
+                tmp = rand() % 6;
+                if (answer[0]!=tmp && answer[1]!=tmp && answer[2]!=tmp && answer[3]!=tmp)
+        {
+                        answer[i] = tmp;
                         i++;
                 }
         }
-        
-        //for (i=0; i<4;i++)
-        //      draw_filled_rect(BORDER+(2*i*10), 213, BORDER+(2*i*10)+10,223, MAKE_COLOR(colors[answer[i]],colors[answer[i]]));
-
 }
 
 int gui_mastermind_init() {
         int i,j;
-        colors[0]=COLOR_HISTO_R_PLAY;
-        colors[1]=COLOR_HISTO_G_PLAY;
-        colors[2]=COLOR_HISTO_B_PLAY;
-        colors[3]=COLOR_YELLOW;
-        colors[4]=COLOR_WHITE;
-        colors[5]=COLOR_BLACK;
-        curr_color[0]=0;
-        curr_color[1]=0;
-        curr_color[2]=0;
-        curr_color[3]=0;
 
         curr_x=0;
         curr_y=7;
         
-        draw_filled_rect( 0, 0, 360, 240, BG_COLOR);
-
-        for (i=0;i<4;i++){
-                for (j=0;j<8;j++){
-                        draw_filled_rect(BORDER+(2*i*10), BORDER+(2*j*10)+2*j, BORDER+(2*i*10)+10, BORDER+(2*j*10)+2*j+10 , COLOR_LIGHT_GRAY);
-                }
-        }
-
-        draw_filled_rect(10, BORDER+(2*j*10)+2*j, 150,BORDER+(2*j*10)+2*j+1, MAKE_COLOR(BG_COLOR,COLOR_WHITE));
-        draw_filled_rect(148, 10, 149,230, MAKE_COLOR(BG_COLOR,COLOR_WHITE));
-        draw_filled_rect(151, 10, 152,230, MAKE_COLOR(BG_COLOR,COLOR_WHITE));
-        
-        //for (i=0; i<4;i++)
-        //      draw_filled_rect(BORDER+(2*i*10), 213, BORDER+(2*i*10)+10,223, COLOR_LIGHT_GRAY);
+        draw_filled_rect( 0, 0, screen_width-1, screen_height-1, BG_COLOR);
+
+        for (i=0;i<4;i++)
+                for (j=0;j<8;j++)
+                        draw_filled_rect(CAM_TS_BUTTON_BORDER+BORDER+(2*i*10), BORDER+(2*j*10)+2*j, CAM_TS_BUTTON_BORDER+BORDER+(2*i*10)+10, BORDER+(2*j*10)+2*j+10 , COLOR_LIGHT_GRAY);
+
+        draw_filled_rect(CAM_TS_BUTTON_BORDER+10, BORDER+(2*j*10)+2*j, CAM_TS_BUTTON_BORDER+150,BORDER+(2*j*10)+2*j+1, MAKE_COLOR(BG_COLOR,COLOR_WHITE));
+        draw_filled_rect(CAM_TS_BUTTON_BORDER+148, 10, CAM_TS_BUTTON_BORDER+149,230, MAKE_COLOR(BG_COLOR,COLOR_WHITE));
+        draw_filled_rect(CAM_TS_BUTTON_BORDER+151, 10, CAM_TS_BUTTON_BORDER+152,230, MAKE_COLOR(BG_COLOR,COLOR_WHITE));
         
         for (i=0; i<6;i++)
-                draw_filled_rect(BORDER+(2*(i+7)*10)+20, 40, BORDER+(2*(i+7)*10)+35,55, MAKE_COLOR(colors[i],colors[i]));
+                draw_filled_rect(CAM_TS_BUTTON_BORDER+BORDER+(2*(i+7)*10)+20, 40, CAM_TS_BUTTON_BORDER+BORDER+(2*(i+7)*10)+35,55, MAKE_COLOR(colors[i],colors[i]));
                 
-        draw_filled_rect(BORDER+(2*7*10)+20, 65, BORDER+(2*7*10)+35,80, MAKE_COLOR(COLOR_BLACK,COLOR_BLACK));
-        draw_string(BORDER+(2*7*10)+50, 65 , lang_str(LANG_MENU_GAMES_RIGHT_PLACE), TEXT_COLOR);
-        
-        draw_filled_rect(BORDER+(2*7*10)+20, 90, BORDER+(2*7*10)+35,105, MAKE_COLOR(COLOR_WHITE,COLOR_WHITE));
-        draw_string(BORDER+(2*7*10)+50, 90 , lang_str(LANG_MENU_GAMES_C_IN_ANSWER), TEXT_COLOR);
-
+        draw_filled_rect(CAM_TS_BUTTON_BORDER+BORDER+(2*7*10)+20, 65, CAM_TS_BUTTON_BORDER+BORDER+(2*7*10)+35,80, MAKE_COLOR(COLOR_BLACK,COLOR_BLACK));
+        draw_string(CAM_TS_BUTTON_BORDER+BORDER+(2*7*10)+50, 65 , lang_str(LANG_MENU_GAMES_RIGHT_PLACE), TEXT_COLOR);
+        
+        draw_filled_rect(CAM_TS_BUTTON_BORDER+BORDER+(2*7*10)+20, 90, CAM_TS_BUTTON_BORDER+BORDER+(2*7*10)+35,105, MAKE_COLOR(COLOR_WHITE,COLOR_WHITE));
+        draw_string(CAM_TS_BUTTON_BORDER+BORDER+(2*7*10)+50, 90 , lang_str(LANG_MENU_GAMES_C_IN_ANSWER), TEXT_COLOR);
                                         
-        draw_string(173, 20 , lang_str(LANG_MENU_GAMES_AC_COLORS), TEXT_COLOR);
+        draw_string(CAM_TS_BUTTON_BORDER+173, 20 , lang_str(LANG_MENU_GAMES_AC_COLORS), TEXT_COLOR);
                 
-        draw_string(167, 200 , lang_str(LANG_MENU_GAMES_CURSOR1), TEXT_COLOR);
-        draw_string(167, 185 , lang_str(LANG_MENU_GAMES_CURSOR2), TEXT_COLOR);
-        draw_string(167, 170 , lang_str(LANG_MENU_GAMES_CURSOR3), TEXT_COLOR);
+        draw_string(CAM_TS_BUTTON_BORDER+167, 200 , lang_str(LANG_MENU_GAMES_CURSOR1), TEXT_COLOR);
+        draw_string(CAM_TS_BUTTON_BORDER+167, 185 , lang_str(LANG_MENU_GAMES_CURSOR2), TEXT_COLOR);
+        draw_string(CAM_TS_BUTTON_BORDER+167, 170 , lang_str(LANG_MENU_GAMES_CURSOR3), TEXT_COLOR);
 
         for(i=0;i<4;i++) curr_color[i]=99;
@@ -148 +136 @@
 }
 //-------------------------------------------------------------------
+static void draw_box(color border)
+{
+    if (curr_color[curr_x] == 99) curr_color[curr_x] = 0;
+    draw_filled_rect(CAM_TS_BUTTON_BORDER+BORDER+(2*curr_x*10), BORDER+(2*curr_y*10)+2*curr_y, CAM_TS_BUTTON_BORDER+BORDER+(2*curr_x*10)+10, BORDER+(2*curr_y*10)+2*curr_y+10 , MAKE_COLOR(colors[curr_color[curr_x]],border));
+}
+
+static void end_game(int msg)
+{
+    int i;
+    draw_string(CAM_TS_BUTTON_BORDER+198, 130 , lang_str(msg), TEXT_COLOR);
+        for (i=0; i<4;i++)
+            draw_filled_rect(CAM_TS_BUTTON_BORDER+BORDER+(2*i*10), 213, CAM_TS_BUTTON_BORDER+BORDER+(2*i*10)+10,223,  MAKE_COLOR(colors[answer[i]],colors[answer[i]]));
+}
+
+static void chg_box(int inc_box, int inc_val)
+{
+    draw_box(colors[curr_color[curr_x]]);
+    curr_x = (curr_x + inc_box) & 3;
+    if (curr_color[curr_x] == 99) curr_color[curr_x] = 0;
+    curr_color[curr_x] = (curr_color[curr_x] + inc_val);
+    if (curr_color[curr_x] < 0) curr_color[curr_x] = 5;
+    else if (curr_color[curr_x] > 5) curr_color[curr_x] = 0;
+    draw_box(COLOR_BLACK);
+}
+
 void gui_mastermind_kbd_process() {
         int i=0;
         rand();
-        switch (kbd_get_autoclicked_key()) 
-        {
-                case KEY_SET:
-                        if(GameGo==1){
-                                if(CanNext()){
-                                        if(WinQuary()==1){
-                                                draw_string(198, 130 , lang_str(LANG_MENU_GAMES_RIGHT), TEXT_COLOR);
-                                                draw_string(167, 200 , lang_str(LANG_MENU_GAMES_CURSOR1), TEXT_COLOR);
-                                                draw_string(167, 185 , lang_str(LANG_MENU_GAMES_CURSOR2), TEXT_COLOR);
-                                                draw_string(167, 170 , lang_str(LANG_MENU_GAMES_CURSOR3), TEXT_COLOR);
-                                                for (i=0; i<4;i++)
-                                                        draw_filled_rect(BORDER+(2*i*10), 213, BORDER+(2*i*10)+10,223,  MAKE_COLOR(colors[answer[i]],colors[answer[i]]));
-                                        }
-                                        else if(WinQuary()==2){
-                                                draw_string(198, 130 , lang_str(LANG_MENU_GAMES_GAME_OVER), TEXT_COLOR);
-                                                draw_string(167, 200 , lang_str(LANG_MENU_GAMES_CURSOR1), TEXT_COLOR);
-                                                draw_string(167, 185 , lang_str(LANG_MENU_GAMES_CURSOR2), TEXT_COLOR);
-                                                draw_string(167, 170 , lang_str(LANG_MENU_GAMES_CURSOR3), TEXT_COLOR);
-                                                for (i=0; i<4;i++)
-                                                        draw_filled_rect(BORDER+(2*i*10), 213, BORDER+(2*i*10)+10,223,  MAKE_COLOR(colors[answer[i]],colors[answer[i]]));
-                                        }
-                                        else{
-                                                draw_filled_rect(BORDER+(2*(curr_x)*10), BORDER+(2*curr_y*10)+2*curr_y, BORDER+(2*(curr_x)*10)+10, BORDER+(2*curr_y*10)+2*curr_y+10 , MAKE_COLOR(colors[curr_color[curr_x]],colors[curr_color[curr_x]]));
-                                                for(i=0;i<4;i++) curr_color[i]=99;
-                                                curr_y--;
-                                                curr_x=0;
-                                                if(curr_color[curr_x]==99) curr_color[curr_x]=0;
-                                                draw_filled_rect(BORDER+(2*curr_x*10), BORDER+(2*curr_y*10)+2*curr_y, BORDER+(2*curr_x*10)+10, BORDER+(2*curr_y*10)+2*curr_y+10 , MAKE_COLOR(colors[curr_color[curr_x]],COLOR_BLACK));
-                                        }
-                                }
-                        }
-                        else{
-                                gui_mastermind_init();
-                                CreateColorCombo();
-                                for (i=0; i<4;i++)draw_filled_rect(BORDER+(2*i*10), 213, BORDER+(2*i*10)+10,223, BG_COLOR); // overwrite anwser
-                                curr_x=0;
-                                if(curr_color[curr_x]==99) curr_color[curr_x]=0;
-                                draw_filled_rect(BORDER+(2*curr_x*10), BORDER+(2*curr_y*10)+2*curr_y, BORDER+(2*curr_x*10)+10, BORDER+(2*curr_y*10)+2*curr_y+10 , MAKE_COLOR(colors[curr_color[curr_x]],COLOR_BLACK));
-                                GameGo=1;
-                                draw_string(198, 130 , "            ", TEXT_COLOR);
-                        }
-                        break;
-                case KEY_LEFT:
-                        if(GameGo==1){
-                                draw_filled_rect(BORDER+(2*curr_x*10), BORDER+(2*curr_y*10)+2*curr_y, BORDER+(2*curr_x*10)+10, BORDER+(2*curr_y*10)+2*curr_y+10 , MAKE_COLOR(colors[curr_color[curr_x]],colors[curr_color[curr_x]]));
-                                (curr_x==0)?curr_x=3:curr_x--;
-                                if(curr_color[curr_x]==99) curr_color[curr_x]=0;
-                                draw_filled_rect(BORDER+(2*curr_x*10), BORDER+(2*curr_y*10)+2*curr_y, BORDER+(2*curr_x*10)+10, BORDER+(2*curr_y*10)+2*curr_y+10 , MAKE_COLOR(colors[curr_color[curr_x]],COLOR_BLACK));
-                        }
-                        break;
-                case KEY_RIGHT:
-                        if(GameGo==1){
-                                draw_filled_rect(BORDER+(2*curr_x*10), BORDER+(2*curr_y*10)+2*curr_y, BORDER+(2*curr_x*10)+10, BORDER+(2*curr_y*10)+2*curr_y+10 , MAKE_COLOR(colors[curr_color[curr_x]],colors[curr_color[curr_x]]));
-                                curr_x=(curr_x+1)%4;
-                                if(curr_color[curr_x]==99) curr_color[curr_x]=0;
-                                draw_filled_rect(BORDER+(2*curr_x*10), BORDER+(2*curr_y*10)+2*curr_y, BORDER+(2*curr_x*10)+10, BORDER+(2*curr_y*10)+2*curr_y+10 , MAKE_COLOR(colors[curr_color[curr_x]],COLOR_BLACK));
-                        }
-                        break;
-                case KEY_UP:
-                        if(GameGo==1){
-                                draw_string(167, 130 , "                       ", TEXT_COLOR);
-                                curr_color[curr_x]=(curr_color[curr_x]+1)%6;
-                                draw_filled_rect(BORDER+(2*curr_x*10), BORDER+(2*curr_y*10)+2*curr_y, BORDER+(2*curr_x*10)+10, BORDER+(2*curr_y*10)+2*curr_y+10 , MAKE_COLOR(colors[curr_color[curr_x]],COLOR_BLACK));
-                        }
-                        break;
-                case KEY_DOWN:
-                        if(GameGo==1){
-                                draw_string(167, 130 , "                       ", TEXT_COLOR);
-                                (curr_color[curr_x]-1<0)?curr_color[curr_x]=5:curr_color[curr_x]--;
-                                draw_filled_rect(BORDER+(2*curr_x*10), BORDER+(2*curr_y*10)+2*curr_y, BORDER+(2*curr_x*10)+10, BORDER+(2*curr_y*10)+2*curr_y+10 , MAKE_COLOR(colors[curr_color[curr_x]],COLOR_BLACK));
-                        }
-                        break;
-        }
+    long key = kbd_get_autoclicked_key();
+    if (key)
+    {
+        if (GameGo == 1)
+        {
+            draw_string(CAM_TS_BUTTON_BORDER+167, 130 , "                       ", TEXT_COLOR);
+                switch (kbd_get_autoclicked_key()) 
+                {
+                        case KEY_SET:
+                                if(CanNext())
+                    {
+                                        if(WinQuary() == 1)
+                        {
+                            end_game(LANG_MENU_GAMES_RIGHT);
+                                        }
+                                        else if(WinQuary() == 2)
+                        {
+                            end_game(LANG_MENU_GAMES_GAME_OVER);
+                                        }
+                                        else
+                        {
+                            draw_box(colors[curr_color[curr_x]]);
+                                                for(i=0;i<4;i++) curr_color[i]=99;
+                                                curr_y--;
+                                                curr_x=0;
+                            draw_box(COLOR_BLACK);
+                                        }
+                                }
+                                break;
+                        case KEY_LEFT:
+                    chg_box(-1,0);
+                                break;
+                        case KEY_RIGHT:
+                    chg_box(1,0);
+                                break;
+                        case KEY_UP:
+                    chg_box(0,1);
+                                break;
+                        case KEY_DOWN:
+                    chg_box(0,-1);
+                                break;
+                }
+        }
+        else if (key == KEY_SET)
+        {
+                        gui_mastermind_init();
+                        CreateColorCombo();
+            draw_box(COLOR_BLACK);
+                        GameGo=1;
+        }
+    }
 }
 //-------------------------------------------------------------------
@@ -230 +221 @@
     static struct tm *ttm;
 
-    draw_txt_string(15, 0, lang_str(LANG_MENU_GAMES_MASTERMIND), MAKE_COLOR(BG_COLOR, COLOR_WHITE));
+    draw_txt_string(CAM_TS_BUTTON_BORDER/FONT_WIDTH+15, 0, lang_str(LANG_MENU_GAMES_MASTERMIND), MAKE_COLOR(BG_COLOR, COLOR_WHITE));
 
     t = time(NULL);
     ttm = localtime(&t);
-    sprintf(buf, "Time: %2u:%02u", ttm->tm_hour, ttm->tm_min);
-    draw_txt_string(screen_width/FONT_WIDTH-2-1-1-9-2-5-4, screen_height/FONT_HEIGHT-1, buf, TEXT_COLOR);
-        
-        sprintf(buf, "Batt:%3d%%", get_batt_perc());
-    draw_txt_string(screen_width/FONT_WIDTH-2-9, screen_height/FONT_HEIGHT-1, buf, TEXT_COLOR);
-}
+    sprintf(buf, "Time: %2u:%02u  Batt:%3d%%", ttm->tm_hour, ttm->tm_min, get_batt_perc());
+    draw_txt_string((screen_width-CAM_TS_BUTTON_BORDER)/FONT_WIDTH-2-1-1-9-2-5-4, screen_height/FONT_HEIGHT-1, buf, TEXT_COLOR);
+}

trunk/core/gui_palette.c

@@ -65 +65 @@
 
 void gui_palette_draw() {
-    unsigned int x, y;
+    unsigned int x, y, xl, xr;
     char f=0;
     color c;
     static char buf[64];
 
+    xl = CAM_TS_BUTTON_BORDER;
+    xr = screen_width - CAM_TS_BUTTON_BORDER;
+
     if (gui_palette_redraw)
     {
         // Draw top text line - current color + instructions
-        draw_string(screen_width-29*FONT_WIDTH, 0, "    Use \x18\x19\x1b\x1a to change color ", MAKE_COLOR(COLOR_BLACK, COLOR_WHITE));
+        draw_string(xr-29*FONT_WIDTH, 0, "    Use \x18\x19\x1b\x1a to change color ", MAKE_COLOR(COLOR_BLACK, COLOR_WHITE));
         sprintf(buf, " %s: 0x%02hX    ", lang_str(LANG_PALETTE_TEXT_COLOR), (unsigned char)cl);
-        draw_txt_string(0, 0, buf, MAKE_COLOR(COLOR_BLACK, COLOR_WHITE));
+        draw_string(xl, 0, buf, MAKE_COLOR(COLOR_BLACK, COLOR_WHITE));
 
         // Draw Palette color boxes
@@ -83 +86 @@
             for (x=DISP_LEFT; x<DISP_RIGHT; x+=CELL_SIZE, c+=0x0100)
             {
-                draw_filled_rect(x, y, x+CELL_SIZE, y+CELL_SIZE, c);
+                draw_filled_rect(xl+x, y, xl+x+CELL_SIZE, y+CELL_SIZE, c);
             }
         }
 
         // Draw gray borders
-        draw_rect_thick(0, DISP_TOP-BORDER_SIZE, screen_width-1, screen_height-1, COLOR_GREY, BORDER_SIZE); // outer border
-        draw_filled_rect(DISP_RIGHT+1, DISP_TOP, DISP_RIGHT+BORDER_SIZE, DISP_BOTTOM, MAKE_COLOR(COLOR_GREY, COLOR_GREY)); //middle
+        draw_rect_thick(xl, DISP_TOP-BORDER_SIZE, xr-1, screen_height-1, COLOR_GREY, BORDER_SIZE); // outer border
+        draw_filled_rect(xl+DISP_RIGHT+1, DISP_TOP, xl+DISP_RIGHT+BORDER_SIZE, DISP_BOTTOM, MAKE_COLOR(COLOR_GREY, COLOR_GREY)); //middle
 
-        // Co-ordintate of selected color
+        // Co-ordinate of selected color
         y = DISP_TOP + ((cl>>4)&0x0F) * CELL_SIZE;
         x = DISP_LEFT + (cl&0x0F) * CELL_SIZE;
 
         // Highlight selected color
-        draw_filled_rect_thick(x-CELL_ZOOM, y-CELL_ZOOM, x+CELL_SIZE+CELL_ZOOM, y+CELL_SIZE+CELL_ZOOM, MAKE_COLOR(cl, COLOR_RED), 2);
+        draw_filled_rect_thick(xl+x-CELL_ZOOM, y-CELL_ZOOM, xl+x+CELL_SIZE+CELL_ZOOM, y+CELL_SIZE+CELL_ZOOM, MAKE_COLOR(cl, COLOR_RED), 2);
 
         // Fill 'sample' area with selected color
-        draw_filled_rect(DISP_RIGHT+BORDER_SIZE+1, DISP_TOP, screen_width-BORDER_SIZE-1, DISP_BOTTOM, MAKE_COLOR(cl, COLOR_WHITE));
+        draw_filled_rect(xl+DISP_RIGHT+BORDER_SIZE+1, DISP_TOP, xr-BORDER_SIZE-1, DISP_BOTTOM, MAKE_COLOR(cl, COLOR_WHITE));
 
         gui_palette_redraw = 0;

trunk/core/gui_read.c

@@ -26 +26 @@
 static void gui_read_draw_batt() {
     sprintf(buffer, "Batt:%3d%%", get_batt_perc());
-    draw_txt_string(screen_width/FONT_WIDTH-2-1-1-9, 0, buffer, MAKE_COLOR(COLOR_BLACK, COLOR_WHITE));
+    draw_txt_string((screen_width-CAM_TS_BUTTON_BORDER)/FONT_WIDTH-2-1-1-9, 0, buffer, MAKE_COLOR(COLOR_BLACK, COLOR_WHITE));
 }
 
@@ -37 +37 @@
     ttm = localtime(&t);
     sprintf(buffer, "%2u:%02u", ttm->tm_hour, ttm->tm_min);
-    draw_txt_string(screen_width/FONT_WIDTH-2-1-1-9-2-5, 0, buffer, MAKE_COLOR(COLOR_BLACK, COLOR_WHITE));
+    draw_txt_string((screen_width-CAM_TS_BUTTON_BORDER)/FONT_WIDTH-2-1-1-9-2-5, 0, buffer, MAKE_COLOR(COLOR_BLACK, COLOR_WHITE));
 }
 
 //-------------------------------------------------------------------
 static void gui_read_draw_scroll_indicator() {
-    draw_txt_char(screen_width/FONT_WIDTH-2, 0, (conf.reader_autoscroll)?((pause)?'\x05':'\x04'):'\x03', MAKE_COLOR(COLOR_BLACK, COLOR_WHITE)); //title infoline
+    draw_txt_char((screen_width-CAM_TS_BUTTON_BORDER)/FONT_WIDTH-2, 0, (conf.reader_autoscroll)?((pause)?'\x05':'\x04'):'\x03', MAKE_COLOR(COLOR_BLACK, COLOR_WHITE)); //title infoline
 }
 
@@ -60 +60 @@
     pause = 0;
     read_to_draw = 1;
-    x=6; 
+    x=CAM_TS_BUTTON_BORDER+6; 
     y=FONT_HEIGHT;
-    w=screen_width-6-6-8;
+    w=screen_width-CAM_TS_BUTTON_BORDER*2-6-6-8;
     h=screen_height-y;
     last_time = get_tick_count();
@@ -167 +167 @@
         sprintf(buffer, "(%3d%%) %d/%d  ", (read_file_size)?(conf.reader_pos*100/read_file_size):0, conf.reader_pos, read_file_size);
         buffer[screen_width/FONT_WIDTH]=0;
-        draw_txt_string(0, 0, buffer, MAKE_COLOR(COLOR_BLACK, COLOR_WHITE)); //title infoline
+        draw_txt_string((CAM_TS_BUTTON_BORDER/FONT_WIDTH), 0, buffer, MAKE_COLOR(COLOR_BLACK, COLOR_WHITE)); //title infoline
 
         // scrollbar

trunk/core/gui_reversi.c

@@ -220 +220 @@
 
     field_size = (screen_height-2*FONT_HEIGHT-4)&0xFFF8;
-    field_x = FONT_WIDTH+8;
+    field_x = CAM_TS_BUTTON_BORDER+FONT_WIDTH+8;
     field_y = (screen_height-field_size)>>1;
     cell_size = field_size >> 3;
@@ -322 +322 @@
 //-------------------------------------------------------------------
 static void redrawstatus() {
-    uchar x=field_size+FONT_WIDTH*2+23, y = 25;
+    int x=CAM_TS_BUTTON_BORDER+field_size+FONT_WIDTH*2+23, y = 25;
     if (InGame) { 
         if (CurrPlayer==FIELD_PLAYER1) { 
@@ -410 +410 @@
 
     sprintf(buf, "Batt:%3d%%", get_batt_perc());
-    draw_txt_string(screen_width/FONT_WIDTH-2-9, screen_height/FONT_HEIGHT-1, buf, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
+    draw_txt_string((screen_width-CAM_TS_BUTTON_BORDER)/FONT_WIDTH-2-9, screen_height/FONT_HEIGHT-1, buf, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
 
     Timer();

trunk/core/gui_sokoban.c

@@ -48 +48 @@
 
 static int need_redraw;
+static int need_redraw_all;
 static int  moves;
 static char field[FIELD_HEIGHT][FIELD_WIDTH];
@@ -216 +217 @@
     if (++conf.sokoban_level >= num_levels) conf.sokoban_level = 0;
     sokoban_set_level(conf.sokoban_level);
-    need_redraw = 1;
+    need_redraw_all = 1;
 }
 
@@ -249 +250 @@
 //-------------------------------------------------------------------
 static void sokoban_draw_box(int x, int y, color cl) {
-    draw_filled_rect(x*cell_size, y*cell_size, x*cell_size+cell_size-1, y*cell_size+cell_size-1, cl);
-    draw_line(x*cell_size+2, y*cell_size, x*cell_size+2, y*cell_size+cell_size-1, cl);
-    draw_line(x*cell_size+cell_size-1-2, y*cell_size, x*cell_size+cell_size-1-2, y*cell_size+cell_size-1, cl);
-    draw_line(x*cell_size+2, y*cell_size+2, x*cell_size+cell_size-1-2, y*cell_size+2, cl);
-    draw_line(x*cell_size+2, y*cell_size+cell_size-1-2, x*cell_size+cell_size-1-2, y*cell_size+cell_size-1-2, cl);
+    draw_filled_rect(CAM_TS_BUTTON_BORDER+x*cell_size, y*cell_size, CAM_TS_BUTTON_BORDER+x*cell_size+cell_size-1, y*cell_size+cell_size-1, cl);
+    draw_line(CAM_TS_BUTTON_BORDER+x*cell_size+2, y*cell_size, CAM_TS_BUTTON_BORDER+x*cell_size+2, y*cell_size+cell_size-1, cl);
+    draw_line(CAM_TS_BUTTON_BORDER+x*cell_size+cell_size-1-2, y*cell_size, CAM_TS_BUTTON_BORDER+x*cell_size+cell_size-1-2, y*cell_size+cell_size-1, cl);
+    draw_line(CAM_TS_BUTTON_BORDER+x*cell_size+2, y*cell_size+2, CAM_TS_BUTTON_BORDER+x*cell_size+cell_size-1-2, y*cell_size+2, cl);
+    draw_line(CAM_TS_BUTTON_BORDER+x*cell_size+2, y*cell_size+cell_size-1-2, CAM_TS_BUTTON_BORDER+x*cell_size+cell_size-1-2, y*cell_size+cell_size-1-2, cl);
 }
 
@@ -321 +322 @@
         return 0;
     }
-    need_redraw = 1;
+    need_redraw_all = 1;
     return 1;
 }
@@ -363 +364 @@
       #endif
             sokoban_set_level(conf.sokoban_level);
-            need_redraw = 1;
+            need_redraw_all = 1;
             break;
       #if CAM_HAS_ERASE_BUTTON
@@ -378 +379 @@
     int y, x;
     static char str[16];
+
+    if (need_redraw_all) {
+        draw_filled_rect(0, 0, screen_width-1, screen_height-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
+        need_redraw_all = 0;
+        need_redraw = 1;
+    }
 
     if (need_redraw) {
@@ -385 +392 @@
                 switch (field[y][x]) {
                     case MARKER_WALL:
-                        draw_filled_rect(x*cell_size, y*cell_size, x*cell_size+cell_size-1, y*cell_size+cell_size-1, MAKE_COLOR(WALL_COLOR_1, WALL_COLOR_2));
+                        draw_filled_rect(CAM_TS_BUTTON_BORDER+x*cell_size, y*cell_size, CAM_TS_BUTTON_BORDER+x*cell_size+cell_size-1, y*cell_size+cell_size-1, MAKE_COLOR(WALL_COLOR_1, WALL_COLOR_2));
                         break;
                     case MARKER_BOX:
@@ -391 +398 @@
                         break;
                     case MARKER_PLACE:
-                        draw_filled_rect(x*cell_size, y*cell_size, x*cell_size+cell_size-1, y*cell_size+cell_size-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
-                        draw_filled_rect(x*cell_size+4, y*cell_size+4, x*cell_size+cell_size-1-4, y*cell_size+cell_size-1-4, MAKE_COLOR(PLACE_COLOR_1, PLACE_COLOR_2));
+                        draw_filled_rect(CAM_TS_BUTTON_BORDER+x*cell_size, y*cell_size, CAM_TS_BUTTON_BORDER+x*cell_size+cell_size-1, y*cell_size+cell_size-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
+                        draw_filled_rect(CAM_TS_BUTTON_BORDER+x*cell_size+4, y*cell_size+4, CAM_TS_BUTTON_BORDER+x*cell_size+cell_size-1-4, y*cell_size+cell_size-1-4, MAKE_COLOR(PLACE_COLOR_1, PLACE_COLOR_2));
                         break;
                     case MARKER_BOX_PLACE:
@@ -399 +406 @@
                     case MARKER_PLAYER:
                     case MARKER_PLAYER_PLACE:
-                        draw_filled_rect(x*cell_size, y*cell_size, x*cell_size+cell_size-1, y*cell_size+cell_size-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
-                        draw_filled_ellipse(x*cell_size+(cell_size>>1)-1, y*cell_size+(cell_size>>1)-1, (cell_size>>1)-3, (cell_size>>1)-3, MAKE_COLOR(PLAYER_COLOR_1, PLAYER_COLOR_2));
+                        draw_filled_rect(CAM_TS_BUTTON_BORDER+x*cell_size, y*cell_size, CAM_TS_BUTTON_BORDER+x*cell_size+cell_size-1, y*cell_size+cell_size-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
+                        draw_filled_ellipse(CAM_TS_BUTTON_BORDER+x*cell_size+(cell_size>>1)-1, y*cell_size+(cell_size>>1)-1, (cell_size>>1)-3, (cell_size>>1)-3, MAKE_COLOR(PLAYER_COLOR_1, PLAYER_COLOR_2));
                         break;
                     case MARKER_EMPTY:
                     default:
-                        draw_filled_rect(x*cell_size, y*cell_size, x*cell_size+cell_size-1, y*cell_size+cell_size-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
+                        draw_filled_rect(CAM_TS_BUTTON_BORDER+x*cell_size, y*cell_size, CAM_TS_BUTTON_BORDER+x*cell_size+cell_size-1, y*cell_size+cell_size-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
                         break;
                 }
@@ -410 +417 @@
         }
 
-        draw_line(cell_size*FIELD_WIDTH, 0, cell_size*FIELD_WIDTH, screen_height-1, COLOR_WHITE);
-        draw_line(cell_size*FIELD_WIDTH+1, 0, cell_size*FIELD_WIDTH+1, screen_height-1, COLOR_BLACK);
-
-        //draw_filled_rect(cell_size*FIELD_WIDTH+2, 0, screen_width-1, 7, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
-        draw_filled_rect(cell_size*FIELD_WIDTH+2, 0, screen_width-1, screen_height-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
+        draw_line(CAM_TS_BUTTON_BORDER+cell_size*FIELD_WIDTH, 0, CAM_TS_BUTTON_BORDER+cell_size*FIELD_WIDTH, screen_height-1, COLOR_WHITE);
+        draw_line(CAM_TS_BUTTON_BORDER+cell_size*FIELD_WIDTH+1, 0, CAM_TS_BUTTON_BORDER+cell_size*FIELD_WIDTH+1, screen_height-1, COLOR_BLACK);
 
         sprintf(str, "%s: %-6d", lang_str(LANG_SOKOBAN_TEXT_LEVEL), conf.sokoban_level+1);
-        draw_string(cell_size*FIELD_WIDTH+2, 8, str, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
+        draw_string(CAM_TS_BUTTON_BORDER+cell_size*FIELD_WIDTH+2, 8, str, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
         sprintf(str, "%s: %-6d", lang_str(LANG_SOKOBAN_TEXT_MOVES), moves);
-        draw_string(cell_size*FIELD_WIDTH+2, 8+FONT_HEIGHT, str, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
+        draw_string(CAM_TS_BUTTON_BORDER+cell_size*FIELD_WIDTH+2, 8+FONT_HEIGHT, str, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
 
         //draw_filled_rect(cell_size*FIELD_WIDTH+2, 8+FONT_HEIGHT*2, screen_width-1, screen_height-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
@@ -430 +434 @@
 
     sprintf(str, "Batt:%3d%%", get_batt_perc());
-    draw_txt_string(screen_width/FONT_WIDTH-2-9, screen_height/FONT_HEIGHT-1, str, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
-}
-
+    draw_txt_string((screen_width-CAM_TS_BUTTON_BORDER)/FONT_WIDTH-2-9, screen_height/FONT_HEIGHT-1, str, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
+}
+

trunk/core/kbd.c

@@ -92 +92 @@
 static int nTxtbl[]={0,2,4,6,8,10,12,13};
 #endif
-// ------ add by Masuji SUTO (end)   --------------
+
 #if defined(CAMERA_sx100is) || defined(CAMERA_sx110is)
 #define ZSTEP_TABLE_SIZE 8
@@ -112 +112 @@
 static int nTxtbl[]={0,1,2,3,4,5,6,7,8,9,10,11,12,13};
 #endif
+
+#if defined(CAMERA_ixus310_elph500hs)
+#define ZSTEP_TABLE_SIZE 9
+static int nTxtbl[]={0,8,16,24,32,40,48,56,64};
+#endif
+
 #if defined(CAMERA_s90) || defined(CAMERA_s95)
 #define ZSTEP_TABLE_SIZE 10
 static int nTxtbl[]={0,1,2,3,4,5,6,7,8,9};
 #endif
+// ------ add by Masuji SUTO (end)   --------------
 
 #ifdef OPT_SCRIPTING
@@ -209 +216 @@
         return 1;
     }
+
+#ifdef CAM_TOUCHSCREEN_UI
+    extern int ts_process_touch();
+    if (ts_process_touch())
+    {
+        extern void draw_restore();
+        draw_restore();
+    }
+#endif
 
     // deals with the rest

trunk/core/raw.c

@@ -117 +117 @@
     int i;
     if (gamma[255]) return;
-#if defined(CAMERA_sx30) || defined(CAMERA_g12)
+#if defined(CAMERA_sx30) || defined(CAMERA_g12) || defined(CAMERA_ixus310_elph500hs)
     for (i=0; i<12; i++) gamma[i]=255*pow(i/255.0, 0.5);
     for (i=12; i<64; i++) gamma[i]=255*pow(i/255.0, 0.4);

trunk/include/camera.h

@@ -63 +63 @@
                                                 // The guard pixel is the first pixel of the top row in the screen bitmap.
 
+#undef  CAM_TOUCHSCREEN_UI                      // Define to enable touch screen U/I (e.g. IXUS 310 HS)
+#define CAM_TS_BUTTON_BORDER        0           // Define this to leave a border on each side of the OSD display for touch screen buttons.
+                                                // Used on the IXUS 310 to stop the OSD from overlapping the on screen buttons on each side
+#define CAM_DISP_ALT_TEXT           1           // Display the '<ALT>' message at the bottom of the screen in ALT mode (IXUS 310 changes button color instead)
+
 #undef  CAM_AF_SCAN_DURING_VIDEO_RECORD         // CHDK can make single AF scan during video record
 #undef  CAM_HAS_VIDEO_BUTTON                    // Camera can take stills in video mode, and vice versa

trunk/include/conf.h

@@ -278 +278 @@
     int flash_manual_override;
     int flash_video_override_power;
+
+    // Overrides to disable touchscreen U/I components (IXUS 310)
+    int touchscreen_disable_video_controls;
+    int touchscreen_disable_shortcut_controls;
 } Conf;
 

trunk/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 
 enum Gui_Mode {
     GUI_MODE_NONE = 0,

trunk/include/keyboard.h

@@ -56 +56 @@
 extern void other_kbd_process();
 
+#ifdef CAM_TOUCHSCREEN_UI
+extern int redraw_buttons;
 #endif
+
+#endif

trunk/include/lolevel.h

@@ -260 +260 @@
 extern int some_flag_for_af_scan;
 extern int parameter_for_af_scan;
-extern void _SetAE_ShutterSpeed(short* tv);
+extern short _SetAE_ShutterSpeed(short* tv);
 
 extern void _EnterToCompensationEVF(void);

trunk/include/modelist.h

@@ -114 +114 @@
     MODE_SCN_WINK_SELF_TIMER, // sx30/g12 (Smart Shutter, Wink Self Timer mode)
     MODE_SCN_FACE_SELF_TIMER, // sx30/g12 (Smart Shutter, Face Self Timer mode)
+    MODE_VIDEO_SUPER_SLOW   ,   // IXUS 310 HS Super Slow Motion Movie
 };
 

trunk/include/platform.h

@@ -589 +589 @@
 #endif
 
-#endif
+#ifdef CAM_TOUCHSCREEN_UI
+extern unsigned short  touch_screen_x, touch_screen_y;
+extern int touch_screen_active;
+#endif
+
+#endif