From a1f9df4008b867a8780a2ca9f53a45c501fc89e9 Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Tue, 15 May 2012 17:37:42 +0000 Subject: [PATCH] [Elm] Flip now a container. SVN revision: 71126 --- src/lib/elm_flip.c | 2141 +++++++++++++++++++++++++++----------------------- src/lib/elm_flip.h | 4 +- src/lib/elm_mapbuf.h | 2 +- 3 files changed, 1176 insertions(+), 971 deletions(-) diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c index f30c415..bded50f 100644 --- a/src/lib/elm_flip.c +++ b/src/lib/elm_flip.c @@ -1,15 +1,18 @@ #include #include "elm_priv.h" +#include "elm_widget_container.h" -typedef struct _Widget_Data Widget_Data; -typedef struct _Slice Slice; -typedef struct _Vertex2 Vertex2; -typedef struct _Vertex3 Vertex3; +static const char FLIP_SMART_NAME[] = "elm_flip"; + +typedef struct _Elm_Flip_Smart_Data Elm_Flip_Smart_Data; +typedef struct _Slice Slice; +typedef struct _Vertex2 Vertex2; +typedef struct _Vertex3 Vertex3; struct _Slice { Evas_Object *obj; - double u[4], v[4], x[4], y[4], z[4]; + double u[4], v[4], x[4], y[4], z[4]; }; struct _Vertex2 @@ -22,112 +25,138 @@ struct _Vertex3 double x, y, z; }; -struct _Widget_Data +struct _Elm_Flip_Smart_Data { - Evas_Object *obj; - Ecore_Animator *animator; - double start, len; - Elm_Flip_Mode mode; - Evas_Object *clip; - Evas_Object *event[4]; + Elm_Widget_Smart_Data base; + + Evas_Object *clip; + Evas_Object *event[4]; struct - { - Evas_Object *content, *clip; - } front, back; - Ecore_Job *job; - Evas_Coord down_x, down_y, x, y, ox, oy, w, h; - Elm_Flip_Interaction intmode; - int dir; - double dir_hitsize[4]; - Eina_Bool dir_enabled[4]; - int slices_w, slices_h; - Slice **slices, **slices2; - - Eina_Bool state : 1; - Eina_Bool down : 1; - Eina_Bool finish : 1; - Eina_Bool started : 1; - Eina_Bool backflip : 1; - Eina_Bool pageflip : 1; + { + Evas_Object *content, *clip; + } front, back; + + Ecore_Animator *animator; + double start, len; + Ecore_Job *job; + Evas_Coord down_x, down_y, x, y, ox, oy, w, h; + Elm_Flip_Interaction intmode; + Elm_Flip_Mode mode; + int dir; + double dir_hitsize[4]; + Eina_Bool dir_enabled[4]; + int slices_w, slices_h; + Slice **slices, **slices2; + + Eina_Bool state : 1; + Eina_Bool down : 1; + Eina_Bool finish : 1; + Eina_Bool started : 1; + Eina_Bool backflip : 1; + Eina_Bool pageflip : 1; }; -static const char *widtype = NULL; -static void _del_hook(Evas_Object *obj); -static void _theme_hook(Evas_Object *obj); -static void _sizing_eval(Evas_Object *obj); -static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _sub_del(void *data, Evas_Object *obj, void *event_info); - -static void _state_slices_clear(Widget_Data *wd); -static void _configure(Evas_Object *obj); - static const char SIG_ANIMATE_BEGIN[] = "animate,begin"; static const char SIG_ANIMATE_DONE[] = "animate,done"; - -static const Evas_Smart_Cb_Description _signals[] = { +static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_ANIMATE_BEGIN, ""}, {SIG_ANIMATE_DONE, ""}, {NULL, NULL} }; +static Eina_Bool _flip(Evas_Object *obj); + +#define ELM_FLIP_DATA_GET(o, sd) \ + Elm_Flip_Smart_Data * sd = evas_object_smart_data_get(o) + +#define ELM_FLIP_DATA_GET_OR_RETURN(o, ptr) \ + ELM_FLIP_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } + +#define ELM_FLIP_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_FLIP_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } + +#define ELM_FLIP_CHECK(obj) \ + if (!obj || !elm_widget_type_check((obj), FLIP_SMART_NAME, __func__)) \ + return + +EVAS_SMART_SUBCLASS_NEW + (FLIP_SMART_NAME, _elm_flip, Elm_Container_Smart_Class, + Elm_Container_Smart_Class, elm_container_smart_class_get, _smart_callbacks); + static void -_del_hook(Evas_Object *obj) +_slice_free(Slice *sl) { - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (wd->animator) ecore_animator_del(wd->animator); - _state_slices_clear(wd); - free(wd); + evas_object_del(sl->obj); + free(sl); } static void -_theme_hook(Evas_Object *obj) +_state_slices_clear(Elm_Flip_Smart_Data *sd) { - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - _sizing_eval(obj); -} + int i, j, num; -static Eina_Bool -_elm_flip_focus_next_hook(const Evas_Object *obj, - Elm_Focus_Direction dir, Evas_Object **next) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return EINA_FALSE; + if (sd->slices) + { + num = 0; + for (j = 0; j < sd->slices_h; j++) + { + for (i = 0; i < sd->slices_w; i++) + { + if (sd->slices[num]) _slice_free(sd->slices[num]); + if (sd->slices2[num]) _slice_free(sd->slices2[num]); + num++; + } + } - /* Try Focus cycle in subitem */ - if (wd->state) - return elm_widget_focus_next_get(wd->front.content, dir, next); - else - return elm_widget_focus_next_get(wd->back.content, dir, next); + free(sd->slices); + free(sd->slices2); + sd->slices = NULL; + sd->slices2 = NULL; + } + + sd->slices_w = 0; + sd->slices_h = 0; } static void _sizing_eval(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord minw = -1, minh = -1, minw2 = -1, minh2 = -1; Evas_Coord maxw = -1, maxh = -1, maxw2 = -1, maxh2 = -1; int fingx = 0, fingy = 0; - if (!wd) return; - if (wd->front.content) - evas_object_size_hint_min_get(wd->front.content, &minw, &minh); - if (wd->back.content) - evas_object_size_hint_min_get(wd->back.content, &minw2, &minh2); - if (wd->front.content) - evas_object_size_hint_max_get(wd->front.content, &maxw, &maxh); - if (wd->back.content) - evas_object_size_hint_max_get(wd->back.content, &maxw2, &maxh2); + + ELM_FLIP_DATA_GET(obj, sd); + + if (sd->front.content) + evas_object_size_hint_min_get(sd->front.content, &minw, &minh); + if (sd->back.content) + evas_object_size_hint_min_get(sd->back.content, &minw2, &minh2); + if (sd->front.content) + evas_object_size_hint_max_get(sd->front.content, &maxw, &maxh); + if (sd->back.content) + evas_object_size_hint_max_get(sd->back.content, &maxw2, &maxh2); if (minw2 > minw) minw = minw2; if (minh2 > minh) minh = minh2; if ((maxw2 >= 0) && (maxw2 < maxw)) maxw = maxw2; if ((maxh2 >= 0) && (maxh2 < maxh)) maxh = maxh2; - if (wd->dir_enabled[0]) fingy++; - if (wd->dir_enabled[1]) fingy++; - if (wd->dir_enabled[2]) fingx++; - if (wd->dir_enabled[3]) fingx++; + if (sd->dir_enabled[0]) fingy++; + if (sd->dir_enabled[1]) fingy++; + if (sd->dir_enabled[2]) fingx++; + if (sd->dir_enabled[3]) fingx++; elm_coords_finger_size_adjust(fingx, &minw, fingy, &minh); @@ -135,119 +164,174 @@ _sizing_eval(Evas_Object *obj) evas_object_size_hint_max_set(obj, maxw, maxh); } +static Eina_Bool +_elm_flip_smart_theme(Evas_Object *obj) +{ + if (!ELM_WIDGET_CLASS(_elm_flip_parent_sc)->theme(obj)) return EINA_FALSE; + + _sizing_eval(obj); + + return EINA_TRUE; +} + +static Eina_Bool +_elm_flip_smart_focus_next(const Evas_Object *obj, + Elm_Focus_Direction dir, + Evas_Object **next) +{ + ELM_FLIP_DATA_GET(obj, sd); + + /* attempt to cycle focus on in sub-items */ + if (sd->state) + return elm_widget_focus_next_get(sd->front.content, dir, next); + else + return elm_widget_focus_next_get(sd->back.content, dir, next); +} + static void -_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_changed_size_hints_cb(void *data, + Evas *e __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Widget_Data *wd = elm_widget_data_get(data); - if (!wd) return; _sizing_eval(data); } -static void -_sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info) +static Eina_Bool +_elm_flip_smart_sub_object_add(Evas_Object *obj, + Evas_Object *sobj) { - Widget_Data *wd = elm_widget_data_get(obj); - Evas_Object *sub = event_info; - if (!wd) return; - if (sub == wd->front.content) + if (!ELM_WIDGET_CLASS(_elm_flip_parent_sc)->sub_object_add(obj, sobj)) + return EINA_FALSE; + + evas_object_smart_member_add(sobj, obj); + //FIXME: smart member clip could be reset by the obj. + evas_object_event_callback_add + (sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints_cb, obj); + + return EINA_TRUE; +} + +static Eina_Bool +_elm_flip_smart_sub_object_del(Evas_Object *obj, + Evas_Object *sobj) +{ + ELM_FLIP_DATA_GET(obj, sd); + + if (!ELM_WIDGET_CLASS(_elm_flip_parent_sc)->sub_object_del(obj, sobj)) + return EINA_FALSE; + + if (sobj == sd->front.content) { - evas_object_event_callback_del_full(sub, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - wd->front.content = NULL; - evas_object_hide(wd->front.clip); - _sizing_eval(obj); + sd->front.content = NULL; + evas_object_hide(sd->front.clip); } - else if (sub == wd->back.content) + else if (sobj == sd->back.content) { - evas_object_event_callback_del_full(sub, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - wd->back.content = NULL; - evas_object_hide(wd->back.clip); - _sizing_eval(obj); + sd->back.content = NULL; + evas_object_hide(sd->back.clip); } + + evas_object_smart_member_del(sobj); + evas_object_clip_unset(sobj); + + evas_object_event_callback_del_full + (sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints_cb, obj); + _sizing_eval(obj); + + return EINA_TRUE; } static Slice * -_slice_new(Widget_Data *wd, Evas_Object *obj) +_slice_new(Elm_Flip_Smart_Data *sd, + Evas_Object *obj) { Slice *sl; sl = calloc(1, sizeof(Slice)); if (!sl) return NULL; + sl->obj = evas_object_image_add(evas_object_evas_get(obj)); - elm_widget_sub_object_add(wd->obj, sl->obj); - evas_object_smart_member_add(sl->obj, wd->obj); + + evas_object_smart_member_add(sl->obj, ELM_WIDGET_DATA(sd)->obj); + evas_object_image_smooth_scale_set(sl->obj, EINA_FALSE); evas_object_pass_events_set(sl->obj, EINA_TRUE); evas_object_image_source_set(sl->obj, obj); - return sl; -} -static void -_slice_free(Slice *sl) -{ - evas_object_del(sl->obj); - free(sl); + return sl; } static void -_slice_apply(Widget_Data *wd, Slice *sl, Evas_Coord x __UNUSED__, - Evas_Coord y __UNUSED__, Evas_Coord w, Evas_Coord h __UNUSED__, - Evas_Coord ox, Evas_Coord oy, Evas_Coord ow, Evas_Coord oh) +_slice_apply(Elm_Flip_Smart_Data *sd, + Slice *sl, + Evas_Coord x __UNUSED__, + Evas_Coord y __UNUSED__, + Evas_Coord w, + Evas_Coord h __UNUSED__, + Evas_Coord ox, + Evas_Coord oy, + Evas_Coord ow, + Evas_Coord oh) { static Evas_Map *m = NULL; int i; if (!m) m = evas_map_new(4); if (!m) return; + evas_map_smooth_set(m, EINA_FALSE); for (i = 0; i < 4; i++) { evas_map_point_color_set(m, i, 255, 255, 255, 255); - if (wd->dir == 0) + if (sd->dir == 0) { int p[4] = { 0, 1, 2, 3 }; evas_map_point_coord_set(m, i, ox + sl->x[p[i]], oy + sl->y[p[i]], sl->z[p[i]]); - evas_map_point_image_uv_set(m, i, sl->u[p[i]] , sl->v[p[i]]); + evas_map_point_image_uv_set(m, i, sl->u[p[i]], sl->v[p[i]]); } - else if (wd->dir == 1) + else if (sd->dir == 1) { int p[4] = { 1, 0, 3, 2 }; evas_map_point_coord_set(m, i, ox + (w - sl->x[p[i]]), oy + sl->y[p[i]], sl->z[p[i]]); evas_map_point_image_uv_set(m, i, ow - sl->u[p[i]], sl->v[p[i]]); } - else if (wd->dir == 2) + else if (sd->dir == 2) { int p[4] = { 1, 0, 3, 2 }; evas_map_point_coord_set(m, i, ox + sl->y[p[i]], oy + sl->x[p[i]], sl->z[p[i]]); - evas_map_point_image_uv_set(m, i, sl->v[p[i]] , sl->u[p[i]]); + evas_map_point_image_uv_set(m, i, sl->v[p[i]], sl->u[p[i]]); } - else/* if (wd->dir == 3) will be this anyway */ + else /* if (sd->dir == 3) will be this anyway */ { int p[4] = { 0, 1, 2, 3 }; evas_map_point_coord_set(m, i, ox + sl->y[p[i]], oy + (w - sl->x[p[i]]), sl->z[p[i]]); - evas_map_point_image_uv_set(m, i, sl->v[p[i]] , oh - sl->u[p[i]]); + evas_map_point_image_uv_set(m, i, sl->v[p[i]], oh - sl->u[p[i]]); } } + evas_object_map_enable_set(sl->obj, EINA_TRUE); evas_object_image_fill_set(sl->obj, 0, 0, ow, oh); evas_object_map_set(sl->obj, m); } static void -_slice_3d(Widget_Data *wd __UNUSED__, Slice *sl, Evas_Coord x, Evas_Coord y, - Evas_Coord w, Evas_Coord h) +_slice_3d(Elm_Flip_Smart_Data *sd __UNUSED__, + Slice *sl, + Evas_Coord x, + Evas_Coord y, + Evas_Coord w, + Evas_Coord h) { Evas_Map *m = (Evas_Map *)evas_object_map_get(sl->obj); int i; if (!m) return; + // vanishing point is center of page, and focal dist is 1024 evas_map_util_3d_perspective(m, x + (w / 2), y + (h / 2), 0, 1024); for (i = 0; i < 4; i++) @@ -256,24 +340,33 @@ _slice_3d(Widget_Data *wd __UNUSED__, Slice *sl, Evas_Coord x, Evas_Coord y, evas_map_point_coord_get(m, i, &xx, &yy, &zz); evas_map_point_coord_set(m, i, xx, yy, 0); } + if (evas_map_util_clockwise_get(m)) evas_object_show(sl->obj); else evas_object_hide(sl->obj); + evas_object_map_set(sl->obj, m); } static void -_slice_light(Widget_Data *wd __UNUSED__, Slice *sl, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) +_slice_light(Elm_Flip_Smart_Data *sd __UNUSED__, + Slice *sl, + Evas_Coord x, + Evas_Coord y, + Evas_Coord w, + Evas_Coord h) { Evas_Map *m = (Evas_Map *)evas_object_map_get(sl->obj); int i; if (!m) return; + evas_map_util_3d_lighting(m, - // light position - // (centered over page 10 * h toward camera) - x + (w / 2) , y + (h / 2) , -10000, + /* light position + * (centered over page 10 * h toward camera) */ + x + (w / 2), y + (h / 2), -10000, 255, 255, 255, // light color - 0 , 0 , 0); // ambient minimum + 0, 0, 0); // ambient minimum + // multiply brightness by 1.2 to make lightish bits all white so we dont // add shading where we could otherwise be pure white for (i = 0; i < 4; i++) @@ -286,15 +379,25 @@ _slice_light(Widget_Data *wd __UNUSED__, Slice *sl, Evas_Coord x, Evas_Coord y, b = (double)b * 1.2; if (b > 255) b = 255; evas_map_point_color_set(m, i, r, g, b, a); } + evas_object_map_set(sl->obj, m); } static void -_slice_xyz(Widget_Data *wd __UNUSED__, Slice *sl, - double xx1, double yy1, double zz1, - double xx2, double yy2, double zz2, - double xx3, double yy3, double zz3, - double xx4, double yy4, double zz4) +_slice_xyz(Elm_Flip_Smart_Data *sd __UNUSED__, + Slice *sl, + double xx1, + double yy1, + double zz1, + double xx2, + double yy2, + double zz2, + double xx3, + double yy3, + double zz3, + double xx4, + double yy4, + double zz4) { sl->x[0] = xx1; sl->y[0] = yy1; sl->z[0] = zz1; sl->x[1] = xx2; sl->y[1] = yy2; sl->z[1] = zz2; @@ -303,11 +406,16 @@ _slice_xyz(Widget_Data *wd __UNUSED__, Slice *sl, } static void -_slice_uv(Widget_Data *wd __UNUSED__, Slice *sl, - double u1, double v1, - double u2, double v2, - double u3, double v3, - double u4, double v4) +_slice_uv(Elm_Flip_Smart_Data *sd __UNUSED__, + Slice *sl, + double u1, + double v1, + double u2, + double v2, + double u3, + double v3, + double u4, + double v4) { sl->u[0] = u1; sl->v[0] = v1; sl->u[1] = u2; sl->v[1] = v2; @@ -316,7 +424,11 @@ _slice_uv(Widget_Data *wd __UNUSED__, Slice *sl, } static void -_deform_point(Vertex2 *vi, Vertex3 *vo, double rho, double theta, double A) +_deform_point(Vertex2 *vi, + Vertex3 *vo, + double rho, + double theta, + double A) { // ^Y // | @@ -325,7 +437,7 @@ _deform_point(Vertex2 *vi, Vertex3 *vo, double rho, double theta, double A) // theta == cone angle (0 -> PI/2) // A == distance of cone apex from origin // rho == angle of cone from vertical axis (...-PI/2 to PI/2...) - Vertex3 v1; + Vertex3 v1; double d, r, b; d = sqrt((vi->x * vi->x) + pow(vi->y - A, 2)); @@ -342,68 +454,66 @@ _deform_point(Vertex2 *vi, Vertex3 *vo, double rho, double theta, double A) } static void -_interp_point(Vertex3 *vi1, Vertex3 *vi2, Vertex3 *vo, double v) +_interp_point(Vertex3 *vi1, + Vertex3 *vi2, + Vertex3 *vo, + double v) { vo->x = (v * vi2->x) + ((1.0 - v) * vi1->x); vo->y = (v * vi2->y) + ((1.0 - v) * vi1->y); vo->z = (v * vi2->z) + ((1.0 - v) * vi1->z); } -static void -_state_slices_clear(Widget_Data *wd) -{ - int i, j, num; - - if (wd->slices) - { - num = 0; - for (j = 0; j < wd->slices_h; j++) - { - for (i = 0; i < wd->slices_w; i++) - { - if (wd->slices[num]) _slice_free(wd->slices[num]); - if (wd->slices2[num]) _slice_free(wd->slices2[num]); - num++; - } - } - free(wd->slices); - free(wd->slices2); - wd->slices = NULL; - wd->slices2 = NULL; - } - wd->slices_w = 0; - wd->slices_h = 0; -} - static int -_slice_obj_color_sum(Slice *s, int p, int *r, int *g, int *b, int *a) +_slice_obj_color_sum(Slice *s, + int p, + int *r, + int *g, + int *b, + int *a) { Evas_Map *m; int rr = 0, gg = 0, bb = 0, aa = 0; if (!s) return 0; + m = (Evas_Map *)evas_object_map_get(s->obj); if (!m) return 0; + evas_map_point_color_get(m, p, &rr, &gg, &bb, &aa); *r += rr; *g += gg; *b += bb; *a += aa; + return 1; } static void -_slice_obj_color_set(Slice *s, int p, int r, int g, int b, int a) +_slice_obj_color_set(Slice *s, + int p, + int r, + int g, + int b, + int a) { Evas_Map *m; if (!s) return; - m = (Evas_Map *) evas_object_map_get(s->obj); + + m = (Evas_Map *)evas_object_map_get(s->obj); if (!m) return; + evas_map_point_color_set(m, p, r, g, b, a); evas_object_map_set(s->obj, m); } static void -_slice_obj_vert_color_merge(Slice *s1, int p1, Slice *s2, int p2, - Slice *s3, int p3, Slice *s4, int p4) +_slice_obj_vert_color_merge(Slice *s1, + int p1, + Slice *s2, + int p2, + Slice *s3, + int p3, + Slice *s4, + int p4) { int r = 0, g = 0, b = 0, a = 0, n = 0; @@ -422,47 +532,47 @@ _slice_obj_vert_color_merge(Slice *s1, int p1, Slice *s2, int p2, } static int -_state_update(Widget_Data *wd) +_state_update(Elm_Flip_Smart_Data *sd) { - Evas_Coord xx1, yy1, xx2, yy2, mx, my; - Evas_Coord x, y, w, h, ox, oy, ow, oh; - int i, j, num, nn, jump, num2; Slice *sl; + Vertex3 *tvo, *tvol; + Evas_Object *front, *back; + int i, j, num, nn, jump, num2; double b, minv = 0.0, minva, mgrad; + Evas_Coord xx1, yy1, xx2, yy2, mx, my; + Evas_Coord x, y, w, h, ox, oy, ow, oh; int gx, gy, gszw, gszh, gw, gh, col, row, nw, nh; double rho, A, theta, perc, percm, n, rhol, Al, thetal; - Vertex3 *tvo, *tvol; - Evas_Object *front, *back; - wd->backflip = EINA_TRUE; - if (wd->state) + sd->backflip = EINA_TRUE; + if (sd->state) { - front = wd->front.content; - back = wd->front.content; + front = sd->front.content; + back = sd->front.content; } else { - front = wd->back.content; - back = wd->back.content; + front = sd->back.content; + back = sd->back.content; } - evas_object_geometry_get(wd->obj, &x, &y, &w, &h); + evas_object_geometry_get(ELM_WIDGET_DATA(sd)->obj, &x, &y, &w, &h); ox = x; oy = y; ow = w; oh = h; - xx1 = wd->down_x; - yy1 = wd->down_y; - xx2 = wd->x; - yy2 = wd->y; + xx1 = sd->down_x; + yy1 = sd->down_y; + xx2 = sd->x; + yy2 = sd->y; - if (wd->dir == 0) + if (sd->dir == 0) { // no nothing. left drag is standard } - else if (wd->dir == 1) + else if (sd->dir == 1) { xx1 = (w - 1) - xx1; xx2 = (w - 1) - xx2; } - else if (wd->dir == 2) + else if (sd->dir == 2) { Evas_Coord tmp; @@ -470,7 +580,7 @@ _state_update(Widget_Data *wd) tmp = xx2; xx2 = yy2; yy2 = tmp; tmp = w; w = h; h = tmp; } - else/* if (wd->dir == 3) will be this anyway */ + else /* if (sd->dir == 3) will be this anyway */ { Evas_Coord tmp; @@ -486,22 +596,24 @@ _state_update(Widget_Data *wd) my = (yy1 + yy2) / 2; if (mx < 0) mx = 0; - else if (mx >= w) mx = w - 1; + else if (mx >= w) + mx = w - 1; if (my < 0) my = 0; - else if (my >= h) my = h - 1; + else if (my >= h) + my = h - 1; mgrad = (double)(yy1 - yy2) / (double)(xx1 - xx2); - if (mx < 1) mx = 1; // quick hack to keep curl line visible + if (mx < 1) mx = 1; // quick hack to keep curl line visible if (mgrad == 0.0) // special horizontal case - mgrad = 0.001; // quick dirty hack for now + mgrad = 0.001; // quick dirty hack for now // else - { - minv = 1.0 / mgrad; - // y = (m * x) + b - b = my + (minv * mx); - } + { + minv = 1.0 / mgrad; + // y = (m * x) + b + b = my + (minv * mx); + } if ((b >= -5) && (b <= (h + 5))) { if (minv > 0.0) // clamp to h @@ -519,9 +631,11 @@ _state_update(Widget_Data *wd) perc = (double)xx2 / (double)xx1; percm = (double)mx / (double)xx1; if (perc < 0.0) perc = 0.0; - else if (perc > 1.0) perc = 1.0; + else if (perc > 1.0) + perc = 1.0; if (percm < 0.0) percm = 0.0; - else if (percm > 1.0) percm = 1.0; + else if (percm > 1.0) + percm = 1.0; minva = atan(minv) / (M_PI / 2); if (minva < 0.0) minva = -minva; @@ -561,26 +675,26 @@ _state_update(Widget_Data *wd) nw = (w + gszw - 1) / gszw; nh = (h + gszh - 1) / gszh; - if ((wd->slices_w != nw) || (wd->slices_h != nh)) _state_slices_clear(wd); - wd->slices_w = nw; - wd->slices_h = nh; - if (!wd->slices) + if ((sd->slices_w != nw) || (sd->slices_h != nh)) _state_slices_clear(sd); + sd->slices_w = nw; + sd->slices_h = nh; + if (!sd->slices) { - wd->slices = calloc(wd->slices_w * wd->slices_h, sizeof(Slice *)); - if (!wd->slices) return 0; - wd->slices2 = calloc(wd->slices_w * wd->slices_h, sizeof(Slice *)); - if (!wd->slices2) + sd->slices = calloc(sd->slices_w * sd->slices_h, sizeof(Slice *)); + if (!sd->slices) return 0; + sd->slices2 = calloc(sd->slices_w * sd->slices_h, sizeof(Slice *)); + if (!sd->slices2) { - free(wd->slices); - wd->slices = NULL; + free(sd->slices); + sd->slices = NULL; return 0; } } - num = (wd->slices_w + 1) * (wd->slices_h + 1); + num = (sd->slices_w + 1) * (sd->slices_h + 1); tvo = alloca(sizeof(Vertex3) * num); - tvol = alloca(sizeof(Vertex3) * (wd->slices_w + 1)); + tvol = alloca(sizeof(Vertex3) * (sd->slices_w + 1)); for (col = 0, gx = 0; gx <= (w + gszw - 1); gx += gszw, col++) { @@ -615,10 +729,10 @@ _state_update(Widget_Data *wd) } } - jump = wd->slices_h + 1; + jump = sd->slices_h + 1; for (col = 0, gx = 0; gx < w; gx += gszw, col++) { - num = wd->slices_h * col; + num = sd->slices_h * col; num2 = jump * col; gw = gszw; @@ -628,7 +742,7 @@ _state_update(Widget_Data *wd) { Vertex3 vo[4]; - if (b > 0) nn = num + wd->slices_h - row - 1; + if (b > 0) nn = num + sd->slices_h - row - 1; else nn = num + row; gh = gszh; @@ -638,7 +752,15 @@ _state_update(Widget_Data *wd) vo[1] = tvo[num2 + row + jump]; vo[2] = tvo[num2 + row + jump + 1]; vo[3] = tvo[num2 + row + 1]; -#define SWP(a, b) do {typeof(a) vt; vt = (a); (a) = (b); (b) = vt;} while (0) + +#define SWP(a, b) \ + do { \ + typeof(a)vt; \ + vt = (a); \ + (a) = (b); \ + (b) = vt; \ + } while (0) + if (b > 0) { SWP(vo[0], vo[3]); @@ -650,211 +772,224 @@ _state_update(Widget_Data *wd) } // FRONT - sl = wd->slices[nn]; + sl = sd->slices[nn]; if (!sl) { - sl = _slice_new(wd, front); - wd->slices[nn] = sl; + sl = _slice_new(sd, front); + sd->slices[nn] = sl; } - _slice_xyz(wd, sl, + _slice_xyz(sd, sl, vo[0].x, vo[0].y, vo[0].z, vo[1].x, vo[1].y, vo[1].z, vo[2].x, vo[2].y, vo[2].z, vo[3].x, vo[3].y, vo[3].z); if (b <= 0) - _slice_uv(wd, sl, - gx, gy, gx + gw, gy, gx + gw, gy + gh, gx, gy + gh); + _slice_uv(sd, sl, + gx, gy, gx + gw, gy, gx + gw, gy + gh, gx, gy + gh); else - _slice_uv(wd, sl, + _slice_uv(sd, sl, gx, h - (gy + gh), gx + gw, h - (gy + gh), gx + gw, h - gy, gx, h - gy); // BACK - sl = wd->slices2[nn]; + sl = sd->slices2[nn]; if (!sl) { - sl = _slice_new(wd, back); - wd->slices2[nn] = sl; + sl = _slice_new(sd, back); + sd->slices2[nn] = sl; } - _slice_xyz(wd, sl, + _slice_xyz(sd, sl, vo[1].x, vo[1].y, vo[1].z, vo[0].x, vo[0].y, vo[0].z, vo[3].x, vo[3].y, vo[3].z, vo[2].x, vo[2].y, vo[2].z); - if (wd->backflip) + if (sd->backflip) { if (b <= 0) - _slice_uv(wd, sl, gx + gw, gy, gx, gy, gx, gy + gh, gx + gw, + _slice_uv(sd, sl, gx + gw, gy, gx, gy, gx, gy + gh, gx + gw, gy + gh); else - _slice_uv(wd, sl, gx + gw, h - (gy + gh), gx, h - (gy + gh), + _slice_uv(sd, sl, gx + gw, h - (gy + gh), gx, h - (gy + gh), gx, h - gy, gx + gw, h - gy); } else { if (b <= 0) - _slice_uv(wd, sl, w - (gx + gw), gy, w - (gx), gy, w - (gx), + _slice_uv(sd, sl, w - (gx + gw), gy, w - (gx), gy, w - (gx), gy + gh, w - (gx + gw), gy + gh); else - _slice_uv(wd, sl, w - (gx + gw), h - (gy + gh), w - (gx), - h - (gy + gh), w - (gx), h - gy, w - (gx + gw), + _slice_uv(sd, sl, w - (gx + gw), h - (gy + gh), w - (gx), + h - (gy + gh), w - (gx), h - gy, w - (gx + gw), h - gy); } } } - for (num = 0; num < wd->slices_h * wd->slices_w; num++) + for (num = 0; num < sd->slices_h * sd->slices_w; num++) { - _slice_apply(wd, wd->slices[num], x, y, w, h, ox, oy, ow, oh); - _slice_apply(wd, wd->slices2[num], x, y, w, h, ox, oy, ow, oh); - _slice_light(wd, wd->slices[num], ox, oy, ow, oh); - _slice_light(wd, wd->slices2[num], ox, oy, ow, oh); + _slice_apply(sd, sd->slices[num], x, y, w, h, ox, oy, ow, oh); + _slice_apply(sd, sd->slices2[num], x, y, w, h, ox, oy, ow, oh); + _slice_light(sd, sd->slices[num], ox, oy, ow, oh); + _slice_light(sd, sd->slices2[num], ox, oy, ow, oh); } - for (i = 0; i <= wd->slices_w; i++) + for (i = 0; i <= sd->slices_w; i++) { - num = i * wd->slices_h; - for (j = 0; j <= wd->slices_h; j++) + num = i * sd->slices_h; + for (j = 0; j <= sd->slices_h; j++) { Slice *s[4] = { NULL }, *s2[4] = { NULL }; if ((i > 0) && (j > 0)) - s[0] = wd->slices[num - 1 - wd->slices_h], - s2[0] = wd->slices2[num - 1 - wd->slices_h]; - if ((i < wd->slices_w) && (j > 0)) - s[1] = wd->slices[num - 1], - s2[1] = wd->slices2[num - 1]; - if ((i > 0) && (j < wd->slices_h)) - s[2] = wd->slices[num - wd->slices_h], - s2[2] = wd->slices2[num - wd->slices_h]; - if ((i < wd->slices_w) && (j < wd->slices_h)) - s[3] = wd->slices[num], - s2[3] = wd->slices2[num]; - switch (wd->dir) + s[0] = sd->slices[num - 1 - sd->slices_h], + s2[0] = sd->slices2[num - 1 - sd->slices_h]; + if ((i < sd->slices_w) && (j > 0)) + s[1] = sd->slices[num - 1], + s2[1] = sd->slices2[num - 1]; + if ((i > 0) && (j < sd->slices_h)) + s[2] = sd->slices[num - sd->slices_h], + s2[2] = sd->slices2[num - sd->slices_h]; + if ((i < sd->slices_w) && (j < sd->slices_h)) + s[3] = sd->slices[num], + s2[3] = sd->slices2[num]; + switch (sd->dir) { case 0: - _slice_obj_vert_color_merge(s[0], 2, s[1], 3, s[2], 1, s[3], 0); - _slice_obj_vert_color_merge(s2[0], 3, s2[1], 2, s2[2], 0, s2[3], 1); + _slice_obj_vert_color_merge + (s[0], 2, s[1], 3, s[2], 1, s[3], 0); + _slice_obj_vert_color_merge + (s2[0], 3, s2[1], 2, s2[2], 0, s2[3], 1); break; + case 1: - _slice_obj_vert_color_merge(s[0], 3, s[1], 2, s[2], 0, s[3], 1); - _slice_obj_vert_color_merge(s2[0], 2, s2[1], 3, s2[2], 1, s2[3], 0); + _slice_obj_vert_color_merge + (s[0], 3, s[1], 2, s[2], 0, s[3], 1); + _slice_obj_vert_color_merge + (s2[0], 2, s2[1], 3, s2[2], 1, s2[3], 0); break; + case 2: - _slice_obj_vert_color_merge(s[0], 3, s[1], 2, s[2], 0, s[3], 1); - _slice_obj_vert_color_merge(s2[0], 2, s2[1], 3, s2[2], 1, s2[3], 0); + _slice_obj_vert_color_merge + (s[0], 3, s[1], 2, s[2], 0, s[3], 1); + _slice_obj_vert_color_merge + (s2[0], 2, s2[1], 3, s2[2], 1, s2[3], 0); break; + default: - _slice_obj_vert_color_merge(s[0], 2, s[1], 3, s[2], 1, s[3], 0); - _slice_obj_vert_color_merge(s2[0], 3, s2[1], 2, s2[2], 0, s2[3], 1); + _slice_obj_vert_color_merge + (s[0], 2, s[1], 3, s[2], 1, s[3], 0); + _slice_obj_vert_color_merge + (s2[0], 3, s2[1], 2, s2[2], 0, s2[3], 1); } num++; } } - for (num = 0; num < wd->slices_h * wd->slices_w; num++) + for (num = 0; num < sd->slices_h * sd->slices_w; num++) { - _slice_3d(wd, wd->slices[num], ox, oy, ow, oh); - _slice_3d(wd, wd->slices2[num], ox, oy, ow, oh); + _slice_3d(sd, sd->slices[num], ox, oy, ow, oh); + _slice_3d(sd, sd->slices2[num], ox, oy, ow, oh); } return 1; } static void -_state_end(Widget_Data *wd) +_state_end(Elm_Flip_Smart_Data *sd) { - _state_slices_clear(wd); + _state_slices_clear(sd); } - static void -flip_show_hide(Evas_Object *obj) +_flip_show_hide(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); + ELM_FLIP_DATA_GET(obj, sd); if (elm_flip_front_visible_get(obj)) { - if (wd->pageflip) + if (sd->pageflip) { - if (wd->front.content) + if (sd->front.content) { - evas_object_move(wd->front.content, 4999, 4999); - evas_object_show(wd->front.clip); + evas_object_move(sd->front.content, 4999, 4999); + evas_object_show(sd->front.clip); } else - evas_object_hide(wd->front.clip); - if (wd->back.content) - evas_object_show(wd->back.clip); + evas_object_hide(sd->front.clip); + if (sd->back.content) + evas_object_show(sd->back.clip); else - evas_object_hide(wd->back.clip); + evas_object_hide(sd->back.clip); } else { - if (wd->front.content) - evas_object_show(wd->front.clip); + if (sd->front.content) + evas_object_show(sd->front.clip); else - evas_object_hide(wd->front.clip); - evas_object_hide(wd->back.clip); + evas_object_hide(sd->front.clip); + evas_object_hide(sd->back.clip); } } else { - if (wd->pageflip) + if (sd->pageflip) { - if (wd->front.content) - evas_object_show(wd->front.clip); + if (sd->front.content) + evas_object_show(sd->front.clip); else - evas_object_hide(wd->front.clip); - if (wd->back.content) + evas_object_hide(sd->front.clip); + if (sd->back.content) { - evas_object_move(wd->back.content, 4999, 4999); - evas_object_show(wd->back.clip); + evas_object_move(sd->back.content, 4999, 4999); + evas_object_show(sd->back.clip); } else - evas_object_hide(wd->back.clip); + evas_object_hide(sd->back.clip); } else { - if (wd->front.content) - evas_object_hide(wd->front.clip); + if (sd->front.content) + evas_object_hide(sd->front.clip); else - evas_object_hide(wd->front.clip); - if (wd->back.content) - evas_object_show(wd->back.clip); + evas_object_hide(sd->front.clip); + if (sd->back.content) + evas_object_show(sd->back.clip); else - evas_object_hide(wd->back.clip); + evas_object_hide(sd->back.clip); } } } static void -_flip_do(Evas_Object *obj, double t, Elm_Flip_Mode mode, int lin, int rev) +_flip_do(Evas_Object *obj, + double t, + Elm_Flip_Mode mode, + int lin, + int rev) { - Evas_Coord x, y, w, h; double p, deg, pp; Evas_Map *mf, *mb; + Evas_Coord x, y, w, h; Evas_Coord cx, cy, px, py, foc; int lx, ly, lz, lr, lg, lb, lar, lag, lab; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; + ELM_FLIP_DATA_GET(obj, sd); mf = evas_map_new(4); evas_map_smooth_set(mf, EINA_FALSE); mb = evas_map_new(4); evas_map_smooth_set(mb, EINA_FALSE); - if (wd->front.content) + if (sd->front.content) { - const char *type = evas_object_type_get(wd->front.content); + const char *type = evas_object_type_get(sd->front.content); // FIXME: only handles filled obj if ((type) && (!strcmp(type, "image"))) { int iw, ih; - evas_object_image_size_get(wd->front.content, &iw, &ih); - evas_object_geometry_get(wd->front.content, &x, &y, &w, &h); + evas_object_image_size_get(sd->front.content, &iw, &ih); + evas_object_geometry_get(sd->front.content, &x, &y, &w, &h); evas_map_util_points_populate_from_geometry(mf, x, y, w, h, 0); evas_map_point_image_uv_set(mf, 0, 0, 0); evas_map_point_image_uv_set(mf, 1, iw, 0); @@ -863,19 +998,19 @@ _flip_do(Evas_Object *obj, double t, Elm_Flip_Mode mode, int lin, int rev) } else { - evas_object_geometry_get(wd->front.content, &x, &y, &w, &h); + evas_object_geometry_get(sd->front.content, &x, &y, &w, &h); evas_map_util_points_populate_from_geometry(mf, x, y, w, h, 0); } } - if (wd->back.content) + if (sd->back.content) { - const char *type = evas_object_type_get(wd->back.content); + const char *type = evas_object_type_get(sd->back.content); if ((type) && (!strcmp(type, "image"))) { int iw, ih; - evas_object_image_size_get(wd->back.content, &iw, &ih); - evas_object_geometry_get(wd->back.content, &x, &y, &w, &h); + evas_object_image_size_get(sd->back.content, &iw, &ih); + evas_object_geometry_get(sd->back.content, &x, &y, &w, &h); evas_map_util_points_populate_from_geometry(mb, x, y, w, h, 0); evas_map_point_image_uv_set(mb, 0, 0, 0); evas_map_point_image_uv_set(mb, 1, iw, 0); @@ -884,7 +1019,7 @@ _flip_do(Evas_Object *obj, double t, Elm_Flip_Mode mode, int lin, int rev) } else { - evas_object_geometry_get(wd->back.content, &x, &y, &w, &h); + evas_object_geometry_get(sd->back.content, &x, &y, &w, &h); evas_map_util_points_populate_from_geometry(mb, x, y, w, h, 0); } } @@ -911,148 +1046,159 @@ _flip_do(Evas_Object *obj, double t, Elm_Flip_Mode mode, int lin, int rev) switch (mode) { case ELM_FLIP_ROTATE_Y_CENTER_AXIS: - p = 1.0 - t; - pp = p; - if (!lin) pp = (p * p); - p = 1.0 - pp; - if (wd->state) deg = 180.0 * p; - else deg = 180 + (180.0 * p); - if (rev) deg = -deg; - evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, 0); - evas_map_util_3d_rotate(mb, 0.0, 180 + deg, 0.0, cx, cy, 0); - break; + p = 1.0 - t; + pp = p; + if (!lin) pp = (p * p); + p = 1.0 - pp; + if (sd->state) deg = 180.0 * p; + else deg = 180 + (180.0 * p); + if (rev) deg = -deg; + evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, 0); + evas_map_util_3d_rotate(mb, 0.0, 180 + deg, 0.0, cx, cy, 0); + break; + case ELM_FLIP_ROTATE_X_CENTER_AXIS: - p = 1.0 - t; - pp = p; - if (!lin) pp = (p * p); - p = 1.0 - pp; - if (wd->state) deg = 180.0 * p; - else deg = 180 + (180.0 * p); - if (rev) deg = -deg; - evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, 0); - evas_map_util_3d_rotate(mb, 180.0 + deg, 0.0, 0.0, cx, cy, 0); - break; + p = 1.0 - t; + pp = p; + if (!lin) pp = (p * p); + p = 1.0 - pp; + if (sd->state) deg = 180.0 * p; + else deg = 180 + (180.0 * p); + if (rev) deg = -deg; + evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, 0); + evas_map_util_3d_rotate(mb, 180.0 + deg, 0.0, 0.0, cx, cy, 0); + break; + case ELM_FLIP_ROTATE_XZ_CENTER_AXIS: - p = 1.0 - t; - pp = p; - if (!lin) pp = (p * p); - p = 1.0 - pp; - if (wd->state) deg = 180.0 * p; - else deg = 180 + (180.0 * p); - if (rev) deg = -deg; - evas_map_util_3d_rotate(mf, deg, 0.0, deg, cx, cy, 0); - evas_map_util_3d_rotate(mb, 180 + deg, 0.0, 180 + deg, cx, cy, 0); - break; + p = 1.0 - t; + pp = p; + if (!lin) pp = (p * p); + p = 1.0 - pp; + if (sd->state) deg = 180.0 * p; + else deg = 180 + (180.0 * p); + if (rev) deg = -deg; + evas_map_util_3d_rotate(mf, deg, 0.0, deg, cx, cy, 0); + evas_map_util_3d_rotate(mb, 180 + deg, 0.0, 180 + deg, cx, cy, 0); + break; + case ELM_FLIP_ROTATE_YZ_CENTER_AXIS: - p = 1.0 - t; - pp = p; - if (!lin) pp = (p * p); - p = 1.0 - pp; - if (wd->state) deg = 180.0 * p; - else deg = 180 + (180.0 * p); - if (rev) deg = -deg; - evas_map_util_3d_rotate(mf, 0.0, deg, deg, cx, cy, 0); - evas_map_util_3d_rotate(mb, 0.0, 180.0 + deg, 180.0 + deg, cx, cy, 0); - break; + p = 1.0 - t; + pp = p; + if (!lin) pp = (p * p); + p = 1.0 - pp; + if (sd->state) deg = 180.0 * p; + else deg = 180 + (180.0 * p); + if (rev) deg = -deg; + evas_map_util_3d_rotate(mf, 0.0, deg, deg, cx, cy, 0); + evas_map_util_3d_rotate(mb, 0.0, 180.0 + deg, 180.0 + deg, cx, cy, 0); + break; + case ELM_FLIP_CUBE_LEFT: - p = 1.0 - t; - pp = p; - if (!lin) pp = (p * p); - p = 1.0 - pp; - deg = -90.0 * p; - if (wd->state) - { - evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, w / 2); - evas_map_util_3d_rotate(mb, 0.0, deg + 90, 0.0, cx, cy, w / 2); - } - else - { - evas_map_util_3d_rotate(mf, 0.0, deg + 90, 0.0, cx, cy, w / 2); - evas_map_util_3d_rotate(mb, 0.0, deg, 0.0, cx, cy, w / 2); - } - break; + p = 1.0 - t; + pp = p; + if (!lin) pp = (p * p); + p = 1.0 - pp; + deg = -90.0 * p; + if (sd->state) + { + evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, w / 2); + evas_map_util_3d_rotate(mb, 0.0, deg + 90, 0.0, cx, cy, w / 2); + } + else + { + evas_map_util_3d_rotate(mf, 0.0, deg + 90, 0.0, cx, cy, w / 2); + evas_map_util_3d_rotate(mb, 0.0, deg, 0.0, cx, cy, w / 2); + } + break; + case ELM_FLIP_CUBE_RIGHT: - p = 1.0 - t; - pp = p; - if (!lin) pp = (p * p); - p = 1.0 - pp; - deg = 90.0 * p; - if (wd->state) - { - evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, w / 2); - evas_map_util_3d_rotate(mb, 0.0, deg - 90, 0.0, cx, cy, w / 2); - } - else - { - evas_map_util_3d_rotate(mf, 0.0, deg - 90, 0.0, cx, cy, w / 2); - evas_map_util_3d_rotate(mb, 0.0, deg, 0.0, cx, cy, w / 2); - } - break; + p = 1.0 - t; + pp = p; + if (!lin) pp = (p * p); + p = 1.0 - pp; + deg = 90.0 * p; + if (sd->state) + { + evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, w / 2); + evas_map_util_3d_rotate(mb, 0.0, deg - 90, 0.0, cx, cy, w / 2); + } + else + { + evas_map_util_3d_rotate(mf, 0.0, deg - 90, 0.0, cx, cy, w / 2); + evas_map_util_3d_rotate(mb, 0.0, deg, 0.0, cx, cy, w / 2); + } + break; + case ELM_FLIP_CUBE_UP: - p = 1.0 - t; - pp = p; - if (!lin) pp = (p * p); - p = 1.0 - pp; - deg = -90.0 * p; - if (wd->state) - { - evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, h / 2); - evas_map_util_3d_rotate(mb, deg + 90, 0.0, 0.0, cx, cy, h / 2); - } - else - { - evas_map_util_3d_rotate(mf, deg + 90, 0.0, 0.0, cx, cy, h / 2); - evas_map_util_3d_rotate(mb, deg, 0.0, 0.0, cx, cy, h / 2); - } - break; + p = 1.0 - t; + pp = p; + if (!lin) pp = (p * p); + p = 1.0 - pp; + deg = -90.0 * p; + if (sd->state) + { + evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, h / 2); + evas_map_util_3d_rotate(mb, deg + 90, 0.0, 0.0, cx, cy, h / 2); + } + else + { + evas_map_util_3d_rotate(mf, deg + 90, 0.0, 0.0, cx, cy, h / 2); + evas_map_util_3d_rotate(mb, deg, 0.0, 0.0, cx, cy, h / 2); + } + break; + case ELM_FLIP_CUBE_DOWN: - p = 1.0 - t; - pp = p; - if (!lin) pp = (p * p); - p = 1.0 - pp; - deg = 90.0 * p; - if (wd->state) - { - evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, h / 2); - evas_map_util_3d_rotate(mb, deg - 90, 0.0, 0.0, cx, cy, h / 2); - } - else - { - evas_map_util_3d_rotate(mf, deg - 90, 0.0, 0.0, cx, cy, h / 2); - evas_map_util_3d_rotate(mb, deg, 0.0, 0.0, cx, cy, h / 2); - } - break; + p = 1.0 - t; + pp = p; + if (!lin) pp = (p * p); + p = 1.0 - pp; + deg = 90.0 * p; + if (sd->state) + { + evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, h / 2); + evas_map_util_3d_rotate(mb, deg - 90, 0.0, 0.0, cx, cy, h / 2); + } + else + { + evas_map_util_3d_rotate(mf, deg - 90, 0.0, 0.0, cx, cy, h / 2); + evas_map_util_3d_rotate(mb, deg, 0.0, 0.0, cx, cy, h / 2); + } + break; + case ELM_FLIP_PAGE_LEFT: break; + case ELM_FLIP_PAGE_RIGHT: break; + case ELM_FLIP_PAGE_UP: break; + case ELM_FLIP_PAGE_DOWN: break; + default: - break; + break; } - - if (wd->front.content) + if (sd->front.content) { evas_map_util_3d_lighting(mf, lx, ly, lz, lr, lg, lb, lar, lag, lab); evas_map_util_3d_perspective(mf, px, py, 0, foc); - evas_object_map_set(wd->front.content, mf); - evas_object_map_enable_set(wd->front.content, 1); - if (evas_map_util_clockwise_get(mf)) evas_object_show(wd->front.clip); - else evas_object_hide(wd->front.clip); + evas_object_map_set(sd->front.content, mf); + evas_object_map_enable_set(sd->front.content, 1); + if (evas_map_util_clockwise_get(mf)) evas_object_show(sd->front.clip); + else evas_object_hide(sd->front.clip); } - if (wd->back.content) + if (sd->back.content) { evas_map_util_3d_lighting(mb, lx, ly, lz, lr, lg, lb, lar, lag, lab); evas_map_util_3d_perspective(mb, px, py, 0, foc); - evas_object_map_set(wd->back.content, mb); - evas_object_map_enable_set(wd->back.content, 1); - if (evas_map_util_clockwise_get(mb)) evas_object_show(wd->back.clip); - else evas_object_hide(wd->back.clip); + evas_object_map_set(sd->back.content, mb); + evas_object_map_enable_set(sd->back.content, 1); + if (evas_map_util_clockwise_get(mb)) evas_object_show(sd->back.clip); + else evas_object_hide(sd->back.clip); } evas_map_free(mf); @@ -1060,179 +1206,191 @@ _flip_do(Evas_Object *obj, double t, Elm_Flip_Mode mode, int lin, int rev) } static void -_showhide(Evas_Object *obj) +_show_hide(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); + ELM_FLIP_DATA_GET(obj, sd); Evas_Coord x, y, w, h; - if (!wd) return; + if (!sd) return; evas_object_geometry_get(obj, &x, &y, &w, &h); - if (wd->front.content) + if (sd->front.content) { - if ((wd->pageflip) && (wd->state)) + if ((sd->pageflip) && (sd->state)) { - evas_object_move(wd->front.content, 4999, 4999); + evas_object_move(sd->front.content, 4999, 4999); } else { - if (!wd->animator) - evas_object_move(wd->front.content, x, y); + if (!sd->animator) + evas_object_move(sd->front.content, x, y); } - evas_object_resize(wd->front.content, w, h); + evas_object_resize(sd->front.content, w, h); } - if (wd->back.content) + if (sd->back.content) { - if ((wd->pageflip) && (!wd->state)) + if ((sd->pageflip) && (!sd->state)) { - evas_object_move(wd->back.content, 4999, 4999); + evas_object_move(sd->back.content, 4999, 4999); } else { - if (!wd->animator) - evas_object_move(wd->back.content, x, y); + if (!sd->animator) + evas_object_move(sd->back.content, x, y); } - evas_object_resize(wd->back.content, w, h); + evas_object_resize(sd->back.content, w, h); } +} +static void +_configure(Evas_Object *obj) +{ + Evas_Coord x, y, w, h; + Evas_Coord fsize; + + ELM_FLIP_DATA_GET(obj, sd); + + _show_hide(obj); + evas_object_geometry_get(obj, &x, &y, &w, &h); + // FIXME: manual flip wont get fixed + if (sd->animator) _flip(obj); + + if (sd->event[0]) + { + fsize = (double)w * sd->dir_hitsize[0]; + elm_coords_finger_size_adjust(0, NULL, 1, &fsize); + evas_object_move(sd->event[0], x, y); + evas_object_resize(sd->event[0], w, fsize); + } + if (sd->event[1]) + { + fsize = (double)w * sd->dir_hitsize[1]; + elm_coords_finger_size_adjust(0, NULL, 1, &fsize); + evas_object_move(sd->event[1], x, y + h - fsize); + evas_object_resize(sd->event[1], w, fsize); + } + if (sd->event[2]) + { + fsize = (double)h * sd->dir_hitsize[2]; + elm_coords_finger_size_adjust(1, &fsize, 0, NULL); + evas_object_move(sd->event[2], x, y); + evas_object_resize(sd->event[2], fsize, h); + } + if (sd->event[3]) + { + fsize = (double)h * sd->dir_hitsize[3]; + elm_coords_finger_size_adjust(1, &fsize, 0, NULL); + evas_object_move(sd->event[3], x + w - fsize, y); + evas_object_resize(sd->event[3], fsize, h); + } } static Eina_Bool _flip(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); - double t = ecore_loop_time_get() - wd->start; + double t; Evas_Coord w, h; - if (!wd) return ECORE_CALLBACK_CANCEL; - if (!wd->animator) return ECORE_CALLBACK_CANCEL; + ELM_FLIP_DATA_GET(obj, sd); - t = t / wd->len; + t = ecore_loop_time_get() - sd->start; + + if (!sd->animator) return ECORE_CALLBACK_CANCEL; + + t = t / sd->len; if (t > 1.0) t = 1.0; evas_object_geometry_get(obj, NULL, NULL, &w, &h); - if (wd->mode == ELM_FLIP_PAGE_LEFT) + if (sd->mode == ELM_FLIP_PAGE_LEFT) { - wd->dir = 0; - wd->started = EINA_TRUE; - wd->pageflip = EINA_TRUE; - wd->down_x = w - 1; - wd->down_y = h / 2; - wd->x = (1.0 - t) * wd->down_x; - wd->y = wd->down_y; - flip_show_hide(obj); - _state_update(wd); + sd->dir = 0; + sd->started = EINA_TRUE; + sd->pageflip = EINA_TRUE; + sd->down_x = w - 1; + sd->down_y = h / 2; + sd->x = (1.0 - t) * sd->down_x; + sd->y = sd->down_y; + _flip_show_hide(obj); + _state_update(sd); } - else if (wd->mode == ELM_FLIP_PAGE_RIGHT) + else if (sd->mode == ELM_FLIP_PAGE_RIGHT) { - wd->dir = 1; - wd->started = EINA_TRUE; - wd->pageflip = EINA_TRUE; - wd->down_x = 0; - wd->down_y = h / 2; - wd->x = (t) * w; - wd->y = wd->down_y; - flip_show_hide(obj); - _state_update(wd); + sd->dir = 1; + sd->started = EINA_TRUE; + sd->pageflip = EINA_TRUE; + sd->down_x = 0; + sd->down_y = h / 2; + sd->x = (t) * w; + sd->y = sd->down_y; + _flip_show_hide(obj); + _state_update(sd); } - else if (wd->mode == ELM_FLIP_PAGE_UP) + else if (sd->mode == ELM_FLIP_PAGE_UP) { - wd->dir = 2; - wd->started = EINA_TRUE; - wd->pageflip = EINA_TRUE; - wd->down_x = w / 2; - wd->down_y = h - 1; - wd->x = wd->down_x; - wd->y = (1.0 - t) * wd->down_y; - flip_show_hide(obj); - _state_update(wd); + sd->dir = 2; + sd->started = EINA_TRUE; + sd->pageflip = EINA_TRUE; + sd->down_x = w / 2; + sd->down_y = h - 1; + sd->x = sd->down_x; + sd->y = (1.0 - t) * sd->down_y; + _flip_show_hide(obj); + _state_update(sd); } - else if (wd->mode == ELM_FLIP_PAGE_DOWN) + else if (sd->mode == ELM_FLIP_PAGE_DOWN) { - wd->dir = 3; - wd->started = EINA_TRUE; - wd->pageflip = EINA_TRUE; - wd->down_x = w / 2; - wd->down_y = 0; - wd->x = wd->down_x; - wd->y = (t) * h; - flip_show_hide(obj); - _state_update(wd); + sd->dir = 3; + sd->started = EINA_TRUE; + sd->pageflip = EINA_TRUE; + sd->down_x = w / 2; + sd->down_y = 0; + sd->x = sd->down_x; + sd->y = (t) * h; + _flip_show_hide(obj); + _state_update(sd); } else - _flip_do(obj, t, wd->mode, 0, 0); + _flip_do(obj, t, sd->mode, 0, 0); if (t >= 1.0) { - wd->pageflip = EINA_FALSE; - _state_end(wd); - evas_object_map_enable_set(wd->front.content, 0); - evas_object_map_enable_set(wd->back.content, 0); + sd->pageflip = EINA_FALSE; + _state_end(sd); + evas_object_map_enable_set(sd->front.content, 0); + evas_object_map_enable_set(sd->back.content, 0); // FIXME: hack around evas rendering bug (only fix makes evas bitch-slow - evas_object_resize(wd->front.content, 0, 0); - evas_object_resize(wd->back.content, 0, 0); + evas_object_resize(sd->front.content, 0, 0); + evas_object_resize(sd->back.content, 0, 0); evas_smart_objects_calculate(evas_object_evas_get(obj)); // FIXME: end hack - wd->animator = NULL; - wd->state = !wd->state; + sd->animator = NULL; + sd->state = !sd->state; _configure(obj); - flip_show_hide(obj); + _flip_show_hide(obj); evas_object_smart_callback_call(obj, SIG_ANIMATE_DONE, NULL); + return ECORE_CALLBACK_CANCEL; } - return ECORE_CALLBACK_RENEW; -} - -static void -_configure(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord x, y, w, h; - Evas_Coord fsize; - if (!wd) return; - _showhide(obj); - evas_object_geometry_get(obj, &x, &y, &w, &h); - // FIXME: manual flip wont get fixed - if (wd->animator) _flip(obj); - - if (wd->event[0]) - { - fsize = (double)w * wd->dir_hitsize[0]; - elm_coords_finger_size_adjust(0, NULL, 1, &fsize); - evas_object_move(wd->event[0], x, y); - evas_object_resize(wd->event[0], w, fsize); - } - if (wd->event[1]) - { - fsize = (double)w * wd->dir_hitsize[1]; - elm_coords_finger_size_adjust(0, NULL, 1, &fsize); - evas_object_move(wd->event[1], x, y + h - fsize); - evas_object_resize(wd->event[1], w, fsize); - } - if (wd->event[2]) - { - fsize = (double)h * wd->dir_hitsize[2]; - elm_coords_finger_size_adjust(1, &fsize, 0, NULL); - evas_object_move(wd->event[2], x, y); - evas_object_resize(wd->event[2], fsize, h); - } - if (wd->event[3]) - { - fsize = (double)h * wd->dir_hitsize[3]; - elm_coords_finger_size_adjust(1, &fsize, 0, NULL); - evas_object_move(wd->event[3], x + w - fsize, y); - evas_object_resize(wd->event[3], fsize, h); - } + return ECORE_CALLBACK_RENEW; } +/* we have to have move/resize info up-to-date on those events. it + * happens that smarts callbacks on them happen before we have the new + * values, so using event callbacks instead */ static void -_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_on_move(void *data __UNUSED__, + Evas *e __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { _configure(obj); } static void -_resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +_on_resize(void *data __UNUSED__, + Evas *e __UNUSED__, + Evas_Object *obj, + void *event_info __UNUSED__) { _configure(obj); } @@ -1244,68 +1402,72 @@ _animate(void *data) } static double -_pos_get(Widget_Data *wd, int *rev, Elm_Flip_Mode *m) +_pos_get(Elm_Flip_Smart_Data *sd, + int *rev, + Elm_Flip_Mode *m) { Evas_Coord x, y, w, h; double t = 1.0; - evas_object_geometry_get(wd->obj, &x, &y, &w, &h); - switch (wd->intmode) + evas_object_geometry_get(ELM_WIDGET_DATA(sd)->obj, &x, &y, &w, &h); + switch (sd->intmode) { case ELM_FLIP_INTERACTION_ROTATE: case ELM_FLIP_INTERACTION_CUBE: - { - if (wd->dir == 0) - { - if (wd->down_x > 0) - t = 1.0 - ((double)wd->x / (double)wd->down_x); - *rev = 1; - } - else if (wd->dir == 1) - { - if (wd->down_x < w) - t = 1.0 - ((double)(w - wd->x) / (double)(w - wd->down_x)); - } - else if (wd->dir == 2) - { - if (wd->down_y > 0) - t = 1.0 - ((double)wd->y / (double)wd->down_y); - } - else if (wd->dir == 3) - { - if (wd->down_y < h) - t = 1.0 - ((double)(h - wd->y) / (double)(h - wd->down_y)); - *rev = 1; - } + { + if (sd->dir == 0) + { + if (sd->down_x > 0) + t = 1.0 - ((double)sd->x / (double)sd->down_x); + *rev = 1; + } + else if (sd->dir == 1) + { + if (sd->down_x < w) + t = 1.0 - ((double)(w - sd->x) / (double)(w - sd->down_x)); + } + else if (sd->dir == 2) + { + if (sd->down_y > 0) + t = 1.0 - ((double)sd->y / (double)sd->down_y); + } + else if (sd->dir == 3) + { + if (sd->down_y < h) + t = 1.0 - ((double)(h - sd->y) / (double)(h - sd->down_y)); + *rev = 1; + } - if (t < 0.0) t = 0.0; - else if (t > 1.0) t = 1.0; + if (t < 0.0) t = 0.0; + else if (t > 1.0) + t = 1.0; + + if ((sd->dir == 0) || (sd->dir == 1)) + { + if (sd->intmode == ELM_FLIP_INTERACTION_ROTATE) + *m = ELM_FLIP_ROTATE_Y_CENTER_AXIS; + else if (sd->intmode == ELM_FLIP_INTERACTION_CUBE) + { + if (*rev) + *m = ELM_FLIP_CUBE_LEFT; + else + *m = ELM_FLIP_CUBE_RIGHT; + } + } + else + { + if (sd->intmode == ELM_FLIP_INTERACTION_ROTATE) + *m = ELM_FLIP_ROTATE_X_CENTER_AXIS; + else if (sd->intmode == ELM_FLIP_INTERACTION_CUBE) + { + if (*rev) + *m = ELM_FLIP_CUBE_UP; + else + *m = ELM_FLIP_CUBE_DOWN; + } + } + } - if ((wd->dir == 0) || (wd->dir == 1)) - { - if (wd->intmode == ELM_FLIP_INTERACTION_ROTATE) - *m = ELM_FLIP_ROTATE_Y_CENTER_AXIS; - else if (wd->intmode == ELM_FLIP_INTERACTION_CUBE) - { - if (*rev) - *m = ELM_FLIP_CUBE_LEFT; - else - *m = ELM_FLIP_CUBE_RIGHT; - } - } - else - { - if (wd->intmode == ELM_FLIP_INTERACTION_ROTATE) - *m = ELM_FLIP_ROTATE_X_CENTER_AXIS; - else if (wd->intmode == ELM_FLIP_INTERACTION_CUBE) - { - if (*rev) - *m = ELM_FLIP_CUBE_UP; - else - *m = ELM_FLIP_CUBE_DOWN; - } - } - } default: break; } @@ -1313,72 +1475,78 @@ _pos_get(Widget_Data *wd, int *rev, Elm_Flip_Mode *m) } static Eina_Bool -_event_anim(void *data, double pos) +_event_anim(void *data, + double pos) { - Widget_Data *wd = data; + Elm_Flip_Smart_Data *sd = data; double p; p = ecore_animator_pos_map(pos, ECORE_POS_MAP_ACCELERATE, 0.0, 0.0); - if (wd->finish) + if (sd->finish) { - if (wd->dir == 0) - wd->x = wd->ox * (1.0 - p); - else if (wd->dir == 1) - wd->x = wd->ox + ((wd->w - wd->ox) * p); - else if (wd->dir == 2) - wd->y = wd->oy * (1.0 - p); - else if (wd->dir == 3) - wd->y = wd->oy + ((wd->h - wd->oy) * p); + if (sd->dir == 0) + sd->x = sd->ox * (1.0 - p); + else if (sd->dir == 1) + sd->x = sd->ox + ((sd->w - sd->ox) * p); + else if (sd->dir == 2) + sd->y = sd->oy * (1.0 - p); + else if (sd->dir == 3) + sd->y = sd->oy + ((sd->h - sd->oy) * p); } else { - if (wd->dir == 0) - wd->x = wd->ox + ((wd->w - wd->ox) * p); - else if (wd->dir == 1) - wd->x = wd->ox * (1.0 - p); - else if (wd->dir == 2) - wd->y = wd->oy + ((wd->h - wd->oy) * p); - else if (wd->dir == 3) - wd->y = wd->oy * (1.0 - p); + if (sd->dir == 0) + sd->x = sd->ox + ((sd->w - sd->ox) * p); + else if (sd->dir == 1) + sd->x = sd->ox * (1.0 - p); + else if (sd->dir == 2) + sd->y = sd->oy + ((sd->h - sd->oy) * p); + else if (sd->dir == 3) + sd->y = sd->oy * (1.0 - p); } - switch (wd->intmode) + switch (sd->intmode) { case ELM_FLIP_INTERACTION_NONE: break; + case ELM_FLIP_INTERACTION_ROTATE: case ELM_FLIP_INTERACTION_CUBE: - { - Elm_Flip_Mode m = ELM_FLIP_ROTATE_X_CENTER_AXIS; - int rev = 0; - p = _pos_get(wd, &rev, &m); - _flip_do(wd->obj, p, m, 1, rev); - } - break; + { + Elm_Flip_Mode m = ELM_FLIP_ROTATE_X_CENTER_AXIS; + int rev = 0; + p = _pos_get(sd, &rev, &m); + _flip_do(ELM_WIDGET_DATA(sd)->obj, p, m, 1, rev); + } + break; + case ELM_FLIP_INTERACTION_PAGE: - wd->pageflip = EINA_TRUE; + sd->pageflip = EINA_TRUE; _configure(data); - _state_update(wd); + _state_update(sd); break; + default: break; } if (pos < 1.0) return ECORE_CALLBACK_RENEW; - wd->pageflip = EINA_FALSE; - _state_end(wd); - evas_object_map_enable_set(wd->front.content, 0); - evas_object_map_enable_set(wd->back.content, 0); + sd->pageflip = EINA_FALSE; + _state_end(sd); + evas_object_map_enable_set(sd->front.content, 0); + evas_object_map_enable_set(sd->back.content, 0); // FIXME: hack around evas rendering bug (only fix makes evas bitch-slow - evas_object_resize(wd->front.content, 0, 0); - evas_object_resize(wd->back.content, 0, 0); - evas_smart_objects_calculate(evas_object_evas_get(wd->obj)); + evas_object_resize(sd->front.content, 0, 0); + evas_object_resize(sd->back.content, 0, 0); + evas_smart_objects_calculate + (evas_object_evas_get(ELM_WIDGET_DATA(sd)->obj)); // FIXME: end hack - wd->animator = NULL; - if (wd->finish) wd->state = !wd->state; - flip_show_hide(wd->obj); - _configure(wd->obj); - wd->animator = NULL; - evas_object_smart_callback_call(wd->obj, SIG_ANIMATE_DONE, NULL); + sd->animator = NULL; + if (sd->finish) sd->state = !sd->state; + _flip_show_hide(ELM_WIDGET_DATA(sd)->obj); + _configure(ELM_WIDGET_DATA(sd)->obj); + sd->animator = NULL; + evas_object_smart_callback_call + (ELM_WIDGET_DATA(sd)->obj, SIG_ANIMATE_DONE, NULL); return ECORE_CALLBACK_CANCEL; } @@ -1386,159 +1554,173 @@ _event_anim(void *data, double pos) static void _update_job(void *data) { - Widget_Data *wd = data; - double p; Elm_Flip_Mode m = ELM_FLIP_ROTATE_X_CENTER_AXIS; + Elm_Flip_Smart_Data *sd = data; int rev = 0; + double p; - wd->job = NULL; - switch (wd->intmode) + sd->job = NULL; + switch (sd->intmode) { case ELM_FLIP_INTERACTION_ROTATE: case ELM_FLIP_INTERACTION_CUBE: - p = _pos_get(wd, &rev, &m); - _flip_do(wd->obj, p, m, 1, rev); + p = _pos_get(sd, &rev, &m); + _flip_do(ELM_WIDGET_DATA(sd)->obj, p, m, 1, rev); break; + case ELM_FLIP_INTERACTION_PAGE: - wd->pageflip = EINA_TRUE; + sd->pageflip = EINA_TRUE; _configure(data); - _state_update(wd); + _state_update(sd); break; + default: break; } } static void -_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_down_cb(void *data, + Evas *e __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info) { - Evas_Object *fl = data; - Widget_Data *wd = elm_widget_data_get(fl); Evas_Event_Mouse_Down *ev = event_info; + Evas_Object *fl = data; Evas_Coord x, y, w, h; - if (!wd) return; + ELM_FLIP_DATA_GET(fl, sd); + if (ev->button != 1) return; - if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; - if (wd->animator) + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; + if (sd->animator) { - ecore_animator_del(wd->animator); - wd->animator = NULL; + ecore_animator_del(sd->animator); + sd->animator = NULL; } - wd->down = EINA_TRUE; - wd->started = EINA_FALSE; + sd->down = EINA_TRUE; + sd->started = EINA_FALSE; evas_object_geometry_get(data, &x, &y, &w, &h); - wd->x = ev->canvas.x - x; - wd->y = ev->canvas.y - y; - wd->w = w; - wd->h = h; - wd->down_x = wd->x; - wd->down_y = wd->y; + sd->x = ev->canvas.x - x; + sd->y = ev->canvas.y - y; + sd->w = w; + sd->h = h; + sd->down_x = sd->x; + sd->down_y = sd->y; } static void -_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_up_cb(void *data, + Evas *e __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info) { - Evas_Object *fl = data; - Widget_Data *wd = elm_widget_data_get(fl); Evas_Event_Mouse_Up *ev = event_info; + Evas_Object *fl = data; Evas_Coord x, y, w, h; double tm = 0.5; - if (!wd) return; + ELM_FLIP_DATA_GET(fl, sd); + if (ev->button != 1) return; - if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; - wd->down = 0; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; + + sd->down = 0; evas_object_geometry_get(data, &x, &y, &w, &h); - wd->x = ev->canvas.x - x; - wd->y = ev->canvas.y - y; - wd->w = w; - wd->h = h; - wd->ox = wd->x; - wd->oy = wd->y; - if (wd->job) + sd->x = ev->canvas.x - x; + sd->y = ev->canvas.y - y; + sd->w = w; + sd->h = h; + sd->ox = sd->x; + sd->oy = sd->y; + if (sd->job) { - ecore_job_del(wd->job); - wd->job = NULL; + ecore_job_del(sd->job); + sd->job = NULL; } - wd->finish = EINA_FALSE; - if (wd->dir == 0) + sd->finish = EINA_FALSE; + if (sd->dir == 0) { - tm = (double)wd->x / (double)wd->w; - if (wd->x < (wd->w / 2)) wd->finish = EINA_TRUE; + tm = (double)sd->x / (double)sd->w; + if (sd->x < (sd->w / 2)) sd->finish = EINA_TRUE; } - else if (wd->dir == 1) + else if (sd->dir == 1) { - if (wd->x > (wd->w / 2)) wd->finish = EINA_TRUE; - tm = 1.0 - ((double)wd->x / (double)wd->w); + if (sd->x > (sd->w / 2)) sd->finish = EINA_TRUE; + tm = 1.0 - ((double)sd->x / (double)sd->w); } - else if (wd->dir == 2) + else if (sd->dir == 2) { - if (wd->y < (wd->h / 2)) wd->finish = EINA_TRUE; - tm = (double)wd->y / (double)wd->h; + if (sd->y < (sd->h / 2)) sd->finish = EINA_TRUE; + tm = (double)sd->y / (double)sd->h; } - else if (wd->dir == 3) + else if (sd->dir == 3) { - if (wd->y > (wd->h / 2)) wd->finish = EINA_TRUE; - tm = 1.0 - ((double)wd->y / (double)wd->h); + if (sd->y > (sd->h / 2)) sd->finish = EINA_TRUE; + tm = 1.0 - ((double)sd->y / (double)sd->h); } if (tm < 0.01) tm = 0.01; - else if (tm > 0.99) tm = 0.99; - if (!wd->finish) tm = 1.0 - tm; + else if (tm > 0.99) + tm = 0.99; + if (!sd->finish) tm = 1.0 - tm; tm *= 1.0; // FIXME: config for anim time - if (wd->animator) ecore_animator_del(wd->animator); - wd->animator = ecore_animator_timeline_add(tm, _event_anim, wd); - _event_anim(wd, 0.0); + if (sd->animator) ecore_animator_del(sd->animator); + sd->animator = ecore_animator_timeline_add(tm, _event_anim, sd); + _event_anim(sd, 0.0); } static void -_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) +_move_cb(void *data, + Evas *e __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info) { - Evas_Object *fl = data; - Widget_Data *wd = elm_widget_data_get(fl); Evas_Event_Mouse_Move *ev = event_info; + Evas_Object *fl = data; Evas_Coord x, y, w, h; - if (!wd) return; - if (!wd->down) return; - if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; + ELM_FLIP_DATA_GET(fl, sd); + + if (!sd->down) return; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; evas_object_geometry_get(data, &x, &y, &w, &h); - wd->x = ev->cur.canvas.x - x; - wd->y = ev->cur.canvas.y - y; - wd->w = w; - wd->h = h; - if (!wd->started) + sd->x = ev->cur.canvas.x - x; + sd->y = ev->cur.canvas.y - y; + sd->w = w; + sd->h = h; + if (!sd->started) { Evas_Coord dx, dy; - dx = wd->x - wd->down_x; - dy = wd->y - wd->down_y; + dx = sd->x - sd->down_x; + dy = sd->y - sd->down_y; if (((dx * dx) + (dy * dy)) > (_elm_config->finger_size * _elm_config->finger_size / 4)) { - wd->dir = 0; - if ((wd->x > (w / 2)) && - (dx < 0) && (abs(dx) > abs(dy))) - wd->dir = 0; // left - else if ((wd->x < (w / 2)) && (dx >= 0) && + sd->dir = 0; + if ((sd->x > (w / 2)) && + (dx < 0) && (abs(dx) > abs(dy))) + sd->dir = 0; // left + else if ((sd->x < (w / 2)) && (dx >= 0) && (abs(dx) > abs(dy))) - wd->dir = 1; // right - else if ((wd->y > (h / 2)) && (dy < 0) && (abs(dy) >= abs(dx))) - wd->dir = 2; // up - else if ((wd->y < (h / 2)) && (dy >= 0) && (abs(dy) >= abs(dx))) - wd->dir = 3; // down - wd->started = EINA_TRUE; - if (wd->intmode == ELM_FLIP_INTERACTION_PAGE) - wd->pageflip = EINA_TRUE; - flip_show_hide(data); + sd->dir = 1; // right + else if ((sd->y > (h / 2)) && (dy < 0) && (abs(dy) >= abs(dx))) + sd->dir = 2; // up + else if ((sd->y < (h / 2)) && (dy >= 0) && (abs(dy) >= abs(dx))) + sd->dir = 3; // down + sd->started = EINA_TRUE; + if (sd->intmode == ELM_FLIP_INTERACTION_PAGE) + sd->pageflip = EINA_TRUE; + _flip_show_hide(data); evas_smart_objects_calculate(evas_object_evas_get(data)); _flip(data); - // FIXME: hack around evas rendering bug (only fix makes evas bitch-slow) - evas_object_map_enable_set(wd->front.content, EINA_FALSE); - evas_object_map_enable_set(wd->back.content, EINA_FALSE); + // FIXME: hack around evas rendering bug (only fix makes + // evas bitch-slow) + evas_object_map_enable_set(sd->front.content, EINA_FALSE); + evas_object_map_enable_set(sd->back.content, EINA_FALSE); // FIXME: XXX why does this bork interactive flip?? -// evas_object_resize(wd->front.content, 0, 0); -// evas_object_resize(wd->back.content, 0, 0); +// evas_object_resize(sd->front.content, 0, 0); +// evas_object_resize(sd->back.content, 0, 0); evas_smart_objects_calculate(evas_object_evas_get(data)); _configure(obj); // FIXME: end hack @@ -1546,199 +1728,195 @@ _move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *even } else return; } + ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; - if (wd->job) ecore_job_del(wd->job); - wd->job = ecore_job_add(_update_job, wd); + if (sd->job) ecore_job_del(sd->job); + sd->job = ecore_job_add(_update_job, sd); } -static void -_flip_content_front_set(Evas_Object *obj, Evas_Object *content) +static Eina_Bool +_flip_content_set(Evas_Object *obj, + Evas_Object *content, + Eina_Bool front) { - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - int i; + Evas_Object **cont; - if (wd->front.content == content) return; - if (wd->front.content) evas_object_del(wd->front.content); - wd->front.content = content; - if (content) - { - elm_widget_sub_object_add(obj, content); - evas_object_smart_member_add(content, obj); - //FIXME: smart member clip could be reset by the obj. - evas_object_clip_set(content, wd->front.clip); - evas_object_event_callback_add(content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - _sizing_eval(obj); - } + ELM_FLIP_DATA_GET(obj, sd); - // force calc to contents are the right size before transition - evas_smart_objects_calculate(evas_object_evas_get(obj)); - flip_show_hide(obj); - _configure(obj); - if (wd->intmode != ELM_FLIP_INTERACTION_NONE) - { - for (i = 0; i < 4; i++) evas_object_raise(wd->event[i]); - } -} + cont = front ? &(sd->front.content) : &(sd->back.content); -static void -_flip_content_back_set(Evas_Object *obj, Evas_Object *content) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; + if (*cont == content) return EINA_TRUE; + + if (*cont) evas_object_del(*cont); + *cont = content; - int i; - if (wd->back.content == content) return; - if (wd->back.content) evas_object_del(wd->back.content); - wd->back.content = content; if (content) { elm_widget_sub_object_add(obj, content); - evas_object_smart_member_add(content, obj); - //FIXME: smart member clip could be reset by the obj. - evas_object_clip_set(content, wd->back.clip); - evas_object_event_callback_add(content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - _sizing_eval(obj); + //evas_object_smart_member_add(content, obj); + evas_object_clip_set + (content, front ? sd->front.clip : sd->back.clip); } // force calc to contents are the right size before transition evas_smart_objects_calculate(evas_object_evas_get(obj)); - flip_show_hide(obj); + //evas_object_smart_calculate(obj); + _flip_show_hide(obj); _configure(obj); - if (wd->intmode != ELM_FLIP_INTERACTION_NONE) + _sizing_eval(obj); + + if (sd->intmode != ELM_FLIP_INTERACTION_NONE) { - for (i = 0; i < 4; i++) evas_object_raise(wd->event[i]); + for (i = 0; i < 4; i++) + evas_object_raise(sd->event[i]); } + + return EINA_TRUE; } static Evas_Object * -_content_front_unset(Evas_Object *obj) +_flip_content_unset(Evas_Object *obj, + Eina_Bool front) { - Widget_Data *wd = elm_widget_data_get(obj); - if ((!wd) || (!wd->front.content)) return NULL; + Evas_Object *content; + Evas_Object **cont; - Evas_Object *content = wd->front.content; - elm_widget_sub_object_del(obj, content); - evas_object_smart_member_del(content); - return content; -} + ELM_FLIP_DATA_GET(obj, sd); -static Evas_Object * -_content_back_unset(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if ((!wd) || (!wd->back.content)) return NULL; + cont = front ? &(sd->front.content) : &(sd->back.content); - Evas_Object *content = wd->back.content; + if (!*cont) return NULL; + + content = *cont; elm_widget_sub_object_del(obj, content); - evas_object_smart_member_del(content); + return content; } -static void -_content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) +static Eina_Bool +_elm_flip_smart_content_set(Evas_Object *obj, + const char *part, + Evas_Object *content) { - ELM_CHECK_WIDTYPE(obj, widtype); - if (!part || !strcmp(part, "front")) - _flip_content_front_set(obj, content); + return _flip_content_set(obj, content, EINA_TRUE); else if (!strcmp(part, "back")) - _flip_content_back_set(obj, content); + return _flip_content_set(obj, content, EINA_FALSE); + + return EINA_FALSE; } static Evas_Object * -_content_get_hook(const Evas_Object *obj, const char *part) +_elm_flip_smart_content_get(const Evas_Object *obj, + const char *part) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; + ELM_FLIP_DATA_GET(obj, sd); if (!part || !strcmp(part, "front")) - return wd->front.content; + return sd->front.content; else if (!strcmp(part, "back")) - return wd->back.content; + return sd->back.content; return NULL; } static Evas_Object * -_content_unset_hook(Evas_Object *obj, const char *part) +_elm_flip_smart_content_unset(Evas_Object *obj, + const char *part) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - if (!part || !strcmp(part, "front")) - return _content_front_unset(obj); + return _flip_content_unset(obj, EINA_TRUE); else if (!strcmp(part, "back")) - return _content_back_unset(obj); + return _flip_content_unset(obj, EINA_FALSE); return NULL; } +static void +_elm_flip_smart_add(Evas_Object *obj) +{ + EVAS_SMART_DATA_ALLOC(obj, Elm_Flip_Smart_Data); + + ELM_WIDGET_CLASS(_elm_flip_parent_sc)->base.add(obj); + + priv->clip = evas_object_rectangle_add(evas_object_evas_get(obj)); + evas_object_static_clip_set(priv->clip, EINA_TRUE); + evas_object_move(priv->clip, -49999, -49999); + evas_object_resize(priv->clip, 99999, 99999); + evas_object_smart_member_add(priv->clip, obj); + + priv->front.clip = evas_object_rectangle_add(evas_object_evas_get(obj)); + evas_object_static_clip_set(priv->front.clip, EINA_TRUE); + evas_object_data_set(priv->front.clip, "_elm_leaveme", obj); + evas_object_move(priv->front.clip, -49999, -49999); + evas_object_resize(priv->front.clip, 99999, 99999); + evas_object_smart_member_add(priv->front.clip, obj); + evas_object_clip_set(priv->front.clip, priv->clip); + + priv->back.clip = evas_object_rectangle_add(evas_object_evas_get(obj)); + evas_object_static_clip_set(priv->back.clip, EINA_TRUE); + evas_object_data_set(priv->back.clip, "_elm_leaveme", obj); + evas_object_move(priv->back.clip, -49999, -49999); + evas_object_resize(priv->back.clip, 99999, 99999); + evas_object_smart_member_add(priv->back.clip, obj); + evas_object_clip_set(priv->back.clip, priv->clip); + + evas_object_event_callback_add + (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints_cb, obj); + + evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_resize, NULL); + + priv->state = EINA_TRUE; + priv->intmode = ELM_FLIP_INTERACTION_NONE; + + elm_widget_can_focus_set(obj, EINA_FALSE); + + _sizing_eval(obj); +} + +static void +_elm_flip_smart_del(Evas_Object *obj) +{ + ELM_FLIP_DATA_GET(obj, sd); + + if (sd->animator) ecore_animator_del(sd->animator); + _state_slices_clear(sd); + + ELM_WIDGET_CLASS(_elm_flip_parent_sc)->base.del(obj); +} + +static void +_elm_flip_smart_set_user(Elm_Container_Smart_Class *sc) +{ + ELM_WIDGET_CLASS(sc)->base.add = _elm_flip_smart_add; + ELM_WIDGET_CLASS(sc)->base.del = _elm_flip_smart_del; + + ELM_WIDGET_CLASS(sc)->theme = _elm_flip_smart_theme; + ELM_WIDGET_CLASS(sc)->focus_next = _elm_flip_smart_focus_next; + ELM_WIDGET_CLASS(sc)->sub_object_add = _elm_flip_smart_sub_object_add; + ELM_WIDGET_CLASS(sc)->sub_object_del = _elm_flip_smart_sub_object_del; + + sc->content_set = _elm_flip_smart_content_set; + sc->content_get = _elm_flip_smart_content_get; + sc->content_unset = _elm_flip_smart_content_unset; +} + EAPI Evas_Object * elm_flip_add(Evas_Object *parent) { - Evas_Object *obj; Evas *e; - Widget_Data *wd; + Evas_Object *obj; - ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); + EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); - ELM_SET_WIDTYPE(widtype, "flip"); - elm_widget_type_set(obj, "flip"); - elm_widget_sub_object_add(parent, obj); - elm_widget_data_set(obj, wd); - elm_widget_del_hook_set(obj, _del_hook); - elm_widget_theme_hook_set(obj, _theme_hook); - elm_widget_focus_next_hook_set(obj, _elm_flip_focus_next_hook); - elm_widget_can_focus_set(obj, EINA_FALSE); - elm_widget_content_set_hook_set(obj, _content_set_hook); - elm_widget_content_get_hook_set(obj, _content_get_hook); - elm_widget_content_unset_hook_set(obj, _content_unset_hook); - - wd->obj = obj; - - wd->clip = evas_object_rectangle_add(e); - evas_object_static_clip_set(wd->clip, EINA_TRUE); - evas_object_move(wd->clip, -49999, -49999); - evas_object_resize(wd->clip, 99999, 99999); - elm_widget_sub_object_add(obj, wd->clip); - evas_object_smart_member_add(wd->clip, obj); - - wd->front.clip = evas_object_rectangle_add(e); - evas_object_static_clip_set(wd->front.clip, EINA_TRUE); - evas_object_data_set(wd->front.clip, "_elm_leaveme", obj); - evas_object_move(wd->front.clip, -49999, -49999); - evas_object_resize(wd->front.clip, 99999, 99999); - elm_widget_sub_object_add(obj, wd->front.clip); - evas_object_smart_member_add(wd->front.clip, obj); - evas_object_clip_set(wd->front.clip, wd->clip); - - wd->back.clip = evas_object_rectangle_add(e); - evas_object_static_clip_set(wd->back.clip, EINA_TRUE); - evas_object_data_set(wd->back.clip, "_elm_leaveme", obj); - evas_object_move(wd->back.clip, -49999, -49999); - evas_object_resize(wd->back.clip, 99999, 99999); - elm_widget_sub_object_add(obj, wd->back.clip); - evas_object_smart_member_add(wd->back.clip, obj); - evas_object_clip_set(wd->back.clip, wd->clip); - - evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); - evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, NULL); - evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, NULL); - evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj);; - - evas_object_smart_callbacks_descriptions_set(obj, _signals); - - wd->state = EINA_TRUE; - wd->intmode = ELM_FLIP_INTERACTION_NONE; + e = evas_object_evas_get(parent); + if (!e) return NULL; - _sizing_eval(obj); + obj = evas_object_smart_add(e, _elm_flip_smart_class_new()); + + if (!elm_widget_sub_object_add(parent, obj)) + ERR("could not add %p as sub object of %p", obj, parent); return obj; } @@ -1746,46 +1924,49 @@ elm_flip_add(Evas_Object *parent) EAPI Eina_Bool elm_flip_front_visible_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return EINA_FALSE; - return wd->state; + ELM_FLIP_CHECK(obj) EINA_FALSE; + ELM_FLIP_DATA_GET(obj, sd); + + return sd->state; } EAPI void -elm_flip_perspective_set(Evas_Object *obj, Evas_Coord foc __UNUSED__, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__) +elm_flip_perspective_set(Evas_Object *obj, + Evas_Coord foc __UNUSED__, + Evas_Coord x __UNUSED__, + Evas_Coord y __UNUSED__) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; + ELM_FLIP_CHECK(obj); } // FIXME: add ambient and lighting control EAPI void -elm_flip_go(Evas_Object *obj, Elm_Flip_Mode mode) +elm_flip_go(Evas_Object *obj, + Elm_Flip_Mode mode) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (!wd->animator) wd->animator = ecore_animator_add(_animate, obj); - flip_show_hide(obj); - wd->mode = mode; - wd->start = ecore_loop_time_get(); - wd->len = 0.5; // FIXME: make config val - if ((wd->mode == ELM_FLIP_PAGE_LEFT) || - (wd->mode == ELM_FLIP_PAGE_RIGHT) || - (wd->mode == ELM_FLIP_PAGE_UP) || - (wd->mode == ELM_FLIP_PAGE_DOWN)) - wd->pageflip = EINA_TRUE; + ELM_FLIP_CHECK(obj); + ELM_FLIP_DATA_GET(obj, sd); + + if (!sd->animator) sd->animator = ecore_animator_add(_animate, obj); + _flip_show_hide(obj); + + sd->mode = mode; + sd->start = ecore_loop_time_get(); + sd->len = 0.5; // FIXME: make config val + if ((sd->mode == ELM_FLIP_PAGE_LEFT) || + (sd->mode == ELM_FLIP_PAGE_RIGHT) || + (sd->mode == ELM_FLIP_PAGE_UP) || + (sd->mode == ELM_FLIP_PAGE_DOWN)) + sd->pageflip = EINA_TRUE; // force calc to contents are the right size before transition evas_smart_objects_calculate(evas_object_evas_get(obj)); _flip(obj); // FIXME: hack around evas rendering bug (only fix makes evas bitch-slow) - evas_object_map_enable_set(wd->front.content, 0); - evas_object_map_enable_set(wd->back.content, 0); - evas_object_resize(wd->front.content, 0, 0); - evas_object_resize(wd->back.content, 0, 0); + evas_object_map_enable_set(sd->front.content, 0); + evas_object_map_enable_set(sd->back.content, 0); + evas_object_resize(sd->front.content, 0, 0); + evas_object_resize(sd->back.content, 0, 0); evas_smart_objects_calculate(evas_object_evas_get(obj)); _configure(obj); // FIXME: end hack @@ -1793,48 +1974,48 @@ elm_flip_go(Evas_Object *obj, Elm_Flip_Mode mode) } EAPI void -elm_flip_interaction_set(Evas_Object *obj, Elm_Flip_Interaction mode) +elm_flip_interaction_set(Evas_Object *obj, + Elm_Flip_Interaction mode) { - ELM_CHECK_WIDTYPE(obj, widtype); int i; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (wd->intmode == mode) return; - wd->intmode = mode; + + ELM_FLIP_CHECK(obj); + ELM_FLIP_DATA_GET(obj, sd); + + if (sd->intmode == mode) return; + sd->intmode = mode; for (i = 0; i < 4; i++) { - if (wd->intmode == ELM_FLIP_INTERACTION_NONE) + if (sd->intmode == ELM_FLIP_INTERACTION_NONE) { - if (wd->event[i]) + if (sd->event[i]) { - evas_object_del(wd->event[i]); - wd->event[i] = NULL; + evas_object_del(sd->event[i]); + sd->event[i] = NULL; } } else { - if ((wd->dir_enabled[i]) && (!wd->event[i])) + if ((sd->dir_enabled[i]) && (!sd->event[i])) { Evas *e = evas_object_evas_get(obj); - wd->event[i] = evas_object_rectangle_add(e); - elm_widget_sub_object_add(obj, wd->event[i]); - evas_object_data_set(wd->event[i], "_elm_leaveme", obj); - evas_object_clip_set(wd->event[i], evas_object_clip_get(obj)); - evas_object_color_set(wd->event[i], 0, 0, 0, 0); - evas_object_show(wd->event[i]); - evas_object_smart_member_add(wd->event[i], obj); - evas_object_event_callback_add(wd->event[i], - EVAS_CALLBACK_MOUSE_DOWN, - _down_cb, obj); - evas_object_event_callback_add(wd->event[i], - EVAS_CALLBACK_MOUSE_UP, - _up_cb, obj); - evas_object_event_callback_add(wd->event[i], - EVAS_CALLBACK_MOUSE_MOVE, - _move_cb, obj); + sd->event[i] = evas_object_rectangle_add(e); + + evas_object_data_set(sd->event[i], "_elm_leaveme", obj); + evas_object_clip_set(sd->event[i], evas_object_clip_get(obj)); + evas_object_color_set(sd->event[i], 0, 0, 0, 0); + evas_object_show(sd->event[i]); + evas_object_smart_member_add(sd->event[i], obj); + evas_object_event_callback_add + (sd->event[i], EVAS_CALLBACK_MOUSE_DOWN, _down_cb, obj); + evas_object_event_callback_add + (sd->event[i], EVAS_CALLBACK_MOUSE_UP, _up_cb, obj); + evas_object_event_callback_add + (sd->event[i], EVAS_CALLBACK_MOUSE_MOVE, _move_cb, obj); } } } + _sizing_eval(obj); _configure(obj); } @@ -1842,99 +2023,121 @@ elm_flip_interaction_set(Evas_Object *obj, Elm_Flip_Interaction mode) EAPI Elm_Flip_Interaction elm_flip_interaction_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) ELM_FLIP_INTERACTION_NONE; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return ELM_FLIP_INTERACTION_NONE; - return wd->intmode; + ELM_FLIP_CHECK(obj) ELM_FLIP_INTERACTION_NONE; + ELM_FLIP_DATA_GET(obj, sd); + + return sd->intmode; } EAPI void -elm_flip_interaction_direction_enabled_set(Evas_Object *obj, Elm_Flip_Direction dir, Eina_Bool enabled) +elm_flip_interaction_direction_enabled_set(Evas_Object *obj, + Elm_Flip_Direction dir, + Eina_Bool enabled) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); int i = -1; - if (!wd) return; + + ELM_FLIP_CHECK(obj); + ELM_FLIP_DATA_GET(obj, sd); + enabled = !!enabled; - if (dir == ELM_FLIP_DIRECTION_UP) i = 0; - else if (dir == ELM_FLIP_DIRECTION_DOWN) i = 1; - else if (dir == ELM_FLIP_DIRECTION_LEFT) i = 2; - else if (dir == ELM_FLIP_DIRECTION_RIGHT) i = 3; + if (dir == ELM_FLIP_DIRECTION_UP) i = 0; + else if (dir == ELM_FLIP_DIRECTION_DOWN) + i = 1; + else if (dir == ELM_FLIP_DIRECTION_LEFT) + i = 2; + else if (dir == ELM_FLIP_DIRECTION_RIGHT) + i = 3; if (i < 0) return; - if (wd->dir_enabled[i] == enabled) return; - wd->dir_enabled[i] = enabled; - if (wd->intmode == ELM_FLIP_INTERACTION_NONE) return; - if ((wd->dir_enabled[i]) && (!wd->event[i])) + if (sd->dir_enabled[i] == enabled) return; + sd->dir_enabled[i] = enabled; + if (sd->intmode == ELM_FLIP_INTERACTION_NONE) return; + if ((sd->dir_enabled[i]) && (!sd->event[i])) { - wd->event[i] = evas_object_rectangle_add(evas_object_evas_get(obj)); - elm_widget_sub_object_add(obj, wd->event[i]); - evas_object_data_set(wd->event[i], "_elm_leaveme", obj); - evas_object_clip_set(wd->event[i], evas_object_clip_get(obj)); - evas_object_color_set(wd->event[i], 0, 0, 0, 0); - evas_object_show(wd->event[i]); - evas_object_smart_member_add(wd->event[i], obj); - evas_object_event_callback_add(wd->event[i], EVAS_CALLBACK_MOUSE_DOWN, + sd->event[i] = evas_object_rectangle_add(evas_object_evas_get(obj)); + + evas_object_data_set(sd->event[i], "_elm_leaveme", obj); + evas_object_clip_set(sd->event[i], evas_object_clip_get(obj)); + evas_object_color_set(sd->event[i], 0, 0, 0, 0); + evas_object_show(sd->event[i]); + evas_object_smart_member_add(sd->event[i], obj); + evas_object_event_callback_add(sd->event[i], EVAS_CALLBACK_MOUSE_DOWN, _down_cb, obj); - evas_object_event_callback_add(wd->event[i], EVAS_CALLBACK_MOUSE_UP, + evas_object_event_callback_add(sd->event[i], EVAS_CALLBACK_MOUSE_UP, _up_cb, obj); - evas_object_event_callback_add(wd->event[i], EVAS_CALLBACK_MOUSE_MOVE, + evas_object_event_callback_add(sd->event[i], EVAS_CALLBACK_MOUSE_MOVE, _move_cb, obj); } - else if (!(wd->dir_enabled[i]) && (wd->event[i])) + else if (!(sd->dir_enabled[i]) && (sd->event[i])) { - evas_object_del(wd->event[i]); - wd->event[i] = NULL; + evas_object_del(sd->event[i]); + sd->event[i] = NULL; } _sizing_eval(obj); _configure(obj); } EAPI Eina_Bool -elm_flip_interaction_direction_enabled_get(Evas_Object *obj, Elm_Flip_Direction dir) +elm_flip_interaction_direction_enabled_get(Evas_Object *obj, + Elm_Flip_Direction dir) { - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); int i = -1; - if (!wd) return EINA_FALSE; + + ELM_FLIP_CHECK(obj) EINA_FALSE; + ELM_FLIP_DATA_GET(obj, sd); + if (dir == ELM_FLIP_DIRECTION_UP) i = 0; - else if (dir == ELM_FLIP_DIRECTION_DOWN) i = 1; - else if (dir == ELM_FLIP_DIRECTION_LEFT) i = 2; - else if (dir == ELM_FLIP_DIRECTION_RIGHT) i = 3; + else if (dir == ELM_FLIP_DIRECTION_DOWN) + i = 1; + else if (dir == ELM_FLIP_DIRECTION_LEFT) + i = 2; + else if (dir == ELM_FLIP_DIRECTION_RIGHT) + i = 3; if (i < 0) return EINA_FALSE; - return wd->dir_enabled[i]; + return sd->dir_enabled[i]; } EAPI void -elm_flip_interaction_direction_hitsize_set(Evas_Object *obj, Elm_Flip_Direction dir, double hitsize) +elm_flip_interaction_direction_hitsize_set(Evas_Object *obj, + Elm_Flip_Direction dir, + double hitsize) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); int i = -1; - if (!wd) return; + + ELM_FLIP_CHECK(obj); + ELM_FLIP_DATA_GET(obj, sd); + if (dir == ELM_FLIP_DIRECTION_UP) i = 0; - else if (dir == ELM_FLIP_DIRECTION_DOWN) i = 1; - else if (dir == ELM_FLIP_DIRECTION_LEFT) i = 2; - else if (dir == ELM_FLIP_DIRECTION_RIGHT) i = 3; + else if (dir == ELM_FLIP_DIRECTION_DOWN) + i = 1; + else if (dir == ELM_FLIP_DIRECTION_LEFT) + i = 2; + else if (dir == ELM_FLIP_DIRECTION_RIGHT) + i = 3; if (i < 0) return; if (hitsize < 0.0) hitsize = 0.0; - else if (hitsize > 1.0) hitsize = 1.0; - if (wd->dir_hitsize[i] == hitsize) return; - wd->dir_hitsize[i] = hitsize; + else if (hitsize > 1.0) + hitsize = 1.0; + if (sd->dir_hitsize[i] == hitsize) return; + sd->dir_hitsize[i] = hitsize; _sizing_eval(obj); _configure(obj); } EAPI double -elm_flip_interaction_direction_hitsize_get(Evas_Object *obj, Elm_Flip_Direction dir) +elm_flip_interaction_direction_hitsize_get(Evas_Object *obj, + Elm_Flip_Direction dir) { - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); int i = -1; - if (!wd) return 0.0; + ELM_FLIP_CHECK(obj) EINA_FALSE; + ELM_FLIP_DATA_GET(obj, sd); + if (dir == ELM_FLIP_DIRECTION_UP) i = 0; - else if (dir == ELM_FLIP_DIRECTION_DOWN) i = 1; - else if (dir == ELM_FLIP_DIRECTION_LEFT) i = 2; - else if (dir == ELM_FLIP_DIRECTION_RIGHT) i = 3; + else if (dir == ELM_FLIP_DIRECTION_DOWN) + i = 1; + else if (dir == ELM_FLIP_DIRECTION_LEFT) + i = 2; + else if (dir == ELM_FLIP_DIRECTION_RIGHT) + i = 3; if (i < 0) return 0.0; - return wd->dir_hitsize[i]; + return sd->dir_hitsize[i]; } diff --git a/src/lib/elm_flip.h b/src/lib/elm_flip.h index 124809b..a56b6e8 100644 --- a/src/lib/elm_flip.h +++ b/src/lib/elm_flip.h @@ -23,7 +23,9 @@ * @li "front" - A front content of the flip * @li "back" - A back content of the flip * - * Supported elm_object common APIs. + * This widget inherits from @ref elm-container-class, so that the + * functions meant to act on it will work for mapbuf objects: + * * @li @ref elm_object_part_content_set * @li @ref elm_object_part_content_get * @li @ref elm_object_part_content_unset diff --git a/src/lib/elm_mapbuf.h b/src/lib/elm_mapbuf.h index 2e3b827..dd2f8bc 100644 --- a/src/lib/elm_mapbuf.h +++ b/src/lib/elm_mapbuf.h @@ -13,7 +13,7 @@ * children). * * This widget inherits from @ref elm-container-class, so that the - * functions meant to act on it will wor work for mapbuf objects: + * functions meant to act on it will work for mapbuf objects: * * @li @ref elm_object_part_content_set * @li @ref elm_object_part_content_get -- 2.7.4