Merge pull request #5 from rerdavies/dev

Dev - merge 0.0.3-beta3

Author: rerdavies

CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.16.0)
 project(nwindows
-    VERSION 0.0.2
+    VERSION 0.0.3
     DESCRIPTION "Modern Text User Interface Library for C++."
     HOMEPAGE_URL "https://rerdavies.github.io/nwindows/"
     LANGUAGES CXX
 )
-set(NWINDOWS_RELEASE_QUALIFIER "-beta2")
+set(NWINDOWS_RELEASE_QUALIFIER "-beta3")
 
 
 

README.md

@@ -5,7 +5,7 @@
 [![Documentation](https://img.shields.io/badge/documentation-Examples-blue)](https://github.com/rerdavies/nwindows/tree/main/examples)
 <!--[![Documentation](https://img.shields.io/badge/documentation-Release%20Notes-blue)](https://reravies.github.io/nwindows/) -->
 
-*0.0.2-beta2*
+*0.0.3-beta3*
 
 The *NWindows* library is a C++ text user interface (TUI) library for building console applications on Linux.
 The library uses elements to compose user interfaces using an innovative and concise manipulator system. The library provides a rich set of elements with which to build user interfaces.

ReleaseNotes.md

@@ -1,5 +1,10 @@
 ## Release Notes
 
+### NWindows 0.0.3-beta3
+
+- Cache can_display_character() results for faster rendering.
+
+
 ### NWindows 0.0.2-beta2
 
 - Polyfill checkbox/radio-button/dropdown characters on EGA/VGA (Linux) terminals.

docs/src/NWindowsVersionInfo.tsx

@@ -21,4 +21,4 @@
  *   SOFTWARE.
  */
 
-export const NWindowsVersion = "0.0.2-beta2";
+export const NWindowsVersion = "0.0.3-beta3";

docs/src/assets/ReleaseNotes.md

@@ -1,5 +1,10 @@
 ## Release Notes
 
+### NWindows 0.0.3-beta3
+
+- Cache can_display_character() results for faster rendering.
+
+
 ### NWindows 0.0.2-beta2
 
 - Polyfill checkbox/radio-button/dropdown characters on EGA/VGA (Linux) terminals.

src/ConsoleFontTest.cpp

@@ -109,24 +109,24 @@ void dump_unicode_ioctl()
     Finally closeConsoleFd([console_fd]() { close(console_fd); });
 
 
-    std::vector<uint8_t> fontdata;
-    fontdata.resize(512 * 32);
+    std::vector<uint8_t> font_data;
+    font_data.resize(512 * 32);
 
-    struct consolefontdesc fontdesc;
-    fontdesc.charcount = 512;
-    fontdesc.chardata = (char*)fontdata.data();
-    fontdesc.charheight = 32;
+    struct consolefontdesc font_desc;
+    font_desc.charcount = 512;
+    font_desc.chardata = (char*)font_data.data();
+    font_desc.charheight = 32;
 
     errno = 0;
-    int rc = ioctl(console_fd, GIO_FONTX, &fontdesc);
+    int rc = ioctl(console_fd, GIO_FONTX, &font_desc);
 
     if (rc != 0)
     {
         std::string msg = strerror(errno);
         std::cout << "FontX not supported. " << msg << std::endl;
     }
     else {
-        std::cout << "Fontx supported: " << fontdesc.charcount << " characters, height: " << fontdesc.charheight << std::endl;
+        std::cout << "Fontx supported: " << font_desc.charcount << " characters, height: " << font_desc.charheight << std::endl;
     }
 
 

src/NWindows.cpp

@@ -1176,6 +1176,7 @@ void NWindow::add_child_window(NWindow::ptr child)
 {
     this->child_windows_.push_back(child);
     child->parent_window_ = this;
+    child->top_level_window_ = this->top_level_window_;
     child->is_unicode_locale_ = this->is_unicode_locale_;
     child->color_palette(this->color_palette_);
 
@@ -1192,6 +1193,7 @@ bool NWindow::remove_child_window(NWindow* child)
         if (i->get() == child)
         {
             child->parent_window_ = nullptr;
+            child->top_level_window_ = nullptr;
             child_windows_.erase(i);
             return true;
         }
@@ -1201,21 +1203,11 @@ bool NWindow::remove_child_window(NWindow* child)
 
 NWindow* NWindow::top_level_window()
 {
-    NWindow* window = this;
-    while (window->parent_window_ != nullptr)
-    {
-        window = window->parent_window_;
-    }
-    return window;
+    return this->top_level_window_;
 }
 const NWindow* NWindow::top_level_window() const
 {
-    const NWindow* window = this;
-    while (window->parent_window_ != nullptr)
-    {
-        window = window->parent_window_;
-    }
-    return window;
+    return this->top_level_window_;
 }
 
 
@@ -1286,6 +1278,8 @@ void NWindow::init_root_window()
     {
         throw std::runtime_error("A root window already exists. Create a child window instead, by supplying a parent window argument to NWindow::create.");
     }
+    this->top_level_window_ = this;
+
     std::string old_locale = ::setlocale(LC_ALL, "");
     std::string locale = ::setlocale(LC_ALL, nullptr);
 
@@ -4573,7 +4567,7 @@ static bool use_raspberry_pi_fallback() {
     {
         g_checked_raspberry_pi = true;
 
-        // Are we running in raspi lxterminal?
+        // Are we running in Raspberry Pi lxterminal?
                 // GIO_LAUNCHED_DESKTOP_FILE=/usr/share/raspi-ui-overrides/applications/lxterminal.desktop
         const char* term = std::getenv("GIO_LAUNCHED_DESKTOP_FILE");
         g_use_raspberry_pi_fallback = false;
@@ -6313,8 +6307,33 @@ void NWindow::handle_is_active_changed(bool activated)
 }
 
 
-
 bool NWindow::can_display_character(char32_t c) const
+{
+    if (this->top_level_window() != this)
+    {
+        return this->top_level_window()->can_display_character(c);
+    }
+    // Simple cache implementation, assuming that the underlying call 
+    // requires a round-trip wire transit,
+
+    auto ff = can_display_character_cache_.find(c);
+    if (ff != can_display_character_cache_.end())
+    {
+        return ff->second;
+    }
+    bool result = can_display_character_(c);
+    
+    // moral constness.
+    const_cast<NWindow*>(this)->can_display_character_cache_[c] = result;
+
+    return result;
+}
+// std::unordered_map<char32_t,bool> NWindow::can_display_character_cache_;
+
+
+
+
+bool NWindow::can_display_character_(char32_t c) const
 {
     // Figure out whether wcwidth() works on Windows for emoji (and other extended unicode characters)
     // or figure out an alternative.

src/include/NWindows/NWindows.hpp

@@ -39,6 +39,7 @@
 #include "NEvent.hpp"
 #include "NClipboard.hpp"
 #include "NUtf8.hpp"
+#include <unordered_map>
 
 #include "NWindowsVersionInfo.hpp"
 
@@ -1426,6 +1427,7 @@ namespace nwindows
         static void set_locale(const std::string& locale);
         bool can_display_character(char32_t c) const;
 
+
         std::shared_ptr<ConsoleFont> console_font() const { return this->top_level_window()->console_font_; } 
 
 
@@ -1615,6 +1617,9 @@ namespace nwindows
         virtual void render() override;
 
     private:
+        bool can_display_character_(char32_t c) const;
+        std::unordered_map<char32_t,bool> can_display_character_cache_;
+
 
         bool is_unicode_locale() const { return is_unicode_locale_; }
 
@@ -1745,6 +1750,7 @@ namespace nwindows
         std::vector<PANEL*> panel_stack_; // root level window only.
 
         NWindow* parent_window_ = nullptr;
+        NWindow* top_level_window_ = nullptr;
         std::vector<NWindow::ptr> child_windows_; // for ownership.
 
         std::string title_;

src/include/NWindows/NWindowsVersionInfo.hpp

@@ -28,8 +28,8 @@
 // Uses Semantic Versioning
 #define NWINDOWS_MAJOR_VERSION 0
 #define NWINDOWS_MINOR_VERSION 0
-#define NWINDOWS_BUILD_NUMBER 2  // increments with each release
-#define NWINDOWS_RELEASE_QUALIFIER "-beta2"
+#define NWINDOWS_BUILD_NUMBER 3  // increments with each release
+#define NWINDOWS_RELEASE_QUALIFIER "-beta3"