glimmer-dsl-libui 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dc091cfefc95ef7b7f93457fc609a3ee852912d5c72fb79a363c9dd96787865
-  data.tar.gz: d6547ce1dae1fa9abb73bdcf7b441b087f0bc7ab66dd0d8eedeed724e82c810f
+  metadata.gz: 467e3450aca13a338d5d835aa79c7b483cd9475866d6e6f08e2b130386107d1a
+  data.tar.gz: 81674d7b0b95d973b5286c1c8cc187e747412e02a6a0f7bffc7d235b499186c6
 SHA512:
-  metadata.gz: 352489b82a6706cbc9232f21be57a1e236efc4b08d76653b4b2fce73b0e931c6d3c7e10207f14f2f2417336f6f54bcdb03b52aa84ec55e8c9849be2bf2bfb361
-  data.tar.gz: 23587a71abcecc6d95bdc471b3fb907928abb028f439aaf22542fc2c19bf26916944e35770e36f1600765e04c767c0a512d5626cfbf2a0ebe007286a5516b733
+  metadata.gz: ada3fc2a2db26d4660876010f1b8f0cdc08797baa0b0e63e5a044e050dc9cf400f6318dc7e09328137b755c861695c1a74901ec91be2add91433c1d487ba1438
+  data.tar.gz: f1aee5106ee4500c46970de47136da231c4e096a213f65095cb2640e8b978672100ef036ebb8a24fbd65137ec222f84a345832c6fe69bc87066599496658c8b6

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 0.12.2
+
+- New `code_entry` control [ALPHA/EXPERIMENTAL/INCOMPLETE/UNSTABLE] (similar to `code_area`, but with code editing functionality).
+- New examples/basic_code_entry.rb
+- Update examples/basic_code_area.rb to have padding inside the `code_area` and no window padding anymore
+- Have `code_area` handle italic syntax highlighting styles
+- Support `code_area` `font_family` and `font_size` options
+- Controls prepend `Parent` mixin to keep track of their children via `children` attribute
+- tab_item always generates a vertical_box root container (root_proxy) before adding its child content within it (also, it does not generate a horizontal_box anymore by default if it had no content to start, yet a vertical_box all the time)
+- Upgrade to glimmer 2.7.9
+- Fix issue in `code_area` not recognizing indentation
+
 ## 0.12.1
 
 - Fix issue with getting error "superclass mismatch for class Array" when `concurrent-ruby` is included in a desktop applications as it is required to load `concurrent-ruby` before `glimmer`, so now `glimmer-dsl-libui` will attempt loading `concurrent-ruby` if available or default to old behavior otherwise.

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for LibUI 0.12.1
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for LibUI 0.12.2
 ## Prerequisite-Free Ruby Desktop Development Cross-Platform Native GUI Library  ([Fukuoka Award Winning](http://www.digitalfukuoka.jp/topics/187?locale=ja))
 ### The Quickest Way From Zero To GUI
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
@@ -456,7 +456,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.12.1'
+gem 'glimmer-dsl-libui', '~> 0.12.2'
 ```
 
 Test that installation worked by running the [Glimmer Meta-Example](#examples):

data/VERSION

@@ -1 +1 @@
-0.12.1
+0.12.2

data/examples/basic_code_area.rb

@@ -7,7 +7,6 @@ class BasicCodeArea
     @code = <<~CODE
       # Greets target with greeting
       def greet(greeting: 'Hello', target: 'World')
-        
         puts "\#{greeting}, \#{target}!"
       end
       
@@ -21,8 +20,6 @@ class BasicCodeArea
   
   body {
     window('Basic Code Area', 400, 300) {
-      margined true
-      
       code_area(language: 'ruby', code: @code)
     }
   }

data/examples/basic_code_entry.rb

@@ -0,0 +1,30 @@
+require 'glimmer-dsl-libui'
+
+# code_entry is experimental/incomplete and not recommended for serious usage
+class BasicCodeEntry
+  include Glimmer::LibUI::Application
+  
+  before_body do
+    @code = <<~CODE
+      # Greets target with greeting
+      def greet(greeting: 'Hello', target: 'World')
+        puts "\#{greeting}, \#{target}!"
+      end
+      
+      greet
+      greet(target: 'Robert')
+      greet(greeting: 'Aloha')
+      greet(greeting: 'Aloha', target: 'Nancy')
+      greet(greeting: 'Howdy', target: 'Doodle')
+    CODE
+  end
+  
+  body {
+    window('Basic Code Entry', 400, 300) {
+      # code_entry is experimental/incomplete and not recommended for serious usage
+      code_entry(language: 'ruby', code: @code)
+    }
+  }
+end
+
+BasicCodeEntry.launch

data/lib/glimmer/libui/control_proxy/tab_item_proxy.rb

@@ -29,17 +29,18 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class TabItemProxy < ControlProxy
-        attr_reader :index
+        attr_reader :index, :root_proxy
         
         def initialize(keyword, parent, args, &block)
           @keyword = keyword
           @parent_proxy = parent
+          @root_proxy = nil
           @args = args
           @block = block
           @enabled = 1
           @index = @parent_proxy.num_pages
-          @content = @block&.call
           build_control
+          @content = @root_proxy.content(&@block) if @block
         end
         
         def name
@@ -57,11 +58,18 @@ module Glimmer
         alias margined= margined
         alias margined? margined
             
+        # TODO implement tab_insert_at
+        
+        def destroy
+          @parent_proxy.delete(@index)
+        end
+            
         private
         
         def build_control
-          @content = Box::HorizontalBoxProxy.new('horizontal_box', @libui, []) if @content.nil?
-          @libui = @parent_proxy.append(name, @content.libui)
+          @root_proxy = Box::VerticalBoxProxy.new('vertical_box', @parent_proxy, [])
+          # TODO support being able to re-open a tab item and add content.. it needs special code.. perhaps by having a @content parent for every tab item, this problem becomes easier to solve
+          @parent_proxy.append(name, @root_proxy.libui) # returns nil, so there is no @libui object to store in this case
         end
       end
     end

data/lib/glimmer/libui/control_proxy/text_proxy.rb

@@ -203,7 +203,7 @@ module Glimmer
         def extent_width
           if @extent_width.to_f > 0
             @extent_width
-          else
+          else # TODO auto calculate extents
             width
           end
         end
@@ -211,7 +211,7 @@ module Glimmer
         def extent_height
           if @extent_height.to_f > 0
             @extent_height
-          else
+          else # TODO auto calculate extents
             children_max_size = children.map(&:font).map {|font| font[:size] if font.respond_to?(:[]) }.compact.max
             if children_max_size.to_f > 0
               children_max_size
@@ -221,6 +221,16 @@ module Glimmer
           end
         end
         
+        def calculate_extents
+          # TODO fix implementation once libui binding project responds about this
+          # as it always returns 0,0 right now
+          extent_width = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE*8)
+          extent_height = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE*8)
+          ::LibUI.draw_text_layout_extents(@libui, extent_width, extent_height)
+          @extent_width = extent_width[0, Fiddle::SIZEOF_DOUBLE*8].unpack1('i')
+          @extent_height = extent_height[0, Fiddle::SIZEOF_DOUBLE*8].unpack1('i')
+        end
+        
         private
         
         def build_control
@@ -234,16 +244,6 @@ module Glimmer
           draw_brush.B = (draw_brush_args[:b] || draw_brush_args[:blue]).to_f / 255.0
           draw_brush.A = (draw_brush_args[:a] || draw_brush_args[:alpha])
         end
-        
-        def calculate_extents
-          # TODO fix implementation once libui binding project responds about this
-          # as it always returns 0,0 right now
-          extent_width = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE*8)
-          extent_height = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DOUBLE*8)
-          ::LibUI.draw_text_layout_extents(@libui, extent_width, extent_height)
-          @extent_width = extent_width[0, Fiddle::SIZEOF_DOUBLE*8].unpack1('i')
-          @extent_height = extent_height[0, Fiddle::SIZEOF_DOUBLE*8].unpack1('i')
-        end
       end
     end
   end

data/lib/glimmer/libui/control_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/data_bindable'
+require 'glimmer/libui/parent'
 
 module Glimmer
   module LibUI
@@ -104,6 +105,7 @@ module Glimmer
       end
       
       include DataBindable
+      prepend Parent
       
       KEYWORD_ALIASES = {
         'message_box'       => 'msg_box',
@@ -354,6 +356,7 @@ module Glimmer
         deregister_all_custom_listeners
         send_to_libui('destroy')
         ControlProxy.control_proxies.delete(self)
+        # TODO should we destroy all children too or at least remove them from the children collection?
       end
             
       def enabled(value = nil)

data/lib/glimmer/libui/custom_control/code_area.rb

@@ -19,24 +19,15 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require 'os'
+
 require 'glimmer/libui/custom_control'
+require 'glimmer/libui/syntax_highlighter'
 
 module Glimmer
   module LibUI
     module CustomControl
       class CodeArea
-        class << self
-          def languages
-            require 'rouge'
-            Rouge::Lexer.all.map {|lexer| lexer.tag}.sort
-          end
-          
-          def lexers
-            require 'rouge'
-            Rouge::Lexer.all.sort_by(&:title)
-          end
-        end
-        
         include Glimmer::LibUI::CustomControl
         
         REGEX_COLOR_HEX6 = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/
@@ -44,50 +35,38 @@ module Glimmer
         option :language, default: 'ruby'
         option :theme, default: 'glimmer'
         option :code
+        option :padding, default: 10
+        option :font_family, default: OS.mac? ? 'Consolas' : 'Courier'
+        option :font_size, default: 13
+        
+        attr_reader :syntax_highlighter
+        
+        before_body do
+          @syntax_highlighter = SyntaxHighlighter.new(language: language, theme: theme)
+          @font_default = {family: font_family, size: font_size, weight: :medium, italic: :normal, stretch: :normal}
+          @font_italic = @font_default.merge(italic: :italic)
+        end
         
         body {
           area {
             rectangle(0, 0, 8000, 8000) {
               fill :white
             }
-            text {
-              default_font family: OS.mac? ? 'Consolas' : 'Courier', size: 13, weight: :medium, italic: :normal, stretch: :normal
+            text(padding, padding) {
+              default_font @font_default
               
-              syntax_highlighting(code).each do |token|
-                style_data = Rouge::Theme.find(theme).new.style_for(token[:token_type])
-               
-                string(token[:token_text]) {
-                  color style_data[:fg] || :black
-                  background style_data[:bg] || :white
+              syntax_highlighter.syntax_highlighting(code).each do |token|
+                token_text = token[:token_text].start_with?("\n") ? " #{token[:token_text]}" : token[:token_text]
+            
+                string(token_text) {
+                  font @font_italic if token[:token_style][:italic]
+                  color token[:token_style][:fg] || :black
+                  background token[:token_style][:bg] || :white
                 }
               end
             }
           }
         }
-        
-        def lexer
-          require 'rouge'
-          require 'glimmer-dsl-libui/ext/rouge/theme/glimmer'
-          # TODO Try to use Rouge::Lexer.find_fancy('guess', code) in the future to guess the language or otherwise detect it from file extension
-          @lexer ||= Rouge::Lexer.find_fancy(language)
-          @lexer ||= Rouge::Lexer.find_fancy('ruby') # default to Ruby if no lexer is found
-        end
-        
-        def syntax_highlighting(text)
-          return [] if text.to_s.strip.empty?
-          @syntax_highlighting ||= {}
-          unless @syntax_highlighting.keys.include?(text)
-            lex = lexer.lex(text).to_a
-            text_size = 0
-            @syntax_highlighting[text] = lex.map do |pair|
-              {token_type: pair.first, token_text: pair.last}
-            end.each do |hash|
-              hash[:token_index] = text_size
-              text_size += hash[:token_text].size
-            end
-          end
-          @syntax_highlighting[text]
-        end
       end
     end
   end

data/lib/glimmer/libui/custom_control/code_entry.rb

@@ -0,0 +1,300 @@
+# Copyright (c) 2021-2024 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'os'
+
+require 'glimmer/libui/custom_control'
+require 'glimmer/libui/syntax_highlighter'
+
+module Glimmer
+  module LibUI
+    module CustomControl
+      class CodeEntry
+        include Glimmer::LibUI::CustomControl
+        
+        REGEX_COLOR_HEX6 = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/
+        # TODO vary shortcut key by OS (CMD for Mac, CTRL elsewhere)
+        
+        option :language, default: 'ruby'
+        option :theme, default: 'glimmer'
+        option :code
+        option :padding, default: 10
+        option :caret_blinking_delay_in_seconds, default: 0.5
+        option :font_family, default: OS.mac? ? 'Courier New' : 'Courier'
+        option :font_size, default: 14
+        # TODO consider offering the option to autosave to a file upon changes
+        
+        attr_reader :syntax_highlighter, :line, :position
+        
+        before_body do
+          @syntax_highlighter = SyntaxHighlighter.new(language: language, theme: theme)
+          @font_default = {family: font_family, size: font_size, weight: :medium, italic: :normal, stretch: :normal}
+          @font_italic = @font_default.merge(italic: :italic)
+          @line = 0
+          @position = 5
+          @draw_caret = false
+          @multiplier_position = 0.6
+          @multiplier_line = 1.2
+        end
+        
+        after_body do
+          LibUI.timer(caret_blinking_delay_in_seconds/2.0) do
+            body_root.redraw
+          end
+        end
+        
+        body {
+          scrolling_area(1, 1) { |code_entry_area|
+            on_draw do
+              # TODO need to determine the scrolling area width and height from the text extent once supported in the future
+              # TODO only reset size when a new line has been added
+              area_width = longest_line_size * font_size*@multiplier_position
+              area_height = line_count * font_size*@multiplier_line
+              code_entry_area.set_size(area_width, area_height)
+              
+              rectangle(0, 0, area_width, area_height) {
+                fill :white
+              }
+              
+              code_layer
+              
+              caret_layer if @draw_caret
+              
+              if @blinking_time.nil? || (Time.now - @blinking_time > caret_blinking_delay_in_seconds)
+                @blinking_time = Time.now
+                @draw_caret = !@draw_caret
+              end
+            end
+      
+            on_mouse_down do |mouse_event|
+              # once text extent calculation via libui is supported, consider the idea of splitting
+              # text by single characters to use every character extent in determining mouse location
+              # or not splitting but using the extent of one character to determine mouse location
+              @position = (mouse_event[:x] - padding) / (font_size*@multiplier_position)
+              @line = (mouse_event[:y] - padding) / (font_size*@multiplier_line)
+              @line = [@line, code.lines.length - 1].min
+              @position = [@position, current_code_line_max_position].min
+              body_root.redraw
+            end
+            # TODO mouse click based text selection
+            # TODO keyboar based text selection
+      
+            on_key_down do |key_event|
+              # TODO consider delegating some of the logic below to a model
+              handled = true # assume it is handled for all cases except the else clause below
+              case key_event
+              in modifiers: [], ext_key: :left
+                if @position == 0
+                  if @line > 0
+                    new_position = code.lines[line - 1].length - 1
+                    @line = [@line - 1, 0].max
+                    @position = new_position
+                  end
+                else
+                  @position = [@position - 1, 0].max
+                end
+              in modifiers: [], ext_key: :right
+                if @position == current_code_line_max_position
+                  if @line < code.lines.size - 1
+                    @line += 1
+                    @position = 0
+                  end
+                else
+                  @position += 1
+                end
+              in modifiers: [], ext_key: :up
+                # TODO scroll view when going down or up or paging or going home / end
+                @line = [@line - 1, 0].max
+                if @max_position
+                  @position = @max_position
+                  @max_position = nil
+                end
+              in modifiers: [], ext_key: :down
+                @line += 1
+                if @max_position
+                  @position = @max_position
+                  @max_position = nil
+                end
+              in modifiers: [], ext_key: :page_up
+                @line = [@line - 15, 0].max
+                if @max_position
+                  @position = @max_position
+                  @max_position = nil
+                end
+              in modifiers: [], ext_key: :page_down
+                @line += 15
+                if @max_position
+                  @position = @max_position
+                  @max_position = nil
+                end
+              in modifiers: [], ext_key: :home
+                @line = 0
+                @position = 0
+              in modifiers: [], ext_key: :end
+                @line = code.lines.size - 1
+                @position = current_code_line_max_position
+              in ext_key: :delete
+                code.slice!(caret_index)
+              in key: "\n"
+                code.insert(caret_index, "\n")
+                @line += 1
+                @position = 0
+                # TODO indent upon hitting enter
+              in key: "\b"
+                if @position == 0
+                  if @line > 0
+                    new_position = code.lines[line - 1].length - 1
+                    code.slice!(caret_index - 1)
+                    @line = [@line - 1, 0].max
+                    @position = new_position
+                  end
+                else
+                  @position = [@position - 1, 0].max
+                  code.slice!(caret_index)
+                end
+              in key: "\t"
+                code.insert(caret_index, '  ')
+                @position += 2
+              in modifiers: [:control], key: 'a'
+                @position = 0
+              in modifiers: [:command], ext_key: :left
+                @position = 0
+              in modifiers: [:control], key: 'e'
+                @position = current_code_line_max_position
+              in modifiers: [:command], ext_key: :right
+                @position = current_code_line_max_position
+              in modifiers: [:shift], key_code: 48
+                code.insert(caret_index, ')')
+                @position += 1
+              in modifiers: [:alt], ext_key: :right
+                if @position == current_code_line_max_position
+                  if @line < code.lines.size - 1
+                    @line += 1
+                    @position = 0
+                  end
+                else
+                  new_caret_index = caret_index
+                  new_caret_index += 1 while code[new_caret_index + 1]&.match(/[^a-zA-Z]/)
+                  new_caret_index += 1 until code[new_caret_index + 1].nil? || code[new_caret_index + 1].match(/[^a-zA-Z]/)
+                  @position += new_caret_index + 1 - caret_index
+                end
+              in modifiers: [:alt], ext_key: :left
+                if @position == 0
+                  if @line > 0
+                    new_position = code.lines[line - 1].length - 1
+                    @line = [@line - 1, 0].max
+                    @position = new_position
+                  end
+                else
+                  new_caret_index = caret_index
+                  new_caret_index -= 1 while code[new_caret_index - 1]&.match(/[^a-zA-Z]/)
+                  new_caret_index -= 1 until code[new_caret_index + 1].nil? || code[new_caret_index - 1].match(/[^a-zA-Z]/)
+                  @position -= caret_index - new_caret_index
+                  @position = [@position, 0].max
+                end
+              in modifier: nil, modifiers: []
+                code.insert(caret_index, key_event[:key])
+                @position += 1
+              in modifier: nil, modifiers: [:shift]
+                character = key_event[:key] || key_event[:key_code].chr.capitalize
+                code.insert(caret_index, character)
+                @position += 1
+              # TODO CMD Z (undo)
+              # TODO CMD SHIFT Z (redo)
+              # TODO CMD + [ (outdent)
+              # TODO CMD + ] (indent)
+              # TODO CMD + down (move line down)
+              # TODO CMD + up (move line up)
+              # TODO CMD + D (duplicate)
+              else
+                handled = false
+              end
+              @line = [@line, code.lines.length - 1].min
+              @line = [@line, 0].max
+              new_position = [@position, current_code_line_max_position].min
+              if new_position != @position
+                @max_position = @position
+                @position = new_position
+              end
+              @draw_caret = true
+              body_root.redraw
+              handled
+            end
+          }
+        }
+        
+        def code_layer
+          text(padding, padding) {
+            default_font @font_default
+            
+            syntax_highlighter.syntax_highlighting(code).each do |token|
+              token_text = token[:token_text].start_with?("\n") ? " #{token[:token_text]}" : token[:token_text]
+              
+              string(token_text) {
+                font @font_italic if token[:token_style][:italic]
+                color token[:token_style][:fg] || :black
+                background token[:token_style][:bg] || :white
+              }
+            end
+          }
+        end
+        
+        def caret_layer
+          # TODO adjust padding offset based on text extent
+          text(padding - 4, padding) {
+            default_font @font_default
+              
+            # TODO make caret blink
+            string(caret_text) {
+              color :black
+              background [0, 0, 0, 0]
+            }
+          }
+        end
+        
+        def caret_text
+          # TODO replace | with a real caret (see if there is an emoji or special character for it)
+          ("\n" * @line) + (' ' * @position) + '|'
+        end
+        
+        def caret_index
+          code.lines[0..line].join.length - (current_code_line.length - @position)
+        end
+        
+        def current_code_line
+          code.lines[@line]
+        end
+        
+        def current_code_line_max_position
+          (current_code_line && current_code_line.length > 0) ? (current_code_line.length - 1) : 0
+        end
+        
+        def longest_line_size
+          code&.lines&.map(&:size)&.max || 1
+        end
+        
+        def line_count
+          code&.lines&.size || 1
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/data_bindable.rb

@@ -43,7 +43,7 @@ module Glimmer
       # and updates view property accordingly
       def data_bind_read(property, model_binding)
         model_attribute_observer = Glimmer::DataBinding::Observer.proc do
-          new_value = model_binding.evaluate_property
+          new_value = model_binding.evaluate_property # TODO performance might be worse for not using block value instead (double double call on evaluate_property)
           send("#{property}=", new_value) unless send(property) == new_value
         end
         observer_registration = model_attribute_observer.observe(model_binding, attribute_writer_type: [:attribute=, :set_attribute])

data/lib/glimmer/libui/syntax_highlighter.rb

@@ -0,0 +1,47 @@
+class SyntaxHighlighter
+  class << self
+    def languages
+      require 'rouge'
+      Rouge::Lexer.all.map {|lexer| lexer.tag}.sort
+    end
+    
+    def lexers
+      require 'rouge'
+      Rouge::Lexer.all.sort_by(&:title)
+    end
+  end
+  
+  attr_reader :language, :theme
+  
+  def initialize(language:, theme:)
+    @language = language
+    @theme = theme
+  end
+  
+  def lexer
+    require 'rouge'
+    require 'glimmer-dsl-libui/ext/rouge/theme/glimmer'
+    # TODO Try to use Rouge::Lexer.find_fancy('guess', code) in the future to guess the language or otherwise detect it from file extension
+    @lexer ||= Rouge::Lexer.find_fancy(language)
+    @lexer ||= Rouge::Lexer.find_fancy('ruby') # default to Ruby if no lexer is found
+  end
+  
+  def syntax_highlighting(text)
+    return [] if text.to_s.strip.empty?
+    @syntax_highlighting ||= {} # TODO consider memoizing/remembering the last value only to avoid wasting memory
+    unless @syntax_highlighting.keys.include?(text)
+      lex = lexer.lex(text).to_a
+      text_size = 0
+      @syntax_highlighting[text] = lex.map do |pair|
+        token_type = pair.first
+        token_text = pair.last
+        token_style = Rouge::Theme.find(theme).new.style_for(token_type)
+        {token_type: token_type, token_text: token_text, token_style: token_style}
+      end.each do |hash|
+        hash[:token_index] = text_size # TODO do we really need this? Also, consider renaming to something like token_character_index to clarify it is not the index of the token itself yet its first character
+        text_size += hash[:token_text].size
+      end
+    end
+    @syntax_highlighting[text]
+  end
+end

data/lib/glimmer/libui.rb

@@ -199,6 +199,13 @@ module Glimmer
         Color::RGB.constants.reject {|c| c.to_s.upcase == c.to_s}.map(&:to_s).map(&:underscore).map(&:to_sym)
       end
       
+      # Returns OS shortcut key, meaning the key used with most shorcuts,
+      # like :command on the Mac (used in CMD+S for save)
+      # or :control on Windows and Linux (used in CONTROL+S for save)
+      def os_shortcut_key
+        @os_shortcut_key ||= OS.mac? ? :command : :ctrl
+      end
+      
       # Queues block to execute at the nearest opportunity possible on the main GUI event loop
       def queue_main(&block)
         closure = fiddle_closure_block_caller(4, [0]) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.7.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.4
+        version: 2.7.9
 - !ruby/object:Gem::Dependency
   name: perfect-shape
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -388,6 +388,7 @@ files:
 - examples/basic_button.rb
 - examples/basic_child_window.rb
 - examples/basic_code_area.rb
+- examples/basic_code_entry.rb
 - examples/basic_composite_shape.rb
 - examples/basic_custom_shape.rb
 - examples/basic_draw_text.rb
@@ -592,6 +593,7 @@ files:
 - lib/glimmer/libui/control_proxy/window_proxy.rb
 - lib/glimmer/libui/custom_control.rb
 - lib/glimmer/libui/custom_control/code_area.rb
+- lib/glimmer/libui/custom_control/code_entry.rb
 - lib/glimmer/libui/custom_control/refined_table.rb
 - lib/glimmer/libui/custom_shape.rb
 - lib/glimmer/libui/custom_window.rb
@@ -611,6 +613,7 @@ files:
 - lib/glimmer/libui/shape/polyline.rb
 - lib/glimmer/libui/shape/rectangle.rb
 - lib/glimmer/libui/shape/square.rb
+- lib/glimmer/libui/syntax_highlighter.rb
 - lib/glimmer/proc_tracker.rb
 - lib/glimmer/rake_task.rb
 - lib/glimmer/rake_task/list.rb