diff options
| -rw-r--r-- | src/menu/application.cpp | 2 | ||||
| -rw-r--r-- | src/menu/container.cpp | 21 | ||||
| -rw-r--r-- | src/menu/container.hpp | 2 | ||||
| -rw-r--r-- | src/menu/drawable_control.cpp | 72 | ||||
| -rw-r--r-- | src/menu/drawable_control.hpp | 19 | ||||
| -rw-r--r-- | src/menu/mouse_event.cpp | 81 | ||||
| -rw-r--r-- | src/menu/mouse_event.hpp | 62 | ||||
| -rw-r--r-- | src/menu/mouse_manager.cpp | 137 | ||||
| -rw-r--r-- | src/menu/mouse_manager.hpp | 70 |
9 files changed, 460 insertions, 6 deletions
diff --git a/src/menu/application.cpp b/src/menu/application.cpp index 28eaf480..e18abf24 100644 --- a/src/menu/application.cpp +++ b/src/menu/application.cpp @@ -24,6 +24,7 @@ #include "application.hpp" #include "event_manager.hpp" +#include "mouse_manager.hpp" #include <exception> #include "software_mouse_pointer.hpp" #include "frames/loading_frame.hpp" @@ -89,6 +90,7 @@ namespace usdx { SDL_Event event; EventManager event_manager; + MouseManager mouse_manager(event_manager); boost::thread event_thread(boost::bind(&EventManager::handle_events, &event_manager)); SoftwareMousePointer pointer(this, &event_manager); diff --git a/src/menu/container.cpp b/src/menu/container.cpp index 31155e3c..fb13d398 100644 --- a/src/menu/container.cpp +++ b/src/menu/container.cpp @@ -144,4 +144,25 @@ namespace usdx DrawableControl::set_size(width, height); recalculate_window_coords(); } + + DrawableControl* Container::get_component_at(const Point<int>& p) + { + if (!get_absolut_rect().is_in(p)) + return NULL; + + for (std::list<DrawableControl*>::iterator next = controls.begin(), it = next++; + it != controls.end(); it = next++) { + + DrawableControl* c = (*it)->get_component_at(p); + if (c != NULL) { + return c; + } + } + + if (frame) { + return frame->get_component_at(p); + } + + return this; + } }; diff --git a/src/menu/container.hpp b/src/menu/container.hpp index f9eeacd5..67bbb3c4 100644 --- a/src/menu/container.hpp +++ b/src/menu/container.hpp @@ -105,6 +105,8 @@ namespace usdx */ virtual void set_size(int width, int height); + virtual DrawableControl* get_component_at(const Point<int>& p); + /** * This signal gets emitted, if the window coordinates are changed. */ diff --git a/src/menu/drawable_control.cpp b/src/menu/drawable_control.cpp index 47df96db..72c3ec77 100644 --- a/src/menu/drawable_control.cpp +++ b/src/menu/drawable_control.cpp @@ -39,7 +39,7 @@ namespace usdx DrawableControl::DrawableControl(Container* parent) : Control(parent), position(0, 0), size(0, 0), clipping_required(false), focusable(true), background(NULL), - parent(parent) + debug_box(NULL), parent(parent) { ContainerHelper(this).add(parent); } @@ -48,7 +48,7 @@ namespace usdx const ContainerHelper& helper) : Control(parent), position(0, 0), size(0, 0), clipping_required(false), focusable(true), background(NULL), - parent(parent) + debug_box(NULL), parent(parent) { helper.add(parent); } @@ -61,6 +61,11 @@ namespace usdx delete background; background = NULL; } + + if (debug_box) { + delete debug_box; + debug_box = NULL; + } } bool DrawableControl::is_clipping_required(void) const @@ -120,10 +125,14 @@ namespace usdx if (Application::get_config()->get_debug_boxes()) { - boost::shared_lock<boost::shared_mutex> lock(size_mutex); - StaticRectangle s(RgbColor(255, 0, 0), size); - s.set_stroke_width(2.0f); - s.repaint(); + if (debug_box == NULL) { + boost::shared_lock<boost::shared_mutex> lock(size_mutex); + + debug_box = new StaticRectangle(RgbColor(255, 0, 0), size); + debug_box->set_stroke_width(2.0f); + } + + debug_box->repaint(); } } @@ -230,4 +239,55 @@ namespace usdx boost::shared_lock<boost::shared_mutex> lock(background_mutex); return background; } + + const Rectangle<int> DrawableControl::get_absolut_rect(void) const + { + Rectangle<int> rect(get_position(), get_size()); + + if (parent) { + Rectangle<int> parent_rect = parent->get_absolut_rect(); + rect += Point<int>(parent_rect.get_left(), + parent_rect.get_top()); + rect = parent_rect.intersect(rect); + } + + return rect; + } + + DrawableControl* DrawableControl::get_component_at(const Point<int>& p) + { + if (focusable && get_absolut_rect().is_in(p)) { + return this; + } + + return NULL; + } + + void DrawableControl::mouse_move(const Point<int>& p) + { + } + + void DrawableControl::mouse_down(uint8_t button, const Point<int>& p) + { + } + + void DrawableControl::mouse_up(uint8_t button, const Point<int>& p) + { + } + + void DrawableControl::mouse_enter(void) + { + } + + void DrawableControl::mouse_leave(void) + { + } + + void DrawableControl::mouse_click(uint8_t button, const Point<int>& p) + { + } + + void DrawableControl::mouse_dbl_click(uint8_t button, const Point<int>& p) + { + } }; diff --git a/src/menu/drawable_control.hpp b/src/menu/drawable_control.hpp index cd1f45e0..bac1ccfb 100644 --- a/src/menu/drawable_control.hpp +++ b/src/menu/drawable_control.hpp @@ -33,7 +33,9 @@ #include "control.hpp" #include "utils/point.hpp" #include "utils/dimension.hpp" +#include "utils/rectangle.hpp" #include "background.hpp" +#include "static.hpp" namespace usdx { @@ -71,6 +73,11 @@ namespace usdx */ Background* background; + /** + * Optional box around the control. Used for debugging. + */ + Static* debug_box; + mutable boost::shared_mutex position_mutex; mutable boost::shared_mutex size_mutex; mutable boost::shared_mutex clipping_required_mutex; @@ -131,6 +138,18 @@ namespace usdx void set_background(Background*); const Background* get_background(void) const; + + const Rectangle<int> get_absolut_rect(void) const; + virtual DrawableControl* get_component_at(const Point<int>& p); + + virtual void mouse_move(const Point<int>& p); + virtual void mouse_down(uint8_t button, const Point<int>& p); + virtual void mouse_up(uint8_t button, const Point<int>& p); + virtual void mouse_enter(void); + virtual void mouse_leave(void); + + virtual void mouse_click(uint8_t button, const Point<int>& p); + virtual void mouse_dbl_click(uint8_t button, const Point<int>& p); }; }; diff --git a/src/menu/mouse_event.cpp b/src/menu/mouse_event.cpp new file mode 100644 index 00000000..e140c6e4 --- /dev/null +++ b/src/menu/mouse_event.cpp @@ -0,0 +1,81 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + +#include "mouse_event.hpp" +#include "base/time.hpp" + +namespace usdx +{ + log4cpp::Category& MouseEvent::log = + log4cpp::Category::getInstance("usdx.menu.mouse_event"); + + MouseEvent::MouseEvent(void) : + control(NULL), button(0), direction(NONE) + { + } + + MouseEvent::~MouseEvent() + { + } + + MouseEvent::Event MouseEvent::detect_event(DrawableControl *control, + uint8_t button, + MouseEvent::Event direction) + { + if (this->control == control && this->button == button) + { + if (direction == UP) { + if (this->direction == DOWN) { + if (time.since(5000)) + return CLICK; + } + else if (this->direction == CLICK) { + if (time.since(5000)) + return DBL_CLICK; + } + } + else if (direction == DOWN) { + if (this->direction == CLICK && time.since(5000)) + return CLICK; + } + } + + return NONE; + } + + MouseEvent::Event MouseEvent::add_event(DrawableControl *control, + uint8_t button, + MouseEvent::Event direction) + { + MouseEvent::Event event = this->detect_event(control, button, + direction); + + this->control = control; + this->button = button; + this->direction = event == NONE ? direction : event; + time.update(); + + return event; + } +}; diff --git a/src/menu/mouse_event.hpp b/src/menu/mouse_event.hpp new file mode 100644 index 00000000..ecb1e4ae --- /dev/null +++ b/src/menu/mouse_event.hpp @@ -0,0 +1,62 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + +#ifndef MOUSE_EVENT_HPP +#define MOUSE_EVENT_HPP + +#include <log4cpp/Category.hh> + +#include "drawable_control.hpp" +#include "base/timestamp.hpp" + +namespace usdx +{ + class MouseEvent + { + public: + enum Event { NONE, UP, DOWN, CLICK, DBL_CLICK }; + + private: + static log4cpp::Category& log; + + DrawableControl *control; + Timestamp time; + + uint8_t button; + Event direction; + + Event detect_event(DrawableControl *control, uint8_t button, + Event direction); + + public: + MouseEvent(void); + virtual ~MouseEvent(); + + Event add_event(DrawableControl *control, uint8_t button, + Event direction); + + }; +}; + +#endif diff --git a/src/menu/mouse_manager.cpp b/src/menu/mouse_manager.cpp new file mode 100644 index 00000000..0910da6f --- /dev/null +++ b/src/menu/mouse_manager.cpp @@ -0,0 +1,137 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + +#include "mouse_manager.hpp" +#include "utils/rectangle.hpp" +#include "container.hpp" +#include "application.hpp" + +namespace usdx +{ + log4cpp::Category& MouseManager::log = + log4cpp::Category::getInstance("usdx.menu.mouse_manager"); + + MouseManager::MouseManager(EventManager& event_manager) + : last_active(NULL) + { + mouse_move_connection = event_manager.mouse_move.connect( + boost::bind(&MouseManager::on_mouse_move, this, _1)); + mouse_down_connection = event_manager.mouse_down.connect( + boost::bind(&MouseManager::on_mouse_down, this, _1, _2)); + mouse_up_connection = event_manager.mouse_up.connect( + boost::bind(&MouseManager::on_mouse_up, this, _1, _2)); + } + + MouseManager::~MouseManager() + { + mouse_move_connection.disconnect(); + mouse_down_connection.disconnect(); + mouse_up_connection.disconnect(); + } + + void MouseManager::find_active_element(const Point<int>& p) + { + DrawableControl *c = find_parent(last_active, p); + c = c->get_component_at(p); + + if (last_active != c) { + if (last_active) { + last_active->mouse_leave(); + } + + last_active = c; + + if (last_active) { + last_active->mouse_enter(); + } + } + } + + DrawableControl* MouseManager::find_parent(DrawableControl* current, + const Point<int>& p) const + { + if (current == NULL) { + // start search from top level + return Application::get_instance(); + } + + if (!current->get_absolut_rect().is_in(p)) { + current = find_parent(current->get_parent(), p); + } + + return current; + } + + void MouseManager::on_mouse_move(const Point<int>& p) + { + find_active_element(p); + + if (last_active) { + last_active->mouse_move(p); + } + } + + void MouseManager::on_mouse_down(uint8_t button, const Point<int>& p) + { + find_active_element(p); + + if (last_active) { + last_active->mouse_down(button, p); + } + + event.add_event(last_active, button, MouseEvent::DOWN); + } + + void MouseManager::on_mouse_up(uint8_t button, const Point<int>& p) + { + find_active_element(p); + + if (last_active) { + last_active->mouse_up(button, p); + } + + MouseEvent::Event e = event.add_event(last_active, button, + MouseEvent::UP); + + switch (e) { + case MouseEvent::CLICK: + last_active->mouse_click(button, p); + break; + + case MouseEvent::DBL_CLICK: + last_active->mouse_dbl_click(button, p); + break; + + default: + ; + } + } + + void MouseManager::deactivate_control(const DrawableControl* control) + { + if (last_active == control) { + last_active = NULL; + } + } +}; diff --git a/src/menu/mouse_manager.hpp b/src/menu/mouse_manager.hpp new file mode 100644 index 00000000..fe71ead3 --- /dev/null +++ b/src/menu/mouse_manager.hpp @@ -0,0 +1,70 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + +#ifndef MOUSE_MANAGER_HPP +#define MOUSE_MANAGER_HPP + +#include <log4cpp/Category.hh> + +#include <boost/signals2.hpp> +#include "event_manager.hpp" +#include "drawable_control.hpp" +#include "utils/point.hpp" +#include "mouse_event.hpp" + +namespace usdx +{ + class MouseManager + { + private: + static log4cpp::Category& log; + + DrawableControl *last_active; + MouseEvent event; + + void find_active_element(const Point<int>& p); + DrawableControl* find_parent(DrawableControl* current, const Point<int>& p) const; + + boost::signals2::connection mouse_move_connection; + boost::signals2::connection mouse_down_connection; + boost::signals2::connection mouse_up_connection; + + void on_mouse_move(const Point<int>& p); + void on_mouse_down(uint8_t button, const Point<int>& p); + void on_mouse_up(uint8_t button, const Point<int>& p); + + public: + MouseManager(EventManager& event_manager); + virtual ~MouseManager(); + + /** + * This method used to remove the internal reference to the active + * control. This should be called during deconstruction of each drawable + * control. + */ + void deactivate_control(const DrawableControl* control); + }; +}; + +#endif |