Drive trays message queue from existing main loop.

CMakeLists.txt

@@ -1,31 +1,68 @@
-cmake_minimum_required(VERSION 3.1)
-project(tray VERSION 0.2 DESCRIPTION "A cross-platform C++ system tray library")
+cmake_minimum_required(VERSION 3.14)
 
-file(GLOB src
-    "tray/src/*.cpp"
-    "tray/src/*/*.cpp"
-    "tray/src/*/*/*.cpp"
-)
+# ──────────────────────────────────────────────────────────────────────────────
+project(tray VERSION 0.2 DESCRIPTION "A cross-platform C++ system-tray library"
+               LANGUAGES CXX)
+
+# ─── source files ─────────────────────────────────────────────────────────────
+# Everything under tray/src/ (one recursive glob keeps it readable)
+file(GLOB_RECURSE src CONFIGURE_DEPENDS "tray/src/*.cpp")
 
 add_library(tray STATIC ${src})
 
-if (UNIX)
+# ─── public headers ───────────────────────────────────────────────────────────
+target_include_directories(tray
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tray/include>
+        $<INSTALL_INTERFACE:include>)
+
+# ─── platform-specific dependencies ───────────────────────────────────────────
+if(UNIX AND NOT APPLE)
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
-    pkg_check_modules(APPINDICATOR REQUIRED appindicator3-0.1)
 
-    target_link_libraries(tray INTERFACE ${GTK3_LIBRARIES} ${APPINDICATOR_LIBRARIES})
-    target_compile_options(tray PRIVATE -Wall -Wextra -Werror -pedantic -Wno-unused-lambda-capture)
-    target_include_directories(tray SYSTEM PUBLIC ${GTK3_INCLUDE_DIRS} ${APPINDICATOR_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR})
-endif()
+    # Ask pkg-config to give us IMPORTED targets that already carry their flags
+    pkg_check_modules(GTK3          REQUIRED IMPORTED_TARGET gtk+-3.0)
+    pkg_check_modules(APPINDICATOR  REQUIRED IMPORTED_TARGET ayatana-appindicator3-0.1)
+    pkg_check_modules(CAIRO         REQUIRED IMPORTED_TARGET cairo)
+
+    # Link – using the IMPORTED targets automatically propagates include paths,
+    # link libs (-lgtk-3, -lgdk-3, -lcairo, …) and extra compile flags (-pthread)
+    target_link_libraries(tray
+        PUBLIC                         # make the deps visible to consumers
+            PkgConfig::GTK3
+            PkgConfig::APPINDICATOR
+            PkgConfig::CAIRO)
+
+    # Extra warnings (but **no -Werror** on external code)
+    if(CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang)$")
+        target_compile_options(tray PRIVATE -Wall -Wextra -pedantic)
+    endif()
 
-target_include_directories(tray SYSTEM PUBLIC "tray/include")
+    # Only add -Wno-unused-lambda-capture if the compiler supports it
+    include(CheckCXXCompilerFlag)
+    check_cxx_compiler_flag("-Wno-unused-lambda-capture" HAS_WNO_UNUSED_LAMBDA)
+    if(HAS_WNO_UNUSED_LAMBDA)
+        target_compile_options(tray PRIVATE -Wno-unused-lambda-capture)
+    endif()
+endif()
 
+# ─── language & misc properties ───────────────────────────────────────────────
 target_compile_features(tray PRIVATE cxx_std_17)
-set_target_properties(tray PROPERTIES 
-                      CXX_STANDARD 17
-                      CXX_EXTENSIONS OFF
-                      CXX_STANDARD_REQUIRED ON)
 
-set_target_properties(tray PROPERTIES VERSION ${PROJECT_VERSION})
-set_target_properties(tray PROPERTIES PROJECT_NAME ${PROJECT_NAME})
+set_target_properties(tray PROPERTIES
+    CXX_STANDARD            17
+    CXX_STANDARD_REQUIRED   YES
+    CXX_EXTENSIONS          NO
+    VERSION                 ${PROJECT_VERSION})
+
+# (Optional) install rules – comment out if you don’t need “make install”
+install(TARGETS tray
+        EXPORT trayTargets
+        ARCHIVE DESTINATION lib
+        INCLUDES DESTINATION include)
+
+install(DIRECTORY tray/include/ DESTINATION include)
+
+export(EXPORT trayTargets
+       FILE "${CMAKE_CURRENT_BINARY_DIR}/trayTargets.cmake")
+

tray/include/core/linux/tray.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #if defined(__linux__)
 #include <core/traybase.hpp>
-#include <libappindicator/app-indicator.h>
+#include <libayatana-appindicator/app-indicator.h>
 
 namespace Tray
 {
@@ -22,6 +22,7 @@ namespace Tray
         void run() override;
         void exit() override;
         void update() override;
+        void pump() override;
     };
 } // namespace Tray
-#endif
+#endif

tray/include/core/traybase.hpp

@@ -37,6 +37,7 @@ namespace Tray
         virtual void run() = 0;
         virtual void exit() = 0;
         virtual void update() = 0;
+        virtual void pump() = 0;
         std::vector<std::shared_ptr<TrayEntry>> getEntries();
     };
 } // namespace Tray

tray/include/core/windows/tray.hpp

@@ -30,6 +30,7 @@ namespace Tray
         void run() override;
         void exit() override;
         void update() override;
+        void pump() override;
     };
 } // namespace Tray
 #endif

tray/src/core/linux/tray.cpp

@@ -1,6 +1,6 @@
 #if defined(__linux__)
 #include <core/linux/tray.hpp>
-#include <libappindicator/app-indicator.h>
+#include <libayatana-appindicator/app-indicator.h>
 #include <stdexcept>
 
 #include <components/button.hpp>
@@ -20,6 +20,20 @@ Tray::Tray::Tray(std::string identifier, Icon icon) : BaseTray(std::move(identif
     }
 
     appIndicator = app_indicator_new(this->identifier.c_str(), this->icon, APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+
+#if 0
+    gchar *current_dir = g_get_current_dir();
+    g_print("%s current_dir:%s\n", G_STRFUNC, current_dir);
+    gchar *theme_path = g_build_path(G_DIR_SEPARATOR_S,
+                            current_dir,
+                            "data",
+                            NULL);
+    g_print("%s path:%s\n", G_STRFUNC, theme_path);
+    app_indicator_set_icon_theme_path(appIndicator, theme_path);
+    g_free(current_dir);
+    g_free(theme_path);
+#endif
+
     app_indicator_set_status(appIndicator, APP_INDICATOR_STATUS_ACTIVE);
 }
 
@@ -168,4 +182,9 @@ void Tray::Tray::run()
     }
 }
 
-#endif
+void Tray::Tray::pump()
+{
+    gtk_main_iteration_do(false);
+}
+
+#endif

tray/src/core/windows/tray.cpp

@@ -219,4 +219,14 @@ void Tray::Tray::run()
     }
 }
 
+void Tray::Tray::pump()
+{
+    static MSG msg;
+    if(PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE))
+    {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+    }
+}
+
 #endif