reflexion 0.1.19 → 0.1.23

data/src/ios/view_controller.mm

@@ -3,9 +3,9 @@
 
 
 #include <rays/opengl.h>
-#include <rays/exception.h>
 #include "reflex/exception.h"
 #include "../view.h"
+#include "../pointer.h"
 #include "event.h"
 #include "window.h"
 
@@ -14,7 +14,7 @@
 
 
 static ReflexViewController*
-createReflexViewController ()
+create_reflex_view_controller ()
 {
 	return [[ReflexViewController alloc] init];
 }
@@ -52,7 +52,7 @@ get_top_view_controller (UIViewController* vc)
 }
 
 static void
-showReflexViewController (
+show_reflex_view_controller (
 	UIViewController* root_vc, ReflexViewController* reflex_vc)
 {
 	UIViewController* top = get_top_view_controller(root_vc);
@@ -90,13 +90,13 @@ ReflexViewController_set_show_fun (ReflexViewController_ShowFun fun)
 ReflexViewController_CreateFun
 ReflexViewController_get_create_fun ()
 {
-	return global::create_fun ? global::create_fun : createReflexViewController;
+	return global::create_fun ? global::create_fun : create_reflex_view_controller;
 }
 
 ReflexViewController_ShowFun
 ReflexViewController_get_show_fun ()
 {
-	return global::show_fun ? global::show_fun : showReflexViewController;
+	return global::show_fun ? global::show_fun : show_reflex_view_controller;
 }
 
 
@@ -131,6 +131,10 @@ 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
@@ -138,7 +142,11 @@ ReflexViewController_get_show_fun ()
 		self = [super init];
 		if (!self) return nil;
 
-		pwindow = ptr_for_rebind = NULL;
+		pwindow        =
+		ptr_for_rebind = NULL;
+		update_count   = 0;
+		touching_count = 0;
+		pointer_id     = 0;
 
 		return self;
 	}
@@ -312,6 +320,8 @@ ReflexViewController_get_show_fun ()
 		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;
@@ -332,6 +342,9 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
+		if (update_count == 0)
+			[self update];
+
 		EAGLContext* context = self.reflexView.context;
 		if (!context) return;
 
@@ -371,7 +384,7 @@ ReflexViewController_get_show_fun ()
 				b.move_to(0, 0);
 
 				if (win->painter())
-					win->painter()->canvas(b, UIScreen.mainScreen.scale);
+					win->painter()->canvas(b, win->painter()->pixel_density());
 
 				if (win->root())
 					View_set_frame(win->root(), b);
@@ -386,9 +399,12 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(
-			touches, event, self.reflexView, Reflex::PointerEvent::DOWN);
-		win->on_pointer(&e);
+		Reflex::NativePointerEvent e(touches, event, self.reflexView, &pointer_id);
+		[self addToPrevPointers: e];
+
+		touching_count += e.size();
+
+		Window_call_pointer_event(win, &e);
 	}
 
 	- (void) touchesEnded: (NSSet*) touches withEvent: (UIEvent*) event
@@ -396,19 +412,20 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(
-			touches, event, self.reflexView, Reflex::PointerEvent::UP);
-		win->on_pointer(&e);
+		Reflex::NativePointerEvent e(touches, event, self.reflexView, &prev_pointers);
+
+		touching_count -= e.size();
+		if (touching_count == 0)
+			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
 	{
-		Reflex::Window* win = self.window;
-		if (!win) return;
-
-		Reflex::NativePointerEvent e(
-			touches, event, self.reflexView, Reflex::PointerEvent::UP);
-		win->on_pointer(&e);
+		[self touchesEnded: touches withEvent: event];
 	}
 
 	- (void) touchesMoved: (NSSet*) touches withEvent: (UIEvent*) event
@@ -416,9 +433,20 @@ ReflexViewController_get_show_fun ()
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
-		Reflex::NativePointerEvent e(
-			touches, event, self.reflexView, Reflex::PointerEvent::MOVE);
-		win->on_pointer(&e);
+		Reflex::NativePointerEvent e(touches, event, self.reflexView, &prev_pointers);
+		[self addToPrevPointers: e];
+
+		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]);
+			Reflex::Pointer_set_prev(&prev_pointers.back(), NULL);
+		}
 	}
 
 @end// ReflexViewController

data/src/ios/window.mm

@@ -130,6 +130,24 @@ namespace Reflex
 			rect.size.height);
 	}
 
+	void
+	Window_set_resizable (Window* window, bool state)
+	{
+		//not_implemented_error(__FILE__, __LINE__);
+	}
+
+	bool
+	Window_is_resizable (const Window& window)
+	{
+		return false;
+	}
+
+	float
+	Window_get_pixel_density (const Window& window)
+	{
+		return UIScreen.mainScreen.scale;
+	}
+
 
 	WindowData::WindowData ()
 	{

data/src/osx/event.h

@@ -5,7 +5,7 @@
 
 
 #import <AppKit/NSEvent.h>
-#include <reflex/event.h>
+#include "../event.h"
 
 
 namespace Reflex
@@ -20,10 +20,21 @@ namespace Reflex
 	};// NativeKeyEvent
 
 
-	struct NativePointerEvent : public PointerEvent
+	struct NativeFlagKeyEvent : public KeyEvent
 	{
 
-		NativePointerEvent (NSEvent* event, NSView* view, Type type);
+		NativeFlagKeyEvent (NSEvent* event);
+
+	};// NativeFlagKeyEvent
+
+
+	class NativePointerEvent : public PointerEvent
+	{
+
+		public:
+
+			NativePointerEvent (
+				NSEvent* event, NSView* view, Pointer::ID id, Pointer::Action action);
 
 	};// NativePointerEvent
 

data/src/osx/event.mm

@@ -3,6 +3,7 @@
 
 
 #include <assert.h>
+#include <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 
@@ -17,14 +18,176 @@ namespace Reflex
 		return [chars UTF8String];
 	}
 
+	static KeyCode
+	get_code (UInt16 code)
+	{
+		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;
+
+			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;
+
+			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;
+		}
+
+		return KEY_NONE;
+	}
+
+	static uint
+	get_modifier_flag_mask (const NSEvent* e)
+	{
+		switch ([e keyCode])
+		{
+			case kVK_Shift:
+			case kVK_RightShift:   return NSShiftKeyMask;
+			case kVK_Control:
+			case kVK_RightControl: return NSControlKeyMask;
+			case kVK_Option:
+			case kVK_RightOption:  return NSAlternateKeyMask;
+			case kVK_Command:
+			case kVK_RightCommand: return NSCommandKeyMask;
+			case kVK_CapsLock:     return NSAlphaShiftKeyMask;
+			case kVK_Function:     return NSFunctionKeyMask;
+		}
+		return 0;
+	}
+
+	static KeyEvent::Type
+	get_flag_key_event_type(const NSEvent* e)
+	{
+		uint mask = get_modifier_flag_mask(e);
+		if (mask == 0) return Reflex::KeyEvent::NONE;
+
+		return [e modifierFlags] & mask
+			?	Reflex::KeyEvent::DOWN
+			:	Reflex::KeyEvent::UP;
+	}
+
 	static uint
 	get_current_pointer_type ()
 	{
 		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;
 	}
 
@@ -36,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
@@ -78,34 +243,59 @@ 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(
-			type, get_chars(e), [e keyCode], get_modifiers(e), [e isARepeat] ? 1 : 0)
+			type, get_chars(e), get_code([e keyCode]), get_modifiers(e),
+			[e isARepeat] ? 1 : 0)
 	{
 	}
 
 
-	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)
+	NativeFlagKeyEvent::NativeFlagKeyEvent (NSEvent* e)
+	:	KeyEvent(
+			get_flag_key_event_type(e), "", get_code([e keyCode]), get_modifiers(e),
+			0)
 	{
-		NSPoint p = correct_point(view, [e locationInWindow]);
-		x = p.x;
-		y = p.y;
+	}
+
+
+	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)
+	{
+		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);
 	}