reflexion 0.1.57 → 0.2.1

data/ext/reflex/style.cpp

@@ -52,7 +52,7 @@ RUCY_DEFN(set_flow)
 			argc >= 2 ? (Reflex::Style::Flow) to<int>(argv[1]) : Reflex::Style::FLOW_NONE);
 	}
 
-	return value(argc, argv);
+	return array(argv, argc);
 }
 RUCY_END
 
@@ -120,7 +120,7 @@ RUCY_DEFN(set_size)
 	set_width( self, argv[0]);
 	set_height(self, argc >= 2 ? argv[1] : argv[0]);
 
-	return value(argc, argv);
+	return array(argv, argc);
 }
 RUCY_END
 

data/ext/reflex/view.cpp

@@ -31,7 +31,7 @@ array (T begin, T end)
 {
 	std::vector<Value> v;
 	for (T it = begin; it != end; ++it) v.push_back(value(*it));
-	return value(v.size(), &v[0]);
+	return array(&v[0], v.size());
 }
 
 

data/include/reflex/defs.h

@@ -66,188 +66,199 @@ namespace Reflex
 	enum KeyCode
 	{
 
-		KEY_NONE = 0,
-
-		KEY_A,
-		KEY_B,
-		KEY_C,
-		KEY_D,
-		KEY_E,
-		KEY_F,
-		KEY_G,
-		KEY_H,
-		KEY_I,
-		KEY_J,
-		KEY_K,
-		KEY_L,
-		KEY_M,
-		KEY_N,
-		KEY_O,
-		KEY_P,
-		KEY_Q,
-		KEY_R,
-		KEY_S,
-		KEY_T,
-		KEY_U,
-		KEY_V,
-		KEY_W,
-		KEY_X,
-		KEY_Y,
-		KEY_Z,
-
-		KEY_0,
-		KEY_1,
-		KEY_2,
-		KEY_3,
-		KEY_4,
-		KEY_5,
-		KEY_6,
-		KEY_7,
-		KEY_8,
-		KEY_9,
-
-		KEY_MINUS,
-		KEY_EQUAL,
-		KEY_COMMA,
-		KEY_PERIOD,
-		KEY_SEMICOLON,
-		KEY_QUOTE,
-		KEY_SLASH,
-		KEY_BACKSLASH,
-		KEY_UNDERSCORE,
-		KEY_GRAVE,
-		KEY_YEN,
-		KEY_LBRACKET,
-		KEY_RBRACKET,
-
-		KEY_ENTER,
-		KEY_RETURN,
-		KEY_SPACE,
-		KEY_TAB,
-		KEY_DELETE,
-		KEY_BACKSPACE,
-		//KEY_INSERT,
-		KEY_ESCAPE,
-
-		KEY_LEFT,
-		KEY_RIGHT,
-		KEY_UP,
-		KEY_DOWN,
-		KEY_HOME,
-		KEY_END,
-		KEY_PAGEUP,
-		KEY_PAGEDOWN,
-
-		KEY_LSHIFT,
-		KEY_RSHIFT,
-		KEY_LCONTROL,
-		KEY_RCONTROL,
-		//KEY_LALT,
-		//KEY_RALT,
-		//KEY_LWIN,
-		//KEY_RWIN,
-		KEY_LCOMMAND,
-		KEY_RCOMMAND,
-		KEY_LOPTION,
-		KEY_ROPTION,
-		KEY_FUNCTION,
-
-		KEY_F1,
-		KEY_F2,
-		KEY_F3,
-		KEY_F4,
-		KEY_F5,
-		KEY_F6,
-		KEY_F7,
-		KEY_F8,
-		KEY_F9,
-		KEY_F10,
-		KEY_F11,
-		KEY_F12,
-		KEY_F13,
-		KEY_F14,
-		KEY_F15,
-		KEY_F16,
-		KEY_F17,
-		KEY_F18,
-		KEY_F19,
-		KEY_F20,
-		//KEY_F21,
-		//KEY_F22,
-		//KEY_F23,
-		//KEY_F24,
-
-		KEY_NUM_0,
-		KEY_NUM_1,
-		KEY_NUM_2,
-		KEY_NUM_3,
-		KEY_NUM_4,
-		KEY_NUM_5,
-		KEY_NUM_6,
-		KEY_NUM_7,
-		KEY_NUM_8,
-		KEY_NUM_9,
-
-		KEY_NUM_PLUS,
-		KEY_NUM_MINUS,
-		KEY_NUM_MULTIPLY,
-		KEY_NUM_DIVIDE,
-		KEY_NUM_EQUAL,
-		KEY_NUM_COMMA,
-		KEY_NUM_DECIMAL,
-		KEY_NUM_CLEAR,
-
-		KEY_CAPSLOCK,
-		//KEY_NUMLOCK,
-		//KEY_SCROLLLOCK,
-
-		//KEY_PRINTSCREEN,
-		//KEY_PAUSE,
-		//KEY_BREAK,
-		KEY_SECTION,
-		KEY_HELP,
-
-		KEY_IME_EISU,
-		KEY_IME_KANA,
-		//KEY_IME_KANJI,
-		//KEY_IME_JUNJA,
-		//KEY_IME_PROCESS,
-		//KEY_IME_ACCEPT,
-		//KEY_IME_FINAL,
-		//KEY_IME_CONVERT,
-		//KEY_IME_NONCONVERT,
-		//KEY_IME_MODECHANGE,
-
-		KEY_VOLUME_UP,
-		KEY_VOLUME_DOWN,
-		KEY_MUTE,
-
-		//KEY_SLEEP,
-		//KEY_EXEC,
-		//KEY_PRINT,
-		//KEY_APPS,
-		//KEY_SELECT,
-		//KEY_CLEAR,
-		//KEY_PLAY,
-		//KEY_ZOOM,
-
-		//KEY_BROWSER_BACK,
-		//KEY_BROWSER_FORWARD,
-		//KEY_BROWSER_REFRESH,
-		//KEY_BROWSER_STOP,
-		//KEY_BROWSER_SEARCH,
-		//KEY_BROWSER_FAVORITES,
-		//KEY_BROWSER_HOME,
-
-		//KEY_MEDIA_NEXT_TRACK,
-		//KEY_MEDIA_PREV_TRACK,
-		//KEY_MEDIA_STOP,
-		//KEY_MEDIA_PLAY_PAUSE,
-
-		//KEY_LAUNCH_MAIL,
-		//KEY_LAUNCH_MEDIA_SELECT,
-		//KEY_LAUNCH_APP1,
-		//KEY_LAUNCH_APP2,
+		KEY_NONE = -1,
+
+		#if defined(OSX) || defined(IOS)
+			#define NATIVE_VK(osx) osx
+		#endif
+
+		KEY_A = NATIVE_VK(0x00),
+		KEY_B = NATIVE_VK(0x0B),
+		KEY_C = NATIVE_VK(0x08),
+		KEY_D = NATIVE_VK(0x02),
+		KEY_E = NATIVE_VK(0x0E),
+		KEY_F = NATIVE_VK(0x03),
+		KEY_G = NATIVE_VK(0x05),
+		KEY_H = NATIVE_VK(0x04),
+		KEY_I = NATIVE_VK(0x22),
+		KEY_J = NATIVE_VK(0x26),
+		KEY_K = NATIVE_VK(0x28),
+		KEY_L = NATIVE_VK(0x25),
+		KEY_M = NATIVE_VK(0x2E),
+		KEY_N = NATIVE_VK(0x2D),
+		KEY_O = NATIVE_VK(0x1F),
+		KEY_P = NATIVE_VK(0x23),
+		KEY_Q = NATIVE_VK(0x0C),
+		KEY_R = NATIVE_VK(0x0F),
+		KEY_S = NATIVE_VK(0x01),
+		KEY_T = NATIVE_VK(0x11),
+		KEY_U = NATIVE_VK(0x20),
+		KEY_V = NATIVE_VK(0x09),
+		KEY_W = NATIVE_VK(0x0D),
+		KEY_X = NATIVE_VK(0x07),
+		KEY_Y = NATIVE_VK(0x10),
+		KEY_Z = NATIVE_VK(0x06),
+
+		KEY_0 = NATIVE_VK(0x1D),
+		KEY_1 = NATIVE_VK(0x12),
+		KEY_2 = NATIVE_VK(0x13),
+		KEY_3 = NATIVE_VK(0x14),
+		KEY_4 = NATIVE_VK(0x15),
+		KEY_5 = NATIVE_VK(0x17),
+		KEY_6 = NATIVE_VK(0x16),
+		KEY_7 = NATIVE_VK(0x1A),
+		KEY_8 = NATIVE_VK(0x1C),
+		KEY_9 = NATIVE_VK(0x19),
+
+		KEY_MINUS      = NATIVE_VK(0x1B),
+		KEY_EQUAL      = NATIVE_VK(0x18),
+		KEY_COMMA      = NATIVE_VK(0x2B),
+		KEY_PERIOD     = NATIVE_VK(0x2F),
+		KEY_SEMICOLON  = NATIVE_VK(0x29),
+		KEY_QUOTE      = NATIVE_VK(0x27),
+		KEY_SLASH      = NATIVE_VK(0x2C),
+		KEY_BACKSLASH  = NATIVE_VK(0x2A),
+		KEY_UNDERSCORE = NATIVE_VK(0x5E),
+		KEY_GRAVE      = NATIVE_VK(0x32),
+		KEY_YEN        = NATIVE_VK(0x5D),
+		KEY_LBRACKET   = NATIVE_VK(0x21),
+		KEY_RBRACKET   = NATIVE_VK(0x1E),
+
+		KEY_ENTER     = NATIVE_VK(0x24),
+		KEY_RETURN    = NATIVE_VK(0x24),
+		KEY_SPACE     = NATIVE_VK(0x31),
+		KEY_TAB       = NATIVE_VK(0x30),
+		KEY_DELETE    = NATIVE_VK(0x75),
+		KEY_BACKSPACE = NATIVE_VK(0x33),
+		//KEY_INSERT    = NATIVE_VK(),
+		KEY_ESCAPE    = NATIVE_VK(0x35),
+
+		KEY_LEFT     = NATIVE_VK(0x7B),
+		KEY_RIGHT    = NATIVE_VK(0x7C),
+		KEY_UP       = NATIVE_VK(0x7E),
+		KEY_DOWN     = NATIVE_VK(0x7D),
+		KEY_HOME     = NATIVE_VK(0x73),
+		KEY_END      = NATIVE_VK(0x77),
+		KEY_PAGEUP   = NATIVE_VK(0x74),
+		KEY_PAGEDOWN = NATIVE_VK(0x79),
+
+		KEY_SHIFT    = NATIVE_VK(0x38),
+		KEY_LSHIFT   = NATIVE_VK(0x38),
+		KEY_RSHIFT   = NATIVE_VK(0x3C),
+		KEY_CONTROL  = NATIVE_VK(0x3B),
+		KEY_LCONTROL = NATIVE_VK(0x3B),
+		KEY_RCONTROL = NATIVE_VK(0x3E),
+		//KEY_LALT     = NATIVE_VK(),
+		//KEY_RALT     = NATIVE_VK(),
+		//KEY_LWIN     = NATIVE_VK(),
+		//KEY_RWIN     = NATIVE_VK(),
+		KEY_COMMAND  = NATIVE_VK(0x37),
+		KEY_LCOMMAND = NATIVE_VK(0x37),
+		KEY_RCOMMAND = NATIVE_VK(0x36),
+		KEY_OPTION   = NATIVE_VK(0x3A),
+		KEY_LOPTION  = NATIVE_VK(0x3A),
+		KEY_ROPTION  = NATIVE_VK(0x3D),
+		KEY_FUNCTION = NATIVE_VK(0x3F),
+
+		KEY_F1  = NATIVE_VK(0x7A),
+		KEY_F2  = NATIVE_VK(0x78),
+		KEY_F3  = NATIVE_VK(0x63),
+		KEY_F4  = NATIVE_VK(0x76),
+		KEY_F5  = NATIVE_VK(0x60),
+		KEY_F6  = NATIVE_VK(0x61),
+		KEY_F7  = NATIVE_VK(0x62),
+		KEY_F8  = NATIVE_VK(0x64),
+		KEY_F9  = NATIVE_VK(0x65),
+		KEY_F10 = NATIVE_VK(0x6D),
+		KEY_F11 = NATIVE_VK(0x67),
+		KEY_F12 = NATIVE_VK(0x6F),
+		KEY_F13 = NATIVE_VK(0x69),
+		KEY_F14 = NATIVE_VK(0x6B),
+		KEY_F15 = NATIVE_VK(0x71),
+		KEY_F16 = NATIVE_VK(0x6A),
+		KEY_F17 = NATIVE_VK(0x40),
+		KEY_F18 = NATIVE_VK(0x4F),
+		KEY_F19 = NATIVE_VK(0x50),
+		KEY_F20 = NATIVE_VK(0x5A),
+		//KEY_F21 = NATIVE_VK(),
+		//KEY_F22 = NATIVE_VK(),
+		//KEY_F23 = NATIVE_VK(),
+		//KEY_F24 = NATIVE_VK(),
+
+		KEY_NUM_0 = NATIVE_VK(0x52),
+		KEY_NUM_1 = NATIVE_VK(0x53),
+		KEY_NUM_2 = NATIVE_VK(0x54),
+		KEY_NUM_3 = NATIVE_VK(0x55),
+		KEY_NUM_4 = NATIVE_VK(0x56),
+		KEY_NUM_5 = NATIVE_VK(0x57),
+		KEY_NUM_6 = NATIVE_VK(0x58),
+		KEY_NUM_7 = NATIVE_VK(0x59),
+		KEY_NUM_8 = NATIVE_VK(0x5B),
+		KEY_NUM_9 = NATIVE_VK(0x5C),
+
+		KEY_NUM_PLUS     = NATIVE_VK(0x45),
+		KEY_NUM_MINUS    = NATIVE_VK(0x4E),
+		KEY_NUM_MULTIPLY = NATIVE_VK(0x43),
+		KEY_NUM_DIVIDE   = NATIVE_VK(0x4B),
+		KEY_NUM_EQUAL    = NATIVE_VK(0x51),
+		KEY_NUM_COMMA    = NATIVE_VK(0x5F),
+		KEY_NUM_DECIMAL  = NATIVE_VK(0x41),
+		KEY_NUM_CLEAR    = NATIVE_VK(0x47),
+		KEY_NUM_ENTER    = NATIVE_VK(0x4C),
+
+		KEY_CAPSLOCK   = NATIVE_VK(0x39),
+		//KEY_NUMLOCK    = NATIVE_VK(),
+		//KEY_SCROLLLOCK = NATIVE_VK(),
+
+		//KEY_PRINTSCREEN = NATIVE_VK(),
+		//KEY_PAUSE       = NATIVE_VK(),
+		//KEY_BREAK       = NATIVE_VK(),
+		KEY_SECTION     = NATIVE_VK(0x0A),
+		KEY_HELP        = NATIVE_VK(0x72),
+
+		KEY_IME_EISU       = NATIVE_VK(0x66),
+		KEY_IME_KANA       = NATIVE_VK(0x68),
+		//KEY_IME_KANJI      = NATIVE_VK(),
+		//KEY_IME_JUNJA      = NATIVE_VK(),
+		//KEY_IME_PROCESS    = NATIVE_VK(),
+		//KEY_IME_ACCEPT     = NATIVE_VK(),
+		//KEY_IME_FINAL      = NATIVE_VK(),
+		//KEY_IME_CONVERT    = NATIVE_VK(),
+		//KEY_IME_NONCONVERT = NATIVE_VK(),
+		//KEY_IME_MODECHANGE = NATIVE_VK(),
+
+		KEY_VOLUME_UP   = NATIVE_VK(0x48),
+		KEY_VOLUME_DOWN = NATIVE_VK(0x49),
+		KEY_MUTE        = NATIVE_VK(0x4A),
+
+		//KEY_SLEEP  = NATIVE_VK(),
+		//KEY_EXEC   = NATIVE_VK(),
+		//KEY_PRINT  = NATIVE_VK(),
+		//KEY_APPS   = NATIVE_VK(),
+		//KEY_SELECT = NATIVE_VK(),
+		//KEY_CLEAR  = NATIVE_VK(),
+		//KEY_PLAY   = NATIVE_VK(),
+		//KEY_ZOOM   = NATIVE_VK(),
+
+		//KEY_BROWSER_BACK      = NATIVE_VK(),
+		//KEY_BROWSER_FORWARD   = NATIVE_VK(),
+		//KEY_BROWSER_REFRESH   = NATIVE_VK(),
+		//KEY_BROWSER_STOP      = NATIVE_VK(),
+		//KEY_BROWSER_SEARCH    = NATIVE_VK(),
+		//KEY_BROWSER_FAVORITES = NATIVE_VK(),
+		//KEY_BROWSER_HOME      = NATIVE_VK(),
+
+		//KEY_MEDIA_NEXT_TRACK = NATIVE_VK(),
+		//KEY_MEDIA_PREV_TRACK = NATIVE_VK(),
+		//KEY_MEDIA_STOP       = NATIVE_VK(),
+		//KEY_MEDIA_PLAY_PAUSE = NATIVE_VK(),
+
+		//KEY_LAUNCH_MAIL         = NATIVE_VK(),
+		//KEY_LAUNCH_MEDIA_SELECT = NATIVE_VK(),
+		//KEY_LAUNCH_APP1         = NATIVE_VK(),
+		//KEY_LAUNCH_APP2         = NATIVE_VK(),
+
+		#undef NATIVE_VK
 
 	};// KeyCode
 
@@ -267,17 +278,17 @@ namespace Reflex
 		MOD_WIN      = 0x1 << 3,
 #endif
 
-		MOD_OPTION   = MOD_ALT,
+		MOD_OPTION   = 0x1 << 4,
 
-		MOD_COMMAND  = MOD_WIN,
+		MOD_COMMAND  = 0x1 << 5,
 
-		MOD_HELP     = 0x1 << 4,
+		MOD_HELP     = 0x1 << 6,
 
-		MOD_FUNCTION = 0x1 << 5,
+		MOD_FUNCTION = 0x1 << 7,
 
-		MOD_NUMPAD   = 0x1 << 6,
+		MOD_NUMPAD   = 0x1 << 8,
 
-		MOD_CAPS     = 0x1 << 7,
+		MOD_CAPS     = 0x1 << 9,
 
 	};// Modifier
 

data/include/reflex/ruby.h

@@ -4,19 +4,22 @@
 #define __REFLEX_RUBY_H__
 
 
-#include <reflex/ruby/reflex.h>
 #include <reflex/ruby/defs.h>
+#include <reflex/ruby/reflex.h>
 #include <reflex/ruby/exception.h>
 
 #include <reflex/ruby/selector.h>
+#include <reflex/ruby/pointer.h>
 #include <reflex/ruby/event.h>
 #include <reflex/ruby/timer.h>
 #include <reflex/ruby/style.h>
 #include <reflex/ruby/shape.h>
+#include <reflex/ruby/filter.h>
 
 #include <reflex/ruby/application.h>
 #include <reflex/ruby/window.h>
 #include <reflex/ruby/view.h>
+#include <reflex/ruby/screen.h>
 
 #include <reflex/ruby/image_view.h>
 

data/include/reflex.h

@@ -10,6 +10,7 @@
 #include <reflex/debug.h>
 
 #include <reflex/selector.h>
+#include <reflex/pointer.h>
 #include <reflex/event.h>
 #include <reflex/style.h>
 #include <reflex/timer.h>
@@ -19,6 +20,7 @@
 #include <reflex/application.h>
 #include <reflex/window.h>
 #include <reflex/view.h>
+#include <reflex/screen.h>
 
 #include <reflex/device.h>
 

data/lib/reflex/key_event.rb

@@ -1,3 +1,4 @@
+require 'xot/bit_flag_accessor'
 require 'xot/const_symbol_accessor'
 require 'reflex/ext'
 
@@ -15,6 +16,19 @@ 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,
+    }
+
     def down?()
       get_action == DOWN
     end
@@ -28,7 +42,15 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::KeyEvent action:#{action} chars:'#{chars}' code:#{code} mod:#{modifiers} repeat:#{repeat} captured?:#{captured?}>"
+      "#<Reflex::KeyEvent action:%s chars:%s key:%s code:0x%X mod:%s repeat:%d captured?:%s>" % [
+        action,
+        chars ? "'#{chars}'" : :nil,
+        key ? key : :nil,
+        code,
+        modifiers.join(','),
+        repeat,
+        captured?
+      ]
     end
 
   end# KeyEvent

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.42'
-  s.add_runtime_dependency 'rucy',  '~> 0.1.44'
-  s.add_runtime_dependency 'beeps', '~> 0.1.46'
-  s.add_runtime_dependency 'rays',  '~> 0.1.49'
+  s.add_runtime_dependency 'xot',   '~> 0.2.1'
+  s.add_runtime_dependency 'rucy',  '~> 0.2.1'
+  s.add_runtime_dependency 'beeps', '~> 0.2.1'
+  s.add_runtime_dependency 'rays',  '~> 0.2.1'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/samples/key.rb

@@ -30,7 +30,7 @@ end
 
 w.on :pointer_move do |points|
   $pos = "#{points.x}, #{points.y}"
-  p [points.type, points.x, points.y, points.size, points.modifiers, points.count, points.drag]
+  p [points.action, points.x, points.y, points.size, points.modifiers, points.count, points.drag?]
   w.redraw
 end
 

data/src/event.cpp

@@ -545,6 +545,7 @@ namespace Reflex
 	const char*
 	KeyEvent::chars () const
 	{
+		if (self->chars.empty()) return NULL;
 		return self->chars;
 	}
 

data/src/ios/event.h

@@ -4,7 +4,6 @@
 #define __REFLEX_SRC_IOS_EVENT_H__
 
 
-#include <list>
 #import <UIKit/UIEvent.h>
 #include "../event.h"
 
@@ -13,21 +12,12 @@ namespace Reflex
 {
 
 
-	typedef std::list<Pointer> PrevPointerList;
-
-
 	class NativePointerEvent : public PointerEvent
 	{
 
 		public:
 
-			NativePointerEvent (
-				NSSet* touches, UIEvent* event, UIView* view,
-				Pointer::ID* pointer_id);
-
-			NativePointerEvent (
-				NSSet* touches, UIEvent* event, UIView* view,
-				PrevPointerList* prev_pointers);
+			NativePointerEvent (NSSet* touches, UIEvent* event, UIView* view);
 
 	};// NativePointerEvent
 

data/src/ios/event.mm

@@ -69,45 +69,13 @@ 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)
-	{
-		auto it = std::find_if(
-			prev_pointers->begin(), prev_pointers->end(),
-			[&](const Pointer& p) {return p.position() == prev_position;});
-
-		if (it != prev_pointers->end())
-		{
-			set_pasts(pointer, &*it);
-			prev_pointers->erase(it);
-		}
-		else if (prev_pointers->size() == 1)
-		{
-			set_pasts(pointer, &prev_pointers->front());
-			prev_pointers->clear();
-		}
-
-		if (pointer->prev())
-			Pointer_set_id(pointer, pointer->prev()->id());
-	}
-
 	static Pointer
-	create_pointer (
-		UITouch* touch, UIEvent* event, UIView* view, double time,
-		Pointer::ID pointer_id, PrevPointerList* prev_pointers)
+	create_pointer (UITouch* touch, UIEvent* event, UIView* view)
 	{
 		Pointer::Action action = get_action(touch);
+
 		Pointer pointer(
-			pointer_id,
+			0,
 			get_type(touch),
 			action,
 			to_point([touch locationInView: view]),
@@ -115,39 +83,24 @@ namespace Reflex
 			action == Pointer::MOVE,
 			(uint) touch.tapCount,
 			0,
-			time);
+			touch.timestamp);
 
-		if (prev_pointers)
+		if (touch.phase != UITouchPhaseBegan)
 		{
-			attach_prev_pointer(
-				&pointer, prev_pointers,
-				to_point([touch previousLocationInView: view]));
+			Pointer_set_prev_position(
+				&pointer, to_point([touch previousLocationInView: view]));
 		}
-		else
-			Pointer_set_down(&pointer, &pointer);
 
 		return pointer;
 	}
 
 	NativePointerEvent::NativePointerEvent (
-		NSSet* touches, UIEvent* event, UIView* view,
-		Pointer::ID* pointer_id)
-	{
-		for (UITouch* touch in touches)
-		{
-			PointerEvent_add_pointer(
-				this, create_pointer(touch, event, view, time(), ++*pointer_id, NULL));
-		}
-	}
-
-	NativePointerEvent::NativePointerEvent (
-		NSSet* touches, UIEvent* event, UIView* view,
-		PrevPointerList* prev_pointers)
+		NSSet* touches, UIEvent* event, UIView* view)
 	{
 		for (UITouch* touch in touches)
 		{
-			PointerEvent_add_pointer(
-				this, create_pointer(touch, event, view, time(), 0, prev_pointers));
+			Pointer pointer = create_pointer(touch, event, view);
+			if (pointer) PointerEvent_add_pointer(this, pointer);
 		}
 	}