From 892b1c5be336ce44ee87e753041ce1c6c0cca227 Mon Sep 17 00:00:00 2001
From: ChunEon Park <hermet@hermet.pe.kr>
Date: Sat, 18 Jan 2014 22:26:10 +0900
Subject: [PATCH] ecore_evas - applied macro to check rotation state.

also, let the potrait compare on the higher priority.

if you can suggest better macro name, then please modify it.
---
 src/lib/ecore_evas/ecore_evas.c               | 116 +++++++++---------
 src/lib/ecore_evas/ecore_evas_private.h       |   3 +
 .../ecore_evas/engines/fb/ecore_evas_fb.c     |  55 +++++----
 .../wayland/ecore_evas_wayland_common.c       |  73 +++++------
 .../engines/wayland/ecore_evas_wayland_egl.c  |   2 +-
 .../engines/wayland/ecore_evas_wayland_shm.c  |   6 +-
 .../engines/win32/ecore_evas_win32.c          |  44 +++----
 .../ecore_evas/engines/x/ecore_evas_x.c       |  64 +++++-----
 8 files changed, 184 insertions(+), 179 deletions(-)

diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index ad368e5123..37be5f8a76 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -1157,14 +1157,14 @@ ecore_evas_resize(Ecore_Evas *ee, int w, int h)
    if (ee->prop.fullscreen) return;
    if (w < 1) w = 1;
    if (h < 1) h = 1;
-   if ((ee->rotation == 90) || (ee->rotation == 270))
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
-        IFC(ee, fn_resize) (ee, h, w);
+        IFC(ee, fn_resize) (ee, w, h);
         IFE;
      }
    else
      {
-        IFC(ee, fn_resize) (ee, w, h);
+        IFC(ee, fn_resize) (ee, h, w);
         IFE;
      }
 }
@@ -1181,14 +1181,14 @@ ecore_evas_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
    if (ee->prop.fullscreen) return;
    if (w < 1) w = 1;
    if (h < 1) h = 1;
-   if ((ee->rotation == 90) || (ee->rotation == 270))
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
-        IFC(ee, fn_move_resize) (ee, x, y, h, w);
+        IFC(ee, fn_move_resize) (ee, x, y, w, h);
         IFE;
      }
    else
      {
-        IFC(ee, fn_move_resize) (ee, x, y, w, h);
+        IFC(ee, fn_move_resize) (ee, x, y, h, w);
         IFE;
      }
 }
@@ -1202,20 +1202,20 @@ ecore_evas_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h)
                          "ecore_evas_geometry_get");
         return;
      }
-   if ((ee->rotation == 90) || (ee->rotation == 270))
-     {
-        if (x) *x = ee->x;
-        if (y) *y = ee->y;
-        if (w) *w = ee->h;
-        if (h) *h = ee->w;
-     }
-   else
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
         if (x) *x = ee->x;
         if (y) *y = ee->y;
         if (w) *w = ee->w;
         if (h) *h = ee->h;
      }
+   else
+     {
+        if (x) *x = ee->x;
+        if (y) *y = ee->y;
+        if (w) *w = ee->h;
+        if (h) *h = ee->w;
+     }
 }
 
 EAPI void
@@ -1227,20 +1227,20 @@ ecore_evas_request_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, in
                          "ecore_evas_request_geometry_get");
         return;
      }
-   if ((ee->rotation == 90) || (ee->rotation == 270))
-     {
-        if (x) *x = ee->req.x;
-        if (y) *y = ee->req.y;
-        if (w) *w = ee->req.h;
-        if (h) *h = ee->req.w;
-     }
-   else
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
         if (x) *x = ee->req.x;
         if (y) *y = ee->req.y;
         if (w) *w = ee->req.w;
         if (h) *h = ee->req.h;
      }
+   else
+     {
+        if (x) *x = ee->req.x;
+        if (y) *y = ee->req.y;
+        if (w) *w = ee->req.h;
+        if (h) *h = ee->req.w;
+     }
 }
 
 EAPI void
@@ -1505,14 +1505,14 @@ ecore_evas_size_min_set(Ecore_Evas *ee, int w, int h)
      }
    if (w < 0) w = 0;
    if (h < 0) h = 0;
-   if ((ee->rotation == 90) || (ee->rotation == 270))
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
-        IFC(ee, fn_size_min_set) (ee, h, w);
+        IFC(ee, fn_size_min_set) (ee, w, h);
         IFE;
      }
    else
      {
-        IFC(ee, fn_size_min_set) (ee, w, h);
+        IFC(ee, fn_size_min_set) (ee, h, w);
         IFE;
      }
 }
@@ -1526,16 +1526,16 @@ ecore_evas_size_min_get(const Ecore_Evas *ee, int *w, int *h)
                          "ecore_evas_size_min_get");
         return;
      }
-   if ((ee->rotation == 90) || (ee->rotation == 270))
-     {
-        if (w) *w = ee->prop.min.h;
-        if (h) *h = ee->prop.min.w;
-     }
-   else
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
         if (w) *w = ee->prop.min.w;
         if (h) *h = ee->prop.min.h;
      }
+   else
+     {
+        if (w) *w = ee->prop.min.h;
+        if (h) *h = ee->prop.min.w;
+     }
 }
 
 EAPI void
@@ -1549,14 +1549,14 @@ ecore_evas_size_max_set(Ecore_Evas *ee, int w, int h)
      }
    if (w < 0) w = 0;
    if (h < 0) h = 0;
-   if ((ee->rotation == 90) || (ee->rotation == 270))
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
-        IFC(ee, fn_size_max_set) (ee, h, w);
+        IFC(ee, fn_size_max_set) (ee, w, h);
         IFE;
      }
    else
      {
-        IFC(ee, fn_size_max_set) (ee, w, h);
+        IFC(ee, fn_size_max_set) (ee, h, w);
         IFE;
      }
 }
@@ -1570,16 +1570,16 @@ ecore_evas_size_max_get(const Ecore_Evas *ee, int *w, int *h)
                          "ecore_evas_size_max_get");
         return;
      }
-   if ((ee->rotation == 90) || (ee->rotation == 270))
-     {
-        if (w) *w = ee->prop.max.h;
-        if (h) *h = ee->prop.max.w;
-     }
-   else
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
         if (w) *w = ee->prop.max.w;
         if (h) *h = ee->prop.max.h;
      }
+   else
+     {
+        if (w) *w = ee->prop.max.h;
+        if (h) *h = ee->prop.max.w;
+     }
 }
 
 EAPI void
@@ -1593,14 +1593,14 @@ ecore_evas_size_base_set(Ecore_Evas *ee, int w, int h)
      }
    if (w < 0) w = 0;
    if (h < 0) h = 0;
-   if ((ee->rotation == 90) || (ee->rotation == 270))
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
-        IFC(ee, fn_size_base_set) (ee, h, w);
+        IFC(ee, fn_size_base_set) (ee, w, h);
         IFE;
      }
    else
      {
-        IFC(ee, fn_size_base_set) (ee, w, h);
+        IFC(ee, fn_size_base_set) (ee, h, w);
         IFE;
      }
 }
@@ -1614,16 +1614,16 @@ ecore_evas_size_base_get(const Ecore_Evas *ee, int *w, int *h)
                          "ecore_evas_size_base_get");
         return;
      }
-   if ((ee->rotation == 90) || (ee->rotation == 270))
-     {
-        if (w) *w = ee->prop.base.h;
-        if (h) *h = ee->prop.base.w;
-     }
-   else
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
         if (w) *w = ee->prop.base.w;
         if (h) *h = ee->prop.base.h;
      }
+   else
+     {
+        if (w) *w = ee->prop.base.h;
+        if (h) *h = ee->prop.base.w;
+     }
 }
 
 EAPI void
@@ -1637,14 +1637,14 @@ ecore_evas_size_step_set(Ecore_Evas *ee, int w, int h)
      }
    if (w < 0) w = 0;
    if (h < 0) h = 0;
-   if ((ee->rotation == 90) || (ee->rotation == 270))
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
-        IFC(ee, fn_size_step_set) (ee, h, w);
+        IFC(ee, fn_size_step_set) (ee, w, h);
         IFE;
      }
    else
      {
-        IFC(ee, fn_size_step_set) (ee, w, h);
+        IFC(ee, fn_size_step_set) (ee, h, w);
         IFE;
      }
 }
@@ -1658,16 +1658,16 @@ ecore_evas_size_step_get(const Ecore_Evas *ee, int *w, int *h)
                          "ecore_evas_size_step_get");
         return;
      }
-   if ((ee->rotation == 90) || (ee->rotation == 270))
-     {
-        if (w) *w = ee->prop.step.h;
-        if (h) *h = ee->prop.step.w;
-     }
-   else
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
         if (w) *w = ee->prop.step.w;
         if (h) *h = ee->prop.step.h;
      }
+   else
+     {
+        if (w) *w = ee->prop.step.h;
+        if (h) *h = ee->prop.step.w;
+     }
 }
 
 EAPI void
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h
index 1984dbb44c..ca7a801a13 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -33,6 +33,9 @@ EAPI extern int _ecore_evas_log_dom;
 #endif
 #define CRI(...) EINA_LOG_DOM_CRIT(_ecore_evas_log_dom, __VA_ARGS__)
 
+#define ECORE_EVAS_PORTRAIT(ee) \
+  ((ee->rotation == 0) || (ee->rotation == 180))
+
 
 #define IDLE_FLUSH_TIME 0.5
 #ifndef _ECORE_EVAS_H
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
index 3a04b9578d..3f075367e5 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -84,10 +84,10 @@ _ecore_evas_fb_gain(void *data)
    if (ee)
      {
         ee->visible = 1;
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+        else
+          evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
      }
 
    EINA_LIST_FOREACH(ecore_evas_input_devices, ll, dev)
@@ -286,18 +286,18 @@ _ecore_evas_resize(Ecore_Evas *ee, int w, int h)
    if ((w == ee->w) && (h == ee->h)) return;
    ee->w = w;
    ee->h = h;
-   if ((ee->rotation == 90) || (ee->rotation == 270))
-     {
-       evas_output_size_set(ee->evas, ee->h, ee->w);
-       evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
-       evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
-     }
-   else
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
        evas_output_size_set(ee->evas, ee->w, ee->h);
        evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
        evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
      }
+   else
+     {
+       evas_output_size_set(ee->evas, ee->h, ee->w);
+       evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
+       evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
+     }
    if (ee->func.fn_resize) ee->func.fn_resize(ee);
 }
 
@@ -309,18 +309,18 @@ _ecore_evas_move_resize(Ecore_Evas *ee, int x EINA_UNUSED, int y EINA_UNUSED, in
    if ((w == ee->w) && (h == ee->h)) return;
    ee->w = w;
    ee->h = h;
-   if ((ee->rotation == 90) || (ee->rotation == 270))
-     {
-       evas_output_size_set(ee->evas, ee->h, ee->w);
-       evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
-       evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
-     }
-   else
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
        evas_output_size_set(ee->evas, ee->w, ee->h);
        evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
        evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
      }
+   else
+     {
+       evas_output_size_set(ee->evas, ee->h, ee->w);
+       evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
+       evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
+     }
    if (ee->func.fn_resize) ee->func.fn_resize(ee);
 }
 
@@ -355,7 +355,7 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation, int resize EINA_UNUSED)
           }
         else
           {
-             if ((rotation == 0) || (rotation == 180))
+             if (ECORE_EVAS_PORTRAIT(ee))
                {
                   evas_output_size_set(ee->evas, ee->w, ee->h);
                   evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
@@ -377,10 +377,11 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation, int resize EINA_UNUSED)
           }
         ee->rotation = rotation;
      }
-   if ((ee->rotation == 90) || (ee->rotation == 270))
-     evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
-   else
+   if (ECORE_EVAS_PORTRAIT(ee))
      evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+   else
+     evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
+
    _ecore_evas_mouse_move_process_fb(ee, ee->mouse.x, ee->mouse.y);
    if (ee->func.fn_resize) ee->func.fn_resize(ee);
 }
@@ -625,16 +626,16 @@ ecore_evas_fb_new_internal(const char *disp_name, int rotation, int w, int h)
    evas_data_attach_set(ee->evas, ee);
    evas_output_method_set(ee->evas, rmethod);
 
-   if ((rotation == 90) || (rotation == 270))
-     {
-       evas_output_size_set(ee->evas, h, w);
-       evas_output_viewport_set(ee->evas, 0, 0, h, w);
-     }
-   else
+   if (ECORE_EVAS_PORTRAIT(ee))
      {
        evas_output_size_set(ee->evas, w, h);
        evas_output_viewport_set(ee->evas, 0, 0, w, h);
      }
+   else
+     {
+       evas_output_size_set(ee->evas, h, w);
+       evas_output_viewport_set(ee->evas, 0, 0, h, w);
+     }
 
    einfo = (Evas_Engine_Info_FB *)evas_engine_info_get(ee->evas);
    if (einfo && disp_name)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 647a5db75e..86044ca15e 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -219,20 +219,20 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
 
         evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
 
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          {
-             minw = (ee->prop.min.w + fh);
-             minh = (ee->prop.min.h + fw);
-             maxw = (ee->prop.max.w + fh);
-             maxh = (ee->prop.max.h + fw);
-          }
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           {
              minw = (ee->prop.min.w + fw);
              minh = (ee->prop.min.h + fh);
              maxw = (ee->prop.max.w + fw);
              maxh = (ee->prop.max.h + fh);
           }
+        else
+          {
+             minw = (ee->prop.min.w + fh);
+             minh = (ee->prop.min.h + fw);
+             maxw = (ee->prop.max.w + fh);
+             maxh = (ee->prop.max.h + fw);
+          }
 
         /* adjust size using aspect */
         if ((ee->prop.base.w >= 0) && (ee->prop.base.h >= 0))
@@ -303,16 +303,17 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
         orig_w = nw;
         orig_h = nh;
 
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          {
-             nw -= fh;
-             nh -= fw;
           }
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           {
              nw -= fw;
              nh -= fh;
           }
+        else
+          {
+             nw -= fh;
+             nh -= fw;
+          }
      }
 
    if (prev_full != ee->prop.fullscreen)
@@ -407,7 +408,7 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
                }
 
              /* add canvas damage */
-             if ((ee->rotation == 0) || (ee->rotation == 180))
+             if (ECORE_EVAS_PORTRAIT(ee))
                evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h);
              else
                evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.h, ee->req.w);
@@ -436,7 +437,7 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
              if (ee->func.fn_resize) ee->func.fn_resize(ee);
 
              /* add canvas damage */
-             if ((ee->rotation == 0) || (ee->rotation == 180))
+             if (ECORE_EVAS_PORTRAIT(ee))
                evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
              else
                evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
@@ -485,7 +486,7 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
         if (ee->func.fn_resize) ee->func.fn_resize(ee);
 
         /* add canvas damage */
-        if ((ee->rotation == 0) || (ee->rotation == 180))
+        if (ECORE_EVAS_PORTRAIT(ee))
           evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
         else
           evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
@@ -613,20 +614,20 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
         double a;
         evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
 
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          {
-             minw = (ee->prop.min.w - fh);
-             minh = (ee->prop.min.h - fw);
-             maxw = (ee->prop.max.w + fh);
-             maxh = (ee->prop.max.h + fw);
-          }
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           {
              minw = (ee->prop.min.w - fw);
              minh = (ee->prop.min.h - fh);
              maxw = (ee->prop.max.w + fw);
              maxh = (ee->prop.max.h + fh);
           }
+        else
+          {
+             minw = (ee->prop.min.w - fh);
+             minh = (ee->prop.min.h - fw);
+             maxw = (ee->prop.max.w + fh);
+             maxh = (ee->prop.max.h + fw);
+          }
 
         /* adjust size using aspect */
         if ((ee->prop.base.w >= 0) && (ee->prop.base.h >= 0))
@@ -697,16 +698,16 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
         orig_w = w;
         orig_h = h;
 
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          {
-             w += fh;
-             h += fw;
-          }
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           {
              w += fw;
              h += fh;
           }
+        else
+          {
+             w += fh;
+             h += fw;
+          }
      }
 
    evas_output_size_get(ee->evas, &ow, &oh);
@@ -717,16 +718,16 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
         ee->req.w = orig_w;
         ee->req.h = orig_h;
 
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          {
-             evas_output_size_set(ee->evas, h, w);
-             evas_output_viewport_set(ee->evas, 0, 0, h, w);
-          }
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           {
              evas_output_size_set(ee->evas, w, h);
              evas_output_viewport_set(ee->evas, 0, 0, w, h);
           }
+        else
+          {
+             evas_output_size_set(ee->evas, h, w);
+             evas_output_viewport_set(ee->evas, 0, 0, h, w);
+          }
 
         if (ee->prop.avoid_damage)
           {
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 45aa06919a..bb9213c9ca 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -455,7 +455,7 @@ _ecore_evas_wayland_egl_resize(Ecore_Evas *ee, int location)
 
         evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
 
-        if ((ee->rotation == 0) || (ee->rotation == 180))
+        if (ECORE_EVAS_PORTRAIT(ee))
           ecore_wl_window_resize(wdata->win, ee->w + fw, ee->h + fh, location);
         else
           ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location);
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index ccaf684750..cdafd6695c 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -446,10 +446,10 @@ _ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int location)
 
         evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
 
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location);
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           ecore_wl_window_resize(wdata->win, ee->w + fw, ee->h + fh, location);
+        else
+          ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location);
      }
 }
 
diff --git a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
index 67b074506a..4f73a2ba80 100644
--- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
+++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
@@ -376,16 +376,16 @@ _ecore_evas_win32_event_window_configure(void *data EINA_UNUSED, int type EINA_U
         ee->req.w = ee->w;
         ee->req.h = ee->h;
 
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          {
-             evas_output_size_set(ee->evas, ee->h, ee->w);
-             evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
-          }
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           {
              evas_output_size_set(ee->evas, ee->w, ee->h);
              evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
           }
+        else
+          {
+             evas_output_size_set(ee->evas, ee->h, ee->w);
+             evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
+          }
         if (ee->prop.avoid_damage)
           {
              int pdam;
@@ -481,16 +481,16 @@ _ecore_evas_win32_resize(Ecore_Evas *ee, int width, int height)
         ee->h = height;
         ecore_win32_window_resize((struct _Ecore_Win32_Window *)ee->prop.window,
                                   width, height);
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          {
-             evas_output_size_set(ee->evas, ee->h, ee->w);
-             evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
-          }
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           {
              evas_output_size_set(ee->evas, ee->w, ee->h);
              evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
           }
+        else
+          {
+             evas_output_size_set(ee->evas, ee->h, ee->w);
+             evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
+          }
         if (ee->prop.avoid_damage)
           {
              int pdam;
@@ -528,16 +528,16 @@ _ecore_evas_win32_move_resize(Ecore_Evas *ee, int x, int y, int width, int heigh
         ee->h = height;
         ecore_win32_window_move_resize((struct _Ecore_Win32_Window *)ee->prop.window,
                                        x, y, width, height);
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          {
-             evas_output_size_set(ee->evas, ee->h, ee->w);
-             evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
-          }
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           {
              evas_output_size_set(ee->evas, ee->w, ee->h);
              evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
           }
+        else
+          {
+             evas_output_size_set(ee->evas, ee->h, ee->w);
+             evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
+          }
         if (ee->prop.avoid_damage)
           {
              int pdam;
@@ -586,7 +586,7 @@ _ecore_evas_win32_rotation_set_internal(Ecore_Evas *ee, int rotation)
                                          &w, &h);
              ecore_win32_window_resize((struct _Ecore_Win32_Window *)ee->prop.window,
                                        h, w);
-             if ((rotation == 0) || (rotation == 180))
+             if (ECORE_EVAS_PORTRAIT(ee))
                {
                   evas_output_size_set(ee->evas, ee->w, ee->h);
                   evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
@@ -618,10 +618,10 @@ _ecore_evas_win32_rotation_set_internal(Ecore_Evas *ee, int rotation)
         if (ee->func.fn_resize) ee->func.fn_resize(ee);
      }
 
-   if ((ee->rotation == 90) || (ee->rotation == 270))
-     evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
-   else
+   if (ECORE_EVAS_PORTRAIT(ee))
      evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+   else
+     evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
 }
 
 static void
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 4489db954f..0aa50f02d2 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1373,16 +1373,16 @@ _ecore_evas_x_event_window_configure(void *data EINA_UNUSED, int type EINA_UNUSE
         ee->h = e->h;
         ee->req.w = ee->w;
         ee->req.h = ee->h;
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          {
-             evas_output_size_set(ee->evas, ee->h, ee->w);
-             evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
-          }
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           {
              evas_output_size_set(ee->evas, ee->w, ee->h);
              evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
           }
+        else
+          {
+             evas_output_size_set(ee->evas, ee->h, ee->w);
+             evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
+          }
         if (ee->prop.avoid_damage)
           {
              int pdam;
@@ -1854,16 +1854,16 @@ _ecore_evas_x_resize(Ecore_Evas *ee, int w, int h)
              ee->w = w;
              ee->h = h;
              if (ee->prop.window) ecore_x_window_resize(ee->prop.window, w, h);
-             if ((ee->rotation == 90) || (ee->rotation == 270))
-               {
-                  evas_output_size_set(ee->evas, ee->h, ee->w);
-                  evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
-               }
-             else
+             if (ECORE_EVAS_PORTRAIT(ee))
                {
                   evas_output_size_set(ee->evas, ee->w, ee->h);
                   evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
                }
+             else
+               {
+                  evas_output_size_set(ee->evas, ee->h, ee->w);
+                  evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
+               }
              if (ee->prop.avoid_damage)
                {
                   int pdam;
@@ -1913,16 +1913,16 @@ _ecore_evas_x_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
                }
              ee->w = w;
              ee->h = h;
-             if ((ee->rotation == 90) || (ee->rotation == 270))
-               {
-                  evas_output_size_set(ee->evas, ee->h, ee->w);
-                  evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
-               }
-             else
+             if (ECORE_EVAS_PORTRAIT(ee))
                {
                   evas_output_size_set(ee->evas, ee->w, ee->h);
                   evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
                }
+             else
+               {
+                  evas_output_size_set(ee->evas, ee->h, ee->w);
+                  evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
+               }
              if (ee->prop.avoid_damage)
                {
                   int pdam;
@@ -1992,7 +1992,7 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
 
                   ecore_x_window_size_get(ee->prop.window, &w, &h);
                   ecore_x_window_resize(ee->prop.window, h, w);
-                  if ((rotation == 0) || (rotation == 180))
+                  if (ECORE_EVAS_PORTRAIT(ee))
                     {
                        evas_output_size_set(ee->evas, ee->req.w, ee->req.h);
                        evas_output_viewport_set(ee->evas, 0, 0, ee->req.w, ee->req.h);
@@ -2004,17 +2004,17 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
                     }
                   if (ee->func.fn_resize) ee->func.fn_resize(ee);
                }
-             if ((ee->rotation == 90) || (ee->rotation == 270))
-               evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.h, ee->req.w);
-             else
+             if (ECORE_EVAS_PORTRAIT(ee))
                evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h);
+             else
+               evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.h, ee->req.w);
           }
         else
           {
              /* int w, h; */
 
              /* ecore_x_window_size_get(ee->prop.window, &w, &h); */
-             if ((rotation == 0) || (rotation == 180))
+             if (ECORE_EVAS_PORTRAIT(ee))
                {
                   evas_output_size_set(ee->evas, ee->w, ee->h);
                   evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
@@ -2025,10 +2025,10 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
                   evas_output_viewport_set(ee->evas, 0, 0, ee->h, ee->w);
                }
              if (ee->func.fn_resize) ee->func.fn_resize(ee);
-             if ((ee->rotation == 90) || (ee->rotation == 270))
-               evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
-             else
+             if (ECORE_EVAS_PORTRAIT(ee))
                evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+             else
+               evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
           }
         ecore_evas_size_min_get(ee, &minw, &minh);
         ecore_evas_size_max_get(ee, &maxw, &maxh);
@@ -2053,10 +2053,10 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
                                        ecore_x_current_time_get());
         if (ee->func.fn_resize) ee->func.fn_resize(ee);
 
-        if ((ee->rotation == 90) || (ee->rotation == 270))
-          evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
-        else
+        if (ECORE_EVAS_PORTRAIT(ee))
           evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+        else
+          evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
      }
 }
 
@@ -3013,10 +3013,10 @@ _avoid_damage_do(Ecore_Evas *ee, int on)
                {
                   ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
                }
-             if ((ee->rotation == 90) || (ee->rotation == 270))
-               evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
-             else
+             if (ECORE_EVAS_PORTRAIT(ee))
                evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+             else
+               evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
              if (ee->prop.avoid_damage == ECORE_EVAS_AVOID_DAMAGE_BUILT_IN)
                {
                   edata->using_bg_pixmap = 1;