reflexion 0.6.0 → 0.7.0

data/include/reflex/view.h

@@ -68,7 +68,7 @@ namespace Reflex
 
 				FLAG_CLIP          = Xot::bit(0),
 
-				FLAG_CACHE         = Xot::bit(1),
+				FLAG_DRAW_CACHE    = Xot::bit(1),
 
 				FLAG_RESIZE_TO_FIT = Xot::bit(2),
 
@@ -76,7 +76,9 @@ namespace Reflex
 
 				FLAG_FIX_ANGLE     = Xot::bit(4),
 
-				FLAG_LAST          = FLAG_FIX_ANGLE
+				FLAG_TEXT_INPUT    = Xot::bit(5),
+
+				FLAG_LAST          = FLAG_TEXT_INPUT
 
 			};// Flag
 
@@ -117,6 +119,14 @@ namespace Reflex
 
 			virtual void update_layout ();
 
+			virtual void fit_to_content ();
+
+			virtual Bounds      content_bounds () const;
+
+			virtual bool accepts_text_input () const;
+
+			virtual Bounds       text_input_bounds () const;
+
 			virtual Point from_parent (const Point& point) const;
 
 			virtual Point   to_parent (const Point& point) const;
@@ -228,10 +238,6 @@ namespace Reflex
 
 			virtual const Bounds& frame () const;
 
-			virtual Bounds      content_bounds () const;
-
-			virtual void fit_to_content ();
-
 			virtual void set_zoom (float zoom);
 
 			virtual float    zoom () const;
@@ -393,6 +399,12 @@ namespace Reflex
 
 			virtual void on_key_up   (KeyEvent* e);
 
+			virtual void on_text         (TextEvent* e);
+
+			virtual void on_text_preedit (TextEvent* e);
+
+			virtual void on_text_commit  (TextEvent* e);
+
 			virtual void on_pointer        (PointerEvent* e);
 
 			virtual void on_pointer_down   (PointerEvent* e);
@@ -409,16 +421,6 @@ namespace Reflex
 
 			virtual void on_wheel (WheelEvent* e);
 
-			virtual void on_midi (MIDIEvent* e);
-
-			virtual void on_note     (NoteEvent* e);
-
-			virtual void on_note_on  (NoteEvent* e);
-
-			virtual void on_note_off (NoteEvent* e);
-
-			virtual void on_control_change (ControlChangeEvent* e);
-
 			virtual void on_capture (CaptureEvent* e);
 
 			virtual void on_timer (TimerEvent* e);
@@ -431,6 +433,16 @@ namespace Reflex
 
 			virtual void   on_contact_end   (ContactEvent* e);
 
+			virtual void on_midi (MIDIEvent* e);
+
+			virtual void on_note     (NoteEvent* e);
+
+			virtual void on_note_on  (NoteEvent* e);
+
+			virtual void on_note_off (NoteEvent* e);
+
+			virtual void on_control_change (ControlChangeEvent* e);
+
 			virtual operator bool () const;
 
 			virtual bool operator ! () const;

data/include/reflex/window.h

@@ -34,19 +34,35 @@ namespace Reflex
 			enum Flag
 			{
 
-				FLAG_CLOSABLE    = Xot::bit(0),
+				FLAG_CLOSABLE            = Xot::bit(0),
 
-				FLAG_MINIMIZABLE = Xot::bit(1),
+				FLAG_MINIMIZABLE         = Xot::bit(1),
 
-				FLAG_RESIZABLE   = Xot::bit(2),
+				FLAG_RESIZABLE           = Xot::bit(2),
 
-				FLAG_FULLSCREEN  = Xot::bit(3),
+				FLAG_TITLEBAR_BUTTONS    = Xot::bit(3),
 
-				FLAG_PORTRAIT    = Xot::bit(4),
+				FLAG_TITLEBAR_BACKGROUND = Xot::bit(4),
 
-				FLAG_LANDSCAPE   = Xot::bit(5),
+				FLAG_UNLISTED            = Xot::bit(5),
 
-				FLAG_LAST        = FLAG_LANDSCAPE
+				FLAG_SHADOW              = Xot::bit(6),
+
+				FLAG_TRANSPARENT         = Xot::bit(7),
+
+				FLAG_FULLSCREEN          = Xot::bit(8),
+
+				FLAG_ALWAYS_ON_TOP       = Xot::bit(9),
+
+				FLAG_ALWAYS_ON_BOTTOM    = Xot::bit(10),
+
+				FLAG_POINTER_THROUGH     = Xot::bit(11),
+
+				FLAG_PORTRAIT            = Xot::bit(12),
+
+				FLAG_LANDSCAPE           = Xot::bit(13),
+
+				FLAG_LAST                = FLAG_LANDSCAPE
 
 			};// Flag
 
@@ -84,7 +100,11 @@ namespace Reflex
 
 			virtual const Menu* menu () const;
 
-			virtual void    set_flag (uint flags);
+			virtual void set_pointer_through_alpha (float alpha);
+
+			virtual float    pointer_through_alpha () const;
+
+			virtual void    set_flags (uint flags);
 
 			virtual uint        flags () const;
 
@@ -132,6 +152,12 @@ namespace Reflex
 
 			virtual void on_key_up   (KeyEvent* e);
 
+			virtual void on_text         (TextEvent* e);
+
+			virtual void on_text_preedit (TextEvent* e);
+
+			virtual void on_text_commit  (TextEvent* e);
+
 			virtual void on_pointer        (PointerEvent* e);
 
 			virtual void on_pointer_down   (PointerEvent* e);
@@ -148,6 +174,12 @@ namespace Reflex
 
 			virtual void on_wheel (WheelEvent* e);
 
+			virtual void on_file      (FileEvent* e);
+
+			virtual void on_file_open (FileEvent* e);
+
+			virtual void on_file_save (FileEvent* e);
+
 			virtual void on_midi (MIDIEvent* e);
 
 			virtual void on_note     (NoteEvent* e);

data/include/reflex.h

@@ -24,6 +24,9 @@
 #include <reflex/view.h>
 #include <reflex/menu.h>
 #include <reflex/screen.h>
+#include <reflex/clipboard.h>
+#include <reflex/file_dialog.h>
+#include <reflex/color_picker.h>
 
 #include <reflex/device.h>
 #include <reflex/midi.h>

data/lib/reflex/application.rb

@@ -33,11 +33,11 @@ module Reflex
 
     private
 
-      def call_start_block()
-        return unless @start_block
-        Xot::BlockUtil.instance_eval_or_block_call self, &@start_block
-        @start_block = nil
-      end
+    def call_start_block()
+      return unless @start_block
+      Xot::BlockUtil.instance_eval_or_block_call self, &@start_block
+      @start_block = nil
+    end
 
   end# Application
 

data/lib/reflex/autoinit.rb

@@ -1,6 +1,8 @@
-require 'rays/autoinit'
+# load reflex_ext before Rays.init! to set pre_init_fun
 require 'reflex/ext'
 
+require 'rays/autoinit'
+
 
 unless defined?($REFLEX_NOAUTOINIT) && $REFLEX_NOAUTOINIT
   Reflex.init!

data/lib/reflex/button.rb

@@ -63,9 +63,9 @@ module Reflex
 
     private
 
-      def pressing?()
-        capturing? :pointer
-      end
+    def pressing?()
+      capturing? :pointer
+    end
 
   end# Button
 

data/lib/reflex/color_event.rb

@@ -0,0 +1,16 @@
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class ColorEvent < Event
+
+    def inspect()
+      "#<Reflex::ColorEvent color:#{color}>"
+    end
+
+  end# ColorEvent
+
+
+end# Reflex

data/lib/reflex/color_picker.rb

@@ -0,0 +1,45 @@
+require 'xot/setter'
+require 'xot/hookable'
+require 'xot/block_util'
+require 'xot/universal_accessor'
+require 'xot/inspectable'
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class ColorPicker
+
+    include Xot::Setter
+    include Xot::Hookable
+    include Xot::Inspectable
+
+    def initialize(options = nil, &block)
+      super()
+      set options if options
+      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
+    end
+
+    universal_accessor :owner, alpha: {reader: :alpha?}
+
+    def pick_color(initial = nil, &block)
+      @color_block = block ? -> e {block.call e.color, e} : nil
+      pick_color! initial
+      self
+    end
+
+    private
+
+    def call_color_block(e)
+      @color_block&.call e
+    end
+
+    def clear_color_block()
+      @color_block = nil
+    end
+
+  end# ColorPicker
+
+
+end# Reflex

data/lib/reflex/control_change_event.rb

@@ -0,0 +1,17 @@
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class ControlChangeEvent < Event
+
+    def inspect()
+      "#<Reflex::ControlChangeEvent channel:%d controller:%d value:%f time:%f captured?:%s>" %
+        [channel, controller, value, time, captured?]
+    end
+
+  end# ControlChangeEvent
+
+
+end# Reflex

data/lib/reflex/file_dialog.rb

@@ -0,0 +1,70 @@
+require 'xot/setter'
+require 'xot/hookable'
+require 'xot/block_util'
+require 'xot/universal_accessor'
+require 'xot/inspectable'
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class FileDialog
+
+    include Xot::Setter
+    include Xot::Hookable
+    include Xot::Inspectable
+
+    def initialize(options = nil, &block)
+      super()
+      set options if options
+      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
+    end
+
+    universal_accessor :owner, :title, :extensions
+
+    def open_file(dir = nil, &block)
+      @file_block = block ? -> e {block.call e.paths.first, e} : nil
+      open_file! expand(dir)
+      self
+    end
+
+    def open_files(dir = nil, &block)
+      @file_block = block ? -> e {block.call e.paths, e} : nil
+      open_files! expand(dir)
+      self
+    end
+
+    def open_directory(dir = nil, &block)
+      @file_block = block ? -> e {block.call e.paths.first, e} : nil
+      open_directory! expand(dir)
+      self
+    end
+
+    def save_file(dir = nil, name: nil, &block)
+      @file_block = block ? -> e {block.call e.paths.first, e} : nil
+      save_file! expand(dir), name
+      self
+    end
+
+    alias open_dir open_directory
+
+    private
+
+    def expand(dir)
+      dir ? File.expand_path(dir.to_s) : nil
+    end
+
+    def call_file_block(e)
+      block, @file_block = @file_block, nil
+      block&.call e
+    end
+
+    def call_cancel_block()
+      @file_block = nil
+    end
+
+  end# FileDialog
+
+
+end# Reflex

data/lib/reflex/file_event.rb

@@ -0,0 +1,37 @@
+require 'xot/const_symbol_accessor'
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class FileEvent < Event
+
+    alias get_action action
+
+    const_symbol_reader :action, **{
+      none: ACTION_NONE,
+      open: FileEvent::OPEN,
+      save: FileEvent::SAVE
+    }
+
+    def path()
+      paths.first
+    end
+
+    def open?()
+      get_action == FileEvent::OPEN
+    end
+
+    def save?()
+      get_action == FileEvent::SAVE
+    end
+
+    def inspect()
+      "#<Reflex::FileEvent #{action} paths:#{paths}>"
+    end
+
+  end# FileEvent
+
+
+end# Reflex

data/lib/reflex/helper.rb

@@ -2,6 +2,7 @@ require 'xot/universal_accessor'
 require 'reflex/ext'
 require 'reflex/point'
 require 'reflex/bounds'
+require 'reflex/text_event'
 
 
 module Reflex
@@ -19,19 +20,16 @@ module Reflex
     numpad:   MOD_NUMPAD,
     caps:     MOD_CAPS,
     scroll:   MOD_SCROLL
-  }
+  }.freeze
 
   SHORTCUT_MODIFIER_SYMBOLS = MODIFIER_SYMBOLS.slice(
     :shift,
     :control,
     :alt,
+    :win,
     :option,
-    :command)
-
-  LOCK_MODIFIER_SYMBOLS = MODIFIER_SYMBOLS.slice(
-    :numpad,
-    :caps,
-    :scroll)
+    :command
+  ).freeze
 
 
   module HasFrame
@@ -112,4 +110,57 @@ module Reflex
   end# HasTags
 
 
+  # keeps the text being composed by the input method. defining the hooks
+  # below is also what lets the view accept text input.
+  module HasTextPreedit
+
+    def preedit()
+      @preedit ||= ''
+    end
+
+    def preedit_selection()
+      @preedit_selection
+    end
+
+    def preedit?()
+      !preedit.empty?
+    end
+
+    def on_text_preedit(e)
+      @preedit, @preedit_selection = e.text, e.selection
+      redraw
+    end
+
+    def on_text_commit(e)
+      return unless preedit?
+
+      @preedit, @preedit_selection = '', nil
+      redraw
+    end
+
+    # draws the composing text underlined, with a double underline under the
+    # clause being converted, in the painter's current font and fill color.
+    def draw_preedit(painter, x, y, height: nil)
+      return unless preedit?
+
+      font     = painter.font
+      height ||= font.height
+      width    = font.width preedit
+      uy       = y + height - 1
+
+      painter.push stroke: painter.fill do |p|
+        p.text preedit, x, y
+        p.line x, uy, x + width, uy
+
+        if preedit_selection
+          sx = x + font.width(preedit[0...preedit_selection.begin] || '')
+          sw =     font.width(preedit[preedit_selection]           || '')
+          p.line sx, uy - 2, sx + sw, uy - 2
+        end
+      end
+    end
+
+  end# HasTextPreedit
+
+
 end# Reflex

data/lib/reflex/key_event.rb

@@ -20,8 +20,12 @@ 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 key()
+      Reflex.get_key_symbol! code
     end
 
     def down?()
@@ -37,12 +41,13 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::KeyEvent action:%s chars:%s key:%s code:0x%X mod:%s repeat:%d captured?:%s>" % [
+      "#<Reflex::KeyEvent %p chars:%s key:%s code:0x%X mod:%p repeat:%d captured?:%p>" %
+      [
         action,
         chars ? "'#{chars}'" : :nil,
         key ? key : :nil,
         code,
-        modifiers.join(','),
+        modifiers(all: true),
         repeat,
         captured?
       ]

data/lib/reflex/menu.rb

@@ -20,7 +20,7 @@ module Reflex
     def initialize(label = nil, **options, &block)
       super()
       self.label = label if label
-      set **options unless options.empty?
+      set(**options) unless options.empty?
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
@@ -55,6 +55,15 @@ module Reflex
 
     bit_flag_accessor :shortcut_modifiers, **SHORTCUT_MODIFIER_SYMBOLS
 
+    def shortcut_key=(key)
+      key = sym2key(key) if key.is_a? Symbol
+      set_shortcut_key! key
+    end
+
+    def shortcut_key()
+      Reflex.get_key_symbol! shortcut_key!
+    end
+
     universal_accessor :label, :image, :shortcut_key, :shortcut_modifiers
 
     def each(&block)
@@ -70,6 +79,13 @@ module Reflex
       "#<Reflex::Menu label:#{label.inspect} size:#{size}>"
     end
 
+    private
+
+    def sym2key(sym)
+      KEYS.find {sym == Reflex.get_key_symbol!(_1)} ||
+        raise(ArgumentError, "unknown shortcut key: #{sym.inspect}")
+    end
+
   end# Menu
 
 

data/lib/reflex/model.rb

@@ -110,35 +110,35 @@ module Reflex
 
     private
 
-      INT_SYMS       = [:to_i, :to_int]
+    INT_SYMS       = [:to_i, :to_int]
 
-      FLOAT_SYMS     = [:to_f, :to_float]
+    FLOAT_SYMS     = [:to_f, :to_float]
 
-      STRING_SYMS    = [:to_s, :to_str, :to_string]
+    STRING_SYMS    = [:to_s, :to_str, :to_string]
 
-      ARRAY_GET_SYMS = [:[], :at]
+    ARRAY_GET_SYMS = [:[], :at]
 
-      ARRAY_SET_SYMS = [:[]=, :set_at]
+    ARRAY_SET_SYMS = [:[]=, :set_at]
 
-      ARRAY_SIZE_SYMS = [:size, :length]
+    ARRAY_SIZE_SYMS = [:size, :length]
 
-      def apply_filters(data)
-        return data unless @filters
-        @filters.each do |filter|
-          break if data.nil?
-          data = filter.call data
-        end
-        data
+    def apply_filters(data)
+      return data unless @filters
+      @filters.each do |filter|
+        break if data.nil?
+        data = filter.call data
       end
+      data
+    end
 
-      def call_symbols(symbols, *args)
-        if dat = data
-          symbols.each do |symbol|
-            return dat.send symbol, *args if dat.respond_to? symbol
-          end
+    def call_symbols(symbols, *args)
+      if dat = data
+        symbols.each do |symbol|
+          return dat.send symbol, *args if dat.respond_to? symbol
         end
-        nil
       end
+      nil
+    end
 
   end# Model
 

data/lib/reflex/note_event.rb

@@ -24,7 +24,7 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::NoteEvent action:%s channel:%d note:%d vel:0f time:%f captured?:%s>" %
+      "#<Reflex::NoteEvent action:%s channel:%d note:%d vel:%f time:%f captured?:%s>" %
         [action, channel, note, velocity, time, captured?]
     end
 

data/lib/reflex/pointer.rb

@@ -38,8 +38,8 @@ 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 mouse?()
@@ -113,7 +113,18 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::Pointer id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
+      "#<Reflex::Pointer id:%d %p %p (%p, %p) mod:%p click:%d drag:%p time:%p>" %
+      [
+        id,
+        types,
+        action,
+        x.round(2),
+        y.round(2),
+        modifiers(all: true),
+        click_count,
+        drag?,
+        time.round(2)
+      ]
     end
 
   end# Pointer

data/lib/reflex/pointer_event.rb

@@ -24,7 +24,18 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::PointerEvent id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
+      "#<Reflex::PointerEvent id:%d %p %p (%p, %p) mod:%p click:%d drag:%p time:%p>" %
+      [
+        id,
+        types,
+        action,
+        x.round(2),
+        y.round(2),
+        modifiers(all: true),
+        click_count,
+        drag?,
+        time.round(2)
+      ]
     end
 
   end# PointerEvent