brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text: Pack all bitfields at the end of the private structure

Browse Source 
Don't leave them in the middle, to avoid holes.
This commit is contained in:
Emmanuele Bassi 2011-09-07 15:20:42 +01:00
parent 0c22246bea
commit 9f70ea8dee
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
clutter/clutter-text.c
View File

@ -141,26 +141,6 @@ struct _ClutterTextPrivate
creating a layout */ creating a layout */
PangoAttrList *preedit_attrs; PangoAttrList *preedit_attrs;
guint alignment : 2;
guint wrap : 1;
guint use_underline : 1;
guint use_markup : 1;
guint ellipsize : 3;
guint single_line_mode : 1;
guint wrap_mode : 3;
guint justify : 1;
guint editable : 1;
guint cursor_visible : 1;
guint activatable : 1;
guint selectable : 1;
guint selection_color_set : 1;
guint in_select_drag : 1;
guint cursor_color_set : 1;
guint preedit_set : 1;
guint is_default_font : 1;
guint has_focus : 1;
guint selected_text_color_set : 1;
/* current cursor position */ /* current cursor position */
gint position; gint position;
@ -196,7 +176,6 @@ struct _ClutterTextPrivate
/* Box representing the paint volume. The box is lazily calculated /* Box representing the paint volume. The box is lazily calculated
and cached */ and cached */
ClutterPaintVolume paint_volume; ClutterPaintVolume paint_volume;
gboolean paint_volume_valid;
guint preedit_cursor_pos; guint preedit_cursor_pos;
gint preedit_n_chars; gint preedit_n_chars;
@ -214,6 +193,28 @@ struct _ClutterTextPrivate
/* Signal handler for when the :text-direction changes */ /* Signal handler for when the :text-direction changes */
guint direction_changed_id; guint direction_changed_id;
/* bitfields */
guint alignment : 2;
guint wrap : 1;
guint use_underline : 1;
guint use_markup : 1;
guint ellipsize : 3;
guint single_line_mode : 1;
guint wrap_mode : 3;
guint justify : 1;
guint editable : 1;
guint cursor_visible : 1;
guint activatable : 1;
guint selectable : 1;
guint selection_color_set : 1;
guint in_select_drag : 1;
guint cursor_color_set : 1;
guint preedit_set : 1;
guint is_default_font : 1;
guint has_focus : 1;
guint selected_text_color_set : 1;
guint paint_volume_valid : 1;
}; };
enum enum