reflexion 0.1.20 → 0.1.24

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();
 	}

data/src/shape.cpp

@@ -432,25 +432,23 @@ namespace Reflex
 	}
 
 	void
-	Shape_call_contact_event (Shape* shape, const ContactEvent& event)
+	Shape_call_contact_event (Shape* shape, ContactEvent* event)
 	{
-		if (!shape)
+		if (!shape || !event)
 			argument_error(__FILE__, __LINE__);
 
-		ContactEvent e = event;
-		shape->on_contact(&e);
+		shape->on_contact(event);
 
-		switch (e.type)
+		switch (event->action())
 		{
-			case ContactEvent::BEGIN: shape->on_contact_begin(&e); break;
-			case ContactEvent::END:   shape->on_contact_end(&e);   break;
-			case ContactEvent::NONE: break;
+			case ContactEvent::BEGIN: shape->on_contact_begin(event); break;
+			case ContactEvent::END:   shape->on_contact_end(event);   break;
+			default: break;
 		}
 
-		if (e.is_blocked())
-			return;
+		if (event->is_blocked()) return;
 
-		View_call_contact_event(shape->owner(), e);
+		View_call_contact_event(shape->owner(), event);
 	}
 
 
@@ -587,9 +585,9 @@ namespace Reflex
 	void
 	Shape::on_draw (DrawEvent* e)
 	{
-		assert(e && e->painter);
+		assert(e && e->painter());
 
-		e->painter->polygon(self->polygon);
+		e->painter()->polygon(self->polygon);
 	}
 
 	void

data/src/shape.h

@@ -52,7 +52,7 @@ namespace Reflex
 
 	void Shape_update (Shape* shape, bool force = false);
 
-	void Shape_call_contact_event (Shape* shape, const ContactEvent& event);
+	void Shape_call_contact_event (Shape* shape, ContactEvent* event);
 
 
 }// Reflex