aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-04-03 15:04:15 +0200
committerLoïc Hoguin <[email protected]>2014-04-03 15:04:15 +0200
commit971a0b4ee13fef8ffd3d1cd0e1f359c75b08bb50 (patch)
tree6b1138710f0ea73bd7b126d8dfa26bba604e13ef
parentfad5d6798a9a93acd274daa3e378c6c2fbb1b72b (diff)
downloadesdl2-971a0b4ee13fef8ffd3d1cd0e1f359c75b08bb50.tar.gz
esdl2-971a0b4ee13fef8ffd3d1cd0e1f359c75b08bb50.tar.bz2
esdl2-971a0b4ee13fef8ffd3d1cd0e1f359c75b08bb50.zip
Add sdl_window:restore/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 f5a3012..966f14d 100644
--- a/c_src/esdl2.h
+++ b/c_src/esdl2.h
@@ -175,6 +175,7 @@
F(maximize_window, 1) \
F(minimize_window, 1) \
F(raise_window, 1) \
+ F(restore_window, 1) \
// Generated declarations for the NIF.
diff --git a/c_src/sdl_window.c b/c_src/sdl_window.c
index 1b30b14..936792b 100644
--- a/c_src/sdl_window.c
+++ b/c_src/sdl_window.c
@@ -411,3 +411,20 @@ NIF_FUNCTION(raise_window)
return nif_thread_cast(env, thread_raise_window, 1,
NIF_RES_GET(Window, window_res));
}
+
+// restore_window
+
+NIF_CAST_HANDLER(thread_restore_window)
+{
+ SDL_RestoreWindow(args[0]);
+}
+
+NIF_FUNCTION(restore_window)
+{
+ void* window_res;
+
+ BADARG_IF(!enif_get_resource(env, argv[0], res_Window, &window_res));
+
+ return nif_thread_cast(env, thread_restore_window, 1,
+ NIF_RES_GET(Window, window_res));
+}
diff --git a/src/esdl2.erl b/src/esdl2.erl
index f6c1d57..6f603cd 100644
--- a/src/esdl2.erl
+++ b/src/esdl2.erl
@@ -87,6 +87,7 @@
-export([maximize_window/1]).
-export([minimize_window/1]).
-export([raise_window/1]).
+-export([restore_window/1]).
%% @todo We probably want to accept an env variable or somthing for the location.
-on_load(on_load/0).
@@ -277,3 +278,6 @@ minimize_window(_) ->
raise_window(_) ->
erlang:nif_error({not_loaded, ?MODULE}).
+
+restore_window(_) ->
+ erlang:nif_error({not_loaded, ?MODULE}).
diff --git a/src/sdl_window.erl b/src/sdl_window.erl
index faeebe2..d597c79 100644
--- a/src/sdl_window.erl
+++ b/src/sdl_window.erl
@@ -30,6 +30,7 @@
-export([maximize/1]).
-export([minimize/1]).
-export([raise/1]).
+-export([restore/1]).
create(Title, X, Y, W, H, Flags) ->
esdl2:create_window(Title, X, Y, W, H, Flags),
@@ -93,3 +94,6 @@ minimize(Window) ->
raise(Window) ->
esdl2:raise_window(Window).
+
+restore(Window) ->
+ esdl2:restore_window(Window).