* elementary: Full switch to Eina data type.

SVN revision: 41081
This commit is contained in:
Cedric BAIL 2009-06-17 15:35:19 +00:00
parent 443d341ede
commit 29adfe9fc8
26 changed files with 326 additions and 323 deletions

View File

@ -2145,9 +2145,9 @@ Evas_Object *gl_icon_get(const void *data, Evas_Object *obj, const char *part)
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
return ic; return ic;
} }
Evas_Bool gl_state_get(const void *data, Evas_Object *obj, const char *part) Eina_Bool gl_state_get(const void *data, Evas_Object *obj, const char *part)
{ {
return 0; return EINA_FALSE;
} }
void gl_del(const void *data, Evas_Object *obj) void gl_del(const void *data, Evas_Object *obj)
{ {
@ -2475,9 +2475,9 @@ Evas_Object *gl2_icon_get(const void *data, Evas_Object *obj, const char *part)
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
return ic; return ic;
} }
Evas_Bool gl2_state_get(const void *data, Evas_Object *obj, const char *part) Eina_Bool gl2_state_get(const void *data, Evas_Object *obj, const char *part)
{ {
return 0; return EINA_FALSE;
} }
void gl2_del(const void *data, Evas_Object *obj) void gl2_del(const void *data, Evas_Object *obj)
{ {
@ -2627,9 +2627,9 @@ Evas_Object *gl3_icon_get(const void *data, Evas_Object *obj, const char *part)
} }
return NULL; return NULL;
} }
Evas_Bool gl3_state_get(const void *data, Evas_Object *obj, const char *part) Eina_Bool gl3_state_get(const void *data, Evas_Object *obj, const char *part)
{ {
return 0; return EINA_FALSE;
} }
void gl3_del(const void *data, Evas_Object *obj) void gl3_del(const void *data, Evas_Object *obj)
{ {
@ -3070,9 +3070,9 @@ Evas_Object *gl4_icon_get(const void *data, Evas_Object *obj, const char *part)
} }
return NULL; return NULL;
} }
Evas_Bool gl4_state_get(const void *data, Evas_Object *obj, const char *part) Eina_Bool gl4_state_get(const void *data, Evas_Object *obj, const char *part)
{ {
return 0; return EINA_FALSE;
} }
void gl4_del(const void *data, Evas_Object *obj) void gl4_del(const void *data, Evas_Object *obj)
{ {
@ -3221,9 +3221,9 @@ Evas_Object *gl5_icon_get(const void *data, Evas_Object *obj, const char *part)
} }
return NULL; return NULL;
} }
Evas_Bool gl5_state_get(const void *data, Evas_Object *obj, const char *part) Eina_Bool gl5_state_get(const void *data, Evas_Object *obj, const char *part)
{ {
return 0; return EINA_FALSE;
} }
void gl5_del(const void *data, Evas_Object *obj) void gl5_del(const void *data, Evas_Object *obj)
{ {

View File

@ -156,8 +156,8 @@ extern "C" {
EAPI void elm_quicklaunch_sub_shutdown(void); EAPI void elm_quicklaunch_sub_shutdown(void);
EAPI void elm_quicklaunch_shutdown(void); EAPI void elm_quicklaunch_shutdown(void);
EAPI void elm_quicklaunch_seed(void); EAPI void elm_quicklaunch_seed(void);
EAPI Evas_Bool elm_quicklaunch_prepare(int argc, char **argv); EAPI Eina_Bool elm_quicklaunch_prepare(int argc, char **argv);
EAPI Evas_Bool elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (void *data), void *postfork_data); EAPI Eina_Bool elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (void *data), void *postfork_data);
EAPI void elm_quicklaunch_cleanup(void); EAPI void elm_quicklaunch_cleanup(void);
EAPI int elm_quicklaunch_fallback(int argc, char **argv); EAPI int elm_quicklaunch_fallback(int argc, char **argv);
EAPI char *elm_quicklaunch_exe_path_get(const char *exe); EAPI char *elm_quicklaunch_exe_path_get(const char *exe);
@ -183,17 +183,17 @@ extern "C" {
EAPI void elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj); EAPI void elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj);
EAPI void elm_win_resize_object_del(Evas_Object *obj, Evas_Object *subobj); EAPI void elm_win_resize_object_del(Evas_Object *obj, Evas_Object *subobj);
EAPI void elm_win_title_set(Evas_Object *obj, const char *title); EAPI void elm_win_title_set(Evas_Object *obj, const char *title);
EAPI void elm_win_autodel_set(Evas_Object *obj, Evas_Bool autodel); EAPI void elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel);
EAPI void elm_win_activate(Evas_Object *obj); EAPI void elm_win_activate(Evas_Object *obj);
EAPI void elm_win_lower(Evas_Object *obj); EAPI void elm_win_lower(Evas_Object *obj);
EAPI void elm_win_raise(Evas_Object *obj); EAPI void elm_win_raise(Evas_Object *obj);
EAPI void elm_win_borderless_set(Evas_Object *obj, Evas_Bool borderless); EAPI void elm_win_borderless_set(Evas_Object *obj, Eina_Bool borderless);
EAPI void elm_win_shaped_set(Evas_Object *obj, Evas_Bool shaped); EAPI void elm_win_shaped_set(Evas_Object *obj, Eina_Bool shaped);
EAPI void elm_win_alpha_set(Evas_Object *obj, Evas_Bool alpha); EAPI void elm_win_alpha_set(Evas_Object *obj, Eina_Bool alpha);
EAPI void elm_win_override_set(Evas_Object *obj, Evas_Bool override); EAPI void elm_win_override_set(Evas_Object *obj, Eina_Bool override);
EAPI void elm_win_fullscreen_set(Evas_Object *obj, Evas_Bool fullscreen); EAPI void elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen);
EAPI void elm_win_maximized_set(Evas_Object *obj, Evas_Bool maximized); EAPI void elm_win_maximized_set(Evas_Object *obj, Eina_Bool maximized);
EAPI void elm_win_iconified_set(Evas_Object *obj, Evas_Bool iconified); EAPI void elm_win_iconified_set(Evas_Object *obj, Eina_Bool iconified);
EAPI void elm_win_layer_set(Evas_Object *obj, int layer); EAPI void elm_win_layer_set(Evas_Object *obj, int layer);
EAPI void elm_win_rotation_set(Evas_Object *obj, int rotation); EAPI void elm_win_rotation_set(Evas_Object *obj, int rotation);
EAPI void elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky); EAPI void elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky);
@ -212,7 +212,7 @@ extern "C" {
* *
*/ */
EAPI void elm_win_keyboard_mode_set(Evas_Object *obj, Elm_Win_Keyboard_Mode mode); EAPI void elm_win_keyboard_mode_set(Evas_Object *obj, Elm_Win_Keyboard_Mode mode);
EAPI void elm_win_keyboard_win_set(Evas_Object *obj, Evas_Bool is_keyboard); EAPI void elm_win_keyboard_win_set(Evas_Object *obj, Eina_Bool is_keyboard);
EAPI Evas_Object *elm_win_inwin_add(Evas_Object *obj); EAPI Evas_Object *elm_win_inwin_add(Evas_Object *obj);
EAPI void elm_win_inwin_activate(Evas_Object *obj); EAPI void elm_win_inwin_activate(Evas_Object *obj);
@ -240,10 +240,10 @@ extern "C" {
EAPI Evas_Object *elm_icon_add(Evas_Object *parent); EAPI Evas_Object *elm_icon_add(Evas_Object *parent);
EAPI Eina_Bool elm_icon_file_set(Evas_Object *obj, const char *file, const char *group); EAPI Eina_Bool elm_icon_file_set(Evas_Object *obj, const char *file, const char *group);
EAPI void elm_icon_standard_set(Evas_Object *obj, const char *name); EAPI void elm_icon_standard_set(Evas_Object *obj, const char *name);
EAPI void elm_icon_smooth_set(Evas_Object *obj, Evas_Bool smooth); EAPI void elm_icon_smooth_set(Evas_Object *obj, Eina_Bool smooth);
EAPI void elm_icon_no_scale_set(Evas_Object *obj, Evas_Bool no_scale); EAPI void elm_icon_no_scale_set(Evas_Object *obj, Eina_Bool no_scale);
EAPI void elm_icon_scale_set(Evas_Object *obj, Evas_Bool scale_up, Evas_Bool scale_down); EAPI void elm_icon_scale_set(Evas_Object *obj, Eina_Bool scale_up, Eina_Bool scale_down);
EAPI void elm_icon_fill_outside_set(Evas_Object *obj, Evas_Bool fill_outside); EAPI void elm_icon_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
EAPI void elm_icon_prescale_set(Evas_Object *obj, int size); EAPI void elm_icon_prescale_set(Evas_Object *obj, int size);
/* smart callbacks called: /* smart callbacks called:
* "clicked" - the user clicked the icon * "clicked" - the user clicked the icon
@ -263,10 +263,10 @@ extern "C" {
EAPI Evas_Object *elm_image_add(Evas_Object *parent); EAPI Evas_Object *elm_image_add(Evas_Object *parent);
EAPI Eina_Bool elm_image_file_set(Evas_Object *obj, const char *file, const char *group); EAPI Eina_Bool elm_image_file_set(Evas_Object *obj, const char *file, const char *group);
EAPI void elm_image_smooth_set(Evas_Object *obj, Evas_Bool smooth); EAPI void elm_image_smooth_set(Evas_Object *obj, Eina_Bool smooth);
EAPI void elm_image_no_scale_set(Evas_Object *obj, Evas_Bool no_scale); EAPI void elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale);
EAPI void elm_image_scale_set(Evas_Object *obj, Evas_Bool scale_up, Evas_Bool scale_down); EAPI void elm_image_scale_set(Evas_Object *obj, Eina_Bool scale_up, Eina_Bool scale_down);
EAPI void elm_image_fill_outside_set(Evas_Object *obj, Evas_Bool fill_outside); EAPI void elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
EAPI void elm_image_prescale_set(Evas_Object *obj, int size); EAPI void elm_image_prescale_set(Evas_Object *obj, int size);
EAPI void elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient orient); EAPI void elm_image_orient_set(Evas_Object *obj, Elm_Image_Orient orient);
/* smart callbacks called: /* smart callbacks called:
@ -274,8 +274,8 @@ extern "C" {
*/ */
EAPI Evas_Object *elm_box_add(Evas_Object *parent); EAPI Evas_Object *elm_box_add(Evas_Object *parent);
EAPI void elm_box_horizontal_set(Evas_Object *obj, Evas_Bool horizontal); EAPI void elm_box_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
EAPI void elm_box_homogenous_set(Evas_Object *obj, Evas_Bool homogenous); EAPI void elm_box_homogenous_set(Evas_Object *obj, Eina_Bool homogenous);
EAPI void elm_box_pack_start(Evas_Object *obj, Evas_Object *subobj); EAPI void elm_box_pack_start(Evas_Object *obj, Evas_Object *subobj);
EAPI void elm_box_pack_end(Evas_Object *obj, Evas_Object *subobj); EAPI void elm_box_pack_end(Evas_Object *obj, Evas_Object *subobj);
EAPI void elm_box_pack_before(Evas_Object *obj, Evas_Object *subobj, Evas_Object *before); EAPI void elm_box_pack_before(Evas_Object *obj, Evas_Object *subobj, Evas_Object *before);
@ -306,12 +306,12 @@ extern "C" {
EAPI Evas_Object *elm_scroller_add(Evas_Object *parent); EAPI Evas_Object *elm_scroller_add(Evas_Object *parent);
EAPI void elm_scroller_content_set(Evas_Object *obj, Evas_Object *child); EAPI void elm_scroller_content_set(Evas_Object *obj, Evas_Object *child);
EAPI void elm_scroller_content_min_limit(Evas_Object *obj, Evas_Bool w, Evas_Bool h); EAPI void elm_scroller_content_min_limit(Evas_Object *obj, Eina_Bool w, Eina_Bool h);
EAPI void elm_scroller_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); EAPI void elm_scroller_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
EAPI void elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v); EAPI void elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
EAPI void elm_scroller_region_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); EAPI void elm_scroller_region_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
EAPI void elm_scroller_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); EAPI void elm_scroller_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
EAPI void elm_scroller_bounce_set(Evas_Object *obj, Evas_Bool h_bounce, Evas_Bool v_bounce); EAPI void elm_scroller_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
/* smart callbacks called: /* smart callbacks called:
* "edge_left" * "edge_left"
* "edge_right" * "edge_right"
@ -329,9 +329,9 @@ extern "C" {
EAPI void elm_toggle_label_set(Evas_Object *obj, const char *label); EAPI void elm_toggle_label_set(Evas_Object *obj, const char *label);
EAPI void elm_toggle_icon_set(Evas_Object *obj, Evas_Object *icon); EAPI void elm_toggle_icon_set(Evas_Object *obj, Evas_Object *icon);
EAPI void elm_toggle_states_labels_set(Evas_Object *obj, const char *onlabel, const char *offlabel); EAPI void elm_toggle_states_labels_set(Evas_Object *obj, const char *onlabel, const char *offlabel);
EAPI void elm_toggle_state_set(Evas_Object *obj, Evas_Bool state); EAPI void elm_toggle_state_set(Evas_Object *obj, Eina_Bool state);
EAPI Evas_Bool elm_toggle_state_get(const Evas_Object *obj); EAPI Eina_Bool elm_toggle_state_get(const Evas_Object *obj);
EAPI void elm_toggle_state_pointer_set(Evas_Object *obj, Evas_Bool *statep); EAPI void elm_toggle_state_pointer_set(Evas_Object *obj, Eina_Bool *statep);
/* smart callbacks called: /* smart callbacks called:
* "changed" - the user toggled the state * "changed" - the user toggled the state
*/ */
@ -353,7 +353,7 @@ extern "C" {
*/ */
EAPI Evas_Object *elm_table_add(Evas_Object *parent); EAPI Evas_Object *elm_table_add(Evas_Object *parent);
EAPI void elm_table_homogenous_set(Evas_Object *obj, Evas_Bool homogenous); EAPI void elm_table_homogenous_set(Evas_Object *obj, Eina_Bool homogenous);
EAPI void elm_table_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h); EAPI void elm_table_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h);
/* smart callbacks called: /* smart callbacks called:
*/ */
@ -361,9 +361,9 @@ extern "C" {
EAPI Evas_Object *elm_clock_add(Evas_Object *parent); EAPI Evas_Object *elm_clock_add(Evas_Object *parent);
EAPI void elm_clock_time_set(Evas_Object *obj, int hrs, int min, int sec); EAPI void elm_clock_time_set(Evas_Object *obj, int hrs, int min, int sec);
EAPI void elm_clock_time_get(const Evas_Object *obj, int *hrs, int *min, int *sec); EAPI void elm_clock_time_get(const Evas_Object *obj, int *hrs, int *min, int *sec);
EAPI void elm_clock_edit_set(Evas_Object *obj, Evas_Bool edit); EAPI void elm_clock_edit_set(Evas_Object *obj, Eina_Bool edit);
EAPI void elm_clock_show_am_pm_set(Evas_Object *obj, Evas_Bool am_pm); EAPI void elm_clock_show_am_pm_set(Evas_Object *obj, Eina_Bool am_pm);
EAPI void elm_clock_show_seconds_set(Evas_Object *obj, Evas_Bool seconds); EAPI void elm_clock_show_seconds_set(Evas_Object *obj, Eina_Bool seconds);
/* smart callbacks called: /* smart callbacks called:
* "changed" - the user changed the time * "changed" - the user changed the time
*/ */
@ -405,14 +405,14 @@ extern "C" {
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
}; };
EAPI Evas_Object *elm_entry_add(Evas_Object *parent); EAPI Evas_Object *elm_entry_add(Evas_Object *parent);
EAPI void elm_entry_single_line_set(Evas_Object *obj, Evas_Bool single_line); EAPI void elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line);
EAPI void elm_entry_password_set(Evas_Object *obj, Evas_Bool password); EAPI void elm_entry_password_set(Evas_Object *obj, Eina_Bool password);
EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry); EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry);
EAPI const char *elm_entry_entry_get(const Evas_Object *obj); EAPI const char *elm_entry_entry_get(const Evas_Object *obj);
EAPI const char *elm_entry_selection_get(const Evas_Object *obj); EAPI const char *elm_entry_selection_get(const Evas_Object *obj);
EAPI void elm_entry_entry_insert(Evas_Object *obj, const char *entry); EAPI void elm_entry_entry_insert(Evas_Object *obj, const char *entry);
EAPI void elm_entry_line_wrap_set(Evas_Object *obj, Evas_Bool wrap); EAPI void elm_entry_line_wrap_set(Evas_Object *obj, Eina_Bool wrap);
EAPI void elm_entry_editable_set(Evas_Object *obj, Evas_Bool editable); EAPI void elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable);
EAPI void elm_entry_select_none(Evas_Object *obj); EAPI void elm_entry_select_none(Evas_Object *obj);
EAPI void elm_entry_select_all(Evas_Object *obj); EAPI void elm_entry_select_all(Evas_Object *obj);
EAPI char *elm_entry_markup_to_utf8(const char *s); EAPI char *elm_entry_markup_to_utf8(const char *s);
@ -453,10 +453,10 @@ extern "C" {
struct { struct {
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
} anchor, hover_parent; } anchor, hover_parent;
Evas_Bool hover_left : 1; Eina_Bool hover_left : 1;
Evas_Bool hover_right : 1; Eina_Bool hover_right : 1;
Evas_Bool hover_top : 1; Eina_Bool hover_top : 1;
Evas_Bool hover_bottom : 1; Eina_Bool hover_bottom : 1;
}; };
EAPI Evas_Object *elm_anchorview_add(Evas_Object *parent); EAPI Evas_Object *elm_anchorview_add(Evas_Object *parent);
EAPI void elm_anchorview_text_set(Evas_Object *obj, const char *text); EAPI void elm_anchorview_text_set(Evas_Object *obj, const char *text);
@ -476,10 +476,10 @@ extern "C" {
struct { struct {
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
} anchor, hover_parent; } anchor, hover_parent;
Evas_Bool hover_left : 1; Eina_Bool hover_left : 1;
Evas_Bool hover_right : 1; Eina_Bool hover_right : 1;
Evas_Bool hover_top : 1; Eina_Bool hover_top : 1;
Evas_Bool hover_bottom : 1; Eina_Bool hover_bottom : 1;
}; };
EAPI Evas_Object *elm_anchorblock_add(Evas_Object *parent); EAPI Evas_Object *elm_anchorblock_add(Evas_Object *parent);
EAPI void elm_anchorblock_text_set(Evas_Object *obj, const char *text); EAPI void elm_anchorblock_text_set(Evas_Object *obj, const char *text);
@ -533,7 +533,7 @@ extern "C" {
EAPI Elm_Toolbar_Item *elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data); EAPI Elm_Toolbar_Item *elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI void elm_toolbar_item_del(Elm_Toolbar_Item *item); EAPI void elm_toolbar_item_del(Elm_Toolbar_Item *item);
EAPI void elm_toolbar_item_select(Elm_Toolbar_Item *item); EAPI void elm_toolbar_item_select(Elm_Toolbar_Item *item);
EAPI void elm_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable); EAPI void elm_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable);
/* smart callbacks called: /* smart callbacks called:
* "clicked" - when the user clicks on a toolbar item and becomes selected * "clicked" - when the user clicks on a toolbar item and becomes selected
*/ */
@ -552,13 +552,13 @@ extern "C" {
EAPI Elm_List_Item *elm_list_item_insert_after(Evas_Object *obj, Elm_List_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data); EAPI Elm_List_Item *elm_list_item_insert_after(Evas_Object *obj, Elm_List_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI void elm_list_clear(Evas_Object *obj); EAPI void elm_list_clear(Evas_Object *obj);
EAPI void elm_list_go(Evas_Object *obj); EAPI void elm_list_go(Evas_Object *obj);
EAPI void elm_list_multi_select_set(Evas_Object *obj, Evas_Bool multi); EAPI void elm_list_multi_select_set(Evas_Object *obj, Eina_Bool multi);
EAPI void elm_list_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode); EAPI void elm_list_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode);
EAPI void elm_list_always_select_mode_set(Evas_Object *obj, Evas_Bool always_select); EAPI void elm_list_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
EAPI const Eina_List *elm_list_items_get(const Evas_Object *obj); EAPI const Eina_List *elm_list_items_get(const Evas_Object *obj);
EAPI Elm_List_Item *elm_list_selected_item_get(const Evas_Object *obj); EAPI Elm_List_Item *elm_list_selected_item_get(const Evas_Object *obj);
EAPI const Eina_List *elm_list_selected_items_get(const Evas_Object *obj); EAPI const Eina_List *elm_list_selected_items_get(const Evas_Object *obj);
EAPI void elm_list_item_selected_set(Elm_List_Item *item, Evas_Bool selected); EAPI void elm_list_item_selected_set(Elm_List_Item *item, Eina_Bool selected);
EAPI void elm_list_item_show(Elm_List_Item *item); EAPI void elm_list_item_show(Elm_List_Item *item);
EAPI void elm_list_item_del(Elm_List_Item *item); EAPI void elm_list_item_del(Elm_List_Item *item);
EAPI void elm_list_item_del_cb_set(Elm_List_Item *item, void (*func)(void *data, Evas_Object *obj, void *event_info)); EAPI void elm_list_item_del_cb_set(Elm_List_Item *item, void (*func)(void *data, Evas_Object *obj, void *event_info));
@ -592,11 +592,11 @@ extern "C" {
EAPI void elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size); EAPI void elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size);
EAPI void elm_slider_unit_format_set(Evas_Object *obj, const char *format); EAPI void elm_slider_unit_format_set(Evas_Object *obj, const char *format);
EAPI void elm_slider_indicator_format_set(Evas_Object *obj, const char *indicator); EAPI void elm_slider_indicator_format_set(Evas_Object *obj, const char *indicator);
EAPI void elm_slider_horizontal_set(Evas_Object *obj, Evas_Bool horizontal); EAPI void elm_slider_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
EAPI void elm_slider_min_max_set(Evas_Object *obj, double min, double max); EAPI void elm_slider_min_max_set(Evas_Object *obj, double min, double max);
EAPI void elm_slider_value_set(Evas_Object *obj, double val); EAPI void elm_slider_value_set(Evas_Object *obj, double val);
EAPI double elm_slider_value_get(const Evas_Object *obj); EAPI double elm_slider_value_get(const Evas_Object *obj);
EAPI void elm_slider_inverted_set(Evas_Object *obj, Evas_Bool inverted); EAPI void elm_slider_inverted_set(Evas_Object *obj, Eina_Bool inverted);
/* smart callbacks called: /* smart callbacks called:
* "changed" - when the slider value changes * "changed" - when the slider value changes
* "delay,changed" - when the slider value changed, but a small time after a change (use this if you only want to respond to a change once the slider is held still for a short while). * "delay,changed" - when the slider value changed, but a small time after a change (use this if you only want to respond to a change once the slider is held still for a short while).
@ -612,7 +612,7 @@ extern "C" {
typedef struct _Elm_Genlist_Item_Class_Func Elm_Genlist_Item_Class_Func; typedef struct _Elm_Genlist_Item_Class_Func Elm_Genlist_Item_Class_Func;
typedef char *(*GenlistItemLabelGetFunc) (const void *data, Evas_Object *obj, const char *part); typedef char *(*GenlistItemLabelGetFunc) (const void *data, Evas_Object *obj, const char *part);
typedef Evas_Object *(*GenlistItemIconGetFunc) (const void *data, Evas_Object *obj, const char *part); typedef Evas_Object *(*GenlistItemIconGetFunc) (const void *data, Evas_Object *obj, const char *part);
typedef Evas_Bool (*GenlistItemStateGetFunc) (const void *data, Evas_Object *obj, const char *part); typedef Eina_Bool (*GenlistItemStateGetFunc) (const void *data, Evas_Object *obj, const char *part);
typedef void (*GenlistItemDelFunc) (const void *data, Evas_Object *obj); typedef void (*GenlistItemDelFunc) (const void *data, Evas_Object *obj);
struct _Elm_Genlist_Item_Class struct _Elm_Genlist_Item_Class
@ -632,7 +632,7 @@ extern "C" {
EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data); EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data); EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
EAPI void elm_genlist_clear(Evas_Object *obj); EAPI void elm_genlist_clear(Evas_Object *obj);
EAPI void elm_genlist_multi_select_set(Evas_Object *obj, Evas_Bool multi); EAPI void elm_genlist_multi_select_set(Evas_Object *obj, Eina_Bool multi);
EAPI Elm_Genlist_Item *elm_genlist_selected_item_get(const Evas_Object *obj); EAPI Elm_Genlist_Item *elm_genlist_selected_item_get(const Evas_Object *obj);
EAPI const Eina_List *elm_genlist_selected_items_get(const Evas_Object *obj); EAPI const Eina_List *elm_genlist_selected_items_get(const Evas_Object *obj);
EAPI Elm_Genlist_Item *elm_genlist_first_item_get(const Evas_Object *obj); EAPI Elm_Genlist_Item *elm_genlist_first_item_get(const Evas_Object *obj);
@ -642,19 +642,19 @@ extern "C" {
EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Genlist_Item *item); EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Genlist_Item *item);
EAPI Elm_Genlist_Item *elm_genlist_item_parent_get(const Elm_Genlist_Item *it); EAPI Elm_Genlist_Item *elm_genlist_item_parent_get(const Elm_Genlist_Item *it);
EAPI void elm_genlist_item_subitems_clear(Elm_Genlist_Item *item); EAPI void elm_genlist_item_subitems_clear(Elm_Genlist_Item *item);
EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Evas_Bool selected); EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Eina_Bool selected);
EAPI Evas_Bool elm_genlist_item_selected_get(const Elm_Genlist_Item *item); EAPI Eina_Bool elm_genlist_item_selected_get(const Elm_Genlist_Item *item);
EAPI void elm_genlist_item_expanded_set(Elm_Genlist_Item *item, Evas_Bool expanded); EAPI void elm_genlist_item_expanded_set(Elm_Genlist_Item *item, Eina_Bool expanded);
EAPI Evas_Bool elm_genlist_item_expanded_get(const Elm_Genlist_Item *item); EAPI Eina_Bool elm_genlist_item_expanded_get(const Elm_Genlist_Item *item);
EAPI void elm_genlist_item_disabled_set(Elm_Genlist_Item *item, Evas_Bool disabled); EAPI void elm_genlist_item_disabled_set(Elm_Genlist_Item *item, Eina_Bool disabled);
EAPI Evas_Bool elm_genlist_item_disabled_get(const Elm_Genlist_Item *item); EAPI Eina_Bool elm_genlist_item_disabled_get(const Elm_Genlist_Item *item);
EAPI void elm_genlist_item_show(Elm_Genlist_Item *item); EAPI void elm_genlist_item_show(Elm_Genlist_Item *item);
EAPI void elm_genlist_item_del(Elm_Genlist_Item *item); EAPI void elm_genlist_item_del(Elm_Genlist_Item *item);
EAPI const void *elm_genlist_item_data_get(const Elm_Genlist_Item *item); EAPI const void *elm_genlist_item_data_get(const Elm_Genlist_Item *item);
EAPI void elm_genlist_item_update(Elm_Genlist_Item *item); EAPI void elm_genlist_item_update(Elm_Genlist_Item *item);
EAPI void elm_genlist_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode); EAPI void elm_genlist_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode);
EAPI void elm_genlist_always_select_mode_set(Evas_Object *obj, Evas_Bool always_select); EAPI void elm_genlist_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
EAPI void elm_genlist_no_select_mode_set(Evas_Object *obj, Evas_Bool no_select); EAPI void elm_genlist_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select);
/* available item styles: /* available item styles:
* default * default
* double_label * double_label
@ -672,9 +672,9 @@ extern "C" {
EAPI Evas_Object *elm_check_add(Evas_Object *parent); EAPI Evas_Object *elm_check_add(Evas_Object *parent);
EAPI void elm_check_label_set(Evas_Object *obj, const char *label); EAPI void elm_check_label_set(Evas_Object *obj, const char *label);
EAPI void elm_check_icon_set(Evas_Object *obj, Evas_Object *icon); EAPI void elm_check_icon_set(Evas_Object *obj, Evas_Object *icon);
EAPI void elm_check_state_set(Evas_Object *obj, Evas_Bool state); EAPI void elm_check_state_set(Evas_Object *obj, Eina_Bool state);
EAPI Evas_Bool elm_check_state_get(const Evas_Object *obj); EAPI Eina_Bool elm_check_state_get(const Evas_Object *obj);
EAPI void elm_check_state_pointer_set(Evas_Object *obj, Evas_Bool *statep); EAPI void elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep);
/* smart callbacks called: /* smart callbacks called:
* "changed" - the user toggled the state * "changed" - the user toggled the state
*/ */

View File

@ -9,8 +9,8 @@ struct _Widget_Data
const char *file; const char *file;
Elm_Text_Format format; Elm_Text_Format format;
Ecore_Timer *delay_write; Ecore_Timer *delay_write;
Evas_Bool can_write : 1; Eina_Bool can_write : 1;
Evas_Bool auto_write : 1; Eina_Bool auto_write : 1;
}; };
static void _del_hook(Evas_Object *obj); static void _del_hook(Evas_Object *obj);
@ -233,7 +233,7 @@ elm_notepad_add(Evas_Object *parent)
elm_entry_entry_set(wd->entry, ""); elm_entry_entry_set(wd->entry, "");
evas_object_smart_callback_add(wd->entry, "changed", _entry_changed, obj); evas_object_smart_callback_add(wd->entry, "changed", _entry_changed, obj);
wd->auto_write = 1; wd->auto_write = EINA_TRUE;
_sizing_eval(obj); _sizing_eval(obj);
return obj; return obj;

View File

@ -81,14 +81,14 @@ elm_box_add(Evas_Object *parent)
} }
EAPI void EAPI void
elm_box_horizontal_set(Evas_Object *obj, Evas_Bool horizontal) elm_box_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
_els_smart_box_orientation_set(wd->box, horizontal); _els_smart_box_orientation_set(wd->box, horizontal);
} }
EAPI void EAPI void
elm_box_homogenous_set(Evas_Object *obj, Evas_Bool homogenous) elm_box_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
_els_smart_box_homogenous_set(wd->box, homogenous); _els_smart_box_homogenous_set(wd->box, homogenous);

View File

@ -20,7 +20,7 @@ struct _Elm_Carousel_Item
Evas_Object *icon; Evas_Object *icon;
void (*func) (void *data, Evas_Object *obj, void *event_info); void (*func) (void *data, Evas_Object *obj, void *event_info);
const void *data; const void *data;
Evas_Bool selected : 1; Eina_Bool selected : 1;
}; };
static void _del_hook(Evas_Object *obj); static void _del_hook(Evas_Object *obj);
@ -50,12 +50,12 @@ _item_select(Elm_Carousel_Item *it)
{ {
if (it2->selected) if (it2->selected)
{ {
it2->selected = 0; it2->selected = EINA_FALSE;
edje_object_signal_emit(it2->base, "elm,state,unselected", "elm"); edje_object_signal_emit(it2->base, "elm,state,unselected", "elm");
break; break;
} }
} }
it->selected = 1; it->selected = EINA_TRUE;
edje_object_signal_emit(it->base, "elm,state,selected", "elm"); edje_object_signal_emit(it->base, "elm,state,selected", "elm");
_item_show(it); _item_show(it);
obj2 = it->obj; obj2 = it->obj;

View File

@ -25,8 +25,8 @@ struct _Widget_Data
{ {
Evas_Object *chk; Evas_Object *chk;
Evas_Object *icon; Evas_Object *icon;
Evas_Bool state; Eina_Bool state;
Evas_Bool *statep; Eina_Bool *statep;
const char *label; const char *label;
}; };
@ -113,7 +113,7 @@ static void
_signal_check_off(void *data, Evas_Object *obj, const char *emission, const char *source) _signal_check_off(void *data, Evas_Object *obj, const char *emission, const char *source)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
wd->state = 0; wd->state = EINA_FALSE;
if (wd->statep) *wd->statep = wd->state; if (wd->statep) *wd->statep = wd->state;
edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm"); edje_object_signal_emit(wd->chk, "elm,state,check,off", "elm");
evas_object_smart_callback_call(data, "changed", NULL); evas_object_smart_callback_call(data, "changed", NULL);
@ -123,7 +123,7 @@ static void
_signal_check_on(void *data, Evas_Object *obj, const char *emission, const char *source) _signal_check_on(void *data, Evas_Object *obj, const char *emission, const char *source)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
wd->state = 1; wd->state = EINA_TRUE;
if (wd->statep) *wd->statep = wd->state; if (wd->statep) *wd->statep = wd->state;
edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm"); edje_object_signal_emit(wd->chk, "elm,state,check,on", "elm");
evas_object_smart_callback_call(data, "changed", NULL); evas_object_smart_callback_call(data, "changed", NULL);
@ -253,7 +253,7 @@ elm_check_icon_set(Evas_Object *obj, Evas_Object *icon)
* @ingroup Check * @ingroup Check
*/ */
EAPI void EAPI void
elm_check_state_set(Evas_Object *obj, Evas_Bool state) elm_check_state_set(Evas_Object *obj, Eina_Bool state)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (state != wd->state) if (state != wd->state)
@ -275,7 +275,7 @@ elm_check_state_set(Evas_Object *obj, Evas_Bool state)
* *
* @ingroup Check * @ingroup Check
*/ */
EAPI Evas_Bool EAPI Eina_Bool
elm_check_state_get(const Evas_Object *obj) elm_check_state_get(const Evas_Object *obj)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
@ -298,7 +298,7 @@ elm_check_state_get(const Evas_Object *obj)
* @ingroup Check * @ingroup Check
*/ */
EAPI void EAPI void
elm_check_state_pointer_set(Evas_Object *obj, Evas_Bool *statep) elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);

View File

@ -6,9 +6,9 @@ typedef struct _Widget_Data Widget_Data;
struct _Widget_Data struct _Widget_Data
{ {
Evas_Object *clk; Evas_Object *clk;
Evas_Bool seconds : 1; Eina_Bool seconds : 1;
Evas_Bool am_pm : 1; Eina_Bool am_pm : 1;
Evas_Bool edit : 1; Eina_Bool edit : 1;
int hrs, min, sec; int hrs, min, sec;
Evas_Object *digit[6]; Evas_Object *digit[6];
Evas_Object *ampm; Evas_Object *ampm;
@ -16,9 +16,9 @@ struct _Widget_Data
struct { struct {
int hrs, min, sec; int hrs, min, sec;
char ampm; char ampm;
char seconds; Eina_Bool seconds : 1;
char am_pm; Eina_Bool am_pm : 1;
char edit; Eina_Bool edit : 1;
} cur; } cur;
}; };
@ -378,9 +378,9 @@ elm_clock_add(Evas_Object *parent)
elm_widget_resize_object_set(obj, wd->clk); elm_widget_resize_object_set(obj, wd->clk);
wd->cur.ampm = -1; wd->cur.ampm = -1;
wd->cur.seconds = -1; wd->cur.seconds = EINA_TRUE;
wd->cur.am_pm = -1; wd->cur.am_pm = EINA_TRUE;
wd->cur.edit = -1; wd->cur.edit = EINA_TRUE;
_time_update(obj); _time_update(obj);
_ticker(obj); _ticker(obj);
@ -408,7 +408,7 @@ elm_clock_time_get(const Evas_Object *obj, int *hrs, int *min, int *sec)
} }
EAPI void EAPI void
elm_clock_edit_set(Evas_Object *obj, Evas_Bool edit) elm_clock_edit_set(Evas_Object *obj, Eina_Bool edit)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
wd->edit = edit; wd->edit = edit;
@ -416,7 +416,7 @@ elm_clock_edit_set(Evas_Object *obj, Evas_Bool edit)
} }
EAPI void EAPI void
elm_clock_show_am_pm_set(Evas_Object *obj, Evas_Bool am_pm) elm_clock_show_am_pm_set(Evas_Object *obj, Eina_Bool am_pm)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
wd->am_pm = am_pm; wd->am_pm = am_pm;
@ -424,7 +424,7 @@ elm_clock_show_am_pm_set(Evas_Object *obj, Evas_Bool am_pm)
} }
EAPI void EAPI void
elm_clock_show_seconds_set(Evas_Object *obj, Evas_Bool seconds) elm_clock_show_seconds_set(Evas_Object *obj, Eina_Bool seconds)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
wd->seconds = seconds; wd->seconds = seconds;

View File

@ -15,15 +15,15 @@ struct _Widget_Data
Evas_Coord lastw; Evas_Coord lastw;
Evas_Coord downx, downy; Evas_Coord downx, downy;
Evas_Coord cx, cy, cw, ch; Evas_Coord cx, cy, cw, ch;
Evas_Bool changed : 1; Eina_Bool changed : 1;
Evas_Bool linewrap : 1; Eina_Bool linewrap : 1;
Evas_Bool single_line : 1; Eina_Bool single_line : 1;
Evas_Bool password : 1; Eina_Bool password : 1;
Evas_Bool editable : 1; Eina_Bool editable : 1;
Evas_Bool selection_asked : 1; Eina_Bool selection_asked : 1;
Evas_Bool have_selection : 1; Eina_Bool have_selection : 1;
Evas_Bool selmode : 1; Eina_Bool selmode : 1;
Evas_Bool deferred_cur : 1; Eina_Bool deferred_cur : 1;
}; };
static void _del_hook(Evas_Object *obj); static void _del_hook(Evas_Object *obj);
@ -102,7 +102,7 @@ _sizing_eval(Evas_Object *obj)
{ {
evas_object_geometry_get(wd->ent, NULL, NULL, &resw, &resh); evas_object_geometry_get(wd->ent, NULL, NULL, &resw, &resh);
if ((resw == wd->lastw) && (!wd->changed)) return; if ((resw == wd->lastw) && (!wd->changed)) return;
wd->changed = 0; wd->changed = EINA_FALSE;
wd->lastw = resw; wd->lastw = resw;
if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job); if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job);
wd->deferred_recalc_job = ecore_job_add(_elm_win_recalc_job, obj); wd->deferred_recalc_job = ecore_job_add(_elm_win_recalc_job, obj);
@ -190,7 +190,7 @@ static void
_select(void *data, Evas_Object *obj, void *event_info) _select(void *data, Evas_Object *obj, void *event_info)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
wd->selmode = 1; wd->selmode = EINA_TRUE;
edje_object_part_text_select_none(wd->ent, "elm.text"); edje_object_part_text_select_none(wd->ent, "elm.text");
edje_object_part_text_select_allow_set(wd->ent, "elm.text", 1); edje_object_part_text_select_allow_set(wd->ent, "elm.text", 1);
edje_object_signal_emit(wd->ent, "elm,state,select,on", "elm"); edje_object_signal_emit(wd->ent, "elm,state,select,on", "elm");
@ -213,7 +213,7 @@ _paste(void *data, Evas_Object *obj, void *event_info)
ecore_x_selection_primary_request ecore_x_selection_primary_request
(elm_win_xwindow_get(top), (elm_win_xwindow_get(top),
ECORE_X_SELECTION_TARGET_UTF8_STRING); ECORE_X_SELECTION_TARGET_UTF8_STRING);
wd->selection_asked = 1; wd->selection_asked = EINA_TRUE;
} }
#endif #endif
} }
@ -232,7 +232,7 @@ static void
_cut(void *data, Evas_Object *obj, void *event_info) _cut(void *data, Evas_Object *obj, void *event_info)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
wd->selmode = 0; wd->selmode = EINA_FALSE;
edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0); edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0);
edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm"); edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
elm_widget_scroll_hold_pop(data); elm_widget_scroll_hold_pop(data);
@ -245,7 +245,7 @@ static void
_copy(void *data, Evas_Object *obj, void *event_info) _copy(void *data, Evas_Object *obj, void *event_info)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
wd->selmode = 0; wd->selmode = EINA_FALSE;
edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0); edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0);
edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm"); edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
elm_widget_scroll_hold_pop(data); elm_widget_scroll_hold_pop(data);
@ -257,7 +257,7 @@ static void
_cancel(void *data, Evas_Object *obj, void *event_info) _cancel(void *data, Evas_Object *obj, void *event_info)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
wd->selmode = 0; wd->selmode = EINA_FALSE;
edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0); edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0);
edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm"); edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
elm_widget_scroll_hold_pop(data); elm_widget_scroll_hold_pop(data);
@ -596,7 +596,7 @@ static void
_signal_entry_changed(void *data, Evas_Object *obj, const char *emission, const char *source) _signal_entry_changed(void *data, Evas_Object *obj, const char *emission, const char *source)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
wd->changed = 1; wd->changed = EINA_TRUE;
_sizing_eval(data); _sizing_eval(data);
evas_object_smart_callback_call(data, "changed", NULL); evas_object_smart_callback_call(data, "changed", NULL);
} }
@ -611,7 +611,7 @@ _signal_selection_start(void *data, Evas_Object *obj, const char *emission, cons
{ {
if (entry != data) elm_entry_select_none(entry); if (entry != data) elm_entry_select_none(entry);
} }
wd->have_selection = 1; wd->have_selection = EINA_TRUE;
evas_object_smart_callback_call(data, "selection,start", NULL); evas_object_smart_callback_call(data, "selection,start", NULL);
if (wd->sel_notify_handler) if (wd->sel_notify_handler)
{ {
@ -635,7 +635,7 @@ static void
_signal_selection_changed(void *data, Evas_Object *obj, const char *emission, const char *source) _signal_selection_changed(void *data, Evas_Object *obj, const char *emission, const char *source)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
wd->have_selection = 1; wd->have_selection = EINA_TRUE;
evas_object_smart_callback_call(data, "selection,changed", NULL); evas_object_smart_callback_call(data, "selection,changed", NULL);
if (wd->sel_notify_handler) if (wd->sel_notify_handler)
{ {
@ -660,7 +660,7 @@ _signal_selection_cleared(void *data, Evas_Object *obj, const char *emission, co
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
if (!wd->have_selection) return; if (!wd->have_selection) return;
wd->have_selection = 0; wd->have_selection = EINA_FALSE;
evas_object_smart_callback_call(data, "selection,cleared", NULL); evas_object_smart_callback_call(data, "selection,cleared", NULL);
if (wd->sel_notify_handler) if (wd->sel_notify_handler)
{ {
@ -715,7 +715,7 @@ _signal_entry_paste_request(void *data, Evas_Object *obj, const char *emission,
ecore_x_selection_primary_request ecore_x_selection_primary_request
(elm_win_xwindow_get(top), (elm_win_xwindow_get(top),
ECORE_X_SELECTION_TARGET_UTF8_STRING); ECORE_X_SELECTION_TARGET_UTF8_STRING);
wd->selection_asked = 1; wd->selection_asked = EINA_TRUE;
} }
#endif #endif
} }
@ -743,7 +743,7 @@ _signal_entry_cut_notify(void *data, Evas_Object *obj, const char *emission, con
free(txt); free(txt);
} }
edje_object_part_text_insert(wd->ent, "elm.text", ""); edje_object_part_text_insert(wd->ent, "elm.text", "");
wd->changed = 1; wd->changed = EINA_TRUE;
_sizing_eval(data); _sizing_eval(data);
} }
@ -758,7 +758,7 @@ _signal_cursor_changed(void *data, Evas_Object *obj, const char *emission, const
elm_widget_show_region_set(data, cx, cy, cw, ch); elm_widget_show_region_set(data, cx, cy, cw, ch);
else else
{ {
wd->deferred_cur = 1; wd->deferred_cur = EINA_TRUE;
wd->cx = cx; wd->cx = cx;
wd->cy = cy; wd->cy = cy;
wd->cw = cw; wd->cw = cw;
@ -874,7 +874,7 @@ _event_selection_notify(void *data, int type, void *event)
} }
} }
} }
wd->selection_asked = 0; wd->selection_asked = EINA_FALSE;
} }
return 1; return 1;
} }
@ -912,8 +912,8 @@ elm_entry_add(Evas_Object *parent)
elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_theme_hook_set(obj, _theme_hook);
elm_widget_can_focus_set(obj, 1); elm_widget_can_focus_set(obj, 1);
wd->linewrap = 1; wd->linewrap = EINA_TRUE;
wd->editable = 1; wd->editable = EINA_TRUE;
wd->ent = edje_object_add(e); wd->ent = edje_object_add(e);
evas_object_event_callback_add(wd->ent, EVAS_CALLBACK_MOVE, _move, obj); evas_object_event_callback_add(wd->ent, EVAS_CALLBACK_MOVE, _move, obj);
@ -959,13 +959,13 @@ elm_entry_add(Evas_Object *parent)
} }
EAPI void EAPI void
elm_entry_single_line_set(Evas_Object *obj, Evas_Bool single_line) elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
const char *t; const char *t;
if (wd->single_line == single_line) return; if (wd->single_line == single_line) return;
wd->single_line = single_line; wd->single_line = single_line;
wd->linewrap = 0; wd->linewrap = EINA_FALSE;
t = eina_stringshare_add(elm_entry_entry_get(obj)); t = eina_stringshare_add(elm_entry_entry_get(obj));
_elm_theme_set(wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj)); _elm_theme_set(wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj));
elm_entry_entry_set(obj, t); elm_entry_entry_set(obj, t);
@ -974,14 +974,14 @@ elm_entry_single_line_set(Evas_Object *obj, Evas_Bool single_line)
} }
EAPI void EAPI void
elm_entry_password_set(Evas_Object *obj, Evas_Bool password) elm_entry_password_set(Evas_Object *obj, Eina_Bool password)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
const char *t; const char *t;
if (wd->password == password) return; if (wd->password == password) return;
wd->password = password; wd->password = password;
wd->single_line = 1; wd->single_line = EINA_TRUE;
wd->linewrap = 0; wd->linewrap = EINA_FALSE;
t = eina_stringshare_add(elm_entry_entry_get(obj)); t = eina_stringshare_add(elm_entry_entry_get(obj));
_elm_theme_set(wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj)); _elm_theme_set(wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj));
elm_entry_entry_set(obj, t); elm_entry_entry_set(obj, t);
@ -1005,7 +1005,7 @@ elm_entry_entry_set(Evas_Object *obj, const char *entry)
printf("ANCHOR: %s\n", anchor); printf("ANCHOR: %s\n", anchor);
} }
#endif #endif
wd->changed = 1; wd->changed = EINA_TRUE;
_sizing_eval(obj); _sizing_eval(obj);
} }
@ -1013,6 +1013,7 @@ EAPI const char *
elm_entry_entry_get(const Evas_Object *obj) elm_entry_entry_get(const Evas_Object *obj)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
return edje_object_part_text_get(wd->ent, "elm.text"); return edje_object_part_text_get(wd->ent, "elm.text");
} }
@ -1020,6 +1021,7 @@ EAPI const char *
elm_entry_selection_get(const Evas_Object *obj) elm_entry_selection_get(const Evas_Object *obj)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
return edje_object_part_text_selection_get(wd->ent, "elm.text"); return edje_object_part_text_selection_get(wd->ent, "elm.text");
} }
@ -1028,12 +1030,12 @@ elm_entry_entry_insert(Evas_Object *obj, const char *entry)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
edje_object_part_text_insert(wd->ent, "elm.text", entry); edje_object_part_text_insert(wd->ent, "elm.text", entry);
wd->changed = 1; wd->changed = EINA_TRUE;
_sizing_eval(obj); _sizing_eval(obj);
} }
EAPI void EAPI void
elm_entry_line_wrap_set(Evas_Object *obj, Evas_Bool wrap) elm_entry_line_wrap_set(Evas_Object *obj, Eina_Bool wrap)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
const char *t; const char *t;
@ -1047,7 +1049,7 @@ elm_entry_line_wrap_set(Evas_Object *obj, Evas_Bool wrap)
} }
EAPI void EAPI void
elm_entry_editable_set(Evas_Object *obj, Evas_Bool editable) elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
const char *t; const char *t;
@ -1066,11 +1068,11 @@ elm_entry_select_none(Evas_Object *obj)
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (wd->selmode) if (wd->selmode)
{ {
wd->selmode = 0; wd->selmode = EINA_FALSE;
edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0); edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0);
edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm"); edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
} }
wd->have_selection = 0; wd->have_selection = EINA_FALSE;
edje_object_part_text_select_none(wd->ent, "elm.text"); edje_object_part_text_select_none(wd->ent, "elm.text");
} }
@ -1080,11 +1082,11 @@ elm_entry_select_all(Evas_Object *obj)
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (wd->selmode) if (wd->selmode)
{ {
wd->selmode = 0; wd->selmode = EINA_FALSE;
edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0); edje_object_part_text_select_allow_set(wd->ent, "elm.text", 0);
edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm"); edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
} }
wd->have_selection = 1; wd->have_selection = EINA_TRUE;
edje_object_part_text_select_all(wd->ent, "elm.text"); edje_object_part_text_select_all(wd->ent, "elm.text");
} }

View File

@ -233,12 +233,12 @@ struct _Widget_Data
Eina_List *selected; Eina_List *selected;
Elm_Genlist_Item *show_item; Elm_Genlist_Item *show_item;
Elm_List_Mode mode; Elm_List_Mode mode;
Evas_Bool on_hold : 1; Eina_Bool on_hold : 1;
Evas_Bool multi : 1; Eina_Bool multi : 1;
Evas_Bool min_w : 1; Eina_Bool min_w : 1;
Evas_Bool min_h : 1; Eina_Bool min_h : 1;
Evas_Bool always_select : 1; Eina_Bool always_select : 1;
Evas_Bool no_select : 1; Eina_Bool no_select : 1;
}; };
struct _Item_Block struct _Item_Block
@ -248,8 +248,8 @@ struct _Item_Block
Widget_Data *wd; Widget_Data *wd;
Eina_List *items; Eina_List *items;
Evas_Coord x, y, w, h, minw, minh; Evas_Coord x, y, w, h, minw, minh;
Evas_Bool realized : 1; Eina_Bool realized : 1;
Evas_Bool changed : 1; Eina_Bool changed : 1;
}; };
struct _Elm_Genlist_Item struct _Elm_Genlist_Item
@ -275,17 +275,17 @@ struct _Elm_Genlist_Item
Elm_Genlist_Item *rel; Elm_Genlist_Item *rel;
int relcount; int relcount;
Evas_Bool before : 1; Eina_Bool before : 1;
Evas_Bool realized : 1; Eina_Bool realized : 1;
Evas_Bool selected : 1; Eina_Bool selected : 1;
Evas_Bool hilighted : 1; Eina_Bool hilighted : 1;
Evas_Bool expanded : 1; // FIXME: not done yet Eina_Bool expanded : 1; // FIXME: not done yet
Evas_Bool disabled : 1; Eina_Bool disabled : 1;
Evas_Bool mincalcd : 1; Eina_Bool mincalcd : 1;
Evas_Bool queued : 1; Eina_Bool queued : 1;
Evas_Bool showme : 1; Eina_Bool showme : 1;
Evas_Bool delete_me : 1; Eina_Bool delete_me : 1;
}; };
struct _Pan struct _Pan
@ -331,10 +331,10 @@ _theme_hook(Evas_Object *obj)
Elm_Genlist_Item *it; Elm_Genlist_Item *it;
EINA_LIST_FOREACH(itb->items, l, it) EINA_LIST_FOREACH(itb->items, l, it)
{ {
it->mincalcd = 0; it->mincalcd = EINA_FALSE;
} }
itb->changed = 1; itb->changed = EINA_TRUE;
} }
if (wd->calc_job) ecore_job_del(wd->calc_job); if (wd->calc_job) ecore_job_del(wd->calc_job);
wd->calc_job = ecore_job_add(_calc_job, wd); wd->calc_job = ecore_job_add(_calc_job, wd);
@ -408,7 +408,7 @@ _item_hilight(Elm_Genlist_Item *it)
selectraise = edje_object_data_get(it->base, "selectraise"); selectraise = edje_object_data_get(it->base, "selectraise");
if ((selectraise) && (!strcmp(selectraise, "on"))) if ((selectraise) && (!strcmp(selectraise, "on")))
evas_object_raise(it->base); evas_object_raise(it->base);
it->hilighted = 1; it->hilighted = EINA_TRUE;
} }
static void static void
@ -422,7 +422,7 @@ _item_select(Elm_Genlist_Item *it)
if (it->wd->always_select) goto call; if (it->wd->always_select) goto call;
return; return;
} }
it->selected = 1; it->selected = EINA_TRUE;
it->wd->selected = eina_list_append(it->wd->selected, it); it->wd->selected = eina_list_append(it->wd->selected, it);
call: call:
if (it->func.func) it->func.func((void *)it->func.data, it->wd->obj, it); if (it->func.func) it->func.func((void *)it->func.data, it->wd->obj, it);
@ -443,10 +443,10 @@ _item_unselect(Elm_Genlist_Item *it)
if ((stacking) && (!strcmp(stacking, "below"))) if ((stacking) && (!strcmp(stacking, "below")))
evas_object_lower(it->base); evas_object_lower(it->base);
} }
it->hilighted = 0; it->hilighted = EINA_FALSE;
if (it->selected) if (it->selected)
{ {
it->selected = 0; it->selected = EINA_FALSE;
it->wd->selected = eina_list_remove(it->wd->selected, it); it->wd->selected = eina_list_remove(it->wd->selected, it);
evas_object_smart_callback_call(it->wd->obj, "unselected", it); evas_object_smart_callback_call(it->wd->obj, "unselected", it);
} }
@ -461,7 +461,7 @@ _mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info)
{ {
if (!it->wd->on_hold) if (!it->wd->on_hold)
{ {
it->wd->on_hold = 1; it->wd->on_hold = EINA_TRUE;
_item_unselect(it); _item_unselect(it);
} }
} }
@ -472,8 +472,8 @@ _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
{ {
Elm_Genlist_Item *it = data; Elm_Genlist_Item *it = data;
Evas_Event_Mouse_Down *ev = event_info; Evas_Event_Mouse_Down *ev = event_info;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = 1; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
else it->wd->on_hold = 0; else it->wd->on_hold = EINA_FALSE;
_item_hilight(it); _item_hilight(it);
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
evas_object_smart_callback_call(it->wd->obj, "clicked", it); evas_object_smart_callback_call(it->wd->obj, "clicked", it);
@ -485,11 +485,11 @@ _mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
Elm_Genlist_Item *it = data; Elm_Genlist_Item *it = data;
Evas_Event_Mouse_Up *ev = event_info; Evas_Event_Mouse_Up *ev = event_info;
Eina_List *l; Eina_List *l;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = 1; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
else it->wd->on_hold = 0; else it->wd->on_hold = EINA_FALSE;
if (it->wd->on_hold) if (it->wd->on_hold)
{ {
it->wd->on_hold = 0; it->wd->on_hold = EINA_FALSE;
return; return;
} }
if (it->disabled) return; if (it->disabled) return;
@ -655,7 +655,7 @@ _item_realize(Elm_Genlist_Item *it, int in, int calc)
it->states = _stringlist_get(edje_object_data_get(it->base, "states")); it->states = _stringlist_get(edje_object_data_get(it->base, "states"));
EINA_LIST_FOREACH(it->states, l, key) EINA_LIST_FOREACH(it->states, l, key)
{ {
Evas_Bool on = it->itc->func.state_get(it->data, it->wd->obj, l->data); Eina_Bool on = it->itc->func.state_get(it->data, it->wd->obj, l->data);
if (on) if (on)
{ {
snprintf(buf, sizeof(buf), "elm,state,%s,active", key); snprintf(buf, sizeof(buf), "elm,state,%s,active", key);
@ -671,10 +671,10 @@ _item_realize(Elm_Genlist_Item *it, int in, int calc)
elm_coords_finger_size_adjust(1, &mw, 1, &mh); elm_coords_finger_size_adjust(1, &mw, 1, &mh);
it->w = it->minw = mw; it->w = it->minw = mw;
it->h = it->minh = mh; it->h = it->minh = mh;
it->mincalcd = 1; it->mincalcd = EINA_TRUE;
} }
if (!calc) evas_object_show(it->base); if (!calc) evas_object_show(it->base);
it->realized = 1; it->realized = EINA_TRUE;
} }
static void static void
@ -696,7 +696,7 @@ _item_unrealize(Elm_Genlist_Item *it)
EINA_LIST_FREE(it->icon_objs, icon) evas_object_del(icon); EINA_LIST_FREE(it->icon_objs, icon) evas_object_del(icon);
it->states = NULL; it->states = NULL;
it->realized = 0; it->realized = EINA_FALSE;
} }
static int static int
@ -728,7 +728,7 @@ _item_block_recalc(Item_Block *itb, int in)
} }
itb->minw = minw; itb->minw = minw;
itb->minh = minh; itb->minh = minh;
itb->changed = 0; itb->changed = EINA_FALSE;
/* force an evas norender to garbage collect deleted objects */ /* force an evas norender to garbage collect deleted objects */
evas_norender(evas_object_evas_get(itb->wd->obj)); evas_norender(evas_object_evas_get(itb->wd->obj));
return showme; return showme;
@ -746,7 +746,7 @@ _item_block_realize(Item_Block *itb, int in, int full)
if (full) _item_realize(it, in, 0); if (full) _item_realize(it, in, 0);
in++; in++;
} }
itb->realized = 1; itb->realized = EINA_TRUE;
} }
static void static void
@ -760,7 +760,7 @@ _item_block_unrealize(Item_Block *itb)
{ {
_item_unrealize(it); _item_unrealize(it);
} }
itb->realized = 0; itb->realized = EINA_FALSE;
} }
static void static void
@ -1092,7 +1092,7 @@ _item_block_del(Elm_Genlist_Item *it)
itb->items = eina_list_remove(itb->items, it); itb->items = eina_list_remove(itb->items, it);
itb->count--; itb->count--;
itb->changed = 1; itb->changed = EINA_TRUE;
if (it->wd->calc_job) ecore_job_del(it->wd->calc_job); if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
it->wd->calc_job = ecore_job_add(_calc_job, it->wd); it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
if (itb->count < 1) if (itb->count < 1)
@ -1104,7 +1104,7 @@ _item_block_del(Elm_Genlist_Item *it)
else else
it->wd->blocks = eina_inlist_remove(it->wd->blocks, il); it->wd->blocks = eina_inlist_remove(it->wd->blocks, il);
free(itb); free(itb);
if (itbn) itbn->changed = 1; if (itbn) itbn->changed = EINA_TRUE;
} }
else else
{ {
@ -1121,7 +1121,7 @@ _item_block_del(Elm_Genlist_Item *it)
it2->block = itbp; it2->block = itbp;
itbp->items = eina_list_append(itbp->items, it2); itbp->items = eina_list_append(itbp->items, it2);
itbp->count++; itbp->count++;
itbp->changed = 1; itbp->changed = EINA_TRUE;
} }
it->wd->blocks = eina_inlist_remove(it->wd->blocks, EINA_INLIST_GET(itb)); it->wd->blocks = eina_inlist_remove(it->wd->blocks, EINA_INLIST_GET(itb));
free(itb); free(itb);
@ -1136,7 +1136,7 @@ _item_block_del(Elm_Genlist_Item *it)
itb->items = eina_list_remove_list(itb->items, last); itb->items = eina_list_remove_list(itb->items, last);
itbn->items = eina_list_prepend(itbn->items, it2); itbn->items = eina_list_prepend(itbn->items, it2);
itbn->count++; itbn->count++;
itbn->changed = 1; itbn->changed = EINA_TRUE;
} }
it->wd->blocks = eina_inlist_remove(it->wd->blocks, EINA_INLIST_GET(itb)); it->wd->blocks = eina_inlist_remove(it->wd->blocks, EINA_INLIST_GET(itb));
free(itb); free(itb);
@ -1154,7 +1154,7 @@ _item_del(Elm_Genlist_Item *it)
if (it->realized) _item_unrealize(it); if (it->realized) _item_unrealize(it);
if (it->block) _item_block_del(it); if (it->block) _item_block_del(it);
if ((!it->delete_me) && (it->itc->func.del)) it->itc->func.del(it->data, it->wd->obj); if ((!it->delete_me) && (it->itc->func.del)) it->itc->func.del(it->data, it->wd->obj);
it->delete_me = 1; it->delete_me = EINA_TRUE;
if (it->queued) if (it->queued)
it->wd->queue = eina_list_remove(it->wd->queue, it); it->wd->queue = eina_list_remove(it->wd->queue, it);
it->wd->items = eina_inlist_remove(it->wd->items, EINA_INLIST_GET(it)); it->wd->items = eina_inlist_remove(it->wd->items, EINA_INLIST_GET(it));
@ -1256,7 +1256,7 @@ _item_block_add(Widget_Data *wd, Elm_Genlist_Item *it)
itb->items = eina_list_append_relative(itb->items, it, it->rel); itb->items = eina_list_append_relative(itb->items, it, it->rel);
} }
itb->count++; itb->count++;
itb->changed = 1; itb->changed = EINA_TRUE;
it->block = itb; it->block = itb;
if (itb->wd->calc_job) ecore_job_del(itb->wd->calc_job); if (itb->wd->calc_job) ecore_job_del(itb->wd->calc_job);
itb->wd->calc_job = ecore_job_add(_calc_job, itb->wd); itb->wd->calc_job = ecore_job_add(_calc_job, itb->wd);
@ -1281,7 +1281,7 @@ _item_idler(void *data)
it = wd->queue->data; it = wd->queue->data;
wd->queue = eina_list_remove_list(wd->queue, wd->queue); wd->queue = eina_list_remove_list(wd->queue, wd->queue);
it->queued = 0; it->queued = EINA_FALSE;
_item_block_add(wd, it); _item_block_add(wd, it);
} }
if (n > 0) if (n > 0)
@ -1302,7 +1302,7 @@ _item_queue(Widget_Data *wd, Elm_Genlist_Item *it)
{ {
if (it->queued) return; if (it->queued) return;
if (!wd->queue_idler) wd->queue_idler = ecore_idler_add(_item_idler, wd); if (!wd->queue_idler) wd->queue_idler = ecore_idler_add(_item_idler, wd);
it->queued = 1; it->queued = EINA_TRUE;
wd->queue = eina_list_append(wd->queue, it); wd->queue = eina_list_append(wd->queue, it);
} }
@ -1540,7 +1540,7 @@ elm_genlist_clear(Evas_Object *obj)
* @ingroup Genlist * @ingroup Genlist
*/ */
EAPI void EAPI void
elm_genlist_multi_select_set(Evas_Object *obj, Evas_Bool multi) elm_genlist_multi_select_set(Evas_Object *obj, Eina_Bool multi)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
wd->multi = multi; wd->multi = multi;
@ -1738,7 +1738,7 @@ elm_genlist_item_subitems_clear(Elm_Genlist_Item *it)
* @ingroup Genlist * @ingroup Genlist
*/ */
EAPI void EAPI void
elm_genlist_item_selected_set(Elm_Genlist_Item *it, Evas_Bool selected) elm_genlist_item_selected_set(Elm_Genlist_Item *it, Eina_Bool selected)
{ {
Widget_Data *wd = elm_widget_data_get(it->wd->obj); Widget_Data *wd = elm_widget_data_get(it->wd->obj);
@ -1771,10 +1771,10 @@ elm_genlist_item_selected_set(Elm_Genlist_Item *it, Evas_Bool selected)
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EAPI Evas_Bool EAPI Eina_Bool
elm_genlist_item_selected_get(const Elm_Genlist_Item *it) elm_genlist_item_selected_get(const Elm_Genlist_Item *it)
{ {
if (!it) return 0; if (!it) return EINA_FALSE;
return it->selected; return it->selected;
} }
@ -1790,7 +1790,7 @@ elm_genlist_item_selected_get(const Elm_Genlist_Item *it)
* @ingroup Genlist * @ingroup Genlist
*/ */
EAPI void EAPI void
elm_genlist_item_expanded_set(Elm_Genlist_Item *it, Evas_Bool expanded) elm_genlist_item_expanded_set(Elm_Genlist_Item *it, Eina_Bool expanded)
{ {
if (!it) return; if (!it) return;
if (it->expanded == expanded) return; if (it->expanded == expanded) return;
@ -1819,10 +1819,10 @@ elm_genlist_item_expanded_set(Elm_Genlist_Item *it, Evas_Bool expanded)
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EAPI Evas_Bool EAPI Eina_Bool
elm_genlist_item_expanded_get(const Elm_Genlist_Item *it) elm_genlist_item_expanded_get(const Elm_Genlist_Item *it)
{ {
if (!it) return 0; if (!it) return EINA_FALSE;
return it->expanded; return it->expanded;
} }
@ -1839,7 +1839,7 @@ elm_genlist_item_expanded_get(const Elm_Genlist_Item *it)
* @ingroup Genlist * @ingroup Genlist
*/ */
EAPI void EAPI void
elm_genlist_item_disabled_set(Elm_Genlist_Item *it, Evas_Bool disabled) elm_genlist_item_disabled_set(Elm_Genlist_Item *it, Eina_Bool disabled)
{ {
if (!it) return; if (!it) return;
if (it->disabled == disabled) return; if (it->disabled == disabled) return;
@ -1864,11 +1864,11 @@ elm_genlist_item_disabled_set(Elm_Genlist_Item *it, Evas_Bool disabled)
* *
* @ingroup Genlist * @ingroup Genlist
*/ */
EAPI Evas_Bool EAPI Eina_Bool
elm_genlist_item_disabled_get(const Elm_Genlist_Item *it) elm_genlist_item_disabled_get(const Elm_Genlist_Item *it)
{ {
if (!it) return 0; if (!it) return EINA_FALSE;
if (it->delete_me) return 0; if (it->delete_me) return EINA_FALSE;
return it->disabled; return it->disabled;
} }
@ -1890,12 +1890,12 @@ elm_genlist_item_show(Elm_Genlist_Item *it)
if ((it->queued) || (!it->mincalcd)) if ((it->queued) || (!it->mincalcd))
{ {
it->wd->show_item = it; it->wd->show_item = it;
it->showme = 1; it->showme = EINA_TRUE;
return; return;
} }
if (it->wd->show_item) if (it->wd->show_item)
{ {
it->wd->show_item->showme = 0; it->wd->show_item->showme = EINA_FALSE;
it->wd->show_item = NULL; it->wd->show_item = NULL;
} }
elm_smart_scroller_child_region_show(it->wd->scr, elm_smart_scroller_child_region_show(it->wd->scr,
@ -1919,13 +1919,13 @@ elm_genlist_item_del(Elm_Genlist_Item *it)
if (it->relcount > 0) if (it->relcount > 0)
{ {
elm_genlist_item_subitems_clear(it); elm_genlist_item_subitems_clear(it);
it->delete_me = 1; it->delete_me = EINA_TRUE;
if (it->wd->show_item == it) it->wd->show_item = NULL; if (it->wd->show_item == it) it->wd->show_item = NULL;
if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it); if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it);
if (it->block) if (it->block)
{ {
if (it->realized) _item_unrealize(it); if (it->realized) _item_unrealize(it);
it->block->changed = 1; it->block->changed = EINA_TRUE;
if (it->wd->calc_job) ecore_job_del(it->wd->calc_job); if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
it->wd->calc_job = ecore_job_add(_calc_job, it->wd); it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
} }
@ -1975,7 +1975,7 @@ elm_genlist_item_update(Elm_Genlist_Item *it)
if (it->delete_me) return; if (it->delete_me) return;
minw = it->wd->minw; minw = it->wd->minw;
minh = it->minh; minh = it->minh;
it->mincalcd = 0; it->mincalcd = EINA_FALSE;
EINA_INLIST_FOREACH(it->wd->blocks, itb) EINA_INLIST_FOREACH(it->wd->blocks, itb)
{ {
if (itb == it->block) break; if (itb == it->block) break;
@ -2001,7 +2001,7 @@ elm_genlist_item_update(Elm_Genlist_Item *it)
} }
if ((it->minw > minw) || (it->minh != minh)) if ((it->minw > minw) || (it->minh != minh))
{ {
it->block->changed = 1; it->block->changed = EINA_TRUE;
if (it->wd->calc_job) ecore_job_del(it->wd->calc_job); if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
it->wd->calc_job = ecore_job_add(_calc_job, it->wd); it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
} }
@ -2048,7 +2048,7 @@ elm_genlist_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode)
* @ingroup Genlist * @ingroup Genlist
*/ */
EAPI void EAPI void
elm_genlist_always_select_mode_set(Evas_Object *obj, Evas_Bool always_select) elm_genlist_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
wd->always_select = always_select; wd->always_select = always_select;
@ -2066,7 +2066,7 @@ elm_genlist_always_select_mode_set(Evas_Object *obj, Evas_Bool always_select)
* @ingroup Genlist * @ingroup Genlist
*/ */
EAPI void EAPI void
elm_genlist_no_select_mode_set(Evas_Object *obj, Evas_Bool no_select) elm_genlist_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
wd->no_select = no_select; wd->no_select = no_select;

View File

@ -7,11 +7,11 @@ struct _Widget_Data
{ {
Evas_Object *img; Evas_Object *img;
const char *stdicon; const char *stdicon;
Evas_Bool scale_up : 1; Eina_Bool scale_up : 1;
Evas_Bool scale_down : 1; Eina_Bool scale_down : 1;
Evas_Bool smooth : 1; Eina_Bool smooth : 1;
Evas_Bool fill_outside : 1; Eina_Bool fill_outside : 1;
Evas_Bool no_scale : 1; Eina_Bool no_scale : 1;
}; };
static void _del_hook(Evas_Object *obj); static void _del_hook(Evas_Object *obj);
@ -101,9 +101,9 @@ elm_icon_add(Evas_Object *parent)
evas_object_repeat_events_set(wd->img, 1); evas_object_repeat_events_set(wd->img, 1);
elm_widget_resize_object_set(obj, wd->img); elm_widget_resize_object_set(obj, wd->img);
wd->smooth = 1; wd->smooth = EINA_TRUE;
wd->scale_up = 1; wd->scale_up = EINA_TRUE;
wd->scale_down = 1; wd->scale_down = EINA_TRUE;
_sizing_eval(obj); _sizing_eval(obj);
return obj; return obj;
@ -142,7 +142,7 @@ elm_icon_standard_set(Evas_Object *obj, const char *name)
} }
EAPI void EAPI void
elm_icon_smooth_set(Evas_Object *obj, Evas_Bool smooth) elm_icon_smooth_set(Evas_Object *obj, Eina_Bool smooth)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
@ -151,7 +151,7 @@ elm_icon_smooth_set(Evas_Object *obj, Evas_Bool smooth)
} }
EAPI void EAPI void
elm_icon_no_scale_set(Evas_Object *obj, Evas_Bool no_scale) elm_icon_no_scale_set(Evas_Object *obj, Eina_Bool no_scale)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
@ -160,7 +160,7 @@ elm_icon_no_scale_set(Evas_Object *obj, Evas_Bool no_scale)
} }
EAPI void EAPI void
elm_icon_scale_set(Evas_Object *obj, Evas_Bool scale_up, Evas_Bool scale_down) elm_icon_scale_set(Evas_Object *obj, Eina_Bool scale_up, Eina_Bool scale_down)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
@ -170,7 +170,7 @@ elm_icon_scale_set(Evas_Object *obj, Evas_Bool scale_up, Evas_Bool scale_down)
} }
EAPI void EAPI void
elm_icon_fill_outside_set(Evas_Object *obj, Evas_Bool fill_outside) elm_icon_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;

View File

@ -9,11 +9,11 @@ typedef struct _Widget_Data Widget_Data;
struct _Widget_Data struct _Widget_Data
{ {
Evas_Object *img; Evas_Object *img;
Evas_Bool scale_up : 1; Eina_Bool scale_up : 1;
Evas_Bool scale_down : 1; Eina_Bool scale_down : 1;
Evas_Bool smooth : 1; Eina_Bool smooth : 1;
Evas_Bool fill_outside : 1; Eina_Bool fill_outside : 1;
Evas_Bool no_scale : 1; Eina_Bool no_scale : 1;
}; };
static void _del_hook(Evas_Object *obj); static void _del_hook(Evas_Object *obj);
@ -100,9 +100,9 @@ elm_image_add(Evas_Object *parent)
evas_object_repeat_events_set(wd->img, 1); evas_object_repeat_events_set(wd->img, 1);
elm_widget_resize_object_set(obj, wd->img); elm_widget_resize_object_set(obj, wd->img);
wd->smooth = 1; wd->smooth = EINA_TRUE;
wd->scale_up = 1; wd->scale_up = EINA_TRUE;
wd->scale_down = 1; wd->scale_down = EINA_TRUE;
_els_smart_icon_scale_size_set(wd->img, 0); _els_smart_icon_scale_size_set(wd->img, 0);
@ -115,10 +115,10 @@ elm_image_file_set(Evas_Object *obj, const char *file, const char *group)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
Eina_Bool ret; Eina_Bool ret;
if (!wd) return 0; if (!wd) return EINA_FALSE;
const char *p; const char *p;
if (!file) return 0; if (!file) return EINA_FALSE;
if (((p = strrchr(file, '.'))) && (!strcasecmp(p, ".edj"))) if (((p = strrchr(file, '.'))) && (!strcasecmp(p, ".edj")))
ret = _els_smart_icon_file_edje_set(wd->img, file, group); ret = _els_smart_icon_file_edje_set(wd->img, file, group);
else else
@ -128,7 +128,7 @@ elm_image_file_set(Evas_Object *obj, const char *file, const char *group)
} }
EAPI void EAPI void
elm_image_smooth_set(Evas_Object *obj, Evas_Bool smooth) elm_image_smooth_set(Evas_Object *obj, Eina_Bool smooth)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
@ -137,7 +137,7 @@ elm_image_smooth_set(Evas_Object *obj, Evas_Bool smooth)
} }
EAPI void EAPI void
elm_image_no_scale_set(Evas_Object *obj, Evas_Bool no_scale) elm_image_no_scale_set(Evas_Object *obj, Eina_Bool no_scale)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
@ -146,7 +146,7 @@ elm_image_no_scale_set(Evas_Object *obj, Evas_Bool no_scale)
} }
EAPI void EAPI void
elm_image_scale_set(Evas_Object *obj, Evas_Bool scale_up, Evas_Bool scale_down) elm_image_scale_set(Evas_Object *obj, Eina_Bool scale_up, Eina_Bool scale_down)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
@ -156,7 +156,7 @@ elm_image_scale_set(Evas_Object *obj, Evas_Bool scale_up, Evas_Bool scale_down)
} }
EAPI void EAPI void
elm_image_fill_outside_set(Evas_Object *obj, Evas_Bool fill_outside) elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;

View File

@ -10,14 +10,14 @@ struct _Widget_Data
Eina_List *selected; Eina_List *selected;
Elm_List_Mode mode; Elm_List_Mode mode;
Evas_Coord minw[2], minh[2]; Evas_Coord minw[2], minh[2];
Evas_Bool on_hold : 1; Eina_Bool on_hold : 1;
Evas_Bool multi : 1; Eina_Bool multi : 1;
Evas_Bool always_select : 1; Eina_Bool always_select : 1;
}; };
struct _Elm_List_Item struct _Elm_List_Item
{ {
Evas_List *node; Eina_List *node;
Evas_Object *obj; Evas_Object *obj;
Evas_Object *base; Evas_Object *base;
const char *label; const char *label;
@ -25,13 +25,13 @@ struct _Elm_List_Item
void (*func) (void *data, Evas_Object *obj, void *event_info); void (*func) (void *data, Evas_Object *obj, void *event_info);
void (*del_cb) (void *data, Evas_Object *obj, void *event_info); void (*del_cb) (void *data, Evas_Object *obj, void *event_info);
const void *data; const void *data;
Evas_Bool even : 1; Eina_Bool even : 1;
Evas_Bool is_even : 1; Eina_Bool is_even : 1;
Evas_Bool fixed : 1; Eina_Bool fixed : 1;
Evas_Bool selected : 1; Eina_Bool selected : 1;
Evas_Bool hilighted : 1; Eina_Bool hilighted : 1;
Evas_Bool dummy_icon : 1; Eina_Bool dummy_icon : 1;
Evas_Bool dummy_end : 1; Eina_Bool dummy_end : 1;
}; };
static void _del_hook(Evas_Object *obj); static void _del_hook(Evas_Object *obj);
@ -124,7 +124,7 @@ _item_hilight(Elm_List_Item *it)
selectraise = edje_object_data_get(it->base, "selectraise"); selectraise = edje_object_data_get(it->base, "selectraise");
if ((selectraise) && (!strcmp(selectraise, "on"))) if ((selectraise) && (!strcmp(selectraise, "on")))
evas_object_raise(it->base); evas_object_raise(it->base);
it->hilighted = 1; it->hilighted = EINA_TRUE;
} }
static void static void
@ -137,7 +137,7 @@ _item_select(Elm_List_Item *it)
if (wd->always_select) goto call; if (wd->always_select) goto call;
return; return;
} }
it->selected = 1; it->selected = EINA_TRUE;
wd->selected = eina_list_append(wd->selected, it); wd->selected = eina_list_append(wd->selected, it);
call: call:
if (it->func) it->func((void *)it->data, it->obj, it); if (it->func) it->func((void *)it->data, it->obj, it);
@ -158,10 +158,10 @@ _item_unselect(Elm_List_Item *it)
if ((stacking) && (!strcmp(stacking, "below"))) if ((stacking) && (!strcmp(stacking, "below")))
evas_object_lower(it->base); evas_object_lower(it->base);
} }
it->hilighted = 0; it->hilighted = EINA_FALSE;
if (it->selected) if (it->selected)
{ {
it->selected = 0; it->selected = EINA_FALSE;
wd->selected = eina_list_remove(wd->selected, it); wd->selected = eina_list_remove(wd->selected, it);
evas_object_smart_callback_call(it->obj, "unselected", it); evas_object_smart_callback_call(it->obj, "unselected", it);
} }
@ -177,7 +177,7 @@ _mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info)
{ {
if (!wd->on_hold) if (!wd->on_hold)
{ {
wd->on_hold = 1; wd->on_hold = EINA_TRUE;
_item_unselect(it); _item_unselect(it);
} }
} }
@ -189,8 +189,8 @@ _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
Elm_List_Item *it = data; Elm_List_Item *it = data;
Widget_Data *wd = elm_widget_data_get(it->obj); Widget_Data *wd = elm_widget_data_get(it->obj);
Evas_Event_Mouse_Down *ev = event_info; Evas_Event_Mouse_Down *ev = event_info;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) wd->on_hold = 1; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) wd->on_hold = EINA_TRUE;
else wd->on_hold = 0; else wd->on_hold = EINA_FALSE;
_item_hilight(it); _item_hilight(it);
if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
evas_object_smart_callback_call(it->obj, "clicked", it); evas_object_smart_callback_call(it->obj, "clicked", it);
@ -202,11 +202,11 @@ _mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
Elm_List_Item *it = data; Elm_List_Item *it = data;
Widget_Data *wd = elm_widget_data_get(it->obj); Widget_Data *wd = elm_widget_data_get(it->obj);
Evas_Event_Mouse_Up *ev = event_info; Evas_Event_Mouse_Up *ev = event_info;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) wd->on_hold = 1; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) wd->on_hold = EINA_TRUE;
else wd->on_hold = 0; else wd->on_hold = EINA_FALSE;
if (wd->on_hold) if (wd->on_hold)
{ {
wd->on_hold = 0; wd->on_hold = EINA_FALSE;
return; return;
} }
if (wd->multi) if (wd->multi)
@ -347,13 +347,13 @@ _fix_items(Evas_Object *obj)
{ {
it->icon = evas_object_rectangle_add(evas_object_evas_get(it->base)); it->icon = evas_object_rectangle_add(evas_object_evas_get(it->base));
evas_object_color_set(it->icon, 0, 0, 0, 0); evas_object_color_set(it->icon, 0, 0, 0, 0);
it->dummy_icon = 1; it->dummy_icon = EINA_TRUE;
} }
if ((!it->end) && (minh[1] > 0)) if ((!it->end) && (minh[1] > 0))
{ {
it->end = evas_object_rectangle_add(evas_object_evas_get(it->base)); it->end = evas_object_rectangle_add(evas_object_evas_get(it->base));
evas_object_color_set(it->end, 0, 0, 0, 0); evas_object_color_set(it->end, 0, 0, 0, 0);
it->dummy_end = 1; it->dummy_end = EINA_TRUE;
} }
if (it->icon) if (it->icon)
{ {
@ -387,7 +387,7 @@ _fix_items(Evas_Object *obj)
evas_object_raise(it->base); evas_object_raise(it->base);
stacking = edje_object_data_get(it->base, "stacking"); stacking = edje_object_data_get(it->base, "stacking");
} }
it->fixed = 1; it->fixed = EINA_TRUE;
it->is_even = it->even; it->is_even = it->even;
} }
i++; i++;
@ -508,7 +508,7 @@ elm_list_go(Evas_Object *obj)
} }
EAPI void EAPI void
elm_list_multi_select_set(Evas_Object *obj, Evas_Bool multi) elm_list_multi_select_set(Evas_Object *obj, Eina_Bool multi)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
wd->multi = multi; wd->multi = multi;
@ -527,7 +527,7 @@ elm_list_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode)
} }
EAPI void EAPI void
elm_list_always_select_mode_set(Evas_Object *obj, Evas_Bool always_select) elm_list_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
wd->always_select = always_select; wd->always_select = always_select;
@ -556,7 +556,7 @@ elm_list_selected_items_get(const Evas_Object *obj)
} }
EAPI void EAPI void
elm_list_item_selected_set(Elm_List_Item *it, Evas_Bool selected) elm_list_item_selected_set(Elm_List_Item *it, Eina_Bool selected)
{ {
Widget_Data *wd = elm_widget_data_get(it->obj); Widget_Data *wd = elm_widget_data_get(it->obj);

View File

@ -670,7 +670,7 @@ elm_quicklaunch_seed(void)
static void *qr_handle = NULL; static void *qr_handle = NULL;
static int (*qr_main) (int argc, char **argv) = NULL; static int (*qr_main) (int argc, char **argv) = NULL;
EAPI Evas_Bool EAPI Eina_Bool
elm_quicklaunch_prepare(int argc, char **argv) elm_quicklaunch_prepare(int argc, char **argv)
{ {
#ifdef HAVE_FORK #ifdef HAVE_FORK
@ -678,7 +678,7 @@ elm_quicklaunch_prepare(int argc, char **argv)
if (!exe) if (!exe)
{ {
printf("ERROR: %s does not exist\n", argv[0]); printf("ERROR: %s does not exist\n", argv[0]);
return 0; return EINA_FALSE;
} }
else else
{ {
@ -706,17 +706,17 @@ elm_quicklaunch_prepare(int argc, char **argv)
} }
qr_handle = dlopen(exe, RTLD_NOW | RTLD_GLOBAL); qr_handle = dlopen(exe, RTLD_NOW | RTLD_GLOBAL);
free(exe); free(exe);
if (!qr_handle) return 0; if (!qr_handle) return EINA_FALSE;
qr_main = dlsym(qr_handle, "elm_main"); qr_main = dlsym(qr_handle, "elm_main");
if (!qr_main) if (!qr_main)
{ {
dlclose(qr_handle); dlclose(qr_handle);
qr_handle = NULL; qr_handle = NULL;
return 0; return EINA_FALSE;
} }
return 1; return EINA_TRUE;
#else #else
return 0; return EINA_FALSE;
#endif #endif
} }
@ -744,7 +744,7 @@ save_env(void)
} }
#endif #endif
EAPI Evas_Bool EAPI Eina_Bool
elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (void *data), void *postfork_data) elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (void *data), void *postfork_data)
{ {
#ifdef HAVE_FORK #ifdef HAVE_FORK
@ -761,11 +761,11 @@ elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (voi
char **args; char **args;
child = fork(); child = fork();
if (child > 0) return 1; if (child > 0) return EINA_TRUE;
else if (child < 0) else if (child < 0)
{ {
perror("could not fork"); perror("could not fork");
return 0; return EINA_FALSE;
} }
setsid(); setsid();
if (chdir(cwd) != 0) if (chdir(cwd) != 0)
@ -777,11 +777,11 @@ elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (voi
exit(execvp(argv[0], args)); exit(execvp(argv[0], args));
} }
child = fork(); child = fork();
if (child > 0) return 1; if (child > 0) return EINA_TRUE;
else if (child < 0) else if (child < 0)
{ {
perror("could not fork"); perror("could not fork");
return 0; return EINA_FALSE;
} }
if (postfork_func) postfork_func(postfork_data); if (postfork_func) postfork_func(postfork_data);
@ -804,9 +804,9 @@ elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (voi
ecore_app_args_set(argc, (const char **)argv); ecore_app_args_set(argc, (const char **)argv);
ret = qr_main(argc, argv); ret = qr_main(argc, argv);
exit(ret); exit(ret);
return 1; return EINA_TRUE;
#else #else
return 0; return EINA_FALSE;
#endif #endif
} }

View File

@ -33,7 +33,7 @@ struct _Item
{ {
Evas_Object *obj, *base, *content; Evas_Object *obj, *base, *content;
Evas_Coord minw, minh; Evas_Coord minw, minh;
Evas_Bool popme : 1; Eina_Bool popme : 1;
}; };
static void _del_hook(Evas_Object *obj); static void _del_hook(Evas_Object *obj);
@ -273,7 +273,7 @@ elm_pager_content_pop(Evas_Object *obj)
Item *it; Item *it;
if (!wd->stack) return; if (!wd->stack) return;
it = eina_list_last(wd->stack)->data; it = eina_list_last(wd->stack)->data;
it->popme = 1; it->popme = EINA_TRUE;
ll = eina_list_last(wd->stack); ll = eina_list_last(wd->stack);
if (ll) if (ll)
{ {

View File

@ -46,7 +46,7 @@ struct _Widget_Data
Evas_Object *icon; Evas_Object *icon;
int value; int value;
const char *label; const char *label;
Evas_Bool state; Eina_Bool state;
Group *group; Group *group;
}; };
@ -132,7 +132,7 @@ _sub_del(void *data, Evas_Object *obj, void *event_info)
} }
static void static void
_state_set(Evas_Object *obj, Evas_Bool state) _state_set(Evas_Object *obj, Eina_Bool state)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (state != wd->state) if (state != wd->state)
@ -290,7 +290,7 @@ elm_radio_group_add(Evas_Object *obj, Evas_Object *group)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
Widget_Data *wd2 = elm_widget_data_get(group); Widget_Data *wd2 = elm_widget_data_get(group);
Evas_Bool state = 0; Eina_Bool state = EINA_FALSE;
if (wd->group == wd2->group) return; if (wd->group == wd2->group) return;
wd->group->radios = eina_list_remove(wd->group->radios, obj); wd->group->radios = eina_list_remove(wd->group->radios, obj);
if (!wd->group->radios) free(wd->group); if (!wd->group->radios) free(wd->group);

View File

@ -7,8 +7,8 @@ struct _Widget_Data
{ {
Evas_Object *scr; Evas_Object *scr;
Evas_Object *content; Evas_Object *content;
Evas_Bool min_w : 1; Eina_Bool min_w : 1;
Evas_Bool min_h : 1; Eina_Bool min_h : 1;
}; };
static void _del_hook(Evas_Object *obj); static void _del_hook(Evas_Object *obj);
@ -229,7 +229,7 @@ elm_scroller_content_set(Evas_Object *obj, Evas_Object *content)
} }
EAPI void EAPI void
elm_scroller_content_min_limit(Evas_Object *obj, Evas_Bool w, Evas_Bool h) elm_scroller_content_min_limit(Evas_Object *obj, Eina_Bool w, Eina_Bool h)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
@ -280,7 +280,7 @@ elm_scroller_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
} }
EAPI void EAPI void
elm_scroller_bounce_set(Evas_Object *obj, Evas_Bool h_bounce, Evas_Bool v_bounce) elm_scroller_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;

View File

@ -45,8 +45,8 @@ struct _Widget_Data
const char *label; const char *label;
const char *units; const char *units;
const char *indicator; const char *indicator;
Evas_Bool horizontal : 1; Eina_Bool horizontal : 1;
Evas_Bool inverted : 1; Eina_Bool inverted : 1;
double val, val_min, val_max; double val, val_min, val_max;
Ecore_Timer *delay; Ecore_Timer *delay;
Evas_Coord size; Evas_Coord size;
@ -266,7 +266,7 @@ elm_slider_add(Evas_Object *parent)
elm_widget_del_hook_set(obj, _del_hook); elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_theme_hook_set(obj, _theme_hook);
wd->horizontal = 1; wd->horizontal = EINA_TRUE;
wd->val = 0.0; wd->val = 0.0;
wd->val_min = 0.0; wd->val_min = 0.0;
wd->val_max = 1.0; wd->val_max = 1.0;
@ -448,7 +448,7 @@ elm_slider_indicator_format_set(Evas_Object *obj, const char *indicator)
* @ingroup Slider * @ingroup Slider
*/ */
EAPI void EAPI void
elm_slider_horizontal_set(Evas_Object *obj, Evas_Bool horizontal) elm_slider_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
horizontal = !!horizontal; horizontal = !!horizontal;
@ -532,7 +532,7 @@ elm_slider_value_get(const Evas_Object *obj)
* @ingroup Slider * @ingroup Slider
*/ */
EAPI void EAPI void
elm_slider_inverted_set(Evas_Object *obj, Evas_Bool inverted) elm_slider_inverted_set(Evas_Object *obj, Eina_Bool inverted)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
inverted = !!inverted; inverted = !!inverted;

View File

@ -81,7 +81,7 @@ elm_table_add(Evas_Object *parent)
} }
EAPI void EAPI void
elm_table_homogenous_set(Evas_Object *obj, Evas_Bool homogenous) elm_table_homogenous_set(Evas_Object *obj, Eina_Bool homogenous)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
_els_smart_table_homogenous_set(wd->tbl, homogenous); _els_smart_table_homogenous_set(wd->tbl, homogenous);

View File

@ -141,6 +141,7 @@ static Eina_Bool
_cache_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata) _cache_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
eina_stringshare_del(data); eina_stringshare_del(data);
return EINA_TRUE;
} }
int int

View File

@ -7,8 +7,8 @@ struct _Widget_Data
{ {
Evas_Object *tgl; Evas_Object *tgl;
Evas_Object *icon; Evas_Object *icon;
Evas_Bool state; Eina_Bool state;
Evas_Bool *statep; Eina_Bool *statep;
const char *label; const char *label;
const char *ontext, *offtext; const char *ontext, *offtext;
}; };
@ -202,7 +202,7 @@ elm_toggle_states_labels_set(Evas_Object *obj, const char *onlabel, const char *
} }
EAPI void EAPI void
elm_toggle_state_set(Evas_Object *obj, Evas_Bool state) elm_toggle_state_set(Evas_Object *obj, Eina_Bool state)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (state != wd->state) if (state != wd->state)
@ -216,7 +216,7 @@ elm_toggle_state_set(Evas_Object *obj, Evas_Bool state)
} }
} }
EAPI Evas_Bool EAPI Eina_Bool
elm_toggle_state_get(const Evas_Object *obj) elm_toggle_state_get(const Evas_Object *obj)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
@ -224,7 +224,7 @@ elm_toggle_state_get(const Evas_Object *obj)
} }
EAPI void EAPI void
elm_toggle_state_pointer_set(Evas_Object *obj, Evas_Bool *statep) elm_toggle_state_pointer_set(Evas_Object *obj, Eina_Bool *statep)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);

View File

@ -8,7 +8,7 @@ struct _Widget_Data
Evas_Object *scr, *bx; Evas_Object *scr, *bx;
Eina_List *items; Eina_List *items;
int icon_size; int icon_size;
Evas_Bool scrollable : 1; Eina_Bool scrollable : 1;
}; };
struct _Elm_Toolbar_Item struct _Elm_Toolbar_Item
@ -19,7 +19,7 @@ struct _Elm_Toolbar_Item
Evas_Object *icon; Evas_Object *icon;
void (*func) (void *data, Evas_Object *obj, void *event_info); void (*func) (void *data, Evas_Object *obj, void *event_info);
const void *data; const void *data;
Evas_Bool selected : 1; Eina_Bool selected : 1;
}; };
static void _del_hook(Evas_Object *obj); static void _del_hook(Evas_Object *obj);
@ -49,12 +49,12 @@ _item_select(Elm_Toolbar_Item *it)
{ {
if (it2->selected) if (it2->selected)
{ {
it2->selected = 0; it2->selected = EINA_FALSE;
edje_object_signal_emit(it2->base, "elm,state,unselected", "elm"); edje_object_signal_emit(it2->base, "elm,state,unselected", "elm");
break; break;
} }
} }
it->selected = 1; it->selected = EINA_TRUE;
edje_object_signal_emit(it->base, "elm,state,selected", "elm"); edje_object_signal_emit(it->base, "elm,state,selected", "elm");
_item_show(it); _item_show(it);
obj2 = it->obj; obj2 = it->obj;
@ -195,7 +195,7 @@ elm_toolbar_add(Evas_Object *parent)
ELM_SMART_SCROLLER_POLICY_OFF); ELM_SMART_SCROLLER_POLICY_OFF);
wd->icon_size = 32; wd->icon_size = 32;
wd->scrollable = 1; wd->scrollable = EINA_TRUE;
wd->bx = _els_smart_box_add(e); wd->bx = _els_smart_box_add(e);
_els_smart_box_orientation_set(wd->bx, 1); _els_smart_box_orientation_set(wd->bx, 1);
@ -273,7 +273,7 @@ elm_toolbar_item_select(Elm_Toolbar_Item *item)
} }
EAPI void EAPI void
elm_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable) elm_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
wd->scrollable = scrollable; wd->scrollable = scrollable;

View File

@ -16,7 +16,7 @@ struct _Elm_Win
Elm_Win_Type type; Elm_Win_Type type;
Elm_Win_Keyboard_Mode kbdmode; Elm_Win_Keyboard_Mode kbdmode;
Evas_Bool autodel : 1; Eina_Bool autodel : 1;
int *autodel_clear; int *autodel_clear;
int rot; int rot;
}; };
@ -107,8 +107,8 @@ _elm_win_delete_request(Ecore_Evas *ee)
win->autodel_clear = &autodel; win->autodel_clear = &autodel;
evas_object_smart_callback_call(win->win_obj, "delete-request", NULL); evas_object_smart_callback_call(win->win_obj, "delete-request", NULL);
// FIXME: if above callback deletes - then the below will be invalid // FIXME: if above callback deletes - then the below will be invalid
if (autodel == 1) evas_object_del(win->win_obj); if (autodel) evas_object_del(win->win_obj);
else if (autodel == 0) win->autodel_clear = NULL; else win->autodel_clear = NULL;
} }
static void static void
@ -427,7 +427,7 @@ elm_win_title_set(Evas_Object *obj, const char *title)
} }
EAPI void EAPI void
elm_win_autodel_set(Evas_Object *obj, Evas_Bool autodel) elm_win_autodel_set(Evas_Object *obj, Eina_Bool autodel)
{ {
Elm_Win *win = elm_widget_data_get(obj); Elm_Win *win = elm_widget_data_get(obj);
if (!win) return; if (!win) return;
@ -459,7 +459,7 @@ elm_win_raise(Evas_Object *obj)
} }
EAPI void EAPI void
elm_win_borderless_set(Evas_Object *obj, Evas_Bool borderless) elm_win_borderless_set(Evas_Object *obj, Eina_Bool borderless)
{ {
Elm_Win *win = elm_widget_data_get(obj); Elm_Win *win = elm_widget_data_get(obj);
if (!win) return; if (!win) return;
@ -468,7 +468,7 @@ elm_win_borderless_set(Evas_Object *obj, Evas_Bool borderless)
} }
EAPI void EAPI void
elm_win_shaped_set(Evas_Object *obj, Evas_Bool shaped) elm_win_shaped_set(Evas_Object *obj, Eina_Bool shaped)
{ {
Elm_Win *win = elm_widget_data_get(obj); Elm_Win *win = elm_widget_data_get(obj);
if (!win) return; if (!win) return;
@ -477,7 +477,7 @@ elm_win_shaped_set(Evas_Object *obj, Evas_Bool shaped)
} }
EAPI void EAPI void
elm_win_alpha_set(Evas_Object *obj, Evas_Bool alpha) elm_win_alpha_set(Evas_Object *obj, Eina_Bool alpha)
{ {
Elm_Win *win = elm_widget_data_get(obj); Elm_Win *win = elm_widget_data_get(obj);
if (!win) return; if (!win) return;
@ -499,7 +499,7 @@ elm_win_alpha_set(Evas_Object *obj, Evas_Bool alpha)
} }
EAPI void EAPI void
elm_win_override_set(Evas_Object *obj, Evas_Bool override) elm_win_override_set(Evas_Object *obj, Eina_Bool override)
{ {
Elm_Win *win = elm_widget_data_get(obj); Elm_Win *win = elm_widget_data_get(obj);
if (!win) return; if (!win) return;
@ -508,7 +508,7 @@ elm_win_override_set(Evas_Object *obj, Evas_Bool override)
} }
EAPI void EAPI void
elm_win_fullscreen_set(Evas_Object *obj, Evas_Bool fullscreen) elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen)
{ {
Elm_Win *win = elm_widget_data_get(obj); Elm_Win *win = elm_widget_data_get(obj);
if (!win) return; if (!win) return;
@ -526,7 +526,7 @@ elm_win_fullscreen_set(Evas_Object *obj, Evas_Bool fullscreen)
} }
EAPI void EAPI void
elm_win_maximized_set(Evas_Object *obj, Evas_Bool maximized) elm_win_maximized_set(Evas_Object *obj, Eina_Bool maximized)
{ {
Elm_Win *win = elm_widget_data_get(obj); Elm_Win *win = elm_widget_data_get(obj);
if (!win) return; if (!win) return;
@ -535,7 +535,7 @@ elm_win_maximized_set(Evas_Object *obj, Evas_Bool maximized)
} }
EAPI void EAPI void
elm_win_iconified_set(Evas_Object *obj, Evas_Bool iconified) elm_win_iconified_set(Evas_Object *obj, Eina_Bool iconified)
{ {
Elm_Win *win = elm_widget_data_get(obj); Elm_Win *win = elm_widget_data_get(obj);
if (!win) return; if (!win) return;
@ -591,7 +591,7 @@ elm_win_keyboard_mode_set(Evas_Object *obj, Elm_Win_Keyboard_Mode mode)
} }
EAPI void EAPI void
elm_win_keyboard_win_set(Evas_Object *obj, Evas_Bool is_keyboard) elm_win_keyboard_win_set(Evas_Object *obj, Eina_Bool is_keyboard)
{ {
Elm_Win *win = elm_widget_data_get(obj); Elm_Win *win = elm_widget_data_get(obj);
if (!win) return; if (!win) return;

View File

@ -9,10 +9,10 @@ struct _Smart_Data
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
Evas_Object *obj; Evas_Object *obj;
Evas_Object *clip; Evas_Object *clip;
Evas_Bool changed : 1; Eina_Bool changed : 1;
Evas_Bool horizontal : 1; Eina_Bool horizontal : 1;
Evas_Bool homogenous : 1; Eina_Bool homogenous : 1;
Evas_Bool deleting : 1; Eina_Bool deleting : 1;
Eina_List *items; Eina_List *items;
}; };
@ -487,7 +487,7 @@ _smart_del(Evas_Object *obj)
sd = evas_object_smart_data_get(obj); sd = evas_object_smart_data_get(obj);
if (!sd) return; if (!sd) return;
sd->deleting = 1; sd->deleting = EINA_TRUE;
while (sd->items) while (sd->items)
{ {
Evas_Object *child; Evas_Object *child;

View File

@ -605,16 +605,16 @@ elm_smart_scroller_edje_object_get(Evas_Object *obj)
} }
void void
elm_smart_scroller_single_dir_set(Evas_Object *obj, Evas_Bool single_dir) elm_smart_scroller_single_dir_set(Evas_Object *obj, Eina_Bool single_dir)
{ {
API_ENTRY return; API_ENTRY return;
sd->one_dir_at_a_time = single_dir; sd->one_dir_at_a_time = single_dir;
} }
Evas_Bool Eina_Bool
elm_smart_scroller_single_dir_get(Evas_Object *obj) elm_smart_scroller_single_dir_get(Evas_Object *obj)
{ {
API_ENTRY return 0; API_ENTRY return EINA_FALSE;
return sd->one_dir_at_a_time; return sd->one_dir_at_a_time;
} }
@ -631,14 +631,14 @@ elm_smart_scroller_theme_set(Evas_Object *obj, const char *clas, const char *gro
} }
void void
elm_smart_scroller_hold_set(Evas_Object *obj, Evas_Bool hold) elm_smart_scroller_hold_set(Evas_Object *obj, Eina_Bool hold)
{ {
API_ENTRY return; API_ENTRY return;
sd->hold = hold; sd->hold = hold;
} }
void void
elm_smart_scroller_freeze_set(Evas_Object *obj, Evas_Bool freeze) elm_smart_scroller_freeze_set(Evas_Object *obj, Eina_Bool freeze)
{ {
API_ENTRY return; API_ENTRY return;
sd->freeze = freeze; sd->freeze = freeze;
@ -653,7 +653,7 @@ elm_smart_scroller_freeze_set(Evas_Object *obj, Evas_Bool freeze)
} }
void void
elm_smart_scroller_bounce_allow_set(Evas_Object *obj, Evas_Bool horiz, Evas_Bool vert) elm_smart_scroller_bounce_allow_set(Evas_Object *obj, Eina_Bool horiz, Eina_Bool vert)
{ {
API_ENTRY return; API_ENTRY return;
sd->bounce_horiz = horiz; sd->bounce_horiz = horiz;

View File

@ -21,9 +21,9 @@ void elm_smart_scroller_page_size_get (Evas_Object *obj, Evas_Coord *x
void elm_smart_scroller_policy_set (Evas_Object *obj, Elm_Smart_Scroller_Policy hbar, Elm_Smart_Scroller_Policy vbar); void elm_smart_scroller_policy_set (Evas_Object *obj, Elm_Smart_Scroller_Policy hbar, Elm_Smart_Scroller_Policy vbar);
void elm_smart_scroller_policy_get (Evas_Object *obj, Elm_Smart_Scroller_Policy *hbar, Elm_Smart_Scroller_Policy *vbar); void elm_smart_scroller_policy_get (Evas_Object *obj, Elm_Smart_Scroller_Policy *hbar, Elm_Smart_Scroller_Policy *vbar);
Evas_Object *elm_smart_scroller_edje_object_get (Evas_Object *obj); Evas_Object *elm_smart_scroller_edje_object_get (Evas_Object *obj);
void elm_smart_scroller_single_dir_set (Evas_Object *obj, Evas_Bool single_dir); void elm_smart_scroller_single_dir_set (Evas_Object *obj, Eina_Bool single_dir);
Evas_Bool elm_smart_scroller_single_dir_get (Evas_Object *obj); Eina_Bool elm_smart_scroller_single_dir_get (Evas_Object *obj);
void elm_smart_scroller_theme_set (Evas_Object *obj, const char *clas, const char *group, const char *style); void elm_smart_scroller_theme_set (Evas_Object *obj, const char *clas, const char *group, const char *style);
void elm_smart_scroller_hold_set (Evas_Object *obj, Evas_Bool hold); void elm_smart_scroller_hold_set (Evas_Object *obj, Eina_Bool hold);
void elm_smart_scroller_freeze_set (Evas_Object *obj, Evas_Bool freeze); void elm_smart_scroller_freeze_set (Evas_Object *obj, Eina_Bool freeze);
void elm_smart_scroller_bounce_allow_set (Evas_Object *obj, Evas_Bool horiz, Evas_Bool vert); void elm_smart_scroller_bounce_allow_set (Evas_Object *obj, Eina_Bool horiz, Eina_Bool vert);

View File

@ -9,8 +9,8 @@ struct _Smart_Data
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
Evas_Object *obj; Evas_Object *obj;
Evas_Object *clip; Evas_Object *clip;
Evas_Bool homogenous : 1; Eina_Bool homogenous : 1;
Evas_Bool deleting : 1; Eina_Bool deleting : 1;
Eina_List *items; Eina_List *items;
struct { struct {
int cols, rows; int cols, rows;
@ -797,7 +797,7 @@ _smart_del(Evas_Object *obj)
sd = evas_object_smart_data_get(obj); sd = evas_object_smart_data_get(obj);
if (!sd) return; if (!sd) return;
sd->deleting = 1; sd->deleting = EINA_TRUE;
while (sd->items) while (sd->items)
{ {
Evas_Object *child; Evas_Object *child;