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

Merge pull request #382 from emersion/cursor-surface-position 

Process surface position for software cursor hotspots
This commit is contained in:
Drew DeVault 2017-11-02 14:29:57 -04:00 committed by GitHub
parent 62734d0553 0384c9c094
commit 80b4a2f64c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
types/wlr_output.c
View File

@ -279,10 +279,16 @@ static void output_cursor_render(struct wlr_output_cursor *cursor) {
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;
}
float matrix[16];
wlr_texture_get_matrix(texture, &matrix,
&cursor->output->transform_matrix, cursor->x - cursor->hotspot_x,
cursor->y - cursor->hotspot_y);
wlr_texture_get_matrix(texture, &matrix, &cursor->output->transform_matrix,
x, y);
wlr_render_with_matrix(renderer, texture, &matrix);
}