[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2253-gb6666a6

[Sandro Santilli]

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, master has been updated
       via  b6666a67ff2ab161f73fadd9c17b75573751e41c (commit)
       via  a60f7ea77232573bb010ea29a14b41f901045fc4 (commit)
       via  bb76853664ebdcc7f1555201d38b8de6c1615184 (commit)
      from  62cfdfe81d6d9a17c722558dc6046b6596342e98 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=b6666a67ff2ab161f73fadd9c17b75573751e41c


commit b6666a67ff2ab161f73fadd9c17b75573751e41c
Author: Nutchanon Wetchasit <address@hidden>
Date:   Fri Jan 29 08:01:02 2016 +0100

    Remove the incorrect _fd variable check in FBGui destructor.

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 0370c56..37948c7 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -153,7 +153,6 @@ terminate_signal(int /*signo*/) {
 
 FBGui::FBGui(unsigned long xid, float scale, bool loop, RunResources& r)
     : Gui(xid, scale, loop, r),
-      _fd(-1),
       _original_vt(-1),
       _original_kd(-1),
       _own_vt(-1),
@@ -174,11 +173,7 @@ FBGui::~FBGui()
 {  
     // GNASH_REPORT_FUNCTION;
     
-    if (_fd > 0) {
-        enable_terminal();
-        // log_debug("Closing framebuffer device");
-        close(_fd);
-    }
+    enable_terminal();
 }
 
 bool
@@ -588,8 +583,6 @@ FBGui::disable_terminal()
     struct vt_stat vts;
     if (ioctl(fd, VT_GETSTATE, &vts) == -1) {
         log_error(_("Could not get current VT state"));
-        close(_fd);
-        _fd = -1;
         close(fd);
         return false;
     }
@@ -618,7 +611,7 @@ FBGui::disable_terminal()
         return false;
     }
   
-    _fd = open(tty, O_RDWR);
+    fd = open(tty, O_RDWR);
     if (fd < 0) {
         log_error(_("Could not open %s"), tty);
         return false;
@@ -714,8 +707,6 @@ FBGui::enable_terminal()
 
     if (ioctl(fd, VT_ACTIVATE, _original_vt)) {
         log_error(_("Could not activate VT number %d"), _original_vt);
-        close(_fd);
-        _fd = -1;
         close(fd);
         return false;
     }
diff --git a/gui/fb/fbsup.h b/gui/fb/fbsup.h
index 35b850f..063b0b5 100644
--- a/gui/fb/fbsup.h
+++ b/gui/fb/fbsup.h
@@ -187,7 +187,6 @@ private:
     /// reverts disable_terminal() changes
     bool enable_terminal();
     
-    int         _fd;
     int         _original_vt;   // virtual terminal that was active at startup
     int         _original_kd;   // keyboard mode at startup
     int         _own_vt;        // virtual terminal we are running in   

http://git.savannah.gnu.org/cgit//commit/?id=a60f7ea77232573bb010ea29a14b41f901045fc4


commit a60f7ea77232573bb010ea29a14b41f901045fc4
Author: Nutchanon Wetchasit <address@hidden>
Date:   Fri Jan 29 08:00:46 2016 +0100

    Call a correct console cleanup function in FBGui destructor.

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 07d0687..0370c56 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -175,7 +175,7 @@ FBGui::~FBGui()
     // GNASH_REPORT_FUNCTION;
     
     if (_fd > 0) {
-        disable_terminal();
+        enable_terminal();
         // log_debug("Closing framebuffer device");
         close(_fd);
     }

http://git.savannah.gnu.org/cgit//commit/?id=bb76853664ebdcc7f1555201d38b8de6c1615184


commit bb76853664ebdcc7f1555201d38b8de6c1615184
Author: Nutchanon Wetchasit <address@hidden>
Date:   Fri Jan 29 08:00:20 2016 +0100

    Use normal exit procedure instead of std::exit() when fb-gnash finished 
running SWF.

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 5e9a155..07d0687 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -517,6 +517,12 @@ FBGui::setInvalidatedRegions(const InvalidatedRanges& 
ranges)
      _glue->setInvalidatedRegions(ranges);
 }
 
+void
+FBGui::quitUI()
+{
+    terminate_request = true;
+}
+
 char *
 FBGui::find_accessible_tty(int no)
 {
diff --git a/gui/fb/fbsup.h b/gui/fb/fbsup.h
index 23f409b..35b850f 100644
--- a/gui/fb/fbsup.h
+++ b/gui/fb/fbsup.h
@@ -119,6 +119,9 @@ public:
     /// Start main rendering loop.
     bool run();
 
+    /// Stop main rendering loop.
+    void quitUI();
+
     // Resize the viewing area within the total framebuffer display
     bool resize_view(int width, int height);
     

-----------------------------------------------------------------------

Summary of changes:
 gui/fb/fb.cpp  |   19 ++++++++-----------
 gui/fb/fbsup.h |    4 +++-
 2 files changed, 11 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Gnash