ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Platform: port Sdl2Application away from std::string. 

Co-authored-by: Squareys <squareys@googlemail.com>
ktx1-detection
Vladimír Vondruš 4 years ago
parent
c3024cbcc9
commit
ca1cbe2950
3 changed files with 53 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/Magnum/Platform/Sdl2Application.cpp
  2. 39
      src/Magnum/Platform/Sdl2Application.h
  3. 7
      src/Magnum/Platform/Test/Sdl2ApplicationTest.cpp

38
src/Magnum/Platform/Sdl2Application.cpp
Unescape View File

@ -159,22 +159,22 @@ Sdl2Application::Sdl2Application(const Arguments& arguments, NoCreateT):
/* Save command-line arguments */ /* Save command-line arguments */
if(args.value("log") == "verbose") _verboseLog = true; if(args.value("log") == "verbose") _verboseLog = true;
const std::string dpiScaling = args.value("dpi-scaling"); const Containers::StringView dpiScaling = args.value<Containers::StringView>("dpi-scaling");
if(dpiScaling == "default") if(dpiScaling == "default"_s)
_commandLineDpiScalingPolicy = Implementation::Sdl2DpiScalingPolicy::Default; _commandLineDpiScalingPolicy = Implementation::Sdl2DpiScalingPolicy::Default;
#ifdef CORRADE_TARGET_APPLE #ifdef CORRADE_TARGET_APPLE
else if(dpiScaling == "framebuffer") else if(dpiScaling == "framebuffer"_s)
_commandLineDpiScalingPolicy = Implementation::Sdl2DpiScalingPolicy::Framebuffer; _commandLineDpiScalingPolicy = Implementation::Sdl2DpiScalingPolicy::Framebuffer;
#endif #endif
#ifndef CORRADE_TARGET_APPLE #ifndef CORRADE_TARGET_APPLE
#if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_ANDROID) #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_ANDROID)
else if(dpiScaling == "virtual") else if(dpiScaling == "virtual"_s)
_commandLineDpiScalingPolicy = Implementation::Sdl2DpiScalingPolicy::Virtual; _commandLineDpiScalingPolicy = Implementation::Sdl2DpiScalingPolicy::Virtual;
#endif #endif
else if(dpiScaling == "physical") else if(dpiScaling == "physical"_s)
_commandLineDpiScalingPolicy = Implementation::Sdl2DpiScalingPolicy::Physical; _commandLineDpiScalingPolicy = Implementation::Sdl2DpiScalingPolicy::Physical;
#endif #endif
else if(dpiScaling.find_first_of(" \t\n") != std::string::npos) else if(dpiScaling.containsAny(" \t\n"_s))
_commandLineDpiScaling = args.value<Vector2>("dpi-scaling"); _commandLineDpiScaling = args.value<Vector2>("dpi-scaling");
else else
_commandLineDpiScaling = Vector2{args.value<Float>("dpi-scaling")}; _commandLineDpiScaling = Vector2{args.value<Float>("dpi-scaling")};
@ -322,13 +322,15 @@ Vector2 Sdl2Application::dpiScaling(const Configuration& configuration) {
#endif #endif
} }
void Sdl2Application::setWindowTitle(const std::string& title) { void Sdl2Application::setWindowTitle(const Containers::StringView title) {
#ifndef CORRADE_TARGET_EMSCRIPTEN #ifndef CORRADE_TARGET_EMSCRIPTEN
SDL_SetWindowTitle(_window, title.data()); SDL_SetWindowTitle(_window,
Containers::String::nullTerminatedGlobalView(title).data());
#else #else
/* We don't have the _window because SDL_CreateWindow() doesn't exist in /* We don't have the _window because SDL_CreateWindow() doesn't exist in
the SDL1/2 hybrid. But it's not used anyway, so pass nullptr there. */ the SDL1/2 hybrid. But it's not used anyway, so pass nullptr there. */
SDL_SetWindowTitle(nullptr, title.data()); SDL_SetWindowTitle(nullptr,
Containers::String::nullTerminatedGlobalView(title).data());
#endif #endif
} }
@ -743,16 +745,20 @@ Vector2i Sdl2Application::framebufferSize() const {
#endif #endif
#ifdef CORRADE_TARGET_EMSCRIPTEN #ifdef CORRADE_TARGET_EMSCRIPTEN
void Sdl2Application::setContainerCssClass(const std::string& cssClass) { void Sdl2Application::setContainerCssClass(const Containers::StringView cssClass) {
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension" #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
EM_ASM_({ EM_ASM_({
/* Handle also the classic #container for backwards compatibility. We /* Handle also the classic #container for backwards compatibility. We
also need to preserve the mn-container otherwise next time we'd have also need to preserve the mn-container otherwise next time we'd have
no way to look for it anymore. */ no way to look for it anymore.
Using UTF8ToString() instead of AsciiToString() as it has an
explicit size parameter and thus doesn't need a null-terminated
input, which would potentially require yet another allocation. */
(Module['canvas'].closest('.mn-container') || (Module['canvas'].closest('.mn-container') ||
document.getElementById('container')).className = (['mn-container', AsciiToString($0)]).join(' '); document.getElementById('container')).className = (['mn-container', UTF8ToString($0, $1)]).join(' ');
}, cssClass.data()); }, cssClass.data(), cssClass.size());
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
} }
#endif #endif
@ -1201,7 +1207,7 @@ Sdl2Application::GLConfiguration::~GLConfiguration() = default;
Sdl2Application::Configuration::Configuration(): Sdl2Application::Configuration::Configuration():
#if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_IOS) #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_IOS)
_title("Magnum SDL2 Application"), _title(Containers::String::nullTerminatedGlobalView("Magnum SDL2 Application"_s)),
#endif #endif
#if !defined(CORRADE_TARGET_IOS) && !defined(CORRADE_TARGET_EMSCRIPTEN) #if !defined(CORRADE_TARGET_IOS) && !defined(CORRADE_TARGET_EMSCRIPTEN)
_size{800, 600}, _size{800, 600},
@ -1212,11 +1218,11 @@ Sdl2Application::Configuration::Configuration():
Sdl2Application::Configuration::~Configuration() = default; Sdl2Application::Configuration::~Configuration() = default;
std::string Sdl2Application::KeyEvent::keyName(const Key key) { Containers::StringView Sdl2Application::KeyEvent::keyName(const Key key) {
return SDL_GetKeyName(SDL_Keycode(key)); return SDL_GetKeyName(SDL_Keycode(key));
} }
std::string Sdl2Application::KeyEvent::keyName() const { Containers::StringView Sdl2Application::KeyEvent::keyName() const {
return keyName(_key); return keyName(_key);
} }

39
src/Magnum/Platform/Sdl2Application.h
Unescape View File

@ -31,10 +31,10 @@
* @brief Class @ref Magnum::Platform::Sdl2Application, macro @ref MAGNUM_SDL2APPLICATION_MAIN() * @brief Class @ref Magnum::Platform::Sdl2Application, macro @ref MAGNUM_SDL2APPLICATION_MAIN()
*/ */
#include <string>
#include <Corrade/Containers/ArrayView.h> #include <Corrade/Containers/ArrayView.h>
#include <Corrade/Containers/EnumSet.h> #include <Corrade/Containers/EnumSet.h>
#include <Corrade/Containers/Optional.h> #include <Corrade/Containers/Optional.h>
#include <Corrade/Containers/String.h> /** @todo PIMPL Configuration instead? */
#include "Magnum/Magnum.h" #include "Magnum/Magnum.h"
#include "Magnum/Tags.h" #include "Magnum/Tags.h"
@ -81,6 +81,11 @@
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif
#ifdef MAGNUM_BUILD_DEPRECATED
/* Some APIs used to take or return a std::string before */
#include <Corrade/Containers/StringStl.h>
#endif
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT
union SDL_Event; /* for anyEvent() */ union SDL_Event; /* for anyEvent() */
#endif #endif
@ -805,7 +810,7 @@ class Sdl2Application {
* *
* The @p title is expected to be encoded in UTF-8. * The @p title is expected to be encoded in UTF-8.
*/ */
void setWindowTitle(const std::string& title); void setWindowTitle(Containers::StringView title);
#if !defined(CORRADE_TARGET_EMSCRIPTEN) && (SDL_MAJOR_VERSION*1000 + SDL_MINOR_VERSION*100 + SDL_PATCHLEVEL >= 2005 || defined(DOXYGEN_GENERATING_OUTPUT)) #if !defined(CORRADE_TARGET_EMSCRIPTEN) && (SDL_MAJOR_VERSION*1000 + SDL_MINOR_VERSION*100 + SDL_PATCHLEVEL >= 2005 || defined(DOXYGEN_GENERATING_OUTPUT))
/** /**
@ -853,7 +858,7 @@ class Sdl2Application {
* @cb{.html} <div class="mn-container"> @ce is not found. This * @cb{.html} <div class="mn-container"> @ce is not found. This
* compatibility is scheduled to be removed in the future. * compatibility is scheduled to be removed in the future.
*/ */
void setContainerCssClass(const std::string& cssClass); void setContainerCssClass(Containers::StringView cssClass);
#endif #endif
/** /**
@ -1819,10 +1824,13 @@ class Sdl2Application::Configuration {
/** /**
* @brief Window title * @brief Window title
* *
* The returned string view is
* @relativeref{Corrade,Containers::StringViewFlag::NullTerminated} and
* is valid until the next call to @ref setTitle().
* @note Not available in @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten" * @note Not available in @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten"
* and @ref CORRADE_TARGET_IOS "iOS". * and @ref CORRADE_TARGET_IOS "iOS".
*/ */
std::string title() const { return _title; } Containers::StringView title() const { return _title; }
#endif #endif
/** /**
@ -1840,8 +1848,8 @@ class Sdl2Application::Configuration {
* application state change) using @ref setWindowTitle(). * application state change) using @ref setWindowTitle().
*/ */
#if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_IOS) #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_IOS)
Configuration& setTitle(std::string title) { Configuration& setTitle(const Containers::StringView title) {
_title = std::move(title); _title = Containers::String::nullTerminatedGlobalView(title);
return *this; return *this;
} }
#else #else
@ -1954,7 +1962,7 @@ class Sdl2Application::Configuration {
private: private:
#if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_IOS) #if !defined(CORRADE_TARGET_EMSCRIPTEN) && !defined(CORRADE_TARGET_IOS)
std::string _title; Containers::String _title;
#endif #endif
Vector2i _size; Vector2i _size;
DpiScalingPolicy _dpiScalingPolicy; DpiScalingPolicy _dpiScalingPolicy;
@ -2468,10 +2476,13 @@ class Sdl2Application::KeyEvent: public Sdl2Application::InputEvent {
* *
* Human-readable localized UTF-8 name for given @p key, intended for * Human-readable localized UTF-8 name for given @p key, intended for
* displaying to the user in e.g. key binding configuration. If there * displaying to the user in e.g. key binding configuration. If there
* is no name for given key, empty string is returned. * is no name for given key, empty string is returned. The returned
* @see @ref keyName(Key) * view is always @relativeref{Corrade,Containers::StringViewFlag::NullTerminated}
* and is valid at least until the next call to this function, to
* @ref keyName() const or to the underlying @cpp SDL_GetKeyName() @ce
* API.
*/ */
static std::string keyName(Key key); static Containers::StringView keyName(Key key);
/** /**
* @brief Key * @brief Key
@ -2486,10 +2497,12 @@ class Sdl2Application::KeyEvent: public Sdl2Application::InputEvent {
* Human-readable localized UTF-8 name for the key returned by * Human-readable localized UTF-8 name for the key returned by
* @ref key(), intended for displaying to the user in e.g. * @ref key(), intended for displaying to the user in e.g.
* key binding configuration. If there is no name for that key, empty * key binding configuration. If there is no name for that key, empty
* string is returned. * string is returned. The returned string is always @relativeref{Corrade,Containers::StringViewFlag::NullTerminated}
* @see @ref keyName(Key) * and is valid at least until the next call to this function, to
* @ref keyName(Key) or to the underlying @cpp SDL_GetKeyName() @ce
* API.
*/ */
std::string keyName() const; Containers::StringView keyName() const;
/** @brief Modifiers */ /** @brief Modifiers */
Modifiers modifiers() const { return _modifiers; } Modifiers modifiers() const { return _modifiers; }

7
src/Magnum/Platform/Test/Sdl2ApplicationTest.cpp
Unescape View File

@ -53,6 +53,8 @@
namespace Magnum { namespace Platform { namespace Test { namespace { namespace Magnum { namespace Platform { namespace Test { namespace {
using namespace Containers::Literals;
struct Sdl2ApplicationTest: Platform::Application { struct Sdl2ApplicationTest: Platform::Application {
explicit Sdl2ApplicationTest(const Arguments& arguments); explicit Sdl2ApplicationTest(const Arguments& arguments);
@ -107,7 +109,7 @@ struct Sdl2ApplicationTest: Platform::Application {
stopTextInput(); stopTextInput();
} else if(event.key() == KeyEvent::Key::T) { } else if(event.key() == KeyEvent::Key::T) {
Debug{} << "setting window title"; Debug{} << "setting window title";
setWindowTitle("This is a UTF-8 Window Title™!"); setWindowTitle("This is a UTF-8 Window Title™ and it should have no exclamation mark!!"_s.exceptSuffix(2));
} }
#ifndef CORRADE_TARGET_EMSCRIPTEN #ifndef CORRADE_TARGET_EMSCRIPTEN
else if(event.key() == KeyEvent::Key::S) { else if(event.key() == KeyEvent::Key::S) {
@ -181,7 +183,8 @@ Sdl2ApplicationTest::Sdl2ApplicationTest(const Arguments& arguments): Platform::
} }
Configuration conf; Configuration conf;
conf.setWindowFlags(Configuration::WindowFlag::Resizable); conf.setTitle("Window title that should have no exclamation mark!!"_s.exceptSuffix(2))
.setWindowFlags(Configuration::WindowFlag::Resizable);
if(!args.value("dpi-scaling").empty()) if(!args.value("dpi-scaling").empty())
conf.setSize({800, 600}, args.value<Vector2>("dpi-scaling")); conf.setSize({800, 600}, args.value<Vector2>("dpi-scaling"));
#ifndef CORRADE_TARGET_EMSCRIPTEN #ifndef CORRADE_TARGET_EMSCRIPTEN

Write Preview
Loading…
Cancel
Save