styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: Handle failure to init a display screen 

Summary:
e_comp_wl_output_init will fail (silently) under a couple of
conditions.  Instead, make it propagate the error so it can be handled
at a higher level.  For now just issue an error message.

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>

Reviewers: cedric, devilhorns, zmike

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D2155
This commit is contained in:
Bryce Harrington 2015-03-13 20:06:01 -04:00 committed by Mike Blumenkrantz
parent f225f04002
commit 673de24fa7
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/bin/e_comp_wl.c
View File

@ -763,12 +763,13 @@ _e_comp_wl_cb_randr_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *e
break;
}
e_comp_wl_output_init(screen->id, screen->info.screen,
screen->info.name,
screen->config.geom.x, screen->config.geom.y,
screen->config.geom.w, screen->config.geom.h,
screen->info.size.w, screen->info.size.h,
screen->config.mode.refresh, 0, transform);
if (!e_comp_wl_output_init(screen->id, screen->info.screen,
screen->info.name,
screen->config.geom.x, screen->config.geom.y,
screen->config.geom.w, screen->config.geom.h,
screen->info.size.w, screen->info.size.h,
screen->config.mode.refresh, 0, transform))
ERR("Could not initialize screen %s");
}
return ECORE_CALLBACK_RENEW;
@ -2851,22 +2852,27 @@ _e_comp_wl_output_get(Eina_List *outputs, const char *id)
* @param refresh output's refresh rate in Hz
* @param subpixel output's subpixel layout
* @param transform output's rotation and/or mirror transformation
*
* @returns True if a display output object could be added or updated
*/
EAPI void
e_comp_wl_output_init(const char *id, const char *make, const char *model, int x, int y, int w, int h, int pw, int ph, unsigned int refresh, unsigned int subpixel, unsigned int transform)
EAPI Eina_Bool
e_comp_wl_output_init(const char *id, const char *make, const char *model,
int x, int y, int w, int h, int pw, int ph,
unsigned int refresh, unsigned int subpixel,
unsigned int transform)
{
E_Comp_Data *cdata;
E_Comp_Wl_Output *output;
Eina_List *l2;
struct wl_resource *resource;
if (!(cdata = e_comp->wl_comp_data)) return;
if (!(cdata = e_comp->wl_comp_data)) return EINA_FALSE;
/* retrieve named output; or create it if it doesn't exist */
output = _e_comp_wl_output_get(cdata->outputs, id);
if (!output)
{
if (!(output = E_NEW(E_Comp_Wl_Output, 1))) return;
if (!(output = E_NEW(E_Comp_Wl_Output, 1))) return EINA_FALSE;
if (id) output->id = eina_stringshare_add(id);
if (make) output->make = eina_stringshare_add(make);
@ -2914,4 +2920,5 @@ e_comp_wl_output_init(const char *id, const char *make, const char *model, int x
if (wl_resource_get_version(resource) >= WL_OUTPUT_DONE_SINCE_VERSION)
wl_output_send_done(resource);
}
return EINA_TRUE;
}

2
src/bin/e_comp_wl.h
View File

@ -291,7 +291,7 @@ EAPI E_Comp_Wl_Buffer *e_comp_wl_buffer_get(struct wl_resource *resource);
EAPI struct wl_signal e_comp_wl_surface_create_signal_get(E_Comp *comp);
EAPI double e_comp_wl_idle_time_get(void);
EAPI void e_comp_wl_output_init(const char *id, const char *make, const char *model, int x, int y, int w, int h, int pw, int ph, unsigned int refresh, unsigned int subpixel, unsigned int transform);
EAPI Eina_Bool e_comp_wl_output_init(const char *id, const char *make, const char *model, int x, int y, int w, int h, int pw, int ph, unsigned int refresh, unsigned int subpixel, unsigned int transform);
static inline uint64_t
e_comp_wl_id_get(uint32_t id, pid_t pid)