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

Revert "ecore_evas - use the macro orthogonal check." 

This reverts commit 43acf1e82f.

some partial changes are incorrectly applied.
This commit is contained in:
ChunEon Park 2014-01-18 22:04:25 +09:00
parent 43acf1e82f
commit 8cd92c17e0
8 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/ecore_evas/ecore_evas.c
View File

@ -1157,7 +1157,7 @@ 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 (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
IFC(ee, fn_resize) (ee, h, w);
IFE;
@ -1181,7 +1181,7 @@ 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 (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
IFC(ee, fn_move_resize) (ee, x, y, h, w);
IFE;
@ -1202,7 +1202,7 @@ ecore_evas_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h)
"ecore_evas_geometry_get");
return;
}
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
if (x) *x = ee->x;
if (y) *y = ee->y;
@ -1227,7 +1227,7 @@ ecore_evas_request_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, in
"ecore_evas_request_geometry_get");
return;
}
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
if (x) *x = ee->req.x;
if (y) *y = ee->req.y;
@ -1505,7 +1505,7 @@ ecore_evas_size_min_set(Ecore_Evas *ee, int w, int h)
}
if (w < 0) w = 0;
if (h < 0) h = 0;
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
IFC(ee, fn_size_min_set) (ee, h, w);
IFE;
@ -1526,7 +1526,7 @@ ecore_evas_size_min_get(const Ecore_Evas *ee, int *w, int *h)
"ecore_evas_size_min_get");
return;
}
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
if (w) *w = ee->prop.min.h;
if (h) *h = ee->prop.min.w;
@ -1549,7 +1549,7 @@ ecore_evas_size_max_set(Ecore_Evas *ee, int w, int h)
}
if (w < 0) w = 0;
if (h < 0) h = 0;
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
IFC(ee, fn_size_max_set) (ee, h, w);
IFE;
@ -1570,7 +1570,7 @@ ecore_evas_size_max_get(const Ecore_Evas *ee, int *w, int *h)
"ecore_evas_size_max_get");
return;
}
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
if (w) *w = ee->prop.max.h;
if (h) *h = ee->prop.max.w;
@ -1593,7 +1593,7 @@ ecore_evas_size_base_set(Ecore_Evas *ee, int w, int h)
}
if (w < 0) w = 0;
if (h < 0) h = 0;
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
IFC(ee, fn_size_base_set) (ee, h, w);
IFE;
@ -1614,7 +1614,7 @@ ecore_evas_size_base_get(const Ecore_Evas *ee, int *w, int *h)
"ecore_evas_size_base_get");
return;
}
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
if (w) *w = ee->prop.base.h;
if (h) *h = ee->prop.base.w;
@ -1637,7 +1637,7 @@ ecore_evas_size_step_set(Ecore_Evas *ee, int w, int h)
}
if (w < 0) w = 0;
if (h < 0) h = 0;
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
IFC(ee, fn_size_step_set) (ee, h, w);
IFE;
@ -1658,7 +1658,7 @@ ecore_evas_size_step_get(const Ecore_Evas *ee, int *w, int *h)
"ecore_evas_size_step_get");
return;
}
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
if (w) *w = ee->prop.step.h;
if (h) *h = ee->prop.step.w;

3
src/lib/ecore_evas/ecore_evas_private.h
View File

@ -33,9 +33,6 @@ EAPI extern int _ecore_evas_log_dom;
#endif
#define CRI(...) EINA_LOG_DOM_CRIT(_ecore_evas_log_dom, __VA_ARGS__)
#define ECORE_EVAS_RIGHT_ANGLED(ee) \
((ee->rotation == 90) || (ee->rotation == 270))
#define IDLE_FLUSH_TIME 0.5
#ifndef _ECORE_EVAS_H

12
src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
View File

@ -84,7 +84,7 @@ _ecore_evas_fb_gain(void *data)
if (ee)
{
ee->visible = 1;
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
@ -286,7 +286,7 @@ _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 (ECORE_EVAS_RIGHT_ANGLED(ee))
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);
@ -309,7 +309,7 @@ _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 (ECORE_EVAS_RIGHT_ANGLED(ee))
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);
@ -355,7 +355,7 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation, int resize EINA_UNUSED)
}
else
{
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((rotation == 0) || (rotation == 180))
{
evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
@ -377,7 +377,7 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation, int resize EINA_UNUSED)
}
ee->rotation = rotation;
}
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
@ -625,7 +625,7 @@ 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 (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((rotation == 90) || (rotation == 270))
{
evas_output_size_set(ee->evas, h, w);
evas_output_viewport_set(ee->evas, 0, 0, h, w);

20
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -219,7 +219,7 @@ _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 (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
minw = (ee->prop.min.w + fh);
minh = (ee->prop.min.h + fw);
@ -303,7 +303,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
orig_w = nw;
orig_h = nh;
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
nw -= fh;
nh -= fw;
@ -382,7 +382,7 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
else
{
/* resize the canvas based on rotation */
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((rotation == 0) || (rotation == 180))
{
/* resize the ecore_wayland window */
ecore_wl_window_resize(wdata->win,
@ -407,7 +407,7 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
}
/* add canvas damage */
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 0) || (ee->rotation == 180))
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);
@ -421,7 +421,7 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
else
{
/* resize the canvas based on rotation */
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((rotation == 0) || (rotation == 180))
{
evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
@ -436,7 +436,7 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
if (ee->func.fn_resize) ee->func.fn_resize(ee);
/* add canvas damage */
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 0) || (ee->rotation == 180))
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 +485,7 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
if (ee->func.fn_resize) ee->func.fn_resize(ee);
/* add canvas damage */
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 0) || (ee->rotation == 180))
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,7 +613,7 @@ _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 (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
minw = (ee->prop.min.w - fh);
minh = (ee->prop.min.h - fw);
@ -697,7 +697,7 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
orig_w = w;
orig_h = h;
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
{
w += fh;
h += fw;
@ -717,7 +717,7 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
ee->req.w = orig_w;
ee->req.h = orig_h;
if (ECORE_EVAS_RIGHT_ANGLED(ee))
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);

2
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
View File

@ -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 (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 0) || (ee->rotation == 180))
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);

2
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
View File

@ -446,7 +446,7 @@ _ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int location)
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location);
else
ecore_wl_window_resize(wdata->win, ee->w + fw, ee->h + fh, location);

10
src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
View File

@ -376,7 +376,7 @@ _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 (ECORE_EVAS_RIGHT_ANGLED(ee))
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);
@ -481,7 +481,7 @@ _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 (ECORE_EVAS_RIGHT_ANGLED(ee))
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);
@ -528,7 +528,7 @@ _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 (ECORE_EVAS_RIGHT_ANGLED(ee))
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);
@ -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 (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((rotation == 0) || (rotation == 180))
{
evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
@ -618,7 +618,7 @@ _ecore_evas_win32_rotation_set_internal(Ecore_Evas *ee, int rotation)
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);

18
src/modules/ecore_evas/engines/x/ecore_evas_x.c
View File

@ -1373,7 +1373,7 @@ _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 (ECORE_EVAS_RIGHT_ANGLED(ee))
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);
@ -1854,7 +1854,7 @@ _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 (ECORE_EVAS_RIGHT_ANGLED(ee))
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);
@ -1913,7 +1913,7 @@ _ecore_evas_x_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
}
ee->w = w;
ee->h = h;
if (ECORE_EVAS_RIGHT_ANGLED(ee))
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);
@ -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 (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((rotation == 0) || (rotation == 180))
{
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,7 +2004,7 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
}
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.h, ee->req.w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->req.w, ee->req.h);
@ -2014,7 +2014,7 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
/* int w, h; */
/* ecore_x_window_size_get(ee->prop.window, &w, &h); */
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((rotation == 0) || (rotation == 180))
{
evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
@ -2025,7 +2025,7 @@ _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 (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
@ -2053,7 +2053,7 @@ _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 (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
@ -3013,7 +3013,7 @@ _avoid_damage_do(Ecore_Evas *ee, int on)
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
if (ECORE_EVAS_RIGHT_ANGLED(ee))
if ((ee->rotation == 90) || (ee->rotation == 270))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
else
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);