Session: only dispatch udev in dispatchPendingEventsAsync if on linux (…

…#86)
hyprwm · Sep 23, 2024 · 8b72861 · 8b72861
1 parent 752d0fb
commit 8b72861
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/src/backend/Backend.cpp b/src/backend/Backend.cpp
@@ -166,6 +166,9 @@ bool Aquamarine::CBackend::start() {
         b->onReady();
     }
 
+    if (session)
+        session->onReady();
+
     sessionFDs = session ? session->pollFDs() : std::vector<Hyprutils::Memory::CSharedPointer<SPollFD>>{};
 
     return true;

diff --git a/src/backend/Session.cpp b/src/backend/Session.cpp
@@ -264,24 +264,7 @@ static bool isDRMCard(const char* sysname) {
 }
 
 void Aquamarine::CSession::onReady() {
-    for (auto const& d : libinputDevices) {
-        if (d->keyboard)
-            backend->events.newKeyboard.emit(SP<IKeyboard>(d->keyboard));
-        if (d->mouse)
-            backend->events.newPointer.emit(SP<IPointer>(d->mouse));
-        if (d->touch)
-            backend->events.newTouch.emit(SP<ITouch>(d->touch));
-        if (d->switchy)
-            backend->events.newSwitch.emit(SP<ITouch>(d->touch));
-        if (d->tablet)
-            backend->events.newTablet.emit(SP<ITablet>(d->tablet));
-        if (d->tabletPad)
-            backend->events.newTabletPad.emit(SP<ITabletPad>(d->tabletPad));
-
-        for (auto const& t : d->tabletTools) {
-            backend->events.newTabletTool.emit(SP<ITabletTool>(t));
-        }
-    }
+    ;
 }
 
 void Aquamarine::CSession::dispatchUdevEvents() {
@@ -377,7 +360,12 @@ void Aquamarine::CSession::dispatchLibseatEvents() {
 
 void Aquamarine::CSession::dispatchPendingEventsAsync() {
     dispatchLibseatEvents();
+
+    // only linux libudev allows us to asynchronously dispatch outstanding without blocking
+#if defined(__linux__)
     dispatchUdevEvents();
+#endif
+
     dispatchLibinputEvents();
 }