mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-02 09:01:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix wlr_seat; add to example compositor

Browse source
This commit is contained in:
nyorain 2017-08-17 12:55:59 +02:00
parent af5db7a44c
commit ad22b4874d
6 changed files with 165 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

74
examples/compositor/main.c
View file

@ -4,6 +4,8 @@
#include <stdlib.h>
#include <time.h>
#include <inttypes.h>
#include <unistd.h>
#include <sys/mman.h>
#include <wayland-server.h>
#include <wlr/backend.h>
#include <wlr/backend/session.h>
@ -14,16 +16,26 @@
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_wl_shell.h>
#include <wlr/types/wlr_xdg_shell_v6.h>
#include <wlr/types/wlr_seat.h>
#include <xkbcommon/xkbcommon.h>
#include <wlr/util/log.h>
#include "shared.h"
#include "compositor.h"
// TODO: move to common header?
int os_create_anonymous_file(off_t size);
struct sample_state {
struct wlr_renderer *renderer;
struct wl_compositor_state compositor;
struct wlr_wl_shell *wl_shell;
struct wlr_seat *wl_seat;
struct wlr_xdg_shell_v6 *xdg_shell;
struct wl_resource *focus;
struct wl_listener keyboard_bound;
int keymap_fd;
size_t keymap_size;
uint32_t serial;
};
/*
@ -33,7 +45,7 @@ static inline int64_t timespec_to_msec(const struct timespec *a) {
return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000;
}
void output_frame_handle_surface(struct sample_state *sample,
static void output_frame_handle_surface(struct sample_state *sample,
struct wlr_output *wlr_output, struct timespec *ts,
struct wl_resource *_res) {
struct wlr_surface *surface = wl_resource_get_user_data(_res);
@ -53,7 +65,7 @@ void output_frame_handle_surface(struct sample_state *sample,
}
}
}
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;
@ -74,11 +86,48 @@ void handle_output_frame(struct output_state *output, struct timespec *ts) {
wlr_output_swap_buffers(wlr_output);
}
static void handle_keyboard_key(struct keyboard_state *keyboard, uint32_t keycode,
xkb_keysym_t sym, enum wlr_key_state key_state) {
struct compositor_state *state = keyboard->compositor;
struct sample_state *sample = state->data;
struct wl_resource *res = NULL;
struct wlr_seat_handle *seat_handle = NULL;
wl_list_for_each(res, &sample->compositor.surfaces, link) {
break;
}
if (res) {
seat_handle = wlr_seat_handle_for_client(sample->wl_seat,
wl_resource_get_client(res));
}
if (res != sample->focus && seat_handle && seat_handle->keyboard) {
struct wl_array keys;
wl_array_init(&keys);
wl_keyboard_send_enter(seat_handle->keyboard, ++sample->serial, res, &keys);
sample->focus = res;
}
if (seat_handle && seat_handle->keyboard) {
wl_keyboard_send_key(seat_handle->keyboard, ++sample->serial, 0, keycode, key_state);
}
}
static void handle_keyboard_bound(struct wl_listener *listener, void *data) {
struct wlr_seat_handle *handle = data;
struct sample_state *state = wl_container_of(listener, state, keyboard_bound);
wl_keyboard_send_keymap(handle->keyboard, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
state->keymap_fd, state->keymap_size);
}
int main() {
struct sample_state state = { 0 };
struct compositor_state compositor = { 0,
.data = &state,
.output_frame_cb = handle_output_frame,
.keyboard_key_cb = handle_keyboard_key
};
compositor_init(&compositor);
@ -92,8 +141,29 @@ int main() {
state.wl_shell = wlr_wl_shell_create(compositor.display);
state.xdg_shell = wlr_xdg_shell_v6_create(compositor.display);
state.wl_seat = wlr_seat_create(compositor.display, "seat0");
state.keyboard_bound.notify = handle_keyboard_bound;
wl_signal_add(&state.wl_seat->events.keyboard_bound, &state.keyboard_bound);
wlr_seat_set_capabilities(state.wl_seat, WL_SEAT_CAPABILITY_KEYBOARD
| WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_TOUCH);
struct keyboard_state *kbstate;
wl_list_for_each(kbstate, &compositor.keyboards, link) {
char *keymap = xkb_keymap_get_as_string(kbstate->keymap,
XKB_KEYMAP_FORMAT_TEXT_V1);
state.keymap_size = strlen(keymap);
state.keymap_fd = os_create_anonymous_file(state.keymap_size);
void *ptr = mmap(NULL, state.keymap_size,
PROT_READ | PROT_WRITE,
MAP_SHARED, state.keymap_fd, 0);
strcpy(ptr, keymap);
free(keymap);
break;
}
compositor_run(&compositor);
wlr_wl_shell_destroy(state.wl_shell);
wlr_xdg_shell_v6_destroy(state.xdg_shell);
close(state.keymap_fd);
}