khtml_ecma_window_3.4.4.patch

来自「konqueror3 embedded版本, KDE环境下的当家浏览器的嵌入式版」· PATCH 代码 · 共 103 行

--- ecma/kjs_window.cpp	2005-04-11 15:20:21.568934574 +0200
+++ ecma/kjs_window.cpp	2005-04-11 15:18:27.942066936 +0200
@@ -36,7 +36,9 @@
 #include <kwinmodule.h> // schroder
 #endif
 
+#ifndef KONQ_EMBEDDED
 #include <kbookmarkmanager.h>
+#endif
 #include <kglobalsettings.h>
 #include <assert.h>
 #include <qstyle.h>
@@ -108,8 +110,8 @@ namespace KJS {
 #ifdef Q_WS_QWS
   class KonquerorFunc : public DOMFunction {
   public:
-    KonquerorFunc(const Konqueror* k, const char* name)
-      : DOMFunction(), konqueror(k), m_name(name) { }
+    KonquerorFunc(ExecState *exec, const Konqueror* k, const char* name)
+      : DOMFunction(exec), konqueror(k), m_name(name) { }
     virtual Value tryCall(ExecState *exec, Object &thisObj, const List &args);
 
   private:
@@ -621,7 +623,7 @@ Value Window::get(ExecState *exec, const
     }
 #ifdef Q_WS_QWS
     case _Konqueror: {
-      Value k( new Konqueror(exec, part) );
+      Value k( new Konqueror(part) );
       const_cast<Window *>(this)->put(exec, "konqueror", k, DontDelete|ReadOnly|Internal);
       return k;
     }
@@ -631,11 +633,16 @@ Value Window::get(ExecState *exec, const
     case OuterHeight:
     case OuterWidth:
     {
+#if defined Q_WS_X11 && ! defined K_WS_QTONLY
       if (!part->widget())
         return Number(0);
       KWin::WindowInfo inf = KWin::windowInfo(part->widget()->topLevelWidget()->winId());
       return Number(entry->value == OuterHeight ?
                     inf.geometry().height() : inf.geometry().width());
+#else
+      return Number(entry->value == OuterHeight ?  
+		    part->view()->height() : part->view()->width());
+#endif
     }
     case PageXOffset:
       return Number(part->view()->contentsX());
@@ -1471,6 +1478,7 @@ Value WindowFunc::tryCall(ExecState *exe
     return Boolean((KMessageBox::warningYesNo(widget, str, caption,
                                                 KStdGuiItem::ok(), KStdGuiItem::cancel()) == KMessageBox::Yes));
   case Window::Prompt:
+#ifndef KONQ_EMBEDDED
     if (!widget->dialogsAllowed())
       return Undefined();
     if ( part && part->xmlDocImpl() )
@@ -1490,6 +1498,9 @@ Value WindowFunc::tryCall(ExecState *exe
         return String(str2);
     else
         return Null();
+#else
+    return Undefined();
+#endif
   case Window::Open:
     return window->openWindow(exec, args);
   case Window::Navigate:
@@ -2235,6 +2246,7 @@ Value ExternalFunc::tryCall(ExecState *e
   switch (id) {
   case External::AddFavorite:
   {
+#ifndef KONQ_EMBEDDED
     if (!widget->dialogsAllowed())
       return Undefined();
     part->xmlDocImpl()->updateRendering();
@@ -2272,6 +2284,9 @@ Value ExternalFunc::tryCall(ExecState *e
       KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager();
       mgr->addBookmarkDialog(url,title);
     }
+#else
+    return Undefined();
+#endif
     break;
   }
   default:
@@ -2406,14 +2421,14 @@ Value Konqueror::get(ExecState *exec, co
     }
   }
 
-  return Value( new KonquerorFunc(this, p.qstring().latin1() ) );
+  return Value( new KonquerorFunc(exec, this, p.qstring().latin1() ) );
 }
 
 Value KonquerorFunc::tryCall(ExecState *exec, Object &, const List &args)
 {
   KParts::BrowserExtension *ext = konqueror->part->browserExtension();
 
-  if(!ext)
+  if (!ext)
     return Undefined();
 
   KParts::BrowserInterface *iface = ext->browserInterface();