Merge pull request #997 from alvarolobato/mac_build

Add native screenshot capture for Mac (POSIX) build

Author: fvanroie

src/drv/tft/tft_driver_sdl2.cpp

@@ -22,6 +22,26 @@
 #include "custom/bootlogo_template.h" // Sketch tab header for xbm images
 #endif
 
+static volatile bool screenshot_requested = false;
+
+static int screenshot_event_watch(void* userdata, SDL_Event* event)
+{
+    (void)userdata;
+    if(event->type == SDL_KEYDOWN && event->key.keysym.sym == SDLK_F12) {
+        screenshot_requested = true;
+    }
+    return 1;
+}
+
+bool gui_pop_screenshot_request(void)
+{
+    if(screenshot_requested) {
+        screenshot_requested = false;
+        return true;
+    }
+    return false;
+}
+
 namespace dev {
 
 /**
@@ -75,6 +95,7 @@ void TftSdl::init(int32_t w, int h)
      * You have to call 'lv_tick_inc()' in periodically to inform LittelvGL about how much time were elapsed
      * Create an SDL thread to do this*/
     SDL_CreateThread(tick_thread, "tick", NULL);
+    SDL_AddEventWatch(screenshot_event_watch, NULL);
 
 #if HASP_USE_LVGL_TASK
 #error "SDL2 LVGL task is not implemented"

src/hasp/hasp_dispatch.cpp

@@ -644,6 +644,14 @@ void dispatch_screenshot(const char*, const char* filename, uint8_t source)
         guiTakeScreenshot(filename);
     }
 
+#elif defined(POSIX)
+
+    if(strlen(filename) == 0) {
+        guiTakeScreenshot("screenshot.bmp");
+    } else {
+        guiTakeScreenshot(filename);
+    }
+
 #else
     LOG_WARNING(TAG_MSGR, D_FILE_SAVE_FAILED, filename);
 #endif

src/hasp_gui.cpp

@@ -23,6 +23,10 @@
 File pFileOut;
 #endif
 
+#if defined(POSIX) && USE_MONITOR
+bool gui_pop_screenshot_request(void);
+#endif
+
 #if ESP32
 static SemaphoreHandle_t xGuiSemaphore = NULL;
 static TaskHandle_t g_lvgl_task_handle;
@@ -388,6 +392,12 @@ IRAM_ATTR void guiLoop(void)
 #if HASP_TARGET_ARDUINO
     // haspTouch.loop();
 #endif
+
+#if defined(POSIX) && USE_MONITOR
+    if(gui_pop_screenshot_request()) {
+        guiTakeScreenshot("screenshot.bmp");
+    }
+#endif
 }
 
 void guiEverySecond(void)
@@ -618,7 +628,7 @@ bool guiSetConfig(const JsonObject& settings)
 #endif // HASP_USE_CONFIG
 
 /* **************************** SCREENSHOTS ************************************** */
-#if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 || HASP_USE_HTTP > 0
+#if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 || HASP_USE_HTTP > 0 || defined(POSIX)
 
 /** Send Bitmap Header.
  *
@@ -666,7 +676,7 @@ void gui_flush_not_complete()
 {
     LOG_WARNING(TAG_GUI, F("Pixelbuffer not completely sent"));
 }
-#endif // HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 || HASP_USE_HTTP > 0
+#endif // HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0 || HASP_USE_HTTP > 0 || defined(POSIX)
 
 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
 /* Flush VDB bytes to a file */
@@ -722,6 +732,56 @@ void guiTakeScreenshot(const char* pFileName)
         LOG_WARNING(TAG_GUI, F(D_FILE_SAVE_FAILED), pFileName);
     }
 }
+#elif defined(POSIX)
+static FILE* pFileOutPosix = NULL;
+
+static void gui_screenshot_to_file(lv_disp_drv_t* disp, const lv_area_t* area, lv_color_t* color_p)
+{
+    size_t len = (area->x2 - area->x1 + 1) * (area->y2 - area->y1 + 1);
+    len *= sizeof(lv_color_t);
+    size_t res = fwrite((uint8_t*)color_p, 1, len, pFileOutPosix);
+    if(res != len) gui_flush_not_complete();
+
+    drv_display_flush_cb(disp, area, color_p);
+}
+
+void guiTakeScreenshot(const char* pFileName)
+{
+    uint8_t buffer[sizeof(bmp_header_t) + 2];
+    gui_get_bitmap_header(buffer, sizeof(buffer));
+
+    pFileOutPosix = fopen(pFileName, "wb");
+    if(pFileOutPosix) {
+
+        size_t len = fwrite(buffer, 1, sizeof(buffer), pFileOutPosix);
+        if(len == sizeof(buffer)) {
+            LOG_VERBOSE(TAG_GUI, F("Bitmap header written"));
+
+            lv_disp_t* disp       = lv_disp_get_default();
+            drv_display_flush_cb  = disp->driver.flush_cb;
+            disp->driver.flush_cb = gui_screenshot_to_file;
+
+            lv_obj_invalidate(lv_scr_act());
+            lv_refr_now(NULL);
+            disp->driver.flush_cb = drv_display_flush_cb;
+
+            char fullpath[PATH_MAX];
+            if(realpath(pFileName, fullpath)) {
+                LOG_VERBOSE(TAG_GUI, F("Bitmap data flushed to %s"), fullpath);
+            } else {
+                LOG_VERBOSE(TAG_GUI, F("Bitmap data flushed to %s"), pFileName);
+            }
+
+        } else {
+            LOG_ERROR(TAG_GUI, F("Data written does not match header size"));
+        }
+        fclose(pFileOutPosix);
+        pFileOutPosix = NULL;
+
+    } else {
+        LOG_WARNING(TAG_GUI, F(D_FILE_SAVE_FAILED), pFileName);
+    }
+}
 #endif
 
 #if HASP_USE_HTTP > 0

tools/osx_build_extra.py

@@ -1,7 +1,17 @@
 Import("env")
+import subprocess
 
-#env.Replace(CC="gcc-10", CXX="g++-10")
-env.Replace(CC="gcc-13", CXX="g++-13")
+# Use system clang with full SDK paths
+env.Replace(CC="clang", CXX="clang++")
+
+# Get SDK path from xcrun
+try:
+    sdk_path = subprocess.check_output(["xcrun", "--show-sdk-path"]).decode().strip()
+    env.Append(CPPPATH=[f"{sdk_path}/usr/include/c++/v1"])
+    env.Append(CXXFLAGS=["-stdlib=libc++"])
+    env.Append(LINKFLAGS=["-stdlib=libc++"])
+except:
+    pass
 
 env.Replace(BUILD_SCRIPT="tools/osx_build_script.py")