#5634: Listen to app-activated events to inspect the system clipboard…

… when switching back to DarkRadiant
codereader · Jun 10, 2021 · fd77a0f · fd77a0f
1 parent 37b5eef
commit fd77a0f
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 1 deletion.
diff --git a/include/iclipboard.h b/include/iclipboard.h
@@ -25,6 +25,9 @@ class IClipboard :
 
     /// Copy the given string to the system clipboard
     virtual void setString(const std::string& str) = 0;
+
+    // A signal that is emitted when the contents of the system clipboard changes
+    virtual sigc::signal<void>& signal_clipboardContentChanged() = 0;
 };
 
 }

diff --git a/radiant/clipboard/ClipboardModule.cpp b/radiant/clipboard/ClipboardModule.cpp
@@ -2,6 +2,7 @@
 
 #include "itextstream.h"
 #include <wx/clipbrd.h>
+#include <wx/app.h>
 
 #include "module/StaticModule.h"
 
@@ -34,9 +35,17 @@ void ClipboardModule::setString(const std::string& str)
 		// This data objects are held by the clipboard, so do not delete them in the app.
 		wxTheClipboard->SetData(new wxTextDataObject(str));
 		wxTheClipboard->Close();
+
+        // Contents changed signal
+        _sigContentsChanged.emit();
 	}
 }
 
+sigc::signal<void>& ClipboardModule::signal_clipboardContentChanged()
+{
+    return _sigContentsChanged;
+}
+
 const std::string& ClipboardModule::getName() const
 {
 	static std::string _name(MODULE_CLIPBOARD);
@@ -45,13 +54,32 @@ const std::string& ClipboardModule::getName() const
 
 const StringSet& ClipboardModule::getDependencies() const
 {
-	static StringSet _dependencies;
+    static StringSet _dependencies;
 	return _dependencies;
 }
 
 void ClipboardModule::initialiseModule(const IApplicationContext& ctx)
 {
 	rMessage() << getName() << "::initialiseModule called." << std::endl;
+
+    wxTheApp->Bind(wxEVT_ACTIVATE_APP, &ClipboardModule::onAppActivated, this);
+}
+
+void ClipboardModule::shutdownModule()
+{
+    wxTheApp->Unbind(wxEVT_ACTIVATE_APP, &ClipboardModule::onAppActivated, this);
+}
+
+void ClipboardModule::onAppActivated(wxActivateEvent& ev)
+{
+    if (ev.GetActive())
+    {
+        // Update the shader clipboard when the main window regains focus
+        // TODO
+        rMessage() << "App activated" << std::endl;
+    }
+
+    ev.Skip();
 }
 
 module::StaticModule<ClipboardModule> clipboardModule;

diff --git a/radiant/clipboard/ClipboardModule.h b/radiant/clipboard/ClipboardModule.h
@@ -2,19 +2,29 @@
 
 #include "iclipboard.h"
 
+class wxActivateEvent;
+
 namespace ui
 {
 
 class ClipboardModule :
 	public radiant::IClipboard
 {
+private:
+    sigc::signal<void> _sigContentsChanged;
+
 public:
 	std::string getString() override;
 	void setString(const std::string& str) override;
+    virtual sigc::signal<void>& signal_clipboardContentChanged() override;
 
 	const std::string& getName() const override;
 	const StringSet& getDependencies() const override;
 	void initialiseModule(const IApplicationContext& ctx) override;
+	void shutdownModule() override;
+
+private:
+    void onAppActivated(wxActivateEvent& ev);
 };
 
 }
diff --git a/radiant/ui/mainframe/ScreenUpdateBlocker.cpp b/radiant/ui/mainframe/ScreenUpdateBlocker.cpp
@@ -127,6 +127,8 @@ void ScreenUpdateBlocker::onMainWindowFocus(wxFocusEvent& ev)
 	{
 		showModalProgressDialog();
 	}
+
+    ev.Skip();
 }
 
 void ScreenUpdateBlocker::onCloseEvent(wxCloseEvent& ev)