Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2024-03-17 01:52:34 +1100
committerKae <80987908+Novaenia@users.noreply.github.com>2024-03-17 01:52:34 +1100
commit463205c09cc393e92ae2f51b9bc8f61c4e368dea (patch)
treea143c6d084f8847b43721f5d5a5f7b5a5450da52
parentd577a98980b81d843b8600b79bb833db6ab8e08f (diff)
remove unnecessary SDL2 include
[skip ci]
-rw-r--r--source/application/StarApplicationController.hpp1
-rw-r--r--source/application/StarMainApplication_sdl.cpp4
-rw-r--r--source/client/StarClientApplication.cpp2
-rw-r--r--source/frontend/StarClipboardLuaBindings.cpp8
4 files changed, 10 insertions, 5 deletions
diff --git a/source/application/StarApplicationController.hpp b/source/application/StarApplicationController.hpp
index 341e15e..0e288d2 100644
--- a/source/application/StarApplicationController.hpp
+++ b/source/application/StarApplicationController.hpp
@@ -54,6 +54,7 @@ public:
virtual bool openAudioInputDevice(const char* name, int freq, int channels, void* userdata, AudioCallback callback) = 0;
virtual bool closeAudioInputDevice() = 0;
+ virtual bool hasClipboard() = 0;
virtual void setClipboard(String text) = 0;
virtual Maybe<String> getClipboard() = 0;
diff --git a/source/application/StarMainApplication_sdl.cpp b/source/application/StarMainApplication_sdl.cpp
index 7b1601f..1b5a1f4 100644
--- a/source/application/StarMainApplication_sdl.cpp
+++ b/source/application/StarMainApplication_sdl.cpp
@@ -481,6 +481,10 @@ private:
Controller(SdlPlatform* parent)
: parent(parent) {}
+ bool hasClipboard() override {
+ return SDL_HasClipboardText();
+ }
+
Maybe<String> getClipboard() override {
Maybe<String> string;
if (SDL_HasClipboardText()) {
diff --git a/source/client/StarClientApplication.cpp b/source/client/StarClientApplication.cpp
index e5cf601..6df7916 100644
--- a/source/client/StarClientApplication.cpp
+++ b/source/client/StarClientApplication.cpp
@@ -517,7 +517,7 @@ void ClientApplication::changeState(MainAppState newState) {
m_universeClient->setLuaCallbacks("input", LuaBindings::makeInputCallbacks());
m_universeClient->setLuaCallbacks("voice", LuaBindings::makeVoiceCallbacks());
- if(!m_root->configuration()->get("safeScripts").toBool())
+ if (!m_root->configuration()->get("safeScripts").toBool())
m_universeClient->setLuaCallbacks("clipboard", LuaBindings::makeClipboardCallbacks(appController()));
auto heldScriptPanes = make_shared<List<MainInterface::ScriptPaneInfo>>();
diff --git a/source/frontend/StarClipboardLuaBindings.cpp b/source/frontend/StarClipboardLuaBindings.cpp
index c4fbc41..c8a8dfe 100644
--- a/source/frontend/StarClipboardLuaBindings.cpp
+++ b/source/frontend/StarClipboardLuaBindings.cpp
@@ -1,14 +1,14 @@
#include "StarClipboardLuaBindings.hpp"
#include "StarLuaConverters.hpp"
-#include "SDL2/SDL.h"
-
namespace Star {
LuaCallbacks LuaBindings::makeClipboardCallbacks(ApplicationControllerPtr appController) {
LuaCallbacks callbacks;
- callbacks.registerCallback("hasText", []() -> bool { return SDL_HasClipboardText() == SDL_TRUE;});
+ callbacks.registerCallback("hasText", [appController]() -> bool {
+ return appController->hasClipboard();
+ });
callbacks.registerCallback("getText", [appController]() -> Maybe<String> {
return appController->getClipboard();
@@ -21,4 +21,4 @@ LuaCallbacks LuaBindings::makeClipboardCallbacks(ApplicationControllerPtr appCon
return callbacks;
};
-}// namespace Star
+}