summaryrefslogtreecommitdiff
path: root/legacy/elementary
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2012-03-28 09:02:22 +0000
committerDaniel Juyung Seo <seojuyung2@gmail.com>2012-03-28 09:02:22 +0000
commit7908a77ad80cb337518806c931ace08475d0b55c (patch)
tree5af2a0c7bca6cc58473bea4c9a21d7c6ed4eec06 /legacy/elementary
parent9d2fb4b4b5edcecf1fa74debd2ac83576a6636ad (diff)
elm: Fixed formatting.
SVN revision: 69700
Diffstat (limited to 'legacy/elementary')
-rw-r--r--legacy/elementary/src/lib/elc_dayselector.h12
-rw-r--r--legacy/elementary/src/lib/elc_multibuttonentry.c4
-rw-r--r--legacy/elementary/src/lib/elc_multibuttonentry.h12
-rw-r--r--legacy/elementary/src/lib/elc_naviframe.c2
-rw-r--r--legacy/elementary/src/lib/elc_naviframe.h4
-rw-r--r--legacy/elementary/src/lib/elm_actionslider.h2
-rw-r--r--legacy/elementary/src/lib/elm_authors.h2
-rw-r--r--legacy/elementary/src/lib/elm_bg.c7
-rw-r--r--legacy/elementary/src/lib/elm_bubble.c2
-rw-r--r--legacy/elementary/src/lib/elm_bubble.h2
-rw-r--r--legacy/elementary/src/lib/elm_button.h2
-rw-r--r--legacy/elementary/src/lib/elm_calendar.h2
-rw-r--r--legacy/elementary/src/lib/elm_check.h2
-rw-r--r--legacy/elementary/src/lib/elm_colorselector.h8
-rw-r--r--legacy/elementary/src/lib/elm_config.c2
-rw-r--r--legacy/elementary/src/lib/elm_config.h16
-rw-r--r--legacy/elementary/src/lib/elm_entry.c9
-rw-r--r--legacy/elementary/src/lib/elm_entry.h22
-rw-r--r--legacy/elementary/src/lib/elm_flip.c7
-rw-r--r--legacy/elementary/src/lib/elm_flip.h6
-rw-r--r--legacy/elementary/src/lib/elm_genlist.h8
-rw-r--r--legacy/elementary/src/lib/elm_gesture_layer.c6
-rw-r--r--legacy/elementary/src/lib/elm_getting_started.h22
-rw-r--r--legacy/elementary/src/lib/elm_glview.h28
-rw-r--r--legacy/elementary/src/lib/elm_icon.c27
-rw-r--r--legacy/elementary/src/lib/elm_index.c4
-rw-r--r--legacy/elementary/src/lib/elm_index.h10
-rw-r--r--legacy/elementary/src/lib/elm_intro.h18
-rw-r--r--legacy/elementary/src/lib/elm_layout.c47
-rw-r--r--legacy/elementary/src/lib/elm_list.c5
-rw-r--r--legacy/elementary/src/lib/elm_menu.c11
-rw-r--r--legacy/elementary/src/lib/elm_menu.h2
-rw-r--r--legacy/elementary/src/lib/elm_object_item.h2
-rw-r--r--legacy/elementary/src/lib/elm_photo.c20
-rw-r--r--legacy/elementary/src/lib/elm_photo.h2
-rw-r--r--legacy/elementary/src/lib/elm_plug.h2
-rw-r--r--legacy/elementary/src/lib/elm_radio.h6
-rw-r--r--legacy/elementary/src/lib/elm_removed.h6
-rw-r--r--legacy/elementary/src/lib/elm_segment_control.h2
-rw-r--r--legacy/elementary/src/lib/elm_slider.c6
-rw-r--r--legacy/elementary/src/lib/elm_slideshow.c5
-rw-r--r--legacy/elementary/src/lib/elm_spinner.c6
-rw-r--r--legacy/elementary/src/lib/elm_spinner.h18
-rw-r--r--legacy/elementary/src/lib/elm_store.c47
-rw-r--r--legacy/elementary/src/lib/elm_store.h88
-rw-r--r--legacy/elementary/src/lib/elm_toolbar.c9
-rw-r--r--legacy/elementary/src/lib/elm_tooltip.h2
-rw-r--r--legacy/elementary/src/lib/elm_transit.c35
-rw-r--r--legacy/elementary/src/lib/elm_transit.h10
-rw-r--r--legacy/elementary/src/lib/elm_video.h18
-rw-r--r--legacy/elementary/src/lib/elm_web.c67
-rw-r--r--legacy/elementary/src/lib/elm_web.h2
-rw-r--r--legacy/elementary/src/lib/elm_widget.c14
-rw-r--r--legacy/elementary/src/lib/elm_win.c108
-rw-r--r--legacy/elementary/src/lib/elm_win.h10
-rw-r--r--legacy/elementary/src/lib/els_scroller.c135
-rw-r--r--legacy/elementary/src/lib/els_tooltip.c14
57 files changed, 496 insertions, 451 deletions
diff --git a/legacy/elementary/src/lib/elc_dayselector.h b/legacy/elementary/src/lib/elc_dayselector.h
index 456a4c302e..ca18615f39 100644
--- a/legacy/elementary/src/lib/elc_dayselector.h
+++ b/legacy/elementary/src/lib/elc_dayselector.h
@@ -11,22 +11,22 @@
11 * 11 *
12 * The selection can be toggle by just clicking on the day. 12 * The selection can be toggle by just clicking on the day.
13 * 13 *
14 * Dayselector also provides the functionality to check whether a day is 14 * Dayselector also provides the functionality to check whether a day is
15 * selected or not. 15 * selected or not.
16 * 16 *
17 * First day of the week is taken from config settings by default. It can be 17 * First day of the week is taken from config settings by default. It can be
18 * altered by using the API elm_dayselector_week_start_set() API. 18 * altered by using the API elm_dayselector_week_start_set() API.
19 * 19 *
20 * APIs are provided for setting the duration of weekend 20 * APIs are provided for setting the duration of weekend
21 * elm_dayselector_weekend_start_set() and elm_dayselector_weekend_length_set() 21 * elm_dayselector_weekend_start_set() and elm_dayselector_weekend_length_set()
22 * does this job. 22 * does this job.
23 * 23 *
24 * Two styles of weekdays and weekends are supported in Dayselector. 24 * Two styles of weekdays and weekends are supported in Dayselector.
25 * Application can emit signals on individual check objects for setting the 25 * Application can emit signals on individual check objects for setting the
26 * weekday, weekend styles. 26 * weekday, weekend styles.
27 * 27 *
28 * Once the weekend start day or weekend length changes, all the weekday & 28 * Once the weekend start day or weekend length changes, all the weekday &
29 * weekend styles will be reset to default style. It's the application's 29 * weekend styles will be reset to default style. It's the application's
30 * responsibility to set the styles again by sending corresponding signals. 30 * responsibility to set the styles again by sending corresponding signals.
31 * 31 *
32 * Supported elm_object_item common APIs. 32 * Supported elm_object_item common APIs.
diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c
index 392caa2966..ab34839a65 100644
--- a/legacy/elementary/src/lib/elc_multibuttonentry.c
+++ b/legacy/elementary/src/lib/elc_multibuttonentry.c
@@ -1195,8 +1195,8 @@ _view_init(Evas_Object *obj)
1195 if (size_str) button_min_height = (Evas_Coord)atoi(size_str); 1195 if (size_str) button_min_height = (Evas_Coord)atoi(size_str);
1196 1196
1197 wd->end_type = MULTIBUTTONENTRY_CLOSED_IMAGE; 1197 wd->end_type = MULTIBUTTONENTRY_CLOSED_IMAGE;
1198 evas_object_size_hint_min_set(wd->end, 1198 evas_object_size_hint_min_set(wd->end,
1199 button_min_width * _elm_config->scale, 1199 button_min_width * _elm_config->scale,
1200 button_min_height * _elm_config->scale); 1200 button_min_height * _elm_config->scale);
1201 elm_widget_sub_object_add(obj, wd->end); 1201 elm_widget_sub_object_add(obj, wd->end);
1202 } 1202 }
diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.h b/legacy/elementary/src/lib/elc_multibuttonentry.h
index d34dea44d6..cc4de8489b 100644
--- a/legacy/elementary/src/lib/elc_multibuttonentry.h
+++ b/legacy/elementary/src/lib/elc_multibuttonentry.h
@@ -1,12 +1,12 @@
1/** 1/**
2 * @defgroup Multibuttonentry Multibuttonentry 2 * @defgroup Multibuttonentry Multibuttonentry
3 * 3 *
4 * A Multibuttonentry is a widget to allow a user enter text and manage it as a number 4 * A Multibuttonentry is a widget to allow a user enter text and manage it as a number
5 * of buttons. Each text button is inserted by pressing the "return" key. 5 * of buttons. Each text button is inserted by pressing the "return" key.
6 * If there is no space in the current row, a new button is added to the next row. 6 * If there is no space in the current row, a new button is added to the next row.
7 * When a text button is pressed, it will become focused. 7 * When a text button is pressed, it will become focused.
8 * Backspace removes the focus. 8 * Backspace removes the focus.
9 * When the Multibuttonentry loses focus items longer than one line are shrunk 9 * When the Multibuttonentry loses focus items longer than one line are shrunk
10 * to one line. 10 * to one line.
11 * 11 *
12 * Typical use case of multibuttonentry is, composing emails/messages to a group 12 * Typical use case of multibuttonentry is, composing emails/messages to a group
@@ -54,7 +54,7 @@
54 * 54 *
55 * @param obj The parent object 55 * @param obj The parent object
56 * @param item_label The label corresponding to the added item. 56 * @param item_label The label corresponding to the added item.
57 * @param item_data data specific to this item. 57 * @param item_data data specific to this item.
58 * @param data data specific to the multibuttonentry. 58 * @param data data specific to the multibuttonentry.
59 * 59 *
60 * @return EINA_TRUE 60 * @return EINA_TRUE
@@ -105,7 +105,7 @@ EAPI Eina_Bool elm_multibuttonentry_expanded_get(const Evas_Obj
105 * 105 *
106 * @param obj The multibuttonentry object 106 * @param obj The multibuttonentry object
107 * @param expanded the value of expanded state. 107 * @param expanded the value of expanded state.
108 * Set this to EINA_TRUE for expanded state. 108 * Set this to EINA_TRUE for expanded state.
109 * Set this to EINA_FALSE for single line state. 109 * Set this to EINA_FALSE for single line state.
110 * 110 *
111 * @ingroup Multibuttonentry 111 * @ingroup Multibuttonentry
diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c
index f3c5f17718..a0fcc768a8 100644
--- a/legacy/elementary/src/lib/elc_naviframe.c
+++ b/legacy/elementary/src/lib/elc_naviframe.c
@@ -1000,7 +1000,7 @@ _item_style_set(Elm_Naviframe_Item *navi_it, const char *item_style)
1000 if (navi_it->title_next_btn) 1000 if (navi_it->title_next_btn)
1001 elm_object_signal_emit(VIEW(navi_it), "elm,state,next_btn,show", "elm"); 1001 elm_object_signal_emit(VIEW(navi_it), "elm,state,next_btn,show", "elm");
1002 1002
1003// why does this forcibly enable title? isnt that separate to style? 1003// why does this forcibly enable title? isnt that separate to style?
1004// navi_it->title_visible = EINA_TRUE; 1004// navi_it->title_visible = EINA_TRUE;
1005 _sizing_eval(WIDGET(navi_it)); 1005 _sizing_eval(WIDGET(navi_it));
1006 1006
diff --git a/legacy/elementary/src/lib/elc_naviframe.h b/legacy/elementary/src/lib/elc_naviframe.h
index 6c48c0ae08..fd4f26593b 100644
--- a/legacy/elementary/src/lib/elc_naviframe.h
+++ b/legacy/elementary/src/lib/elc_naviframe.h
@@ -14,14 +14,14 @@
14 * Since each item could keep the different styles, users could keep the 14 * Since each item could keep the different styles, users could keep the
15 * same look & feel for the pages or different styles for the items in it's 15 * same look & feel for the pages or different styles for the items in it's
16 * application. 16 * application.
17 * 17 *
18 * Default content parts of the naviframe that you can use content hooks for 18 * Default content parts of the naviframe that you can use content hooks for
19 * are: 19 * are:
20 * @li "default" - The main content of the current page 20 * @li "default" - The main content of the current page
21 * @li "icon" - An icon in the title area of the current page 21 * @li "icon" - An icon in the title area of the current page
22 * @li "prev_btn" - A button of the current page to go to the previous page 22 * @li "prev_btn" - A button of the current page to go to the previous page
23 * @li "next_btn" - A button of the current page to go to the next page 23 * @li "next_btn" - A button of the current page to go to the next page
24 * 24 *
25 * Default text parts of the naviframe that you can use for are: 25 * Default text parts of the naviframe that you can use for are:
26 * @li "default" - Title label in the title area of the current page 26 * @li "default" - Title label in the title area of the current page
27 * @li "subtitle" - Sub-title label in the title area of the current page 27 * @li "subtitle" - Sub-title label in the title area of the current page
diff --git a/legacy/elementary/src/lib/elm_actionslider.h b/legacy/elementary/src/lib/elm_actionslider.h
index 1f2e1f5b5c..8822022523 100644
--- a/legacy/elementary/src/lib/elm_actionslider.h
+++ b/legacy/elementary/src/lib/elm_actionslider.h
@@ -36,7 +36,7 @@
36 * Supported elm_object common APIs. 36 * Supported elm_object common APIs.
37 * @li elm_object_part_text_set 37 * @li elm_object_part_text_set
38 * @li elm_object_part_text_get 38 * @li elm_object_part_text_get
39 * 39 *
40 * See an example of actionslider usage @ref actionslider_example_page "here" 40 * See an example of actionslider usage @ref actionslider_example_page "here"
41 * @{ 41 * @{
42 */ 42 */
diff --git a/legacy/elementary/src/lib/elm_authors.h b/legacy/elementary/src/lib/elm_authors.h
index c07cd4055c..694c7973d7 100644
--- a/legacy/elementary/src/lib/elm_authors.h
+++ b/legacy/elementary/src/lib/elm_authors.h
@@ -55,7 +55,7 @@
55 * @author Hyunsil Park <hyunsil.park@samsung.com> 55 * @author Hyunsil Park <hyunsil.park@samsung.com>
56 * @author Goun Lee <gouni.lee@samsung.com> 56 * @author Goun Lee <gouni.lee@samsung.com>
57 * @author Mikael Sans <sans.mikael@gmail.com> 57 * @author Mikael Sans <sans.mikael@gmail.com>
58 * 58 *
59 * Please contact <enlightenment-devel@lists.sourceforge.net> to get in 59 * Please contact <enlightenment-devel@lists.sourceforge.net> to get in
60 * contact with the developers and maintainers. 60 * contact with the developers and maintainers.
61 */ 61 */
diff --git a/legacy/elementary/src/lib/elm_bg.c b/legacy/elementary/src/lib/elm_bg.c
index edc23f13ac..79400c2280 100644
--- a/legacy/elementary/src/lib/elm_bg.c
+++ b/legacy/elementary/src/lib/elm_bg.c
@@ -8,9 +8,10 @@ struct _Widget_Data
8 Evas_Object *base, *rect, *img, *overlay; 8 Evas_Object *base, *rect, *img, *overlay;
9 const char *file, *group; 9 const char *file, *group;
10 Elm_Bg_Option option; 10 Elm_Bg_Option option;
11 struct { 11 struct
12 Evas_Coord w, h; 12 {
13 } load_opts; 13 Evas_Coord w, h;
14 } load_opts;
14}; 15};
15 16
16static const char *widtype = NULL; 17static const char *widtype = NULL;
diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c
index 1346de5f0f..efca8447f7 100644
--- a/legacy/elementary/src/lib/elm_bubble.c
+++ b/legacy/elementary/src/lib/elm_bubble.c
@@ -30,7 +30,7 @@ static const Evas_Smart_Cb_Description _signals[] =
30 {NULL, NULL} 30 {NULL, NULL}
31}; 31};
32 32
33static const char *corner_string[] = 33static const char *corner_string[] =
34{ 34{
35 "top_left", 35 "top_left",
36 "top_right", 36 "top_right",
diff --git a/legacy/elementary/src/lib/elm_bubble.h b/legacy/elementary/src/lib/elm_bubble.h
index 0c3d580df6..8e1afdb8ec 100644
--- a/legacy/elementary/src/lib/elm_bubble.h
+++ b/legacy/elementary/src/lib/elm_bubble.h
@@ -54,7 +54,7 @@
54/** 54/**
55 * Defines the corner values for a bubble. 55 * Defines the corner values for a bubble.
56 * 56 *
57 * The corner will be used to determine where the arrow of the 57 * The corner will be used to determine where the arrow of the
58 * bubble points to. 58 * bubble points to.
59 */ 59 */
60typedef enum 60typedef enum
diff --git a/legacy/elementary/src/lib/elm_button.h b/legacy/elementary/src/lib/elm_button.h
index e8254db044..9a60708199 100644
--- a/legacy/elementary/src/lib/elm_button.h
+++ b/legacy/elementary/src/lib/elm_button.h
@@ -28,7 +28,7 @@
28 * continuous look across its options. 28 * continuous look across its options.
29 * @li hoversel_vertical_entry: Another internal for @ref Hoversel. 29 * @li hoversel_vertical_entry: Another internal for @ref Hoversel.
30 * @li naviframe: Internally used by @ref Naviframe for its back button. 30 * @li naviframe: Internally used by @ref Naviframe for its back button.
31 * @li colorselector: Internally used by @ref Colorselector 31 * @li colorselector: Internally used by @ref Colorselector
32 * for its left and right buttons. 32 * for its left and right buttons.
33 * 33 *
34 * Default content parts of the button widget that you can use for are: 34 * Default content parts of the button widget that you can use for are:
diff --git a/legacy/elementary/src/lib/elm_calendar.h b/legacy/elementary/src/lib/elm_calendar.h
index cb8bb17869..588d27dbb6 100644
--- a/legacy/elementary/src/lib/elm_calendar.h
+++ b/legacy/elementary/src/lib/elm_calendar.h
@@ -4,7 +4,7 @@
4 * This is a Calendar widget. Calender widget helps applications to flexibly 4 * This is a Calendar widget. Calender widget helps applications to flexibly
5 * display a calender with day of the week, day, year and month. Applications will be 5 * display a calender with day of the week, day, year and month. Applications will be
6 * able to choose a specific date that will be reported in the smart_callbacks for 6 * able to choose a specific date that will be reported in the smart_callbacks for
7 * the calendar widget. The APIs of calendar widget let the applications perform 7 * the calendar widget. The APIs of calendar widget let the applications perform
8 * other functions like, 8 * other functions like,
9 * placing marks on specific dates 9 * placing marks on specific dates
10 * Setting the bounds for the calendar (minimum and maximum years) 10 * Setting the bounds for the calendar (minimum and maximum years)
diff --git a/legacy/elementary/src/lib/elm_check.h b/legacy/elementary/src/lib/elm_check.h
index 3ade50d97a..0681caa894 100644
--- a/legacy/elementary/src/lib/elm_check.h
+++ b/legacy/elementary/src/lib/elm_check.h
@@ -44,7 +44,7 @@
44 * @li elm_object_signal_callback_del 44 * @li elm_object_signal_callback_del
45 * 45 *
46 * @ref tutorial_check should give you a firm grasp of how to use this widget. 46 * @ref tutorial_check should give you a firm grasp of how to use this widget.
47 * 47 *
48 * @{ 48 * @{
49 */ 49 */
50 50
diff --git a/legacy/elementary/src/lib/elm_colorselector.h b/legacy/elementary/src/lib/elm_colorselector.h
index b51465c3d4..76c6c97097 100644
--- a/legacy/elementary/src/lib/elm_colorselector.h
+++ b/legacy/elementary/src/lib/elm_colorselector.h
@@ -94,7 +94,7 @@ EAPI void elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g, in
94 * 94 *
95 * @param obj Colorselector object 95 * @param obj Colorselector object
96 * @param mode Elm_Colorselector_Mode 96 * @param mode Elm_Colorselector_Mode
97 * 97 *
98 * Colorselector supports three modes palette only, selector only and both. 98 * Colorselector supports three modes palette only, selector only and both.
99 * 99 *
100 * @ingroup Colorselector 100 * @ingroup Colorselector
@@ -106,7 +106,7 @@ EAPI void elm_colorselector_mode_set(Evas_Object *obj, Elm_Colorselector_Mode mo
106 * 106 *
107 * @param obj Colorselector object 107 * @param obj Colorselector object
108 * @return mode The current mode of colorselector 108 * @return mode The current mode of colorselector
109 * 109 *
110 * @ingroup Colorselector 110 * @ingroup Colorselector
111 */ 111 */
112EAPI Elm_Colorselector_Mode elm_colorselector_mode_get(const Evas_Object *obj); 112EAPI Elm_Colorselector_Mode elm_colorselector_mode_get(const Evas_Object *obj);
@@ -119,7 +119,7 @@ EAPI Elm_Colorselector_Mode elm_colorselector_mode_get(const Evas_Object *obj);
119 * @param g integer pointer for g-value of color 119 * @param g integer pointer for g-value of color
120 * @param b integer pointer for b-value of color 120 * @param b integer pointer for b-value of color
121 * @param a integer pointer for a-value of color 121 * @param a integer pointer for a-value of color
122 * 122 *
123 * @ingroup Colorselector 123 * @ingroup Colorselector
124 */ 124 */
125EAPI void elm_colorselector_palette_item_color_get(const Elm_Object_Item *it, int *r, int *g, int *b, int *a); 125EAPI void elm_colorselector_palette_item_color_get(const Elm_Object_Item *it, int *r, int *g, int *b, int *a);
@@ -180,7 +180,7 @@ EAPI void elm_colorselector_palette_name_set(Evas_Object *obj, const char *palet
180 * @param obj The Colorselector object 180 * @param obj The Colorselector object
181 * @return Name of palette 181 * @return Name of palette
182 * 182 *
183 * Returns the currently set palette name using which colors will be 183 * Returns the currently set palette name using which colors will be
184 * saved/loaded in to config. 184 * saved/loaded in to config.
185 * 185 *
186 * @ingroup Colorselector 186 * @ingroup Colorselector
diff --git a/legacy/elementary/src/lib/elm_config.c b/legacy/elementary/src/lib/elm_config.c
index ed7438d164..9937383c30 100644
--- a/legacy/elementary/src/lib/elm_config.c
+++ b/legacy/elementary/src/lib/elm_config.c
@@ -1763,7 +1763,7 @@ elm_config_cache_font_cache_size_get(void)
1763 return _elm_config->font_cache; 1763 return _elm_config->font_cache;
1764} 1764}
1765 1765
1766EAPI void 1766EAPI void
1767elm_config_cache_font_cache_size_set(int size) 1767elm_config_cache_font_cache_size_set(int size)
1768{ 1768{
1769 if (_elm_config->font_cache == size) return; 1769 if (_elm_config->font_cache == size) return;
diff --git a/legacy/elementary/src/lib/elm_config.h b/legacy/elementary/src/lib/elm_config.h
index a6dc46cffd..edab212498 100644
--- a/legacy/elementary/src/lib/elm_config.h
+++ b/legacy/elementary/src/lib/elm_config.h
@@ -43,7 +43,7 @@ EAPI void elm_config_reload(void);
43/** 43/**
44 * Flush all config settings then apply those settings to all applications 44 * Flush all config settings then apply those settings to all applications
45 * using elementary on the current display. 45 * using elementary on the current display.
46 * 46 *
47 * @ingroup Config 47 * @ingroup Config
48 */ 48 */
49EAPI void elm_config_all_flush(void); 49EAPI void elm_config_all_flush(void);
@@ -428,7 +428,7 @@ EAPI double elm_config_tooltip_delay_get(void);
428/** 428/**
429 * Set the duration after which tooltip will be shown. 429 * Set the duration after which tooltip will be shown.
430 * 430 *
431 * @return EINA_TRUE if value is set. 431 * @return EINA_TRUE if value is set.
432 */ 432 */
433EAPI void elm_config_tooltip_delay_set(double delay); 433EAPI void elm_config_tooltip_delay_set(double delay);
434 434
@@ -494,7 +494,7 @@ EAPI void elm_config_scale_set(double scale);
494 * This gets the "show last" setting of password mode which might be 494 * This gets the "show last" setting of password mode which might be
495 * enabled or disabled. 495 * enabled or disabled.
496 * 496 *
497 * @return @c EINA_TRUE, if the "show last" setting is enabled, 497 * @return @c EINA_TRUE, if the "show last" setting is enabled,
498 * @c EINA_FALSE if it's disabled. 498 * @c EINA_FALSE if it's disabled.
499 * 499 *
500 * @ingroup Password_last_show 500 * @ingroup Password_last_show
@@ -880,7 +880,7 @@ EAPI Eina_Bool elm_config_focus_highlight_enabled_get(void);
880 * Set the enable status of the focus highlight 880 * Set the enable status of the focus highlight
881 * 881 *
882 * @param enable Enable highlight if EINA_TRUE, disable otherwise 882 * @param enable Enable highlight if EINA_TRUE, disable otherwise
883 * 883 *
884 * Set whether to show or not the highlight on focused objects 884 * Set whether to show or not the highlight on focused objects
885 * 885 *
886 * Note that it will take effect only to Elementary windows created after 886 * Note that it will take effect only to Elementary windows created after
@@ -896,10 +896,10 @@ EAPI void elm_config_focus_highlight_enabled_set(Eina_Bool enabl
896 * Get the enable status of the highlight animation 896 * Get the enable status of the highlight animation
897 * 897 *
898 * @return The focus highlight mode set 898 * @return The focus highlight mode set
899 * 899 *
900 * Get whether the focus highlight, if enabled, will animate its switch from 900 * Get whether the focus highlight, if enabled, will animate its switch from
901 * one object to the next 901 * one object to the next
902 * 902 *
903 * @ingroup Focus 903 * @ingroup Focus
904 */ 904 */
905EAPI Eina_Bool elm_config_focus_highlight_animate_get(void); 905EAPI Eina_Bool elm_config_focus_highlight_animate_get(void);
@@ -908,10 +908,10 @@ EAPI Eina_Bool elm_config_focus_highlight_animate_get(void);
908 * Set the enable status of the highlight animation 908 * Set the enable status of the highlight animation
909 * 909 *
910 * @param animate Enable animation if EINA_TRUE, disable otherwise 910 * @param animate Enable animation if EINA_TRUE, disable otherwise
911 * 911 *
912 * Set whether the focus highlight, if enabled, will animate its switch from 912 * Set whether the focus highlight, if enabled, will animate its switch from
913 * one object to the next 913 * one object to the next
914 * 914 *
915 * Note that it will take effect only to Elementary windows created after 915 * Note that it will take effect only to Elementary windows created after
916 * this is called. 916 * this is called.
917 * 917 *
diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c
index a918fd3409..38ef33b975 100644
--- a/legacy/elementary/src/lib/elm_entry.c
+++ b/legacy/elementary/src/lib/elm_entry.c
@@ -53,11 +53,12 @@ struct _Widget_Data
53 Elm_Input_Panel_Return_Key_Type input_panel_return_key_type; 53 Elm_Input_Panel_Return_Key_Type input_panel_return_key_type;
54 void *input_panel_imdata; 54 void *input_panel_imdata;
55 int input_panel_imdata_len; 55 int input_panel_imdata_len;
56 struct { 56 struct
57 {
57 Evas_Object *hover_parent; 58 Evas_Object *hover_parent;
58 Evas_Object *pop, *hover; 59 Evas_Object *pop, *hover;
59 const char *hover_style; 60 const char *hover_style;
60 } anchor_hover; 61 } anchor_hover;
61 Eina_Bool changed : 1; 62 Eina_Bool changed : 1;
62 Eina_Bool single_line : 1; 63 Eina_Bool single_line : 1;
63 Eina_Bool password : 1; 64 Eina_Bool password : 1;
@@ -1180,7 +1181,7 @@ _remove_item_tags(const char *str)
1180 while (EINA_TRUE) 1181 while (EINA_TRUE)
1181 { 1182 {
1182 const char *temp = eina_strbuf_string_get(buf); 1183 const char *temp = eina_strbuf_string_get(buf);
1183 1184
1184 char *startTag = NULL; 1185 char *startTag = NULL;
1185 char *endTag = NULL; 1186 char *endTag = NULL;
1186 1187
@@ -1209,7 +1210,7 @@ _elm_entry_entry_paste(Evas_Object *obj, const char *entry)
1209{ 1210{
1210 Widget_Data *wd = elm_widget_data_get(obj); 1211 Widget_Data *wd = elm_widget_data_get(obj);
1211 char *str = NULL; 1212 char *str = NULL;
1212 1213
1213 if (wd->cnp_mode == ELM_CNP_MODE_NO_IMAGE) 1214 if (wd->cnp_mode == ELM_CNP_MODE_NO_IMAGE)
1214 { 1215 {
1215 str = _remove_item_tags(entry); 1216 str = _remove_item_tags(entry);
diff --git a/legacy/elementary/src/lib/elm_entry.h b/legacy/elementary/src/lib/elm_entry.h
index 120c590a35..b29a284885 100644
--- a/legacy/elementary/src/lib/elm_entry.h
+++ b/legacy/elementary/src/lib/elm_entry.h
@@ -244,7 +244,7 @@
244 * @typedef Elm_Text_Format 244 * @typedef Elm_Text_Format
245 * 245 *
246 * Text Format types. 246 * Text Format types.
247 * 247 *
248 * @see elm_entry_file_set() 248 * @see elm_entry_file_set()
249 */ 249 */
250typedef enum 250typedef enum
@@ -258,7 +258,7 @@ typedef enum
258 * @typedef Elm_Wrap_Type 258 * @typedef Elm_Wrap_Type
259 * 259 *
260 * Line wrapping types. 260 * Line wrapping types.
261 * 261 *
262 * @see elm_entry_line_wrap_set() 262 * @see elm_entry_line_wrap_set()
263 */ 263 */
264typedef enum 264typedef enum
@@ -275,7 +275,7 @@ typedef enum
275 * @typedef Elm_Input_Panel_Layout 275 * @typedef Elm_Input_Panel_Layout
276 * 276 *
277 * Input panel (virtual keyboard) layout types. 277 * Input panel (virtual keyboard) layout types.
278 * 278 *
279 * @see elm_entry_input_panel_layout_set() 279 * @see elm_entry_input_panel_layout_set()
280 */ 280 */
281typedef enum 281typedef enum
@@ -299,7 +299,7 @@ typedef enum
299 * @typedef Elm_Input_Panel_Lang 299 * @typedef Elm_Input_Panel_Lang
300 * 300 *
301 * Input panel (virtual keyboard) language modes. 301 * Input panel (virtual keyboard) language modes.
302 * 302 *
303 * @see elm_entry_input_panel_language_set() 303 * @see elm_entry_input_panel_language_set()
304 */ 304 */
305typedef enum 305typedef enum
@@ -313,7 +313,7 @@ typedef enum
313 * @typedef Elm_Autocapital_Type 313 * @typedef Elm_Autocapital_Type
314 * 314 *
315 * Autocapitalization Types. 315 * Autocapitalization Types.
316 * 316 *
317 * @see elm_entry_autocapital_type_set() 317 * @see elm_entry_autocapital_type_set()
318 */ 318 */
319typedef enum 319typedef enum
@@ -329,7 +329,7 @@ typedef enum
329 * @typedef Elm_Input_Panel_Return_Key_Type 329 * @typedef Elm_Input_Panel_Return_Key_Type
330 * 330 *
331 * "Return" Key types on the input panel (virtual keyboard). 331 * "Return" Key types on the input panel (virtual keyboard).
332 * 332 *
333 * @see elm_entry_input_panel_return_key_type_set() 333 * @see elm_entry_input_panel_return_key_type_set()
334 */ 334 */
335typedef enum 335typedef enum
@@ -972,7 +972,7 @@ EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Elm_Ent
972 * Append the given callback to the list. This functions will be called 972 * Append the given callback to the list. This functions will be called
973 * whenever any text is inserted into the entry, with the text to be inserted 973 * whenever any text is inserted into the entry, with the text to be inserted
974 * as a parameter. The type of given text is always markup. 974 * as a parameter. The type of given text is always markup.
975 * The callback function is free to alter the text in any way it wants, but 975 * The callback function is free to alter the text in any way it wants, but
976 * it must remember to free the given pointer and update it. 976 * it must remember to free the given pointer and update it.
977 * If the new text is to be discarded, the function can free it and set its 977 * If the new text is to be discarded, the function can free it and set its
978 * text parameter to NULL. This will also prevent any following filters from 978 * text parameter to NULL. This will also prevent any following filters from
@@ -1235,7 +1235,7 @@ EAPI void elm_entry_input_panel_hide(Evas_Object *obj);
1235/** 1235/**
1236 * Set the language mode of the input panel. 1236 * Set the language mode of the input panel.
1237 * 1237 *
1238 * This API can be used if you want to show the alphabet keyboard mode. 1238 * This API can be used if you want to show the alphabet keyboard mode.
1239 * 1239 *
1240 * @param obj The entry object 1240 * @param obj The entry object
1241 * @param lang language to be set to the input panel. 1241 * @param lang language to be set to the input panel.
@@ -1268,7 +1268,7 @@ EAPI void elm_entry_input_panel_imdata_set(Evas_Object *obj, c
1268/** 1268/**
1269 * Get the specific data of the current input panel. 1269 * Get the specific data of the current input panel.
1270 * 1270 *
1271 * See @ref elm_entry_input_panel_imdata_set for more details. 1271 * See @ref elm_entry_input_panel_imdata_set for more details.
1272 * 1272 *
1273 * @param obj The entry object 1273 * @param obj The entry object
1274 * @param data The specific data to be got from the input panel 1274 * @param data The specific data to be got from the input panel
@@ -1301,7 +1301,7 @@ EAPI Elm_Input_Panel_Return_Key_Type elm_entry_input_panel_return_key_type_get(c
1301 * 1301 *
1302 * @param obj The entry object 1302 * @param obj The entry object
1303 * @param disabled The state to put in in: @c EINA_TRUE for 1303 * @param disabled The state to put in in: @c EINA_TRUE for
1304 * disabled, @c EINA_FALSE for enabled 1304 * disabled, @c EINA_FALSE for enabled
1305 */ 1305 */
1306EAPI void elm_entry_input_panel_return_key_disabled_set(Evas_Object *obj, Eina_Bool disabled); 1306EAPI void elm_entry_input_panel_return_key_disabled_set(Evas_Object *obj, Eina_Bool disabled);
1307 1307
@@ -1326,7 +1326,7 @@ EAPI Eina_Bool elm_entry_input_panel_return_key_disabled_get(const
1326EAPI void elm_entry_input_panel_return_key_autoenabled_set(Evas_Object *obj, Eina_Bool enabled); 1326EAPI void elm_entry_input_panel_return_key_autoenabled_set(Evas_Object *obj, Eina_Bool enabled);
1327 1327
1328/** 1328/**
1329 * Reset the input method context of the entry if needed. 1329 * Reset the input method context of the entry if needed.
1330 * 1330 *
1331 * This can be necessary in the case where modifying the buffer would confuse on-going input method behavior 1331 * This can be necessary in the case where modifying the buffer would confuse on-going input method behavior
1332 * @param obj The entry object 1332 * @param obj The entry object
diff --git a/legacy/elementary/src/lib/elm_flip.c b/legacy/elementary/src/lib/elm_flip.c
index 7410ff1e2b..d38240325a 100644
--- a/legacy/elementary/src/lib/elm_flip.c
+++ b/legacy/elementary/src/lib/elm_flip.c
@@ -30,9 +30,10 @@ struct _Widget_Data
30 Elm_Flip_Mode mode; 30 Elm_Flip_Mode mode;
31 Evas_Object *clip; 31 Evas_Object *clip;
32 Evas_Object *event[4]; 32 Evas_Object *event[4];
33 struct { 33 struct
34 Evas_Object *content, *clip; 34 {
35 } front, back; 35 Evas_Object *content, *clip;
36 } front, back;
36 Ecore_Job *job; 37 Ecore_Job *job;
37 Evas_Coord down_x, down_y, x, y, ox, oy, w, h; 38 Evas_Coord down_x, down_y, x, y, ox, oy, w, h;
38 Elm_Flip_Interaction intmode; 39 Elm_Flip_Interaction intmode;
diff --git a/legacy/elementary/src/lib/elm_flip.h b/legacy/elementary/src/lib/elm_flip.h
index 222b07cb62..9e5d77c9fc 100644
--- a/legacy/elementary/src/lib/elm_flip.h
+++ b/legacy/elementary/src/lib/elm_flip.h
@@ -19,14 +19,14 @@
19 * "animate,done" - when a flip animation is finished 19 * "animate,done" - when a flip animation is finished
20 * 20 *
21 * Default content parts of the flip widget that you can use for are: 21 * Default content parts of the flip widget that you can use for are:
22 * @li "front" - A front content of the flip 22 * @li "front" - A front content of the flip
23 * @li "back" - A back content of the flip 23 * @li "back" - A back content of the flip
24 * 24 *
25 * Supported elm_object common APIs. 25 * Supported elm_object common APIs.
26 * @li elm_object_part_content_set 26 * @li elm_object_part_content_set
27 * @li elm_object_part_content_get 27 * @li elm_object_part_content_get
28 * @li elm_object_part_content_unset 28 * @li elm_object_part_content_unset
29 * 29 *
30 * @ref tutorial_flip show how to use most of the API. 30 * @ref tutorial_flip show how to use most of the API.
31 * 31 *
32 * @{ 32 * @{
diff --git a/legacy/elementary/src/lib/elm_genlist.h b/legacy/elementary/src/lib/elm_genlist.h
index a957c995da..c1b0a13511 100644
--- a/legacy/elementary/src/lib/elm_genlist.h
+++ b/legacy/elementary/src/lib/elm_genlist.h
@@ -504,7 +504,7 @@ EAPI Eina_Bool elm_genlist_multi_select_get(const Evas_Objec
504 * fixed (restricted to a minimum of) to the list width when calculating its 504 * fixed (restricted to a minimum of) to the list width when calculating its
505 * size in order to allow the height to be calculated based on it. This allows, 505 * size in order to allow the height to be calculated based on it. This allows,
506 * for instance, text block to wrap lines if the Edje part is configured with 506 * for instance, text block to wrap lines if the Edje part is configured with
507 * "text.min: 0 1". 507 * "text.min: 0 1".
508 * @note ELM_LIST_COMPRESS will make list resize slower as it will have to 508 * @note ELM_LIST_COMPRESS will make list resize slower as it will have to
509 * recalculate every item height again whenever the list width 509 * recalculate every item height again whenever the list width
510 * changes! 510 * changes!
@@ -897,7 +897,7 @@ EAPI void elm_genlist_item_show(Elm_Object_Item *it, El
897 * @ref Elm_Genlist_Item_Scrollto_Type 897 * @ref Elm_Genlist_Item_Scrollto_Type
898 * 898 *
899 * This causes genlist to jump to the given item @p it and show it (by 899 * This causes genlist to jump to the given item @p it and show it (by
900 * animatedly scrolling), if it is not fully visible. 900 * animatedly scrolling), if it is not fully visible.
901 * This may use animation and take a some time to do so. 901 * This may use animation and take a some time to do so.
902 * 902 *
903 * @see elm_genlist_item_show() 903 * @see elm_genlist_item_show()
@@ -943,7 +943,7 @@ EAPI void elm_genlist_item_item_class_update(Elm_Object
943 * 943 *
944 * @param it The genlist item 944 * @param it The genlist item
945 * 945 *
946 * This returns the Genlist_Item_Class for the given item. It can be used to 946 * This returns the Genlist_Item_Class for the given item. It can be used to
947 * examine the function pointers and item_style. 947 * examine the function pointers and item_style.
948 * 948 *
949 * @ingroup Genlist 949 * @ingroup Genlist
@@ -1659,7 +1659,7 @@ EAPI void elm_genlist_reorder_mode_set(Evas_Object *obj
1659EAPI Eina_Bool elm_genlist_reorder_mode_get(const Evas_Object *obj); 1659EAPI Eina_Bool elm_genlist_reorder_mode_get(const Evas_Object *obj);
1660 1660
1661/** 1661/**
1662 * Get the Item's Type 1662 * Get the Item's Type
1663 * 1663 *
1664 * @param it The genlist item 1664 * @param it The genlist item
1665 * @return The item type. 1665 * @return The item type.
diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c
index 7e65175f69..3d6a61a449 100644
--- a/legacy/elementary/src/lib/elm_gesture_layer.c
+++ b/legacy/elementary/src/lib/elm_gesture_layer.c
@@ -1570,9 +1570,9 @@ _n_long_tap_test(Evas_Object *obj, Pointer_Event *pe,
1570 * @ingroup Elm_Gesture_Layer 1570 * @ingroup Elm_Gesture_Layer
1571 */ 1571 */
1572static void 1572static void
1573_set_momentum(Elm_Gesture_Momentum_Info *momentum, 1573_set_momentum(Elm_Gesture_Momentum_Info *momentum,
1574 Evas_Coord xx1, Evas_Coord yy1, 1574 Evas_Coord xx1, Evas_Coord yy1,
1575 Evas_Coord xx2, Evas_Coord yy2, 1575 Evas_Coord xx2, Evas_Coord yy2,
1576 unsigned int t1x, unsigned int t1y, unsigned int t2) 1576 unsigned int t1x, unsigned int t1y, unsigned int t2)
1577{ 1577{
1578 Evas_Coord velx = 0, vely = 0, vel; 1578 Evas_Coord velx = 0, vely = 0, vel;
@@ -2791,7 +2791,7 @@ _get_rotate_properties(Rotate_Type *st,
2791 &st->info.x, &st->info.y) / 2; 2791 &st->info.x, &st->info.y) / 2;
2792 2792
2793 *angle = get_angle(xx1, yy1, xx2, yy2); 2793 *angle = get_angle(xx1, yy1, xx2, yy2);
2794 2794
2795 if (angle == &st->info.angle) 2795 if (angle == &st->info.angle)
2796 { /* Fingers are moving, compute momentum */ 2796 { /* Fingers are moving, compute momentum */
2797 unsigned int tm_start = 2797 unsigned int tm_start =
diff --git a/legacy/elementary/src/lib/elm_getting_started.h b/legacy/elementary/src/lib/elm_getting_started.h
index 9bea82f69a..1931eb0eaf 100644
--- a/legacy/elementary/src/lib/elm_getting_started.h
+++ b/legacy/elementary/src/lib/elm_getting_started.h
@@ -39,11 +39,11 @@
39 * @verbatim 39 * @verbatim
40 * AUTOMAKE_OPTIONS = 1.4 foreign 40 * AUTOMAKE_OPTIONS = 1.4 foreign
41 * MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in configure depcomp install-sh missing 41 * MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in configure depcomp install-sh missing
42 * 42 *
43 * INCLUDES = -I$(top_srcdir) 43 * INCLUDES = -I$(top_srcdir)
44 * 44 *
45 * bin_PROGRAMS = myapp 45 * bin_PROGRAMS = myapp
46 * 46 *
47 * myapp_SOURCES = main.c 47 * myapp_SOURCES = main.c
48 * myapp_LDADD = @ELEMENTARY_LIBS@ 48 * myapp_LDADD = @ELEMENTARY_LIBS@
49 * myapp_CFLAGS = @ELEMENTARY_CFLAGS@ 49 * myapp_CFLAGS = @ELEMENTARY_CFLAGS@
@@ -136,24 +136,24 @@
136 * 136 *
137 * @code 137 * @code
138 * #include <Elementary.h> 138 * #include <Elementary.h>
139 * 139 *
140 * static void 140 * static void
141 * on_done(void *data, Evas_Object *obj, void *event_info) 141 * on_done(void *data, Evas_Object *obj, void *event_info)
142 * { 142 * {
143 * // quit the mainloop (elm_run function will return) 143 * // quit the mainloop (elm_run function will return)
144 * elm_exit(); 144 * elm_exit();
145 * } 145 * }
146 * 146 *
147 * EAPI_MAIN int 147 * EAPI_MAIN int
148 * elm_main(int argc, char **argv) 148 * elm_main(int argc, char **argv)
149 * { 149 * {
150 * Evas_Object *win, *box, *lab, *btn; 150 * Evas_Object *win, *box, *lab, *btn;
151 * 151 *
152 * // new window - do the usual and give it a name (hello) and title (Hello) 152 * // new window - do the usual and give it a name (hello) and title (Hello)
153 * win = elm_win_util_standard_add("hello", "Hello"); 153 * win = elm_win_util_standard_add("hello", "Hello");
154 * // when the user clicks "close" on a window there is a request to delete 154 * // when the user clicks "close" on a window there is a request to delete
155 * evas_object_smart_callback_add(win, "delete,request", on_done, NULL); 155 * evas_object_smart_callback_add(win, "delete,request", on_done, NULL);
156 * 156 *
157 * // add a box object - default is vertical. a box holds children in a row, 157 * // add a box object - default is vertical. a box holds children in a row,
158 * // either horizontally or vertically. nothing more. 158 * // either horizontally or vertically. nothing more.
159 * box = elm_box_add(win); 159 * box = elm_box_add(win);
@@ -163,7 +163,7 @@
163 * // size as well as gets resized if window is resized) 163 * // size as well as gets resized if window is resized)
164 * elm_win_resize_object_add(win, box); 164 * elm_win_resize_object_add(win, box);
165 * evas_object_show(box); 165 * evas_object_show(box);
166 * 166 *
167 * // add a label widget, set the text and put it in the pad frame 167 * // add a label widget, set the text and put it in the pad frame
168 * lab = elm_label_add(win); 168 * lab = elm_label_add(win);
169 * // set default text of the label 169 * // set default text of the label
@@ -171,7 +171,7 @@
171 * // pack the label at the end of the box 171 * // pack the label at the end of the box
172 * elm_box_pack_end(box, lab); 172 * elm_box_pack_end(box, lab);
173 * evas_object_show(lab); 173 * evas_object_show(lab);
174 * 174 *
175 * // add an ok button 175 * // add an ok button
176 * btn = elm_button_add(win); 176 * btn = elm_button_add(win);
177 * // set default text of button to "OK" 177 * // set default text of button to "OK"
@@ -181,10 +181,10 @@
181 * evas_object_show(btn); 181 * evas_object_show(btn);
182 * // call on_done when button is clicked 182 * // call on_done when button is clicked
183 * evas_object_smart_callback_add(btn, "clicked", on_done, NULL); 183 * evas_object_smart_callback_add(btn, "clicked", on_done, NULL);
184 * 184 *
185 * // now we are done, show the window 185 * // now we are done, show the window
186 * evas_object_show(win); 186 * evas_object_show(win);
187 * 187 *
188 * // run the mainloop and process events and callbacks 188 * // run the mainloop and process events and callbacks
189 * elm_run(); 189 * elm_run();
190 * elm_shutdown(); 190 * elm_shutdown();
diff --git a/legacy/elementary/src/lib/elm_glview.h b/legacy/elementary/src/lib/elm_glview.h
index 5ed8434e18..43aaa7b7c2 100644
--- a/legacy/elementary/src/lib/elm_glview.h
+++ b/legacy/elementary/src/lib/elm_glview.h
@@ -16,7 +16,7 @@ typedef void (*Elm_GLView_Func_Cb)(Evas_Object *obj);
16 16
17typedef enum _Elm_GLView_Mode 17typedef enum _Elm_GLView_Mode
18{ 18{
19 ELM_GLVIEW_NONE = 0, 19 ELM_GLVIEW_NONE = 0,
20 ELM_GLVIEW_ALPHA = (1<<1), /**< Alpha channel enabled rendering mode */ 20 ELM_GLVIEW_ALPHA = (1<<1), /**< Alpha channel enabled rendering mode */
21 ELM_GLVIEW_DEPTH = (1<<2), /**< Depth buffer enabled rendering mode */ 21 ELM_GLVIEW_DEPTH = (1<<2), /**< Depth buffer enabled rendering mode */
22 ELM_GLVIEW_STENCIL = (1<<3), /**< Stencil buffer enabled rendering mode */ 22 ELM_GLVIEW_STENCIL = (1<<3), /**< Stencil buffer enabled rendering mode */
@@ -24,7 +24,7 @@ typedef enum _Elm_GLView_Mode
24} Elm_GLView_Mode; 24} Elm_GLView_Mode;
25 25
26/** 26/**
27 * Defines a policy for the glview resizing. 27 * Defines a policy for the glview resizing.
28 * 28 *
29 * The resizing policy tells glview what to do with the underlying 29 * The resizing policy tells glview what to do with the underlying
30 * surface when resize happens. ELM_GLVIEW_RESIZE_POLICY_RECREATE 30 * surface when resize happens. ELM_GLVIEW_RESIZE_POLICY_RECREATE
@@ -42,12 +42,12 @@ typedef enum
42} Elm_GLView_Resize_Policy; 42} Elm_GLView_Resize_Policy;
43 43
44/** 44/**
45 * Defines a policy for gl rendering. 45 * Defines a policy for gl rendering.
46 * 46 *
47 * The rendering policy tells glview where to run the gl rendering code. 47 * The rendering policy tells glview where to run the gl rendering code.
48 * ELM_GLVIEW_RENDER_POLICY_ON_DEMAND tells glview to call the rendering 48 * ELM_GLVIEW_RENDER_POLICY_ON_DEMAND tells glview to call the rendering
49 * calls on demand, which means that the rendering code gets called 49 * calls on demand, which means that the rendering code gets called
50 * only when it is visible. 50 * only when it is visible.
51 * 51 *
52 * @note Default is ELM_GLVIEW_RENDER_POLICY_ON_DEMAND 52 * @note Default is ELM_GLVIEW_RENDER_POLICY_ON_DEMAND
53 */ 53 */
@@ -113,7 +113,7 @@ EAPI Evas_GL_API *elm_glview_gl_api_get(const Evas_Object *obj);
113 * 113 *
114 * Direct is a hint for the elm_glview to render directly to the window 114 * Direct is a hint for the elm_glview to render directly to the window
115 * given that the right conditions are met. Otherwise it falls back 115 * given that the right conditions are met. Otherwise it falls back
116 * to rendering to an offscreen buffer before it gets composited to the 116 * to rendering to an offscreen buffer before it gets composited to the
117 * window. 117 * window.
118 * 118 *
119 * @ingroup GLView 119 * @ingroup GLView
@@ -126,10 +126,10 @@ EAPI Eina_Bool elm_glview_mode_set(Evas_Object *obj, Elm_GLView_Mode mode);
126 * @param obj The glview object. 126 * @param obj The glview object.
127 * @param policy The scaling policy. 127 * @param policy The scaling policy.
128 * 128 *
129 * By default, the resize policy is set to ELM_GLVIEW_RESIZE_POLICY_RECREATE. 129 * By default, the resize policy is set to ELM_GLVIEW_RESIZE_POLICY_RECREATE.
130 * When resize is called it destroys the previous surface and recreates the 130 * When resize is called it destroys the previous surface and recreates the
131 * newly specified size. If the policy is set to 131 * newly specified size. If the policy is set to
132 * ELM_GLVIEW_RESIZE_POLICY_SCALE, however, glview only scales the image 132 * ELM_GLVIEW_RESIZE_POLICY_SCALE, however, glview only scales the image
133 * object and not the underlying GL Surface. 133 * object and not the underlying GL Surface.
134 * 134 *
135 * @ingroup GLView 135 * @ingroup GLView
@@ -143,7 +143,7 @@ EAPI Eina_Bool elm_glview_resize_policy_set(Evas_Object *obj, Elm_GLView_Resi
143 * @param policy The render policy. 143 * @param policy The render policy.
144 * 144 *
145 * By default, the render policy is set to ELM_GLVIEW_RENDER_POLICY_ON_DEMAND. 145 * By default, the render policy is set to ELM_GLVIEW_RENDER_POLICY_ON_DEMAND.
146 * This policy is set such that during the render loop, glview is only 146 * This policy is set such that during the render loop, glview is only
147 * redrawn if it needs to be redrawn. (i.e. when it is visible) If the policy 147 * redrawn if it needs to be redrawn. (i.e. when it is visible) If the policy
148 * is set to ELM_GLVIEWW_RENDER_POLICY_ALWAYS, it redraws regardless of 148 * is set to ELM_GLVIEWW_RENDER_POLICY_ALWAYS, it redraws regardless of
149 * whether it is visible or needs redrawing. 149 * whether it is visible or needs redrawing.
@@ -158,7 +158,7 @@ EAPI Eina_Bool elm_glview_render_policy_set(Evas_Object *obj, Elm_GLView_Rend
158 * @param obj The glview object. 158 * @param obj The glview object.
159 * @param func The init function to be registered. 159 * @param func The init function to be registered.
160 * 160 *
161 * The registered init function gets called once during the render loop. 161 * The registered init function gets called once during the render loop.
162 * This function allows glview to hide all the rendering context/surface 162 * This function allows glview to hide all the rendering context/surface
163 * details and have the user just call GL calls that they desire 163 * details and have the user just call GL calls that they desire
164 * for initialization GL calls. 164 * for initialization GL calls.
@@ -188,7 +188,7 @@ EAPI void elm_glview_del_func_set(Evas_Object *obj, Elm_GLView_Func_Cb f
188 * @param obj The glview object. 188 * @param obj The glview object.
189 * @param func The resize function to be registered. 189 * @param func The resize function to be registered.
190 * 190 *
191 * The resize function gets called during the render loop. 191 * The resize function gets called during the render loop.
192 * This function allows glview to hide all the rendering context/surface 192 * This function allows glview to hide all the rendering context/surface
193 * details and have the user just call GL calls that they desire 193 * details and have the user just call GL calls that they desire
194 * when resize happens. 194 * when resize happens.
@@ -201,9 +201,9 @@ EAPI void elm_glview_resize_func_set(Evas_Object *obj, Elm_GLView_Func_C
201 * Set the render function that runs in the main loop. 201 * Set the render function that runs in the main loop.
202 * 202 *
203 * The render function gets called in the main loop but whether it runs 203 * The render function gets called in the main loop but whether it runs
204 * depends on the rendering policy and whether elm_glview_changed_set() 204 * depends on the rendering policy and whether elm_glview_changed_set()
205 * gets called. 205 * gets called.
206 * 206 *
207 * @param obj The glview object. 207 * @param obj The glview object.
208 * @param func The render function to be registered. 208 * @param func The render function to be registered.
209 * 209 *
diff --git a/legacy/elementary/src/lib/elm_icon.c b/legacy/elementary/src/lib/elm_icon.c
index 7ed48d5e95..187df0e63a 100644
--- a/legacy/elementary/src/lib/elm_icon.c
+++ b/legacy/elementary/src/lib/elm_icon.c
@@ -17,27 +17,30 @@ struct _Widget_Data
17 Elm_Icon_Lookup_Order lookup_order; 17 Elm_Icon_Lookup_Order lookup_order;
18 18
19#ifdef HAVE_ELEMENTARY_ETHUMB 19#ifdef HAVE_ELEMENTARY_ETHUMB
20 struct { 20 struct
21 struct { 21 {
22 const char *path; 22 struct
23 const char *key; 23 {
24 } file, thumb; 24 const char *path;
25 const char *key;
26 } file, thumb;
25 27
26 Ecore_Event_Handler *eeh; 28 Ecore_Event_Handler *eeh;
27 29
28 Ethumb_Thumb_Format format; 30 Ethumb_Thumb_Format format;
29 31
30 Ethumb_Client_Async *request; 32 Ethumb_Client_Async *request;
31 33
32 Eina_Bool retry : 1; 34 Eina_Bool retry : 1;
33 } thumb; 35 } thumb;
34#endif 36#endif
35 37
36#ifdef ELM_EFREET 38#ifdef ELM_EFREET
37 struct { 39 struct
40 {
38 int requested_size; 41 int requested_size;
39 Eina_Bool use : 1; 42 Eina_Bool use : 1;
40 } freedesktop; 43 } freedesktop;
41#endif 44#endif
42 int in_eval; 45 int in_eval;
43 Eina_Bool scale_up : 1; 46 Eina_Bool scale_up : 1;
diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c
index 98a7d58b2c..c69f0ca6b4 100644
--- a/legacy/elementary/src/lib/elm_index.c
+++ b/legacy/elementary/src/lib/elm_index.c
@@ -662,7 +662,7 @@ elm_index_autohide_disabled_set(Evas_Object *obj, Eina_Bool disabled)
662 else 662 else
663 edje_object_signal_emit(wd->base, "elm,state,inactive", "elm"); 663 edje_object_signal_emit(wd->base, "elm,state,inactive", "elm");
664 664
665 //FIXME: Should be update indicator based on the indicator visiblility 665 //FIXME: Should be update indicator based on the indicator visiblility
666} 666}
667 667
668EAPI Eina_Bool 668EAPI Eina_Bool
@@ -701,7 +701,7 @@ elm_index_item_selected_set(Elm_Object_Item *it, Eina_Bool selected)
701 Widget_Data *wd = elm_widget_data_get(WIDGET(it)); 701 Widget_Data *wd = elm_widget_data_get(WIDGET(it));
702 if (!wd) return; 702 if (!wd) return;
703 703
704 //FIXME: Should be update indicator based on the autohidden status & indicator visiblility 704 //FIXME: Should be update indicator based on the autohidden status & indicator visiblility
705 705
706 if (selected) 706 if (selected)
707 { 707 {
diff --git a/legacy/elementary/src/lib/elm_index.h b/legacy/elementary/src/lib/elm_index.h
index 01f104973d..f8be044b01 100644
--- a/legacy/elementary/src/lib/elm_index.h
+++ b/legacy/elementary/src/lib/elm_index.h
@@ -148,7 +148,7 @@ EAPI Elm_Object_Item *elm_index_selected_item_get(const Evas_Object *obj, i
148 * @param letter Letter under which the item should be indexed 148 * @param letter Letter under which the item should be indexed
149 * @param func The function to call when the item is selected. 149 * @param func The function to call when the item is selected.
150 * @param data The item data to set for the index's item 150 * @param data The item data to set for the index's item
151 * @return A handle to the item added or @c NULL, on errors 151 * @return A handle to the item added or @c NULL, on errors
152 * 152 *
153 * Despite the most common usage of the @p letter argument is for 153 * Despite the most common usage of the @p letter argument is for
154 * single char strings, one could use arbitrary strings as index 154 * single char strings, one could use arbitrary strings as index
@@ -168,7 +168,7 @@ EAPI Elm_Object_Item *elm_index_item_append(Evas_Object *obj, const char *l
168 * @param letter Letter under which the item should be indexed 168 * @param letter Letter under which the item should be indexed
169 * @param func The function to call when the item is selected. 169 * @param func The function to call when the item is selected.
170 * @param data The item data to set for the index's item 170 * @param data The item data to set for the index's item
171 * @return A handle to the item added or @c NULL, on errors 171 * @return A handle to the item added or @c NULL, on errors
172 * 172 *
173 * Despite the most common usage of the @p letter argument is for 173 * Despite the most common usage of the @p letter argument is for
174 * single char strings, one could use arbitrary strings as index 174 * single char strings, one could use arbitrary strings as index
@@ -189,7 +189,7 @@ EAPI Elm_Object_Item *elm_index_item_prepend(Evas_Object *obj, const char *
189 * @param letter Letter under which the item should be indexed 189 * @param letter Letter under which the item should be indexed
190 * @param func The function to call when the item is clicked. 190 * @param func The function to call when the item is clicked.
191 * @param data The item data to set for the index's item 191 * @param data The item data to set for the index's item
192 * @return A handle to the item added or @c NULL, on errors 192 * @return A handle to the item added or @c NULL, on errors
193 * 193 *
194 * Despite the most common usage of the @p letter argument is for 194 * Despite the most common usage of the @p letter argument is for
195 * single char strings, one could use arbitrary strings as index 195 * single char strings, one could use arbitrary strings as index
@@ -213,7 +213,7 @@ EAPI Elm_Object_Item *elm_index_item_insert_after(Evas_Object *obj, Elm_Obj
213 * @param letter Letter under which the item should be indexed 213 * @param letter Letter under which the item should be indexed
214 * @param func The function to call when the item is clicked. 214 * @param func The function to call when the item is clicked.
215 * @param data The item data to set for the index's item 215 * @param data The item data to set for the index's item
216 * @return A handle to the item added or @c NULL, on errors 216 * @return A handle to the item added or @c NULL, on errors
217 * 217 *
218 * Despite the most common usage of the @p letter argument is for 218 * Despite the most common usage of the @p letter argument is for
219 * single char strings, one could use arbitrary strings as index 219 * single char strings, one could use arbitrary strings as index
@@ -251,7 +251,7 @@ EAPI Elm_Object_Item *elm_index_item_insert_before(Evas_Object *obj, Elm_Ob
251 * because all references to it will be lost. If this function is 251 * because all references to it will be lost. If this function is
252 * not provided (@c NULL is given), index items will be @b 252 * not provided (@c NULL is given), index items will be @b
253 * duplicated, if @p cmp_func returns @c 0. 253 * duplicated, if @p cmp_func returns @c 0.
254 * @return A handle to the item added or @c NULL, on errors 254 * @return A handle to the item added or @c NULL, on errors
255 * 255 *
256 * Despite the most common usage of the @p letter argument is for 256 * Despite the most common usage of the @p letter argument is for
257 * single char strings, one could use arbitrary strings as index 257 * single char strings, one could use arbitrary strings as index
diff --git a/legacy/elementary/src/lib/elm_intro.h b/legacy/elementary/src/lib/elm_intro.h
index 59758fe593..2dd8879282 100644
--- a/legacy/elementary/src/lib/elm_intro.h
+++ b/legacy/elementary/src/lib/elm_intro.h
@@ -3,29 +3,29 @@
3 * @image html elementary.png 3 * @image html elementary.png
4 * @version 0.8.0 4 * @version 0.8.0
5 * @date 2008-2012 5 * @date 2008-2012
6 * 6 *
7 * @section intro What is Elementary? 7 * @section intro What is Elementary?
8 * 8 *
9 * This is a VERY SIMPLE toolkit. It is not meant for writing extensive desktop 9 * This is a VERY SIMPLE toolkit. It is not meant for writing extensive desktop
10 * applications (yet). Small simple ones with simple needs. 10 * applications (yet). Small simple ones with simple needs.
11 * 11 *
12 * It is meant to make the programmers work almost brainless but give them lots 12 * It is meant to make the programmers work almost brainless but give them lots
13 * of flexibility. 13 * of flexibility.
14 * 14 *
15 * @li @ref Start - Go here to quickly get started with writing Apps 15 * @li @ref Start - Go here to quickly get started with writing Apps
16 * 16 *
17 * @section organization Organization 17 * @section organization Organization
18 * 18 *
19 * One can divide Elementary into three main groups: 19 * One can divide Elementary into three main groups:
20 * @li @ref infralist - These are modules that deal with Elementary as a whole. 20 * @li @ref infralist - These are modules that deal with Elementary as a whole.
21 * @li @ref widgetslist - These are the widgets you'll compose your UI out of. 21 * @li @ref widgetslist - These are the widgets you'll compose your UI out of.
22 * @li @ref containerslist - These are the containers which hold the widgets. 22 * @li @ref containerslist - These are the containers which hold the widgets.
23 * 23 *
24 * @section license License 24 * @section license License
25 * 25 *
26 * LGPL v2 (see COPYING in the base of Elementary's source). This applies to 26 * LGPL v2 (see COPYING in the base of Elementary's source). This applies to
27 * all files in the source tree. 27 * all files in the source tree.
28 * 28 *
29 * @section ack Acknowledgements 29 * @section ack Acknowledgements
30 * There is a lot that goes into making a widget set, and they don't happen out of 30 * There is a lot that goes into making a widget set, and they don't happen out of
31 * nothing. It's like trying to make everyone everywhere happy, regardless of age, 31 * nothing. It's like trying to make everyone everywhere happy, regardless of age,
diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c
index 3ce9e4baef..83c329d127 100644
--- a/legacy/elementary/src/lib/elm_layout.c
+++ b/legacy/elementary/src/lib/elm_layout.c
@@ -19,27 +19,32 @@ struct _Subinfo
19{ 19{
20 const char *part; 20 const char *part;
21 Evas_Object *obj; 21 Evas_Object *obj;
22 enum { 22 enum
23 SWALLOW, 23 {
24 BOX_APPEND, 24 SWALLOW,
25 BOX_PREPEND, 25 BOX_APPEND,
26 BOX_INSERT_BEFORE, 26 BOX_PREPEND,
27 BOX_INSERT_AT, 27 BOX_INSERT_BEFORE,
28 TABLE_PACK, 28 BOX_INSERT_AT,
29 TEXT 29 TABLE_PACK,
30 } type; 30 TEXT
31 union { 31 } type;
32 union { 32 union
33 const Evas_Object *reference; 33 {
34 unsigned int pos; 34 union
35 } box; 35 {
36 struct { 36 const Evas_Object *reference;
37 unsigned short col, row, colspan, rowspan; 37 unsigned int pos;
38 } table; 38 } box;
39 struct { 39 struct
40 const char *text; 40 {
41 } text; 41 unsigned short col, row, colspan, rowspan;
42 } p; 42 } table;
43 struct
44 {
45 const char *text;
46 } text;
47 } p;
43}; 48};
44 49
45struct _Part_Cursor 50struct _Part_Cursor
diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c
index 15524cb4be..f06bfe14de 100644
--- a/legacy/elementary/src/lib/elm_list.c
+++ b/legacy/elementary/src/lib/elm_list.c
@@ -18,9 +18,10 @@ struct _Widget_Data
18 Elm_Object_Select_Mode select_mode; 18 Elm_Object_Select_Mode select_mode;
19 int walking; 19 int walking;
20 int movements; 20 int movements;
21 struct { 21 struct
22 {
22 Evas_Coord x, y; 23 Evas_Coord x, y;
23 } history[SWIPE_MOVES]; 24 } history[SWIPE_MOVES];
24 Eina_Bool scr_minw : 1; 25 Eina_Bool scr_minw : 1;
25 Eina_Bool scr_minh : 1; 26 Eina_Bool scr_minh : 1;
26 Eina_Bool swipe : 1; 27 Eina_Bool swipe : 1;
diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c
index 28b4e1825f..22d846e605 100644
--- a/legacy/elementary/src/lib/elm_menu.c
+++ b/legacy/elementary/src/lib/elm_menu.c
@@ -14,11 +14,12 @@ struct _Elm_Menu_Item
14 Evas_Smart_Cb func; 14 Evas_Smart_Cb func;
15 unsigned int idx; 15 unsigned int idx;
16 16
17 struct { 17 struct
18 Evas_Object *hv, *bx, *location; 18 {
19 Eina_List *items; 19 Evas_Object *hv, *bx, *location;
20 Eina_Bool open : 1; 20 Eina_List *items;
21 } submenu; 21 Eina_Bool open : 1;
22 } submenu;
22 23
23 Eina_Bool separator : 1; 24 Eina_Bool separator : 1;
24 Eina_Bool selected : 1; 25 Eina_Bool selected : 1;
diff --git a/legacy/elementary/src/lib/elm_menu.h b/legacy/elementary/src/lib/elm_menu.h
index 0ba6726eaa..e9382cea1e 100644
--- a/legacy/elementary/src/lib/elm_menu.h
+++ b/legacy/elementary/src/lib/elm_menu.h
@@ -24,7 +24,7 @@
24 * @li elm_object_item_part_content_set 24 * @li elm_object_item_part_content_set
25 * @li elm_object_item_part_content_get 25 * @li elm_object_item_part_content_get
26 * @li elm_object_item_disabled_set 26 * @li elm_object_item_disabled_set
27 * @li elm_object_item_disabled_get 27 * @li elm_object_item_disabled_get
28 * 28 *
29 * @see @ref tutorial_menu 29 * @see @ref tutorial_menu
30 * @{ 30 * @{
diff --git a/legacy/elementary/src/lib/elm_object_item.h b/legacy/elementary/src/lib/elm_object_item.h
index 4fa1327fb4..5ad22f91eb 100644
--- a/legacy/elementary/src/lib/elm_object_item.h
+++ b/legacy/elementary/src/lib/elm_object_item.h
@@ -448,7 +448,7 @@ EAPI Eina_Bool elm_object_item_cursor_engine_only_get(const E
448 * 448 *
449 * A smart callback function must have the Elm_Object_Item_Smart_Cb prototype 449 * A smart callback function must have the Elm_Object_Item_Smart_Cb prototype
450 * definition. The first parameter (@p data) in this definition will be a user 450 * definition. The first parameter (@p data) in this definition will be a user
451 * specific data. The second parameter @p it is a handle to the object item on 451 * specific data. The second parameter @p it is a handle to the object item on
452 * which event occurred. The third parameter, @p event_info, is a pointer to 452 * which event occurred. The third parameter, @p event_info, is a pointer to
453 * data which is totally dependent on the elementary object item's 453 * data which is totally dependent on the elementary object item's
454 * implementation and semantic for the given event. 454 * implementation and semantic for the given event.
diff --git a/legacy/elementary/src/lib/elm_photo.c b/legacy/elementary/src/lib/elm_photo.c
index 001d59eb69..275f52f49b 100644
--- a/legacy/elementary/src/lib/elm_photo.c
+++ b/legacy/elementary/src/lib/elm_photo.c
@@ -14,19 +14,21 @@ struct _Widget_Data
14 Ecore_Timer *longtimer; 14 Ecore_Timer *longtimer;
15 15
16#ifdef HAVE_ELEMENTARY_ETHUMB 16#ifdef HAVE_ELEMENTARY_ETHUMB
17 struct { 17 struct
18 int id; 18 {
19 int id;
19 20
20 struct { 21 struct
21 const char *path; 22 {
22 const char *key; 23 const char *path;
23 } file, thumb; 24 const char *key;
25 } file, thumb;
24 26
25 Ethumb_Exists *exists; 27 Ethumb_Exists *exists;
26 28
27 Ecore_Event_Handler *eeh; 29 Ecore_Event_Handler *eeh;
28 30
29 Ethumb_Thumb_Format format; 31 Ethumb_Thumb_Format format;
30 32
31 Eina_Bool retry : 1; 33 Eina_Bool retry : 1;
32 } thumb; 34 } thumb;
diff --git a/legacy/elementary/src/lib/elm_photo.h b/legacy/elementary/src/lib/elm_photo.h
index 9228c2307b..1ebbaf064f 100644
--- a/legacy/elementary/src/lib/elm_photo.h
+++ b/legacy/elementary/src/lib/elm_photo.h
@@ -8,7 +8,7 @@
8 * 8 *
9 * "clicked" - This is called when a user has clicked the photo 9 * "clicked" - This is called when a user has clicked the photo
10 * "drag,start" - dragging the image out of the photo object 10 * "drag,start" - dragging the image out of the photo object
11 * "drag,end" - Drop the dragged item 11 * "drag,end" - Drop the dragged item
12 * 12 *
13 * @{ 13 * @{
14 */ 14 */
diff --git a/legacy/elementary/src/lib/elm_plug.h b/legacy/elementary/src/lib/elm_plug.h
index 8196d9adde..01afbbd7b1 100644
--- a/legacy/elementary/src/lib/elm_plug.h
+++ b/legacy/elementary/src/lib/elm_plug.h
@@ -1,7 +1,7 @@
1/** 1/**
2 * @defgroup Plug Plug 2 * @defgroup Plug Plug
3 * 3 *
4 * An object that allows one to show an image which other process created. 4 * An object that allows one to show an image which other process created.
5 * It can be used anywhere like any other elementary widget. 5 * It can be used anywhere like any other elementary widget.
6 * 6 *
7 */ 7 */
diff --git a/legacy/elementary/src/lib/elm_radio.h b/legacy/elementary/src/lib/elm_radio.h
index 2bd5bc1c57..cfe18b89b3 100644
--- a/legacy/elementary/src/lib/elm_radio.h
+++ b/legacy/elementary/src/lib/elm_radio.h
@@ -9,13 +9,13 @@
9 * 9 *
10 * A radio object contains an indicator, an optional Label and an optional 10 * A radio object contains an indicator, an optional Label and an optional
11 * icon object. While it's possible to have a group of only one radio they, 11 * icon object. While it's possible to have a group of only one radio they,
12 * are normally used in groups of 2 or more. 12 * are normally used in groups of 2 or more.
13 * 13 *
14 * elm_radio objects are grouped in a slightly different, compared to other 14 * elm_radio objects are grouped in a slightly different, compared to other
15 * UI toolkits. There is no seperate group name/id to remember or manage. 15 * UI toolkits. There is no seperate group name/id to remember or manage.
16 * The members represent the group, there are the group. To make a group, 16 * The members represent the group, there are the group. To make a group,
17 * use elm_radio_group_add() and pass existing radio object and the new radio 17 * use elm_radio_group_add() and pass existing radio object and the new radio
18 * object. 18 * object.
19 * 19 *
20 * The radio object(s) will select from one of a set 20 * The radio object(s) will select from one of a set
21 * of integer values, so any value they are configuring needs to be mapped to 21 * of integer values, so any value they are configuring needs to be mapped to
diff --git a/legacy/elementary/src/lib/elm_removed.h b/legacy/elementary/src/lib/elm_removed.h
index cc39ad9fb6..60428ff12e 100644
--- a/legacy/elementary/src/lib/elm_removed.h
+++ b/legacy/elementary/src/lib/elm_removed.h
@@ -340,7 +340,7 @@ EINA_DEPRECATED EAPI void elm_scroll_bounce_friction_all_set(double fric
340 * @param friction the page scroll friction 340 * @param friction the page scroll friction
341 * 341 *
342 * @see elm_thumbscroll_page_scroll_friction_get() 342 * @see elm_thumbscroll_page_scroll_friction_get()
343 * @deprecated Use elm_scroll_page_scroll_friction_set() and 343 * @deprecated Use elm_scroll_page_scroll_friction_set() and
344 * elm_config_all_flush() 344 * elm_config_all_flush()
345 * @ingroup Scrolling 345 * @ingroup Scrolling
346 */ 346 */
@@ -5591,7 +5591,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_index_active_get(const Evas_Objec
5591 * @param letter Letter under which the item should be indexed 5591 * @param letter Letter under which the item should be indexed
5592 * @param item The item data to set for the index's item 5592 * @param item The item data to set for the index's item
5593 * @param relative The index item to be the predecessor of this new one 5593 * @param relative The index item to be the predecessor of this new one
5594 * @return A handle to the item added or @c NULL, on errors 5594 * @return A handle to the item added or @c NULL, on errors
5595 * 5595 *
5596 * Despite the most common usage of the @p letter argument is for 5596 * Despite the most common usage of the @p letter argument is for
5597 * single char strings, one could use arbitrary strings as index 5597 * single char strings, one could use arbitrary strings as index
@@ -5615,7 +5615,7 @@ EINA_DEPRECATED EAPI Elm_Object_Item *elm_index_item_append_relative(Evas_O
5615 * @param letter Letter under which the item should be indexed 5615 * @param letter Letter under which the item should be indexed
5616 * @param item The item data to set for the index's item 5616 * @param item The item data to set for the index's item
5617 * @param relative The index item to be the successor of this new one 5617 * @param relative The index item to be the successor of this new one
5618 * @return A handle to the item added or @c NULL, on errors 5618 * @return A handle to the item added or @c NULL, on errors
5619 * 5619 *
5620 * Despite the most common usage of the @p letter argument is for 5620 * Despite the most common usage of the @p letter argument is for
5621 * single char strings, one could use arbitrary strings as index 5621 * single char strings, one could use arbitrary strings as index
diff --git a/legacy/elementary/src/lib/elm_segment_control.h b/legacy/elementary/src/lib/elm_segment_control.h
index 75a6fc1b3c..16bf06f1fa 100644
--- a/legacy/elementary/src/lib/elm_segment_control.h
+++ b/legacy/elementary/src/lib/elm_segment_control.h
@@ -41,7 +41,7 @@
41 * @li elm_object_item_part_text_get 41 * @li elm_object_item_part_text_get
42 * @li elm_object_item_part_content_set 42 * @li elm_object_item_part_content_set
43 * @li elm_object_item_part_content_get 43 * @li elm_object_item_part_content_get
44 * 44 *
45 * Here is an example on its usage: 45 * Here is an example on its usage:
46 * @li @ref segment_control_example 46 * @li @ref segment_control_example
47 * 47 *
diff --git a/legacy/elementary/src/lib/elm_slider.c b/legacy/elementary/src/lib/elm_slider.c
index 6a3719d278..13554eaa6a 100644
--- a/legacy/elementary/src/lib/elm_slider.c
+++ b/legacy/elementary/src/lib/elm_slider.c
@@ -494,7 +494,7 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
494 if (wd->spacer_down) 494 if (wd->spacer_down)
495 { 495 {
496 Evas_Coord d = 0; 496 Evas_Coord d = 0;
497 497
498 evas_object_geometry_get(wd->spacer, &x, &y, &w, &h); 498 evas_object_geometry_get(wd->spacer, &x, &y, &w, &h);
499 if (wd->horizontal) d = abs(ev->cur.canvas.x - x - wd->downx); 499 if (wd->horizontal) d = abs(ev->cur.canvas.x - x - wd->downx);
500 else d = abs(ev->cur.canvas.y - y - wd->downy); 500 else d = abs(ev->cur.canvas.y - y - wd->downy);
@@ -507,7 +507,7 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
507 } 507 }
508 ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD; 508 ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
509 } 509 }
510 510
511 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) 511 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
512 { 512 {
513 if (wd->spacer_down) wd->spacer_down = EINA_FALSE; 513 if (wd->spacer_down) wd->spacer_down = EINA_FALSE;
@@ -615,7 +615,7 @@ _elm_slider_label_get(const Evas_Object *obj, const char *part)
615 if (!wd) return NULL; 615 if (!wd) return NULL;
616 if (!wd->labels) return NULL; 616 if (!wd->labels) return NULL;
617 617
618 if (!part) 618 if (!part)
619 return eina_hash_find(wd->labels, "elm.text"); 619 return eina_hash_find(wd->labels, "elm.text");
620 return eina_hash_find(wd->labels, part); 620 return eina_hash_find(wd->labels, part);
621} 621}
diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c
index 17492e53ca..d23997d5dc 100644
--- a/legacy/elementary/src/lib/elm_slideshow.c
+++ b/legacy/elementary/src/lib/elm_slideshow.c
@@ -33,10 +33,11 @@ struct _Widget_Data
33 double timeout; 33 double timeout;
34 Eina_Bool loop:1; 34 Eina_Bool loop:1;
35 35
36 struct { 36 struct
37 {
37 const char *current; 38 const char *current;
38 Eina_List *list; //list of const char * 39 Eina_List *list; //list of const char *
39 } layout; 40 } layout;
40}; 41};
41 42
42static const char *widtype = NULL; 43static const char *widtype = NULL;
diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c
index 43fd4a3829..e1f35bf36b 100644
--- a/legacy/elementary/src/lib/elm_spinner.c
+++ b/legacy/elementary/src/lib/elm_spinner.c
@@ -211,7 +211,7 @@ _write_label(Evas_Object *obj)
211 Elm_Spinner_Special_Value *sv; 211 Elm_Spinner_Special_Value *sv;
212 Widget_Data *wd = elm_widget_data_get(obj); 212 Widget_Data *wd = elm_widget_data_get(obj);
213 char buf[1024]; 213 char buf[1024];
214 214
215 if (!wd) return; 215 if (!wd) return;
216 EINA_LIST_FOREACH(wd->special_values, l, sv) 216 EINA_LIST_FOREACH(wd->special_values, l, sv)
217 { 217 {
@@ -235,11 +235,11 @@ static Eina_Bool
235_value_set(Evas_Object *obj, double new_val) 235_value_set(Evas_Object *obj, double new_val)
236{ 236{
237 Widget_Data *wd = elm_widget_data_get(obj); 237 Widget_Data *wd = elm_widget_data_get(obj);
238 238
239 if (!wd) return EINA_FALSE; 239 if (!wd) return EINA_FALSE;
240 240
241 if (wd->round > 0) 241 if (wd->round > 0)
242 new_val = wd->base + 242 new_val = wd->base +
243 (double)((((int)(new_val - wd->base)) / wd->round) * wd->round); 243 (double)((((int)(new_val - wd->base)) / wd->round) * wd->round);
244 244
245 if (wd->wrap) 245 if (wd->wrap)
diff --git a/legacy/elementary/src/lib/elm_spinner.h b/legacy/elementary/src/lib/elm_spinner.h
index e77c7474c0..37fb61a3d4 100644
--- a/legacy/elementary/src/lib/elm_spinner.h
+++ b/legacy/elementary/src/lib/elm_spinner.h
@@ -355,20 +355,20 @@ EAPI double elm_spinner_interval_get(const Evas_Object *obj);
355 * @param base The base value 355 * @param base The base value
356 * 356 *
357 * Rounding works as follows: 357 * Rounding works as follows:
358 * 358 *
359 * rounded_val = base + (double)(((value - base) / round) * round) 359 * rounded_val = base + (double)(((value - base) / round) * round)
360 * 360 *
361 * Where rounded_val, value and base are doubles, and round is an integer. 361 * Where rounded_val, value and base are doubles, and round is an integer.
362 * 362 *
363 * This means that things will be rounded to increments (or decrements) of 363 * This means that things will be rounded to increments (or decrements) of
364 * "round" starting from value @p base. The default base for rounding is 0. 364 * "round" starting from value @p base. The default base for rounding is 0.
365 * 365 *
366 * Example: round = 3, base = 2 366 * Example: round = 3, base = 2
367 * Values: 3, 6, 9, 12, 15, ... 367 * Values: 3, 6, 9, 12, 15, ...
368 * 368 *
369 * Example: round = 2, base = 5.5 369 * Example: round = 2, base = 5.5
370 * Values: 5.5, 7.5, 9.5, 11.5, ... 370 * Values: 5.5, 7.5, 9.5, 11.5, ...
371 * 371 *
372 * @see elm_spinner_round_get() 372 * @see elm_spinner_round_get()
373 * @see elm_spinner_base_get() too. 373 * @see elm_spinner_base_get() too.
374 * 374 *
@@ -383,7 +383,7 @@ EAPI void elm_spinner_base_set(Evas_Object *obj, double base);
383 * @return The base rounding value 383 * @return The base rounding value
384 * 384 *
385 * This returns the base for rounding. 385 * This returns the base for rounding.
386 * 386 *
387 * @see elm_spinner_round_set() too. 387 * @see elm_spinner_round_set() too.
388 * @see elm_spinner_base_set() too. 388 * @see elm_spinner_base_set() too.
389 * 389 *
@@ -398,7 +398,7 @@ EAPI double elm_spinner_base_get(const Evas_Object *obj);
398 * @param rnd The rounding value 398 * @param rnd The rounding value
399 * 399 *
400 * Sets the rounding value used for value rounding in the spinner. 400 * Sets the rounding value used for value rounding in the spinner.
401 * 401 *
402 * @see elm_spinner_round_get() 402 * @see elm_spinner_round_get()
403 * @see elm_spinner_base_set() 403 * @see elm_spinner_base_set()
404 * 404 *
@@ -413,7 +413,7 @@ EAPI void elm_spinner_round_set(Evas_Object *obj, int rnd);
413 * @return The rounding value 413 * @return The rounding value
414 * 414 *
415 * This returns the round value for rounding. 415 * This returns the round value for rounding.
416 * 416 *
417 * @see elm_spinner_round_set() too. 417 * @see elm_spinner_round_set() too.
418 * @see elm_spinner_base_set() too. 418 * @see elm_spinner_base_set() too.
419 * 419 *
diff --git a/legacy/elementary/src/lib/elm_store.c b/legacy/elementary/src/lib/elm_store.c
index f88625f539..a296f368c9 100644
--- a/legacy/elementary/src/lib/elm_store.c
+++ b/legacy/elementary/src/lib/elm_store.c
@@ -13,29 +13,34 @@ struct _Elm_Store
13{ 13{
14 EINA_MAGIC; 14 EINA_MAGIC;
15 void (*free)(Elm_Store *store); 15 void (*free)(Elm_Store *store);
16 struct { 16 struct
17 void (*free)(Elm_Store_Item *item); 17 {
18 } item; 18 void (*free)(Elm_Store_Item *item);
19 } item;
19 Evas_Object *genlist; 20 Evas_Object *genlist;
20 Ecore_Thread *list_th; 21 Ecore_Thread *list_th;
21 Eina_Inlist *items; 22 Eina_Inlist *items;
22 Eina_List *realized; 23 Eina_List *realized;
23 int realized_count; 24 int realized_count;
24 int cache_max; 25 int cache_max;
25 struct { 26 struct
26 struct { 27 {
27 Elm_Store_Item_List_Cb func; 28 struct
28 void *data; 29 {
29 } list; 30 Elm_Store_Item_List_Cb func;
30 struct { 31 void *data;
31 Elm_Store_Item_Fetch_Cb func; 32 } list;
32 void *data; 33 struct
33 } fetch; 34 {
34 struct { 35 Elm_Store_Item_Fetch_Cb func;
35 Elm_Store_Item_Unfetch_Cb func; 36 void *data;
36 void *data; 37 } fetch;
37 } unfetch; 38 struct
38 } cb; 39 {
40 Elm_Store_Item_Unfetch_Cb func;
41 void *data;
42 } unfetch;
43 } cb;
39 Eina_Bool sorted : 1; 44 Eina_Bool sorted : 1;
40 Eina_Bool fetch_thread : 1; 45 Eina_Bool fetch_thread : 1;
41}; 46};
@@ -97,7 +102,7 @@ _store_cache_trim(Elm_Store *st)
97 eina_lock_take(&sti->lock); 102 eina_lock_take(&sti->lock);
98 } 103 }
99 sti->fetched = EINA_FALSE; 104 sti->fetched = EINA_FALSE;
100//// let fetch/unfetch do the locking 105//// let fetch/unfetch do the locking
101// eina_lock_release(&sti->lock); 106// eina_lock_release(&sti->lock);
102 if (st->cb.unfetch.func) 107 if (st->cb.unfetch.func)
103 st->cb.unfetch.func(st->cb.unfetch.data, sti); 108 st->cb.unfetch.func(st->cb.unfetch.data, sti);
@@ -159,7 +164,7 @@ _store_filesystem_fetch_do(void *data, Ecore_Thread *th __UNUSED__)
159 } 164 }
160 if (!sti->fetched) 165 if (!sti->fetched)
161 { 166 {
162//// let fetch/unfetch do the locking 167//// let fetch/unfetch do the locking
163// eina_lock_release(&sti->lock); 168// eina_lock_release(&sti->lock);
164 if (sti->store->cb.fetch.func) 169 if (sti->store->cb.fetch.func)
165 sti->store->cb.fetch.func(sti->store->cb.fetch.data, sti); 170 sti->store->cb.fetch.func(sti->store->cb.fetch.data, sti);
@@ -697,7 +702,7 @@ EAPI void
697elm_store_item_data_set(Elm_Store_Item *sti, void *data) 702elm_store_item_data_set(Elm_Store_Item *sti, void *data)
698{ 703{
699 if (!EINA_MAGIC_CHECK(sti, ELM_STORE_ITEM_MAGIC)) return; 704 if (!EINA_MAGIC_CHECK(sti, ELM_STORE_ITEM_MAGIC)) return;
700//// let fetch/unfetch do the locking 705//// let fetch/unfetch do the locking
701// eina_lock_take(&sti->lock); 706// eina_lock_take(&sti->lock);
702 sti->data = data; 707 sti->data = data;
703// eina_lock_release(&sti->lock); 708// eina_lock_release(&sti->lock);
@@ -708,7 +713,7 @@ elm_store_item_data_get(Elm_Store_Item *sti)
708{ 713{
709 if (!EINA_MAGIC_CHECK(sti, ELM_STORE_ITEM_MAGIC)) return NULL; 714 if (!EINA_MAGIC_CHECK(sti, ELM_STORE_ITEM_MAGIC)) return NULL;
710 void *d; 715 void *d;
711//// let fetch/unfetch do the locking 716//// let fetch/unfetch do the locking
712// eina_lock_take(&sti->lock); 717// eina_lock_take(&sti->lock);
713 d = sti->data; 718 d = sti->data;
714// eina_lock_release(&sti->lock); 719// eina_lock_release(&sti->lock);
diff --git a/legacy/elementary/src/lib/elm_store.h b/legacy/elementary/src/lib/elm_store.h
index e57b76b209..d9b2c31f3c 100644
--- a/legacy/elementary/src/lib/elm_store.h
+++ b/legacy/elementary/src/lib/elm_store.h
@@ -1,6 +1,6 @@
1/** 1/**
2 * @defgroup Store Elementary Store 2 * @defgroup Store Elementary Store
3 * 3 *
4 * Store is an abstracting API that is intended to farm off fetching of data 4 * Store is an abstracting API that is intended to farm off fetching of data
5 * to threads running asynchronously from the mainloop that actually fetch 5 * to threads running asynchronously from the mainloop that actually fetch
6 * data needed for a genlist (or possibly future other widgets) so scrolling 6 * data needed for a genlist (or possibly future other widgets) so scrolling
@@ -10,18 +10,18 @@
10 * genlist know later when its ready. Store actually does this and implements 10 * genlist know later when its ready. Store actually does this and implements
11 * the infrastructure of this, leaving the actual fetch and convert up to 11 * the infrastructure of this, leaving the actual fetch and convert up to
12 * functions provided by the user). 12 * functions provided by the user).
13 * 13 *
14 * It is possible for store to run inline without a thread, but this is 14 * It is possible for store to run inline without a thread, but this is
15 * highly inadvisable. you can disable this with: 15 * highly inadvisable. you can disable this with:
16 * 16 *
17 * elm_store_fetch_thread_set(store, EINA_FALSE); 17 * elm_store_fetch_thread_set(store, EINA_FALSE);
18 * 18 *
19 * Store works first by creating a store, setting up functions to list items 19 * Store works first by creating a store, setting up functions to list items
20 * and fetch items. Currently the only store type supported is the 20 * and fetch items. Currently the only store type supported is the
21 * filesystem store, which will list the files inside a directory (not 21 * filesystem store, which will list the files inside a directory (not
22 * recursively) and then hand each file it finds (the file path) to the 22 * recursively) and then hand each file it finds (the file path) to the
23 * list function for evaluation. 23 * list function for evaluation.
24 * 24 *
25 * The list function may look at filename, may open the file or do 25 * The list function may look at filename, may open the file or do
26 * anything it likes to determine something about the file. Either it 26 * anything it likes to determine something about the file. Either it
27 * filters it out (returns EINA_FALSE) and it is discarded or it 27 * filters it out (returns EINA_FALSE) and it is discarded or it
@@ -37,7 +37,7 @@
37 * and what type is there (it's a label of some sort, an icon, or with a 37 * and what type is there (it's a label of some sort, an icon, or with a
38 * custom mapping function that figures it out itself and creates the 38 * custom mapping function that figures it out itself and creates the
39 * content needed for the genlist item). 39 * content needed for the genlist item).
40 * 40 *
41 * Store then uses this sort id to build (over time) a sorted list of items 41 * Store then uses this sort id to build (over time) a sorted list of items
42 * that then map 1:1 to genlist items. When these items are visible and 42 * that then map 1:1 to genlist items. When these items are visible and
43 * need content, Store calls the fetch function per item, which is responsible 43 * need content, Store calls the fetch function per item, which is responsible
@@ -45,12 +45,12 @@
45 * so it can map this to some item content. This function also runs in a 45 * so it can map this to some item content. This function also runs in a
46 * thread, and thus can do blocking IO work to later return the data. Sorting 46 * thread, and thus can do blocking IO work to later return the data. Sorting
47 * is optional and can be enabled or disabled too. 47 * is optional and can be enabled or disabled too.
48 * 48 *
49 * When items are no longer needed, store will cal the unfetch function to 49 * When items are no longer needed, store will cal the unfetch function to
50 * free data in memory about that item that is no longer needed. This function 50 * free data in memory about that item that is no longer needed. This function
51 * is called in the mainloop and is expected to take minimal or almost no time 51 * is called in the mainloop and is expected to take minimal or almost no time
52 * to simply free up memory resources. 52 * to simply free up memory resources.
53 * 53 *
54 * @{ 54 * @{
55 */ 55 */
56 56
@@ -140,27 +140,27 @@ struct _Elm_Store_Item_Info_Filesystem
140 140
141/** 141/**
142 * Create a new store object 142 * Create a new store object
143 * 143 *
144 * This creates a new store object to then configure so it works. 144 * This creates a new store object to then configure so it works.
145 * 145 *
146 * @return A new store object, or NULL if creation fails 146 * @return A new store object, or NULL if creation fails
147 */ 147 */
148EAPI Elm_Store *elm_store_filesystem_new(void); 148EAPI Elm_Store *elm_store_filesystem_new(void);
149/** 149/**
150 * Free the store object and all items it manages 150 * Free the store object and all items it manages
151 * 151 *
152 * This frees the given @p st store and all the items it manages. It will 152 * This frees the given @p st store and all the items it manages. It will
153 * clear the List that it populated, but otherwise leave it alone. It will 153 * clear the List that it populated, but otherwise leave it alone. It will
154 * cancel background threads (and may have to wait for them to complete a 154 * cancel background threads (and may have to wait for them to complete a
155 * pending operation to do this). 155 * pending operation to do this).
156 * 156 *
157 * @param st The store to free 157 * @param st The store to free
158 */ 158 */
159EAPI void elm_store_free(Elm_Store *st); 159EAPI void elm_store_free(Elm_Store *st);
160 160
161/** 161/**
162 * Set the path to the directory to scan for a filesystem store 162 * Set the path to the directory to scan for a filesystem store
163 * 163 *
164 * This sets the directory (@p dir) to scan and begins scanning in the 164 * This sets the directory (@p dir) to scan and begins scanning in the
165 * the background in threads (or not if threading is disabled with 165 * the background in threads (or not if threading is disabled with
166 * elm_store_fetch_thread_set()). Note that Listing is always done in a thread 166 * elm_store_fetch_thread_set()). Note that Listing is always done in a thread
@@ -168,7 +168,7 @@ EAPI void elm_store_free(Elm_Store *st);
168 * called after fetch, list and unfetch functions are set, as well as target 168 * called after fetch, list and unfetch functions are set, as well as target
169 * genlist etc. You also should not change the directory once set. If you 169 * genlist etc. You also should not change the directory once set. If you
170 * need a new directory scanned, create a new store. 170 * need a new directory scanned, create a new store.
171 * 171 *
172 * @param st The store to modify 172 * @param st The store to modify
173 * @param dir A string giving the path to the directory to scan 173 * @param dir A string giving the path to the directory to scan
174 */ 174 */
@@ -176,23 +176,23 @@ EAPI void elm_store_filesystem_directory_set(Elm_Store *st, c
176 176
177/** 177/**
178 * Get the directory set on a filesystem store 178 * Get the directory set on a filesystem store
179 * 179 *
180 * This gets the directory set by elm_store_filesystem_directory_set(). This 180 * This gets the directory set by elm_store_filesystem_directory_set(). This
181 * string returned will be valid until elm_store_filesystem_directory_set() 181 * string returned will be valid until elm_store_filesystem_directory_set()
182 * changes it or until the store is freed with elm_store_free(). 182 * changes it or until the store is freed with elm_store_free().
183 * 183 *
184 * @return A string with the path set, or NULL if none set. 184 * @return A string with the path set, or NULL if none set.
185 */ 185 */
186EAPI const char *elm_store_filesystem_directory_get(const Elm_Store *st); 186EAPI const char *elm_store_filesystem_directory_get(const Elm_Store *st);
187 187
188/** 188/**
189 * Get the path of a specific store item 189 * Get the path of a specific store item
190 * 190 *
191 * This returns the full path of a store item. This string is valid only 191 * This returns the full path of a store item. This string is valid only
192 * during the list function set by elm_store_list_func_set() or during the 192 * during the list function set by elm_store_list_func_set() or during the
193 * fetch function set by elm_store_fetch_func_set() or during the unfetch 193 * fetch function set by elm_store_fetch_func_set() or during the unfetch
194 * function set by elm_store_unfetch_func_set(). 194 * function set by elm_store_unfetch_func_set().
195 * 195 *
196 * @param sti The store item to get the path from 196 * @param sti The store item to get the path from
197 * @return A full path in a string or NULL if none available 197 * @return A full path in a string or NULL if none available
198 */ 198 */
@@ -200,11 +200,11 @@ EAPI const char *elm_store_item_filesystem_path_get(const Elm_Store_
200 200
201/** 201/**
202 * Set the target genlist to fill in from the store 202 * Set the target genlist to fill in from the store
203 * 203 *
204 * This tells the store the target genlist to use to fill in content from 204 * This tells the store the target genlist to use to fill in content from
205 * the store. Once a store starts "going" via elm_store_filesystem_directory_set() 205 * the store. Once a store starts "going" via elm_store_filesystem_directory_set()
206 * The target should never be changed again. 206 * The target should never be changed again.
207 * 207 *
208 * @param st The store to do the filling. 208 * @param st The store to do the filling.
209 * @param obj The genlist object to fill in and control the content of from the store. 209 * @param obj The genlist object to fill in and control the content of from the store.
210 */ 210 */
@@ -212,11 +212,11 @@ EAPI void elm_store_target_genlist_set(Elm_Store *st, Evas_Ob
212 212
213/** 213/**
214 * Set the maximum number of items that are not visible to keep cached 214 * Set the maximum number of items that are not visible to keep cached
215 * 215 *
216 * Store may keep some items around for caching purposes that cannot be seen, 216 * Store may keep some items around for caching purposes that cannot be seen,
217 * so this controls the maximum number. The default is 128, but may change 217 * so this controls the maximum number. The default is 128, but may change
218 * at any point in time in the future. 218 * at any point in time in the future.
219 * 219 *
220 * @param st The store to modify 220 * @param st The store to modify
221 * @param max The number of items to keep (should be greater than or equal to 0) 221 * @param max The number of items to keep (should be greater than or equal to 0)
222 */ 222 */
@@ -224,9 +224,9 @@ EAPI void elm_store_cache_set(Elm_Store *st, int max);
224 224
225/** 225/**
226 * Get the maximum number if items to cache 226 * Get the maximum number if items to cache
227 * 227 *
228 * This returns the number of items at most to cache. 228 * This returns the number of items at most to cache.
229 * 229 *
230 * @param st The store to query 230 * @param st The store to query
231 * @return The maximum number of items to cache (>= 0) 231 * @return The maximum number of items to cache (>= 0)
232 * @see elm_store_cache_set() 232 * @see elm_store_cache_set()
@@ -235,12 +235,12 @@ EAPI int elm_store_cache_get(const Elm_Store *st);
235 235
236/** 236/**
237 * Set the function used to deal with listing of items 237 * Set the function used to deal with listing of items
238 * 238 *
239 * This function is called per item that is found so it can examine the item 239 * This function is called per item that is found so it can examine the item
240 * and discard it (return EINA_FALSE to discard, or EINA_TRUE to accept), and 240 * and discard it (return EINA_FALSE to discard, or EINA_TRUE to accept), and
241 * work out some sorting ID (that may be filename or anything else based on 241 * work out some sorting ID (that may be filename or anything else based on
242 * content). This function is always called from a thread. 242 * content). This function is always called from a thread.
243 * 243 *
244 * @param st The store to set the function of 244 * @param st The store to set the function of
245 * @param func The function to be called 245 * @param func The function to be called
246 * @param data the data pointer to be passed to the @p func function when called 246 * @param data the data pointer to be passed to the @p func function when called
@@ -249,7 +249,7 @@ EAPI void elm_store_list_func_set(Elm_Store *st, Elm_Store_It
249 249
250/** 250/**
251 * Set the function used to deal with fetching of items 251 * Set the function used to deal with fetching of items
252 * 252 *
253 * This function is called per item that needs data to be fetched when it 253 * This function is called per item that needs data to be fetched when it
254 * becomes visible and such data is needed. This function is normally run 254 * becomes visible and such data is needed. This function is normally run
255 * from a thread (unless elm_store_fetch_thread_set() disables this). The 255 * from a thread (unless elm_store_fetch_thread_set() disables this). The
@@ -257,7 +257,7 @@ EAPI void elm_store_list_func_set(Elm_Store *st, Elm_Store_It
257 * allocated for this item with fields and then rely on the mapping setup 257 * allocated for this item with fields and then rely on the mapping setup
258 * to tell Store how to take a field in the structure and apply it to a 258 * to tell Store how to take a field in the structure and apply it to a
259 * genlist item. 259 * genlist item.
260 * 260 *
261 * @param st The store to set the function of 261 * @param st The store to set the function of
262 * @param func The function to be called 262 * @param func The function to be called
263 * @param data the data pointer to be passed to the @p func function when called 263 * @param data the data pointer to be passed to the @p func function when called
@@ -266,11 +266,11 @@ EAPI void elm_store_fetch_func_set(Elm_Store *st, Elm_Store_I
266 266
267/** 267/**
268 * Set the function used to free the structure allocated for the item 268 * Set the function used to free the structure allocated for the item
269 * 269 *
270 * This function is called per item when it is not needed in memory anymore 270 * This function is called per item when it is not needed in memory anymore
271 * and should free the structure allocated in and filled in the function set 271 * and should free the structure allocated in and filled in the function set
272 * by elm_store_fetch_func_set(). 272 * by elm_store_fetch_func_set().
273 * 273 *
274 * @param st The store to set the function of 274 * @param st The store to set the function of
275 * @param func The function to be called 275 * @param func The function to be called
276 * @param data the data pointer to be passed to the @p func function when called 276 * @param data the data pointer to be passed to the @p func function when called
@@ -279,7 +279,7 @@ EAPI void elm_store_unfetch_func_set(Elm_Store *st, Elm_Store
279 279
280/** 280/**
281 * Enable or disable fetching in a thread for Store 281 * Enable or disable fetching in a thread for Store
282 * 282 *
283 * @param st The store to modify 283 * @param st The store to modify
284 * @param use_thread EINA_TRUE to use a thread to fetch, EINA_FALSE don't use a thread. 284 * @param use_thread EINA_TRUE to use a thread to fetch, EINA_FALSE don't use a thread.
285 */ 285 */
@@ -287,7 +287,7 @@ EAPI void elm_store_fetch_thread_set(Elm_Store *st, Eina_Bool
287 287
288/** 288/**
289 * Get the thread enabled fetching option for Store 289 * Get the thread enabled fetching option for Store
290 * 290 *
291 * @return The state set currently for the store. 291 * @return The state set currently for the store.
292 * @see elm_store_fetch_thread_set() 292 * @see elm_store_fetch_thread_set()
293 */ 293 */
@@ -295,13 +295,13 @@ EAPI Eina_Bool elm_store_fetch_thread_get(const Elm_Store *st);
295 295
296/** 296/**
297 * Set if items are to be sorted or not. 297 * Set if items are to be sorted or not.
298 * 298 *
299 * By default items are not sorted, but read "in order" as they are found. If 299 * By default items are not sorted, but read "in order" as they are found. If
300 * you want to sort, your list function set by elm_store_list_func_set() must 300 * you want to sort, your list function set by elm_store_list_func_set() must
301 * provide a sort ID to sort by, and then Store will take care of sorting when 301 * provide a sort ID to sort by, and then Store will take care of sorting when
302 * it inserts items. You should set this up before you begin listing items 302 * it inserts items. You should set this up before you begin listing items
303 * in the store and then never change it again. 303 * in the store and then never change it again.
304 * 304 *
305 * @param st The store to modify 305 * @param st The store to modify
306 * @param sorted EINA_TRUE if we are to sort, EINA_FALSE if not. 306 * @param sorted EINA_TRUE if we are to sort, EINA_FALSE if not.
307 */ 307 */
@@ -309,9 +309,9 @@ EAPI void elm_store_sorted_set(Elm_Store *st, Eina_Bool sorte
309 309
310/** 310/**
311 * Get the sorting flag 311 * Get the sorting flag
312 * 312 *
313 * Get the sorted flag as set by elm_store_sorted_set(). 313 * Get the sorted flag as set by elm_store_sorted_set().
314 * 314 *
315 * @param st The store to query 315 * @param st The store to query
316 * @return EINA_TRUE if sorted, EINA_FALSE if not. 316 * @return EINA_TRUE if sorted, EINA_FALSE if not.
317 */ 317 */
@@ -319,12 +319,12 @@ EAPI Eina_Bool elm_store_sorted_get(const Elm_Store *st);
319 319
320/** 320/**
321 * Set the item data holding item fields to map to item values in genlist 321 * Set the item data holding item fields to map to item values in genlist
322 * 322 *
323 * Once you decode an item, allocate a structure for it and fill the structure, 323 * Once you decode an item, allocate a structure for it and fill the structure,
324 * you should set the item data with this function (eg in the fetch function). 324 * you should set the item data with this function (eg in the fetch function).
325 * This item pointer is the base offset to use when mapping fields to item 325 * This item pointer is the base offset to use when mapping fields to item
326 * values. Once you unfetch, store will handle NULLing the data pointer for you. 326 * values. Once you unfetch, store will handle NULLing the data pointer for you.
327 * 327 *
328 * @param sti The store item to set the data pointer of 328 * @param sti The store item to set the data pointer of
329 * @param data The data pointer to set. 329 * @param data The data pointer to set.
330 */ 330 */
@@ -332,9 +332,9 @@ EAPI void elm_store_item_data_set(Elm_Store_Item *sti, void *
332 332
333/** 333/**
334 * Get the item data 334 * Get the item data
335 * 335 *
336 * This gets the data pointer set by elm_store_item_data_set(). 336 * This gets the data pointer set by elm_store_item_data_set().
337 * 337 *
338 * @param sti The store item to query 338 * @param sti The store item to query
339 * @return The data pointer set on the item 339 * @return The data pointer set on the item
340 */ 340 */
@@ -342,9 +342,9 @@ EAPI void *elm_store_item_data_get(Elm_Store_Item *sti);
342 342
343/** 343/**
344 * Fetch the store than a store item belongs to 344 * Fetch the store than a store item belongs to
345 * 345 *
346 * This fetches the store object that owns the store item. 346 * This fetches the store object that owns the store item.
347 * 347 *
348 * @param sti The store item to query 348 * @param sti The store item to query
349 * @return The store the item belongs to 349 * @return The store the item belongs to
350 */ 350 */
@@ -352,7 +352,7 @@ EAPI const Elm_Store *elm_store_item_store_get(const Elm_Store_Item *sti)
352 352
353/** 353/**
354 * Fetch the genlist item that this store item controls 354 * Fetch the genlist item that this store item controls
355 * 355 *
356 * @param sti The store item to query 356 * @param sti The store item to query
357 * @return The genlist object item handle controlled by this store item 357 * @return The genlist object item handle controlled by this store item
358 */ 358 */
diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c
index e0263c3e85..e7673f9662 100644
--- a/legacy/elementary/src/lib/elm_toolbar.c
+++ b/legacy/elementary/src/lib/elm_toolbar.c
@@ -36,10 +36,11 @@ struct _Elm_Toolbar_Item
36 Evas_Object *object; 36 Evas_Object *object;
37 Evas_Object *o_menu; 37 Evas_Object *o_menu;
38 Evas_Smart_Cb func; 38 Evas_Smart_Cb func;
39 struct { 39 struct
40 int priority; 40 {
41 Eina_Bool visible : 1; 41 int priority;
42 } prio; 42 Eina_Bool visible : 1;
43 } prio;
43 Eina_Bool selected : 1; 44 Eina_Bool selected : 1;
44 Eina_Bool separator : 1; 45 Eina_Bool separator : 1;
45 Eina_Bool menu : 1; 46 Eina_Bool menu : 1;
diff --git a/legacy/elementary/src/lib/elm_tooltip.h b/legacy/elementary/src/lib/elm_tooltip.h
index 5380350431..f4d7e17925 100644
--- a/legacy/elementary/src/lib/elm_tooltip.h
+++ b/legacy/elementary/src/lib/elm_tooltip.h
@@ -29,7 +29,7 @@ typedef Evas_Object *(*Elm_Tooltip_Item_Content_Cb)(void *data, Evas_Object *obj
29EAPI void elm_object_tooltip_show(Evas_Object *obj); 29EAPI void elm_object_tooltip_show(Evas_Object *obj);
30EAPI void elm_object_tooltip_hide(Evas_Object *obj); 30EAPI void elm_object_tooltip_hide(Evas_Object *obj);
31 31
32/** 32/**
33 * Set the text to be displayed inside the tooltip. 33 * Set the text to be displayed inside the tooltip.
34 * 34 *
35 * @param obj The tooltip object. 35 * @param obj The tooltip object.
diff --git a/legacy/elementary/src/lib/elm_transit.c b/legacy/elementary/src/lib/elm_transit.c
index 7fbeb187f8..6f1f49d454 100644
--- a/legacy/elementary/src/lib/elm_transit.c
+++ b/legacy/elementary/src/lib/elm_transit.c
@@ -31,22 +31,25 @@ struct _Elm_Transit
31 Elm_Transit *prev_chain_transit; 31 Elm_Transit *prev_chain_transit;
32 Eina_List *next_chain_transits; 32 Eina_List *next_chain_transits;
33 Elm_Transit_Tween_Mode tween_mode; 33 Elm_Transit_Tween_Mode tween_mode;
34 struct { 34 struct
35 Elm_Transit_Del_Cb func; 35 {
36 void *arg; 36 Elm_Transit_Del_Cb func;
37 } del_data; 37 void *arg;
38 struct { 38 } del_data;
39 double delayed; 39 struct
40 double paused; 40 {
41 double duration; 41 double delayed;
42 double begin; 42 double paused;
43 double current; 43 double duration;
44 } time; 44 double begin;
45 struct { 45 double current;
46 int count; 46 } time;
47 int current; 47 struct
48 Eina_Bool reverse; 48 {
49 } repeat; 49 int count;
50 int current;
51 Eina_Bool reverse;
52 } repeat;
50 double progress; 53 double progress;
51 unsigned int effects_pending_del; 54 unsigned int effects_pending_del;
52 int walking; 55 int walking;
diff --git a/legacy/elementary/src/lib/elm_transit.h b/legacy/elementary/src/lib/elm_transit.h
index f5222059e6..b0569f9640 100644
--- a/legacy/elementary/src/lib/elm_transit.h
+++ b/legacy/elementary/src/lib/elm_transit.h
@@ -156,7 +156,7 @@ EAPI Elm_Transit *elm_transit_add(void);
156/** 156/**
157 * Stops the animation and delete the @p transit object. 157 * Stops the animation and delete the @p transit object.
158 * 158 *
159 * Call this function if you want to stop the animation before the 159 * Call this function if you want to stop the animation before the
160 * transit time. Make sure the @p transit object is still alive with 160 * transit time. Make sure the @p transit object is still alive with
161 * elm_transit_del_cb_set() function. 161 * elm_transit_del_cb_set() function.
162 * All added effects will be deleted, calling its respective data_free_cb 162 * All added effects will be deleted, calling its respective data_free_cb
@@ -173,7 +173,7 @@ EAPI void elm_transit_del(Elm_Transit *transit);
173/** 173/**
174 * Add a new effect to the transit. 174 * Add a new effect to the transit.
175 * 175 *
176 * @note The cb function and the data are the key to the effect. 176 * @note The cb function and the data are the key to the effect.
177 * If you try to add an existing effect, nothing is done. 177 * If you try to add an existing effect, nothing is done.
178 * @note After the first addition of an effect to @p transit, if its 178 * @note After the first addition of an effect to @p transit, if its
179 * effect list become empty again, the @p transit will be killed by 179 * effect list become empty again, the @p transit will be killed by
@@ -199,8 +199,8 @@ EAPI void elm_transit_del(Elm_Transit *transit);
199 * @p data. 199 * @p data.
200 * 200 *
201 * @ingroup Transit 201 * @ingroup Transit
202 * @warning The transit will free the context data at the and of the 202 * @warning The transit will free the context data at the and of the
203 * transition with the data_free_cb function. 203 * transition with the data_free_cb function.
204 * Do not share the context data in between different transit objects. 204 * Do not share the context data in between different transit objects.
205 */ 205 */
206EAPI void elm_transit_effect_add(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect, Elm_Transit_Effect_End_Cb end_cb); 206EAPI void elm_transit_effect_add(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect, Elm_Transit_Effect_End_Cb end_cb);
@@ -232,7 +232,7 @@ EAPI void elm_transit_effect_del(Elm_Transit *transit, Elm_Tra
232 * object list become empty again, the @p transit will be killed by 232 * object list become empty again, the @p transit will be killed by
233 * elm_transit_del(transit) function. 233 * elm_transit_del(transit) function.
234 * @note If the @p obj belongs to another transit, the @p obj will be 234 * @note If the @p obj belongs to another transit, the @p obj will be
235 * removed from it and it will only belong to the other @p transit. 235 * removed from it and it will only belong to the other @p transit.
236 * If the old transit stays without objects, it will die. 236 * If the old transit stays without objects, it will die.
237 * @note When you add an object into the @p transit, its state from 237 * @note When you add an object into the @p transit, its state from
238 * evas_object_pass_events_get(obj) is saved, and it is applied when the 238 * evas_object_pass_events_get(obj) is saved, and it is applied when the
diff --git a/legacy/elementary/src/lib/elm_video.h b/legacy/elementary/src/lib/elm_video.h
index 5e23532425..7d8af7f27f 100644
--- a/legacy/elementary/src/lib/elm_video.h
+++ b/legacy/elementary/src/lib/elm_video.h
@@ -5,15 +5,15 @@
5 * @{ 5 * @{
6 * 6 *
7 * Elementary comes with two object that help design application that need 7 * Elementary comes with two object that help design application that need
8 * to display video. 8 * to display video.
9 * 9 *
10 * The first one, Elm_Video, display a video by using Emotion. 10 * The first one, Elm_Video, display a video by using Emotion.
11 * It embeds the video inside an Edje object, so you can do some 11 * It embeds the video inside an Edje object, so you can do some
12 * animation depending on the video state change. It also implements a 12 * animation depending on the video state change. It also implements a
13 * resource management policy to remove this burden from the application. 13 * resource management policy to remove this burden from the application.
14 * 14 *
15 * The second one, 15 * The second one,
16 * Elm_Player is a video player that need to be linked with an Elm_Video. 16 * Elm_Player is a video player that need to be linked with an Elm_Video.
17 * It take care of updating its content according to Emotion event and provide a 17 * It take care of updating its content according to Emotion event and provide a
18 * way to theme itself. It also automatically raises the priority of the 18 * way to theme itself. It also automatically raises the priority of the
19 * linked Elm_Video so it will use the video decoder, if available. It also 19 * linked Elm_Video so it will use the video decoder, if available. It also
@@ -67,12 +67,12 @@ EAPI Evas_Object *elm_video_add(Evas_Object *parent);
67 * @brief Define the file or URI that will be the video source. 67 * @brief Define the file or URI that will be the video source.
68 * 68 *
69 * @param video The video object to define the file or URI for the video 69 * @param video The video object to define the file or URI for the video
70 * of the Elm_Video object. 70 * of the Elm_Video object.
71 * 71 *
72 * @param filename The file or URI to target. 72 * @param filename The file or URI to target.
73 * Local files can be specified using file:// or by using full file paths. 73 * Local files can be specified using file:// or by using full file paths.
74 * URI could be remote source of video, like http:// or local source like 74 * URI could be remote source of video, like http:// or local source like
75 * WebCam (v4l2://). (You can use Emotion API to request and list 75 * WebCam (v4l2://). (You can use Emotion API to request and list
76 * the available Webcam on your system). 76 * the available Webcam on your system).
77 * 77 *
78 * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise 78 * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise
@@ -194,7 +194,7 @@ EAPI double elm_video_audio_level_get(const Evas_Object *video);
194EAPI void elm_video_audio_level_set(Evas_Object *video, double volume); 194EAPI void elm_video_audio_level_set(Evas_Object *video, double volume);
195 195
196/** 196/**
197 * @brief Get the current position (in seconds) being played in the 197 * @brief Get the current position (in seconds) being played in the
198 * Elm_Video object. 198 * Elm_Video object.
199 * 199 *
200 * @param video The video object. 200 * @param video The video object.
@@ -205,7 +205,7 @@ EAPI void elm_video_audio_level_set(Evas_Object *video, double v
205EAPI double elm_video_play_position_get(const Evas_Object *video); 205EAPI double elm_video_play_position_get(const Evas_Object *video);
206 206
207/** 207/**
208 * @brief Set the current position (in seconds) to be played in the 208 * @brief Set the current position (in seconds) to be played in the
209 * Elm_Video object. 209 * Elm_Video object.
210 * 210 *
211 * @param video The video object. 211 * @param video The video object.
@@ -240,7 +240,7 @@ EAPI void elm_video_remember_position_set(Evas_Object *video, Ei
240 * @brief Set whether the object can remember the last played position. 240 * @brief Set whether the object can remember the last played position.
241 * 241 *
242 * @param video The video object. 242 * @param video The video object.
243 * @return whether the object remembers the last played position (EINA_TRUE) 243 * @return whether the object remembers the last played position (EINA_TRUE)
244 * or not. 244 * or not.
245 * 245 *
246 * @note This API only serves as indication. System support is required. 246 * @note This API only serves as indication. System support is required.
diff --git a/legacy/elementary/src/lib/elm_web.c b/legacy/elementary/src/lib/elm_web.c
index eb1cc50d3d..72e970f9bf 100644
--- a/legacy/elementary/src/lib/elm_web.c
+++ b/legacy/elementary/src/lib/elm_web.c
@@ -18,13 +18,14 @@ typedef struct _View_Smart_Data View_Smart_Data;
18struct _View_Smart_Data 18struct _View_Smart_Data
19{ 19{
20 Ewk_View_Smart_Data base; 20 Ewk_View_Smart_Data base;
21 struct { 21 struct
22 Evas_Event_Mouse_Down event; 22 {
23 Evas_Coord x, y; 23 Evas_Event_Mouse_Down event;
24 unsigned int move_count; 24 Evas_Coord x, y;
25 Ecore_Timer *longpress_timer; 25 unsigned int move_count;
26 Ecore_Animator *pan_anim; 26 Ecore_Timer *longpress_timer;
27 } mouse; 27 Ecore_Animator *pan_anim;
28 } mouse;
28}; 29};
29#endif 30#endif
30 31
@@ -34,34 +35,38 @@ struct _Widget_Data
34 Evas_Object *self; 35 Evas_Object *self;
35#ifdef HAVE_ELEMENTARY_WEB 36#ifdef HAVE_ELEMENTARY_WEB
36 Evas_Object *ewk_view; 37 Evas_Object *ewk_view;
37 struct { 38 struct
38 Elm_Web_Window_Open window_create; 39 {
39 void *window_create_data; 40 Elm_Web_Window_Open window_create;
40 Elm_Web_Dialog_Alert alert; 41 void *window_create_data;
41 void *alert_data; 42 Elm_Web_Dialog_Alert alert;
42 Elm_Web_Dialog_Confirm confirm; 43 void *alert_data;
43 void *confirm_data; 44 Elm_Web_Dialog_Confirm confirm;
44 Elm_Web_Dialog_Prompt prompt; 45 void *confirm_data;
45 void *prompt_data; 46 Elm_Web_Dialog_Prompt prompt;
46 Elm_Web_Dialog_File_Selector file_selector; 47 void *prompt_data;
47 void *file_selector_data; 48 Elm_Web_Dialog_File_Selector file_selector;
48 Elm_Web_Console_Message console_message; 49 void *file_selector_data;
49 void *console_message_data; 50 Elm_Web_Console_Message console_message;
50 } hook; 51 void *console_message_data;
52 } hook;
51 Elm_Win_Keyboard_Mode input_method; 53 Elm_Win_Keyboard_Mode input_method;
52 struct { 54 struct
55 {
53 Elm_Web_Zoom_Mode mode; 56 Elm_Web_Zoom_Mode mode;
54 float current; 57 float current;
55 float min, max; 58 float min, max;
56 Eina_Bool no_anim; 59 Eina_Bool no_anim;
57 Ecore_Timer *timer; 60 Ecore_Timer *timer;
58 } zoom; 61 } zoom;
59 struct { 62 struct
60 struct { 63 {
64 struct
65 {
61 int x, y; 66 int x, y;
62 } start, end; 67 } start, end;
63 Ecore_Animator *animator; 68 Ecore_Animator *animator;
64 } bring_in; 69 } bring_in;
65 Eina_Bool tab_propagate : 1; 70 Eina_Bool tab_propagate : 1;
66 Eina_Bool inwin_mode : 1; 71 Eina_Bool inwin_mode : 1;
67#else 72#else
@@ -1221,7 +1226,7 @@ elm_web_console_message_hook_set(Evas_Object *obj, Elm_Web_Console_Message func,
1221#endif 1226#endif
1222} 1227}
1223 1228
1224EAPI void 1229EAPI void
1225elm_web_useragent_set(Evas_Object *obj, const char *user_agent) 1230elm_web_useragent_set(Evas_Object *obj, const char *user_agent)
1226{ 1231{
1227 ELM_CHECK_WIDTYPE(obj, widtype); 1232 ELM_CHECK_WIDTYPE(obj, widtype);
@@ -1234,7 +1239,7 @@ elm_web_useragent_set(Evas_Object *obj, const char *user_agent)
1234#endif 1239#endif
1235} 1240}
1236 1241
1237EAPI const char* 1242EAPI const char*
1238elm_web_useragent_get(const Evas_Object *obj) 1243elm_web_useragent_get(const Evas_Object *obj)
1239{ 1244{
1240 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 1245 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
@@ -1899,7 +1904,7 @@ elm_web_window_features_property_get(const Elm_Web_Window_Features *wf, Elm_Web_
1899 } 1904 }
1900 1905
1901 /* What to do with these ? 1906 /* What to do with these ?
1902 1907
1903 (void)wf; 1908 (void)wf;
1904 (void)toolbar_visible; 1909 (void)toolbar_visible;
1905 (void)statusbar_visible; 1910 (void)statusbar_visible;
@@ -1924,7 +1929,7 @@ elm_web_window_features_region_get(const Elm_Web_Window_Features *wf, Evas_Coord
1924 1929
1925 if (!wf || !x || !y || !w || !h) return; 1930 if (!wf || !x || !y || !w || !h) return;
1926 /* What to do with these ? 1931 /* What to do with these ?
1927 1932
1928 (void)wf; 1933 (void)wf;
1929 (void)x; 1934 (void)x;
1930 (void)y; 1935 (void)y;
diff --git a/legacy/elementary/src/lib/elm_web.h b/legacy/elementary/src/lib/elm_web.h
index 9fb713f042..33645eb3c3 100644
--- a/legacy/elementary/src/lib/elm_web.h
+++ b/legacy/elementary/src/lib/elm_web.h
@@ -367,7 +367,7 @@ EAPI Evas_Object *elm_web_add(Evas_Object *parent);
367 367
368/** 368/**
369 * Change useragent of a elm_web object 369 * Change useragent of a elm_web object
370 * 370 *
371 * @param obj The object 371 * @param obj The object
372 * @param user_agent String for useragent 372 * @param user_agent String for useragent
373 * 373 *
diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c
index a05efd94b5..b09eee978c 100644
--- a/legacy/elementary/src/lib/elm_widget.c
+++ b/legacy/elementary/src/lib/elm_widget.c
@@ -2129,10 +2129,10 @@ elm_widget_show_region_set(Evas_Object *obj,
2129 Evas_Coord px, py, cx, cy; 2129 Evas_Coord px, py, cx, cy;
2130 2130
2131 API_ENTRY return; 2131 API_ENTRY return;
2132 2132
2133 evas_smart_objects_calculate(evas_object_evas_get(obj)); 2133 evas_smart_objects_calculate(evas_object_evas_get(obj));
2134 2134
2135 if (!forceshow && (x == sd->rx) && (y == sd->ry) && 2135 if (!forceshow && (x == sd->rx) && (y == sd->ry) &&
2136 (w == sd->rw) && (h == sd->rh)) return; 2136 (w == sd->rw) && (h == sd->rh)) return;
2137 sd->rx = x; 2137 sd->rx = x;
2138 sd->ry = y; 2138 sd->ry = y;
@@ -2677,13 +2677,13 @@ _widget_name_find(const Evas_Object *obj, const char *name, int recurse)
2677 Evas_Object *child; 2677 Evas_Object *child;
2678 const char *s; 2678 const char *s;
2679 INTERNAL_ENTRY NULL; 2679 INTERNAL_ENTRY NULL;
2680 2680
2681 if (!_elm_widget_is(obj)) return NULL; 2681 if (!_elm_widget_is(obj)) return NULL;
2682 if (sd->resize_obj) 2682 if (sd->resize_obj)
2683 { 2683 {
2684 s = evas_object_name_get(sd->resize_obj); 2684 s = evas_object_name_get(sd->resize_obj);
2685 if ((s) && (!strcmp(s, name))) return sd->resize_obj; 2685 if ((s) && (!strcmp(s, name))) return sd->resize_obj;
2686 if ((recurse != 0) && 2686 if ((recurse != 0) &&
2687 ((child = _widget_name_find(sd->resize_obj, name, recurse - 1)))) 2687 ((child = _widget_name_find(sd->resize_obj, name, recurse - 1))))
2688 return child; 2688 return child;
2689 } 2689 }
@@ -2691,7 +2691,7 @@ _widget_name_find(const Evas_Object *obj, const char *name, int recurse)
2691 { 2691 {
2692 s = evas_object_name_get(child); 2692 s = evas_object_name_get(child);
2693 if ((s) && (!strcmp(s, name))) return child; 2693 if ((s) && (!strcmp(s, name))) return child;
2694 if ((recurse != 0) && 2694 if ((recurse != 0) &&
2695 ((child = _widget_name_find(child, name, recurse - 1)))) 2695 ((child = _widget_name_find(child, name, recurse - 1))))
2696 return child; 2696 return child;
2697 } 2697 }
@@ -2699,7 +2699,7 @@ _widget_name_find(const Evas_Object *obj, const char *name, int recurse)
2699 { 2699 {
2700 s = evas_object_name_get(sd->hover_obj); 2700 s = evas_object_name_get(sd->hover_obj);
2701 if ((s) && (!strcmp(s, name))) return sd->hover_obj; 2701 if ((s) && (!strcmp(s, name))) return sd->hover_obj;
2702 if ((recurse != 0) && 2702 if ((recurse != 0) &&
2703 ((child = _widget_name_find(sd->hover_obj, name, recurse - 1)))) 2703 ((child = _widget_name_find(sd->hover_obj, name, recurse - 1))))
2704 return child; 2704 return child;
2705 } 2705 }
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 957dba38fe..84999913a2 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -20,48 +20,52 @@ struct _Elm_Win
20 Elm_Win_Keyboard_Mode kbdmode; 20 Elm_Win_Keyboard_Mode kbdmode;
21 Elm_Win_Indicator_Mode indmode; 21 Elm_Win_Indicator_Mode indmode;
22 Elm_Win_Indicator_Opacity_Mode ind_o_mode; 22 Elm_Win_Indicator_Opacity_Mode ind_o_mode;
23 struct { 23 struct
24 const char *info; 24 {
25 Ecore_Timer *timer; 25 const char *info;
26 int repeat_count; 26 Ecore_Timer *timer;
27 int shot_counter; 27 int repeat_count;
28 } shot; 28 int shot_counter;
29 } shot;
29 int resize_location; 30 int resize_location;
30 int *autodel_clear, rot; 31 int *autodel_clear, rot;
31 int show_count; 32 int show_count;
32 struct { 33 struct
33 int x, y; 34 {
34 } screen; 35 int x, y;
35 struct 36 } screen;
37 struct
36 { 38 {
37 Ecore_Evas *ee; 39 Ecore_Evas *ee;
38 Evas *evas; 40 Evas *evas;
39 Evas_Object *obj, *hot_obj; 41 Evas_Object *obj, *hot_obj;
40 int hot_x, hot_y; 42 int hot_x, hot_y;
41 } pointer; 43 } pointer;
42 struct { 44 struct
43 Evas_Object *top; 45 {
46 Evas_Object *top;
44 47
45 struct { 48 struct
46 Evas_Object *target; 49 {
47 Eina_Bool visible : 1; 50 Evas_Object *target;
48 Eina_Bool handled : 1; 51 Eina_Bool visible : 1;
49 } cur, prev; 52 Eina_Bool handled : 1;
53 } cur, prev;
50 54
51 const char *style; 55 const char *style;
52 Ecore_Job *reconf_job; 56 Ecore_Job *reconf_job;
53 57
54 Eina_Bool enabled : 1; 58 Eina_Bool enabled : 1;
55 Eina_Bool changed_theme : 1; 59 Eina_Bool changed_theme : 1;
56 Eina_Bool top_animate : 1; 60 Eina_Bool top_animate : 1;
57 Eina_Bool geometry_changed : 1; 61 Eina_Bool geometry_changed : 1;
58 } focus_highlight; 62 } focus_highlight;
59 63
60 Evas_Object *icon; 64 Evas_Object *icon;
61 const char *title; 65 const char *title;
62 const char *icon_name; 66 const char *icon_name;
63 const char *role; 67 const char *role;
64 68
65 double aspect; 69 double aspect;
66 Eina_Bool urgent : 1; 70 Eina_Bool urgent : 1;
67 Eina_Bool modal : 1; 71 Eina_Bool modal : 1;
@@ -352,7 +356,7 @@ _elm_win_resize(Ecore_Evas *ee)
352 win->deferred_resize_job = ecore_job_add(_elm_win_resize_job, win); 356 win->deferred_resize_job = ecore_job_add(_elm_win_resize_job, win);
353} 357}
354 358
355static void 359static void
356_elm_win_mouse_in(Ecore_Evas *ee) 360_elm_win_mouse_in(Ecore_Evas *ee)
357{ 361{
358 Evas_Object *obj; 362 Evas_Object *obj;
@@ -417,7 +421,7 @@ _elm_win_focus_out(Ecore_Evas *ee)
417 } 421 }
418} 422}
419 423
420static void 424static void
421_elm_win_state_change(Ecore_Evas *ee) 425_elm_win_state_change(Ecore_Evas *ee)
422{ 426{
423 Evas_Object *obj; 427 Evas_Object *obj;
@@ -429,7 +433,7 @@ _elm_win_state_change(Ecore_Evas *ee)
429 Eina_Bool ch_maximized = EINA_FALSE; 433 Eina_Bool ch_maximized = EINA_FALSE;
430 434
431 if (!(obj = ecore_evas_object_associate_get(ee))) return; 435 if (!(obj = ecore_evas_object_associate_get(ee))) return;
432 436
433 if (!(win = elm_widget_data_get(obj))) return; 437 if (!(win = elm_widget_data_get(obj))) return;
434 438
435 if (win->withdrawn != ecore_evas_withdrawn_get(win->ee)) 439 if (win->withdrawn != ecore_evas_withdrawn_get(win->ee))
@@ -676,7 +680,7 @@ _elm_win_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_inf
676 if (win->icon_name) eina_stringshare_del(win->icon_name); 680 if (win->icon_name) eina_stringshare_del(win->icon_name);
677 if (win->role) eina_stringshare_del(win->role); 681 if (win->role) eina_stringshare_del(win->role);
678 if (win->icon) evas_object_del(win->icon); 682 if (win->icon) evas_object_del(win->icon);
679 683
680 free(win); 684 free(win);
681 685
682 if ((!_elm_win_list) && 686 if ((!_elm_win_list) &&
@@ -913,7 +917,7 @@ static void
913_elm_win_xwin_update(Elm_Win *win) 917_elm_win_xwin_update(Elm_Win *win)
914{ 918{
915 const char *s; 919 const char *s;
916 920
917 _elm_win_xwindow_get(win); 921 _elm_win_xwindow_get(win);
918 if (win->parent) 922 if (win->parent)
919 { 923 {
@@ -938,7 +942,7 @@ _elm_win_xwin_update(Elm_Win *win)
938 942
939 s = win->role; 943 s = win->role;
940 if (s) ecore_x_icccm_window_role_set(win->xwin, s); 944 if (s) ecore_x_icccm_window_role_set(win->xwin, s);
941 945
942 // set window icon 946 // set window icon
943 if (win->icon) 947 if (win->icon)
944 { 948 {
@@ -951,16 +955,16 @@ _elm_win_xwin_update(Elm_Win *win)
951 int w = 0, h = 0, stride, x, y; 955 int w = 0, h = 0, stride, x, y;
952 unsigned char *p; 956 unsigned char *p;
953 unsigned int *p2; 957 unsigned int *p2;
954 958
955 evas_object_image_size_get(win->icon, &w, &h); 959 evas_object_image_size_get(win->icon, &w, &h);
956 stride = evas_object_image_stride_get(win->icon); 960 stride = evas_object_image_stride_get(win->icon);
957 if ((w > 0) && (h > 0) && 961 if ((w > 0) && (h > 0) &&
958 (stride >= (int)(w * sizeof(unsigned int)))) 962 (stride >= (int)(w * sizeof(unsigned int))))
959 { 963 {
960 ic.width = w; 964 ic.width = w;
961 ic.height = h; 965 ic.height = h;
962 ic.data = malloc(w * h * sizeof(unsigned int)); 966 ic.data = malloc(w * h * sizeof(unsigned int));
963 967
964 if (ic.data) 968 if (ic.data)
965 { 969 {
966 p = (unsigned char *)data; 970 p = (unsigned char *)data;
@@ -973,7 +977,7 @@ _elm_win_xwin_update(Elm_Win *win)
973 p += sizeof(unsigned int); 977 p += sizeof(unsigned int);
974 p2++; 978 p2++;
975 } 979 }
976 p += (stride - (w * sizeof(unsigned int))); 980 p += (stride - (w * sizeof(unsigned int)));
977 } 981 }
978 ecore_x_netwm_icons_set(win->xwin, &ic, 1); 982 ecore_x_netwm_icons_set(win->xwin, &ic, 1);
979 free(ic.data); 983 free(ic.data);
@@ -982,7 +986,7 @@ _elm_win_xwin_update(Elm_Win *win)
982 evas_object_image_data_set(win->icon, data); 986 evas_object_image_data_set(win->icon, data);
983 } 987 }
984 } 988 }
985 989
986 switch (win->type) 990 switch (win->type)
987 { 991 {
988 case ELM_WIN_BASIC: 992 case ELM_WIN_BASIC:
@@ -1509,7 +1513,7 @@ the_end:
1509 win->focus_highlight.prev = win->focus_highlight.cur; 1513 win->focus_highlight.prev = win->focus_highlight.cur;
1510} 1514}
1511 1515
1512static void 1516static void
1513_elm_win_frame_add(Elm_Win *win, const char *style) 1517_elm_win_frame_add(Elm_Win *win, const char *style)
1514{ 1518{
1515 evas_output_framespace_set(win->evas, 0, 22, 0, 26); 1519 evas_output_framespace_set(win->evas, 0, 22, 0, 26);
@@ -1520,19 +1524,19 @@ _elm_win_frame_add(Elm_Win *win, const char *style)
1520 evas_object_move(win->frame_obj, 0, 0); 1524 evas_object_move(win->frame_obj, 0, 0);
1521 evas_object_resize(win->frame_obj, 1, 1); 1525 evas_object_resize(win->frame_obj, 1, 1);
1522 1526
1523 edje_object_signal_callback_add(win->frame_obj, "elm,action,move,start", 1527 edje_object_signal_callback_add(win->frame_obj, "elm,action,move,start",
1524 "elm", _elm_win_frame_cb_move_start, win); 1528 "elm", _elm_win_frame_cb_move_start, win);
1525 edje_object_signal_callback_add(win->frame_obj, "elm,action,resize,start", 1529 edje_object_signal_callback_add(win->frame_obj, "elm,action,resize,start",
1526 "*", _elm_win_frame_cb_resize_start, win); 1530 "*", _elm_win_frame_cb_resize_start, win);
1527 edje_object_signal_callback_add(win->frame_obj, "elm,action,minimize", 1531 edje_object_signal_callback_add(win->frame_obj, "elm,action,minimize",
1528 "elm", _elm_win_frame_cb_minimize, win); 1532 "elm", _elm_win_frame_cb_minimize, win);
1529 edje_object_signal_callback_add(win->frame_obj, "elm,action,maximize", 1533 edje_object_signal_callback_add(win->frame_obj, "elm,action,maximize",
1530 "elm", _elm_win_frame_cb_maximize, win); 1534 "elm", _elm_win_frame_cb_maximize, win);
1531 edje_object_signal_callback_add(win->frame_obj, "elm,action,close", 1535 edje_object_signal_callback_add(win->frame_obj, "elm,action,close",
1532 "elm", _elm_win_frame_cb_close, win); 1536 "elm", _elm_win_frame_cb_close, win);
1533} 1537}
1534 1538
1535static void 1539static void
1536_elm_win_frame_cb_move_start(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__) 1540_elm_win_frame_cb_move_start(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__)
1537{ 1541{
1538 Elm_Win *win; 1542 Elm_Win *win;
@@ -1544,7 +1548,7 @@ _elm_win_frame_cb_move_start(void *data, Evas_Object *obj __UNUSED__, const char
1544 ecore_evas_move(win->ee, 0, 0); 1548 ecore_evas_move(win->ee, 0, 0);
1545} 1549}
1546 1550
1547static void 1551static void
1548_elm_win_frame_cb_resize_start(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source) 1552_elm_win_frame_cb_resize_start(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source)
1549{ 1553{
1550 Elm_Win *win; 1554 Elm_Win *win;
@@ -1578,7 +1582,7 @@ _elm_win_frame_cb_resize_start(void *data, Evas_Object *obj __UNUSED__, const ch
1578 ecore_evas_wayland_resize(win->ee, win->resize_location); 1582 ecore_evas_wayland_resize(win->ee, win->resize_location);
1579} 1583}
1580 1584
1581static void 1585static void
1582_elm_win_frame_cb_minimize(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__) 1586_elm_win_frame_cb_minimize(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__)
1583{ 1587{
1584 Elm_Win *win; 1588 Elm_Win *win;
@@ -1588,7 +1592,7 @@ _elm_win_frame_cb_minimize(void *data, Evas_Object *obj __UNUSED__, const char *
1588 ecore_evas_iconified_set(win->ee, EINA_TRUE); 1592 ecore_evas_iconified_set(win->ee, EINA_TRUE);
1589} 1593}
1590 1594
1591static void 1595static void
1592_elm_win_frame_cb_maximize(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__) 1596_elm_win_frame_cb_maximize(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__)
1593{ 1597{
1594 Elm_Win *win; 1598 Elm_Win *win;
@@ -1599,7 +1603,7 @@ _elm_win_frame_cb_maximize(void *data, Evas_Object *obj __UNUSED__, const char *
1599 ecore_evas_maximized_set(win->ee, win->maximized); 1603 ecore_evas_maximized_set(win->ee, win->maximized);
1600} 1604}
1601 1605
1602static void 1606static void
1603_elm_win_frame_cb_close(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__) 1607_elm_win_frame_cb_close(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__)
1604{ 1608{
1605 Elm_Win *win; 1609 Elm_Win *win;
@@ -1609,7 +1613,7 @@ _elm_win_frame_cb_close(void *data, Evas_Object *obj __UNUSED__, const char *sig
1609} 1613}
1610 1614
1611/* 1615/*
1612static void 1616static void
1613_elm_win_pointer_add(Elm_Win *win, const char *style) 1617_elm_win_pointer_add(Elm_Win *win, const char *style)
1614{ 1618{
1615 int mw, mh; 1619 int mw, mh;
@@ -1750,7 +1754,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
1750 1754
1751 win->kbdmode = ELM_WIN_KEYBOARD_UNKNOWN; 1755 win->kbdmode = ELM_WIN_KEYBOARD_UNKNOWN;
1752 win->indmode = ELM_WIN_INDICATOR_UNKNOWN; 1756 win->indmode = ELM_WIN_INDICATOR_UNKNOWN;
1753 1757
1754 switch (type) 1758 switch (type)
1755 { 1759 {
1756 case ELM_WIN_INLINED_IMAGE: 1760 case ELM_WIN_INLINED_IMAGE:
@@ -1892,7 +1896,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
1892 { 1896 {
1893 win->ee = ecore_evas_ews_new(0, 0, 1, 1); 1897 win->ee = ecore_evas_ews_new(0, 0, 1, 1);
1894 } 1898 }
1895 else if (ENGINE_COMPARE(ELM_WAYLAND_SHM)) 1899 else if (ENGINE_COMPARE(ELM_WAYLAND_SHM))
1896 { 1900 {
1897 win->ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 0, 1, 1, 0); 1901 win->ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 0, 1, 1, 0);
1898 win->evas = ecore_evas_get(win->ee); 1902 win->evas = ecore_evas_get(win->ee);
@@ -1900,7 +1904,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
1900 _elm_win_frame_add(win, "default"); 1904 _elm_win_frame_add(win, "default");
1901// _elm_win_pointer_add(win, "default"); 1905// _elm_win_pointer_add(win, "default");
1902 } 1906 }
1903 else if (ENGINE_COMPARE(ELM_WAYLAND_EGL)) 1907 else if (ENGINE_COMPARE(ELM_WAYLAND_EGL))
1904 { 1908 {
1905 win->ee = ecore_evas_wayland_egl_new(NULL, 0, 0, 0, 1, 1, 0); 1909 win->ee = ecore_evas_wayland_egl_new(NULL, 0, 0, 0, 1, 1, 0);
1906 win->evas = ecore_evas_get(win->ee); 1910 win->evas = ecore_evas_get(win->ee);
@@ -1956,7 +1960,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
1956 evas_object_layer_set(win->win_obj, 50); 1960 evas_object_layer_set(win->win_obj, 50);
1957 evas_object_pass_events_set(win->win_obj, EINA_TRUE); 1961 evas_object_pass_events_set(win->win_obj, EINA_TRUE);
1958 1962
1959 if (win->frame_obj) 1963 if (win->frame_obj)
1960 { 1964 {
1961 evas_object_clip_set(win->win_obj, win->frame_obj); 1965 evas_object_clip_set(win->win_obj, win->frame_obj);
1962 evas_object_stack_below(win->frame_obj, win->win_obj); 1966 evas_object_stack_below(win->frame_obj, win->win_obj);
diff --git a/legacy/elementary/src/lib/elm_win.h b/legacy/elementary/src/lib/elm_win.h
index e79c6a48d5..009d7548be 100644
--- a/legacy/elementary/src/lib/elm_win.h
+++ b/legacy/elementary/src/lib/elm_win.h
@@ -144,9 +144,9 @@ typedef enum
144 Evas_Object. */ 144 Evas_Object. */
145 ELM_WIN_SOCKET_IMAGE,/**< The window is rendered onto an image buffer 145 ELM_WIN_SOCKET_IMAGE,/**< The window is rendered onto an image buffer
146 and can be shown other process's plug image object. 146 and can be shown other process's plug image object.
147 No actual window is created for this type, 147 No actual window is created for this type,
148 instead the window and all of its contents will be 148 instead the window and all of its contents will be
149 rendered to an image buffer and can be shown 149 rendered to an image buffer and can be shown
150 other process's plug image object*/ 150 other process's plug image object*/
151} Elm_Win_Type; 151} Elm_Win_Type;
152 152
@@ -179,7 +179,7 @@ typedef enum
179/** 179/**
180 * In some environments, like phones, you may have an indicator that 180 * In some environments, like phones, you may have an indicator that
181 * shows battery status, reception, time etc. This is the indicator. 181 * shows battery status, reception, time etc. This is the indicator.
182 * 182 *
183 * Sometimes you don't want it because you provide the same functionality 183 * Sometimes you don't want it because you provide the same functionality
184 * inside your app, so this will request that the indicator is hidden in 184 * inside your app, so this will request that the indicator is hidden in
185 * this circumstance if you use ELM_ILLUME_INDICATOR_HIDE. The default 185 * this circumstance if you use ELM_ILLUME_INDICATOR_HIDE. The default
@@ -355,14 +355,14 @@ EAPI const char *elm_win_role_get(const Evas_Object *obj);
355 355
356/** 356/**
357 * Set the object to represent the window icon 357 * Set the object to represent the window icon
358 * 358 *
359 * This sets an object that will be used as the icon for the window. The exact 359 * This sets an object that will be used as the icon for the window. The exact
360 * pixel dimensions of the object (not object size) will be used, and the 360 * pixel dimensions of the object (not object size) will be used, and the
361 * image pixels will be used as-is when this function is called. If the 361 * image pixels will be used as-is when this function is called. If the
362 * image object has been updated, then call this function again to source 362 * image object has been updated, then call this function again to source
363 * the image pixels and put them on the window's icon. This has limitations 363 * the image pixels and put them on the window's icon. This has limitations
364 * as only image objects allowed at this stage. This may be lifted in future. 364 * as only image objects allowed at this stage. This may be lifted in future.
365 * 365 *
366 * @param obj The window object 366 * @param obj The window object
367 * @param icon The object to use for an icon 367 * @param icon The object to use for an icon
368 */ 368 */
diff --git a/legacy/elementary/src/lib/els_scroller.c b/legacy/elementary/src/lib/els_scroller.c
index de96703014..0688da62c8 100644
--- a/legacy/elementary/src/lib/els_scroller.c
+++ b/legacy/elementary/src/lib/els_scroller.c
@@ -26,7 +26,8 @@ struct _Smart_Data
26 26
27 Elm_Smart_Scroller_Policy hbar_flags, vbar_flags; 27 Elm_Smart_Scroller_Policy hbar_flags, vbar_flags;
28 28
29 struct { 29 struct
30 {
30 Evas_Coord x, y; 31 Evas_Coord x, y;
31 Evas_Coord sx, sy; 32 Evas_Coord sx, sy;
32 Evas_Coord dx, dy; 33 Evas_Coord dx, dy;
@@ -36,68 +37,75 @@ struct _Smart_Data
36 Evas_Coord bx0, by0; 37 Evas_Coord bx0, by0;
37 Evas_Coord b0x, b0y; 38 Evas_Coord b0x, b0y;
38 Evas_Coord b2x, b2y; 39 Evas_Coord b2x, b2y;
39 struct { 40 struct
41 {
40 Evas_Coord x, y; 42 Evas_Coord x, y;
41 double timestamp, localtimestamp; 43 double timestamp, localtimestamp;
42 } history[60]; 44 } history[60];
43 struct { 45 struct
44 double tadd, dxsum, dysum; 46 {
45 double est_timestamp_diff; 47 double tadd, dxsum, dysum;
46 } hist; 48 double est_timestamp_diff;
47 double anim_start; 49 } hist;
48 double anim_start2; 50 double anim_start;
49 double anim_start3; 51 double anim_start2;
50 double onhold_vx, onhold_vy, onhold_tlast, onhold_vxe, onhold_vye; 52 double anim_start3;
51 double extra_time; 53 double onhold_vx, onhold_vy, onhold_tlast, onhold_vxe, onhold_vye;
52 Evas_Coord hold_x, hold_y; 54 double extra_time;
53 Ecore_Animator *hold_animator; 55 Evas_Coord hold_x, hold_y;
54 Ecore_Animator *onhold_animator; 56 Ecore_Animator *hold_animator;
55 Ecore_Animator *momentum_animator; 57 Ecore_Animator *onhold_animator;
56 Ecore_Animator *bounce_x_animator; 58 Ecore_Animator *momentum_animator;
57 Ecore_Animator *bounce_y_animator; 59 Ecore_Animator *bounce_x_animator;
58 Evas_Coord locked_x, locked_y; 60 Ecore_Animator *bounce_y_animator;
59 int hdir, vdir; 61 Evas_Coord locked_x, locked_y;
60 Eina_Bool now : 1; 62 int hdir, vdir;
61 Eina_Bool cancelled : 1; 63 Eina_Bool now : 1;
62 Eina_Bool hold : 1; 64 Eina_Bool cancelled : 1;
63 Eina_Bool hold_parent : 1; 65 Eina_Bool hold : 1;
64 Eina_Bool want_dragged : 1; 66 Eina_Bool hold_parent : 1;
65 Eina_Bool dragged : 1; 67 Eina_Bool want_dragged : 1;
66 Eina_Bool dragged_began : 1; 68 Eina_Bool dragged : 1;
67 Eina_Bool dir_x : 1; 69 Eina_Bool dragged_began : 1;
68 Eina_Bool dir_y : 1; 70 Eina_Bool dir_x : 1;
69 Eina_Bool locked : 1; 71 Eina_Bool dir_y : 1;
70 Eina_Bool bounce_x_hold : 1; 72 Eina_Bool locked : 1;
71 Eina_Bool bounce_y_hold : 1; 73 Eina_Bool bounce_x_hold : 1;
72 Eina_Bool scroll : 1; 74 Eina_Bool bounce_y_hold : 1;
73 Eina_Bool want_reset : 1; 75 Eina_Bool scroll : 1;
74 } down; 76 Eina_Bool want_reset : 1;
75 77 } down;
76 struct { 78
77 Evas_Coord w, h; 79 struct
78 Eina_Bool resized : 1; 80 {
79 } child; 81 Evas_Coord w, h;
80 struct { 82 Eina_Bool resized : 1;
81 Evas_Coord x, y; 83 } child;
82 } step, page; 84 struct
83 85 {
84 struct { 86 Evas_Coord x, y;
85 void (*set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y); 87 } step, page;
86 void (*get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); 88
87 void (*max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); 89 struct
88 void (*min_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); 90 {
89 void (*child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); 91 void (*set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
90 void (*gravity_set) (Evas_Object *obj, double x, double y); 92 void (*get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
91 void (*gravity_get) (Evas_Object *obj, double *x, double *y); 93 void (*max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
92 } pan_func; 94 void (*min_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
93 95 void (*child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
94 struct { 96 void (*gravity_set) (Evas_Object *obj, double x, double y);
95 struct { 97 void (*gravity_get) (Evas_Object *obj, double *x, double *y);
96 Evas_Coord start, end; 98 } pan_func;
97 double t_start, t_end; 99
98 Ecore_Animator *animator; 100 struct
99 } x, y; 101 {
100 } scrollto; 102 struct
103 {
104 Evas_Coord start, end;
105 double t_start, t_end;
106 Ecore_Animator *animator;
107 } x, y;
108 } scrollto;
101 109
102 double pagerel_h, pagerel_v; 110 double pagerel_h, pagerel_v;
103 Evas_Coord pagesize_h, pagesize_v; 111 Evas_Coord pagesize_h, pagesize_v;
@@ -1836,10 +1844,11 @@ _smart_hold_animator(void *data)
1836 int i, count = 0; 1844 int i, count = 0;
1837 Evas_Coord basex = 0, basey = 0, x, y; 1845 Evas_Coord basex = 0, basey = 0, x, y;
1838 double dt, t, tdiff, tnow, twin; 1846 double dt, t, tdiff, tnow, twin;
1839 struct { 1847 struct
1848 {
1840 Evas_Coord x, y, dx, dy; 1849 Evas_Coord x, y, dx, dy;
1841 double t, dt; 1850 double t, dt;
1842 } pos[60]; 1851 } pos[60];
1843 1852
1844 tdiff = sd->down.hist.est_timestamp_diff; 1853 tdiff = sd->down.hist.est_timestamp_diff;
1845 tnow = ecore_time_get() - tdiff; 1854 tnow = ecore_time_get() - tdiff;
diff --git a/legacy/elementary/src/lib/els_tooltip.c b/legacy/elementary/src/lib/els_tooltip.c
index 29af6282a6..f1a451f8ff 100644
--- a/legacy/elementary/src/lib/els_tooltip.c
+++ b/legacy/elementary/src/lib/els_tooltip.c
@@ -43,12 +43,14 @@ struct _Elm_Tooltip
43 Ecore_Timer *hide_timer; 43 Ecore_Timer *hide_timer;
44 Ecore_Job *reconfigure_job; 44 Ecore_Job *reconfigure_job;
45 Evas_Coord mouse_x, mouse_y; 45 Evas_Coord mouse_x, mouse_y;
46 struct { 46 struct
47 Evas_Coord x, y, bx, by; 47 {
48 } pad; 48 Evas_Coord x, y, bx, by;
49 struct { 49 } pad;
50 double x, y; 50 struct
51 } rel_pos; 51 {
52 double x, y;
53 } rel_pos;
52 double hide_timeout; /* from theme */ 54 double hide_timeout; /* from theme */
53 Eina_Bool visible_lock:1; 55 Eina_Bool visible_lock:1;
54 Eina_Bool changed_style:1; 56 Eina_Bool changed_style:1;