forked from enlightenment/enlightenment
I don't spend hours and hours and hours and days of my free time hacking on ecrustify for people to not use it.
SVN revision: 64917
This commit is contained in:
parent
512062bee3
commit
11ff2ab3eb
|
@ -24,16 +24,26 @@
|
||||||
|
|
||||||
//following macro namescheme follows cardinal relation
|
//following macro namescheme follows cardinal relation
|
||||||
//1 : M
|
//1 : M
|
||||||
#define E_RANDR_NO_SCREEN_RET(ret) if (!e_randr_screen_info) return ret
|
#define E_RANDR_NO_SCREEN_RET(ret) if (!e_randr_screen_info) \
|
||||||
#define E_RANDR_NO_11_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_1) || !e_randr_screen_info->rrvd_info.randr_info_11) return ret
|
return ret
|
||||||
#define E_RANDR_NO_12_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12) return ret
|
#define E_RANDR_NO_11_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_1) || !e_randr_screen_info->rrvd_info.randr_info_11) \
|
||||||
#define E_RANDR_NO_CRTCS_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs) return ret
|
return ret
|
||||||
#define E_RANDR_NO_OUTPUTS_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->outputs) return ret
|
#define E_RANDR_NO_12_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12) \
|
||||||
#define E_RANDR_NO_CRTC_RET(crtc, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc) return ret
|
return ret
|
||||||
#define E_RANDR_NO_OUTPUT_RET(output, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output) return ret
|
#define E_RANDR_NO_CRTCS_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs) \
|
||||||
#define E_RANDR_NO_MODE_RET(mode, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->modes || !mode) return ret
|
return ret
|
||||||
#define E_RANDR_NO_CRTC_OUTPUT_RET(crtc, output, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output) return ret
|
#define E_RANDR_NO_OUTPUTS_RET(ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->outputs) \
|
||||||
#define E_RANDR_NO_CRTC_OUTPUT_MODE_RET(crtc, output, mode, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output || !e_randr_screen_info->rrvd_info.randr_info_12->modes || !mode) return ret
|
return ret
|
||||||
|
#define E_RANDR_NO_CRTC_RET(crtc, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc) \
|
||||||
|
return ret
|
||||||
|
#define E_RANDR_NO_OUTPUT_RET(output, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output) \
|
||||||
|
return ret
|
||||||
|
#define E_RANDR_NO_MODE_RET(mode, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->modes || !mode) \
|
||||||
|
return ret
|
||||||
|
#define E_RANDR_NO_CRTC_OUTPUT_RET(crtc, output, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output) \
|
||||||
|
return ret
|
||||||
|
#define E_RANDR_NO_CRTC_OUTPUT_MODE_RET(crtc, output, mode, ret) if (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12 || !e_randr_screen_info->rrvd_info.randr_info_12->crtcs || !crtc || !e_randr_screen_info->rrvd_info.randr_info_12->outputs || !output || !e_randr_screen_info->rrvd_info.randr_info_12->modes || !mode) \
|
||||||
|
return ret
|
||||||
|
|
||||||
#define E_RANDR_NO_11 (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_1) || !e_randr_screen_info->rrvd_info.randr_info_11)
|
#define E_RANDR_NO_11 (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_1) || !e_randr_screen_info->rrvd_info.randr_info_11)
|
||||||
#define E_RANDR_NO_12 (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12)
|
#define E_RANDR_NO_12 (!e_randr_screen_info || (e_randr_screen_info->randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info->rrvd_info.randr_info_12)
|
||||||
|
@ -203,6 +213,7 @@ _e_randr_screen_info_free(E_Randr_Screen_Info *screen_info)
|
||||||
case ECORE_X_RANDR_1_1:
|
case ECORE_X_RANDR_1_1:
|
||||||
_e_randr_screen_info_11_free(screen_info->rrvd_info.randr_info_11);
|
_e_randr_screen_info_11_free(screen_info->rrvd_info.randr_info_11);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ECORE_X_RANDR_1_2:
|
case ECORE_X_RANDR_1_2:
|
||||||
case ECORE_X_RANDR_1_3:
|
case ECORE_X_RANDR_1_3:
|
||||||
_e_randr_screen_info_12_free(screen_info->rrvd_info.randr_info_12);
|
_e_randr_screen_info_12_free(screen_info->rrvd_info.randr_info_12);
|
||||||
|
@ -577,7 +588,6 @@ _e_randr_output_modes_add(E_Randr_Output_Info *output_info)
|
||||||
}
|
}
|
||||||
output_info->modes = eina_list_prepend(output_info->modes, mode_info);
|
output_info->modes = eina_list_prepend(output_info->modes, mode_info);
|
||||||
if (nmodes < npreferred) output_info->preferred_modes = eina_list_prepend(output_info->preferred_modes, mode_info);
|
if (nmodes < npreferred) output_info->preferred_modes = eina_list_prepend(output_info->preferred_modes, mode_info);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
free(modes);
|
free(modes);
|
||||||
|
@ -912,6 +922,7 @@ _e_randr_notify_crtc_mode_change(E_Randr_Crtc_Info *crtc_info)
|
||||||
// e_notification_unref(n);
|
// e_notification_unref(n);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_randr_notify_output_change(E_Randr_Output_Info *output_info)
|
_e_randr_notify_output_change(E_Randr_Output_Info *output_info)
|
||||||
{
|
{
|
||||||
|
@ -970,6 +981,7 @@ _e_randr_policy_crtc_get(E_Randr_Crtc_Info *but, E_Randr_Crtc_Info *hint __UNUSE
|
||||||
ret = crtc_info;
|
ret = crtc_info;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ECORE_X_RANDR_OUTPUT_POLICY_RIGHT:
|
case ECORE_X_RANDR_OUTPUT_POLICY_RIGHT:
|
||||||
EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
|
EINA_LIST_FOREACH (e_randr_screen_info->rrvd_info.randr_info_12->crtcs, iter, crtc_info)
|
||||||
{
|
{
|
||||||
|
@ -1013,7 +1025,6 @@ _e_randr_policy_crtc_get(E_Randr_Crtc_Info *but, E_Randr_Crtc_Info *hint __UNUSE
|
||||||
Eina_Bool
|
Eina_Bool
|
||||||
_e_randr_copy_mode_info(Ecore_X_Randr_Mode_Info *dest, Ecore_X_Randr_Mode_Info *src)
|
_e_randr_copy_mode_info(Ecore_X_Randr_Mode_Info *dest, Ecore_X_Randr_Mode_Info *src)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (!dest || !src) return EINA_FALSE;
|
if (!dest || !src) return EINA_FALSE;
|
||||||
|
|
||||||
dest->width = src->width;
|
dest->width = src->width;
|
||||||
|
@ -1047,8 +1058,8 @@ _e_randr_free_serialized_mode_info(Ecore_X_Randr_Mode_Info *mode_info)
|
||||||
if (mode_info->name) free(mode_info->name);
|
if (mode_info->name) free(mode_info->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
Eina_List
|
Eina_List *
|
||||||
*_e_randr_create_outputs_policies_list(Eina_List *outputs)
|
_e_randr_create_outputs_policies_list(Eina_List *outputs)
|
||||||
{
|
{
|
||||||
Eina_List *iter, *list = NULL;
|
Eina_List *iter, *list = NULL;
|
||||||
E_Randr_Output_Info *oi;
|
E_Randr_Output_Info *oi;
|
||||||
|
@ -1085,8 +1096,8 @@ _e_randr_free_serialized_output_policy(E_Randr_Serialized_Output_Policy *sop)
|
||||||
free(sop);
|
free(sop);
|
||||||
}
|
}
|
||||||
|
|
||||||
Eina_List
|
Eina_List *
|
||||||
*_e_randr_update_serialized_outputs_policies(E_Randr_Screen_Info_12 *si_12, Eina_List *sops)
|
_e_randr_update_serialized_outputs_policies(E_Randr_Screen_Info_12 *si_12, Eina_List *sops)
|
||||||
{
|
{
|
||||||
E_Randr_Serialized_Output_Policy *sop;
|
E_Randr_Serialized_Output_Policy *sop;
|
||||||
|
|
||||||
|
@ -1098,8 +1109,8 @@ _e_randr_free_serialized_output_policy(E_Randr_Serialized_Output_Policy *sop)
|
||||||
return _e_randr_create_outputs_policies_list(si_12->outputs);
|
return _e_randr_create_outputs_policies_list(si_12->outputs);
|
||||||
}
|
}
|
||||||
|
|
||||||
Eina_List
|
Eina_List *
|
||||||
*_e_randr_create_possible_outputs_names_list(Eina_List *outputs)
|
_e_randr_create_possible_outputs_names_list(Eina_List *outputs)
|
||||||
{
|
{
|
||||||
Eina_List *iter, *list = NULL;
|
Eina_List *iter, *list = NULL;
|
||||||
E_Randr_Output_Info *oi;
|
E_Randr_Output_Info *oi;
|
||||||
|
@ -1124,8 +1135,8 @@ _e_randr_create_possible_outputs_names_list_fail_free_list:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
E_Randr_Edid_Hash
|
E_Randr_Edid_Hash *
|
||||||
*_e_randr_create_edid_hash(E_Randr_Output_Info *output_info)
|
_e_randr_create_edid_hash(E_Randr_Output_Info *output_info)
|
||||||
{
|
{
|
||||||
E_Randr_Edid_Hash *edid_hash;
|
E_Randr_Edid_Hash *edid_hash;
|
||||||
|
|
||||||
|
@ -1136,8 +1147,8 @@ _e_randr_create_possible_outputs_names_list_fail_free_list:
|
||||||
return edid_hash;
|
return edid_hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
E_Randr_Serialized_Output
|
E_Randr_Serialized_Output *
|
||||||
*_e_randr_create_serialized_output(E_Randr_Output_Info *output_info)
|
_e_randr_create_serialized_output(E_Randr_Output_Info *output_info)
|
||||||
{
|
{
|
||||||
E_Randr_Serialized_Output *so;
|
E_Randr_Serialized_Output *so;
|
||||||
char *name;
|
char *name;
|
||||||
|
@ -1165,8 +1176,8 @@ _e_randr_free_serialized_output(E_Randr_Serialized_Output *so)
|
||||||
free(so);
|
free(so);
|
||||||
}
|
}
|
||||||
|
|
||||||
E_Randr_Serialized_Crtc
|
E_Randr_Serialized_Crtc *
|
||||||
*_e_randr_create_serialized_crtc(E_Randr_Crtc_Info *crtc_info)
|
_e_randr_create_serialized_crtc(E_Randr_Crtc_Info *crtc_info)
|
||||||
{
|
{
|
||||||
E_Randr_Serialized_Crtc *sc;
|
E_Randr_Serialized_Crtc *sc;
|
||||||
E_Randr_Serialized_Output *so;
|
E_Randr_Serialized_Output *so;
|
||||||
|
@ -1220,8 +1231,8 @@ _e_randr_free_serialized_crtc(E_Randr_Serialized_Crtc *sc)
|
||||||
free(sc);
|
free(sc);
|
||||||
}
|
}
|
||||||
|
|
||||||
E_Randr_Serialized_Setup_11
|
E_Randr_Serialized_Setup_11 *
|
||||||
*_e_randr_create_serialized_setup_11(E_Randr_Screen_Info_11 *screen_info_11)
|
_e_randr_create_serialized_setup_11(E_Randr_Screen_Info_11 *screen_info_11)
|
||||||
{
|
{
|
||||||
E_Randr_Serialized_Setup_11 *ss;
|
E_Randr_Serialized_Setup_11 *ss;
|
||||||
Ecore_X_Randr_Screen_Size_MM *size;
|
Ecore_X_Randr_Screen_Size_MM *size;
|
||||||
|
@ -1240,8 +1251,8 @@ _e_randr_create_serialized_setup_11_failed_free_ss:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
E_Randr_Serialized_Setup_11
|
E_Randr_Serialized_Setup_11 *
|
||||||
*_e_randr_update_serialized_setup_11(E_Randr_Serialized_Setup_11 *ss_11, E_Randr_Screen_Info_11 *si_11)
|
_e_randr_update_serialized_setup_11(E_Randr_Serialized_Setup_11 *ss_11, E_Randr_Screen_Info_11 *si_11)
|
||||||
{
|
{
|
||||||
Ecore_X_Randr_Screen_Size_MM *size;
|
Ecore_X_Randr_Screen_Size_MM *size;
|
||||||
|
|
||||||
|
@ -1263,8 +1274,8 @@ _e_randr_update_serialized_setup_11_failed_free_ss:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
E_Randr_Serialized_Setup_12
|
E_Randr_Serialized_Setup_12 *
|
||||||
*_e_randr_create_serialized_setup_12(E_Randr_Screen_Info_12 *screen_info_12)
|
_e_randr_create_serialized_setup_12(E_Randr_Screen_Info_12 *screen_info_12)
|
||||||
{
|
{
|
||||||
E_Randr_Serialized_Setup_12 *ss;
|
E_Randr_Serialized_Setup_12 *ss;
|
||||||
Eina_List *iter;
|
Eina_List *iter;
|
||||||
|
@ -1317,8 +1328,8 @@ _e_randr_create_serialized_setup_12_failed_free_list_ss:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
E_Randr_Serialized_Setup_12
|
E_Randr_Serialized_Setup_12 *
|
||||||
*_e_randr_find_matching_serialized_setup(Eina_List *setups_12, E_Randr_Screen_Info_12 *si_12)
|
_e_randr_find_matching_serialized_setup(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 *setups_iter, *r_iter, *s_iter;
|
Eina_List *setups_iter, *r_iter, *s_iter;
|
||||||
|
@ -1375,8 +1386,8 @@ _e_randr_free_serialized_setup_12(E_Randr_Serialized_Setup_12 *ss_12)
|
||||||
free(ss_12);
|
free(ss_12);
|
||||||
}
|
}
|
||||||
|
|
||||||
Eina_List
|
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;
|
||||||
|
|
||||||
|
@ -1395,8 +1406,8 @@ _e_randr_free_serialized_setup_12(E_Randr_Serialized_Setup_12 *ss_12)
|
||||||
return setups_12;
|
return setups_12;
|
||||||
}
|
}
|
||||||
|
|
||||||
E_Randr_Serialized_Setup
|
E_Randr_Serialized_Setup *
|
||||||
*_e_randr_create_serialized_setup(E_Randr_Screen_Info *screen_info)
|
_e_randr_create_serialized_setup(E_Randr_Screen_Info *screen_info)
|
||||||
{
|
{
|
||||||
E_Randr_Serialized_Setup *ss;
|
E_Randr_Serialized_Setup *ss;
|
||||||
E_Randr_Serialized_Setup_12 *ss_12;
|
E_Randr_Serialized_Setup_12 *ss_12;
|
||||||
|
@ -1483,8 +1494,8 @@ _e_randr_try_restore_11(E_Randr_Screen_Info_11 *si_11)
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
E_Randr_Crtc_Info
|
E_Randr_Crtc_Info *
|
||||||
*_e_randr_find_matching_crtc(Eina_List *crtcs, E_Randr_Serialized_Crtc *sc)
|
_e_randr_find_matching_crtc(Eina_List *crtcs, E_Randr_Serialized_Crtc *sc)
|
||||||
{
|
{
|
||||||
Eina_List *iter, *s_name_iter, *p_output_iter;
|
Eina_List *iter, *s_name_iter, *p_output_iter;
|
||||||
E_Randr_Crtc_Info *ci;
|
E_Randr_Crtc_Info *ci;
|
||||||
|
@ -1507,8 +1518,8 @@ _e_randr_try_restore_11(E_Randr_Screen_Info_11 *si_11)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
Eina_List
|
Eina_List *
|
||||||
*_e_randr_find_matching_outputs(Eina_List *sois, Eina_List *ois)
|
_e_randr_find_matching_outputs(Eina_List *sois, Eina_List *ois)
|
||||||
{
|
{
|
||||||
Eina_List *r_output_iter, *s_output_iter, *list = NULL;
|
Eina_List *r_output_iter, *s_output_iter, *list = NULL;
|
||||||
E_Randr_Output_Info *oi;
|
E_Randr_Output_Info *oi;
|
||||||
|
@ -1534,8 +1545,8 @@ _e_randr_try_restore_11(E_Randr_Screen_Info_11 *si_11)
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ecore_X_Randr_Mode_Info
|
Ecore_X_Randr_Mode_Info *
|
||||||
*_e_randr_find_matching_mode_info(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode)
|
_e_randr_find_matching_mode_info(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode)
|
||||||
{
|
{
|
||||||
Eina_List *iter;
|
Eina_List *iter;
|
||||||
Ecore_X_Randr_Mode_Info *mi = NULL;
|
Ecore_X_Randr_Mode_Info *mi = NULL;
|
||||||
|
@ -1615,7 +1626,8 @@ static Eina_Bool
|
||||||
_e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force)
|
_e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force)
|
||||||
{
|
{
|
||||||
if (!output_info) return EINA_FALSE;
|
if (!output_info) return EINA_FALSE;
|
||||||
else if (output_info->crtc && output_info->crtc->current_mode) return EINA_TRUE;
|
else if (output_info->crtc && output_info->crtc->current_mode)
|
||||||
|
return EINA_TRUE;
|
||||||
|
|
||||||
Eina_List *iter, *outputs_list = NULL;
|
Eina_List *iter, *outputs_list = NULL;
|
||||||
E_Randr_Crtc_Info *crtc_info, *usable_crtc = NULL;
|
E_Randr_Crtc_Info *crtc_info, *usable_crtc = NULL;
|
||||||
|
@ -1646,6 +1658,7 @@ _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force)
|
||||||
{
|
{
|
||||||
case ECORE_X_RANDR_OUTPUT_POLICY_NONE:
|
case ECORE_X_RANDR_OUTPUT_POLICY_NONE:
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
|
|
||||||
case ECORE_X_RANDR_OUTPUT_POLICY_CLONE:
|
case ECORE_X_RANDR_OUTPUT_POLICY_CLONE:
|
||||||
/*
|
/*
|
||||||
* Order of approaches to enable a clone (of the primary output):
|
* Order of approaches to enable a clone (of the primary output):
|
||||||
|
@ -1697,8 +1710,7 @@ _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force)
|
||||||
* 2a. exact mode.
|
* 2a. exact mode.
|
||||||
*/
|
*/
|
||||||
ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, usable_crtc->xid, &output_info->xid, 1, primary_output->crtc->current_mode->xid);
|
ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, usable_crtc->xid, &output_info->xid, 1, primary_output->crtc->current_mode->xid);
|
||||||
return (ret && ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info->rrvd_info.randr_info_12->alignment));
|
return ret && ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info->rrvd_info.randr_info_12->alignment);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1709,7 +1721,7 @@ _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force)
|
||||||
if (primary_output->crtc && (mode_info = _e_randr_mode_geo_identical_find(output_info->modes, primary_output->crtc->current_mode)))
|
if (primary_output->crtc && (mode_info = _e_randr_mode_geo_identical_find(output_info->modes, primary_output->crtc->current_mode)))
|
||||||
{
|
{
|
||||||
ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid);
|
ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info->root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid);
|
||||||
return (ret && ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info->rrvd_info.randr_info_12->alignment));
|
return ret && ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info->root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info->rrvd_info.randr_info_12->alignment);
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
* 3. Find the highest resolution mode common to enable on primary output's CRTC and the new one.
|
* 3. Find the highest resolution mode common to enable on primary output's CRTC and the new one.
|
||||||
|
@ -1729,7 +1741,6 @@ _e_randr_try_enable_output(E_Randr_Output_Info *output_info, Eina_Bool force)
|
||||||
eina_list_free(outputs_list);
|
eina_list_free(outputs_list);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
fprintf(stderr, "Couldn't get primary output!\n");
|
fprintf(stderr, "Couldn't get primary output!\n");
|
||||||
|
@ -1864,6 +1875,7 @@ _e_randr_crtc_move_policy(E_Randr_Crtc_Info *new_crtc)
|
||||||
dy);
|
dy);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ECORE_X_RANDR_OUTPUT_POLICY_LEFT:
|
case ECORE_X_RANDR_OUTPUT_POLICY_LEFT:
|
||||||
dx = (crtc_rel->geometry.x - new_crtc->geometry.w);
|
dx = (crtc_rel->geometry.x - new_crtc->geometry.w);
|
||||||
if (dx < 0)
|
if (dx < 0)
|
||||||
|
@ -1877,6 +1889,7 @@ _e_randr_crtc_move_policy(E_Randr_Crtc_Info *new_crtc)
|
||||||
dy);
|
dy);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1953,7 +1966,7 @@ _modes_size_sort_cb(const void *d1, const void *d2)
|
||||||
{
|
{
|
||||||
Ecore_X_Randr_Mode_Info *mode1 = ((Ecore_X_Randr_Mode_Info *)d1), *mode2 = ((Ecore_X_Randr_Mode_Info *)d2);
|
Ecore_X_Randr_Mode_Info *mode1 = ((Ecore_X_Randr_Mode_Info *)d1), *mode2 = ((Ecore_X_Randr_Mode_Info *)d2);
|
||||||
|
|
||||||
return ((mode1->width * mode1->height) - (mode2->width * mode2->height));
|
return (mode1->width * mode1->height) - (mode2->width * mode2->height);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -2104,7 +2117,6 @@ _e_randr_crtcs_clone_crtc_removed(E_Randr_Crtc_Info *former_clone)
|
||||||
}
|
}
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -2246,3 +2258,4 @@ _e_randr_outputs_are_clones(E_Randr_Output_Info *output_info, Eina_List *outputs
|
||||||
}
|
}
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue