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

Merge branch 'wlcore'

Browse source
This commit is contained in:
Drew DeVault 2017-06-29 16:00:24 -04:00
commit 8920b5d607
26 changed files with 322 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
types/wlr_output.c
View file

@ -45,7 +45,7 @@ static void wl_output_send_to_resource(struct wl_resource *resource) {
static void wl_output_destroy(struct wl_resource *resource) {
struct wlr_output *output = wl_resource_get_user_data(resource);
struct wl_resource *_resource = NULL;
wl_resource_for_each(_resource, &output->resource_list) {
wl_resource_for_each(_resource, &output->wl_resources) {
if (_resource == resource) {
struct wl_list *link = wl_resource_get_link(_resource);
wl_list_remove(link);
@ -75,7 +75,7 @@ static void wl_output_bind(struct wl_client *wl_client, void *_wlr_output,
wl_client, &wl_output_interface, version, id);
wl_resource_set_implementation(wl_resource, &wl_output_impl,
wlr_output, wl_output_destroy);
wl_list_insert(&wlr_output->resource_list, wl_resource_get_link(wl_resource));
wl_list_insert(&wlr_output->wl_resources, wl_resource_get_link(wl_resource));
wl_output_send_to_resource(wl_resource);
}
@ -84,7 +84,7 @@ struct wl_global *wlr_output_create_global(
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->resource_list);
wl_list_init(&wlr_output->wl_resources);
return wl_global;
}