From 330d860b3f557bf2c368c070ad40134d622d0969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Thu, 3 Apr 2014 18:04:30 +0200 Subject: Add sdl_window:set_fullscreen/2 --- c_src/esdl2.h | 1 + c_src/nif_helpers.h | 14 ++++++++++++++ c_src/sdl_window.c | 29 +++++++++++++++++++++++++++++ src/esdl2.erl | 4 ++++ src/sdl_window.erl | 5 +++++ 5 files changed, 53 insertions(+) diff --git a/c_src/esdl2.h b/c_src/esdl2.h index 2eb447b..d1d4ae7 100644 --- a/c_src/esdl2.h +++ b/c_src/esdl2.h @@ -178,6 +178,7 @@ F(restore_window, 1) \ F(set_window_bordered, 2) \ F(set_window_brightness, 2) \ + F(set_window_fullscreen, 2) \ // Generated declarations for the NIF. diff --git a/c_src/nif_helpers.h b/c_src/nif_helpers.h index d359f50..915cb2e 100644 --- a/c_src/nif_helpers.h +++ b/c_src/nif_helpers.h @@ -98,6 +98,20 @@ return list; \ } +#define NIF_ATOM_TO_ENUM(a, e) if (!strcmp(buf, #a)) { *val = e; return 1; } +#define NIF_ATOM_TO_ENUM_FUNCTION(f, type, enum_list) \ + int f(ErlNifEnv* env, ERL_NIF_TERM a, type* val) \ + { \ + char buf[MAX_ATOM_LENGTH]; \ + \ + if (!enif_get_atom(env, a, buf, MAX_ATOM_LENGTH, ERL_NIF_LATIN1)) \ + return 0; \ + \ + enum_list(NIF_ATOM_TO_ENUM) \ + \ + return 0; \ + } + #define NIF_ENUM_TO_ATOM(a, e) if (id == e) return atom_ ## a; #define NIF_ENUM_TO_ATOM_FUNCTION(f, type, enum_list) \ ERL_NIF_TERM f(type id) \ diff --git a/c_src/sdl_window.c b/c_src/sdl_window.c index b8e8711..51b9a30 100644 --- a/c_src/sdl_window.c +++ b/c_src/sdl_window.c @@ -38,6 +38,13 @@ void dtor_Window(ErlNifEnv* env, void* obj) NIF_LIST_TO_FLAGS_FUNCTION(list_to_window_flags, Uint32, WINDOW_FLAGS) NIF_FLAGS_TO_LIST_FUNCTION(window_flags_to_list, Uint32, WINDOW_FLAGS) +#define WINDOW_FULLSCREEN_ENUM(E) \ + E(fullscreen, SDL_WINDOW_FULLSCREEN) \ + E(fullscreen_desktop, SDL_WINDOW_FULLSCREEN_DESKTOP) \ + E(windowed, 0) + +NIF_ATOM_TO_ENUM_FUNCTION(atom_to_window_fullscreen, Uint32, WINDOW_FULLSCREEN_ENUM) + // create_window NIF_CALL_HANDLER(thread_create_window) @@ -485,3 +492,25 @@ NIF_FUNCTION(set_window_brightness) return nif_thread_call(env, thread_set_window_brightness, 2, NIF_RES_GET(Window, window_res), fp); } + +// set_window_fullscreen + +NIF_CALL_HANDLER(thread_set_window_fullscreen) +{ + if (SDL_SetWindowFullscreen(args[0], (long)args[1])) + return sdl_error_tuple(env); + + return atom_ok; +} + +NIF_FUNCTION(set_window_fullscreen) +{ + void* window_res; + Uint32 flags; + + BADARG_IF(!enif_get_resource(env, argv[0], res_Window, &window_res)); + BADARG_IF(!atom_to_window_fullscreen(env, argv[1], &flags)); + + return nif_thread_call(env, thread_set_window_fullscreen, 2, + NIF_RES_GET(Window, window_res), flags); +} diff --git a/src/esdl2.erl b/src/esdl2.erl index e85c698..144e8dd 100644 --- a/src/esdl2.erl +++ b/src/esdl2.erl @@ -90,6 +90,7 @@ -export([restore_window/1]). -export([set_window_bordered/2]). -export([set_window_brightness/2]). +-export([set_window_fullscreen/2]). %% @todo We probably want to accept an env variable or somthing for the location. -on_load(on_load/0). @@ -289,3 +290,6 @@ set_window_bordered(_, _) -> set_window_brightness(_, _) -> erlang:nif_error({not_loaded, ?MODULE}). + +set_window_fullscreen(_, _) -> + erlang:nif_error({not_loaded, ?MODULE}). diff --git a/src/sdl_window.erl b/src/sdl_window.erl index 113de6b..f675f26 100644 --- a/src/sdl_window.erl +++ b/src/sdl_window.erl @@ -33,6 +33,7 @@ -export([restore/1]). -export([set_bordered/2]). -export([set_brightness/2]). +-export([set_fullscreen/2]). create(Title, X, Y, W, H, Flags) -> esdl2:create_window(Title, X, Y, W, H, Flags), @@ -106,3 +107,7 @@ set_bordered(Window, Bordered) -> set_brightness(Window, Brightness) -> esdl2:set_window_brightness(Window, Brightness), receive {'_nif_thread_ret_', Ret} -> Ret end. + +set_fullscreen(Window, Flag) -> + esdl2:set_window_fullscreen(Window, Flag), + receive {'_nif_thread_ret_', Ret} -> Ret end. -- cgit v1.2.3