reflexion 0.6.0 → 0.7.0

data/lib/reflex/reflex.rb

@@ -19,6 +19,11 @@ module Reflex
       Window.new(*args, &block).tap {|w| w.show}
     end
 
+    def alert(message, title: nil)
+      utf8 = -> s {s.to_s.encode Encoding::UTF_8, invalid: :replace, undef: :replace}
+      alert! utf8[message], title&.then(&utf8)
+    end
+
     self
 
   end# ClassMethods

data/lib/reflex/shape.rb

@@ -39,20 +39,20 @@ module Reflex
 
     private
 
-      def on_contact!(*args)
-        call_contact!(*args)
-        owner&.delay {on_contact(*args)}# delay to avoid physics world lock
-      end
-
-      def on_contact_begin!(*args)
-        call_contact_begin!(*args)
-        owner&.delay {on_contact_begin(*args)}
-      end
-
-      def on_contact_end!(*args)
-        call_contact_end!(*args)
-        owner&.delay {on_contact_end(*args)}
-      end
+    def on_contact!(*args)
+      call_contact!(*args)
+      owner&.delay {on_contact(*args)}# delay to avoid physics world lock
+    end
+
+    def on_contact_begin!(*args)
+      call_contact_begin!(*args)
+      owner&.delay {on_contact_begin(*args)}
+    end
+
+    def on_contact_end!(*args)
+      call_contact_end!(*args)
+      owner&.delay {on_contact_end(*args)}
+    end
 
   end# Shape
 

data/lib/reflex/style.rb

@@ -110,23 +110,23 @@ module Reflex
 
     private
 
-      SYM2FLOW = {
-        none:  FLOW_NONE,
-        down:  FLOW_DOWN,
-        right: FLOW_RIGHT,
-        up:    FLOW_UP,
-        left:  FLOW_LEFT,
-      }
-
-      FLOW2SYM = SYM2FLOW.inject({}) {|h, (k, v)| h[v] = k; h}
-
-      def sym2flow(sym)
-        SYM2FLOW[sym] || FLOW_NONE
-      end
+    SYM2FLOW = {
+      none:  FLOW_NONE,
+      down:  FLOW_DOWN,
+      right: FLOW_RIGHT,
+      up:    FLOW_UP,
+      left:  FLOW_LEFT,
+    }
+
+    FLOW2SYM = SYM2FLOW.inject({}) {|h, (k, v)| h[v] = k; h}
+
+    def sym2flow(sym)
+      SYM2FLOW[sym] || FLOW_NONE
+    end
 
-      def flow2sym(flow)
-        FLOW2SYM[flow] || :none
-      end
+    def flow2sym(flow)
+      FLOW2SYM[flow] || :none
+    end
 
   end# Style
 

data/lib/reflex/text_event.rb

@@ -0,0 +1,40 @@
+require 'xot/const_symbol_accessor'
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class TextEvent < Event
+
+    alias get_action action
+
+    const_symbol_reader :action, **{
+      none:    ACTION_NONE,
+      preedit: PREEDIT,
+      commit:  COMMIT
+    }
+
+    def preedit?()
+      get_action == PREEDIT
+    end
+
+    def commit?()
+      get_action == COMMIT
+    end
+
+    def selection()
+      offset = selection_offset!
+      return nil if offset < 0
+      offset...(offset + selection_size!)
+    end
+
+    def inspect()
+      "#<Reflex::TextEvent action:%s text:'%s' selection:%s>" %
+        [action, text, selection || :nil]
+    end
+
+  end# TextEvent
+
+
+end# Reflex

data/lib/reflex/timer.rb

@@ -17,9 +17,9 @@ module Reflex
 
     private
 
-      def call_timer_block()
-        @block.call self if @block
-      end
+    def call_timer_block()
+      @block.call self if @block
+    end
 
   end# Timer
 

data/lib/reflex/view.rb

@@ -162,6 +162,21 @@ module Reflex
       end
     end
 
+    # true or false to force, nil to decide by the presence of an on_text handler.
+    def text_input=(state)
+      @text_input = state
+      set_text_input_flag! !!state
+    end
+
+    attr_reader :text_input
+
+    def accepts_text_input?()
+      return false if hidden?
+      return text_input_flag! unless @text_input.nil?
+      %i[on_text on_text_preedit on_text_commit]
+        .any? {|name| method(name).owner != Reflex::View}
+    end
+
     def on_contact(e)
     end
 
@@ -172,12 +187,12 @@ module Reflex
     end
 
     universal_accessor :shape, :name, :selector,
-      :frame, :angle, :pivot, :zoom, :capture,
+      :frame, :angle, :pivot, :zoom, :capture, :text_input,
       :density, :friction, :restitution,
       :linear_velocity, :angular_velocity, :gravity_scale,
       :gravity, :time_scale,
       clip:          {reader: :clip?},
-      cache:         {reader: :cache?},
+      draw_cache:    {reader: :draw_cache?},
       resize_to_fit: {reader: :resize_to_fit?},
       scroll_to_fit: {reader: :scroll_to_fit?},
       fix_angle:     {reader: :fix_angle?},
@@ -202,20 +217,20 @@ module Reflex
 
     private
 
-      def on_contact!(*args)
-        call_contact!(*args)
-        delay {on_contact(*args)}# delay to avoid physics world lock
-      end
+    def on_contact!(*args)
+      call_contact!(*args)
+      delay {on_contact(*args)}# delay to avoid physics world lock
+    end
 
-      def on_contact_begin!(*args)
-        call_contact_begin!(*args)
-        delay {on_contact_begin(*args)}
-      end
+    def on_contact_begin!(*args)
+      call_contact_begin!(*args)
+      delay {on_contact_begin(*args)}
+    end
 
-      def on_contact_end!(*args)
-        call_contact_end!(*args)
-        delay {on_contact_end(*args)}
-      end
+    def on_contact_end!(*args)
+      call_contact_end!(*args)
+      delay {on_contact_end(*args)}
+    end
 
   end# View
 

data/lib/reflex/wheel_event.rb

@@ -11,12 +11,21 @@ module Reflex
     bit_flag_reader :modifiers, **MODIFIER_SYMBOLS
     private alias_method :get_modifiers!, :modifiers
 
-    def modifiers(locks: true)
-      locks ? get_modifiers! : (get_modifiers! - LOCK_MODIFIER_SYMBOLS.keys)
+    def modifiers(all: false)
+      all ? get_modifiers! : (get_modifiers!.select {SHORTCUT_MODIFIER_SYMBOLS.key? _1})
     end
 
     def inspect()
-      "#<Reflex::WheelEvent x:#{x} y:#{y} z:#{z} dx:#{dx} dy:#{dy} dz:#{dz} mod:#{modifiers}>"
+      "#<Reflex::WheelEvent x:%p y:%p z:%p dx:%p dy:%p dz:%p mod:%p>" %
+      [
+        x.round(2),
+        y.round(2),
+        z.round(2),
+        dx.round(2),
+        dy.round(2),
+        dz.round(2),
+        modifiers(all: true)
+      ]
     end
 
   end# WheelEvent

data/lib/reflex/window.rb

@@ -21,6 +21,11 @@ module Reflex
 
     extend Forwardable
 
+    bit_flag_accessor :titlebar do
+      flag :buttons,    TITLEBAR_BUTTONS
+      flag :background, TITLEBAR_BACKGROUND
+    end
+
     bit_flag_accessor :orientations do
       flag :portrait,  ORIENTATION_PORTRAIT
       flag :landscape, ORIENTATION_LANDSCAPE
@@ -35,11 +40,11 @@ module Reflex
       :timeout, :delay, :interval,
       :meter2pixel, :meter, :wall,
       :zoom=,       :zoom,
-      :clip=,       :clip,  :clip?,
-      :cache=,      :cache, :cache?,
+      :clip=,       :clip,       :clip?,
+      :draw_cache=, :draw_cache, :draw_cache?,
       :gravity=,    :gravity,
       :time_scale=, :time_scale,
-      :debug=,      :debug, :debug?
+      :debug=,      :debug,      :debug?
 
     def_delegators :style,
       :flow=,                    :flow,
@@ -68,11 +73,18 @@ module Reflex
       :friction=,    :friction,
       :restitution=, :restitution
 
-    universal_accessor :title, :frame,
-      closable:    {reader: :closable?},
-      minimizable: {reader: :minimizable?},
-      resizable:   {reader: :resizable?},
-      fullscreen:  {reader: :fullscreen?}
+    universal_accessor :title, :frame, :titlebar,
+      :pointer_through_alpha, :orientations,
+      closable:         {reader: :closable?},
+      minimizable:      {reader: :minimizable?},
+      resizable:        {reader: :resizable?},
+      unlisted:         {reader: :unlisted?},
+      shadow:           {reader: :shadow?},
+      transparent:      {reader: :transparent?},
+      fullscreen:       {reader: :fullscreen?},
+      always_on_top:    {reader: :always_on_top?},
+      always_on_bottom: {reader: :always_on_bottom?},
+      pointer_through:  {reader: :pointer_through?}
 
     def initialize(options = nil, &block)
       super()
@@ -90,11 +102,11 @@ module Reflex
 
     private
 
-      def call_show_block()
-        return unless @show_block
-        Xot::BlockUtil.instance_eval_or_block_call self, &@show_block
-        @show_block = nil
-      end
+    def call_show_block()
+      return unless @show_block
+      Xot::BlockUtil.instance_eval_or_block_call self, &@show_block
+      @show_block = nil
+    end
 
   end# Window
 

data/lib/reflex.rb

@@ -31,13 +31,17 @@ require 'reflex/frame_event'
 require 'reflex/scroll_event'
 require 'reflex/focus_event'
 require 'reflex/key_event'
+require 'reflex/text_event'
 require 'reflex/pointer_event'
 require 'reflex/wheel_event'
-require 'reflex/midi_event'
-require 'reflex/note_event'
 require 'reflex/capture_event'
 require 'reflex/timer_event'
 require 'reflex/contact_event'
+require 'reflex/file_event'
+require 'reflex/color_event'
+require 'reflex/midi_event'
+require 'reflex/note_event'
+require 'reflex/control_change_event'
 
 require 'reflex/shape'
 require 'reflex/polygon_shape'
@@ -61,6 +65,8 @@ require 'reflex/view'
 require 'reflex/menu'
 require 'reflex/screen'
 require 'reflex/clipboard'
+require 'reflex/file_dialog'
+require 'reflex/color_picker'
 
 require 'reflex/button'
 require 'reflex/text_view'

data/reflex.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   ext   = Reflex::Extension
   name  = ext.name true
-  rdocs = glob.call *%w[README .doc/ext/**/*.cpp]
+  rdocs = glob.call(*%w[README .doc/ext/**/*.cpp])
 
   s.name        = "#{name}ion"
   s.version     = ext.version
@@ -25,9 +25,9 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'xot',   '~> 0.4.0'
-  s.add_dependency 'rucy',  '~> 0.4.0'
-  s.add_dependency 'rays',  '~> 0.4.0'
+  s.add_dependency 'xot',   '~> 0.5.0'
+  s.add_dependency 'rucy',  '~> 0.5.0'
+  s.add_dependency 'rays',  '~> 0.5.0'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/samples/ime.rb

@@ -0,0 +1,100 @@
+%w[xot rays reflex]
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'reflex'
+
+include Reflex
+
+
+MARGIN = 20
+
+
+# text input is enabled automatically because the text handlers are defined.
+class InputView < View
+
+  def initialize(*args, &block)
+    @text = @preedit = ''
+    @selection = nil
+    super
+  end
+
+  def on_text_preedit(e)
+    @preedit, @selection = e.text, e.selection
+    redraw
+  end
+
+  def on_text_commit(e)
+    @text += e.text
+    @preedit, @selection = '', nil
+    redraw
+  end
+
+  # tells the input method where to put the candidate window.
+  def text_input_bounds()
+    f = font
+    [MARGIN + f.width(@text), MARGIN, f.width(@preedit), f.height]
+  end
+
+  def on_draw(e)
+    f, p = font, e.painter
+    x, y = MARGIN, MARGIN
+
+    p.fill 1
+    p.text @text, x, y
+    x += f.width(@text)
+
+    unless @preedit.empty?
+      # keep the underlines just below the baseline, or the candidate window
+      # (which opens at the bottom of text_input_bounds) hides them.
+      uy = y + f.ascent + 2
+
+      p.text @preedit, x, y
+      underline p, x, uy, f.width(@preedit)
+
+      if @selection
+        # emphasize the clause being converted.
+        sx = x + f.width(@preedit[0...@selection.begin] || '')
+        underline p, sx, uy + 3, f.width(@preedit[@selection] || '')
+      end
+    end
+
+    p.text "|", caret_x(f, x), y
+  end
+
+  private
+
+  def font()
+    window.painter.font
+  end
+
+  # the caret follows the clause being converted, or the end of the preedit.
+  def caret_x(font, preedit_x)
+    return preedit_x if @preedit.empty?
+
+    count = @selection ? @selection.end : @preedit.size
+    preedit_x + font.width(@preedit[0...count] || '')
+  end
+
+  def underline(painter, x, y, width)
+    painter.push stroke: 1 do
+      painter.line x, y, x + width, y
+    end
+  end
+
+end# InputView
+
+
+win = Window.new do
+  set title: 'Reflex IME Sample', frame: [100, 100, 600, 200]
+  painter.background 0.1
+  painter.font = Font.new nil, 24
+
+  add input = InputView.new(name: :input)
+  input.focus
+end
+
+
+Reflex.start do
+  win.show
+end