Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_box.h ewl_enums.h ewl_events.c ewl_events.h
ewl_filedialog.c ewl_radiobutton.c ewl_table.c ewl_table.h
Log Message:
Updated the docs for table and box. Removed the NONE callback. Added a
placeholder for the paste callback, not sure if this will be around long.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_box.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ewl_box.h 19 Nov 2003 20:18:33 -0000 1.29
+++ ewl_box.h 13 Feb 2004 06:25:20 -0000 1.30
@@ -2,7 +2,7 @@
#define __EWL_BOX_H__
/**
- * @defgroup Ewl_Box Box: The Box Layout Widget.
+ * @defgroup Ewl_Box Box: The Box Layout Container.
* @brief Defines the Ewl_Box class used for laying out Ewl_Widget's in a
* horizontal or vertical line.
*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_enums.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ewl_enums.h 28 Jan 2004 05:09:30 -0000 1.43
+++ ewl_enums.h 13 Feb 2004 06:25:20 -0000 1.44
@@ -14,7 +14,6 @@
*/
enum Ewl_Callback_Type
{
- EWL_CALLBACK_NONE, /**< A placeholder FIXME: Is this necessary still? */
EWL_CALLBACK_EXPOSE, /**< Triggered when the window needs redrawing */
EWL_CALLBACK_REALIZE, /**< Event when a widget is first drawn */
EWL_CALLBACK_UNREALIZE, /**< When a widget is no longer drawn */
@@ -41,6 +40,7 @@
EWL_CALLBACK_APPEARANCE_CHANGED, /**< Theme key of widget changed */
EWL_CALLBACK_WIDGET_ENABLE, /**< Widget has been re-enabled */
EWL_CALLBACK_WIDGET_DISABLE, /**< Widget no longer takes input */
+ EWL_CALLBACK_PASTE, /**< Data is ready to be pasted */
EWL_CALLBACK_MAX /**< Flag to indicate last value */
};
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_events.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- ewl_events.c 15 Jan 2004 17:15:55 -0000 1.48
+++ ewl_events.c 13 Feb 2004 06:25:20 -0000 1.49
@@ -9,9 +9,8 @@
/**
- * ewl_ev_init - initialize the event handlers for dispatching to proper widgets
- *
- * Returns true or false to indicate success in initiating the event filters.
+ * @return Returns true or false to indicate success in initializing events.
+ * @brief Initialize the event handlers for dispatching to proper widgets
*/
int ewl_ev_init(void)
{
@@ -45,17 +44,25 @@
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, ewl_ev_mouse_out,
NULL);
+ /*
+ * Selection callbacks to allow for pasting.
+ */
+ ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY, ewl_ev_paste,
+ NULL);
+
DRETURN_INT(1, DLEVEL_STABLE);
}
/**
- * ewl_ev_window_expose - handles the exposing of a window
- * @_ev: the expose event information
+ * @param data: user specified data passed to the function
+ * @param type: the type of event triggering the function call
+ * @param e: the expose event information
+ * @return Returns no value.
+ * @brief Handles the exposing of a window
*
- * Returns no value. Dispatches the expose event to the appropriate window for
- * handling.
+ * Dispatches the expose event to the appropriate window for handling.
*/
-int ewl_ev_window_expose(void *data, int type, void * _ev)
+int ewl_ev_window_expose(void *data, int type, void * e)
{
/*
* Widgets don't need to know about this usually, but we still need to
@@ -66,7 +73,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
- ev = _ev;
+ ev = e;
embed = ewl_embed_find_by_evas_window(ev->win);
if (!embed)
@@ -79,13 +86,15 @@
}
/**
- * ewl_ev_window_configure - handles configure events that occur in windows
- * @_ev: the configure event information
+ * @param data: user specified data passed to the function
+ * @param type: the type of event triggering the function call
+ * @param e: the configure event information
+ * @return Returns no value.
+ * @brief Handles configure events that occur in windows
*
- * Returns no value. Dispatches a configure even to the appropriate ewl
- * window.
+ * Dispatches a configure even to the appropriate ewl window.
*/
-int ewl_ev_window_configure(void *data, int type, void *_ev)
+int ewl_ev_window_configure(void *data, int type, void *e)
{
/*
* When a configure event occurs, we must update the windows geometry
@@ -95,7 +104,7 @@
Ewl_Window *window;
DENTER_FUNCTION(DLEVEL_STABLE);
- ev = _ev;
+ ev = e;
window = ewl_window_find_window(ev->win);
if (!window)
@@ -116,13 +125,15 @@
}
/**
- * ewl_ev_window_delete - handles delete events that occur to windows
- * @_ev: the delete event information
+ * @param data: user specified data passed to the function
+ * @param type: the type of event triggering the function call
+ * @param e: the delete event information
+ * @return Returns no value.
+ * @brief Handles delete events that occur to windows
*
- * Returns no value. Dispatches the delete event to the appropriate ewl
- * window.
+ * Dispatches the delete event to the appropriate ewl window.
*/
-int ewl_ev_window_delete(void *data, int type, void *_ev)
+int ewl_ev_window_delete(void *data, int type, void *e)
{
/*
* Retrieve the appropriate ewl_window using the x window id that is
@@ -133,7 +144,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
- ev = _ev;
+ ev = e;
window = ewl_window_find_window(ev->win);
if (!window)
@@ -145,13 +156,15 @@
}
/**
- * ewl_ev_key_down - handles key down events in windows
- * @_ev: the key down event information
+ * @param data: user specified data passed to the function
+ * @param type: the type of event triggering the function call
+ * @param e: the key down event information
+ * @return Returns no value.
+ * @brief Handles key down events in windows
*
- * Returns no value. Dispatches the key down event to the appropriate ewl
- * window.
+ * Dispatches the key down event to the appropriate ewl window.
*/
-int ewl_ev_key_down(void *data, int type, void *_ev)
+int ewl_ev_key_down(void *data, int type, void *e)
{
Ewl_Widget *temp;
Ewl_Embed *embed;
@@ -159,7 +172,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
- ev = _ev;
+ ev = e;
embed = ewl_embed_find_by_evas_window(ev->win);
@@ -195,13 +208,15 @@
}
/**
- * ewl_ev_key_up - handles key up events in windows
- * @_ev: the key up event information
+ * @param data: user specified data passed to the function
+ * @param type: the type of event triggering the function call
+ * @param e: the key up event information
+ * @return Returns no value.
+ * @brief Handles key up events in windows
*
- * Returns no value. Dispatches the key up event to the appropriate ewl
- * window.
+ * Dispatches the key up event to the appropriate ewl window.
*/
-int ewl_ev_key_up(void *data, int type, void *_ev)
+int ewl_ev_key_up(void *data, int type, void *e)
{
Ewl_Widget *temp;
Ewl_Embed *embed;
@@ -209,7 +224,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
- ev = _ev;
+ ev = e;
embed = ewl_embed_find_by_evas_window(ev->win);
if (!embed)
@@ -233,13 +248,16 @@
/**
- * ewl_ev_mouse_down - handles mouse down events in windows
- * @_ev: the mouse down event information
+ * @param data: user specified data passed to the function
+ * @param type: the type of event triggering the function call
+ * @param e: the mouse down event information
+ * @return Returns no value.
+ * @brief Handles mouse down events in windows
*
- * Returns no value. Dispatches the mouse down event to the appropriate ewl
- * window. Also determines the widgets clicked state.
+ * Dispatches the mouse down event to the appropriate ewl window.
+ * Also determines the widgets clicked state.
*/
-int ewl_ev_mouse_down(void *data, int type, void *_ev)
+int ewl_ev_mouse_down(void *data, int type, void *e)
{
Ewl_Widget *widget = NULL;
Ewl_Widget *temp = NULL;
@@ -248,7 +266,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
- ev = _ev;
+ ev = e;
embed = ewl_embed_find_by_evas_window(ev->win);
if (!embed)
@@ -312,13 +330,16 @@
/**
- * ewl_ev_mouse_up - handles mouse up events in windows
- * @_ev: the mouse up event information
+ * @param data: user specified data passed to the function
+ * @param type: the type of event triggering the function call
+ * @param e: the mouse up event information
+ * @return Returns no value.
+ * @brief Handles mouse up events in windows
*
- * Returns no value. Dispatches the mouse up event to the appropriate ewl
- * window. Also determines the widgets clicked state.
+ * Dispatches the mouse up event to the appropriate ewl window.
+ * Also determines the widgets clicked state.
*/
-int ewl_ev_mouse_up(void *data, int type, void *_ev)
+int ewl_ev_mouse_up(void *data, int type, void *e)
{
Ewl_Widget *temp;
Ewl_Embed *embed;
@@ -326,7 +347,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
- ev = _ev;
+ ev = e;
embed = ewl_embed_find_by_evas_window(ev->win);
if (!embed)
@@ -355,13 +376,15 @@
/**
- * ewl_ev_mouse_move - handles mouse move events in windows
- * @_ev: the mouse move event information
+ * @param data: user specified data passed to the function
+ * @param type: the type of event triggering the function call
+ * @param e: the mouse move event information
+ * @return Returns no value.
+ * @brief Handles mouse move events in windows
*
- * Returns no value. Dispatches the mouse move event to the appropriate ewl
- * window.
+ * Dispatches the mouse move event to the appropriate ewl window.
*/
-int ewl_ev_mouse_move(void *data, int type, void *_ev)
+int ewl_ev_mouse_move(void *data, int type, void *e)
{
Ewl_Widget *widget;
Ewl_Embed *embed;
@@ -369,7 +392,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
- ev = _ev;
+ ev = e;
embed = ewl_embed_find_by_evas_window(ev->win);
if (!embed)
@@ -435,13 +458,15 @@
}
/**
- * ewl_ev_mouse_out - handles the mouse out events in windows
- * @_ev: the mouse out event information
+ * @param data: user specified data passed to the function
+ * @param type: the type of event triggering the function call
+ * @param e: the mouse out event information
+ * @return Returns no value.
+ * @brief Handles the mouse out events in windows
*
- * Returns no value. Dispatches the mouse out event to the appropriate ewl
- * window.
+ * Dispatches the mouse out event to the appropriate ewl window.
*/
-int ewl_ev_mouse_out(void *data, int type, void *_ev)
+int ewl_ev_mouse_out(void *data, int type, void *e)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -452,3 +477,21 @@
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
+
+/**
+ * @param data: user specified data passed to the function
+ * @param type: the type of event triggering the function call
+ * @param e: the mouse out event information
+ * @return Returns no value.
+ * @brief Handles the data for a paste becoming available in windows
+ *
+ * Dispatches the mouse out event to the appropriate ewl window.
+ */
+int ewl_ev_paste(void *data, int type, void *e)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+
+ printf("Paste event received\n");
+
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_events.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_events.h 13 Jul 2003 05:52:49 -0000 1.13
+++ ewl_events.h 13 Feb 2004 06:25:20 -0000 1.14
@@ -1,7 +1,13 @@
-
#ifndef __EWL_EVENTS_H__
#define __EWL_EVENTS_H__
+/**
+ * @defgroup Ewl_Events Events: Lower Level Event Handlers
+ * @brief Defines the routines that dispatch the lower level events to EWL.
+ *
+ * @{
+ */
+
int ewl_ev_init(void);
int ewl_ev_window_expose(void *data, int type, void *_ev);
@@ -14,5 +20,10 @@
int ewl_ev_mouse_up(void *data, int type, void *_ev);
int ewl_ev_mouse_move(void *data, int type, void *_ev);
int ewl_ev_mouse_out(void *data, int type, void *_ev);
+int ewl_ev_paste(void *data, int type, void *_ev);
+
+/**
+ * @}
+ */
#endif /* __EWL_EVENTS_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_filedialog.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ewl_filedialog.c 11 Feb 2004 18:17:32 -0000 1.29
+++ ewl_filedialog.c 13 Feb 2004 06:25:20 -0000 1.30
@@ -3,8 +3,6 @@
/**
* @param type: type of dialog to display
- * @param ok_cb: callback to be called when open/save button is pushed
- * @param cancel_cb: callback to be called when cancel button is pushed
* @return Returns a new filedialog in success, NULL on failure.
* @brief Create a new filedialog
*/
@@ -27,8 +25,6 @@
/**
* @param fd: the filedialog
* @param type: the filedialog type
- * @param ok_cb: the callback to call when open/save button is pushed
- * @param cancel_cb: the callback to call when cancel button is pushed
* @return Returns no value.
* @brief Initialize a new filedialog
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_radiobutton.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ewl_radiobutton.c 10 Feb 2004 05:46:02 -0000 1.30
+++ ewl_radiobutton.c 13 Feb 2004 06:25:20 -0000 1.31
@@ -22,8 +22,8 @@
}
/**
- * @param w: the radio button to be added to a chain of radio buttons
- * @param c: a radio button already in the chain of radio buttons
+ * @param rb: the radio button to be added to a chain of radio buttons
+ * @param crb: a radio button already in the chain of radio buttons
* @return Returns no value.
* @brief Attach the button to a chain of radio buttons
*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_table.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_table.c 19 Nov 2003 20:18:36 -0000 1.38
+++ ewl_table.c 13 Feb 2004 06:25:20 -0000 1.39
@@ -3,13 +3,12 @@
/**
- * ewl_table_new - create a new table
- * @cols: the number of columns
- * @rows: the number of rows
- * @col_headers: the column titles
+ * @param cols: the number of columns
+ * @param rows: the number of rows
+ * @param col_headers: the column titles
+ * @return Returns a a newl table on success, NULL on failure.
+ * @brief Create a new table
*
- * Returns a pointer to a newly allocated table on success, NULL on
- * failure.
*/
Ewl_Widget *ewl_table_new(int cols, int rows, char **col_headers)
{
@@ -21,18 +20,21 @@
if (!t)
DRETURN_PTR(NULL, DLEVEL_STABLE);
+ ewl_table_init(t, cols, rows, col_headers);
+
DRETURN_PTR(EWL_WIDGET(t), DLEVEL_STABLE);
}
/**
- * ewl_table_init - initialize table to starting values
- * @t: the table
- * @cols: the number of columns
- * @rows: the number of rows
- * @col_headers: the column titles
+ * @param t: the table
+ * @param cols: the number of columns
+ * @param rows: the number of rows
+ * @param col_headers: the column titles
+ * @return Returns no value.
+ * @brief Initialize table to starting values
*
- * Returns no value. Responsible for setting up default values and
- * callbacks withing the table structure
+ * Responsible for setting up default values and callbacks withing the table
+ * structure
*/
void ewl_table_init(Ewl_Table * t, int cols, int rows, char **col_headers)
{
@@ -93,16 +95,14 @@
/**
- * ewl_table_add - add a child widget to the table
- * @table: the table
- * @cell: the cell to add
- * @dm_click: callback function to be called on double mouse click
- * @start_col: the start column
- * @end_col: the end columnt
- * @start_row: the start row
- * @end_row: the end row
- *
- * Returns no value.
+ * @param table: the table
+ * @param cell: the cell to add
+ * @param start_col: the start column
+ * @param end_col: the end columnt
+ * @param start_row: the start row
+ * @param end_row: the end row
+ * @return Returns no value.
+ * @brief Add a child widget to the table
*/
void
ewl_table_add(Ewl_Table * table, Ewl_Cell * cell,
@@ -128,16 +128,14 @@
/**
- * ewl_table_get_col_row - get the column and row of a widget
- * @t: the table
- * @cell: the cell to add
- * @w: the widget to find
- * @start_col: integer pointer to store the start column
- * @end_col: integer pointer to store the end column in
- * @start_row: integer pointer to store the start row in
- * @end_row: integer pointer to store the end row in
- *
- * Returns nothing
+ * @param t: the table
+ * @param cell: the cell to add
+ * @param start_col: integer pointer to store the start column
+ * @param end_col: integer pointer to store the end column in
+ * @param start_row: integer pointer to store the start row in
+ * @param end_row: integer pointer to store the end row in
+ * @return Returns nothing
+ * @brief Get the column and row of a widget
*/
void ewl_table_get_col_row(Ewl_Table * t, Ewl_Cell * cell,
int *start_col, int *end_col, int *start_row,
@@ -187,14 +185,13 @@
/**
- * ewl_table_find - get a list of the widgets in the specified col/row
- * @t: the table
- * @start_col: the start column
- * @end_col: the end column
- * @start_row: the start row
- * @end_row: the end row
- *
- * Returns Ewd_List of widgets found in the specified col/row area
+ * @param t: the table
+ * @param start_col: the start column
+ * @param end_col: the end column
+ * @param start_row: the start row
+ * @param end_row: the end row
+ * @return Returns Ewd_List of widgets found in the specified col/row area.
+ * @brief Get a list of the widgets in the specified col/row
*/
Ewd_List *ewl_table_find(Ewl_Table * t, int start_col, int end_col,
int start_row, int end_row)
@@ -236,12 +233,11 @@
/**
- * ewl_table_set_col_w - set the width of a table column
- * @table: the table
- * @col: the column
- * @width: the new width
- *
- * Returns no value.
+ * @param table: the table
+ * @param col: the column
+ * @param width: the new width
+ * @return Returns no value.
+ * @brief Set the width of a table column
*/
void ewl_table_set_col_w(Ewl_Table * table, int col, int width)
{
@@ -261,12 +257,11 @@
}
/**
- * ewl_table_get_col_w - get the width of a table column
- * @table: the table
- * @col: the column
- * @width: integer pointer to store the width in
- *
- * Returns no value.
+ * @param table: the table
+ * @param col: the column
+ * @param width: integer pointer to store the width in
+ * @return Returns no value.
+ * @brief Get the width of a table column
*/
void ewl_table_get_col_w(Ewl_Table * table, int col, int *width)
{
@@ -286,12 +281,11 @@
/**
- * ewl_table_set_row_h - set the height of a table row
- * @table: the table
- * @row: the row
- * @height: the new height
- *
- * Returns no value.
+ * @param table: the table
+ * @param row: the row
+ * @param height: the new height
+ * @return Returns no value.
+ * @brief Set the height of a table row
*/
void ewl_table_set_row_h(Ewl_Table * table, int row, int height)
{
@@ -311,12 +305,11 @@
}
/**
- * ewl_table_get_row_h - get the height of a table row
- * @table: the table
- * @row: the row
- * @height: integer pointer to store the height in
- *
- * Returns no value.
+ * @param table: the table
+ * @param row: the row
+ * @param height: integer pointer to store the height in
+ * @return Returns no value.
+ * @brief Get the height of a table row
*/
void ewl_table_get_row_h(Ewl_Table * table, int row, int *height)
{
@@ -336,13 +329,12 @@
/**
- * ewl_table_reset - clear the table and set new geometry
- * @t: the table
- * @cols: the new number of columns
- * @rows: the new number of columns
- * @col_headers: the new column headers
- *
- * Returns no value
+ * @param t: the table
+ * @param cols: the new number of columns
+ * @param rows: the new number of columns
+ * @param col_headers: the new column headers
+ * @return Returns no value
+ * @brief Clear the table and set new geometry
*/
void ewl_table_reset(Ewl_Table * t, int cols, int rows, char **col_headers)
{
@@ -377,10 +369,9 @@
/**
- * ewl_table_get_selected - get the text in the current selected box
- * @t: the table
- *
- * Returns the text in the currently selected widget in the table
+ * @param t: the table
+ * @return Returns the text in the currently selected widget in the table
+ * @brief Get the text in the current selected box
*/
char *ewl_table_get_selected(Ewl_Table * t)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_table.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_table.h 14 Jan 2004 20:42:54 -0000 1.17
+++ ewl_table.h 13 Feb 2004 06:25:20 -0000 1.18
@@ -1,15 +1,31 @@
-
#ifndef __EWL_TABLE_H__
#define __EWL_TABLE_H__
-/*
+/**
+ * @defgroup Ewl_Table Table: The Table Layout Container.
+ * @brief Defines the Ewl_Box class used for laying out Ewl_Widget's in a
+ * horizontal or vertical line.
+ *
+ * @{
+ */
+
+/**
* @themekey /table/file
* @themekey /table/group
*/
+/**
+ * The table widget is an Ewl_Container used to lay out widgets in a grid like
+ * pattern with headers and alignment.
+ */
typedef struct Ewl_Table Ewl_Table;
+/**
+ * @def EWL_TABLE(table)
+ * Typecase a pointer to an Ewl_Table pointer.
+ */
#define EWL_TABLE(table) ((Ewl_Table *)table)
+
struct Ewl_Table
{
Ewl_Container container;
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
