Torque 3D Embedded Browser (WebKit)

configure -opensource -openssl-linked -I C:/openssl-0.9.8/linc32 -L C:/openssl-0.9.8l/out32dll -no-phonon -no-multimedia -no-script -no-opengl -no-openvg -no-qt3support -no-dbus -no-scripttools -nomake demos -nomake examples -fast -release

--- web/guiWebCtrl.cpp	Thu Feb 18 00:09:48 2010
+++ web/guiWebCtrl.cpp	Wed Sep 15 22:15:19 2010
@@ -15,17 +16,19 @@
 #include "gui/core/guiCanvas.h"
 #include "guiWebCore.h"
 
-static const EnumTable::Enums renderModeEnums[] =
-{
-   { GuiWebView::RENDER_TEXTURE, "texture"  },
-   { GuiWebView::RENDER_NATIVE, "native" },	
-   { GuiWebView::RENDER_POPUP, "popup" },	
-};
-
-static const EnumTable gRenderModeTable( "GUIWEBCTRL_RENDERMODE_ENUM", 3, &renderModeEnums[0] );
-
-IMPLEMENT_CONOBJECT(GuiWebCtrl);
-
+IMPLEMENT_CONOBJECT( GuiWebCtrl );
+
+ImplementEnumType( RenderModeType,
+   "Type of render mode for the control.nn"
+   "@ingroup GuiWebCtrl" )
+   { GuiWebView::RENDER_TEXTURE, "texture",
+      "Render to texture mode." },
+   { GuiWebView::RENDER_NATIVE, "native", 
+      "Native mode." },
+   { GuiWebView::RENDER_POPUP, "popup", 
+      "Popup mode." },
+EndImplementEnumType;
+
 GuiWebCtrl::GuiWebCtrl(void)
 {	
    mWebViewId = -1;
@@ -77,7 +80,7 @@
 
 void GuiWebCtrl::initPersistFields()
 {
-   addField( "renderMode",   TypeEnum,     Offset( mMode,    GuiWebCtrl ), 1, &gRenderModeTable );
+   addField( "renderMode",   TYPEID<RenderModeType>(),     Offset( mMode,    GuiWebCtrl ), "Render mode type" );
    addField( "targetName",   TypeRealString,   Offset(mTextureTargetName, GuiWebCtrl), "Material texture target" );
    addField( "fps",  TypeS32, Offset(mRefreshFPS, GuiWebCtrl), "Refresh framerate for RENDER_TEXTURE mode, 20fps is the default" );
 
@@ -127,7 +130,8 @@
    if (mTextureTargetName.isNotEmpty())
    {
       mWebTexture = new WebTextureMap(this);
-      MatTextureTarget::registerTarget( mTextureTargetName, mWebTexture);
+      //MatTextureTarget::registerTarget( mTextureTargetName, mWebTexture);
+      mWebTexture->registerWithName( mTextureTargetName );
    }
 
    GuiCanvas::getGuiCanvasFrameSignal().notify( this, &GuiWebCtrl::_handleCanvasFrameEvent );
@@ -159,7 +163,7 @@
 
    if (mWebTexture)
    {
-      MatTextureTarget::unregisterTarget( mTextureTargetName, NULL );
+      //MatTextureTarget::unregisterTarget( mTextureTargetName, NULL );
       delete mWebTexture;
       mWebTexture = NULL;
    }
@@ -451,3 +455,35 @@
 {
    object->loadURL(argv[2]);
 }
+
+// >>>
+bool GuiWebCtrl::onInputEvent(const InputEventInfo & event)
+{
+   if(event.deviceType == MouseDeviceType &&
+      event.objInst == KEY_BUTTON1 && event.action == SI_BREAK)
+   {
+      // if the right mouse pass thru is enabled,
+      // we want to reactivate mouse on a right mouse button up
+      GuiCanvas *pCanvas = getRoot();
+      if( !pCanvas )
+         return false;
+
+      PlatformWindow *pWindow = static_cast<GuiCanvas*>(getRoot())->getPlatformWindow();
+      if( !pWindow )
+         return false;
+
+      PlatformCursorController *pController = pWindow->getCursorController();
+      if( !pController )
+         return false;
+
+      pWindow->setMouseLocked(false);
+      pCanvas->setCursorON( true );
+
+      //mouseUnlock();
+      //pCanvas->setForceMouseToGUI(false);
+   }
+   // we return false so that the canvas can properly process the right mouse button up...
+   return false;
+}
+
+// <<<
--- web/guiWebCtrl.h	Thu Feb 18 00:09:48 2010
+++ web/guiWebCtrl.h	Wed Sep 15 22:09:44 2010
@@ -160,6 +160,8 @@
    bool onKeyUp(const GuiEvent &event);
    bool onKeyRepeat(const GuiEvent &event);
 
+   bool onInputEvent(const InputEventInfo & event); // >>> <<<
+
    void setFirstResponder();
    void onLoseFirstResponder();
 
@@ -181,7 +183,7 @@
    DECLARE_DESCRIPTION( "A control that displays an embedded web control" );
 };
 
-class WebTextureMap : public MatTextureTarget
+class WebTextureMap : public NamedTexTarget
 {
 
 public:
@@ -198,6 +200,7 @@
    GuiWebCtrl *mCtrl;
 };
 
-
+typedef GuiWebView::RenderMode RenderModeType;
+DefineEnumType( RenderModeType );
 
 #endif

--- web/guiWebView.h	Thu Feb 18 00:09:48 2010
+++ web/guiWebView.h	Thu Apr 29 18:12:37 2010
@@ -18,6 +18,8 @@
 
 class GuiWebCore;
 
+DECLARE_SCOPE( QTWebkitAPI );
+
 // This is meant only for internal use, see GuiWebCtrl.h for some documentation
 
 class GuiWebPage : public QWebPage {
--- myGameTSCtrl.cpp	Thu Feb 18 00:09:48 2010
+++ myGameTSCtrl.cpp	Wed Sep 15 21:44:45 2010
@@ -73,11 +73,11 @@
          {
             if (r.texCoord[0] != -1)
             {
-               Material* m = dynamic_cast <Material *> (r.material->getMaterial());
+               Material* m = ( r.material ? dynamic_cast< Material* >( r.material->getMaterial() ) : 0 ); // >>> <<< http://www.torquepowered.com/community/forums/viewthread/109335/4#comment-736607
                if (m && m->mDiffuseMapFilename[0].isNotEmpty() && m->mDiffuseMapFilename[0].substr( 0, 1 ).equal("#"))
                {
                      String texTargetBufferName = m->mDiffuseMapFilename[0].substr(1, m->mDiffuseMapFilename[0].length() - 1);
-                     MatTextureTarget *texTarget = MatTextureTarget::findTargetByName( texTargetBufferName ); 
+                     NamedTexTargetRef texTarget = NamedTexTarget::find( texTargetBufferName ); 
                      if (texTarget)
                      {
                         
@@ -127,11 +127,11 @@
          {
             if (r.texCoord[0] != -1)
             {
-               Material* m = dynamic_cast <Material *> (r.material->getMaterial());
+               Material* m = ( r.material ? dynamic_cast< Material* >( r.material->getMaterial() ) : 0 ); // >>> <<< http://www.torquepowered.com/community/forums/viewthread/109335/4#comment-736607
                if (m && m->mDiffuseMapFilename[0].isNotEmpty() && m->mDiffuseMapFilename[0].substr( 0, 1 ).equal("#"))
                {
                      String texTargetBufferName = m->mDiffuseMapFilename[0].substr(1, m->mDiffuseMapFilename[0].length() - 1);
-                     MatTextureTarget *texTarget = MatTextureTarget::findTargetByName( texTargetBufferName ); 
+                     NamedTexTargetRef texTarget = NamedTexTarget::find( texTargetBufferName ); 
                      if (texTarget)
                      {
                         GuiWebCtrl* w = dynamic_cast<GuiWebCtrl*> (Sim::findObject(texTargetBufferName));
@@ -177,11 +177,11 @@
          {
             if (r.texCoord[0] != -1)
             {
-               Material* m = dynamic_cast <Material *> (r.material->getMaterial());
+               Material* m = ( r.material ? dynamic_cast< Material* >( r.material->getMaterial() ) : 0 ); // >>> <<< http://www.torquepowered.com/community/forums/viewthread/109335/4#comment-736607
                if (m && m->mDiffuseMapFilename[0].isNotEmpty() && m->mDiffuseMapFilename[0].substr( 0, 1 ).equal("#"))
                {
                      String texTargetBufferName = m->mDiffuseMapFilename[0].substr(1, m->mDiffuseMapFilename[0].length() - 1);
-                     MatTextureTarget *texTarget = MatTextureTarget::findTargetByName( texTargetBufferName ); 
+                     NamedTexTargetRef texTarget = NamedTexTarget::find( texTargetBufferName ); 
                      if (texTarget)
                      {
                         
@@ -261,10 +261,8 @@
    return false;
 }
 
-
 void MyGameTSCtrl::onRightMouseUp(const GuiEvent & event)
 {
-   /*
    GuiCanvas *pCanvas = getRoot();
    if( !pCanvas )
    return;
@@ -281,8 +279,6 @@
    // script functions are lockMouse(true); Canvas.cursorOff();
    pWindow->setMouseLocked(false);
    pCanvas->setCursorON( true );
-   */
-
 }
 
 void MyGameTSCtrl::onRender(Point2I offset, const RectI &updateRect)