[Gnash-commit] gnash/gui aqua.cpp aqua_glue.h aquasup.h

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/07/22 23:40:10

Modified files:
        gui            : aqua.cpp aqua_glue.h aquasup.h 

Log message:
        More OSX-stuff

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua_glue.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aquasup.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: aqua.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- aqua.cpp    22 Jul 2007 23:28:05 -0000      1.11
+++ aqua.cpp    22 Jul 2007 23:40:09 -0000      1.12
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: aqua.cpp,v 1.11 2007/07/22 23:28:05 nihilus Exp $ */
+/* $Id: aqua.cpp,v 1.12 2007/07/22 23:40:09 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -101,9 +101,16 @@
 void AquaGui::renderBuffer()
 {
     GNASH_REPORT_FUNCTION;
+    _glue.render();
 }
 
-bool AquaGui::init(int /*argc*/, char *** /*argv*/) /* Self-explainatory */
+void
+AquaGui::setInvalidatedRegions(const InvalidatedRanges& ranges)
+{
+    _glue.setInvalidatedRegions(ranges);
+}
+
+bool AquaGui::init(int argc, char ***argv) /* Self-explainatory */
 {
   OSErr                                                err;
   static const EventTypeSpec   sApplicationEvents[] =  {  {kEventClassCommand, 
kEventCommandProcess}  };
@@ -143,6 +150,9 @@
   SendWindowGroupBehind(g.windowGroups[1], g.windowGroups[2]);
   SendWindowGroupBehind(g.windowGroups[0], g.windowGroups[1]);
 
+  _glue.init (argc, argv);
+
+
 Bail:  
   return err;  
 }

Index: aqua_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_glue.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- aqua_glue.h 1 Jul 2007 10:54:00 -0000       1.5
+++ aqua_glue.h 22 Jul 2007 23:40:09 -0000      1.6
@@ -18,12 +18,13 @@
 // 
 //
 
-/* $Id: aqua_glue.h,v 1.5 2007/07/01 10:54:00 bjacques Exp $ */
+/* $Id: aqua_glue.h,v 1.6 2007/07/22 23:40:09 nihilus Exp $ */
 
 #ifndef AQUA_GLUE_H
 #define AQUA_GLUE_H
 
 #include "gnash.h"
+#include "snappingrange.h"
 
 namespace gnash
 {
@@ -33,7 +34,7 @@
   public:
     virtual ~AquaGlue() { }
     virtual bool init(int argc, char **argv[]) = 0;
-
+    virtual void setInvalidatedRegions(const InvalidatedRanges& /* ranges */) 
{}
     virtual bool prepDrawingArea(int width, int height) = 0;
     virtual render_handler* createRenderHandler(int depth) = 0;
     virtual void render() = 0;

Index: aquasup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/aquasup.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- aquasup.h   1 Jul 2007 10:54:00 -0000       1.7
+++ aquasup.h   22 Jul 2007 23:40:09 -0000      1.8
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: aquasup.h,v 1.7 2007/07/01 10:54:00 bjacques Exp $ */
+/* $Id: aquasup.h,v 1.8 2007/07/22 23:40:09 nihilus Exp $ */
 
 #ifndef __AQUASUP_H__
 #define __AQUASUP_H__
@@ -65,6 +65,7 @@
     virtual bool createMenu();
     virtual bool setupEvents();
     virtual void renderBuffer();
+    virtual void setInvalidatedRegions(const InvalidatedRanges& ranges);
     virtual void setInterval(unsigned int interval);
     virtual void setTimeout(unsigned int timeout);
 };