nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 08:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #502 from emersion/output-fixes

Browse Source 
Output fixes
This commit is contained in:
Drew DeVault 2017-12-19 08:28:27 -05:00 committed by GitHub
commit fc78e269a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
types/wlr_output.c
View File

@ -86,12 +86,13 @@ static void wl_output_destroy(struct wl_resource *resource) {
} }
} }
static void wl_output_release(struct wl_client *client, struct wl_resource *resource) { static void wl_output_release(struct wl_client *client,
wl_output_destroy(resource); struct wl_resource *resource) {
wl_resource_destroy(resource);
} }
static struct wl_output_interface wl_output_impl = { static struct wl_output_interface wl_output_impl = {
.release = wl_output_release .release = wl_output_release,
}; };
static void wl_output_bind(struct wl_client *wl_client, void *data, static void wl_output_bind(struct wl_client *wl_client, void *data,
@ -140,8 +141,7 @@ void wlr_output_destroy_global(struct wlr_output *wlr_output) {
wl_list_remove(&wlr_output->display_destroy.link); wl_list_remove(&wlr_output->display_destroy.link);
struct wl_resource *resource, *tmp; struct wl_resource *resource, *tmp;
wl_resource_for_each_safe(resource, tmp, &wlr_output->wl_resources) { wl_resource_for_each_safe(resource, tmp, &wlr_output->wl_resources) {
struct wl_list *link = wl_resource_get_link(resource); wl_resource_destroy(resource);
wl_list_remove(link);
} }
wl_global_destroy(wlr_output->wl_global); wl_global_destroy(wlr_output->wl_global);
wlr_output->wl_global = NULL; wlr_output->wl_global = NULL;
@ -289,6 +289,8 @@ void wlr_output_destroy(struct wlr_output *output) {
return; return;
} }
wlr_output_destroy_global(output);
wl_signal_emit(&output->events.destroy, output); wl_signal_emit(&output->events.destroy, output);
struct wlr_output_mode *mode, *tmp_mode; struct wlr_output_mode *mode, *tmp_mode;
@ -297,8 +299,6 @@ void wlr_output_destroy(struct wlr_output *output) {
free(mode); free(mode);
} }
wl_list_remove(&output->display_destroy.link);
if (output->impl && output->impl->destroy) { if (output->impl && output->impl->destroy) {
output->impl->destroy(output); output->impl->destroy(output);
} else { } else {
@ -521,9 +521,9 @@ bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
cursor->hotspot_x = hotspot_x; cursor->hotspot_x = hotspot_x;
cursor->hotspot_y = hotspot_y; cursor->hotspot_y = hotspot_y;
if (cursor->output->hardware_cursor == NULL && struct wlr_output_cursor *hwcur = cursor->output->hardware_cursor;
cursor->output->impl->set_cursor) { if (cursor->output->impl->set_cursor && (hwcur == NULL || hwcur == cursor)) {
if (cursor->output->impl->move_cursor) { if (cursor->output->impl->move_cursor && hwcur != cursor) {
cursor->output->impl->move_cursor(cursor->output, cursor->output->impl->move_cursor(cursor->output,
(int)cursor->x, (int)cursor->y); (int)cursor->x, (int)cursor->y);
} }