check the returned value of evas_engine_info_set()

SVN revision: 52894
This commit is contained in:
Vincent Torri 2010-09-29 16:45:49 +00:00
parent c0593c571a
commit 62bcf9643e
8 changed files with 101 additions and 35 deletions

View File

@ -76,7 +76,10 @@ _ecore_evas_resize(Ecore_Evas *ee, int w, int h)
einfo->info.alpha_threshold = 0;
einfo->info.func.new_update_region = NULL;
einfo->info.func.free_update_region = NULL;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
@ -568,7 +571,10 @@ ecore_evas_buffer_allocfunc_new(int w, int h, void *(*alloc_func) (void *data, i
einfo->info.alpha_threshold = 0;
einfo->info.func.new_update_region = NULL;
einfo->info.func.free_update_region = NULL;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
evas_key_modifier_add(ee->evas, "Shift");
evas_key_modifier_add(ee->evas, "Control");
@ -717,7 +723,10 @@ ecore_evas_object_image_new(Ecore_Evas *ee_target)
einfo->info.alpha_threshold = 0;
einfo->info.func.new_update_region = NULL;
einfo->info.func.free_update_region = NULL;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
evas_key_modifier_add(ee->evas, "Shift");
evas_key_modifier_add(ee->evas, "Control");

View File

@ -432,7 +432,10 @@ ecore_evas_cocoa_new(const char* name, int w, int h)
goto free_window;
einfo->info.context = [[evas_view context] retain];
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
ecore_evases = (Ecore_Evas *) eina_inlist_prepend(EINA_INLIST_GET(ecore_evases), EINA_INLIST_GET(ee));

View File

@ -417,7 +417,10 @@ _ecore_evas_directfb_fullscreen_set(Ecore_Evas *ee, int on)
if (einfo)
{
einfo->info.surface = ee->engine.directfb.window->surface;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
ee->prop.fullscreen = on;
if (resized)
@ -538,7 +541,10 @@ ecore_evas_directfb_new(const char *disp_name, int windowed, int x, int y, int w
{
einfo->info.dfb = ecore_directfb_interface_get();
einfo->info.surface = window->surface;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
ee->engine.func->fn_render = _ecore_evas_directfb_render;

View File

@ -366,7 +366,10 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation, int resize __UNUSED__)
{
einfo->info.rotation = rotation;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
if (!ee->prop.fullscreen)
{
int tmp;
@ -393,7 +396,10 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation, int resize __UNUSED__)
else
{
einfo->info.rotation = rotation;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
ee->rotation = rotation;
}
if ((ee->rotation == 90) || (ee->rotation == 270))
@ -643,7 +649,10 @@ ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h)
einfo->info.device_number = strtol(disp_name, NULL, 10);
einfo->info.refresh = 0;
einfo->info.rotation = ee->rotation;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
evas_key_modifier_add(ee->evas, "Shift");
evas_key_modifier_add(ee->evas, "Control");

View File

@ -394,7 +394,10 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu
((Evas_Engine_Info_SDL *)einfo)->info.hwsurface = hwsurface;
((Evas_Engine_Info_SDL *)einfo)->info.noframe = noframe;
((Evas_Engine_Info_SDL *)einfo)->info.alpha = alpha;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
#endif
}
@ -406,7 +409,10 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu
{
((Evas_Engine_Info_GL_SDL *)einfo)->flags.fullscreen = fullscreen;
((Evas_Engine_Info_GL_SDL *)einfo)->flags.noframe = noframe;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
#endif
}

View File

@ -556,7 +556,10 @@ _ecore_evas_win32_rotation_set(Ecore_Evas *ee, int rotation, int resize)
einfo = (Evas_Engine_Info_Software_Gdi *)evas_engine_info_get(ee->evas);
if (!einfo) return;
einfo->info.rotation = rotation;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
_ecore_evas_win32_rotation_set_internal(ee, rotation);
}
#endif /* BUILD_ECORE_EVAS_SOFTWARE_GDI */
@ -569,7 +572,10 @@ _ecore_evas_win32_rotation_set(Ecore_Evas *ee, int rotation, int resize)
einfo = (Evas_Engine_Info_Software_DDraw *)evas_engine_info_get(ee->evas);
if (!einfo) return;
einfo->info.rotation = rotation;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
_ecore_evas_win32_rotation_set_internal(ee, rotation);
}
#endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
@ -842,7 +848,10 @@ _ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on)
{
einfo->info.fullscreen = !!on;
/* einfo->info.layered = window->shape.layered; */
evas_engine_info_set(ecore_evas_get(ee), (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
}
#endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
@ -857,7 +866,10 @@ _ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on)
{
einfo->info.fullscreen = !!on;
einfo->info.layered = window->shape.layered;
evas_engine_info_set(ecore_evas_get(ee), (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
}
#endif /* BUILD_ECORE_EVAS_DIRECT3D */
@ -947,7 +959,10 @@ _ecore_evas_engine_software_gdi_init(Ecore_Evas *ee)
einfo->info.borderless = 0;
einfo->info.fullscreen = 0;
einfo->info.region = 0;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
return 1;
@ -978,7 +993,10 @@ _ecore_evas_engine_software_ddraw_init(Ecore_Evas *ee)
einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
einfo->info.depth = ecore_win32_screen_depth_get();
einfo->info.rotation = 0;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
return 1;
@ -1009,7 +1027,10 @@ _ecore_evas_engine_direct3d_init(Ecore_Evas *ee)
einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
einfo->info.depth = ecore_win32_screen_depth_get();
einfo->info.rotation = 0;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
return 1;
@ -1039,7 +1060,10 @@ _ecore_evas_engine_opengl_glew_init(Ecore_Evas *ee)
/* FIXME: REDRAW_DEBUG missing for now */
einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
einfo->info.depth = ecore_win32_screen_depth_get();
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
return 1;
@ -1073,7 +1097,10 @@ _ecore_evas_engine_software_16_ddraw_init(Ecore_Evas *ee)
einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
einfo->info.depth = ecore_win32_screen_depth_get();
einfo->info.rotation = 0;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
return 1;

View File

@ -665,7 +665,10 @@ _ecore_evas_wince_fullscreen_set(Ecore_Evas *ee, int on)
{
einfo->info.fullscreen = !!on;
/* einfo->info.layered = window->shape.layered; */
evas_engine_info_set(ecore_evas_get(ee), (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
}
@ -805,7 +808,10 @@ ecore_evas_software_wince_new_internal(int backend,
einfo->info.backend = backend;
einfo->info.rotation = 0;
einfo->info.fullscreen = fullscreen;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
ecore_wince_window_backend_set((Ecore_WinCE_Window *)ee->prop.window, backend);
ecore_wince_window_suspend_set((Ecore_WinCE_Window *)ee->prop.window, einfo->func.suspend);

View File

@ -158,7 +158,7 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y,
WRN("OpenGL X11 init engine '%s' failed - no visual, colormap or depth.", ee->driver);
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
WRN("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
return 0;
}
}
@ -183,10 +183,10 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y,
CWBorderPixel | CWBitGravity | CWEventMask |
CWOverrideRedirect, &attr);
einfo->info.drawable = win;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
WRN("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
XDestroyWindow(einfo->info.display, win);
return 0;
}
@ -3170,7 +3170,7 @@ ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent,
einfo->info.debug = redraw_debug;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
WRN("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ecore_evas_free(ee);
return NULL;
}
@ -3692,7 +3692,7 @@ ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent,
einfo->info.drawable = ee->prop.window;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
WRN("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ecore_evas_free(ee);
return NULL;
}
@ -3915,7 +3915,7 @@ ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent,
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
WRN("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ecore_evas_free(ee);
return NULL;
}
@ -4219,12 +4219,12 @@ ecore_evas_software_x11_8_new(const char *disp_name, Ecore_X_Window parent,
}
einfo->info.rotation = 0;
einfo->info.debug = redraw_debug;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
WRN("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ecore_evas_free(ee);
return NULL;
}
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
ecore_evas_free(ee);
return NULL;
}
}
ecore_x_icccm_hints_set(ee->prop.window,