[Gnash-commit] [SCM] Gnash branch, master, updated. 821944e60a00ae1e3d2dc28fc39bad6a52a8a816

[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  821944e60a00ae1e3d2dc28fc39bad6a52a8a816 (commit)
      from  1686ba51a89f5b6ee36eeb3ccaf60073c6344e2e (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=821944e60a00ae1e3d2dc28fc39bad6a52a8a816


commit 821944e60a00ae1e3d2dc28fc39bad6a52a8a816
Author: Sandro Santilli <address@hidden>
Date:   Sat Nov 6 13:28:15 2010 +0100

    Kind of revert the support for -j/-k as that one would then need a support 
for --fullscreen in turn, which messes up a lot of the command line handling. 
This is another gui that needs to be handling its own command line switches!

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 00955cd..76d3ab2 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -321,8 +321,14 @@ FBGui::initialize_renderer()
 {
     GNASH_REPORT_FUNCTION;
 
-    const int width    = var_screeninfo.xres;
-    const int height   = var_screeninfo.yres;
+    // TODO: do not reset _width and _height
+    //       if they were set trough -j / -k
+
+    _width    = var_screeninfo.xres;
+    _height   = var_screeninfo.yres;
+
+    _validbounds.setTo(0, 0, _width - 1, _height - 1);    
+
     const int bpp = var_screeninfo.bits_per_pixel;
     const int size = fix_screeninfo.smem_len; 
 
@@ -372,7 +378,7 @@ FBGui::initialize_renderer()
   
     m_rowsize = var_screeninfo.xres_virtual*((bpp+7)/8);
   
-    agg_handler->init_buffer(mem, size, width, height, m_rowsize);
+    agg_handler->init_buffer(mem, size, _width, _height, m_rowsize);
   
     disable_terminal();
 
@@ -466,8 +472,6 @@ FBGui::createWindow(const char* /*title*/, int width, int 
height,
     _width = width;
     _height = height;
 
-    _validbounds.setTo(0, 0, width - 1, height - 1);    
-
     // Now initialize AGG
     return initialize_renderer();
 }

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

Summary of changes:
 gui/fb/fb.cpp |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash