diff options
| author | Deon Thomas <PrinceAMD.Elive@gmail.com> | 2013-08-01 12:06:21 -0400 |
|---|---|---|
| committer | Deon Thomas <PrinceAMD.Elive@gmail.com> | 2013-08-01 12:06:21 -0400 |
| commit | 5bcf14406452026fce62bea737797cba8e869be9 (patch) | |
| tree | 1c781be809d5ac5ad75c4c08615a8899cdd9e016 | |
| parent | 7c8e3d8e31d376e8e86a04ca75a8bc9a1e1b4aa0 (diff) | |
| download | enlightenment-5bcf14406452026fce62bea737797cba8e869be9.tar.gz | |
Revert: removed ECORE_VERSION_MAJOR/MINOR #if statement since all the new ecore_randr code has been backported to ecore 1.7.7+
| -rw-r--r-- | src/bin/e_randr.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/bin/e_randr.c b/src/bin/e_randr.c index 67fc14d281..d1edbe465f 100644 --- a/src/bin/e_randr.c +++ b/src/bin/e_randr.c @@ -422,6 +422,7 @@ _e_randr_config_restore(void) else { /* this crtc is not in our config. get values from X */ +#if ((ECORE_VERSION_MAJOR >= 1) && (ECORE_VERSION_MINOR >= 8)) Ecore_X_Randr_Crtc_Info *cinfo; /* get crtc info from X */ @@ -436,6 +437,17 @@ _e_randr_config_restore(void) ecore_x_randr_crtc_info_free(cinfo); } +#else + /* get geometry of this crtc */ + ecore_x_randr_crtc_geometry_get(root, crtcs[c], + &x, &y, &w, &h); + + /* get mode */ + mode = ecore_x_randr_crtc_mode_get(root, crtcs[c]); + + /* get orientation */ + orient = ecore_x_randr_crtc_orientation_get(root, crtcs[c]); +#endif } /* at this point, we should have geometry, mode and orientation. @@ -1166,6 +1178,7 @@ _e_randr_config_screen_size_calculate(int *sw, int *sh) { Ecore_X_Randr_Crtc crtc = 0; +#if ((ECORE_VERSION_MAJOR >= 1) && (ECORE_VERSION_MINOR >= 8)) Ecore_X_Randr_Crtc_Info *cinfo; /* get crtc info from X */ @@ -1180,6 +1193,16 @@ _e_randr_config_screen_size_calculate(int *sw, int *sh) ecore_x_randr_crtc_info_free(cinfo); } +#else + /* get geometry of this crtc */ + ecore_x_randr_crtc_geometry_get(root, crtc, &x, &y, &w, &h); + + /* get mode */ + mode = ecore_x_randr_crtc_mode_get(root, crtc); + + /* get orientation */ + orient = ecore_x_randr_crtc_orientation_get(root, crtc); +#endif } /* at this point, we should have geometry, mode and orientation. |