Build fixups

dpogue · Nov 24, 2023 · bdab4db · bdab4db
1 parent 000afff
commit bdab4db
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -192,9 +192,9 @@ jobs:
               libcairo2 \
               libsecret-1-dev \
               libtool \
-              libx11-xcb-dev \
+              libx11-dev \
               libxcb-keysyms1-dev \
-              libxcb-xfixes0-dev \
+              libxfixes-dev \
               nasm \
               ninja-build \
               qtbase5-dev

diff --git a/Sources/Plasma/Apps/plClient/Mac-Cocoa/main.mm b/Sources/Plasma/Apps/plClient/Mac-Cocoa/main.mm
@@ -200,7 +200,6 @@ - (void)startRunLoop
         if (cmdParser.IsSpecified(kArgSkipIntroMovies))
             gClient->SetFlag(plClient::kFlagSkipIntroMovies);
         gClient->WindowActivate(TRUE);
-        gClient->SetMessagePumpProc(PumpMessageQueueProc);
         gClient.Start();
     });
 
@@ -451,7 +450,8 @@ - (void)startClient
     [self.window makeKeyAndOrderFront:self];
     self.renderLayer = self.window.contentView.layer;
 
-    plClientWindow* cwnd = new plStubClientWindow((hsWindowHndl)(__bridge void*)self.window, (hsWindowHndl)nullptr);
+    plStubClientWindow* cwnd = new plStubClientWindow((hsWindowHndl)(__bridge void*)self.window, (hsWindowHndl)nullptr);
+    cwnd->SetMessagePumpProc(PumpMessageQueueProc);
     gClient.SetClientWindow(cwnd);
 
     if (!gClient) {

diff --git a/Sources/Plasma/Apps/plClient/plClientWindow.h b/Sources/Plasma/Apps/plClient/plClientWindow.h
@@ -94,16 +94,21 @@ class plClientWindow
 
 class plStubClientWindow : public plClientWindow
 {
+    typedef void (*plMessagePumpProc)();
+
 private:
     hsWindowHndl fWindow;
     hsWindowHndl fDisplay;
+    plMessagePumpProc fMessagePumpProc;
 
 public:
     plStubClientWindow(hsWindowHndl w, hsWindowHndl d) : plClientWindow(), fWindow(w), fDisplay(d) { }
 
+    void SetMessagePumpProc(plMessagePumpProc proc) { fMessagePumpProc = proc; }
+
     bool CreateClientWindow() override { return true; }
     void ShowClientWindow() override { }
-    bool ProcessEvents() override { return false; }
+    bool ProcessEvents() override { fMessagePumpProc(); return false; }
     void DeInit() override { }
 
     hsWindowHndl GetWindowHandle() const override {