[Gnash-commit] gnash ChangeLog gui/Makefile.am gui/NullGui.cpp...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/10/09 16:05:24

Modified files:
        .              : ChangeLog 
        gui            : Makefile.am NullGui.cpp NullGui.h Player.cpp 
                         gtk.cpp gui.h kde.cpp kdesup.h sdl.cpp sdlsup.h 

Log message:
        Some more cleanup. Work KdeGui in a usable state.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1093&r2=1.1094
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/NullGui.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/NullGui.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kdesup.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdlsup.h?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1093
retrieving revision 1.1094
diff -u -b -r1.1093 -r1.1094
--- ChangeLog   9 Oct 2006 15:42:50 -0000       1.1093
+++ ChangeLog   9 Oct 2006 16:05:24 -0000       1.1094
@@ -1,3 +1,7 @@
+2006-10-09 Bastiaan Jacques <address@hidden>
+
+       * gui: Some more cleanup. Work KdeGui in a usable state.
+
 2006-10-09 Sandro Santilli <address@hidden>
 
        * gui/fb.cpp, gui/fbsup.h: fixed createWindow() function to reflect

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gui/Makefile.am     7 Oct 2006 18:11:20 -0000       1.25
+++ gui/Makefile.am     9 Oct 2006 16:05:24 -0000       1.26
@@ -76,6 +76,10 @@
 endif # USE_GUI_GTK
 if USE_GUI_KDE
   KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
+  AM_LDFLAGS += \
+       $(LIB_KDECORE) \
+       $(LIB_KDEUI) \
+       $(KDE_LDFLAGS)
 endif # USE_GUI_KDE
 else # ! USE_RENDERER_OPENGL
  GTK_OPENGL_SRCS =
@@ -189,7 +193,8 @@
 klash_LDADD = \
        $(LIB_KDECORE) \
        $(LIB_KDEUI) \
-       $(GNASH_LIBS)
+       $(GNASH_LIBS) \
+       libgnashplayer.la
 
 klash_DEPENDENCIES = klash.moc libgnashgui.la
 
@@ -200,7 +205,7 @@
          $(MOC) $(srcdir)/kdesup.h -o klash.moc; \
        else  \
          echo "WARNING: Install QT's moc tool! Linking to default MOC file"; \
-         ln -s $(srcdir)/klash.moc.in klash.moc; \
+         ln -sf $(srcdir)/klash.moc.in klash.moc; \
        fi
 
 #noinst_PROGRAMS = guitest # klash flak

Index: gui/NullGui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/NullGui.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gui/NullGui.cpp     8 Aug 2006 14:16:07 -0000       1.2
+++ gui/NullGui.cpp     9 Oct 2006 16:05:24 -0000       1.3
@@ -53,7 +53,7 @@
 {
 
 bool
-NullGui::run(void *)
+NullGui::run()
 {
                while (true)
                {

Index: gui/NullGui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/NullGui.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gui/NullGui.h       9 Oct 2006 13:47:44 -0000       1.5
+++ gui/NullGui.h       9 Oct 2006 16:05:24 -0000       1.6
@@ -71,7 +71,7 @@
        {
                return true;
        }
-       bool run(void *);
+       bool run();
        bool createMenu()  { return true; }
        bool setupEvents()  { return true; }
        void renderBuffer()  { }

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gui/Player.cpp      9 Oct 2006 13:47:44 -0000       1.17
+++ gui/Player.cpp      9 Oct 2006 16:05:24 -0000       1.18
@@ -51,13 +51,13 @@
 #else
 # ifdef HAVE_KDE
 #  include "kdesup.h"
-#  include <qapplication.h>
 #  define GUI_CLASS KdeGui
 # else
 #  error "KDE development packages not installed!"
 # endif
 #endif
 
+
 #ifdef GUI_FB
 # include "fbsup.h"
 # define GUI_CLASS FBGui 
@@ -210,7 +210,6 @@
        if ( do_render )
        {
                _gui.reset(new GUI_CLASS(windowid, scale, do_loop, bit_depth));
-
        }
        else
        {
@@ -254,11 +253,6 @@
     
        bool background = true;
        unsigned int  delay = 0;
-#ifdef USE_KDE
-       QApplication *app = new QApplication(argc, argv);
-#else
-       void *app=NULL;
-#endif
 
        assert(tu_types_validate());
 
@@ -357,7 +351,7 @@
 
     // @@ is it ok for 'app' to be NULL ?
     // (this would be the case when USE_KDE is not defined)
-    _gui->run(app);
+    _gui->run();
 
     // Clean up as much as possible, so valgrind will help find actual leaks.
     gnash::clear();

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gui/gtk.cpp 9 Oct 2006 13:47:44 -0000       1.28
+++ gui/gtk.cpp 9 Oct 2006 16:05:24 -0000       1.29
@@ -233,7 +233,7 @@
 }
 
 bool
-GtkGui::run(void* /*arg*/)
+GtkGui::run()
 {
     GNASH_REPORT_FUNCTION;
     gtk_main();

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gui/gui.h   9 Oct 2006 14:08:46 -0000       1.18
+++ gui/gui.h   9 Oct 2006 16:05:24 -0000       1.19
@@ -69,7 +69,8 @@
      * @param xid The X11 Window ID to attach to. If this is argument is zero,
      * a new window is created.
      *
-     * @param scale The scale used to resize the window.
+     * @param scale The scale used to resize the window size, which has been
+     * established by extracting information from the SWF file.
      * 
      * @param loop Defines whether or not the movie should be played once or
      * looped indefinitely.
@@ -98,13 +99,13 @@
      * Create and display our window.
      *
      * @param title The window title.
-     * @param width The window width in pixels.
-     * @param height The window height in pixels.
+     * @param width The desired window width in pixels.
+     * @param height The desired window height in pixels.
      */   
     virtual bool createWindow(const char* title, int width, int height) = 0;
 
     /// Start main rendering loop.
-    virtual bool run(void *) = 0;
+    virtual bool run() = 0;
 
     /// Create a menu and attach it to our window.
     virtual bool createMenu() = 0;
@@ -160,6 +161,8 @@
     static bool advance_movie(Gui* gui);
 
     /// Resize the client area view and the window accordingly.
+    /// @param width  The desired width in pixels.
+    /// @param height The desired height in pixels.
     void resize_view(int width, int height);
 
 protected:

Index: gui/kde.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gui/kde.cpp 9 Oct 2006 13:47:44 -0000       1.5
+++ gui/kde.cpp 9 Oct 2006 16:05:24 -0000       1.6
@@ -58,6 +58,10 @@
 
 using namespace std;
 
+// XXX ugly hack: qapp must be created before KdeGui (which inherits from
+// QGLWidget) can be created. This is a QT requirement.
+static QApplication* qapp = new QApplication (0, NULL);
+
 namespace gnash 
 {
 
@@ -111,14 +115,14 @@
 KdeGui::init(int argc, char **argv[])
 {
 //    GNASH_REPORT_FUNCTION;
-
+    _qapp = qapp;
     _glue.init (argc, argv);
     
     return true;
 }
 
 bool
-KdeGui::createWindow(int width, int height)
+KdeGui::createWindow(const char* /*windowtitle*/, int width, int height)
 {
 //    GNASH_REPORT_FUNCTION;
 
@@ -181,11 +185,8 @@
 }
 
 bool
-KdeGui::run(void *arg)
+KdeGui::run()
 {
-//    GNASH_REPORT_FUNCTION;
-
-    QApplication *_qapp = (QApplication *)arg;
     connect(_qapp, SIGNAL(lastWindowClosed()), _qapp, SLOT(quit()));
     
     _qapp->exec();
@@ -196,7 +197,7 @@
 bool
 KdeGui::createMenu()
 {
-    GNASH_REPORT_FUNCTION;
+//    GNASH_REPORT_FUNCTION;
 
     return true;
 }
@@ -204,7 +205,7 @@
 bool
 KdeGui::setupEvents()
 {
-  GNASH_REPORT_FUNCTION;
+//  GNASH_REPORT_FUNCTION;
 
   return true;
 }

Index: gui/kdesup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kdesup.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gui/kdesup.h        9 Oct 2006 13:47:44 -0000       1.6
+++ gui/kdesup.h        9 Oct 2006 16:05:24 -0000       1.7
@@ -45,6 +45,7 @@
 #include "tu_config.h"
 #include "gui.h"
 
+#include <qobject.h>
 #include <qgl.h>
 #include <qwidget.h>
 #include <qpopupmenu.h>
@@ -56,7 +57,6 @@
 #include <qkeycode.h>
 #include <qmessagebox.h>
 
-
 #ifdef RENDERER_OPENGL
 # include <qgl.h>
 # include "kde_glue_opengl.h"
@@ -78,8 +78,8 @@
     KdeGui(unsigned long xid, float scale, bool loop, unsigned int depth);
     virtual ~KdeGui();
     virtual bool init(int argc, char **argv[]);
-    virtual bool createWindow(int width, int height);
-    virtual bool run(void *arg);
+    virtual bool createWindow(const char* windowtitle, int width, int height);
+    virtual bool run();
     virtual bool createMenu();
     virtual bool setupEvents();
     virtual void renderBuffer();

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gui/sdl.cpp 9 Oct 2006 13:47:44 -0000       1.30
+++ gui/sdl.cpp 9 Oct 2006 16:05:24 -0000       1.31
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: sdl.cpp,v 1.30 2006/10/09 13:47:44 bjacques Exp $ */
+/* $Id: sdl.cpp,v 1.31 2006/10/09 16:05:24 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -109,7 +109,7 @@
 }
 
 bool
-SDLGui::run(void* /*arg*/)
+SDLGui::run()
 {
        GNASH_REPORT_FUNCTION;
        int x_old = -1;

Index: gui/sdlsup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/sdlsup.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gui/sdlsup.h        9 Oct 2006 13:47:44 -0000       1.14
+++ gui/sdlsup.h        9 Oct 2006 16:05:24 -0000       1.15
@@ -64,7 +64,7 @@
     virtual bool init(int argc, char **argv[]);
     virtual bool createWindow( int width, int height);
     virtual bool createWindow(const char *title, int width, int height);
-    virtual bool run(void *arg);
+    virtual bool run();
     virtual bool createMenu();
     virtual bool setupEvents();
     virtual void renderBuffer();