reflexion 0.5.2 → 0.6.0

data/lib/reflex/key_event.rb

@@ -1,6 +1,7 @@
 require 'xot/bit_flag_accessor'
 require 'xot/const_symbol_accessor'
 require 'reflex/ext'
+require 'reflex/helper'
 
 
 module Reflex
@@ -16,18 +17,12 @@ module Reflex
       up:   UP
     }
 
-    bit_flag_reader :modifiers, **{
-      shift:    MOD_SHIFT,
-      control:  MOD_CONTROL,
-      alt:      MOD_ALT,
-      win:      MOD_WIN,
-      option:   MOD_OPTION,
-      command:  MOD_COMMAND,
-      help:     MOD_HELP,
-      function: MOD_FUNCTION,
-      numpad:   MOD_NUMPAD,
-      caps:     MOD_CAPS,
-    }
+    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)
+    end
 
     def down?()
       get_action == DOWN

data/lib/reflex/link_constraint.rb

@@ -0,0 +1,31 @@
+require 'reflex/ext'
+require 'reflex/constraint'
+
+
+module Reflex
+
+
+  class LinkConstraint < Constraint
+
+    def range=(range)
+      case range
+      when nil     then clear_range!
+      when Range   then set_range! range.begin, range.end
+      when Numeric then set_range! range,       range
+      else raise ArgumentError, "invalid range: #{range.inspect}"
+      end
+    end
+
+    def range()
+      has_range! ? Range.new(range_min!, range_max!) : nil
+    end
+
+    universal_accessor :axis, :distance, :range, :motor, :force
+
+    alias dist= distance=
+    alias dist  distance
+
+  end# LinkConstraint
+
+
+end# Reflex

data/lib/reflex/menu.rb

@@ -0,0 +1,76 @@
+require 'forwardable'
+require 'xot/setter'
+require 'xot/bit_flag_accessor'
+require 'xot/universal_accessor'
+require 'xot/hookable'
+require 'xot/block_util'
+require 'reflex/ext'
+require 'reflex/helper'
+
+
+module Reflex
+
+
+  class Menu
+
+    include Enumerable
+    include Xot::Setter
+    include Xot::Hookable
+
+    def initialize(label = nil, **options, &block)
+      super()
+      self.label = label if label
+      set **options unless options.empty?
+      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
+    end
+
+    def add_child(child, index: nil)
+      add_child! child, index
+    end
+
+    alias add       add_child
+    alias remove remove_child
+
+    def enable(bool = true)
+      enable! bool
+    end
+
+    def disable()
+      enable! false
+    end
+
+    def check(bool = true)
+      check! bool
+    end
+
+    def uncheck()
+      check! false
+    end
+
+    def shortcut=(key_and_modifiers)
+      key, *mods = key_and_modifiers
+      self.shortcut_key       = key
+      self.shortcut_modifiers = mods
+    end
+
+    bit_flag_accessor :shortcut_modifiers, **SHORTCUT_MODIFIER_SYMBOLS
+
+    universal_accessor :label, :image, :shortcut_key, :shortcut_modifiers
+
+    def each(&block)
+      return enum_for :each unless block
+      each!(&block)
+    end
+
+    def children()
+      to_a
+    end
+
+    def inspect()
+      "#<Reflex::Menu label:#{label.inspect} size:#{size}>"
+    end
+
+  end# Menu
+
+
+end# Reflex

data/lib/reflex/pin.rb

@@ -0,0 +1,39 @@
+require 'xot/block_util'
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class Pin
+
+    def snap(*args, **options, &block)
+      setup__ snap!(*args), options, block
+    end
+
+    def link(*args, **options, &block)
+      setup__ link!(*args), options, block
+    end
+
+    def wheel(*args, **options, &block)
+      setup__ wheel!(*args), options, block
+    end
+
+    def chase(*args, **options, &block)
+      setup__ chase!(*args), options, block
+    end
+
+    alias pos position
+
+    private
+
+    def setup__(constraint, options, block)
+      constraint.set options unless options.empty?
+      Xot::BlockUtil.instance_eval_or_block_call constraint, &block if block
+      constraint
+    end
+
+  end# Pin
+
+
+end# Reflex

data/lib/reflex/pointer.rb

@@ -1,6 +1,7 @@
 require 'xot/bit_flag_accessor'
 require 'xot/const_symbol_accessor'
 require 'reflex/ext'
+require 'reflex/helper'
 
 
 module Reflex
@@ -29,9 +30,18 @@ module Reflex
       up:     UP,
       move:   MOVE,
       cancel: CANCEL,
+      enter:  ENTER,
+      leave:  LEAVE,
       stay:   STAY
     }
 
+    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)
+    end
+
     def mouse?()
       (get_types & MOUSE) != 0
     end
@@ -76,6 +86,14 @@ module Reflex
       get_action == CANCEL
     end
 
+    def enter?()
+      get_action == ENTER
+    end
+
+    def leave?()
+      get_action == LEAVE
+    end
+
     def stay?()
       get_action == STAY
     end

data/lib/reflex/pointer_event.rb

@@ -15,7 +15,7 @@ module Reflex
       :id,
       :types, :mouse?, :touch?, :pen?,
       :mouse_left?, :left?, :mouse_right?, :right?, :mouse_middle?, :middle?,
-      :action, :down?, :up?, :move?, :cancel?, :stay?,
+      :action, :down?, :up?, :move?, :cancel?, :enter?, :leave?, :stay?,
       :position, :pos, :x, :y, :modifiers, :click_count, :drag?,
       :time, :prev, :down
 

data/lib/reflex/snap_constraint.rb

@@ -0,0 +1,28 @@
+require 'reflex/ext'
+require 'reflex/constraint'
+
+
+module Reflex
+
+
+  class SnapConstraint < Constraint
+
+    def angle=(angle)
+      case angle
+      when nil     then clear_angle!
+      when Range   then set_angle! angle.begin, angle.end
+      when Numeric then set_angle! angle,       angle
+      else raise ArgumentError, "invalid angle: #{angle.inspect}"
+      end
+    end
+
+    def angle()
+      has_angle! ? Range.new(angle_min!, angle_max!) : nil
+    end
+
+    universal_accessor :angle, :motor, :force
+
+  end# SnapConstraint
+
+
+end# Reflex

data/lib/reflex/view.rb

@@ -60,7 +60,7 @@ module Reflex
     end
 
     def timeout(seconds = 0, count: 1, &block)
-      timer = start_timer seconds, count
+      timer = start_timer! seconds, count
       timer.block = block if block
       timer
     end
@@ -73,6 +73,10 @@ module Reflex
       timeout seconds, &block
     end
 
+    def add_child(child, index: nil)
+      add_child! child, index
+    end
+
     def remove_self()
       parent.remove self if parent
     end
@@ -81,12 +85,22 @@ module Reflex
       find_children(*args).first
     end
 
+    def each_child(&block)
+      return enum_for :each_child unless block
+      each_child!(&block)
+    end
+
     def children()
-      to_enum :each_child
+      each_child.to_a
+    end
+
+    def each_style(&block)
+      return enum_for :each_style unless block
+      each_style!(&block)
     end
 
     def styles()
-      to_enum :each_style
+      each_style.to_a
     end
 
     def style(*args, &block)
@@ -95,8 +109,46 @@ module Reflex
       s
     end
 
+    def each_shape(&block)
+      return enum_for :each_shape unless block
+      each_shape!(&block)
+    end
+
+    def add_shape(shape, index: nil)
+      add_shape! shape, index
+    end
+
     def shapes()
-      to_enum :each_shape
+      each_shape.to_a
+    end
+
+    def pin(*args)
+      Pin.new self, *args
+    end
+
+    def snap(*args, **options, &block)
+      pin.snap(*args, **options, &block)
+    end
+
+    def link(*args, **options, &block)
+      pin.link(*args, **options, &block)
+    end
+
+    def wheel(*args, **options, &block)
+      pin.wheel(*args, **options, &block)
+    end
+
+    def chase(*args, **options, &block)
+      pin.chase(*args, **options, &block)
+    end
+
+    def each_constraint(&block)
+      return enum_for :each_constraint unless block
+      each_constraint!(&block)
+    end
+
+    def constraints()
+      each_constraint.to_a
     end
 
     def capturing?(*args)

data/lib/reflex/wheel_constraint.rb

@@ -0,0 +1,28 @@
+require 'reflex/ext'
+require 'reflex/constraint'
+
+
+module Reflex
+
+
+  class WheelConstraint < Constraint
+
+    def range=(range)
+      case range
+      when nil     then clear_range!
+      when Range   then set_range! range.begin, range.end
+      when Numeric then set_range! range,       range
+      else raise ArgumentError, "invalid range: #{range.inspect}"
+      end
+    end
+
+    def range()
+      has_range! ? Range.new(range_min!, range_max!) : nil
+    end
+
+    universal_accessor :axis, :range, :motor, :force
+
+  end# WheelConstraint
+
+
+end# Reflex

data/lib/reflex/wheel_event.rb

@@ -1,4 +1,6 @@
+require 'xot/bit_flag_accessor'
 require 'reflex/ext'
+require 'reflex/helper'
 
 
 module Reflex
@@ -6,6 +8,13 @@ module Reflex
 
   class WheelEvent < Event
 
+    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)
+    end
+
     def inspect()
       "#<Reflex::WheelEvent x:#{x} y:#{y} z:#{z} dx:#{dx} dy:#{dy} dz:#{dz} mod:#{modifiers}>"
     end

data/lib/reflex.rb

@@ -25,12 +25,6 @@ require 'reflex/style_length'
 require 'reflex/timer'
 require 'reflex/filter'
 
-require 'reflex/shape'
-require 'reflex/polygon_shape'
-require 'reflex/line_shape'
-require 'reflex/rect_shape'
-require 'reflex/ellipse_shape'
-
 require 'reflex/update_event'
 require 'reflex/draw_event'
 require 'reflex/frame_event'
@@ -45,13 +39,28 @@ require 'reflex/capture_event'
 require 'reflex/timer_event'
 require 'reflex/contact_event'
 
+require 'reflex/shape'
+require 'reflex/polygon_shape'
+require 'reflex/line_shape'
+require 'reflex/rect_shape'
+require 'reflex/ellipse_shape'
+
+require 'reflex/pin'
+require 'reflex/constraint'
+require 'reflex/snap_constraint'
+require 'reflex/link_constraint'
+require 'reflex/wheel_constraint'
+require 'reflex/chase_constraint'
+
 require 'reflex/model'
 require 'reflex/model_owner'
 
 require 'reflex/application'
 require 'reflex/window'
 require 'reflex/view'
+require 'reflex/menu'
 require 'reflex/screen'
+require 'reflex/clipboard'
 
 require 'reflex/button'
 require 'reflex/text_view'

data/pod.rake

@@ -3,7 +3,7 @@
 
 github  = 'https://github.com/xord'
 renames = {reflexion: 'reflex'}
-regexp  = /add\w+dependency.*['"](\w+)['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/
+regexp  = /add\w+dependency.*['"]([\w\-]+)['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/
 repos   = File.readlines('reflex.gemspec', chomp: true)
   .map {|s| regexp.match(s)&.values_at 1, 2}
   .compact
@@ -15,7 +15,9 @@ task :clobber do
   sh %( rm -rf #{repos.keys.join ' '} )
 end
 
-task :setup
+task :setup do
+  sh %( VENDOR_NOCOMPILE=1 rake vendor erb )
+end
 
 repos.each do |repo, ver|
   rakefile = "#{repo}/Rakefile"

data/reflex.gemspec

@@ -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.3.15'
-  s.add_dependency 'rucy',  '~> 0.3.15'
-  s.add_dependency 'rays',  '~> 0.3.16'
+  s.add_dependency 'xot',   '~> 0.4.0'
+  s.add_dependency 'rucy',  '~> 0.4.0'
+  s.add_dependency 'rays',  '~> 0.4.0'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/samples/constraint.rb

@@ -0,0 +1,152 @@
+%w[xot rays reflex]
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'reflex'
+
+
+Reflex.start name: "Constraint" do |app|
+  Reflex::Window.show title: app.name, frame: [100, 100, 500, 500] do
+    gravity 0, 9.8 * meter
+    #debug   true
+
+    ball = -> x, y, size_ = 30, color = :red do
+      Reflex::View.new {
+        pos        x, y
+        size       size_
+        background color
+        dynamic    true
+        shape      Reflex::EllipseShape.new(density: 1)
+      }
+    end
+
+    anchor = -> x, y do
+      Reflex::View.new {
+        pos        x, y
+        size       10
+        background :darkgray
+        static     true
+      }
+    end
+
+    # pendulum: snap the hanging ball to the anchor center
+    pivot  = add anchor.call(100, 100)
+    weight = add ball.call(160, 100, 30, :orange)
+    pivot.snap weight
+
+    # motored arm: snap with angle range and a motor
+    hinge = add anchor.call(250, 100)
+    arm   = add ball.call(250, 140, 20, :peach)
+    hinge.snap arm, angle: -60..60, motor: 90
+
+    # ground: a bumpy line the car drives over
+    ground = [[0, 480], [70, 465], [140, 482], [210, 462],
+              [280, 480], [350, 465], [420, 482], [500, 470]]
+    add Reflex::View.new {
+      pos 0, 0; size 500, 500
+      static true
+      shape  Reflex::LineShape.new.tap {|line| line.add_points(*ground.flatten)}
+    }
+
+    # car: each wheel rides on the body with a wheel joint -- a vertical rail
+    # gives suspension (spring) while the wheel spins freely, driven by a
+    # motor, so it rolls over the bumpy ground
+    body   = add Reflex::View.new {
+      pos 50, 400; size 70, 16
+      background :white
+      dynamic    true
+      shape      Reflex::RectShape.new(density: 1)
+    }
+    wheels, axles = [], []
+    [14, 56].each do |x|
+      tire = add ball.call(40 + x, 415, 20, :gray)
+      wheels << tire
+      axles  << tire.pin(10, 10).wheel(body.pin(x, 20),
+        axis: [0, 1], spring: 6, damping: 0.7, motor: 360)
+    end
+
+    # reverse the drive each time the car reaches a wall. a wheel or a body
+    # corner may touch first, so watch them all; the side check ignores the
+    # second touch when two parts hit the same wall together.
+    edge      = wall
+    mid, side = body.parent.center.x, nil
+    reverse   = lambda do |e|
+      left = body.center.x < mid
+      next if e.view != edge || left == side
+      side = left
+      axles.each {|a| a.motor = -a.motor}
+    end
+    [body, *wheels].each {|part| part.on :contact_begin, &reverse}
+
+    # spring chain: balls linked with springs
+    # (collide: true lets the nodes bump each other instead of overlapping)
+    top  = add anchor.call(400, 50)
+    prev = top
+    4.times do |i|
+      node = add ball.call(400, 90 + i * 40, 20, :green)
+      node.link prev, spring: 4, damping: 0.5, collide: true
+      prev = node
+    end
+
+    # elevator: a platform rails up and down the world on a vertical axis
+    # (a link with an axis), ping-ponging between the ends of its range
+    elevator = add Reflex::View.new {
+      pos 220, 320; size 60, 10
+      background :brown
+      dynamic    true
+      shape      Reflex::RectShape.new(density: 1)
+    }
+    elevator.gravity_scale = 0# the motor moves it, not the gravity
+    lift = elevator.pin.link axis: [0, 1], range: -60..60, motor: 30
+
+    # chaser: follows the pendulum weight with a soft spring
+    chaser = add ball.call(100, 400, 25, :blue)
+    chaser.gravity_scale = 0
+    chaser.sensor        = true# do not bump the pendulum
+    chaser.chase weight, spring: 2, damping: 1
+
+    # drag any ball with a chase constraint
+    drag = nil
+    on :pointer do |e|
+      case
+      when e.down?
+        # hit test in each view's local space to respect rotation, and
+        # prefer the topmost (= last added) view
+        hit = children.to_a.reverse.find do |c|
+          next false unless c.dynamic?
+          p = c.from_parent e.pos
+          p.x.between?(0, c.frame.w) && p.y.between?(0, c.frame.h)
+        end
+        if hit
+          # pause the elevator drive, or the motor overpowers the drag
+          lift.motor = nil if hit == elevator
+          # grab the view at the clicked point, not at its center
+          drag = hit.pin(hit.from_parent e.pos).chase e.pos,
+            spring: 5, damping: 0.7
+        end
+      when e.drag?
+        drag.target = e.pos if drag
+      when e.up?
+        drag&.remove
+        drag = nil
+        lift.motor ||= 30# resume the elevator drive
+      end
+    end
+
+    after :on_draw do |e|
+      # reverse the elevator at the ends of its range (nil while dragging)
+      if lift.motor
+        lift.motor = -lift.motor.abs if lift.current_distance >=  55
+        lift.motor =  lift.motor.abs if lift.current_distance <= -55
+      end
+
+      e.painter.push do
+        stroke :gray
+        ground.each_cons(2) {|a, b| line a[0], a[1], b[0], b[1]}
+        no_stroke
+        fill :white
+        text "#{e.fps.to_i} FPS - drag a ball to chase the pointer", 10, 10
+      end
+    end
+  end
+end

data/samples/menu.rb

@@ -0,0 +1,29 @@
+%w[xot rays reflex]
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'xot/util'
+require 'reflex'
+
+icon = Rays::Image.new(8, 8).paint {fill :red; ellipse 0, 0, 8}
+
+Reflex.start do
+  app_menu = Reflex::Application.instance.menu || Reflex::Menu.new
+  file     = app_menu.add Reflex::Menu.new('File'), index: 1
+  hello    = file    .add Reflex::Menu.new('Hello', image: icon)
+
+  popup_menu = Reflex::Menu.new
+  cut        = popup_menu.add Reflex::Menu.new('Cut')
+  copy       = popup_menu.add Reflex::Menu.new('Copy')
+  paste      = popup_menu.add Reflex::Menu.new('Paste')
+
+  hello.on(:click) {|e| p :hello}
+  cut  .on(:click) {|e| p :cut}
+  copy .on(:click) {|e| p :copy}
+  paste.on(:click) {|e| p :paste}
+
+  win      = Reflex::Window.new title: 'Menu Test', frame: [100, 100, 400, 300]
+  win.menu = app_menu if Xot.win32?
+  win.on(:pointer_down) {|e| popup_menu.popup win.root, e.x, e.y if e.right?}
+  win.show
+end

data/src/application.cpp

@@ -32,8 +32,8 @@ namespace Reflex
 	static void
 	close_all_windows (Application* app)
 	{
-		for (auto it = app->window_begin(), end = app->window_end(); it != end; ++it)
-			(*it)->close(true);
+		for (auto& window : Application::WindowList(app->window_begin(), app->window_end()))
+			window->close(true);
 	}
 
 	void
@@ -101,6 +101,25 @@ namespace Reflex
 		return self->name.c_str();
 	}
 
+	void
+	Application::set_menu (Menu* menu)
+	{
+		self->menu = menu;
+		Application_set_menu(this, menu);
+	}
+
+	Menu*
+	Application::menu ()
+	{
+		return self->menu.get();
+	}
+
+	const Menu*
+	Application::menu () const
+	{
+		return const_cast<Application*>(this)->menu();
+	}
+
 	Application::window_iterator
 	Application::window_begin ()
 	{