changeset 14:26efd2928f01

Client: add some JavaScript bindings for Window, #462
author David Demelier <markand@malikania.fr>
date Sun, 03 Apr 2016 10:23:23 +0200
parents fb7c2c096101
children 3b9ea4072263
files libclient/CMakeLists.txt libclient/malikania/js-window.cpp libclient/malikania/js-window.h tests/libclient/CMakeLists.txt tests/libclient/js-window/CMakeLists.txt tests/libclient/js-window/main.cpp
diffstat 6 files changed, 269 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libclient/CMakeLists.txt	Sat Apr 02 16:05:44 2016 +0200
+++ b/libclient/CMakeLists.txt	Sun Apr 03 10:23:23 2016 +0200
@@ -25,6 +25,7 @@
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/font.h
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/image.h
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/js-color.h
+	${CMAKE_CURRENT_SOURCE_DIR}/malikania/js-window.h
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/label.h
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/line.h
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/point.h
@@ -46,6 +47,7 @@
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/image.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/js-color.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/js-size.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/malikania/js-window.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/label.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/sprite.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/malikania/window.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libclient/malikania/js-window.cpp	Sun Apr 03 10:23:23 2016 +0200
@@ -0,0 +1,97 @@
+/*
+ * js-window.cpp -- window management (JavaScript binding)
+ *
+ * Copyright (c) 2013-2016 Malikania Authors
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "js-color.h"
+#include "js-window.h"
+
+namespace malikania {
+
+namespace {
+
+duk::Ret constructor(duk::ContextPtr ctx)
+{
+	duk::StackAssert sa(ctx);
+
+	if (!duk_is_constructor_call(ctx)) {
+		duk::raise(ctx, DUK_ERR_ERROR, "window must be new-constructed");
+	}
+
+	try {
+		duk::construct(ctx, duk::Pointer<Window>{new Window()});
+	} catch (const std::exception &ex) {
+		duk::raise(ctx, DUK_ERR_ERROR, "%s", ex.what());
+	}
+
+	return 0;
+}
+
+duk::Ret clear(duk::ContextPtr ctx)
+{
+	try {
+		duk::self<duk::Pointer<Window>>(ctx)->clear();
+	} catch (const std::exception &ex) {
+		duk::raise(ctx, DUK_ERR_ERROR, "%s", ex.what());
+	}
+
+	return 0;
+}
+
+duk::Ret present(duk::ContextPtr ctx)
+{
+	try {
+		duk::self<duk::Pointer<Window>>(ctx)->present();
+	} catch (const std::exception &ex) {
+		duk::raise(ctx, DUK_ERR_ERROR, "%s", ex.what());
+	}
+
+	return 0;
+}
+
+duk::Ret setDrawingColor(duk::ContextPtr ctx)
+{
+	try {
+		duk::self<duk::Pointer<Window>>(ctx)->setDrawingColor(duk::require<Color>(ctx, 0));
+	} catch (const std::exception &ex) {
+		duk::raise(ctx, DUK_ERR_ERROR, "%s", ex.what());
+	}
+
+	return 0;
+}
+
+const duk::FunctionMap methods{
+	{ "clear",		{ clear,		0 } },
+	{ "present",		{ present,		0 } },
+	{ "setDrawingColor",	{ setDrawingColor,	1 } }
+};
+
+} // !namespace
+
+void loadMalikaniaWindow(duk::ContextPtr ctx)
+{
+	duk::StackAssert sa(ctx);
+
+	duk::getGlobal<void>(ctx, "Malikania");
+	duk::push(ctx, duk::Function{constructor});
+	duk::push(ctx, duk::Object());
+	duk::push(ctx, methods);
+	duk::putProperty(ctx, -2, "prototype");
+	duk::putProperty(ctx, -2, "Window");
+	duk::pop(ctx);
+}
+
+} // !malikania
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libclient/malikania/js-window.h	Sun Apr 03 10:23:23 2016 +0200
@@ -0,0 +1,78 @@
+/*
+ * js-window.h -- window management (JavaScript binding)
+ *
+ * Copyright (c) 2013-2016 Malikania Authors
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef MALIKANIA_JS_WINDOW_H
+#define MALIKANIA_JS_WINDOW_H
+
+#include "js.h"
+#include "window.h"
+
+namespace malikania {
+
+namespace duk {
+
+/**
+ * @brief JavaScript binding for Window.
+ */
+template <>
+class TypeTraits<Window> {
+public:
+	/**
+	 * Put the Window prototype to the top of the stack.
+	 *
+	 * @param ctx the context
+	 */
+	static void prototype(duk::ContextPtr ctx)
+	{
+		duk::StackAssert sa(ctx, 1);
+
+		duk::getGlobal<void>(ctx, "Malikania");
+		duk::getGlobal<void>(ctx, "Window");
+		duk::getProperty<void>(ctx, -1, "prototype");
+		duk::remove(ctx, -2);
+		duk::remove(ctx, -2);
+	}
+
+	/**
+	 * Get the object signature.
+	 *
+	 * @return Window signature
+	 */
+	static inline std::string name()
+	{
+		return "\xff""\xff""Window";
+	}
+
+	/**
+	 * Get inheritance list.
+	 *
+	 * @return empty
+	 */
+	static std::vector<std::string> inherits()
+	{
+		return {};
+	}
+};
+
+} // !duk
+
+void loadMalikaniaWindow(duk::ContextPtr ctx);
+
+} // !malikania
+
+#endif // !MALIKANIA_JS_WINDOW_H
--- a/tests/libclient/CMakeLists.txt	Sat Apr 02 16:05:44 2016 +0200
+++ b/tests/libclient/CMakeLists.txt	Sun Apr 03 10:23:23 2016 +0200
@@ -29,3 +29,4 @@
 # JavaScript bindings
 add_subdirectory(js-color)
 add_subdirectory(js-size)
+add_subdirectory(js-window)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/libclient/js-window/CMakeLists.txt	Sun Apr 03 10:23:23 2016 +0200
@@ -0,0 +1,23 @@
+#
+# CMakeLists.txt -- CMake build system for malikania
+#
+# Copyright (c) 2013-2016 Malikania Authors
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+malikania_create_test(
+	NAME js-window
+	LIBRARIES libclient
+	SOURCES main.cpp
+)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/libclient/js-window/main.cpp	Sun Apr 03 10:23:23 2016 +0200
@@ -0,0 +1,68 @@
+/*
+ * main.cpp -- test Window (JavaScript binding)
+ *
+ * Copyright (c) 2013-2016 Malikania Authors
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <chrono>
+#include <thread>
+
+#include <gtest/gtest.h>
+
+#include <malikania/js-window.h>
+
+using namespace malikania;
+
+using namespace std::chrono_literals;
+
+class TestWindow : public testing::Test {
+protected:
+	duk::Context m_ctx;
+
+public:
+	TestWindow()
+	{
+		duk::putGlobal(m_ctx, "Malikania", duk::Object());
+
+		loadMalikaniaWindow(m_ctx);
+	}
+};
+
+TEST_F(TestWindow, basic)
+{
+	try {
+		auto ret = duk::pevalString(m_ctx,
+			"w = new Malikania.Window();"
+			"w.setDrawingColor('lightskyblue');"
+			"w.clear();"
+			"w.present();"
+		);
+
+		if (ret != 0) {
+			throw duk::error(m_ctx, -1);
+		}
+
+		std::this_thread::sleep_for(3s);
+	} catch (const std::exception &ex) {
+		FAIL() << ex.what();
+	}
+}
+
+int main(int argc, char **argv)
+{
+	testing::InitGoogleTest(&argc, argv);
+
+	return RUN_ALL_TESTS();
+}