NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handl x io errors more gracefully by quitting the mainloop cleanly. 

also let app woners know via ioerr cb's on windows before we schedule
the quit.



SVN revision: 74893
This commit is contained in:
Carsten Haitzler 2012-08-06 04:09:02 +00:00
parent 35f9a089f9
commit 419a66ff93
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
legacy/elementary/src/lib/elm_win.c
View File

@ -157,6 +157,7 @@ static const char SIG_FULLSCREEN[] = "fullscreen";
static const char SIG_UNFULLSCREEN[] = "unfullscreen";
static const char SIG_MAXIMIZED[] = "maximized";
static const char SIG_UNMAXIMIZED[] = "unmaximized";
static const char SIG_IOERR[] = "ioerr";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_DELETE_REQUEST, ""},
@ -172,6 +173,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_UNFULLSCREEN, ""},
{SIG_MAXIMIZED, ""},
{SIG_UNMAXIMIZED, ""},
{SIG_IOERR, ""},
{NULL, NULL}
};
@ -476,7 +478,7 @@ _elm_win_resize_job(void *data)
}
evas_object_resize(ELM_WIDGET_DATA(sd)->obj, w, h);
EINA_LIST_FOREACH (sd->resize_objs, l, obj)
EINA_LIST_FOREACH(sd->resize_objs, l, obj)
{
evas_object_move(obj, 0, 0);
evas_object_resize(obj, w, h);
@ -1563,7 +1565,7 @@ _elm_win_resize_objects_eval(Evas_Object *obj)
int xx = 1, xy = 1;
double wx, wy;
EINA_LIST_FOREACH (sd->resize_objs, l, child)
EINA_LIST_FOREACH(sd->resize_objs, l, child)
{
evas_object_size_hint_weight_get(child, &wx, &wy);
if (wx == 0.0) xx = 0;
@ -1637,12 +1639,12 @@ _elm_win_rescale(Elm_Theme *th,
if (!use_theme)
{
EINA_LIST_FOREACH (_elm_win_list, l, obj)
EINA_LIST_FOREACH(_elm_win_list, l, obj)
elm_widget_theme(obj);
}
else
{
EINA_LIST_FOREACH (_elm_win_list, l, obj)
EINA_LIST_FOREACH(_elm_win_list, l, obj)
elm_widget_theme_specific(obj, th, EINA_FALSE);
}
}
@ -1653,7 +1655,7 @@ _elm_win_translate(void)
const Eina_List *l;
Evas_Object *obj;
EINA_LIST_FOREACH (_elm_win_list, l, obj)
EINA_LIST_FOREACH(_elm_win_list, l, obj)
elm_widget_translate(obj);
}
@ -2028,6 +2030,21 @@ _elm_win_smart_set_user(Elm_Widget_Smart_Class *sc)
sc->event = _elm_win_smart_event;
}
#ifdef HAVE_ELEMENTARY_X
static void
_elm_x_io_err(void *data)
{
Eina_List *l;
Evas_Object *obj;
EINA_LIST_FOREACH(_elm_win_list, l, obj)
{
evas_object_smart_callback_call(obj, SIG_IOERR, NULL);
}
elm_exit();
}
#endif
EAPI Evas_Object *
elm_win_add(Evas_Object *parent,
const char *name,
@ -2332,6 +2349,10 @@ elm_win_add(Evas_Object *parent,
#ifdef HAVE_ELEMENTARY_X
_elm_win_xwindow_get(sd);
if (sd->x.xwin)
{
ecore_x_io_error_handler_set(_elm_x_io_err, NULL);
}
#endif
#ifdef HAVE_ELEMENTARY_WAYLAND
@ -2400,7 +2421,7 @@ elm_win_add(Evas_Object *parent,
evas_image_cache_set(sd->evas, (_elm_config->image_cache * 1024));
evas_font_cache_set(sd->evas, (_elm_config->font_cache * 1024));
EINA_LIST_FOREACH (_elm_config->font_dirs, l, fontpath)
EINA_LIST_FOREACH(_elm_config->font_dirs, l, fontpath)
evas_font_path_append(sd->evas, fontpath);
if (!_elm_config->font_hinting)

1
legacy/elementary/src/lib/elm_win.h
View File

@ -82,6 +82,7 @@
* @li "unfullscreen": window has stopped being fullscreen
* @li "maximized": window has been maximized
* @li "unmaximized": window has stopped being maximized
* @li "ioerr": there has been a low-level I/O error with the display system
*
* Examples:
* @li @ref win_example_01