aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2010-04-29 10:51:30 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-05 17:17:48 +0100
commit3ca6e32a9ecaa8514b9a30711cec20cf80722c23 (patch)
tree449370686727f344e2845a75e5c99eb035789fec
parentf613ca3eed2fca5eb17e574c0b5324b4e47dbd7f (diff)
downloadusdx-3ca6e32a9ecaa8514b9a30711cec20cf80722c23.tar.gz
usdx-3ca6e32a9ecaa8514b9a30711cec20cf80722c23.tar.xz
usdx-3ca6e32a9ecaa8514b9a30711cec20cf80722c23.zip
added software cursor
-rw-r--r--src/menu/application.cpp7
-rw-r--r--src/menu/software_mouse_pointer.cpp65
-rw-r--r--src/menu/software_mouse_pointer.hpp61
3 files changed, 133 insertions, 0 deletions
diff --git a/src/menu/application.cpp b/src/menu/application.cpp
index 9265aad7..48f1291c 100644
--- a/src/menu/application.cpp
+++ b/src/menu/application.cpp
@@ -27,6 +27,8 @@
#include "application.hpp"
#include "event_manager.hpp"
#include <exception>
+#include "software_mouse_pointer.hpp"
+
namespace usdx
{
@@ -105,6 +107,7 @@ namespace usdx
SDL_Event event;
EventManager event_manager;
boost::thread event_thread(boost::bind(&EventManager::handle_events, &event_manager));
+ overlays.push_front(new SoftwareMousePointer(NULL, &event_manager));
running = true;
while (running) {
@@ -156,7 +159,11 @@ namespace usdx
SDL_setFramerate(fps_manager, frames_per_second);
+ SDL_ShowCursor(SDL_DISABLE);
+
main_loop(display);
+
+ SDL_ShowCursor(SDL_ENABLE);
}
const int Application::get_display_width(void) const
diff --git a/src/menu/software_mouse_pointer.cpp b/src/menu/software_mouse_pointer.cpp
new file mode 100644
index 00000000..47e00047
--- /dev/null
+++ b/src/menu/software_mouse_pointer.cpp
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#include "software_mouse_pointer.hpp"
+#include <SDL/SDL.h>
+
+namespace usdx
+{
+ SoftwareMousePointer::SoftwareMousePointer(Control* parent, EventManager* event_manager)
+ : DrawableControl(parent), x(-1), y(-1)
+ {
+ texture = new Image(L"game/themes/Deluxe/interface/cursor.png");
+
+ mouse_move_connection = event_manager->mouse_move.connect(
+ boost::bind(&SoftwareMousePointer::on_mouse_move, this, _1, _2));
+ }
+
+ SoftwareMousePointer::~SoftwareMousePointer()
+ {
+ mouse_move_connection.disconnect();
+
+ if (texture != NULL) {
+ delete texture;
+ texture = NULL;
+ }
+ }
+
+ void SoftwareMousePointer::draw(SDL_Surface* display) const
+ {
+ if (x >= 0 && y >= 0) {
+ SDL_Rect rcDest = { x, y, 0, 0 };
+ SDL_BlitSurface((SDL_Surface*)texture->get_surface(), NULL, display, &rcDest);
+ }
+ }
+
+ void SoftwareMousePointer::on_mouse_move(int x, int y)
+ {
+ this->x = x;
+ this->y = y;
+ }
+};
+
diff --git a/src/menu/software_mouse_pointer.hpp b/src/menu/software_mouse_pointer.hpp
new file mode 100644
index 00000000..dad27543
--- /dev/null
+++ b/src/menu/software_mouse_pointer.hpp
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#ifndef SOFTWARE_MOUSE_POINTER_HPP
+#define SOFTWARE_MOUSE_POINTER_HPP
+
+#include "drawable_control.hpp"
+#include "control.hpp"
+#include "event_manager.hpp"
+#include "image.hpp"
+
+#include <boost/signals2.hpp>
+
+namespace usdx
+{
+ class SoftwareMousePointer : public DrawableControl
+ {
+ private:
+ int x;
+ int y;
+
+ Image* texture;
+
+ boost::signals2::connection mouse_move_connection;
+
+ protected:
+ void draw(SDL_Surface* display) const;
+
+ public:
+ SoftwareMousePointer(Control* parent, EventManager* event_manager);
+ virtual ~SoftwareMousePointer();
+
+ void on_mouse_move(int x, int y);
+ };
+};
+
+
+#endif