aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-04-03 12:54:29 +0200
committerLoïc Hoguin <[email protected]>2014-04-03 12:54:29 +0200
commit4454f9a00ca8aa85e78e71fb7ef670d802c671e2 (patch)
tree5678d7e37b5d96df04d5f18fca792782b0193e99
parentb5028ef614b37255bad1997fa940bf9e0cb5d4da (diff)
downloadesdl2-4454f9a00ca8aa85e78e71fb7ef670d802c671e2.tar.gz
esdl2-4454f9a00ca8aa85e78e71fb7ef670d802c671e2.tar.bz2
esdl2-4454f9a00ca8aa85e78e71fb7ef670d802c671e2.zip
Add sdl_window:get_id/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.erl5
4 files changed, 27 insertions, 0 deletions
diff --git a/c_src/esdl2.h b/c_src/esdl2.h
index 1798815..9b9f0e2 100644
--- a/c_src/esdl2.h
+++ b/c_src/esdl2.h
@@ -165,6 +165,7 @@
F(get_window_display_index, 1) \
F(get_window_flags, 1) \
F(get_window_grab, 1) \
+ F(get_window_id, 1) \
// Generated declarations for the NIF.
diff --git a/c_src/sdl_window.c b/c_src/sdl_window.c
index 818fa2f..2ec3ba0 100644
--- a/c_src/sdl_window.c
+++ b/c_src/sdl_window.c
@@ -189,3 +189,20 @@ NIF_FUNCTION(get_window_grab)
return nif_thread_call(env, thread_get_window_grab, 1,
NIF_RES_GET(Window, window_res));
}
+
+// get_window_id
+
+NIF_CALL_HANDLER(thread_get_window_id)
+{
+ return enif_make_uint(env, SDL_GetWindowID(args[0]));
+}
+
+NIF_FUNCTION(get_window_id)
+{
+ void* window_res;
+
+ BADARG_IF(!enif_get_resource(env, argv[0], res_Window, &window_res));
+
+ return nif_thread_call(env, thread_get_window_id, 1,
+ NIF_RES_GET(Window, window_res));
+}
diff --git a/src/esdl2.erl b/src/esdl2.erl
index 3c996fb..b069662 100644
--- a/src/esdl2.erl
+++ b/src/esdl2.erl
@@ -77,6 +77,7 @@
-export([get_window_display_index/1]).
-export([get_window_flags/1]).
-export([get_window_grab/1]).
+-export([get_window_id/1]).
%% @todo We probably want to accept an env variable or somthing for the location.
-on_load(on_load/0).
@@ -237,3 +238,6 @@ get_window_flags(_) ->
get_window_grab(_) ->
erlang:nif_error({not_loaded, ?MODULE}).
+
+get_window_id(_) ->
+ erlang:nif_error({not_loaded, ?MODULE}).
diff --git a/src/sdl_window.erl b/src/sdl_window.erl
index bc77974..7b7afca 100644
--- a/src/sdl_window.erl
+++ b/src/sdl_window.erl
@@ -20,6 +20,7 @@
-export([get_display_index/1]).
-export([get_flags/1]).
-export([is_input_grabbed/1]).
+-export([get_id/1]).
create(Title, X, Y, W, H, Flags) ->
esdl2:create_window(Title, X, Y, W, H, Flags),
@@ -47,3 +48,7 @@ get_flags(Window) ->
is_input_grabbed(Window) ->
esdl2:get_window_grab(Window),
receive {'_nif_thread_ret_', Ret} -> Ret end.
+
+get_id(Window) ->
+ esdl2:get_window_id(Window),
+ receive {'_nif_thread_ret_', Ret} -> Ret end.