aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-11-26 09:35:23 +0100
committerDavid Robillard <d@drobilla.net>2020-11-26 09:35:23 +0100
commitee6aebafa72303dc01c91a5ca069fbe7188b1a14 (patch)
treedf9e8560095b8038fa7118ac1d03057dc9e67bd3
parent2d90c04eef376b406c65f5d3553757415fb9806f (diff)
downloadpugl-ee6aebafa72303dc01c91a5ca069fbe7188b1a14.tar.gz
pugl-ee6aebafa72303dc01c91a5ca069fbe7188b1a14.tar.bz2
pugl-ee6aebafa72303dc01c91a5ca069fbe7188b1a14.zip
Remove stub event handlers from pugl::View
This was a bit weird since event dispatching can be handled by some other object. Just remove them, and have clients use a catch-all template to handle events that are not handled specially.
-rw-r--r--bindings/cxx/include/pugl/pugl.hpp119
-rw-r--r--examples/pugl_cxx_demo.cpp6
-rw-r--r--examples/pugl_vulkan_cxx_demo.cpp6
3 files changed, 10 insertions, 121 deletions
diff --git a/bindings/cxx/include/pugl/pugl.hpp b/bindings/cxx/include/pugl/pugl.hpp
index e71f5a6..dd7389e 100644
--- a/bindings/cxx/include/pugl/pugl.hpp
+++ b/bindings/cxx/include/pugl/pugl.hpp
@@ -591,125 +591,6 @@ public:
/**
@}
- @name Event Handlers
- Methods called when events are dispatched to the view.
-
- For convenience, the methods defined here are all trivial stubs that
- return success.
- @{
- */
-
- static Status onEvent(const CreateEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const DestroyEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const ConfigureEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const MapEvent&) noexcept { return Status::success; }
-
- static Status onEvent(const UnmapEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const UpdateEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const ExposeEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const CloseEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const FocusInEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const FocusOutEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const KeyPressEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const KeyReleaseEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const TextEvent&) noexcept { return Status::success; }
-
- static Status onEvent(const PointerInEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const PointerOutEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const ButtonPressEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const ButtonReleaseEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const MotionEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const ScrollEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const ClientEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const TimerEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const LoopEnterEvent&) noexcept
- {
- return Status::success;
- }
-
- static Status onEvent(const LoopLeaveEvent&) noexcept
- {
- return Status::success;
- }
-
- /**
- @}
*/
PuglView* cobj() noexcept { return Wrapper::cobj(); }
diff --git a/examples/pugl_cxx_demo.cpp b/examples/pugl_cxx_demo.cpp
index 482f67f..0aa66ad 100644
--- a/examples/pugl_cxx_demo.cpp
+++ b/examples/pugl_cxx_demo.cpp
@@ -38,7 +38,11 @@ public:
setEventHandler(*this);
}
- using pugl::View::onEvent;
+ template<PuglEventType t, class Base>
+ pugl::Status onEvent(const pugl::Event<t, Base>&) noexcept
+ {
+ return pugl::Status::success;
+ }
static pugl::Status onEvent(const pugl::ConfigureEvent& event) noexcept;
pugl::Status onEvent(const pugl::UpdateEvent& event) noexcept;
diff --git a/examples/pugl_vulkan_cxx_demo.cpp b/examples/pugl_vulkan_cxx_demo.cpp
index b4e04ef..154bbaf 100644
--- a/examples/pugl_vulkan_cxx_demo.cpp
+++ b/examples/pugl_vulkan_cxx_demo.cpp
@@ -1385,7 +1385,11 @@ public:
setEventHandler(*this);
}
- using pugl::View::onEvent;
+ template<PuglEventType t, class Base>
+ pugl::Status onEvent(const pugl::Event<t, Base>&) noexcept
+ {
+ return pugl::Status::success;
+ }
pugl::Status onEvent(const pugl::ConfigureEvent& event);
pugl::Status onEvent(const pugl::UpdateEvent& event);