forked from enlightenment/enlightenment
parent
de639bccff
commit
dba1e9d7e4
|
@ -886,6 +886,7 @@ _e_randr_event_cb(void *data __UNUSED__, int type, void *ev)
|
||||||
|
|
||||||
if (output_info->policy != ECORE_X_RANDR_OUTPUT_POLICY_NONE)
|
if (output_info->policy != ECORE_X_RANDR_OUTPUT_POLICY_NONE)
|
||||||
enabled = _e_randr_try_enable_output(output_info, EINA_FALSE); //maybe give a success message?
|
enabled = _e_randr_try_enable_output(output_info, EINA_FALSE); //maybe give a success message?
|
||||||
|
fprintf(stderr, "E_RANDR: Output %d %s.", output_info->xid, (enabled ? "was enabled sucessfully" : "could not be enabled"));
|
||||||
}
|
}
|
||||||
_e_randr_notify_output_change(output_info);
|
_e_randr_notify_output_change(output_info);
|
||||||
}
|
}
|
||||||
|
@ -1486,7 +1487,6 @@ Eina_List *
|
||||||
_e_randr_update_serialized_setup_12(Eina_List *setups_12, E_Randr_Screen_Info_12 *si_12)
|
_e_randr_update_serialized_setup_12(Eina_List *setups_12, E_Randr_Screen_Info_12 *si_12)
|
||||||
{
|
{
|
||||||
E_Randr_Serialized_Setup_12 *ss_12;
|
E_Randr_Serialized_Setup_12 *ss_12;
|
||||||
Eina_List *li;
|
|
||||||
|
|
||||||
if (setups_12)
|
if (setups_12)
|
||||||
{
|
{
|
||||||
|
@ -1694,12 +1694,14 @@ _e_randr_restore_12_policies(E_Randr_Screen_Info_12 *si_12)
|
||||||
Eina_Bool
|
Eina_Bool
|
||||||
_e_randr_try_restore_12(E_Randr_Screen_Info_12 *si_12)
|
_e_randr_try_restore_12(E_Randr_Screen_Info_12 *si_12)
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
E_Randr_Serialized_Setup_12 *ss_12;
|
E_Randr_Serialized_Setup_12 *ss_12;
|
||||||
E_Randr_Serialized_Crtc *sc;
|
E_Randr_Serialized_Crtc *sc;
|
||||||
E_Randr_Crtc_Info *ci;
|
E_Randr_Crtc_Info *ci;
|
||||||
Ecore_X_Randr_Output *outputs_array;
|
Ecore_X_Randr_Output *outputs_array;
|
||||||
Ecore_X_Randr_Mode_Info *mi;
|
Ecore_X_Randr_Mode_Info *mi;
|
||||||
Eina_List *iter;
|
Eina_List *iter;
|
||||||
|
*/
|
||||||
Eina_Bool ret = EINA_TRUE;
|
Eina_Bool ret = EINA_TRUE;
|
||||||
|
|
||||||
//Restore policies
|
//Restore policies
|
||||||
|
|
|
@ -131,7 +131,6 @@ dialog_subdialog_arrangement_create_data(E_Config_Dialog_Data *data)
|
||||||
Eina_List *iter;
|
Eina_List *iter;
|
||||||
E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data;
|
E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data;
|
||||||
char *disabled_output_width, *disabled_output_height;
|
char *disabled_output_width, *disabled_output_height;
|
||||||
Evas_Object *display;
|
|
||||||
|
|
||||||
EINA_LIST_FOREACH(data->output_dialog_data_list, iter, dialog_data)
|
EINA_LIST_FOREACH(data->output_dialog_data_list, iter, dialog_data)
|
||||||
{
|
{
|
||||||
|
|
|
@ -19,7 +19,7 @@ Eina_Bool dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd,
|
||||||
Eina_Bool dialog_subdialog_policies_basic_apply_data(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);
|
void dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc);
|
||||||
|
|
||||||
static void _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 E_Config_Dialog_Data *e_config_runtime_info;
|
||||||
extern char _theme_file_path[];
|
extern char _theme_file_path[];
|
||||||
|
|
||||||
|
@ -164,19 +164,22 @@ _dialog_subdialog_policies_radio_add_fail:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The current dialog does not demonstrate what the policies mean, so disabled
|
||||||
|
* for now.
|
||||||
|
*
|
||||||
static void
|
static void
|
||||||
_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];
|
char signal[29];
|
||||||
int policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE;
|
int policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE;
|
||||||
|
|
||||||
/*
|
|
||||||
* IMPROVABLE:
|
* IMPROVABLE:
|
||||||
* "sadly" the evas callbacks are called before radio_val is set to its new
|
* "sadly" the evas callbacks are called before radio_val is set to its new
|
||||||
* value. If that is ever changed, remove the used code below and just use the
|
* value. If that is ever changed, remove the used code below and just use the
|
||||||
* 1-liner below.
|
* 1-liner below.
|
||||||
* snprintf(signal, sizeof(signal), "conf,randr,dialog,policies,%d", e_config_runtime_info->gui.subdialogs.policies.radio_val);
|
* snprintf(signal, sizeof(signal), "conf,randr,dialog,policies,%d", e_config_runtime_info->gui.subdialogs.policies.radio_val);
|
||||||
*/
|
* /
|
||||||
if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_above) policy = ECORE_X_RANDR_OUTPUT_POLICY_ABOVE;
|
if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_above) policy = ECORE_X_RANDR_OUTPUT_POLICY_ABOVE;
|
||||||
if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_right) policy = ECORE_X_RANDR_OUTPUT_POLICY_RIGHT;
|
if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_right) policy = ECORE_X_RANDR_OUTPUT_POLICY_RIGHT;
|
||||||
if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_below) policy = ECORE_X_RANDR_OUTPUT_POLICY_BELOW;
|
if (obj == e_config_runtime_info->gui.subdialogs.policies.radio_below) policy = ECORE_X_RANDR_OUTPUT_POLICY_BELOW;
|
||||||
|
@ -190,6 +193,7 @@ _dialog_subdialog_policies_policy_mouse_up_cb(void *data __UNUSED__, Evas *e __U
|
||||||
|
|
||||||
fprintf(stderr, "CONF_RANDR: mouse button released. Emitted signal to policy: %s\n", signal);
|
fprintf(stderr, "CONF_RANDR: mouse button released. Emitted signal to policy: %s\n", signal);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
Eina_Bool
|
Eina_Bool
|
||||||
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__)
|
||||||
|
|
Loading…
Reference in New Issue