diff --git a/po/POTFILES.in b/po/POTFILES.in
index 119d43784..65c51156f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -164,7 +164,6 @@ src/modules/conf_display/e_int_config_desk.c
src/modules/conf_display/e_int_config_desklock.c
src/modules/conf_display/e_int_config_desklock_fsel.c
src/modules/conf_display/e_int_config_desks.c
-src/modules/conf_display/e_int_config_display.c
src/modules/conf_display/e_int_config_dpms.c
src/modules/conf_display/e_int_config_screensaver.c
src/modules/conf_display/e_mod_main.c
diff --git a/src/modules/Makefile_conf_display.mk b/src/modules/Makefile_conf_display.mk
index 043f55f45..2ca1cf0e1 100644
--- a/src/modules/Makefile_conf_display.mk
+++ b/src/modules/Makefile_conf_display.mk
@@ -12,7 +12,6 @@ src_modules_conf_display_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
src_modules_conf_display_module_la_LDFLAGS = $(MOD_LDFLAGS)
src_modules_conf_display_module_la_SOURCES = src/modules/conf_display/e_mod_main.c \
src/modules/conf_display/e_mod_main.h \
- src/modules/conf_display/e_int_config_display.c \
src/modules/conf_display/e_int_config_screensaver.c \
src/modules/conf_display/e_int_config_dpms.c \
src/modules/conf_display/e_int_config_desklock.c \
diff --git a/src/modules/conf_display/e_int_config_display.c b/src/modules/conf_display/e_int_config_display.c
deleted file mode 100644
index 93709a9b7..000000000
--- a/src/modules/conf_display/e_int_config_display.c
+++ /dev/null
@@ -1,653 +0,0 @@
-#include "e.h"
-
-/* TODO:
- *
- * Give list some icons.
- */
-
-/*
-#define RANDR_11 ((1 << 16) | 1)
-
-static void _fill_data(E_Config_Dialog_Data *cfdata);
-static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static void _load_resolutions(E_Config_Dialog_Data *cfdata);
-static void _load_rates(E_Config_Dialog_Data *cfdata);
-static void _ilist_item_change(void *data);
-static Eina_Bool _deferred_noxrandr_error(void *data);
-static Eina_Bool _deferred_norates_error(void *data);
-static int _sort_resolutions(const void *d1, const void *d2);
-
-typedef struct _Resolution Resolution;
-typedef struct _SureBox SureBox;
-
-struct _Resolution
-{
- int id;
- Ecore_X_Randr_Screen_Size size;
- int size_index;
- Eina_List *rates;
-};
-
-struct _SureBox
-{
- E_Dialog *dia;
- Ecore_Timer *timer;
- int iterations;
- E_Config_Dialog *cfd;
- E_Config_Dialog_Data *cfdata;
-};
-
-struct _E_Config_Dialog_Data
-{
- E_Config_Dialog *cfd;
- Eina_List *resolutions;
- Ecore_X_Randr_Screen_Size orig_size;
- int orig_size_index;
- Ecore_X_Randr_Refresh_Rate orig_rate;
- int orig_orientation;
- int orig_flip;
- int restore;
- int can_rotate;
- int can_flip;
- int orientation;
- int flip;
- int flip_x;
- int flip_y;
- Eina_Bool has_rates;
-
- Evas_Object *rate_list;
- Evas_Object *res_list;
- SureBox *surebox;
-};
-
-static void
-_surebox_dialog_cb_delete(E_Win *win)
-{
- E_Dialog *dia;
- SureBox *sb;
- E_Config_Dialog *cfd;
-
- dia = win->data;
- sb = dia->data;
- sb->cfdata->surebox = NULL;
- cfd = sb->cfdata->cfd;
- if (sb->timer) ecore_timer_del(sb->timer);
- sb->timer = NULL;
- free(sb);
- e_object_del(E_OBJECT(dia));
- e_object_unref(E_OBJECT(cfd));
-}
-
-static void
-_surebox_dialog_cb_yes(void *data, E_Dialog *dia)
-{
- SureBox *sb;
-
- sb = data;
-
- if (sb->cfdata->restore)
- e_randr_11_store_configuration(E_RANDR_CONFIGURATION_STORE_ALL);
-
- _fill_data(sb->cfdata);
- _load_resolutions(sb->cfdata);
- // No need to load rates as the currently selected resolution has not been
- // changed since last selection.
- if (dia) _surebox_dialog_cb_delete(dia->win);
-}
-
-static void
-_surebox_dialog_cb_no(void *data, E_Dialog *dia)
-{
- SureBox *sb;
-
- sb = data;
- ecore_x_randr_screen_primary_output_refresh_rate_set(sb->dia->win->container->manager->root,
- sb->cfdata->orig_size_index, sb->cfdata->orig_rate);
- _load_resolutions(sb->cfdata);
- _load_rates(sb->cfdata);
- _surebox_dialog_cb_delete(dia->win);
-}
-
-static void
-_surebox_text_fill(SureBox *sb)
-{
- char buf[4096];
-
- if (!sb->dia) return;
- if (sb->iterations > 1)
- {
- if (sb->cfdata->has_rates)
- snprintf(buf, sizeof(buf),
- P_("Does this look OK? Save if it does, or Restore if not.
"
- "If you do not press a button, the old resolution of
"
- "%d×%d at %d Hz will be restored in %d second.",
- "Does this look OK? Save if it does, or Restore if not.
"
- "If you do not press a button, the old resolution of
"
- "%d×%d at %d Hz will be restored in %d seconds.", sb->iterations),
- sb->cfdata->orig_size.width, sb->cfdata->orig_size.height,
- sb->cfdata->orig_rate, sb->iterations);
- else
- snprintf(buf, sizeof(buf),
- P_("Does this look OK? Save if it does, or Restore if not.
"
- "If you do not press a button, the old resolution of
"
- "%d×%d will be restored in %d second.",
- "Does this look OK? Save if it does, or Restore if not.
"
- "If you do not press a button, the old resolution of
"
- "%d×%d will be restored in %d seconds.", sb->iterations),
- sb->cfdata->orig_size.width, sb->cfdata->orig_size.height,
- sb->iterations);
- }
- else
- {
- if (sb->cfdata->has_rates)
- snprintf(buf, sizeof(buf),
- _("Does this look OK? Save if it does, or Restore if not.
"
- "If you do not press a button, the old resolution of
"
- "%d×%d at %d Hz will be restored IMMEDIATELY."),
- sb->cfdata->orig_size.width, sb->cfdata->orig_size.height,
- sb->cfdata->orig_rate);
- else
- snprintf(buf, sizeof(buf),
- _("Does this look OK? Save if it does, or Restore if not.
"
- "If you do not press a button, the old resolution of
"
- "%d×%d will be restored IMMEDIATELY."),
- sb->cfdata->orig_size.width, sb->cfdata->orig_size.height);
- }
- e_dialog_text_set(sb->dia, buf);
-}
-
-static Eina_Bool
-_surebox_timer_cb(void *data)
-{
- SureBox *sb;
-
- sb = data;
- sb->iterations--;
- _surebox_text_fill(sb);
- if (sb->iterations == 0)
- {
- _surebox_dialog_cb_no(sb, sb->dia);
- return ECORE_CALLBACK_CANCEL;
- }
- return ECORE_CALLBACK_RENEW;
-}
-
-static SureBox *
-_surebox_new(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
-{
- SureBox *sb;
-
- sb = E_NEW(SureBox, 1);
- sb->dia = e_dialog_new(cfd->comp, "E", "_display_res_sure_dialog");
- sb->timer = ecore_timer_add(1.0, _surebox_timer_cb, sb);
- sb->iterations = 15;
- sb->cfd = cfd;
- sb->cfdata = cfdata;
- cfdata->surebox = sb;
- sb->dia->data = sb;
- e_dialog_title_set(sb->dia, _("Resolution change"));
- e_dialog_icon_set(sb->dia, "preferences-system-screen-resolution", 48);
- _surebox_text_fill(sb);
- e_win_delete_callback_set(sb->dia->win, _surebox_dialog_cb_delete);
- e_dialog_button_add(sb->dia, _("Save"), NULL, _surebox_dialog_cb_yes, sb);
- e_dialog_button_add(sb->dia, _("Restore"), NULL, _surebox_dialog_cb_no, sb);
- e_dialog_button_focus_num(sb->dia, 1);
- e_win_centered_set(sb->dia->win, 1);
- e_win_borderless_set(sb->dia->win, 1);
- e_win_layer_set(sb->dia->win, E_WIN_LAYER_ABOVE);
- e_win_sticky_set(sb->dia->win, 1);
- e_dialog_show(sb->dia);
- e_object_ref(E_OBJECT(cfd));
- return sb;
-}
-
-E_Config_Dialog *
-e_int_config_display(E_Comp *comp, const char *params __UNUSED__)
-{
- E_Config_Dialog *cfd;
- E_Config_Dialog_View *v;
-
- if (!ecore_x_randr_query())
- {
- ecore_timer_add(0.5, _deferred_noxrandr_error, NULL);
- fprintf(stderr, "XRandR not present on this display.\n");
- return NULL;
- }
-
- if (e_config_dialog_find("E", "screen/screen_resolution")) return NULL;
- v = E_NEW(E_Config_Dialog_View, 1);
- v->create_cfdata = _create_data;
- v->free_cfdata = _free_data;
- v->basic.apply_cfdata = _basic_apply_data;
- v->basic.create_widgets = _basic_create_widgets;
- v->basic.check_changed = _basic_check_changed;
- v->override_auto_apply = 1;
-
- cfd = e_config_dialog_new(comp, _("Screen Resolution Settings"),
- "E", "screen/screen_resolution",
- "preferences-system-screen-resolution", 0, v, NULL);
- return cfd;
-}
-
-static void
-_fill_data(E_Config_Dialog_Data *cfdata)
-{
- E_Manager *man;
- int rots;
-
- man = e_manager_current_get();
- ecore_x_randr_screen_primary_output_current_size_get(man->root, &cfdata->orig_size.width, &cfdata->orig_size.height, NULL, NULL, &cfdata->orig_size_index);
- cfdata->orig_rate = ecore_x_randr_screen_primary_output_current_refresh_rate_get(man->root);
-
- rots = ecore_x_randr_screen_primary_output_orientations_get(man->root);
- if ((rots) && (rots != ECORE_X_RANDR_ORIENTATION_ROT_0))
- {
- cfdata->orientation = ecore_x_randr_screen_primary_output_orientation_get(man->root);
- cfdata->can_flip = rots & (ECORE_X_RANDR_ORIENTATION_FLIP_X | ECORE_X_RANDR_ORIENTATION_FLIP_Y);
- cfdata->flip = cfdata->orientation &
- (ECORE_X_RANDR_ORIENTATION_FLIP_X | ECORE_X_RANDR_ORIENTATION_FLIP_Y);
- cfdata->orig_flip = cfdata->flip;
-
- if (cfdata->orientation & (ECORE_X_RANDR_ORIENTATION_FLIP_X))
- cfdata->flip_x = 1;
- if (cfdata->orientation & (ECORE_X_RANDR_ORIENTATION_FLIP_Y))
- cfdata->flip_y = 1;
-
- cfdata->can_rotate =
- rots & (ECORE_X_RANDR_ORIENTATION_ROT_0 | ECORE_X_RANDR_ORIENTATION_ROT_90 |
- ECORE_X_RANDR_ORIENTATION_ROT_180 | ECORE_X_RANDR_ORIENTATION_ROT_270);
- cfdata->orientation =
- cfdata->orientation &
- (ECORE_X_RANDR_ORIENTATION_ROT_0 | ECORE_X_RANDR_ORIENTATION_ROT_90 |
- ECORE_X_RANDR_ORIENTATION_ROT_180 | ECORE_X_RANDR_ORIENTATION_ROT_270);
- cfdata->orig_orientation = cfdata->orientation;
- }
-}
-
-static void *
-_create_data(E_Config_Dialog *cfd)
-{
- E_Config_Dialog_Data *cfdata;
-
- cfdata = E_NEW(E_Config_Dialog_Data, 1);
- _fill_data(cfdata);
- cfdata->cfd = cfd;
- return cfdata;
-}
-
-static void
-_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
-{
- Resolution *r;
-
- if (cfdata->surebox)
- _surebox_dialog_cb_delete(cfdata->surebox->dia->win);
-
- EINA_LIST_FREE(cfdata->resolutions, r)
- {
- Ecore_X_Randr_Refresh_Rate *rt;
-
- EINA_LIST_FREE(r->rates, rt)
- E_FREE(rt);
-
- E_FREE(r);
- }
- E_FREE(cfdata);
-}
-
-static int
-_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
-{
- int r;
- Resolution *res;
- Ecore_X_Randr_Refresh_Rate *rt;
-
- r = e_widget_ilist_selected_get(cfdata->res_list);
- if (r < 0) return 0;
- res = eina_list_nth(cfdata->resolutions, r);
- if (!res) return 0;
- r = e_widget_ilist_selected_get(cfdata->rate_list);
- if (r < 0) return 0;
- rt = eina_list_nth(res->rates, r);
- if (!rt) return 0;
-
- return (res->size.width != cfdata->orig_size.width) ||
- (res->size.height != cfdata->orig_size.height) ||
- (cfdata->has_rates && (*rt != cfdata->orig_rate)) ||
- (cfdata->can_rotate &&
- (cfdata->orig_orientation != cfdata->orientation)) ||
- (cfdata->can_flip &&
- (((!(cfdata->orig_flip & ECORE_X_RANDR_ORIENTATION_FLIP_X)) !=
- (!cfdata->flip_x)) ||
- ((!(cfdata->orig_flip & ECORE_X_RANDR_ORIENTATION_FLIP_Y)) !=
- (!cfdata->flip_y))));
-}
-
-static int
-_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
-{
- int r;
- Resolution *res;
- Ecore_X_Randr_Refresh_Rate *rate;
- E_Manager *man;
-
- r = e_widget_ilist_selected_get(cfdata->res_list);
- res = eina_list_nth(cfdata->resolutions, r);
- r = e_widget_ilist_selected_get(cfdata->rate_list);
- rate = eina_list_nth(res->rates, r);
-
- man = e_manager_current_get();
-
- if (!((cfdata->orig_size.width == res->size.width) &&
- (cfdata->orig_size.height == res->size.height) &&
- (cfdata->orig_rate == *rate || !cfdata->has_rates)))
- {
- if (cfdata->has_rates)
- ecore_x_randr_screen_primary_output_refresh_rate_set(man->root, res->size_index, *rate);
- else
- ecore_x_randr_screen_primary_output_size_set(man->root, res->size_index);
-
- if (e_config->cnfmdlg_disabled)
- {
- SureBox *sb;
-
- sb = E_NEW(SureBox, 1);
- sb->cfd = cfd;
- sb->cfdata = cfdata;
- _surebox_dialog_cb_yes(sb, NULL);
- free(sb);
- }
- else
- _surebox_new(cfd, cfdata);
- }
-
- if ((cfdata->can_rotate) || (cfdata->can_flip))
- {
- cfdata->flip = cfdata->orientation;
- if (cfdata->flip_x)
- cfdata->flip = (cfdata->flip | ECORE_X_RANDR_ORIENTATION_FLIP_X);
- if (cfdata->flip_y)
- cfdata->flip = (cfdata->flip | ECORE_X_RANDR_ORIENTATION_FLIP_Y);
-
- ecore_x_randr_screen_primary_output_orientation_set(man->root,
- (cfdata->orientation | cfdata->flip));
- cfdata->orig_orientation = cfdata->orientation;
- cfdata->orig_flip = cfdata->flip;
- }
-
- return 1;
-}
-
-static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
-{
- Evas_Object *o, *of, *ob, *ot;
- E_Radio_Group *rg;
- E_Manager *man;
- Ecore_X_Randr_Screen_Size_MM *sizes;
- int i, s;
-
- o = e_widget_table_add(evas, 0);
-
- of = e_widget_framelist_add(evas, _("Resolution"), 0);
- ob = e_widget_ilist_add(evas, 16, 16, NULL);
- cfdata->res_list = ob;
- e_widget_size_min_set(ob, 170, 215);
- e_widget_framelist_object_append(of, ob);
- e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1);
-
- ob = e_widget_check_add(evas, _("Restore on login"), &cfdata->restore);
- e_widget_table_object_append(o, ob, 0, 1, 2, 1, 1, 1, 0, 0);
-
- ot = e_widget_table_add(evas, 0);
- of = e_widget_framelist_add(evas, _("Refresh"), 0);
- ob = e_widget_ilist_add(evas, 16, 16, NULL);
- cfdata->rate_list = ob;
- e_widget_size_min_set(ob, 100, 80);
- e_widget_framelist_object_append(of, ob);
- e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
-
- man = e_manager_current_get();
- sizes = ecore_x_randr_screen_primary_output_sizes_get(man->root, &s);
- cfdata->has_rates = EINA_FALSE;
-
- if ((!sizes) || (s == 0))
- ecore_timer_add(0.5, _deferred_noxrandr_error, NULL);
- else
- {
- ecore_x_randr_screen_primary_output_current_size_get(man->root, &cfdata->orig_size.width, &cfdata->orig_size.height, NULL, NULL, &cfdata->orig_size_index);
- cfdata->orig_rate = ecore_x_randr_screen_primary_output_current_refresh_rate_get(man->root);
-
- for (i = 0; i < (s - 1); i++)
- {
- Resolution *res;
- Ecore_X_Randr_Refresh_Rate *rates;
- int r = 0, j;
-
- res = E_NEW(Resolution, 1);
- if (!res) continue;
-
- res->size.width = sizes[i].width;
- res->size.height = sizes[i].height;
- res->size_index = i;
- rates = ecore_x_randr_screen_primary_output_refresh_rates_get(man->root, i, &r);
- for (j = 0; j < r; j++)
- {
- Ecore_X_Randr_Refresh_Rate *rt;
-
- cfdata->has_rates = EINA_TRUE;
- rt = E_NEW(Ecore_X_Randr_Refresh_Rate, 1);
- if (!rt) continue;
- *rt = rates[j];
- res->rates = eina_list_append(res->rates, rt);
- }
- if (rates) E_FREE(rates);
- cfdata->resolutions = eina_list_append(cfdata->resolutions, res);
- }
-
- cfdata->resolutions = eina_list_sort(cfdata->resolutions,
- eina_list_count(cfdata->resolutions), _sort_resolutions);
- cfdata->resolutions = eina_list_reverse(cfdata->resolutions);
-
- _load_resolutions(cfdata);
- if (!cfdata->has_rates)
- ecore_timer_add(0.5, _deferred_norates_error, NULL);
- }
-
- E_FREE(sizes);
-
- _load_rates(cfdata);
-
- if (cfdata->can_rotate)
- {
- of = e_widget_framelist_add(evas, _("Rotation"), 0);
- rg = e_widget_radio_group_new(&(cfdata->orientation));
- ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-normal", 24, 24, ECORE_X_RANDR_ORIENTATION_ROT_0, rg);
- e_widget_framelist_object_append(of, ob);
- if (!(cfdata->can_rotate & ECORE_X_RANDR_ORIENTATION_ROT_0)) e_widget_disabled_set(ob, 1);
- ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-left", 24, 24, ECORE_X_RANDR_ORIENTATION_ROT_90, rg);
- e_widget_framelist_object_append(of, ob);
- if (!(cfdata->can_rotate & ECORE_X_RANDR_ORIENTATION_ROT_90)) e_widget_disabled_set(ob, 1);
- ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-around", 24, 24, ECORE_X_RANDR_ORIENTATION_ROT_180, rg);
- e_widget_framelist_object_append(of, ob);
- if (!(cfdata->can_rotate & ECORE_X_RANDR_ORIENTATION_ROT_180)) e_widget_disabled_set(ob, 1);
- ob = e_widget_radio_icon_add(evas, NULL, "preferences-screen-right", 24, 24, ECORE_X_RANDR_ORIENTATION_ROT_270, rg);
- e_widget_framelist_object_append(of, ob);
- if (!(cfdata->can_rotate & ECORE_X_RANDR_ORIENTATION_ROT_270)) e_widget_disabled_set(ob, 1);
- e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 0, 1, 0);
- }
-
- if (cfdata->can_flip)
- {
- of = e_widget_framelist_add(evas, _("Mirroring"), 0);
- ob = e_widget_check_icon_add(evas, NULL, "preferences-screen-hflip", 24, 24, &(cfdata->flip_x));
- e_widget_framelist_object_append(of, ob);
- if (!(cfdata->can_flip & ECORE_X_RANDR_ORIENTATION_FLIP_X)) e_widget_disabled_set(ob, 1);
- ob = e_widget_check_icon_add(evas, NULL, "preferences-screen-vflip", 24, 24, &(cfdata->flip_y));
- e_widget_framelist_object_append(of, ob);
- if (!(cfdata->can_flip & ECORE_X_RANDR_ORIENTATION_FLIP_Y))
- e_widget_disabled_set(ob, 1);
- e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 0, 1, 0);
- }
-
- e_widget_table_object_append(o, ot, 1, 0, 1, 1, 1, 1, 1, 1);
- return o;
-}
-
-static int
-_sort_resolutions(const void *d1, const void *d2)
-{
- const Resolution *r1 = d1;
- const Resolution *r2 = d2;
-
- if (r1->size.width > r2->size.width) return 1;
- if (r1->size.width < r2->size.width) return -1;
- if (r1->size.height > r2->size.height) return 1;
-
- return -1;
-}
-
-static void
-_load_resolutions(E_Config_Dialog_Data *cfdata)
-{
- int i, sel = 0;
- Evas *evas;
- Eina_List *l;
-
- evas = evas_object_evas_get(cfdata->res_list);
- if (e_widget_ilist_count(cfdata->res_list) !=
- (int)eina_list_count(cfdata->resolutions))
- {
- evas_event_freeze(evas);
- edje_freeze();
- e_widget_ilist_freeze(cfdata->res_list);
- e_widget_ilist_clear(cfdata->res_list);
-
- for (l = cfdata->resolutions, i = 0; l; l = l->next, i++)
- {
- char buf[1024];
- Resolution *res = l->data;
- Evas_Object *ob = NULL;
-
- res->id = i;
- snprintf(buf, sizeof(buf), _("%i×%i"), res->size.width, res->size.height);
-
- if ((res->size.width == cfdata->orig_size.width) &&
- (res->size.height == cfdata->orig_size.height))
- {
- ob = e_icon_add(evas);
- e_util_icon_theme_set(ob, "dialog-ok-apply");
- sel = res->id;
- }
- e_widget_ilist_append(cfdata->res_list, ob, buf,
- _ilist_item_change, cfdata, NULL);
- }
-
- e_widget_ilist_go(cfdata->res_list);
- e_widget_ilist_selected_set(cfdata->res_list, sel);
- e_widget_ilist_thaw(cfdata->res_list);
- edje_thaw();
- evas_event_thaw(evas);
- }
- else
- {
- for (l = cfdata->resolutions; l; l = l->next)
- {
- Resolution *res = l->data;
- Evas_Object *ob = NULL;
-
- if ((res->size.width == cfdata->orig_size.width) &&
- (res->size.height == cfdata->orig_size.height))
- {
- ob = e_icon_add(evas);
- e_util_icon_theme_set(ob, "dialog-ok-apply");
- }
- e_widget_ilist_nth_icon_set(cfdata->res_list, res->id, ob);
- }
- }
-}
-
-static void
-_load_rates(E_Config_Dialog_Data *cfdata)
-{
- int r, k = 0, sel = 0;
- char buf[16];
- Evas *evas;
- Resolution *res;
- Eina_List *l;
-
- evas = evas_object_evas_get(cfdata->rate_list);
- evas_event_freeze(evas);
- edje_freeze();
- e_widget_ilist_freeze(cfdata->rate_list);
- e_widget_ilist_clear(cfdata->rate_list);
-
- r = e_widget_ilist_selected_get(cfdata->res_list);
-
- EINA_LIST_FOREACH(cfdata->resolutions, l, res)
- if (res->id == r)
- {
- Ecore_X_Randr_Refresh_Rate *rt;
- Eina_List *ll;
-
- EINA_LIST_FOREACH(res->rates, ll, rt)
- {
- Evas_Object *ob = NULL;
-
- snprintf(buf, sizeof(buf), "%i Hz", (int)*rt);
-
- if (*rt == cfdata->orig_rate)
- {
- ob = e_icon_add(evas);
- e_util_icon_theme_set(ob, "dialog-ok-apply");
- sel = k;
- }
- e_widget_ilist_append(cfdata->rate_list, ob, buf, NULL, NULL, NULL);
- k++;
- }
- break;
- }
-
- e_widget_ilist_go(cfdata->rate_list);
- e_widget_ilist_selected_set(cfdata->rate_list, sel);
- e_widget_ilist_thaw(cfdata->rate_list);
- edje_thaw();
- evas_event_thaw(evas);
-}
-
-static void
-_ilist_item_change(void *data)
-{
- _load_rates(data);
-}
-
-static Eina_Bool
-_deferred_noxrandr_error(void *data __UNUSED__)
-{
- e_util_dialog_show(_("Missing Features"),
- _("Your X Display Server is missing support for
"
- "the XRandR (X Resize and Rotate) extension.
"
- "You cannot change screen resolutions without
"
- "the support of this extension. It could also be
"
- "that at the time ecore was built, there
"
- "was no XRandR support detected."));
- return ECORE_CALLBACK_CANCEL;
-}
-
-static Eina_Bool
-_deferred_norates_error(void *data __UNUSED__)
-{
- e_util_dialog_show(_("No Refresh Rates Found"),
- _("No refresh rates were reported by your X Display Server.
"
- "If you are running a nested X Display Server, then
"
- "this is to be expected. However, if you are not, then
"
- "the current refresh rate will be used when setting
"
- "the resolution, which may cause damage to your screen."));
- return ECORE_CALLBACK_CANCEL;
-}
-
-*/