Merge pull request #2369 from Max-Might/master

Haiku: platform support

drivers/gl_context/glew.c

@@ -1,3 +1,7 @@
+#ifdef __HAIKU__
+	#undef GLEW_ENABLED
+#endif
+
 #ifdef GLEW_ENABLED
 /*
 ** The OpenGL Extension Wrangler Library

drivers/unix/packet_peer_udp_posix.cpp

@@ -13,7 +13,11 @@
 #include <stdio.h>
 
 #ifndef NO_FCNTL
-#include <sys/fcntl.h>
+	#ifdef __HAIKU__
+		#include <fcntl.h>
+	#else
+		#include <sys/fcntl.h>
+	#endif
 #else
 #include <sys/ioctl.h>
 #endif

drivers/unix/stream_peer_tcp_posix.cpp

@@ -39,7 +39,11 @@
 #include <netdb.h>
 #include <sys/types.h>
 #ifndef NO_FCNTL
-#include <sys/fcntl.h>
+	#ifdef __HAIKU__
+		#include <fcntl.h>
+	#else
+		#include <sys/fcntl.h>
+	#endif
 #else
 #include <sys/ioctl.h>
 #endif

drivers/unix/tcp_server_posix.cpp

@@ -41,7 +41,11 @@
 #include <netdb.h>
 #include <sys/types.h>
 #ifndef NO_FCNTL
-#include <sys/fcntl.h>
+	#ifdef __HAIKU__
+		#include <fcntl.h>
+	#else
+		#include <sys/fcntl.h>
+	#endif
 #else
 #include <sys/ioctl.h>
 #endif

platform/haiku/SCsub

@@ -0,0 +1,16 @@
+Import('env')
+
+common_haiku = [
+	'os_haiku.cpp',
+	'context_gl_haiku.cpp',
+	'haiku_application.cpp',
+	'haiku_direct_window.cpp',
+	'haiku_gl_view.cpp',
+	'key_mapping_haiku.cpp',
+	'audio_driver_media_kit.cpp'
+]
+
+env.Program(
+	'#bin/godot',
+	['godot_haiku.cpp'] + common_haiku
+)

platform/haiku/audio_driver_media_kit.cpp

@@ -0,0 +1,143 @@
+/*************************************************************************/
+/*  audio_driver_media_kit.cpp                                           */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "audio_driver_media_kit.h"
+
+#ifdef MEDIA_KIT_ENABLED
+
+#include "globals.h"
+
+int32_t* AudioDriverMediaKit::samples_in = NULL;
+
+Error AudioDriverMediaKit::init() {
+	active = false;
+
+	mix_rate = 44100;
+	output_format = OUTPUT_STEREO;
+	channels = 2;
+
+	int latency = GLOBAL_DEF("audio/output_latency", 25);
+	buffer_size = nearest_power_of_2(latency * mix_rate / 1000);
+	samples_in = memnew_arr(int32_t, buffer_size * channels);
+
+	media_raw_audio_format format;
+	format = media_raw_audio_format::wildcard;
+	format.frame_rate = mix_rate;
+	format.channel_count = channels;
+	format.format = media_raw_audio_format::B_AUDIO_INT;
+	format.byte_order = B_MEDIA_LITTLE_ENDIAN;
+	format.buffer_size = buffer_size * sizeof(int32_t) * channels;
+
+	player = new BSoundPlayer(
+		&format,
+		"godot_sound_server",
+		AudioDriverMediaKit::PlayBuffer,
+		NULL,
+		this
+	);
+
+	if (player->InitCheck() != B_OK) {
+		fprintf(stderr, "MediaKit ERR: can not create a BSoundPlayer instance\n");
+		ERR_FAIL_COND_V(player == NULL, ERR_CANT_OPEN);
+	}
+
+	mutex = Mutex::create();
+	player->Start();
+
+	return OK;
+}
+
+void AudioDriverMediaKit::PlayBuffer(void* cookie, void* buffer, size_t size, const media_raw_audio_format& format) {
+	AudioDriverMediaKit* ad = (AudioDriverMediaKit*) cookie;
+	int32_t* buf = (int32_t*) buffer;
+
+	if (!ad->active) {
+		for (unsigned int i = 0; i < ad->buffer_size * ad->channels; i++) {
+			AudioDriverMediaKit::samples_in[i] = 0;
+		}
+	} else {
+		ad->lock();
+		ad->audio_server_process(ad->buffer_size, AudioDriverMediaKit::samples_in);
+		ad->unlock();
+	}
+
+	for (unsigned int i = 0; i < ad->buffer_size * ad->channels; i++) {
+		buf[i] = AudioDriverMediaKit::samples_in[i];
+	}
+}
+
+void AudioDriverMediaKit::start() {
+	active = true;
+}
+
+int AudioDriverMediaKit::get_mix_rate() const {
+	return mix_rate;
+}
+
+AudioDriverSW::OutputFormat AudioDriverMediaKit::get_output_format() const {
+	return output_format;
+}
+
+void AudioDriverMediaKit::lock() {
+	if (!mutex)
+		return;
+
+	mutex->lock();
+}
+
+void AudioDriverMediaKit::unlock() {
+	if (!mutex)
+		return;
+
+	mutex->unlock();
+}
+
+void AudioDriverMediaKit::finish() {
+	if (player)
+		delete player;
+
+	if (samples_in) {
+		memdelete_arr(samples_in);
+	};
+
+	if (mutex) {
+		memdelete(mutex);
+		mutex = NULL;
+	}
+}
+
+AudioDriverMediaKit::AudioDriverMediaKit() {
+	mutex = NULL;
+	player = NULL;
+}
+
+AudioDriverMediaKit::~AudioDriverMediaKit() {
+
+}
+
+#endif

platform/haiku/audio_driver_media_kit.h

@@ -0,0 +1,72 @@
+/*************************************************************************/
+/*  audio_driver_media_kit.h                                             */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "servers/audio/audio_server_sw.h"
+
+#ifdef MEDIA_KIT_ENABLED
+
+#include "core/os/thread.h"
+#include "core/os/mutex.h"
+
+#include <kernel/image.h> // needed for image_id
+#include <SoundPlayer.h>
+
+class AudioDriverMediaKit : public AudioDriverSW {
+	Mutex* mutex;
+
+	BSoundPlayer* player;
+	static int32_t* samples_in;
+
+	static void PlayBuffer(void* cookie, void* buffer, size_t size, const media_raw_audio_format& format);
+
+	unsigned int mix_rate;
+	OutputFormat output_format;
+	unsigned int buffer_size;
+	int channels;
+
+	bool active;
+
+public:
+
+	const char* get_name() const {
+		return "MediaKit";
+	};
+
+	virtual Error init();
+	virtual void start();
+	virtual int get_mix_rate() const;
+	virtual OutputFormat get_output_format() const;
+	virtual void lock();
+	virtual void unlock();
+	virtual void finish();
+
+	AudioDriverMediaKit();
+	~AudioDriverMediaKit();
+};
+
+#endif

platform/haiku/context_gl_haiku.cpp

@@ -0,0 +1,43 @@
+#include "context_gl_haiku.h"
+
+#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+
+ContextGL_Haiku::ContextGL_Haiku(HaikuDirectWindow* p_window) {
+	window = p_window;
+
+	uint32 type = BGL_RGB | BGL_DOUBLE | BGL_DEPTH;
+	view = new HaikuGLView(window->Bounds(), type);
+}
+
+ContextGL_Haiku::~ContextGL_Haiku() {
+	delete view;
+}
+
+Error ContextGL_Haiku::initialize() {
+	window->AddChild(view);
+	window->SetHaikuGLView(view);
+
+	return OK;
+}
+
+void ContextGL_Haiku::release_current() {
+	view->UnlockGL();
+}
+
+void ContextGL_Haiku::make_current() {
+	view->LockGL();
+}
+
+void ContextGL_Haiku::swap_buffers() {
+	view->SwapBuffers();
+}
+
+int ContextGL_Haiku::get_window_width() {
+	return window->Bounds().IntegerWidth();
+}
+
+int ContextGL_Haiku::get_window_height() {
+	return window->Bounds().IntegerHeight();
+} 
+
+#endif

platform/haiku/context_gl_haiku.h

@@ -0,0 +1,29 @@
+#ifndef CONTEXT_GL_HAIKU_H
+#define CONTEXT_GL_HAIKU_H
+
+#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+
+#include "drivers/gl_context/context_gl.h"
+
+#include "haiku_direct_window.h"
+#include "haiku_gl_view.h"
+
+class ContextGL_Haiku : public ContextGL {
+private:
+	HaikuGLView* view;
+	HaikuDirectWindow* window;
+
+public:
+	ContextGL_Haiku(HaikuDirectWindow* p_window);
+	~ContextGL_Haiku();
+
+	virtual Error initialize();
+	virtual void release_current();	
+	virtual void make_current();	
+	virtual void swap_buffers();
+	virtual int get_window_width();
+	virtual int get_window_height();
+};
+
+#endif
+#endif

platform/haiku/detect.py

@@ -0,0 +1,61 @@
+import os
+import sys
+
+def is_active():
+	return True
+
+def get_name():
+	return "Haiku"
+
+def can_build():
+	if (os.name != "posix"):
+		return False
+
+	if (sys.platform == "darwin"):
+		return False
+
+	return True
+
+def get_opts():
+	return [
+		('debug_release', 'Add debug symbols to release version','no')
+	]
+
+def get_flags():
+	return [
+		('builtin_zlib', 'no')
+	]
+
+def configure(env):
+	is64 = sys.maxsize > 2**32
+
+	if (env["bits"]=="default"):
+		if (is64):
+			env["bits"]="64"
+		else:
+			env["bits"]="32"
+
+	env.Append(CPPPATH = ['#platform/haiku'])
+
+	env["CC"] = "gcc"
+	env["CXX"] = "g++"
+
+	if (env["target"]=="release"):
+		if (env["debug_release"]=="yes"):
+			env.Append(CCFLAGS=['-g2'])
+		else:
+			env.Append(CCFLAGS=['-O3','-ffast-math'])
+	elif (env["target"]=="release_debug"):
+		env.Append(CCFLAGS=['-O2','-ffast-math','-DDEBUG_ENABLED'])
+	elif (env["target"]=="debug"):
+		env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
+
+	#env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
+	env.Append(CPPFLAGS = ['-DGLEW_ENABLED', '-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED'])
+	env.Append(CPPFLAGS = ['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
+	env.Append(LIBS = ['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL', 'GLEW'])
+
+	import methods
+	env.Append(BUILDERS = {'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
+	env.Append(BUILDERS = {'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
+	env.Append(BUILDERS = {'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl')})

platform/haiku/godot_haiku.cpp

@@ -0,0 +1,19 @@
+#include "main/main.h"
+#include "os_haiku.h"
+
+int main(int argc, char* argv[]) {
+	OS_Haiku os;
+	
+	Error error = Main::setup(argv[0], argc-1, &argv[1]);
+	if (error != OK) {
+		return 255;
+	}
+	
+	if (Main::start()) {
+		os.run();
+	}
+	
+	Main::cleanup();
+	
+	return os.get_exit_code();
+}

platform/haiku/haiku_application.cpp

@@ -0,0 +1,7 @@
+#include "haiku_application.h"
+
+HaikuApplication::HaikuApplication()
+   : BApplication("application/x-vnd.Godot")
+{
+
+}

platform/haiku/haiku_application.h

@@ -0,0 +1,13 @@
+#ifndef HAIKU_APPLICATION_H
+#define HAIKU_APPLICATION_H
+
+#include <kernel/image.h> // needed for image_id
+#include <Application.h>
+
+class HaikuApplication : public BApplication
+{
+public:
+   HaikuApplication();
+};
+
+#endif

platform/haiku/haiku_direct_window.cpp

@@ -0,0 +1,344 @@
+#include <UnicodeChar.h>
+
+#include "main/main.h"
+#include "os/keyboard.h"
+#include "haiku_direct_window.h"
+#include "key_mapping_haiku.h"
+
+HaikuDirectWindow::HaikuDirectWindow(BRect p_frame)
+   : BDirectWindow(p_frame, "Godot", B_TITLED_WINDOW, B_QUIT_ON_WINDOW_CLOSE)
+{
+	last_mouse_pos_valid = false;
+	last_buttons_state = 0;
+	last_button_mask = 0;
+	last_key_modifier_state = 0;
+}
+
+
+HaikuDirectWindow::~HaikuDirectWindow() {
+	if (update_runner) {
+		delete update_runner;
+	}
+}
+
+void HaikuDirectWindow::SetHaikuGLView(HaikuGLView* p_view) {
+	view = p_view;
+}
+
+void HaikuDirectWindow::StartMessageRunner() {
+	update_runner = new BMessageRunner(BMessenger(this),
+		new BMessage(REDRAW_MSG), 1000000/30 /* 30 fps */);
+}
+
+void HaikuDirectWindow::StopMessageRunner() {
+	delete update_runner;
+}
+
+void HaikuDirectWindow::SetInput(InputDefault* p_input) {
+	input = p_input;
+}
+
+void HaikuDirectWindow::SetMainLoop(MainLoop* p_main_loop) {
+	main_loop = p_main_loop;
+}
+
+bool HaikuDirectWindow::QuitRequested() {
+	main_loop->notification(MainLoop::NOTIFICATION_WM_QUIT_REQUEST);
+	return false;
+}
+
+void HaikuDirectWindow::DirectConnected(direct_buffer_info* info) {
+	view->DirectConnected(info);
+	view->EnableDirectMode(true);
+}
+
+void HaikuDirectWindow::MessageReceived(BMessage* message) {
+	switch (message->what) {
+		case REDRAW_MSG:
+			if (Main::iteration() == true) {
+				view->EnableDirectMode(false);
+				Quit();
+			}
+			break;
+
+		default:
+			BDirectWindow::MessageReceived(message);
+	}
+}
+
+void HaikuDirectWindow::DispatchMessage(BMessage* message, BHandler* handler) {
+	switch (message->what) {
+		case B_MOUSE_DOWN:
+		case B_MOUSE_UP:
+			HandleMouseButton(message);
+			break;
+
+		case B_MOUSE_MOVED:
+			HandleMouseMoved(message);
+			break;
+
+		case B_MOUSE_WHEEL_CHANGED:
+			HandleMouseWheelChanged(message);
+			break;
+
+		case B_KEY_DOWN:
+		case B_KEY_UP:
+			HandleKeyboardEvent(message);
+			break;
+
+		case B_MODIFIERS_CHANGED:
+			HandleKeyboardModifierEvent(message);
+			break;
+
+		case B_WINDOW_RESIZED:
+			HandleWindowResized(message);
+			break;
+
+		case LOCKGL_MSG:
+			view->LockGL();
+			break;
+
+		case UNLOCKGL_MSG:
+			view->UnlockGL();
+			break;
+
+		default:
+			BDirectWindow::DispatchMessage(message, handler);
+	}
+}
+
+void HaikuDirectWindow::HandleMouseButton(BMessage* message) {
+	BPoint where;
+	if (message->FindPoint("where", &where) != B_OK) {
+		return;
+	}
+
+	uint32 modifiers = message->FindInt32("modifiers");
+	uint32 buttons = message->FindInt32("buttons");
+	uint32 button = buttons ^ last_buttons_state;
+	last_buttons_state = buttons;
+
+	// TODO: implement the mouse_mode checks
+	//if (mouse_mode == MOUSE_MODE_CAPTURED) {
+	//	event.xbutton.x=last_mouse_pos.x;
+	//	event.xbutton.y=last_mouse_pos.y;
+	//}
+
+	InputEvent mouse_event;
+	mouse_event.ID = ++event_id;
+	mouse_event.type = InputEvent::MOUSE_BUTTON;
+	mouse_event.device = 0;
+
+	mouse_event.mouse_button.mod = GetKeyModifierState(modifiers);
+	mouse_event.mouse_button.button_mask = GetMouseButtonState(buttons);
+	mouse_event.mouse_button.x = where.x;
+	mouse_event.mouse_button.y = where.y;
+	mouse_event.mouse_button.global_x = where.x;
+	mouse_event.mouse_button.global_y = where.y;
+
+	switch (button) {
+		default:
+		case B_PRIMARY_MOUSE_BUTTON:
+			mouse_event.mouse_button.button_index = 1;
+			break;
+
+		case B_SECONDARY_MOUSE_BUTTON:
+			mouse_event.mouse_button.button_index = 2;
+			break;
+
+		case B_TERTIARY_MOUSE_BUTTON:
+			mouse_event.mouse_button.button_index = 3;
+			break;
+	}
+
+	mouse_event.mouse_button.pressed = (message->what == B_MOUSE_DOWN);
+
+	if (message->what == B_MOUSE_DOWN && mouse_event.mouse_button.button_index == 1) {
+		int32 clicks = message->FindInt32("clicks");
+
+		if (clicks > 1) {
+			mouse_event.mouse_button.doubleclick=true;
+		}
+	}
+
+	input->parse_input_event(mouse_event);
+}
+
+void HaikuDirectWindow::HandleMouseMoved(BMessage* message) {
+	BPoint where;
+	if (message->FindPoint("where", &where) != B_OK) {
+		return;
+	}
+
+	Point2i pos(where.x, where.y);
+	uint32 modifiers = message->FindInt32("modifiers");
+	uint32 buttons = message->FindInt32("buttons");
+
+	if (!last_mouse_pos_valid) {
+		last_mouse_position = pos;
+		last_mouse_pos_valid = true;
+	}
+
+	Point2i rel = pos - last_mouse_position;
+
+	InputEvent motion_event;
+	motion_event.ID = ++event_id;
+	motion_event.type = InputEvent::MOUSE_MOTION;
+	motion_event.device = 0;
+
+	motion_event.mouse_motion.mod = GetKeyModifierState(modifiers);
+	motion_event.mouse_motion.button_mask = GetMouseButtonState(buttons);
+	motion_event.mouse_motion.x = pos.x;
+	motion_event.mouse_motion.y = pos.y;
+	input->set_mouse_pos(pos);
+	motion_event.mouse_motion.global_x = pos.x;
+	motion_event.mouse_motion.global_y = pos.y;
+	motion_event.mouse_motion.speed_x = input->get_mouse_speed().x;
+	motion_event.mouse_motion.speed_y = input->get_mouse_speed().y;
+
+	motion_event.mouse_motion.relative_x = rel.x;
+	motion_event.mouse_motion.relative_y = rel.y;
+
+	last_mouse_position = pos;
+
+	input->parse_input_event(motion_event);
+}
+
+void HaikuDirectWindow::HandleMouseWheelChanged(BMessage* message) {
+	float wheel_delta_y = 0;
+	if (message->FindFloat("be:wheel_delta_y", &wheel_delta_y) != B_OK) {
+		return;
+	}
+
+	InputEvent mouse_event;
+	mouse_event.ID = ++event_id;
+	mouse_event.type = InputEvent::MOUSE_BUTTON;
+	mouse_event.device = 0;
+
+	mouse_event.mouse_button.button_index = wheel_delta_y < 0 ? 4 : 5;
+	mouse_event.mouse_button.mod = GetKeyModifierState(last_key_modifier_state);
+	mouse_event.mouse_button.button_mask = last_button_mask;
+	mouse_event.mouse_button.x = last_mouse_position.x;
+	mouse_event.mouse_button.y = last_mouse_position.y;
+	mouse_event.mouse_button.global_x = last_mouse_position.x;
+	mouse_event.mouse_button.global_y = last_mouse_position.y;
+
+	mouse_event.mouse_button.pressed = true;
+	input->parse_input_event(mouse_event);
+
+	mouse_event.ID = ++event_id;
+	mouse_event.mouse_button.pressed = false;
+	input->parse_input_event(mouse_event);
+}
+
+void HaikuDirectWindow::HandleKeyboardEvent(BMessage* message) {
+	int32 raw_char = 0;
+	int32 key = 0;
+	int32 modifiers = 0;
+
+	if (message->FindInt32("raw_char", &raw_char) != B_OK) {
+		return;
+	}
+
+	if (message->FindInt32("key", &key) != B_OK) {
+		return;
+	}
+
+	if (message->FindInt32("modifiers", &modifiers) != B_OK) {
+		return;
+	}
+
+	InputEvent event;
+	event.ID = ++event_id;
+	event.type = InputEvent::KEY;
+	event.device = 0;
+	event.key.mod = GetKeyModifierState(modifiers);
+	event.key.pressed = (message->what == B_KEY_DOWN);
+	event.key.scancode = KeyMappingHaiku::get_keysym(raw_char, key);
+	event.key.echo = message->HasInt32("be:key_repeat");
+	event.key.unicode = 0;
+
+	const char* bytes = NULL;
+	if (message->FindString("bytes", &bytes) == B_OK) {
+		event.key.unicode = BUnicodeChar::FromUTF8(&bytes);
+	}
+
+	//make it consistent accross platforms.
+	if (event.key.scancode==KEY_BACKTAB) {
+		event.key.scancode=KEY_TAB;
+		event.key.mod.shift=true;
+	}
+
+	input->parse_input_event(event);
+}
+
+void HaikuDirectWindow::HandleKeyboardModifierEvent(BMessage* message) {
+	int32 old_modifiers = 0;
+	int32 modifiers = 0;
+
+	if (message->FindInt32("be:old_modifiers", &old_modifiers) != B_OK) {
+		return;
+	}
+
+	if (message->FindInt32("modifiers", &modifiers) != B_OK) {
+		return;
+	}
+
+	int32 key = old_modifiers ^ modifiers;
+
+	InputEvent event;
+	event.ID = ++event_id;
+	event.type = InputEvent::KEY;
+	event.device = 0;
+	event.key.mod = GetKeyModifierState(modifiers);
+	event.key.pressed = ((modifiers & key) != 0);
+	event.key.scancode = KeyMappingHaiku::get_modifier_keysym(key);
+	event.key.echo = false;
+	event.key.unicode = 0;
+
+	input->parse_input_event(event);
+}
+
+void HaikuDirectWindow::HandleWindowResized(BMessage* message) {
+	int32 width = 0;
+	int32 height = 0;
+
+	if ((message->FindInt32("width", &width) != B_OK) || (message->FindInt32("height", &height) != B_OK)) {
+		return;
+	}
+
+	current_video_mode->width = width;
+	current_video_mode->height = height;
+}
+
+inline InputModifierState HaikuDirectWindow::GetKeyModifierState(uint32 p_state) {
+	last_key_modifier_state = p_state;
+	InputModifierState state;
+
+	state.shift = (p_state & B_SHIFT_KEY) != 0;
+	state.control = (p_state & B_CONTROL_KEY) != 0;
+	state.alt = (p_state & B_OPTION_KEY) != 0;
+	state.meta = (p_state & B_COMMAND_KEY) != 0;
+
+	return state;
+}
+
+inline int HaikuDirectWindow::GetMouseButtonState(uint32 p_state) {
+	int state = 0;
+
+	if (p_state & B_PRIMARY_MOUSE_BUTTON) {
+		state |= 1 << 0;
+	}
+
+	if (p_state & B_SECONDARY_MOUSE_BUTTON) {
+		state |= 1 << 1;
+	}
+
+	if (p_state & B_TERTIARY_MOUSE_BUTTON) {
+		state |= 1 << 2;
+	}
+
+	last_button_mask = state;
+
+	return state;
+}

platform/haiku/haiku_direct_window.h

@@ -0,0 +1,60 @@
+#ifndef HAIKU_DIRECT_WINDOW_H
+#define HAIKU_DIRECT_WINDOW_H
+
+#include <kernel/image.h> // needed for image_id
+#include <DirectWindow.h>
+
+#include "core/os/os.h"
+#include "main/input_default.h"
+
+#include "haiku_gl_view.h"
+
+#define REDRAW_MSG 'rdrw'
+#define LOCKGL_MSG 'glck'
+#define UNLOCKGL_MSG 'ulck'
+
+class HaikuDirectWindow : public BDirectWindow
+{
+private:
+	unsigned int event_id;
+	Point2i last_mouse_position;
+	bool last_mouse_pos_valid;
+	uint32 last_buttons_state;
+	uint32 last_key_modifier_state;
+	int last_button_mask;
+	OS::VideoMode* current_video_mode;
+
+	MainLoop* main_loop;
+	InputDefault* input;
+	HaikuGLView* view;
+	BMessageRunner* update_runner;
+
+	void HandleMouseButton(BMessage* message);
+	void HandleMouseMoved(BMessage* message);
+	void HandleMouseWheelChanged(BMessage* message);
+	void HandleWindowResized(BMessage* message);
+	void HandleKeyboardEvent(BMessage* message);
+	void HandleKeyboardModifierEvent(BMessage* message);
+	inline InputModifierState GetKeyModifierState(uint32 p_state);
+	inline int GetMouseButtonState(uint32 p_state);
+
+public:
+	HaikuDirectWindow(BRect p_frame);
+	~HaikuDirectWindow();
+
+	void SetHaikuGLView(HaikuGLView* p_view);
+	void StartMessageRunner();
+	void StopMessageRunner();
+	void SetInput(InputDefault* p_input);
+	void SetMainLoop(MainLoop* p_main_loop);
+	inline void SetVideoMode(OS::VideoMode* video_mode) { current_video_mode = video_mode; };
+	virtual bool QuitRequested();
+	virtual void DirectConnected(direct_buffer_info* info);
+	virtual void MessageReceived(BMessage* message);
+	virtual void DispatchMessage(BMessage* message, BHandler* handler);
+
+	inline Point2i GetLastMousePosition() { return last_mouse_position; };
+	inline int GetLastButtonMask() { return last_button_mask; };
+};
+
+#endif

platform/haiku/haiku_gl_view.cpp

@@ -0,0 +1,18 @@
+#include "main/main.h"
+#include "haiku_gl_view.h"
+
+HaikuGLView::HaikuGLView(BRect frame, uint32 type)
+   : BGLView(frame, "GodotGLView", B_FOLLOW_ALL_SIDES, 0, type)
+{
+}
+
+void HaikuGLView::AttachedToWindow(void) {
+	LockGL();
+	BGLView::AttachedToWindow();
+	UnlockGL();
+	MakeFocus();
+}
+
+void HaikuGLView::Draw(BRect updateRect) {
+	Main::force_redraw();
+}

platform/haiku/haiku_gl_view.h

@@ -0,0 +1,15 @@
+#ifndef HAIKU_GL_VIEW_H
+#define HAIKU_GL_VIEW_H
+
+#include <kernel/image.h> // needed for image_id
+#include <GLView.h>
+
+class HaikuGLView : public BGLView
+{
+public:
+	HaikuGLView(BRect frame, uint32 type);
+	virtual void AttachedToWindow(void);
+	virtual void Draw(BRect updateRect);
+};
+
+#endif

platform/haiku/key_mapping_haiku.cpp

@@ -0,0 +1,193 @@
+#include <InterfaceDefs.h>
+
+#include "key_mapping_haiku.h"
+#include "os/keyboard.h"
+
+struct _HaikuTranslatePair {
+	unsigned int keysym;
+	int32 keycode;
+};
+
+static _HaikuTranslatePair _mod_to_keycode[] = {
+	{ KEY_SHIFT, B_SHIFT_KEY },
+	{ KEY_ALT, B_COMMAND_KEY },
+	{ KEY_CONTROL, B_CONTROL_KEY },
+	{ KEY_CAPSLOCK, B_CAPS_LOCK },
+	{ KEY_SCROLLLOCK, B_SCROLL_LOCK },
+	{ KEY_NUMLOCK, B_NUM_LOCK },
+	{ KEY_SUPER_L, B_OPTION_KEY },
+	{ KEY_MENU, B_MENU_KEY },
+	{ KEY_SHIFT, B_LEFT_SHIFT_KEY },
+	{ KEY_SHIFT, B_RIGHT_SHIFT_KEY },
+	{ KEY_ALT, B_LEFT_COMMAND_KEY },
+	{ KEY_ALT, B_RIGHT_COMMAND_KEY },
+	{ KEY_CONTROL, B_LEFT_CONTROL_KEY },
+	{ KEY_CONTROL, B_RIGHT_CONTROL_KEY },
+	{ KEY_SUPER_L, B_LEFT_OPTION_KEY },
+	{ KEY_SUPER_R, B_RIGHT_OPTION_KEY },
+	{ KEY_UNKNOWN, 0 }
+};
+
+static _HaikuTranslatePair _fn_to_keycode[] = {
+	{ KEY_F1, B_F1_KEY },
+	{ KEY_F2, B_F2_KEY },
+	{ KEY_F3, B_F3_KEY },
+	{ KEY_F4, B_F4_KEY },
+	{ KEY_F5, B_F5_KEY },
+	{ KEY_F6, B_F6_KEY },
+	{ KEY_F7, B_F7_KEY },
+	{ KEY_F8, B_F8_KEY },
+	{ KEY_F9, B_F9_KEY },
+	{ KEY_F10, B_F10_KEY },
+	{ KEY_F11, B_F11_KEY },
+	{ KEY_F12, B_F12_KEY },
+	//{ KEY_F13, ? },
+	//{ KEY_F14, ? },
+	//{ KEY_F15, ? },
+	//{ KEY_F16, ? },
+	{ KEY_PRINT, B_PRINT_KEY },
+	{ KEY_SCROLLLOCK, B_SCROLL_KEY },
+	{ KEY_PAUSE, B_PAUSE_KEY },
+	{ KEY_UNKNOWN, 0 }
+};
+
+static _HaikuTranslatePair _hb_to_keycode[] = {
+	{ KEY_BACKSPACE, B_BACKSPACE },
+	{ KEY_TAB, B_TAB },
+	{ KEY_RETURN, B_RETURN },
+	{ KEY_CAPSLOCK, B_CAPS_LOCK },
+	{ KEY_ESCAPE, B_ESCAPE },
+	{ KEY_SPACE, B_SPACE },
+	{ KEY_PAGEUP, B_PAGE_UP },
+	{ KEY_PAGEDOWN, B_PAGE_DOWN },
+	{ KEY_END, B_END },
+	{ KEY_HOME, B_HOME },
+	{ KEY_LEFT, B_LEFT_ARROW },
+	{ KEY_UP, B_UP_ARROW },
+	{ KEY_RIGHT, B_RIGHT_ARROW },
+	{ KEY_DOWN, B_DOWN_ARROW },
+	{ KEY_PRINT, B_PRINT_KEY },
+	{ KEY_INSERT, B_INSERT },
+	{ KEY_DELETE, B_DELETE },
+	// { KEY_HELP, ??? },
+	
+	{ KEY_0, (0x30) },
+	{ KEY_1, (0x31) },
+	{ KEY_2, (0x32) },
+	{ KEY_3, (0x33) },
+	{ KEY_4, (0x34) },
+	{ KEY_5, (0x35) },
+	{ KEY_6, (0x36) },
+	{ KEY_7, (0x37) },
+	{ KEY_8, (0x38) },
+	{ KEY_9, (0x39) },
+	{ KEY_A, (0x61) },
+	{ KEY_B, (0x62) },
+	{ KEY_C, (0x63) },
+	{ KEY_D, (0x64) },
+	{ KEY_E, (0x65) },
+	{ KEY_F, (0x66) },
+	{ KEY_G, (0x67) },
+	{ KEY_H, (0x68) },
+	{ KEY_I, (0x69) },
+	{ KEY_J, (0x6A) },
+	{ KEY_K, (0x6B) },
+	{ KEY_L, (0x6C) },
+	{ KEY_M, (0x6D) },
+	{ KEY_N, (0x6E) },
+	{ KEY_O, (0x6F) },
+	{ KEY_P, (0x70) },
+	{ KEY_Q, (0x71) },
+	{ KEY_R, (0x72) },
+	{ KEY_S, (0x73) },
+	{ KEY_T, (0x74) },
+	{ KEY_U, (0x75) },
+	{ KEY_V, (0x76) },
+	{ KEY_W, (0x77) },
+	{ KEY_X, (0x78) },
+	{ KEY_Y, (0x79) },
+	{ KEY_Z, (0x7A) },
+
+/*
+{ KEY_PLAY, VK_PLAY},// (0xFA)
+{ KEY_STANDBY,VK_SLEEP },//(0x5F)
+{ KEY_BACK,VK_BROWSER_BACK},// (0xA6)
+{ KEY_FORWARD,VK_BROWSER_FORWARD},// (0xA7)
+{ KEY_REFRESH,VK_BROWSER_REFRESH},// (0xA8)
+{ KEY_STOP,VK_BROWSER_STOP},// (0xA9)
+{ KEY_SEARCH,VK_BROWSER_SEARCH},// (0xAA)
+{ KEY_FAVORITES, VK_BROWSER_FAVORITES},// (0xAB)
+{ KEY_HOMEPAGE,VK_BROWSER_HOME},// (0xAC)
+{ KEY_VOLUMEMUTE,VK_VOLUME_MUTE},// (0xAD)
+{ KEY_VOLUMEDOWN,VK_VOLUME_DOWN},// (0xAE)
+{ KEY_VOLUMEUP,VK_VOLUME_UP},// (0xAF)
+{ KEY_MEDIANEXT,VK_MEDIA_NEXT_TRACK},// (0xB0)
+{ KEY_MEDIAPREVIOUS,VK_MEDIA_PREV_TRACK},// (0xB1)
+{ KEY_MEDIASTOP,VK_MEDIA_STOP},// (0xB2)
+{ KEY_LAUNCHMAIL, VK_LAUNCH_MAIL},// (0xB4)
+{ KEY_LAUNCHMEDIA,VK_LAUNCH_MEDIA_SELECT},// (0xB5)
+{ KEY_LAUNCH0,VK_LAUNCH_APP1},// (0xB6)
+{ KEY_LAUNCH1,VK_LAUNCH_APP2},// (0xB7)
+*/
+
+	{ KEY_SEMICOLON, 0x3B },
+	{ KEY_EQUAL, 0x3D },
+	{ KEY_COLON, 0x2C },
+	{ KEY_MINUS, 0x2D },
+	{ KEY_PERIOD, 0x2E },
+	{ KEY_SLASH, 0x2F },
+	{ KEY_KP_MULTIPLY, 0x2A },
+	{ KEY_KP_ADD, 0x2B },
+
+	{ KEY_QUOTELEFT, 0x60 },
+	{ KEY_BRACKETLEFT, 0x5B },
+	{ KEY_BACKSLASH, 0x5C },
+	{ KEY_BRACKETRIGHT, 0x5D },
+	{ KEY_APOSTROPHE, 0x27 },
+
+	{ KEY_UNKNOWN, 0 }
+};
+
+unsigned int KeyMappingHaiku::get_keysym(int32 raw_char, int32 key) {
+	if (raw_char == B_INSERT && key == 0x64) { return KEY_KP_0; }
+	if (raw_char == B_END && key == 0x58) { return KEY_KP_1; }
+	if (raw_char == B_DOWN_ARROW && key == 0x59) { return KEY_KP_2; }
+	if (raw_char == B_PAGE_DOWN && key == 0x5A) { return KEY_KP_3; }
+	if (raw_char == B_LEFT_ARROW && key == 0x48) { return KEY_KP_4; }
+	if (raw_char == 0x35 && key == 0x49) { return KEY_KP_5; }
+	if (raw_char == B_RIGHT_ARROW && key == 0x4A) { return KEY_KP_6; }
+	if (raw_char == B_HOME && key == 0x37) { return KEY_KP_7; }
+	if (raw_char == B_UP_ARROW && key == 0x38) { return KEY_KP_8; }
+	if (raw_char == B_PAGE_UP && key == 0x39) { return KEY_KP_9; }
+	if (raw_char == 0x2F && key == 0x23) { return KEY_KP_DIVIDE; }
+	if (raw_char == 0x2D && key == 0x25) { return KEY_KP_SUBSTRACT; }
+	if (raw_char == B_DELETE && key == 0x65) { return KEY_KP_PERIOD; }
+
+	if (raw_char == 0x10) {
+		for(int i = 0; _fn_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
+			if (_fn_to_keycode[i].keycode == key) {
+				return _fn_to_keycode[i].keysym;
+			}
+		}
+
+		return KEY_UNKNOWN;
+	}
+
+	for(int i = 0; _hb_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
+		if (_hb_to_keycode[i].keycode == raw_char) {
+			return _hb_to_keycode[i].keysym;
+		}
+	}
+
+	return KEY_UNKNOWN;
+}
+
+unsigned int KeyMappingHaiku::get_modifier_keysym(int32 key) {
+	for(int i = 0; _mod_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
+		if ((_mod_to_keycode[i].keycode & key) != 0) {
+			return _mod_to_keycode[i].keysym;
+		}
+	}
+
+	return KEY_UNKNOWN;
+}

platform/haiku/key_mapping_haiku.h

@@ -0,0 +1,13 @@
+#ifndef KEY_MAPPING_HAIKU_H
+#define KEY_MAPPING_HAIKU_H
+
+class KeyMappingHaiku
+{
+	KeyMappingHaiku() {};
+
+public:
+	static unsigned int get_keysym(int32 raw_char, int32 key);
+	static unsigned int get_modifier_keysym(int32 key);
+};
+
+#endif

platform/haiku/os_haiku.cpp

@@ -0,0 +1,320 @@
+#include <Screen.h>
+
+#include "servers/visual/visual_server_raster.h"
+#include "servers/visual/visual_server_wrap_mt.h"
+#include "drivers/gles2/rasterizer_gles2.h"
+#include "servers/physics/physics_server_sw.h"
+//#include "servers/physics_2d/physics_2d_server_wrap_mt.h"
+#include "main/main.h"
+
+#include "os_haiku.h"
+
+
+OS_Haiku::OS_Haiku() {
+#ifdef MEDIA_KIT_ENABLED
+	AudioDriverManagerSW::add_driver(&driver_media_kit);
+#endif
+};
+
+void OS_Haiku::run() {
+	if (!main_loop) {
+		return;
+	}
+
+	main_loop->init();
+	context_gl->release_current();
+
+	// TODO: clean up
+	BMessenger* bms = new BMessenger(window);
+	BMessage* msg = new BMessage();
+	bms->SendMessage(LOCKGL_MSG, msg);
+
+	window->StartMessageRunner();
+	app->Run();
+	window->StopMessageRunner();
+
+	delete app;
+
+	delete bms;
+	delete msg;
+	main_loop->finish();
+}
+
+String OS_Haiku::get_name() {
+	return "Haiku";
+}
+
+int OS_Haiku::get_video_driver_count() const {
+	return 1;
+}
+
+const char* OS_Haiku::get_video_driver_name(int p_driver) const {
+	return "GLES2";
+}
+
+OS::VideoMode OS_Haiku::get_default_video_mode() const {
+	return OS::VideoMode(800, 600, false);
+}
+
+void OS_Haiku::initialize(const VideoMode& p_desired, int p_video_driver, int p_audio_driver) {
+	main_loop = NULL;
+	current_video_mode = p_desired;
+
+	app = new HaikuApplication();
+
+	BRect frame;
+	frame.Set(50, 50, 50 + current_video_mode.width - 1, 50 + current_video_mode.height - 1);
+
+	window = new HaikuDirectWindow(frame);
+	window->SetVideoMode(&current_video_mode);
+
+	if (current_video_mode.fullscreen) {
+		window->SetFullScreen(true);
+	}
+
+	if (!current_video_mode.resizable) {
+		uint32 flags = window->Flags();
+		flags |= B_NOT_RESIZABLE;
+		window->SetFlags(flags);
+	}
+
+#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+	context_gl = memnew(ContextGL_Haiku(window));
+	context_gl->initialize();
+	context_gl->make_current();
+
+	rasterizer = memnew(RasterizerGLES2);
+#endif
+
+	visual_server = memnew(VisualServerRaster(rasterizer));
+
+	ERR_FAIL_COND(!visual_server);
+
+	// TODO: enable multithreaded VS
+	//if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) {
+	//	visual_server = memnew(VisualServerWrapMT(visual_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD));
+	//}
+
+	input = memnew(InputDefault);
+	window->SetInput(input);
+
+	window->Show();
+	visual_server->init();
+
+	physics_server = memnew(PhysicsServerSW);
+	physics_server->init();
+	physics_2d_server = memnew(Physics2DServerSW);
+	// TODO: enable multithreaded PS
+	//physics_2d_server = Physics2DServerWrapMT::init_server<Physics2DServerSW>();
+	physics_2d_server->init();
+
+	AudioDriverManagerSW::get_driver(p_audio_driver)->set_singleton();
+
+	if (AudioDriverManagerSW::get_driver(p_audio_driver)->init() != OK) {
+		ERR_PRINT("Initializing audio failed.");
+	}
+
+	sample_manager = memnew(SampleManagerMallocSW);
+	audio_server = memnew(AudioServerSW(sample_manager));
+	audio_server->init();
+
+	spatial_sound_server = memnew(SpatialSoundServerSW);
+	spatial_sound_server->init();
+	spatial_sound_2d_server = memnew(SpatialSound2DServerSW);
+	spatial_sound_2d_server->init();
+}
+
+void OS_Haiku::finalize() {
+	if (main_loop) {
+		memdelete(main_loop);
+	}
+
+	main_loop = NULL;
+
+	spatial_sound_server->finish();
+	memdelete(spatial_sound_server);
+
+	spatial_sound_2d_server->finish();
+	memdelete(spatial_sound_2d_server);
+
+	audio_server->finish();
+	memdelete(audio_server);
+	memdelete(sample_manager);
+
+	visual_server->finish();
+	memdelete(visual_server);
+	memdelete(rasterizer);
+
+	physics_server->finish();
+	memdelete(physics_server);
+
+	physics_2d_server->finish();
+	memdelete(physics_2d_server);
+
+	memdelete(input);
+
+#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+	memdelete(context_gl);
+#endif
+}
+
+void OS_Haiku::set_main_loop(MainLoop* p_main_loop) {
+	main_loop = p_main_loop;
+	input->set_main_loop(p_main_loop);
+	window->SetMainLoop(p_main_loop);
+}
+
+MainLoop* OS_Haiku::get_main_loop() const {
+	return main_loop;
+}
+
+void OS_Haiku::delete_main_loop() {
+	if (main_loop) {
+		memdelete(main_loop);
+	}
+
+	main_loop = NULL;
+	window->SetMainLoop(NULL);
+}
+
+void OS_Haiku::release_rendering_thread() {
+	context_gl->release_current();
+}
+
+void OS_Haiku::make_rendering_thread() {
+	context_gl->make_current();
+}
+
+bool OS_Haiku::can_draw() const {
+	// TODO: implement
+	return true;
+}
+
+void OS_Haiku::swap_buffers() {
+	context_gl->swap_buffers();
+}
+
+Point2 OS_Haiku::get_mouse_pos() const {
+	return window->GetLastMousePosition();
+}
+
+int OS_Haiku::get_mouse_button_state() const {
+	return window->GetLastButtonMask();
+}
+
+void OS_Haiku::set_cursor_shape(CursorShape p_shape) {
+	//ERR_PRINT("set_cursor_shape() NOT IMPLEMENTED");
+}
+
+int OS_Haiku::get_screen_count() const {
+	// TODO: implement get_screen_count()
+	return 1;
+}
+
+int OS_Haiku::get_current_screen() const {
+	// TODO: implement get_current_screen()
+	return 0;
+}
+
+void OS_Haiku::set_current_screen(int p_screen) {
+	// TODO: implement set_current_screen()
+}
+
+Point2 OS_Haiku::get_screen_position(int p_screen) const {
+	// TODO: make this work with the p_screen parameter
+	BScreen* screen = new BScreen(window);
+	BRect frame = screen->Frame();
+	delete screen;
+	return Point2i(frame.left, frame.top);
+}
+
+Size2 OS_Haiku::get_screen_size(int p_screen) const {
+	// TODO: make this work with the p_screen parameter
+	BScreen* screen = new BScreen(window);
+	BRect frame = screen->Frame();
+	delete screen;
+	return Size2i(frame.IntegerWidth() + 1, frame.IntegerHeight() + 1);
+}
+
+void OS_Haiku::set_window_title(const String& p_title) {
+	window->SetTitle(p_title.utf8().get_data());
+}
+
+Size2 OS_Haiku::get_window_size() const {
+	BSize size = window->Size();
+	return Size2i(size.IntegerWidth() + 1, size.IntegerHeight() + 1);
+}
+
+void OS_Haiku::set_window_size(const Size2 p_size) {
+	// TODO: why does it stop redrawing after this is called?
+	window->ResizeTo(p_size.x, p_size.y);
+}
+
+Point2 OS_Haiku::get_window_position() const {
+	BPoint point(0, 0);
+	window->ConvertToScreen(&point);
+	return Point2i(point.x, point.y);
+}
+
+void OS_Haiku::set_window_position(const Point2& p_position) {
+	window->MoveTo(p_position.x, p_position.y);
+}
+
+void OS_Haiku::set_window_fullscreen(bool p_enabled) {
+	window->SetFullScreen(p_enabled);
+	current_video_mode.fullscreen = p_enabled;
+	visual_server->init();
+}
+
+bool OS_Haiku::is_window_fullscreen() const {
+	return current_video_mode.fullscreen;
+}
+
+void OS_Haiku::set_window_resizable(bool p_enabled) {
+	uint32 flags = window->Flags();
+
+	if (p_enabled) {
+		flags &= ~(B_NOT_RESIZABLE);
+	} else {
+		flags |= B_NOT_RESIZABLE;
+	}
+
+	window->SetFlags(flags);
+	current_video_mode.resizable = p_enabled;
+}
+
+bool OS_Haiku::is_window_resizable() const {
+	return current_video_mode.resizable;
+}
+
+void OS_Haiku::set_window_minimized(bool p_enabled) {
+	window->Minimize(p_enabled);
+}
+
+bool OS_Haiku::is_window_minimized() const {
+	return window->IsMinimized();
+}
+
+void OS_Haiku::set_window_maximized(bool p_enabled) {
+	window->Minimize(!p_enabled);
+}
+
+bool OS_Haiku::is_window_maximized() const {
+	return !window->IsMinimized();
+}
+
+void OS_Haiku::set_video_mode(const VideoMode& p_video_mode, int p_screen) {
+	ERR_PRINT("set_video_mode() NOT IMPLEMENTED");
+}
+
+OS::VideoMode OS_Haiku::get_video_mode(int p_screen) const {
+	return current_video_mode;
+}
+
+void OS_Haiku::get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen) const {
+	ERR_PRINT("get_fullscreen_mode_list() NOT IMPLEMENTED");
+}
+
+String OS_Haiku::get_executable_path() const {
+	return OS::get_executable_path();
+}

platform/haiku/os_haiku.h

@@ -0,0 +1,99 @@
+#ifndef OS_HAIKU_H
+#define OS_HAIKU_H
+
+#include "drivers/unix/os_unix.h"
+#include "servers/visual_server.h"
+#include "servers/visual/rasterizer.h"
+#include "servers/physics_server.h"
+#include "servers/physics_2d/physics_2d_server_sw.h"
+#include "servers/audio/audio_server_sw.h"
+#include "servers/audio/sample_manager_sw.h"
+#include "servers/spatial_sound/spatial_sound_server_sw.h"
+#include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h"
+#include "main/input_default.h"
+
+#include "audio_driver_media_kit.h"
+#include "context_gl_haiku.h"
+#include "haiku_application.h"
+#include "haiku_direct_window.h"
+
+
+class OS_Haiku : public OS_Unix {
+private:
+	HaikuApplication* app;
+	HaikuDirectWindow* window;
+	MainLoop* main_loop;
+	InputDefault* input;
+	Rasterizer* rasterizer;
+	VisualServer* visual_server;
+	VideoMode current_video_mode;
+	PhysicsServer* physics_server;
+	Physics2DServer* physics_2d_server;
+	AudioServerSW* audio_server;
+	SampleManagerMallocSW* sample_manager;
+	SpatialSoundServerSW* spatial_sound_server;
+	SpatialSound2DServerSW* spatial_sound_2d_server;
+
+#ifdef MEDIA_KIT_ENABLED
+	AudioDriverMediaKit driver_media_kit;
+#endif
+
+#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+	ContextGL_Haiku* context_gl;
+#endif
+
+	virtual void delete_main_loop();
+
+protected:
+	virtual int get_video_driver_count() const;
+	virtual const char* get_video_driver_name(int p_driver) const;
+	virtual VideoMode get_default_video_mode() const;
+
+	virtual void initialize(const VideoMode& p_desired, int p_video_driver, int p_audio_driver);
+	virtual void finalize();
+
+	virtual void set_main_loop(MainLoop* p_main_loop);
+
+public:
+	OS_Haiku();
+	void run();
+
+	virtual String get_name();
+
+	virtual MainLoop* get_main_loop() const;
+
+	virtual bool can_draw() const;
+	virtual void release_rendering_thread();
+	virtual void make_rendering_thread();
+	virtual void swap_buffers();
+
+	virtual Point2 get_mouse_pos() const;
+	virtual int get_mouse_button_state() const;
+	virtual void set_cursor_shape(CursorShape p_shape);
+
+	virtual int get_screen_count() const;
+	virtual int get_current_screen() const;
+	virtual void set_current_screen(int p_screen);
+	virtual Point2 get_screen_position(int p_screen=0) const;
+	virtual Size2 get_screen_size(int p_screen=0) const;
+	virtual void set_window_title(const String& p_title);
+	virtual Size2 get_window_size() const;
+	virtual void set_window_size(const Size2 p_size);
+	virtual Point2 get_window_position() const;
+	virtual void set_window_position(const Point2& p_position);
+	virtual void set_window_fullscreen(bool p_enabled);
+	virtual bool is_window_fullscreen() const;
+	virtual void set_window_resizable(bool p_enabled);
+	virtual bool is_window_resizable() const;
+	virtual void set_window_minimized(bool p_enabled);
+	virtual bool is_window_minimized() const;
+	virtual void set_window_maximized(bool p_enabled);
+	virtual bool is_window_maximized() const;
+
+	virtual void set_video_mode(const VideoMode& p_video_mode, int p_screen=0);
+	virtual VideoMode get_video_mode(int p_screen=0) const;
+	virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen=0) const;
+	virtual String get_executable_path() const;
+};
+
+#endif

platform/haiku/platform_config.h

@@ -0,0 +1,6 @@
+#include <alloca.h>
+
+// for ifaddrs.h needed in drivers/unix/ip_unix.cpp
+#define _BSD_SOURCE 1
+
+#define GLES2_INCLUDE_H <GL/glew.h>