forked from enlightenment/enlightenment
and remove virtual roots config that isnt ever used or able to be
enabled or tested...also remove the config vals from profiles. SVN revision: 66514
This commit is contained in:
parent
cdb864ed8e
commit
7fd02afae4
|
@ -17,19 +17,8 @@ group "E_Config" struct {
|
||||||
value "edje_collection_cache" int: 30;
|
value "edje_collection_cache" int: 30;
|
||||||
value "zone_desks_x_count" int: 1;
|
value "zone_desks_x_count" int: 1;
|
||||||
value "zone_desks_y_count" int: 1;
|
value "zone_desks_y_count" int: 1;
|
||||||
value "use_virtual_roots" int: 0;
|
|
||||||
value "show_desktop_icons" int: 1;
|
value "show_desktop_icons" int: 1;
|
||||||
value "edge_flip_dragging" int: 0;
|
value "edge_flip_dragging" int: 0;
|
||||||
value "evas_engine_default" int: 1;
|
|
||||||
value "evas_engine_container" int: 0;
|
|
||||||
value "evas_engine_init" int: 0;
|
|
||||||
value "evas_engine_menus" int: 0;
|
|
||||||
value "evas_engine_borders" int: 0;
|
|
||||||
value "evas_engine_errors" int: 0;
|
|
||||||
value "evas_engine_popups" int: 0;
|
|
||||||
value "evas_engine_drag" int: 0;
|
|
||||||
value "evas_engine_win" int: 0;
|
|
||||||
value "evas_engine_zone" int: 0;
|
|
||||||
value "use_composite" int: 0;
|
value "use_composite" int: 0;
|
||||||
group "modules" list {
|
group "modules" list {
|
||||||
group "E_Config_Module" struct {
|
group "E_Config_Module" struct {
|
||||||
|
|
|
@ -1495,19 +1495,8 @@ group "E_Config" struct {
|
||||||
value "edje_collection_cache" int: 64;
|
value "edje_collection_cache" int: 64;
|
||||||
value "zone_desks_x_count" int: 1;
|
value "zone_desks_x_count" int: 1;
|
||||||
value "zone_desks_y_count" int: 1;
|
value "zone_desks_y_count" int: 1;
|
||||||
value "use_virtual_roots" int: 0;
|
|
||||||
value "show_desktop_icons" int: 1;
|
value "show_desktop_icons" int: 1;
|
||||||
value "edge_flip_dragging" int: 1;
|
value "edge_flip_dragging" int: 1;
|
||||||
value "evas_engine_default" int: 1;
|
|
||||||
value "evas_engine_container" int: 0;
|
|
||||||
value "evas_engine_init" int: 0;
|
|
||||||
value "evas_engine_menus" int: 0;
|
|
||||||
value "evas_engine_borders" int: 0;
|
|
||||||
value "evas_engine_errors" int: 0;
|
|
||||||
value "evas_engine_popups" int: 0;
|
|
||||||
value "evas_engine_drag" int: 0;
|
|
||||||
value "evas_engine_win" int: 0;
|
|
||||||
value "evas_engine_zone" int: 0;
|
|
||||||
value "use_composite" int: 0;
|
value "use_composite" int: 0;
|
||||||
value "language" string: "en_US.UTF-8";
|
value "language" string: "en_US.UTF-8";
|
||||||
value "window_placement_policy" int: 0;
|
value "window_placement_policy" int: 0;
|
||||||
|
|
|
@ -1672,19 +1672,8 @@ group "E_Config" struct {
|
||||||
value "edje_collection_cache" int: 64;
|
value "edje_collection_cache" int: 64;
|
||||||
value "zone_desks_x_count" int: 4;
|
value "zone_desks_x_count" int: 4;
|
||||||
value "zone_desks_y_count" int: 1;
|
value "zone_desks_y_count" int: 1;
|
||||||
value "use_virtual_roots" int: 0;
|
|
||||||
value "show_desktop_icons" int: 1;
|
value "show_desktop_icons" int: 1;
|
||||||
value "edge_flip_dragging" int: 1;
|
value "edge_flip_dragging" int: 1;
|
||||||
value "evas_engine_default" int: 1;
|
|
||||||
value "evas_engine_container" int: 0;
|
|
||||||
value "evas_engine_init" int: 0;
|
|
||||||
value "evas_engine_menus" int: 0;
|
|
||||||
value "evas_engine_borders" int: 0;
|
|
||||||
value "evas_engine_errors" int: 0;
|
|
||||||
value "evas_engine_popups" int: 0;
|
|
||||||
value "evas_engine_drag" int: 0;
|
|
||||||
value "evas_engine_win" int: 0;
|
|
||||||
value "evas_engine_zone" int: 0;
|
|
||||||
value "use_composite" int: 0;
|
value "use_composite" int: 0;
|
||||||
value "language" string: "en_US.UTF-8";
|
value "language" string: "en_US.UTF-8";
|
||||||
value "window_placement_policy" int: 0;
|
value "window_placement_policy" int: 0;
|
||||||
|
|
|
@ -644,7 +644,6 @@ e_config_init(void)
|
||||||
E_CONFIG_VAL(D, T, edje_collection_cache, INT); /**/
|
E_CONFIG_VAL(D, T, edje_collection_cache, INT); /**/
|
||||||
E_CONFIG_VAL(D, T, zone_desks_x_count, INT); /**/
|
E_CONFIG_VAL(D, T, zone_desks_x_count, INT); /**/
|
||||||
E_CONFIG_VAL(D, T, zone_desks_y_count, INT); /**/
|
E_CONFIG_VAL(D, T, zone_desks_y_count, INT); /**/
|
||||||
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, show_desktop_icons, INT); /**/
|
||||||
E_CONFIG_VAL(D, T, edge_flip_dragging, INT); /**/
|
E_CONFIG_VAL(D, T, edge_flip_dragging, INT); /**/
|
||||||
E_CONFIG_VAL(D, T, use_composite, INT); /**/
|
E_CONFIG_VAL(D, T, use_composite, INT); /**/
|
||||||
|
|
|
@ -59,7 +59,6 @@ struct _E_Config
|
||||||
int edje_collection_cache; // GUI
|
int edje_collection_cache; // GUI
|
||||||
int zone_desks_x_count; // GUI
|
int zone_desks_x_count; // GUI
|
||||||
int zone_desks_y_count; // GUI
|
int zone_desks_y_count; // GUI
|
||||||
int use_virtual_roots; // NO GUI - maybe remove?
|
|
||||||
int show_desktop_icons; // GUI
|
int show_desktop_icons; // GUI
|
||||||
int edge_flip_dragging; // GUI
|
int edge_flip_dragging; // GUI
|
||||||
int use_composite; // GUI
|
int use_composite; // GUI
|
||||||
|
|
|
@ -67,15 +67,7 @@ e_container_new(E_Manager *man)
|
||||||
con->manager->containers = eina_list_append(con->manager->containers, con);
|
con->manager->containers = eina_list_append(con->manager->containers, con);
|
||||||
con->w = con->manager->w;
|
con->w = con->manager->w;
|
||||||
con->h = con->manager->h;
|
con->h = con->manager->h;
|
||||||
if (e_config->use_virtual_roots)
|
con->win = con->manager->win;
|
||||||
{
|
|
||||||
con->win = ecore_x_window_override_new(con->manager->win, con->x, con->y, con->w, con->h);
|
|
||||||
ecore_x_icccm_title_set(con->win, "Enlightenment Container");
|
|
||||||
ecore_x_netwm_name_set(con->win, "Enlightenment Container");
|
|
||||||
ecore_x_window_raise(con->win);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
con->win = con->manager->win;
|
|
||||||
|
|
||||||
if (!e_config->null_container_win)
|
if (!e_config->null_container_win)
|
||||||
con->bg_ecore_evas = e_canvas_new(con->win,
|
con->bg_ecore_evas = e_canvas_new(con->win,
|
||||||
|
|
|
@ -253,12 +253,6 @@ e_hints_manager_init(E_Manager *man)
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
ecore_x_netwm_desk_count_set(man->root, num);
|
ecore_x_netwm_desk_count_set(man->root, num);
|
||||||
#endif
|
|
||||||
if (e_config->use_virtual_roots)
|
|
||||||
{
|
|
||||||
ecore_x_netwm_desk_roots_set(man->root, vroots, num);
|
|
||||||
}
|
|
||||||
#if 0
|
|
||||||
/* No need for workarea without desktops */
|
/* No need for workarea without desktops */
|
||||||
ecore_x_netwm_desk_workareas_set(man->root, num, areas);
|
ecore_x_netwm_desk_workareas_set(man->root, num, areas);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -93,17 +93,7 @@ e_manager_new(Ecore_X_Window root, int num)
|
||||||
man->root = root;
|
man->root = root;
|
||||||
man->num = num;
|
man->num = num;
|
||||||
ecore_x_window_size_get(man->root, &(man->w), &(man->h));
|
ecore_x_window_size_get(man->root, &(man->w), &(man->h));
|
||||||
if (e_config->use_virtual_roots)
|
man->win = man->root;
|
||||||
{
|
|
||||||
man->win = ecore_x_window_override_new(man->root, man->x, man->y, man->w, man->h);
|
|
||||||
ecore_x_icccm_title_set(man->win, "Enlightenment Manager");
|
|
||||||
ecore_x_netwm_name_set(man->win, "Enlightenment Manager");
|
|
||||||
ecore_x_window_raise(man->win);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
man->win = man->root;
|
|
||||||
}
|
|
||||||
|
|
||||||
man->handlers =
|
man->handlers =
|
||||||
eina_list_append(man->handlers,
|
eina_list_append(man->handlers,
|
||||||
|
|
Loading…
Reference in New Issue