Enlightenment CVS committal Author : barbieri Project : e17 Module : libs/etk
Dir : e17/libs/etk/src/lib Modified Files: etk_box.h etk_button.h etk_colorpicker.h etk_combobox.h etk_combobox_entry.h etk_dialog.h etk_editable.c etk_entry.h etk_filechooser_widget.h etk_iconbox.c etk_iconbox.h etk_image.h etk_mdi_window.h etk_menu_bar.h etk_menu_item.h etk_notebook.h etk_object.h etk_paned.h etk_popup_window.h etk_progress_bar.h etk_radio_button.h etk_scrollbar.h etk_shadow.h etk_signal.c etk_signal_callback.h etk_slider.h etk_spinner.h etk_statusbar.h etk_table.h etk_textblock.c etk_textblock.h etk_toggle_button.h etk_toolbar.h etk_toplevel.h etk_tree.h etk_widget.c etk_window.h Log Message: Structures fields reorder to avoid holes and save memory. Have all Etk_Bool inside structures to be a bitfield, reorder fields to provide better packing. Packaging was aided by pahole 1.0 on x86 (http://git.kernel.org/?p=linux/kernel/git/acme/pahole.git) Tested with etk_test and edje_viewer, both still work. PS: bugs may appear due Etk_Bool size change, values like 2 (10b) will now be evaluated as false. That was already a bug, just being exposed now, the fix is easy: use !! (double negative) before the value, example: "visible = obj_ptr;" becomes "visible = !!obj_ptr;". =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_box.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- etk_box.h 19 Sep 2007 20:16:25 -0000 1.15 +++ etk_box.h 26 Sep 2007 04:58:03 -0000 1.16 @@ -90,12 +90,13 @@ /* Inherit from Etk_Container */ Etk_Container container; - int spacing; - Etk_Bool homogeneous; Etk_Box_Cell *first_cell[2]; Etk_Box_Cell *last_cell[2]; - int cells_count[2]; int *request_sizes[2]; + int cells_count[2]; + + int spacing; + Etk_Bool homogeneous:1; }; /** =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_button.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- etk_button.h 19 Sep 2007 20:16:25 -0000 1.20 +++ etk_button.h 26 Sep 2007 04:58:04 -0000 1.21 @@ -53,12 +53,13 @@ void (*released_handler)(Etk_Button *button); void (*clicked_handler)(Etk_Button *button); - Etk_Bool is_pressed; - Etk_Bool ignore_image_remove; Etk_Button_Style style; Etk_Stock_Size stock_size; float xalign; float yalign; + + Etk_Bool is_pressed:1; + Etk_Bool ignore_image_remove:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_colorpicker.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- etk_colorpicker.h 19 Sep 2007 20:16:25 -0000 1.19 +++ etk_colorpicker.h 26 Sep 2007 04:58:04 -0000 1.20 @@ -65,9 +65,9 @@ int sp_res; float sp_xpos, sp_ypos; Etk_Colorpicker_Mode sp_xcomponent, sp_ycomponent; - Etk_Bool sp_dragging; - Etk_Bool sp_image_needs_update; - Etk_Bool sp_cursor_needs_update; + Etk_Bool sp_dragging:1; + Etk_Bool sp_image_needs_update:1; + Etk_Bool sp_cursor_needs_update:1; /* Vertical picker */ Evas_Object *vp_object; @@ -75,9 +75,9 @@ Evas_Object *vp_cursor; int vp_res; float vp_pos; - Etk_Bool vp_dragging; - Etk_Bool vp_image_needs_update; - Etk_Bool vp_cursor_needs_update; + Etk_Bool vp_dragging:1; + Etk_Bool vp_image_needs_update:1; + Etk_Bool vp_cursor_needs_update:1; /* Component widgets */ Etk_Widget *component_table; @@ -87,7 +87,7 @@ Etk_Widget *sliders[6]; Evas_Object *sliders_image[6]; int sliders_res; - Etk_Bool sliders_need_update; + Etk_Bool sliders_need_update:1; /* Alpha slider */ Etk_Widget *alpha_slider; @@ -99,8 +99,8 @@ Etk_Widget *current_color_widget; Evas_Object *current_color_rect; - Etk_Bool ignore_value_changed; - Etk_Bool use_alpha; + Etk_Bool ignore_value_changed:1; + Etk_Bool use_alpha:1; Etk_Colorpicker_Mode mode; Etk_Color current_color; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- etk_combobox.h 19 Sep 2007 20:16:25 -0000 1.25 +++ etk_combobox.h 26 Sep 2007 04:58:04 -0000 1.26 @@ -121,7 +121,7 @@ Etk_Widget **active_item_children; int items_height; - Etk_Bool built; + Etk_Bool built:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox_entry.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- etk_combobox_entry.h 19 Sep 2007 20:16:25 -0000 1.5 +++ etk_combobox_entry.h 26 Sep 2007 04:58:04 -0000 1.6 @@ -121,7 +121,7 @@ Etk_Widget *hbox; int items_height; - Etk_Bool built; + Etk_Bool built:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_dialog.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- etk_dialog.h 19 Sep 2007 20:16:25 -0000 1.14 +++ etk_dialog.h 26 Sep 2007 04:58:04 -0000 1.15 @@ -62,7 +62,7 @@ Etk_Widget *action_area_hbox; Etk_Widget *separator; - Etk_Bool has_separator; + Etk_Bool has_separator:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_editable.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- etk_editable.c 19 Sep 2007 20:16:25 -0000 1.14 +++ etk_editable.c 26 Sep 2007 04:58:04 -0000 1.15 @@ -29,22 +29,22 @@ Evas_Object *text_object; Evas_Object *cursor_object; Evas_Object *selection_object; + Etk_String *text; int cursor_pos; - Etk_Bool cursor_visible; int selection_pos; - Etk_Bool selection_visible; - Etk_Bool password_mode; - Etk_Bool disabled; - - Etk_String *text; int unicode_length; - - float align; int cursor_width; - Etk_Bool selection_on_fg; int average_char_w; int average_char_h; + + float align; + + Etk_Bool cursor_visible:1; + Etk_Bool selection_visible:1; + Etk_Bool password_mode:1; + Etk_Bool disabled:1; + Etk_Bool selection_on_fg:1; } Etk_Editable_Smart_Data; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_entry.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- etk_entry.h 19 Sep 2007 20:16:26 -0000 1.16 +++ etk_entry.h 26 Sep 2007 04:58:04 -0000 1.17 @@ -48,15 +48,16 @@ Etk_Image *primary_image; Etk_Image *secondary_image; - Etk_Bool password_mode; - Etk_Bool selection_dragging; - Etk_Bool pointer_set; - Etk_Bool primary_image_highlight; - Etk_Bool secondary_image_highlight; + char *text; + Etk_Color highlight_color; int image_interspace; - char *text; + Etk_Bool password_mode:1; + Etk_Bool selection_dragging:1; + Etk_Bool pointer_set:1; + Etk_Bool primary_image_highlight:1; + Etk_Bool secondary_image_highlight:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_filechooser_widget.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- etk_filechooser_widget.h 21 Sep 2007 11:14:02 -0000 1.10 +++ etk_filechooser_widget.h 26 Sep 2007 04:58:04 -0000 1.11 @@ -46,11 +46,11 @@ Etk_Tree_Col *files_name_col; Etk_Tree_Col *files_date_col; - Etk_Bool select_multiple; - Etk_Bool show_hidden; - Etk_Bool is_save; - char *current_folder; + + Etk_Bool select_multiple:1; + Etk_Bool show_hidden:1; + Etk_Bool is_save:1; }; Etk_Type *etk_filechooser_widget_type_get(void); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- etk_iconbox.c 19 Sep 2007 20:16:26 -0000 1.27 +++ etk_iconbox.c 26 Sep 2007 04:58:04 -0000 1.28 @@ -41,15 +41,11 @@ Etk_Widget widget; Etk_Iconbox *iconbox; - int xoffset; - int yoffset; - int num_cols; Evas_List *icon_objects; Evas_Object *clip; Evas_Object *selection_rect; - Etk_Bool selection_started; int selection_orig_x; int selection_orig_y; int selection_mouse_x; @@ -58,10 +54,14 @@ int selection_last_col; int selection_first_row; int selection_last_row; + int xoffset; + int yoffset; + int num_cols; Ecore_Timer *scroll_timer; float hscrolling_speed; float vscrolling_speed; + Etk_Bool selection_started:1; } Etk_Iconbox_Grid; typedef struct Etk_Iconbox_Icon_Object =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- etk_iconbox.h 19 Sep 2007 20:16:26 -0000 1.12 +++ etk_iconbox.h 26 Sep 2007 04:58:04 -0000 1.13 @@ -58,8 +58,6 @@ int icon_y; int icon_width; int icon_height; - Etk_Bool icon_fill; - Etk_Bool icon_keep_aspect; int label_x; int label_y; @@ -67,6 +65,9 @@ int label_height; float label_xalign; float label_yalign; + + Etk_Bool icon_fill:1; + Etk_Bool icon_keep_aspect:1; }; /** @@ -88,8 +89,8 @@ void *data; void (*data_free_cb)(void *data); - Etk_Bool was_selected; - Etk_Bool selected; + Etk_Bool was_selected:1; + Etk_Bool selected:1; }; /** @@ -113,7 +114,7 @@ Etk_Iconbox_Icon *last_icon; Etk_Color selected_icon_color; - Etk_Bool frozen; + Etk_Bool frozen:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_image.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- etk_image.h 19 Sep 2007 20:16:26 -0000 1.17 +++ etk_image.h 26 Sep 2007 04:58:04 -0000 1.18 @@ -73,12 +73,12 @@ { void *pixels; Etk_Size size; - Etk_Bool copied; + Etk_Bool copied:1; } data; } info; double aspect_ratio; - Etk_Bool keep_aspect; + Etk_Bool keep_aspect:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_mdi_window.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- etk_mdi_window.h 19 Sep 2007 20:16:26 -0000 1.6 +++ etk_mdi_window.h 26 Sep 2007 04:58:04 -0000 1.7 @@ -49,17 +49,18 @@ Etk_Bool (*delete_event)(Etk_Mdi_Window *mdi_window); char *title; - Etk_Bool maximized; - Etk_Bool draggable; - Etk_Bool resizable; - Etk_Bool decorated; /* Etk_Mdi_Window_WM_Decoration decorations; */ - Etk_Bool dragging; int drag_offset_x; int drag_offset_y; - Etk_Bool resizing; int resize_offset_x; int resize_offset_y; + + Etk_Bool maximized:1; + Etk_Bool draggable:1; + Etk_Bool resizable:1; + Etk_Bool decorated:1; + Etk_Bool resizing:1; + Etk_Bool dragging:1; }; Etk_Type *etk_mdi_window_type_get(void); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_menu_bar.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- etk_menu_bar.h 19 Sep 2007 20:16:26 -0000 1.8 +++ etk_menu_bar.h 26 Sep 2007 04:58:04 -0000 1.9 @@ -38,7 +38,7 @@ /* Inherit from Etk_Menu_Shell */ Etk_Menu_Shell menu_shell; - Etk_Bool move_callback; + Etk_Bool move_callback:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_menu_item.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- etk_menu_item.h 19 Sep 2007 20:16:26 -0000 1.19 +++ etk_menu_item.h 26 Sep 2007 04:58:04 -0000 1.20 @@ -71,7 +71,7 @@ char *label; Etk_Widget *left_widget; - Etk_Bool is_selected; + Etk_Bool is_selected:1; }; /** @@ -108,7 +108,7 @@ void (*toggled_handler)(Etk_Menu_Item_Check *check_item); void (*active_set)(Etk_Menu_Item_Check *check_item, Etk_Bool active); - Etk_Bool active; + Etk_Bool active:1; }; /** @@ -122,7 +122,7 @@ Etk_Menu_Item_Check check_item; Evas_List **group; - Etk_Bool can_uncheck; + Etk_Bool can_uncheck:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_notebook.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- etk_notebook.h 19 Sep 2007 20:16:26 -0000 1.24 +++ etk_notebook.h 26 Sep 2007 04:58:04 -0000 1.25 @@ -57,12 +57,13 @@ Etk_Container container; Etk_Widget *tab_bar; - Etk_Bool tab_bar_focused; - Etk_Bool tab_bar_visible; - Etk_Bool tab_bar_homogeneous; Evas_List *pages; Etk_Notebook_Page *current_page; + + Etk_Bool tab_bar_focused:1; + Etk_Bool tab_bar_visible:1; + Etk_Bool tab_bar_homogeneous:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_object.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- etk_object.h 19 Sep 2007 20:16:26 -0000 1.19 +++ etk_object.h 26 Sep 2007 04:58:04 -0000 1.20 @@ -54,7 +54,7 @@ /* private: */ void (*callback)(Etk_Object *object, const char *property_name, void *data); void *data; - Etk_Bool delete_me; + Etk_Bool delete_me:1; }; /** @@ -66,7 +66,6 @@ /* private: */ Etk_Type *type; char *name; - Etk_Bool destroy_me; Etk_Object *prev; Etk_Object *next; @@ -75,8 +74,9 @@ Evas_List *signal_callbacks; Evas_List *weak_pointers; Evas_Hash *notification_callbacks; - Etk_Bool should_delete_cbs; int notifying; + Etk_Bool should_delete_cbs:1; + Etk_Bool destroy_me:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_paned.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_paned.h 19 Sep 2007 20:16:26 -0000 1.11 +++ etk_paned.h 26 Sep 2007 04:58:04 -0000 1.12 @@ -49,13 +49,14 @@ Etk_Widget *separator; Etk_Widget *child1; - Etk_Bool expand1; Etk_Widget *child2; - Etk_Bool expand2; - Etk_Bool drag; int drag_delta; int position; + + Etk_Bool expand1:1; + Etk_Bool expand2:1; + Etk_Bool drag:1; }; /** =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_popup_window.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_popup_window.h 19 Sep 2007 20:16:26 -0000 1.11 +++ etk_popup_window.h 26 Sep 2007 04:58:04 -0000 1.12 @@ -45,10 +45,10 @@ /* Inherit from Etk_Window */ Etk_Window window; - Etk_Bool popped_up; Etk_Popup_Window *parent; Evas_List *children; Etk_Popup_Window *popped_child; + Etk_Bool popped_up:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_progress_bar.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- etk_progress_bar.h 19 Sep 2007 20:16:26 -0000 1.13 +++ etk_progress_bar.h 26 Sep 2007 04:58:04 -0000 1.14 @@ -53,7 +53,7 @@ double filler_pulse_w; Etk_Progress_Bar_Direction pulse_dir; Etk_Progress_Bar_Direction direction; - Etk_Bool is_pulsing; + Etk_Bool is_pulsing:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_radio_button.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- etk_radio_button.h 19 Sep 2007 20:16:26 -0000 1.6 +++ etk_radio_button.h 26 Sep 2007 04:58:04 -0000 1.7 @@ -36,7 +36,7 @@ Etk_Toggle_Button toggle_button; Evas_List **group; - Etk_Bool can_uncheck; + Etk_Bool can_uncheck:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_scrollbar.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- etk_scrollbar.h 19 Sep 2007 20:16:26 -0000 1.7 +++ etk_scrollbar.h 26 Sep 2007 04:58:04 -0000 1.8 @@ -54,8 +54,8 @@ Etk_Range range; Ecore_Timer *scrolling_timer; - Etk_Bool first_scroll; - Etk_Bool dragging; + Etk_Bool first_scroll:1; + Etk_Bool dragging:1; }; /** =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_shadow.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- etk_shadow.h 19 Sep 2007 20:16:26 -0000 1.8 +++ etk_shadow.h 26 Sep 2007 04:58:04 -0000 1.9 @@ -66,12 +66,12 @@ int border_width; Etk_Color border_color; - Etk_Bool shadow_need_recalc; - Etk_Bool border_need_recalc; - Evas_Object *shadow_objs[4]; Evas_Object *border_objs[4]; Evas_Object *clip; + + Etk_Bool shadow_need_recalc:1; + Etk_Bool border_need_recalc:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_signal.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- etk_signal.c 19 Sep 2007 20:16:26 -0000 1.29 +++ etk_signal.c 26 Sep 2007 04:58:04 -0000 1.30 @@ -22,7 +22,7 @@ { Etk_Signal *signal; Etk_Object *object; - Etk_Bool stop_emission; + Etk_Bool stop_emission:1; } Etk_Signal_Emitted; static void _etk_signal_free(Etk_Signal *signal); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_signal_callback.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- etk_signal_callback.h 19 Sep 2007 20:16:26 -0000 1.7 +++ etk_signal_callback.h 26 Sep 2007 04:58:04 -0000 1.8 @@ -28,9 +28,9 @@ /* private: */ Etk_Signal *signal; Etk_Callback callback; - Etk_Bool swapped; - Etk_Bool blocked; void *data; + Etk_Bool swapped:1; + Etk_Bool blocked:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_slider.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- etk_slider.h 19 Sep 2007 20:16:26 -0000 1.10 +++ etk_slider.h 26 Sep 2007 04:58:04 -0000 1.11 @@ -59,10 +59,10 @@ Etk_Range range; char *format; - Etk_Bool inverted; - Etk_Bool dragging; - Etk_Slider_Update_Policy policy; Ecore_Timer *update_timer; + Etk_Slider_Update_Policy policy; + Etk_Bool inverted:1; + Etk_Bool dragging:1; }; /** =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_spinner.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- etk_spinner.h 19 Sep 2007 20:16:26 -0000 1.5 +++ etk_spinner.h 26 Sep 2007 04:58:04 -0000 1.6 @@ -36,15 +36,14 @@ Etk_Range range; Evas_Object *editable_object; - Etk_Bool selection_dragging; + Ecore_Timer *step_timer; + int successive_steps; int digits; char value_format[16]; - Etk_Bool snap_to_ticks; - Etk_Bool wrap; - - int successive_steps; - Ecore_Timer *step_timer; + Etk_Bool snap_to_ticks:1; + Etk_Bool wrap:1; + Etk_Bool selection_dragging:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_statusbar.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- etk_statusbar.h 19 Sep 2007 20:16:26 -0000 1.7 +++ etk_statusbar.h 26 Sep 2007 04:58:04 -0000 1.8 @@ -35,12 +35,12 @@ /* Inherit from Etk_Widget */ Etk_Widget widget; - Etk_Bool has_resize_grip; Evas_List *msg_stack; int next_message_id; int next_context_id; int window_width; int window_height; + Etk_Bool has_resize_grip:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_table.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- etk_table.h 19 Sep 2007 20:16:26 -0000 1.16 +++ etk_table.h 26 Sep 2007 04:58:04 -0000 1.17 @@ -77,7 +77,7 @@ int requested_size; int size; int offset; - Etk_Bool expand; + Etk_Bool expand:1; } Etk_Table_Col_Row; /** =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_textblock.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- etk_textblock.c 19 Sep 2007 20:16:26 -0000 1.34 +++ etk_textblock.c 26 Sep 2007 04:58:04 -0000 1.35 @@ -48,8 +48,6 @@ Etk_Textblock_Object_Line *first_visible_line; Etk_Textblock_Object_Line *last_visible_line; - Etk_Bool cursor_visible; - Etk_Bool selecting; Etk_Textblock_Iter *cursor; Etk_Textblock_Iter *selection; @@ -63,6 +61,9 @@ Ecore_Timer *cursor_timer; Ecore_Job *update_job; + + Etk_Bool cursor_visible:1; + Etk_Bool selecting:1; }; /* A line for a textblock object is a text terminated by '\n', <br> or </p>. @@ -77,8 +78,8 @@ Etk_Geometry geometry; Evas_Object *object; - Etk_Bool need_geometry_update; - Etk_Bool need_content_update; + Etk_Bool need_geometry_update:1; + Etk_Bool need_content_update:1; }; static void _etk_tb_constructor(Etk_Textblock *tb); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_textblock.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- etk_textblock.h 19 Sep 2007 20:16:26 -0000 1.22 +++ etk_textblock.h 26 Sep 2007 04:58:04 -0000 1.23 @@ -89,9 +89,6 @@ struct Etk_Textblock_Format { Etk_Textblock_Wrap wrap; - float align; - int left_margin; - int right_margin; Etk_Textblock_Style_Type style; Etk_Color style_color1; @@ -101,15 +98,19 @@ Etk_Color underline_color1; Etk_Color underline_color2; - Etk_Bool strikethrough; Etk_Color strikethrough_color; const char *font_face; - int font_size; Etk_Color font_color; - Etk_Bool bold; - Etk_Bool italic; + float align; + int left_margin; + int right_margin; + int font_size; + + Etk_Bool strikethrough:1; + Etk_Bool bold:1; + Etk_Bool italic:1; }; /** TODOC */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_toggle_button.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- etk_toggle_button.h 19 Sep 2007 20:16:26 -0000 1.8 +++ etk_toggle_button.h 26 Sep 2007 04:58:04 -0000 1.9 @@ -36,7 +36,7 @@ void (*active_set)(Etk_Toggle_Button *toggle_button, Etk_Bool active); void (*toggled_handler)(Etk_Toggle_Button *toggle_button); - Etk_Bool active; + Etk_Bool active:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_toolbar.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- etk_toolbar.h 19 Sep 2007 20:16:26 -0000 1.12 +++ etk_toolbar.h 26 Sep 2007 04:58:04 -0000 1.13 @@ -62,7 +62,7 @@ Etk_Toolbar_Orientation orientation; Etk_Toolbar_Style style; Etk_Stock_Size stock_size; - Etk_Bool reorientating; + Etk_Bool reorientating:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_toplevel.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- etk_toplevel.h 19 Sep 2007 20:16:26 -0000 1.7 +++ etk_toplevel.h 26 Sep 2007 04:58:04 -0000 1.8 @@ -67,7 +67,7 @@ Evas_List *pointer_stack; void (*pointer_set)(Etk_Toplevel *toplevel, Etk_Pointer_Type pointer_type); - Etk_Bool need_update; + Etk_Bool need_update:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_tree.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- etk_tree.h 19 Sep 2007 20:16:26 -0000 1.41 +++ etk_tree.h 26 Sep 2007 04:58:04 -0000 1.42 @@ -59,21 +59,17 @@ Etk_Object object; int id; - Etk_Tree *tree; - int num_models; - Etk_Tree_Model *models[ETK_TREE_MAX_MODELS_PER_COL]; - int position; - Etk_Bool resizable; - Etk_Bool visible; - Etk_Bool expand; - float align; - int xoffset; int min_width; int width; int visible_width; + float align; + + Etk_Tree *tree; + + Etk_Tree_Model *models[ETK_TREE_MAX_MODELS_PER_COL]; Etk_Widget *header; Evas_Object *header_over; @@ -86,6 +82,10 @@ int (*last_compare_cb)(Etk_Tree_Col *col, Etk_Tree_Row *row1, Etk_Tree_Row *row2, void *data); void *data; } sort; + + Etk_Bool resizable:1; + Etk_Bool visible:1; + Etk_Bool expand:1; }; /** @@ -108,9 +108,9 @@ void *data; void (*data_free_cb)(void *data); - unsigned int delete_me : 1; - unsigned int unfolded : 1; - unsigned int selected : 1; + Etk_Bool delete_me:1; + Etk_Bool unfolded:1; + Etk_Bool selected:1; }; /** @@ -128,36 +128,36 @@ Etk_Widget *grid; Evas_Object *grid_clip; - int num_cols; Etk_Tree_Col **columns; - Etk_Bool headers_visible; - Etk_Bool col_separators_visible; Etk_Color col_separator_color; Etk_Tree_Col *col_to_resize; - Etk_Bool col_resize_pointer_set; - int col_resize_orig_width; - int col_resize_orig_mouse_x; Etk_Tree_Col *sorted_col; - Etk_Bool sorted_asc; - int total_rows; Etk_Tree_Row root; Etk_Tree_Row *last_selected_row; Evas_List *purge_pool; Evas_List *row_objects; + int num_cols; int rows_height; int scroll_x; int scroll_y; + int col_resize_orig_width; + int col_resize_orig_mouse_x; + int total_rows; Ecore_Job *purge_job; - Etk_Bool tree_contains_headers; Etk_Tree_Mode mode; - Etk_Bool multiple_select; - Etk_Bool alternating_row_colors; - Etk_Bool frozen; - Etk_Bool built; + Etk_Bool tree_contains_headers:1; + Etk_Bool col_resize_pointer_set:1; + Etk_Bool sorted_asc:1; + Etk_Bool multiple_select:1; + Etk_Bool alternating_row_colors:1; + Etk_Bool headers_visible:1; + Etk_Bool col_separators_visible:1; + Etk_Bool frozen:1; + Etk_Bool built:1; }; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_widget.c,v retrieving revision 1.121 retrieving revision 1.122 diff -u -3 -r1.121 -r1.122 --- etk_widget.c 19 Sep 2007 20:16:26 -0000 1.121 +++ etk_widget.c 26 Sep 2007 04:58:04 -0000 1.122 @@ -34,7 +34,7 @@ typedef struct Etk_Widget_Member_Object { Evas_Object *object; - Etk_Bool visible; + Etk_Bool visible:1; } Etk_Widget_Member_Object; typedef struct Etk_Widget_Swallowed_Object =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_window.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- etk_window.h 19 Sep 2007 20:16:27 -0000 1.27 +++ etk_window.h 26 Sep 2007 04:58:04 -0000 1.28 @@ -47,8 +47,8 @@ void *engine_data; Etk_Bool (*delete_event)(Etk_Window *window); - Etk_Bool wait_size_request; Etk_Window *center_on_window; + Etk_Bool wait_size_request:1; }; ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs