From bb3cd2ef0ed2fbcbd5e0dee33a47a99383346315 Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Wed, 1 Aug 2012 21:03:41 +0000 Subject: [PATCH] [elm] Clock inheritable. SVN revision: 74757 --- legacy/elementary/src/lib/Makefile.am | 1 + legacy/elementary/src/lib/elm_clock.c | 82 +++----- legacy/elementary/src/lib/elm_widget_clock.h | 187 +++++++++++++++++++ 3 files changed, 210 insertions(+), 60 deletions(-) create mode 100644 legacy/elementary/src/lib/elm_widget_clock.h diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index 69021c600a..fd72dd6ae3 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -49,6 +49,7 @@ elm_widget_box.h \ elm_widget_button.h \ elm_widget_calendar.h \ elm_widget_check.h \ +elm_widget_clock.h \ elm_widget_conform.h \ elm_widget_container.h \ elm_widget_datetime.h \ diff --git a/legacy/elementary/src/lib/elm_clock.c b/legacy/elementary/src/lib/elm_clock.c index af3eaa1fd4..3796cce1fb 100644 --- a/legacy/elementary/src/lib/elm_clock.c +++ b/legacy/elementary/src/lib/elm_clock.c @@ -1,64 +1,10 @@ #include #include "elm_priv.h" -#include "elm_widget_layout.h" +#include "elm_widget_clock.h" -static const char CLOCK_SMART_NAME[] = "elm_clock"; +EAPI const char ELM_CLOCK_SMART_NAME[] = "elm_clock"; #define DEFAULT_FIRST_INTERVAL 0.85 -typedef struct _Elm_Clock_Smart_Data Elm_Clock_Smart_Data; - -struct _Elm_Clock_Smart_Data -{ - Elm_Layout_Smart_Data base; - - double interval, first_interval; - Elm_Clock_Edit_Mode digedit; - int hrs, min, sec, timediff; - Evas_Object *digit[6]; - Evas_Object *am_pm_obj; - Evas_Object *sel_obj; - Ecore_Timer *ticker, *spin; - - struct - { - int hrs, min, sec; - char ampm; - Elm_Clock_Edit_Mode digedit; - - Eina_Bool seconds : 1; - Eina_Bool am_pm : 1; - Eina_Bool edit : 1; - } cur; - - Eina_Bool seconds : 1; - Eina_Bool am_pm : 1; - Eina_Bool edit : 1; -}; - -#define ELM_CLOCK_DATA_GET(o, sd) \ - Elm_Clock_Smart_Data * sd = evas_object_smart_data_get(o) - -#define ELM_CLOCK_DATA_GET_OR_RETURN(o, ptr) \ - ELM_CLOCK_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return; \ - } - -#define ELM_CLOCK_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ - ELM_CLOCK_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return val; \ - } - -#define ELM_CLOCK_CHECK(obj) \ - if (!obj || !elm_widget_type_check((obj), CLOCK_SMART_NAME, __func__)) \ - return static void _time_update(Evas_Object *obj); @@ -69,10 +15,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {NULL, NULL} }; -/* Inheriting from elm_layout. Besides, we need no more than what is - * there */ EVAS_SMART_SUBCLASS_NEW - (CLOCK_SMART_NAME, _elm_clock, Elm_Layout_Smart_Class, + (ELM_CLOCK_SMART_NAME, _elm_clock, Elm_Clock_Smart_Class, Elm_Layout_Smart_Class, elm_layout_smart_class_get, _smart_callbacks); static Eina_Bool @@ -530,7 +474,7 @@ _elm_clock_smart_del(Evas_Object *obj) } static void -_elm_clock_smart_set_user(Elm_Layout_Smart_Class *sc) +_elm_clock_smart_set_user(Elm_Clock_Smart_Class *sc) { ELM_WIDGET_CLASS(sc)->base.add = _elm_clock_smart_add; ELM_WIDGET_CLASS(sc)->base.del = _elm_clock_smart_del; @@ -542,6 +486,24 @@ _elm_clock_smart_set_user(Elm_Layout_Smart_Class *sc) ELM_WIDGET_CLASS(sc)->focus_direction = NULL; } +EAPI const Elm_Clock_Smart_Class * +elm_clock_smart_class_get(void) +{ + static Elm_Clock_Smart_Class _sc = + ELM_CLOCK_SMART_CLASS_INIT_NAME_VERSION(ELM_CLOCK_SMART_NAME); + static const Elm_Clock_Smart_Class *class = NULL; + Evas_Smart_Class *esc = (Evas_Smart_Class *)&_sc; + + if (class) + return class; + + _elm_clock_smart_set(&_sc); + esc->callbacks = _smart_callbacks; + class = &_sc; + + return class; +} + EAPI Evas_Object * elm_clock_add(Evas_Object *parent) { diff --git a/legacy/elementary/src/lib/elm_widget_clock.h b/legacy/elementary/src/lib/elm_widget_clock.h new file mode 100644 index 0000000000..54f043c901 --- /dev/null +++ b/legacy/elementary/src/lib/elm_widget_clock.h @@ -0,0 +1,187 @@ +#ifndef ELM_WIDGET_CLOCK_H +#define ELM_WIDGET_CLOCK_H + +#include "elm_widget_layout.h" + +#ifdef HAVE_EIO +# include +#endif + +/** + * @addtogroup Widget + * @{ + * + * @section elm-clock-class The Elementary Clock Class + * + * Elementary, besides having the @ref Clock widget, exposes its + * foundation -- the Elementary Clock Class -- in order to create other + * widgets which are a clock with some more logic on top. + */ + +/** + * @def ELM_CLOCK_CLASS + * + * Use this macro to cast whichever subclass of + * #Elm_Clock_Smart_Class into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_CLOCK_CLASS(x) ((Elm_Clock_Smart_Class *)x) + +/** + * @def ELM_CLOCK_DATA + * + * Use this macro to cast whichever subdata of + * #Elm_Clock_Smart_Data into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_CLOCK_DATA(x) ((Elm_Clock_Smart_Data *)x) + +/** + * @def ELM_CLOCK_SMART_CLASS_VERSION + * + * Current version for Elementary clock @b base smart class, a value + * which goes to _Elm_Clock_Smart_Class::version. + * + * @ingroup Widget + */ +#define ELM_CLOCK_SMART_CLASS_VERSION 1 + +/** + * @def ELM_CLOCK_SMART_CLASS_INIT + * + * Initializer for a whole #Elm_Clock_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_CLOCK_SMART_CLASS_INIT_NULL + * @see ELM_CLOCK_SMART_CLASS_INIT_NAME_VERSION + * + * @ingroup Widget + */ +#define ELM_CLOCK_SMART_CLASS_INIT(smart_class_init) \ + {smart_class_init, ELM_CLOCK_SMART_CLASS_VERSION} + +/** + * @def ELM_CLOCK_SMART_CLASS_INIT_NULL + * + * Initializer to zero out a whole #Elm_Clock_Smart_Class structure. + * + * @see ELM_CLOCK_SMART_CLASS_INIT_NAME_VERSION + * @see ELM_CLOCK_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_CLOCK_SMART_CLASS_INIT_NULL \ + ELM_CLOCK_SMART_CLASS_INIT(EVAS_SMART_CLASS_INIT_NULL) + +/** + * @def ELM_CLOCK_SMART_CLASS_INIT_NAME_VERSION + * + * Initializer to zero out a whole #Elm_Clock_Smart_Class structure and + * set its name and version. + * + * This is similar to #ELM_CLOCK_SMART_CLASS_INIT_NULL, but it will + * also set the version field of #Elm_Clock_Smart_Class (base field) + * to the latest #ELM_CLOCK_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_CLOCK_SMART_CLASS_INIT_NULL + * @see ELM_CLOCK_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_CLOCK_SMART_CLASS_INIT_NAME_VERSION(name) \ + ELM_CLOCK_SMART_CLASS_INIT \ + (ELM_LAYOUT_SMART_CLASS_INIT_NAME_VERSION(name)) + +/** + * Elementary clock base smart class. This inherits directly from + * #Elm_Layout_Smart_Class and is meant to build widgets extending the + * behavior of a clock. + * + * All of the functions listed on @ref Clock namespace will work for + * objects deriving from #Elm_Clock_Smart_Class. + */ +typedef struct _Elm_Clock_Smart_Class +{ + Elm_Layout_Smart_Class base; + + int version; /**< Version of this smart class definition */ +} Elm_Clock_Smart_Class; + +/** + * Base layout smart data extended with clock instance data. + */ +typedef struct _Elm_Clock_Smart_Data Elm_Clock_Smart_Data; +struct _Elm_Clock_Smart_Data +{ + Elm_Layout_Smart_Data base; + + double interval, first_interval; + Elm_Clock_Edit_Mode digedit; + int hrs, min, sec, timediff; + Evas_Object *digit[6]; + Evas_Object *am_pm_obj; + Evas_Object *sel_obj; + Ecore_Timer *ticker, *spin; + + struct + { + int hrs, min, sec; + char ampm; + Elm_Clock_Edit_Mode digedit; + + Eina_Bool seconds : 1; + Eina_Bool am_pm : 1; + Eina_Bool edit : 1; + } cur; + + Eina_Bool seconds : 1; + Eina_Bool am_pm : 1; + Eina_Bool edit : 1; +}; + +/** + * @} + */ + +EAPI extern const char ELM_CLOCK_SMART_NAME[]; +EAPI const Elm_Clock_Smart_Class *elm_clock_smart_class_get(void); + +#define ELM_CLOCK_DATA_GET(o, sd) \ + Elm_Clock_Smart_Data * sd = evas_object_smart_data_get(o) + +#define ELM_CLOCK_DATA_GET_OR_RETURN(o, ptr) \ + ELM_CLOCK_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } + +#define ELM_CLOCK_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_CLOCK_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } + +#define ELM_CLOCK_CHECK(obj) \ + if (!obj || !elm_widget_type_check \ + ((obj), ELM_CLOCK_SMART_NAME, __func__)) \ + return + +#endif