Changeset 1250 for trunk/core/gui_draw.c

Timestamp:

07/28/11 11:42:13 (22 months ago)

Author:

philmoz

Message:

Fix for CHDK sometimes forgetting to redraw the menus.
See - ​http://chdk.setepontos.com/index.php?topic=6659.0
Added an optional system for detecting if the camera firmware has erased the screen, and force a menu redraw (define CAM_DETECT_SCREEN_ERASE in platform_camera.h to enable).
Updated comment for CAM_MENU_BORDERWIDTH in camera.h

File:

• trunk/core/gui_draw.c (modified) (3 diffs)

trunk/core/gui_draw.c

@@ -60 +60 @@
    draw_set_aspect_xcorrection_proc(xcorrection_proc);
    draw_set_aspect_ycorrection_proc(ycorrection_proc);
+}
+
+#endif
+
+//-------------------------------------------------------------------
+#ifdef CAM_DETECT_SCREEN_ERASE
+
+#define GUARD_VAL   SCREEN_COLOR
+
+void draw_set_guard()
+{
+    *((unsigned char*)(frame_buffer[0])) = GUARD_VAL;
+    *((unsigned char*)(frame_buffer[1])) = GUARD_VAL;
+}
+
+int draw_test_guard()
+{
+    if (*((unsigned char*)(frame_buffer[0])) != GUARD_VAL) return 0;
+    if (*((unsigned char*)(frame_buffer[1])) != GUARD_VAL) return 0;
+    return 1;
+}
+
+// Test a pixel value in both frame buffers, returns 0 if either doesn't match or co-ords out of range
+int draw_test_pixel(coord x, coord y, color c)
+{
+    if (x >= screen_width || y >= screen_height) return 0;
+#if CAM_USES_ASPECT_CORRECTION
+    return (frame_buffer[0][y * screen_buffer_width + aspect_xcorrection_proc(x)] == c) &&
+           (frame_buffer[1][y * screen_buffer_width + aspect_xcorrection_proc(x)] == c);
+#else
+    return (frame_buffer[0][y * screen_buffer_width + x] == c) &&
+           (frame_buffer[1][y * screen_buffer_width + x] == c);
+#endif
 }
 
@@ -81 +114 @@
       draw_set_aspect_ycorrection_proc(NULL);
     #endif
+
+#ifdef CAM_DETECT_SCREEN_ERASE
+    draw_set_guard();
+#endif
 }
 
@@ -377 +414 @@
 void draw_restore() {
     vid_bitmap_refresh();
+
+#ifdef CAM_DETECT_SCREEN_ERASE
+    draw_set_guard();
+#endif
 }