Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_editable.c e_editable.h e_entry.c
Log Message:
* [Entry] The selection and the cursor are now themable. The text
is still hardcoded though
* [Entry] Fix some behaviour bugs
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_editable.c 12 Aug 2006 12:21:32 -0000 1.2
+++ e_editable.c 12 Aug 2006 20:51:29 -0000 1.3
@@ -25,7 +25,6 @@
int cursor_pos;
int cursor_visible;
int selection_pos;
- int selection_dragging;
int selection_visible;
int selectable;
int password_mode;
@@ -38,6 +37,9 @@
char *font;
int font_size;
Evas_Text_Style_Type font_style;
+ int cursor_width;
+ int selection_on_fg;
+
int average_char_w;
int average_char_h;
};
@@ -48,13 +50,8 @@
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);
-static int _e_editable_cursor_pos_get_from_coords(Evas_Object *editable,
Evas_Coord canvas_x, Evas_Coord canvas_y);
-
+static void _e_editable_text_position_update(Evas_Object *editable, Evas_Coord
real_w);
static int _e_editable_cursor_timer_cb(void *data);
-static void _e_editable_mouse_down_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void _e_editable_mouse_up_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void _e_editable_mouse_move_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info);
static void _e_editable_smart_add(Evas_Object *object);
static void _e_editable_smart_del(Evas_Object *object);
@@ -105,6 +102,61 @@
}
/**
+ * Sets the theme group to be used by the editable object.
+ * This function has to be called, or the cursor and the selection won't be
+ * visible.
+ *
+ * @param editable an editable object
+ * @param category the theme category to use for the editable object
+ * @param group the theme group to use for the editable object
+ */
+EAPI void
+e_editable_theme_set(Evas_Object *editable, const char *category, const char
*group)
+{
+ E_Editable_Smart_Data *sd;
+ char *obj_group;
+ const char *data;
+
+ if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
+ return;
+ if ((!category) || (!group))
+ return;
+
+ /* Gets the theme for the cursor */
+ obj_group = malloc(strlen(group) + strlen("/cursor") + 1);
+ sprintf(obj_group, "%s/cursor", group);
+ e_theme_edje_object_set(sd->cursor_object, category, obj_group);
+ free(obj_group);
+
+ edje_object_size_min_get(sd->cursor_object, &sd->cursor_width, NULL);
+ if (sd->cursor_width < 1)
+ sd->cursor_width = 1;
+
+
+ /* Gets the theme for the selection */
+ obj_group = malloc(strlen(group) + strlen("/selection") + 1);
+ sprintf(obj_group, "%s/selection", group);
+ e_theme_edje_object_set(sd->selection_object, category, obj_group);
+ free(obj_group);
+
+ data = edje_object_data_get(sd->selection_object, "on_foreground");
+ if ((data) && (strcmp(data, "1") == 0))
+ {
+ sd->selection_on_fg = 1;
+ evas_object_stack_above(sd->selection_object, sd->text_object);
+ }
+ else
+ {
+ sd->selection_on_fg = 0;
+ evas_object_stack_below(sd->selection_object, sd->text_object);
+ }
+
+ /* TODO: font */
+
+ _e_editable_cursor_update(editable);
+}
+
+/**
* Sets whether or not the editable object is in password mode. In password
* mode, the editable object displays '*' instead of the characters
*
@@ -172,8 +224,8 @@
sd->allocated_length = E_EDITABLE_BLOCK_SIZE;
}
- sd->cursor_pos = 0;
- sd->selection_pos = 0;
+ sd->cursor_pos = sd->unicode_length;
+ sd->selection_pos = sd->unicode_length;
_e_editable_cursor_update(editable);
}
@@ -281,7 +333,7 @@
if (sd->selection_pos >= pos)
e_editable_selection_pos_set(editable, sd->selection_pos +
unicode_length);
- _e_editable_text_position_update(editable);
+ _e_editable_text_position_update(editable, -1);
return 1;
}
@@ -317,7 +369,7 @@
else if (sd->selection_pos > start)
e_editable_selection_pos_set(editable, start);
- _e_editable_text_position_update(editable);
+ _e_editable_text_position_update(editable, -1);
return 1;
}
@@ -689,6 +741,57 @@
}
/**
+ * Gets the cursor position at the coords ( @a x, @a y ). It's used to know
+ * where to place the cursor or the selection bound on mouse evevents.
+ *
+ * @param editable an editable object
+ * @param x the x coord, relative to the editable object
+ * @param y the y coord, relative to the editable object
+ * @return Returns the position where to place the cursor according to the
+ * given coords, or -1 on failure
+ */
+EAPI int
+e_editable_pos_get_from_coords(Evas_Object *editable, Evas_Coord x, Evas_Coord
y)
+{
+ E_Editable_Smart_Data *sd;
+ Evas_Coord ox, oy;
+ Evas_Coord tx, ty, tw, th;
+ Evas_Coord cx, cw;
+ Evas_Coord canvas_x, canvas_y;
+ int pos;
+
+ if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
+ return -1;
+
+ evas_object_geometry_get(editable, &ox, &oy, NULL, NULL);
+ evas_object_geometry_get(sd->text_object, &tx, &ty, &tw, &th);
+ canvas_x = ox + x;
+ canvas_y = oy + y;
+
+ if ((canvas_y < ty) || (canvas_x < tx))
+ pos = 0;
+ else if ((canvas_y > (ty + th)) || (canvas_x > (tx + tw)))
+ pos = sd->unicode_length;
+ else
+ {
+ pos = evas_object_text_char_coords_get(sd->text_object,
+ canvas_x - tx, canvas_y - ty,
+ &cx, NULL, &cw, NULL);
+ if (pos >= 0)
+ {
+ if ((canvas_x - tx) > (cx + (cw / 2)))
+ pos++;
+ if (pos > sd->unicode_length)
+ pos = sd->unicode_length;
+ }
+ else
+ pos = -1;
+ }
+
+ return pos;
+}
+
+/**
* A utility function to get the average size of a character written inside
* the editable object
*
@@ -874,7 +977,7 @@
}
_e_editable_selection_update(editable);
- _e_editable_text_position_update(editable);
+ _e_editable_text_position_update(editable, -1);
}
/* Updates the selection of the editable object */
@@ -962,7 +1065,7 @@
/* Updates the position of the text object according to the position of the
* cursor (we make sure the cursor is visible) */
static void
-_e_editable_text_position_update(Evas_Object *editable)
+_e_editable_text_position_update(Evas_Object *editable, Evas_Coord real_w)
{
E_Editable_Smart_Data *sd;
Evas_Coord ox, oy, ow;
@@ -975,6 +1078,8 @@
return;
evas_object_geometry_get(editable, &ox, &oy, &ow, NULL);
+ if (real_w >= 0)
+ ow = real_w;
evas_object_geometry_get(sd->text_object, &tx, &ty, &tw, NULL);
evas_object_geometry_get(sd->cursor_object, &cx, &cy, &cw, NULL);
evas_object_geometry_get(sd->selection_object, &sx, &sy, NULL, NULL);
@@ -1002,44 +1107,6 @@
}
}
-/* Returns the position where to place the cursor according to the given coords
- * Returns -1 on failure */
-static int
-_e_editable_cursor_pos_get_from_coords(Evas_Object *editable, Evas_Coord
canvas_x, Evas_Coord canvas_y)
-{
- E_Editable_Smart_Data *sd;
- Evas_Coord tx, ty, tw, th;
- Evas_Coord cx, cw;
- int pos;
-
- if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
- return -1;
-
- evas_object_geometry_get(sd->text_object, &tx, &ty, &tw, &th);
-
- if ((canvas_y < ty) || (canvas_x < tx))
- pos = 0;
- else if ((canvas_y > (ty + th)) || (canvas_x > (tx + tw)))
- pos = sd->unicode_length;
- else
- {
- pos = evas_object_text_char_coords_get(sd->text_object,
- canvas_x - tx, canvas_y - ty,
- &cx, NULL, &cw, NULL);
- if (pos >= 0)
- {
- if ((canvas_x - tx) > (cx + (cw / 2)))
- pos++;
- if (pos > sd->unicode_length)
- pos = sd->unicode_length;
- }
- else
- pos = -1;
- }
-
- return pos;
-}
-
/* Shows/hides the cursor on regular interval */
static int
_e_editable_cursor_timer_cb(void *data)
@@ -1064,72 +1131,6 @@
return 1;
}
-/* Called when the editable object is pressed by the mouse */
-static void
-_e_editable_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info)
-{
- Evas_Object *editable;
- E_Editable_Smart_Data *sd;
- Evas_Event_Mouse_Down *event;
- Evas_Coord ty, th;
- int pos;
-
- if ((!(editable = obj)) || (!(sd = evas_object_smart_data_get(editable))))
- return;
- if (!(event = event_info))
- return;
-
- evas_object_geometry_get(sd->text_object, NULL, &ty, NULL, &th);
- if ((event->canvas.y < ty) || (event->canvas.y > (ty + th)))
- return;
-
- pos = _e_editable_cursor_pos_get_from_coords(editable, event->canvas.x,
- event->canvas.y);
- if (pos >= 0)
- {
- e_editable_cursor_pos_set(editable, pos);
- if (!evas_key_modifier_is_set(event->modifiers, "Shift"))
- e_editable_selection_pos_set(editable, pos);
-
- sd->selection_dragging = 1;
- }
-}
-
-/* Called when the editable object is released by the mouse */
-static void
-_e_editable_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info)
-{
- E_Editable_Smart_Data *sd;
-
- if ((!obj) || (!(sd = evas_object_smart_data_get(obj))))
- return;
- sd->selection_dragging = 0;
-}
-
-/* Called when the mouse moves over the editable object */
-static void
-_e_editable_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info)
-{
- Evas_Object *editable;
- E_Editable_Smart_Data *sd;
- Evas_Event_Mouse_Move *event;
- int pos;
-
- if ((!(editable = obj)) || (!(sd = evas_object_smart_data_get(editable))))
- return;
- if (!(event = event_info))
- return;
-
- if (sd->selection_dragging)
- {
- pos = _e_editable_cursor_pos_get_from_coords(editable,
- event->cur.canvas.x,
- event->cur.canvas.y);
- if (pos >= 0)
- e_editable_cursor_pos_set(editable, pos);
- }
-}
-
/* Editable object's smart methods */
static void
@@ -1157,6 +1158,8 @@
sd->font = strdup("Vera");
sd->font_size = 10;
sd->font_style = EVAS_TEXT_STYLE_PLAIN;
+ sd->cursor_width = 1;
+ sd->selection_on_fg = 0;
sd->average_char_w = 0;
sd->average_char_h = 0;
@@ -1164,7 +1167,6 @@
sd->cursor_pos = 0;
sd->cursor_visible = 1;
sd->selection_pos = 0;
- sd->selection_dragging = 0;
sd->selection_visible = 1;
sd->selectable = 1;
sd->password_mode = 0;
@@ -1184,26 +1186,15 @@
evas_object_clip_set(sd->text_object, sd->clip_object);
evas_object_smart_member_add(sd->text_object, object);
- sd->cursor_object = evas_object_rectangle_add(evas);
- /* TODO: themability (and use edje for this?) ! */
- evas_object_color_set(sd->cursor_object, 0, 0, 0, 255);
- evas_object_clip_set(sd->cursor_object, sd->clip_object);
- evas_object_smart_member_add(sd->cursor_object, object);
-
- sd->selection_object = evas_object_rectangle_add(evas);
- /* TODO: themability (stackint too) ! */
- evas_object_color_set(sd->selection_object, 245, 205, 109, 102);
+ sd->selection_object = edje_object_add(evas);
evas_object_clip_set(sd->selection_object, sd->clip_object);
evas_object_smart_member_add(sd->selection_object, object);
- _e_editable_cursor_update(object);
+ sd->cursor_object = edje_object_add(evas);
+ evas_object_clip_set(sd->cursor_object, sd->clip_object);
+ evas_object_smart_member_add(sd->cursor_object, object);
- evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_DOWN,
- _e_editable_mouse_down_cb, NULL);
- evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_UP,
- _e_editable_mouse_up_cb, NULL);
- evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_MOVE,
- _e_editable_mouse_move_cb, NULL);
+ _e_editable_cursor_update(object);
}
/* Deletes the editable */
@@ -1272,6 +1263,7 @@
evas_object_resize(sd->clip_object, w, h);
evas_object_resize(sd->event_object, w, h);
+ _e_editable_text_position_update(object, w);
}
/* Shows the editable object */
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_editable.h 12 Aug 2006 12:21:32 -0000 1.2
+++ e_editable.h 12 Aug 2006 20:51:29 -0000 1.3
@@ -7,8 +7,10 @@
#define E_EDITABLE_H
EAPI Evas_Object *e_editable_add (Evas *evas);
+EAPI void e_editable_theme_set (Evas_Object *editable,
const char *category, const char *group);
EAPI void e_editable_password_set (Evas_Object *editable,
int password_mode);
EAPI int e_editable_password_get (Evas_Object *editable);
+
EAPI void e_editable_text_set (Evas_Object *editable,
const char *text);
EAPI const char *e_editable_text_get (Evas_Object *editable);
EAPI char *e_editable_text_range_get (Evas_Object *editable,
int start, int end);
@@ -38,6 +40,7 @@
EAPI void e_editable_selectable_set (Evas_Object *editable,
int selectable);
EAPI int e_editable_selectable_get (Evas_Object *editable);
+EAPI int e_editable_pos_get_from_coords (Evas_Object *editable,
Evas_Coord x, Evas_Coord y);
EAPI void e_editable_char_size_get (Evas_Object *editable,
int *w, int *h);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_entry.c 12 Aug 2006 12:21:32 -0000 1.22
+++ e_entry.c 12 Aug 2006 20:51:29 -0000 1.23
@@ -12,6 +12,7 @@
int enabled;
int focused;
+ int selection_dragging;
float valign;
int min_width;
int height;
@@ -19,6 +20,9 @@
/* local subsystem functions */
static void _e_entry_key_down_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
+static void _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
+static void _e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
+static void _e_entry_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _e_entry_smart_add(Evas_Object *object);
static void _e_entry_smart_del(Evas_Object *object);
@@ -191,8 +195,6 @@
if (sd->enabled)
e_editable_cursor_show(sd->editable_object);
e_editable_selection_show(sd->editable_object);
- e_editable_cursor_move_to_end(sd->editable_object);
- e_editable_selection_move_to_end(sd->editable_object);
sd->focused = 1;
}
@@ -215,6 +217,8 @@
evas_object_focus_set(entry, 0);
edje_object_signal_emit(sd->entry_object, "focus_out", "");
+ e_editable_cursor_move_to_end(sd->editable_object);
+ e_editable_selection_move_to_end(sd->editable_object);
e_editable_cursor_hide(sd->editable_object);
e_editable_selection_hide(sd->editable_object);
sd->focused = 0;
@@ -387,6 +391,70 @@
evas_object_smart_callback_call(obj, "changed", NULL);
}
+/* Called when the entry object is pressed by the mouse */
+static void
+_e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ E_Entry_Smart_Data *sd;
+ Evas_Event_Mouse_Down *event;
+ Evas_Coord ox, oy;
+ int pos;
+
+ if ((!obj) || (!(sd = evas_object_smart_data_get(obj))))
+ return;
+ if (!(event = event_info))
+ return;
+
+ evas_object_geometry_get(sd->editable_object, &ox, &oy, NULL, NULL);
+ pos = e_editable_pos_get_from_coords(sd->editable_object,
+ event->canvas.x - ox,
+ event->canvas.y - oy);
+ if (pos >= 0)
+ {
+ e_editable_cursor_pos_set(sd->editable_object, pos);
+ if (!evas_key_modifier_is_set(event->modifiers, "Shift"))
+ e_editable_selection_pos_set(sd->editable_object, pos);
+
+ sd->selection_dragging = 1;
+ }
+}
+
+/* Called when the entry object is released by the mouse */
+static void
+_e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ E_Entry_Smart_Data *sd;
+
+ if ((!obj) || (!(sd = evas_object_smart_data_get(obj))))
+ return;
+ sd->selection_dragging = 0;
+}
+
+/* Called when the mouse moves over the entry object */
+static void
+_e_entry_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ E_Entry_Smart_Data *sd;
+ Evas_Event_Mouse_Move *event;
+ Evas_Coord ox, oy;
+ int pos;
+
+ if ((!obj) || (!(sd = evas_object_smart_data_get(obj))))
+ return;
+ if (!(event = event_info))
+ return;
+
+ if (sd->selection_dragging)
+ {
+ evas_object_geometry_get(sd->editable_object, &ox, &oy, NULL, NULL);
+ pos = e_editable_pos_get_from_coords(sd->editable_object,
+ event->cur.canvas.x - ox,
+ event->cur.canvas.y - oy);
+ if (pos >= 0)
+ e_editable_cursor_pos_set(sd->editable_object, pos);
+ }
+}
+
/* Editable object's smart methods */
static void _e_entry_smart_add(Evas_Object *object)
@@ -407,6 +475,7 @@
sd->enabled = 1;
sd->focused = 0;
+ sd->selection_dragging = 0;
sd->valign = 0.5;
o = edje_object_add(evas);
@@ -416,6 +485,7 @@
o = e_editable_add(evas);
sd->editable_object = o;
+ e_editable_theme_set(o, "base/theme/widgets", "widgets/entry");
e_editable_cursor_hide(o);
e_editable_char_size_get(o, &cw, &ch);
edje_extern_object_min_size_set(o, cw, ch);
@@ -425,6 +495,12 @@
evas_object_event_callback_add(object, EVAS_CALLBACK_KEY_DOWN,
_e_entry_key_down_cb, NULL);
+ evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_DOWN,
+ _e_entry_mouse_down_cb, NULL);
+ evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_UP,
+ _e_entry_mouse_up_cb, NULL);
+ evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_MOVE,
+ _e_entry_mouse_move_cb, NULL);
}
static void _e_entry_smart_del(Evas_Object *object)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
