[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, noise, created. release_0_8_9_final-1
From: |
Rob Savoye |
Subject: |
[Gnash-commit] [SCM] Gnash branch, noise, created. release_0_8_9_final-1170-gd7e2167 |
Date: |
Mon, 05 Sep 2011 19:52:19 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, noise has been created
at d7e21679125e98814dee3ba0649f1d7f37f48b06 (commit)
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=d7e21679125e98814dee3ba0649f1d7f37f48b06
commit d7e21679125e98814dee3ba0649f1d7f37f48b06
Author: Rob Savoye <address@hidden>
Date: Mon Sep 5 13:51:47 2011 -0600
minor style changes in brace placement
diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 23c25cd..f82b9b2 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -830,7 +830,9 @@ bool
movie_root::clearIntervalTimer(boost::uint32_t x)
{
TimerMap::iterator it = _intervalTimers.find(x);
- if (it == _intervalTimers.end()) return false;
+ if (it == _intervalTimers.end()) {
+ return false;
+ }
// We do not remove the element here because
// we might have been called during execution
@@ -866,8 +868,7 @@ movie_root::advance()
// Give up; we've probably failed to catch up.
_timelineSound.reset();
- }
- else {
+ } else {
// -1 for bad result, 0 for first block.
// Get the stream block we are currently at.
@@ -920,7 +921,9 @@ movie_root::advance()
block = s->getStreamBlock(_timelineSound->id);
}
- if (advanced) _lastMovieAdvancement = now;
+ if (advanced) {
+ _lastMovieAdvancement = now;
+ }
}
}
else {
http://git.savannah.gnu.org/cgit//commit/?id=b2cab90c32c10cbc72296d3ecaef397de6ae7888
commit b2cab90c32c10cbc72296d3ecaef397de6ae7888
Author: Rob Savoye <address@hidden>
Date: Mon Sep 5 13:51:28 2011 -0600
Use new option to optionally force the mouse pointer to be visible.
diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 73c95f2..d3bbab6 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -281,7 +281,9 @@ GtkGui::error(const std::string& msg)
RcInitFile& rcfile = RcInitFile::getDefaultInstance();
- if (!rcfile.popupMessages()) return;
+ if (!rcfile.popupMessages()) {
+ return;
+ }
GtkWidget* popup = gtk_dialog_new_with_buttons("Gnash Error",
GTK_WINDOW(_window),
@@ -431,8 +433,19 @@ GtkGui::showMouse(bool show)
bool state = _mouseShown;
- if (show == _mouseShown) return state;
-
+ RcInitFile& rcfile = RcInitFile::getDefaultInstance();
+
+ // Whether to forcibly show the mouse pointer even if the SWF file
+ // disables it. This allows touchscreen based SWF files to
+ // work on a normal non-touchscreen desktop.
+ if (rcfile.showMouse()) {
+ return true;
+ } else {
+ if (show == _mouseShown) {
+ return state;
+ }
+ }
+
if (!show) {
GdkPixmap *pixmap;
GdkColor *color;
@@ -451,7 +464,9 @@ GtkGui::showMouse(bool show)
_mouseShown = false;
}
- else if (show) _mouseShown = true;
+ else if (show) {
+ _mouseShown = true;
+ }
return state;
}
@@ -611,7 +626,9 @@ GtkGui::setInterval(unsigned int interval)
{
_interval = interval;
- if ( ! isStopped() ) startAdvanceTimer();
+ if ( ! isStopped() ) {
+ startAdvanceTimer();
+ }
}
///////////////////////////////////////////////////////////////////////////////
http://git.savannah.gnu.org/cgit//commit/?id=6d6b7560b8a45f9b09b9c80927644fba84646a22
commit 6d6b7560b8a45f9b09b9c80927644fba84646a22
Author: Rob Savoye <address@hidden>
Date: Mon Sep 5 13:50:57 2011 -0600
add new option to force a mouse pointer so touchscreen SWF files work on
the desktop with a mouse.
diff --git a/libbase/rc.cpp b/libbase/rc.cpp
index b15910c..aa9041b 100644
--- a/libbase/rc.cpp
+++ b/libbase/rc.cpp
@@ -533,6 +533,9 @@ RcInitFile::parseFile(const std::string& filespec)
extractSetting(_localhostOnly, "localhost", variable,
value)
||
+ extractSetting(_showMouse, "showMouse", variable,
+ value)
+ ||
extractSetting(_localdomainOnly, "localdomain", variable,
value)
||
@@ -750,6 +753,7 @@ RcInitFile::updateFile(const std::string& filespec)
<< endl <<
cmd << "splashScreen " << _splashScreen << endl <<
cmd << "localHost " << _localhostOnly << endl <<
+ cmd << "showMouse " << _showMouse << endl <<
cmd << "localDomain " << _localdomainOnly << endl <<
cmd << "insecureSSL " << _insecureSSL << endl <<
cmd << "debugger " << _debugger << endl <<
diff --git a/libbase/rc.h b/libbase/rc.h
index 459a3ac..b6a6857 100644
--- a/libbase/rc.h
+++ b/libbase/rc.h
@@ -157,6 +157,11 @@ public:
//
/// @return a std::vector of strings containing blocked domains
const PathList& getBlackList() const { return _blacklist; }
+
+ /// Whether to forcibly show the mouse pointer even if the SWF file
+ /// disables it. THis allows touchscreen based SWF files to
+ /// work on a normal non-touchscreen desktop.
+ bool showMouse() const { return _showMouse; }
/// Sets the RcInitFile blacklist of domains to block
//
@@ -497,7 +502,10 @@ protected:
/// Only access network resources on the local host
bool _localhostOnly;
-
+
+ /// Show the mouse pointer
+ bool _showMouse;
+
/// Allowed domains
PathList _whitelist;
http://git.savannah.gnu.org/cgit//commit/?id=44afdfbc3440d05db451cfea7551f2babe89fce4
commit 44afdfbc3440d05db451cfea7551f2babe89fce4
Author: Rob Savoye <address@hidden>
Date: Mon Sep 5 13:50:16 2011 -0600
change t to nil for emacs tab-mode
diff --git a/libcore/MouseButtonState.h b/libcore/MouseButtonState.h
index adebc0a..94a0f99 100644
--- a/libcore/MouseButtonState.h
+++ b/libcore/MouseButtonState.h
@@ -64,5 +64,5 @@ public:
// mode: C++
// c-basic-offset: 8
// tab-width: 8
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
http://git.savannah.gnu.org/cgit//commit/?id=6969f2a7bbd483d2228fc4da41f4d7b67af30904
commit 6969f2a7bbd483d2228fc4da41f4d7b67af30904
Author: Rob Savoye <address@hidden>
Date: Mon Sep 5 13:49:52 2011 -0600
minor style changes in brace placement
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 3c4983d..b0c2acd 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -966,21 +966,23 @@ Gui::advanceMovie(bool doDisplay)
}
#endif
- if (doDisplay && visible()) display(m);
-
- if (!loops()) {
+ if (doDisplay && visible()) {
+ display(m);
+ }
+
+ if (!loops()) {
// can be 0 on malformed SWF
- const size_t curframe = m->getRootMovie().get_current_frame();
- const MovieClip& si = m->getRootMovie();
- if (curframe + 1 >= si.get_frame_count()) {
- quit();
- }
- }
-
+ const size_t curframe = m->getRootMovie().get_current_frame();
+ const MovieClip& si = m->getRootMovie();
+ if (curframe + 1 >= si.get_frame_count()) {
+ quit();
+ }
+ }
+
if (_screenShotter.get() && _renderer.get()) {
_screenShotter->screenShot(*_renderer, _advances, doDisplay ? 0 :
&dis);
}
-
+
// Only increment advances and check for exit condition when we've
// really changed frame.
if (advanced) {
-----------------------------------------------------------------------
hooks/post-receive
--
Gnash
- [Gnash-commit] [SCM] Gnash branch, noise, created. release_0_8_9_final-1170-gd7e2167,
Rob Savoye <=