Merge pull request #473 from emersion/cursor-enter-leave

Send wl_surface.{enter,leave} to cursor surfaces
This commit is contained in:
Drew DeVault 2017-12-08 09:12:19 -05:00 committed by GitHub
commit 381a646d2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 62 additions and 30 deletions

View File

@ -3,7 +3,7 @@
#include <stdint.h> #include <stdint.h>
#define ROOTS_XCURSOR_SIZE 16 #define ROOTS_XCURSOR_SIZE 24
#define ROOTS_XCURSOR_DEFAULT "left_ptr" #define ROOTS_XCURSOR_DEFAULT "left_ptr"
#define ROOTS_XCURSOR_MOVE "grabbing" #define ROOTS_XCURSOR_MOVE "grabbing"

View File

@ -16,6 +16,7 @@ struct wlr_output_cursor {
struct wlr_output *output; struct wlr_output *output;
double x, y; double x, y;
bool enabled; bool enabled;
bool visible;
uint32_t width, height; uint32_t width, height;
int32_t hotspot_x, hotspot_y; int32_t hotspot_x, hotspot_y;
struct wl_list link; struct wl_list link;
@ -98,6 +99,9 @@ void wlr_output_set_fullscreen_surface(struct wlr_output *output,
struct wlr_surface *surface); struct wlr_surface *surface);
struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output); struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output);
/**
* Sets the cursor image. The image must be already scaled for the output.
*/
bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor, bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
const uint8_t *pixels, int32_t stride, uint32_t width, uint32_t height, const uint8_t *pixels, int32_t stride, uint32_t width, uint32_t height,
int32_t hotspot_x, int32_t hotspot_y); int32_t hotspot_x, int32_t hotspot_y);

View File

@ -310,12 +310,20 @@ static void output_fullscreen_surface_render(struct wlr_output *output,
wlr_surface_send_frame_done(surface, when); 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, static void output_cursor_get_box(struct wlr_output_cursor *cursor,
struct wlr_box *box) { struct wlr_box *box) {
box->x = cursor->x - cursor->hotspot_x; box->x = cursor->x - cursor->hotspot_x;
box->y = cursor->y - cursor->hotspot_y; box->y = cursor->y - cursor->hotspot_y;
box->width = cursor->width; box->width = cursor->width;
box->height = cursor->height; 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, static void output_cursor_render(struct wlr_output_cursor *cursor,
@ -331,36 +339,23 @@ static void output_cursor_render(struct wlr_output_cursor *cursor,
return; 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); glViewport(0, 0, cursor->output->width, cursor->output->height);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
int x = cursor->x - cursor->hotspot_x; struct wlr_box cursor_box;
int y = cursor->y - cursor->hotspot_y; output_cursor_get_box(cursor, &cursor_box);
if (cursor->surface != NULL) {
x += cursor->surface->current->sx; float translate[16];
y += cursor->surface->current->sy; 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]; float matrix[16];
wlr_texture_get_matrix(texture, &matrix, &cursor->output->transform_matrix, wlr_matrix_mul(&translate, &scale, &matrix);
x, y); wlr_matrix_mul(&cursor->output->transform_matrix, &matrix, &matrix);
wlr_render_with_matrix(renderer, texture, &matrix); wlr_render_with_matrix(renderer, texture, &matrix);
if (cursor->surface != NULL) { if (cursor->surface != NULL) {
@ -381,7 +376,8 @@ void wlr_output_swap_buffers(struct wlr_output *output) {
struct wlr_output_cursor *cursor; struct wlr_output_cursor *cursor;
wl_list_for_each(cursor, &output->cursors, link) { 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; continue;
} }
output_cursor_render(cursor, &now); output_cursor_render(cursor, &now);
@ -516,11 +512,39 @@ bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
stride, width, height, pixels); 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) { static void output_cursor_commit(struct wlr_output_cursor *cursor) {
// Some clients commit a cursor surface with a NULL buffer to hide it. // Some clients commit a cursor surface with a NULL buffer to hide it.
cursor->enabled = wlr_surface_has_buffer(cursor->surface); cursor->enabled = wlr_surface_has_buffer(cursor->surface);
cursor->width = cursor->surface->current->width; cursor->width = cursor->surface->current->width * cursor->output->scale;
cursor->height = cursor->surface->current->height; cursor->height = cursor->surface->current->height * cursor->output->scale;
if (cursor->output->hardware_cursor != cursor) { if (cursor->output->hardware_cursor != cursor) {
cursor->output->needs_swap = true; cursor->output->needs_swap = true;
@ -553,8 +577,8 @@ void wlr_output_cursor_set_surface(struct wlr_output_cursor *cursor,
return; return;
} }
cursor->hotspot_x = hotspot_x; cursor->hotspot_x = hotspot_x * cursor->output->scale;
cursor->hotspot_y = hotspot_y; cursor->hotspot_y = hotspot_y * cursor->output->scale;
if (surface && surface == cursor->surface) { if (surface && surface == cursor->surface) {
if (cursor->output->hardware_cursor == cursor && if (cursor->output->hardware_cursor == cursor &&
@ -584,6 +608,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.commit, &cursor->surface_commit);
wl_signal_add(&surface->events.destroy, &cursor->surface_destroy); wl_signal_add(&surface->events.destroy, &cursor->surface_destroy);
output_cursor_commit(cursor); output_cursor_commit(cursor);
cursor->visible = false;
output_cursor_update_visible(cursor);
} else { } else {
cursor->enabled = false; cursor->enabled = false;
cursor->width = 0; cursor->width = 0;
@ -599,6 +626,7 @@ bool wlr_output_cursor_move(struct wlr_output_cursor *cursor,
y *= cursor->output->scale; y *= cursor->output->scale;
cursor->x = x; cursor->x = x;
cursor->y = y; cursor->y = y;
output_cursor_update_visible(cursor);
if (cursor->output->hardware_cursor != cursor) { if (cursor->output->hardware_cursor != cursor) {
cursor->output->needs_swap = true; cursor->output->needs_swap = true;