From d87eff1f3e6d8efa1c846bbbee98e95e061ce522 Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Tue, 31 Jul 2012 22:07:02 +0000 Subject: [PATCH] [elm] Radio now inheritable. SVN revision: 74693 --- legacy/elementary/src/lib/Makefile.am | 1 + legacy/elementary/src/lib/elm_radio.c | 77 +++----- legacy/elementary/src/lib/elm_widget_radio.h | 174 +++++++++++++++++++ 3 files changed, 200 insertions(+), 52 deletions(-) create mode 100644 legacy/elementary/src/lib/elm_widget_radio.h diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index b242e8b144..102bfb8070 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -67,6 +67,7 @@ elm_widget_photo.h \ elm_widget_photocam.h \ elm_widget_plug.h \ elm_widget_progressbar.h \ +elm_widget_radio.h \ elm_widget_route.h \ elm_widget_scroller.h \ elm_widget_separator.h \ diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c index 03f84cd869..317dea5736 100644 --- a/legacy/elementary/src/lib/elm_radio.c +++ b/legacy/elementary/src/lib/elm_radio.c @@ -1,53 +1,8 @@ #include #include "elm_priv.h" -#include "elm_widget_layout.h" +#include "elm_widget_radio.h" -static const char RADIO_SMART_NAME[] = "elm_radio"; - -typedef struct _Elm_Radio_Smart_Data Elm_Radio_Smart_Data; -typedef struct _Group Group; - -struct _Group -{ - int value; - int *valuep; - Eina_List *radios; -}; - -struct _Elm_Radio_Smart_Data -{ - Elm_Layout_Smart_Data base; - - int value; - Eina_Bool state; - - Group *group; -}; - -#define ELM_RADIO_DATA_GET(o, sd) \ - Elm_Radio_Smart_Data * sd = evas_object_smart_data_get(o) - -#define ELM_RADIO_DATA_GET_OR_RETURN(o, ptr) \ - ELM_RADIO_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return; \ - } - -#define ELM_RADIO_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ - ELM_RADIO_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return val; \ - } - -#define ELM_RADIO_CHECK(obj) \ - if (!obj || !elm_widget_type_check((obj), RADIO_SMART_NAME, __func__)) \ - return +EAPI const char ELM_RADIO_SMART_NAME[] = "elm_radio"; static const Elm_Layout_Part_Alias_Description _content_aliases[] = { @@ -70,7 +25,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { /* Inheriting from elm_layout. Besides, we need no more than what is * there */ EVAS_SMART_SUBCLASS_NEW - (RADIO_SMART_NAME, _elm_radio, Elm_Layout_Smart_Class, + (ELM_RADIO_SMART_NAME, _elm_radio, Elm_Radio_Smart_Class, Elm_Layout_Smart_Class, elm_layout_smart_class_get, _smart_callbacks); static void @@ -334,7 +289,7 @@ _elm_radio_smart_del(Evas_Object *obj) } static void -_elm_radio_smart_set_user(Elm_Layout_Smart_Class *sc) +_elm_radio_smart_set_user(Elm_Radio_Smart_Class *sc) { ELM_WIDGET_CLASS(sc)->base.add = _elm_radio_smart_add; ELM_WIDGET_CLASS(sc)->base.del = _elm_radio_smart_del; @@ -350,10 +305,28 @@ _elm_radio_smart_set_user(Elm_Layout_Smart_Class *sc) ELM_CONTAINER_CLASS(sc)->content_set = _elm_radio_smart_content_set; - sc->sizing_eval = _elm_radio_smart_sizing_eval; + ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_radio_smart_sizing_eval; - sc->content_aliases = _content_aliases; - sc->text_aliases = _text_aliases; + ELM_LAYOUT_CLASS(sc)->content_aliases = _content_aliases; + ELM_LAYOUT_CLASS(sc)->text_aliases = _text_aliases; +} + +EAPI const Elm_Radio_Smart_Class * +elm_radio_smart_class_get(void) +{ + static Elm_Radio_Smart_Class _sc = + ELM_RADIO_SMART_CLASS_INIT_NAME_VERSION(ELM_RADIO_SMART_NAME); + static const Elm_Radio_Smart_Class *class = NULL; + Evas_Smart_Class *esc = (Evas_Smart_Class *)&_sc; + + if (class) + return class; + + _elm_radio_smart_set(&_sc); + esc->callbacks = _smart_callbacks; + class = &_sc; + + return class; } EAPI Evas_Object * diff --git a/legacy/elementary/src/lib/elm_widget_radio.h b/legacy/elementary/src/lib/elm_widget_radio.h new file mode 100644 index 0000000000..b25ea34912 --- /dev/null +++ b/legacy/elementary/src/lib/elm_widget_radio.h @@ -0,0 +1,174 @@ +#ifndef ELM_WIDGET_RADIO_H +#define ELM_WIDGET_RADIO_H + +#include "elm_widget_layout.h" + +/** + * @addtogroup Widget + * @{ + * + * @section elm-radio-class The Elementary Radio Class + * + * Elementary, besides having the @ref Radio widget, exposes its + * foundation -- the Elementary Radio Class -- in order to create other + * widgets which are a radio with some more logic on top. + */ + +/** + * @def ELM_RADIO_CLASS + * + * Use this macro to cast whichever subclass of + * #Elm_Radio_Smart_Class into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_RADIO_CLASS(x) ((Elm_Radio_Smart_Class *)x) + +/** + * @def ELM_RADIO_DATA + * + * Use this macro to cast whichever subdata of + * #Elm_Radio_Smart_Data into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_RADIO_DATA(x) ((Elm_Radio_Smart_Data *)x) + +/** + * @def ELM_RADIO_SMART_CLASS_VERSION + * + * Current version for Elementary radio @b base smart class, a value + * which goes to _Elm_Radio_Smart_Class::version. + * + * @ingroup Widget + */ +#define ELM_RADIO_SMART_CLASS_VERSION 1 + +/** + * @def ELM_RADIO_SMART_CLASS_INIT + * + * Initializer for a whole #Elm_Radio_Smart_Class structure, with + * @c NULL values on its specific fields. + * + * @param smart_class_init initializer to use for the "base" field + * (#Evas_Smart_Class). + * + * @see EVAS_SMART_CLASS_INIT_NULL + * @see EVAS_SMART_CLASS_INIT_NAME_VERSION + * @see ELM_RADIO_SMART_CLASS_INIT_NULL + * @see ELM_RADIO_SMART_CLASS_INIT_NAME_VERSION + * + * @ingroup Widget + */ +#define ELM_RADIO_SMART_CLASS_INIT(smart_class_init) \ + {smart_class_init, ELM_RADIO_SMART_CLASS_VERSION} + +/** + * @def ELM_RADIO_SMART_CLASS_INIT_NULL + * + * Initializer to zero out a whole #Elm_Radio_Smart_Class structure. + * + * @see ELM_RADIO_SMART_CLASS_INIT_NAME_VERSION + * @see ELM_RADIO_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_RADIO_SMART_CLASS_INIT_NULL \ + ELM_RADIO_SMART_CLASS_INIT(EVAS_SMART_CLASS_INIT_NULL) + +/** + * @def ELM_RADIO_SMART_CLASS_INIT_NAME_VERSION + * + * Initializer to zero out a whole #Elm_Radio_Smart_Class structure and + * set its name and version. + * + * This is similar to #ELM_RADIO_SMART_CLASS_INIT_NULL, but it will + * also set the version field of #Elm_Radio_Smart_Class (base field) + * to the latest #ELM_RADIO_SMART_CLASS_VERSION and name it to the + * specific value. + * + * It will keep a reference to the name field as a "const char *", + * i.e., the name must be available while the structure is + * used (hint: static or global variable!) and must not be modified. + * + * @see ELM_RADIO_SMART_CLASS_INIT_NULL + * @see ELM_RADIO_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_RADIO_SMART_CLASS_INIT_NAME_VERSION(name) \ + ELM_RADIO_SMART_CLASS_INIT \ + (ELM_LAYOUT_SMART_CLASS_INIT_NAME_VERSION(name)) + +/** + * Elementary radio base smart class. This inherits directly from + * #Elm_Layout_Smart_Class and is meant to build widgets extending the + * behavior of a radio. + * + * All of the functions listed on @ref Radio namespace will work for + * objects deriving from #Elm_Radio_Smart_Class. + */ +typedef struct _Elm_Radio_Smart_Class +{ + Elm_Layout_Smart_Class base; + + int version; /**< Version of this smart class definition */ +} Elm_Radio_Smart_Class; + +/** + * Base layout smart data extended with radio instance data. + */ +typedef struct _Elm_Radio_Smart_Data Elm_Radio_Smart_Data; +typedef struct _Group Group; + +struct _Group +{ + int value; + int *valuep; + Eina_List *radios; +}; + +struct _Elm_Radio_Smart_Data +{ + Elm_Layout_Smart_Data base; + + int value; + Eina_Bool state; + + Group *group; +}; + +/** + * @} + */ + +EAPI extern const char ELM_RADIO_SMART_NAME[]; +EAPI const Elm_Radio_Smart_Class *elm_radio_smart_class_get(void); + +#define ELM_RADIO_DATA_GET(o, sd) \ + Elm_Radio_Smart_Data * sd = evas_object_smart_data_get(o) + +#define ELM_RADIO_DATA_GET_OR_RETURN(o, ptr) \ + ELM_RADIO_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } + +#define ELM_RADIO_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_RADIO_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } + +#define ELM_RADIO_CHECK(obj) \ + if (!obj || !elm_widget_type_check((obj), ELM_RADIO_SMART_NAME, \ + __func__)) \ + return + +#endif