itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made output layout example standalone

Browse Source
master
Timidger 7 years ago
parent 8fd25cbc5b
commit 583654405f
No known key found for this signature in database
GPG Key ID: 42EF7ECE5FEF1D17
1 changed files with 150 additions and 66 deletions
Show Stats Download Patch File Download Diff File

216
examples/output-layout.c
Unescape View File

@ -1,4 +1,4 @@
#define _POSIX_C_SOURCE 199309L #define _POSIX_C_SOURCE 200112L
#define _XOPEN_SOURCE 700 #define _XOPEN_SOURCE 700
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <limits.h> #include <limits.h>
@ -16,16 +16,17 @@
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_keyboard.h> #include <wlr/types/wlr_keyboard.h>
#include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_matrix.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include "support/cat.h" #include "cat.h"
#include "support/config.h"
#include "support/shared.h"
struct sample_state { struct sample_state {
struct example_config *config; struct wl_display *display;
struct wl_listener new_output;
struct wl_listener new_input;
struct wlr_renderer *renderer; struct wlr_renderer *renderer;
struct wlr_texture *cat_texture; struct wlr_texture *cat_texture;
struct wlr_output_layout *layout; struct wlr_output_layout *layout;
@ -34,6 +35,20 @@ struct sample_state {
struct timespec ts_last; struct timespec ts_last;
}; };
struct sample_output {
struct sample_state *sample;
struct wlr_output *output;
struct wl_listener frame;
struct wl_listener destroy;
};
struct sample_keyboard {
struct sample_state *sample;
struct wlr_input_device *device;
struct wl_listener key;
struct wl_listener destroy;
};
static void animate_cat(struct sample_state *sample, static void animate_cat(struct sample_state *sample,
struct wlr_output *output) { struct wlr_output *output) {
struct timespec ts; struct timespec ts;
@ -93,10 +108,12 @@ static void animate_cat(struct sample_state *sample,
sample->ts_last = ts; sample->ts_last = ts;
} }
static void handle_output_frame(struct output_state *output, void output_frame_notify(struct wl_listener *listener, void *data) {
struct timespec *ts) { struct sample_output *output = wl_container_of(listener, output, frame);
struct compositor_state *state = output->compositor; struct sample_state *sample = output->sample;
struct sample_state *sample = state->data; struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
struct wlr_output *wlr_output = output->output; struct wlr_output *wlr_output = output->output;
wlr_output_make_current(wlr_output, NULL); wlr_output_make_current(wlr_output, NULL);
@ -124,94 +141,161 @@ static void handle_output_frame(struct output_state *output,
wlr_output_swap_buffers(wlr_output, NULL, NULL); wlr_output_swap_buffers(wlr_output, NULL, NULL);
} }
static void handle_output_add(struct output_state *ostate) { static void update_velocities(struct sample_state *sample,
struct sample_state *sample = ostate->compositor->data; float x_diff, float y_diff) {
sample->x_vel += x_diff;
sample->y_vel += y_diff;
}
struct output_config *o_config = void output_remove_notify(struct wl_listener *listener, void *data) {
example_config_get_output(sample->config, ostate->output); struct sample_output *sample_output = wl_container_of(listener, sample_output, destroy);
struct sample_state *sample = sample_output->sample;
wlr_output_layout_remove(sample->layout, sample_output->output);
wl_list_remove(&sample_output->frame.link);
wl_list_remove(&sample_output->destroy.link);
free(sample_output);
}
if (o_config) { void new_output_notify(struct wl_listener *listener, void *data) {
wlr_output_set_transform(ostate->output, o_config->transform); struct wlr_output *output = data;
wlr_output_layout_add(sample->layout, ostate->output, o_config->x, struct sample_state *sample = wl_container_of(listener, sample, new_output);
o_config->y); struct sample_output *sample_output = calloc(1, sizeof(struct sample_output));
} else { if (wl_list_length(&output->modes) > 0) {
wlr_output_layout_add_auto(sample->layout, ostate->output); struct wlr_output_mode *mode = wl_container_of((&output->modes)->prev, mode, link);
wlr_output_set_mode(output, mode);
} }
wlr_output_layout_add_auto(sample->layout, output);
sample_output->output = output;
sample_output->sample = sample;
wl_signal_add(&output->events.frame, &sample_output->frame);
sample_output->frame.notify = output_frame_notify;
wl_signal_add(&output->events.destroy, &sample_output->destroy);
sample_output->destroy.notify = output_remove_notify;
} }
static void handle_output_remove(struct output_state *ostate) { void keyboard_key_notify(struct wl_listener *listener, void *data) {
struct sample_state *sample = ostate->compositor->data; struct sample_keyboard *keyboard = wl_container_of(listener, keyboard, key);
wlr_output_layout_remove(sample->layout, ostate->output); struct sample_state *sample = keyboard->sample;
struct wlr_event_keyboard_key *event = data;
uint32_t keycode = event->keycode + 8;
const xkb_keysym_t *syms;
int nsyms = xkb_state_key_get_syms(keyboard->device->keyboard->xkb_state,
keycode, &syms);
for (int i = 0; i < nsyms; i++) {
xkb_keysym_t sym = syms[i];
if (sym == XKB_KEY_Escape) {
wl_display_terminate(sample->display);
}
// 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
int delta = 75;
if (event->state == WLR_KEY_PRESSED) {
switch (sym) {
case XKB_KEY_Left:
update_velocities(sample, -delta, 0);
break;
case XKB_KEY_Right:
update_velocities(sample, delta, 0);
break;
case XKB_KEY_Up:
update_velocities(sample, 0, -delta);
break;
case XKB_KEY_Down:
update_velocities(sample, 0, delta);
break;
}
}
}
} }
static void update_velocities(struct compositor_state *state, void keyboard_destroy_notify(struct wl_listener *listener, void *data) {
float x_diff, float y_diff) { struct sample_keyboard *keyboard = wl_container_of(listener, keyboard, destroy);
struct sample_state *sample = state->data; wl_list_remove(&keyboard->destroy.link);
sample->x_vel += x_diff; wl_list_remove(&keyboard->key.link);
sample->y_vel += y_diff; free(keyboard);
} }
static void handle_keyboard_key(struct keyboard_state *kbstate, void new_input_notify(struct wl_listener *listener, void *data) {
uint32_t keycode, xkb_keysym_t sym, enum wlr_key_state key_state, struct wlr_input_device *device = data;
uint64_t time_usec) { struct sample_state *sample = wl_container_of(listener, sample, new_input);
// NOTE: It may be better to simply refer to our key state during each frame struct sample_keyboard *keyboard;
// and make this change in pixels/sec^2 struct xkb_rule_names rules;
// Also, key repeat struct xkb_context *context;
int delta = 75; switch (device->type) {
if (key_state == WLR_KEY_PRESSED) { case WLR_INPUT_DEVICE_KEYBOARD:
switch (sym) { keyboard = calloc(1, sizeof(struct sample_keyboard));
case XKB_KEY_Left: keyboard->device = device;
update_velocities(kbstate->compositor, -delta, 0); keyboard->sample = sample;
break; wl_signal_add(&device->events.destroy, &keyboard->destroy);
case XKB_KEY_Right: keyboard->destroy.notify = keyboard_destroy_notify;
update_velocities(kbstate->compositor, delta, 0); wl_signal_add(&device->keyboard->events.key, &keyboard->key);
break; keyboard->key.notify = keyboard_key_notify;
case XKB_KEY_Up: memset(&rules, 0, sizeof(rules));
update_velocities(kbstate->compositor, 0, -delta); rules.rules = getenv("XKB_DEFAULT_RULES");
break; rules.model = getenv("XKB_DEFAULT_MODEL");
case XKB_KEY_Down: rules.layout = getenv("XKB_DEFAULT_LAYOUT");
update_velocities(kbstate->compositor, 0, delta); rules.variant = getenv("XKB_DEFAULT_VARIANT");
break; rules.options = getenv("XKB_DEFAULT_OPTIONS");
context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
if (!context) {
wlr_log(L_ERROR, "Failed to create XKB context");
exit(1);
} }
wlr_keyboard_set_keymap(device->keyboard, xkb_map_new_from_names(context,
&rules, XKB_KEYMAP_COMPILE_NO_FLAGS));
xkb_context_unref(context);
break;
default:
break;
} }
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
wlr_log_init(L_DEBUG, NULL); wlr_log_init(L_DEBUG, NULL);
struct sample_state state = {0}; struct wl_display *display = wl_display_create();
struct sample_state state = {
.x_vel = 500,
.y_vel = 500,
.display = display,
};
state.x_vel = 500;
state.y_vel = 500;
state.layout = wlr_output_layout_create(); state.layout = wlr_output_layout_create();
clock_gettime(CLOCK_MONOTONIC, &state.ts_last); clock_gettime(CLOCK_MONOTONIC, &state.ts_last);
state.config = parse_args(argc, argv); struct wlr_backend *wlr = wlr_backend_autocreate(display);
if (!wlr) {
exit(1);
}
wl_signal_add(&wlr->events.new_output, &state.new_output);
state.new_output.notify = new_output_notify;
wl_signal_add(&wlr->events.new_input, &state.new_input);
state.new_input.notify = new_input_notify;
struct compositor_state compositor = { 0 }; const char *socket = wl_display_add_socket_auto(display);
compositor.data = &state; if (!socket) {
compositor.output_add_cb = handle_output_add; wlr_log_errno(L_ERROR, "Unable to open wayland socket");
compositor.output_remove_cb = handle_output_remove; wlr_backend_destroy(wlr);
compositor.output_frame_cb = handle_output_frame; exit(1);
compositor.keyboard_key_cb = handle_keyboard_key; }
compositor_init(&compositor); setenv("_WAYLAND_DISPLAY", socket, true);
state.renderer = wlr_backend_get_renderer(compositor.backend); state.renderer = wlr_backend_get_renderer(wlr);
state.cat_texture = wlr_texture_from_pixels(state.renderer, state.cat_texture = wlr_texture_from_pixels(state.renderer,
WL_SHM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height, WL_SHM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height,
cat_tex.pixel_data); cat_tex.pixel_data);
if (!wlr_backend_start(compositor.backend)) { if (!wlr_backend_start(wlr)) {
wlr_log(L_ERROR, "Failed to start backend"); wlr_log(L_ERROR, "Failed to start backend");
wlr_backend_destroy(compositor.backend); wlr_backend_destroy(wlr);
exit(1); exit(1);
} }
wl_display_run(compositor.display); wl_display_run(display);
wlr_texture_destroy(state.cat_texture); wlr_texture_destroy(state.cat_texture);
wlr_renderer_destroy(state.renderer); wlr_renderer_destroy(state.renderer);
compositor_fini(&compositor);
wlr_output_layout_destroy(state.layout); wlr_output_layout_destroy(state.layout);
example_config_destroy(state.config);
} }

Write Preview
Loading…
Cancel
Save