Enlightenment CVS committal

Author  : moom16
Project : e17
Module  : proto

Dir     : e17/proto/etk/src/lib


Modified Files:
        Etk.h Makefile.am etk_button.c etk_image.c etk_image.h 
        etk_main.c etk_marshallers.c etk_marshallers.h etk_menu.c 
        etk_menu_item.c etk_menu_item.h etk_menu_shell.c 
        etk_menu_shell.h etk_object.c etk_object.h etk_signal.c 
        etk_signal.h etk_stock.c etk_stock.h etk_toplevel_widget.c 
        etk_toplevel_widget.h etk_types.h etk_widget.c etk_widget.h 
        etk_window.c etk_window.h 
Added Files:
        etk_menu_bar.c etk_menu_bar.h etk_statusbar.c etk_statusbar.h 


Log Message:
* More work on the menus
* Add a menu bar (need some theming)
* Add a status bar (the resize grip doesn't work yet)
* Clean up etk_test
* Some minor fixes and new things




===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Etk.h       13 Nov 2005 12:04:05 -0000      1.10
+++ Etk.h       20 Nov 2005 10:33:28 -0000      1.11
@@ -48,6 +48,8 @@
 #include "etk_separator.h"
 #include "etk_menu_shell.h"
 #include "etk_menu.h"
+#include "etk_menu_bar.h"
 #include "etk_menu_item.h"
+#include "etk_statusbar.h"
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 13 Nov 2005 12:04:05 -0000      1.13
+++ Makefile.am 20 Nov 2005 10:33:28 -0000      1.14
@@ -35,7 +35,8 @@
 etk_tree.h \
 etk_range.h etk_scale.h etk_scrollbar.h \
 etk_separator.h \
-etk_menu_shell.h etk_menu.h etk_menu_item.h
+etk_menu_shell.h etk_menu.h etk_menu_bar.h etk_menu_item.h \
+etk_statusbar.h
 
 libetk_la_SOURCES = \
 etk_main.c etk_utils.c \
@@ -57,7 +58,8 @@
 etk_tree.c \
 etk_range.c etk_scale.c etk_scrollbar.c \
 etk_separator.c \
-etk_menu_shell.c etk_menu.c etk_menu_item.c \
+etk_menu_shell.c etk_menu.c etk_menu_bar.c etk_menu_item.c \
+etk_statusbar.c \
 $(ETKHEADERS)
 
 installed_headersdir = $(prefix)/include/etk
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_button.c        11 Nov 2005 22:48:48 -0000      1.5
+++ etk_button.c        20 Nov 2005 10:33:28 -0000      1.6
@@ -2,7 +2,6 @@
 #include "etk_button.h"
 #include <stdlib.h>
 #include <string.h>
-#include "config.h"
 #include "etk_hbox.h"
 #include "etk_alignment.h"
 #include "etk_image.h"
@@ -107,24 +106,17 @@
  * @return Returns the new button widget
  * @see Etk_Stock
  */
+/* Todo button_stock_set */
 Etk_Widget *etk_button_new_from_stock(Etk_Stock_Id stock_id)
 {
    Etk_Widget *button;
-   char *key;
-
-   key = etk_stock_key_get(stock_id);
-   if (key)
-   {
-      Etk_Widget *image;
-      char *label;
-
-      label = etk_stock_label_get(stock_id);
-      image = etk_image_new_from_edje(PACKAGE_DATA_DIR 
"/stock_icons/default.edj", key);
-      button = etk_button_new_with_label(_(label));
-      etk_button_image_set(ETK_BUTTON(button), ETK_IMAGE(image));
-   }
-   else
-      button = etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button", NULL);
+   Etk_Widget *image;
+   char *label;
+   
+   image = etk_image_new_from_stock(stock_id);
+   label = etk_stock_label_get(stock_id);
+   button = etk_button_new_with_label(_(label));
+   etk_button_image_set(ETK_BUTTON(button), ETK_IMAGE(image));
 
    return button;
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_image.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_image.c 11 Nov 2005 22:48:48 -0000      1.8
+++ etk_image.c 20 Nov 2005 10:33:28 -0000      1.9
@@ -7,6 +7,7 @@
 #include "etk_signal.h"
 #include "etk_signal_callback.h"
 #include "etk_utils.h"
+#include "config.h"
 
 /**
  * @addtogroup Etk_Image
@@ -93,6 +94,27 @@
 }
 
 /**
+ * @brief Creates a new image and loads the image corresponding to the stock id
+ * @param stock_id the stock id corresponding to the image
+ * @return Returns the new image widget
+ */
+/* TODO: image_stock_set */
+Etk_Widget *etk_image_new_from_stock(Etk_Stock_Id stock_id)
+{
+   char *key;
+
+   if ((key = etk_stock_key_get(stock_id)))
+   {
+      Etk_Widget *image;
+      
+      image = etk_image_new_from_edje(PACKAGE_DATA_DIR 
"/stock_icons/default.edj", key);
+      return image;
+   }
+   
+   return NULL;
+}
+
+/**
  * @brief Loads the image from a file
  * @param image an image
  * @param filename the name of the file to load
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_image.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_image.h 30 Oct 2005 13:38:54 -0000      1.3
+++ etk_image.h 20 Nov 2005 10:33:28 -0000      1.4
@@ -4,6 +4,7 @@
 
 #include <Evas.h>
 #include "etk_widget.h"
+#include "etk_stock.h"
 
 /**
  * @defgroup Etk_Image Etk_Image
@@ -40,6 +41,7 @@
 Etk_Widget *etk_image_new();
 Etk_Widget *etk_image_new_from_file(const char *filename);
 Etk_Widget *etk_image_new_from_edje(const char *edje_filename, const char 
*edje_group);
+Etk_Widget *etk_image_new_from_stock(Etk_Stock_Id stock_id);
 
 void etk_image_set_from_file(Etk_Image *image, const char *filename);
 const char *etk_image_file_get(Etk_Image *image);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_main.c  11 Nov 2005 22:48:48 -0000      1.7
+++ etk_main.c  20 Nov 2005 10:33:28 -0000      1.8
@@ -42,7 +42,7 @@
 {
    if (_etk_main_initialized)
       return TRUE;
-
+   
    if (!evas_init())
    {
       ETK_WARNING("Evas initialization failed!");
@@ -217,7 +217,7 @@
    {
       geometry.x = 0;
       geometry.y = 0;
-      etk_toplevel_widget_size_get(ETK_TOPLEVEL_WIDGET(widget), &geometry.w, 
&geometry.h);
+      etk_toplevel_widget_geometry_get(ETK_TOPLEVEL_WIDGET(widget), NULL, 
NULL, &geometry.w, &geometry.h);
    }
    else
       geometry = widget->geometry;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_marshallers.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_marshallers.c   23 Oct 2005 15:35:32 -0000      1.3
+++ etk_marshallers.c   20 Nov 2005 10:33:28 -0000      1.4
@@ -69,6 +69,27 @@
    callback_VOID__POINTER(object, arg1, data);
 }
 
+/* etk_marshaller_VOID__INT_POINTER */
+void etk_marshaller_VOID__INT_POINTER(Etk_Signal_Callback_Function callback, 
Etk_Object *object, void *data, void *return_value, va_list arguments)
+{
+   typedef void (*Etk_Signal_Callback_Function_VOID__INT_POINTER)(Etk_Object 
*object, int arg1, void *arg2, void *data);
+
+   int arg1;
+   void *arg2;
+
+   Etk_Signal_Callback_Function_VOID__INT_POINTER callback_VOID__INT_POINTER;
+
+   if (!callback || !object)
+      return;
+
+   arg1 = va_arg(arguments, int);
+   arg2 = va_arg(arguments, void *);
+
+   callback_VOID__INT_POINTER = 
(Etk_Signal_Callback_Function_VOID__INT_POINTER)callback;
+   callback_VOID__INT_POINTER(object, arg1, arg2, data);
+}
+
+
 /* etk_marshaller_BOOL__VOID */
 void etk_marshaller_BOOL__VOID(Etk_Signal_Callback_Function callback, 
Etk_Object *object, void *data, void *return_value, va_list arguments)
 {
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_marshallers.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_marshallers.h   23 Oct 2005 15:35:33 -0000      1.3
+++ etk_marshallers.h   20 Nov 2005 10:33:28 -0000      1.4
@@ -14,6 +14,7 @@
 void etk_marshaller_VOID__INT(Etk_Signal_Callback_Function callback, 
Etk_Object *object, void *data, void *return_value, va_list arguments);
 void etk_marshaller_VOID__DOUBLE(Etk_Signal_Callback_Function callback, 
Etk_Object *object, void *data, void *return_value, va_list arguments);
 void etk_marshaller_VOID__POINTER(Etk_Signal_Callback_Function callback, 
Etk_Object *object, void *data, void *return_value, va_list arguments);
+void etk_marshaller_VOID__INT_POINTER(Etk_Signal_Callback_Function callback, 
Etk_Object *object, void *data, void *return_value, va_list arguments);
 void etk_marshaller_BOOL__VOID(Etk_Signal_Callback_Function callback, 
Etk_Object *object, void *data, void *return_value, va_list arguments);
 void etk_marshaller_BOOL__DOUBLE(Etk_Signal_Callback_Function callback, 
Etk_Object *object, void *data, void *return_value, va_list arguments);
 void etk_marshaller_BOOL__POINTER_POINTER(Etk_Signal_Callback_Function 
callback, Etk_Object *object, void *data, void *return_value, va_list 
arguments);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_menu.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_menu.c  13 Nov 2005 12:04:05 -0000      1.2
+++ etk_menu.c  20 Nov 2005 10:33:28 -0000      1.3
@@ -14,7 +14,7 @@
 * @{
  */
 
-#define ETK_MENU_MIN_POP_TIME 250
+#define ETK_MENU_MIN_POP_TIME 400
 
 typedef enum _Etk_Menu_Screen_Edge
 {
@@ -25,7 +25,7 @@
    ETK_MENU_TOP_EDGE = (1 << 3)
 } Etk_Menu_Screen_Edge;
 
-enum _Etk_Widget_Signal_Id
+enum _Etk_Menu_Signal_Id
 {
    ETK_MENU_NUM_SIGNALS
 };
@@ -39,9 +39,12 @@
 static void _etk_menu_child_removed_cb(Etk_Object *object, void *child, void 
*data);
 static int _etk_menu_mouse_up_cb(void *data, int type, void *event);
 static int _etk_menu_mouse_move_cb(void *data, int type, void *event);
-static void _etk_menu_item_select_cb(Etk_Object *object, void *data);
-static void _etk_menu_item_deselect_cb(Etk_Object *object, void *data);
-static void _etk_menu_item_activate_cb(Etk_Object *object, void *data);
+static void _etk_menu_item_enter_cb(Etk_Object *object, void *data);
+static void _etk_menu_item_leave_cb(Etk_Object *object, void *data);
+static void _etk_menu_item_mouse_up_cb(Etk_Object *object, void *event, void 
*data);
+static void _etk_menu_item_selected_cb(Etk_Object *object, void *data);
+static void _etk_menu_item_deselected_cb(Etk_Object *object, void *data);
+static void _etk_menu_item_activated_cb(Etk_Object *object, void *data);
 
 static Etk_Menu_Screen_Edge _etk_menu_over_screen_edge(Etk_Menu *menu);
 static Etk_Menu_Screen_Edge _etk_menu_mouse_on_screen_edge();
@@ -120,7 +123,8 @@
       _etk_menu_mouse_move_handler = 
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _etk_menu_mouse_move_cb, 
menu);
       ecore_x_window_show(_etk_menu_input_window);
       ecore_x_keyboard_grab(_etk_menu_input_window);
-      ecore_x_pointer_confine_grab(_etk_menu_input_window);
+      /* TODO: fixme pointer_grab!!
+      ecore_x_pointer_grab(_etk_menu_input_window); */
 
       _etk_menu_root_popup_timestamp = ecore_x_current_time_get();
       _etk_menu_root = menu;
@@ -153,9 +157,9 @@
  */
 void etk_menu_popdown(Etk_Menu *menu)
 {
-   Evas_List *l;
+   Evas_List *l, *menu_list;
 
-   if (!menu)
+   if (!menu || !(menu_list = evas_list_find_list(_etk_menu_popped_menus, 
menu)))
       return;
 
    for (l = ETK_CONTAINER(menu)->children; l; l = l->next)
@@ -165,14 +169,18 @@
    if (menu == _etk_menu_root)
    {
       ecore_x_keyboard_ungrab();
-      ecore_x_pointer_ungrab();
+      /* TODO: pointer grab, fixme!!
+      ecore_x_pointer_ungrab(); */
       ecore_x_window_hide(_etk_menu_input_window);
       ecore_event_handler_del(_etk_menu_mouse_up_handler);
       ecore_event_handler_del(_etk_menu_mouse_move_handler);
       _etk_menu_root = NULL;
    }
+   
+   if (ETK_MENU_SHELL(menu)->parent)
+      etk_signal_emit_by_name("submenu_popped_down", 
ETK_OBJECT(ETK_MENU_SHELL(menu)->parent), NULL);
 
-   _etk_menu_popped_menus = evas_list_remove(_etk_menu_popped_menus, menu);
+   _etk_menu_popped_menus = evas_list_remove_list(_etk_menu_popped_menus, 
menu_list);
 }
 
 /**************************
@@ -241,7 +249,6 @@
    if (!(menu_container = ETK_CONTAINER(widget)))
       return;
    
-   /* Then we allocate size for the child items */
    y_offset = geometry.y;
    child_geometry.x = geometry.x;
    for (l = menu_container->children; l; l = l->next)
@@ -301,9 +308,12 @@
    if (!(item = ETK_OBJECT(child)))
       return;
    
-   etk_signal_connect("select", item, ETK_CALLBACK(_etk_menu_item_select_cb), 
NULL);
-   etk_signal_connect("deselect", item, 
ETK_CALLBACK(_etk_menu_item_deselect_cb), NULL);
-   etk_signal_connect("activate", item, 
ETK_CALLBACK(_etk_menu_item_activate_cb), NULL);
+   etk_signal_connect("enter", item, ETK_CALLBACK(_etk_menu_item_enter_cb), 
NULL);
+   etk_signal_connect("leave", item, ETK_CALLBACK(_etk_menu_item_leave_cb), 
NULL);
+   etk_signal_connect("mouse_up", item, 
ETK_CALLBACK(_etk_menu_item_mouse_up_cb), NULL);
+   etk_signal_connect("selected", item, 
ETK_CALLBACK(_etk_menu_item_selected_cb), NULL);
+   etk_signal_connect("deselected", item, 
ETK_CALLBACK(_etk_menu_item_deselected_cb), NULL);
+   etk_signal_connect("activated", item, 
ETK_CALLBACK(_etk_menu_item_activated_cb), NULL);
    etk_menu_shell_update(ETK_MENU_SHELL(object));
 }
 
@@ -315,9 +325,9 @@
    if (!(item = ETK_OBJECT(child)))
       return;
    
-   etk_signal_disconnect("select", item, 
ETK_CALLBACK(_etk_menu_item_select_cb));
-   etk_signal_disconnect("deselect", item, 
ETK_CALLBACK(_etk_menu_item_deselect_cb));
-   etk_signal_disconnect("activate", item, 
ETK_CALLBACK(_etk_menu_item_activate_cb));
+   etk_signal_disconnect("selected", item, 
ETK_CALLBACK(_etk_menu_item_selected_cb));
+   etk_signal_disconnect("deselected", item, 
ETK_CALLBACK(_etk_menu_item_deselected_cb));
+   etk_signal_disconnect("activated", item, 
ETK_CALLBACK(_etk_menu_item_activated_cb));
    etk_menu_shell_update(ETK_MENU_SHELL(object));
 }
 
@@ -387,8 +397,34 @@
    return 1;
 }
 
+/* Called when the mouse pointer enters the item */ 
+static void _etk_menu_item_enter_cb(Etk_Object *object, void *data)
+{
+   etk_menu_item_select(ETK_MENU_ITEM(object));
+}
+
+/* Called when the mouse pointer leaves the item */
+static void _etk_menu_item_leave_cb(Etk_Object *object, void *data)
+{
+   Etk_Menu_Item *item;
+   
+   if (!(item = ETK_MENU_ITEM(object)) || item->submenu)
+      return;
+   etk_menu_item_deselect(item);
+}
+
+/* Called when the user has clicked on the item */
+static void _etk_menu_item_mouse_up_cb(Etk_Object *object, void *event, void 
*data)
+{
+   Etk_Menu_Item *item;
+   
+   if (!(item = ETK_MENU_ITEM(object)) || item->submenu)
+      return;
+   etk_menu_item_activate(item);
+}
+
 /* Called when the item is selected */
-static void _etk_menu_item_select_cb(Etk_Object *object, void *data)
+static void _etk_menu_item_selected_cb(Etk_Object *object, void *data)
 {
    Etk_Menu_Item *item;
    Etk_Menu *menu;
@@ -399,7 +435,11 @@
 
    /* First, we deactivate all the items that are on the same menu than the 
item */
    for (l = ETK_CONTAINER(menu)->children; l; l = l->next)
+   {
+      if (ETK_MENU_ITEM(l->data) == item)
+         continue;
       etk_menu_item_deselect(ETK_MENU_ITEM(l->data));
+   }
    
    /* Then we popup the child menu */
    if (item->submenu)
@@ -413,7 +453,7 @@
 }
 
 /* Called when the item is deselected */
-static void _etk_menu_item_deselect_cb(Etk_Object *object, void *data)
+static void _etk_menu_item_deselected_cb(Etk_Object *object, void *data)
 {
    Etk_Menu_Item *item;
    
@@ -426,7 +466,7 @@
 
 
 /* Called when the item is activated */
-static void _etk_menu_item_activate_cb(Etk_Object *object, void *data)
+static void _etk_menu_item_activated_cb(Etk_Object *object, void *data)
 {
    Etk_Menu_Item *item;
    
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_menu_item.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_menu_item.c     13 Nov 2005 12:20:33 -0000      1.3
+++ etk_menu_item.c     20 Nov 2005 10:33:28 -0000      1.4
@@ -14,9 +14,10 @@
 
 enum _Etk_Menu_Item_Signal_Id
 {
-   ETK_MENU_ITEM_SELECT_SIGNAL,
-   ETK_MENU_ITEM_DESELECT_SIGNAL,
-   ETK_MENU_ITEM_ACTIVATE_SIGNAL,
+   ETK_MENU_ITEM_SELECTED_SIGNAL,
+   ETK_MENU_ITEM_DESELECTED_SIGNAL,
+   ETK_MENU_ITEM_ACTIVATED_SIGNAL,
+   ETK_MENU_ITEM_SUBMENU_POPPED_DOWN_SIGNAL,
    ETK_MENU_ITEM_NUM_SIGNALS
 };
 
@@ -32,12 +33,9 @@
 static void _etk_menu_item_realize_cb(Etk_Object *object, void *data);
 static void _etk_menu_item_image_realize_cb(Etk_Object *object, void *data);
 static void _etk_menu_item_right_widget_realize_cb(Etk_Object *object, void 
*data);
-static void _etk_menu_item_enter_cb(Etk_Object *object, void *data);
-static void _etk_menu_item_leave_cb(Etk_Object *object, void *data);
-static void _etk_menu_item_up_cb(Etk_Object *object, void *event, void *data);
-static void _etk_menu_item_select_handler(Etk_Menu_Item *menu_item);
-static void _etk_menu_item_deselect_handler(Etk_Menu_Item *menu_item);
-static void _etk_menu_item_activate_handler(Etk_Menu_Item *menu_item);
+static void _etk_menu_item_selected_handler(Etk_Menu_Item *menu_item);
+static void _etk_menu_item_deselected_handler(Etk_Menu_Item *menu_item);
+static void _etk_menu_item_activated_handler(Etk_Menu_Item *menu_item);
 
 static Etk_Signal *_etk_menu_item_signals[ETK_MENU_ITEM_NUM_SIGNALS];
 
@@ -63,9 +61,10 @@
    {
       menu_item_type = etk_type_new("Etk_Menu_Item", ETK_CONTAINER_TYPE, 
sizeof(Etk_Menu_Item), ETK_CONSTRUCTOR(_etk_menu_item_constructor), 
ETK_DESTRUCTOR(_etk_menu_item_destructor));
 
-      _etk_menu_item_signals[ETK_MENU_ITEM_SELECT_SIGNAL] = 
etk_signal_new("select", menu_item_type, ETK_MEMBER_OFFSET(Etk_Menu_Item, 
select), etk_marshaller_VOID__VOID, NULL, NULL);
-      _etk_menu_item_signals[ETK_MENU_ITEM_DESELECT_SIGNAL] = 
etk_signal_new("deselect", menu_item_type, ETK_MEMBER_OFFSET(Etk_Menu_Item, 
deselect), etk_marshaller_VOID__VOID, NULL, NULL);
-      _etk_menu_item_signals[ETK_MENU_ITEM_ACTIVATE_SIGNAL] = 
etk_signal_new("activate", menu_item_type, ETK_MEMBER_OFFSET(Etk_Menu_Item, 
activate), etk_marshaller_VOID__VOID, NULL, NULL);
+      _etk_menu_item_signals[ETK_MENU_ITEM_SELECTED_SIGNAL] = 
etk_signal_new("selected", menu_item_type, ETK_MEMBER_OFFSET(Etk_Menu_Item, 
selected), etk_marshaller_VOID__VOID, NULL, NULL);
+      _etk_menu_item_signals[ETK_MENU_ITEM_DESELECTED_SIGNAL] = 
etk_signal_new("deselected", menu_item_type, ETK_MEMBER_OFFSET(Etk_Menu_Item, 
deselected), etk_marshaller_VOID__VOID, NULL, NULL);
+      _etk_menu_item_signals[ETK_MENU_ITEM_ACTIVATED_SIGNAL] = 
etk_signal_new("activated", menu_item_type, ETK_MEMBER_OFFSET(Etk_Menu_Item, 
activated), etk_marshaller_VOID__VOID, NULL, NULL);
+      _etk_menu_item_signals[ETK_MENU_ITEM_SUBMENU_POPPED_DOWN_SIGNAL] = 
etk_signal_new("submenu_popped_down", menu_item_type, -1, 
etk_marshaller_VOID__VOID, NULL, NULL);
       
       etk_type_property_add(menu_item_type, "label", 
ETK_MENU_ITEM_LABEL_PROPERTY, ETK_PROPERTY_STRING, 
ETK_PROPERTY_READABLE_WRITABLE,  etk_property_value_string(NULL));
       
@@ -133,36 +132,40 @@
 }
 
 /**
- * @brief Emits the "select" signal which will select the menu item
+ * @brief Selects the menu item
  * @param menu_item a menu_item
  */
 void etk_menu_item_select(Etk_Menu_Item *menu_item)
 {
-   if (!menu_item)
+   if (!menu_item || menu_item->is_selected)
       return;
-   etk_signal_emit(_etk_menu_item_signals[ETK_MENU_ITEM_SELECT_SIGNAL], 
ETK_OBJECT(menu_item), NULL);
+   
+   menu_item->is_selected = TRUE;
+   etk_signal_emit(_etk_menu_item_signals[ETK_MENU_ITEM_SELECTED_SIGNAL], 
ETK_OBJECT(menu_item), NULL);
 }
 
 /**
- * @brief Emits the "deselect" signal which will deselect the menu item
+ * @brief Deselects the menu item
  * @param menu_item a menu_item
  */
 void etk_menu_item_deselect(Etk_Menu_Item *menu_item)
 {
-   if (!menu_item)
+   if (!menu_item || !menu_item->is_selected)
       return;
-   etk_signal_emit(_etk_menu_item_signals[ETK_MENU_ITEM_DESELECT_SIGNAL], 
ETK_OBJECT(menu_item), NULL);
+   
+   menu_item->is_selected = FALSE;
+   etk_signal_emit(_etk_menu_item_signals[ETK_MENU_ITEM_DESELECTED_SIGNAL], 
ETK_OBJECT(menu_item), NULL);
 }
 
 /**
- * @brief Emits the "activate" signal which will activate the menu item
+ * @brief Activates the menu item
  * @param menu_item a menu_item
  */
 void etk_menu_item_activate(Etk_Menu_Item *menu_item)
 {
    if (!menu_item)
       return;
-   etk_signal_emit(_etk_menu_item_signals[ETK_MENU_ITEM_ACTIVATE_SIGNAL], 
ETK_OBJECT(menu_item), NULL);
+   etk_signal_emit(_etk_menu_item_signals[ETK_MENU_ITEM_ACTIVATED_SIGNAL], 
ETK_OBJECT(menu_item), NULL);
 }
 
 /**
@@ -175,6 +178,8 @@
    if (!menu_item)
       return;
    menu_item->submenu = submenu;
+   if (menu_item->submenu)
+      ETK_MENU_SHELL(menu_item->submenu)->parent = menu_item;
    
    if (menu_item->submenu && !menu_item->right_widget)
    {
@@ -308,9 +313,9 @@
    if (!menu_item)
       return;
 
-   menu_item->select = _etk_menu_item_select_handler;
-   menu_item->deselect = _etk_menu_item_deselect_handler;
-   menu_item->activate = _etk_menu_item_activate_handler;
+   menu_item->selected = _etk_menu_item_selected_handler;
+   menu_item->deselected = _etk_menu_item_deselected_handler;
+   menu_item->activated = _etk_menu_item_activated_handler;
    
    menu_item->submenu = NULL;
    menu_item->parent = NULL;
@@ -318,14 +323,11 @@
    menu_item->image = NULL;
    menu_item->right_widget = NULL;
    
-   menu_item->selected = FALSE;
+   menu_item->is_selected = FALSE;
    menu_item->show_image = FALSE;
    menu_item->show_right_swallow = FALSE;
    
    etk_signal_connect_after("realize", ETK_OBJECT(menu_item), 
ETK_CALLBACK(_etk_menu_item_realize_cb), NULL);
-   etk_signal_connect("enter", ETK_OBJECT(menu_item), 
ETK_CALLBACK(_etk_menu_item_enter_cb), NULL);
-   etk_signal_connect("leave", ETK_OBJECT(menu_item), 
ETK_CALLBACK(_etk_menu_item_leave_cb), NULL);
-   etk_signal_connect("mouse_up", ETK_OBJECT(menu_item), 
ETK_CALLBACK(_etk_menu_item_up_cb), NULL);
 }
 
 /* Destroys the menu item */
@@ -426,56 +428,28 @@
       etk_widget_swallow_widget(ETK_WIDGET(menu_item), "right_swallow", 
ETK_WIDGET(menu_item->right_widget));
 }
 
-/* Called when the mouse pointer enters the item */ 
-static void _etk_menu_item_enter_cb(Etk_Object *object, void *data)
-{
-   etk_menu_item_select(ETK_MENU_ITEM(object));
-}
-
-/* Called when the mouse pointer leaves the item */
-static void _etk_menu_item_leave_cb(Etk_Object *object, void *data)
+/* Default handler for the "selected" signal */
+static void _etk_menu_item_selected_handler(Etk_Menu_Item *menu_item)
 {
-   Etk_Menu_Item *item;
-   
-   if (!(item = ETK_MENU_ITEM(object)) || item->submenu)
-      return;
-   etk_menu_item_deselect(item);
-}
-
-/* Called when the user has clicked on the item */
-static void _etk_menu_item_up_cb(Etk_Object *object, void *event, void *data)
-{
-   Etk_Menu_Item *item;
-   
-   if (!(item = ETK_MENU_ITEM(object)) || item->submenu)
-      return;
-   etk_menu_item_activate(item);
-}
-
-/* Default handler for the "select" signal */
-static void _etk_menu_item_select_handler(Etk_Menu_Item *menu_item)
-{
-   if (!menu_item || menu_item->selected)
+   if (!menu_item)
       return;
-   menu_item->selected = TRUE;
    etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item), "select");
    etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item->image), "select");
    etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item->right_widget), 
"select");
 }
 
-/* Default handler for the "deselect" signal */
-static void _etk_menu_item_deselect_handler(Etk_Menu_Item *menu_item)
+/* Default handler for the "deselected" signal */
+static void _etk_menu_item_deselected_handler(Etk_Menu_Item *menu_item)
 {
-   if (!menu_item || !menu_item->selected)
+   if (!menu_item)
       return;
    etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item), "deselect");
    etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item->image), 
"deselect");
    etk_widget_theme_object_signal_emit(ETK_WIDGET(menu_item->right_widget), 
"deselect");
-   menu_item->selected = FALSE;
 }
 
-/* Default handler for the "activate" signal */
-static void _etk_menu_item_activate_handler(Etk_Menu_Item *menu_item)
+/* Default handler for the "activated" signal */
+static void _etk_menu_item_activated_handler(Etk_Menu_Item *menu_item)
 {
    if (!menu_item)
       return;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_menu_item.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_menu_item.h     13 Nov 2005 12:20:33 -0000      1.3
+++ etk_menu_item.h     20 Nov 2005 10:33:28 -0000      1.4
@@ -34,9 +34,9 @@
    /* Inherit from Etk_Container */
    Etk_Container container;
    
-   void (*select)(Etk_Menu_Item *menu_item);
-   void (*deselect)(Etk_Menu_Item *menu_item);
-   void (*activate)(Etk_Menu_Item *menu_item);
+   void (*selected)(Etk_Menu_Item *menu_item);
+   void (*deselected)(Etk_Menu_Item *menu_item);
+   void (*activated)(Etk_Menu_Item *menu_item);
    
    Etk_Menu_Shell *parent;
    Etk_Menu *submenu;
@@ -46,7 +46,7 @@
    /* "right_widget" can be the submenu arrow, the checkbox or the radiobox 
widget */
    Etk_Widget *right_widget;
    
-   Etk_Bool selected;
+   Etk_Bool is_selected;
    Etk_Bool show_image;
    Etk_Bool show_right_swallow;
    Etk_Bool right_widget_is_arrow;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_menu_shell.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_menu_shell.c    13 Nov 2005 12:04:05 -0000      1.1
+++ etk_menu_shell.c    20 Nov 2005 10:33:28 -0000      1.2
@@ -88,6 +88,7 @@
 {
    if (!menu_shell)
       return;
+   menu_shell->parent = NULL;
    menu_shell->items_update = NULL;
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_menu_shell.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_menu_shell.h    13 Nov 2005 12:04:05 -0000      1.1
+++ etk_menu_shell.h    20 Nov 2005 10:33:28 -0000      1.2
@@ -27,6 +27,7 @@
    /* Inherit from Etk_Container */
    Etk_Container container;
    
+   Etk_Menu_Item *parent;
    void (*items_update)(Etk_Menu_Shell *menu_shell);
 };
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_object.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_object.c        11 Nov 2005 22:48:48 -0000      1.6
+++ etk_object.c        20 Nov 2005 10:33:28 -0000      1.7
@@ -13,8 +13,15 @@
  * @{
  */
 
+typedef struct _Etk_Object_Data
+{
+   void *value;
+   void (*free_cb)(void *data);
+} Etk_Object_Data;
+
 static void _etk_object_constructor(Etk_Object *object);
 static void _etk_object_destructor(Etk_Object *object);
+static void _etk_object_data_free(Etk_Object_Data *data);
 
 static Ecore_List *_etk_object_created_objects = NULL;
 static Etk_Signal *_etk_object_signals[ETK_OBJECT_NUM_SIGNALS];
@@ -207,9 +214,9 @@
       return;
    
    if (ecore_list_goto(object->before_signal_callbacks_list, signal_callback))
-      ecore_list_remove(object->before_signal_callbacks_list);
+      ecore_list_remove_destroy(object->before_signal_callbacks_list);
    if (ecore_list_goto(object->after_signal_callbacks_list, signal_callback))
-      ecore_list_remove(object->after_signal_callbacks_list);
+      ecore_list_remove_destroy(object->after_signal_callbacks_list);
 }
 
 /**
@@ -269,34 +276,51 @@
 }
 
 /**
- * @brief Sets a datum associated to a key for the object
- * @param object the object to add the datum to
- * @param key the key associated to the datum
- * @param value the value of the datum
+ * @brief Sets data associated to a key for the object
+ * @param object the object to add the data to
+ * @param key the key associated to the data
+ * @param value the value of the data
  */
 void etk_object_data_set(Etk_Object *object, const char *key, void *value)
 {
+   etk_object_data_set_full(object, key, value, NULL);
+}
+
+/**
+ * @brief Sets data associated to a key for the object
+ * @param object the object to add the data to
+ * @param key the key associated to the data
+ * @param free_cb the function to call on the data when the object is destroyed
+ * @param value the value of the data
+ */
+void etk_object_data_set_full(Etk_Object *object, const char *key, void 
*value, void (*free_cb)(void *data))
+{
+   Etk_Object_Data *new_data;
    char *new_key;
 
    if (!object || !key)
       return;
 
    new_key = strdup(key);
-   ecore_hash_set(object->data_hash, new_key, value);
+   new_data = malloc(sizeof(Etk_Object_Data));
+   new_data->value = value;
+   new_data->free_cb = free_cb;
+   ecore_hash_set(object->data_hash, new_key, new_data);
 }
 
 /**
- * @brief Gets the datum associated to the key
- * @param object the object to get the datum from
- * @param key the key associated to the datum
- * @return Returns the value of the datum, NULL on failure
+ * @brief Gets the data associated to the key
+ * @param object the object to get the data from
+ * @param key the key associated to the data
+ * @return Returns the value of the data, NULL on failure
  */
 void *etk_object_data_get(Etk_Object *object, const char *key)
 {
-   if (!object || !key)
+   Etk_Object_Data *data;
+   
+   if (!object || !key || !(data = ecore_hash_get(object->data_hash, key)))
       return NULL;
-
-   return ecore_hash_get(object->data_hash, key);
+   return data->value;
 }
 
 /**
@@ -515,6 +539,7 @@
 
    object->data_hash = ecore_hash_new(ecore_str_hash, ecore_str_compare);
    ecore_hash_set_free_key(object->data_hash, free);
+   ecore_hash_set_free_value(object->data_hash, _etk_object_data_free);
 
    object->before_signal_callbacks_list = ecore_list_new();
    ecore_list_set_free_cb(object->before_signal_callbacks_list, 
ECORE_FREE_CB(etk_signal_callback_delete));
@@ -545,4 +570,15 @@
       ecore_list_remove(_etk_object_created_objects);
 }
 
+/* Frees data associated to an object */
+static void _etk_object_data_free(Etk_Object_Data *data)
+{
+   if (!data)
+      return;
+   
+   if (data->free_cb)
+      data->free_cb(data->value);
+   free(data);
+}
+
 /** @} */
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_object.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_object.h        23 Oct 2005 08:05:34 -0000      1.2
+++ etk_object.h        20 Nov 2005 10:33:28 -0000      1.3
@@ -77,6 +77,7 @@
 void etk_object_weak_pointer_remove(Etk_Object *object, void 
**pointer_location);
 
 void etk_object_data_set(Etk_Object *object, const char *key, void *value);
+void etk_object_data_set_full(Etk_Object *object, const char *key, void 
*value, void (*free_cb)(void *data));
 void *etk_object_data_get(Etk_Object *object, const char *key);
 
 void etk_object_property_reset(Etk_Object *object, const char *property_name);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_signal.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_signal.c        11 Nov 2005 22:48:48 -0000      1.2
+++ etk_signal.c        20 Nov 2005 10:33:28 -0000      1.3
@@ -60,7 +60,7 @@
  * @param accum_data the value to pass to the accumulator
  * @return Returns the new signal, or NULL on failure
  */
-Etk_Signal *etk_signal_new(const char *signal_name, Etk_Type *object_type, int 
default_handler_offset, Etk_Marshaller marshaller, Etk_Accumulator accumulator, 
void *accum_data)
+Etk_Signal *etk_signal_new(const char *signal_name, Etk_Type *object_type, 
long default_handler_offset, Etk_Marshaller marshaller, Etk_Accumulator 
accumulator, void *accum_data)
 {
    Etk_Signal *new_signal;
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_signal.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_signal.h        11 Nov 2005 22:48:48 -0000      1.3
+++ etk_signal.h        20 Nov 2005 10:33:28 -0000      1.4
@@ -12,7 +12,7 @@
  */
 
 /** @brief Gets the offset of a member of a struct (mainly used for 
etk_signal_new) */
-#define ETK_MEMBER_OFFSET(type, member)   ((long)(&((type *)0)->member))
+#define ETK_MEMBER_OFFSET(type, member)   ((long)((long *)&((type 
*)0)->member))
 
 /**
  * @struct Etk_Signal
@@ -23,7 +23,7 @@
    /* private: */
    char *name;
    Etk_Type *object_type;
-   int default_handler_offset;
+   long default_handler_offset;
    Etk_Marshaller marshaller;
    Etk_Accumulator accumulator;
    void *accum_data;
@@ -32,7 +32,7 @@
 Etk_Bool etk_signal_init();
 void etk_signal_shutdown();
 
-Etk_Signal *etk_signal_new(const char *signal_name, Etk_Type *object_type, int 
default_handler_offset, Etk_Marshaller marshaller, Etk_Accumulator accumulator, 
void *accum_data);
+Etk_Signal *etk_signal_new(const char *signal_name, Etk_Type *object_type, 
long default_handler_offset, Etk_Marshaller marshaller, Etk_Accumulator 
accumulator, void *accum_data);
 void etk_signal_delete(Etk_Signal *signal);
 
 Etk_Signal *etk_signal_lookup(const char *signal_name, Etk_Type *type);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_stock.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_stock.c 2 Nov 2005 10:41:03 -0000       1.1
+++ etk_stock.c 20 Nov 2005 10:33:28 -0000      1.2
@@ -18,7 +18,10 @@
 {
    { "close", "Close" },
    { "open",  "Open"  },
-   { "save",  "Save"  }
+   { "save",  "Save"  },
+   { "cut",   "Cut"  },
+   { "copy",  "Copy"  },
+   { "paste", "Paste"  }
 };
 
 /**************************
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_stock.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_stock.h 2 Nov 2005 10:41:03 -0000       1.1
+++ etk_stock.h 20 Nov 2005 10:33:28 -0000      1.2
@@ -9,11 +9,15 @@
  * @{
  */
 
+/* TODO: doc */
 enum _Etk_Stock_Id
 {
    ETK_STOCK_CLOSE,
    ETK_STOCK_OPEN,
    ETK_STOCK_SAVE,
+   ETK_STOCK_CUT,
+   ETK_STOCK_COPY,
+   ETK_STOCK_PASTE,
    ETK_NUM_STOCK_IDS
 };
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_toplevel_widget.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_toplevel_widget.c       11 Nov 2005 22:48:48 -0000      1.7
+++ etk_toplevel_widget.c       20 Nov 2005 10:33:28 -0000      1.8
@@ -64,20 +64,24 @@
 }
 
 /**
- * @brief Gets the size of the toplevel widget
+ * @brief Gets the geometry of the toplevel widget
  * @param toplevel_widget a toplevel widget
- * @param width the location where to set the width of the toplevel widget
- * @param height the location where to set the height of the toplevel widget
+ * @param x the location where to set the x positon of the toplevel widget
+ * @param y the location where to set the y positon of the toplevel widget
+ * @param w the location where to set the width of the toplevel widget
+ * @param h the location where to set the height of the toplevel widget
  */
-void etk_toplevel_widget_size_get(Etk_Toplevel_Widget *toplevel_widget, int 
*width, int *height)
+void etk_toplevel_widget_geometry_get(Etk_Toplevel_Widget *toplevel_widget, 
int *x, int *y, int *w, int *h)
 {
-   if (!toplevel_widget)
+   if (!toplevel_widget || !toplevel_widget->geometry_get)
+   {
+      if (x)  *x = 0;
+      if (y)  *y = 0;
+      if (w)  *w = 0;
+      if (h)  *h = 0;
       return;
-
-   if (width)
-      *width = toplevel_widget->width;
-   if (height)
-      *height = toplevel_widget->height;
+   }
+   toplevel_widget->geometry_get(toplevel_widget, x, y, w, h);
 }
 
 /**
@@ -223,11 +227,10 @@
       return;
 
    toplevel_widget->evas = NULL;
-   toplevel_widget->width = 0;
-   toplevel_widget->height = 0;
    toplevel_widget->focused_widget = NULL;
    toplevel_widget->pointer_stack = NULL;
    toplevel_widget->pointer_set = NULL;
+   toplevel_widget->geometry_get = NULL;
    ETK_WIDGET(toplevel_widget)->toplevel_parent = toplevel_widget;
 
    etk_signal_connect_after("realize", ETK_OBJECT(toplevel_widget), 
ETK_CALLBACK(_etk_toplevel_widget_realize_cb), NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_toplevel_widget.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_toplevel_widget.h       28 Oct 2005 14:06:25 -0000      1.3
+++ etk_toplevel_widget.h       20 Nov 2005 10:33:28 -0000      1.4
@@ -51,8 +51,7 @@
    Etk_Bin bin;
 
    Evas *evas;
-   int width;
-   int height;
+   void (*geometry_get)(Etk_Toplevel_Widget *toplevel_widget, int *x, int *y, 
int *w, int *h);
 
    Etk_Widget *focused_widget;
 
@@ -62,7 +61,7 @@
 
 Etk_Type *etk_toplevel_widget_type_get();
 Evas *etk_toplevel_widget_evas_get(Etk_Toplevel_Widget *toplevel_widget);
-void etk_toplevel_widget_size_get(Etk_Toplevel_Widget *toplevel_widget, int 
*width, int *height);
+void etk_toplevel_widget_geometry_get(Etk_Toplevel_Widget *toplevel_widget, 
int *x, int *y, int *w, int *h);
 
 void etk_toplevel_widget_focused_widget_set(Etk_Toplevel_Widget 
*toplevel_widget, Etk_Widget *widget);
 Etk_Widget *etk_toplevel_widget_focused_widget_get(Etk_Toplevel_Widget 
*toplevel_widget);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_types.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_types.h 13 Nov 2005 12:20:33 -0000      1.14
+++ etk_types.h 20 Nov 2005 10:33:28 -0000      1.15
@@ -97,8 +97,12 @@
 typedef struct _Etk_VSeparator Etk_VSeparator;
 typedef struct _Etk_Menu_Shell Etk_Menu_Shell;
 typedef struct _Etk_Menu Etk_Menu;
+typedef struct _Etk_Menu_Bar Etk_Menu_Bar;
 typedef struct _Etk_Menu_Item Etk_Menu_Item;
 typedef struct _Etk_Menu_Separator Etk_Menu_Separator;
+typedef struct _Etk_Menu_Check_Item Etk_Menu_Check_Item;
+typedef struct _Etk_Menu_Radio_Item Etk_Menu_Radio_Item;
+typedef struct _Etk_Statusbar Etk_Statusbar;
 
 /**
  * @enum Etk_Fill_Policy_Flags
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_widget.c        13 Nov 2005 12:04:05 -0000      1.12
+++ etk_widget.c        20 Nov 2005 10:33:28 -0000      1.13
@@ -231,9 +231,71 @@
 }
 
 /**
+ * @brief Gets the geometry of the widget, relative to the top left corner of 
its toplevel parent
+ * @param widget a widget
+ * @param x the location where to set the x position of the widget
+ * @param y the location where to set the y position of the widget
+ * @param w the location where to set the width of the widget
+ * @param h the location where to set the height of the widget
+ */
+void etk_widget_geometry_get(Etk_Widget *widget, int *x, int *y, int *w, int 
*h)
+{
+   if (!widget)
+   {
+      if (x)  *x = 0;
+      if (y)  *y = 0;
+      if (w)  *w = 0;
+      if (h)  *h = 0;
+      return;
+   }
+   
+   if (x)  *x = widget->geometry.x;
+   if (y)  *y = widget->geometry.y;
+   if (w)  *w = widget->geometry.w;
+   if (h)  *h = widget->geometry.h;
+}
+
+/**
+ * @brief Gets the inner geometry of the widget, relative to the top left 
corner of its toplevel parent
+ * @param widget a widget
+ * @param x the location where to set the inner x position of the widget
+ * @param y the location where to set the inner y position of the widget
+ * @param w the location where to set the inner width of the widget
+ * @param h the location where to set the inner height of the widget
+ */
+void etk_widget_inner_geometry_get(Etk_Widget *widget, int *x, int *y, int *w, 
int *h)
+{
+   if (!widget)
+   {
+      if (x)  *x = 0;
+      if (y)  *y = 0;
+      if (w)  *w = 0;
+      if (h)  *h = 0;
+      return;
+   }
+   
+   if (x)  *x = widget->inner_geometry.x;
+   if (y)  *y = widget->inner_geometry.y;
+   if (w)  *w = widget->inner_geometry.w;
+   if (h)  *h = widget->inner_geometry.h;
+}
+
+/**
+ * @brief Gets the toplevel widget that contains @a widget
+ * @param widget a widget
+ * @return Returns the toplevel widget if @a widget is contained in a toplevel 
widget, NULL on failure
+ */
+Etk_Toplevel_Widget *etk_widget_toplevel_parent_get(Etk_Widget *widget)
+{
+   if (!widget)
+      return NULL;
+   return widget->toplevel_parent;
+}
+
+/**
  * @brief Gets the evas of the toplevel widget that contains @a widget
  * @param widget a widget
- * @return Returns the evas if @a widget is contained by a toplevel widget, 
NULL on failure
+ * @return Returns the evas if @a widget is contained in a toplevel widget, 
NULL on failure
  */
 Evas *etk_widget_toplevel_evas_get(Etk_Widget *widget)
 {
@@ -271,7 +333,7 @@
          widget->theme_group = NULL;
       etk_object_notify(ETK_OBJECT(widget), "theme_group");
    }
-
+   
    if (widget->realized && (!widget->theme_file || !widget->theme_group))
       etk_widget_unrealize(widget);
    else if (widget->theme_file && widget->theme_group)
@@ -382,6 +444,9 @@
 
    if (!widget || !widget->realized)
       return;
+   
+   if (widget->parent && widget->smart_object)
+      etk_widget_member_object_del(ETK_WIDGET(widget->parent), 
widget->smart_object);
 
    while (widget->swallowed_objects)
    {
@@ -774,19 +839,11 @@
    if (!widget || widget->swallowed || !widget->smart_object)
       return;
 
-   /* TODO: remove printf */
-   //printf("Size Alloc: %p %d %d %d %d\n", widget, geometry.x, geometry.y, 
geometry.w, geometry.h);
    if (geometry.x != widget->geometry.x || geometry.y != widget->geometry.y)
-   {
-      //printf("Size Move: Move %p %s %d %d\n", widget, 
ETK_OBJECT(widget)->type->name, geometry.x, geometry.y);
       evas_object_move(widget->smart_object, geometry.x, geometry.y);
-   }
    if (geometry.w != widget->geometry.w || geometry.h != widget->geometry.h || 
widget->need_redraw)
-   {
-      //printf("Size Alloc: Resize %p %s %d %d\n", widget, 
ETK_OBJECT(widget)->type->name, geometry.w, geometry.h);
       evas_object_resize(widget->smart_object, geometry.w, geometry.h);
-   }
-
+   
    etk_signal_emit(_etk_widget_signals[ETK_WIDGET_SIZE_ALLOCATE_SIGNAL], 
ETK_OBJECT(widget), NULL, &geometry);
 }
 
@@ -1081,7 +1138,7 @@
 {
    if (!widget || !object || !widget->smart_object || 
(evas_object_evas_get(object) != etk_widget_toplevel_evas_get(widget)))
       return FALSE;
-
+   
    if (evas_list_find_list(widget->member_objects, object))
       return TRUE;
    widget->member_objects = evas_list_append(widget->member_objects, object);
@@ -1660,6 +1717,9 @@
    event.timestamp = evas_event->timestamp;
 
    etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_DOWN_SIGNAL], 
ETK_OBJECT(widget), NULL, &event);
+   
+   if (!widget->repeat_events)
+      etk_widget_event_propagation_stop();
 }
 
 /* Called when the widget is pressed */
@@ -1706,6 +1766,9 @@
    if (evas_event->canvas.x >= widget->geometry.x && evas_event->canvas.x <= 
widget->geometry.x + widget->geometry.w &&
          evas_event->canvas.y >= widget->geometry.y && evas_event->canvas.y <= 
widget->geometry.y + widget->geometry.h)
       etk_signal_emit(_etk_widget_signals[ETK_WIDGET_MOUSE_CLICKED_SIGNAL], 
ETK_OBJECT(widget), NULL, &event);
+   
+   if (!widget->repeat_events)
+      etk_widget_event_propagation_stop();
 }
 
 /* Called when the mouse wheel is used over the widget */
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_widget.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_widget.h        11 Nov 2005 22:48:48 -0000      1.9
+++ etk_widget.h        20 Nov 2005 10:33:28 -0000      1.10
@@ -192,7 +192,10 @@
 
 void etk_widget_name_set(Etk_Widget *widget, const char *name);
 const char *etk_widget_name_get(Etk_Widget *widget);
+void etk_widget_geometry_get(Etk_Widget *widget, int *x, int *y, int *w, int 
*h);
+void etk_widget_inner_geometry_get(Etk_Widget *widget, int *x, int *y, int *w, 
int *h);
 
+Etk_Toplevel_Widget *etk_widget_toplevel_parent_get(Etk_Widget *widget);
 Evas *etk_widget_toplevel_evas_get(Etk_Widget *widget);
 void etk_widget_theme_set(Etk_Widget *widget, const char *theme_file, const 
char *theme_group);
 void etk_widget_realize(Etk_Widget *widget);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_window.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_window.c        13 Nov 2005 12:04:05 -0000      1.5
+++ etk_window.c        20 Nov 2005 10:33:28 -0000      1.6
@@ -26,6 +26,7 @@
 static void _etk_window_delete_request_cb(Ecore_Evas *ecore_evas);
 static void _etk_window_size_request_cb(Etk_Window *window, Etk_Size 
*requisition, void *data);
 static Etk_Bool _etk_window_delete_event_handler(Etk_Window *window);
+static void _etk_window_toplevel_geometry_get(Etk_Toplevel_Widget *toplevel, 
int *x, int *y, int *w, int *h);
 static void _etk_window_pointer_set(Etk_Toplevel_Widget *toplevel_widget, 
Etk_Pointer_Type pointer_type);
 
 static Etk_Signal *_etk_window_signals[ETK_WINDOW_NUM_SIGNALS];
@@ -321,8 +322,13 @@
    for (i = 0; i < num_states; i++)
    {
       if (states[i] == ECORE_X_WINDOW_STATE_SKIP_TASKBAR)
+      {
+         free(states);
          return TRUE;
+      }
    }
+   if (num_states > 0)
+      free(states);
    return FALSE;
 }
 
@@ -382,11 +388,28 @@
    for (i = 0; i < num_states; i++)
    {
       if (states[i] == ECORE_X_WINDOW_STATE_SKIP_PAGER)
+      {
+         free(states);
          return TRUE;
+      }
    }
+   if (num_states > 0)
+      free(states);
    return FALSE;
 }
 
+/**
+ * @brief A utility function to use as a callback for the "delete_event" 
signal. It will hide the window and return TRUE to prevent the program to quit
+ * @param window the window to hide
+ * @param data the data passed when the signal is emitted - unused
+ * @return Return TRUE so the the program won't quit
+ */
+Etk_Bool etk_window_hide_on_delete(Etk_Object *window, void *data)
+{
+   etk_widget_hide(ETK_WIDGET(window));
+   return TRUE;
+}
+
 /**************************
  *
  * Etk specific functions
@@ -405,6 +428,7 @@
    window->x_window = ecore_evas_software_x11_window_get(window->ecore_evas);
    ETK_TOPLEVEL_WIDGET(window)->evas = ecore_evas_get(window->ecore_evas);
    ETK_TOPLEVEL_WIDGET(window)->pointer_set = _etk_window_pointer_set;
+   ETK_TOPLEVEL_WIDGET(window)->geometry_get = 
_etk_window_toplevel_geometry_get;
 
    /* TODO: font path */
    evas_font_path_append(ETK_TOPLEVEL_WIDGET(window)->evas, PACKAGE_DATA_DIR 
"/fonts/");
@@ -439,14 +463,9 @@
 static void _etk_window_resize_cb(Ecore_Evas *ecore_evas)
 {
    Etk_Window *window;
-   int w, h;
 
    if (!(window = ETK_WINDOW(ecore_evas_data_get(ecore_evas, "etk_window"))))
       return;
-
-   ecore_evas_geometry_get(window->ecore_evas, NULL, NULL, &w, &h);
-   ETK_TOPLEVEL_WIDGET(window)->width = w;
-   ETK_TOPLEVEL_WIDGET(window)->height = h;
    etk_widget_redraw_queue(ETK_WIDGET(window));
 }
 
@@ -471,7 +490,7 @@
 
    if (window && requisition && requisition->w >= 0 && requisition->h >= 0)
    {
-      etk_toplevel_widget_size_get(ETK_TOPLEVEL_WIDGET(window), &w, &h);
+      ecore_evas_geometry_get(window->ecore_evas, NULL, NULL, &w, &h);
       if (w < requisition->w || h < requisition->h)
          ecore_evas_resize(window->ecore_evas, ETK_MAX(w, requisition->w), 
ETK_MAX(h, requisition->h));
       ecore_evas_size_min_set(window->ecore_evas, requisition->w, 
requisition->h);
@@ -484,6 +503,12 @@
    return FALSE;
 }
 
+/* Gets the geometry of the window toplevel widget */
+static void _etk_window_toplevel_geometry_get(Etk_Toplevel_Widget *toplevel, 
int *x, int *y, int *w, int *h)
+{
+   etk_window_geometry_get(ETK_WINDOW(toplevel), x, y, w, h);
+}
+
 /* Sets the mouse pointer of the window */
 static void _etk_window_pointer_set(Etk_Toplevel_Widget *toplevel_widget, 
Etk_Pointer_Type pointer_type)
 {
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_window.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_window.h        11 Nov 2005 22:48:48 -0000      1.2
+++ etk_window.h        20 Nov 2005 10:33:28 -0000      1.3
@@ -61,6 +61,8 @@
 void etk_window_skip_pager_hint_set(Etk_Window *window, Etk_Bool 
skip_pager_hint);
 Etk_Bool etk_window_skip_pager_hint_get(Etk_Window *window);
 
+Etk_Bool etk_window_hide_on_delete(Etk_Object *window, void *data);
+
 /** @} */
 
 #endif




-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.  Get Certified Today
Register for a JBoss Training Course.  Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to