Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_embed.c ewl_embed.h ewl_events.c ewl_widget.c ewl_window.c
Log Message:
api breakage, ewl_embed
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_embed.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- ewl_embed.c 18 Aug 2004 03:15:20 -0000 1.44
+++ ewl_embed.c 23 Aug 2004 01:29:37 -0000 1.45
@@ -122,7 +122,7 @@
* through standard evas functions.
*/
Evas_Object *
-ewl_embed_set_evas(Ewl_Embed *emb, Evas *evas, Ewl_Embed_Evas_Window *evas_window)
+ewl_embed_evas_set(Ewl_Embed *emb, Evas *evas, Ewl_Embed_Evas_Window *evas_window)
{
Ewl_Widget *w;
Ecore_List *paths;
@@ -173,7 +173,7 @@
DRETURN_PTR(emb->smart, DLEVEL_STABLE);
}
-int ewl_embed_get_max_layer(Ewl_Embed *embed)
+int ewl_embed_max_layer_get(Ewl_Embed *embed)
{
int layer;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -183,7 +183,7 @@
DRETURN_INT(layer, DLEVEL_STABLE);
}
-void ewl_embed_set_max_layer(Ewl_Embed *embed, int layer)
+void ewl_embed_max_layer_set(Ewl_Embed *embed, int layer)
{
if (REALIZED(embed))
evas_object_layer_set(embed->ev_clip, layer);
@@ -198,7 +198,7 @@
* @brief Sends the event for a key press into an embed.
*/
void
-ewl_embed_feed_key_down(Ewl_Embed *embed, char *keyname, unsigned int mods)
+ewl_embed_key_down_feed(Ewl_Embed *embed, char *keyname, unsigned int mods)
{
Ewl_Widget *temp;
Ewl_Event_Key_Down ev;
@@ -248,7 +248,7 @@
* @return Returns no value.
* @brief Sends the event for a key release into an embed.
*/
-void ewl_embed_feed_key_up(Ewl_Embed *embed, char *keyname, unsigned int mods)
+void ewl_embed_key_up_feed(Ewl_Embed *embed, char *keyname, unsigned int mods)
{
Ewl_Widget *temp;
Ewl_Event_Key_Up ev;
@@ -290,7 +290,7 @@
* @brief Sends the event for a mouse button press into an embed.
*/
void
-ewl_embed_feed_mouse_down(Ewl_Embed *embed, int b, int clicks, int x, int y,
+ewl_embed_mouse_down_feed(Ewl_Embed *embed, int b, int clicks, int x, int y,
unsigned int mods)
{
Ewl_Event_Mouse_Down ev;
@@ -378,7 +378,7 @@
* @brief Sends the event for a mouse button release into an embed.
*/
void
-ewl_embed_feed_mouse_up(Ewl_Embed *embed, int b, int x, int y,
+ewl_embed_mouse_up_feed(Ewl_Embed *embed, int b, int x, int y,
unsigned int mods)
{
Ewl_Widget *temp;
@@ -423,7 +423,7 @@
* @brief Sends the event for a mouse button release into an embed.
*/
void
-ewl_embed_feed_mouse_move(Ewl_Embed *embed, int x, int y, unsigned int mods)
+ewl_embed_mouse_move_feed(Ewl_Embed *embed, int x, int y, unsigned int mods)
{
Ewl_Widget *widget;
Ewl_Event_Mouse_Move ev;
@@ -505,7 +505,7 @@
* @brief Sends a mouse out event to the last focused widget
*/
void
-ewl_embed_feed_mouse_out(Ewl_Embed *embed, int x, int y, unsigned int mods)
+ewl_embed_mouse_out_feed(Ewl_Embed *embed, int x, int y, unsigned int mods)
{
Ewl_Event_Mouse_Out ev;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -534,7 +534,7 @@
* @brief Sends a mouse out event to the last focused widget
*/
void
-ewl_embed_feed_mouse_wheel(Ewl_Embed *embed, int x, int y, int z, int dir, unsigned
int mods)
+ewl_embed_mouse_wheel_feed(Ewl_Embed *embed, int x, int y, int z, int dir, unsigned
int mods)
{
Ewl_Widget *w;
Ewl_Event_Mouse_Wheel ev;
@@ -635,7 +635,7 @@
* @return Returns no value.
* @brief Moves the widget @a w to the front of the tab order list.
*/
-void ewl_embed_push_tab_order(Ewl_Embed *e, Ewl_Widget *w)
+void ewl_embed_tab_order_push(Ewl_Embed *e, Ewl_Widget *w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("e", e);
@@ -658,7 +658,7 @@
* @return Returns no value.
* @brief Removes the widget @a w from the tab order list for @a e.
*/
-void ewl_embed_remove_tab_order(Ewl_Embed *e, Ewl_Widget *w)
+void ewl_embed_tab_order_remove(Ewl_Embed *e, Ewl_Widget *w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("e", e);
@@ -675,7 +675,7 @@
* @return Returns no value.
* @brief Changes focus to the next widget in the circular tab order list.
*/
-void ewl_embed_next_tab_order(Ewl_Embed *e)
+void ewl_embed_tab_order_next(Ewl_Embed *e)
{
Ewl_Widget *w;
@@ -1014,7 +1014,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
embed = data;
- ewl_embed_feed_mouse_out(embed, ev->canvas.x, ev->canvas.y,
+ ewl_embed_mouse_out_feed(embed, ev->canvas.x, ev->canvas.y,
ewl_ev_get_modifiers());
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -1030,7 +1030,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
embed = data;
- ewl_embed_feed_mouse_down(embed, ev->button, 1, ev->canvas.x,
+ ewl_embed_mouse_down_feed(embed, ev->button, 1, ev->canvas.x,
ev->canvas.y, ewl_ev_get_modifiers());
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -1046,7 +1046,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
embed = data;
- ewl_embed_feed_mouse_up(embed, ev->button, ev->canvas.x,
+ ewl_embed_mouse_up_feed(embed, ev->button, ev->canvas.x,
ev->canvas.y, ewl_ev_get_modifiers());
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -1062,7 +1062,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
embed = data;
- ewl_embed_feed_mouse_move(embed, ev->canvas.x, ev->canvas.y,
+ ewl_embed_mouse_move_feed(embed, ev->canvas.x, ev->canvas.y,
ewl_ev_get_modifiers());
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -1087,7 +1087,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
embed = data;
- ewl_embed_feed_key_down(embed, ev->keyname, ewl_ev_get_modifiers());
+ ewl_embed_key_down_feed(embed, ev->keyname, ewl_ev_get_modifiers());
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1102,7 +1102,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
embed = data;
- ewl_embed_feed_key_up(embed, ev->keyname, ewl_ev_get_modifiers());
+ ewl_embed_key_up_feed(embed, ev->keyname, ewl_ev_get_modifiers());
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_embed.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ewl_embed.h 22 Jun 2004 16:44:32 -0000 1.26
+++ ewl_embed.h 23 Aug 2004 01:29:37 -0000 1.27
@@ -58,30 +58,30 @@
Ewl_Widget *ewl_embed_new(void);
int ewl_embed_init(Ewl_Embed * win);
-Evas_Object *ewl_embed_set_evas(Ewl_Embed *emb, Evas *evas,
+Evas_Object *ewl_embed_evas_set(Ewl_Embed *emb, Evas *evas,
Ewl_Embed_Evas_Window *evas_window);
-int ewl_embed_get_max_layer(Ewl_Embed *embed);
-void ewl_embed_set_max_layer(Ewl_Embed *embed, int layer);
-void ewl_embed_feed_key_down(Ewl_Embed *embed, char *keyname,
+int ewl_embed_max_layer_get(Ewl_Embed *embed);
+void ewl_embed_max_layer_set(Ewl_Embed *embed, int layer);
+void ewl_embed_key_down_feed(Ewl_Embed *embed, char *keyname,
unsigned int modifiers);
-void ewl_embed_feed_key_up(Ewl_Embed *embed, char *keyname,
+void ewl_embed_key_up_feed(Ewl_Embed *embed, char *keyname,
unsigned int modifiers);
-void ewl_embed_feed_mouse_down(Ewl_Embed *embed, int b, int clicks,
+void ewl_embed_mouse_down_feed(Ewl_Embed *embed, int b, int clicks,
int x, int y, unsigned int modifiers);
-void ewl_embed_feed_mouse_up(Ewl_Embed *embed, int b, int x,
+void ewl_embed_mouse_up_feed(Ewl_Embed *embed, int b, int x,
int y, unsigned int modifiers);
-void ewl_embed_feed_mouse_move(Ewl_Embed *embed, int x, int y,
+void ewl_embed_mouse_move_feed(Ewl_Embed *embed, int x, int y,
unsigned int modifiers);
-void ewl_embed_feed_mouse_out(Ewl_Embed *embed, int x, int y,
+void ewl_embed_mouse_out_feed(Ewl_Embed *embed, int x, int y,
unsigned int modifiers);
-void ewl_embed_feed_mouse_wheel(Ewl_Embed *embed, int x, int y,
+void ewl_embed_mouse_wheel_feed(Ewl_Embed *embed, int x, int y,
int z, int dir, unsigned int mods);
void ewl_embed_font_path_add(char *path);
Ewl_Embed *ewl_embed_find_by_evas_window(Ewl_Embed_Evas_Window *win);
Ewl_Embed *ewl_embed_find_by_widget(Ewl_Widget * w);
-void ewl_embed_next_tab_order(Ewl_Embed *e);
-void ewl_embed_remove_tab_order(Ewl_Embed *e, Ewl_Widget *w);
-void ewl_embed_push_tab_order(Ewl_Embed *e, Ewl_Widget *w);
+void ewl_embed_tab_order_next(Ewl_Embed *e);
+void ewl_embed_tab_order_remove(Ewl_Embed *e, Ewl_Widget *w);
+void ewl_embed_tab_order_push(Ewl_Embed *e, Ewl_Widget *w);
void ewl_embed_coord_to_screen(Ewl_Embed *e, int xx, int yy,
int *x, int *y);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_events.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- ewl_events.c 23 Aug 2004 00:42:12 -0000 1.66
+++ ewl_events.c 23 Aug 2004 01:29:37 -0000 1.67
@@ -266,9 +266,9 @@
else if (strstr(ev->keyname, "Hyper_"))
key_modifiers |= EWL_KEY_MODIFIER_WIN;
else if (!ev->key_compose || iscntrl(*ev->key_compose))
- ewl_embed_feed_key_down(embed, ev->keyname, key_modifiers);
+ ewl_embed_key_down_feed(embed, ev->keyname, key_modifiers);
else
- ewl_embed_feed_key_down(embed, ev->key_compose, key_modifiers);
+ ewl_embed_key_down_feed(embed, ev->key_compose, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -308,9 +308,9 @@
else if (strstr(ev->keyname, "Hyper_"))
key_modifiers &= ~EWL_KEY_MODIFIER_WIN;
else if (!ev->key_compose || iscntrl(*ev->key_compose))
- ewl_embed_feed_key_up(embed, ev->keyname, key_modifiers);
+ ewl_embed_key_up_feed(embed, ev->keyname, key_modifiers);
else
- ewl_embed_feed_key_up(embed, ev->key_compose, key_modifiers);
+ ewl_embed_key_up_feed(embed, ev->key_compose, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -345,7 +345,7 @@
if (ev->triple_click)
clicks = 3;
- ewl_embed_feed_mouse_down(embed, ev->button, clicks, ev->x, ev->y,
+ ewl_embed_mouse_down_feed(embed, ev->button, clicks, ev->x, ev->y,
key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -375,7 +375,7 @@
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
- ewl_embed_feed_mouse_up(embed, ev->button, ev->x, ev->y, key_modifiers);
+ ewl_embed_mouse_up_feed(embed, ev->button, ev->x, ev->y, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -403,7 +403,7 @@
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
- ewl_embed_feed_mouse_move(embed, ev->x, ev->y, key_modifiers);
+ ewl_embed_mouse_move_feed(embed, ev->x, ev->y, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -428,7 +428,7 @@
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
- ewl_embed_feed_mouse_out(embed, ev->x, ev->y, key_modifiers);
+ ewl_embed_mouse_out_feed(embed, ev->x, ev->y, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -453,7 +453,7 @@
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
- ewl_embed_feed_mouse_wheel(embed, ev->x, ev->y, ev->z, ev->direction,
key_modifiers);
+ ewl_embed_mouse_wheel_feed(embed, ev->x, ev->y, ev->z, ev->direction,
key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -503,7 +503,7 @@
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
- ewl_embed_feed_key_down(embed, ev->keyname, key_modifiers);
+ ewl_embed_key_down_feed(embed, ev->keyname, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -531,7 +531,7 @@
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
- ewl_embed_feed_key_down(embed, ev->keyname, key_modifiers);
+ ewl_embed_key_down_feed(embed, ev->keyname, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -567,9 +567,9 @@
/* Feed a mouse move, since they don't occur prior to mouse down on a
* touchscreen */
- ewl_embed_feed_mouse_move(embed, ev->x, ev->y, key_modifiers);
+ ewl_embed_mouse_move_feed(embed, ev->x, ev->y, key_modifiers);
- ewl_embed_feed_mouse_down(embed, ev->button, clicks, ev->x, ev->y,
+ ewl_embed_mouse_down_feed(embed, ev->button, clicks, ev->x, ev->y,
key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -598,8 +598,8 @@
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
- ewl_embed_feed_mouse_move(embed, ev->x, ev->y, key_modifiers);
- ewl_embed_feed_mouse_up(embed, ev->button, ev->x, ev->y, key_modifiers);
+ ewl_embed_mouse_move_feed(embed, ev->x, ev->y, key_modifiers);
+ ewl_embed_mouse_up_feed(embed, ev->button, ev->x, ev->y, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -626,7 +626,7 @@
if (!embed)
DRETURN_INT(TRUE, DLEVEL_STABLE);
- ewl_embed_feed_mouse_move(embed, ev->x, ev->y, key_modifiers);
+ ewl_embed_mouse_move_feed(embed, ev->x, ev->y, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_widget.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- ewl_widget.c 19 Aug 2004 02:44:01 -0000 1.120
+++ ewl_widget.c 23 Aug 2004 01:29:38 -0000 1.121
@@ -697,7 +697,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
e = ewl_embed_find_by_widget(w);
- ewl_embed_push_tab_order(EWL_EMBED(e), w);
+ ewl_embed_tab_order_push(EWL_EMBED(e), w);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1016,8 +1016,8 @@
if (w->fx_clip_box) {
int sum;
sum = ewl_widget_layer_sum_get(w);
- if (sum > ewl_embed_get_max_layer(emb))
- ewl_embed_set_max_layer(emb, sum);
+ if (sum > ewl_embed_max_layer_get(emb))
+ ewl_embed_max_layer_set(emb, sum);
evas_object_layer_set(w->fx_clip_box, sum);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- ewl_window.c 23 Aug 2004 00:42:12 -0000 1.90
+++ ewl_window.c 23 Aug 2004 01:29:38 -0000 1.91
@@ -520,7 +520,7 @@
ewl_object_current_w_get(o),
ewl_object_current_h_get(o));
- ewl_embed_set_evas(embed, evas, window->window);
+ ewl_embed_evas_set(embed, evas, window->window);
window->render = strdup(render);
FREE(render);
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs