swagtoy
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

namespacing-- 

SVN revision: 64990
This commit is contained in:
Mike Blumenkrantz 2011-11-09 15:39:26 +00:00
parent 6f8d4803ed
commit d447dfb63f
5 changed files with 196 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
src/modules/conf_randr/e_int_config_randr.c
View File

@ -47,40 +47,40 @@ static Evas_Object *basic_create_widgets (E_Config_Dialog *c
static Eina_Bool _deferred_noxrandr_error (void *data);
// Functions for the arrangement subdialog interaction
extern Eina_Bool e_config_randr_dialog_subdialog_arrangement_create_data (E_Config_Dialog_Data *cfdata);
extern Evas_Object *e_config_randr_dialog_subdialog_arrangement_basic_create_widgets (Evas *canvas);
extern Eina_Bool e_config_randr_dialog_subdialog_arrangement_basic_check_changed (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern Eina_Bool e_config_randr_dialog_subdialog_arrangement_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern void e_config_randr_dialog_subdialog_arrangement_free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern void e_config_randr_dialog_subdialog_arrangement_keep_changes (E_Config_Dialog_Data *cfdata);
extern void e_config_randr_dialog_subdialog_arrangement_discard_changes (E_Config_Dialog_Data *cfdata);
extern Eina_Bool dialog_subdialog_arrangement_create_data (E_Config_Dialog_Data *cfdata);
extern Evas_Object *dialog_subdialog_arrangement_basic_create_widgets (Evas *canvas);
extern Eina_Bool dialog_subdialog_arrangement_basic_check_changed (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern Eina_Bool dialog_subdialog_arrangement_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern void dialog_subdialog_arrangement_free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern void dialog_subdialog_arrangement_keep_changes (E_Config_Dialog_Data *cfdata);
extern void dialog_subdialog_arrangement_discard_changes (E_Config_Dialog_Data *cfdata);
// Functions for the policies subdialog interaction
extern Eina_Bool e_config_randr_dialog_subdialog_policies_create_data (E_Config_Dialog_Data *cfdata);
extern Evas_Object *e_config_randr_dialog_subdialog_policies_basic_create_widgets (Evas *canvas);
extern Eina_Bool e_config_randr_dialog_subdialog_policies_basic_check_changed (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern Eina_Bool e_config_randr_dialog_subdialog_policies_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern void e_config_randr_dialog_subdialog_policies_keep_changes (E_Config_Dialog_Data *cfdata);
extern void e_config_randr_dialog_subdialog_policies_discard_changes (E_Config_Dialog_Data *cfdata);
extern Eina_Bool dialog_subdialog_policies_create_data (E_Config_Dialog_Data *cfdata);
extern Evas_Object *dialog_subdialog_policies_basic_create_widgets (Evas *canvas);
extern Eina_Bool dialog_subdialog_policies_basic_check_changed (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern Eina_Bool dialog_subdialog_policies_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern void dialog_subdialog_policies_keep_changes (E_Config_Dialog_Data *cfdata);
extern void dialog_subdialog_policies_discard_changes (E_Config_Dialog_Data *cfdata);
// Functions for the resolutions subdialog interaction
extern Eina_Bool e_config_randr_dialog_subdialog_resolutions_create_data (E_Config_Dialog_Data *cfdata);
extern Evas_Object *e_config_randr_dialog_subdialog_resolutions_basic_create_widgets (Evas *canvas);
extern Eina_Bool e_config_randr_dialog_subdialog_resolutions_basic_check_changed (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern Eina_Bool e_config_randr_dialog_subdialog_resolutions_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern void e_config_randr_dialog_subdialog_resolutions_update_list (Evas *canvas, Evas_Object *crtc);
extern void e_config_randr_dialog_subdialog_resolutions_keep_changes (E_Config_Dialog_Data *cfdata);
extern void e_config_randr_dialog_subdialog_resolutions_discard_changes (E_Config_Dialog_Data *cfdata);
extern Eina_Bool dialog_subdialog_resolutions_create_data (E_Config_Dialog_Data *cfdata);
extern Evas_Object *dialog_subdialog_resolutions_basic_create_widgets (Evas *canvas);
extern Eina_Bool dialog_subdialog_resolutions_basic_check_changed (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern Eina_Bool dialog_subdialog_resolutions_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern void dialog_subdialog_resolutions_update_list (Evas *canvas, Evas_Object *crtc);
extern void dialog_subdialog_resolutions_keep_changes (E_Config_Dialog_Data *cfdata);
extern void dialog_subdialog_resolutions_discard_changes (E_Config_Dialog_Data *cfdata);
// Functions for the orientation subdialog interaction
extern Eina_Bool e_config_randr_dialog_subdialog_orientation_create_data (E_Config_Dialog_Data *cfdata);
extern Evas_Object *e_config_randr_dialog_subdialog_orientation_basic_create_widgets (Evas *canvas);
extern Eina_Bool e_config_randr_dialog_subdialog_orientation_basic_check_changed (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern Eina_Bool e_config_randr_dialog_subdialog_orientation_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern void e_config_randr_dialog_subdialog_orientation_update_radio_buttons (Evas_Object *crtc);
extern void e_config_randr_dialog_subdialog_orientation_update_edje (Evas_Object *crtc);
extern void e_config_randr_dialog_subdialog_orientation_keep_changes (E_Config_Dialog_Data *cfdata);
extern void e_config_randr_dialog_subdialog_orientation_discard_changes (E_Config_Dialog_Data *cfdata);
extern Eina_Bool dialog_subdialog_orientation_create_data (E_Config_Dialog_Data *cfdata);
extern Evas_Object *dialog_subdialog_orientation_basic_create_widgets (Evas *canvas);
extern Eina_Bool dialog_subdialog_orientation_basic_check_changed (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern Eina_Bool dialog_subdialog_orientation_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
extern void dialog_subdialog_orientation_update_radio_buttons (Evas_Object *crtc);
extern void dialog_subdialog_orientation_update_edje (Evas_Object *crtc);
extern void dialog_subdialog_orientation_keep_changes (E_Config_Dialog_Data *cfdata);
extern void dialog_subdialog_orientation_discard_changes (E_Config_Dialog_Data *cfdata);
/* actual module specifics */
E_Config_Dialog_Data *e_config_runtime_info = NULL;
@ -88,7 +88,7 @@ extern E_Module *conf_randr_module;
char _theme_file_path[PATH_MAX];
E_Config_Randr_Dialog_Output_Dialog_Data *
_e_config_randr_dialog_output_dialog_data_new(E_Randr_Crtc_Info *crtc_info, E_Randr_Output_Info *output_info)
_dialog_output_dialog_data_new(E_Randr_Crtc_Info *crtc_info, E_Randr_Output_Info *output_info)
{
E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data;
@ -134,16 +134,16 @@ create_data(E_Config_Dialog *cfd)
//is open.
if (output_info->connection_status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)
continue;
if ((odd = _e_config_randr_dialog_output_dialog_data_new(output_info->crtc, output_info)))
if ((odd = _dialog_output_dialog_data_new(output_info->crtc, output_info)))
EINA_SAFETY_ON_FALSE_GOTO((e_config_runtime_info->output_dialog_data_list = eina_list_append(e_config_runtime_info->output_dialog_data_list, odd)), _e_conf_randr_create_data_failed_free_data);
}
fprintf(stderr, "CONF_RANDR: Added %d output data structs.\n", eina_list_count(e_config_runtime_info->output_dialog_data_list));
//FIXME: Properly (stack-like) free data when creation fails
EINA_SAFETY_ON_FALSE_GOTO(e_config_randr_dialog_subdialog_arrangement_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
EINA_SAFETY_ON_FALSE_GOTO(e_config_randr_dialog_subdialog_resolutions_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
EINA_SAFETY_ON_FALSE_GOTO(e_config_randr_dialog_subdialog_policies_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
EINA_SAFETY_ON_FALSE_GOTO(e_config_randr_dialog_subdialog_orientation_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
EINA_SAFETY_ON_FALSE_GOTO(dialog_subdialog_arrangement_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
EINA_SAFETY_ON_FALSE_GOTO(dialog_subdialog_resolutions_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
EINA_SAFETY_ON_FALSE_GOTO(dialog_subdialog_policies_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
EINA_SAFETY_ON_FALSE_GOTO(dialog_subdialog_orientation_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
return e_config_runtime_info;
@ -156,7 +156,7 @@ _e_conf_randr_create_data_failed_free_data:
free_cfdata(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
EINA_SAFETY_ON_TRUE_RETURN(!e_randr_screen_info);
e_config_randr_dialog_subdialog_arrangement_free_data(cfd, cfdata);
dialog_subdialog_arrangement_free_data(cfd, cfdata);
if (cfdata) free(cfdata);
cfdata = NULL;
@ -215,10 +215,10 @@ _e_conf_randr_confirmation_dialog_keep_cb(void *data, E_Dialog *dia)
if (!cdd) return;
e_config_randr_dialog_subdialog_arrangement_keep_changes(cdd->cfdata);
e_config_randr_dialog_subdialog_orientation_keep_changes(cdd->cfdata);
e_config_randr_dialog_subdialog_policies_keep_changes(cdd->cfdata);
e_config_randr_dialog_subdialog_resolutions_keep_changes(cdd->cfdata);
dialog_subdialog_arrangement_keep_changes(cdd->cfdata);
dialog_subdialog_orientation_keep_changes(cdd->cfdata);
dialog_subdialog_policies_keep_changes(cdd->cfdata);
dialog_subdialog_resolutions_keep_changes(cdd->cfdata);
_e_conf_randr_confirmation_dialog_delete_cb(dia->win);
}
@ -229,10 +229,10 @@ _e_conf_randr_confirmation_dialog_discard_cb(void *data, E_Dialog *dia)
if (!cdd) return;
e_config_randr_dialog_subdialog_arrangement_discard_changes(cdd->cfdata);
e_config_randr_dialog_subdialog_orientation_discard_changes(cdd->cfdata);
e_config_randr_dialog_subdialog_policies_discard_changes(cdd->cfdata);
e_config_randr_dialog_subdialog_resolutions_discard_changes(cdd->cfdata);
dialog_subdialog_arrangement_discard_changes(cdd->cfdata);
dialog_subdialog_orientation_discard_changes(cdd->cfdata);
dialog_subdialog_policies_discard_changes(cdd->cfdata);
dialog_subdialog_resolutions_discard_changes(cdd->cfdata);
_e_conf_randr_confirmation_dialog_delete_cb(dia->win);
}
@ -287,13 +287,13 @@ basic_create_widgets (E_Config_Dialog *cfd, Evas *canvas, E_Config_Dialog_Data *
EINA_SAFETY_ON_TRUE_RETURN_VAL (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2), NULL);
EINA_SAFETY_ON_TRUE_RETURN_VAL((!canvas || !cfdata), NULL);
if(!(cfdata->gui.subdialogs.arrangement.dialog = e_config_randr_dialog_subdialog_arrangement_basic_create_widgets(canvas))) goto _e_config_randr_dialog_create_subdialog_arrangement_fail;
if(!(cfdata->gui.subdialogs.policies.dialog = e_config_randr_dialog_subdialog_policies_basic_create_widgets(canvas))) goto _e_config_randr_dialog_create_subdialog_policies_fail;
if(!(cfdata->gui.subdialogs.resolutions.dialog = e_config_randr_dialog_subdialog_resolutions_basic_create_widgets(canvas))) goto _e_config_randr_dialog_create_subdialog_resolutions_fail;
if(!(cfdata->gui.subdialogs.orientation.dialog = e_config_randr_dialog_subdialog_orientation_basic_create_widgets(canvas))) goto _e_config_randr_dialog_create_subdialog_orientation_fail;
if(!(cfdata->gui.subdialogs.arrangement.dialog = dialog_subdialog_arrangement_basic_create_widgets(canvas))) goto _dialog_create_subdialog_arrangement_fail;
if(!(cfdata->gui.subdialogs.policies.dialog = dialog_subdialog_policies_basic_create_widgets(canvas))) goto _dialog_create_subdialog_policies_fail;
if(!(cfdata->gui.subdialogs.resolutions.dialog = dialog_subdialog_resolutions_basic_create_widgets(canvas))) goto _dialog_create_subdialog_resolutions_fail;
if(!(cfdata->gui.subdialogs.orientation.dialog = dialog_subdialog_orientation_basic_create_widgets(canvas))) goto _dialog_create_subdialog_orientation_fail;
EINA_SAFETY_ON_FALSE_GOTO((table = e_widget_table_add(canvas, EINA_FALSE)), _e_config_randr_dialog_create_widgets_fail);
EINA_SAFETY_ON_FALSE_GOTO((wl = e_widget_list_add(canvas, EINA_FALSE, EINA_TRUE)), _e_config_randr_dialog_create_widget_list_fail);
EINA_SAFETY_ON_FALSE_GOTO((table = e_widget_table_add(canvas, EINA_FALSE)), _dialog_create_widgets_fail);
EINA_SAFETY_ON_FALSE_GOTO((wl = e_widget_list_add(canvas, EINA_FALSE, EINA_TRUE)), _dialog_create_widget_list_fail);
//e_widget_table_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h);
e_widget_table_object_append(table, cfdata->gui.subdialogs.arrangement.dialog, 1, 1, 1, 1, EVAS_HINT_FILL, EVAS_HINT_FILL, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@ -315,17 +315,17 @@ basic_create_widgets (E_Config_Dialog *cfd, Evas *canvas, E_Config_Dialog_Data *
return cfdata->gui.dialog;
_e_config_randr_dialog_create_widget_list_fail:
_dialog_create_widget_list_fail:
evas_object_del(table);
_e_config_randr_dialog_create_widgets_fail:
_dialog_create_widgets_fail:
evas_object_del(cfdata->gui.subdialogs.orientation.dialog);
_e_config_randr_dialog_create_subdialog_orientation_fail:
_dialog_create_subdialog_orientation_fail:
evas_object_del(cfdata->gui.subdialogs.resolutions.dialog);
_e_config_randr_dialog_create_subdialog_resolutions_fail:
_dialog_create_subdialog_resolutions_fail:
evas_object_del(cfdata->gui.subdialogs.policies.dialog);
_e_config_randr_dialog_create_subdialog_policies_fail:
_dialog_create_subdialog_policies_fail:
evas_object_del(cfdata->gui.subdialogs.arrangement.dialog);
_e_config_randr_dialog_create_subdialog_arrangement_fail:
_dialog_create_subdialog_arrangement_fail:
return NULL;
}
@ -341,26 +341,26 @@ static int
if (!cfdata) return EINA_FALSE;
//the order matters except for policies!
if (e_config_randr_dialog_subdialog_policies_basic_check_changed(cfd, cfdata))
if (dialog_subdialog_policies_basic_check_changed(cfd, cfdata))
{
ret &= e_config_randr_dialog_subdialog_policies_basic_apply_data(cfd, cfdata);
ret &= dialog_subdialog_policies_basic_apply_data(cfd, cfdata);
if (!ret) return EINA_FALSE;
}
if (e_config_randr_dialog_subdialog_resolutions_basic_check_changed(cfd, cfdata))
if (dialog_subdialog_resolutions_basic_check_changed(cfd, cfdata))
{
ret &= e_config_randr_dialog_subdialog_resolutions_basic_apply_data(cfd, cfdata);
ret &= dialog_subdialog_resolutions_basic_apply_data(cfd, cfdata);
if (!ret) return EINA_FALSE;
}
if (e_config_randr_dialog_subdialog_arrangement_basic_check_changed(cfd, cfdata))
if (dialog_subdialog_arrangement_basic_check_changed(cfd, cfdata))
{
ret &= e_config_randr_dialog_subdialog_arrangement_basic_apply_data(cfd, cfdata);
ret &= dialog_subdialog_arrangement_basic_apply_data(cfd, cfdata);
if (!ret) return EINA_FALSE;
}
if (e_config_randr_dialog_subdialog_orientation_basic_check_changed(cfd, cfdata))
ret &= e_config_randr_dialog_subdialog_orientation_basic_apply_data(cfd, cfdata);
if (dialog_subdialog_orientation_basic_check_changed(cfd, cfdata))
ret &= dialog_subdialog_orientation_basic_apply_data(cfd, cfdata);
_e_conf_randr_confirmation_dialog_new(cfd);
@ -414,9 +414,9 @@ basic_check_changed (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
if (!cfdata) return EINA_FALSE;
else
return (e_config_randr_dialog_subdialog_arrangement_basic_check_changed(cfd, cfdata)
|| e_config_randr_dialog_subdialog_policies_basic_check_changed(cfd, cfdata)
|| e_config_randr_dialog_subdialog_orientation_basic_check_changed(cfd, cfdata)
|| e_config_randr_dialog_subdialog_resolutions_basic_check_changed(cfd, cfdata));
return (dialog_subdialog_arrangement_basic_check_changed(cfd, cfdata)
|| dialog_subdialog_policies_basic_check_changed(cfd, cfdata)
|| dialog_subdialog_orientation_basic_check_changed(cfd, cfdata)
|| dialog_subdialog_resolutions_basic_check_changed(cfd, cfdata));
}

112
src/modules/conf_randr/e_int_config_randr_arrangement.c
View File

@ -17,30 +17,30 @@
#define CRTC_THUMB_SIZE_W 300
#define CRTC_THUMB_SIZE_H 300
Eina_Bool e_config_randr_dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *e_config_runtime_info);
Evas_Object *e_config_randr_dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas);
Eina_Bool e_config_randr_dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool e_config_randr_dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void e_config_randr_dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static inline Eina_List *_e_config_randr_dialog_subdialog_arrangement_neighbors_get(Evas_Object *obj);
static void _e_config_randr_dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj);
Eina_Bool dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *e_config_runtime_info);
Evas_Object *dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas);
Eina_Bool dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static inline Eina_List *_dialog_subdialog_arrangement_neighbors_get(Evas_Object *obj);
static void _dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj);
//static inline E_Config_Randr_Dialog_Output_Dialog_Data *_e_config_randr_dialog_subdialog_arrangement_output_dialog_data_new (E_Randr_Crtc_Info *crtc_info, E_Randr_Output_Info *output_info);
static inline void _e_config_randr_dialog_subdialog_arrangement_suggestion_add(Evas *evas);
static inline void _e_config_randr_dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj);
static void _e_config_randr_dialog_subdialog_arrangement_smart_class_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
static Evas_Object *_e_config_randr_dialog_subdialog_arrangement_output_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data);
static void _e_config_randr_dialog_subdialog_arrangement_output_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_config_randr_dialog_subdialog_arrangement_output_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_config_randr_dialog_subdialog_arrangement_output_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
//static inline E_Config_Randr_Dialog_Output_Dialog_Data *_dialog_subdialog_arrangement_output_dialog_data_new (E_Randr_Crtc_Info *crtc_info, E_Randr_Output_Info *output_info);
static inline void _dialog_subdialog_arrangement_suggestion_add(Evas *evas);
static inline void _dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj);
static void _dialog_subdialog_arrangement_smart_class_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
static Evas_Object *_dialog_subdialog_arrangement_output_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data);
static void _dialog_subdialog_arrangement_output_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _dialog_subdialog_arrangement_output_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _dialog_subdialog_arrangement_output_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
// Function for the resolutions subdialog interaction
extern void e_config_randr_dialog_subdialog_resolutions_update_list(Evas_Object *crtc);
extern void dialog_subdialog_resolutions_update_list(Evas_Object *crtc);
// Function for the orientation subdialog interaction
extern void e_config_randr_dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc);
extern void e_config_randr_dialog_subdialog_orientation_update_edje(Evas_Object *crtc);
extern void dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc);
extern void dialog_subdialog_orientation_update_edje(Evas_Object *crtc);
// Functions for the orientation subdialog interaction
extern void e_config_randr_dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc);
extern void dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc);
Evas_Smart_Class screen_setup_smart_class = EVAS_SMART_CLASS_INIT_NAME_VERSION("EvasObjectSmartScreenSetup");
Evas_Smart *screen_setup_smart;
@ -49,7 +49,7 @@ extern E_Config_Dialog_Data *e_config_runtime_info;
extern char _theme_file_path[];
static void
_e_config_randr_dialog_subdialog_arrangement_output_dialog_data_fill(E_Config_Randr_Dialog_Output_Dialog_Data *odd)
_dialog_subdialog_arrangement_output_dialog_data_fill(E_Config_Randr_Dialog_Output_Dialog_Data *odd)
{
if (!odd) return;
@ -75,14 +75,14 @@ _e_config_randr_dialog_subdialog_arrangement_output_dialog_data_fill(E_Config_Ra
}
Eina_Bool
e_config_randr_dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *data)
dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *data)
{
Eina_List *iter;
E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data;
EINA_LIST_FOREACH(data->output_dialog_data_list, iter, dialog_data)
{
_e_config_randr_dialog_subdialog_arrangement_output_dialog_data_fill(dialog_data);
_dialog_subdialog_arrangement_output_dialog_data_fill(dialog_data);
}
return EINA_TRUE;
@ -90,7 +90,7 @@ e_config_randr_dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *da
//IMPROVABLE: Clean up properly if instances can't be created
Evas_Object *
e_config_randr_dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas)
dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas)
{
Evas_Object *subdialog, *crtc;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
@ -100,7 +100,7 @@ e_config_randr_dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas)
//initialize smart object
evas_object_smart_clipped_smart_set(&screen_setup_smart_class);
screen_setup_smart_class.resize = _e_config_randr_dialog_subdialog_arrangement_smart_class_resize;
screen_setup_smart_class.resize = _dialog_subdialog_arrangement_smart_class_resize;
screen_setup_smart = evas_smart_class_new(&screen_setup_smart_class);
subdialog = evas_object_smart_add(canvas, screen_setup_smart);
@ -112,14 +112,14 @@ e_config_randr_dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas)
{
if ((!output_dialog_data->crtc && !output_dialog_data->output))
continue;
crtc = _e_config_randr_dialog_subdialog_arrangement_output_add(canvas, output_dialog_data);
crtc = _dialog_subdialog_arrangement_output_add(canvas, output_dialog_data);
if (!crtc) continue;
evas_object_show(crtc);
evas_object_event_callback_add (crtc, EVAS_CALLBACK_MOUSE_DOWN, _e_config_randr_dialog_subdialog_arrangement_output_mouse_down_cb, NULL);
evas_object_event_callback_add (crtc, EVAS_CALLBACK_MOUSE_MOVE, _e_config_randr_dialog_subdialog_arrangement_output_mouse_move_cb, NULL);
evas_object_event_callback_add (crtc, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_arrangement_output_mouse_up_cb, NULL);
evas_object_event_callback_add (crtc, EVAS_CALLBACK_MOUSE_DOWN, _dialog_subdialog_arrangement_output_mouse_down_cb, NULL);
evas_object_event_callback_add (crtc, EVAS_CALLBACK_MOUSE_MOVE, _dialog_subdialog_arrangement_output_mouse_move_cb, NULL);
evas_object_event_callback_add (crtc, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_arrangement_output_mouse_up_cb, NULL);
evas_object_smart_member_add(crtc, subdialog);
fprintf(stderr, "CONF_RANDR: CRTC representation (%p) added to arrangement subdialog (%p).\n", crtc, subdialog);
@ -131,7 +131,7 @@ e_config_randr_dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas)
}
static Evas_Object *
_e_config_randr_dialog_subdialog_arrangement_output_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data)
_dialog_subdialog_arrangement_output_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data)
{
E_Randr_Output_Info *output_info;
Evas_Object *output;
@ -145,7 +145,7 @@ _e_config_randr_dialog_subdialog_arrangement_output_add(Evas *canvas, E_Config_R
evas_object_data_set(output, "output_info", output_dialog_data);
//set theme for monitor representation
EINA_SAFETY_ON_FALSE_GOTO(edje_object_file_set(output, _theme_file_path, "e/conf/randr/dialog/subdialog/arrangement/output"), _e_config_randr_dialog_subdialog_arrangement_output_add_edje_set_fail);
EINA_SAFETY_ON_FALSE_GOTO(edje_object_file_set(output, _theme_file_path, "e/conf/randr/dialog/subdialog/arrangement/output"), _dialog_subdialog_arrangement_output_add_edje_set_fail);
//indicate monitor state
if (!output_dialog_data->crtc || (output_dialog_data->crtc && !output_dialog_data->previous_mode))
edje_object_signal_emit(output, "disabled", "e");
@ -173,16 +173,16 @@ _e_config_randr_dialog_subdialog_arrangement_output_add(Evas *canvas, E_Config_R
edje_object_part_text_set(output, "output_txt", output_name);
//set output orientation
e_config_randr_dialog_subdialog_orientation_update_edje(output);
dialog_subdialog_orientation_update_edje(output);
return output;
_e_config_randr_dialog_subdialog_arrangement_output_add_edje_set_fail:
_dialog_subdialog_arrangement_output_add_edje_set_fail:
evas_object_del(output);
return NULL;
}
static void
_e_config_randr_dialog_subdialog_arrangement_smart_class_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
_dialog_subdialog_arrangement_smart_class_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
Evas_Object *output;
Evas_Coord real_sum_w = 0, real_sum_h = 0;
@ -281,7 +281,7 @@ _e_config_randr_dialog_subdialog_arrangement_smart_class_resize(Evas_Object *obj
}
static void
_e_config_randr_dialog_subdialog_arrangement_output_mouse_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_dialog_subdialog_arrangement_output_mouse_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Evas_Object *element = NULL;
Eina_List *iter;
@ -299,13 +299,13 @@ _e_config_randr_dialog_subdialog_arrangement_output_mouse_down_cb(void *data __U
e_config_runtime_info->gui.selected_eo = obj;
//update resolutions list
e_config_randr_dialog_subdialog_resolutions_update_list(obj);
dialog_subdialog_resolutions_update_list(obj);
//update orientation radio buttons
e_config_randr_dialog_subdialog_orientation_update_radio_buttons(obj);
dialog_subdialog_orientation_update_radio_buttons(obj);
//update policy radio buttons
e_config_randr_dialog_subdialog_policies_update_radio_buttons(obj);
dialog_subdialog_policies_update_radio_buttons(obj);
crtc_selected = EINA_TRUE;
}
@ -316,20 +316,20 @@ _e_config_randr_dialog_subdialog_arrangement_output_mouse_down_cb(void *data __U
e_config_runtime_info->gui.selected_eo = NULL;
//update resolutions list
e_config_randr_dialog_subdialog_resolutions_update_list(NULL);
dialog_subdialog_resolutions_update_list(NULL);
//update orientation radio buttons
e_config_randr_dialog_subdialog_orientation_update_radio_buttons(NULL);
dialog_subdialog_orientation_update_radio_buttons(NULL);
//update policy radio buttons
e_config_randr_dialog_subdialog_policies_update_radio_buttons(NULL);
dialog_subdialog_policies_update_radio_buttons(NULL);
}
evas_object_geometry_get(obj, &e_config_runtime_info->gui.subdialogs.arrangement.previous_pos.x, &e_config_runtime_info->gui.subdialogs.arrangement.previous_pos.y, NULL, NULL);
}
static void
_e_config_randr_dialog_subdialog_arrangement_output_mouse_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
_dialog_subdialog_arrangement_output_mouse_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_Move *ev = event_info;
Eina_Rectangle geo, parent;
@ -357,13 +357,13 @@ _e_config_randr_dialog_subdialog_arrangement_output_mouse_move_cb(void *data __U
if ((geo.x != new.x) || (geo.y != new.y))
{
evas_object_move(obj, new.x, new.y);
_e_config_randr_dialog_subdialog_arrangement_make_suggestion(obj);
_dialog_subdialog_arrangement_make_suggestion(obj);
}
}
}
static void
_e_config_randr_dialog_subdialog_arrangement_output_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_dialog_subdialog_arrangement_output_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Evas_Coord_Point coords;
@ -380,7 +380,7 @@ _e_config_randr_dialog_subdialog_arrangement_output_mouse_up_cb(void *data __UNU
}
void
_e_config_randr_dialog_subdialog_arrangement_suggestion_add(Evas *evas)
_dialog_subdialog_arrangement_suggestion_add(Evas *evas)
{
const char *theme_data_item = NULL;
@ -393,7 +393,7 @@ _e_config_randr_dialog_subdialog_arrangement_suggestion_add(Evas *evas)
}
void
_e_config_randr_dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj)
_dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj)
{
Eina_List *li, *crtcs = evas_object_smart_members_get(evas_object_smart_parent_get(obj));
Evas_Object *crtc = NULL;
@ -404,7 +404,7 @@ _e_config_randr_dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj)
if (!e_config_runtime_info->gui.subdialogs.arrangement.suggestion)
{
_e_config_randr_dialog_subdialog_arrangement_suggestion_add(evas_object_evas_get(obj));
_dialog_subdialog_arrangement_suggestion_add(evas_object_evas_get(obj));
evas_object_show(e_config_runtime_info->gui.subdialogs.arrangement.suggestion);
}
@ -520,7 +520,7 @@ _e_config_randr_dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj)
}
void
e_config_randr_dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data;
@ -539,7 +539,7 @@ e_config_randr_dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd __UNU
}
static Eina_List *
_e_config_randr_dialog_subdialog_arrangement_neighbors_get(Evas_Object *obj)
_dialog_subdialog_arrangement_neighbors_get(Evas_Object *obj)
{
Evas_Object *smart_parent, *crtc;
Eina_List *crtcs, *iter, *neighbors = NULL;
@ -575,7 +575,7 @@ _e_config_randr_dialog_subdialog_arrangement_neighbors_get(Evas_Object *obj)
}
static void
_e_config_randr_dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj)
_dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj)
{
Eina_List *neighbors, *iter;
Evas_Object *smart_parent, *crtc;
@ -589,7 +589,7 @@ _e_config_randr_dialog_subdialog_arrangement_determine_positions_recursive(Evas_
smart_parent = e_config_runtime_info->gui.subdialogs.arrangement.smart_parent;
evas_object_geometry_get(smart_parent, &smart_geo.x, &smart_geo.y, &smart_geo.w, &smart_geo.h);
//fprintf(stderr, "CONF_RANDR: Smart Parent is at %dx%d\n", smart_geo.x, smart_geo.y);
neighbors = _e_config_randr_dialog_subdialog_arrangement_neighbors_get(obj);
neighbors = _dialog_subdialog_arrangement_neighbors_get(obj);
EINA_SAFETY_ON_FALSE_RETURN((dialog_data = evas_object_data_get(obj, "output_info")));
evas_object_geometry_get(obj, &geo.x, &geo.y, &geo.w, &geo.h);
@ -672,7 +672,7 @@ _e_config_randr_dialog_subdialog_arrangement_determine_positions_recursive(Evas_
|| (neighbor_info->new_pos.y == Ecore_X_Randr_Unset))
{
//fprintf(stderr, "CONF_RANDR: Now going to travel %p.\n", crtc);
_e_config_randr_dialog_subdialog_arrangement_determine_positions_recursive(crtc);
_dialog_subdialog_arrangement_determine_positions_recursive(crtc);
}
}
}
@ -680,7 +680,7 @@ _e_config_randr_dialog_subdialog_arrangement_determine_positions_recursive(Evas_
}
Eina_Bool
e_config_randr_dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
{
Eina_List *crtcs, *iter;
Evas_Object *smart_parent, *crtc, *top_left = NULL;
@ -719,7 +719,7 @@ e_config_randr_dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cf
}
e_config_runtime_info->gui.subdialogs.arrangement.relative_zero.x = relz.x;
e_config_runtime_info->gui.subdialogs.arrangement.relative_zero.y = relz.y;
if (top_left) _e_config_randr_dialog_subdialog_arrangement_determine_positions_recursive(top_left);
if (top_left) _dialog_subdialog_arrangement_determine_positions_recursive(top_left);
EINA_LIST_FOREACH(crtcs, iter, crtc)
{
@ -745,7 +745,7 @@ e_config_randr_dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cf
}
Eina_Bool
e_config_randr_dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
Eina_List *iter;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
@ -760,7 +760,7 @@ e_config_randr_dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog
}
void
e_config_randr_dialog_subdialog_arrangement_keep_changes(E_Config_Dialog_Data *cfdata)
dialog_subdialog_arrangement_keep_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;
@ -778,7 +778,7 @@ e_config_randr_dialog_subdialog_arrangement_keep_changes(E_Config_Dialog_Data *c
}
void
e_config_randr_dialog_subdialog_arrangement_discard_changes(E_Config_Dialog_Data *cfdata)
dialog_subdialog_arrangement_discard_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;

64
src/modules/conf_randr/e_int_config_randr_orientation.c
View File

@ -7,33 +7,33 @@
#define RANDR_DIALOG_ORIENTATION_ALL (ECORE_X_RANDR_ORIENTATION_ROT_0 | ECORE_X_RANDR_ORIENTATION_ROT_90 | ECORE_X_RANDR_ORIENTATION_ROT_180 | ECORE_X_RANDR_ORIENTATION_ROT_270 | ECORE_X_RANDR_ORIENTATION_ROT_270 | ECORE_X_RANDR_ORIENTATION_FLIP_X | ECORE_X_RANDR_ORIENTATION_FLIP_Y)
Eina_Bool e_config_randr_dialog_subdialog_orientation_create_data (E_Config_Dialog_Data *cfdata);
Evas_Object *e_config_randr_dialog_subdialog_orientation_basic_create_widgets(Evas *canvas);
Eina_Bool e_config_randr_dialog_subdialog_orientation_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool e_config_randr_dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool e_config_randr_dialog_subdialog_orientation_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void e_config_randr_dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc);
void e_config_randr_dialog_subdialog_orientation_update_edje(Evas_Object *crtc);
Eina_Bool dialog_subdialog_orientation_create_data (E_Config_Dialog_Data *cfdata);
Evas_Object *dialog_subdialog_orientation_basic_create_widgets(Evas *canvas);
Eina_Bool dialog_subdialog_orientation_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool dialog_subdialog_orientation_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc);
void dialog_subdialog_orientation_update_edje(Evas_Object *crtc);
//static void _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
//static void _dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
extern E_Config_Dialog_Data *e_config_runtime_info;
extern char _theme_file_path[];
/*
static void
_e_config_randr_dialog_subdialog_orientation_radio_add_callbacks(void)
_dialog_subdialog_orientation_radio_add_callbacks(void)
{
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot270, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot180, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot90, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_normal, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot270, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot180, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot90, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_normal, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_policy_mouse_up_cb, NULL);
}
*/
Eina_Bool
e_config_randr_dialog_subdialog_orientation_create_data(E_Config_Dialog_Data *cfdata)
dialog_subdialog_orientation_create_data(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
E_Randr_Crtc_Info *ci;
@ -53,7 +53,7 @@ e_config_randr_dialog_subdialog_orientation_create_data(E_Config_Dialog_Data *cf
}
Evas_Object *
e_config_randr_dialog_subdialog_orientation_basic_create_widgets(Evas *canvas)
dialog_subdialog_orientation_basic_create_widgets(Evas *canvas)
{
Evas_Object *subdialog;
E_Radio_Group *rg;
@ -65,7 +65,7 @@ e_config_randr_dialog_subdialog_orientation_basic_create_widgets(Evas *canvas)
if (!(subdialog = e_widget_framelist_add(canvas, _("Display Orientation"), EINA_FALSE))) return NULL;
// Add radio buttons
if(!(rg = e_widget_radio_group_new(&e_config_runtime_info->gui.subdialogs.orientation.radio_val))) goto _e_config_randr_dialog_subdialog_orientation_radio_add_fail;
if(!(rg = e_widget_radio_group_new(&e_config_runtime_info->gui.subdialogs.orientation.radio_val))) goto _dialog_subdialog_orientation_radio_add_fail;
//IMPROVABLE: use enum to determine objects via 'switch'-statement
e_config_runtime_info->gui.subdialogs.orientation.radio_normal = e_widget_radio_add(canvas, _("Normal"), ECORE_X_RANDR_OUTPUT_POLICY_ABOVE, rg);
@ -86,35 +86,35 @@ e_config_randr_dialog_subdialog_orientation_basic_create_widgets(Evas *canvas)
e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical = e_widget_radio_add(canvas, _("Flipped, vertically"), ECORE_X_RANDR_OUTPUT_POLICY_NONE, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical);
//_e_config_randr_dialog_subdialog_orientation_radio_add_callbacks();
//_dialog_subdialog_orientation_radio_add_callbacks();
/*
// Add orientation demonstration edje
if (!(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje = edje_object_add(canvas)))
goto _e_config_randr_dialog_subdialog_orientation_edje_add_fail;
goto _dialog_subdialog_orientation_edje_add_fail;
if (!edje_object_file_set(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje, _theme_file_path, "e/conf/randr/dialog/subdialog/orientation"))
goto _e_config_randr_dialog_subdialog_orientation_edje_set_fail;
goto _dialog_subdialog_orientation_edje_set_fail;
e_widget_table_object_align_append(subdialog, e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje, 1, 0, 1, 1, 1, 1, 1, 1, 1.0, 1.0);
*/
//disable widgets, if no CRTC is selected
e_config_randr_dialog_subdialog_orientation_update_radio_buttons(e_config_runtime_info->gui.selected_eo);
dialog_subdialog_orientation_update_radio_buttons(e_config_runtime_info->gui.selected_eo);
//evas_object_show(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje);
return subdialog;
/*
_e_config_randr_dialog_subdialog_orientation_edje_set_fail:
_dialog_subdialog_orientation_edje_set_fail:
evas_object_del(ol);
evas_object_del(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje);
_e_config_randr_dialog_subdialog_orientation_edje_add_fail:
_dialog_subdialog_orientation_edje_add_fail:
fprintf(stderr, "CONF_RANDR: Couldn't set edj for orientation subdialog!\n");
evas_object_del(subdialog);
return NULL;
*/
_e_config_randr_dialog_subdialog_orientation_radio_add_fail:
_dialog_subdialog_orientation_radio_add_fail:
evas_object_del(subdialog);
fprintf(stderr, "CONF_RANDR: Could not add radio group!\n");
return NULL;
@ -122,7 +122,7 @@ _e_config_randr_dialog_subdialog_orientation_radio_add_fail:
#if 0
static void
_e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
_dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
char signal[40];
int orientation = ECORE_X_RANDR_ORIENTATION_ROT_0;
@ -150,7 +150,7 @@ _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas
#endif
void
e_config_randr_dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc)
dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc)
{
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
Ecore_X_Randr_Orientation supported_oris, ori;
@ -237,7 +237,7 @@ e_config_randr_dialog_subdialog_orientation_update_radio_buttons(Evas_Object *cr
}
void
e_config_randr_dialog_subdialog_orientation_update_edje(Evas_Object *crtc)
dialog_subdialog_orientation_update_edje(Evas_Object *crtc)
{
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
Ecore_X_Randr_Orientation supported_oris, ori;
@ -266,7 +266,7 @@ e_config_randr_dialog_subdialog_orientation_update_edje(Evas_Object *crtc)
}
Eina_Bool
e_config_randr_dialog_subdialog_orientation_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
dialog_subdialog_orientation_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
{
Ecore_X_Randr_Orientation orientation;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
@ -289,7 +289,7 @@ e_config_randr_dialog_subdialog_orientation_basic_apply_data (E_Config_Dialog *c
}
Eina_Bool
e_config_randr_dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
@ -299,7 +299,7 @@ e_config_randr_dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog
}
void
e_config_randr_dialog_subdialog_orientation_keep_changes(E_Config_Dialog_Data *cfdata)
dialog_subdialog_orientation_keep_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;
@ -315,7 +315,7 @@ e_config_randr_dialog_subdialog_orientation_keep_changes(E_Config_Dialog_Data *c
}
void
e_config_randr_dialog_subdialog_orientation_discard_changes(E_Config_Dialog_Data *cfdata)
dialog_subdialog_orientation_discard_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;

56
src/modules/conf_randr/e_int_config_randr_policies.c
View File

@ -12,31 +12,31 @@
#define Ecore_X_Randr_Unset -1
#endif
Evas_Object *e_config_randr_dialog_subdialog_policies_basic_create_widgets(Evas *canvas);
Eina_Bool e_config_randr_dialog_subdialog_policies_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool e_config_randr_dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool e_config_randr_dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void e_config_randr_dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc);
Evas_Object *dialog_subdialog_policies_basic_create_widgets(Evas *canvas);
Eina_Bool dialog_subdialog_policies_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc);
static void _e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _dialog_subdialog_policies_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
extern E_Config_Dialog_Data *e_config_runtime_info;
extern char _theme_file_path[];
/*
static void
_e_config_randr_dialog_subdialog_policies_radio_add_callbacks(void)
_dialog_subdialog_policies_radio_add_callbacks(void)
{
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_none, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_clone, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_left, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_below, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_above, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_right, EVAS_CALLBACK_MOUSE_UP, _e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_none, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_clone, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_left, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_below, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_above, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_right, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_policies_policy_mouse_up_cb, NULL);
}
*/
Eina_Bool
e_config_randr_dialog_subdialog_policies_create_data(E_Config_Dialog_Data *e_config_runtime_info)
dialog_subdialog_policies_create_data(E_Config_Dialog_Data *e_config_runtime_info)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;
@ -59,7 +59,7 @@ e_config_randr_dialog_subdialog_policies_create_data(E_Config_Dialog_Data *e_con
}
Evas_Object *
e_config_randr_dialog_subdialog_policies_basic_create_widgets(Evas *canvas)
dialog_subdialog_policies_basic_create_widgets(Evas *canvas)
{
Evas_Object *subdialog;
E_Radio_Group *rg;
@ -72,7 +72,7 @@ e_config_randr_dialog_subdialog_policies_basic_create_widgets(Evas *canvas)
if(!(subdialog = e_widget_framelist_add(canvas, _("Screen attachement policy"), EINA_FALSE))) return NULL;
// Add radio buttons
if (!(rg = e_widget_radio_group_new(&e_config_runtime_info->gui.subdialogs.policies.radio_val))) goto _e_config_randr_dialog_subdialog_policies_radio_add_fail;
if (!(rg = e_widget_radio_group_new(&e_config_runtime_info->gui.subdialogs.policies.radio_val))) goto _dialog_subdialog_policies_radio_add_fail;
//IMPROVABLE: use enum to determine objects via 'switch'-statement
e_config_runtime_info->gui.subdialogs.policies.radio_above = e_widget_radio_add(canvas, _("Above"), ECORE_X_RANDR_OUTPUT_POLICY_ABOVE, rg);
@ -93,18 +93,18 @@ e_config_randr_dialog_subdialog_policies_basic_create_widgets(Evas *canvas)
e_config_runtime_info->gui.subdialogs.policies.radio_none = e_widget_radio_add(canvas, _("No reaction"), ECORE_X_RANDR_OUTPUT_POLICY_NONE, rg);
e_widget_framelist_object_append(subdialog, e_config_runtime_info->gui.subdialogs.policies.radio_none);
//_e_config_randr_dialog_subdialog_policies_radio_add_callbacks();
//_dialog_subdialog_policies_radio_add_callbacks();
/*
// Add policies demonstration edje
if (!(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje = edje_object_add(canvas)))
{
goto _e_config_randr_dialog_subdialog_policies_edje_add_fail;
goto _dialog_subdialog_policies_edje_add_fail;
}
if (!edje_object_file_set(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje, _theme_file_path, "e/conf/randr/dialog/subdialog/policies"))
{
goto _e_config_randr_dialog_subdialog_policies_edje_set_fail;
goto _dialog_subdialog_policies_edje_set_fail;
}
e_widget_table_object_align_append(subdialog, e_config_runtime_info->gui.subdialogs.policies.swallowing_edje, 1, 0, 1, 1, 1, 1, 1, 1, 1.0, 1.0);
@ -142,20 +142,20 @@ e_config_randr_dialog_subdialog_policies_basic_create_widgets(Evas *canvas)
return subdialog;
/*
_e_config_randr_dialog_subdialog_policies_edje_set_fail:
_dialog_subdialog_policies_edje_set_fail:
evas_object_del(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje);
_e_config_randr_dialog_subdialog_policies_edje_add_fail:
_dialog_subdialog_policies_edje_add_fail:
fprintf(stderr, "CONF_RANDR: Couldn't set edj for policies subdialog!\n");
evas_object_del(subdialog);
return NULL;
*/
_e_config_randr_dialog_subdialog_policies_radio_add_fail:
_dialog_subdialog_policies_radio_add_fail:
evas_object_del(subdialog);
return NULL;
}
static void
_e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_dialog_subdialog_policies_policy_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
char signal[29];
int policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE;
@ -182,7 +182,7 @@ _e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb(void *data __UNUSED
}
Eina_Bool
e_config_randr_dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{
if (!e_randr_screen_info || !e_config_runtime_info->gui.selected_output_dd) return EINA_FALSE;
@ -195,7 +195,7 @@ e_config_randr_dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd _
}
Eina_Bool
e_config_randr_dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
if (!e_randr_screen_info || !cfdata || !cfdata->gui.selected_output_dd) return EINA_FALSE;
@ -203,7 +203,7 @@ e_config_randr_dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cf
}
void
e_config_randr_dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc)
dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc)
{
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
E_Randr_Output_Info *output = NULL;
@ -267,7 +267,7 @@ e_config_randr_dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc)
}
void
e_config_randr_dialog_subdialog_policies_keep_changes(E_Config_Dialog_Data *cfdata)
dialog_subdialog_policies_keep_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;
@ -283,7 +283,7 @@ e_config_randr_dialog_subdialog_policies_keep_changes(E_Config_Dialog_Data *cfda
}
void
e_config_randr_dialog_subdialog_policies_discard_changes(E_Config_Dialog_Data *cfdata)
dialog_subdialog_policies_discard_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;

26
src/modules/conf_randr/e_int_config_randr_resolutions.c
View File

@ -18,17 +18,17 @@
#define ICON_HEIGHT 10
#define RESOLUTION_TXT_MAX_LENGTH 50
Evas_Object *e_config_randr_dialog_subdialog_resolutions_basic_create_widgets(Evas *canvas);
Eina_Bool e_config_randr_dialog_subdialog_resolutions_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool e_config_randr_dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void e_config_randr_dialog_subdialog_resolutions_update_list(Evas_Object *crtc);
void e_config_randr_dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *cfdata);
void e_config_randr_dialog_subdialog_resolutions_discard_changes(E_Config_Dialog_Data *cfdata);
Evas_Object *dialog_subdialog_resolutions_basic_create_widgets(Evas *canvas);
Eina_Bool dialog_subdialog_resolutions_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void dialog_subdialog_resolutions_update_list(Evas_Object *crtc);
void dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *cfdata);
void dialog_subdialog_resolutions_discard_changes(E_Config_Dialog_Data *cfdata);
extern E_Config_Dialog_Data *e_config_runtime_info;
Eina_Bool
e_config_randr_dialog_subdialog_resolutions_create_data(E_Config_Dialog_Data *cfdata)
dialog_subdialog_resolutions_create_data(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Ecore_X_Randr_Mode_Info *mi;
@ -60,7 +60,7 @@ e_config_randr_dialog_subdialog_resolutions_create_data(E_Config_Dialog_Data *cf
}
Evas_Object *
e_config_randr_dialog_subdialog_resolutions_basic_create_widgets(Evas *canvas)
dialog_subdialog_resolutions_basic_create_widgets(Evas *canvas)
{
Evas_Object *subdialog;
@ -75,7 +75,7 @@ e_config_randr_dialog_subdialog_resolutions_basic_create_widgets(Evas *canvas)
}
Eina_Bool
e_config_randr_dialog_subdialog_resolutions_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
dialog_subdialog_resolutions_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
{
//Apply new mode
Ecore_X_Randr_Mode_Info* selected_mode;
@ -145,7 +145,7 @@ e_config_randr_dialog_subdialog_resolutions_basic_apply_data (E_Config_Dialog *c
}
Eina_Bool
e_config_randr_dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{
Ecore_X_Randr_Mode_Info* selected_mode;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
@ -156,7 +156,7 @@ e_config_randr_dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog
}
void
e_config_randr_dialog_subdialog_resolutions_update_list(Evas_Object *crtc)
dialog_subdialog_resolutions_update_list(Evas_Object *crtc)
{
Eina_List *iter, *modelist = NULL;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
@ -224,7 +224,7 @@ e_config_randr_dialog_subdialog_resolutions_update_list(Evas_Object *crtc)
void
e_config_randr_dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *cfdata)
dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;
@ -242,7 +242,7 @@ e_config_randr_dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *c
}
void
e_config_randr_dialog_subdialog_resolutions_discard_changes(E_Config_Dialog_Data *cfdata)
dialog_subdialog_resolutions_discard_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;