forked from enlightenment/enlightenment
append E_Comp_Wl_Output to compositor's output list during output_init
call Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
parent
e36d2f5235
commit
e8d0ac4f2d
|
@ -2297,11 +2297,9 @@ static void
|
|||
_e_comp_wl_cb_output_bind(struct wl_client *client, void *data, uint32_t version, uint32_t id)
|
||||
{
|
||||
E_Comp_Wl_Output *output;
|
||||
E_Comp_Data *cdata;
|
||||
struct wl_resource *resource;
|
||||
|
||||
if (!(output = data)) return;
|
||||
if (!(cdata = e_comp->wl_comp_data)) return;
|
||||
|
||||
resource =
|
||||
wl_resource_create(client, &wl_output_interface, MIN(version, 2), id);
|
||||
|
@ -2311,7 +2309,6 @@ _e_comp_wl_cb_output_bind(struct wl_client *client, void *data, uint32_t version
|
|||
return;
|
||||
}
|
||||
|
||||
cdata->outputs = eina_list_append(cdata->outputs, output);
|
||||
output->resources = eina_list_append(output->resources, resource);
|
||||
|
||||
wl_resource_set_implementation(resource, NULL, output,
|
||||
|
@ -2853,6 +2850,8 @@ e_comp_wl_output_init(const char *id, const char *make, const char *model, int x
|
|||
if (make) output->make = eina_stringshare_add(make);
|
||||
if (model) output->model = eina_stringshare_add(model);
|
||||
|
||||
cdata->outputs = eina_list_append(cdata->outputs, output);
|
||||
|
||||
output->global =
|
||||
wl_global_create(cdata->wl.disp, &wl_output_interface, 2,
|
||||
output, _e_comp_wl_cb_output_bind);
|
||||
|
|
Loading…
Reference in New Issue