reflexion 0.2 → 0.2.1

data/src/ios/view_controller.mm

@@ -3,7 +3,7 @@
 
 
 #include <assert.h>
-#include <rays/opengl.h>
+#include <rays/rays.h>
 #include "reflex/exception.h"
 #include "../view.h"
 #include "../pointer.h"
@@ -136,8 +136,6 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window *pwindow, *ptr_for_rebind;
 		int update_count;
 		int touching_count;
-		Reflex::Pointer::ID pointer_id;
-		Reflex::PrevPointerList prev_pointers;
 	}
 
 	- (id) init
@@ -149,7 +147,6 @@ ReflexViewController_get_show_fun ()
 		ptr_for_rebind = NULL;
 		update_count   = 0;
 		touching_count = 0;
-		pointer_id     = 0;
 
 		return self;
 	}
@@ -272,9 +269,8 @@ ReflexViewController_get_show_fun ()
 		ReflexView* view = self.reflexView;
 		if (!view) return;
 
-		EAGLContext* context = view.context;
-		if (context && context == [EAGLContext currentContext])
-			[EAGLContext setCurrentContext: (EAGLContext*) Rays::get_offscreen_context()];
+		if (view.context && view.context == [EAGLContext currentContext])
+			Rays::activate_offscreen_context();
 
 		view.reflexViewController = nil;
 		[view removeFromSuperview];
@@ -421,23 +417,22 @@ ReflexViewController_get_show_fun ()
 		win->self->prev_position = b.position();
 		win->self->prev_size     = b.size();
 
-		if (dpos != 0 || dsize != 0)
+		if (dpos == 0 && dsize == 0) return;
+
+		Reflex::FrameEvent e(b, dpos.x, dpos.y, 0, dsize.x, dsize.y, 0);
+		if (dpos  != 0) win->on_move(&e);
+		if (dsize != 0)
 		{
-			Reflex::FrameEvent e(b, dpos.x, dpos.y, 0, dsize.x, dsize.y, 0);
-			if (dpos  != 0) win->on_move(&e);
-			if (dsize != 0)
-			{
-				Rays::Bounds b = win->frame();
-				b.move_to(0, 0);
+			Rays::Bounds b = win->frame();
+			b.move_to(0, 0);
 
-				if (win->painter())
-					win->painter()->canvas(b, win->painter()->pixel_density());
+			if (win->painter())
+				win->painter()->canvas(b, win->painter()->pixel_density());
 
-				if (win->root())
-					View_set_frame(win->root(), b);
+			if (win->root())
+				View_set_frame(win->root(), b);
 
-				win->on_resize(&e);
-			}
+			win->on_resize(&e);
 		}
 	}
 
@@ -481,12 +476,10 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(touches, event, self.reflexView, &pointer_id);
-		[self addToPrevPointers: e];
+		Reflex::NativePointerEvent e(touches, event, self.reflexView);
+		Window_call_pointer_event(win, &e);
 
 		touching_count += e.size();
-
-		Window_call_pointer_event(win, &e);
 	}
 
 	- (void) touchesEnded: (NSSet*) touches withEvent: (UIEvent*) event
@@ -494,15 +487,14 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(touches, event, self.reflexView, &prev_pointers);
+		Reflex::NativePointerEvent e(touches, event, self.reflexView);
+		Window_call_pointer_event(win, &e);
 
 		touching_count -= e.size();
 		if (touching_count == 0)
-			prev_pointers.clear();
+			win->self->prev_pointers.clear();
 		else if (touching_count < 0)
 			Reflex::invalid_state_error(__FILE__, __LINE__);
-
-		Window_call_pointer_event(win, &e);
 	}
 
 	- (void) touchesCancelled: (NSSet*) touches withEvent: (UIEvent*) event
@@ -515,23 +507,8 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(touches, event, self.reflexView, &prev_pointers);
-		[self addToPrevPointers: e];
-
+		Reflex::NativePointerEvent e(touches, event, self.reflexView);
 		Window_call_pointer_event(win, &e);
 	}
 
-	- (void) addToPrevPointers: (const Reflex::PointerEvent&) event
-	{
-		size_t size = event.size();
-		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);
-		}
-	}
-
 @end// ReflexViewController

data/src/ios/window.mm

@@ -142,6 +142,25 @@ namespace Reflex
 		return Bounds(b.origin.x, b.origin.y, b.size.width, b.size.height);
 	}
 
+	static UIScreen*
+	get_screen (const Window& window)
+	{
+		UIWindow* w = get_vc(&window).view.window;
+		if (@available(iOS 13.0, *))
+			return w.windowScene.screen;
+		else
+			return w.screen;
+	}
+
+	Screen
+	Window_get_screen (const Window& window)
+	{
+		Screen s;
+		UIScreen* screen = get_screen(window);
+		Screen_initialize(&s, screen ? screen : UIScreen.mainScreen);
+		return s;
+	}
+
 	static UIInterfaceOrientationMask g_orientation_mask =
 		UIInterfaceOrientationMaskAll;
 
@@ -246,25 +265,6 @@ namespace Reflex
 			flags_to_orientation_mask(flags & (Window::FLAG_PORTRAIT | Window::FLAG_LANDSCAPE)));
 	}
 
-	static UIScreen*
-	get_screen (const Window& window)
-	{
-		UIWindow* w = get_vc(&window).view.window;
-		if (@available(iOS 13.0, *))
-			return w.windowScene.screen;
-		else
-			return w.screen;
-	}
-
-	Screen
-	Window_get_screen (const Window& window)
-	{
-		Screen s;
-		UIScreen* screen = get_screen(window);
-		Screen_initialize(&s, screen ? screen : UIScreen.mainScreen);
-		return s;
-	}
-
 	float
 	Window_get_pixel_density (const Window& window)
 	{

data/src/osx/event.h

@@ -38,7 +38,7 @@ namespace Reflex
 		public:
 
 			NativePointerEvent (
-				NSEvent* event, NSView* view, Pointer::ID id, Pointer::Action action);
+				NSEvent* event, NSView* view, Pointer::Action action);
 
 	};// NativePointerEvent
 

data/src/osx/event.mm

@@ -11,145 +11,47 @@ namespace Reflex
 {
 
 
-	static const char*
-	get_chars (NSEvent* e)
+	static uint
+	get_modifiers (const NSEvent* e)
 	{
-		NSString* chars = [e characters];//charactersIgnoringModifiers];
-		return [chars UTF8String];
+		NSUInteger flags = e.modifierFlags;
+		return
+			(flags & NSAlphaShiftKeyMask) ? MOD_CAPS     : 0 |
+			(flags & NSShiftKeyMask)      ? MOD_SHIFT    : 0 |
+			(flags & NSControlKeyMask)    ? MOD_CONTROL  : 0 |
+			(flags & NSAlternateKeyMask)  ? MOD_OPTION   : 0 |
+			(flags & NSCommandKeyMask)    ? MOD_COMMAND  : 0 |
+			(flags & NSNumericPadKeyMask) ? MOD_NUMPAD   : 0 |
+			(flags & NSHelpKeyMask)       ? MOD_HELP     : 0 |
+			(flags & NSFunctionKeyMask)   ? MOD_FUNCTION : 0;
 	}
 
-	static KeyCode
-	get_code (UInt16 code)
+	static Point
+	get_pointer_position (NSEvent* e, NSView* view)
 	{
-		switch (code)
-		{
-			case kVK_ANSI_A:              return KEY_A;
-			case kVK_ANSI_S:              return KEY_S;
-			case kVK_ANSI_D:              return KEY_D;
-			case kVK_ANSI_F:              return KEY_F;
-			case kVK_ANSI_H:              return KEY_H;
-			case kVK_ANSI_G:              return KEY_G;
-			case kVK_ANSI_Z:              return KEY_Z;
-			case kVK_ANSI_X:              return KEY_X;
-			case kVK_ANSI_C:              return KEY_C;
-			case kVK_ANSI_V:              return KEY_V;
-			case kVK_ANSI_B:              return KEY_B;
-			case kVK_ANSI_Q:              return KEY_Q;
-			case kVK_ANSI_W:              return KEY_W;
-			case kVK_ANSI_E:              return KEY_E;
-			case kVK_ANSI_R:              return KEY_R;
-			case kVK_ANSI_Y:              return KEY_Y;
-			case kVK_ANSI_T:              return KEY_T;
-			case kVK_ANSI_1:              return KEY_1;
-			case kVK_ANSI_2:              return KEY_2;
-			case kVK_ANSI_3:              return KEY_3;
-			case kVK_ANSI_4:              return KEY_4;
-			case kVK_ANSI_6:              return KEY_6;
-			case kVK_ANSI_5:              return KEY_5;
-			case kVK_ANSI_Equal:          return KEY_EQUAL;
-			case kVK_ANSI_9:              return KEY_9;
-			case kVK_ANSI_7:              return KEY_7;
-			case kVK_ANSI_Minus:          return KEY_MINUS;
-			case kVK_ANSI_8:              return KEY_8;
-			case kVK_ANSI_0:              return KEY_0;
-			case kVK_ANSI_RightBracket:   return KEY_RBRACKET;
-			case kVK_ANSI_O:              return KEY_O;
-			case kVK_ANSI_U:              return KEY_U;
-			case kVK_ANSI_LeftBracket:    return KEY_LBRACKET;
-			case kVK_ANSI_I:              return KEY_I;
-			case kVK_ANSI_P:              return KEY_P;
-			case kVK_ANSI_L:              return KEY_L;
-			case kVK_ANSI_J:              return KEY_J;
-			case kVK_ANSI_Quote:          return KEY_QUOTE;
-			case kVK_ANSI_K:              return KEY_K;
-			case kVK_ANSI_Semicolon:      return KEY_SEMICOLON;
-			case kVK_ANSI_Backslash:      return KEY_BACKSLASH;
-			case kVK_ANSI_Comma:          return KEY_COMMA;
-			case kVK_ANSI_Slash:          return KEY_SLASH;
-			case kVK_ANSI_N:              return KEY_N;
-			case kVK_ANSI_M:              return KEY_M;
-			case kVK_ANSI_Period:         return KEY_PERIOD;
-			case kVK_ANSI_Grave:          return KEY_GRAVE;
-			case kVK_ANSI_KeypadDecimal:  return KEY_NUM_DECIMAL;
-			case kVK_ANSI_KeypadMultiply: return KEY_NUM_MULTIPLY;
-			case kVK_ANSI_KeypadPlus:     return KEY_NUM_PLUS;
-			case kVK_ANSI_KeypadClear:    return KEY_NUM_CLEAR;
-			case kVK_ANSI_KeypadDivide:   return KEY_NUM_DIVIDE;
-			case kVK_ANSI_KeypadEnter:    return KEY_ENTER;
-			case kVK_ANSI_KeypadMinus:    return KEY_NUM_MINUS;
-			case kVK_ANSI_KeypadEquals:   return KEY_NUM_EQUAL;
-			case kVK_ANSI_Keypad0:        return KEY_NUM_0;
-			case kVK_ANSI_Keypad1:        return KEY_NUM_1;
-			case kVK_ANSI_Keypad2:        return KEY_NUM_2;
-			case kVK_ANSI_Keypad3:        return KEY_NUM_3;
-			case kVK_ANSI_Keypad4:        return KEY_NUM_4;
-			case kVK_ANSI_Keypad5:        return KEY_NUM_5;
-			case kVK_ANSI_Keypad6:        return KEY_NUM_6;
-			case kVK_ANSI_Keypad7:        return KEY_NUM_7;
-			case kVK_ANSI_Keypad8:        return KEY_NUM_8;
-			case kVK_ANSI_Keypad9:        return KEY_NUM_9;
+		assert(view);
 
-			case kVK_Return:        return KEY_RETURN;
-			case kVK_Tab:           return KEY_TAB;
-			case kVK_Space:         return KEY_SPACE;
-			case kVK_Delete:        return KEY_BACKSPACE;
-			case kVK_Escape:        return KEY_ESCAPE;
-			case kVK_Command:       return KEY_LCOMMAND;
-			case kVK_Shift:         return KEY_LSHIFT;
-			case kVK_CapsLock:      return KEY_CAPSLOCK;
-			case kVK_Option:        return KEY_LOPTION;
-			case kVK_Control:       return KEY_LCONTROL;
-			case kVK_RightCommand:  return KEY_RCOMMAND;
-			case kVK_RightShift:    return KEY_RSHIFT;
-			case kVK_RightOption:   return KEY_ROPTION;
-			case kVK_RightControl:  return KEY_RCONTROL;
-			case kVK_Function:      return KEY_FUNCTION;
-			case kVK_F17:           return KEY_F17;
-			case kVK_VolumeUp:      return KEY_VOLUME_UP;
-			case kVK_VolumeDown:    return KEY_VOLUME_DOWN;
-			case kVK_Mute:          return KEY_MUTE;
-			case kVK_F18:           return KEY_F18;
-			case kVK_F19:           return KEY_F19;
-			case kVK_F20:           return KEY_F20;
-			case kVK_F5:            return KEY_F5;
-			case kVK_F6:            return KEY_F6;
-			case kVK_F7:            return KEY_F7;
-			case kVK_F3:            return KEY_F3;
-			case kVK_F8:            return KEY_F8;
-			case kVK_F9:            return KEY_F9;
-			case kVK_F11:           return KEY_F11;
-			case kVK_F13:           return KEY_F13;
-			case kVK_F16:           return KEY_F16;
-			case kVK_F14:           return KEY_F14;
-			case kVK_F10:           return KEY_F10;
-			case kVK_F12:           return KEY_F12;
-			case kVK_F15:           return KEY_F15;
-			case kVK_Help:          return KEY_HELP;
-			case kVK_Home:          return KEY_HOME;
-			case kVK_PageUp:        return KEY_PAGEUP;
-			case kVK_ForwardDelete: return KEY_DELETE;
-			case kVK_F4:            return KEY_F4;
-			case kVK_End:           return KEY_END;
-			case kVK_F2:            return KEY_F2;
-			case kVK_PageDown:      return KEY_PAGEDOWN;
-			case kVK_F1:            return KEY_F1;
-			case kVK_LeftArrow:     return KEY_LEFT;
-			case kVK_RightArrow:    return KEY_RIGHT;
-			case kVK_DownArrow:     return KEY_DOWN;
-			case kVK_UpArrow:       return KEY_UP;
+		NSPoint p = [view convertPoint: e.locationInWindow fromView: nil];
+		p.y = view.bounds.size.height - p.y;
+		return Point(p.x, p.y);
+	}
 
-			case kVK_ISO_Section: return KEY_SECTION;
 
-			case kVK_JIS_Yen:         return KEY_YEN;
-			case kVK_JIS_Underscore:  return KEY_UNDERSCORE;
-			case kVK_JIS_KeypadComma: return KEY_NUM_COMMA;
-			case kVK_JIS_Eisu:        return KEY_IME_EISU;
-			case kVK_JIS_Kana:        return KEY_IME_KANA;
-		}
+	static const char*
+	get_chars (NSEvent* e)
+	{
+		NSString* chars = [e characters];//charactersIgnoringModifiers];
+		return [chars UTF8String];
+	}
 
-		return KEY_NONE;
+	NativeKeyEvent::NativeKeyEvent (NSEvent* e, Action action)
+	:	KeyEvent(
+			action, get_chars(e), [e keyCode],
+			get_modifiers(e), [e isARepeat] ? 1 : 0)
+	{
 	}
 
+
 	static uint
 	get_modifier_flag_mask (const NSEvent* e)
 	{
@@ -180,6 +82,23 @@ namespace Reflex
 			:	Reflex::KeyEvent::UP;
 	}
 
+	NativeFlagKeyEvent::NativeFlagKeyEvent (NSEvent* e)
+	:	KeyEvent(
+			get_flag_key_event_action(e), "", [e keyCode],
+			get_modifiers(e), 0)
+	{
+	}
+
+
+	static bool
+	is_pointer_dragging (NSEvent* e)
+	{
+		return
+			[e type] == NSLeftMouseDragged  ||
+			[e type] == NSRightMouseDragged ||
+			[e type] == NSOtherMouseDragged;
+	}
+
 	static uint
 	get_current_pointer_type ()
 	{
@@ -219,75 +138,18 @@ namespace Reflex
 		}
 	}
 
-	static uint
-	get_modifiers (const NSEvent* e)
-	{
-		NSUInteger flags = [e modifierFlags];
-		return
-			(flags & NSAlphaShiftKeyMask) ? MOD_CAPS     : 0 |
-			(flags & NSShiftKeyMask)      ? MOD_SHIFT    : 0 |
-			(flags & NSControlKeyMask)    ? MOD_CONTROL  : 0 |
-			(flags & NSAlternateKeyMask)  ? MOD_ALT      : 0 |
-			(flags & NSCommandKeyMask)    ? MOD_COMMAND  : 0 |
-			(flags & NSNumericPadKeyMask) ? MOD_NUMPAD   : 0 |
-			(flags & NSHelpKeyMask)       ? MOD_HELP     : 0 |
-			(flags & NSFunctionKeyMask)   ? MOD_FUNCTION : 0;
-	}
-
-	static NSPoint
-	correct_point (NSView* view, const NSPoint& point)
-	{
-		assert(view);
-		NSPoint p = [view convertPoint: point fromView: nil];
-		p.y = [view bounds].size.height - p.y;
-		return p;
-	}
-
-	static Point
-	get_pointer_position (NSEvent* e, NSView* view)
-	{
-		NSPoint p = correct_point(view, [e locationInWindow]);
-		return Point(p.x, p.y);
-	}
-
-
-	NativeKeyEvent::NativeKeyEvent (NSEvent* e, Action action)
-	:	KeyEvent(
-			action, get_chars(e), get_code([e keyCode]),
-			get_modifiers(e), [e isARepeat] ? 1 : 0)
-	{
-	}
-
-
-	NativeFlagKeyEvent::NativeFlagKeyEvent (NSEvent* e)
-	:	KeyEvent(
-			get_flag_key_event_action(e), "", get_code([e keyCode]),
-			get_modifiers(e), 0)
-	{
-	}
-
-
-	static bool
-	is_pointer_dragging (NSEvent* e)
-	{
-		return
-			[e type] == NSLeftMouseDragged  ||
-			[e type] == NSRightMouseDragged ||
-			[e type] == NSOtherMouseDragged;
-	}
-
 	NativePointerEvent::NativePointerEvent (
-		NSEvent* event, NSView* view, Pointer::ID id, Pointer::Action action)
+		NSEvent* event, NSView* view, Pointer::Action action)
 	{
 		bool dragging = is_pointer_dragging(event);
 		PointerEvent_add_pointer(this, Pointer(
-			id,
+			0,
 			get_pointer_type(event),
 			action,
 			get_pointer_position(event, view),
 			get_modifiers(event),
 			dragging,
-			action == Pointer::MOVE && !dragging ? 0 : (uint) [event clickCount],
+			action == Pointer::MOVE && !dragging ? 0 : (uint) event.clickCount,
 			0,
 			time()));
 	}

data/src/osx/native_window.mm

@@ -4,6 +4,7 @@
 
 #include <assert.h>
 #import <Cocoa/Cocoa.h>
+#include <rays/rays.h>
 #include "reflex/exception.h"
 #include "../view.h"
 #include "../pointer.h"
@@ -12,12 +13,6 @@
 #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 ()
 {
@@ -61,8 +56,6 @@ move_to_main_screen_origin (NativeWindow* window)
 		OpenGLView* view;
 		NSTimer* timer;
 		int update_count;
-		Reflex::Pointer::ID pointer_id;
-		Reflex::Pointer prev_pointer;
 	}
 
 	- (id) init
@@ -74,12 +67,11 @@ move_to_main_screen_origin (NativeWindow* window)
 			defer: NO];
 		if (!self) return nil;
 
-		pwindow         =
-		ptr_for_rebind  = NULL;
-		view            = nil;
-		timer           = nil;
-		update_count    = 0;
-		pointer_id      = 0;
+		pwindow        =
+		ptr_for_rebind = NULL;
+		view           = nil;
+		timer          = nil;
+		update_count   = 0;
 
 		[self setDelegate: self];
 		[self setupContentView];
@@ -92,8 +84,7 @@ move_to_main_screen_origin (NativeWindow* window)
 	{
 		assert(!pwindow);
 
-		if (view) [view release];
-
+		[self cleanupContentView];
 		[super dealloc];
 	}
 
@@ -156,6 +147,16 @@ move_to_main_screen_origin (NativeWindow* window)
 		[self setContentView: view];
 	}
 
+	- (void) cleanupContentView
+	{
+		if (!view) return;
+
+		if (view.openGLContext == NSOpenGLContext.currentContext)
+			Rays::activate_offscreen_context();
+
+		[view release];
+	}
+
 	- (void) startTimer
 	{
 		[self startTimer: 60];
@@ -297,23 +298,22 @@ move_to_main_screen_origin (NativeWindow* window)
 		win->self->prev_position = b.position();
 		win->self->prev_size     = b.size();
 
-		if (dpos != 0 || dsize != 0)
+		if (dpos == 0 && dsize == 0) return;
+
+		Reflex::FrameEvent e(b, dpos.x, dpos.y, 0, dsize.x, dsize.y, 0);
+		if (dpos  != 0) win->on_move(&e);
+		if (dsize != 0)
 		{
-			Reflex::FrameEvent e(b, dpos.x, dpos.y, 0, dsize.x, dsize.y, 0);
-			if (dpos  != 0) win->on_move(&e);
-			if (dsize != 0)
-			{
-				Rays::Bounds b = win->frame();
-				b.move_to(0, 0);
+			Rays::Bounds b = win->frame();
+			b.move_to(0, 0);
 
-				if (win->painter())
-					win->painter()->canvas(b, win->painter()->pixel_density());
+			if (win->painter())
+				win->painter()->canvas(b, win->painter()->pixel_density());
 
-				if (win->root())
-					View_set_frame(win->root(), b);
+			if (win->root())
+				View_set_frame(win->root(), b);
 
-				win->on_resize(&e);
-			}
+			win->on_resize(&e);
 		}
 	}
 
@@ -394,10 +394,7 @@ move_to_main_screen_origin (NativeWindow* window)
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		if (Reflex::Pointer_mask_flag(prev_pointer, MOUSE_BUTTONS) == 0)
-			++pointer_id;
-
-		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::DOWN);
+		Reflex::NativePointerEvent e(event, view, Reflex::Pointer::DOWN);
 
 		if (e[0].position().y < 0)
 		{
@@ -406,8 +403,6 @@ move_to_main_screen_origin (NativeWindow* window)
 			return;
 		}
 
-		[self attachAndUpdatePastPointers: &e];
-
 		Window_call_pointer_event(win, &e);
 	}
 
@@ -416,15 +411,7 @@ move_to_main_screen_origin (NativeWindow* window)
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::UP);
-		[self attachAndUpdatePastPointers: &e];
-
-		if (prev_pointer && Reflex::Pointer_mask_flag(prev_pointer, MOUSE_BUTTONS) == 0)
-		{
-			++pointer_id;
-			Pointer_set_down(&prev_pointer, NULL);
-		}
-
+		Reflex::NativePointerEvent e(event, view, Reflex::Pointer::UP);
 		Window_call_pointer_event(win, &e);
 	}
 
@@ -433,9 +420,7 @@ move_to_main_screen_origin (NativeWindow* window)
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::MOVE);
-		[self attachAndUpdatePastPointers: &e];
-
+		Reflex::NativePointerEvent e(event, view, Reflex::Pointer::MOVE);
 		Window_call_pointer_event(win, &e);
 	}
 
@@ -444,46 +429,10 @@ move_to_main_screen_origin (NativeWindow* window)
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::MOVE);
-		[self attachAndUpdatePastPointers: &e];
-
+		Reflex::NativePointerEvent e(event, view, Reflex::Pointer::MOVE);
 		Window_call_pointer_event(win, &e);
 	}
 
-	- (void) attachAndUpdatePastPointers: (Reflex::PointerEvent*) e
-	{
-		using namespace Reflex;
-
-		assert(e->size() == 1);
-
-		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);
-	}
-
 	- (void) scrollWheel: (NSEvent*) event
 	{
 		Reflex::Window* win = self.window;