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

remove all traces of selecting engine in e17 - wont actuallly ever be 

needed beyond compositor. :)



SVN revision: 66513
This commit is contained in:
Carsten Haitzler 2011-12-26 06:24:59 +00:00
parent 897c5aaf45
commit cdb864ed8e
21 changed files with 46 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e_border.c
View File

@ -362,7 +362,7 @@ e_border_new(E_Container *con,
e_bindings_mouse_grab(E_BINDING_CONTEXT_BORDER, bd->win);
e_bindings_wheel_grab(E_BINDING_CONTEXT_BORDER, bd->win);
e_focus_setup(bd);
bd->bg_ecore_evas = e_canvas_new(e_config->evas_engine_borders, bd->win,
bd->bg_ecore_evas = e_canvas_new(bd->win,
0, 0, bd->w, bd->h, 1, 0,
&(bd->bg_win));
e_canvas_add(bd->bg_ecore_evas);
@ -1125,7 +1125,7 @@ _e_border_frame_replace(E_Border *bd, Eina_Bool argb)
e_bindings_wheel_grab(E_BINDING_CONTEXT_BORDER, bd->win);
e_focus_setup(bd);
bd->bg_ecore_evas = e_canvas_new(e_config->evas_engine_borders, bd->win,
bd->bg_ecore_evas = e_canvas_new(bd->win,
0, 0, bd->w, bd->h, 1, 0,
&(bd->bg_win));

85
src/bin/e_canvas.c
View File

@ -44,35 +44,6 @@ e_canvas_del(Ecore_Evas *ee)
_e_canvases = eina_list_remove(_e_canvases, ee);
}
EAPI int
e_canvas_engine_decide(int engine)
{
/* if use default - use it */
if (engine == E_EVAS_ENGINE_DEFAULT)
engine = e_config->evas_engine_default;
/* if engine is software-16 - do we support it? */
if (engine == E_EVAS_ENGINE_SOFTWARE_X11_16)
{
if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_16_X11))
engine = E_EVAS_ENGINE_SOFTWARE_X11;
}
/* if engine is gl - do we support it? */
if (engine == E_EVAS_ENGINE_GL_X11)
{
/* if we dont - fall back to software x11 */
if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11))
engine = E_EVAS_ENGINE_SOFTWARE_X11;
}
/* support xrender? */
if (engine == E_EVAS_ENGINE_XRENDER_X11)
{
/* if we dont - fall back to software x11 */
if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_XRENDER_X11))
engine = E_EVAS_ENGINE_SOFTWARE_X11;
}
return engine;
}
EAPI void
e_canvas_recache(void)
{
@ -172,62 +143,20 @@ e_canvas_rehint(void)
}
EAPI Ecore_Evas *
e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
e_canvas_new(Ecore_X_Window win, int x, int y, int w, int h,
int direct_resize, int override, Ecore_X_Window *win_ret)
{
Ecore_Evas *ee;
int engine;
engine = e_canvas_engine_decide(engine_hint);
if (engine == E_EVAS_ENGINE_GL_X11)
ee = ecore_evas_software_x11_new(NULL, win, x, y, w, h);
if (ee)
{
ee = ecore_evas_gl_x11_new(NULL, win, x, y, w, h);
if (ee)
{
ecore_evas_override_set(ee, override);
if (direct_resize) ecore_evas_gl_x11_direct_resize_set(ee, 1);
if (win_ret) *win_ret = ecore_evas_gl_x11_window_get(ee);
}
else
goto try2;
}
else if (engine == E_EVAS_ENGINE_XRENDER_X11)
{
ee = ecore_evas_xrender_x11_new(NULL, win, x, y, w, h);
if (ee)
{
ecore_evas_override_set(ee, override);
if (direct_resize) ecore_evas_xrender_x11_direct_resize_set(ee, 1);
if (win_ret) *win_ret = ecore_evas_xrender_x11_window_get(ee);
}
else
goto try2;
}
else if (engine == E_EVAS_ENGINE_SOFTWARE_X11_16)
{
ee = ecore_evas_software_x11_16_new(NULL, win, x, y, w, h);
if (ee)
{
ecore_evas_override_set(ee, override);
if (direct_resize) ecore_evas_software_x11_16_direct_resize_set(ee, 1);
if (win_ret) *win_ret = ecore_evas_software_x11_16_window_get(ee);
}
else
goto try2;
ecore_evas_override_set(ee, override);
if (direct_resize) ecore_evas_software_x11_direct_resize_set(ee, 1);
if (win_ret) *win_ret = ecore_evas_software_x11_window_get(ee);
}
else
{
try2:
ee = ecore_evas_software_x11_new(NULL, win, x, y, w, h);
if (ee)
{
ecore_evas_override_set(ee, override);
if (direct_resize) ecore_evas_software_x11_direct_resize_set(ee, 1);
if (win_ret) *win_ret = ecore_evas_software_x11_window_get(ee);
}
else
EINA_LOG_ERR("Impossible to build any Ecore_Evas window !!");
}
EINA_LOG_ERR("Impossible to build any Ecore_Evas window !!");
return ee;
}

3
src/bin/e_canvas.h
View File

@ -5,13 +5,12 @@
EAPI void e_canvas_add(Ecore_Evas *ee);
EAPI void e_canvas_del(Ecore_Evas *ee);
EAPI int e_canvas_engine_decide(int engine);
EAPI void e_canvas_recache(void);
EAPI void e_canvas_cache_flush(void);
EAPI void e_canvas_cache_reload(void);
EAPI void e_canvas_idle_flush(void);
EAPI void e_canvas_rehint(void);
EAPI Ecore_Evas *e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h, int direct_resize, int override, Ecore_X_Window *win_ret);
EAPI Ecore_Evas *e_canvas_new(Ecore_X_Window win, int x, int y, int w, int h, int direct_resize, int override, Ecore_X_Window *win_ret);
#endif
#endif

35
src/bin/e_config.c
View File

@ -647,16 +647,6 @@ e_config_init(void)
E_CONFIG_VAL(D, T, use_virtual_roots, INT); /* should not make this a config option (for now) */
E_CONFIG_VAL(D, T, show_desktop_icons, INT); /**/
E_CONFIG_VAL(D, T, edge_flip_dragging, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_default, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_container, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_init, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_menus, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_borders, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_errors, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_popups, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_drag, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_win, INT); /**/
E_CONFIG_VAL(D, T, evas_engine_zone, INT); /**/
E_CONFIG_VAL(D, T, use_composite, INT); /**/
E_CONFIG_VAL(D, T, language, STR); /**/
E_CONFIG_LIST(D, T, modules, _e_config_module_edd); /**/
@ -1496,31 +1486,6 @@ e_config_profile_del(const char *prof)
ecore_file_recursive_rm(buf);
}
EAPI Eina_List *
e_config_engine_list(void)
{
Eina_List *l = NULL;
l = eina_list_append(l, strdup("SOFTWARE"));
/*
* DISABLE GL as an accessible engine - it does have problems, ESPECIALLY with
* shaped windows (it can't do them), and multiple gl windows and shared
* contexts, so for now just disable it. xrender is much more complete in
* this regard.
*/
#if 0 /* opengl cant do occludes for frames - only useful for compositor */
l = eina_list_append(l, strdup("GL"));
#endif
#if 0 /* xrender too incomplete these days */
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_XRENDER_X11))
l = eina_list_append(l, strdup("XRENDER"));
#endif
#if 0 /* software-16 too incomplete and buggy */
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_16_X11))
l = eina_list_append(l, strdup("SOFTWARE_16"));
#endif
return l;
}
EAPI void
e_config_save_block_set(int block)
{

31
src/bin/e_config.h
View File

@ -36,25 +36,6 @@ typedef struct _E_Event_Config_Icon_Theme E_Event_Config_Icon_Theme;
#define E_CONFIG_FILE_GENERATION 0x0146
#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
#define E_EVAS_ENGINE_DEFAULT 0
#define E_EVAS_ENGINE_SOFTWARE_X11 1
#define E_EVAS_ENGINE_GL_X11 2
#define E_EVAS_ENGINE_XRENDER_X11 3
#define E_EVAS_ENGINE_SOFTWARE_X11_16 4
typedef enum _E_Engine_Context
{
E_ENGINE_CONTEXT_INIT,
E_ENGINE_CONTEXT_CONTAINER,
E_ENGINE_CONTEXT_ZONE,
E_ENGINE_CONTEXT_BORDER,
E_ENGINE_CONTEXT_MENU,
E_ENGINE_CONTEXT_ERROR,
E_ENGINE_CONTEXT_WIN,
E_ENGINE_CONTEXT_POPUP,
E_ENGINE_CONTEXT_DRAG
} E_Engine_Context;
struct _E_Config
{
int config_version; // INTERNAL
@ -81,16 +62,6 @@ struct _E_Config
int use_virtual_roots; // NO GUI - maybe remove?
int show_desktop_icons; // GUI
int edge_flip_dragging; // GUI
int evas_engine_default; // GUI
int evas_engine_container; // NO GUI - maybe remove?
int evas_engine_init; // NO GUI - maybe remove?
int evas_engine_menus; // NO GUI - maybe remove?
int evas_engine_borders; // NO GUI - maybe remove?
int evas_engine_errors; // NO GUI - maybe remove?
int evas_engine_popups; // NO GUI - maybe remove?
int evas_engine_drag; // NO GUI - maybe remove?
int evas_engine_win; // NO GUI - maybe remove?
int evas_engine_zone; // NO GUI - maybe remove?
int use_composite; // GUI
const char *language; // GUI
Eina_List *modules; // GUI
@ -558,8 +529,6 @@ EAPI Eina_List *e_config_profile_list(void);
EAPI void e_config_profile_add(const char *prof);
EAPI void e_config_profile_del(const char *prof);
EAPI Eina_List *e_config_engine_list(void);
EAPI void e_config_save_block_set(int block);
EAPI int e_config_save_block_get(void);

4
src/bin/e_container.c
View File

@ -78,11 +78,11 @@ e_container_new(E_Manager *man)
con->win = con->manager->win;
if (!e_config->null_container_win)
con->bg_ecore_evas = e_canvas_new(e_config->evas_engine_container, con->win,
con->bg_ecore_evas = e_canvas_new(con->win,
0, 0, con->w, con->h, 1, 1,
&(con->bg_win));
else
con->bg_ecore_evas = e_canvas_new(e_config->evas_engine_container, con->win,
con->bg_ecore_evas = e_canvas_new(con->win,
0, 0, 1, 1, 1, 1,
&(con->bg_win));
e_canvas_add(con->bg_ecore_evas);

10
src/bin/e_dnd.c
View File

@ -169,17 +169,11 @@ e_drag_new(E_Container *container, int x, int y,
drag->layer = 250;
drag->container = container;
e_object_ref(E_OBJECT(drag->container));
drag->ecore_evas = e_canvas_new(e_config->evas_engine_drag, drag->container->win,
drag->ecore_evas = e_canvas_new(drag->container->win,
drag->x, drag->y, drag->w, drag->h, 1, 1,
&(drag->evas_win));
if (e_config->use_composite)
{
ecore_evas_alpha_set(drag->ecore_evas, 1);
if (e_config->evas_engine_drag == ECORE_EVAS_ENGINE_SOFTWARE_16_X11)
drag->evas_win = ecore_evas_software_x11_window_get(drag->ecore_evas);
else if (e_config->evas_engine_drag == ECORE_EVAS_ENGINE_XRENDER_X11)
drag->evas_win = ecore_evas_xrender_x11_window_get(drag->ecore_evas);
}
ecore_evas_alpha_set(drag->ecore_evas, 1);
else
{
/* avoid excess exposes when shaped - set damage avoid to 1 */

3
src/bin/e_init.c
View File

@ -68,9 +68,8 @@ e_init_show(void)
else ver = strdup("XvX");
snprintf(buf, sizeof(buf),
"%s/enlightenment/utils/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'",
"%s/enlightenment/utils/enlightenment_init \'%s\' \'%i\' \'%s\' \'%s\'",
e_prefix_lib_get(), theme,
e_canvas_engine_decide(e_config->evas_engine_init),
e_config->font_hinting, tit, ver);
printf("RUN INIT: %s\n", buf);
free(theme);

39
src/bin/e_init_main.c
View File

@ -72,7 +72,6 @@ static Eina_Bool _e_ipc_cb_server_data(void *data, int type, void *event);
static Ecore_Ipc_Server *_e_ipc_server = NULL;
static const char *theme = NULL;
static int font_hinting = -1;
static int engine = -1;
static const char *title = NULL;
static const char *verstr = NULL;
static Eina_List *fpath = NULL;
@ -108,7 +107,6 @@ main(int argc, char **argv)
exit(0);
}
else if (!theme) theme = argv[i];
else if (engine < 0) engine = atoi(argv[i]);
else if (font_hinting < 0) font_hinting = atoi(argv[i]);
else if (!title) title = argv[i];
else if (!verstr) verstr = argv[i];
@ -465,39 +463,10 @@ _e_init_evas_new(Ecore_X_Window root, int w, int h, Ecore_X_Window *winret)
Eina_List *l;
const char *path;
if ((engine == 0) || (engine == 1))
{
ee = ecore_evas_software_x11_new(NULL, root, 0, 0, w, h);
ecore_evas_override_set(ee, 1);
ecore_evas_software_x11_direct_resize_set(ee, 1);
*winret = ecore_evas_software_x11_window_get(ee);
}
else if (engine == 2)
{
ee = ecore_evas_gl_x11_new(NULL, root, 0, 0, w, h);
ecore_evas_override_set(ee, 1);
ecore_evas_gl_x11_direct_resize_set(ee, 1);
*winret = ecore_evas_gl_x11_window_get(ee);
}
else if (engine == 3)
{
ee = ecore_evas_xrender_x11_new(NULL, root, 0, 0, w, h);
ecore_evas_override_set(ee, 1);
ecore_evas_xrender_x11_direct_resize_set(ee, 1);
*winret = ecore_evas_xrender_x11_window_get(ee);
}
else if (engine == 4)
{
ee = ecore_evas_software_x11_16_new(NULL, root, 0, 0, w, h);
ecore_evas_override_set(ee, 1);
ecore_evas_software_x11_16_direct_resize_set(ee, 1);
*winret = ecore_evas_software_x11_16_window_get(ee);
}
else
{
printf("The select engine is unknown or incorrectly set. Please specify a correct one.\n");
exit(0);
}
ee = ecore_evas_software_x11_new(NULL, root, 0, 0, w, h);
ecore_evas_override_set(ee, 1);
ecore_evas_software_x11_direct_resize_set(ee, 1);
*winret = ecore_evas_software_x11_window_get(ee);
e = ecore_evas_get(ee);

7
src/bin/e_menu.c
View File

@ -1493,10 +1493,9 @@ _e_menu_realize(E_Menu *m)
if (m->realized) return;
m->realized = 1;
m->ecore_evas =
e_canvas_new(e_config->evas_engine_menus, m->zone->container->win,
m->cur.x, m->cur.y, m->cur.w, m->cur.h, 1, 1,
&(m->evas_win));
m->ecore_evas = e_canvas_new(m->zone->container->win,
m->cur.x, m->cur.y, m->cur.w, m->cur.h, 1, 1,
&(m->evas_win));
e_canvas_add(m->ecore_evas);
eina_hash_add(_e_menu_hash, e_util_winid_str_get(m->evas_win), m);
m->shape = e_container_shape_add(m->zone->container);

2
src/bin/e_popup.c
View File

@ -47,7 +47,7 @@ e_popup_new(E_Zone *zone, int x, int y, int w, int h)
pop->w = w;
pop->h = h;
pop->layer = 250;
pop->ecore_evas = e_canvas_new(e_config->evas_engine_popups, pop->zone->container->win,
pop->ecore_evas = e_canvas_new(pop->zone->container->win,
pop->zone->x + pop->x, pop->zone->y + pop->y, pop->w, pop->h, 1, 1,
&(pop->evas_win));
if (!pop->ecore_evas)

3
src/bin/e_win.c
View File

@ -41,8 +41,7 @@ e_win_new(E_Container *con)
if (!win) return NULL;
e_object_del_func_set(E_OBJECT(win), _e_win_del);
win->container = con;
win->engine = e_canvas_engine_decide(e_config->evas_engine_win);
win->ecore_evas = e_canvas_new(e_config->evas_engine_win, con->manager->root,
win->ecore_evas = e_canvas_new(con->manager->root,
0, 0, 1, 1, 1, 0,
&(win->evas_win));
e_canvas_add(win->ecore_evas);

1
src/bin/e_win.h
View File

@ -13,7 +13,6 @@ struct _E_Win
E_Object e_obj_inherit;
int x, y, w, h;
int engine;
E_Container *container;
E_Border *border;
Ecore_Evas *ecore_evas;

6
src/bin/e_zone.c
View File

@ -108,9 +108,9 @@ _e_zone_black_new(E_Zone *zone)
char name[256];
if (zone->black_ecore_evas) return;
zone->black_ecore_evas =
e_canvas_new(e_config->evas_engine_zone, zone->container->win,
zone->x, zone->y, 1, 1, 1, 1, &(zone->black_win));
zone->black_ecore_evas = e_canvas_new(zone->container->win,
zone->x, zone->y, 1, 1, 1, 1,
&(zone->black_win));
e_canvas_add(zone->black_ecore_evas);
ecore_evas_layer_set(zone->black_ecore_evas, 6);
zone->black_evas = ecore_evas_get(zone->black_ecore_evas);

4
src/modules/comp/e_mod_comp.c
View File

@ -3211,7 +3211,7 @@ _e_mod_comp_add(E_Manager *man)
if (c->man->num == 0) e_alert_composite_win = c->win;
if (_comp_mod->conf->engine == E_EVAS_ENGINE_GL_X11)
if (_comp_mod->conf->engine == ENGINE_GL)
{
int opt[20];
int opt_i = 0;
@ -3247,7 +3247,7 @@ _e_mod_comp_add(E_Manager *man)
}
if (!c->ee)
{
if (_comp_mod->conf->engine == E_EVAS_ENGINE_GL_X11)
if (_comp_mod->conf->engine == ENGINE_GL)
{
e_util_dialog_internal
(_("Compositor Warning"),

3
src/modules/comp/e_mod_comp_cfdata.c
View File

@ -1,4 +1,5 @@
#include "e.h"
#include "e_mod_main.h"
#include "e_mod_comp_cfdata.h"
EAPI void
@ -67,7 +68,7 @@ e_mod_comp_cfdata_config_new(void)
cfg = E_NEW(Config, 1);
cfg->shadow_file = NULL;
cfg->shadow_style = eina_stringshare_add("default");
cfg->engine = E_EVAS_ENGINE_SOFTWARE_X11;
cfg->engine = ENGINE_SW;
cfg->max_unmapped_pixels = 32 * 1024; // implement
cfg->max_unmapped_time = 10 * 3600; // implement
cfg->min_unmapped_time = 5 * 60; // implement

10
src/modules/comp/e_mod_config.c
View File

@ -126,9 +126,9 @@ _create_data(E_Config_Dialog *cfd)
cfdata->use_shadow = _comp_mod->conf->use_shadow;
cfdata->engine = _comp_mod->conf->engine;
if ((cfdata->engine != E_EVAS_ENGINE_SOFTWARE_X11) &&
(cfdata->engine != E_EVAS_ENGINE_GL_X11))
cfdata->engine = E_EVAS_ENGINE_SOFTWARE_X11;
if ((cfdata->engine != ENGINE_SW) &&
(cfdata->engine != ENGINE_GL))
cfdata->engine = ENGINE_SW;
cfdata->indirect = _comp_mod->conf->indirect;
cfdata->texture_from_pixmap = _comp_mod->conf->texture_from_pixmap;
cfdata->smooth_windows = _comp_mod->conf->smooth_windows;
@ -1207,13 +1207,13 @@ _basic_create_widgets(E_Config_Dialog *cfd,
ol = e_widget_list_add(evas, 0, 0);
rg = e_widget_radio_group_new(&(cfdata->engine));
ob = e_widget_radio_add(evas, _("Software"), E_EVAS_ENGINE_SOFTWARE_X11, rg);
ob = e_widget_radio_add(evas, _("Software"), ENGINE_SW, rg);
e_widget_list_object_append(ol, ob, 1, 1, 0.5);
if (!getenv("ECORE_X_NO_XLIB"))
{
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11))
{
ob = e_widget_radio_add(evas, _("OpenGL"), E_EVAS_ENGINE_GL_X11, rg);
ob = e_widget_radio_add(evas, _("OpenGL"), ENGINE_GL, rg);
e_widget_list_object_append(ol, ob, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("OpenGL options"), 0);

3
src/modules/comp/e_mod_main.h
View File

@ -28,4 +28,7 @@ EAPI int e_modapi_info(E_Module *m);
void _e_mod_config_new(E_Module *m);
void _e_mod_config_free(E_Module *m);
#define ENGINE_SW 1
#define ENGINE_GL 2
#endif

31
src/modules/conf_performance/e_int_config_engine.c
View File

@ -15,7 +15,6 @@ struct _E_Config_Dialog_Data
E_Config_Dialog *cfd;
int use_composite;
int evas_engine_default;
Evas_Object *o_composite;
};
@ -55,7 +54,6 @@ static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
cfdata->use_composite = e_config->use_composite;
cfdata->evas_engine_default = e_config->evas_engine_default;
}
static void
@ -68,7 +66,6 @@ static int
_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
e_config->use_composite = cfdata->use_composite;
e_config->evas_engine_default = E_EVAS_ENGINE_SOFTWARE_X11;
e_config_save_queue();
return 1;
}
@ -76,19 +73,13 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
return !((cfdata->use_composite == e_config->use_composite) &&
(cfdata->evas_engine_default == e_config->evas_engine_default));
return !(cfdata->use_composite == e_config->use_composite);
}
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ob, *of;
/*
E_Radio_Group *rg;
Eina_List *l;
int engine;
*/
o = e_widget_list_add(evas, 0, 0);
@ -99,26 +90,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_on_change_hook_set(ob, _cb_composite_change, cfdata);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 0, 0.5);
/*
of = e_widget_framelist_add(evas, _("Default Engine"), 0);
rg = e_widget_radio_group_new(&(cfdata->evas_engine_default));
for (l = e_config_engine_list(); l; l = l->next)
{
if (!strcmp("SOFTWARE", l->data))
engine = E_EVAS_ENGINE_SOFTWARE_X11;
else if (!strcmp("GL", l->data))
engine = E_EVAS_ENGINE_GL_X11;
else if (!strcmp("XRENDER", l->data))
engine = E_EVAS_ENGINE_XRENDER_X11;
else if (!strcmp("SOFTWARE_16", l->data))
engine = E_EVAS_ENGINE_SOFTWARE_X11_16;
else continue;
ob = e_widget_radio_add(evas, _(l->data), engine, rg);
e_widget_framelist_object_append(of, ob);
}
e_widget_list_object_append(o, of, 1, 0, 0.5);
*/
e_dialog_resizable_set(cfd->dia, 0);
return o;

3
src/modules/gadman/e_mod_gadman.c
View File

@ -496,8 +496,7 @@ _gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone, E_Ga
{
if (!Man->top_ee)
{
Man->top_ee = e_canvas_new(e_config->evas_engine_popups,
Man->container->win, 0, 0, 0, 0, 1, 1,
Man->top_ee = e_canvas_new(Man->container->win, 0, 0, 0, 0, 1, 1,
&(Man->top_win));
}

7
src/modules/wizard/page_150.c
View File

@ -3,6 +3,9 @@
#include "e_mod_main.h"
#include "e_mod_comp_cfdata.h"
#define ENGINE_SW 1
#define ENGINE_GL 2
static int do_comp = 1;
static int do_gl = 0;
static int do_vsync = 0;
@ -183,13 +186,13 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
if (do_gl)
{
cfg->engine = E_EVAS_ENGINE_GL_X11;
cfg->engine = ENGINE_GL;
cfg->smooth_windows = 1;
cfg->vsync = do_vsync;
}
else
{
cfg->engine = E_EVAS_ENGINE_SOFTWARE_X11;
cfg->engine = ENGINE_SW;
cfg->smooth_windows = 0;
cfg->vsync = 0;
}