util/smis -> util/shim/sfml

+ Refined Geometry.hpp

include/sfw/Geometry.hpp

@@ -1,15 +1,66 @@
 #ifndef SFW_GEOMETRY_HPP
 #define SFW_GEOMETRY_HPP
 
+#include "sfw/util/generic.hpp" // using sfw::Unknown, sfw::UseDefault;
+
 namespace sfw
 {
+	/*
+	2D (on-screen) orientation of geometric entities
 
-enum Orientation
-{
-    Horizontal,
-    Vertical
-};
+	- The interpretation of Horizontal|Vertical combinations as "diagonal"
+	  is intentionally undefined here.)
+	*/
+	struct Orientation // `enum class Orientation` would forbid all the num. ops. (despite the :int)!
+	//!! This is the best trade-off between the namespace pollution of plain
+	//!! enums and the overly restrictive & cumbersome enum classes. This way
+	//!! there's no mandatory `Orientation::` qualifiers, but only for selected
+	//!! names, where that makes sense. Also, implicit num. conversions work.
+	{
+		enum _symbolic_ {
+		Unknown = sfw::Unknown,
+		UseDefault = sfw::UseDefault,
+			// `Default` would be hopelessly ambiguous: should it directly
+			// encode a value (like `Horizontal`), and then remain hardcoded
+			// + possibly too context-specific forever, or should it have a
+			// dedicated pseudo-value meaning "use the actually configured
+			// default for the given usage context"?...
+
+		Horizontal = 1,
+		Vertical = Horizontal << 1, // Support Horizontal|Vertical
+
+		Directed = 1 << 4,
+			Leftward  = Directed | Horizontal,
+			Rightward = Directed | Horizontal | (Directed << 1),
+			Upward    = Directed | Vertical,
+			Downward  = Directed | Vertical   | (Directed << 1),
+		};
+
+		Orientation() : value(Unknown) {}
+		Orientation(_symbolic_ x) : value(x) {}
+
+		operator _symbolic_() const { return value; }
+//!!Unfortunately, this doesn't alleviate the need for an op= and op!=:
+//		operator int()        { return value; }
+		bool operator ==(_symbolic_ x) const { return x == value; }
+		bool operator !=(_symbolic_ x) const { return x != value; }
+
+		_symbolic_ value;
+	};
+
+	// Emulate (only the "good parts"!) of a plain enum version...
+	// (Note: an enum class can't be `using`ed into scope all at once,
+	// only its values one by one. :-/ )
+	using Orientation::Horizontal, Orientation::Vertical,
+	      //Orientation::Directed, // <- This one's kinda internal.
+	      Orientation::Leftward, Orientation::Rightward, Orientation::Upward, Orientation::Downward;
+
+	// Sanity chk.:
+	static_assert((int)Unknown != UseDefault);
+	static_assert((int)Unknown != Horizontal);
+	static_assert((int)UseDefault != Horizontal);
+	static_assert(Orientation::Directed > (Horizontal|Vertical));
 
-}
+} // namespace
 
 #endif // SFW_GEOMETRY_HPP

include/sfw/Gfx/_backend-specific/SFML/Text.hpp

@@ -2,7 +2,7 @@
 #define SFW_GFX_TEXT_SFML_HPP
 
 #include <SFML/Graphics/Text.hpp>
-#include "sfw/util/shims.hpp"
+#include "sfw/util/shim/sfml.hpp"
 
 namespace sfw
 {

include/sfw/Widgets/OptionsBox.inl

@@ -1,5 +1,5 @@
 #include "sfw/Theme.hpp"
-#include "sfw/util/shims.hpp" // std::string <-> sf::String conv.
+#include "sfw/util/shim/sfml.hpp" // std::string <-> sf::String conv.
 #include "sfw/util/diagnostics.hpp"
 
 #include <algorithm>

include/sfw/util/generic.hpp

@@ -0,0 +1,13 @@
+#ifndef SFW_GENERIC_HPP
+#define SFW_GENERIC_HPP
+
+namespace sfw
+{
+	enum : int
+	{
+		Unknown = 0,
+		UseDefault = -1,
+	};
+}
+
+#endif // SFW_GENERIC_HPP

src/lib/Layout.cpp

@@ -1,7 +1,7 @@
 #include "sfw/Layout.hpp"
 #include "sfw/Theme.hpp"
 #include "sfw/Gfx/Render.hpp"
-#include "sfw/util/shims.hpp" // for sf::Event::KeyEvent::==
+#include "sfw/util/shim/sfml.hpp" // for sf::Event::KeyEvent::==
 
 #ifdef DEBUG
 #   include "sfw/GUI-main.hpp"

src/lib/WidgetContainer.cpp

@@ -1,7 +1,7 @@
 #include "sfw/WidgetContainer.hpp"
 
 #include "sfw/GUI-main.hpp"
-#include "sfw/util/shims.hpp"
+#include "sfw/util/shim/sfml.hpp"
 
 #include <cassert>
 #include <string>

src/lib/Widgets/Button.cpp

@@ -1,6 +1,6 @@
 #include "sfw/Widgets/Button.hpp"
 #include "sfw/Theme.hpp"
-#include "sfw/util/shims.hpp"
+#include "sfw/util/shim/sfml.hpp"
 
 #include <algorithm>
     using std::max;

src/lib/Widgets/Label.cpp

@@ -1,6 +1,6 @@
 #include "sfw/Widgets/Label.hpp"
 #include "sfw/Theme.hpp"
-#include "sfw/util/shims.hpp"
+#include "sfw/util/shim/sfml.hpp"
 
 #include <SFML/Graphics/RenderTarget.hpp>
 

src/lib/Widgets/TextBox.cpp

@@ -3,7 +3,7 @@
 #include "sfw/Theme.hpp"
 #include "sfw/GUI-main.hpp"
 #include "sfw/util/utf8.hpp"
-#include "sfw/util/shims.hpp"
+#include "sfw/util/shim/sfml.hpp"
 #include "sfw/util/diagnostics.hpp"
 
 #include <SFML/Graphics/RenderTarget.hpp>
@@ -58,13 +58,8 @@ TextBox::TextBox(float pxWidth, CursorStyle style):
 TextBox* TextBox::set(const std::string& content)
 {
 	m_text.set(sfw::utf8_substr(content, 0, m_maxLength)); // Limit the length
-
 	setCursorPos(length());
-
-	//!! This (i.e. calling the user callback also on set...()) should be consistent across all the widgets! -> #257
-	//!! Doing this prematurely (before attaching to the GUI) is not yet clearly warned about (or prevented)! -> #109, #271
-
-	//!!onUpdate(); //!! <- Can't do it yet, as the demo app relies on it not happening! :-/
+//!!	changed(); //! Will become more sophisticated later (-> Undo/Redo)
 	return this;
 }
 
@@ -273,7 +268,7 @@ void TextBox::Paste()
 	std::string newcontent = get();
 	auto u8bpos = utf8_bsize(newcontent, m_cursorPos);
 	newcontent.insert(u8bpos, clip);
-	m_text.set(newcontent); //! not this->set(), to preserve m_cursorPos
+	m_text.set(newcontent); //! not this->set(), to preserve the cursor pos.
 	// Go to the end of the inserted part (or EOS)
 	setCursorPos(m_cursorPos + cliplen);
 }
@@ -502,7 +497,7 @@ void TextBox::onKeyPressed(const sf::Event::KeyEvent& key)
 
 	// "Apply"
 	case sf::Keyboard::Enter:
-		onUpdate();
+		onUpdate(); //!!TBD: Should instead call update(), but that's a NOOP if !changed()
 		break;
 
 	// Ctrl+A: Select All