diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-08-30 10:43:48 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-08-31 07:47:44 -0400 |
| commit | f8e4ba3f5fbb50ff3875dd6d55d9ca05ef889c3c (patch) | |
| tree | 2a85ce28940dfb824d4cb2e9022fc18e82630e23 /examples | |
| parent | 40bd6bcc437c219b9045f796f7a572903307c6b0 (diff) | |
cleanup output-layout example
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/output-layout.c | 22 |
1 files changed, 13 insertions, 9 deletions
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 |