aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-04-03 20:16:59 +0200
committerLoïc Hoguin <[email protected]>2014-04-03 20:16:59 +0200
commit305e52b41717adbfc30ac937994f9bec7db68b86 (patch)
tree79abb3fe3e23daf5fb1caef319fa0bbcb55bc39a
parent0f31316fc0e67d9f00638b913ac91d3009c47e94 (diff)
downloadesdl2-305e52b41717adbfc30ac937994f9bec7db68b86.tar.gz
esdl2-305e52b41717adbfc30ac937994f9bec7db68b86.tar.bz2
esdl2-305e52b41717adbfc30ac937994f9bec7db68b86.zip
Add sdl_window:show/1
-rw-r--r--c_src/esdl2.h1
-rw-r--r--c_src/sdl_window.c17
-rw-r--r--src/esdl2.erl4
-rw-r--r--src/sdl_window.erl4
4 files changed, 26 insertions, 0 deletions
diff --git a/c_src/esdl2.h b/c_src/esdl2.h
index 2a0a231..06d1203 100644
--- a/c_src/esdl2.h
+++ b/c_src/esdl2.h
@@ -186,6 +186,7 @@
F(set_window_position, 3) \
F(set_window_size, 3) \
F(set_window_title, 2) \
+ F(show_window, 1)
// Generated declarations for the NIF.
diff --git a/c_src/sdl_window.c b/c_src/sdl_window.c
index 065e39a..c35fb0c 100644
--- a/c_src/sdl_window.c
+++ b/c_src/sdl_window.c
@@ -644,3 +644,20 @@ NIF_FUNCTION(set_window_title)
return nif_thread_cast(env, thread_set_window_title, 2,
NIF_RES_GET(Window, window_res), title);
}
+
+// show_window
+
+NIF_CAST_HANDLER(thread_show_window)
+{
+ SDL_ShowWindow(args[0]);
+}
+
+NIF_FUNCTION(show_window)
+{
+ void* window_res;
+
+ BADARG_IF(!enif_get_resource(env, argv[0], res_Window, &window_res));
+
+ return nif_thread_cast(env, thread_show_window, 1,
+ NIF_RES_GET(Window, window_res));
+}
diff --git a/src/esdl2.erl b/src/esdl2.erl
index 01969df..0b12186 100644
--- a/src/esdl2.erl
+++ b/src/esdl2.erl
@@ -98,6 +98,7 @@
-export([set_window_position/3]).
-export([set_window_size/3]).
-export([set_window_title/2]).
+-export([show_window/1]).
%% @todo We probably want to accept an env variable or somthing for the location.
-on_load(on_load/0).
@@ -321,3 +322,6 @@ set_window_size(_, _, _) ->
set_window_title(_, _) ->
erlang:nif_error({not_loaded, ?MODULE}).
+
+show_window(_) ->
+ erlang:nif_error({not_loaded, ?MODULE}).
diff --git a/src/sdl_window.erl b/src/sdl_window.erl
index d4f980d..8d4c793 100644
--- a/src/sdl_window.erl
+++ b/src/sdl_window.erl
@@ -41,6 +41,7 @@
-export([set_pos/3]).
-export([set_size/3]).
-export([set_title/2]).
+-export([show/1]).
create(Title, X, Y, W, H, Flags) ->
esdl2:create_window(Title, X, Y, W, H, Flags),
@@ -140,3 +141,6 @@ set_size(Window, W, H) ->
set_title(Window, Title) ->
esdl2:set_window_title(Window, Title).
+
+show(Window) ->
+ esdl2:show_window(Window).