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

Made touch standalone

Browse Source 
TODO test
master
Timidger 7 years ago
parent 4c1d74ef91
commit c622a0c7fb
No known key found for this signature in database
GPG Key ID: 42EF7ECE5FEF1D17
2 changed files with 196 additions and 36 deletions
Show Stats Download Patch File Download Diff File

1
examples/simple.c
Unescape View File

@ -103,7 +103,6 @@ void keyboard_key_notify(struct wl_listener *listener, void *data) {
wl_display_terminate(sample->display); wl_display_terminate(sample->display);
} }
} }
// TODO keyboard input
} }
void keyboard_destroy_notify(struct wl_listener *listener, void *data) { void keyboard_destroy_notify(struct wl_listener *listener, void *data) {

231
examples/touch.c
Unescape 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 <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <math.h> #include <math.h>
@ -12,18 +12,24 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/session.h> #include <wlr/backend/session.h>
#include <wlr/types/wlr_output.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_list.h> #include <wlr/types/wlr_list.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_matrix.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include "cat.h" #include "cat.h"
#include "support/shared.h"
struct sample_state { struct sample_state {
struct wl_display *display;
struct wlr_renderer *renderer; struct wlr_renderer *renderer;
struct wlr_texture *cat_texture; struct wlr_texture *cat_texture;
struct wl_list touch_points; struct wl_list touch_points;
struct timespec last_frame;
struct wl_listener new_output;
struct wl_listener new_input;
struct wl_list touch;
}; };
struct touch_point { struct touch_point {
@ -32,10 +38,38 @@ struct touch_point {
struct wl_list link; struct wl_list link;
}; };
static void handle_output_frame(struct output_state *output, struct timespec *ts) { struct touch_state {
struct compositor_state *state = output->compositor; struct sample_state *sample;
struct sample_state *sample = state->data; struct wlr_input_device *device;
struct wlr_output *wlr_output = output->output; struct wl_listener destroy;
struct wl_listener down;
struct wl_listener up;
struct wl_listener motion;
struct wl_list link;
void *data;
};
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 output_frame_notify(struct wl_listener *listener, void *data) {
struct sample_output *sample_output = wl_container_of(listener, sample_output, frame);
struct sample_state *sample = sample_output->sample;
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
struct wlr_output *wlr_output = sample_output->output;
int32_t width, height; int32_t width, height;
wlr_output_effective_resolution(wlr_output, &width, &height); wlr_output_effective_resolution(wlr_output, &width, &height);
@ -57,57 +91,176 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
wlr_renderer_end(sample->renderer); wlr_renderer_end(sample->renderer);
wlr_output_swap_buffers(wlr_output, NULL, NULL); wlr_output_swap_buffers(wlr_output, NULL, NULL);
sample->last_frame = now;
} }
static void handle_touch_down(struct touch_state *tstate, static void touch_down_notify(struct wl_listener *listener, void *data) {
int32_t touch_id, double x, double y) { struct wlr_event_touch_motion *event = data;
struct sample_state *sample = tstate->compositor->data; struct touch_state *tstate = wl_container_of(listener, tstate, down);
struct sample_state *sample = tstate->sample;
struct touch_point *point = calloc(1, sizeof(struct touch_point)); struct touch_point *point = calloc(1, sizeof(struct touch_point));
point->touch_id = touch_id; point->touch_id = event->touch_id;
point->x = x; point->x = event->x;
point->y = y; point->y = event->y;
wl_list_insert(&sample->touch_points, &point->link); wl_list_insert(&sample->touch_points, &point->link);
} }
static void handle_touch_up(struct touch_state *tstate, int32_t touch_id) { static void touch_up_notify(struct wl_listener *listener, void *data ) {
struct sample_state *sample = tstate->compositor->data; struct wlr_event_touch_up *event = data;
struct touch_state *tstate = wl_container_of(listener, tstate, up);
struct sample_state *sample = tstate->sample;
struct touch_point *point, *tmp; struct touch_point *point, *tmp;
wl_list_for_each_safe(point, tmp, &sample->touch_points, link) { wl_list_for_each_safe(point, tmp, &sample->touch_points, link) {
if (point->touch_id == touch_id) { if (point->touch_id == event->touch_id) {
wl_list_remove(&point->link); wl_list_remove(&point->link);
break; break;
} }
} }
} }
static void handle_touch_motion(struct touch_state *tstate, static void touch_motion_notify(struct wl_listener *listener, void *data) {
int32_t touch_id, double x, double y) { struct wlr_event_touch_motion *event = data;
struct sample_state *sample = tstate->compositor->data; struct touch_state *tstate = wl_container_of(listener, tstate, motion);
struct sample_state *sample = tstate->sample;
struct touch_point *point; struct touch_point *point;
wl_list_for_each(point, &sample->touch_points, link) { wl_list_for_each(point, &sample->touch_points, link) {
if (point->touch_id == touch_id) { if (point->touch_id == event->touch_id) {
point->x = x; point->x = event->x;
point->y = y; point->y = event->y;
break; break;
} }
} }
} }
static void touch_destroy_notify(struct wl_listener *listener, void *data) {
struct touch_state *tstate = wl_container_of(listener, tstate, destroy);
wl_list_remove(&tstate->link);
wl_list_remove(&tstate->destroy.link);
wl_list_remove(&tstate->down.link);
wl_list_remove(&tstate->up.link);
wl_list_remove(&tstate->motion.link);
free(tstate);
}
void output_remove_notify(struct wl_listener *listener, void *data) {
struct sample_output *sample_output = wl_container_of(listener, sample_output, destroy);
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;
}
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 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;
struct touch_state *tstate;
switch (device->type) {
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;
case WLR_INPUT_DEVICE_TOUCH:
tstate = calloc(sizeof(struct touch_state), 1);
tstate->device = device;
tstate->sample = sample;
tstate->destroy.notify = touch_destroy_notify;
wl_signal_add(&device->events.destroy, &tstate->destroy);
tstate->down.notify = touch_down_notify;
wl_signal_add(&device->touch->events.down, &tstate->down);
tstate->motion.notify = touch_motion_notify;
wl_signal_add(&device->touch->events.motion, &tstate->motion);
tstate->up.notify = touch_up_notify;
wl_signal_add(&device->touch->events.up, &tstate->up);
wl_list_insert(&sample->touch, &tstate->link);
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; struct wl_display *display = wl_display_create();
struct sample_state state = {
.display = display
};
wl_list_init(&state.touch_points); wl_list_init(&state.touch_points);
wl_list_init(&state.touch);
struct compositor_state compositor = { 0, struct wlr_backend *wlr = wlr_backend_autocreate(display);
.data = &state, if (!wlr) {
.output_frame_cb = handle_output_frame, exit(1);
.touch_down_cb = handle_touch_down, }
.touch_up_cb = handle_touch_up,
.touch_motion_cb = handle_touch_motion, wl_signal_add(&wlr->events.new_output, &state.new_output);
}; state.new_output.notify = new_output_notify;
compositor_init(&compositor); wl_signal_add(&wlr->events.new_input, &state.new_input);
state.new_input.notify = new_input_notify;
clock_gettime(CLOCK_MONOTONIC, &state.last_frame);
state.renderer = wlr_backend_get_renderer(compositor.backend);
state.renderer = wlr_backend_get_renderer(wlr);
if (!state.renderer) { if (!state.renderer) {
wlr_log(L_ERROR, "Could not start compositor, OOM"); wlr_log(L_ERROR, "Could not start compositor, OOM");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -120,14 +273,22 @@ int main(int argc, char *argv[]) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (!wlr_backend_start(compositor.backend)) { const char *socket = wl_display_add_socket_auto(display);
if (!socket) {
wlr_log_errno(L_ERROR, "Unable to open wayland socket");
wlr_backend_destroy(wlr);
exit(1);
}
setenv("_WAYLAND_DISPLAY", socket, true);
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); wl_display_destroy(display);
} }

Write Preview
Loading…
Cancel
Save