reflexion 0.2 → 0.2.1

data/src/window.h

@@ -5,6 +5,7 @@
 
 
 #include <vector>
+#include <list>
 #include <map>
 #include <xot/time.h>
 #include <rays/point.h>
@@ -18,6 +19,9 @@ namespace Reflex
 {
 
 
+	typedef std::list<Pointer> PointerList;
+
+
 	enum {CAPTURE_ALL = INT_MAX};
 
 
@@ -39,7 +43,7 @@ namespace Reflex
 
 		int hide_count = 1;
 
-		bool redraw = true;
+		bool redraw    = true;
 
 		Painter painter;
 
@@ -51,6 +55,12 @@ namespace Reflex
 
 		CaptureMap captures;
 
+		int next_pointer_id = 1;
+
+		Pointer prev_mouse_pointer;
+
+		PointerList prev_pointers;
+
 		uint flags;
 
 		Data ();
@@ -97,6 +107,8 @@ namespace Reflex
 
 	void Window_set_flags (Window* window, uint flags);
 
+	float Window_get_pixel_density (const Window& window);
+
 	void Window_set_focus (Window* window, View* view);
 
 	void Window_register_capture (
@@ -117,8 +129,6 @@ namespace Reflex
 
 	void Window_call_wheel_event      (Window* window, WheelEvent*   event);
 
-	float Window_get_pixel_density (const Window& window);
-
 
 	typedef View* (*Window_CreateRootViewFun) ();
 

data/test/helper.rb

@@ -8,9 +8,3 @@ require 'reflex'
 require 'test/unit'
 
 include Xot::Test
-
-
-unless defined?($REFLEX_NOAUTOINIT) && $REFLEX_NOAUTOINIT
-  def Rays.fin!() end
-  def Reflex.fin!() end
-end

data/test/test_key_event.rb

@@ -3,22 +3,24 @@ require_relative 'helper'
 
 class TestKeyEvent < Test::Unit::TestCase
 
+  DOWN = Reflex::KeyEvent::DOWN
+
   def event(*args)
     Reflex::KeyEvent.new(*args)
   end
 
   def test_initialize()
-    e = event Reflex::KeyEvent::DOWN, 'a', 1, 2, 3
-    assert_equal :down, e.action
-    assert_equal 'a',   e.chars
-    assert_equal 1,     e.code
-    assert_equal 2,     e.modifiers
-    assert_equal 3,     e.repeat
-    assert_false        e.captured?
+    e = event DOWN, 'a', 1, 2, 3
+    assert_equal :down,      e.action
+    assert_equal 'a',        e.chars
+    assert_equal 1,          e.code
+    assert_equal [:control], e.modifiers
+    assert_equal 3,          e.repeat
+    assert_false             e.captured?
   end
 
   def test_dup()
-    e1 = event Reflex::KeyEvent::DOWN, 'a', 1, 2, 3
+    e1 = event DOWN, 'a', 1, 2, 3
     e2 = e1.dup
     e1.block
     e3 = e1.dup
@@ -27,4 +29,11 @@ class TestKeyEvent < Test::Unit::TestCase
     assert_true  e3.blocked?
   end
 
+  def test_chars()
+    assert_equal 'foo', event(DOWN, 'foo', 1, 2, 3).chars
+
+    assert_nil event(DOWN, '',  1, 2, 3).chars
+    assert_nil event(DOWN, nil, 1, 2, 3).chars
+  end
+
 end# TestKeyEvent

data/test/test_pointer.rb

@@ -34,13 +34,13 @@ class TestPointer < Test::Unit::TestCase
     assert_nothing_raised {pointer}
 
     p = pointer(
-      id: 1, types: TOUCH, action: DOWN,
+      id: 1, types: TOUCH, action: UP,
       position: [2, 3], modifiers: 4, drag: true, click_count: 5, view_index: 6,
       time: 7)
 
     assert_equal 1,        p.id
     assert_equal [:touch], p.types
-    assert_equal :down,    p.action
+    assert_equal :up,      p.action
     assert_equal [2, 3],   p.position.to_a
     assert_equal 2,        p.x
     assert_equal 3,        p.y
@@ -134,6 +134,11 @@ class TestPointer < Test::Unit::TestCase
     assert_equal 2, pointer(position: [1, 2]).y
   end
 
+  def test_down()
+    assert_equal 1, pointer(id: 1, action: DOWN).down.id # DOWN pointer's down() returns itself
+    assert_nil      pointer(id: 2, action: UP)  .down
+  end
+
   def test_compare()
     assert_equal pointer, pointer
 

data/test/test_screen.rb

@@ -11,8 +11,4 @@ class TestScreen < Test::Unit::TestCase
     assert_raise(Reflex::ReflexError) {Reflex::Screen.new}
   end
 
-  def test_frame()
-    assert_raise(Rucy::InvalidObjectError) {screen.frame}
-  end
-
 end# TestScreen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 description: This library helps you to develop interactive graphical user interface.
 email: xordog@gmail.com
 executables: []