reflexion 0.1.22 → 0.1.23

data/src/osx/event.mm

@@ -185,9 +185,9 @@ namespace Reflex
 	{
 		NSUInteger buttons = [NSEvent pressedMouseButtons];
 		uint ret = 0;
-		if (buttons &  (1 << 0)) ret |= POINTER_MOUSE_LEFT;
-		if (buttons &  (1 << 1)) ret |= POINTER_MOUSE_RIGHT;
-		if (buttons >= (1 << 2)) ret |= POINTER_MOUSE_MIDDLE;
+		if (buttons &  Xot::bit(0)) ret |= Reflex::Pointer::MOUSE_LEFT;
+		if (buttons &  Xot::bit(1)) ret |= Reflex::Pointer::MOUSE_RIGHT;
+		if (buttons >= Xot::bit(2)) ret |= Reflex::Pointer::MOUSE_MIDDLE;
 		return ret;
 	}
 
@@ -199,22 +199,24 @@ namespace Reflex
 			case NSLeftMouseDown:
 			case NSLeftMouseUp:
 			case NSLeftMouseDragged:
-				return POINTER_MOUSE_LEFT;
+				return Reflex::Pointer::MOUSE | Reflex::Pointer::MOUSE_LEFT;
 
 			case NSRightMouseDown:
 			case NSRightMouseUp:
 			case NSRightMouseDragged:
-				return POINTER_MOUSE_RIGHT;
+				return Reflex::Pointer::MOUSE | Reflex::Pointer::MOUSE_RIGHT;
 
 			case NSOtherMouseDown:
 			case NSOtherMouseUp:
 			case NSOtherMouseDragged:
-				return POINTER_MOUSE_MIDDLE;
+				return Reflex::Pointer::MOUSE | Reflex::Pointer::MOUSE_MIDDLE;
 
 			case NSMouseMoved:
-				return get_current_pointer_type();
+				return Reflex::Pointer::MOUSE | get_current_pointer_type();
+
+			default:
+				return Reflex::Pointer::TYPE_NONE;
 		}
-		return 0;
 	}
 
 	static uint
@@ -241,6 +243,13 @@ namespace Reflex
 		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, Type type)
 	:	KeyEvent(
@@ -258,26 +267,35 @@ namespace Reflex
 	}
 
 
-	NativePointerEvent::NativePointerEvent (NSEvent* e, NSView* view, Type type)
-	:	PointerEvent(
-			type, get_pointer_type(e), (coord) 0, (coord) 0,
-			get_modifiers(e), (uint) [e clickCount],
-			[e type] == NSLeftMouseDragged || [e type] == NSRightMouseDragged || [e type] == NSOtherMouseDragged)
+	static bool
+	is_pointer_dragging (NSEvent* e)
 	{
-		NSPoint p = correct_point(view, [e locationInWindow]);
-		x = p.x;
-		y = p.y;
+		return
+			[e type] == NSLeftMouseDragged  ||
+			[e type] == NSRightMouseDragged ||
+			[e type] == NSOtherMouseDragged;
+	}
+
+	NativePointerEvent::NativePointerEvent (
+		NSEvent* event, NSView* view, Pointer::ID id, Pointer::Action action)
+	{
+		bool dragging = is_pointer_dragging(event);
+		PointerEvent_add_pointer(this, Pointer(
+			id,
+			get_pointer_type(event),
+			action,
+			get_pointer_position(event, view),
+			get_modifiers(event),
+			action == Pointer::MOVE && !dragging ? 0 : (uint) [event clickCount],
+			dragging,
+			time()));
 	}
 
 
 	NativeWheelEvent::NativeWheelEvent (NSEvent* e, NSView* view)
-	:	WheelEvent([e deltaX], [e deltaY], [e deltaZ])
+	:	WheelEvent(0, 0, 0, [e deltaX], [e deltaY], [e deltaZ], get_modifiers(e))
 	{
-		NSPoint p = correct_point(view, [e locationInWindow]);
-		x         = p.x;
-		y         = p.y;
-		z         = 0;
-		modifiers = get_modifiers(e);
+		position_ = get_pointer_position(e, view);
 	}
 
 

data/src/osx/native_window.mm

@@ -4,9 +4,9 @@
 
 #include <assert.h>
 #import <Cocoa/Cocoa.h>
-#include "rays/bounds.h"
 #include "reflex/exception.h"
 #include "../view.h"
+#include "../pointer.h"
 #include "event.h"
 #include "window.h"
 #import "opengl_view.h"
@@ -20,12 +20,30 @@ static const NSUInteger WINDOW_STYLE_MASK =
 	0;//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;
+}
+
 @implementation NativeWindow
 
 	{
 		Reflex::Window *pwindow, *ptr_for_rebind;
 		OpenGLView* view;
 		NSTimer* timer;
+		int update_count;
+		int clicking_count;
+		Reflex::Pointer::ID pointer_id;
+		Reflex::Pointer prevPointer;
 	}
 
 	- (id) init
@@ -37,9 +55,13 @@ static const NSUInteger WINDOW_STYLE_MASK =
 			defer: NO];
 		if (!self) return nil;
 
-		pwindow = ptr_for_rebind = NULL;
-		view    = nil;
-		timer   = nil;
+		pwindow         =
+		ptr_for_rebind  = NULL;
+		view            = nil;
+		timer           = nil;
+		update_count    = 0;
+		clicking_count  = 0;
+		pointer_id      = 0;
 
 		[self setDelegate: self];
 		[self setupContentView];
@@ -152,6 +174,8 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
+		++update_count;
+
 		double now = Xot::time();
 		Reflex::UpdateEvent e(now, now - win->self->prev_time_update);
 		win->self->prev_time_update = now;
@@ -172,6 +196,9 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
+		if (update_count == 0)
+			[self update];
+
 		double now = Xot::time();
 		double dt  = now - win->self->prev_time_draw;
 		double fps = 1. / dt;
@@ -266,7 +293,7 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		if (!win) return;
 
 		Reflex::NativeKeyEvent e(event, Reflex::KeyEvent::DOWN);
-		win->on_key(&e);
+		Window_call_key_event(win, &e);
 	}
 
 	- (void) keyUp: (NSEvent*) event
@@ -275,7 +302,7 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		if (!win) return;
 
 		Reflex::NativeKeyEvent e(event, Reflex::KeyEvent::UP);
-		win->on_key(&e);
+		Window_call_key_event(win, &e);
 	}
 
 	- (void) flagsChanged: (NSEvent*) event
@@ -284,7 +311,7 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		if (!win) return;
 
 		Reflex::NativeFlagKeyEvent e(event);
-		win->on_key(&e);
+		Window_call_key_event(win, &e);
 	}
 
 	- (void) mouseDown: (NSEvent*) event
@@ -292,8 +319,22 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(event, view, Reflex::PointerEvent::DOWN);
-		win->on_pointer(&e);
+		if (clicking_count == 0) ++pointer_id;
+
+		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::DOWN);
+
+		if (e[0].position().y < 0)
+		{
+			// ignore mouseDown event since the mouseUp event to the window title bar
+			// will not come and will break clicking_count.
+			return;
+		}
+
+		[self attachAndUpdatePrevPointer: &e];
+
+		clicking_count += count_mouse_buttons(e);
+
+		Window_call_pointer_event(win, &e);
 	}
 
 	- (void) mouseUp: (NSEvent*) event
@@ -301,8 +342,16 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(event, view, Reflex::PointerEvent::UP);
-		win->on_pointer(&e);
+		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::UP);
+		[self attachAndUpdatePrevPointer: &e];
+
+		clicking_count -= count_mouse_buttons(e);
+		if (clicking_count == 0)
+			++pointer_id;
+		else if (clicking_count < 0)
+			Reflex::invalid_state_error(__FILE__, __LINE__);
+
+		Window_call_pointer_event(win, &e);
 	}
 
 	- (void) mouseDragged: (NSEvent*) event
@@ -310,8 +359,10 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(event, view, Reflex::PointerEvent::MOVE);
-		win->on_pointer(&e);
+		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::MOVE);
+		[self attachAndUpdatePrevPointer: &e];
+
+		Window_call_pointer_event(win, &e);
 	}
 
 	- (void) mouseMoved: (NSEvent*) event
@@ -319,8 +370,20 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(event, view, Reflex::PointerEvent::MOVE);
-		win->on_pointer(&e);
+		Reflex::NativePointerEvent e(event, view, pointer_id, Reflex::Pointer::MOVE);
+		[self attachAndUpdatePrevPointer: &e];
+
+		Window_call_pointer_event(win, &e);
+	}
+
+	- (void) attachAndUpdatePrevPointer: (Reflex::PointerEvent*) e
+	{
+		assert(e->size() == 1);
+
+		Reflex::Pointer& pointer = Reflex::PointerEvent_pointer_at(e, 0);
+		if (prevPointer)
+			Reflex::Pointer_set_prev(&pointer, &prevPointer);
+		prevPointer = pointer;
 	}
 
 	- (void) scrollWheel: (NSEvent*) event
@@ -329,7 +392,7 @@ static const NSUInteger WINDOW_STYLE_MASK =
 		if (!win) return;
 
 		Reflex::NativeWheelEvent e(event, view);
-		win->on_wheel(&e);
+		Window_call_wheel_event(win, &e);
 	}
 
 	+ (NSRect) frameRectForContentRect: (NSRect) contentRect

data/src/pointer.cpp

@@ -0,0 +1,203 @@
+#include "pointer.h"
+
+
+#include <xot/time.h>
+#include "reflex/exception.h"
+
+
+namespace Reflex
+{
+
+
+	class PrevPointerPtr : public Xot::PImpl<Pointer>
+	{
+
+		typedef Xot::PImpl<Pointer> Super;
+
+		public:
+
+			PrevPointerPtr () : Super(NULL) {}
+
+	};// PrevPointerPtr
+
+
+	struct Pointer::Data
+	{
+
+		enum Flag
+		{
+
+			DRAG  = Xot::bit(0),
+
+			ENTER = Xot::bit(1),
+
+			EXIT  = Xot::bit(2),
+
+		};// Flag
+
+		ID id;
+
+		uint type;
+
+		Action action;
+
+		Point position;
+
+		uint modifiers, click_count, flags;
+
+		double time;
+
+		PrevPointerPtr prev;
+
+		Data (
+			ID id = -1, uint type = TYPE_NONE, Action action = ACTION_NONE,
+			const Point& position = 0, uint modifiers = 0, uint click_count = 0,
+			bool drag = false, bool enter = false, bool exit = false,
+			double time = 0)
+		:	id(id), type(type), action(action),
+			position(position), modifiers(modifiers), click_count(click_count),
+			flags(make_flags(drag, enter, exit)),
+			time(time)
+		{
+		}
+
+		uint make_flags (bool drag, bool enter, bool exit)
+		{
+			return
+				(drag  ? DRAG  : 0) |
+				(enter ? ENTER : 0) |
+				(exit  ? EXIT  : 0);
+		}
+
+	};// Pointer::Data
+
+
+	void
+	Pointer_update_positions (Pointer* pthis, std::function<void(Point*)> fun)
+	{
+		assert(pthis);
+
+		auto& self = pthis->self;
+		fun(&self->position);
+		if (self->prev)
+			fun(&self->prev->self->position);
+	}
+
+	void
+	Pointer_set_id (Pointer* pthis, Pointer::ID id)
+	{
+		pthis->self->id = id;
+	}
+
+	void
+	Pointer_set_prev (Pointer* pthis, const Pointer* prev)
+	{
+		if (prev)
+			pthis->self->prev.reset(new Pointer(*prev));
+		else
+			pthis->self->prev.reset();
+	}
+
+
+	Pointer::Pointer ()
+	{
+	}
+
+	Pointer::Pointer (
+		ID id, uint type, Action action,
+		const Point& position, uint modifiers, uint click_count, bool drag,
+		double time)
+	:	self(new Data(
+			id, type, action,
+			position, modifiers, click_count, drag, false, false,
+			time))
+	{
+	}
+
+	Pointer::Pointer (const This& obj)
+	:	self(new Data(*obj.self))
+	{
+	}
+
+	Pointer&
+	Pointer::operator = (const This& obj)
+	{
+		if (&obj == this) return *this;
+
+		*self = *obj.self;
+		return *this;
+	}
+
+	Pointer::~Pointer ()
+	{
+	}
+
+	Pointer::ID
+	Pointer::id () const
+	{
+		return self->id;
+	}
+
+	uint
+	Pointer::type () const
+	{
+		return self->type;
+	}
+
+	Pointer::Action
+	Pointer::action () const
+	{
+		return self->action;
+	}
+
+	const Point&
+	Pointer::position () const
+	{
+		return self->position;
+	}
+
+	uint
+	Pointer::modifiers () const
+	{
+		return self->modifiers;
+	}
+
+	uint
+	Pointer::click_count () const
+	{
+		return self->click_count;
+	}
+
+	bool
+	Pointer::is_drag () const
+	{
+		return self->flags & Data::DRAG;
+	}
+
+	double
+	Pointer::time () const
+	{
+		return self->time;
+	}
+
+	const Pointer*
+	Pointer::prev () const
+	{
+		return self->prev.get();
+	}
+
+	Pointer::operator bool () const
+	{
+		return
+			self->type != TYPE_NONE &&
+			ACTION_NONE < self->action && self->action <= STAY;
+	}
+
+	bool
+	Pointer::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Reflex

data/src/pointer.h

@@ -0,0 +1,26 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_POINTER_H__
+#define __REFLEX_SRC_POINTER_H__
+
+
+#include <functional>
+#include <reflex/pointer.h>
+
+
+namespace Reflex
+{
+
+
+	void Pointer_update_positions (
+		Pointer* pthis, std::function<void(Point*)> fun);
+
+	void Pointer_set_id   (Pointer* pthis, Pointer::ID id);
+
+	void Pointer_set_prev (Pointer* pthis, const Pointer* prev);
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/selector.cpp

@@ -139,7 +139,7 @@ namespace Reflex
 	}
 
 	bool
-	Selector::is_empty () const
+	Selector::empty () const
 	{
 		return self->name.empty() && self->tags.empty();
 	}