glimmer-dsl-libui 0.5.5 → 0.5.8

data/lib/glimmer/libui/custom_window.rb

@@ -0,0 +1,65 @@
+# Copyright (c) 2021-2022 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 'super_module'
+require 'glimmer/libui/custom_control'
+require 'glimmer/error'
+
+module Glimmer
+  module LibUI
+    module CustomWindow
+      include SuperModule
+      include Glimmer::LibUI::CustomControl
+      
+      class << self
+        def launch(*args, &content)
+          launched_custom_shell = send(keyword, *args, &content)
+          launched_custom_shell.show
+        end
+      end
+      
+      def initialize(parent, *swt_constants, options, &content)
+        original_logger = Glimmer::Config.logger
+        require 'stringio'
+        Glimmer::Config.logger = Logger.new(StringIO.new)
+        super
+        Glimmer::Config.logger = original_logger
+        raise Glimmer::Error, 'Invalid custom window body root! Must be a window, another custom window, or a custom control with window as its body root!' unless body_root.is_a?(Glimmer::LibUI::ControlProxy::WindowProxy) || body_root.is_a?(Glimmer::LibUI::CustomWindow) || (body_root.is_a?(Glimmer::LibUI::CustomControl) && body_root.body_root.is_a?(Glimmer::LibUI::ControlProxy::WindowProxy))
+      end
+      
+      # Classes may override
+      def show
+        body_root.show
+      end
+
+      # TODO consider using Forwardable instead
+      def destroy
+        body_root.destroy
+      end
+
+      def destroying?
+        body_root.destroying?
+      end
+    end
+    
+    Application = CustomWindow
+  end
+end

data/lib/glimmer/libui.rb

@@ -80,11 +80,9 @@ module Glimmer
     
       def hex_to_rgb(value)
         if value.is_a?(String)
-          value = "0x#{value[1..-1]}" if value.start_with?('#')
-          if !value.start_with?('0x')
-            value = value.chars.map {|char| [char, char]}.flatten.join if value.length == 3
-            value = "0x#{value}"
-          end
+          value = value[2..-1] if value.start_with?('0x')
+          value = value[1..-1] if value.start_with?('#')
+          value = value.chars.map {|char| [char, char]}.flatten.join if value.length == 3
           value = value.to_i(16)
         end
         if value.is_a?(Integer)

data/lib/glimmer/proc_tracker.rb

@@ -0,0 +1,39 @@
+# Copyright (c) 2007-2022 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 'delegate'
+
+module Glimmer
+  class ProcTracker < DelegateClass(Proc)
+    def initialize(proc)
+      super(proc)
+    end
+    
+    def call(*args)
+      __getobj__.call(*args)
+      @called = true
+    end
+    
+    def called?
+      !!@called
+    end
+  end
+end

data/lib/glimmer-dsl-libui/ext/glimmer.rb

@@ -0,0 +1,7 @@
+module Glimmer
+  class << self
+    def included(klass)
+      klass.extend(Glimmer)
+    end
+  end
+end

data/lib/glimmer-dsl-libui/ext/rouge/theme/glimmer.rb

@@ -0,0 +1,29 @@
+module Rouge
+  module Themes
+    # A port of the pastie style from Pygments.
+    # See https://bitbucket.org/birkenfeld/pygments-main/src/default/pygments/styles/pastie.py
+    class Glimmer < Github
+      name 'glimmer'
+      style Comment::Single, fg:      [106,115,125], italic: true # Also, Comments
+      style Keyword::Pseudo, fg:      [:dark_red]
+      style Keyword, fg:     [:blue]
+      style Literal::String::Single, fg:      [106,115,125] # Also, Comments
+      style Literal::String::Double, fg:     [0,92,197]
+      style Literal::String::Escape, fg:      [:red]
+      style Literal::Number::Integer, fg:     [:blue]
+      style Literal::String::Interpol, fg:    [:blue]
+      style Literal::String::Symbol, fg:      [:dark_green]
+      style Literal::String, fg:      [:dark_blue]
+      style Name::Builtin, fg:     [215,58,73]
+      style Name::Class, fg:       [3,47,98]
+      style Name::Namespace, fg: [3,47,98]
+      style Name::Constant, fg:    [0,92,197]
+      style Name::Function, fg:    [:blue]
+      style Name::Variable::Instance, fg:    [227,98,9]
+      style Name, fg:        [111,66,193] #purple
+      style Operator, fg:    [:red]
+      style Punctuation, fg: [:blue]
+      style Text, fg:        [75, 75, 75]
+    end
+  end
+end

data/lib/glimmer-dsl-libui.rb

@@ -37,7 +37,7 @@ require 'libui'
 
 # Internal requires
 # require 'ext/glimmer/config'
-# require 'ext/glimmer'
+require 'glimmer-dsl-libui/ext/glimmer'
 require 'glimmer/dsl/libui/dsl'
 require 'glimmer/libui'
 Glimmer::Config.loop_max_count = -1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.8
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-12 00:00:00.000000000 Z
+date: 2022-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: perfect-shape
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: super_module
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +128,26 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.11
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.26.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.26.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +285,7 @@ files:
 - examples/basic_area3.rb
 - examples/basic_area4.rb
 - examples/basic_button.rb
+- examples/basic_code_area.rb
 - examples/basic_draw_text.rb
 - examples/basic_draw_text2.rb
 - examples/basic_entry.rb
@@ -281,6 +316,7 @@ files:
 - examples/basic_window.rb
 - examples/basic_window2.rb
 - examples/button_counter.rb
+- examples/class_based_custom_controls.rb
 - examples/color_button.rb
 - examples/color_button2.rb
 - examples/color_the_circles.rb
@@ -314,8 +350,8 @@ files:
 - examples/login4.rb
 - examples/login5.rb
 - examples/meta_example.rb
-- examples/method_based_custom_keyword.rb
-- examples/method_based_custom_keyword2.rb
+- examples/method_based_custom_controls.rb
+- examples/method_based_custom_controls2.rb
 - examples/midi_player.rb
 - examples/midi_player2.rb
 - examples/midi_player3.rb
@@ -343,8 +379,11 @@ files:
 - icons/blank.png
 - icons/glimmer.png
 - lib/glimmer-dsl-libui.rb
+- lib/glimmer-dsl-libui/ext/glimmer.rb
+- lib/glimmer-dsl-libui/ext/rouge/theme/glimmer.rb
 - lib/glimmer/dsl/libui/bind_expression.rb
 - lib/glimmer/dsl/libui/control_expression.rb
+- lib/glimmer/dsl/libui/custom_control_expression.rb
 - lib/glimmer/dsl/libui/data_binding_expression.rb
 - lib/glimmer/dsl/libui/dsl.rb
 - lib/glimmer/dsl/libui/file_expression.rb
@@ -426,6 +465,9 @@ files:
 - lib/glimmer/libui/control_proxy/transformable.rb
 - lib/glimmer/libui/control_proxy/triple_column.rb
 - 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_window.rb
 - lib/glimmer/libui/data_bindable.rb
 - lib/glimmer/libui/image_path_renderer.rb
 - lib/glimmer/libui/parent.rb
@@ -440,6 +482,7 @@ files:
 - lib/glimmer/libui/shape/polyline.rb
 - lib/glimmer/libui/shape/rectangle.rb
 - lib/glimmer/libui/shape/square.rb
+- lib/glimmer/proc_tracker.rb
 - sounds/AlanWalker-Faded.mid
 - sounds/AlanWalker-SingMeToSleep.mid
 - sounds/CalvinHarris-Blame.mid
@@ -466,7 +509,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.1
+rubygems_version: 3.3.6
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for LibUI