[Freepv-cvs] SF.net SVN: freepv: [30] freepv/trunk/src

[<da...@us...>]

Revision: 30
          http://svn.sourceforge.net/freepv/?rev=30&view=rev
Author:   dangelo
Date:     2006-09-28 23:46:46 -0700 (Thu, 28 Sep 2006)

Log Message:
-----------
unix mozilla plugin: compilation fixes and minor cleanup

Modified Paths:
--------------
    freepv/trunk/src/freepv-mozilla/plugin_unix.cpp
    freepv/trunk/src/freepv-mozilla/plugin_unix.h
    freepv/trunk/src/libfreepv/glutfont/Makefile.am

Modified: freepv/trunk/src/freepv-mozilla/plugin_unix.cpp
===================================================================
--- freepv/trunk/src/freepv-mozilla/plugin_unix.cpp	2006-09-29 06:26:09 UTC (rev 29)
+++ freepv/trunk/src/freepv-mozilla/plugin_unix.cpp	2006-09-29 06:46:46 UTC (rev 30)
@@ -25,13 +25,6 @@
 #include <libfreepv/utils.h>
 #include <npapi.h>
 
-//#include <gtk/gtk.h>
-//#include <gdk/gdkkeysyms.h>
-
-#include <gtk/gtkgl.h>
-/*** Use OpenGL extensions. ***/
-#include <gdk/gdkglglext.h>
-
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include "plugin_unix.h"
@@ -224,22 +217,6 @@
 }
 
 
-
-static void
-xt_event_handler(Widget xtwidget, nsPluginInstanceUnix *plugin, XEvent *xevent, Boolean *b)
-{
-  switch (xevent->type) {
-    case Expose:
-      // get rid of all other exposure events
-      if (plugin) {
-        //while(XCheckTypedWindowEvent(plugin->Display(), plugin->Window(), Expose, xevent));
-          DEBUG_DEBUG("EXPOSURE event");
-      }
-      default:
-        break;
-  }
-}
-
 NPError nsPluginInstanceUnix::SetWindow(NPWindow* aWindow)
 {
     DEBUG_TRACE("");
@@ -334,7 +311,7 @@
             XtAppContext context;
 
             if (NPN_GetValue(mInstance, NPNVxtAppContext, (void*)context) != NPERR_NO_ERROR ) {
-                DEBUG_ERROR("Could not get XtAppContext, no animation possible");
+                DEBUG_ERROR("Could not get XtAppContext from mozilla, trying XtDisplayToApplicationContext");
                 // try out alternative way to retrieve the XtAppContext
                 XtAppContext context2 = XtDisplayToApplicationContext(mDisplay);
                 DEBUG_DEBUG("XtDisplayToApplicationContext: " << context2);
@@ -342,8 +319,8 @@
                 XtIntervalId id = XtAppAddTimeOut(context2, 10, (XtTimerCallbackProc) nsPluginInstanceUnix::xtTimeOutProc, this);
                 DEBUG_DEBUG("added timeout proc, id: " << id);
             } else {
-                XtWorkProcId id = XtAppAddWorkProc(context, (XtWorkProc)nsPluginInstanceUnix::xtWorkProc, this);
-                DEBUG_DEBUG("added work proc, id: " << id);
+                XtIntervalId id = XtAppAddTimeOut(context, 10, (XtTimerCallbackProc) nsPluginInstanceUnix::xtTimeOutProc, this);
+                DEBUG_DEBUG("added timeout proc, id: " << id);
             }
 
         } else {
@@ -363,7 +340,7 @@
 }
 
 
-
+#if 0
 void nsPluginInstanceUnix::draw()
 {
     DEBUG_TRACE("");
@@ -413,6 +390,9 @@
     }
     */
 }
+
+#endif
+
 uint16  nsPluginInstanceUnix::HandleEvent(void* event)
 {
     DEBUG_TRACE("");
@@ -476,16 +456,6 @@
     }
 }
 
-Boolean nsPluginInstanceUnix::xtWorkProc(nsPluginInstanceUnix * thisp)
-{
-    unsigned long t = getTime();
-    DEBUG_TRACE(t);
-    if (thisp->m_eventListener) {
-        thisp->m_eventListener->onTimer(t);
-    }
-    return False;
-}
-
 void nsPluginInstanceUnix::xtTimeOutProc(nsPluginInstanceUnix * thisp, XtIntervalId *id)
 {
     unsigned long t = getTime();

Modified: freepv/trunk/src/freepv-mozilla/plugin_unix.h
===================================================================
--- freepv/trunk/src/freepv-mozilla/plugin_unix.h	2006-09-29 06:26:09 UTC (rev 29)
+++ freepv/trunk/src/freepv-mozilla/plugin_unix.h	2006-09-29 06:46:46 UTC (rev 30)
@@ -35,7 +35,6 @@
 #include <GL/glu.h>
 
 #include <libfreepv/PanoViewer.cpp>
-#include <libfreepv/glutfont/freeglut_font.h>
 
 #include "plugin.h"
 
@@ -66,11 +65,8 @@
   virtual NPError SetValue(NPNVariable variable, void *value)       { return NPERR_NO_ERROR; }
   */
   
-  void draw();
+  //void draw();
   
-  static void realize (GtkWidget *widget,
-                       nsPluginInstanceUnix * thisp);
-
 protected:
 
     // internal utility functions for opengl handling
@@ -83,7 +79,7 @@
 
     // Xt event stuff
     static void xtEventHandler(Widget xtwidget, nsPluginInstanceUnix *thisp, XEvent *event, Boolean *b);
-    static Boolean xtWorkProc(nsPluginInstanceUnix * thisp);
+    //static Boolean xtWorkProc(nsPluginInstanceUnix * thisp);
     static void xtTimeOutProc(nsPluginInstanceUnix * thisp, XtIntervalId *id);
 
 

Modified: freepv/trunk/src/libfreepv/glutfont/Makefile.am
===================================================================
--- freepv/trunk/src/libfreepv/glutfont/Makefile.am	2006-09-29 06:26:09 UTC (rev 29)
+++ freepv/trunk/src/libfreepv/glutfont/Makefile.am	2006-09-29 06:46:46 UTC (rev 30)
@@ -6,4 +6,4 @@
 lib_LIBRARIES = libglutfont.a
 libglutfont_a_SOURCES = freeglut_font.c freeglut_font_data.c \
 	freeglut_glutfont_definitions.c
-noinst_HEADERS = freeglut_font.h
+noinst_HEADERS = freeglut_font_copy.h


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.