reflexion 0.3.4 → 0.3.6

data/src/win32/application.cpp

@@ -42,7 +42,7 @@ namespace Reflex
 	Application::start ()
 	{
 		Event e;
-		on_start(&e);
+		Application_call_start(this, &e);
 
 		timeBeginPeriod(1);
 
@@ -84,27 +84,11 @@ namespace Reflex
 	void
 	Application::quit ()
 	{
-		PostQuitMessage(0);
-	}
-
-	void
-	Application::on_start (Event* e)
-	{
-	}
-
-	void
-	Application::on_quit (Event* e)
-	{
-	}
-
-	void
-	Application::on_motion (MotionEvent* e)
-	{
-	}
+		Event e;
+		Application_call_quit(this, &e);
+		if (e.is_blocked()) return;
 
-	void
-	Application::on_preference (Event* e)
-	{
+		PostQuitMessage(0);
 	}
 
 	void
@@ -112,10 +96,5 @@ namespace Reflex
 	{
 	}
 
-	Application::operator bool () const
-	{
-		return true;
-	}
-
 
 }// Reflex

data/src/win32/event.cpp

@@ -3,15 +3,16 @@
 
 #include <xot/time.h>
 #include "reflex/exception.h"
-#include "../pointer.h"
+#include "reflex/debug.h"
+#include "window.h"
 
 
 namespace Reflex
 {
 
 
-	static uint
-	get_modifiers ()
+	uint
+	get_key_modifiers ()
 	{
 		return
 			(GetKeyState(VK_SHIFT)   & 0x8000 ? MOD_SHIFT   : 0) |
@@ -36,7 +37,7 @@ namespace Reflex
 	}
 
 	NativeKeyEvent::NativeKeyEvent (UINT msg, WPARAM wp, LPARAM lp, const char* chars)
-	:	KeyEvent(get_key_action(msg), chars, (int) wp, get_modifiers(), lp & 0xFF)
+	:	KeyEvent(get_key_action(msg), chars, (int) wp, get_key_modifiers(), lp & 0xFF)
 	{
 	}
 
@@ -134,7 +135,7 @@ namespace Reflex
 			get_mouse_type(msg, wp),
 			get_mouse_action(msg),
 			Point(GET_X_LPARAM(lp), GET_Y_LPARAM(lp)),
-			get_modifiers(),
+			get_key_modifiers(),
 			get_mouse_click_count(msg),
 			is_mouse_dragging(msg, wp),
 			Xot::time()));
@@ -195,7 +196,7 @@ namespace Reflex
 				get_touch_type(touch),
 				action,
 				get_touch_position(hwnd, touch),
-				get_modifiers(),
+				get_key_modifiers(),
 				action == Pointer::DOWN ? 1 : 0,
 				action == Pointer::MOVE,
 				get_touch_time(touch));
@@ -211,7 +212,7 @@ namespace Reflex
 	:	WheelEvent(
 			GET_X_LPARAM(lp),              GET_Y_LPARAM(lp),             0,
 			GET_WHEEL_DELTA_WPARAM(wp_x), -GET_WHEEL_DELTA_WPARAM(wp_y), 0,
-			get_modifiers())
+			get_key_modifiers())
 	{
 	}
 

data/src/win32/event.h

@@ -44,6 +44,11 @@ namespace Reflex
 	};// NativeWheelEvent
 
 
+	uint get_key_modifiers ();
+
+	void Gamepad_poll ();
+
+
 }// Reflex
 
 

data/src/win32/gamepad.cpp

@@ -0,0 +1,110 @@
+#include "gamepad.h"
+
+
+#include <xot/windows.h>
+#include <xinput.h>
+
+#include "reflex/exception.h"
+#include "reflex/debug.h"
+#include "window.h"
+#include "event.h"
+
+
+namespace Reflex
+{
+
+
+	static void
+	call_gamepad_event (Window* win, int code, bool pressed)
+	{
+		auto action = pressed ? KeyEvent::DOWN : KeyEvent::UP;
+		KeyEvent e(action, NULL, code, get_key_modifiers(), 0);
+		Window_call_key_event(win, &e);
+	}
+
+	static void
+	handle_gamepad_button_event (
+		Window* win, const XINPUT_STATE& state, const XINPUT_STATE& prev_state,
+		WORD mask, int code)
+	{
+		WORD pressed =      state.Gamepad.wButtons & mask;
+		WORD prev    = prev_state.Gamepad.wButtons & mask;
+		if (pressed == prev) return;
+
+		call_gamepad_event(win, code, pressed);
+	}
+
+	static void
+	handle_gamepad_trigger_event (Window* win, BYTE value, BYTE prev_value, int code)
+	{
+		WORD pressed =      value > XINPUT_GAMEPAD_TRIGGER_THRESHOLD;
+		WORD prev    = prev_value > XINPUT_GAMEPAD_TRIGGER_THRESHOLD;
+		if (pressed == prev) return;
+
+		call_gamepad_event(win, code, pressed);
+	}
+
+	static void
+	handle_gamepad_events (const XINPUT_STATE& state, const XINPUT_STATE& prev_state)
+	{
+		Window* win = Window_get_active();
+		if (!win) return;
+
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_DPAD_LEFT,  KEY_GAMEPAD_LEFT);
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_DPAD_RIGHT, KEY_GAMEPAD_RIGHT);
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_DPAD_UP,    KEY_GAMEPAD_UP);
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_DPAD_DOWN,  KEY_GAMEPAD_DOWN);
+
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_A, KEY_GAMEPAD_A);
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_B, KEY_GAMEPAD_B);
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_X, KEY_GAMEPAD_X);
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_Y, KEY_GAMEPAD_Y);
+
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_LEFT_SHOULDER,  KEY_GAMEPAD_LSHOULDER);
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_RIGHT_SHOULDER, KEY_GAMEPAD_RSHOULDER);
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_LEFT_THUMB,     KEY_GAMEPAD_LTHUMB);
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_RIGHT_THUMB,    KEY_GAMEPAD_RTHUMB);
+
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_START, KEY_GAMEPAD_START);
+		handle_gamepad_button_event(win, state, prev_state, XINPUT_GAMEPAD_BACK,  KEY_GAMEPAD_SELECT);
+
+		handle_gamepad_trigger_event(win, state.Gamepad.bLeftTrigger,  prev_state.Gamepad.bLeftTrigger,  KEY_GAMEPAD_LTRIGGER);
+		handle_gamepad_trigger_event(win, state.Gamepad.bRightTrigger, prev_state.Gamepad.bRightTrigger, KEY_GAMEPAD_RTRIGGER);
+	}
+
+	void
+	Gamepad_init (Application* app)
+	{
+	}
+
+	void
+	Gamepad_fin (Application* app)
+	{
+		Gamepad_remove_all(app);
+	}
+
+	void
+	Gamepad_poll ()
+	{
+		static XINPUT_STATE prev_state;
+		static bool prev_detected = false;
+
+		XINPUT_STATE state = {0};
+		bool detected      = XInputGetState(0, &state) == ERROR_SUCCESS;
+
+		if (detected != prev_detected)
+		{
+			prev_detected = detected;
+			if (detected) prev_state = {0};
+		}
+
+		if (!detected) return;
+
+		if (state.dwPacketNumber != prev_state.dwPacketNumber)
+			handle_gamepad_events(state, prev_state);
+
+		prev_state = state;
+	}
+
+
+}// Reflex

data/src/win32/gamepad.h

@@ -0,0 +1,20 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_WIN32_GAMEPAD_H__
+#define __REFLEX_SRC_WIN32_GAMEPAD_H__
+
+
+#include "../gamepad.h"
+
+
+namespace Reflex
+{
+
+
+	void Gamepad_poll ();
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/win32/window.cpp

@@ -12,6 +12,7 @@
 #include "reflex/debug.h"
 #include "../view.h"
 #include "event.h"
+#include "gamepad.h"
 #include "screen.h"
 #include "opengl.h"
 
@@ -154,6 +155,8 @@ namespace Reflex
 	{
 		WindowData* self = get_data(win);
 
+		Gamepad_poll();
+
 		Window_call_update_event(win);
 
 		if (self->redraw)
@@ -341,8 +344,13 @@ namespace Reflex
 		{
 			case WM_ACTIVATE:
 			{
-				if ((wp & 0xFFFF) == WA_INACTIVE)
+				if (LOWORD(wp) == WA_INACTIVE)
+				{
+					Window_call_deactivate_event(win);
 					self->pressing_keys.clear();
+				}
+				else
+					Window_call_activate_event(win);
 				break;
 			}
 

data/src/window.cpp

@@ -52,6 +52,17 @@ namespace Reflex
 		return windows;
 	}
 
+	Window*
+	Window_get_active ()
+	{
+		for (auto& w : Window_all())
+		{
+			if (Xot::has_flag(w->self->flags, Window::Data::ACTIVE))
+				return w;
+		}
+		return NULL;
+	}
+
 
 	Window::Data::Data ()
 	:	flags(Window_default_flags())
@@ -167,6 +178,8 @@ namespace Reflex
 	{
 		if (!window) return;
 
+		Xot::add_flag(&window->self->flags, Window::Data::ACTIVE);
+
 		Event e;
 		window->on_activate(&e);
 	}
@@ -178,6 +191,8 @@ namespace Reflex
 
 		Event e;
 		window->on_deactivate(&e);
+
+		Xot::remove_flag(&window->self->flags, Window::Data::ACTIVE);
 	}
 
 	void

data/src/window.h

@@ -33,6 +33,13 @@ namespace Reflex
 
 		typedef std::map<View::Ref, CaptureTargetIDList> CaptureMap;
 
+		enum Flag
+		{
+
+			ACTIVE = Xot::bit(1, FLAG_LAST),
+
+		};// Flag
+
 		int hide_count = 1;
 
 		bool redraw    = true;
@@ -82,6 +89,8 @@ namespace Reflex
 
 	Application::WindowList& Window_all ();
 
+	Window* Window_get_active ();
+
 
 	uint Window_default_flags ();
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,60 +16,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
 description: This library helps you to develop interactive graphical user interface.
 email: xordog@gmail.com
 executables: []
@@ -80,6 +80,7 @@ extra_rdoc_files:
 - ".doc/ext/reflex/capture_event.cpp"
 - ".doc/ext/reflex/contact_event.cpp"
 - ".doc/ext/reflex/device.cpp"
+- ".doc/ext/reflex/device_event.cpp"
 - ".doc/ext/reflex/draw_event.cpp"
 - ".doc/ext/reflex/ellipse_shape.cpp"
 - ".doc/ext/reflex/event.cpp"
@@ -114,6 +115,7 @@ files:
 - ".doc/ext/reflex/capture_event.cpp"
 - ".doc/ext/reflex/contact_event.cpp"
 - ".doc/ext/reflex/device.cpp"
+- ".doc/ext/reflex/device_event.cpp"
 - ".doc/ext/reflex/draw_event.cpp"
 - ".doc/ext/reflex/ellipse_shape.cpp"
 - ".doc/ext/reflex/event.cpp"
@@ -143,10 +145,12 @@ files:
 - ".doc/ext/reflex/view.cpp"
 - ".doc/ext/reflex/wheel_event.cpp"
 - ".doc/ext/reflex/window.cpp"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/release-gem.yml"
 - ".github/workflows/tag.yml"
 - ".github/workflows/test.yml"
 - ".github/workflows/utils.rb"
+- CONTRIBUTING.md
 - ChangeLog.md
 - Gemfile
 - Gemfile.lock
@@ -159,6 +163,7 @@ files:
 - ext/reflex/contact_event.cpp
 - ext/reflex/defs.h
 - ext/reflex/device.cpp
+- ext/reflex/device_event.cpp
 - ext/reflex/draw_event.cpp
 - ext/reflex/ellipse_shape.cpp
 - ext/reflex/event.cpp
@@ -198,12 +203,14 @@ files:
 - include/reflex/event.h
 - include/reflex/exception.h
 - include/reflex/filter.h
+- include/reflex/gamepad.h
 - include/reflex/image_view.h
 - include/reflex/pointer.h
 - include/reflex/reflex.h
 - include/reflex/ruby.h
 - include/reflex/ruby/application.h
 - include/reflex/ruby/defs.h
+- include/reflex/ruby/device.h
 - include/reflex/ruby/event.h
 - include/reflex/ruby/exception.h
 - include/reflex/ruby/filter.h
@@ -325,12 +332,15 @@ files:
 - src/application.h
 - src/body.cpp
 - src/body.h
+- src/device.cpp
 - src/event.cpp
 - src/event.h
 - src/exception.cpp
 - src/filter.cpp
 - src/fixture.cpp
 - src/fixture.h
+- src/gamepad.cpp
+- src/gamepad.h
 - src/image_view.cpp
 - src/ios/app_delegate.h
 - src/ios/app_delegate.mm
@@ -339,6 +349,7 @@ files:
 - src/ios/device.mm
 - src/ios/event.h
 - src/ios/event.mm
+- src/ios/gamepad.mm
 - src/ios/reflex.mm
 - src/ios/screen.h
 - src/ios/screen.mm
@@ -353,6 +364,9 @@ files:
 - src/osx/device.mm
 - src/osx/event.h
 - src/osx/event.mm
+- src/osx/gamepad.mm
+- src/osx/gamepad_gc.mm
+- src/osx/gamepad_hid.mm
 - src/osx/native_window.h
 - src/osx/native_window.mm
 - src/osx/opengl_view.h
@@ -378,6 +392,8 @@ files:
 - src/win32/device.cpp
 - src/win32/event.cpp
 - src/win32/event.h
+- src/win32/gamepad.cpp
+- src/win32/gamepad.h
 - src/win32/opengl.cpp
 - src/win32/opengl.h
 - src/win32/reflex.cpp