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

Code style cleanup 

SVN revision: 17159
This commit is contained in:
sebastid 2005-10-04 12:15:54 +00:00 committed by sebastid
parent fbb9793212
commit 26fd747f3b
4 changed files with 852 additions and 784 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1403
src/bin/e_entry.c
View File

File diff suppressed because it is too large Load Diff

53
src/bin/e_entry.h
View File

@ -1,32 +1,37 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifndef E_ENTRY_H
#define E_ENTRY_H
#include <Evas.h>
Evas_Object *e_editable_text_add(Evas *evas);
EAPI Evas_Object *e_editable_text_add(Evas *evas);
void e_editable_text_text_set(Evas_Object *object, const char *text);
void e_editable_text_insert(Evas_Object *object, const char *text);
EAPI void e_editable_text_text_set(Evas_Object *object, const char *text);
EAPI void e_editable_text_insert(Evas_Object *object, const char *text);
void e_editable_text_delete_char_before(Evas_Object *object);
void e_editable_text_delete_char_after(Evas_Object *object);
EAPI void e_editable_text_delete_char_before(Evas_Object *object);
EAPI void e_editable_text_delete_char_after(Evas_Object *object);
void e_editable_text_cursor_move_at_start(Evas_Object *object);
void e_editable_text_cursor_move_at_end(Evas_Object *object);
void e_editable_text_cursor_move_left(Evas_Object *object);
void e_editable_text_cursor_move_right(Evas_Object *object);
EAPI void e_editable_text_cursor_move_at_start(Evas_Object *object);
EAPI void e_editable_text_cursor_move_at_end(Evas_Object *object);
EAPI void e_editable_text_cursor_move_left(Evas_Object *object);
EAPI void e_editable_text_cursor_move_right(Evas_Object *object);
void e_editable_text_cursor_show(Evas_Object *object);
void e_editable_text_cursor_hide(Evas_Object *object);
EAPI void e_editable_text_cursor_show(Evas_Object *object);
EAPI void e_editable_text_cursor_hide(Evas_Object *object);
Evas_Object *e_entry_add(Evas *evas);
void e_entry_text_set (Evas_Object *entry, const char *text);
void e_entry_text_insert (Evas_Object *entry, const char *text);
void e_entry_delete_char_before(Evas_Object *object);
void e_entry_delete_char_after(Evas_Object *object);
void e_entry_cursor_move_at_start(Evas_Object *object);
void e_entry_cursor_move_at_end(Evas_Object *object);
void e_entry_cursor_move_left(Evas_Object *object);
void e_entry_cursor_move_right(Evas_Object *object);
void e_entry_cursor_show(Evas_Object *object);
void e_entry_cursor_hide(Evas_Object *object);
EAPI Evas_Object *e_entry_add(Evas *evas);
EAPI void e_entry_text_set (Evas_Object *entry, const char *text);
EAPI void e_entry_text_insert (Evas_Object *entry, const char *text);
EAPI void e_entry_delete_char_before(Evas_Object *object);
EAPI void e_entry_delete_char_after(Evas_Object *object);
EAPI void e_entry_cursor_move_at_start(Evas_Object *object);
EAPI void e_entry_cursor_move_at_end(Evas_Object *object);
EAPI void e_entry_cursor_move_left(Evas_Object *object);
EAPI void e_entry_cursor_move_right(Evas_Object *object);
EAPI void e_entry_cursor_show(Evas_Object *object);
EAPI void e_entry_cursor_hide(Evas_Object *object);
#endif

168
src/bin/e_scrollbar.c
View File

@ -1,3 +1,6 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include "e.h"
/*
@ -6,18 +9,19 @@
* - add functions to set / get values and min / max
*/
typedef struct _E_Scrollbar_Smart_Data
typedef struct _E_Scrollbar_Smart_Data E_Scrollbar_Smart_Data;
struct _E_Scrollbar_Smart_Data
{
Evas_Object *edje_object;
struct {
double min;
double max;
double min;
double max;
} value;
E_Scrollbar_Direction direction;
} E_Scrollbar_Smart_Data;
};
static void _e_scrollbar_smart_add(Evas_Object *object);
static void _e_scrollbar_smart_del(Evas_Object *object);
@ -32,68 +36,65 @@ static void _e_scrollbar_smart_hide(Evas_Object *object);
static Evas_Smart *e_scrollbar_smart = NULL;
Evas_Object *e_scrollbar_add(Evas *evas)
Evas_Object *
e_scrollbar_add(Evas *evas)
{
Evas_Object *o;
if (!e_scrollbar_smart)
{
e_scrollbar_smart = evas_smart_new("e_entry",
_e_scrollbar_smart_add, /* add */
_e_scrollbar_smart_del, /* del */
NULL, /* layer_set */
_e_scrollbar_smart_raise, /* raise */
_e_scrollbar_smart_lower, /* lower */
_e_scrollbar_smart_stack_above, /* stack_above */
_e_scrollbar_smart_stack_below, /* stack_below */
_e_scrollbar_smart_move, /* move */
_e_scrollbar_smart_resize, /* resize */
_e_scrollbar_smart_show, /* show */
_e_scrollbar_smart_hide, /* hide */
NULL, /* color_set */
NULL, /* clip_set */
NULL, /* clip_unset */
NULL); /* data*/
}
o = evas_object_smart_add(evas, e_scrollbar_smart);
return o;
{
e_scrollbar_smart = evas_smart_new("e_entry",
_e_scrollbar_smart_add, /* add */
_e_scrollbar_smart_del, /* del */
NULL, /* layer_set */
_e_scrollbar_smart_raise, /* raise */
_e_scrollbar_smart_lower, /* lower */
_e_scrollbar_smart_stack_above, /* stack_above */
_e_scrollbar_smart_stack_below, /* stack_below */
_e_scrollbar_smart_move, /* move */
_e_scrollbar_smart_resize, /* resize */
_e_scrollbar_smart_show, /* show */
_e_scrollbar_smart_hide, /* hide */
NULL, /* color_set */
NULL, /* clip_set */
NULL, /* clip_unset */
NULL); /* data*/
}
return evas_object_smart_add(evas, e_scrollbar_smart);
}
void
e_scrollbar_direction_set (Evas_Object *object, E_Scrollbar_Direction dir)
e_scrollbar_direction_set(Evas_Object *object, E_Scrollbar_Direction dir)
{
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !(scrollbar_sd = evas_object_smart_data_get(object)))
if ((!object) || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
if (scrollbar_sd->direction == dir)
return;
switch (dir)
{
case E_SCROLLBAR_HOR:
e_theme_edje_object_set(scrollbar_sd->edje_object,
"base/theme/widgets/hscrollbar",
"widgets/hscrollbar");
break;
case E_SCROLLBAR_VERT:
e_theme_edje_object_set(scrollbar_sd->edje_object,
"base/theme/widgets/vscrollbar",
"widgets/vscrollbar");
break;
}
{
case E_SCROLLBAR_HORISONTAL:
e_theme_edje_object_set(scrollbar_sd->edje_object,
"base/theme/widgets/hscrollbar",
"widgets/hscrollbar");
break;
case E_SCROLLBAR_VERTICAL:
e_theme_edje_object_set(scrollbar_sd->edje_object,
"base/theme/widgets/vscrollbar",
"widgets/vscrollbar");
break;
}
}
E_Scrollbar_Direction
e_scrollbar_direction_get (Evas_Object *object)
e_scrollbar_direction_get(Evas_Object *object)
{
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
if ((!object) || !(scrollbar_sd = evas_object_smart_data_get(object)))
return E_SCROLLBAR_HORISONTAL;
return scrollbar_sd->direction;
}
@ -102,15 +103,17 @@ e_scrollbar_direction_get (Evas_Object *object)
* Private functions
**************************/
static void _e_scrollbar_smart_add(Evas_Object *object)
static void
_e_scrollbar_smart_add(Evas_Object *object)
{
Evas *evas;
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !(evas = evas_object_evas_get(object)))
if ((!object) || !(evas = evas_object_evas_get(object)))
return;
scrollbar_sd = calloc(1, sizeof(E_Scrollbar_Smart_Data));
if (!scrollbar_sd) return;
scrollbar_sd->value.min = 0.0;
scrollbar_sd->value.max = 1.0;
@ -119,103 +122,112 @@ static void _e_scrollbar_smart_add(Evas_Object *object)
"base/theme/widgets/hscrollbar",
"widgets/hscrollbar");
scrollbar_sd->direction = E_SCROLLBAR_HOR;
scrollbar_sd->direction = E_SCROLLBAR_HORISONTAL;
evas_object_smart_member_add(scrollbar_sd->edje_object, object);
evas_object_smart_data_set(object, scrollbar_sd);
}
static void _e_scrollbar_smart_del(Evas_Object *object)
static void
_e_scrollbar_smart_del(Evas_Object *object)
{
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
if ((!object) || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
evas_object_del(scrollbar_sd->edje_object);
free(scrollbar_sd);
}
static void _e_scrollbar_smart_raise(Evas_Object *object)
static void
_e_scrollbar_smart_raise(Evas_Object *object)
{
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
if ((!object) || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
evas_object_raise(scrollbar_sd->edje_object);
}
static void _e_scrollbar_smart_lower(Evas_Object *object)
static void
_e_scrollbar_smart_lower(Evas_Object *object)
{
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
if ((!object) || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
evas_object_lower(scrollbar_sd->edje_object);
}
static void _e_scrollbar_smart_stack_above(Evas_Object *object, Evas_Object *above)
static void
_e_scrollbar_smart_stack_above(Evas_Object *object, Evas_Object *above)
{
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !above || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
if ((!object) || (!above) || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
evas_object_stack_above(scrollbar_sd->edje_object, above);
}
/* Called when the object is stacked below another object */
static void _e_scrollbar_smart_stack_below(Evas_Object *object, Evas_Object *below)
static void
_e_scrollbar_smart_stack_below(Evas_Object *object, Evas_Object *below)
{
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !below || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
if ((!object) || (!below) || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
evas_object_stack_below(scrollbar_sd->edje_object, below);
}
/* Called when the object is moved */
static void _e_scrollbar_smart_move(Evas_Object *object, Evas_Coord x, Evas_Coord y)
static void
_e_scrollbar_smart_move(Evas_Object *object, Evas_Coord x, Evas_Coord y)
{
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
if ((!object) || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
evas_object_move(scrollbar_sd->edje_object, x, y);
}
/* Called when the object is resized */
static void _e_scrollbar_smart_resize(Evas_Object *object, Evas_Coord w, Evas_Coord h)
static void
_e_scrollbar_smart_resize(Evas_Object *object, Evas_Coord w, Evas_Coord h)
{
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !(scrollbar_sd = evas_object_smart_data_get(object)))
if ((!object) || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
evas_object_resize(scrollbar_sd->edje_object, w, h);
}
static void _e_scrollbar_smart_show(Evas_Object *object)
static void
_e_scrollbar_smart_show(Evas_Object *object)
{
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !(scrollbar_sd = evas_object_smart_data_get(object)))
if ((!object) || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
evas_object_show(scrollbar_sd->edje_object);
}
static void _e_scrollbar_smart_hide(Evas_Object *object)
static void
_e_scrollbar_smart_hide(Evas_Object *object)
{
E_Scrollbar_Smart_Data *scrollbar_sd;
if (!object || !(scrollbar_sd = evas_object_smart_data_get(object)))
if ((!object) || !(scrollbar_sd = evas_object_smart_data_get(object)))
return;
evas_object_hide(scrollbar_sd->edje_object);

12
src/bin/e_scrollbar.h
View File

@ -1,17 +1,21 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifdef E_TYPEDEFS
typedef enum _E_Scrollbar_Direction
{
E_SCROLLBAR_HOR = 0,
E_SCROLLBAR_VERT = 1
E_SCROLLBAR_HORISONTAL,
E_SCROLLBAR_VERTICAL
} E_Scrollbar_Direction;
#else
#ifndef E_SCROLLBAR_H
#define E_SCROLLBAR_H
EAPI Evas_Object *e_scrollbar_add(Evas *evas);
EAPI void e_scrollbar_direction_set_(Evas_Object *object, E_Scrollbar_Direction dir);
EAPI Evas_Object *e_scrollbar_add(Evas *evas);
EAPI void e_scrollbar_direction_set_(Evas_Object *object,
E_Scrollbar_Direction dir);
EAPI E_Scrollbar_Direction e_scrollbar_direction_get(Evas_Object *object);
#endif