remove CBackend::attempt

Author: PaideiaDilemma

include/hyprtoolkit/core/Backend.hpp

@@ -33,13 +33,6 @@ namespace Hyprtoolkit {
         */
         static Hyprutils::Memory::CSharedPointer<CBackend> create();
 
-        /*
-            Attempt to initialize the platform.
-            Optional. Can be used in case the outputAdded event is used to create new windows.
-            In such a szenario the platform must be initialized before opening a window.
-        */
-        bool attempt();
-
         /*
             Destroy the backend.
             Backend will be destroyed once:

src/core/Backend.cpp

@@ -69,20 +69,16 @@ SP<CBackend> CBackend::create() {
         g_logger->log(HT_LOG_ERROR, "couldn't start aq backend");
         return nullptr;
     }
-
-    return g_backend;
-};
-
-bool CBackend::attempt() {
     g_waylandPlatform = makeUnique<CWaylandPlatform>();
     if (!g_waylandPlatform->attempt()) {
         g_waylandPlatform = nullptr;
-        return false;
+        return nullptr;
     }
     g_openGL   = makeShared<COpenGLRenderer>(g_waylandPlatform->m_drmState.fd);
     g_renderer = g_openGL;
-    return true;
-}
+
+    return g_backend;
+};
 
 void CBackend::destroy() {
     terminate();
@@ -111,7 +107,7 @@ std::vector<SP<IOutput>> CBackend::getOutputs() {
 }
 
 SP<IWindow> CBackend::openWindow(const SWindowCreationData& data) {
-    if (!g_waylandPlatform && !attempt())
+    if (!g_waylandPlatform)
         return nullptr;
 
     if (data.type == HT_WINDOW_LAYER) {

tests/SimpleSessionLock.cpp

@@ -51,7 +51,7 @@ static void layout(const SP<IWindow>& window) {
 
     auto rect4 = CRectangleBuilder::begin() //
                      ->color([] { return CHyprColor{0.4F, 0.2F, 0.4F}; })
-                     ->rounding(10)
+                     ->rounding(0)
                      ->size({CDynamicSize::HT_SIZE_ABSOLUTE, CDynamicSize::HT_SIZE_ABSOLUTE, {50, 50}})
                      ->commence();
 
@@ -62,12 +62,12 @@ static void layout(const SP<IWindow>& window) {
                      ->size({CDynamicSize::HT_SIZE_ABSOLUTE, CDynamicSize::HT_SIZE_ABSOLUTE, {447, 447}})
                      ->commence();
 
-    auto text = CTextBuilder::begin()->text("world is a fuck")->color([] { return CHyprColor{0.4F, 0.4F, 0.4F}; })->commence();
+    auto text = CTextBuilder::begin()->text("never give up")->color([] { return CHyprColor{0.4F, 0.4F, 0.4F}; })->commence();
 
     auto button = CButtonBuilder::begin()
-                      ->label("Click me bitch")
-                      ->onMainClick([](SP<CButtonElement> el) { el->rebuild()->label(std::format("Clicked {} times bitch", buttonClicks++))->commence(); })
-                      ->onRightClick([](SP<CButtonElement> el) { el->rebuild()->label("Reset bitch")->commence(); })
+                      ->label("Click me kind person")
+                      ->onMainClick([](SP<CButtonElement> el) { el->rebuild()->label(std::format("Clicked {} times", buttonClicks++))->commence(); })
+                      ->onRightClick([](SP<CButtonElement> el) { el->rebuild()->label("Reset")->commence(); })
                       ->size({CDynamicSize::HT_SIZE_AUTO, CDynamicSize::HT_SIZE_AUTO, {1, 1}})
                       ->commence();
 
@@ -100,6 +100,15 @@ static void onWindowClose(WP<IWindow> window) {
     }
 }
 
+static void createLockSurface(SP<IOutput> output) {
+    windows.emplace_back(CWindowBuilder::begin()->type(HT_WINDOW_LOCK_SURFACE)->prefferedOutput(output)->commence());
+    std::println("New surface {}!", (uintptr_t)windows.back().get());
+    WP<IWindow> weakWindow = windows.back();
+    weakWindow->m_events.closeRequest.listenStatic([weakWindow]() { onWindowClose(weakWindow); });
+
+    layout(weakWindow.lock());
+}
+
 int main(int argc, char** argv, char** envp) {
     int unlockSecs = 1;
     if (argc == 2)
@@ -111,18 +120,10 @@ int main(int argc, char** argv, char** envp) {
         return -1;
     }
 
-    backend->m_events.outputAdded.listenStatic([](SP<IOutput> output) {
-        windows.emplace_back(CWindowBuilder::begin()->type(HT_WINDOW_LOCK_SURFACE)->prefferedOutput(output)->commence());
-        std::println("New surface {}!", (uintptr_t)windows.back().get());
-        WP<IWindow> window = windows.back();
-        window->m_events.closeRequest.listenStatic([window]() { onWindowClose(window); });
-
-        layout(window.lock());
-    });
+    backend->m_events.outputAdded.listenStatic(createLockSurface);
 
-    if (!backend->attempt()) {
-        std::println("Backend attempt failed!");
-        return -1;
+    for (const auto& o: backend->getOutputs()) {
+        createLockSurface(o);
     }
 
     backend->addTimer(std::chrono::seconds(unlockSecs), [](auto, auto) { backend->unlockSession(); }, nullptr);