[Gnash-commit] [SCM] Gnash branch, master, updated. 1686ba51a89f5b6ee36eeb3ccaf60073c6344e2e

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


commit 1686ba51a89f5b6ee36eeb3ccaf60073c6344e2e
Author: Sandro Santilli <address@hidden>
Date:   Sat Nov 6 12:49:22 2010 +0100

    Add support for -j and -k in FB gui (still not completely happy with it, 
but does something now)

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 23d74dc..00955cd 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -188,8 +188,6 @@ FBGui::FBGui(unsigned long xid, float scale, bool loop, 
RunResources& r)
       own_vt(-1),
       fbmem(0),
       buffer(0),                // the real value is set by 
ENABLE_DOUBLE_BUFFERING
-      m_stage_width(0),
-      m_stage_height(0),
       m_rowsize(0),
       _timeout(0)
 {
@@ -315,8 +313,7 @@ FBGui::init(int /*argc*/, char *** /*argv*/)
     }
 #endif
 
-    // Ok, now initialize AGG
-    return initialize_renderer();
+    return true;
 }
 
 bool
@@ -333,11 +330,6 @@ FBGui::initialize_renderer()
     unsigned char* mem;
     Renderer_agg_base* agg_handler;
   
-    m_stage_width = width;
-    m_stage_height = height;
-  
-    _validbounds.setTo(0, 0, width - 1, height - 1);    
-  
 #ifdef ENABLE_DOUBLE_BUFFERING
     log_debug(_("Double buffering enabled"));
     mem = buffer;
@@ -465,12 +457,19 @@ FBGui::renderBuffer()
 }
 
 bool
-FBGui::createWindow(const char* /*title*/, int /*width*/, int /*height*/,
+FBGui::createWindow(const char* /*title*/, int width, int height,
                      int /*xPosition*/, int /*yPosition*/)
 {
-    // Framebuffer has no windows... :-)
-    
-    return true;
+    assert(width>0);
+    assert(height>0);
+
+    _width = width;
+    _height = height;
+
+    _validbounds.setTo(0, 0, width - 1, height - 1);    
+
+    // Now initialize AGG
+    return initialize_renderer();
 }
 
 bool
@@ -529,7 +528,7 @@ FBGui::showMouse(bool /*show*/)
 int
 FBGui::valid_x(int x) {
     if (x < 0) x = 0;
-    if (x >= m_stage_width) x = m_stage_width - 1;
+    if (x >= _width) x = _width - 1;
     return x;
 }
 
@@ -537,7 +536,7 @@ int
 FBGui::valid_y(int y)
 {
     if (y < 0) y = 0;
-    if (y >= m_stage_height) y = m_stage_height - 1;
+    if (y >= _height) y = _height - 1;
     return y;
 }
 
diff --git a/gui/fb/fbsup.h b/gui/fb/fbsup.h
index 8ff1f10..4552d42 100644
--- a/gui/fb/fbsup.h
+++ b/gui/fb/fbsup.h
@@ -100,8 +100,6 @@ private:
     
     std::vector< geometry::Range2d<int> > _drawbounds;
     
-    int m_stage_width;
-    int m_stage_height;
     unsigned m_rowsize;
     
     std::vector<boost::shared_ptr<InputDevice> > _inputs;

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

Summary of changes:
 gui/fb/fb.cpp  |   29 ++++++++++++++---------------
 gui/fb/fbsup.h |    2 --
 2 files changed, 14 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Gnash