Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_iconbox_test.c etk_text_view_test.c etk_tree_test.c
Log Message:
******************
* API BREAK :) *
******************
* [Event] The event system has been rewritten, the Etk events are now
totally wrapped (Etk no longer uses Evas_Lock, Evas_Modifier, ...) and event
structures such as Etk_Event_Mouse_Up_Down have been splitted in
Etk_Event_Mouse_Down and Etk_Event_Mouse_Up
* [Signal] etk_signal_emit() now returns ETK_FALSE if the signal has
been stopped by one of the callbacks
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_iconbox_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_iconbox_test.c 24 Jun 2006 17:54:06 -0000 1.5
+++ etk_iconbox_test.c 24 Aug 2006 18:09:16 -0000 1.6
@@ -11,7 +11,7 @@
char *icon;
} Etk_Test_Iconbox_Types;
-static void _etk_test_iconbox_mouse_up_cb(Etk_Object *object, void
*event_info, void *data);
+static void _etk_test_iconbox_mouse_up_cb(Etk_Object *object,
Etk_Event_Mouse_Up *event, void *data);
static void _etk_test_iconbox_folder_set(Etk_Iconbox *iconbox, const char
*folder);
static Etk_Test_Iconbox_Types _etk_test_iconbox_types[] =
@@ -88,14 +88,13 @@
}
/* Called when the iconbox is pressed by the mouse */
-static void _etk_test_iconbox_mouse_up_cb(Etk_Object *object, void
*event_info, void *data)
+static void _etk_test_iconbox_mouse_up_cb(Etk_Object *object,
Etk_Event_Mouse_Up *event, void *data)
{
Etk_Iconbox *iconbox;
Etk_Iconbox_Icon *icon;
- Etk_Event_Mouse_Up_Down *event;
Etk_String *new_folder;
- if (!(iconbox = ETK_ICONBOX(object)) || !(event = event_info))
+ if (!(iconbox = ETK_ICONBOX(object)))
return;
if (event->button != 1)
return;
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_text_view_test.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_text_view_test.c 15 Aug 2006 15:59:01 -0000 1.14
+++ etk_text_view_test.c 24 Aug 2006 18:09:16 -0000 1.15
@@ -11,7 +11,7 @@
static void _etk_test_text_view_tag_window_create(void *data);
static void _etk_test_text_view_im_window_create(void *data);
-static void _etk_test_im_editor_key_down_cb(Etk_Object *object, void *event,
void *data);
+static void _etk_test_im_editor_key_down_cb(Etk_Object *object,
Etk_Event_Key_Down *event, void *data);
static IM_Button_Type _im_buttons[] =
{
@@ -205,9 +205,8 @@
}
/* Called when a key is pressed when the editor text view is focused */
-static void _etk_test_im_editor_key_down_cb(Etk_Object *object, void *event,
void *data)
+static void _etk_test_im_editor_key_down_cb(Etk_Object *object,
Etk_Event_Key_Down *event, void *data)
{
- Etk_Event_Key_Up_Down *key_event;
Etk_Textblock *message_tb, *editor_tb;
Etk_Textblock_Iter *iter, *cursor;
Etk_String *message;
@@ -218,15 +217,14 @@
if (!(editor_tb = etk_text_view_textblock_get(ETK_TEXT_VIEW(object))))
return;
- key_event = event;
message = etk_textblock_text_get(editor_tb, ETK_TRUE);
- if ((strcmp(key_event->key, "Return") == 0 || strcmp(key_event->key,
"KP_Enter") == 0))
+ if ((strcmp(event->keyname, "Return") == 0 || strcmp(event->keyname,
"KP_Enter") == 0))
{
iter = etk_textblock_iter_new(message_tb);
etk_textblock_iter_forward_end(iter);
/* TODO: we need to wrap the modifiers! */
- if (evas_key_modifier_is_set(key_event->modifiers, "Shift"))
+ if (event->modifiers & ETK_MODIFIER_SHIFT)
{
cursor = etk_text_view_cursor_get(ETK_TEXT_VIEW(object));
etk_textblock_insert(editor_tb, cursor, "\n", -1);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- etk_tree_test.c 15 Aug 2006 16:33:26 -0000 1.33
+++ etk_tree_test.c 24 Aug 2006 18:09:16 -0000 1.34
@@ -8,7 +8,7 @@
static void _etk_test_tree_add_items(Etk_Tree *tree, int n);
static void _etk_test_tree_row_selected(Etk_Object *object, Etk_Tree_Row *row,
void *data);
static void _etk_test_tree_row_unselected(Etk_Object *object, Etk_Tree_Row
*row, void *data);
-static void _etk_test_tree_row_clicked(Etk_Object *object, Etk_Tree_Row *row,
Etk_Event_Mouse_Up_Down *event, void *data);
+static void _etk_test_tree_row_clicked(Etk_Object *object, Etk_Tree_Row *row,
Etk_Event_Mouse_Up *event, void *data);
static void _etk_test_tree_row_activated(Etk_Object *object, Etk_Tree_Row
*row, void *data);
static void _etk_test_tree_checkbox_toggled_cb(Etk_Object *object,
Etk_Tree_Row *row, void *data);
static void _etk_test_tree_clear_list_cb(Etk_Object *object, void *data);
@@ -233,12 +233,12 @@
}
/* Called when a row is clicked */
-static void _etk_test_tree_row_clicked(Etk_Object *object, Etk_Tree_Row *row,
Etk_Event_Mouse_Up_Down *event, void *data)
+static void _etk_test_tree_row_clicked(Etk_Object *object, Etk_Tree_Row *row,
Etk_Event_Mouse_Up *event, void *data)
{
printf("Row clicked %p. Button: %d. ", row, event->button);
- if (event->flags & EVAS_BUTTON_TRIPLE_CLICK)
+ if (event->flags & ETK_MOUSE_TRIPLE_CLICK)
printf("Triple Click\n");
- else if (event->flags & EVAS_BUTTON_DOUBLE_CLICK)
+ else if (event->flags & ETK_MOUSE_DOUBLE_CLICK)
printf("Double Click\n");
else
printf("Single Click\n");
-------------------------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
