From 40bd6bcc437c219b9045f796f7a572903307c6b0 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Wed, 30 Aug 2017 10:39:22 -0400 Subject: implement output layout auto configuration --- examples/output-layout.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'examples/output-layout.c') diff --git a/examples/output-layout.c b/examples/output-layout.c index 90ad558f..a207e9ce 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -129,20 +129,22 @@ static void set_main_output(struct sample_state *sample, sample->y_offs = l_output->y + 200; } -static void handle_output_resolution(struct compositor_state *state, struct output_state *output) { - struct sample_state *sample = state->data; - wlr_output_layout_destroy(sample->layout); - sample->layout = configure_layout(sample->config, &sample->outputs); - set_main_output(sample, output->output); - -} +static void handle_output_add(struct output_state *ostate) { + struct sample_state *sample = ostate->compositor->data; + wl_list_insert(&sample->outputs, &ostate->link); + + struct output_config *o_config = + example_config_get_output(sample->config, ostate->output); + + if (o_config) { + wlr_output_transform(ostate->output, o_config->transform); + wlr_output_layout_add(sample->layout, ostate->output, o_config->x, + o_config->y); + } else { + wlr_output_layout_add_auto(sample->layout, ostate->output); + } -static void handle_output_add(struct output_state *output) { - struct sample_state *sample = output->compositor->data; - wl_list_insert(&sample->outputs, &output->link); - wlr_output_layout_destroy(sample->layout); - sample->layout = configure_layout(sample->config, &sample->outputs); - set_main_output(sample, output->output); + set_main_output(sample, ostate->output); } static void update_velocities(struct compositor_state *state, @@ -190,7 +192,6 @@ int main(int argc, char *argv[]) { compositor.data = &state; compositor.output_add_cb = handle_output_add; compositor.output_frame_cb = handle_output_frame; - compositor.output_resolution_cb = handle_output_resolution; compositor.keyboard_key_cb = handle_keyboard_key; compositor_init(&compositor); -- cgit v1.2.3 From f8e4ba3f5fbb50ff3875dd6d55d9ca05ef889c3c Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Wed, 30 Aug 2017 10:43:48 -0400 Subject: cleanup output-layout example --- examples/output-layout.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'examples/output-layout.c') diff --git a/examples/output-layout.c b/examples/output-layout.c index a207e9ce..7d2f4643 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -36,7 +36,8 @@ struct sample_state { struct wl_list outputs; }; -static void handle_output_frame(struct output_state *output, struct timespec *ts) { +static void handle_output_frame(struct output_state *output, + struct timespec *ts) { struct compositor_state *state = output->compositor; struct sample_state *sample = state->data; struct wlr_output *wlr_output = output->output; @@ -44,16 +45,18 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts wlr_output_make_current(wlr_output); wlr_renderer_begin(sample->renderer, wlr_output); - if (wlr_output_layout_intersects(sample->layout, output->output, - sample->x_offs, sample->y_offs, - sample->x_offs + 128, sample->y_offs + 128)) { + bool intersects = wlr_output_layout_intersects(sample->layout, + output->output, sample->x_offs, sample->y_offs, + sample->x_offs + 128, sample->y_offs + 128); + + if (intersects) { float matrix[16]; // transform global coordinates to local coordinates double local_x = sample->x_offs; double local_y = sample->y_offs; - wlr_output_layout_output_coords(sample->layout, output->output, &local_x, - &local_y); + wlr_output_layout_output_coords(sample->layout, output->output, + &local_x, &local_y); wlr_texture_get_matrix(sample->cat_texture, &matrix, &wlr_output->transform_matrix, local_x, local_y); @@ -89,7 +92,8 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts if (ur_collision && ul_collision && ll_collision && lr_collision) { // oops we went off the screen somehow struct wlr_output_layout_output *main_l_output; - main_l_output = wlr_output_layout_get(sample->layout, sample->main_output); + main_l_output = + wlr_output_layout_get(sample->layout, sample->main_output); sample->x_offs = main_l_output->x + 20; sample->y_offs = main_l_output->y + 20; } else if (ur_collision && ul_collision) { @@ -154,8 +158,8 @@ static void update_velocities(struct compositor_state *state, sample->y_vel += y_diff; } -static void handle_keyboard_key(struct keyboard_state *kbstate, uint32_t keycode, - xkb_keysym_t sym, enum wlr_key_state key_state) { +static void handle_keyboard_key(struct keyboard_state *kbstate, + uint32_t keycode, xkb_keysym_t sym, enum wlr_key_state key_state) { // NOTE: It may be better to simply refer to our key state during each frame // and make this change in pixels/sec^2 // Also, key repeat -- cgit v1.2.3 From fa3d4ecc849f4228dac56e34872fa97b02aab273 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Wed, 30 Aug 2017 13:14:52 -0400 Subject: fix layout hotplugging issue in output-layout.c --- examples/output-layout.c | 24 ++++++++++++++---------- types/wlr_output_layout.c | 1 + 2 files changed, 15 insertions(+), 10 deletions(-) (limited to 'examples/output-layout.c') diff --git a/examples/output-layout.c b/examples/output-layout.c index 7d2f4643..ee23a35e 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -42,6 +42,10 @@ static void handle_output_frame(struct output_state *output, struct sample_state *sample = state->data; struct wlr_output *wlr_output = output->output; + if (sample->main_output == NULL) { + sample->main_output = wlr_output; + } + wlr_output_make_current(wlr_output); wlr_renderer_begin(sample->renderer, wlr_output); @@ -124,15 +128,6 @@ static void handle_output_frame(struct output_state *output, } } -static void set_main_output(struct sample_state *sample, - struct wlr_output *output) { - sample->main_output = output; - struct wlr_output_layout_output *l_output; - l_output = wlr_output_layout_get(sample->layout, output); - sample->x_offs = l_output->x + 200; - sample->y_offs = l_output->y + 200; -} - static void handle_output_add(struct output_state *ostate) { struct sample_state *sample = ostate->compositor->data; wl_list_insert(&sample->outputs, &ostate->link); @@ -147,8 +142,16 @@ static void handle_output_add(struct output_state *ostate) { } else { wlr_output_layout_add_auto(sample->layout, ostate->output); } +} + +static void handle_output_remove(struct output_state *ostate) { + struct sample_state *sample = ostate->compositor->data; + + if (sample->main_output == ostate->output) { + sample->main_output = NULL; + } - set_main_output(sample, ostate->output); + wlr_output_layout_remove(sample->layout, ostate->output); } static void update_velocities(struct compositor_state *state, @@ -195,6 +198,7 @@ int main(int argc, char *argv[]) { struct compositor_state compositor = { 0 }; compositor.data = &state; compositor.output_add_cb = handle_output_add; + compositor.output_remove_cb = handle_output_remove; compositor.output_frame_cb = handle_output_frame; compositor.keyboard_key_cb = handle_keyboard_key; compositor_init(&compositor); diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c index 38c4b50c..503b9ec7 100644 --- a/types/wlr_output_layout.c +++ b/types/wlr_output_layout.c @@ -29,6 +29,7 @@ struct wlr_output_layout *wlr_output_layout_init() { static void wlr_output_layout_output_destroy( struct wlr_output_layout_output *l_output) { + wl_list_remove(&l_output->state->resolution.link); wl_list_remove(&l_output->link); free(l_output->state->_box); free(l_output->state); -- cgit v1.2.3 From 35eee80f9bf16683c56b9ed7d343efcdf0ae86d0 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Wed, 30 Aug 2017 13:50:13 -0400 Subject: remove unused outputs list in output-layout.c --- examples/output-layout.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'examples/output-layout.c') diff --git a/examples/output-layout.c b/examples/output-layout.c index ee23a35e..ff36c379 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -33,7 +33,6 @@ struct sample_state { float x_offs, y_offs; float x_vel, y_vel; struct wlr_output *main_output; - struct wl_list outputs; }; static void handle_output_frame(struct output_state *output, @@ -130,7 +129,6 @@ static void handle_output_frame(struct output_state *output, static void handle_output_add(struct output_state *ostate) { struct sample_state *sample = ostate->compositor->data; - wl_list_insert(&sample->outputs, &ostate->link); struct output_config *o_config = example_config_get_output(sample->config, ostate->output); @@ -192,7 +190,6 @@ int main(int argc, char *argv[]) { state.y_vel = 500; state.layout = wlr_output_layout_init(); - wl_list_init(&state.outputs); state.config = parse_args(argc, argv); struct compositor_state compositor = { 0 }; -- cgit v1.2.3 From 6d26fda57c4b8345e79cda66dc243683b8c1d453 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Thu, 31 Aug 2017 23:43:02 -0400 Subject: use monotonic clock time for animations --- examples/output-layout.c | 130 +++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 66 deletions(-) (limited to 'examples/output-layout.c') diff --git a/examples/output-layout.c b/examples/output-layout.c index ff36c379..c3e3e6d2 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -32,22 +32,79 @@ struct sample_state { struct wlr_output_layout *layout; float x_offs, y_offs; float x_vel, y_vel; - struct wlr_output *main_output; + struct timespec ts_last; }; +static void animate_cat(struct sample_state *sample, + struct wlr_output *output) { + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + long ms = (ts.tv_sec - sample->ts_last.tv_sec) * 1000 + + (ts.tv_nsec - sample->ts_last.tv_nsec) / 1000000; + // how many seconds have passed since the last time we animated + float seconds = ms / 1000.0f; + + if (seconds > 0.1f) { + // XXX when we switch vt, the rendering loop stops so try to detect + // that and pause when it happens. + seconds = 0.0f; + } + + // check for collisions and bounce + bool ur_collision = !wlr_output_layout_output_at(sample->layout, + sample->x_offs + 128, sample->y_offs); + bool ul_collision = !wlr_output_layout_output_at(sample->layout, + sample->x_offs, sample->y_offs); + bool ll_collision = !wlr_output_layout_output_at(sample->layout, + sample->x_offs, sample->y_offs + 128); + bool lr_collision = !wlr_output_layout_output_at(sample->layout, + sample->x_offs + 128, sample->y_offs + 128); + + if (ur_collision && ul_collision && ll_collision && lr_collision) { + // oops we went off the screen somehow + struct wlr_output_layout_output *l_output = + wlr_output_layout_get(sample->layout, output); + sample->x_offs = l_output->x + 20; + sample->y_offs = l_output->y + 20; + } else if (ur_collision && ul_collision) { + sample->y_vel = fabs(sample->y_vel); + } else if (lr_collision && ll_collision) { + sample->y_vel = -fabs(sample->y_vel); + } else if (ll_collision && ul_collision) { + sample->x_vel = fabs(sample->x_vel); + } else if (ur_collision && lr_collision) { + sample->x_vel = -fabs(sample->x_vel); + } else { + if (ur_collision || lr_collision) { + sample->x_vel = -fabs(sample->x_vel); + } + if (ul_collision || ll_collision) { + sample->x_vel = fabs(sample->x_vel); + } + if (ul_collision || ur_collision) { + sample->y_vel = fabs(sample->y_vel); + } + if (ll_collision || lr_collision) { + sample->y_vel = -fabs(sample->y_vel); + } + } + + sample->x_offs += sample->x_vel * seconds; + sample->y_offs += sample->y_vel * seconds; + sample->ts_last = ts; +} + static void handle_output_frame(struct output_state *output, struct timespec *ts) { struct compositor_state *state = output->compositor; struct sample_state *sample = state->data; struct wlr_output *wlr_output = output->output; - if (sample->main_output == NULL) { - sample->main_output = wlr_output; - } - wlr_output_make_current(wlr_output); wlr_renderer_begin(sample->renderer, wlr_output); + animate_cat(sample, output->output); + bool intersects = wlr_output_layout_intersects(sample->layout, output->output, sample->x_offs, sample->y_offs, sample->x_offs + 128, sample->y_offs + 128); @@ -65,66 +122,11 @@ static void handle_output_frame(struct output_state *output, &wlr_output->transform_matrix, local_x, local_y); wlr_render_with_matrix(sample->renderer, sample->cat_texture, &matrix); + } wlr_renderer_end(sample->renderer); wlr_output_swap_buffers(wlr_output); - - if (output->output == sample->main_output) { - long ms = (ts->tv_sec - output->last_frame.tv_sec) * 1000 + - (ts->tv_nsec - output->last_frame.tv_nsec) / 1000000; - // how many seconds have passed since the last frame - float seconds = ms / 1000.0f; - - if (seconds > 0.1f) { - // XXX when we switch vt, the rendering loop stops so try to detect - // that and pause when it happens. - seconds = 0.0f; - } - - // check for collisions and bounce - bool ur_collision = !wlr_output_layout_output_at(sample->layout, - sample->x_offs + 128, sample->y_offs); - bool ul_collision = !wlr_output_layout_output_at(sample->layout, - sample->x_offs, sample->y_offs); - bool ll_collision = !wlr_output_layout_output_at(sample->layout, - sample->x_offs, sample->y_offs + 128); - bool lr_collision = !wlr_output_layout_output_at(sample->layout, - sample->x_offs + 128, sample->y_offs + 128); - - if (ur_collision && ul_collision && ll_collision && lr_collision) { - // oops we went off the screen somehow - struct wlr_output_layout_output *main_l_output; - main_l_output = - wlr_output_layout_get(sample->layout, sample->main_output); - sample->x_offs = main_l_output->x + 20; - sample->y_offs = main_l_output->y + 20; - } else if (ur_collision && ul_collision) { - sample->y_vel = fabs(sample->y_vel); - } else if (lr_collision && ll_collision) { - sample->y_vel = -fabs(sample->y_vel); - } else if (ll_collision && ul_collision) { - sample->x_vel = fabs(sample->x_vel); - } else if (ur_collision && lr_collision) { - sample->x_vel = -fabs(sample->x_vel); - } else { - if (ur_collision || lr_collision) { - sample->x_vel = -fabs(sample->x_vel); - } - if (ul_collision || ll_collision) { - sample->x_vel = fabs(sample->x_vel); - } - if (ul_collision || ur_collision) { - sample->y_vel = fabs(sample->y_vel); - } - if (ll_collision || lr_collision) { - sample->y_vel = -fabs(sample->y_vel); - } - } - - sample->x_offs += sample->x_vel * seconds; - sample->y_offs += sample->y_vel * seconds; - } } static void handle_output_add(struct output_state *ostate) { @@ -144,11 +146,6 @@ static void handle_output_add(struct output_state *ostate) { static void handle_output_remove(struct output_state *ostate) { struct sample_state *sample = ostate->compositor->data; - - if (sample->main_output == ostate->output) { - sample->main_output = NULL; - } - wlr_output_layout_remove(sample->layout, ostate->output); } @@ -189,6 +186,7 @@ int main(int argc, char *argv[]) { state.x_vel = 500; state.y_vel = 500; state.layout = wlr_output_layout_init(); + clock_gettime(CLOCK_MONOTONIC, &state.ts_last); state.config = parse_args(argc, argv); -- cgit v1.2.3