From 1aadd96ba0f0371045cdaf8efed6a5a7b73e496d Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Thu, 3 May 2012 22:43:10 +0000 Subject: [PATCH] [Elm] Elm table migrated to new class hierarchy. SVN revision: 70727 --- legacy/elementary/src/lib/elm_table.c | 332 ++++++++++++++++---------- 1 file changed, 203 insertions(+), 129 deletions(-) diff --git a/legacy/elementary/src/lib/elm_table.c b/legacy/elementary/src/lib/elm_table.c index 863f34acba..45d0fb15be 100644 --- a/legacy/elementary/src/lib/elm_table.c +++ b/legacy/elementary/src/lib/elm_table.c @@ -1,48 +1,48 @@ #include #include "elm_priv.h" -typedef struct _Widget_Data Widget_Data; +static const char TABLE_SMART_NAME[] = "elm_table"; -struct _Widget_Data -{ - Evas_Object *tbl; -}; +#define ELM_TABLE_DATA_GET(o, sd) \ + Elm_Widget_Smart_Data * sd = evas_object_smart_data_get(o) -static const char *widtype = NULL; -static void _del_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 _theme_hook(Evas_Object *obj); +#define ELM_TABLE_DATA_GET_OR_RETURN(o, ptr) \ + ELM_TABLE_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } -static void -_del_pre_hook(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - evas_object_event_callback_del_full - (wd->tbl, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); - evas_object_del(wd->tbl); -} +#define ELM_TABLE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_TABLE_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } -static void -_del_hook(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - free(wd); -} +#define ELM_TABLE_CHECK(obj) \ + if (!obj || !elm_widget_type_check((obj), TABLE_SMART_NAME, __func__)) \ + return + +EVAS_SMART_SUBCLASS_NEW + (TABLE_SMART_NAME, _elm_table, Elm_Widget_Smart_Class, + Elm_Widget_Smart_Class, elm_widget_smart_class_get, NULL); static Eina_Bool -_elm_table_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next) +_elm_table_smart_focus_next(const Evas_Object *obj, + Elm_Focus_Direction dir, + Evas_Object **next) { - Widget_Data *wd = elm_widget_data_get(obj); + Eina_Bool ret; const Eina_List *items; - void *(*list_data_get) (const Eina_List *list); - Eina_List *(*list_free) (Eina_List *list); + Eina_List *(*list_free)(Eina_List *list); + void *(*list_data_get)(const Eina_List *list); - if ((!wd) || (!wd->tbl)) - return EINA_FALSE; + ELM_TABLE_DATA_GET(obj, sd); /* Focus chain */ /* TODO: Change this to use other chain */ @@ -53,33 +53,33 @@ _elm_table_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas } else { - items = evas_object_table_children_get(wd->tbl); + items = evas_object_table_children_get(sd->resize_obj); list_data_get = eina_list_data_get; list_free = eina_list_free; if (!items) return EINA_FALSE; } - Eina_Bool ret = elm_widget_focus_list_next_get(obj, items, list_data_get, - dir, next); + ret = elm_widget_focus_list_next_get(obj, items, list_data_get, dir, next); - if (list_free) - list_free((Eina_List *)items); + if (list_free) list_free((Eina_List *)items); return ret; } static Eina_Bool -_elm_table_focus_direction_hook(const Evas_Object *obj, const Evas_Object *base, double degree, - Evas_Object **direction, double *weight) +_elm_table_smart_focus_direction(const Evas_Object *obj, + const Evas_Object *base, + double degree, + Evas_Object **direction, + double *weight) { - Widget_Data *wd = elm_widget_data_get(obj); + Eina_Bool ret; const Eina_List *items; - void *(*list_data_get) (const Eina_List *list); Eina_List *(*list_free) (Eina_List *list); + void *(*list_data_get) (const Eina_List *list); - if ((!wd) || (!wd->tbl)) - return EINA_FALSE; + ELM_TABLE_DATA_GET(obj, sd); /* Focus chain */ /* TODO: Change this to use other chain */ @@ -90,15 +90,15 @@ _elm_table_focus_direction_hook(const Evas_Object *obj, const Evas_Object *base, } else { - items = evas_object_table_children_get(wd->tbl); + items = evas_object_table_children_get(sd->resize_obj); list_data_get = eina_list_data_get; list_free = eina_list_free; if (!items) return EINA_FALSE; } - Eina_Bool ret = elm_widget_focus_list_direction_get(obj, base, items, list_data_get, degree, - direction, weight); + ret = elm_widget_focus_list_direction_get + (obj, base, items, list_data_get, degree, direction, weight); if (list_free) list_free((Eina_List *)items); @@ -109,29 +109,31 @@ _elm_table_focus_direction_hook(const Evas_Object *obj, const Evas_Object *base, static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl) { - Widget_Data *wd = elm_widget_data_get(obj); - if ((!wd) || (!wd->tbl)) - return; + ELM_TABLE_DATA_GET(obj, sd); - evas_object_table_mirrored_set(wd->tbl, rtl); + evas_object_table_mirrored_set(sd->resize_obj, rtl); } -static void -_theme_hook(Evas_Object *obj) +static Eina_Bool +_elm_table_smart_theme(Evas_Object *obj) { - _elm_widget_mirrored_reload(obj); + if (!_elm_table_parent_sc->theme(obj)) return EINA_FALSE; + _mirrored_set(obj, elm_widget_mirrored_get(obj)); + + return EINA_TRUE; } static void _sizing_eval(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; Evas_Coord w, h; - if (!wd) return; - evas_object_size_hint_min_get(wd->tbl, &minw, &minh); - evas_object_size_hint_max_get(wd->tbl, &maxw, &maxh); + + ELM_TABLE_DATA_GET(obj, sd); + + evas_object_size_hint_min_get(sd->resize_obj, &minw, &minh); + evas_object_size_hint_max_get(sd->resize_obj, &maxw, &maxh); evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_max_set(obj, maxw, maxh); evas_object_geometry_get(obj, NULL, NULL, &w, &h); @@ -143,124 +145,199 @@ _sizing_eval(Evas_Object *obj) } static void -_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_on_size_hints_changed(void *data, + Evas *e __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { _sizing_eval(data); } -static void -_sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) +static Eina_Bool +_elm_table_smart_sub_object_del(Evas_Object *obj, + Evas_Object *child) { + if (!_elm_table_parent_sc->sub_object_del(obj, child)) return EINA_FALSE; + _sizing_eval(obj); + + return EINA_TRUE; +} + +static void +_elm_table_smart_add(Evas_Object *obj) +{ + EVAS_SMART_DATA_ALLOC(obj, Elm_Widget_Smart_Data); + + priv->resize_obj = evas_object_table_add(evas_object_evas_get(obj)); + + evas_object_event_callback_add + (priv->resize_obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _on_size_hints_changed, obj); + + _elm_table_parent_sc->base.add(obj); + + elm_widget_can_focus_set(obj, EINA_FALSE); + elm_widget_highlight_ignore_set(obj, EINA_FALSE); + + _elm_table_smart_theme(obj); +} + +static void +_elm_table_smart_del(Evas_Object *obj) +{ + Eina_List *l; + Evas_Object *child; + + ELM_TABLE_DATA_GET(obj, sd); + + evas_object_event_callback_del_full + (sd->resize_obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _on_size_hints_changed, obj); + + /* let's make our table object the *last* to be processed, since it + * may (smart) parent other sub objects here */ + EINA_LIST_FOREACH (sd->subobjs, l, child) + { + if (child == sd->resize_obj) + { + sd->subobjs = eina_list_demote_list(sd->subobjs, l); + break; + } + } + + _elm_table_parent_sc->base.del(obj); +} + +static void +_elm_table_smart_set_user(Elm_Widget_Smart_Class *sc) +{ + sc->base.add = _elm_table_smart_add; + sc->base.del = _elm_table_smart_del; + + sc->sub_object_del = _elm_table_smart_sub_object_del; + sc->theme = _elm_table_smart_theme; + sc->focus_next = _elm_table_smart_focus_next; + sc->focus_direction = _elm_table_smart_focus_direction; } EAPI Evas_Object * elm_table_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, "table"); - elm_widget_type_set(obj, "table"); - elm_widget_sub_object_add(parent, obj); - elm_widget_data_set(obj, wd); - elm_widget_del_hook_set(obj, _del_hook); - elm_widget_del_pre_hook_set(obj, _del_pre_hook); - elm_widget_focus_next_hook_set(obj, _elm_table_focus_next_hook); - elm_widget_focus_direction_hook_set(obj, _elm_table_focus_direction_hook); - elm_widget_can_focus_set(obj, EINA_FALSE); - elm_widget_highlight_ignore_set(obj, EINA_FALSE); - elm_widget_theme_hook_set(obj, _theme_hook); + e = evas_object_evas_get(parent); + if (!e) return NULL; - wd->tbl = evas_object_table_add(e); - evas_object_event_callback_add(wd->tbl, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - elm_widget_resize_object_set(obj, wd->tbl); + obj = evas_object_smart_add(e, _elm_table_smart_class_new()); - evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); + if (!elm_widget_sub_object_add(parent, obj)) + ERR("could not add %p as sub object of %p", obj, parent); - _mirrored_set(obj, elm_widget_mirrored_get(obj)); return obj; } EAPI void -elm_table_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous) +elm_table_homogeneous_set(Evas_Object *obj, + Eina_Bool homogeneous) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - evas_object_table_homogeneous_set(wd->tbl, homogeneous); + ELM_TABLE_CHECK(obj); + ELM_TABLE_DATA_GET(obj, sd); + + evas_object_table_homogeneous_set(sd->resize_obj, homogeneous); } EAPI Eina_Bool elm_table_homogeneous_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 evas_object_table_homogeneous_get(wd->tbl); + ELM_TABLE_CHECK(obj) EINA_FALSE; + ELM_TABLE_DATA_GET(obj, sd); + + return evas_object_table_homogeneous_get(sd->resize_obj); } EAPI void -elm_table_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical) +elm_table_padding_set(Evas_Object *obj, + Evas_Coord horizontal, + Evas_Coord vertical) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - evas_object_table_padding_set(wd->tbl, horizontal, vertical); + ELM_TABLE_CHECK(obj); + ELM_TABLE_DATA_GET(obj, sd); + + evas_object_table_padding_set + (sd->resize_obj, horizontal, vertical); } EAPI void -elm_table_padding_get(const Evas_Object *obj, Evas_Coord *horizontal, Evas_Coord *vertical) +elm_table_padding_get(const Evas_Object *obj, + Evas_Coord *horizontal, + Evas_Coord *vertical) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - evas_object_table_padding_get(wd->tbl, horizontal, vertical); + ELM_TABLE_CHECK(obj); + ELM_TABLE_DATA_GET(obj, sd); + + evas_object_table_padding_get + (sd->resize_obj, horizontal, vertical); } EAPI void -elm_table_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h) +elm_table_pack(Evas_Object *obj, + Evas_Object *subobj, + int x, + int y, + int w, + int h) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; + ELM_TABLE_CHECK(obj); + ELM_TABLE_DATA_GET(obj, sd); + elm_widget_sub_object_add(obj, subobj); - evas_object_table_pack(wd->tbl, subobj, x, y, w, h); + evas_object_table_pack(sd->resize_obj, subobj, x, y, w, h); } EAPI void -elm_table_unpack(Evas_Object *obj, Evas_Object *subobj) +elm_table_unpack(Evas_Object *obj, + Evas_Object *subobj) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; + ELM_TABLE_CHECK(obj); + ELM_TABLE_DATA_GET(obj, sd); + elm_widget_sub_object_del(obj, subobj); - evas_object_table_unpack(wd->tbl, subobj); + evas_object_table_unpack(sd->resize_obj, subobj); } EAPI void -elm_table_pack_set(Evas_Object *subobj, int x, int y, int w, int h) +elm_table_pack_set(Evas_Object *subobj, + int x, + int y, + int w, + int h) { Evas_Object *obj = elm_widget_parent_widget_get(subobj); - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - evas_object_table_pack(wd->tbl, subobj, x, y, w, h); + + ELM_TABLE_CHECK(obj); + ELM_TABLE_DATA_GET(obj, sd); + + evas_object_table_pack(sd->resize_obj, subobj, x, y, w, h); } EAPI void -elm_table_pack_get(Evas_Object *subobj, int *x, int *y, int *w, int *h) +elm_table_pack_get(Evas_Object *subobj, + int *x, + int *y, + int *w, + int *h) { Evas_Object *obj = elm_widget_parent_widget_get(subobj); unsigned short ix, iy, iw, ih; - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - evas_object_table_pack_get(wd->tbl, subobj, &ix, &iy, &iw, &ih); + + ELM_TABLE_CHECK(obj); + ELM_TABLE_DATA_GET(obj, sd); + + evas_object_table_pack_get(sd->resize_obj, subobj, &ix, &iy, &iw, &ih); if (x) *x = ix; if (y) *y = iy; if (w) *w = iw; @@ -268,14 +345,11 @@ elm_table_pack_get(Evas_Object *subobj, int *x, int *y, int *w, int *h) } EAPI void -elm_table_clear(Evas_Object *obj, Eina_Bool clear) +elm_table_clear(Evas_Object *obj, + Eina_Bool clear) { - Eina_List *chld; - Evas_Object *o; - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - chld = evas_object_table_children_get(wd->tbl); - EINA_LIST_FREE(chld, o) elm_widget_sub_object_del(obj, o); - evas_object_table_clear(wd->tbl, clear); + ELM_TABLE_CHECK(obj); + ELM_TABLE_DATA_GET(obj, sd); + + evas_object_table_clear(sd->resize_obj, clear); }