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

rename stuff, move functions decls to header 

SVN revision: 68438
This commit is contained in:
Leif Middelschulte 2012-02-25 10:01:23 +00:00
parent 0ff9e4bc58
commit a5a3db6195
6 changed files with 216 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,44 +44,7 @@ static int basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Da
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 Eina_Bool _deferred_noxrandr_error(void *data);
// Functions for the arrangement subdialog interaction
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 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 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 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);
static void _e_conf_randr_confirmation_dialog_discard_cb(void *data, E_Dialog *dia);
static void _e_conf_randr_confirmation_dialog_discard_cb(void *data, E_Dialog *dia);
/* actual module specifics */
E_Config_Dialog_Data *e_config_runtime_info = NULL;
@ -142,10 +105,10 @@ create_data(E_Config_Dialog *cfd)
e_config_runtime_info->output_dialog_data_list = eina_list_append(e_config_runtime_info->output_dialog_data_list, odd);
}
//FIXME: Properly (stack-like) free data when creation fails
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);
EINA_SAFETY_ON_FALSE_GOTO(arrangement_widget_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
EINA_SAFETY_ON_FALSE_GOTO(resolution_widget_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
EINA_SAFETY_ON_FALSE_GOTO(policy_widget_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
EINA_SAFETY_ON_FALSE_GOTO(orientation_widget_create_data(e_config_runtime_info), _e_conf_randr_create_data_failed_free_data);
return e_config_runtime_info;
@ -161,7 +124,7 @@ free_cfdata(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
EINA_SAFETY_ON_TRUE_RETURN(!E_RANDR_12);
dialog_subdialog_arrangement_free_data(cfd, cfdata);
arrangement_widget_free_data(cfd, cfdata);
evas_object_del(cfdata->gui.subdialogs.arrangement.dialog);
evas_object_del(cfdata->gui.subdialogs.policies.dialog);
@ -237,10 +200,10 @@ _e_conf_randr_confirmation_dialog_keep_cb(void *data, E_Dialog *dia)
if (!cdd) return;
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);
arrangement_widget_keep_changes(cdd->cfdata);
orientation_widget_keep_changes(cdd->cfdata);
policy_widget_keep_changes(cdd->cfdata);
resolution_widget_keep_changes(cdd->cfdata);
_e_conf_randr_confirmation_dialog_delete_cb(dia->win);
}
@ -251,10 +214,10 @@ _e_conf_randr_confirmation_dialog_discard_cb(void *data, E_Dialog *dia)
if (!cdd) return;
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);
arrangement_widget_discard_changes(cdd->cfdata);
orientation_widget_discard_changes(cdd->cfdata);
policy_widget_discard_changes(cdd->cfdata);
resolution_widget_discard_changes(cdd->cfdata);
_e_conf_randr_confirmation_dialog_delete_cb(dia->win);
}
@ -267,23 +230,23 @@ _e_conf_randr_confirmation_dialog_store_cb(void *data, E_Dialog *dia)
if (!cdd) return;
//Create modifier
if (dialog_subdialog_policies_basic_check_changed(NULL, e_config_runtime_info))
if (policy_widget_basic_check_changed(NULL, e_config_runtime_info))
modifier |= E_RANDR_CONFIGURATION_STORE_POLICIES;
if (dialog_subdialog_resolutions_basic_check_changed(NULL, e_config_runtime_info))
if (resolution_widget_basic_check_changed(NULL, e_config_runtime_info))
modifier |= E_RANDR_CONFIGURATION_STORE_RESOLUTIONS;
if (dialog_subdialog_arrangement_basic_check_changed(NULL, e_config_runtime_info))
if (arrangement_widget_basic_check_changed(NULL, e_config_runtime_info))
modifier |= E_RANDR_CONFIGURATION_STORE_ARRANGEMENT;
if (dialog_subdialog_orientation_basic_check_changed(NULL, e_config_runtime_info))
if (orientation_widget_basic_check_changed(NULL, e_config_runtime_info))
modifier |= E_RANDR_CONFIGURATION_STORE_ORIENTATIONS;
//ordinary "keep" functionality
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);
arrangement_widget_keep_changes(cdd->cfdata);
orientation_widget_keep_changes(cdd->cfdata);
policy_widget_keep_changes(cdd->cfdata);
resolution_widget_keep_changes(cdd->cfdata);
//cleanup dialog
_e_conf_randr_confirmation_dialog_delete_cb(dia->win);
@ -341,10 +304,10 @@ basic_create_widgets(E_Config_Dialog *cfd, Evas *canvas, E_Config_Dialog_Data *c
e_config_runtime_info->gui.canvas = canvas;
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;
if (!(cfdata->gui.subdialogs.arrangement.dialog = arrangement_widget_basic_create_widgets(canvas))) goto _dialog_create_subdialog_arrangement_fail;
if (!(cfdata->gui.subdialogs.policies.dialog = policy_widget_basic_create_widgets(canvas))) goto _dialog_create_subdialog_policies_fail;
if (!(cfdata->gui.subdialogs.resolutions.dialog = resolution_widget_basic_create_widgets(canvas))) goto _dialog_create_subdialog_resolutions_fail;
if (!(cfdata->gui.subdialogs.orientation.dialog = orientation_widget_basic_create_widgets(canvas))) goto _dialog_create_subdialog_orientation_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);
@ -395,26 +358,26 @@ basic_apply_data
if (!cfdata) return EINA_FALSE;
//the order matters except for policies!
if (dialog_subdialog_policies_basic_check_changed(cfd, cfdata))
if (policy_widget_basic_check_changed(cfd, cfdata))
{
ret &= dialog_subdialog_policies_basic_apply_data(cfd, cfdata);
ret &= policy_widget_basic_apply_data(cfd, cfdata);
if (!ret) return EINA_FALSE;
}
if (dialog_subdialog_resolutions_basic_check_changed(cfd, cfdata))
if (resolution_widget_basic_check_changed(cfd, cfdata))
{
ret &= dialog_subdialog_resolutions_basic_apply_data(cfd, cfdata);
ret &= resolution_widget_basic_apply_data(cfd, cfdata);
if (!ret) return EINA_FALSE;
}
if (dialog_subdialog_arrangement_basic_check_changed(cfd, cfdata))
if (arrangement_widget_basic_check_changed(cfd, cfdata))
{
ret &= dialog_subdialog_arrangement_basic_apply_data(cfd, cfdata);
ret &= arrangement_widget_basic_apply_data(cfd, cfdata);
if (!ret) return EINA_FALSE;
}
if (dialog_subdialog_orientation_basic_check_changed(cfd, cfdata))
ret &= dialog_subdialog_orientation_basic_apply_data(cfd, cfdata);
if (orientation_widget_basic_check_changed(cfd, cfdata))
ret &= orientation_widget_basic_apply_data(cfd, cfdata);
_e_conf_randr_confirmation_dialog_new(cfd);
@ -468,9 +431,9 @@ basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
if (!cfdata) return EINA_FALSE;
else
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);
return arrangement_widget_basic_check_changed(cfd, cfdata)
|| policy_widget_basic_check_changed(cfd, cfdata)
|| orientation_widget_basic_check_changed(cfd, cfdata)
|| resolution_widget_basic_check_changed(cfd, cfdata);
}

38
src/modules/conf_randr/e_int_config_randr.h
View File

@ -77,5 +77,43 @@ struct _Config
E_Config_Dialog *e_int_config_randr(E_Container *con, const char *params __UNUSED__);
// Functions for the arrangement subdialog interaction
Eina_Bool arrangement_widget_create_data(E_Config_Dialog_Data *cfdata);
Evas_Object *arrangement_widget_basic_create_widgets(Evas *canvas);
Eina_Bool arrangement_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool arrangement_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void arrangement_widget_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void arrangement_widget_keep_changes(E_Config_Dialog_Data *cfdata);
void arrangement_widget_discard_changes(E_Config_Dialog_Data *cfdata);
// Functions for the policies subdialog interaction
Eina_Bool policy_widget_create_data(E_Config_Dialog_Data *cfdata);
Evas_Object *policy_widget_basic_create_widgets(Evas *canvas);
Eina_Bool policy_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool policy_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void policy_widget_keep_changes(E_Config_Dialog_Data *cfdata);
void policy_widget_discard_changes(E_Config_Dialog_Data *cfdata);
void policy_widget_update_radio_buttons(Evas_Object *crtc);
// Functions for the resolutions subdialog interaction
Eina_Bool resolution_widget_create_data(E_Config_Dialog_Data *cfdata);
Evas_Object *resolution_widget_basic_create_widgets(Evas *canvas);
Eina_Bool resolution_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool resolution_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void resolution_widget_keep_changes(E_Config_Dialog_Data *cfdata);
void resolution_widget_discard_changes(E_Config_Dialog_Data *cfdata);
void resolution_widget_update_list(Evas_Object *crtc);
// Functions for the orientation subdialog interaction
Eina_Bool orientation_widget_create_data(E_Config_Dialog_Data *cfdata);
Evas_Object *orientation_widget_basic_create_widgets(Evas *canvas);
Eina_Bool orientation_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool orientation_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void orientation_widget_update_radio_buttons(Evas_Object *crtc);
void orientation_widget_update_edje(Evas_Object *crtc);
void orientation_widget_keep_changes(E_Config_Dialog_Data *cfdata);
void orientation_widget_discard_changes(E_Config_Dialog_Data *cfdata);
#endif
#endif

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

@ -17,33 +17,25 @@
#define CRTC_THUMB_SIZE_W 300
#define CRTC_THUMB_SIZE_H 300
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);
Eina_Bool arrangement_widget_create_data(E_Config_Dialog_Data *e_config_runtime_info);
Evas_Object *arrangement_widget_basic_create_widgets(Evas *canvas);
Eina_Bool arrangement_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool arrangement_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void arrangement_widget_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static inline Eina_List *_arrangement_widget_neighbors_get(Evas_Object *obj);
static void _arrangement_widget_determine_positions_recursive(Evas_Object *obj);
//static inline E_Config_Randr_Dialog_Output_Dialog_Data *_dialog_subdialog_arrangement_rep_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_rep_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data);
static void _dialog_subdialog_arrangement_rep_del(Evas_Object *output);
static void _dialog_subdialog_arrangement_rep_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _dialog_subdialog_arrangement_rep_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _dialog_subdialog_arrangement_rep_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _dialog_subdialog_arrangement_check_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _dialog_subdialog_arrangement_update(void);
// Function for the resolutions subdialog interaction
extern void dialog_subdialog_resolutions_update_list(Evas_Object *crtc);
// Function for the orientation subdialog interaction
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 dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc);
//static inline E_Config_Randr_Dialog_Output_Dialog_Data *_arrangement_widget_rep_dialog_data_new (E_Randr_Crtc_Info *crtc_info, E_Randr_Output_Info *output_info);
static inline void _arrangement_widget_suggestion_add(Evas *evas);
static inline void _arrangement_widget_make_suggestion(Evas_Object *obj);
static void _arrangement_widget_smart_class_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
static Evas_Object *_arrangement_widget_rep_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data);
static void _arrangement_widget_rep_del(Evas_Object *output);
static void _arrangement_widget_rep_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _arrangement_widget_rep_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _arrangement_widget_rep_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _arrangement_widget_check_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _arrangement_widget_update(void);
static Evas_Smart_Class screen_setup_smart_class = EVAS_SMART_CLASS_INIT_NAME_VERSION("EvasObjectSmartScreenSetup");
static Evas_Smart *screen_setup_smart = NULL;
@ -53,7 +45,7 @@ extern Config *randr_dialog_config;
extern char _theme_file_path[];
static void
_dialog_subdialog_arrangement_rep_dialog_data_fill(E_Config_Randr_Dialog_Output_Dialog_Data *odd)
_arrangement_widget_rep_dialog_data_fill(E_Config_Randr_Dialog_Output_Dialog_Data *odd)
{
if (!odd) return;
@ -91,7 +83,7 @@ _dialog_subdialog_arrangement_rep_dialog_data_fill(E_Config_Randr_Dialog_Output_
}
void
_dialog_subdialog_arrangement_update(void)
_arrangement_widget_update(void)
{
Evas_Object *area, *rep;
Eina_List *iter;
@ -109,7 +101,7 @@ _dialog_subdialog_arrangement_update(void)
if (rep == e_config_runtime_info->gui.subdialogs.arrangement.clipper)
continue;
evas_object_smart_member_del(rep);
_dialog_subdialog_arrangement_rep_del(rep);
_arrangement_widget_rep_del(rep);
}
EINA_LIST_FOREACH(e_config_runtime_info->output_dialog_data_list, iter, output_dialog_data)
@ -118,7 +110,7 @@ _dialog_subdialog_arrangement_update(void)
(!output_dialog_data->output->monitor && (randr_dialog_config && !randr_dialog_config->display_disconnected_outputs)))
continue;
rep = _dialog_subdialog_arrangement_rep_add(e_config_runtime_info->gui.canvas, output_dialog_data);
rep = _arrangement_widget_rep_add(e_config_runtime_info->gui.canvas, output_dialog_data);
if (!rep) continue;
evas_object_show(rep);
@ -129,7 +121,7 @@ _dialog_subdialog_arrangement_update(void)
}
Eina_Bool
dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *data)
arrangement_widget_create_data(E_Config_Dialog_Data *data)
{
Eina_List *iter;
E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data;
@ -137,7 +129,7 @@ dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *data)
EINA_LIST_FOREACH(data->output_dialog_data_list, iter, dialog_data)
{
_dialog_subdialog_arrangement_rep_dialog_data_fill(dialog_data);
_arrangement_widget_rep_dialog_data_fill(dialog_data);
}
if(!(disabled_output_width = edje_file_data_get(_theme_file_path, "disabled_output_width")))
@ -153,7 +145,7 @@ dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *data)
//IMPROVABLE: Clean up properly if instances can't be created
Evas_Object *
dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas)
arrangement_widget_basic_create_widgets(Evas *canvas)
{
Evas_Object *subdialog, *area, *check;
@ -165,19 +157,19 @@ dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas)
check = e_widget_check_add(canvas, _("Display disconnected outputs"), &e_config_runtime_info->gui.subdialogs.arrangement.check_val_display_disconnected_outputs);
if (randr_dialog_config)
e_widget_check_checked_set(check, randr_dialog_config->display_disconnected_outputs);
evas_object_event_callback_add(check, EVAS_CALLBACK_MOUSE_DOWN, _dialog_subdialog_arrangement_check_mouse_down_cb, NULL);
evas_object_event_callback_add(check, EVAS_CALLBACK_MOUSE_DOWN, _arrangement_widget_check_mouse_down_cb, NULL);
e_config_runtime_info->gui.subdialogs.arrangement.check_display_disconnected_outputs = check;
//Add smart move area with outputs
//initialize smart object
evas_object_smart_clipped_smart_set(&screen_setup_smart_class);
screen_setup_smart_class.resize = _dialog_subdialog_arrangement_smart_class_resize;
screen_setup_smart_class.resize = _arrangement_widget_smart_class_resize;
screen_setup_smart = evas_smart_class_new(&screen_setup_smart_class);
area = evas_object_smart_add(canvas, screen_setup_smart);
e_config_runtime_info->gui.subdialogs.arrangement.clipper = evas_object_smart_clipped_clipper_get(area);
e_config_runtime_info->gui.subdialogs.arrangement.smart_parent = area;
_dialog_subdialog_arrangement_update();
_arrangement_widget_update();
fprintf(stderr, "CONF_RANDR: Arrangement subdialog added (%p).\n", subdialog);
// Append both objects to widget list
@ -190,7 +182,7 @@ dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas)
}
static Evas_Object *
_dialog_subdialog_arrangement_rep_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data)
_arrangement_widget_rep_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data)
{
E_Randr_Output_Info *output_info;
Evas_Object *rep;
@ -205,7 +197,7 @@ _dialog_subdialog_arrangement_rep_add(Evas *canvas, E_Config_Randr_Dialog_Output
evas_object_data_set(rep, "rep_info", output_dialog_data);
//set theme for monitor representation
EINA_SAFETY_ON_FALSE_GOTO(edje_object_file_set(rep, _theme_file_path, "e/conf/randr/dialog/subdialog/arrangement/output"), _dialog_subdialog_arrangement_rep_add_edje_set_fail);
EINA_SAFETY_ON_FALSE_GOTO(edje_object_file_set(rep, _theme_file_path, "e/conf/randr/dialog/subdialog/arrangement/output"), _arrangement_widget_rep_add_edje_set_fail);
//indicate monitor state
if (!output_dialog_data->crtc || (output_dialog_data->crtc && !output_dialog_data->previous_mode))
state_signal = "disabled";
@ -234,21 +226,21 @@ _dialog_subdialog_arrangement_rep_add(Evas *canvas, E_Config_Randr_Dialog_Output
edje_object_part_text_set(rep, "output_txt", output_name);
//set output orientation
dialog_subdialog_orientation_update_edje(rep);
orientation_widget_update_edje(rep);
evas_object_event_callback_add (rep, EVAS_CALLBACK_MOUSE_DOWN, _dialog_subdialog_arrangement_rep_mouse_down_cb, NULL);
evas_object_event_callback_add (rep, EVAS_CALLBACK_MOUSE_MOVE, _dialog_subdialog_arrangement_rep_mouse_move_cb, NULL);
evas_object_event_callback_add (rep, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_arrangement_rep_mouse_up_cb, NULL);
evas_object_event_callback_add (rep, EVAS_CALLBACK_MOUSE_DOWN, _arrangement_widget_rep_mouse_down_cb, NULL);
evas_object_event_callback_add (rep, EVAS_CALLBACK_MOUSE_MOVE, _arrangement_widget_rep_mouse_move_cb, NULL);
evas_object_event_callback_add (rep, EVAS_CALLBACK_MOUSE_UP, _arrangement_widget_rep_mouse_up_cb, NULL);
return rep;
_dialog_subdialog_arrangement_rep_add_edje_set_fail:
_arrangement_widget_rep_add_edje_set_fail:
evas_object_del(rep);
return NULL;
}
static void
_dialog_subdialog_arrangement_rep_del(Evas_Object *rep)
_arrangement_widget_rep_del(Evas_Object *rep)
{
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
@ -261,18 +253,18 @@ _dialog_subdialog_arrangement_rep_del(Evas_Object *rep)
edje_object_part_unswallow(rep, output_dialog_data->bg);
evas_object_del(output_dialog_data->bg);
evas_object_event_callback_del(rep, EVAS_CALLBACK_MOUSE_DOWN, _dialog_subdialog_arrangement_rep_mouse_down_cb);
evas_object_event_callback_del(rep, EVAS_CALLBACK_MOUSE_MOVE, _dialog_subdialog_arrangement_rep_mouse_move_cb);
evas_object_event_callback_del(rep, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_arrangement_rep_mouse_up_cb);
evas_object_event_callback_del(rep, EVAS_CALLBACK_MOUSE_DOWN, _arrangement_widget_rep_mouse_down_cb);
evas_object_event_callback_del(rep, EVAS_CALLBACK_MOUSE_MOVE, _arrangement_widget_rep_mouse_move_cb);
evas_object_event_callback_del(rep, EVAS_CALLBACK_MOUSE_UP, _arrangement_widget_rep_mouse_up_cb);
//set output orientation
dialog_subdialog_orientation_update_edje(NULL);
orientation_widget_update_edje(NULL);
evas_object_del(rep);
}
static void
_dialog_subdialog_arrangement_smart_class_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
_arrangement_widget_smart_class_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
Evas_Object *rep;
Evas_Coord real_sum_w = 0, real_sum_h = 0;
@ -377,7 +369,7 @@ _dialog_subdialog_arrangement_smart_class_resize(Evas_Object *obj, Evas_Coord w,
}
static void
_dialog_subdialog_arrangement_check_mouse_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_arrangement_widget_check_mouse_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
if (!obj || !e_config_runtime_info || !randr_dialog_config) return;
@ -385,12 +377,12 @@ _dialog_subdialog_arrangement_check_mouse_down_cb(void *data __UNUSED__, Evas *e
{
//this is bad. The events are called _before_ the value is updated.
randr_dialog_config->display_disconnected_outputs ^= EINA_TRUE;
_dialog_subdialog_arrangement_update();
_arrangement_widget_update();
}
}
static void
_dialog_subdialog_arrangement_rep_mouse_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_arrangement_widget_rep_mouse_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Evas_Object *element = NULL;
Eina_List *iter;
@ -409,13 +401,13 @@ _dialog_subdialog_arrangement_rep_mouse_down_cb(void *data __UNUSED__, Evas *e _
e_config_runtime_info->gui.selected_output_dd = evas_object_data_get(obj, "rep_info");
//update resolutions list
dialog_subdialog_resolutions_update_list(obj);
resolution_widget_update_list(obj);
//update orientation radio buttons
dialog_subdialog_orientation_update_radio_buttons(obj);
orientation_widget_update_radio_buttons(obj);
//update policy radio buttons
dialog_subdialog_policies_update_radio_buttons(obj);
policy_widget_update_radio_buttons(obj);
crtc_selected = EINA_TRUE;
}
@ -427,20 +419,20 @@ _dialog_subdialog_arrangement_rep_mouse_down_cb(void *data __UNUSED__, Evas *e _
e_config_runtime_info->gui.selected_output_dd = NULL;
//update resolutions list
dialog_subdialog_resolutions_update_list(NULL);
resolution_widget_update_list(NULL);
//update orientation radio buttons
dialog_subdialog_orientation_update_radio_buttons(NULL);
orientation_widget_update_radio_buttons(NULL);
//update policy radio buttons
dialog_subdialog_policies_update_radio_buttons(NULL);
policy_widget_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
_dialog_subdialog_arrangement_rep_mouse_move_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
_arrangement_widget_rep_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;
@ -467,12 +459,12 @@ _dialog_subdialog_arrangement_rep_mouse_move_cb(void *data __UNUSED__, Evas *e _
if ((geo.x != new.x) || (geo.y != new.y))
{
evas_object_move(obj, new.x, new.y);
_dialog_subdialog_arrangement_make_suggestion(obj);
_arrangement_widget_make_suggestion(obj);
}
}
static void
_dialog_subdialog_arrangement_rep_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_arrangement_widget_rep_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Evas_Coord_Point coords;
@ -489,7 +481,7 @@ _dialog_subdialog_arrangement_rep_mouse_up_cb(void *data __UNUSED__, Evas *e __U
}
void
_dialog_subdialog_arrangement_suggestion_add(Evas *evas)
_arrangement_widget_suggestion_add(Evas *evas)
{
const char *theme_data_item = NULL;
@ -502,7 +494,7 @@ _dialog_subdialog_arrangement_suggestion_add(Evas *evas)
}
void
_dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj)
_arrangement_widget_make_suggestion(Evas_Object *obj)
{
Eina_List *li, *crtcs = evas_object_smart_members_get(evas_object_smart_parent_get(obj));
Evas_Object *crtc = NULL;
@ -513,7 +505,7 @@ _dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj)
if (!e_config_runtime_info->gui.subdialogs.arrangement.suggestion)
{
_dialog_subdialog_arrangement_suggestion_add(evas_object_evas_get(obj));
_arrangement_widget_suggestion_add(evas_object_evas_get(obj));
evas_object_show(e_config_runtime_info->gui.subdialogs.arrangement.suggestion);
}
@ -629,7 +621,7 @@ _dialog_subdialog_arrangement_make_suggestion(Evas_Object *obj)
}
void
dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
arrangement_widget_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data;
Eina_List *iter;
@ -647,7 +639,7 @@ dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config
}
static Eina_List *
_dialog_subdialog_arrangement_neighbors_get(Evas_Object *obj)
_arrangement_widget_neighbors_get(Evas_Object *obj)
{
Evas_Object *smart_parent, *crtc;
Eina_List *crtcs, *iter, *neighbors = NULL;
@ -684,7 +676,7 @@ _dialog_subdialog_arrangement_neighbors_get(Evas_Object *obj)
}
static void
_dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj)
_arrangement_widget_determine_positions_recursive(Evas_Object *obj)
{
Eina_List *neighbors, *iter;
Evas_Object *smart_parent, *crtc;
@ -698,7 +690,7 @@ _dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj)
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 = _dialog_subdialog_arrangement_neighbors_get(obj);
neighbors = _arrangement_widget_neighbors_get(obj);
EINA_SAFETY_ON_FALSE_RETURN((dialog_data = evas_object_data_get(obj, "rep_info")));
evas_object_geometry_get(obj, &geo.x, &geo.y, &geo.w, &geo.h);
@ -781,7 +773,7 @@ _dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj)
|| (neighbor_info->new_pos.y == Ecore_X_Randr_Unset))
{
//fprintf(stderr, "CONF_RANDR: Now going to travel %p.\n", crtc);
_dialog_subdialog_arrangement_determine_positions_recursive(crtc);
_arrangement_widget_determine_positions_recursive(crtc);
}
}
}
@ -789,7 +781,7 @@ _dialog_subdialog_arrangement_determine_positions_recursive(Evas_Object *obj)
}
Eina_Bool
dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
arrangement_widget_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;
@ -828,7 +820,7 @@ dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dia
}
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) _dialog_subdialog_arrangement_determine_positions_recursive(top_left);
if (top_left) _arrangement_widget_determine_positions_recursive(top_left);
EINA_LIST_FOREACH(crtcs, iter, crtc)
{
@ -854,7 +846,7 @@ dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dia
}
Eina_Bool
dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
arrangement_widget_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;
@ -869,7 +861,7 @@ dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd __UNUSED__
}
void
dialog_subdialog_arrangement_keep_changes(E_Config_Dialog_Data *cfdata)
arrangement_widget_keep_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;
@ -887,7 +879,7 @@ dialog_subdialog_arrangement_keep_changes(E_Config_Dialog_Data *cfdata)
}
void
dialog_subdialog_arrangement_discard_changes(E_Config_Dialog_Data *cfdata)
arrangement_widget_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 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);
Eina_Bool orientation_widget_create_data(E_Config_Dialog_Data *cfdata);
Evas_Object *orientation_widget_basic_create_widgets(Evas *canvas);
Eina_Bool orientation_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool orientation_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool orientation_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void orientation_widget_update_radio_buttons(Evas_Object *crtc);
void orientation_widget_update_edje(Evas_Object *crtc);
//static void _dialog_subdialog_orientation_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
//static void _orientation_widget_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
_dialog_subdialog_orientation_radio_add_callbacks(void)
_orientation_widget_radio_add_callbacks(void)
{
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical, EVAS_CALLBACK_MOUSE_UP, _dialog_subdialog_orientation_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_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_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_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_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_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_vertical, EVAS_CALLBACK_MOUSE_UP, _orientation_widget_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_reflect_horizontal, EVAS_CALLBACK_MOUSE_UP, _orientation_widget_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot270, EVAS_CALLBACK_MOUSE_UP, _orientation_widget_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot180, EVAS_CALLBACK_MOUSE_UP, _orientation_widget_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_rot90, EVAS_CALLBACK_MOUSE_UP, _orientation_widget_mouse_up_cb, NULL);
evas_object_event_callback_add (e_config_runtime_info->gui.subdialogs.orientation.radio_normal, EVAS_CALLBACK_MOUSE_UP, _orientation_widget_mouse_up_cb, NULL);
}
*/
Eina_Bool
dialog_subdialog_orientation_create_data(E_Config_Dialog_Data *cfdata)
orientation_widget_create_data(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
E_Randr_Crtc_Info *ci;
@ -53,7 +53,7 @@ dialog_subdialog_orientation_create_data(E_Config_Dialog_Data *cfdata)
}
Evas_Object *
dialog_subdialog_orientation_basic_create_widgets(Evas *canvas)
orientation_widget_basic_create_widgets(Evas *canvas)
{
Evas_Object *subdialog;
E_Radio_Group *rg;
@ -65,7 +65,7 @@ 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 _dialog_subdialog_orientation_radio_add_fail;
if (!(rg = e_widget_radio_group_new(&e_config_runtime_info->gui.subdialogs.orientation.radio_val))) goto _orientation_widget_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 @@ 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);
//_dialog_subdialog_orientation_radio_add_callbacks();
//_orientation_widget_radio_add_callbacks();
/*
// Add orientation demonstration edje
if (!(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje = edje_object_add(canvas)))
goto _dialog_subdialog_orientation_edje_add_fail;
goto _orientation_widget_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 _dialog_subdialog_orientation_edje_set_fail;
goto _orientation_widget_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
dialog_subdialog_orientation_update_radio_buttons(e_config_runtime_info->gui.selected_eo);
orientation_widget_update_radio_buttons(e_config_runtime_info->gui.selected_eo);
//evas_object_show(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje);
return subdialog;
/*
_dialog_subdialog_orientation_edje_set_fail:
_orientation_widget_edje_set_fail:
evas_object_del(ol);
evas_object_del(e_config_runtime_info->gui.subdialogs.orientation.swallowing_edje);
_dialog_subdialog_orientation_edje_add_fail:
_orientation_widget_edje_add_fail:
fprintf(stderr, "CONF_RANDR: Couldn't set edj for orientation subdialog!\n");
evas_object_del(subdialog);
return NULL;
*/
_dialog_subdialog_orientation_radio_add_fail:
_orientation_widget_radio_add_fail:
evas_object_del(subdialog);
fprintf(stderr, "CONF_RANDR: Could not add radio group!\n");
return NULL;
@ -122,7 +122,7 @@ _dialog_subdialog_orientation_radio_add_fail:
#if 0
static void
_dialog_subdialog_orientation_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
_orientation_widget_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
char signal[40];
int orientation = ECORE_X_RANDR_ORIENTATION_ROT_0;
@ -151,7 +151,7 @@ _dialog_subdialog_orientation_mouse_up_cb(void *data, Evas *e, Evas_Object *obj,
#endif
void
dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc)
orientation_widget_update_radio_buttons(Evas_Object *crtc)
{
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
Ecore_X_Randr_Orientation supported_oris, ori;
@ -243,7 +243,7 @@ dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc)
}
void
dialog_subdialog_orientation_update_edje(Evas_Object *crtc)
orientation_widget_update_edje(Evas_Object *crtc)
{
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
Ecore_X_Randr_Orientation supported_oris, ori;
@ -272,7 +272,7 @@ dialog_subdialog_orientation_update_edje(Evas_Object *crtc)
}
Eina_Bool
dialog_subdialog_orientation_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
orientation_widget_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;
@ -295,7 +295,7 @@ dialog_subdialog_orientation_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dia
}
Eina_Bool
dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
orientation_widget_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
@ -305,7 +305,7 @@ dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd __UNUSED__
}
void
dialog_subdialog_orientation_keep_changes(E_Config_Dialog_Data *cfdata)
orientation_widget_keep_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;
@ -321,7 +321,7 @@ dialog_subdialog_orientation_keep_changes(E_Config_Dialog_Data *cfdata)
}
void
dialog_subdialog_orientation_discard_changes(E_Config_Dialog_Data *cfdata)
orientation_widget_discard_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;

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

@ -14,14 +14,14 @@
#define E_RANDR_12 (e_randr_screen_info.rrvd_info.randr_info_12)
Evas_Object *dialog_subdialog_policies_basic_create_widgets(Evas *canvas);
Eina_Bool dialog_subdialog_policies_create_data(E_Config_Dialog_Data *e_config_runtime_info);
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 *rep);
Evas_Object *policy_widget_basic_create_widgets(Evas *canvas);
Eina_Bool policy_widget_create_data(E_Config_Dialog_Data *e_config_runtime_info);
Eina_Bool policy_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool policy_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool policy_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void policy_widget_update_radio_buttons(Evas_Object *rep);
//static void _dialog_subdialog_policies_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
//static void _policy_widget_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[];
@ -36,19 +36,19 @@ static const char *_POLICIES_STRINGS[] = {
/*
static void
_dialog_subdialog_policies_radio_add_callbacks(void)
_policy_widget_radio_add_callbacks(void)
{
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);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_none, EVAS_CALLBACK_MOUSE_UP, _policy_widget_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_clone, EVAS_CALLBACK_MOUSE_UP, _policy_widget_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_left, EVAS_CALLBACK_MOUSE_UP, _policy_widget_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_below, EVAS_CALLBACK_MOUSE_UP, _policy_widget_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_above, EVAS_CALLBACK_MOUSE_UP, _policy_widget_policy_mouse_up_cb, NULL);
evas_object_event_callback_add(e_config_runtime_info->gui.subdialogs.policies.radio_right, EVAS_CALLBACK_MOUSE_UP, _policy_widget_policy_mouse_up_cb, NULL);
}
*/
Eina_Bool
dialog_subdialog_policies_create_data(E_Config_Dialog_Data *e_config_runtime_info)
policy_widget_create_data(E_Config_Dialog_Data *e_config_runtime_info)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
E_Randr_Output_Info *oi = NULL;
@ -73,7 +73,7 @@ dialog_subdialog_policies_create_data(E_Config_Dialog_Data *e_config_runtime_inf
}
Evas_Object *
dialog_subdialog_policies_basic_create_widgets(Evas *canvas)
policy_widget_basic_create_widgets(Evas *canvas)
{
Evas_Object *subdialog;
E_Radio_Group *rg;
@ -86,7 +86,7 @@ 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 _dialog_subdialog_policies_radio_add_fail;
if (!(rg = e_widget_radio_group_new(&e_config_runtime_info->gui.subdialogs.policies.radio_val))) goto _policy_widget_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);
@ -107,18 +107,18 @@ 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);
//_dialog_subdialog_policies_radio_add_callbacks();
//_policy_widget_radio_add_callbacks();
/*
// Add policies demonstration edje
if (!(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje = edje_object_add(canvas)))
{
goto _dialog_subdialog_policies_edje_add_fail;
goto _policy_widget_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 _dialog_subdialog_policies_edje_set_fail;
goto _policy_widget_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);
@ -156,14 +156,14 @@ dialog_subdialog_policies_basic_create_widgets(Evas *canvas)
return subdialog;
/*
_dialog_subdialog_policies_edje_set_fail:
_policy_widget_edje_set_fail:
evas_object_del(e_config_runtime_info->gui.subdialogs.policies.swallowing_edje);
_dialog_subdialog_policies_edje_add_fail:
_policy_widget_edje_add_fail:
fprintf(stderr, "CONF_RANDR: Couldn't set edj for policies subdialog!\n");
evas_object_del(subdialog);
return NULL;
*/
_dialog_subdialog_policies_radio_add_fail:
_policy_widget_radio_add_fail:
evas_object_del(subdialog);
return NULL;
}
@ -173,7 +173,7 @@ _dialog_subdialog_policies_radio_add_fail:
* for now.
*
static void
_dialog_subdialog_policies_policy_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
_policy_widget_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;
@ -200,7 +200,7 @@ _dialog_subdialog_policies_policy_mouse_up_cb(void *data __UNUSED__, Evas *e __U
*/
Eina_Bool
dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
policy_widget_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{
if (!E_RANDR_12 || !e_config_runtime_info->gui.selected_output_dd) return EINA_FALSE;
@ -213,7 +213,7 @@ dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Co
}
Eina_Bool
dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
policy_widget_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
if (!E_RANDR_12 || !cfdata || !cfdata->gui.selected_output_dd || !cfdata->gui.selected_output_dd->output) return EINA_FALSE;
@ -221,7 +221,7 @@ dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E
}
void
dialog_subdialog_policies_update_radio_buttons(Evas_Object *rep)
policy_widget_update_radio_buttons(Evas_Object *rep)
{
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
Ecore_X_Randr_Output_Policy policy;
@ -279,7 +279,7 @@ dialog_subdialog_policies_update_radio_buttons(Evas_Object *rep)
}
void
dialog_subdialog_policies_keep_changes(E_Config_Dialog_Data *cfdata)
policy_widget_keep_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
E_Randr_Output_Info *oi;
@ -305,7 +305,7 @@ dialog_subdialog_policies_keep_changes(E_Config_Dialog_Data *cfdata)
}
void
dialog_subdialog_policies_discard_changes(E_Config_Dialog_Data *cfdata)
policy_widget_discard_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;

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

@ -18,18 +18,18 @@
#define ICON_HEIGHT 10
#define RESOLUTION_TXT_MAX_LENGTH 50
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);
Evas_Object *resolution_widget_basic_create_widgets(Evas *canvas);
Eina_Bool resolution_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
Eina_Bool resolution_widget_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
void resolution_widget_update_list(Evas_Object *crtc);
void resolution_widget_keep_changes(E_Config_Dialog_Data *cfdata);
void resolution_widget_discard_changes(E_Config_Dialog_Data *cfdata);
extern E_Config_Dialog_Data *e_config_runtime_info;
static Ecore_X_Randr_Mode_Info disabled_mode = {.xid = Ecore_X_Randr_None};
Eina_Bool
dialog_subdialog_resolutions_create_data(E_Config_Dialog_Data *cfdata)
resolution_widget_create_data(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Ecore_X_Randr_Mode_Info *mi;
@ -62,7 +62,7 @@ dialog_subdialog_resolutions_create_data(E_Config_Dialog_Data *cfdata)
}
Evas_Object *
dialog_subdialog_resolutions_basic_create_widgets(Evas *canvas)
resolution_widget_basic_create_widgets(Evas *canvas)
{
Evas_Object *subdialog;
@ -77,7 +77,7 @@ 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 __UNUSED__)
resolution_widget_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
{
//Apply new mode
Ecore_X_Randr_Mode_Info *selected_mode;
@ -149,7 +149,7 @@ dialog_subdialog_resolutions_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dia
}
Eina_Bool
dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
resolution_widget_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;
@ -160,7 +160,7 @@ dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd __UNUSED__
}
void
dialog_subdialog_resolutions_update_list(Evas_Object *rep)
resolution_widget_update_list(Evas_Object *rep)
{
Eina_List *iter, *modelist = NULL;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
@ -223,7 +223,7 @@ dialog_subdialog_resolutions_update_list(Evas_Object *rep)
}
void
dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *cfdata)
resolution_widget_keep_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;
@ -241,7 +241,7 @@ dialog_subdialog_resolutions_keep_changes(E_Config_Dialog_Data *cfdata)
}
void
dialog_subdialog_resolutions_discard_changes(E_Config_Dialog_Data *cfdata)
resolution_widget_discard_changes(E_Config_Dialog_Data *cfdata)
{
E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;