get rid of Eina_Bool in bitfields

This commit is contained in:
Boris Faure 2014-08-28 21:04:00 +02:00
parent 97825eddee
commit 34979f1ce4
7 changed files with 52 additions and 52 deletions

View File

@ -8,7 +8,7 @@ struct _Keys_Handler
Ecore_IMF_Context *imf; Ecore_IMF_Context *imf;
unsigned int last_keyup; unsigned int last_keyup;
Eina_List *seq; Eina_List *seq;
Eina_Bool composing : 1; unsigned char composing : 1;
}; };
void keyin_compose_seq_reset(Keys_Handler *khdl); void keyin_compose_seq_reset(Keys_Handler *khdl);

View File

@ -41,8 +41,8 @@ struct _Win
Evas_Object *cmdbox; Evas_Object *cmdbox;
Ecore_Timer *cmdbox_del_timer; Ecore_Timer *cmdbox_del_timer;
Ecore_Timer *cmdbox_focus_timer; Ecore_Timer *cmdbox_focus_timer;
Eina_Bool focused : 1; unsigned char focused : 1;
Eina_Bool cmdbox_up : 1; unsigned char cmdbox_up : 1;
}; };
struct _Term struct _Term
@ -63,11 +63,11 @@ struct _Term
struct { struct {
int x, y; int x, y;
} down; } down;
Eina_Bool focused : 1; unsigned char focused : 1;
Eina_Bool hold : 1; unsigned char hold : 1;
Eina_Bool unswallowed : 1; unsigned char unswallowed : 1;
Eina_Bool missed_bell : 1; unsigned char missed_bell : 1;
Eina_Bool miniview_shown : 1; unsigned char miniview_shown : 1;
}; };
struct _Split struct _Split
@ -80,7 +80,7 @@ struct _Split
Evas_Object *panes; // null if a leaf node Evas_Object *panes; // null if a leaf node
Evas_Object *sel; // multi "tab" selector is active Evas_Object *sel; // multi "tab" selector is active
Evas_Object *sel_bg; // multi "tab" selector wrapper edje obj for styling Evas_Object *sel_bg; // multi "tab" selector wrapper edje obj for styling
Eina_Bool horizontal : 1; unsigned char horizontal : 1;
}; };
int _log_domain = -1; int _log_domain = -1;

View File

@ -36,12 +36,12 @@ struct _Media
int resizes; int resizes;
struct { struct {
Evas_Coord x, y; Evas_Coord x, y;
Eina_Bool down : 1; unsigned char down : 1;
} down; } down;
Eina_Bool nosmooth : 1; unsigned char nosmooth : 1;
Eina_Bool downloading : 1; unsigned char downloading : 1;
Eina_Bool queued : 1; unsigned char queued : 1;
Eina_Bool pos_drag : 1; unsigned char pos_drag : 1;
}; };
static Evas_Smart *_smart = NULL; static Evas_Smart *_smart = NULL;

View File

@ -19,7 +19,7 @@ struct _Font
const char *pretty_name; const char *pretty_name;
const char *full_name; const char *full_name;
Evas_Object *term; Evas_Object *term;
Eina_Bool bitmap : 1; unsigned char bitmap : 1;
}; };
static Eina_List *fonts = NULL; static Eina_List *fonts = NULL;

View File

@ -28,24 +28,24 @@ struct _Sel
int w, h; int w, h;
struct { struct {
Evas_Coord x, y; Evas_Coord x, y;
Eina_Bool down : 1; unsigned char down : 1;
} down; } down;
Config *config; Config *config;
Eina_Bool select_me : 1; unsigned char select_me : 1;
Eina_Bool exit_me : 1; unsigned char exit_me : 1;
Eina_Bool exit_on_sel : 1; unsigned char exit_on_sel : 1;
Eina_Bool exit_now : 1; unsigned char exit_now : 1;
Eina_Bool pending_sel : 1; unsigned char pending_sel : 1;
Eina_Bool use_px : 1; unsigned char use_px : 1;
}; };
struct _Entry struct _Entry
{ {
Evas_Object *obj, *bg, *termio; Evas_Object *obj, *bg, *termio;
Eina_Bool selected : 1; unsigned char selected : 1;
Eina_Bool selected_before : 1; unsigned char selected_before : 1;
Eina_Bool selected_orig : 1; unsigned char selected_orig : 1;
Eina_Bool was_selected : 1; unsigned char was_selected : 1;
}; };
static Evas_Smart *_smart = NULL; static Evas_Smart *_smart = NULL;

View File

@ -55,9 +55,9 @@ struct _Termio
struct { struct {
Evas_Object *dndobj; Evas_Object *dndobj;
Evas_Coord x, y; Evas_Coord x, y;
Eina_Bool down : 1; unsigned char down : 1;
Eina_Bool dnd : 1; unsigned char dnd : 1;
Eina_Bool dndobjdel : 1; unsigned char dndobjdel : 1;
} down; } down;
} link; } link;
int zoom_fontsize_start; int zoom_fontsize_start;
@ -81,15 +81,15 @@ struct _Termio
double set_sel_at; double set_sel_at;
Elm_Sel_Type sel_type; Elm_Sel_Type sel_type;
Keys_Handler khdl; Keys_Handler khdl;
Eina_Bool jump_on_change : 1; unsigned char jump_on_change : 1;
Eina_Bool jump_on_keypress : 1; unsigned char jump_on_keypress : 1;
Eina_Bool have_sel : 1; unsigned char have_sel : 1;
Eina_Bool noreqsize : 1; unsigned char noreqsize : 1;
Eina_Bool didclick : 1; unsigned char didclick : 1;
Eina_Bool moved : 1; unsigned char moved : 1;
Eina_Bool bottom_right : 1; unsigned char bottom_right : 1;
Eina_Bool top_left : 1; unsigned char top_left : 1;
Eina_Bool reset_sel : 1; unsigned char reset_sel : 1;
}; };
#define INT_SWAP(_a, _b) do { \ #define INT_SWAP(_a, _b) do { \

View File

@ -138,15 +138,15 @@ struct _Termpty
Eina_Hash *chid_map; Eina_Hash *chid_map;
Eina_List *active; Eina_List *active;
Eina_List *expecting; Eina_List *expecting;
Eina_Bool on : 1; unsigned char on : 1;
} block; } block;
struct { struct {
struct { struct {
int x, y; int x, y;
} start, end, start_backup, end_backup; } start, end, start_backup, end_backup;
Eina_Bool is_active : 1; unsigned char is_active : 1;
Eina_Bool is_box : 1; unsigned char is_box : 1;
Eina_Bool makesel : 1; unsigned char makesel : 1;
} selection; } selection;
Termstate state, save, swap; Termstate state, save, swap;
int exit_code; int exit_code;
@ -193,17 +193,17 @@ struct _Termblock
int refs; int refs;
short w, h; short w, h;
short x, y; short x, y;
Eina_Bool scale_stretch : 1; unsigned char scale_stretch : 1;
Eina_Bool scale_center : 1; unsigned char scale_center : 1;
Eina_Bool scale_fill : 1; unsigned char scale_fill : 1;
Eina_Bool thumb : 1; unsigned char thumb : 1;
Eina_Bool edje : 1; unsigned char edje : 1;
Eina_Bool active : 1;
Eina_Bool was_active : 1;
Eina_Bool was_active_before : 1;
Eina_Bool mov_paused : 1; // movie paused state marker unsigned char active : 1;
unsigned char was_active : 1;
unsigned char was_active_before : 1;
unsigned char mov_paused : 1; // movie paused state marker
}; };
struct _Termexp struct _Termexp