blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made examples/pointer standalone

This commit is contained in:
Timidger 2018-04-20 10:11:45 -04:00
parent 7284709370
commit 4c1d74ef91
No known key found for this signature in database
GPG Key ID: 42EF7ECE5FEF1D17
1 changed files with 147 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
examples/pointer.c
View File

@ -1,4 +1,4 @@
#define _POSIX_C_SOURCE 199309L #define _POSIX_C_SOURCE 200112L
#define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE 500
#include <assert.h> #include <assert.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
@ -22,12 +22,10 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <wlr/xcursor.h> #include <wlr/xcursor.h>
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include "support/config.h"
#include "support/shared.h"
struct sample_state { struct sample_state {
struct wl_display *display;
struct compositor_state *compositor; struct compositor_state *compositor;
struct example_config *config;
struct wlr_xcursor *xcursor; struct wlr_xcursor *xcursor;
struct wlr_cursor *cursor; struct wlr_cursor *cursor;
double cur_x, cur_y; double cur_x, cur_y;
@ -35,7 +33,10 @@ struct sample_state {
float clear_color[4]; float clear_color[4];
struct wlr_output_layout *layout; struct wlr_output_layout *layout;
struct wl_list devices; struct wl_list devices;
struct timespec last_frame;
struct wl_listener new_output;
struct wl_listener new_input;
struct wl_listener cursor_motion; struct wl_listener cursor_motion;
struct wl_listener cursor_motion_absolute; struct wl_listener cursor_motion_absolute;
struct wl_listener cursor_button; struct wl_listener cursor_button;
@ -59,6 +60,21 @@ struct touch_point {
struct wl_list link; struct wl_list link;
}; };
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 warp_to_touch(struct sample_state *sample, static void warp_to_touch(struct sample_state *sample,
struct wlr_input_device *dev) { struct wlr_input_device *dev) {
if (wl_list_empty(&sample->touch_points)) { if (wl_list_empty(&sample->touch_points)) {
@ -78,11 +94,10 @@ static void warp_to_touch(struct sample_state *sample,
wlr_cursor_warp_absolute(sample->cursor, dev, x, y); wlr_cursor_warp_absolute(sample->cursor, dev, x, y);
} }
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 *sample_output = wl_container_of(listener, sample_output, frame);
struct compositor_state *state = output->compositor; struct sample_state *sample = sample_output->sample;
struct sample_state *sample = state->data; struct wlr_output *wlr_output = sample_output->output;
struct wlr_output *wlr_output = output->output;
wlr_output_make_current(wlr_output, NULL); wlr_output_make_current(wlr_output, NULL);
@ -93,52 +108,6 @@ 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) {
struct sample_state *sample = ostate->compositor->data;
struct output_config *o_config =
example_config_get_output(sample->config, ostate->output);
if (o_config) {
wlr_output_set_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);
}
example_config_configure_cursor(sample->config, sample->cursor,
sample->compositor);
struct wlr_xcursor_image *image = sample->xcursor->images[0];
wlr_cursor_set_image(sample->cursor, image->buffer, image->width * 4,
image->width, image->height, image->hotspot_x, image->hotspot_y, 0);
wlr_cursor_warp(sample->cursor, NULL, sample->cursor->x, sample->cursor->y);
}
static void handle_output_remove(struct output_state *ostate) {
struct sample_state *sample = ostate->compositor->data;
wlr_output_layout_remove(sample->layout, ostate->output);
example_config_configure_cursor(sample->config, sample->cursor,
sample->compositor);
}
static void handle_input_add(struct compositor_state *state,
struct wlr_input_device *device) {
struct sample_state *sample = state->data;
if (device->type == WLR_INPUT_DEVICE_POINTER ||
device->type == WLR_INPUT_DEVICE_TOUCH ||
device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
wlr_cursor_attach_input_device(sample->cursor, device);
example_config_configure_cursor(sample->config, sample->cursor,
sample->compositor);
}
}
static void handle_cursor_motion(struct wl_listener *listener, void *data) { static void handle_cursor_motion(struct wl_listener *listener, void *data) {
struct sample_state *sample = struct sample_state *sample =
wl_container_of(listener, sample, cursor_motion); wl_container_of(listener, sample, cursor_motion);
@ -255,18 +224,120 @@ static void handle_tablet_tool_axis(struct wl_listener *listener, void *data) {
} }
} }
void keyboard_key_notify(struct wl_listener *listener, void *data) {
struct sample_keyboard *keyboard = wl_container_of(listener, keyboard, key);
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);
}
}
}
void output_remove_notify(struct wl_listener *listener, void *data) {
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);
}
void new_output_notify(struct wl_listener *listener, void *data) {
struct wlr_output *output = data;
struct sample_state *sample = wl_container_of(listener, sample, new_output);
struct sample_output *sample_output = calloc(1, sizeof(struct sample_output));
if (wl_list_length(&output->modes) > 0) {
struct wlr_output_mode *mode = wl_container_of((&output->modes)->prev, mode, link);
wlr_output_set_mode(output, mode);
}
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;
wlr_output_layout_add_auto(sample->layout, sample_output->output);
struct wlr_xcursor_image *image = sample->xcursor->images[0];
wlr_cursor_set_image(sample->cursor, image->buffer, image->width * 4,
image->width, image->height, image->hotspot_x, image->hotspot_y, 0);
}
void keyboard_destroy_notify(struct wl_listener *listener, void *data) {
struct sample_keyboard *keyboard = wl_container_of(listener, keyboard, destroy);
wl_list_remove(&keyboard->destroy.link);
wl_list_remove(&keyboard->key.link);
free(keyboard);
}
void new_input_notify(struct wl_listener *listener, void *data) {
struct wlr_input_device *device = data;
struct sample_state *sample = wl_container_of(listener, sample, new_input);
struct sample_keyboard *keyboard;
struct xkb_rule_names rules;
struct xkb_context *context;
switch (device->type) {
case WLR_INPUT_DEVICE_POINTER:
case WLR_INPUT_DEVICE_TOUCH:
case WLR_INPUT_DEVICE_TABLET_TOOL:
wlr_cursor_attach_input_device(sample->cursor, device);
break;
case WLR_INPUT_DEVICE_KEYBOARD:
keyboard = calloc(1, sizeof(struct sample_keyboard));
keyboard->device = device;
keyboard->sample = sample;
wl_signal_add(&device->events.destroy, &keyboard->destroy);
keyboard->destroy.notify = keyboard_destroy_notify;
wl_signal_add(&device->keyboard->events.key, &keyboard->key);
keyboard->key.notify = keyboard_key_notify;
memset(&rules, 0, sizeof(rules));
rules.rules = getenv("XKB_DEFAULT_RULES");
rules.model = getenv("XKB_DEFAULT_MODEL");
rules.layout = getenv("XKB_DEFAULT_LAYOUT");
rules.variant = getenv("XKB_DEFAULT_VARIANT");
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 wl_display *display = wl_display_create();
struct sample_state state = { struct sample_state state = {
.default_color = { 0.25f, 0.25f, 0.25f, 1 }, .default_color = { 0.25f, 0.25f, 0.25f, 1 },
.clear_color = { 0.25f, 0.25f, 0.25f, 1 }, .clear_color = { 0.25f, 0.25f, 0.25f, 1 },
.display = display
}; };
state.config = parse_args(argc, argv); struct wlr_backend *wlr = wlr_backend_autocreate(display);
if (!wlr) {
exit(1);
}
state.cursor = wlr_cursor_create(); state.cursor = wlr_cursor_create();
state.layout = wlr_output_layout_create(); state.layout = wlr_output_layout_create();
wlr_cursor_attach_output_layout(state.cursor, state.layout); wlr_cursor_attach_output_layout(state.cursor, state.layout);
wlr_cursor_map_to_region(state.cursor, state.config->cursor.mapped_box); //wlr_cursor_map_to_region(state.cursor, state.config->cursor.mapped_box);
wl_list_init(&state.devices); wl_list_init(&state.devices);
wl_list_init(&state.touch_points); wl_list_init(&state.touch_points);
@ -297,20 +368,17 @@ int main(int argc, char *argv[]) {
wl_signal_add(&state.cursor->events.touch_cancel, &state.touch_cancel); wl_signal_add(&state.cursor->events.touch_cancel, &state.touch_cancel);
state.touch_cancel.notify = handle_touch_cancel; state.touch_cancel.notify = handle_touch_cancel;
wl_signal_add(&wlr->events.new_input, &state.new_input);
state.new_input.notify = new_input_notify;
wl_signal_add(&wlr->events.new_output, &state.new_output);
state.new_output.notify = new_output_notify;
// tool events // tool events
wl_signal_add(&state.cursor->events.tablet_tool_axis, wl_signal_add(&state.cursor->events.tablet_tool_axis,
&state.tablet_tool_axis); &state.tablet_tool_axis);
state.tablet_tool_axis.notify = handle_tablet_tool_axis; state.tablet_tool_axis.notify = handle_tablet_tool_axis;
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.input_add_cb = handle_input_add;
state.compositor = &compositor;
struct wlr_xcursor_theme *theme = wlr_xcursor_theme_load("default", 16); struct wlr_xcursor_theme *theme = wlr_xcursor_theme_load("default", 16);
if (!theme) { if (!theme) {
wlr_log(L_ERROR, "Failed to load cursor theme"); wlr_log(L_ERROR, "Failed to load cursor theme");
@ -326,17 +394,23 @@ int main(int argc, char *argv[]) {
wlr_cursor_set_image(state.cursor, image->buffer, image->width * 4, wlr_cursor_set_image(state.cursor, image->buffer, image->width * 4,
image->width, image->height, image->hotspot_x, image->hotspot_y, 0); image->width, image->height, image->hotspot_x, image->hotspot_y, 0);
compositor_init(&compositor); clock_gettime(CLOCK_MONOTONIC, &state.last_frame);
if (!wlr_backend_start(compositor.backend)) { const char *socket = wl_display_add_socket_auto(display);
wlr_log(L_ERROR, "Failed to start backend"); if (!socket) {
wlr_backend_destroy(compositor.backend); wlr_log_errno(L_ERROR, "Unable to open wayland socket");
wlr_backend_destroy(wlr);
exit(1); exit(1);
} }
wl_display_run(compositor.display); setenv("_WAYLAND_DISPLAY", socket, true);
compositor_fini(&compositor); if (!wlr_backend_start(wlr)) {
wlr_log(L_ERROR, "Failed to start backend");
wlr_backend_destroy(wlr);
exit(1);
}
wl_display_run(display);
wl_display_destroy(display);
wlr_xcursor_theme_destroy(theme); wlr_xcursor_theme_destroy(theme);
example_config_destroy(state.config);
wlr_cursor_destroy(state.cursor); wlr_cursor_destroy(state.cursor);
wlr_output_layout_destroy(state.layout); wlr_output_layout_destroy(state.layout);
} }