mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-11-02 09:01:38 -05:00
Merge branch 'master' into surface-transform
This commit is contained in:
emersion
commit
466e86b7b2
44 changed files with 549 additions and 209 deletions
|
|
@ -102,6 +102,11 @@ void wlr_keyboard_init(struct wlr_keyboard *kb,
|
|||
wl_signal_init(&kb->events.key);
|
||||
wl_signal_init(&kb->events.modifiers);
|
||||
wl_signal_init(&kb->events.keymap);
|
||||
wl_signal_init(&kb->events.repeat_info);
|
||||
|
||||
// Sane defaults
|
||||
kb->repeat_info.rate = 25;
|
||||
kb->repeat_info.delay = 600;
|
||||
}
|
||||
|
||||
void wlr_keyboard_destroy(struct wlr_keyboard *kb) {
|
||||
|
|
@ -167,6 +172,16 @@ void wlr_keyboard_set_keymap(struct wlr_keyboard *kb,
|
|||
wl_signal_emit(&kb->events.keymap, kb);
|
||||
}
|
||||
|
||||
void wlr_keyboard_set_repeat_info(struct wlr_keyboard *kb, int32_t rate,
|
||||
int32_t delay) {
|
||||
if (kb->repeat_info.rate == rate && kb->repeat_info.delay == delay) {
|
||||
return;
|
||||
}
|
||||
kb->repeat_info.rate = rate;
|
||||
kb->repeat_info.delay = delay;
|
||||
wl_signal_emit(&kb->events.repeat_info, kb);
|
||||
}
|
||||
|
||||
uint32_t wlr_keyboard_get_modifiers(struct wlr_keyboard *kb) {
|
||||
xkb_mod_mask_t mask = kb->modifiers.depressed | kb->modifiers.latched;
|
||||
uint32_t modifiers = 0;
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ static void wl_output_send_to_resource(struct wl_resource *resource) {
|
|||
|
||||
static void wlr_output_send_current_mode_to_resource(
|
||||
struct wl_resource *resource) {
|
||||
assert(resource);
|
||||
struct wlr_output *output = wl_resource_get_user_data(resource);
|
||||
assert(output);
|
||||
const uint32_t version = wl_resource_get_version(resource);
|
||||
|
|
@ -119,7 +120,6 @@ struct wl_global *wlr_output_create_global(struct wlr_output *wlr_output,
|
|||
struct wl_global *wl_global = wl_global_create(display,
|
||||
&wl_output_interface, 3, wlr_output, wl_output_bind);
|
||||
wlr_output->wl_global = wl_global;
|
||||
wl_list_init(&wlr_output->wl_resources);
|
||||
return wl_global;
|
||||
}
|
||||
|
||||
|
|
@ -155,6 +155,24 @@ bool wlr_output_set_mode(struct wlr_output *output,
|
|||
bool result = output->impl->set_mode(output, mode);
|
||||
if (result) {
|
||||
wlr_output_update_matrix(output);
|
||||
|
||||
struct wl_resource *resource;
|
||||
wl_resource_for_each(resource, &output->wl_resources) {
|
||||
wlr_output_send_current_mode_to_resource(resource);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
bool wlr_output_set_custom_mode(struct wlr_output *output, int32_t width,
|
||||
int32_t height, int32_t refresh) {
|
||||
if (!output->impl || !output->impl->set_custom_mode) {
|
||||
return false;
|
||||
}
|
||||
bool result = output->impl->set_custom_mode(output, width, height, refresh);
|
||||
if (result) {
|
||||
wlr_output_update_matrix(output);
|
||||
|
||||
struct wl_resource *resource;
|
||||
wl_resource_for_each(resource, &output->wl_resources) {
|
||||
wlr_output_send_current_mode_to_resource(resource);
|
||||
|
|
@ -168,21 +186,31 @@ void wlr_output_update_size(struct wlr_output *output, int32_t width,
|
|||
if (output->width == width && output->height == height) {
|
||||
return;
|
||||
}
|
||||
|
||||
output->width = width;
|
||||
output->height = height;
|
||||
wlr_output_update_matrix(output);
|
||||
if (output->wl_global != NULL) {
|
||||
struct wl_resource *resource;
|
||||
wl_resource_for_each(resource, &output->wl_resources) {
|
||||
wlr_output_send_current_mode_to_resource(resource);
|
||||
}
|
||||
|
||||
struct wl_resource *resource;
|
||||
wl_resource_for_each(resource, &output->wl_resources) {
|
||||
wlr_output_send_current_mode_to_resource(resource);
|
||||
}
|
||||
|
||||
wl_signal_emit(&output->events.resolution, output);
|
||||
}
|
||||
|
||||
void wlr_output_transform(struct wlr_output *output,
|
||||
void wlr_output_set_transform(struct wlr_output *output,
|
||||
enum wl_output_transform transform) {
|
||||
output->impl->transform(output, transform);
|
||||
wlr_output_update_matrix(output);
|
||||
|
||||
// TODO: only send geometry and done
|
||||
struct wl_resource *resource;
|
||||
wl_resource_for_each(resource, &output->wl_resources) {
|
||||
wl_output_send_to_resource(resource);
|
||||
}
|
||||
|
||||
wl_signal_emit(&output->events.transform, output);
|
||||
}
|
||||
|
||||
void wlr_output_set_position(struct wlr_output *output, int32_t lx,
|
||||
|
|
@ -194,12 +222,29 @@ void wlr_output_set_position(struct wlr_output *output, int32_t lx,
|
|||
output->lx = lx;
|
||||
output->ly = ly;
|
||||
|
||||
// TODO: only send geometry and done
|
||||
struct wl_resource *resource;
|
||||
wl_resource_for_each(resource, &output->wl_resources) {
|
||||
wl_output_send_to_resource(resource);
|
||||
}
|
||||
}
|
||||
|
||||
void wlr_output_set_scale(struct wlr_output *output, uint32_t scale) {
|
||||
if (output->scale == scale) {
|
||||
return;
|
||||
}
|
||||
|
||||
output->scale = scale;
|
||||
|
||||
// TODO: only send mode and done
|
||||
struct wl_resource *resource;
|
||||
wl_resource_for_each(resource, &output->wl_resources) {
|
||||
wl_output_send_to_resource(resource);
|
||||
}
|
||||
|
||||
wl_signal_emit(&output->events.scale, output);
|
||||
}
|
||||
|
||||
void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
|
||||
const struct wlr_output_impl *impl) {
|
||||
assert(impl->make_current && impl->swap_buffers && impl->transform);
|
||||
|
|
@ -209,9 +254,12 @@ void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
|
|||
output->transform = WL_OUTPUT_TRANSFORM_NORMAL;
|
||||
output->scale = 1;
|
||||
wl_list_init(&output->cursors);
|
||||
wl_list_init(&output->wl_resources);
|
||||
wl_signal_init(&output->events.frame);
|
||||
wl_signal_init(&output->events.swap_buffers);
|
||||
wl_signal_init(&output->events.resolution);
|
||||
wl_signal_init(&output->events.scale);
|
||||
wl_signal_init(&output->events.transform);
|
||||
wl_signal_init(&output->events.destroy);
|
||||
}
|
||||
|
||||
|
|
@ -224,9 +272,9 @@ void wlr_output_destroy(struct wlr_output *output) {
|
|||
|
||||
struct wlr_output_mode *mode, *tmp_mode;
|
||||
wl_list_for_each_safe(mode, tmp_mode, &output->modes, link) {
|
||||
wl_list_remove(&mode->link);
|
||||
free(mode);
|
||||
}
|
||||
wl_list_remove(&output->modes);
|
||||
if (output->impl && output->impl->destroy) {
|
||||
output->impl->destroy(output);
|
||||
} else {
|
||||
|
|
@ -287,12 +335,20 @@ static void output_fullscreen_surface_render(struct wlr_output *output,
|
|||
wlr_surface_send_frame_done(surface, when);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the cursor box, scaled for its output.
|
||||
*/
|
||||
static void output_cursor_get_box(struct wlr_output_cursor *cursor,
|
||||
struct wlr_box *box) {
|
||||
box->x = cursor->x - cursor->hotspot_x;
|
||||
box->y = cursor->y - cursor->hotspot_y;
|
||||
box->width = cursor->width;
|
||||
box->height = cursor->height;
|
||||
|
||||
if (cursor->surface != NULL) {
|
||||
box->x += cursor->surface->current->sx * cursor->output->scale;
|
||||
box->y += cursor->surface->current->sy * cursor->output->scale;
|
||||
}
|
||||
}
|
||||
|
||||
static void output_cursor_render(struct wlr_output_cursor *cursor,
|
||||
|
|
@ -308,36 +364,23 @@ static void output_cursor_render(struct wlr_output_cursor *cursor,
|
|||
return;
|
||||
}
|
||||
|
||||
struct wlr_box output_box;
|
||||
output_box.x = output_box.y = 0;
|
||||
wlr_output_effective_resolution(cursor->output, &output_box.width,
|
||||
&output_box.height);
|
||||
output_box.width *= cursor->output->scale;
|
||||
output_box.height *= cursor->output->scale;
|
||||
|
||||
struct wlr_box cursor_box;
|
||||
output_cursor_get_box(cursor, &cursor_box);
|
||||
|
||||
struct wlr_box intersection;
|
||||
struct wlr_box *intersection_ptr = &intersection;
|
||||
if (!wlr_box_intersection(&output_box, &cursor_box, &intersection_ptr)) {
|
||||
return;
|
||||
}
|
||||
|
||||
glViewport(0, 0, cursor->output->width, cursor->output->height);
|
||||
glEnable(GL_BLEND);
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
int x = cursor->x - cursor->hotspot_x;
|
||||
int y = cursor->y - cursor->hotspot_y;
|
||||
if (cursor->surface != NULL) {
|
||||
x += cursor->surface->current->sx;
|
||||
y += cursor->surface->current->sy;
|
||||
}
|
||||
struct wlr_box cursor_box;
|
||||
output_cursor_get_box(cursor, &cursor_box);
|
||||
|
||||
float translate[16];
|
||||
wlr_matrix_translate(&translate, cursor_box.x, cursor_box.y, 0);
|
||||
|
||||
float scale[16];
|
||||
wlr_matrix_scale(&scale, cursor_box.width, cursor_box.height, 1);
|
||||
|
||||
float matrix[16];
|
||||
wlr_texture_get_matrix(texture, &matrix, &cursor->output->transform_matrix,
|
||||
x, y);
|
||||
wlr_matrix_mul(&translate, &scale, &matrix);
|
||||
wlr_matrix_mul(&cursor->output->transform_matrix, &matrix, &matrix);
|
||||
|
||||
wlr_render_with_matrix(renderer, texture, &matrix);
|
||||
|
||||
if (cursor->surface != NULL) {
|
||||
|
|
@ -358,7 +401,8 @@ void wlr_output_swap_buffers(struct wlr_output *output) {
|
|||
|
||||
struct wlr_output_cursor *cursor;
|
||||
wl_list_for_each(cursor, &output->cursors, link) {
|
||||
if (!cursor->enabled || output->hardware_cursor == cursor) {
|
||||
if (!cursor->enabled || !cursor->visible ||
|
||||
output->hardware_cursor == cursor) {
|
||||
continue;
|
||||
}
|
||||
output_cursor_render(cursor, &now);
|
||||
|
|
@ -493,11 +537,39 @@ bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
|
|||
stride, width, height, pixels);
|
||||
}
|
||||
|
||||
static void output_cursor_update_visible(struct wlr_output_cursor *cursor) {
|
||||
struct wlr_box output_box;
|
||||
output_box.x = output_box.y = 0;
|
||||
wlr_output_effective_resolution(cursor->output, &output_box.width,
|
||||
&output_box.height);
|
||||
output_box.width *= cursor->output->scale;
|
||||
output_box.height *= cursor->output->scale;
|
||||
|
||||
struct wlr_box cursor_box;
|
||||
output_cursor_get_box(cursor, &cursor_box);
|
||||
|
||||
struct wlr_box intersection;
|
||||
struct wlr_box *intersection_ptr = &intersection;
|
||||
bool visible =
|
||||
wlr_box_intersection(&output_box, &cursor_box, &intersection_ptr);
|
||||
|
||||
if (cursor->surface != NULL) {
|
||||
if (cursor->visible && !visible) {
|
||||
wlr_surface_send_leave(cursor->surface, cursor->output);
|
||||
}
|
||||
if (!cursor->visible && visible) {
|
||||
wlr_surface_send_enter(cursor->surface, cursor->output);
|
||||
}
|
||||
}
|
||||
|
||||
cursor->visible = visible;
|
||||
}
|
||||
|
||||
static void output_cursor_commit(struct wlr_output_cursor *cursor) {
|
||||
// Some clients commit a cursor surface with a NULL buffer to hide it.
|
||||
cursor->enabled = wlr_surface_has_buffer(cursor->surface);
|
||||
cursor->width = cursor->surface->current->width;
|
||||
cursor->height = cursor->surface->current->height;
|
||||
cursor->width = cursor->surface->current->width * cursor->output->scale;
|
||||
cursor->height = cursor->surface->current->height * cursor->output->scale;
|
||||
|
||||
if (cursor->output->hardware_cursor != cursor) {
|
||||
cursor->output->needs_swap = true;
|
||||
|
|
@ -530,8 +602,8 @@ void wlr_output_cursor_set_surface(struct wlr_output_cursor *cursor,
|
|||
return;
|
||||
}
|
||||
|
||||
cursor->hotspot_x = hotspot_x;
|
||||
cursor->hotspot_y = hotspot_y;
|
||||
cursor->hotspot_x = hotspot_x * cursor->output->scale;
|
||||
cursor->hotspot_y = hotspot_y * cursor->output->scale;
|
||||
|
||||
if (surface && surface == cursor->surface) {
|
||||
if (cursor->output->hardware_cursor == cursor &&
|
||||
|
|
@ -561,6 +633,9 @@ void wlr_output_cursor_set_surface(struct wlr_output_cursor *cursor,
|
|||
wl_signal_add(&surface->events.commit, &cursor->surface_commit);
|
||||
wl_signal_add(&surface->events.destroy, &cursor->surface_destroy);
|
||||
output_cursor_commit(cursor);
|
||||
|
||||
cursor->visible = false;
|
||||
output_cursor_update_visible(cursor);
|
||||
} else {
|
||||
cursor->enabled = false;
|
||||
cursor->width = 0;
|
||||
|
|
@ -576,6 +651,7 @@ bool wlr_output_cursor_move(struct wlr_output_cursor *cursor,
|
|||
y *= cursor->output->scale;
|
||||
cursor->x = x;
|
||||
cursor->y = y;
|
||||
output_cursor_update_visible(cursor);
|
||||
|
||||
if (cursor->output->hardware_cursor != cursor) {
|
||||
cursor->output->needs_swap = true;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ struct wlr_output_layout_output_state {
|
|||
bool auto_configured;
|
||||
|
||||
struct wl_listener resolution;
|
||||
struct wl_listener scale;
|
||||
struct wl_listener transform;
|
||||
struct wl_listener output_destroy;
|
||||
};
|
||||
|
||||
|
|
@ -46,6 +48,8 @@ static void wlr_output_layout_output_destroy(
|
|||
struct wlr_output_layout_output *l_output) {
|
||||
wl_signal_emit(&l_output->events.destroy, l_output);
|
||||
wl_list_remove(&l_output->state->resolution.link);
|
||||
wl_list_remove(&l_output->state->scale.link);
|
||||
wl_list_remove(&l_output->state->transform.link);
|
||||
wl_list_remove(&l_output->state->output_destroy.link);
|
||||
wl_list_remove(&l_output->link);
|
||||
free(l_output->state);
|
||||
|
|
@ -134,6 +138,18 @@ static void handle_output_resolution(struct wl_listener *listener, void *data) {
|
|||
wlr_output_layout_reconfigure(state->layout);
|
||||
}
|
||||
|
||||
static void handle_output_scale(struct wl_listener *listener, void *data) {
|
||||
struct wlr_output_layout_output_state *state =
|
||||
wl_container_of(listener, state, scale);
|
||||
wlr_output_layout_reconfigure(state->layout);
|
||||
}
|
||||
|
||||
static void handle_output_transform(struct wl_listener *listener, void *data) {
|
||||
struct wlr_output_layout_output_state *state =
|
||||
wl_container_of(listener, state, transform);
|
||||
wlr_output_layout_reconfigure(state->layout);
|
||||
}
|
||||
|
||||
static void handle_output_destroy(struct wl_listener *listener, void *data) {
|
||||
struct wlr_output_layout_output_state *state =
|
||||
wl_container_of(listener, state, output_destroy);
|
||||
|
|
@ -162,6 +178,10 @@ static struct wlr_output_layout_output *wlr_output_layout_output_create(
|
|||
|
||||
wl_signal_add(&output->events.resolution, &l_output->state->resolution);
|
||||
l_output->state->resolution.notify = handle_output_resolution;
|
||||
wl_signal_add(&output->events.scale, &l_output->state->scale);
|
||||
l_output->state->scale.notify = handle_output_scale;
|
||||
wl_signal_add(&output->events.transform, &l_output->state->transform);
|
||||
l_output->state->transform.notify = handle_output_transform;
|
||||
wl_signal_add(&output->events.destroy, &l_output->state->output_destroy);
|
||||
l_output->state->output_destroy.notify = handle_output_destroy;
|
||||
|
||||
|
|
|
|||
|
|
@ -109,10 +109,18 @@ static void seat_client_send_keymap(struct wlr_seat_client *client,
|
|||
wl_keyboard_send_keymap(client->keyboard,
|
||||
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, keyboard->keymap_fd,
|
||||
keyboard->keymap_size);
|
||||
}
|
||||
|
||||
static void seat_client_send_repeat_info(struct wlr_seat_client *client,
|
||||
struct wlr_keyboard *keyboard) {
|
||||
if (!keyboard || !client->keyboard) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (wl_resource_get_version(client->keyboard) >=
|
||||
WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION) {
|
||||
wl_keyboard_send_repeat_info(client->keyboard, 25, 600);
|
||||
wl_keyboard_send_repeat_info(client->keyboard,
|
||||
keyboard->repeat_info.rate, keyboard->repeat_info.delay);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -138,8 +146,9 @@ static void wl_seat_get_keyboard(struct wl_client *client,
|
|||
wl_resource_set_implementation(seat_client->keyboard, &wl_keyboard_impl,
|
||||
seat_client, &wl_keyboard_destroy);
|
||||
|
||||
seat_client_send_keymap(seat_client,
|
||||
seat_client->seat->keyboard_state.keyboard);
|
||||
struct wlr_keyboard *keyboard = seat_client->seat->keyboard_state.keyboard;
|
||||
seat_client_send_keymap(seat_client, keyboard);
|
||||
seat_client_send_repeat_info(seat_client, keyboard);
|
||||
|
||||
// TODO possibly handle the case where this keyboard needs an enter
|
||||
// right away
|
||||
|
|
@ -695,6 +704,16 @@ static void handle_keyboard_keymap(struct wl_listener *listener, void *data) {
|
|||
}
|
||||
}
|
||||
|
||||
static void handle_keyboard_repeat_info(struct wl_listener *listener,
|
||||
void *data) {
|
||||
struct wlr_seat_keyboard_state *state =
|
||||
wl_container_of(listener, state, keyboard_repeat_info);
|
||||
struct wlr_seat_client *client;
|
||||
wl_list_for_each(client, &state->seat->clients, link) {
|
||||
seat_client_send_repeat_info(client, state->keyboard);
|
||||
}
|
||||
}
|
||||
|
||||
static void handle_keyboard_destroy(struct wl_listener *listener, void *data) {
|
||||
struct wlr_seat_keyboard_state *state =
|
||||
wl_container_of(listener, state, keyboard_destroy);
|
||||
|
|
@ -713,22 +732,28 @@ void wlr_seat_set_keyboard(struct wlr_seat *seat,
|
|||
if (seat->keyboard_state.keyboard) {
|
||||
wl_list_remove(&seat->keyboard_state.keyboard_destroy.link);
|
||||
wl_list_remove(&seat->keyboard_state.keyboard_keymap.link);
|
||||
wl_list_remove(&seat->keyboard_state.keyboard_repeat_info.link);
|
||||
seat->keyboard_state.keyboard = NULL;
|
||||
}
|
||||
|
||||
if (device) {
|
||||
assert(device->type == WLR_INPUT_DEVICE_KEYBOARD);
|
||||
|
||||
wl_signal_add(&device->events.destroy,
|
||||
&seat->keyboard_state.keyboard_destroy);
|
||||
seat->keyboard_state.keyboard_destroy.notify = handle_keyboard_destroy;
|
||||
|
||||
wl_signal_add(&device->keyboard->events.keymap,
|
||||
&seat->keyboard_state.keyboard_keymap);
|
||||
seat->keyboard_state.keyboard_keymap.notify = handle_keyboard_keymap;
|
||||
wl_signal_add(&device->keyboard->events.repeat_info,
|
||||
&seat->keyboard_state.keyboard_repeat_info);
|
||||
seat->keyboard_state.keyboard_repeat_info.notify =
|
||||
handle_keyboard_repeat_info;
|
||||
|
||||
struct wlr_seat_client *client;
|
||||
wl_list_for_each(client, &seat->clients, link) {
|
||||
seat_client_send_keymap(client, device->keyboard);
|
||||
seat_client_send_repeat_info(client, device->keyboard);
|
||||
}
|
||||
|
||||
seat->keyboard_state.keyboard = device->keyboard;
|
||||
|
|
@ -835,7 +860,6 @@ void wlr_seat_keyboard_enter(struct wlr_seat *seat,
|
|||
surface->resource, &keys);
|
||||
wl_array_release(&keys);
|
||||
|
||||
wlr_seat_keyboard_send_modifiers(seat);
|
||||
wlr_seat_client_send_selection(client);
|
||||
}
|
||||
|
||||
|
|
@ -857,6 +881,12 @@ void wlr_seat_keyboard_enter(struct wlr_seat *seat,
|
|||
|
||||
seat->keyboard_state.focused_client = client;
|
||||
seat->keyboard_state.focused_surface = surface;
|
||||
|
||||
if (client && client->keyboard && seat->keyboard_state.keyboard) {
|
||||
// tell new client about any modifier change last,
|
||||
// as it targets seat->keyboard_state.focused_client
|
||||
wlr_seat_keyboard_send_modifiers(seat);
|
||||
}
|
||||
}
|
||||
|
||||
void wlr_seat_keyboard_notify_enter(struct wlr_seat *seat, struct
|
||||
|
|
|
|||
|
|
@ -459,6 +459,8 @@ static void handle_wlr_surface_committed(struct wl_listener *listener,
|
|||
surface->popup_state->seat);
|
||||
shell_pointer_grab_maybe_end(&grab->pointer_grab);
|
||||
}
|
||||
|
||||
wl_signal_emit(&surface->events.commit, surface);
|
||||
}
|
||||
|
||||
static int shell_surface_ping_timeout(void *user_data) {
|
||||
|
|
@ -509,6 +511,7 @@ static void shell_protocol_get_shell_surface(struct wl_client *client,
|
|||
wl_surface->resource);
|
||||
|
||||
wl_signal_init(&wl_surface->events.destroy);
|
||||
wl_signal_init(&wl_surface->events.commit);
|
||||
wl_signal_init(&wl_surface->events.ping_timeout);
|
||||
wl_signal_init(&wl_surface->events.request_move);
|
||||
wl_signal_init(&wl_surface->events.request_resize);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue