intermediate commit (glad not initializing correctly)

jni/love/Android.mk

@@ -99,9 +99,7 @@ LOCAL_SHARED_LIBRARIES := SDL2 libphysfs liblua libvorbis libogg  libopenal libm
 # $(info liblove: src files $(LOCAL_SRC_FILES))
 
 SDL_PATH := ../SDL2-2.0.1
-LOCAL_SRC_FILES += $(SDL_PATH)/src/main/android/SDL_android_main.c \
-LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog 
-
-LOCAL_LDFLAGS := -lz
+LOCAL_SRC_FILES += $(SDL_PATH)/src/main/android/SDL_android_main.c 
+LOCAL_LDLIBS := -lz -lGLESv1_CM -lGLESv2 -ldl -landroid
 
 include $(BUILD_SHARED_LIBRARY)

jni/love/src/libraries/glad/glad.cpp

@@ -5,7 +5,6 @@
 
 namespace glad {
 
-
 #ifdef GLAD_USE_SDL
 #include <SDL.h>
 #if !SDL_VERSION_ATLEAST(2,0,0)
@@ -7884,6 +7883,7 @@ static void find_core(void) {
 bool gladLoadGLLoader(LOADER load) {
 	GLVersion.major = 0; GLVersion.minor = 0; GLVersion.gles = 0;
 	fp_glGetString = (pfn_glGetString)load("glGetString");
+	SDL_Log ("glad fp_glGetString %s", fp_glGetString);
 	if(fp_glGetString == NULL) return false;
 	find_core();
 	load_GL_VERSION_1_0(load);

jni/love/src/love.cpp

@@ -20,7 +20,6 @@
 
 #include "modules/love/love.h"
 #include <SDL.h>
-#include <SDL_opengles.h>
 
 #ifdef LOVE_BUILD_EXE
 

jni/love/src/modules/graphics/opengl/Graphics.cpp

@@ -135,6 +135,8 @@ void Graphics::setViewportSize(int width, int height)
 
 bool Graphics::setMode(int width, int height)
 {
+	SDL_Log ("Graphics::setMode %d,%d", width, height);
+
 	this->width = width;
 	this->height = height;
 

jni/love/src/modules/graphics/opengl/OpenGL.cpp

@@ -31,6 +31,8 @@
 // C
 #include <cstring>
 
+#include <SDL.h>
+
 namespace love
 {
 namespace graphics
@@ -52,8 +54,10 @@ bool OpenGL::initContext()
 	if (contextInitialized)
 		return true;
 
-	if (!gladLoadGL())
-		return false;
+	if (!gladLoadGL()) {
+		SDL_Log ("Initialization of OpenGL failed! Aborting!");
+		abort();
+	}
 
 	initOpenGLFunctions();
 	initVendor();

jni/love/src/modules/window/sdl/Window.cpp

@@ -28,6 +28,9 @@
 #include <vector>
 #include <algorithm>
 
+#include "libraries/glad/gladfuncs.hpp"
+using namespace glad;
+
 namespace love
 {
 namespace window
@@ -95,6 +98,28 @@ bool Window::setWindow(int width, int height, WindowAttributes *attribs)
 
 	Uint32 sdlflags = SDL_WINDOW_OPENGL;
 
+#ifdef __ANDROID__
+	f.fullscreen = true;
+	f.resizable = false;
+
+	if (window) {
+		int query_width, query_height;
+		SDL_GetWindowSize (window, &query_width, &query_height);
+		SDL_Log ("Overriding windows size to = %d,%d", query_width, query_height);
+
+		width = query_width;
+		height = query_height;
+	} else {
+		SDL_DisplayMode mode = {};
+
+		SDL_GetDesktopDisplayMode(f.display, &mode);
+		SDL_Log ("Overriding windows size to = %d,%d", mode.w, mode.h);
+
+		width = mode.w;
+		height = mode.h;
+	}
+#endif
+
 	if (f.fullscreen)
 	{
 		if (f.fstype == FULLSCREEN_TYPE_DESKTOP)
@@ -105,8 +130,10 @@ bool Window::setWindow(int width, int height, WindowAttributes *attribs)
 
 			// Fullscreen window creation will bug out if no mode can be used.
 			SDL_DisplayMode mode = {0, width, height, 0, 0};
-			if (SDL_GetClosestDisplayMode(f.display, &mode, &mode) == 0)
+			if (SDL_GetClosestDisplayMode(f.display, &mode, &mode) == 0) {
+				displayError ("SDL", "Could not get closest display mode");
 				return false;
+			}
 		}
 	}
 

jni/love/src/scripts/boot.lua

@@ -372,6 +372,7 @@ function love.init()
 		love._openConsole()
 	end
 
+	SDL.log("setting window mode to " .. tostring(c.window.width) .. "x" .. tostring(c.window.width) )
 	-- Setup window here.
 	if c.window and c.modules.window then
 		assert(love.window.setMode(c.window.width, c.window.height,
@@ -394,6 +395,7 @@ function love.init()
 		end
 	end
 
+	SDL.log("starting timer")
 	-- Our first timestep, because window creation can take some time
 	if love.timer then
 		love.timer.step()
@@ -451,22 +453,34 @@ function love.init()
 end
 
 function love.run()
+	SDL.log ("started love.run")
 
+ 	SDL.log ("checking love.math")
 	if love.math then
+	 	SDL.log ("setting random seed")
 		love.math.setRandomSeed(os.time())
 	end
 
+ 	SDL.log ("checking love.event")
+
 	if love.event then
+	 	SDL.log ("pumping event")
 		love.event.pump()
 	end
 
-	if love.load then love.load(arg) end
+ 	SDL.log ("checking ")
+	if love.load then 
+	 	SDL.log ("running love.load")
+		love.load(arg)
+	end
 
 	-- We don't want the first frame's dt to include time taken by love.load.
 	if love.timer then love.timer.step() end
 
 	local dt = 0
 
+	SDL.log ("entering main loop")
+
 	-- Main loop time.
 	while true do
 		-- Process events.
@@ -491,13 +505,24 @@ function love.run()
 			dt = love.timer.getDelta()
 		end
 
+		SDL.log ("calling update")
+
 		-- Call update and draw
 		if love.update then love.update(dt) end -- will pass 0 if love.timer is disabled
 
+		SDL.log ("calling draw")
+
 		if love.window and love.graphics and love.window.isCreated() then
+			SDL.log ("calling clear")
 			love.graphics.clear()
+			SDL.log ("calling origin")
 			love.graphics.origin()
-			if love.draw then love.draw() end
+			if love.draw then
+				SDL.log ("calling setcolor")
+				love.graphics.setColor(255, 255, 255)
+--				love.draw()
+			end
+			SDL.log ("calling present")
 			love.graphics.present()
 		end
 
@@ -512,7 +537,6 @@ end
 -----------------------------------------------------------
 
 function love.nogame()
-
 	local baby_png =
 	"iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAL1klEQVR4nO2deZAU1R3HPz3X\
 	3ruzuywEXZVLBJHAilfUpAQNGo1RPDAxKiaKkpQHlZBKhTIRjSaWlCmrrCJBDR7RaMSUBx6x\
@@ -1317,14 +1341,18 @@ function love.nogame()
 	local create_rain
 
 	function love.load()
+		SDL.log ("in love.load()")
 		-- Subtractive blending isn't supported on some ancient systems, so
 		-- we should make sure it still looks decent in that case.
 		if love.graphics.isSupported("subtractive") then
+			SDL.log ("calling love.graphics.setBackgroundColor")
 			love.graphics.setBackgroundColor(137, 194, 218)
 		else
+			SDL.log ("calling love.graphics.setBackgroundColor")
 			love.graphics.setBackgroundColor(11, 88, 123)
 		end
 
+		SDL.log ("in getting graphics width/height")
 		local win_w = love.graphics.getWidth()
 		local win_h = love.graphics.getHeight()
 
@@ -1478,10 +1506,12 @@ function love.nogame()
 	end
 
 	function love.draw()
+		sdl.log("setting color")
 		love.graphics.setColor(255, 255, 255)
 
-		draw_grid()
-		draw_inspector()
+		sdl.log("setting color")
+--		draw_grid()
+--		draw_inspector()
 	end
 	
 	function love.keyreleased(key)
@@ -1511,6 +1541,7 @@ local function error_printer(msg, layer)
 end
 
 function love.errhand(msg)
+	SDL.log ("###################### LÖVE Error: " .. msg)
 	msg = tostring(msg)
 
 	error_printer(msg, 2)
@@ -1604,10 +1635,15 @@ end
 -----------------------------------------------------------
 
 return function()
+	SDL.log ("calling love.boot")
 	local result = xpcall(love.boot, error_printer)
 	if not result then return 1 end
+
+	SDL.log ("calling love.init")
 	local result = xpcall(love.init, deferErrhand)
 	if not result then return 1 end
+
+	SDL.log ("calling love.run")
 	local result, retval = xpcall(love.run, deferErrhand)
 	if not result then return 1 end
 

jni/love/src/scripts/boot.lua.h

@@ -634,6 +634,12 @@ const unsigned char boot_lua[] =
 	0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 
 	0x65, 0x28, 0x29, 0x0a,
 	0x09, 0x65, 0x6e, 0x64, 0x0a,
+	0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x28, 0x22, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x20, 
+	0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x22, 0x20, 0x2e, 
+	0x2e, 0x20, 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x63, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 
+	0x77, 0x2e, 0x77, 0x69, 0x64, 0x74, 0x68, 0x29, 0x20, 0x2e, 0x2e, 0x20, 0x22, 0x78, 0x22, 0x20, 0x2e, 0x2e, 
+	0x20, 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x63, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 
+	0x2e, 0x77, 0x69, 0x64, 0x74, 0x68, 0x29, 0x20, 0x29, 0x0a,
 	0x09, 0x2d, 0x2d, 0x20, 0x53, 0x65, 0x74, 0x75, 0x70, 0x20, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x68, 
 	0x65, 0x72, 0x65, 0x2e, 0x0a,
 	0x09, 0x69, 0x66, 0x20, 0x63, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x63, 
@@ -683,6 +689,8 @@ const unsigned char boot_lua[] =
 	0x77, 0x2e, 0x69, 0x63, 0x6f, 0x6e, 0x29, 0x29, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x65, 0x6e, 0x64, 0x0a,
+	0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x28, 0x22, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 
+	0x20, 0x74, 0x69, 0x6d, 0x65, 0x72, 0x22, 0x29, 0x0a,
 	0x09, 0x2d, 0x2d, 0x20, 0x4f, 0x75, 0x72, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x74, 0x69, 0x6d, 0x65, 
 	0x73, 0x74, 0x65, 0x70, 0x2c, 0x20, 0x62, 0x65, 0x63, 0x61, 0x75, 0x73, 0x65, 0x20, 0x77, 0x69, 0x6e, 0x64, 
 	0x6f, 0x77, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x61, 0x6e, 0x20, 0x74, 0x61, 
@@ -803,18 +811,33 @@ const unsigned char boot_lua[] =
 	0x65, 0x6e, 0x64, 0x0a,
 	0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x28, 
 	0x29, 0x0a,
+	0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x73, 0x74, 0x61, 0x72, 0x74, 0x65, 0x64, 
+	0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x22, 0x29, 0x0a,
+	0x20, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 
+	0x6e, 0x67, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x68, 0x22, 0x29, 0x0a,
 	0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x68, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a,
+	0x09, 0x20, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x73, 0x65, 0x74, 0x74, 0x69, 
+	0x6e, 0x67, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x20, 0x73, 0x65, 0x65, 0x64, 0x22, 0x29, 0x0a,
 	0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x73, 0x65, 0x74, 0x52, 0x61, 0x6e, 
 	0x64, 0x6f, 0x6d, 0x53, 0x65, 0x65, 0x64, 0x28, 0x6f, 0x73, 0x2e, 0x74, 0x69, 0x6d, 0x65, 0x28, 0x29, 0x29, 0x0a,
 	0x09, 0x65, 0x6e, 0x64, 0x0a,
+	0x20, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 
+	0x6e, 0x67, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x29, 0x0a,
 	0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x20, 0x74, 0x68, 0x65, 
 	0x6e, 0x0a,
+	0x09, 0x20, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x70, 0x75, 0x6d, 0x70, 0x69, 
+	0x6e, 0x67, 0x20, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x29, 0x0a,
 	0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x75, 0x6d, 0x70, 0x28, 
 	0x29, 0x0a,
 	0x09, 0x65, 0x6e, 0x64, 0x0a,
+	0x20, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 
+	0x6e, 0x67, 0x20, 0x22, 0x29, 0x0a,
 	0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 
-	0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x28, 0x61, 0x72, 0x67, 0x29, 0x20, 0x65, 0x6e, 
-	0x64, 0x0a,
+	0x20, 0x0a,
+	0x09, 0x20, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x72, 0x75, 0x6e, 0x6e, 0x69, 
+	0x6e, 0x67, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x29, 0x0a,
+	0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x28, 0x61, 0x72, 0x67, 0x29, 0x0a,
+	0x09, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x2d, 0x2d, 0x20, 0x57, 0x65, 0x20, 0x64, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, 
 	0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x27, 0x73, 0x20, 
 	0x64, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 
@@ -824,6 +847,8 @@ const unsigned char boot_lua[] =
 	0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x74, 0x69, 0x6d, 0x65, 0x72, 0x2e, 0x73, 0x74, 0x65, 0x70, 0x28, 
 	0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x64, 0x74, 0x20, 0x3d, 0x20, 0x30, 0x0a,
+	0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x69, 0x6e, 
+	0x67, 0x20, 0x6d, 0x61, 0x69, 0x6e, 0x20, 0x6c, 0x6f, 0x6f, 0x70, 0x22, 0x29, 0x0a,
 	0x09, 0x2d, 0x2d, 0x20, 0x4d, 0x61, 0x69, 0x6e, 0x20, 0x6c, 0x6f, 0x6f, 0x70, 0x20, 0x74, 0x69, 0x6d, 0x65, 
 	0x2e, 0x0a,
 	0x09, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20, 0x74, 0x72, 0x75, 0x65, 0x20, 0x64, 0x6f, 0x0a,
@@ -863,6 +888,8 @@ const unsigned char boot_lua[] =
 	0x09, 0x09, 0x09, 0x64, 0x74, 0x20, 0x3d, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x74, 0x69, 0x6d, 0x65, 0x72, 
 	0x2e, 0x67, 0x65, 0x74, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x28, 0x29, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
+	0x09, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 
+	0x67, 0x20, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x22, 0x29, 0x0a,
 	0x09, 0x09, 0x2d, 0x2d, 0x20, 0x43, 0x61, 0x6c, 0x6c, 0x20, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x20, 0x61, 
 	0x6e, 0x64, 0x20, 0x64, 0x72, 0x61, 0x77, 0x0a,
 	0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x20, 0x74, 
@@ -870,16 +897,31 @@ const unsigned char boot_lua[] =
 	0x29, 0x20, 0x65, 0x6e, 0x64, 0x20, 0x2d, 0x2d, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x70, 0x61, 0x73, 0x73, 
 	0x20, 0x30, 0x20, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x74, 0x69, 0x6d, 0x65, 0x72, 0x20, 0x69, 
 	0x73, 0x20, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x0a,
+	0x09, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 
+	0x67, 0x20, 0x64, 0x72, 0x61, 0x77, 0x22, 0x29, 0x0a,
 	0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x61, 
 	0x6e, 0x64, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x20, 0x61, 
 	0x6e, 0x64, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x69, 0x73, 0x43, 
 	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x28, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a,
+	0x09, 0x09, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x61, 0x6c, 0x6c, 0x69, 
+	0x6e, 0x67, 0x20, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x22, 0x29, 0x0a,
 	0x09, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x63, 
 	0x6c, 0x65, 0x61, 0x72, 0x28, 0x29, 0x0a,
+	0x09, 0x09, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x61, 0x6c, 0x6c, 0x69, 
+	0x6e, 0x67, 0x20, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x22, 0x29, 0x0a,
 	0x09, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x6f, 
 	0x72, 0x69, 0x67, 0x69, 0x6e, 0x28, 0x29, 0x0a,
 	0x09, 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x64, 0x72, 0x61, 0x77, 0x20, 0x74, 0x68, 
-	0x65, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x64, 0x72, 0x61, 0x77, 0x28, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a,
+	0x65, 0x6e, 0x0a,
+	0x09, 0x09, 0x09, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x61, 0x6c, 0x6c, 
+	0x69, 0x6e, 0x67, 0x20, 0x73, 0x65, 0x74, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x22, 0x29, 0x0a,
+	0x09, 0x09, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 
+	0x73, 0x65, 0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 
+	0x20, 0x32, 0x35, 0x35, 0x29, 0x0a,
+	0x2d, 0x2d, 0x09, 0x09, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x64, 0x72, 0x61, 0x77, 0x28, 0x29, 0x0a,
+	0x09, 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
+	0x09, 0x09, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x61, 0x6c, 0x6c, 0x69, 
+	0x6e, 0x67, 0x20, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x22, 0x29, 0x0a,
 	0x09, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x70, 
 	0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x28, 0x29, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
@@ -4820,6 +4862,8 @@ const unsigned char boot_lua[] =
 	0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x61, 0x69, 0x6e, 0x0a,
 	0x09, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 
 	0x64, 0x28, 0x29, 0x0a,
+	0x09, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x69, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 
+	0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x28, 0x29, 0x22, 0x29, 0x0a,
 	0x09, 0x09, 0x2d, 0x2d, 0x20, 0x53, 0x75, 0x62, 0x74, 0x72, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x20, 0x62, 
 	0x6c, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x69, 0x73, 0x6e, 0x27, 0x74, 0x20, 0x73, 0x75, 0x70, 0x70, 
 	0x6f, 0x72, 0x74, 0x65, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x73, 0x6f, 0x6d, 0x65, 0x20, 0x61, 0x6e, 0x63, 0x69, 
@@ -4831,14 +4875,25 @@ const unsigned char boot_lua[] =
 	0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 
 	0x2e, 0x69, 0x73, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x28, 0x22, 0x73, 0x75, 0x62, 0x74, 
 	0x72, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a,
+	0x09, 0x09, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x61, 0x6c, 0x6c, 0x69, 
+	0x6e, 0x67, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x73, 
+	0x65, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x22, 
+	0x29, 0x0a,
 	0x09, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x73, 
 	0x65, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x28, 
 	0x31, 0x33, 0x37, 0x2c, 0x20, 0x31, 0x39, 0x34, 0x2c, 0x20, 0x32, 0x31, 0x38, 0x29, 0x0a,
 	0x09, 0x09, 0x65, 0x6c, 0x73, 0x65, 0x0a,
+	0x09, 0x09, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x61, 0x6c, 0x6c, 0x69, 
+	0x6e, 0x67, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x73, 
+	0x65, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x22, 
+	0x29, 0x0a,
 	0x09, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x73, 
 	0x65, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x28, 
 	0x31, 0x31, 0x2c, 0x20, 0x38, 0x38, 0x2c, 0x20, 0x31, 0x32, 0x33, 0x29, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
+	0x09, 0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x69, 0x6e, 0x20, 0x67, 0x65, 0x74, 
+	0x74, 0x69, 0x6e, 0x67, 0x20, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x20, 0x77, 0x69, 0x64, 0x74, 
+	0x68, 0x2f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x29, 0x0a,
 	0x09, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x77, 0x69, 0x6e, 0x5f, 0x77, 0x20, 0x3d, 0x20, 0x6c, 0x6f, 
 	0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x67, 0x65, 0x74, 0x57, 0x69, 0x64, 
 	0x74, 0x68, 0x28, 0x29, 0x0a,
@@ -5123,11 +5178,16 @@ const unsigned char boot_lua[] =
 	0x09, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x64, 0x72, 0x61, 
 	0x77, 0x28, 0x29, 0x0a,
+	0x09, 0x09, 0x73, 0x64, 0x6c, 0x2e, 0x6c, 0x6f, 0x67, 0x28, 0x22, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 
+	0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x22, 0x29, 0x0a,
 	0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x73, 0x65, 
 	0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 
 	0x35, 0x35, 0x29, 0x0a,
-	0x09, 0x09, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x67, 0x72, 0x69, 0x64, 0x28, 0x29, 0x0a,
-	0x09, 0x09, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x28, 0x29, 0x0a,
+	0x09, 0x09, 0x73, 0x64, 0x6c, 0x2e, 0x6c, 0x6f, 0x67, 0x28, 0x22, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 
+	0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x22, 0x29, 0x0a,
+	0x2d, 0x2d, 0x09, 0x09, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x67, 0x72, 0x69, 0x64, 0x28, 0x29, 0x0a,
+	0x2d, 0x2d, 0x09, 0x09, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x6f, 0x72, 
+	0x28, 0x29, 0x0a,
 	0x09, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x0a,
 	0x09, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6b, 0x65, 0x79, 
@@ -5180,6 +5240,10 @@ const unsigned char boot_lua[] =
 	0x65, 0x6e, 0x64, 0x0a,
 	0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x72, 0x72, 0x68, 
 	0x61, 0x6e, 0x64, 0x28, 0x6d, 0x73, 0x67, 0x29, 0x0a,
+	0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 
+	0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x20, 0x4c, 0xc3, 
+	0x96, 0x56, 0x45, 0x20, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x3a, 0x20, 0x22, 0x20, 0x2e, 0x2e, 0x20, 0x6d, 0x73, 
+	0x67, 0x29, 0x0a,
 	0x09, 0x6d, 0x73, 0x67, 0x20, 0x3d, 0x20, 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x6d, 0x73, 
 	0x67, 0x29, 0x0a,
 	0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x28, 0x6d, 0x73, 0x67, 
@@ -5322,16 +5386,22 @@ const unsigned char boot_lua[] =
 	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 
 	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a,
 	0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x0a,
+	0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 
+	0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x22, 0x29, 0x0a,
 	0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x78, 0x70, 
 	0x63, 0x61, 0x6c, 0x6c, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x62, 0x6f, 0x6f, 0x74, 0x2c, 0x20, 0x65, 0x72, 
 	0x72, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x29, 0x0a,
 	0x09, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x74, 0x68, 0x65, 
 	0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, 0x20, 0x65, 0x6e, 0x64, 0x0a,
+	0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 
+	0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x69, 0x6e, 0x69, 0x74, 0x22, 0x29, 0x0a,
 	0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x78, 0x70, 
 	0x63, 0x61, 0x6c, 0x6c, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x69, 0x6e, 0x69, 0x74, 0x2c, 0x20, 0x64, 0x65, 
 	0x66, 0x65, 0x72, 0x45, 0x72, 0x72, 0x68, 0x61, 0x6e, 0x64, 0x29, 0x0a,
 	0x09, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x74, 0x68, 0x65, 
 	0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, 0x20, 0x65, 0x6e, 0x64, 0x0a,
+	0x09, 0x53, 0x44, 0x4c, 0x2e, 0x6c, 0x6f, 0x67, 0x20, 0x28, 0x22, 0x63, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 
+	0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x72, 0x75, 0x6e, 0x22, 0x29, 0x0a,
 	0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2c, 0x20, 0x72, 0x65, 0x74, 
 	0x76, 0x61, 0x6c, 0x20, 0x3d, 0x20, 0x78, 0x70, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 
 	0x72, 0x75, 0x6e, 0x2c, 0x20, 0x64, 0x65, 0x66, 0x65, 0x72, 0x45, 0x72, 0x72, 0x68, 0x61, 0x6e, 0x64, 0x29, 0x0a,