aboutsummaryrefslogtreecommitdiff
path: root/include/cru/platform/gui
diff options
context:
space:
mode:
Diffstat (limited to 'include/cru/platform/gui')
-rw-r--r--include/cru/platform/gui/InputMethod.h2
-rw-r--r--include/cru/platform/gui/Window.h14
-rw-r--r--include/cru/platform/gui/osx/InputMethod.h2
-rw-r--r--include/cru/platform/gui/osx/Window.h14
-rw-r--r--include/cru/platform/gui/sdl/Window.h28
-rw-r--r--include/cru/platform/gui/win/InputMethod.h6
-rw-r--r--include/cru/platform/gui/win/Window.h10
-rw-r--r--include/cru/platform/gui/xcb/InputMethod.h4
-rw-r--r--include/cru/platform/gui/xcb/Window.h28
9 files changed, 54 insertions, 54 deletions
diff --git a/include/cru/platform/gui/InputMethod.h b/include/cru/platform/gui/InputMethod.h
index d178cb8a..2d5d0b76 100644
--- a/include/cru/platform/gui/InputMethod.h
+++ b/include/cru/platform/gui/InputMethod.h
@@ -61,6 +61,6 @@ struct IInputMethodContext : virtual IPlatformResource {
virtual IEvent<std::nullptr_t>* CompositionStartEvent() = 0;
virtual IEvent<std::nullptr_t>* CompositionEndEvent() = 0;
virtual IEvent<std::nullptr_t>* CompositionEvent() = 0;
- virtual IEvent<std::string>* TextEvent() = 0;
+ virtual IEvent<const std::string&>* TextEvent() = 0;
};
} // namespace cru::platform::gui
diff --git a/include/cru/platform/gui/Window.h b/include/cru/platform/gui/Window.h
index 3be5b21b..b8973c5a 100644
--- a/include/cru/platform/gui/Window.h
+++ b/include/cru/platform/gui/Window.h
@@ -102,16 +102,16 @@ struct CRU_PLATFORM_GUI_API INativeWindow : virtual IPlatformResource {
virtual IEvent<std::nullptr_t>* PaintEvent() = 0;
virtual IEvent<WindowVisibilityType>* VisibilityChangeEvent() = 0;
- virtual IEvent<Size>* ResizeEvent() = 0;
+ virtual IEvent<const Size&>* ResizeEvent() = 0;
virtual IEvent<FocusChangeType>* FocusEvent() = 0;
virtual IEvent<MouseEnterLeaveType>* MouseEnterLeaveEvent() = 0;
- virtual IEvent<Point>* MouseMoveEvent() = 0;
- virtual IEvent<NativeMouseButtonEventArgs>* MouseDownEvent() = 0;
- virtual IEvent<NativeMouseButtonEventArgs>* MouseUpEvent() = 0;
- virtual IEvent<NativeMouseWheelEventArgs>* MouseWheelEvent() = 0;
- virtual IEvent<NativeKeyEventArgs>* KeyDownEvent() = 0;
- virtual IEvent<NativeKeyEventArgs>* KeyUpEvent() = 0;
+ virtual IEvent<const Point&>* MouseMoveEvent() = 0;
+ virtual IEvent<const NativeMouseButtonEventArgs&>* MouseDownEvent() = 0;
+ virtual IEvent<const NativeMouseButtonEventArgs&>* MouseUpEvent() = 0;
+ virtual IEvent<const NativeMouseWheelEventArgs&>* MouseWheelEvent() = 0;
+ virtual IEvent<const NativeKeyEventArgs&>* KeyDownEvent() = 0;
+ virtual IEvent<const NativeKeyEventArgs&>* KeyUpEvent() = 0;
virtual IInputMethodContext* GetInputMethodContext() = 0;
};
diff --git a/include/cru/platform/gui/osx/InputMethod.h b/include/cru/platform/gui/osx/InputMethod.h
index 9044a76c..ebb51b3e 100644
--- a/include/cru/platform/gui/osx/InputMethod.h
+++ b/include/cru/platform/gui/osx/InputMethod.h
@@ -42,7 +42,7 @@ class OsxInputMethodContext : public OsxGuiResource,
IEvent<std::nullptr_t>* CompositionEvent() override;
- IEvent<std::string>* TextEvent() override;
+ IEvent<const std::string&>* TextEvent() override;
bool IsEnabled();
diff --git a/include/cru/platform/gui/osx/Window.h b/include/cru/platform/gui/osx/Window.h
index f4bda28e..e36f4238 100644
--- a/include/cru/platform/gui/osx/Window.h
+++ b/include/cru/platform/gui/osx/Window.h
@@ -66,16 +66,16 @@ class OsxWindow : public OsxGuiResource, public INativeWindow {
IEvent<std::nullptr_t>* PaintEvent() override;
IEvent<WindowVisibilityType>* VisibilityChangeEvent() override;
- IEvent<Size>* ResizeEvent() override;
+ IEvent<const Size&>* ResizeEvent() override;
IEvent<FocusChangeType>* FocusEvent() override;
IEvent<MouseEnterLeaveType>* MouseEnterLeaveEvent() override;
- IEvent<Point>* MouseMoveEvent() override;
- IEvent<NativeMouseButtonEventArgs>* MouseDownEvent() override;
- IEvent<NativeMouseButtonEventArgs>* MouseUpEvent() override;
- IEvent<NativeMouseWheelEventArgs>* MouseWheelEvent() override;
- IEvent<NativeKeyEventArgs>* KeyDownEvent() override;
- IEvent<NativeKeyEventArgs>* KeyUpEvent() override;
+ IEvent<const Point&>* MouseMoveEvent() override;
+ IEvent<const NativeMouseButtonEventArgs&>* MouseDownEvent() override;
+ IEvent<const NativeMouseButtonEventArgs&>* MouseUpEvent() override;
+ IEvent<const NativeMouseWheelEventArgs&>* MouseWheelEvent() override;
+ IEvent<const NativeKeyEventArgs&>* KeyDownEvent() override;
+ IEvent<const NativeKeyEventArgs&>* KeyUpEvent() override;
IInputMethodContext* GetInputMethodContext() override;
diff --git a/include/cru/platform/gui/sdl/Window.h b/include/cru/platform/gui/sdl/Window.h
index c818ecce..8ffadd02 100644
--- a/include/cru/platform/gui/sdl/Window.h
+++ b/include/cru/platform/gui/sdl/Window.h
@@ -64,16 +64,16 @@ class SdlWindow : public SdlResource, public virtual INativeWindow {
IEvent<std::nullptr_t>* PaintEvent() override;
IEvent<WindowVisibilityType>* VisibilityChangeEvent() override;
- IEvent<Size>* ResizeEvent() override;
+ IEvent<const Size&>* ResizeEvent() override;
IEvent<FocusChangeType>* FocusEvent() override;
IEvent<MouseEnterLeaveType>* MouseEnterLeaveEvent() override;
- IEvent<Point>* MouseMoveEvent() override;
- IEvent<NativeMouseButtonEventArgs>* MouseDownEvent() override;
- IEvent<NativeMouseButtonEventArgs>* MouseUpEvent() override;
- IEvent<NativeMouseWheelEventArgs>* MouseWheelEvent() override;
- IEvent<NativeKeyEventArgs>* KeyDownEvent() override;
- IEvent<NativeKeyEventArgs>* KeyUpEvent() override;
+ IEvent<const Point&>* MouseMoveEvent() override;
+ IEvent<const NativeMouseButtonEventArgs&>* MouseDownEvent() override;
+ IEvent<const NativeMouseButtonEventArgs&>* MouseUpEvent() override;
+ IEvent<const NativeMouseWheelEventArgs&>* MouseWheelEvent() override;
+ IEvent<const NativeKeyEventArgs&>* KeyDownEvent() override;
+ IEvent<const NativeKeyEventArgs&>* KeyUpEvent() override;
IInputMethodContext* GetInputMethodContext() override;
@@ -91,14 +91,14 @@ class SdlWindow : public SdlResource, public virtual INativeWindow {
Event<std::nullptr_t> destroy_event_;
Event<std::nullptr_t> paint_event_;
Event<WindowVisibilityType> visibility_change_event_;
- Event<Size> resize_event_;
+ Event<const Size&> resize_event_;
Event<FocusChangeType> focus_event_;
Event<MouseEnterLeaveType> mouse_enter_leave_event_;
- Event<Point> mouse_move_event_;
- Event<NativeMouseButtonEventArgs> mouse_down_event_;
- Event<NativeMouseButtonEventArgs> mouse_up_event_;
- Event<NativeMouseWheelEventArgs> mouse_wheel_event_;
- Event<NativeKeyEventArgs> key_down_event_;
- Event<NativeKeyEventArgs> key_up_event_;
+ Event<const Point&> mouse_move_event_;
+ Event<const NativeMouseButtonEventArgs&> mouse_down_event_;
+ Event<const NativeMouseButtonEventArgs&> mouse_up_event_;
+ Event<const NativeMouseWheelEventArgs&> mouse_wheel_event_;
+ Event<const NativeKeyEventArgs&> key_down_event_;
+ Event<const NativeKeyEventArgs&> key_up_event_;
};
} // namespace cru::platform::gui::xcb
diff --git a/include/cru/platform/gui/win/InputMethod.h b/include/cru/platform/gui/win/InputMethod.h
index c246cbd7..fa4d5882 100644
--- a/include/cru/platform/gui/win/InputMethod.h
+++ b/include/cru/platform/gui/win/InputMethod.h
@@ -66,7 +66,7 @@ class CRU_WIN_GUI_API WinInputMethodContext
IEvent<std::nullptr_t>* CompositionEvent() override;
- IEvent<std::string>* TextEvent() override;
+ IEvent<const std::string&>* TextEvent() override;
private:
void OnWindowNativeMessage(WindowNativeMessageEventArgs& args);
@@ -78,11 +78,11 @@ class CRU_WIN_GUI_API WinInputMethodContext
private:
WinNativeWindow* native_window_;
- EventRevokerListGuard event_guard_;
+ EventHandlerRevokerListGuard event_guard_;
Event<std::nullptr_t> composition_start_event_;
Event<std::nullptr_t> composition_end_event_;
Event<std::nullptr_t> composition_event_;
- Event<std::string> text_event_;
+ Event<const std::string&> text_event_;
};
} // namespace cru::platform::gui::win
diff --git a/include/cru/platform/gui/win/Window.h b/include/cru/platform/gui/win/Window.h
index cd720fbd..f315f3d3 100644
--- a/include/cru/platform/gui/win/Window.h
+++ b/include/cru/platform/gui/win/Window.h
@@ -69,19 +69,19 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource,
IEvent<WindowVisibilityType>* VisibilityChangeEvent() override {
return &visibility_change_event_;
}
- IEvent<Size>* ResizeEvent() override { return &resize_event_; }
+ IEvent<const Size&>* ResizeEvent() override { return &resize_event_; }
IEvent<FocusChangeType>* FocusEvent() override { return &focus_event_; }
IEvent<MouseEnterLeaveType>* MouseEnterLeaveEvent() override {
return &mouse_enter_leave_event_;
}
- IEvent<Point>* MouseMoveEvent() override { return &mouse_move_event_; }
+ IEvent<const Point&>* MouseMoveEvent() override { return &mouse_move_event_; }
IEvent<platform::gui::NativeMouseButtonEventArgs>* MouseDownEvent() override {
return &mouse_down_event_;
}
IEvent<platform::gui::NativeMouseButtonEventArgs>* MouseUpEvent() override {
return &mouse_up_event_;
}
- IEvent<NativeMouseWheelEventArgs>* MouseWheelEvent() override {
+ IEvent<const NativeMouseWheelEventArgs&>* MouseWheelEvent() override {
return &mouse_wheel_event_;
}
@@ -200,11 +200,11 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource,
Event<std::nullptr_t> create_event_;
Event<std::nullptr_t> destroy_event_;
Event<std::nullptr_t> paint_event_;
- Event<Size> resize_event_;
+ Event<const Size&> resize_event_;
Event<WindowVisibilityType> visibility_change_event_;
Event<FocusChangeType> focus_event_;
Event<MouseEnterLeaveType> mouse_enter_leave_event_;
- Event<Point> mouse_move_event_;
+ Event<const Point&> mouse_move_event_;
Event<platform::gui::NativeMouseButtonEventArgs> mouse_down_event_;
Event<platform::gui::NativeMouseButtonEventArgs> mouse_up_event_;
Event<platform::gui::NativeMouseWheelEventArgs> mouse_wheel_event_;
diff --git a/include/cru/platform/gui/xcb/InputMethod.h b/include/cru/platform/gui/xcb/InputMethod.h
index e32ed63e..710ea2e5 100644
--- a/include/cru/platform/gui/xcb/InputMethod.h
+++ b/include/cru/platform/gui/xcb/InputMethod.h
@@ -67,7 +67,7 @@ class XcbXimInputMethodContext : public XcbResource,
IEvent<std::nullptr_t>* CompositionStartEvent() override;
IEvent<std::nullptr_t>* CompositionEndEvent() override;
IEvent<std::nullptr_t>* CompositionEvent() override;
- IEvent<std::string>* TextEvent() override;
+ IEvent<const std::string&>* TextEvent() override;
private:
void CreateIc(xcb_window_t window);
@@ -84,6 +84,6 @@ class XcbXimInputMethodContext : public XcbResource,
Event<std::nullptr_t> composition_start_event_;
Event<std::nullptr_t> composition_end_event_;
Event<std::nullptr_t> composition_event_;
- Event<std::string> text_event_;
+ Event<const std::string&> text_event_;
};
} // namespace cru::platform::gui::xcb
diff --git a/include/cru/platform/gui/xcb/Window.h b/include/cru/platform/gui/xcb/Window.h
index bfd86297..4cb5f6da 100644
--- a/include/cru/platform/gui/xcb/Window.h
+++ b/include/cru/platform/gui/xcb/Window.h
@@ -68,16 +68,16 @@ class XcbWindow : public XcbResource, public virtual INativeWindow {
IEvent<std::nullptr_t>* PaintEvent() override;
IEvent<WindowVisibilityType>* VisibilityChangeEvent() override;
- IEvent<Size>* ResizeEvent() override;
+ IEvent<const Size&>* ResizeEvent() override;
IEvent<FocusChangeType>* FocusEvent() override;
IEvent<MouseEnterLeaveType>* MouseEnterLeaveEvent() override;
- IEvent<Point>* MouseMoveEvent() override;
- IEvent<NativeMouseButtonEventArgs>* MouseDownEvent() override;
- IEvent<NativeMouseButtonEventArgs>* MouseUpEvent() override;
- IEvent<NativeMouseWheelEventArgs>* MouseWheelEvent() override;
- IEvent<NativeKeyEventArgs>* KeyDownEvent() override;
- IEvent<NativeKeyEventArgs>* KeyUpEvent() override;
+ IEvent<const Point&>* MouseMoveEvent() override;
+ IEvent<const NativeMouseButtonEventArgs&>* MouseDownEvent() override;
+ IEvent<const NativeMouseButtonEventArgs&>* MouseUpEvent() override;
+ IEvent<const NativeMouseWheelEventArgs&>* MouseWheelEvent() override;
+ IEvent<const NativeKeyEventArgs&>* KeyDownEvent() override;
+ IEvent<const NativeKeyEventArgs&>* KeyUpEvent() override;
IInputMethodContext* GetInputMethodContext() override;
@@ -127,14 +127,14 @@ class XcbWindow : public XcbResource, public virtual INativeWindow {
Event<std::nullptr_t> paint_event_;
Event<WindowVisibilityType> visibility_change_event_;
- Event<Size> resize_event_;
+ Event<const Size&> resize_event_;
Event<FocusChangeType> focus_event_;
Event<MouseEnterLeaveType> mouse_enter_leave_event_;
- Event<Point> mouse_move_event_;
- Event<NativeMouseButtonEventArgs> mouse_down_event_;
- Event<NativeMouseButtonEventArgs> mouse_up_event_;
- Event<NativeMouseWheelEventArgs> mouse_wheel_event_;
- Event<NativeKeyEventArgs> key_down_event_;
- Event<NativeKeyEventArgs> key_up_event_;
+ Event<const Point&> mouse_move_event_;
+ Event<const NativeMouseButtonEventArgs&> mouse_down_event_;
+ Event<const NativeMouseButtonEventArgs&> mouse_up_event_;
+ Event<const NativeMouseWheelEventArgs&> mouse_wheel_event_;
+ Event<const NativeKeyEventArgs&> key_down_event_;
+ Event<const NativeKeyEventArgs&> key_up_event_;
};
} // namespace cru::platform::gui::xcb
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-07 04:35:39 +0000