diff options
| author | Loïc Hoguin <[email protected]> | 2014-04-03 11:59:33 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-04-03 11:59:33 +0200 |
| commit | 6ef934fb5db12cf4f0042aafdcda15a9f3831e5f (patch) | |
| tree | 09e205bf6a5f7d80cfa2f9d0cb80de6e2997cedb | |
| parent | 5d3facb328b4b10c13847f60fac461be4b249f5e (diff) | |
| download | esdl2-6ef934fb5db12cf4f0042aafdcda15a9f3831e5f.tar.gz esdl2-6ef934fb5db12cf4f0042aafdcda15a9f3831e5f.tar.bz2 esdl2-6ef934fb5db12cf4f0042aafdcda15a9f3831e5f.zip | |
Add sdl_window:get_display_index/1
| -rw-r--r-- | c_src/esdl2.h | 1 | ||||
| -rw-r--r-- | c_src/sdl_window.c | 25 | ||||
| -rw-r--r-- | src/esdl2.erl | 4 | ||||
| -rw-r--r-- | src/sdl_window.erl | 8 |
4 files changed, 38 insertions, 0 deletions
diff --git a/c_src/esdl2.h b/c_src/esdl2.h index c7deb41..c64352e 100644 --- a/c_src/esdl2.h +++ b/c_src/esdl2.h @@ -152,6 +152,7 @@ F(create_window, 6) \ F(create_window_and_renderer, 3) \ F(get_window_brightness, 1) \ + F(get_window_display_index, 1) \ // Generated declarations for the NIF. diff --git a/c_src/sdl_window.c b/c_src/sdl_window.c index bc8221b..98c6aaf 100644 --- a/c_src/sdl_window.c +++ b/c_src/sdl_window.c @@ -126,3 +126,28 @@ NIF_FUNCTION(get_window_brightness) return nif_thread_call(env, thread_get_window_brightness, 1, NIF_RES_GET(Window, window_res)); } + +// get_window_display_index + +NIF_CALL_HANDLER(thread_get_window_display_index) +{ + int i = SDL_GetWindowDisplayIndex(args[0]); + + if (i < 0) + return sdl_error_tuple(env); + + return enif_make_tuple2(env, + atom_ok, + enif_make_int(env, i) + ); +} + +NIF_FUNCTION(get_window_display_index) +{ + void* window_res; + + BADARG_IF(!enif_get_resource(env, argv[0], res_Window, &window_res)); + + return nif_thread_call(env, thread_get_window_display_index, 1, + NIF_RES_GET(Window, window_res)); +} diff --git a/src/esdl2.erl b/src/esdl2.erl index e0f3fd8..83bffa7 100644 --- a/src/esdl2.erl +++ b/src/esdl2.erl @@ -74,6 +74,7 @@ -export([create_window/6]). -export([create_window_and_renderer/3]). -export([get_window_brightness/1]). +-export([get_window_display_index/1]). %% @todo We probably want to accept an env variable or somthing for the location. -on_load(on_load/0). @@ -225,3 +226,6 @@ create_window_and_renderer(_, _, _) -> get_window_brightness(_) -> erlang:nif_error({not_loaded, ?MODULE}). + +get_window_display_index(_) -> + erlang:nif_error({not_loaded, ?MODULE}). diff --git a/src/sdl_window.erl b/src/sdl_window.erl index 88f6578..cf7e9df 100644 --- a/src/sdl_window.erl +++ b/src/sdl_window.erl @@ -17,6 +17,7 @@ -export([create/6]). -export([create_window_and_renderer/3]). -export([get_brightness/1]). +-export([get_display_index/1]). create(Title, X, Y, W, H, Flags) -> esdl2:create_window(Title, X, Y, W, H, Flags), @@ -29,3 +30,10 @@ create_window_and_renderer(W, H, Flags) -> get_brightness(Window) -> esdl2:get_window_brightness(Window), receive {'_nif_thread_ret_', Ret} -> Ret end. + +get_display_index(Window) -> + esdl2:get_window_display_index(Window), + receive {'_nif_thread_ret_', Ret} -> + {ok, Index} = Ret, + Index + end. |