Adding web view console log, web client JavaScript execution, working on code editor

Source/AtomicEditor/Editors/JSResourceEditor.cpp

@@ -14,15 +14,12 @@
 #include <Atomic/Core/CoreEvents.h>
 #include <AtomicJS/Javascript/JSVM.h>
 
-#include "JSResourceEditor.h"
+#include <AtomicWebView/WebViewEvents.h>
+#include <AtomicWebView/UIWebView.h>
+#include <AtomicWebView/WebClient.h>
 
-#include "../Javascript/JSTheme.h"
-#include "../Javascript/JSASTSyntaxColorVisitor.h"
+#include "JSResourceEditor.h"
 
-#include <TurboBadger/tb_message_window.h>
-#include <TurboBadger/tb_editfield.h>
-#include <TurboBadger/tb_style_edit.h>
-#include <TurboBadger/tb_style_edit_content.h>
 
 using namespace tb;
 
@@ -30,14 +27,7 @@ namespace AtomicEditor
 {
 
 JSResourceEditor ::JSResourceEditor(Context* context, const String &fullpath, UITabContainer *container) :
-    ResourceEditor(context, fullpath, container),
-    styleEdit_(0),
-    lineNumberList_(0),
-    editField_(0),
-    autocomplete_(0),
-    textDirty_(true),
-    textDelta_(0.0f),
-    currentFindPos_(-1)
+    ResourceEditor(context, fullpath, container)
 {
 
     TBLayout* layout = new TBLayout();
@@ -50,89 +40,16 @@ JSResourceEditor ::JSResourceEditor(Context* context, const String &fullpath, UI
     TBContainer* c = new TBContainer();
     c->SetGravity(WIDGET_GRAVITY_ALL);
 
-    TBEditField* text = editField_ = new TBEditField();
-    text->SetMultiline(true);
-    text->SetWrapping(true);
-    text->SetGravity(WIDGET_GRAVITY_ALL);
-    text->SetStyling(true);
-    text->SetSkinBg(TBIDC("TextCode"));
-
-    TBFontDescription fd;
-    fd.SetID(TBIDC("Monaco"));
-    fd.SetSize(12);
-    text->SetFontDescription(fd);
-
-    SharedPtr<File> jsFile(GetSubsystem<ResourceCache>()->GetFile(fullpath));
-    assert(jsFile);
-
-    String source;
-    jsFile->ReadText(source);
-
-    String json;
-
-    JSASTProgram* program = NULL;
-
-    if (ParseJavascriptToJSON(source.CString(), json))
-    {
-        program = JSASTProgram::ParseFromJSON(fullpath, json);
-    }
-
-    text->SetText(source.CString());
-
-    lineNumberList_ = new TBSelectList();
-    lineNumberList_->SetFontDescription(fd);
-    lineNumberList_->SetSkinBg(TBIDC("LineNumberSelectList"));
-    lineNumberList_->GetScrollContainer()->SetScrollMode(SCROLL_MODE_OFF);
-    //lineNumberList_->GetScrollContainer()->SetIgnoreScrollEvents(true);
-    lineNumberList_->SetGravity(WIDGET_GRAVITY_ALL);
-    LayoutParams lp;
-    lp.max_w = 48;
-    lineNumberList_->SetLayoutParams(lp);
-
-    c->AddChild(text);
-
-    layout->AddChild(lineNumberList_);
     layout->AddChild(c);
-    layout->SetSpacing(0);
-
-    TBStyleEdit* sedit = text->GetStyleEdit();
-    TBTextTheme* theme = new TBTextTheme();
-    for (unsigned i = 0; i < TB_MAX_TEXT_THEME_COLORS; i++)
-        theme->themeColors[i] = TBColor(255, 255, 255);
-
-    theme->themeColors[JSTHEME_LITERAL_STRING].SetFromString("#E6DB74", 7);
-
-    theme->themeColors[JSTHEME_LITERAL_NUMBER].SetFromString("#AE81FF", 7);
-    theme->themeColors[JSTHEME_LITERAL_REGEX].SetFromString("#AE81FF", 7);
-    theme->themeColors[JSTHEME_LITERAL_BOOLEAN].SetFromString("#AE81FF", 7);
-    theme->themeColors[JSTHEME_LITERAL_NULL].SetFromString("#AE81FF", 7);
 
-    theme->themeColors[JSTHEME_FUNCTION].SetFromString("#66D9EF", 7);
-    theme->themeColors[JSTHEME_VAR].SetFromString("#66D9EF", 7);
+    String url = "file://";
 
+    webView_ = new UIWebView(context_, "file:///Users/josh/Dev/atomic/AtomicGameEngine/Data/AtomicEditor/CodeEditor/Editor.html");
+    webClient_ = webView_->GetWebClient();
 
-    theme->themeColors[JSTHEME_KEYWORD].SetFromString("#f92672", 7);
-    theme->themeColors[JSTHEME_OPERATOR].SetFromString("#f92672", 7);
+    SubscribeToEvent(webClient_, E_WEBVIEWLOADEND, HANDLER(JSResourceEditor, HandleWebViewLoadEnd));
 
-    theme->themeColors[JSTHEME_CODE].SetFromString("#a6e22e", 7);
-    theme->themeColors[JSTHEME_COMMENT].SetFromString("#75715e", 7);
-
-    theme->themeColors[JSTHEME_FUNCTIONDECLARG].SetFromString("#FF9800", 7);
-
-    sedit->SetTextTheme(theme);
-
-    sedit->text_change_listener = this;
-
-    styleEdit_ = sedit;
-    UpdateLineNumbers();
-
-    if (program)
-    {
-        JSASTSyntaxColorVisitor syntaxColor(sedit);
-        syntaxColor.visit(program);
-    }
-
-    SubscribeToEvent(E_UPDATE, HANDLER(JSResourceEditor, HandleUpdate));
+    c->AddChild(webView_->GetInternalWidget());
 
     // FIXME: Set the size at the end of setup, so all children are updated accordingly
     // future size changes will be handled automatically
@@ -142,383 +59,54 @@ JSResourceEditor ::JSResourceEditor(Context* context, const String &fullpath, UI
 
 JSResourceEditor::~JSResourceEditor()
 {
-}
-
-void JSResourceEditor::FormatCode()
-{
-
-    TBStr text;
-    styleEdit_->GetText(text);
-
-    if (text.Length())
-    {
-        String output;
-        if (BeautifyJavascript(text.CStr(), output))
-        {
-            if (output.Length())
-            {
-                styleEdit_->selection.SelectAll();
-                styleEdit_->InsertText(output.CString(), output.Length());
-            }
-        }
-    }
-
 
 }
 
-void JSResourceEditor::UpdateLineNumbers()
+void JSResourceEditor::HandleWebViewLoadEnd(StringHash eventType, VariantMap& eventData)
 {
-    if (!styleEdit_)
-        return;
-
-    TBGenericStringItemSource* lineSource = lineNumberList_->GetDefaultSource();
-
-    int lines = lineSource->GetNumItems();
-
-    int lineCount = styleEdit_->blocks.CountLinks();
-
-    if (lines == lineCount)
-        return;
-
-    while (lines > lineCount)
-    {
-        lineSource->DeleteItem(lineSource->GetNumItems() - 1);
-        lines --;
-    }
-
-    for (int i = lines; i < lineCount; i++)
-    {
-        String sline;
-        sline.AppendWithFormat("%i  ", i + 1);
-        TBGenericStringItem* item = new TBGenericStringItem(sline.CString());
-        lineSource->AddItem(item);
-
-    }
-
-    // item widgets don't exist until ValidateList
-    lineNumberList_->ValidateList();
-
-    for (int i = 0; i < lineCount; i++)
-    {
-        TBTextField* textField = (TBTextField* )lineNumberList_->GetItemWidget(i);
-
-        if (textField)
-        {
-            textField->SetTextAlign(TB_TEXT_ALIGN_RIGHT);
-            textField->SetSkinBg(TBIDC("TBSelectItemLineNumber"));
-        }
-
-    }
-
+    webClient_->ExecuteJavaScript("sayHi();");
 }
 
-void JSResourceEditor::OnChange(TBStyleEdit* styleEdit)
+void JSResourceEditor::FormatCode()
 {
-    textDelta_ = 0.25f;
-    textDirty_ = true;
 
-    SetModified(true);
-    UpdateLineNumbers();
 }
 
 bool JSResourceEditor::OnEvent(const TBWidgetEvent &ev)
 {
-    if (ev.type == EVENT_TYPE_KEY_DOWN)
-    {
-
-        if (ev.special_key == TB_KEY_ESC)
-        {
-            //SendEvent(E_FINDTEXTCLOSE);
-        }
-
-    }
-
     if (ev.type == EVENT_TYPE_SHORTCUT)
     {
         if (ev.ref_id == TBIDC("close"))
         {
             RequestClose();
         }
-
-        if (ev.ref_id == TBIDC("find"))
-        {
-            //using namespace FindTextOpen;
-            //SendEvent(E_FINDTEXTOPEN);
-        }
-        else if (ev.ref_id == TBIDC("findnext") || ev.ref_id == TBIDC("findprev"))
-        {
-            /*
-            String text;
-
-            FindTextWidget* finder = GetSubsystem<FindTextWidget>();
-            finder->GetFindText(text);
-
-            // TODO: get flags from finder
-            unsigned flags = FINDTEXT_FLAG_NONE;
-
-            if (ev.ref_id == TBIDC("findnext"))
-                flags |= FINDTEXT_FLAG_NEXT;
-            else if (ev.ref_id == TBIDC("findprev"))
-                flags |= FINDTEXT_FLAG_PREV;
-
-            flags |= FINDTEXT_FLAG_WRAP;
-
-            finder->Find(text, flags);
-            */
-        }
-        else if (ev.ref_id == TBIDC("cut") || ev.ref_id == TBIDC("copy") || ev.ref_id == TBIDC("paste")
-                 || ev.ref_id == TBIDC("selectall") || ev.ref_id == TBIDC("undo") || ev.ref_id == TBIDC("redo") )
-        {
-            editField_->OnEvent(ev);
-        }
     }
 
     return false;
 }
 
-void JSResourceEditor::HandleUpdate(StringHash eventType, VariantMap& eventData)
-{
-
-    if (!styleEdit_)
-        return;
-
-    // sync line number
-    lineNumberList_->GetScrollContainer()->ScrollTo(0, styleEdit_->scroll_y);
-    lineNumberList_->SetValue(styleEdit_->GetCaretLine());
-
-    // Timestep parameter is same no matter what event is being listened to
-    float timeStep = eventData[Update::P_TIMESTEP].GetFloat();
-
-    if (!textDirty_)
-        return;
-
-    if (textDelta_ > 0.0f)
-    {
-        textDelta_ -= timeStep;
-        if (textDelta_ < 0.0f)
-        {
-            textDelta_ = 0.0f;
-        }
-        else
-        {
-            return;
-        }
-    }
-
-    TBStr text;
-    styleEdit_->GetText(text);
-
-    JSASTProgram* program = NULL;
-    String json;
-    if (ParseJavascriptToJSON(text.CStr(), json))
-    {
-        program = JSASTProgram::ParseFromJSON("fullpath", json);
-
-        if (program)
-        {
-            JSASTSyntaxColorVisitor syntaxColor(styleEdit_);
-            syntaxColor.visit(program);
-            delete program;
-        }
-
-    }
-
-    textDirty_ = false;
-
-    editField_->SetFocus(WIDGET_FOCUS_REASON_UNKNOWN);
-
-}
-
 void JSResourceEditor::FindTextClose()
 {
-    editField_->SetFocus(WIDGET_FOCUS_REASON_UNKNOWN);
-    styleEdit_->selection.SelectNothing();
 }
 
 bool JSResourceEditor::FindText(const String& findText, unsigned flags)
 {
-    /*
-    unsigned findLength = findText.Length();
-
-    if (!findLength)
-        return true;
-
-    TBStr _source;
-    styleEdit_->GetText(_source);
-    String source = _source.CStr();
-
-    unsigned pos = String::NPOS;
-    int startPos = currentFindPos_;
-
-    if (currentFindPos_ == -1)
-        startPos = styleEdit_->caret.GetGlobalOfs();
-    else
-    {
-        if (flags & FINDTEXT_FLAG_NEXT)
-            startPos += findLength;
-    }
 
-    if (flags & FINDTEXT_FLAG_PREV)
-    {
-        String pretext = source.Substring(0, startPos);
-        pos = pretext.FindLast(findText, String::NPOS, flags & FINDTEXT_FLAG_CASESENSITIVE ? true : false);
-    }
-    else
-    {
-        pos = source.Find(findText, startPos, flags & FINDTEXT_FLAG_CASESENSITIVE ? true : false);
-    }
-
-    if (pos == String::NPOS)
-    {
-        if (flags & FINDTEXT_FLAG_WRAP)
-        {
-            if (flags & FINDTEXT_FLAG_PREV)
-            {
-                pos = source.FindLast(findText, String::NPOS, flags & FINDTEXT_FLAG_CASESENSITIVE ? true : false);
-            }
-            else
-            {
-                pos = source.Find(findText, 0, flags & FINDTEXT_FLAG_CASESENSITIVE ? true : false);
-            }
-        }
-
-        if (pos == String::NPOS)
-        {
-            styleEdit_->selection.SelectNothing();
-            return true;
-        }
-    }
-
-    currentFindPos_ = pos;
-
-    styleEdit_->caret.SetGlobalOfs((int) pos + findLength);
-
-    int height = styleEdit_->layout_height;
-
-    int newy = styleEdit_->caret.y - height/2;
-
-    styleEdit_->SetScrollPos(styleEdit_->scroll_x, newy);
-
-    styleEdit_->selection.Select(pos, pos + findLength);
-    */
     return true;
 }
 
 void JSResourceEditor::SetFocus()
 {
-    editField_->SetFocus(WIDGET_FOCUS_REASON_UNKNOWN);
+    //editField_->SetFocus(WIDGET_FOCUS_REASON_UNKNOWN);
 }
 
 void JSResourceEditor::GotoTokenPos(int tokenPos)
 {
-    styleEdit_->caret.SetGlobalOfs(tokenPos);
-
-    int height = styleEdit_->layout_height;
-
-    int newy = styleEdit_->caret.y - height/2;
-
-    styleEdit_->SetScrollPos(styleEdit_->scroll_x, newy);
 
 }
 
 void JSResourceEditor::GotoLineNumber(int lineNumber)
 {
-    int line = 0;
-    TBBlock *block = NULL;
-    for (block = styleEdit_->blocks.GetFirst(); block; block = block->GetNext())
-    {
-        if (lineNumber == line)
-            break;
-        line++;
-    }
-    if (!block)
-        return;
-
-    styleEdit_->caret.Place(block, 0);
-
-    int height = styleEdit_->layout_height;
-    int newy = styleEdit_->caret.y - height/2;
-
-    styleEdit_->SetScrollPos(styleEdit_->scroll_x, newy);
-
-}
-
-bool JSResourceEditor::ParseJavascriptToJSON(const char* source, String& json, bool loose)
-{
-
-    JSVM* vm = JSVM::GetJSVM(NULL);
-    duk_context* ctx = vm->GetJSContext();
-
-    int top = duk_get_top(ctx);
-
-    json.Clear();
-
-    duk_get_global_string(ctx, "require");
-    duk_push_string(ctx, "AtomicEditor/JavaScript/Lib/jsutils");
-    if (duk_pcall(ctx, 1))
-    {
-        printf("Error: %s\n", duk_safe_to_string(ctx, -1));
-        duk_set_top(ctx, top);
-        return false;
-    }
-
-    duk_get_prop_string(ctx, -1, "parseToJSON");
-    duk_push_string(ctx, source);
-    bool ok = true;
-
-    if (duk_pcall(ctx, 1))
-    {
-        ok = false;
-        printf("Error: %s\n", duk_safe_to_string(ctx, -1));
-    }
-    else
-    {
-        json = duk_to_string(ctx, -1);
-    }
-
-    duk_set_top(ctx, top);
-
-    return ok;
-}
-
-bool JSResourceEditor::BeautifyJavascript(const char* source, String& output)
-{
-    JSVM* vm = JSVM::GetJSVM(NULL);
-    duk_context* ctx = vm->GetJSContext();
-
-    int top = duk_get_top(ctx);
-
-    output.Clear();
-
-    duk_get_global_string(ctx, "require");
-    duk_push_string(ctx, "AtomicEditor/JavaScript/Lib/jsutils");
-
-    if (duk_pcall(ctx, 1))
-    {
-        printf("Error: %s\n", duk_safe_to_string(ctx, -1));
-        duk_set_top(ctx, top);
-        return false;
-    }
-
-
-    duk_get_prop_string(ctx, -1, "jsBeautify");
-    duk_push_string(ctx, source);
-    bool ok = true;
-
-    if (duk_pcall(ctx, 1))
-    {
-        ok = false;
-        printf("Error: %s\n", duk_safe_to_string(ctx, -1));
-    }
-    else
-    {
-        output = duk_to_string(ctx, -1);
-    }
-
-    // ignore result
-    duk_set_top(ctx, top);
-
-    return ok;
 
 }
 
@@ -527,12 +115,6 @@ bool JSResourceEditor::Save()
     if (!modified_)
         return true;
 
-    TBStr text;
-    styleEdit_->GetText(text);
-    File file(context_, fullpath_, FILE_WRITE);
-    file.Write((void*) text.CStr(), text.Length());
-    file.Close();
-
     SetModified(false);
 
     return true;

Source/AtomicEditor/Editors/JSResourceEditor.h

@@ -8,19 +8,20 @@
 #pragma once
 
 #include "ResourceEditor.h"
-#include <TurboBadger/tb_editfield.h>
-#include <TurboBadger/tb_style_edit.h>
-#include <TurboBadger/tb_select.h>
 
 using namespace Atomic;
 using namespace tb;
 
-namespace AtomicEditor
+namespace Atomic
 {
+    class UIWebView;
+    class WebClient;
+}
 
-class JSAutocomplete; 
+namespace AtomicEditor
+{
 
-class JSResourceEditor: public ResourceEditor, public TBStyleEditTextChangeListener
+class JSResourceEditor: public ResourceEditor
 {
     OBJECT(JSResourceEditor);
 
@@ -35,9 +36,6 @@ public:
     bool FindText(const String& findText, unsigned flags);
     void FindTextClose();
 
-    void OnChange(TBStyleEdit* styleEdit);
-    void HandleUpdate(StringHash eventType, VariantMap& eventData);
-
     void GotoTokenPos(int tokenPos);
     void GotoLineNumber(int lineNumber);
 
@@ -49,20 +47,13 @@ public:
 
 private:
 
-    bool ParseJavascriptToJSON(const char* source, String& json, bool loose = true);
-    bool BeautifyJavascript(const char* source, String& output);
-    void UpdateLineNumbers();
-
-    tb::TBStyleEdit* styleEdit_;
-    tb::TBSelectList* lineNumberList_;
+    void HandleWebViewLoadEnd(StringHash eventType, VariantMap& eventData);
 
-    TBEditField* editField_;
-    JSAutocomplete* autocomplete_;
+    bool BeautifyJavascript(const char* source, String& output);
 
-    float textDelta_;
-    bool textDirty_;
+    SharedPtr<UIWebView> webView_;
+    WeakPtr<WebClient> webClient_;
 
-    int currentFindPos_;
 
 };
 

Source/AtomicWebView/WebClient.cpp

@@ -172,6 +172,30 @@ public:
 
     }
 
+    ///
+    // Called to display a console message. Return true to stop the message from
+    // being output to the console.
+    ///
+    /*--cef(optional_param=message,optional_param=source)--*/
+    virtual bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
+                                  const CefString& message,
+                                  const CefString& source,
+                                  int line) OVERRIDE
+    {
+        if (webClient_.Null())
+            return false;
+
+        String _message;
+        ConvertCEFString(message, _message);
+        String _source;
+        ConvertCEFString(source, _source);
+
+        LOGINFOF("WebViewJS: %s (%s:%i)", _message.CString(), _source.CString(), line);
+
+        return false;
+    }
+
+
 
     bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
                                   CefProcessId source_process,
@@ -437,12 +461,23 @@ void WebClient::SendFocusEvent(bool focus)
     host->SendFocusEvent(focus);
 }
 
+// Javascript
+void WebClient::ExecuteJavaScript(const String& script)
+{
+    if (!d_->browser_.get())
+        return;
+
+    d_->browser_->GetMainFrame()->ExecuteJavaScript(CefString(script.CString()), "", 0);
+}
+
 // Navigation
 
 void WebClient::LoadURL(const String& url)
 {
     if (!d_->browser_.get())
+    {
         return;
+    }
 
     CefString _url(url.CString());
     d_->browser_->GetMainFrame()->LoadURL(_url);

Source/AtomicWebView/WebClient.h

@@ -52,6 +52,8 @@ public:
     void ShortcutRedo();
     void ShortcutDelete();
 
+    void ExecuteJavaScript(const String& script);
+
     // Navigation
 
     bool IsLoading();