Merge branch 'master' of git.net-core.org:darkgod/t-engine4

src/web-cef3/build/windows/build.bat

+@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 /DSELFEXE_WINDOWS
+@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
+@set TE4_WEB_INCLUDES=/I ".." /I "C:\MingW\include\SDL2"  /I "n:\libs\cef3\include" /I "n:\libs\cef3"
+@set TE4_WEB_LIBS="n:\libs\cef3\Release\libcef.lib" "n:\libs\cef3\out\Release\lib\libcef_dll_wrapper.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

src/web-cef3/web.cpp

@@ -480,7 +480,6 @@ void te4_web_inject_key(web_view_type *view, int scancode, int asymb, const char
 	if (view->closed) return;
 	
 	int key_code = scancode;
-	printf("<==== %d :: %d :: %d\n", key_code, unilen, SDLK_RETURN);
 
 	CefKeyEvent key_event;
 
@@ -515,7 +514,8 @@ void te4_web_inject_key(web_view_type *view, int scancode, int asymb, const char
 	// This has been fully untested and most certainly isnt working
 	BYTE VkCode = LOBYTE(VkKeyScanA(key_code));
 	UINT scanCode = MapVirtualKey(VkCode, MAPVK_VK_TO_VSC);
-	cef_event.native_key_code = (scanCode << 16) |  // key scan code
+	key_event.native_key_code = (scanCode << 16) |  // key scan code
+                              1;  // key repeat count
 #elif defined(SELFEXE_MACOSX)
 	if (key_code == SDLK_BACKSPACE) {
 		cef_event.native_key_code = kVK_Delete;