enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

add wrappers for elm_win util create functions 

avoid deadlocking in gl init by forcing sw
This commit is contained in:
Mike Blumenkrantz 2017-03-17 13:17:02 -04:00
parent 047f08a994
commit 3ca416cc0a
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/bin/e_win.c
View File

@ -2,6 +2,8 @@
/* intercept elm_win operations so we talk directly to e_client */
#undef elm_win_add
#undef elm_win_util_dialog_add
#undef elm_win_util_standard_add
typedef struct _Elm_Win_Trap_Ctx
{
@ -501,3 +503,33 @@ e_elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
free(eng);
return o;
}
E_API Evas_Object *
elm_win_util_standard_add(const char *name, const char *title)
{
char *eng;
Evas_Object *o;
eng = eina_strdup(getenv("ELM_ACCEL"));
e_util_env_set("ELM_ACCEL", "none");
o = elm_win_util_standard_add(name, title);
e_util_env_set("ELM_ACCEL", eng);
elm_win_alpha_set(o, 1);
free(eng);
return o;
}
E_API Evas_Object *
e_elm_win_util_dialog_add(Evas_Object *parent, const char *name, const char *title)
{
char *eng;
Evas_Object *o;
eng = eina_strdup(getenv("ELM_ACCEL"));
e_util_env_set("ELM_ACCEL", "none");
o = elm_win_util_dialog_add(parent, name, title);
e_util_env_set("ELM_ACCEL", eng);
elm_win_alpha_set(o, 1);
free(eng);
return o;
}

8
src/bin/e_win.h
View File

@ -38,9 +38,17 @@ e_obj_is_win(const void *obj)
}
E_API Evas_Object *e_elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type);
E_API Evas_Object *elm_win_util_standard_add(const char *name, const char *title);
E_API Evas_Object *e_elm_win_util_dialog_add(Evas_Object *parent, const char *name, const char *title);
#define elm_win_add(X, Y, Z) \
e_elm_win_add((X), (Y), (Z))
#define elm_win_util_dialog_add(X, Y, Z) \
e_elm_win_util_dialog_add((X), (Y), (Z))
#define elm_win_util_standard_add(X, Y) \
e_elm_win_util_standard_add((X), (Y))
#endif
#endif