From 276a44441d8795cd29a215dff35ab6aefcdc6557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Wed, 21 Oct 2015 03:41:03 +0200 Subject: Add sdl_hints:add_callback/3 function This also sets up esdl2 to start accepting callbacks. The module/process esdl2_callbacks must always be running for that purpose, so esdl2 was made an OTP application instead of a simple library. Implementation of the rest of SDL_hints will follow in subsequent commits. --- src/esdl2.erl | 16 +++++++++++++ src/esdl2_app.erl | 25 +++++++++++++++++++ src/esdl2_callbacks.erl | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ src/esdl2_sup.erl | 27 +++++++++++++++++++++ src/sdl.erl | 21 +++++++++++++--- src/sdl_hints.erl | 30 +++++++++++++++++++++++ 6 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 src/esdl2_app.erl create mode 100644 src/esdl2_callbacks.erl create mode 100644 src/esdl2_sup.erl create mode 100644 src/sdl_hints.erl (limited to 'src') diff --git a/src/esdl2.erl b/src/esdl2.erl index 3e0db38..7bacb71 100644 --- a/src/esdl2.erl +++ b/src/esdl2.erl @@ -14,6 +14,9 @@ -module(esdl2). +%% internal +-export([register_callback_process/0]). + %% sdl -export([init/1]). -export([init_subsystem/1]). @@ -53,6 +56,9 @@ -export([gl_create_context/1]). -export([gl_swap_window/1]). +%% sdl_hints +-export([add_hint_callback/3]). + %% sdl_keyboard -export([is_text_input_active/0]). -export([start_text_input/0]). @@ -137,6 +143,8 @@ -export([set_window_title/2]). -export([show_window/1]). +%% internal + %% @todo We probably want to accept an env variable or somthing for the location. -on_load(on_load/0). on_load() -> @@ -149,6 +157,9 @@ on_load() -> end, erlang:load_nif(filename:join(PrivDir, atom_to_list(?MODULE)), 0). +register_callback_process() -> + erlang:nif_error({not_loaded, ?MODULE}). + %% sdl init(_) -> @@ -242,6 +253,11 @@ gl_create_context(_) -> gl_swap_window(_) -> erlang:nif_error({not_loaded, ?MODULE}). +%% sdl_hints + +add_hint_callback(_, _, _) -> + erlang:nif_error({not_loaded, ?MODULE}). + %% sdl_keyboard is_text_input_active() -> diff --git a/src/esdl2_app.erl b/src/esdl2_app.erl new file mode 100644 index 0000000..2e90bcb --- /dev/null +++ b/src/esdl2_app.erl @@ -0,0 +1,25 @@ +%% Copyright (c) 2015, Loïc Hoguin +%% +%% Permission to use, copy, modify, and/or distribute this software for any +%% purpose with or without fee is hereby granted, provided that the above +%% copyright notice and this permission notice appear in all copies. +%% +%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-module(esdl2_app). +-behaviour(application). + +-export([start/2]). +-export([stop/1]). + +start(_, _) -> + esdl2_sup:start_link(). + +stop(_) -> + ok. diff --git a/src/esdl2_callbacks.erl b/src/esdl2_callbacks.erl new file mode 100644 index 0000000..d683992 --- /dev/null +++ b/src/esdl2_callbacks.erl @@ -0,0 +1,64 @@ +%% Copyright (c) 2015, Loïc Hoguin +%% +%% Permission to use, copy, modify, and/or distribute this software for any +%% purpose with or without fee is hereby granted, provided that the above +%% copyright notice and this permission notice appear in all copies. +%% +%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-module(esdl2_callbacks). +-behaviour(gen_server). + +%% API. +-export([start_link/0]). + +%% gen_server. +-export([init/1]). +-export([handle_call/3]). +-export([handle_cast/2]). +-export([handle_info/2]). +-export([terminate/2]). +-export([code_change/3]). + +-record(state, { +}). + +%% API. + +-spec start_link() -> {ok, pid()}. +start_link() -> + gen_server:start_link(?MODULE, [], []). + +%% gen_server. + +init([]) -> + ok = esdl2:register_callback_process(), + {ok, #state{}}. + +handle_call(_Request, _From, State) -> + {reply, ignored, State}. + +handle_cast(_Msg, State) -> + {noreply, State}. + +handle_info({callback, M, F, A}, State) -> + try + apply(M, F, A) + catch Class:Reason -> + error_logger:error_msg("Exception ~p:~p with callback:~n{~p,~p,~p}~n", [Class, Reason, M, F, A]) + end, + {noreply, State}; +handle_info(_Info, State) -> + {noreply, State}. + +terminate(_Reason, _State) -> + ok. + +code_change(_OldVsn, State, _Extra) -> + {ok, State}. diff --git a/src/esdl2_sup.erl b/src/esdl2_sup.erl new file mode 100644 index 0000000..bacda01 --- /dev/null +++ b/src/esdl2_sup.erl @@ -0,0 +1,27 @@ +%% Copyright (c) 2015, Loïc Hoguin +%% +%% Permission to use, copy, modify, and/or distribute this software for any +%% purpose with or without fee is hereby granted, provided that the above +%% copyright notice and this permission notice appear in all copies. +%% +%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-module(esdl2_sup). +-behaviour(supervisor). + +-export([start_link/0]). +-export([init/1]). + +start_link() -> + supervisor:start_link({local, ?MODULE}, ?MODULE, []). + +init([]) -> + {ok, {#{}, [ + #{id => esdl2_callbacks, start => {esdl2_callbacks, start_link, []}} + ]}}. diff --git a/src/sdl.erl b/src/sdl.erl index 5391d32..8706eff 100644 --- a/src/sdl.erl +++ b/src/sdl.erl @@ -33,10 +33,25 @@ start() -> start([]). --spec start([subsystem()]) -> ok | error(). +-spec start([subsystem()]) -> ok | {application_start_error, term()} | error(). start(Subsystems) -> - esdl2:init(Subsystems), - receive {'_nif_thread_ret_', Ret} -> Ret end. + case ensure_started() of + ok -> + esdl2:init(Subsystems), + receive {'_nif_thread_ret_', Ret} -> Ret end; + Error -> + Error + end. + +ensure_started() -> + case application:start(esdl2) of + ok -> + ok; + {error, {already_started, esdl2}} -> + ok; + {error, Reason} -> + {application_start_error, Reason} + end. -spec stop() -> ok. stop() -> diff --git a/src/sdl_hints.erl b/src/sdl_hints.erl new file mode 100644 index 0000000..a6921b0 --- /dev/null +++ b/src/sdl_hints.erl @@ -0,0 +1,30 @@ +%% Copyright (c) 2015, Loïc Hoguin +%% +%% Permission to use, copy, modify, and/or distribute this software for any +%% purpose with or without fee is hereby granted, provided that the above +%% copyright notice and this permission notice appear in all copies. +%% +%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-module(sdl_hints). + +-export([add_callback/3]). +-export([test_callback/3]). + +%% The hint names are the same as the environment variable names +%% that SDL2 accepts. + +-spec add_callback(string(), module(), atom()) -> ok. +add_callback(Hint, Module, Function) -> + esdl2:add_hint_callback(Hint, Module, Function). + +%% This callback can be used to test hints. +-spec test_callback(string(), undefined | string(), undefined | string()) -> ok. +test_callback(Hint, OldValue, NewValue) -> + io:format("Hint ~p has value changed from ~p to ~p~n", [Hint, OldValue, NewValue]). -- cgit v1.2.3