From f0a6efcfcd92d6731606a33f01908566ee3c9acc Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 6 Jun 2017 11:19:42 -0400 Subject: example/main.c -> example/simple.c --- example/CMakeLists.txt | 6 +- example/main.c | 156 ------------------------------------------------- example/simple.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 159 deletions(-) delete mode 100644 example/main.c create mode 100644 example/simple.c diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 76080c40..ba96cc02 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -2,11 +2,11 @@ include_directories( ${DRM_INCLUDE_DIRS} ) -add_executable(example - main.c +add_executable(simple + simple.c ) -target_link_libraries(example +target_link_libraries(simple wlr-backend wlr-session ) diff --git a/example/main.c b/example/main.c deleted file mode 100644 index 1f92bbe7..00000000 --- a/example/main.c +++ /dev/null @@ -1,156 +0,0 @@ -#define _POSIX_C_SOURCE 199309L -#include -#include -#include -#include -#include -#include -#include -#include - -struct state { - float color[3]; - int dec; - struct timespec last_frame; - struct wl_listener output_add; - struct wl_listener output_remove; - struct wl_list outputs; -}; - -struct output_state { - struct wl_list link; - struct wlr_output *output; - struct state *state; - struct wl_listener frame; -}; - -void output_frame(struct wl_listener *listener, void *data) { - struct output_state *ostate = wl_container_of(listener, ostate, frame); - struct state *s = ostate->state; - - struct timespec now; - clock_gettime(CLOCK_MONOTONIC, &now); - - long ms = (now.tv_sec - s->last_frame.tv_sec) * 1000 + - (now.tv_nsec - s->last_frame.tv_nsec) / 1000000; - int inc = (s->dec + 1) % 3; - - s->color[inc] += ms / 2000.0f; - s->color[s->dec] -= ms / 2000.0f; - - if (s->color[s->dec] < 0.0f) { - s->color[inc] = 1.0f; - s->color[s->dec] = 0.0f; - s->dec = inc; - } - - s->last_frame = now; - - glClearColor(s->color[0], s->color[1], s->color[2], 1.0); - glClear(GL_COLOR_BUFFER_BIT); -} - -void output_add(struct wl_listener *listener, void *data) { - struct wlr_output *output = data; - struct state *state = wl_container_of(listener, state, output_add); - fprintf(stderr, "Output '%s' added\n", output->name); - wlr_output_set_mode(output, output->modes->items[0]); - struct output_state *ostate = calloc(1, sizeof(struct output_state)); - ostate->output = output; - ostate->state = state; - ostate->frame.notify = output_frame; - wl_list_init(&ostate->frame.link); - wl_signal_add(&output->events.frame, &ostate->frame); - wl_list_insert(&state->outputs, &ostate->link); -} - -void output_remove(struct wl_listener *listener, void *data) { - struct wlr_output *output = data; - struct state *state = wl_container_of(listener, state, output_remove); - struct output_state *ostate = NULL, *_ostate; - wl_list_for_each(_ostate, &state->outputs, link) { - if (_ostate->output == output) { - ostate = _ostate; - break; - } - } - if (!ostate) { - return; // We are unfamiliar with this output - } - wl_list_remove(&ostate->link); - wl_list_remove(&ostate->frame.link); -} - -int timer_done(void *data) { - *(bool *)data = true; - return 1; -} - -int enable_outputs(void *data) { - struct state *state = data; - struct output_state *ostate; - wl_list_for_each(ostate, &state->outputs, link) { - struct wlr_output *output = ostate->output; - wlr_output_enable(output, true); - } - return 1; -} - -int disable_outputs(void *data) { - struct state *state = data; - struct output_state *ostate; - wl_list_for_each(ostate, &state->outputs, link) { - struct wlr_output *output = ostate->output; - wlr_output_enable(output, false); - } - return 1; -} - -int main() { - struct state state = { - .color = { 1.0, 0.0, 0.0 }, - .dec = 0, - .output_add = { .notify = output_add }, - .output_remove = { .notify = output_remove } - }; - - wl_list_init(&state.outputs); - wl_list_init(&state.output_add.link); - wl_list_init(&state.output_remove.link); - clock_gettime(CLOCK_MONOTONIC, &state.last_frame); - - struct wl_display *display = wl_display_create(); - struct wl_event_loop *event_loop = wl_display_get_event_loop(display); - - struct wlr_session *session = wlr_session_start(display); - if (!session) { - return 1; - } - - struct wlr_backend *wlr = wlr_backend_autocreate(display, session); - wl_signal_add(&wlr->events.output_add, &state.output_add); - wl_signal_add(&wlr->events.output_remove, &state.output_remove); - if (!wlr || !wlr_backend_init(wlr)) { - return 1; - } - - bool done = false; - struct wl_event_source *timer = wl_event_loop_add_timer(event_loop, - timer_done, &done); - struct wl_event_source *timer_disable_outputs = - wl_event_loop_add_timer(event_loop, disable_outputs, &state); - struct wl_event_source *timer_enable_outputs = - wl_event_loop_add_timer(event_loop, enable_outputs, &state); - - wl_event_source_timer_update(timer, 20000); - wl_event_source_timer_update(timer_disable_outputs, 5000); - wl_event_source_timer_update(timer_enable_outputs, 10000); - - while (!done) { - wl_event_loop_dispatch(event_loop, 0); - } - - wl_event_source_remove(timer); - wlr_backend_destroy(wlr); - wl_display_destroy(display); -} diff --git a/example/simple.c b/example/simple.c new file mode 100644 index 00000000..1f92bbe7 --- /dev/null +++ b/example/simple.c @@ -0,0 +1,156 @@ +#define _POSIX_C_SOURCE 199309L +#include +#include +#include +#include +#include +#include +#include +#include + +struct state { + float color[3]; + int dec; + struct timespec last_frame; + struct wl_listener output_add; + struct wl_listener output_remove; + struct wl_list outputs; +}; + +struct output_state { + struct wl_list link; + struct wlr_output *output; + struct state *state; + struct wl_listener frame; +}; + +void output_frame(struct wl_listener *listener, void *data) { + struct output_state *ostate = wl_container_of(listener, ostate, frame); + struct state *s = ostate->state; + + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + + long ms = (now.tv_sec - s->last_frame.tv_sec) * 1000 + + (now.tv_nsec - s->last_frame.tv_nsec) / 1000000; + int inc = (s->dec + 1) % 3; + + s->color[inc] += ms / 2000.0f; + s->color[s->dec] -= ms / 2000.0f; + + if (s->color[s->dec] < 0.0f) { + s->color[inc] = 1.0f; + s->color[s->dec] = 0.0f; + s->dec = inc; + } + + s->last_frame = now; + + glClearColor(s->color[0], s->color[1], s->color[2], 1.0); + glClear(GL_COLOR_BUFFER_BIT); +} + +void output_add(struct wl_listener *listener, void *data) { + struct wlr_output *output = data; + struct state *state = wl_container_of(listener, state, output_add); + fprintf(stderr, "Output '%s' added\n", output->name); + wlr_output_set_mode(output, output->modes->items[0]); + struct output_state *ostate = calloc(1, sizeof(struct output_state)); + ostate->output = output; + ostate->state = state; + ostate->frame.notify = output_frame; + wl_list_init(&ostate->frame.link); + wl_signal_add(&output->events.frame, &ostate->frame); + wl_list_insert(&state->outputs, &ostate->link); +} + +void output_remove(struct wl_listener *listener, void *data) { + struct wlr_output *output = data; + struct state *state = wl_container_of(listener, state, output_remove); + struct output_state *ostate = NULL, *_ostate; + wl_list_for_each(_ostate, &state->outputs, link) { + if (_ostate->output == output) { + ostate = _ostate; + break; + } + } + if (!ostate) { + return; // We are unfamiliar with this output + } + wl_list_remove(&ostate->link); + wl_list_remove(&ostate->frame.link); +} + +int timer_done(void *data) { + *(bool *)data = true; + return 1; +} + +int enable_outputs(void *data) { + struct state *state = data; + struct output_state *ostate; + wl_list_for_each(ostate, &state->outputs, link) { + struct wlr_output *output = ostate->output; + wlr_output_enable(output, true); + } + return 1; +} + +int disable_outputs(void *data) { + struct state *state = data; + struct output_state *ostate; + wl_list_for_each(ostate, &state->outputs, link) { + struct wlr_output *output = ostate->output; + wlr_output_enable(output, false); + } + return 1; +} + +int main() { + struct state state = { + .color = { 1.0, 0.0, 0.0 }, + .dec = 0, + .output_add = { .notify = output_add }, + .output_remove = { .notify = output_remove } + }; + + wl_list_init(&state.outputs); + wl_list_init(&state.output_add.link); + wl_list_init(&state.output_remove.link); + clock_gettime(CLOCK_MONOTONIC, &state.last_frame); + + struct wl_display *display = wl_display_create(); + struct wl_event_loop *event_loop = wl_display_get_event_loop(display); + + struct wlr_session *session = wlr_session_start(display); + if (!session) { + return 1; + } + + struct wlr_backend *wlr = wlr_backend_autocreate(display, session); + wl_signal_add(&wlr->events.output_add, &state.output_add); + wl_signal_add(&wlr->events.output_remove, &state.output_remove); + if (!wlr || !wlr_backend_init(wlr)) { + return 1; + } + + bool done = false; + struct wl_event_source *timer = wl_event_loop_add_timer(event_loop, + timer_done, &done); + struct wl_event_source *timer_disable_outputs = + wl_event_loop_add_timer(event_loop, disable_outputs, &state); + struct wl_event_source *timer_enable_outputs = + wl_event_loop_add_timer(event_loop, enable_outputs, &state); + + wl_event_source_timer_update(timer, 20000); + wl_event_source_timer_update(timer_disable_outputs, 5000); + wl_event_source_timer_update(timer_enable_outputs, 10000); + + while (!done) { + wl_event_loop_dispatch(event_loop, 0); + } + + wl_event_source_remove(timer); + wlr_backend_destroy(wlr); + wl_display_destroy(display); +} -- cgit v1.2.3