From 7fd02afae4e8de1b4a74f850ce9b131ddc6ec2f3 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 26 Dec 2011 06:32:21 +0000 Subject: [PATCH] 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 --- config/default/e.src | 11 ----------- config/illume/e.src | 11 ----------- config/standard/e.src | 11 ----------- src/bin/e_config.c | 1 - src/bin/e_config.h | 1 - src/bin/e_container.c | 10 +--------- src/bin/e_hints.c | 6 ------ src/bin/e_manager.c | 12 +----------- 8 files changed, 2 insertions(+), 61 deletions(-) diff --git a/config/default/e.src b/config/default/e.src index 7bc47361a..adbfa2ac1 100644 --- a/config/default/e.src +++ b/config/default/e.src @@ -17,19 +17,8 @@ group "E_Config" struct { value "edje_collection_cache" int: 30; value "zone_desks_x_count" int: 1; value "zone_desks_y_count" int: 1; - value "use_virtual_roots" int: 0; value "show_desktop_icons" int: 1; 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; group "modules" list { group "E_Config_Module" struct { diff --git a/config/illume/e.src b/config/illume/e.src index b45c735eb..6222ab8f7 100644 --- a/config/illume/e.src +++ b/config/illume/e.src @@ -1495,19 +1495,8 @@ group "E_Config" struct { value "edje_collection_cache" int: 64; value "zone_desks_x_count" int: 1; value "zone_desks_y_count" int: 1; - value "use_virtual_roots" int: 0; value "show_desktop_icons" 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 "language" string: "en_US.UTF-8"; value "window_placement_policy" int: 0; diff --git a/config/standard/e.src b/config/standard/e.src index a3941ec8f..588bdb64c 100644 --- a/config/standard/e.src +++ b/config/standard/e.src @@ -1672,19 +1672,8 @@ group "E_Config" struct { value "edje_collection_cache" int: 64; value "zone_desks_x_count" int: 4; value "zone_desks_y_count" int: 1; - value "use_virtual_roots" int: 0; value "show_desktop_icons" 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 "language" string: "en_US.UTF-8"; value "window_placement_policy" int: 0; diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 49b0d8a6b..4fbf2569a 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -644,7 +644,6 @@ e_config_init(void) 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_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, edge_flip_dragging, INT); /**/ E_CONFIG_VAL(D, T, use_composite, INT); /**/ diff --git a/src/bin/e_config.h b/src/bin/e_config.h index 71a49001a..abf3cfbd7 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -59,7 +59,6 @@ struct _E_Config int edje_collection_cache; // GUI int zone_desks_x_count; // GUI int zone_desks_y_count; // GUI - int use_virtual_roots; // NO GUI - maybe remove? int show_desktop_icons; // GUI int edge_flip_dragging; // GUI int use_composite; // GUI diff --git a/src/bin/e_container.c b/src/bin/e_container.c index 36b80e997..2fbe770e5 100644 --- a/src/bin/e_container.c +++ b/src/bin/e_container.c @@ -67,15 +67,7 @@ e_container_new(E_Manager *man) con->manager->containers = eina_list_append(con->manager->containers, con); con->w = con->manager->w; con->h = con->manager->h; - if (e_config->use_virtual_roots) - { - 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; + con->win = con->manager->win; if (!e_config->null_container_win) con->bg_ecore_evas = e_canvas_new(con->win, diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c index 926e727cb..b894f3e7f 100644 --- a/src/bin/e_hints.c +++ b/src/bin/e_hints.c @@ -253,12 +253,6 @@ e_hints_manager_init(E_Manager *man) #if 0 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 */ ecore_x_netwm_desk_workareas_set(man->root, num, areas); #endif diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c index 5db5d96d6..fdda7fab9 100644 --- a/src/bin/e_manager.c +++ b/src/bin/e_manager.c @@ -93,17 +93,7 @@ e_manager_new(Ecore_X_Window root, int num) man->root = root; man->num = num; ecore_x_window_size_get(man->root, &(man->w), &(man->h)); - if (e_config->use_virtual_roots) - { - 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->win = man->root; man->handlers = eina_list_append(man->handlers,