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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/07/23 00:00:51

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

Log message:
        More OSX...

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

Patches:
Index: aqua.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- aqua.cpp    22 Jul 2007 23:40:09 -0000      1.12
+++ aqua.cpp    23 Jul 2007 00:00:51 -0000      1.13
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: aqua.cpp,v 1.12 2007/07/22 23:40:09 nihilus Exp $ */
+/* $Id: aqua.cpp,v 1.13 2007/07/23 00:00:51 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -69,12 +69,6 @@
 
 namespace gnash {
        
-AquaGui::AquaGui()
-: Gui() 
-{
-
-}
-
 AquaGui::AquaGui(unsigned long xid, float scale, bool loop, unsigned int depth)
        : Gui(xid, scale, loop, depth)
 {
@@ -107,6 +101,7 @@
 void
 AquaGui::setInvalidatedRegions(const InvalidatedRanges& ranges)
 {
+       GNASH_REPORT_FUNCTION;
     _glue.setInvalidatedRegions(ranges);
 }
 
@@ -115,6 +110,8 @@
   OSErr                                                err;
   static const EventTypeSpec   sApplicationEvents[] =  {  {kEventClassCommand, 
kEventCommandProcess}  };
 
+  GNASH_REPORT_FUNCTION;
+  
   BlockZero(&g, sizeof(g));
     
   g.mainBundle = CFBundleGetMainBundle();
@@ -152,6 +149,10 @@
   
   _glue.init (argc, argv);
 
+    _renderer = _glue.createRenderHandler();
+    if(!_renderer)return false;    
+    return true;
+
 
 Bail:  
   return err;  
@@ -168,8 +169,9 @@
 
 bool AquaGui::createWindow(const char* title, int width, int height)
 {
-
-    return false;
+       _glue.prepDrawingArea(_width, _height);
+    set_render_handler(_renderer);
+    return true;
 }
 
 bool AquaGui::createMenu()

Index: aqua_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_glue.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- aqua_glue.h 22 Jul 2007 23:40:09 -0000      1.6
+++ aqua_glue.h 23 Jul 2007 00:00:51 -0000      1.7
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: aqua_glue.h,v 1.6 2007/07/22 23:40:09 nihilus Exp $ */
+/* $Id: aqua_glue.h,v 1.7 2007/07/23 00:00:51 nihilus Exp $ */
 
 #ifndef AQUA_GLUE_H
 #define AQUA_GLUE_H
@@ -36,7 +36,7 @@
     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 render_handler* createRenderHandler() = 0;
     virtual void render() = 0;
   protected:
     int _bpp;

Index: aqua_ogl_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_ogl_glue.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- aqua_ogl_glue.cpp   22 Jul 2007 23:28:05 -0000      1.10
+++ aqua_ogl_glue.cpp   23 Jul 2007 00:00:51 -0000      1.11
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: aqua_ogl_glue.cpp,v 1.10 2007/07/22 23:28:05 nihilus Exp $ */
+/* $Id: aqua_ogl_glue.cpp,v 1.11 2007/07/23 00:00:51 nihilus Exp $ */
 
 
 #include "aqua_ogl_glue.h"
@@ -48,47 +48,24 @@
 
 bool AquaOglGlue::init(int, char***)
 {
-//    GNASH_REPORT_FUNCTION;
+    GNASH_REPORT_FUNCTION;
 
     return true;
 }
 
 
-render_handler* AquaOglGlue::createRenderHandler(int depth)
+render_handler* AquaOglGlue::createRenderHandler()
 {
-//    GNASH_REPORT_FUNCTION;
-
-    _bpp = depth;
+    GNASH_REPORT_FUNCTION;
     render_handler* renderer = create_render_handler_ogl();
-
+#ifdef FIX_I810_LOD_BIAS
+    glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 
_tex_lod_bias);
+#endif
     return renderer;
 }
 
 bool AquaOglGlue::prepDrawingArea(int width, int height)
 {
-    if (_bpp == 16) {
-      // 16-bit color, surface creation is likely to succeed.
-      /*SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
-      SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
-      SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
-      SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 15);
-      SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-      SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);*/
-    } else {
-      assert(_bpp == 32);
-
-      // 32-bit color etc, for getting dest alpha,
-      // for MULTIPASS_ANTIALIASING (see
-      // render_handler_ogl.cpp).
-      /*SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
-      SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
-      SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
-      SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
-      SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
-      SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-      SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);*/
-    }
-
     //SDL_SetVideoMode(width, height, _bpp, sdl_flags | SDL_OPENGL);
 
      // Turn on alpha blending.

Index: aqua_ogl_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_ogl_glue.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- aqua_ogl_glue.h     1 Jul 2007 10:54:00 -0000       1.5
+++ aqua_ogl_glue.h     23 Jul 2007 00:00:51 -0000      1.6
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: aqua_ogl_glue.h,v 1.5 2007/07/01 10:54:00 bjacques Exp $ */
+/* $Id: aqua_ogl_glue.h,v 1.6 2007/07/23 00:00:51 nihilus Exp $ */
 
 #ifndef AQUA_OGL_GLUE_H
 #define AQUA_OGL_GLUE_H
@@ -37,7 +37,7 @@
     virtual ~AquaOglGlue();
 
     bool init(int argc, char ***argv);
-    render_handler* createRenderHandler( int depth);
+    render_handler* createRenderHandler();
     bool prepDrawingArea(int width, int height);
     void render();
   private:

Index: aquasup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/aquasup.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- aquasup.h   22 Jul 2007 23:40:09 -0000      1.8
+++ aquasup.h   23 Jul 2007 00:00:51 -0000      1.9
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: aquasup.h,v 1.8 2007/07/22 23:40:09 nihilus Exp $ */
+/* $Id: aquasup.h,v 1.9 2007/07/23 00:00:51 nihilus Exp $ */
 
 #ifndef __AQUASUP_H__
 #define __AQUASUP_H__
@@ -56,10 +56,10 @@
 #endif
                
        public:
-               AquaGui();
                AquaGui(unsigned long xid, float scale, bool loop, unsigned int 
depth);
     virtual ~AquaGui();
     virtual bool init(int argc, char ***argv);
+    virtual void setCursor(gnash_cursor_type newcursor);
     virtual bool createWindow(const char* title, int width, int height);
     virtual bool run();
     virtual bool createMenu();