[Gnash-commit] /srv/bzr/gnash/trunk r9556: Minor cleanup to gui code.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9556
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2008-08-04 13:31:11 +0200
message:
  Minor cleanup to gui code.
  
  Log unimplemented when trying to jump to before the tag start. This
  gives a lot of logging when a movie is thoroughly obfuscated, but
  that corresponds to the way the SWF looks when it plays.
modified:
  gui/gui.cpp
  gui/gui.h
  libcore/vm/ActionExec.cpp
  libcore/vm/ActionExec.h
    ------------------------------------------------------------
    revno: 9554.2.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Mon 2008-08-04 09:57:53 +0200
    message:
      Const correct, remove function lookup for loops().
    modified:
      gui/gui.cpp
      gui/gui.h
    ------------------------------------------------------------
    revno: 9554.2.2
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Mon 2008-08-04 13:26:37 +0200
    message:
      Log unimplemented when a jump takes us out of the action tag.
    modified:
      libcore/vm/ActionExec.cpp
      libcore/vm/ActionExec.h

=== modified file 'gui/gui.cpp'
--- a/gui/gui.cpp       2008-07-23 20:23:52 +0000
+++ b/gui/gui.cpp       2008-08-04 07:57:53 +0000
@@ -1026,12 +1026,6 @@
     return false;
 }
 
-bool
-Gui::loops()
-{
-    return _loop;
-}
-
 void
 Gui::setInvalidatedRegion(const rect& /*bounds*/)
 {

=== modified file 'gui/gui.h'
--- a/gui/gui.h 2008-07-16 05:44:50 +0000
+++ b/gui/gui.h 2008-08-04 07:57:53 +0000
@@ -189,10 +189,10 @@
     virtual std::string getScreenColor() { return ""; }
 
     /// @return Whether or not the movie should be looped indefinitely.
-    bool loops();
+    bool loops() const { return _loop; }
 
     /// @return Whether the movie is running fullscreen or not.    
-    bool isFullscreen() { return _fullscreen; }
+    bool isFullscreen() const { return _fullscreen; }
 
     /// Mouse notification callback to be called when the mouse is moved.
     //

=== modified file 'libcore/vm/ActionExec.cpp'
--- a/libcore/vm/ActionExec.cpp 2008-07-30 08:36:48 +0000
+++ b/libcore/vm/ActionExec.cpp 2008-08-04 11:26:37 +0000
@@ -790,6 +790,17 @@
     _returning = true;
 }
 
+void
+ActionExec::adjustNextPC(int offset)
+{
+    const int tagPos = offset + static_cast<int>(pc);
+    if (tagPos < 0) {
+        log_unimpl(_("Jump outside DoAction tag requested (offset %d before 
tag start)"), -tagPos);
+        return;
+    }
+    next_pc += offset;
+}
+
 bool
 ActionExec::isFunction2() const
 {

=== modified file 'libcore/vm/ActionExec.h'
--- a/libcore/vm/ActionExec.h   2008-06-29 15:45:05 +0000
+++ b/libcore/vm/ActionExec.h   2008-08-04 11:26:37 +0000
@@ -455,7 +455,7 @@
        
        void skipRemainingBuffer() { next_pc = stop_pc; }
        
-       void adjustNextPC(int offset) { next_pc += offset; }
+       void adjustNextPC(int offset);
        
        size_t getNextPC() const { return next_pc; }