reflexion 0.1.22 → 0.1.23

data/include/reflex/pointer.h

@@ -0,0 +1,107 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_POINTER_H__
+#define __REFLEX_POINTER_H__
+
+
+#include <xot/pimpl.h>
+#include <xot/util.h>
+#include <rays/point.h>
+#include <reflex/defs.h>
+
+
+namespace Reflex
+{
+
+
+	class Pointer
+	{
+
+		typedef Pointer This;
+
+		public:
+
+			typedef int ID;
+
+			enum Type
+			{
+
+				TYPE_NONE    = 0,
+
+				MOUSE        = Xot::bit(0),
+
+				MOUSE_LEFT   = Xot::bit(1),
+
+				MOUSE_RIGHT  = Xot::bit(2),
+
+				MOUSE_MIDDLE = Xot::bit(3),
+
+				TOUCH        = Xot::bit(4),
+
+				PEN          = Xot::bit(5),
+
+			};// Type
+
+			enum Action
+			{
+
+				ACTION_NONE = 0,
+
+				DOWN,
+
+				UP,
+
+				MOVE,
+
+				CANCEL,
+
+				STAY
+
+			};// Action
+
+			Pointer ();
+
+			Pointer (
+				ID id, uint type, Action action,
+				const Point& position, uint modifiers, uint click_count, bool drag,
+				double time);
+
+			Pointer (const This& obj);
+
+			Pointer& operator = (const This& obj);
+
+			~Pointer ();
+
+			ID id () const;
+
+			uint type () const;
+
+			Action action () const;
+
+			const Point& position () const;
+
+			uint modifiers () const;
+
+			uint click_count () const;
+
+			bool is_drag () const;
+
+			double time () const;
+
+			const Pointer* prev () const;
+
+			operator bool () const;
+
+			bool operator ! () const;
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+	};// Pointer
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex/ruby/pointer.h

@@ -0,0 +1,41 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_RUBY_POINTER_H__
+#define __REFLEX_RUBY_POINTER_H__
+
+
+#include <rucy/rucy.h>
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <reflex/pointer.h>
+
+
+namespace Reflex
+{
+
+
+	Rucy::Class pointer_class ();
+	// class Reflex::Pointer
+
+
+}// Reflex
+
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::Pointer)
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Reflex::Pointer> ()
+	{
+		return Reflex::pointer_class();
+	}
+
+
+}// Rucy
+
+
+#endif//EOH

data/include/reflex/ruby/view.h

@@ -201,6 +201,15 @@ namespace Reflex
 					Super::on_pointer_move(e);
 			}
 
+			virtual void on_pointer_cancel (PointerEvent* e)
+			{
+				RUCY_SYM(on_pointer_cancel);
+				if (this->is_overridable())
+					this->value.call(on_pointer_cancel, Rucy::value(e));
+				else
+					Super::on_pointer_cancel(e);
+			}
+
 			virtual void on_wheel (WheelEvent* e)
 			{
 				RUCY_SYM(on_wheel);

data/include/reflex/ruby/window.h

@@ -153,6 +153,15 @@ namespace Reflex
 					Super::on_pointer_move(e);
 			}
 
+			virtual void on_pointer_cancel (PointerEvent* e)
+			{
+				RUCY_SYM(on_pointer_cancel);
+				if (this->is_overridable())
+					this->value.call(on_pointer_cancel, Rucy::value(e));
+				else
+					Super::on_pointer_cancel(e);
+			}
+
 			virtual void on_wheel (WheelEvent* e)
 			{
 				RUCY_SYM(on_wheel);

data/include/reflex/selector.h

@@ -55,7 +55,7 @@ namespace Reflex
 
 			const_iterator end () const;
 
-			bool is_empty () const;
+			bool empty () const;
 
 			friend bool operator == (const This& lhs, const This& rhs);
 

data/include/reflex/view.h

@@ -364,13 +364,15 @@ namespace Reflex
 
 			virtual void on_key_up   (KeyEvent* e);
 
-			virtual void on_pointer      (PointerEvent* e);
+			virtual void on_pointer        (PointerEvent* e);
 
-			virtual void on_pointer_down (PointerEvent* e);
+			virtual void on_pointer_down   (PointerEvent* e);
 
-			virtual void on_pointer_up   (PointerEvent* e);
+			virtual void on_pointer_up     (PointerEvent* e);
 
-			virtual void on_pointer_move (PointerEvent* e);
+			virtual void on_pointer_move   (PointerEvent* e);
+
+			virtual void on_pointer_cancel (PointerEvent* e);
 
 			virtual void on_wheel (WheelEvent* e);
 

data/include/reflex/window.h

@@ -39,6 +39,10 @@ namespace Reflex
 
 			virtual void redraw ();
 
+			virtual Point from_screen (const Point& point) const;
+
+			virtual Point   to_screen (const Point& point) const;
+
 			virtual void    set_title (const char* title);
 
 			virtual const char* title () const;
@@ -67,10 +71,6 @@ namespace Reflex
 
 			virtual const Painter* painter () const;
 
-			virtual Point from_screen (const Point& point) const;
-
-			virtual Point   to_screen (const Point& point) const;
-
 			virtual void on_show (Event* e);
 
 			virtual void on_hide (Event* e);
@@ -91,13 +91,15 @@ namespace Reflex
 
 			virtual void on_key_up   (KeyEvent* e);
 
-			virtual void on_pointer      (PointerEvent* e);
+			virtual void on_pointer        (PointerEvent* e);
+
+			virtual void on_pointer_down   (PointerEvent* e);
 
-			virtual void on_pointer_down (PointerEvent* e);
+			virtual void on_pointer_up     (PointerEvent* e);
 
-			virtual void on_pointer_up   (PointerEvent* e);
+			virtual void on_pointer_move   (PointerEvent* e);
 
-			virtual void on_pointer_move (PointerEvent* e);
+			virtual void on_pointer_cancel (PointerEvent* e);
 
 			virtual void on_wheel (WheelEvent* e);
 

data/lib/reflex/key_event.rb

@@ -31,7 +31,7 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::KeyEvent type:#{type} chars:'#{chars}' code:#{code} mod:#{modifiers} repeat:#{repeat} capture?:#{capture?}>"
+      "#<Reflex::KeyEvent type:#{type} chars:'#{chars}' code:#{code} mod:#{modifiers} repeat:#{repeat} captured?:#{captured?}>"
     end
 
   end# KeyEvent

data/lib/reflex/pointer.rb

@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/bit_flag_accessor'
+require 'xot/const_symbol_accessor'
+require 'reflex/ext'
+
+
+module Reflex
+
+
+  class Pointer
+
+    include Comparable
+
+    alias type   get_type
+    alias action get_action
+
+    bit_flag_reader :type, **{
+      none:         TYPE_NONE,
+      mouse:        MOUSE,
+      mouse_left:   MOUSE_LEFT,
+      mouse_right:  MOUSE_RIGHT,
+      mouse_middle: MOUSE_MIDDLE,
+      touch:        TOUCH,
+      pen:          PEN
+    }
+
+    const_symbol_reader :action, **{
+      none:   ACTION_NONE,
+      down:   DOWN,
+      up:     UP,
+      move:   MOVE,
+      cancel: CANCEL,
+      stay:   STAY
+    }
+
+    def mouse?()
+      (get_type & MOUSE) != 0
+    end
+
+    def mouse_left?()
+      (get_type & MOUSE_LEFT) != 0
+    end
+
+    def mouse_right?()
+      (get_type & MOUSE_RIGHT) != 0
+    end
+
+    def mouse_middle?()
+      (get_type & MOUSE_MIDDLE) != 0
+    end
+
+    alias left?   mouse_left?
+    alias right?  mouse_right?
+    alias middle? mouse_middle?
+
+    def touch?()
+      (get_type & TOUCH) != 0
+    end
+
+    def pen?()
+      (get_type & PEN) != 0
+    end
+
+    def down?()
+      get_action == DOWN
+    end
+
+    def up?()
+      get_action == UP
+    end
+
+    def move?()
+      get_action == MOVE
+    end
+
+    def cancel?()
+      get_action == CANCEL
+    end
+
+    def stay?()
+      get_action == STAY
+    end
+
+    alias pos position
+
+    def x()
+      position.x
+    end
+
+    def y()
+      position.y
+    end
+
+    def <=>(o)
+      inspect <=> o.inspect
+    end
+
+    def inspect()
+      "#<Reflex::Pointer id:#{id} #{type} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
+    end
+
+  end# Pointer
+
+
+end# Reflex

data/lib/reflex/pointer_event.rb

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-require 'xot/bit_flag_accessor'
-require 'xot/const_symbol_accessor'
+require 'forwardable'
 require 'reflex/ext'
 
 
@@ -11,65 +10,28 @@ module Reflex
 
   class PointerEvent < Event
 
-    alias pos position
+    extend Forwardable
 
-    alias get_type         type
-    alias get_pointer_type pointer_type
+    def_delegators :first,
+      :id,
+      :type, :mouse?, :touch?, :pen?,
+      :mouse_left?, :left?, :mouse_right?, :right?, :mouse_middle?, :middle?,
+      :action, :down?, :up?, :move?, :cancel?, :stay?,
+      :position, :pos, :x, :y, :modifiers, :click_count, :drag?,
+      :time, :prev
 
-    const_symbol_reader :type, **{
-      none: TYPE_NONE,
-      down: TYPE_DOWN,
-      up:   TYPE_UP,
-      move: TYPE_MOVE
-    }
-
-    bit_flag_reader :pointer_type, **{
-      none:         POINTER_NONE,
-      mouse_left:   POINTER_MOUSE_LEFT,
-      mouse_right:  POINTER_MOUSE_RIGHT,
-      mouse_middle: POINTER_MOUSE_MIDDLE,
-      touch:        POINTER_TOUCH,
-      pen:          POINTER_PEN
-    }
-
-    def down?()
-      get_type == TYPE_DOWN
+    def pointers()
+      to_enum :each
     end
 
-    def up?()
-      get_type == TYPE_UP
-    end
-
-    def move?()
-      get_type == TYPE_MOVE
-    end
-
-    def left?()
-      (get_pointer_type & POINTER_MOUSE_LEFT) != 0
-    end
-
-    def right?()
-      (get_pointer_type & POINTER_MOUSE_RIGHT) != 0
-    end
-
-    def middle?()
-      (get_pointer_type & POINTER_MOUSE_MIDDLE) != 0
-    end
-
-    def touch?()
-      (get_pointer_type & POINTER_TOUCH) != 0
-    end
-
-    def pen?()
-      (get_pointer_type & POINTER_PEN) != 0
+    def inspect()
+      "#<Reflex::PointerEvent id:#{id} #{type} #{action} (#{x.round 2}, #{y.round 2}) mod:#{modifiers} click:#{click_count} drag:#{drag?} time:#{time.round 2}>"
     end
 
-    def positions()
-      size.times.map {|i| position i}
-    end
+    private
 
-    def inspect()
-      "#<Reflex::PointerEvent type:#{type}/#{pointer_type} x:#{x} y:#{y} size:#{size} mod:#{modifiers} count:#{count} drag:#{drag?}>"
+    def first()
+      self[0]
     end
 
   end# PointerEvent

data/lib/reflex.rb

@@ -33,6 +33,7 @@ require 'reflex/frame_event'
 require 'reflex/scroll_event'
 require 'reflex/focus_event'
 require 'reflex/key_event'
+require 'reflex/pointer'
 require 'reflex/pointer_event'
 require 'reflex/wheel_event'
 require 'reflex/capture_event'

data/reflex.gemspec

@@ -26,12 +26,12 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/xord/reflex"
 
   s.platform              = Gem::Platform::RUBY
-  s.required_ruby_version = '~> 2'
+  s.required_ruby_version = '>= 2.6.0'
 
-  s.add_runtime_dependency 'xot',   '~> 0.1.22'
-  s.add_runtime_dependency 'rucy',  '~> 0.1.22'
-  s.add_runtime_dependency 'beeps', '~> 0.1.22'
-  s.add_runtime_dependency 'rays',  '~> 0.1.22'
+  s.add_runtime_dependency 'xot',   '~> 0.1.23'
+  s.add_runtime_dependency 'rucy',  '~> 0.1.23'
+  s.add_runtime_dependency 'beeps', '~> 0.1.23'
+  s.add_runtime_dependency 'rays',  '~> 0.1.23'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}