Changeset 1480

Timestamp:

12/12/11 06:14:08 (19 months ago)

Author:

philmoz

Message:

Update for IXUS 310:

• offset console output to not overlap CHDK touch screen buttons
• enable CHDK touch screen buttons when script is running, e.g. for use in editor script.

Location:

trunk

Files:

• core/console.c (modified) (2 diffs)
• platform/ixus310_elph500hs/kbd.c (modified) (1 diff)

trunk/core/console.c

@@ -130 +130 @@
     if (t <= console_last_drawn + CONSOLE_HIDE_TIMEOUT)
     {
+        int y = (console_y + console_max_lines - console_num_lines) * FONT_HEIGHT;
+        int x = console_x * FONT_WIDTH + CAM_TS_BUTTON_BORDER;
+
         for(c = 0; c < console_num_lines; ++c)
         {
@@ -135 +138 @@
             l = strlen(console_buf[i]);
             
-            draw_txt_string(console_x, console_y + console_max_lines - console_num_lines + c,
-                            console_buf[i], MAKE_COLOR(COLOR_BG, COLOR_FG));
-
-            for (; l < console_line_length; ++l)
-                draw_txt_char(console_x + l, console_y + console_max_lines - console_num_lines + c,
-                              ' ', MAKE_COLOR(COLOR_BG, COLOR_FG));
+            draw_string(x, y + c * FONT_HEIGHT, console_buf[i], MAKE_COLOR(COLOR_BG, COLOR_FG));
+
+            if (l < console_line_length)
+                draw_filled_rect(x + l * FONT_WIDTH, y + c * FONT_HEIGHT,
+                                 x + console_line_length * FONT_WIDTH, y + c * FONT_HEIGHT + FONT_HEIGHT,
+                                 MAKE_COLOR(COLOR_BG, COLOR_BG));
         }
     }

trunk/platform/ixus310_elph500hs/kbd.c

@@ -346 +346 @@
     { 3, KEY_DISPLAY        , 0x00000008, LB(0,4), 0, "Back",  0,    GUI_MODE_MENU,      GUI_MODE_MENU, MODE_REC|MODE_PLAY },
         { 3, KEY_DISPLAY            , 0x00000008, LB(0,4), 0, "Disp",  0,    GUI_MODE_PALETTE,   100,           MODE_REC|MODE_PLAY },
-    { 3, KEY_UP                     , 0x00000010, RB(0,1), 0, "Up",    0,    GUI_MODE_MENU,      100,           MODE_REC|MODE_PLAY },
-        { 3, KEY_LEFT               , 0x00000020, RB(0,2), 0, "Left",  0,    GUI_MODE_MENU,      100,           MODE_REC|MODE_PLAY },
-    { 3, KEY_RIGHT                  , 0x00000040, RB(0,3), 0, "Right", 0,    GUI_MODE_MENU,      100,           MODE_REC|MODE_PLAY },
-        { 3, KEY_DOWN               , 0x00000080, RB(0,4), 0, "Down",  0,    GUI_MODE_MENU,      100,           MODE_REC|MODE_PLAY },
+    { 3, KEY_UP                     , 0x00000010, RB(0,1), 0, "Up",    0,    GUI_MODE_ALT,       100,           MODE_REC|MODE_PLAY },
+        { 3, KEY_LEFT               , 0x00000020, RB(0,2), 0, "Left",  0,    GUI_MODE_ALT,       100,           MODE_REC|MODE_PLAY },
+    { 3, KEY_RIGHT                  , 0x00000040, RB(0,3), 0, "Right", 0,    GUI_MODE_ALT,       100,           MODE_REC|MODE_PLAY },
+        { 3, KEY_DOWN               , 0x00000080, RB(0,4), 0, "Down",  0,    GUI_MODE_ALT,       100,           MODE_REC|MODE_PLAY },
 
     { 3, KEY_UP                     , 0x00000010, RB(0,0), 0, "Man",   "Focus",  GUI_MODE_ALT, GUI_MODE_ALT, MODE_REC, &conf.subj_dist_override_koef, 0, &conf.touchscreen_disable_shortcut_controls },