reflexion 0.1.43 → 0.1.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c10c73adab35ef74f8426582c0343a84873fbe71b116fd669e656b42edfee613
-  data.tar.gz: ffcf1e0fb5a0b26d3bd0dbc3a5e1627bc25ae7addbbd5dd213332f21b661e5d6
+  metadata.gz: 341401b7f3ada1fc9bcaca9dcd65829a010f6055afa95b67fad2c23230cfa741
+  data.tar.gz: b7955057b7f3fcc7a1047f16b1df64cb92015cb8c7c9e7aadee9e59c5906dee5
 SHA512:
-  metadata.gz: 7761664e1ba50fa8b10ef92c14dbeac9bfca2e4820bbe67d7f01cd44f6b7b235d06657796d567d9d3ff55bdf7e33eb911ab7dd2ea9f83dc77488c3f12771bada
-  data.tar.gz: 50ec935dcb2f5b692cab1ae3549aea533a8a2b7b4c4f89944ee92b39ca849feb7ac8f799dcf82cd8a4f066bdd2986d21489c56761f3e38acbda079e930fe677d
+  metadata.gz: 5090da288b1f24bc631490edcde601d5bff64e276b0fc4dda56c1f68f75b0595e3c8330ca4f98f4c9de49ef2ce476413548cc09b1a768fb3bbc707bc1fec38fb
+  data.tar.gz: 5b5810a8dfe254e4e35a5d15df365d46c72b1d84f844562672044cfd50f2644bcd18221f1fb116390a32ed238962e5fa3a777807293127e1d3a41d315b6fae35

data/.doc/ext/reflex/pointer.cpp

@@ -20,13 +20,13 @@ VALUE alloc(VALUE klass)
 
 static
 VALUE initialize(VALUE self, VALUE
-	id, VALUE type, VALUE action, VALUE position, VALUE modifiers, VALUE drag, VALUE click_count, VALUE view_index, VALUE time)
+	id, VALUE types, VALUE action, VALUE position, VALUE modifiers, VALUE drag, VALUE click_count, VALUE view_index, VALUE time)
 {
 	CHECK;
 
 	*THIS = Reflex::Pointer(
 		to<Reflex::Pointer::ID>(id),
-		to<uint>(type),
+		to<uint>(types),
 		(Reflex::Pointer::Action) to<int>(action),
 		to<Rays::Point>(position),
 		to<uint>(modifiers),
@@ -53,10 +53,10 @@ VALUE get_id(VALUE self)
 }
 
 static
-VALUE get_type(VALUE self)
+VALUE get_types(VALUE self)
 {
 	CHECK;
-	return value(THIS->type());
+	return value(THIS->types());
 }
 
 static
@@ -115,6 +115,13 @@ VALUE get_prev(VALUE self)
 	return value(THIS->prev());
 }
 
+static
+VALUE get_down(VALUE self)
+{
+	CHECK;
+	return value(THIS->down());
+}
+
 
 static Class cPointer;
 
@@ -128,7 +135,7 @@ Init_reflex_pointer ()
 	rb_define_private_method(cPointer, "initialize", RUBY_METHOD_FUNC(initialize), 9);
 	rb_define_private_method(cPointer, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cPointer, "id", RUBY_METHOD_FUNC(get_id), 0);
-	rb_define_private_method(cPointer, "get_type", RUBY_METHOD_FUNC(get_type), 0);
+	rb_define_private_method(cPointer, "get_types", RUBY_METHOD_FUNC(get_types), 0);
 	rb_define_private_method(cPointer, "get_action", RUBY_METHOD_FUNC(get_action), 0);
 	rb_define_method(cPointer, "position", RUBY_METHOD_FUNC(get_position), 0);
 	rb_define_method(cPointer, "modifiers", RUBY_METHOD_FUNC(get_modifiers), 0);
@@ -137,6 +144,7 @@ Init_reflex_pointer ()
 	rb_define_method(cPointer, "view_index", RUBY_METHOD_FUNC(get_view_index), 0);
 	rb_define_method(cPointer, "time", RUBY_METHOD_FUNC(get_time), 0);
 	rb_define_method(cPointer, "prev", RUBY_METHOD_FUNC(get_prev), 0);
+	rb_define_method(cPointer, "down", RUBY_METHOD_FUNC(get_down), 0);
 	cPointer.define_const("TYPE_NONE",    Reflex::Pointer::TYPE_NONE);
 	cPointer.define_const("MOUSE",        Reflex::Pointer::MOUSE);
 	cPointer.define_const("MOUSE_LEFT",   Reflex::Pointer::MOUSE_LEFT);

data/ChangeLog.md

@@ -1,6 +1,18 @@
 # reflex ChangeLog
 
 
+## [v0.1.45] - 2023-06-11
+
+- Add Pointer#down() which saves the first 'pointer_down' pointer
+- PointerEvent includes Enumerable
+- Rename Pointer#type to Pointer#types
+
+
+## [v0.1.44] - 2023-06-08
+
+- Fix compile error
+
+
 ## [v0.1.43] - 2023-06-07
 
 - Add on_activate() and on_deactivate() to Window class

data/VERSION

@@ -1 +1 @@
-0.1.43
+0.1.45

data/ext/reflex/pointer.cpp

@@ -21,13 +21,13 @@ RUCY_END
 
 static
 RUCY_DEF9(initialize,
-	id, type, action, position, modifiers, drag, click_count, view_index, time)
+	id, types, action, position, modifiers, drag, click_count, view_index, time)
 {
 	CHECK;
 
 	*THIS = Reflex::Pointer(
 		to<Reflex::Pointer::ID>(id),
-		to<uint>(type),
+		to<uint>(types),
 		(Reflex::Pointer::Action) to<int>(action),
 		to<Rays::Point>(position),
 		to<uint>(modifiers),
@@ -57,10 +57,10 @@ RUCY_DEF0(get_id)
 RUCY_END
 
 static
-RUCY_DEF0(get_type)
+RUCY_DEF0(get_types)
 {
 	CHECK;
-	return value(THIS->type());
+	return value(THIS->types());
 }
 RUCY_END
 
@@ -128,6 +128,14 @@ RUCY_DEF0(get_prev)
 }
 RUCY_END
 
+static
+RUCY_DEF0(get_down)
+{
+	CHECK;
+	return value(THIS->down());
+}
+RUCY_END
+
 
 static Class cPointer;
 
@@ -141,7 +149,7 @@ Init_reflex_pointer ()
 	cPointer.define_private_method("initialize",      initialize);
 	cPointer.define_private_method("initialize_copy", initialize_copy);
 	cPointer.define_method("id",                 get_id);
-	cPointer.define_private_method("get_type",   get_type);
+	cPointer.define_private_method("get_types",  get_types);
 	cPointer.define_private_method("get_action", get_action);
 	cPointer.define_method("position",           get_position);
 	cPointer.define_method("modifiers",          get_modifiers);
@@ -150,6 +158,7 @@ Init_reflex_pointer ()
 	cPointer.define_method("view_index",         get_view_index);
 	cPointer.define_method("time",               get_time);
 	cPointer.define_method("prev",               get_prev);
+	cPointer.define_method("down",               get_down);
 	cPointer.define_const("TYPE_NONE",    Reflex::Pointer::TYPE_NONE);
 	cPointer.define_const("MOUSE",        Reflex::Pointer::MOUSE);
 	cPointer.define_const("MOUSE_LEFT",   Reflex::Pointer::MOUSE_LEFT);

data/include/reflex/pointer.h

@@ -40,6 +40,8 @@ namespace Reflex
 
 				PEN          = Xot::bit(5),
 
+				TYPE_LAST    = PEN
+
 			};// Type
 
 			enum Action
@@ -62,7 +64,7 @@ namespace Reflex
 			Pointer ();
 
 			Pointer (
-				ID id, uint type, Action action,
+				ID id, uint types, Action action,
 				const Point& position, uint modifiers, bool drag,
 				uint click_count, uint view_index, double time);
 
@@ -74,7 +76,7 @@ namespace Reflex
 
 			ID id () const;
 
-			uint type () const;
+			uint types () const;
 
 			Action action () const;
 
@@ -92,6 +94,8 @@ namespace Reflex
 
 			const Pointer* prev () const;
 
+			const Pointer* down () const;
+
 			operator bool () const;
 
 			bool operator ! () const;

data/lib/reflex/pointer.rb

@@ -10,7 +10,7 @@ module Reflex
 
     include Comparable
 
-    alias types  get_type
+    alias types  get_types
     alias action get_action
 
     bit_flag_reader :types, **{
@@ -33,19 +33,19 @@ module Reflex
     }
 
     def mouse?()
-      (get_type & MOUSE) != 0
+      (get_types & MOUSE) != 0
     end
 
     def mouse_left?()
-      (get_type & MOUSE_LEFT) != 0
+      (get_types & MOUSE_LEFT) != 0
     end
 
     def mouse_right?()
-      (get_type & MOUSE_RIGHT) != 0
+      (get_types & MOUSE_RIGHT) != 0
     end
 
     def mouse_middle?()
-      (get_type & MOUSE_MIDDLE) != 0
+      (get_types & MOUSE_MIDDLE) != 0
     end
 
     alias left?   mouse_left?
@@ -53,11 +53,11 @@ module Reflex
     alias middle? mouse_middle?
 
     def touch?()
-      (get_type & TOUCH) != 0
+      (get_types & TOUCH) != 0
     end
 
     def pen?()
-      (get_type & PEN) != 0
+      (get_types & PEN) != 0
     end
 
     def down?()

data/lib/reflex/pointer_event.rb

@@ -7,6 +7,8 @@ module Reflex
 
   class PointerEvent < Event
 
+    include Enumerable
+
     extend Forwardable
 
     def_delegators :first,
@@ -15,7 +17,7 @@ module Reflex
       :mouse_left?, :left?, :mouse_right?, :right?, :mouse_middle?, :middle?,
       :action, :down?, :up?, :move?, :cancel?, :stay?,
       :position, :pos, :x, :y, :modifiers, :drag?, :click_count, :view_index,
-      :time, :prev
+      :time, :prev, :down
 
     def pointers()
       to_enum :each
@@ -25,12 +27,6 @@ module Reflex
       "#<Reflex::PointerEvent id:#{id} #{types} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} drag:#{drag?} click:#{click_count} view:#{view_index} time:#{time.round 2}>"
     end
 
-    private
-
-    def first()
-      self[0]
-    end
-
   end# PointerEvent
 
 

data/reflex.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'xot',   '~> 0.1.38'
-  s.add_runtime_dependency 'rucy',  '~> 0.1.38'
-  s.add_runtime_dependency 'beeps', '~> 0.1.39'
-  s.add_runtime_dependency 'rays',  '~> 0.1.40'
+  s.add_runtime_dependency 'xot',   '~> 0.1.39'
+  s.add_runtime_dependency 'rucy',  '~> 0.1.39'
+  s.add_runtime_dependency 'beeps', '~> 0.1.40'
+  s.add_runtime_dependency 'rays',  '~> 0.1.42'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/src/ios/event.mm

@@ -69,31 +69,35 @@ namespace Reflex
 			(flags & UIKeyModifierNumericPad) ? MOD_NUMPAD  : 0;
 	}
 
+	static void
+	set_pasts (Pointer* pointer, const Pointer* prev)
+	{
+		Pointer_set_prev(pointer, prev);
+		if (prev && prev->down())
+			Pointer_set_down(pointer, prev->down());
+	}
+
 	static void
 	attach_prev_pointer (
 		Pointer* pointer, PrevPointerList* prev_pointers, const Point& prev_position)
 	{
-		assert(pointer && prev_pointers);
-
 		auto it = std::find_if(
 			prev_pointers->begin(), prev_pointers->end(),
-			[&](const Reflex::Pointer& p) {return p.position() == prev_position;});
+			[&](const Pointer& p) {return p.position() == prev_position;});
 
 		if (it != prev_pointers->end())
 		{
-			Reflex::Pointer_set_prev(pointer, &*it);
+			set_pasts(pointer, &*it);
 			prev_pointers->erase(it);
 		}
 		else if (prev_pointers->size() == 1)
 		{
-			Reflex::Pointer_set_prev(pointer, &prev_pointers->front());
+			set_pasts(pointer, &prev_pointers->front());
 			prev_pointers->clear();
 		}
-		else
-			Reflex::Pointer_set_prev(pointer, NULL);
 
 		if (pointer->prev())
-			Reflex::Pointer_set_id(pointer, pointer->prev()->id());
+			Pointer_set_id(pointer, pointer->prev()->id());
 	}
 
 	static Pointer
@@ -101,8 +105,8 @@ namespace Reflex
 		UITouch* touch, UIEvent* event, UIView* view, double time,
 		Pointer::ID pointer_id, PrevPointerList* prev_pointers)
 	{
-		Reflex::Pointer::Action action = get_action(touch);
-		Reflex::Pointer pointer(
+		Pointer::Action action = get_action(touch);
+		Pointer pointer(
 			pointer_id,
 			get_type(touch),
 			action,
@@ -119,6 +123,8 @@ namespace Reflex
 				&pointer, prev_pointers,
 				to_point([touch previousLocationInView: view]));
 		}
+		else
+			Pointer_set_down(&pointer, &pointer);
 
 		return pointer;
 	}

data/src/ios/view_controller.mm

@@ -311,7 +311,7 @@ ReflexViewController_get_show_fun ()
 			name: UIApplicationWillResignActiveNotification
 			object: nil];
 
-		Window_ca__deactivate_event(self.window);
+		Window_call_deactivate_event(self.window);
 
 		[self stopTimer];
 		[super viewDidDisappear: animated];
@@ -495,6 +495,9 @@ ReflexViewController_get_show_fun ()
 		for (size_t i = 0; i < size; ++i)
 		{
 			prev_pointers.emplace_back(event[i]);
+			if (prev_pointers.size() > 10)
+				Reflex::invalid_state_error(__FILE__, __LINE__);
+
 			Reflex::Pointer_set_prev(&prev_pointers.back(), NULL);
 		}
 	}

data/src/osx/native_window.mm

@@ -12,6 +12,12 @@
 #import "opengl_view.h"
 
 
+static const uint MOUSE_BUTTONS =
+	Reflex::Pointer::MOUSE_LEFT  |
+	Reflex::Pointer::MOUSE_RIGHT |
+	Reflex::Pointer::MOUSE_MIDDLE;
+
+
 static NSWindowStyleMask
 default_style_mask ()
 {
@@ -20,20 +26,6 @@ default_style_mask ()
 		NSTitledWindowMask | NSTexturedBackgroundWindowMask);
 }
 
-static int
-count_mouse_buttons (const Reflex::PointerEvent& e)
-{
-	uint nbuttons = 0;
-	PointerEvent_each_pointer(&e, [&](const auto& pointer) {
-		uint t = pointer.type();
-		nbuttons +=
-			(t & Reflex::Pointer::MOUSE_LEFT   ? 1 : 0) +
-			(t & Reflex::Pointer::MOUSE_RIGHT  ? 1 : 0) +
-			(t & Reflex::Pointer::MOUSE_MIDDLE ? 1 : 0);
-	});
-	return nbuttons;
-}
-
 static void
 update_pixel_density (Reflex::Window* window)
 {
@@ -58,7 +50,6 @@ update_pixel_density (Reflex::Window* window)
 		OpenGLView* view;
 		NSTimer* timer;
 		int update_count;
-		int clicking_count;
 		Reflex::Pointer::ID pointer_id;
 		Reflex::Pointer prev_pointer;
 	}
@@ -77,7 +68,6 @@ update_pixel_density (Reflex::Window* window)
 		view            = nil;
 		timer           = nil;
 		update_count    = 0;
-		clicking_count  = 0;
 		pointer_id      = 0;
 
 		[self setDelegate: self];
@@ -351,7 +341,8 @@ update_pixel_density (Reflex::Window* window)
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		if (clicking_count == 0) ++pointer_id;
+		if (Reflex::Pointer_mask_flag(prev_pointer, MOUSE_BUTTONS) == 0)
+			++pointer_id;
 
 		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::DOWN);
 
@@ -362,9 +353,7 @@ update_pixel_density (Reflex::Window* window)
 			return;
 		}
 
-		[self attachAndUpdatePrevPointer: &e];
-
-		clicking_count += count_mouse_buttons(e);
+		[self attachAndUpdatePastPointers: &e];
 
 		Window_call_pointer_event(win, &e);
 	}
@@ -375,13 +364,13 @@ update_pixel_density (Reflex::Window* window)
 		if (!win) return;
 
 		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::UP);
-		[self attachAndUpdatePrevPointer: &e];
+		[self attachAndUpdatePastPointers: &e];
 
-		clicking_count -= count_mouse_buttons(e);
-		if (clicking_count == 0)
+		if (prev_pointer && Reflex::Pointer_mask_flag(prev_pointer, MOUSE_BUTTONS) == 0)
+		{
 			++pointer_id;
-		else if (clicking_count < 0)
-			return;//Reflex::invalid_state_error(__FILE__, __LINE__);
+			Pointer_set_down(&prev_pointer, NULL);
+		}
 
 		Window_call_pointer_event(win, &e);
 	}
@@ -392,7 +381,7 @@ update_pixel_density (Reflex::Window* window)
 		if (!win) return;
 
 		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::MOVE);
-		[self attachAndUpdatePrevPointer: &e];
+		[self attachAndUpdatePastPointers: &e];
 
 		Window_call_pointer_event(win, &e);
 	}
@@ -403,18 +392,40 @@ update_pixel_density (Reflex::Window* window)
 		if (!win) return;
 
 		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::MOVE);
-		[self attachAndUpdatePrevPointer: &e];
+		[self attachAndUpdatePastPointers: &e];
 
 		Window_call_pointer_event(win, &e);
 	}
 
-	- (void) attachAndUpdatePrevPointer: (Reflex::PointerEvent*) e
+	- (void) attachAndUpdatePastPointers: (Reflex::PointerEvent*) e
 	{
+		using namespace Reflex;
+
 		assert(e->size() == 1);
 
-		Reflex::Pointer& pointer = Reflex::PointerEvent_pointer_at(e, 0);
+		Pointer& pointer = PointerEvent_pointer_at(e, 0);
+
 		if (prev_pointer)
+		{
+			Pointer_add_flag(&pointer, Pointer_mask_flag(prev_pointer, MOUSE_BUTTONS));
 			Reflex::Pointer_set_prev(&pointer, &prev_pointer);
+		}
+
+		switch (pointer.action())
+		{
+			case Pointer::DOWN:
+				Pointer_add_flag(&pointer, pointer.types());
+				break;
+
+			case Pointer::UP:
+				Pointer_remove_flag(&pointer, pointer.types());
+				break;
+		}
+
+		if (prev_pointer && prev_pointer.down())
+			Reflex::Pointer_set_down(&pointer, prev_pointer.down());
+		else if (pointer.action() == Reflex::Pointer::DOWN)
+			Reflex::Pointer_set_down(&pointer, &pointer);
 
 		prev_pointer = pointer;
 		Reflex::Pointer_set_prev(&prev_pointer, NULL);

data/src/pointer.cpp

@@ -28,17 +28,17 @@ namespace Reflex
 		enum Flag
 		{
 
-			DRAG  = Xot::bit(0),
+			DRAG  = Xot::bit(0, TYPE_LAST),
 
-			ENTER = Xot::bit(1),
+			ENTER = Xot::bit(1, TYPE_LAST),
 
-			EXIT  = Xot::bit(2),
+			EXIT  = Xot::bit(2, TYPE_LAST),
 
 		};// Flag
 
 		ID id;
 
-		uint type;
+		uint types;
 
 		Action action;
 
@@ -50,14 +50,14 @@ namespace Reflex
 
 		double time;
 
-		PrevPointerPtr prev;
+		PrevPointerPtr prev, down;
 
 		Data (
-			ID id = -1, uint type = TYPE_NONE, Action action = ACTION_NONE,
+			ID id = -1, uint types = TYPE_NONE, Action action = ACTION_NONE,
 			const Point& position = 0, uint modifiers = 0,
 			bool drag = false, bool enter = false, bool exit = false,
 			uint click_count = 0, uint view_index = 0, double time = 0)
-		:	id(id), type(type), action(action),
+		:	id(id), types(types), action(action),
 			position(position), modifiers(modifiers),
 			flags(make_flags(drag, enter, exit)),
 			click_count(click_count), view_index(view_index), time(time)
@@ -78,36 +78,57 @@ namespace Reflex
 
 
 	void
-	Pointer_update_positions (Pointer* pthis, std::function<void(Point*)> fun)
+	Pointer_update_positions (Pointer* it, std::function<void(Point*)> fun)
 	{
-		auto& self = pthis->self;
+		auto& self = it->self;
 		fun(&self->position);
-		if (self->prev)
-			fun(&self->prev->self->position);
+		if (self->prev) fun(&self->prev->self->position);
+		if (self->down) fun(&self->down->self->position);
 	}
 
 	void
-	Pointer_set_id (Pointer* pthis, Pointer::ID id)
+	Pointer_set_id (Pointer* it, Pointer::ID id)
 	{
-		pthis->self->id = id;
+		it->self->id = id;
 	}
 
 	void
-	Pointer_set_view_index (Pointer* pthis, uint view_index)
+	Pointer_set_view_index (Pointer* it, uint view_index)
 	{
 		if (view_index >= USHRT_MAX)
 			argument_error(__FILE__, __LINE__);
 
-		pthis->self->view_index = view_index;
+		it->self->view_index = view_index;
 	}
 
 	void
-	Pointer_set_prev (Pointer* pthis, const Pointer* prev)
+	Pointer_add_flag (Pointer* it, uint flag)
 	{
-		if (prev)
-			pthis->self->prev.reset(new Pointer(*prev));
-		else
-			pthis->self->prev.reset();
+		Xot::add_flag(&it->self->flags, flag);
+	}
+
+	void
+	Pointer_remove_flag (Pointer* it, uint flag)
+	{
+		Xot::remove_flag(&it->self->flags, flag);
+	}
+
+	uint
+	Pointer_mask_flag (const Pointer& it, uint mask)
+	{
+		return Xot::mask_flag(it.self->flags, mask);
+	}
+
+	void
+	Pointer_set_prev (Pointer* it, const Pointer* prev)
+	{
+		it->self->prev.reset(prev ? new Pointer(*prev) : NULL);
+	}
+
+	void
+	Pointer_set_down (Pointer* it, const Pointer* down)
+	{
+		it->self->down.reset(down ? new Pointer(*down) : NULL);
 	}
 
 
@@ -116,11 +137,11 @@ namespace Reflex
 	}
 
 	Pointer::Pointer (
-		ID id, uint type, Action action,
+		ID id, uint types, Action action,
 		const Point& position, uint modifiers, bool drag,
 		uint click_count, uint view_index, double time)
 	:	self(new Data(
-			id, type, action,
+			id, types, action,
 			position, modifiers, drag, false, false,
 			click_count, view_index, time))
 	{
@@ -149,9 +170,9 @@ namespace Reflex
 	}
 
 	uint
-	Pointer::type () const
+	Pointer::types () const
 	{
-		return self->type;
+		return self->types;
 	}
 
 	Pointer::Action
@@ -175,7 +196,7 @@ namespace Reflex
 	bool
 	Pointer::is_drag () const
 	{
-		return self->flags & Data::DRAG;
+		return Xot::has_flag(self->flags, Data::DRAG);
 	}
 
 	uint
@@ -202,10 +223,16 @@ namespace Reflex
 		return self->prev.get();
 	}
 
+	const Pointer*
+	Pointer::down () const
+	{
+		return self->down.get();
+	}
+
 	Pointer::operator bool () const
 	{
 		return
-			self->type != TYPE_NONE &&
+			self->types != TYPE_NONE &&
 			ACTION_NONE < self->action && self->action <= STAY;
 	}
 

data/src/pointer.h

@@ -12,14 +12,21 @@ namespace Reflex
 {
 
 
-	void Pointer_update_positions (
-		Pointer* pthis, std::function<void(Point*)> fun);
+	void Pointer_update_positions (Pointer* it, std::function<void(Point*)> fun);
 
-	void Pointer_set_id (Pointer* pthis, Pointer::ID id);
+	void Pointer_set_id (Pointer* it, Pointer::ID id);
 
-	void Pointer_set_view_index (Pointer* pthis, uint view_index);
+	void Pointer_set_view_index (Pointer* it, uint view_index);
 
-	void Pointer_set_prev (Pointer* pthis, const Pointer* prev);
+	void Pointer_add_flag (Pointer* it, uint flag);
+
+	void Pointer_remove_flag (Pointer* it, uint flag);
+
+	uint Pointer_mask_flag (const Pointer& it, uint mask);
+
+	void Pointer_set_prev (Pointer* it, const Pointer* prev);
+
+	void Pointer_set_down (Pointer* it, const Pointer* down);
 
 
 }// Reflex

data/test/test_pointer.rb

@@ -22,19 +22,19 @@ class TestPointer < Test::Unit::TestCase
   F = false
 
   def pointer(
-    id: 0, type: TYPE_NONE, action: ACTION_NONE,
+    id: 0, types: TYPE_NONE, action: ACTION_NONE,
     position: 0, modifiers: 0, drag: false, click_count: 0, view_index: 0,
     time: 0)
 
     Reflex::Pointer.new(
-      id, type, action, position, modifiers, drag, click_count, view_index, time)
+      id, types, action, position, modifiers, drag, click_count, view_index, time)
   end
 
   def test_initialize()
     assert_nothing_raised {pointer}
 
     p = pointer(
-      id: 1, type: TOUCH, action: DOWN,
+      id: 1, types: TOUCH, action: DOWN,
       position: [2, 3], modifiers: 4, drag: true, click_count: 5, view_index: 6,
       time: 7)
 
@@ -50,11 +50,12 @@ class TestPointer < Test::Unit::TestCase
     assert_equal 6,        p.view_index
     assert_equal 7,        p.time
     assert_nil             p.prev
+    assert_nil             p.down
   end
 
   def test_types()
     def create(t)
-      pointer(type: t).tap do |o|
+      pointer(types: t).tap do |o|
         def o.test()
           [types, mouse?, left?, right?, middle?, touch?, pen?]
         end
@@ -137,7 +138,7 @@ class TestPointer < Test::Unit::TestCase
     assert_equal pointer, pointer
 
     assert_not_equal pointer, pointer(id:          1)
-    assert_not_equal pointer, pointer(type:        Reflex::Pointer::PEN)
+    assert_not_equal pointer, pointer(types:       Reflex::Pointer::PEN)
     assert_not_equal pointer, pointer(action:      Reflex::Pointer::UP)
     assert_not_equal pointer, pointer(position:    2)
     assert_not_equal pointer, pointer(modifiers:   3)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.43
+  version: 0.1.45
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.40
+        version: 0.1.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.40
+        version: 0.1.42
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement