Author: ceros-guest
Date: 2008-05-04 19:00:15 +0000 (Sun, 04 May 2008)
New Revision: 6855
Added:
packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch
Modified:
packages/trunk/funguloids/debian/changelog
packages/trunk/funguloids/debian/patches/series
packages/trunk/funguloids/debian/rules
Log:
Support disabling of keyboard and mouse capture for debugging
Modified: packages/trunk/funguloids/debian/changelog
===================================================================
--- packages/trunk/funguloids/debian/changelog 2008-05-04 15:00:52 UTC (rev
6854)
+++ packages/trunk/funguloids/debian/changelog 2008-05-04 19:00:15 UTC (rev
6855)
@@ -1,11 +1,12 @@
funguloids (1.06-6) unstable; urgency=low
[ Andres Mejia ]
- * Fix problem with running funguloids with ogre-1.4.6 and ogre-1.4.7.
+ * Fix problem with running funguloids with ogre-1.4.7.
Closes: #478105
* Fix up patches and rules file.
+ * Support disabling of keyboard and mouse capture for debugging.
- -- Andres Mejia <[EMAIL PROTECTED]> Sun, 04 May 2008 01:35:06 -0400
+ -- Andres Mejia <[EMAIL PROTECTED]> Sun, 04 May 2008 14:58:59 -0400
funguloids (1.06-5) unstable; urgency=low
Added: packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch
===================================================================
--- packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch
(rev 0)
+++ packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch
2008-05-04 19:00:15 UTC (rev 6855)
@@ -0,0 +1,26 @@
+Support disabling of keyboard and mouse capture for debugging.
+=====================================================================
+--- src/input.cpp.bak 2008-05-04 14:51:35.000000000 -0400
++++ src/input.cpp 2008-05-04 14:35:00.000000000 -0400
+@@ -37,6 +37,21 @@
+ OIS::ParamList pl;
+ pl.insert(OIS::ParamList::value_type("WINDOW",
Ogre::StringConverter::toString(hWnd)));
+
++ // Disable mouse capture for debugging.
++ #ifdef DISABLE_MOUSE_CAPTURE
++ #if defined OIS_WIN32_PLATFORM
++ pl.insert(std::make_pair(std::string("w32_mouse"),
std::string("DISCL_FOREGROUND" )));
++ pl.insert(std::make_pair(std::string("w32_mouse"),
std::string("DISCL_NONEXCLUSIVE")));
++ pl.insert(std::make_pair(std::string("w32_keyboard"),
std::string("DISCL_FOREGROUND")));
++ pl.insert(std::make_pair(std::string("w32_keyboard"),
std::string("DISCL_NONEXCLUSIVE")));
++ #elif defined OIS_LINUX_PLATFORM
++ pl.insert(std::make_pair(std::string("x11_mouse_grab"),
std::string("false")));
++ pl.insert(std::make_pair(std::string("x11_mouse_hide"),
std::string("false")));
++
pl.insert(std::make_pair(std::string("x11_keyboard_grab"),
std::string("false")));
++ pl.insert(std::make_pair(std::string("XAutoRepeatOn"),
std::string("true")));
++ #endif
++ #endif
++
+ mHWnd = hWnd;
+ mInputManager = OIS::InputManager::createInputSystem(pl);
+ mMouse =
static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));
Modified: packages/trunk/funguloids/debian/patches/series
===================================================================
--- packages/trunk/funguloids/debian/patches/series 2008-05-04 15:00:52 UTC
(rev 6854)
+++ packages/trunk/funguloids/debian/patches/series 2008-05-04 19:00:15 UTC
(rev 6855)
@@ -1,2 +1,3 @@
makefile_modifications.diff -p0
size_chunks_reverse.patch -p0
+disable_mouse_capture.patch -p0
Modified: packages/trunk/funguloids/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules 2008-05-04 15:00:52 UTC (rev
6854)
+++ packages/trunk/funguloids/debian/rules 2008-05-04 19:00:15 UTC (rev
6855)
@@ -25,10 +25,17 @@
DEB_CXXFLAGS += -O2 -g -Wall
endif
+# Specify extra option to build funguliods while disabling keyboard and mouse
+# capture
+ifneq (,$(findstring nomousecapture,$(DEB_BUILD_OPTIONS)))
+ DEB_CXXFLAGS += -DDISABLE_MOUSE_CAPTURE
+endif
+
fromdos: fromdos-stamp
fromdos-stamp:
dh_testdir
fromdos -e src/mpakogre.cpp
+ fromdos -e src/input.cpp
patch: fromdos patch-stamp
patch-stamp:
@@ -39,10 +46,10 @@
configure: patch configure-stamp
configure-stamp:
dh_testdir
- aclocal && \
- autoheader -f && \
- automake --add-missing --force-missing --copy && \
- autoconf -f && \
+ aclocal
+ autoheader -f
+ automake --add-missing --force-missing --copy
+ autoconf -f
CXXFLAGS="$(DEB_CXXFLAGS)" \
./configure $(confflags) --prefix=/usr --with-fmod=no
touch configure-stamp
@@ -70,6 +77,7 @@
todos:
dh_testdir
todos -e src/mpakogre.cpp
+ todos -e src/input.cpp
install: build
dh_testdir
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
