update to CEF 3029

@@ -66,11 +66,6 @@ newoption {
 }
 
 newoption {
-	trigger	    = "web-awesomium",
-	description = "Use awesomium embedded browser as the webcore"
-}
-
-newoption {
 	trigger	    = "web-cef3",
 	description = "Use CEF3 embedded browser as the webcore"
 }

@@ -527,19 +527,6 @@ project "te4-bzip"
 
 	files { "../src/bzip2/*.c", }
 
-if _OPTIONS['web-awesomium'] and not _OPTIONS.wincross then
-project "te4-web"
-	kind "SharedLib"
-	language "C++"
-	targetname "te4-web"
-
-	libdirs {"/opt/awesomium/bin/"}
-	includedirs {"/opt/awesomium/include/"}
-	links { "awesomium-1-7" }
-	
-	files { "../src/web-awesomium/*.cpp", }
-end
-
 if _OPTIONS['web-cef3'] and not _OPTIONS.wincross then
 project "te4-web"
 	kind "SharedLib"
@@ -562,8 +549,8 @@ project "te4-web"
 
 	configuration "linux"
 		buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"}
-		libdirs {"/opt/cef3/2526/libcef_dll/", "/opt/cef3/2526/Release/"}
-		includedirs {"/opt/cef3/2526/include/", "/opt/cef3/2526/"}
+		libdirs {"/huge/Test/cef_binary_3.3029.1611.g44e39a8_linux64/build/libcef_dll_wrapper/", "/huge/Test/cef_binary_3.3029.1611.g44e39a8_linux64/Release/"}
+		includedirs {"/huge/Test/cef_binary_3.3029.1611.g44e39a8_linux64/include/", "/huge/Test/cef_binary_3.3029.1611.g44e39a8_linux64/"}
 		links { "cef_dll_wrapper", "cef" }
 		defines { 'SELFEXE_LINUX' }
 
@@ -586,12 +573,17 @@ project "cef3spawn"
 
 	configuration "linux"
 		buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"}
-		libdirs {"/opt/cef3/2526/out/libcef_dll/", "/opt/cef3/2526/Release/"}
-		includedirs {"/opt/cef3/2526/include/", "/opt/cef3/2526/"}
-		links { "cef", "cef_dll_wrapper" }
+		libdirs {"/huge/Test/cef_binary_3.3029.1611.g44e39a8_linux64/build/libcef_dll_wrapper/", "/huge/Test/cef_binary_3.3029.1611.g44e39a8_linux64/Release/"}
+		includedirs {"/huge/Test/cef_binary_3.3029.1611.g44e39a8_linux64/include/", "/huge/Test/cef_binary_3.3029.1611.g44e39a8_linux64/"}
+		links { "cef_dll_wrapper", "cef" }
 		if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end
 		if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end
 		defines { 'SELFEXE_LINUX' }
+	configuration {"linux", "Debug"}
+		postbuildcommands { "cp ../bin/Debug/cef3spawn ../", }
+	configuration {"linux", "Release"}
+		postbuildcommands { "cp ../bin/Release/cef3spawn ../", }
+
 end
 
 if _OPTIONS.steam then

@@ -17,9 +17,6 @@ solution "TEngine"
 		"src/zlib",
 		"src/bzip2",
 	}
-	if _OPTIONS['web-awesomium'] then
-		includedirs { "src/web-awesomium" }
-	end
 	if _OPTIONS['web-cef3'] then
 		includedirs { "src/web-cef3" }
 	end

-@rem Script to compile T-Engine's webapi functionality.
-@rem See copyright notice in web-te4.h.
-@rem To use: load a windows SDK command prompt, navigate to source file root
-@rem setenv /release /x86 /xp
-@rem build\windows\build-te4-web.bat
-
-@rem SDK tools to use (with options)
-@rem TODO: offer a debugging build?
-@if not defined INCLUDE goto :BADENV
-
-@setlocal
-@set CXX=cl
-@set CXXFLAGS=/nologo /MT /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /EHsc
-@rem @set CXXFLAGS=/nologo /MT /Od /Zi /Wall /D_CRT_SECURE_NO_DEPRECATE /EHsc
-@set DLLNAME=te4-web.dll
-@set LIBNAME=te4-web.lib
-@set TE4_WEB_C=web.cpp web-utils.cpp gl_texture_surface.cpp
-@set TE4_WEB_INCLUDES=/I ".." /I "C:\MingW\include\SDL2"  /I "n:\libs\awesomium\1.7.4.1\include"
-@set TE4_WEB_LIBS="n:\libs\awesomium\1.7.4.1\build\lib\awesomium.lib"
-
-%CXX% %CXXFLAGS% /LD /Fe%DLLNAME% %TE4_WEB_INCLUDES% %TE4_WEB_C% %TE4_WEB_LIBS%
-
-@if errorlevel 1 goto :COMPILATION_ERROR
-
-@rem All done.
-@echo Successfully built %DLLNAME%.
-@goto :END
-
-:COMPILATION_ERROR
-@echo ERROR: Failed to build te4web.  Check SDK tool output for errors.
-@goto :END
-
-:BAD_ENV
-@echo ERROR: Must be compiled in a Windows SDK Command Prompt!
-
-:END
\ No newline at end of file

-// Taken from awesomium examples
-#include "gl_texture_surface.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-GLRAMTextureSurface::GLRAMTextureSurface(int width, int height) : texture_id_(NULL),
-	buffer_(0), bpp_(4), rowspan_(0), width_(width), height_(height) {
-	rowspan_ = width_ * bpp_;
-	buffer_ = new unsigned char[rowspan_ * height_];
-	needs_update_ = false;
-
-	texture_id_ = web_make_texture(width_, height_);
-}
-
-GLRAMTextureSurface::~GLRAMTextureSurface() {
-	web_del_texture(texture_id_);
-	delete[] buffer_;
-}
-
-void* GLRAMTextureSurface::GetTexture() const {
-	const_cast<GLRAMTextureSurface*>(this)->UpdateTexture();
-
-	return texture_id_;
-}
-
-void GLRAMTextureSurface::Paint(unsigned char* src_buffer,
-										int src_row_span,
-										const Awesomium::Rect& src_rect,
-										const Awesomium::Rect& dest_rect) {
-	for (int row = 0; row < dest_rect.height; row++)
-		memcpy(buffer_ + (row + dest_rect.y) * rowspan_ + (dest_rect.x * 4),
-			src_buffer + (row + src_rect.y) * src_row_span + (src_rect.x * 4),
-			dest_rect.width * 4);
-
-	needs_update_ = true;
-}
-
-void GLRAMTextureSurface::Scroll(int dx,
-										int dy,
-										const Awesomium::Rect& clip_rect) {
-	if (abs(dx) >= clip_rect.width || abs(dy) >= clip_rect.height)
-		return;
-
-	if (dx < 0 && dy == 0) {
-		// Area shifted left by dx
-		unsigned char* tempBuffer = new unsigned char[(clip_rect.width + dx) * 4];
-
-		for (int i = 0; i < clip_rect.height; i++) {
-			memcpy(tempBuffer, buffer_ + (i + clip_rect.y) * rowspan_ +
-				(clip_rect.x - dx) * 4, (clip_rect.width + dx) * 4);
-			memcpy(buffer_ + (i + clip_rect.y) * rowspan_ + (clip_rect.x) * 4,
-				tempBuffer, (clip_rect.width + dx) * 4);
-		}
-
-		delete[] tempBuffer;
-	} else if (dx > 0 && dy == 0) {
-		// Area shifted right by dx
-		unsigned char* tempBuffer = new unsigned char[(clip_rect.width - dx) * 4];
-
-		for (int i = 0; i < clip_rect.height; i++) {
-			memcpy(tempBuffer, buffer_ + (i + clip_rect.y) * rowspan_ +
-				(clip_rect.x) * 4, (clip_rect.width - dx) * 4);
-			memcpy(buffer_ + (i + clip_rect.y) * rowspan_ + (clip_rect.x + dx) * 4,
-				tempBuffer, (clip_rect.width - dx) * 4);
-		}
-
-		delete[] tempBuffer;
-	} else if (dy < 0 && dx == 0) {
-		// Area shifted down by dy
-		for (int i = 0; i < clip_rect.height + dy ; i++)
-			memcpy(buffer_ + (i + clip_rect.y) * rowspan_ + (clip_rect.x * 4),
-			buffer_ + (i + clip_rect.y - dy) * rowspan_ + (clip_rect.x * 4),
-			clip_rect.width * 4);
-	} else if (dy > 0 && dx == 0) {
-		// Area shifted up by dy
-		for (int i = clip_rect.height - 1; i >= dy; i--)
-			memcpy(buffer_ + (i + clip_rect.y) * rowspan_ + (clip_rect.x * 4),
-			buffer_ + (i + clip_rect.y - dy) * rowspan_ + (clip_rect.x * 4),
-			clip_rect.width * 4);
-	}
-
-	needs_update_ = true;
-}
-
-void GLRAMTextureSurface::UpdateTexture() {
-	if (needs_update_) {
-		web_texture_update(texture_id_, width_, height_, buffer_);
-		needs_update_ = false;
-	}
-}
-
-
-GLTextureSurfaceFactory::GLTextureSurfaceFactory() {
-}
-
-GLTextureSurfaceFactory::~GLTextureSurfaceFactory() {
-}
-
-Awesomium::Surface* GLTextureSurfaceFactory::CreateSurface(Awesomium::WebView* view, int width, int height) {
-	return new GLRAMTextureSurface(width, height);
-}
-
-void GLTextureSurfaceFactory::DestroySurface(Awesomium::Surface* surface) {
-	delete static_cast<GLRAMTextureSurface*>(surface);
-}

-// Taken from awesomium examples
-
-#ifndef __GL_TEXTURE_SURFACE_H__
-#define __GL_TEXTURE_SURFACE_H__
-
-#include <Awesomium/Surface.h>
-extern "C" {
-#include "tgl.h"
-}
-
-class GLTextureSurface : public Awesomium::Surface {
-public:
-	virtual void Paint(unsigned char* src_buffer,
-										 int src_row_span,
-										 const Awesomium::Rect& src_rect,
-										 const Awesomium::Rect& dest_rect) = 0;
-
-	virtual void Scroll(int dx,
-											int dy,
-											const Awesomium::Rect& clip_rect) = 0;
-
-	virtual void* GetTexture() const = 0;
-	virtual int width() const = 0;
-	virtual int height() const = 0;
-	virtual int size() const = 0;
-};
-
-class GLRAMTextureSurface : public GLTextureSurface {
-	void *texture_id_;
-	unsigned char* buffer_;
-	int bpp_, rowspan_, width_, height_;
-	bool needs_update_;
-
- public:
-	GLRAMTextureSurface(int width, int height);
-	virtual ~GLRAMTextureSurface();
-
-	void* GetTexture() const;
-
-	int width() const { return width_; }
-
-	int height() const { return height_; }
-
-	int size() const { return rowspan_ * height_; }
-
- protected:
-	virtual void Paint(unsigned char* src_buffer,
-										 int src_row_span,
-										 const Awesomium::Rect& src_rect,
-										 const Awesomium::Rect& dest_rect);
-
-	virtual void Scroll(int dx,
-											int dy,
-											const Awesomium::Rect& clip_rect);
-
-	void UpdateTexture();
-};
-
-class GLTextureSurfaceFactory : public Awesomium::SurfaceFactory {
-public:
-	GLTextureSurfaceFactory();
-
-	virtual ~GLTextureSurfaceFactory();
-
-	virtual Awesomium::Surface* CreateSurface(Awesomium::WebView* view,
-																						int width,
-																						int height);
-
-	virtual void DestroySurface(Awesomium::Surface* surface);
-};
-
-extern void *(*web_mutex_create)();
-extern void (*web_mutex_destroy)(void *mutex);
-extern void (*web_mutex_lock)(void *mutex);
-extern void (*web_mutex_unlock)(void *mutex);
-extern void *(*web_make_texture)(int w, int h);
-extern void (*web_del_texture)(void *tex);
-extern void (*web_texture_update)(void *tex, int w, int h, const void* buffer);
-
-#endif  // __GL_TEXTURE_SURFACE_H__

-/*
-    TE4 - T-Engine 4
-    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
-
-    No permission to copy or replicate in any ways.
-*/
-
-#ifndef __TE4WEB_INTERNAL_H__
-#define __TE4WEB_INTERNAL_H__
-
-extern void te4_web_init_utils();
-
-extern void push_order(WebEvent *event);
-extern WebEvent *pop_order();
-extern void push_event(WebEvent *event);
-extern WebEvent *pop_event();
-
-extern void *(*web_mutex_create)();
-extern void (*web_mutex_destroy)(void *mutex);
-extern void (*web_mutex_lock)(void *mutex);
-extern void (*web_mutex_unlock)(void *mutex);
-
-#endif

-/*
-    TE4 - T-Engine 4
-    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
-
-    No permission to copy or replicate in any ways, awesomium is not gpl so we cant link directly
-*/
-
-extern "C" {
-#include <stdio.h>
-#include "web-external.h"
-}
-
-#include "web.h"
-#include "web-internal.h"
-
-#include <vector>
-
-static std::vector<WebEvent*> *iqueue = new std::vector<WebEvent*>;
-static std::vector<WebEvent*> *oqueue = new std::vector<WebEvent*>;
-static void *lock_iqueue = NULL;
-static void *lock_oqueue = NULL;
-
-void te4_web_init_utils() {
-	if (!lock_iqueue) lock_iqueue = web_mutex_create();
-	if (!lock_oqueue) lock_oqueue = web_mutex_create();
-}
-
-void push_order(WebEvent *event)
-{
-	if (!lock_iqueue) return;
-	web_mutex_lock(lock_iqueue);
-	iqueue->push_back(event);
-	web_mutex_unlock(lock_iqueue);
-}
-
-WebEvent *pop_order()
-{
-	if (!lock_iqueue) return NULL;
-	WebEvent *event = NULL;
-
-	web_mutex_lock(lock_iqueue);
-	if (!iqueue->empty()) {
-		event = iqueue->back();
-		iqueue->pop_back();
-	}
-	web_mutex_unlock(lock_iqueue);
-
-	return event;
-}
-
-void push_event(WebEvent *event)
-{
-	if (!lock_oqueue) return;
-	web_mutex_lock(lock_oqueue);
-	oqueue->push_back(event);
-	web_mutex_unlock(lock_oqueue);
-}
-
-WebEvent *pop_event()
-{
-	if (!lock_oqueue) return NULL;
-	WebEvent *event = NULL;
-
-	web_mutex_lock(lock_oqueue);
-	if (!oqueue->empty()) {
-		event = oqueue->back();
-		oqueue->pop_back();
-	}
-	web_mutex_unlock(lock_oqueue);
-
-	return event;
-}
-

-/*
-    TE4 - T-Engine 4
-    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
-
-    No permission to copy or replicate in any ways, awesomium is not gpl so we cant link directly
-*/
-
-extern "C" {
-#include <stdio.h>
-#include <stdlib.h>
-#include "../web-external.h"
-}
-#include "web.h"
-#include "web-internal.h"
-
-#include <Awesomium/WebCore.h>
-#include <Awesomium/BitmapSurface.h>
-#include <Awesomium/DataSource.h>
-#include <Awesomium/STLHelpers.h>
-#include "gl_texture_surface.h"
-
-void *(*web_mutex_create)();
-void (*web_mutex_destroy)(void *mutex);
-void (*web_mutex_lock)(void *mutex);
-void (*web_mutex_unlock)(void *mutex);
-void *(*web_make_texture)(int w, int h);
-void (*web_del_texture)(void *tex);
-void (*web_texture_update)(void *tex, int w, int h, const void* buffer);
-static void (*web_key_mods)(bool *shift, bool *ctrl, bool *alt, bool *meta);
-static void (*web_instant_js)(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret);
-
-using namespace Awesomium;
-
-class TE4DataSource;
-
-static WebCore *web_core = NULL;
-static WebSession *web_session = NULL;
-static TE4DataSource *web_data_source = NULL;
-
-class WebListener;
-
-static char *webstring_to_buf(const WebString &wstr, size_t *flen) {
-	char *buf;
-	unsigned int len = 0;
-	len = wstr.ToUTF8(NULL, 0);
-	buf = (char*)malloc(len + 1);
-	wstr.ToUTF8(buf, len);	
-	buf[len] = '\0';
-	if (flen) *flen = (size_t)len;
-	return buf;
-}
-
-class WebListener : 
-	public WebViewListener::View,
-	public WebViewListener::Download,
-	public WebViewListener::Load,
-	public JSMethodHandler
-{
-private:
-	int handlers;
-public:
-	JSObject te4_js;
-	WebListener(int handlers) { this->handlers = handlers; }
-
-	virtual void OnChangeTitle(Awesomium::WebView* caller, const Awesomium::WebString& title) {
-		char *cur_title = webstring_to_buf(title, NULL);
-		WebEvent *event = new WebEvent();
-		event->kind = TE4_WEB_EVENT_TITLE_CHANGE;
-		event->handlers = handlers;
-		event->data.title = cur_title;
-		push_event(event);
-	}
-
-	virtual void OnChangeAddressBar(Awesomium::WebView* caller, const Awesomium::WebURL& url) {
-	}
-
-	virtual void OnChangeTooltip(Awesomium::WebView* caller, const Awesomium::WebString& tooltip) {
-	}
-
-	virtual void OnChangeTargetURL(Awesomium::WebView* caller, const Awesomium::WebURL& url) {
-	}
-
-	virtual void OnChangeCursor(Awesomium::WebView* caller, Awesomium::Cursor cursor) {
-	}
-
-	virtual void OnChangeFocus(Awesomium::WebView* caller, Awesomium::FocusedElementType focused_type) {
-	}
-
-	virtual void OnAddConsoleMessage(Awesomium::WebView* caller, const Awesomium::WebString& message, int line_number, const Awesomium::WebString& source) {
-		char *msg = webstring_to_buf(message, NULL);
-		char *src = webstring_to_buf(source, NULL);
-		printf("[WEBCORE:console %s:%d] %s\n", src, line_number, msg);
-		free(msg);
-		free(src);
-	}
-
-	virtual void OnShowCreatedWebView(Awesomium::WebView* caller, Awesomium::WebView* new_view, const Awesomium::WebURL& opener_url, const Awesomium::WebURL& target_url, const Awesomium::Rect& initial_pos, bool is_popup) {
-		new_view->Destroy();
-
-		WebString rurl = target_url.spec();
-		char *url = webstring_to_buf(rurl, NULL);
-
-		WebEvent *event = new WebEvent();
-		event->kind = TE4_WEB_EVENT_REQUEST_POPUP_URL;
-		event->handlers = handlers;
-		event->data.popup.url = url;
-		event->data.popup.w = initial_pos.width;
-		event->data.popup.h = initial_pos.height;
-		push_event(event);
-
-		printf("[WEBCORE] stopped popup to %s (%dx%d), pushing event...\n", url, event->data.popup.w, event->data.popup.h);
-	}
-
-	void OnRequestDownload(WebView* caller, int download_id, const WebURL& wurl, const WebString& suggested_filename, const WebString& mime_type) {
-		WebString rurl = wurl.spec();
-		const char *mime = webstring_to_buf(mime_type, NULL);
-		const char *url = webstring_to_buf(rurl, NULL);
-		const char *name = webstring_to_buf(suggested_filename, NULL);
-		printf("[WEBCORE] Download request [name: %s] [mime: %s] [url: %s]\n", name, mime, url);
-
-		WebEvent *event = new WebEvent();
-		event->kind = TE4_WEB_EVENT_DOWNLOAD_REQUEST;
-		event->handlers = handlers;
-		event->data.download_request.url = url;
-		event->data.download_request.name = name;
-		event->data.download_request.mime = mime;
-		event->data.download_request.id = download_id;
-		push_event(event);
-	}
-	void OnUpdateDownload(WebView* caller, int download_id, int64 total_bytes, int64 received_bytes, int64 current_speed) {
-		WebEvent *event = new WebEvent();
-		event->kind = TE4_WEB_EVENT_DOWNLOAD_UPDATE;
-		event->handlers = handlers;
-		event->data.download_update.id = download_id;
-		event->data.download_update.got = received_bytes;
-		event->data.download_update.total = total_bytes;
-		event->data.download_update.percent = 100 * ((double)received_bytes / (double)total_bytes);
-		event->data.download_update.speed = current_speed;
-		push_event(event);
-	}
-	void OnFinishDownload(WebView* caller, int download_id, const WebURL& url, const WebString& saved_path) {
-		WebEvent *event = new WebEvent();
-		event->kind = TE4_WEB_EVENT_DOWNLOAD_FINISH;
-		event->handlers = handlers;
-		event->data.download_finish.id = download_id;
-		push_event(event);
-	}
-
-	/// This event occurs when the page begins loading a frame.
-	virtual void OnBeginLoadingFrame(Awesomium::WebView* caller, int64 frame_id, bool is_main_frame, const Awesomium::WebURL& wurl, bool is_error_page) {
-		WebString rurl = wurl.spec();
-		const char *url = webstring_to_buf(rurl, NULL);
-
-		WebEvent *event = new WebEvent();
-		event->kind = TE4_WEB_EVENT_LOADING;
-		event->handlers = handlers;
-		event->data.loading.url = url;
-		event->data.loading.status = 0;
-		push_event(event);
-	}
-
-	/// This event occurs when a frame fails to load. See error_desc
-	/// for additional information.
-	virtual void OnFailLoadingFrame(Awesomium::WebView* caller, int64 frame_id, bool is_main_frame, const Awesomium::WebURL& wurl, int error_code, const Awesomium::WebString& error_desc) {
-		WebString rurl = wurl.spec();
-		const char *url = webstring_to_buf(rurl, NULL);
-
-		WebEvent *event = new WebEvent();
-		event->kind = TE4_WEB_EVENT_LOADING;
-		event->handlers = handlers;
-		event->data.loading.url = url;
-		event->data.loading.status = -1;
-		push_event(event);
-	}
-
-	/// This event occurs when the page finishes loading a frame.
-	/// The main frame always finishes loading last for a given page load.
-	virtual void OnFinishLoadingFrame(Awesomium::WebView* caller, int64 frame_id, bool is_main_frame, const Awesomium::WebURL& wurl) {
-
-	}
-
-	/// This event occurs when the DOM has finished parsing and the
-	/// window object is available for JavaScript execution.
-	virtual void OnDocumentReady(Awesomium::WebView* caller, const Awesomium::WebURL& wurl) {
-		WebString rurl = wurl.spec();
-		const char *url = webstring_to_buf(rurl, NULL);
-
-		WebEvent *event = new WebEvent();
-		event->kind = TE4_WEB_EVENT_LOADING;
-		event->handlers = handlers;
-		event->data.loading.url = url;
-		event->data.loading.status = 1;
-		push_event(event);
-	}
-
-	virtual void OnMethodCall(WebView* caller, unsigned int remote_object_id, const WebString& method_name, const JSArray& args) {
-		if (remote_object_id == te4_js.remote_id() && method_name == WSLit("lua")) {
-			JSValue arg = args[0];
-			WebString wcode = arg.ToString();
-			const char *code = webstring_to_buf(wcode, NULL);
-
-			WebEvent *event = new WebEvent();
-			event->kind = TE4_WEB_EVENT_RUN_LUA;
-			event->handlers = handlers;
-			event->data.run_lua.code = code;
-			push_event(event);
-		}
-	}
-
-	virtual JSValue OnMethodCallWithReturnValue(WebView* caller, unsigned int remote_object_id, const WebString& method_name, const JSArray& jsargs) {
-		if (remote_object_id != te4_js.remote_id()) {
-			JSValue ret(false);
-			return ret;
-		}
-
-		const char *fct = webstring_to_buf(method_name, NULL);
-		WebJsValue ret;
-		int nb_args = jsargs.size();
-		WebJsValue *args = new WebJsValue[nb_args];
-		for (int i = 0; i < nb_args; i++) {
-			WebJsValue *wv = &args[i];
-			JSValue v = jsargs[i];
-			if (v.IsNull()) {
-				wv->kind = TE4_WEB_JS_NULL;
-			} else if (v.IsBoolean()) {
-				wv->kind = TE4_WEB_JS_BOOLEAN;
-				wv->data.b = v.ToBoolean();
-			} else if (v.IsNumber()) {
-				wv->kind = TE4_WEB_JS_NUMBER;
-				wv->data.n = v.ToDouble();
-			} else if (v.IsString()) {
-				wv->kind = TE4_WEB_JS_STRING;
-				const char *s = webstring_to_buf(v.ToString(), NULL);
-				wv->data.s = s;
-			}
-		}
-
-		web_instant_js(handlers, fct, nb_args, args, &ret);
-
-		// Free the fucking strings. I love GC. I want a GC :/
-		for (int i = 0; i < nb_args; i++) {
-			WebJsValue *wv = &args[i];
-			JSValue v = jsargs[i];
-			if (v.IsString()) free((void*)wv->data.s);
-		}
-		delete args;
-		free((void*)fct);
-
-		if (ret.kind == TE4_WEB_JS_NULL) return JSValue::Null();
-		else if (ret.kind == TE4_WEB_JS_BOOLEAN) return JSValue(ret.data.b);
-		else if (ret.kind == TE4_WEB_JS_NUMBER) return JSValue(ret.data.n);
-		else if (ret.kind == TE4_WEB_JS_STRING) {
-			WebString s = WebString::CreateFromUTF8(ret.data.s, strlen(ret.data.s));
-			return JSValue(s);
-		}
-		return JSValue();
-	}
-};
-
-class TE4DataSource : public DataSource {
-public:
-	virtual void OnRequest(int request_id, const ResourceRequest& request, const WebString& wpath) {
-		const char *path = webstring_to_buf(wpath, NULL);
-
-		WebEvent *event = new WebEvent();
-		event->kind = TE4_WEB_EVENT_LOCAL_REQUEST;
-		event->data.local_request.id = request_id;
-		event->data.local_request.path = path;
-		push_event(event);
-	}
-};
-
-
-class WebViewOpaque {
-public:
-	WebView *view;
-	WebListener *listener;
-};
-
-void te4_web_new(web_view_type *view, int w, int h) {
-	WebViewOpaque *opaque = new WebViewOpaque();
-	view->opaque = (void*)opaque;
-
-	opaque->view = web_core->CreateWebView(w, h, web_session, kWebViewType_Offscreen);
-	opaque->listener = new WebListener(view->handlers);
-	opaque->view->set_view_listener(opaque->listener);
-	opaque->view->set_download_listener(opaque->listener);
-	opaque->view->set_load_listener(opaque->listener);
-	opaque->view->set_js_method_handler(opaque->listener);
-	view->w = w;
-	view->h = h;
-	view->closed = false;
-
-	opaque->listener->te4_js = (opaque->view->CreateGlobalJavascriptObject(WSLit("te4"))).ToObject();
-	opaque->listener->te4_js.SetCustomMethod(WSLit("lua"), false);
-
-	opaque->view->SetTransparent(true);
-	printf("Created webview: %dx%d\n", w, h);
-}
-
-bool te4_web_close(web_view_type *view) {
-	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
-	if (!view->closed) {
-		opaque->view->Destroy();
-		delete opaque->listener;
-		view->closed = true;
-		printf("Destroyed webview\n");
-		return true;
-	}
-	return false;
-}
-
-void te4_web_load_url(web_view_type *view, const char *url) {
-	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
-	if (view->closed) return;
-
-	size_t urllen = strlen(url);
-	WebURL lurl(WebString::CreateFromUTF8(url, urllen));
-	opaque->view->LoadURL(lurl);
-}
-
-void te4_web_set_js_call(web_view_type *view, const char *name) {
-	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
-	if (view->closed) return;
-
-	opaque->listener->te4_js.SetCustomMethod(WebString::CreateFromUTF8(name, strlen(name)), true);
-}
-
-void *te4_web_toscreen(web_view_type *view, int *w, int *h) {
-	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
-	if (view->closed) return NULL;
-
-	const GLTextureSurface* surface = static_cast<const GLTextureSurface*> (opaque->view->surface());
-	if (!surface) return NULL;
-
-	*w = (*w < 0) ? view->w : *w;
-	*h = (*h < 0) ? view->h : *h;
-	return surface->GetTexture();
-}
-
-bool te4_web_loading(web_view_type *view) {
-	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
-	if (view->closed) return false;
-	return opaque->view->IsLoading();
-}
-
-void te4_web_focus(web_view_type *view, bool focus) {
-	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
-	if (view->closed) return;
-
-	if (focus) opaque->view->Focus();
-	else opaque->view->Unfocus();
-}
-
-void te4_web_inject_mouse_move(web_view_type *view, int x, int y) {
-	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
-	if (view->closed) return;
-
-	opaque->view->InjectMouseMove(x, y);
-}
-
-void te4_web_inject_mouse_wheel(web_view_type *view, int x, int y) {
-	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
-	if (view->closed) return;
-
-	opaque->view->InjectMouseWheel(-y, -x);
-}
-
-void te4_web_inject_mouse_button(web_view_type *view, int kind, bool up) {
-	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
-	if (view->closed) return;
-
-	MouseButton b = kMouseButton_Left;
-	if (kind == 2) b = kMouseButton_Middle;
-	else if (kind == 3) b = kMouseButton_Right;
-
-	if (up) opaque->view->InjectMouseUp(b);
-	else opaque->view->InjectMouseDown(b);
-}
-
-void te4_web_inject_key(web_view_type *view, int scancode, int asymb, const char *uni, int unilen, bool up) {
-	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
-	if (view->closed) return;
-
-	WebKeyboardEvent keyEvent;
-	keyEvent.type = !up ? WebKeyboardEvent::kTypeKeyDown : WebKeyboardEvent::kTypeKeyUp;
-	
-	char* buf = new char[20];
-	keyEvent.virtual_key_code = asymb;
-	Awesomium::GetKeyIdentifierFromVirtualKeyCode(keyEvent.virtual_key_code, &buf);
-	strcpy(keyEvent.key_identifier, buf);
-	delete[] buf;
-	
-	bool shift, ctrl, alt, meta;
-	web_key_mods(&shift, &ctrl, &alt, &meta);
-	keyEvent.modifiers = 0;
-	if (shift) keyEvent.modifiers |= WebKeyboardEvent::kModShiftKey;
-	else if (ctrl) keyEvent.modifiers |= WebKeyboardEvent::kModControlKey;
-	else if (alt) keyEvent.modifiers |= WebKeyboardEvent::kModAltKey;
-	else if (meta) keyEvent.modifiers |= WebKeyboardEvent::kModMetaKey;
-	
-	keyEvent.native_key_code = scancode;
-	if (up) {
-		opaque->view->InjectKeyboardEvent(keyEvent);
-	} else {
-		if (uni) {
-			WebString wstr = WebString::CreateFromUTF8(uni, unilen);
-			memcpy(keyEvent.text, wstr.data(), wstr.length() * sizeof(wchar16));
-			memcpy(keyEvent.unmodified_text, wstr.data(), wstr.length() * sizeof(wchar16));
-		}
-		
-		opaque->view->InjectKeyboardEvent(keyEvent);
-
-		if (uni) {
-			keyEvent.type = WebKeyboardEvent::kTypeChar;
-			keyEvent.virtual_key_code = keyEvent.text[0];
-			keyEvent.native_key_code = keyEvent.text[0];
-			opaque->view->InjectKeyboardEvent(keyEvent);
-		}
-	}
-}
-
-void te4_web_download_action(web_view_type *view, long id, const char *path) {
-	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
-	if (view->closed) return;
-
-	if (path) {
-		WebString wpath = WebString::CreateFromUTF8(path, strlen(path));
-		opaque->view->DidChooseDownloadPath(id, wpath);
-	} else {
-		opaque->view->DidCancelDownload(id);
-	}
-}
-
-void te4_web_reply_local(int id, const char *mime, const char *result, size_t len) {
-	WebString wmime = WebString::CreateFromUTF8(mime, strlen(mime));
-	web_data_source->SendResponse(id, len, (unsigned char *)result, wmime);
-}
-
-
-void te4_web_do_update(void (*cb)(WebEvent*)) {
-	if (!web_core) return;
-
-	web_core->Update();
-	WebEvent *event;
-	while (event = pop_event()) {
-		cb(event);
-
-		switch (event->kind) {
-			case TE4_WEB_EVENT_TITLE_CHANGE:
-				free((void*)event->data.title);
-				break;
-			case TE4_WEB_EVENT_REQUEST_POPUP_URL:
-				free((void*)event->data.popup.url);
-				break;
-			case TE4_WEB_EVENT_DOWNLOAD_REQUEST:
-				free((void*)event->data.download_request.url);
-				free((void*)event->data.download_request.name);
-				free((void*)event->data.download_request.mime);
-				break;
-			case TE4_WEB_EVENT_LOADING:
-				free((void*)event->data.loading.url);
-				break;
-			case TE4_WEB_EVENT_LOCAL_REQUEST:
-				free((void*)event->data.local_request.path);
-				break;
-			case TE4_WEB_EVENT_RUN_LUA:
-				free((void*)event->data.run_lua.code);
-				break;
-		}
-
-		delete event;
-	}
-}
-
-void te4_web_setup(
-	int argc, char **gargv, char *spawnc,
-	void*(*mutex_create)(), void(*mutex_destroy)(void*), void(*mutex_lock)(void*), void(*mutex_unlock)(void*),
-	void *(*make_texture)(int, int), void (*del_texture)(void*), void (*texture_update)(void*, int, int, const void*),
-	void (*key_mods)(bool*, bool*, bool*, bool*),
-	void (*instant_js)(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret)
-	) {
-
-	web_mutex_create = mutex_create;
-	web_mutex_destroy = mutex_destroy;
-	web_mutex_lock = mutex_lock;
-	web_mutex_unlock = mutex_unlock;
-	web_make_texture = make_texture;
-	web_del_texture = del_texture;
-	web_texture_update = texture_update;
-	web_key_mods = key_mods;
-	web_instant_js = instant_js;
-	if (!web_core) {
-		web_core = WebCore::Initialize(WebConfig());
-		web_core->set_surface_factory(new GLTextureSurfaceFactory());
-		web_session = web_core->CreateWebSession(WSLit(""), WebPreferences());
-		web_data_source = new TE4DataSource();
-		web_session->AddDataSource(WSLit("te4"), web_data_source);
-	}
-}
-
-void te4_web_initialize(const char *locales, const char *pak) {
-	te4_web_init_utils();
-}
-
-void te4_web_shutdown() {
-}

-/*
-    TE4 - T-Engine 4
-    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
-
-    No permission to copy or replicate in any ways.
-*/
-
-#ifndef __TE4WEB_H__
-#define __TE4WEB_H__
-
-#ifdef __cplusplus
-/* C++ compiler needs to make this a C API. */
-#if defined( _WIN32 )
-/* Windows needs this to be a DLL, so be sure to export. */
-#define WEB_TE4_API extern "C" __declspec( dllexport ) 
-#else
-/* Non-windows platforms are fine linking statically. */
-#define WEB_TE4_API extern "C"
-#endif
-#else
-/* C compiler is using this header. */
-#define WEB_TE4_API
-#endif
-
-WEB_TE4_API void te4_web_setup(
-	int argc, char **argv, char *spawn,
-	void*(*mutex_create)(), void(*mutex_destroy)(void*), void(*mutex_lock)(void*), void(*mutex_unlock)(void*),
-	void*(*make_texture)(int, int), void (*del_texture)(void*), void (*texture_update)(void*, int, int, const void*),
-	void (*key_mods)(bool*, bool*, bool*, bool*),
-	void (*web_instant_js)(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret)
-);
-WEB_TE4_API void te4_web_initialize(const char *locales, const char *pak);
-WEB_TE4_API void te4_web_shutdown();
-WEB_TE4_API void te4_web_do_update(void (*cb)(WebEvent*));
-WEB_TE4_API void te4_web_new(web_view_type *view, int w, int h);
-WEB_TE4_API bool te4_web_close(web_view_type *view);
-WEB_TE4_API void *te4_web_toscreen(web_view_type *view, int *w, int *h);
-WEB_TE4_API bool te4_web_loading(web_view_type *view);
-WEB_TE4_API void te4_web_focus(web_view_type *view, bool focus);
-WEB_TE4_API void te4_web_inject_mouse_move(web_view_type *view, int x, int y);
-WEB_TE4_API void te4_web_inject_mouse_wheel(web_view_type *view, int x, int y);
-WEB_TE4_API void te4_web_inject_mouse_button(web_view_type *view, int kind, bool up);
-WEB_TE4_API void te4_web_inject_key(web_view_type *view, int scancode, int asymb, const char *uni, int unilen, bool up);
-WEB_TE4_API void te4_web_download_action(web_view_type *view, long id, const char *path);
-WEB_TE4_API void te4_web_reply_local(int id, const char *mime, const char *result, size_t len);
-WEB_TE4_API void te4_web_load_url(web_view_type *view, const char *url);
-WEB_TE4_API void te4_web_set_js_call(web_view_type *view, const char *name);
-
-#endif

@@ -46,7 +46,8 @@ int main(int argc, char* argv[]) {
 	CefMainArgs args(argc, argv);
 #endif
 
+    // for (int i = 0; i < argc; i++) printf("cef3spawn arg[%d] = %s\n", i, argv[i]);
 	CefRefPtr<ClientApp> app(new ClientApp);
 	int ret = CefExecuteProcess(args, app.get(), NULL);
 	return ret;
-}
\ No newline at end of file
+}

@@ -115,6 +115,7 @@ static int all_browsers_nb = 0;
 class BrowserClient :
 	public CefClient,
 	public CefRequestHandler,
+	public CefRequestContextHandler,
 	public CefDisplayHandler,
 	public CefLifeSpanHandler,
 	public CefDownloadHandler,
@@ -182,16 +183,16 @@ public:
 		push_event(event);
 	}
 
-	virtual bool OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request) OVERRIDE {
-		return false;
-	}
+	// virtual CefRequestHandler::ReturnValue OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, CefRefPtr<CefRequestCallback> callback) OVERRIDE {
+	// 	return RV_CANCEL;
+	// }
 
-	virtual bool OnBeforePluginLoad(CefRefPtr<CefBrowser> browser, const CefString& url, const CefString& policy_url, CefRefPtr<CefWebPluginInfo> info) OVERRIDE {
-		char *name = cstring_to_c(info->GetName());
-		char *path = cstring_to_c(info->GetPath());
-		fprintf(logfile, "[WEBCORE] Forbade plugin %s from %s\n", name, path);
-		free(name);
-		free(path);
+	virtual bool OnBeforePluginLoad(const CefString& mime_type, const CefString& plugin_url, bool is_main_frame, const CefString& top_origin_url, CefRefPtr<CefWebPluginInfo> plugin_info, PluginPolicy* plugin_policy) OVERRIDE {
+		char *mime = cstring_to_c(mime_type);
+		char *url = cstring_to_c(plugin_url);
+		fprintf(logfile, "[WEBCORE] Forbade plugin %s from %s\n", mime, url);
+		free(mime);
+		free(url);
 		return true;
 	}
 
@@ -206,14 +207,16 @@ public:
 	}
 
 	virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
-	                             CefRefPtr<CefFrame> frame,
-	                             const CefString& target_url,
-	                             const CefString& target_frame_name,
-	                             const CefPopupFeatures& popupFeatures,
-	                             CefWindowInfo& windowInfo,
-	                             CefRefPtr<CefClient>& client,
-	                             CefBrowserSettings& settings,
-	                             bool* no_javascript_access) OVERRIDE {
+			CefRefPtr<CefFrame> frame,
+			const CefString& target_url,
+			const CefString& target_frame_name,
+			CefLifeSpanHandler::WindowOpenDisposition target_disposition,
+			bool user_gesture,
+			const CefPopupFeatures& popupFeatures,
+			CefWindowInfo& windowInfo,
+			CefRefPtr<CefClient>& client,
+			CefBrowserSettings& settings,
+			bool* no_javascript_access) OVERRIDE {
 		char *url = cstring_to_c(target_url);
 
 		WebEvent *event = new WebEvent();
@@ -300,7 +303,7 @@ public:
 		}
 	}
 
-	virtual void OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame) {
+	virtual void OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, TransitionType transition_type) OVERRIDE {
 		const char *url = cstring_to_c(frame->GetURL());
 		WebEvent *event = new WebEvent();
 		event->kind = TE4_WEB_EVENT_LOADING;
@@ -310,7 +313,7 @@ public:
 		push_event(event);
 	}
 
-	virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode) {
+	virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode) OVERRIDE {
 		const char *url = cstring_to_c(frame->GetURL());
 		WebEvent *event = new WebEvent();
 		event->kind = TE4_WEB_EVENT_LOADING;
@@ -320,12 +323,12 @@ public:
 		push_event(event);
 	}
 
-	virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) {
+	virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE {
 		fprintf(logfile, "[WEBCORE] Created browser for webview\n");
 		this->browser = browser;
 	}
 
-	virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) {
+	virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE {
 		this->opaque->render = NULL;
 		this->opaque->view = NULL;
 		this->opaque->browser = NULL;
@@ -805,6 +808,9 @@ void te4_web_do_update(void (*cb)(WebEvent*)) {
 				break;
 			case TE4_WEB_EVENT_DELETE_TEXTURE:
 				web_del_texture(event->data.texture);
+			case TE4_WEB_EVENT_END_BROWSER:
+				break;
+			case TE4_WEB_EVENT_BROWSER_COUNT:
 				break;
 		}
 
@@ -899,7 +905,7 @@ void te4_web_shutdown() {
 
 	while (!all_browsers.empty()) {
 		CefDoMessageLoopWork();
-		fprintf(logfile, "Waiting browsers to close: %d left\n", all_browsers.size());
+		fprintf(logfile, "Waiting browsers to close: %ld left\n", all_browsers.size());
 	}
 	
 	fprintf(logfile, "[WEBCORE] all browsers dead, shutting down\n");