enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

formatting 

SVN revision: 73214
This commit is contained in:
Mike Blumenkrantz 2012-07-03 09:11:44 +00:00
parent c6ce9e563b
commit f23a7afa40
4 changed files with 635 additions and 611 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
src/bin/e_editable.c
View File

@ -2,9 +2,9 @@
#define E_EDITABLE_CURSOR_MARGIN 5
#define E_EDITABLE_BLOCK_SIZE 128
#define E_EDITABLE_BLOCK_SIZE 128
#define E_EDITABLE_SIZE_TO_ALLOC(length) \
(((length) + (E_EDITABLE_BLOCK_SIZE - 1)) / E_EDITABLE_BLOCK_SIZE) * E_EDITABLE_BLOCK_SIZE
(((length) + (E_EDITABLE_BLOCK_SIZE - 1)) / E_EDITABLE_BLOCK_SIZE) * E_EDITABLE_BLOCK_SIZE
typedef struct _E_Editable_Smart_Data E_Editable_Smart_Data;
@ -16,31 +16,31 @@ struct _E_Editable_Smart_Data
Evas_Object *cursor_object;
Evas_Object *selection_object;
int cursor_pos;
int cursor_visible;
int selection_pos;
int selection_visible;
int password_mode;
int cursor_pos;
int cursor_visible;
int selection_pos;
int selection_visible;
int password_mode;
char *text;
int char_length;
int unicode_length;
int allocated_length;
char *text;
int char_length;
int unicode_length;
int allocated_length;
int cursor_width;
int selection_on_fg;
int average_char_w;
int average_char_h;
int cursor_width;
int selection_on_fg;
int average_char_w;
int average_char_h;
};
/* local subsystem functions */
static int _e_editable_text_insert(Evas_Object *editable, int pos, const char *text);
static int _e_editable_text_delete(Evas_Object *editable, int start, int end);
static int _e_editable_text_insert(Evas_Object *editable, int pos, const char *text);
static int _e_editable_text_delete(Evas_Object *editable, int start, int end);
static void _e_editable_cursor_update(Evas_Object *editable);
static void _e_editable_selection_update(Evas_Object *editable);
static void _e_editable_text_update(Evas_Object *editable);
static void _e_editable_text_position_update(Evas_Object *editable, Evas_Coord real_w);
static int _e_editable_char_geometry_get_from_pos(Evas_Object *editable, int utf_pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
static int _e_editable_char_geometry_get_from_pos(Evas_Object *editable, int utf_pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
static void _e_editable_smart_add(Evas_Object *object);
static void _e_editable_smart_del(Evas_Object *object);
@ -70,28 +70,28 @@ e_editable_add(Evas *evas)
{
if (!_e_editable_smart)
{
static const Evas_Smart_Class sc =
{
"e_editable",
EVAS_SMART_CLASS_VERSION,
_e_editable_smart_add,
_e_editable_smart_del,
_e_editable_smart_move,
_e_editable_smart_resize,
_e_editable_smart_show,
_e_editable_smart_hide,
_e_editable_color_set,
_e_editable_clip_set,
_e_editable_clip_unset,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_editable_smart = evas_smart_class_new(&sc);
static const Evas_Smart_Class sc =
{
"e_editable",
EVAS_SMART_CLASS_VERSION,
_e_editable_smart_add,
_e_editable_smart_del,
_e_editable_smart_move,
_e_editable_smart_resize,
_e_editable_smart_show,
_e_editable_smart_hide,
_e_editable_color_set,
_e_editable_clip_set,
_e_editable_clip_unset,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_editable_smart = evas_smart_class_new(&sc);
_e_editable_smart_use = 0;
}
@ -684,17 +684,17 @@ e_editable_select_word(Evas_Object *editable, int idx)
while (i < sd->char_length)
{
if (sd->text[i] == ' ')
{
if (pos < idx) spos = pos + 1;
else if (pos > idx)
{
epos = pos;
break;
}
}
i = evas_string_char_next_get(sd->text, i, NULL);
pos++;
if (sd->text[i] == ' ')
{
if (pos < idx) spos = pos + 1;
else if (pos > idx)
{
epos = pos;
break;
}
}
i = evas_string_char_next_get(sd->text, i, NULL);
pos++;
}
if (epos == -1) epos = pos;
e_editable_selection_pos_set(editable, spos);
@ -779,8 +779,8 @@ e_editable_pos_get_from_coords(Evas_Object *editable, Evas_Coord x, Evas_Coord y
else
{
idx = evas_object_text_char_coords_get(text_obj,
canvas_x - tx, canvas_y - ty,
&cx, NULL, &cw, NULL);
canvas_x - tx, canvas_y - ty,
&cx, NULL, &cw, NULL);
text = evas_object_text_text_get(text_obj);
if ((idx >= 0) && (text))
{
@ -877,6 +877,7 @@ e_editable_disable(Evas_Object *editable)
edje_object_signal_emit(sd->text_object, "e,state,disabled", "e");
}
/* Private functions */
/* A utility function to insert some text inside the editable object.
@ -914,34 +915,34 @@ _e_editable_text_insert(Evas_Object *editable, int pos, const char *text)
if (new_char_length > sd->allocated_length)
{
int new_allocated_length = E_EDITABLE_SIZE_TO_ALLOC(new_char_length);
char *old = sd->text;
int new_allocated_length = E_EDITABLE_SIZE_TO_ALLOC(new_char_length);
char *old = sd->text;
if (sd->password_mode)
{
/* security -- copy contents into new buffer, and overwrite old contents */
sd->text = malloc(new_allocated_length + 1);
if (!sd->text)
{
sd->text = old;
return 0;
}
if (old)
{
memcpy(sd->text, old, prev_char_length + 1);
memset(old, 0, prev_char_length);
free(old);
}
}
else
{
sd->text = realloc(sd->text, new_allocated_length + 1);
if (!sd->text)
{
sd->text = old;
return 0;
}
}
if (sd->password_mode)
{
/* security -- copy contents into new buffer, and overwrite old contents */
sd->text = malloc(new_allocated_length + 1);
if (!sd->text)
{
sd->text = old;
return 0;
}
if (old)
{
memcpy(sd->text, old, prev_char_length + 1);
memset(old, 0, prev_char_length);
free(old);
}
}
else
{
sd->text = realloc(sd->text, new_allocated_length + 1);
if (!sd->text)
{
sd->text = old;
return 0;
}
}
sd->allocated_length = new_allocated_length;
}
sd->unicode_length = new_unicode_length;
@ -986,7 +987,7 @@ _e_editable_text_delete(Evas_Object *editable, int start, int end)
_e_editable_text_update(editable);
return (end - start);
return end - start;
}
/* Updates the position of the cursor
@ -1165,8 +1166,8 @@ _e_editable_char_geometry_get_from_pos(Evas_Object *editable, int utf_pos, Evas_
{
if (utf_pos >= sd->unicode_length)
{
utf_pos = sd->unicode_length - 1;
last_pos = 1;
utf_pos = sd->unicode_length - 1;
last_pos = 1;
}
else
last_pos = 0;
@ -1382,3 +1383,4 @@ _e_editable_clip_unset(Evas_Object *object)
return;
evas_object_clip_unset(sd->clip_object);
}

1026
src/bin/e_table.c
View File

File diff suppressed because it is too large Load Diff

27
src/bin/e_widget_frametable.c
View File

@ -29,7 +29,7 @@ e_widget_frametable_add(Evas *evas, const char *label, int homogenous)
o = edje_object_add(evas);
wd->o_frame = o;
e_theme_edje_object_set(o, "base/theme/widgets",
"e/widgets/frame");
"e/widgets/frame");
edje_object_part_text_set(o, "e.text.label", label);
evas_object_show(o);
e_widget_sub_object_add(obj, o);
@ -59,12 +59,12 @@ e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col,
e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan);
e_widget_size_min_get(sobj, &mw, &mh);
e_table_pack_options_set(sobj,
fill_w, fill_h, /* fill */
expand_w, expand_h, /* expand */
0.5, 0.5, /* align */
mw, mh, /* min */
99999, 99999 /* max */
);
fill_w, fill_h, /* fill */
expand_w, expand_h, /* expand */
0.5, 0.5, /* align */
mw, mh, /* min */
99999, 99999 /* max */
);
e_table_size_min_get(wd->o_table, &mw, &mh);
edje_extern_object_min_size_set(wd->o_table, mw, mh);
edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_table);
@ -82,12 +82,12 @@ e_widget_frametable_object_append_full(Evas_Object *obj, Evas_Object *sobj, int
e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan);
e_table_pack_options_set(sobj,
fill_w, fill_h,
expand_w, expand_h,
align_x, align_y,
min_w, min_h,
max_w, max_h
);
fill_w, fill_h,
expand_w, expand_h,
align_x, align_y,
min_w, min_h,
max_w, max_h
);
e_table_size_min_get(wd->o_table, &mw, &mh);
edje_extern_object_min_size_set(wd->o_table, mw, mh);
edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_table);
@ -135,3 +135,4 @@ _e_wid_disable_hook(Evas_Object *obj)
else
edje_object_signal_emit(wd->o_frame, "e,state,enabled", "e");
}

25
src/bin/e_widget_table.c
View File

@ -53,12 +53,12 @@ e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col,
e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan);
e_widget_size_min_get(sobj, &mw, &mh);
e_table_pack_options_set(sobj,
fill_w, fill_h, /* fill */
expand_w, expand_h, /* expand */
ax, ay, /* align */
mw, mh, /* min */
99999, 99999 /* max */
);
fill_w, fill_h, /* fill */
expand_w, expand_h, /* expand */
ax, ay, /* align */
mw, mh, /* min */
99999, 99999 /* max */
);
e_table_size_min_get(wd->o_table, &mw, &mh);
e_widget_size_min_set(obj, mw, mh);
e_widget_sub_object_add(obj, sobj);
@ -77,12 +77,12 @@ e_widget_table_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int r
e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan);
e_widget_size_min_get(sobj, &mw, &mh);
e_table_pack_options_set(sobj,
fill_w, fill_h, /* fill */
expand_w, expand_h, /* expand */
0.5, 0.5, /* align */
mw, mh, /* min */
99999, 99999 /* max */
);
fill_w, fill_h, /* fill */
expand_w, expand_h, /* expand */
0.5, 0.5, /* align */
mw, mh, /* min */
99999, 99999 /* max */
);
e_table_size_min_get(wd->o_table, &mw, &mh);
e_widget_size_min_set(obj, mw, mh);
}
@ -102,3 +102,4 @@ _e_wid_del_hook(Evas_Object *obj)
wd = e_widget_data_get(obj);
free(wd);
}