diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/config.c | 49 | ||||
| -rw-r--r-- | examples/config.h | 9 | ||||
| -rw-r--r-- | examples/output-layout.c | 176 | ||||
| -rw-r--r-- | examples/pointer.c | 36 |
4 files changed, 120 insertions, 150 deletions
diff --git a/examples/config.c b/examples/config.c index 954edb06..6796ea66 100644 --- a/examples/config.c +++ b/examples/config.c @@ -255,49 +255,14 @@ void example_config_destroy(struct example_config *config) { free(config); } -struct wlr_output_layout *configure_layout(struct example_config *config, - struct wl_list *outputs) { - struct wlr_output_layout *layout = wlr_output_layout_init(); - int max_x = INT_MIN; - int max_x_y = INT_MIN; // y value for the max_x output - - // first add all the configured outputs - struct output_state *output; - wl_list_for_each(output, outputs, link) { - struct output_config *conf; - wl_list_for_each(conf, &config->outputs, link) { - if (strcmp(conf->name, output->output->name) == 0) { - wlr_output_layout_add(layout, output->output, - conf->x, conf->y); - wlr_output_transform(output->output, conf->transform); - int width, height; - wlr_output_effective_resolution(output->output, &width, - &height); - if (conf->x + width > max_x) { - max_x = conf->x + width; - max_x_y = conf->y; - } - break; - } - } - } - - if (max_x == INT_MIN) { - // couldn't find a configured output - max_x = 0; - max_x_y = 0; - } - - // now add all the other configured outputs in a sensible position - wl_list_for_each(output, outputs, link) { - if (wlr_output_layout_get(layout, output->output)) { - continue; +struct output_config *example_config_get_output(struct example_config *config, + struct wlr_output *output) { + struct output_config *o_config; + wl_list_for_each(o_config, &config->outputs, link) { + if (strcmp(o_config->name, output->name) == 0) { + return o_config; } - wlr_output_layout_add(layout, output->output, max_x, max_x_y); - int width, height; - wlr_output_effective_resolution(output->output, &width, &height); - max_x += width; } - return layout; + return NULL; } diff --git a/examples/config.h b/examples/config.h index 2a69c4f4..bc2e101b 100644 --- a/examples/config.h +++ b/examples/config.h @@ -34,6 +34,11 @@ struct example_config *parse_args(int argc, char *argv[]); void example_config_destroy(struct example_config *config); -struct wlr_output_layout *configure_layout(struct example_config *config, - struct wl_list *outputs); +/** + * Get configuration for the output. If the output is not configured, returns + * NULL. + */ +struct output_config *example_config_get_output(struct example_config *config, + struct wlr_output *output); + #endif diff --git a/examples/output-layout.c b/examples/output-layout.c index 90ad558f..c3e3e6d2 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -32,11 +32,70 @@ struct sample_state { struct wlr_output_layout *layout; float x_offs, y_offs; float x_vel, y_vel; - struct wlr_output *main_output; - struct wl_list outputs; + struct timespec ts_last; }; -static void handle_output_frame(struct output_state *output, struct timespec *ts) { +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; @@ -44,105 +103,50 @@ 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)) { + 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); + + 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); 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 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; -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); + 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); +static void handle_output_remove(struct output_state *ostate) { + struct sample_state *sample = ostate->compositor->data; + wlr_output_layout_remove(sample->layout, ostate->output); } static void update_velocities(struct compositor_state *state, @@ -152,8 +156,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 @@ -182,15 +186,15 @@ 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); - wl_list_init(&state.outputs); state.config = parse_args(argc, 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.output_resolution_cb = handle_output_resolution; compositor.keyboard_key_cb = handle_keyboard_key; compositor_init(&compositor); diff --git a/examples/pointer.c b/examples/pointer.c index d9a06339..fe0e2cee 100644 --- a/examples/pointer.c +++ b/examples/pointer.c @@ -132,11 +132,16 @@ static void handle_output_add(struct output_state *ostate) { struct wlr_output *wlr_output = ostate->output; struct wlr_xcursor_image *image = sample->xcursor->images[0]; - // reset layout - wlr_output_layout_destroy(sample->layout); - sample->layout = - configure_layout(sample->config, &ostate->compositor->outputs); - wlr_cursor_attach_output_layout(sample->cursor, sample->layout); + 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); + } // cursor configuration char *mapped_output = sample->config->cursor.mapped_output; @@ -158,11 +163,9 @@ 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; - wlr_output_layout_destroy(sample->layout); - sample->layout = - configure_layout(sample->config, &ostate->compositor->outputs); - wlr_cursor_attach_output_layout(sample->cursor, sample->layout); + struct sample_state *sample = ostate->compositor->data; + + wlr_output_layout_remove(sample->layout, ostate->output); configure_devices(sample); @@ -172,15 +175,6 @@ static void handle_output_remove(struct output_state *ostate) { } } -static void handle_output_resolution(struct compositor_state *state, - struct output_state *ostate) { - struct sample_state *sample = ostate->compositor->data; - wlr_output_layout_destroy(sample->layout); - sample->layout = - configure_layout(sample->config, &ostate->compositor->outputs); - wlr_cursor_attach_output_layout(sample->cursor, sample->layout); -} - static void handle_input_add(struct compositor_state *state, struct wlr_input_device *device) { struct sample_state *sample = state->data; @@ -341,6 +335,8 @@ int main(int argc, char *argv[]) { state.config = parse_args(argc, argv); state.cursor = wlr_cursor_create(); + state.layout = wlr_output_layout_init(); + wlr_cursor_attach_output_layout(state.cursor, state.layout); wlr_cursor_map_to_region(state.cursor, state.config->cursor.mapped_box); wl_list_init(&state.devices); @@ -380,7 +376,6 @@ int main(int argc, char *argv[]) { compositor.data = &state; compositor.output_add_cb = handle_output_add; compositor.output_remove_cb = handle_output_remove; - compositor.output_resolution_cb = handle_output_resolution; compositor.output_frame_cb = handle_output_frame; compositor.input_add_cb = handle_input_add; compositor.input_remove_cb = handle_input_remove; @@ -407,4 +402,5 @@ int main(int argc, char *argv[]) { wlr_xcursor_theme_destroy(theme); example_config_destroy(state.config); wlr_cursor_destroy(state.cursor); + wlr_output_layout_destroy(state.layout); } |