E CVS: libs/ecore sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_dbus
Modified Files:
Ecore_DBus.h ecore_dbus.c ecore_dbus_message.c
ecore_dbus_methods.c ecore_dbus_private.h
Log Message:
Use callbacks for method return, not events
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/Ecore_DBus.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Ecore_DBus.h27 Jul 2006 13:29:43 - 1.13
+++ Ecore_DBus.h27 Jul 2006 15:06:13 - 1.14
@@ -36,8 +36,10 @@
typedef struct _Ecore_DBus_Event_Server_Add Ecore_DBus_Event_Server_Add;
typedef struct _Ecore_DBus_Event_Server_Del Ecore_DBus_Event_Server_Del;
typedef struct _Ecore_DBus_Event_Server_Data Ecore_DBus_Event_Server_Data;
- typedef struct _Ecore_DBus_Event_Arg Ecore_DBus_Event_Arg;
+ typedef struct _Ecore_DBus_Event_Server_Data Ecore_DBus_Event_Server_Signal;
+ typedef struct _Ecore_DBus_Event_Server_Data Ecore_DBus_Method_Return;
typedef struct _Ecore_DBus_Message Ecore_DBus_Message;
+ typedef struct _Ecore_DBus_Message_Arg Ecore_DBus_Message_Arg;
typedef struct _Ecore_DBus_Message_Field Ecore_DBus_Message_Field;
typedef enum _Ecore_DBus_Type
@@ -106,10 +108,10 @@
const char *sender;
const char *signature;
} header;
- Ecore_DBus_Event_Arg *args;
+ Ecore_DBus_Message_Arg *args;
};
- struct _Ecore_DBus_Event_Arg
+ struct _Ecore_DBus_Message_Arg
{
Ecore_DBus_Data_Type type;
void *value;
@@ -130,10 +132,10 @@
EAPI extern int ECORE_DBUS_EVENT_SERVER_ADD;
EAPI extern int ECORE_DBUS_EVENT_SERVER_DEL;
- EAPI extern int ECORE_DBUS_EVENT_SERVER_METHOD_RETURN;
- EAPI extern int ECORE_DBUS_EVENT_SERVER_ERROR;
EAPI extern int ECORE_DBUS_EVENT_SERVER_SIGNAL;
- EAPI extern int ECORE_DBUS_EVENT_SERVER_DATA;
+
+ /* callback */
+ typedef void (*Ecore_DBus_Method_Cb)(void *data, Ecore_DBus_Message_Type
type, Ecore_DBus_Method_Return *reply);
/* init */
EAPI int ecore_dbus_init(void);
@@ -146,21 +148,28 @@
/* message */
EAPI int ecore_dbus_server_send(Ecore_DBus_Server *svr, char
*command, int length);
- EAPI unsigned int ecore_dbus_message_new_method_call(Ecore_DBus_Server
*svr, char *destination, char *path, char *interface, char *method, char *fmt,
...);
+ EAPI unsigned int ecore_dbus_message_new_method_call(Ecore_DBus_Server
*svr,
+char *destination,
char *path,
+char *interface, char
*method,
+void (*method_cb)(void
*udata,
+
Ecore_DBus_Message_Type type,
+
Ecore_DBus_Event_Server_Data *data),
+void *data,
+char *fmt, ...);
EAPI void ecore_dbus_message_del(Ecore_DBus_Message *msg);
EAPI void ecore_dbus_message_print(Ecore_DBus_Message *msg);
EAPI void *ecore_dbus_message_header_field_get(Ecore_DBus_Message
*msg, Ecore_DBus_Message_Header_Field field);
EAPI void *ecore_dbus_message_body_field_get(Ecore_DBus_Message
*msg, unsigned int pos);
/* methods */
- EAPI int ecore_dbus_method_hello(Ecore_DBus_Server *svr);
- EAPI int ecore_dbus_method_list_names(Ecore_DBus_Server *svr);
- EAPI int ecore_dbus_method_name_has_owner(Ecore_DBus_Server *svr, char
*name);
- EAPI int ecore_dbus_method_start_service_by_name(Ecore_DBus_Server *svr,
char *name, unsigned int flags);
- EAPI int ecore_dbus_method_get_name_owner(Ecore_DBus_Server *svr, char
*name);
- EAPI int ecore_dbus_method_get_connection_unix_user(Ecore_DBus_Server *svr,
char *connection);
- EAPI int ecore_dbus_method_add_match(Ecore_DBus_Server *svr, char *match);
- EAPI int ecore_dbus_method_remove_match(Ecore_DBus_Server *svr, char
*match);
+ EAPI int ecore_dbus_method_hello(Ecore_DBus_Server *svr,
Ecore_DBus_Method_Cb method_cb, void *data);
+ EAPI int ecore_dbus_method_list_names(Ecore_DBus_Server *svr,
Ecore_DBus_Method_Cb method_cb, void *data);
+ EAPI int ecore_dbus_method_name_has_owner(Ecore_DBus_Server *svr, char
*name, Ecore_DBus_Method_Cb method_cb, void *data);
+ EAPI int ecore_dbus_method_start_service_by_name(Ecore_DBus_Server *svr,
char *name, unsigned int flags, Ecore_DBus_Method_Cb method_cb, void *data);
+ EAPI int ecore_dbus_method_get_name_owner(Ecore_DBus_Server *svr, char
*name, Ecore_DBus_Method_Cb method_cb, void *data);
+ EAPI int
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_software_x11 Modified Files: ecore_evas_software_x11.c Log Message: * Remove the #ifdef HAVE_ECORE_X since we don't need them anymore with the engines * Big API break in Etk_Window: - etk_window_[de]iconify() -- etk_window_iconified_set/get() - etk_window_[un]maximize() -- etk_window_maximized_set/get() - etk_window_[un]fullscreen() -- etk_window_fullsreen_set/get() - etk_window_[un]focus() -- etk_window_focused_set/get() === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_software_x11/ecore_evas_software_x11.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ecore_evas_software_x11.c 27 Jul 2006 21:07:52 - 1.4 +++ ecore_evas_software_x11.c 28 Jul 2006 00:57:05 - 1.5 @@ -55,22 +55,18 @@ NULL, /* window_center_on_window */ NULL, /* window_move_to_mouse */ NULL, /* window_modal_for_window */ - NULL, /* window_iconify */ - NULL, /* window_deiconify */ - NULL, /* window_is_iconified */ - NULL, /* window_maximize */ - NULL, /* window_unmaximize */ - NULL, /* window_is_maximized */ - NULL, /* window_fullscreen */ - NULL, /* window_unfullscreen */ - NULL, /* window_is_fullscreen */ + NULL, /* window_iconified_set */ + NULL, /* window_iconified_get */ + NULL, /* window_maximized_set */ + NULL, /* window_maximized_get */ + NULL, /* window_fullscreen_set */ + NULL, /* window_fullscreen_get */ NULL, /* window_raise */ NULL, /* window_lower */ NULL, /* window_sticky_set */ NULL, /* window_sticky_get */ - NULL, /* window_focus */ - NULL, /* window_unfocus */ - NULL, /* window_if_focised */ + NULL, /* window_focused_set */ + NULL, /* window_focused_get */ NULL, /* window_decorated_set */ NULL, /* window_decorated_get */ NULL, /* window_shaped_set */ @@ -80,6 +76,7 @@ NULL, /* window_skip_pager_hint_set */ NULL, /* window_skip_pager_hint_get */ NULL, /* window_dnd_aware_set */ + NULL, /* window_dnd_aware_get */ NULL, /* window_pointer_set */ NULL, /* popup_window_constructor */ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas
Modified Files:
Etk_Engine_Ecore_Evas.h ecore_evas.c
Log Message:
* Remove the #ifdef HAVE_ECORE_X since we don't need them anymore with the
engines
* Big API break in Etk_Window:
- etk_window_[de]iconify() -- etk_window_iconified_set/get()
- etk_window_[un]maximize() -- etk_window_maximized_set/get()
- etk_window_[un]fullscreen() -- etk_window_fullsreen_set/get()
- etk_window_[un]focus() -- etk_window_focused_set/get()
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/Etk_Engine_Ecore_Evas.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Etk_Engine_Ecore_Evas.h 27 Jul 2006 00:54:56 - 1.1
+++ Etk_Engine_Ecore_Evas.h 28 Jul 2006 00:57:05 - 1.2
@@ -4,11 +4,9 @@
#define ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(data)
((Etk_Engine_Ecore_Evas_Window_Data*)data)
/* Engine specific data for Etk_Window */
-typedef struct _Etk_Engine_Ecore_Evas_Window_Data
Etk_Engine_Ecore_Evas_Window_Data;
-
-struct _Etk_Engine_Ecore_Evas_Window_Data
+typedef struct Etk_Engine_Ecore_Evas_Window_Data
{
Ecore_Evas *ecore_evas;
-};
+} Etk_Engine_Ecore_Evas_Window_Data;
#endif
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/ecore_evas.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_evas.c27 Jul 2006 21:07:52 - 1.5
+++ ecore_evas.c28 Jul 2006 00:57:05 - 1.6
@@ -28,22 +28,18 @@
static void _window_resize(Etk_Window *window, int w, int h);
static void _window_size_min_set(Etk_Window *window, int w, int h);
static void _window_geometry_get(Etk_Window *window, int *x, int *y, int *w,
int *h);
-static void _window_iconify(Etk_Window *window);
-static void _window_deiconify(Etk_Window *window);
-static Etk_Bool _window_is_iconified(Etk_Window *window);
-static void _window_maximize(Etk_Window *window);
-static void _window_unmaximize(Etk_Window *window);
-static Etk_Bool _window_is_maximized(Etk_Window *window);
-static void _window_fullscreen(Etk_Window *window);
-static void _window_unfullscreen(Etk_Window *window);
-static Etk_Bool _window_is_fullscreen(Etk_Window *window);
+static void _window_iconified_set(Etk_Window *window, Etk_Bool iconified);
+static Etk_Bool _window_iconified_get(Etk_Window *window);
+static void _window_maximized_set(Etk_Window *windo, Etk_Bool maximized);
+static Etk_Bool _window_maximized_get(Etk_Window *window);
+static void _window_fullscreen_set(Etk_Window *window, Etk_Bool focused);
+static Etk_Bool _window_fullscreen_get(Etk_Window *window);
static void _window_raise(Etk_Window *window);
static void _window_lower(Etk_Window *window);
static void _window_sticky_set(Etk_Window *window, Etk_Bool on);
static Etk_Bool _window_sticky_get(Etk_Window *window);
-static void _window_focus(Etk_Window *window);
-static void _window_unfocus(Etk_Window *window);
-static Etk_Bool _window_is_focused(Etk_Window *window);
+static void _window_focused_set(Etk_Window *window, Etk_Bool focused);
+static Etk_Bool _window_focused_get(Etk_Window *window);
static void _window_decorated_set(Etk_Window *window, Etk_Bool decorated);
static Etk_Bool _window_decorated_get(Etk_Window *window);
static void _window_shaped_set(Etk_Window *window, Etk_Bool shaped);
@@ -54,8 +50,7 @@
static void _window_resize_cb(Ecore_Evas *ecore_evas);
static void _window_focus_in_cb(Ecore_Evas *ecore_evas);
static void _window_focus_out_cb(Ecore_Evas *ecore_evas);
-static void _window_sticky_cb(Ecore_Evas *ecore_evas);
-static void _window_unsticky_cb(Ecore_Evas *ecore_evas);
+static void _window_sticky_changed_cb(Ecore_Evas *ecore_evas);
static void _window_delete_request_cb(Ecore_Evas *ecore_evas);
static Etk_Engine engine_info = {
@@ -69,36 +64,32 @@
_engine_shutdown,
_window_constructor,
- _window_destructor,
+ _window_destructor,
_window_show,
_window_hide,
_window_evas_get,
_window_title_set,
- _window_title_get,
+ _window_title_get,
_window_wmclass_set,
_window_move,
_window_resize,
- _window_size_min_set,
+ _window_size_min_set,
_window_geometry_get,
NULL, /* window_center_on_window */
NULL, /* window_move_to_mouse */
NULL, /* window_modal_for_window */
- _window_iconify,
- _window_deiconify,
- _window_is_iconified,
- _window_maximize,
- _window_unmaximize,
- _window_is_maximized,
- _window_fullscreen,
- _window_unfullscreen,
- _window_is_fullscreen,
+ _window_iconified_set,
+ _window_iconified_get,
+ _window_maximized_set,
+ _window_maximized_get,
+ _window_fullscreen_set,
+ _window_fullscreen_get,
_window_raise,
_window_lower,
_window_sticky_set,
_window_sticky_get,
-
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_x11 Modified Files: ecore_evas_x11.c Log Message: * Clean up the engine code and more comments to etk_engine.c === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ecore_evas_x11.c28 Jul 2006 00:57:05 - 1.8 +++ ecore_evas_x11.c28 Jul 2006 02:13:07 - 1.9 @@ -23,7 +23,7 @@ typedef Etk_Engine_Ecore_Evas_X11_Window_Data Etk_Engine_Window_Data; static Ecore_Event_Handler *_window_property_handler = NULL; static int _window_property_cb(void *data, int ev_type, void *ev); - + /* Engine specific data for Etk_Popup_Window */ static Ecore_X_Window _etk_popup_window_input_window = 0; static Ecore_Event_Handler *_popup_window_key_down_handler = NULL; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_engine.c etk_window.c
Log Message:
* Clean up the engine code and more comments to etk_engine.c
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_engine.c28 Jul 2006 00:57:05 - 1.5
+++ etk_engine.c28 Jul 2006 02:13:07 - 1.6
@@ -228,6 +228,10 @@
*
**/
+/**
+ * @brief Calls the engine's method to initialize a window
+ * @param window a window
+ */
void etk_engine_window_constructor(Etk_Window *window)
{
if (!_engine || !_engine-window_constructor)
@@ -235,6 +239,10 @@
_engine-window_constructor(window);
}
+/**
+ * @brief Calls the engine's method to destroy a window
+ * @param window a window
+ */
void etk_engine_window_destructor(Etk_Window *window)
{
if (!_engine || !_engine-window_destructor)
@@ -242,6 +250,10 @@
_engine-window_destructor(window);
}
+/**
+ * @brief Calls the engines's method to show a window
+ * @param window a window
+ */
void etk_engine_window_show(Etk_Window *window)
{
if (!_engine || !_engine-window_show)
@@ -249,6 +261,10 @@
_engine-window_show(window);
}
+/**
+ * @brief Calls the engines's method to hide a window
+ * @param window a window
+ */
void etk_engine_window_hide(Etk_Window *window)
{
if (!_engine || !_engine-window_hide)
@@ -256,6 +272,11 @@
_engine-window_hide(window);
}
+/**
+ * @brief Calls the engines's method to get the evas of a window
+ * @param window a window
+ * @return Returns the evas of the window, or NULL on failure
+ */
Evas *etk_engine_window_evas_get(Etk_Window *window)
{
if (!_engine || !_engine-window_evas_get)
@@ -263,6 +284,11 @@
return _engine-window_evas_get(window);
}
+/**
+ * @brief Calls the engines's method to set the title of a window
+ * @param window a window
+ * @param title the title to set to the window
+ */
void etk_engine_window_title_set(Etk_Window *window, const char *title)
{
if (!_engine || !_engine-window_title_set)
@@ -270,6 +296,11 @@
_engine-window_title_set(window, title);
}
+/**
+ * @brief Calls the engines's method to get the title of a window
+ * @param window a window
+ * @return Returns the title of the window, or NULL on failure
+ */
const char *etk_engine_window_title_get(Etk_Window *window)
{
if (!_engine || !_engine-window_title_get)
@@ -277,6 +308,12 @@
return _engine-window_title_get(window);
}
+/**
+ * @brief Calls the engines's method to set the window name and the window
class of a window
+ * @param window a window
+ * @param window_name the window name to set
+ * @param window_class the window class to set
+ */
void etk_engine_window_wmclass_set(Etk_Window *window, const char
*window_name, const char *window_class)
{
if (!_engine || !_engine-window_wmclass_set)
@@ -284,6 +321,12 @@
_engine-window_wmclass_set(window, window_name, window_class);
}
+/**
+ * @brief Calls the engines's method to move a window
+ * @param window a window
+ * @param x the x position
+ * @param y the y position
+ */
void etk_engine_window_move(Etk_Window *window, int x, int y)
{
if (!_engine || !_engine-window_move)
@@ -291,6 +334,12 @@
_engine-window_move(window, x, y);
}
+/**
+ * @brief Calls the engines's method to resize a window
+ * @param window a window
+ * @param w the new width of the window
+ * @param h the new height of the window
+ */
void etk_engine_window_resize(Etk_Window *window, int w, int h)
{
if (!_engine || !_engine-window_resize)
@@ -298,6 +347,12 @@
_engine-window_resize(window, w, h);
}
+/**
+ * @brief Calls the engines's method to set the minimum size of a window
+ * @param window a window
+ * @param w the minimum width of the window
+ * @param h the minimum height of the window
+ */
void etk_engine_window_size_min_set(Etk_Window *window, int w, int h)
{
if (!_engine || !_engine-window_size_min_set)
@@ -305,6 +360,14 @@
_engine-window_size_min_set(window, w, h);
}
+/**
+ * @brief Calls the engines's method to get the geometry of a window
+ * @param window a window
+ * @param x the location where to store the x position of the window
+ * @param y the location where to store the y position of the window
+ * @param w the location where to store the width of the window
+ * @param h the location where to store the height of the window
+ */
void etk_engine_window_geometry_get(Etk_Window *window, int *x, int *y, int
*w, int *h)
{
if (!_engine || !_engine-window_geometry_get)
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_window.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- etk_window.c28 Jul 2006 00:57:05 -
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas
Modified Files:
ecore_evas.c
Log Message:
* Clean up the engine code and more comments to etk_engine.c
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/ecore_evas.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_evas.c28 Jul 2006 00:57:05 - 1.6
+++ ecore_evas.c28 Jul 2006 02:13:06 - 1.7
@@ -122,6 +122,12 @@
NULL /* selection_clear */
};
+/**
+ *
+ * General engine functions
+ *
+ **/
+
Etk_Engine *engine_open()
{
engine_info.engine_data = NULL;
@@ -144,6 +150,12 @@
ecore_evas_shutdown();
}
+/**
+ *
+ * Etk_Window's functions
+ *
+ **/
+
static void _window_constructor(Etk_Window *window)
{
Etk_Engine_Window_Data *engine_data;
@@ -378,7 +390,8 @@
Etk_Engine_Window_Data *engine_data;
engine_data = window-engine_data;
- ecore_evas_shaped_set(engine_data-ecore_evas, shaped);
+ ecore_evas_shaped_set(engine_data-ecore_evas, shaped);
+ etk_object_notify(ETK_OBJECT(window), shaped);
}
static Etk_Bool _window_shaped_get(Etk_Window *window)
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_software_x11
Modified Files:
ecore_evas_software_x11.c
Log Message:
* Clean up the engine code and more comments to etk_engine.c
===
RCS file:
/cvs/e/e17/proto/etk/src/engines/ecore_evas_software_x11/ecore_evas_software_x11.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_evas_software_x11.c 28 Jul 2006 00:57:05 - 1.5
+++ ecore_evas_software_x11.c 28 Jul 2006 02:13:07 - 1.6
@@ -1,17 +1,11 @@
-#include stdio.h
#include string.h
#include stdlib.h
-#include Evas.h
#include Ecore_Evas.h
-#include Ecore_X.h
-#include Ecore_X_Cursor.h
#include etk_types.h
-#include etk_dnd.h
#include etk_engine.h
+#include etk_window.h
#include etk_utils.h
-#include etk_toplevel_widget.h
-#include etk_main.h
#include Etk_Engine_Ecore_Evas.h
#include Etk_Engine_Ecore_Evas_X11.h
@@ -24,9 +18,6 @@
/* General engine functions */
Etk_Engine *engine_open();
-static Etk_Bool _engine_init();
-static void _engine_shutdown();
-
/* Etk_Window functions */
static void _window_constructor(Etk_Window *window);
@@ -36,7 +27,7 @@
NULL, /* engine name */
NULL, /* super (parent) engine */
NULL, /* DL handle */
-
+
NULL, /* engine_init */
NULL, /* engine_shutdown */
@@ -78,27 +69,32 @@
NULL, /* window_dnd_aware_set */
NULL, /* window_dnd_aware_get */
NULL, /* window_pointer_set */
-
+
NULL, /* popup_window_constructor */
NULL, /* popup_window_popup_at_xy */
NULL, /* popup_window_popup */
NULL, /* popup_window_popdown */
NULL, /* popup_window_popped_get */
-
+
NULL, /* drag_constructor */
NULL, /* drag_begin */
-
+
NULL, /* dnd_init */
NULL, /* dnd_shutdown */
-
+
NULL, /* clipboard_text_request */
NULL, /* clipboard_text_set */
-
+
NULL, /* selection_text_request */
NULL, /* selection_text_set */
NULL /* selection_clear */
};
+/**
+ *
+ * Engine general functions
+ *
+ **/
Etk_Engine *engine_open()
{
@@ -108,6 +104,12 @@
return engine_info;
}
+/**
+ *
+ * Etk_Window's functions
+ *
+ **/
+
static void _window_constructor(Etk_Window *window)
{
/* We _MUST_ initialize and create the ecore_evas and the x_window
@@ -117,7 +119,7 @@
engine_data = malloc(sizeof(Etk_Engine_Window_Data));
window-engine_data = engine_data;
- ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(engine_data)-ecore_evas =
ecore_evas_software_x11_new(0, 0, 0, 0, 0, 0);
+ ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(engine_data)-ecore_evas =
ecore_evas_software_x11_new(NULL, 0, 0, 0, 0, 0);
engine_data-x_window =
ecore_evas_software_x11_window_get(ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(engine_data)-ecore_evas);
engine_info.super-window_constructor(window);
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_x11 Added Files: .cvsignore Log Message: * .cvsignore++ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines Added Files: .cvsignore Log Message: * .cvsignore++ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_software_x11 Added Files: .cvsignore Log Message: * .cvsignore++ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas Added Files: .cvsignore Log Message: * .cvsignore++ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/daemon
Modified Files:
Entrance_Edit.h entrance_edit.c entrance_edit_main.c
Log Message:
Fixed condition that would cause entrance_edit2 to fail silently if it didn't
have permission to write to the config file. Now, it fails noisily :).
ecore_config handles this well.
===
RCS file: /cvs/e/e17/apps/entrance/src/daemon/Entrance_Edit.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Entrance_Edit.h 22 Jul 2006 09:25:44 - 1.1
+++ Entrance_Edit.h 28 Jul 2006 02:48:09 - 1.2
@@ -34,6 +34,7 @@
int entrance_edit_init(const char*);
int entrance_edit_shutdown();
+int entrance_edit_save();
void entrance_edit_list();
===
RCS file: /cvs/e/e17/apps/entrance/src/daemon/entrance_edit.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- entrance_edit.c 22 Jul 2006 09:25:44 - 1.1
+++ entrance_edit.c 28 Jul 2006 02:48:09 - 1.2
@@ -20,7 +20,6 @@
static int _entrance_edit_new();
static void _entrance_edit_free();
-static void _entrance_edit_save();
static void _entrance_edit_defaults_set();
int entrance_edit_init(const char *filename)
@@ -59,7 +58,6 @@
int entrance_edit_shutdown()
{
- _entrance_edit_save();
_entrance_edit_free();
ecore_config_shutdown();
ecore_shutdown();
@@ -68,6 +66,16 @@
return 1;
}
+int entrance_edit_save()
+{
+ if(_entrance_edit) {
+ if(ecore_config_file_save(_entrance_edit-config_file) !=
ECORE_CONFIG_ERR_SUCC) {
+ return 0;
+ } else {
+ return 1;
+ }
+ }
+}
void entrance_edit_list()
{
@@ -157,12 +165,6 @@
}
}
-static void _entrance_edit_save()
-{
- if(_entrance_edit) {
- ecore_config_file_save(_entrance_edit-config_file);
- }
-}
static void _entrance_edit_defaults_set()
{
===
RCS file: /cvs/e/e17/apps/entrance/src/daemon/entrance_edit_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- entrance_edit_main.c22 Jul 2006 09:25:44 - 1.1
+++ entrance_edit_main.c28 Jul 2006 02:48:09 - 1.2
@@ -89,7 +89,6 @@
int c;
while((c = getopt_long_only(argc, argv,
:a:A:b:d:e:g:hH:i:I:m:M:n:N:o:p:r:R:s:S:t:T:u:U:x:X:, d_opt, NULL)) != -1) {
-printf(got c: %c\n, c);
switch(c) {
case 'a':
config_attempts = atoi(optarg);
@@ -183,113 +182,117 @@
if(flag_list) {
entrance_edit_list();
- exit(EXIT_SUCCESS);
- }
-
- /*TODO: for int config_*'s consider using a flag
-* to check if it has been modified or not.
-* checking for = 0 may break if entrance begins
-* to use negative values as valid values.
-* */
-
- if(config_attempts = 0) {
- entrance_edit_int_set(ENTRANCE_EDIT_KEY_DAEMON_ATTEMPTS_INT,
config_attempts);
- }
-
- if(config_xserver = 0) {
- entrance_edit_string_set(ENTRANCE_EDIT_KEY_DAEMON_XSERVER_STR,
config_xserver);
- }
-
- if(config_auth = 0) {
- entrance_edit_int_set(ENTRANCE_EDIT_KEY_CLIENT_AUTH_INT,
config_auth);
- }
-
- if(config_engine = 0) {
- entrance_edit_int_set(ENTRANCE_EDIT_KEY_CLIENT_ENGINE_INT,
config_engine);
- }
-
- if(config_reboot = 0) {
-
entrance_edit_int_set(ENTRANCE_EDIT_KEY_CLIENT_SYSTEM_REBOOT_INT,
config_reboot);
- }
-
- if(config_halt = 0) {
- entrance_edit_int_set(ENTRANCE_EDIT_KEY_CLIENT_SYSTEM_HALT_INT,
config_halt);
- }
-
- if(config_autologin_mode = 0) {
-
entrance_edit_int_set(ENTRANCE_EDIT_KEY_CLIENT_AUTOLOGIN_MODE_INT,
config_autologin_mode);
- }
-
- if(config_presel_mode = 0) {
- entrance_edit_int_set(ENTRANCE_EDIT_KEY_CLIENT_PRESEL_MODE_INT,
config_presel_mode);
- }
-
- if(config_user_remember = 0) {
-
entrance_edit_int_set(ENTRANCE_EDIT_KEY_CLIENT_USER_REMEMBER_INT,
config_user_remember);
- }
-
- if(config_user_remember_count = 0) {
-
entrance_edit_int_set(ENTRANCE_EDIT_KEY_CLIENT_USER_REMEMBER_N_INT,
config_user_remember_count);
- }
-
- if(config_user_count = 0) {
- entrance_edit_int_set(ENTRANCE_EDIT_KEY_CLIENT_USER_COUNT_INT,
config_user_count);
- }
-
- if(config_session_count = 0) {
-
entrance_edit_int_set(ENTRANCE_EDIT_KEY_CLIENT_SESSION_COUNT_INT,
E CVS: apps/entrance essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: TODO Log Message: Drop one from TODO file. One little step for mankind :) === RCS file: /cvs/e/e17/apps/entrance/TODO,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- TODO25 Jun 2006 07:47:17 - 1.23 +++ TODO28 Jul 2006 02:52:56 - 1.24 @@ -12,7 +12,6 @@ ESSENTIAL FEATURES --- -* Command-line configuration tool * Create abstracted interface for obtaining system session list. - Add functions for finding session list on various distributions - Move entrance-definded sessions out of config into $prefix/share/xsessions/. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
actions.c backgrounds.c desktops.c dialog.c dialog.h focus.c
fx.c groups.c iconify.c menus.c mod-trans.c pager.c session.c
settings.c snaps.c sound.c tooltips.c
Log Message:
Some more dialog creation refactoring bits.
===
RCS file: /cvs/e/e16/e/src/actions.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -3 -r1.203 -r1.204
--- actions.c 27 Jul 2006 00:23:13 - 1.203
+++ actions.c 27 Jul 2006 04:52:49 - 1.204
@@ -317,11 +317,13 @@
}
static const DialogDef DlgAbout = {
+ _DlgFillAbout,
ABOUT_ENLIGHTENMENT,
NULL,
NULL,
NULL,
- _DlgFillAbout
+ NULL,
+ NULL,
};
void
===
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- backgrounds.c 25 Jul 2006 01:29:26 - 1.80
+++ backgrounds.c 27 Jul 2006 04:52:49 - 1.81
@@ -2025,11 +2025,6 @@
DialogItemTableSetOptions(table, 3, 0, 0, 0);
- if (Conf.dialogs.headers)
- DialogAddHeader(d, pix/bg.png,
- _(Enlightenment Desktop\n
- Background Settings Dialog\n));
-
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetText(di, _(BG Colour\n));
@@ -2274,11 +2269,13 @@
}
const DialogDef DlgBackground = {
+ _DlgFillBackground,
CONFIGURE_BG,
N_(Background),
N_(Desktop Background Settings),
SOUND_SETTINGS_BG,
- _DlgFillBackground
+ pix/bg.png,
+ N_(Enlightenment Desktop\n Background Settings Dialog\n),
};
/*
===
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -3 -r1.246 -r1.247
--- desktops.c 21 Jul 2006 03:17:17 - 1.246
+++ desktops.c 27 Jul 2006 04:52:50 - 1.247
@@ -2370,11 +2370,6 @@
DialogItemTableSetOptions(table, 2, 0, 0, 0);
- if (Conf.dialogs.headers)
- DialogAddHeader(d, pix/desktops.png,
- _(Enlightenment Multiple Desktop\n
- Settings Dialog\n));
-
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _(Number of virtual desktops:\n));
@@ -2471,11 +2466,13 @@
}
const DialogDef DlgDesks = {
+ _DlgFillDesks,
CONFIGURE_DESKTOPS,
N_(Desks),
N_(Multiple Desktop Settings),
SOUND_SETTINGS_DESKTOPS,
- _DlgFillDesks
+ pix/desktops.png,
+ N_(Enlightenment Multiple Desktop\n Settings Dialog\n),
};
static int tmp_area_x;
@@ -2587,10 +2584,6 @@
DialogItemTableSetOptions(table, 1, 0, 0, 0);
- if (Conf.dialogs.headers)
- DialogAddHeader(d, pix/areas.png,
- _(Enlightenment Virtual Desktop\n Settings Dialog\n));
-
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetText(di, _(Virtual Desktop size:\n));
@@ -2654,11 +2647,13 @@
}
const DialogDef DlgAreas = {
+ _DlgFillAreas,
CONFIGURE_AREA,
N_(Areas),
N_(Virtual Desktop Settings),
SOUND_SETTINGS_AREA,
- _DlgFillAreas
+ pix/areas.png,
+ N_(Enlightenment Virtual Desktop\n Settings Dialog\n),
};
/*
===
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -3 -r1.162 -r1.163
--- dialog.c24 Jul 2006 20:53:49 - 1.162
+++ dialog.c27 Jul 2006 04:52:50 - 1.163
@@ -702,10 +702,16 @@
void
DialogShowSimple(const DialogDef * dd, void *data)
{
+ DialogShowSimpleWithName(dd, dd-name, data);
+}
+
+void
+DialogShowSimpleWithName(const DialogDef * dd, const char *name, void *data)
+{
Dialog *d;
DItem *table;
- d = DialogFind(dd-name);
+ d = DialogFind(name);
if (d)
{
SoundPlay(SOUND_SETTINGS_ACTIVE);
@@ -714,7 +720,7 @@
}
SoundPlay(dd-sound);
- d = DialogCreate(dd-name);
+ d = DialogCreate(name);
if (!d)
return;
@@ -724,6 +730,13 @@
if (!table)
return;
+ if (Conf.dialogs.headers (dd-header_image || dd-header_text))
+ DialogAddHeader(table, dd-header_image, _(dd-header_text));
+
+ table = DialogAddItem(d-item, DITEM_TABLE);
+ if (!table)
+ return;
+
dd-fill(d, table, data);
DialogShow(d);
@@ -880,14 +893,15 @@
}
void
-DialogAddHeader(Dialog * d, const char *img, const char *txt)
+DialogAddHeader(DItem * parent, const char *img, const char *txt)
{
DItem *table, *di;
/* FIXME - Center table horizontally */
- table = DialogAddItem(d-item, DITEM_TABLE);
- DialogItemSetColSpan(table, d-item-item.table.num_columns);
+ table = DialogAddItem(parent, DITEM_TABLE);
+
E CVS: winselector urandom
Enlightenment CVS committal Author : urandom Project : e_modules Module : winselector Dir : e_modules/winselector Added Files: .cvsignore Log Message: the cvsignore file - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
actions.c
Log Message:
Add usual keybindings to about dialog.
===
RCS file: /cvs/e/e16/e/src/actions.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -3 -r1.202 -r1.203
--- actions.c 24 Jul 2006 21:10:58 - 1.202
+++ actions.c 27 Jul 2006 00:23:13 - 1.203
@@ -312,6 +312,8 @@
DialogItemSetText(di, buf);
DialogAddButton(d, _(OK), NULL, 1, DLG_BUTTON_OK);
+ DialogBindKey(d, Return, DialogCallbackClose, 0);
+ DialogBindKey(d, Escape, DialogCallbackClose, 0);
}
static const DialogDef DlgAbout = {
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/emphasis/src/bin
Modified Files:
emphasis.c
Log Message:
Work with latest etk
===
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- emphasis.c 21 Jul 2006 04:05:27 - 1.5
+++ emphasis.c 27 Jul 2006 02:03:05 - 1.6
@@ -6,7 +6,7 @@
Emphasis_Gui *gui;
/* void */ enhance_init();
- if (!etk_init(argc, argv))
+ if (!etk_init(ecore_evas_software_x11))
{
fprintf(stderr, Unable to init etk\n);
return 1;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/edje_viewer/src/bin
Modified Files:
main.c
Log Message:
work with latest etk
===
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- main.c 2 Jul 2006 21:15:03 - 1.2
+++ main.c 27 Jul 2006 01:49:38 - 1.3
@@ -6,7 +6,7 @@
int main(int argc, char **argv)
{
- if (!etk_init())
+ if (!etk_init(ecore_evas_software_x11))
{
fprintf(stderr, Could not init etk. Exiting...\n);
return 0;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_shelf.c
Log Message:
Some convenience functions for setting shelf properties without restarting
the shelf.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- e_shelf.c 27 Jul 2006 05:13:30 - 1.32
+++ e_shelf.c 27 Jul 2006 06:21:15 - 1.33
@@ -274,6 +274,7 @@
{
E_OBJECT_CHECK(es);
E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE);
+
es-layer = layer;
if (es-popup)
e_popup_layer_set(es-popup, es-layer);
@@ -446,6 +447,58 @@
break;
}
e_shelf_move_resize(es, es-x, es-y, es-w, es-h);
+}
+
+EAPI void
+e_shelf_style_set(E_Shelf *es, const char *style)
+{
+ char buf[1024];
+
+ E_OBJECT_CHECK(es);
+ E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE);
+
+ if (!es-o_base) return;
+
+ if (es-style)
+ evas_stringshare_del(es-style);
+ es-style = evas_stringshare_add(style);
+
+ if (style)
+ snprintf(buf, sizeof(buf), shelf/%s/base, style);
+ else
+ snprintf(buf, sizeof(buf), shelf/%s/base, default);
+
+ if (!e_theme_edje_object_set(es-o_base, base/theme/shelf, buf))
+ e_theme_edje_object_set(es-o_base, base/theme/shelf,
+shelf/default/base);
+}
+
+EAPI void
+e_shelf_popup_set(E_Shelf *es, int popup)
+{
+ E_OBJECT_CHECK(es);
+ E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE);
+
+ if (!es-cfg) return;
+ if (es-popup)
+ e_object_del(E_OBJECT(es-popup));
+ if (popup)
+ {
+ es-popup = e_popup_new(es-zone, es-x, es-y, es-w, es-h);
+ e_popup_layer_set(es-popup, es-cfg-layer);
+ es-ee = es-popup-ecore_evas;
+ es-evas = es-popup-evas;
+ evas_object_show(es-o_event);
+ evas_object_show(es-o_base);
+ e_popup_edje_bg_object_set(es-popup, es-o_base);
+ }
+ else
+ {
+ evas_object_move(es-o_event, es-zone-x + es-x, es-zone-y + es-y);
+ evas_object_move(es-o_base, es-zone-x + es-x, es-zone-y + es-y);
+ evas_object_layer_set(es-o_event, es-cfg-layer);
+ evas_object_layer_set(es-o_base, es-cfg-layer);
+ }
}
/* local subsystem functions */
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_dbus
Modified Files:
Ecore_DBus.h ecore_dbus.c ecore_dbus_message.c
ecore_dbus_methods.c ecore_dbus_private.h
ecore_dbus_unmarshal.c ecore_dbus_utils.c
Log Message:
Add one event type for each type of message
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/Ecore_DBus.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Ecore_DBus.h26 Jul 2006 12:08:06 - 1.12
+++ Ecore_DBus.h27 Jul 2006 13:29:43 - 1.13
@@ -36,6 +36,7 @@
typedef struct _Ecore_DBus_Event_Server_Add Ecore_DBus_Event_Server_Add;
typedef struct _Ecore_DBus_Event_Server_Del Ecore_DBus_Event_Server_Del;
typedef struct _Ecore_DBus_Event_Server_Data Ecore_DBus_Event_Server_Data;
+ typedef struct _Ecore_DBus_Event_Arg Ecore_DBus_Event_Arg;
typedef struct _Ecore_DBus_Message Ecore_DBus_Message;
typedef struct _Ecore_DBus_Message_Field Ecore_DBus_Message_Field;
@@ -94,8 +95,24 @@
{
Ecore_DBus_Server *server;
Ecore_DBus_Message_Type type;
- char*member;
Ecore_DBus_Message *message;
+ struct {
+const char *path;
+const char *interface;
+const char *member;
+const char *error_name;
+unsigned int reply_serial;
+const char *destination;
+const char *sender;
+const char *signature;
+ } header;
+ Ecore_DBus_Event_Arg *args;
+ };
+
+ struct _Ecore_DBus_Event_Arg
+ {
+ Ecore_DBus_Data_Type type;
+ void *value;
};
typedef enum _Ecore_DBus_Message_Header_Field
@@ -112,8 +129,11 @@
} Ecore_DBus_Message_Header_Field;
EAPI extern int ECORE_DBUS_EVENT_SERVER_ADD;
- EAPI extern int ECORE_DBUS_EVENT_SERVER_DATA;
EAPI extern int ECORE_DBUS_EVENT_SERVER_DEL;
+ EAPI extern int ECORE_DBUS_EVENT_SERVER_METHOD_RETURN;
+ EAPI extern int ECORE_DBUS_EVENT_SERVER_ERROR;
+ EAPI extern int ECORE_DBUS_EVENT_SERVER_SIGNAL;
+ EAPI extern int ECORE_DBUS_EVENT_SERVER_DATA;
/* init */
EAPI int ecore_dbus_init(void);
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ecore_dbus.c26 Jul 2006 20:43:28 - 1.17
+++ ecore_dbus.c27 Jul 2006 13:29:43 - 1.18
@@ -42,6 +42,9 @@
EAPI int ECORE_DBUS_EVENT_SERVER_ADD = 0;
EAPI int ECORE_DBUS_EVENT_SERVER_DEL = 0;
+EAPI int ECORE_DBUS_EVENT_SERVER_METHOD_RETURN = 0;
+EAPI int ECORE_DBUS_EVENT_SERVER_ERROR = 0;
+EAPI int ECORE_DBUS_EVENT_SERVER_SIGNAL = 0;
EAPI int ECORE_DBUS_EVENT_SERVER_DATA = 0;
/* private function declaration */
@@ -55,8 +58,11 @@
static int _ecore_dbus_event_server_add(void *data, int ev_type, void
*ev);
static int _ecore_dbus_event_server_del(void *data, int ev_type, void
*ev);
static int _ecore_dbus_event_server_data(void *data, int ev_type,
void *ev);
+static void _ecore_dbus_event_server_del_free(void *data, void *ev);
static void _ecore_dbus_event_server_data_free(void *data, void *ev);
+static Ecore_DBus_Event_Server_Data
*_ecore_dbus_event_create(Ecore_DBus_Server *svr, Ecore_DBus_Message *msg);
+
/* local variables */
static const Ecore_DBus_Auth auths[] = {
@@ -83,6 +89,9 @@
ECORE_DBUS_EVENT_SERVER_ADD = ecore_event_type_new();
ECORE_DBUS_EVENT_SERVER_DEL = ecore_event_type_new();
+ ECORE_DBUS_EVENT_SERVER_METHOD_RETURN = ecore_event_type_new();
+ ECORE_DBUS_EVENT_SERVER_ERROR = ecore_event_type_new();
+ ECORE_DBUS_EVENT_SERVER_SIGNAL = ecore_event_type_new();
ECORE_DBUS_EVENT_SERVER_DATA = ecore_event_type_new();
handler[i++] = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD,
@@ -102,6 +111,8 @@
if (--init_count != 0) return init_count;
+ /* FIXME: Delete servers */
+
for (i = 0; i 3; i++)
ecore_event_handler_del(handler[i]);
@@ -254,9 +265,10 @@
Ecore_DBus_Server *svr;
e = ev;
- if (!_ecore_list2_find(servers, ecore_con_server_data_get(e-server)))
return 1;
-
svr = ecore_con_server_data_get(e-server);
+ if (!svr) return 1;
+ if (!_ecore_list2_find(servers, svr)) return 1;
+
ecore_dbus_server_send(svr, \0, 1);
ecore_dbus_server_send(svr, AUTH\r\n, 6);
printf([ecore_dbus] begining auth process\n);
@@ -271,14 +283,16 @@
Ecore_DBus_Event_Server_Del *e2;
e = ev;
- if (!_ecore_list2_find(servers, ecore_con_server_data_get(e-server)))
return 1;
-
svr =
E CVS: libs/ecore sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/bin
Modified Files:
ecore_dbus_hal_test.c ecore_dbus_test.c
Log Message:
Use callbacks for method return, not events
===
RCS file: /cvs/e/e17/libs/ecore/src/bin/ecore_dbus_hal_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_dbus_hal_test.c 27 Jul 2006 13:29:43 - 1.2
+++ ecore_dbus_hal_test.c 27 Jul 2006 15:06:13 - 1.3
@@ -7,13 +7,16 @@
static int ecore_dbus_event_server_add(void *udata, int ev_type, void *ev);
static int ecore_dbus_event_server_del(void *udata, int ev_type, void *ev);
-static int ecore_dbus_event_server_method_return(void *udata, int ev_type,
void *ev);
+
+static void ecore_dbus_method_name_has_owner_cb(void *data,
Ecore_DBus_Message_Type type,
+ Ecore_DBus_Method_Return
*reply);
+static void ecore_dbus_method_add_match_cb(void *data, Ecore_DBus_Message_Type
type,
+ Ecore_DBus_Method_Return *reply);
+
static int ecore_dbus_event_server_signal(void *udata, int ev_type, void *ev);
static const char *event_type_get(Ecore_DBus_Message_Type type);
-static int state = 0;
-
static Ecore_DBus_Server *svr = NULL;
int
@@ -38,8 +41,6 @@
ecore_dbus_event_server_add,
NULL);
handler[i++] = ecore_event_handler_add(ECORE_DBUS_EVENT_SERVER_DEL,
ecore_dbus_event_server_del,
NULL);
- handler[i++] =
ecore_event_handler_add(ECORE_DBUS_EVENT_SERVER_METHOD_RETURN,
-
ecore_dbus_event_server_method_return, NULL);
handler[i++] = ecore_event_handler_add(ECORE_DBUS_EVENT_SERVER_SIGNAL,
ecore_dbus_event_server_signal,
NULL);
@@ -61,8 +62,8 @@
event = ev;
printf(ecore_dbus_event_server_add\n);
- ecore_dbus_method_name_has_owner(event-server, org.freedesktop.Hal);
- state++;
+ ecore_dbus_method_name_has_owner(event-server, org.freedesktop.Hal,
+ ecore_dbus_method_name_has_owner_cb, NULL);
return 0;
}
@@ -78,54 +79,58 @@
return 0;
}
-static int
-ecore_dbus_event_server_method_return(void *udata, int ev_type, void *ev)
+static void
+ecore_dbus_method_name_has_owner_cb(void *data, Ecore_DBus_Message_Type type,
+ Ecore_DBus_Method_Return *reply)
{
- Ecore_DBus_Event_Server_Data *event;
-
- event = ev;
- printf(ecore_dbus_event_server_method_return %s %s.%s\n,
event_type_get(event-type),
-
event-header.interface,
-
event-header.member);
- printf(state: %d\n, state);
- if (state == 1)
- {
- int *exists;
-
- exists = event-args[0].value;
- if ((!exists) || (!*exists))
- {
-printf(No hal\n);
-ecore_main_loop_quit();
- }
- else
- {
-printf(Add listener for devices\n);
-ecore_dbus_method_add_match(event-server,
- type='signal',
- interface='org.freedesktop.Hal.Manager',
- sender='org.freedesktop.Hal',
- path='/org/freedesktop/Hal/Manager');
-
-state++;
- }
+ unsigned int *exists;
+ if (type != ECORE_DBUS_MESSAGE_TYPE_METHOD_RETURN)
+ {
+ ecore_main_loop_quit();
+ return;
}
- else if (state == 2)
+ printf(ecore_dbus_event_server_method_return %s %s.%s\n,
event_type_get(reply-type),
+
reply-header.interface,
+
reply-header.member);
+
+ exists = reply-args[0].value;
+ if ((!exists) || (!*exists))
{
- printf(Should be listening for device changes!\n);
+ printf(No hal\n);
+ ecore_main_loop_quit();
}
else
{
- printf(Hm: %s\n, event-header.member);
- ecore_dbus_message_print(event-message);
+ printf(Add listener for devices\n);
+ ecore_dbus_method_add_match(reply-server,
+ type='signal',
+ interface='org.freedesktop.Hal.Manager',
+ sender='org.freedesktop.Hal',
+ path='/org/freedesktop/Hal/Manager',
+ ecore_dbus_method_add_match_cb, NULL);
+
}
- return 0;
+}
+
+static void
+ecore_dbus_method_add_match_cb(void *data, Ecore_DBus_Message_Type type,
+ Ecore_DBus_Method_Return *reply)
+{
+ if (type !=
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/images Modified Files: Makefile.am Added Files: e-logo-0.png e-logo-10.png e-logo-11.png e-logo-12.png e-logo-13.png e-logo-14.png e-logo-1.png e-logo-2.png e-logo-3.png e-logo-4.png e-logo-5.png e-logo-6.png e-logo-7.png e-logo-8.png e-logo-9.png Log Message: add the pics for the puzzle === RCS file: /cvs/e/e17/libs/ewl/data/images/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- Makefile.am 18 Oct 2005 16:20:25 - 1.12 +++ Makefile.am 28 Jul 2006 04:21:18 - 1.13 @@ -9,7 +9,10 @@ elicit3.png entice.png entice1.png entice2.png entice3.png \ entrance.png entrance1.png entrance2.png entrance3.png evidence.png \ evidence1.png evidence2.png evidence3.png evidence4.png \ - lilbottom.png lilgrad.png + lilbottom.png lilgrad.png e-logo-0.png e-logo-1.png e-logo-2.png \ + e-logo-3.png e-logo-4.png e-logo-5.png e-logo-6.png e-logo-7.png \ + e-logo-8.png e-logo-9.png e-logo-10.png e-logo-11.png e-logo-12.png \ + e-logo-13.png e-logo-14.png themedir = $(pkgdatadir)/images theme_DATA = $(IMAGES) $(EDJS) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin/tests Modified Files: Makefile.am Added Files: puzzle.c Log Message: add a little puzzle game to ewl_test === RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/Makefile.am,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- Makefile.am 14 Jul 2006 02:53:34 - 1.33 +++ Makefile.am 28 Jul 2006 04:23:57 - 1.34 @@ -27,7 +27,7 @@ ewl_scrollpane.la ewl_spinner.la ewl_progressbar.la \ ewl_theme.la ewl_media.la ewl_menu.la ewl_imenu.la \ ewl_widget.la fullscreen.la modal.la ewl_layer.la \ - ewl_list.la + ewl_list.la puzzle.la ewl_border_la_SOURCES = ewl_border.c ewl_border_la_LIBADD= $(top_builddir)/src/lib/libewl.la @@ -337,6 +337,13 @@ -L$(top_builddir)/src/lib/.libs ewl_list_la_DEPENDENCIES = +puzzle_la_SOURCES = puzzle.c +puzzle_la_LIBADD= $(top_builddir)/src/lib/libewl.la +puzzle_la_LDFLAGS = -module -avoid-version \ + -L$(top_builddir)/src/lib \ + -L$(top_builddir)/src/lib/.libs +puzzle_la_DEPENDENCIES = + FILES = $(ewl_border_la_SOURCES) $(ewl_box_la_SOURCES) \ $(ewl_button_la_SOURCES) $(ewl_colordialog_la_SOURCES) \ @@ -359,7 +366,8 @@ $(ewl_imenu_la_SOURCES) $(ewl_widget_la_SOURCES) \ $(ewl_image_thumbnail_la_SOURCES) $(fullscreen_la_SOURCES) \ $(modal_la_SOURCES) $(ewl_layer_la_SOURCES) \ - $(ewl_dnd_snoop_la_SOURCES) $(ewl_list_la_SOURCES) + $(ewl_dnd_snoop_la_SOURCES) $(ewl_list_la_SOURCES) \ + $(puzzle_la_SOURCES) EXTRA_DIST = $(FILES) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sndev
Enlightenment CVS committal Author : sndev Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: bug++. The maximaze state of the window has to be droped to non-maximazed state if window was resized. Otherwise on E restart it gets maximized. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.385 retrieving revision 1.386 diff -u -3 -r1.385 -r1.386 --- TODO27 Jul 2006 19:40:20 - 1.385 +++ TODO28 Jul 2006 04:44:02 - 1.386 @@ -36,6 +36,9 @@ * BUG: Hiding the label of e_widget_slider causes the slider line to disappear * BUG: Window locks should be honored by the pager (e.g. Lock me from changing position) +* BUG: If the window is resized manually when it is maximized, the maximize state + has to be droped to non-maximized. Otherwise on E restart window gets maximized + again ]]] [[[ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: slideshow devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : slideshow Dir : e_modules/slideshow Modified Files: e_mod_main.c Log Message: Patch fix. Forgot to remove this line as it breaks recursion. === RCS file: /cvs/e/e_modules/slideshow/e_mod_main.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- e_mod_main.c28 Jul 2006 00:02:17 - 1.35 +++ e_mod_main.c28 Jul 2006 05:18:12 - 1.36 @@ -520,7 +520,6 @@ ecore_list_destroy(dirListing); - inst-bg_list = ecore_file_ls(ci-dir); ecore_list_goto_first(inst-bg_list); while ((item = (char *)ecore_list_next(inst-bg_list)) != NULL) inst-bg_count++; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas
Modified Files:
ecore_evas.c
Log Message:
- reflect new ecore_evas changes for sticky callbacks
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/ecore_evas.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_evas.c27 Jul 2006 00:54:56 - 1.1
+++ ecore_evas.c27 Jul 2006 16:28:00 - 1.2
@@ -55,6 +55,8 @@
static void _window_resize_cb(Ecore_Evas *ecore_evas);
static void _window_focus_in_cb(Ecore_Evas *ecore_evas);
static void _window_focus_out_cb(Ecore_Evas *ecore_evas);
+static void _window_sticky_cb(Ecore_Evas *ecore_evas);
+static void _window_unsticky_cb(Ecore_Evas *ecore_evas);
static void _window_delete_request_cb(Ecore_Evas *ecore_evas);
static Etk_Engine engine_info = {
@@ -144,6 +146,8 @@
ecore_evas_callback_resize_set(engine_data-ecore_evas, _window_resize_cb);
ecore_evas_callback_focus_in_set(engine_data-ecore_evas,
_window_focus_in_cb);
ecore_evas_callback_focus_out_set(engine_data-ecore_evas,
_window_focus_out_cb);
+ ecore_evas_callback_sticky_set(engine_data-ecore_evas, _window_sticky_cb);
+ ecore_evas_callback_unsticky_set(engine_data-ecore_evas,
_window_unsticky_cb);
ecore_evas_callback_delete_request_set(engine_data-ecore_evas,
_window_delete_request_cb);
}
@@ -449,6 +453,26 @@
if (!(window = ETK_WINDOW(ecore_evas_data_get(ecore_evas, etk_window
return;
window-focus_out_cb(window);
+}
+
+/* Called when the window is made sticky */
+static void _window_sticky_cb(Ecore_Evas *ecore_evas)
+{
+ Etk_Window *window;
+
+ if (!(window = ETK_WINDOW(ecore_evas_data_get(ecore_evas, etk_window
+ return;
+ window-sticky_cb(window);
+}
+
+/* Called when the window is made unsticky */
+static void _window_unsticky_cb(Ecore_Evas *ecore_evas)
+{
+ Etk_Window *window;
+
+ if (!(window = ETK_WINDOW(ecore_evas_data_get(ecore_evas, etk_window
+ return;
+ window-unsticky_cb(window);
}
/* Called when the user wants to close the window */
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_menu.c
Log Message:
Remove unneeded function.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_menu.c8 Jul 2006 09:18:03 - 1.53
+++ e_menu.c28 Jul 2006 10:56:21 - 1.54
@@ -1034,21 +1034,6 @@
}
static void
-_e_menu_category_item_free(E_Menu_Item *mi)
-{
- if (mi-submenu)
- {
- mi-submenu-parent_item = NULL;
- e_object_unref(E_OBJECT(mi-submenu));
- }
- if (mi-menu-realized) _e_menu_item_unrealize(mi);
- if (mi-icon) evas_stringshare_del(mi-icon);
- if (mi-icon_key) evas_stringshare_del(mi-icon_key);
- if (mi-label) evas_stringshare_del(mi-label);
- free(mi);
-}
-
-static void
_e_menu_cb_intercept_item_move(void *data, Evas_Object *o, Evas_Coord x,
Evas_Coord y)
{
E_Menu_Item *mi;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c
Log Message:
Add a DEBUG define for debug functions.
Remove unused variable
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -3 -r1.144 -r1.145
--- e_apps.c20 Jul 2006 11:24:28 - 1.144
+++ e_apps.c28 Jul 2006 10:59:27 - 1.145
@@ -13,6 +13,8 @@
* - clean up the add app functions. To much similar code.
*/
+#define DEBUG 0
+
/* local subsystem functions */
typedef struct _E_App_Change_Info E_App_Change_Info;
typedef struct _E_App_CallbackE_App_Callback;
@@ -58,7 +60,9 @@
static E_App*_e_app_cache_new (E_App_Cache *ac, const char *path,
int scan_subdirs);
static int _e_app_exe_valid_get (const char *exe);
static char *_e_app_localized_val_get (Eet_File *ef, const char *lang,
const char *field, int *size);
+#if DEBUG
static void _e_app_print(const char *path, Ecore_File_Event event);
+#endif
static void _e_app_check_order(const char *file);
static int _e_app_order_contains(E_App *a, const char *file);
@@ -1225,7 +1229,7 @@
char buf[PATH_MAX];
const char *lang;
unsigned char tmp[1];
- int img;
+// int img;
// if ((!a-path) || (!ecore_file_exists(a-path)))
// {
@@ -1715,7 +1719,7 @@
if (!app-scanned)
return;
-#if 0
+#if DEBUG
_e_app_print(path, event);
#endif
@@ -2389,6 +2393,7 @@
return 1;
}
+#if DEBUG
static void
_e_app_print(const char *path, Ecore_File_Event event)
{
@@ -2417,6 +2422,7 @@
break;
}
}
+#endif
static void
_e_app_check_order(const char *file)
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_border_menu.c
Log Message:
Fix maximize options
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_int_border_menu.c 25 Jul 2006 03:27:23 - 1.37
+++ e_int_border_menu.c 28 Jul 2006 11:17:33 - 1.38
@@ -13,6 +13,7 @@
static void _e_border_menu_cb_maximize(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_maximize_vertically(void *data, E_Menu *m,
E_Menu_Item *mi);
static void _e_border_menu_cb_maximize_horizontally(void *data, E_Menu *m,
E_Menu_Item *mi);
+static void _e_border_menu_cb_unmaximize(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_shade(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_prop(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -90,7 +91,8 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _(Maximize));
- e_menu_item_check_set(mi, 1);
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 3);
e_menu_item_toggle_set(mi, (bd-maximized E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_BOTH);
e_menu_item_callback_set(mi, _e_border_menu_cb_maximize, bd);
e_menu_item_icon_edje_set(mi,
@@ -100,8 +102,9 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _(Maximize vertically));
- e_menu_item_check_set(mi, 1);
- e_menu_item_toggle_set(mi, (bd-maximized E_MAXIMIZE_VERTICAL));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 3);
+ e_menu_item_toggle_set(mi, (bd-maximized E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_VERTICAL);
e_menu_item_callback_set(mi, _e_border_menu_cb_maximize_vertically, bd);
e_menu_item_icon_edje_set(mi,
(char
*)e_theme_edje_file_get(base/theme/borders,
@@ -110,13 +113,25 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _(Maximize horizontally));
- e_menu_item_check_set(mi, 1);
- e_menu_item_toggle_set(mi, (bd-maximized E_MAXIMIZE_HORIZONTAL));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 3);
+ e_menu_item_toggle_set(mi, (bd-maximized E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_HORIZONTAL);
e_menu_item_callback_set(mi, _e_border_menu_cb_maximize_horizontally, bd);
e_menu_item_icon_edje_set(mi,
(char
*)e_theme_edje_file_get(base/theme/borders,
widgets/border/default/maximize),
widgets/border/default/maximize);
+
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _(Unmaximize));
+ e_menu_item_radio_set(mi, 1);
+ e_menu_item_radio_group_set(mi, 3);
+ e_menu_item_toggle_set(mi, (bd-maximized E_MAXIMIZE_DIRECTION) ==
E_MAXIMIZE_NONE);
+ e_menu_item_callback_set(mi, _e_border_menu_cb_unmaximize, bd);
+ e_menu_item_icon_edje_set(mi,
+ (char
*)e_theme_edje_file_get(base/theme/borders,
+
widgets/border/default/maximize),
+ widgets/border/default/maximize);
}
m = e_menu_new();
@@ -467,12 +482,7 @@
bd = data;
if (!bd-lock_user_maximize)
- {
- if (bd-maximized E_MAXIMIZE_BOTH)
- e_border_unmaximize(bd, E_MAXIMIZE_BOTH);
- else
- e_border_maximize(bd, (e_config-maximize_policy E_MAXIMIZE_TYPE) |
E_MAXIMIZE_BOTH);
- }
+ e_border_maximize(bd, (e_config-maximize_policy E_MAXIMIZE_TYPE) |
E_MAXIMIZE_BOTH);
}
static void
@@ -483,10 +493,9 @@
bd = data;
if (!bd-lock_user_maximize)
{
- if ((bd-maximized E_MAXIMIZE_VERTICAL))
- e_border_unmaximize(bd, E_MAXIMIZE_VERTICAL);
- else
- e_border_maximize(bd, (e_config-maximize_policy E_MAXIMIZE_TYPE) |
E_MAXIMIZE_VERTICAL);
+ if ((bd-maximized E_MAXIMIZE_HORIZONTAL))
+ e_border_unmaximize(bd, E_MAXIMIZE_HORIZONTAL);
+ e_border_maximize(bd, (e_config-maximize_policy E_MAXIMIZE_TYPE) |
E_MAXIMIZE_VERTICAL);
}
}
@@ -498,10 +507,9 @@
bd = data;
if (!bd-lock_user_maximize)
{
- if ((bd-maximized E_MAXIMIZE_HORIZONTAL))
- e_border_unmaximize(bd, E_MAXIMIZE_HORIZONTAL);
- else
- e_border_maximize(bd, (e_config-maximize_policy E_MAXIMIZE_TYPE) |
E_MAXIMIZE_HORIZONTAL);
+ if ((bd-maximized E_MAXIMIZE_VERTICAL))
+ e_border_unmaximize(bd, E_MAXIMIZE_VERTICAL);
+ e_border_maximize(bd, (e_config-maximize_policy E_MAXIMIZE_TYPE) |
E_MAXIMIZE_HORIZONTAL);
}
}
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_keybindings.c
Log Message:
Remove unused variable
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_int_config_keybindings.c 27 Jul 2006 13:55:36 - 1.33
+++ e_int_config_keybindings.c 28 Jul 2006 11:31:00 - 1.34
@@ -548,7 +548,6 @@
{
Evas_Object *ot;
Evas_Object *ob, *of;
- E_Radio_Group *rg;
cfdata-evas = evas;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_shelf.c
Log Message:
E style
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_shelf.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_int_config_shelf.c28 Jul 2006 11:33:43 - 1.21
+++ e_int_config_shelf.c28 Jul 2006 11:34:38 - 1.22
@@ -26,16 +26,13 @@
E_Config_Dialog_View *v;
v = E_NEW(E_Config_Dialog_View, 1);
- if (v)
- {
- v-create_cfdata = _create_data;
- v-free_cfdata = _free_data;
- v-basic.create_widgets = _basic_create_widgets;
-
- cfd = e_config_dialog_new(con, _(Shelf Settings),
enlightenment/shelf, 0, v, NULL);
- return cfd;
- }
- return NULL;
+ if (!v) return NULL;
+ v-create_cfdata = _create_data;
+ v-free_cfdata = _free_data;
+ v-basic.create_widgets = _basic_create_widgets;
+
+ cfd = e_config_dialog_new(con, _(Shelf Settings), enlightenment/shelf,
0, v, NULL);
+ return cfd;
}
static void *
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_start_main.c e_widget_scrollframe.c
Log Message:
Remove unused
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_start_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_start_main.c 5 Mar 2006 06:23:14 - 1.1
+++ e_start_main.c 28 Jul 2006 11:36:10 - 1.2
@@ -6,7 +6,6 @@
static void env_set(const char *var, const char *val);
static int prefix_determine(char *argv0);
-static const char *prefix_get(void);
static void
env_set(const char *var, const char *val)
@@ -94,12 +93,6 @@
_exe_path = NULL;
_prefix_fallbacks();
return 0;
-}
-
-static const char *
-prefix_get(void)
-{
- return _prefix_path;
}
static int
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_scrollframe.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_widget_scrollframe.c 22 Jul 2006 21:48:24 - 1.2
+++ e_widget_scrollframe.c 28 Jul 2006 11:36:10 - 1.3
@@ -19,7 +19,6 @@
{
Evas_Object *obj, *o;
E_Widget_Data *wd;
- Evas_Coord mw, mh;
obj = e_widget_add(evas);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_thumb_main.c
Log Message:
Add return value
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_thumb_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_thumb_main.c 23 Jul 2006 12:06:59 - 1.7
+++ e_thumb_main.c 28 Jul 2006 11:37:55 - 1.8
@@ -249,13 +249,13 @@
time_t mtime_orig, mtime_thumb;
id = _e_thumb_file_id(eth-file, eth-key);
- if (!id) return;
+ if (!id) return 0;
td = strdup(id);
if (!td)
{
free(id);
- return;
+ return 0;
}
td[2] = 0;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal Author : sebastid Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps_error.c Log Message: Fix declaration === RCS file: /cvs/e/e17/apps/e/src/bin/e_apps_error.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_apps_error.c 26 Jun 2006 16:42:49 - 1.15 +++ e_apps_error.c 28 Jul 2006 11:41:41 - 1.16 @@ -16,7 +16,7 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static void _dialog_resize(void *data, Evas *e, Evas_Object *obj, void *event_info); -static Evas_Object *_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_Data_Line *lines); +static Evas_Object *_dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_Data_Line *lines); static void _dialog_save_cb(void *data, void *data2); EAPI void - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c e_fm.h
Log Message:
use const char with evas_stringshare
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_fm.c 27 Jul 2006 19:29:16 - 1.17
+++ e_fm.c 28 Jul 2006 11:44:23 - 1.18
@@ -1375,7 +1375,8 @@
static const char *
_e_fm2_icon_desktop_url_eval(const char *val)
{
- char *path, *p, *s;
+ const char *s;
+ char *path, *p;
if (strlen(val) 6) return NULL;
if (strncmp(val, file:, 5)) return NULL;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_fm.h 22 Jul 2006 21:49:39 - 1.7
+++ e_fm.h 28 Jul 2006 11:44:23 - 1.8
@@ -66,9 +66,9 @@
/* the background - if any, and how to handle it */
/* FIXME: not implemented yet */
struct {
- char*background;
- char*frame;
- char*icons;
+ const char *background;
+ const char *frame;
+ const char *icons;
unsigned charfixed;
} theme;
/* used internally only - used to save to disk only and laod from disk */
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c
Log Message:
No // when browsing /
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_widget_fsel.c 23 Jul 2006 11:22:13 - 1.2
+++ e_widget_fsel.c 28 Jul 2006 12:02:38 - 1.3
@@ -114,6 +114,7 @@
E_Widget_Data *wd;
Evas_List *selected;
E_Fm2_Icon_Info *ici;
+ const char *realpath;
char buf[4096];
wd = data;
@@ -121,8 +122,16 @@
if (!selected) return;
ici = selected-data;
E_FREE(wd-path);
- snprintf(buf, sizeof(buf), %s/%s,
- e_fm2_real_path_get(wd-o_files_fm), ici-file);
+ realpath = e_fm2_real_path_get(wd-o_files_fm);
+ if (!strcmp(realpath, /))
+ {
+ snprintf(buf, sizeof(buf), /%s, ici-file);
+ }
+ else
+ {
+ snprintf(buf, sizeof(buf), %s/%s,
+realpath, ici-file);
+ }
wd-path = strdup(buf);
e_widget_entry_text_set(wd-o_entry, ici-file);
evas_list_free(selected);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/bin
Modified Files:
ecore_dbus_hal_test.c ecore_dbus_test.c
Log Message:
Add one event type for each type of message
===
RCS file: /cvs/e/e17/libs/ecore/src/bin/ecore_dbus_hal_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_dbus_hal_test.c 26 Jul 2006 20:43:28 - 1.1
+++ ecore_dbus_hal_test.c 27 Jul 2006 13:29:43 - 1.2
@@ -7,16 +7,18 @@
static int ecore_dbus_event_server_add(void *udata, int ev_type, void *ev);
static int ecore_dbus_event_server_del(void *udata, int ev_type, void *ev);
-static int ecore_dbus_event_server_data(void *udata, int ev_type, void *ev);
+static int ecore_dbus_event_server_method_return(void *udata, int ev_type,
void *ev);
+static int ecore_dbus_event_server_signal(void *udata, int ev_type, void *ev);
static const char *event_type_get(Ecore_DBus_Message_Type type);
static int state = 0;
+static Ecore_DBus_Server *svr = NULL;
+
int
main(int argc, char **argv)
{
- Ecore_DBus_Server *svr;
ecore_dbus_init();
svr = ecore_dbus_server_connect(ECORE_DBUS_BUS_SYSTEM,
@@ -36,15 +38,17 @@
ecore_dbus_event_server_add,
NULL);
handler[i++] = ecore_event_handler_add(ECORE_DBUS_EVENT_SERVER_DEL,
ecore_dbus_event_server_del,
NULL);
- handler[i++] = ecore_event_handler_add(ECORE_DBUS_EVENT_SERVER_DATA,
- ecore_dbus_event_server_data,
NULL);
+ handler[i++] =
ecore_event_handler_add(ECORE_DBUS_EVENT_SERVER_METHOD_RETURN,
+
ecore_dbus_event_server_method_return, NULL);
+ handler[i++] = ecore_event_handler_add(ECORE_DBUS_EVENT_SERVER_SIGNAL,
+ ecore_dbus_event_server_signal,
NULL);
ecore_main_loop_begin();
for (i = 0; i 3; i++)
ecore_event_handler_del(handler[i]);
- ecore_dbus_server_del(svr);
+ if (svr) ecore_dbus_server_del(svr);
}
ecore_dbus_shutdown();
return 0;
@@ -57,7 +61,7 @@
event = ev;
printf(ecore_dbus_event_server_add\n);
- ecore_dbus_method_hello(event-server);
+ ecore_dbus_method_name_has_owner(event-server, org.freedesktop.Hal);
state++;
return 0;
}
@@ -69,72 +73,71 @@
event = ev;
printf(ecore_dbus_event_server_del\n);
+ svr = NULL;
ecore_main_loop_quit();
return 0;
}
static int
-ecore_dbus_event_server_data(void *udata, int ev_type, void *ev)
+ecore_dbus_event_server_method_return(void *udata, int ev_type, void *ev)
{
Ecore_DBus_Event_Server_Data *event;
event = ev;
- printf(ecore_dbus_event_server_data %s\n, event-member);
- if (event-type == ECORE_DBUS_MESSAGE_TYPE_METHOD_RETURN)
+ printf(ecore_dbus_event_server_method_return %s %s.%s\n,
event_type_get(event-type),
+
event-header.interface,
+
event-header.member);
+ printf(state: %d\n, state);
+ if (state == 1)
{
- if (state == 1)
- {
-printf(Check if hal is running\n);
-ecore_dbus_method_name_has_owner(event-server,
org.freedesktop.Hal);
-state++;
- }
- else if (state == 2)
- {
-int *exists;
-
-exists = ecore_dbus_message_body_field_get(event-message, 0);
-if ((!exists) || (!*exists))
- {
- printf(No hal\n);
- ecore_main_loop_quit();
- }
-else
- {
- printf(Add listener for devices\n);
- ecore_dbus_method_add_match(event-server,
- type='signal',
- interface='org.freedesktop.Hal.Manager',
- sender='org.freedesktop.Hal',
- path='/org/freedesktop/Hal/Manager');
+ int *exists;
- state++;
- }
- }
- else if (state == 3)
+ exists = event-args[0].value;
+ if ((!exists) || (!*exists))
{
-printf(Should be listening for device changes!);
+printf(No hal\n);
+ecore_main_loop_quit();
}
else
{
-printf(Hm: %s\n, event-member);
-ecore_dbus_message_print(event-message);
+printf(Add listener for devices\n);
+ecore_dbus_method_add_match(event-server,
+ type='signal',
+ interface='org.freedesktop.Hal.Manager',
+ sender='org.freedesktop.Hal',
+ path='/org/freedesktop/Hal/Manager');
+
+state++;
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_x11 Modified Files: ecore_evas_x11.c Log Message: * Do not dlclose() while the engine is still loaded... Bad MoOm!! === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ecore_evas_x11.c27 Jul 2006 16:28:01 - 1.4 +++ ecore_evas_x11.c27 Jul 2006 17:22:03 - 1.5 @@ -126,6 +126,7 @@ NULL, /* engine specific data */ NULL, /* engine name */ NULL, /* super (parent) engine */ + NULL, /* DL handle */ _window_constructor, _window_destructor, - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language troback
Enlightenment CVS committal Author : troback Project : e_modules Module : language Dir : e_modules/language/po Added Files: sv.po Log Message: Swedish translation added! - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language troback
Enlightenment CVS committal Author : troback Project : e_modules Module : language Dir : e_modules/language Modified Files: configure.in Log Message: Swedish translation added! === RCS file: /cvs/e/e_modules/language/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- configure.in25 Jul 2006 22:07:16 - 1.10 +++ configure.in28 Jul 2006 17:51:08 - 1.11 @@ -17,7 +17,7 @@ AM_ENABLE_SHARED AM_PROG_LIBTOOL -ALL_LINGUAS=it +ALL_LINGUAS=it sv AC_SUBST(ALL_LINGUAS) AM_GNU_GETTEXT([external]) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_engine.c etk_engine.h
Log Message:
* Do not dlclose() while the engine is still loaded... Bad MoOm!!
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_engine.c27 Jul 2006 16:49:35 - 1.2
+++ etk_engine.c27 Jul 2006 17:22:03 - 1.3
@@ -80,34 +80,16 @@
{
Etk_Engine *engine;
void *(*engine_shutdown)();
- char filename[PATH_MAX];
- void *handle;
-
engine = _loaded_engines-data;
_loaded_engines = evas_list_remove(_loaded_engines, engine);
- if (!engine-engine_name)
- continue;
-
- snprintf(filename, sizeof(filename), %s/etk/engines/%s.so,
PACKAGE_LIB_DIR, engine-engine_name);
-
- if (!ecore_file_exists(filename))
- {
- ETK_WARNING(Etk can not find requested engine!);
- return;
- }
-
- handle = dlopen(filename, RTLD_LAZY | RTLD_GLOBAL);
- if (!handle)
- {
- ETK_WARNING(Etk can not dlopen requested engine!);
+ if (!engine-handle)
continue;
- }
- if ((engine_shutdown = dlsym(handle, engine_shutdown)))
+ if ((engine_shutdown = dlsym(engine-handle, engine_shutdown)))
engine_shutdown();
- dlclose(handle);
+ dlclose(engine-handle);
}
while (_etk_engines)
@@ -203,7 +185,8 @@
return NULL;
}
- dlclose(handle);
+ _loaded_engines = evas_list_append(_loaded_engines, engine);
+ engine-handle = handle;
_engine = engine;
return engine;
@@ -630,6 +613,9 @@
/* Copies the methods of inherit_from to inherit_to */
static void _etk_engine_inheritance_set(Etk_Engine *inherit_to, Etk_Engine
*inherit_from)
{
+ if (!inherit_to || !inherit_from)
+ return;
+
inherit_to-super = inherit_from;
INHERIT(window_constructor);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_engine.h27 Jul 2006 16:49:35 - 1.2
+++ etk_engine.h27 Jul 2006 17:22:03 - 1.3
@@ -14,6 +14,7 @@
void *engine_data;
char *engine_name;
Etk_Engine *super;
+ void *handle;
void (*window_constructor)(Etk_Window *window);
void (*window_destructor)(Etk_Window *window);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_textblock.c
Log Message:
* [Textblock] Keep the cursor visible while moving it
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_textblock.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- etk_textblock.c 26 Jul 2006 14:57:18 - 1.22
+++ etk_textblock.c 26 Jul 2006 15:17:07 - 1.23
@@ -1129,22 +1129,25 @@
if (!tbo || !(tbo_sd = evas_object_smart_data_get(tbo)) ||
tbo_sd-cursor_visible == visible)
return;
- if (visible)
+ if (evas_object_visible_get(tbo))
{
- evas_object_show(tbo_sd-cursor_object);
- if (!tbo_sd-cursor_timer)
+ if (visible)
{
- tbo_sd-cursor_timer =
ecore_timer_add(ETK_TB_OBJECT_SHOW_CURSOR_DELAY,
-_etk_textblock_object_cursor_timer_cb, tbo);
+ evas_object_show(tbo_sd-cursor_object);
+ if (!tbo_sd-cursor_timer)
+ {
+tbo_sd-cursor_timer =
ecore_timer_add(ETK_TB_OBJECT_SHOW_CURSOR_DELAY,
+ _etk_textblock_object_cursor_timer_cb, tbo);
+ }
+ else
+ecore_timer_interval_set(tbo_sd-cursor_timer,
ETK_TB_OBJECT_SHOW_CURSOR_DELAY);
}
else
- ecore_timer_interval_set(tbo_sd-cursor_timer,
ETK_TB_OBJECT_SHOW_CURSOR_DELAY);
- }
- else
- {
- evas_object_hide(tbo_sd-cursor_object);
- ecore_timer_del(tbo_sd-cursor_timer);
- tbo_sd-cursor_timer = NULL;
+ {
+ evas_object_hide(tbo_sd-cursor_object);
+ ecore_timer_del(tbo_sd-cursor_timer);
+ tbo_sd-cursor_timer = NULL;
+ }
}
tbo_sd-cursor_visible = visible;
@@ -2787,6 +2790,13 @@
if (iter == tbo_sd-cursor || iter == tbo_sd-selection)
{
_etk_textblock_object_cursor_update_queue(tbo);
+
+ if (iter == tbo_sd-cursor tbo_sd-cursor_timer)
+ {
+evas_object_show(tbo_sd-cursor_object);
+ecore_timer_interval_set(tbo_sd-cursor_timer,
ETK_TB_OBJECT_SHOW_CURSOR_DELAY);
+ }
+
break;
}
}
@@ -3275,7 +3285,6 @@
}
/* Updates the cursor object and the selection of the textblock object */
-/* TODO: Reset the timer? */
static void _etk_textblock_object_cursor_update(Evas_Object *tbo)
{
Evas *evas;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e urandom
Enlightenment CVS committal
Author : urandom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_menu.c e_menu.h
Log Message:
function for adding evas objects as icons in the menus
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- e_menu.c28 Jul 2006 10:56:21 - 1.54
+++ e_menu.c28 Jul 2006 23:22:57 - 1.55
@@ -584,6 +584,19 @@
mi-menu-changed = 1;
}
+EAPI void
+e_menu_item_icon_object_set(E_Menu_Item *mi, Evas_Object *obj)
+{
+ E_OBJECT_CHECK(mi);
+ E_OBJECT_TYPE_CHECK(mi, E_MENU_ITEM_TYPE);
+ if (((mi-icon_object) (obj) (mi-icon_object == obj)) ||
+ ((!mi-icon_object) (!obj)))
+ return;
+ mi-icon_object = obj;
+ mi-changed = 1;
+ mi-menu-changed = 1;
+}
+
EAPI void
e_menu_item_label_set(E_Menu_Item *mi, const char *label)
{
@@ -1167,7 +1180,7 @@
evas_object_pass_events_set(o, 1);
e_box_pack_end(mi-container_object, o);
}
- if (mi-icon)
+ if (mi-icon || mi-icon_object)
{
int icon_w, icon_h;
@@ -1181,24 +1194,36 @@
else
evas_object_del(o);
-if (!mi-icon_key)
+if (mi-icon_object)
{
o = e_icon_add(mi-menu-evas);
- mi-icon_object = o;
- e_icon_file_set(o, mi-icon);
+ e_icon_object_set(o, mi-icon_object);
e_icon_fill_inside_set(o, 1);
- e_icon_size_get(mi-icon_object, icon_w, icon_h);
+ e_icon_size_get(o, icon_w, icon_h);
+
+ mi-icon_object = o;
}
-else
+else if (mi-icon)
{
- Evas_Coord iww, ihh;
-
- o = edje_object_add(mi-menu-evas);
- mi-icon_object = o;
- edje_object_file_set(o, mi-icon, mi-icon_key);
- edje_object_size_max_get(o, iww, ihh);
- icon_w = iww;
- icon_h = ihh;
+ if (!mi-icon_key)
+ {
+ o = e_icon_add(mi-menu-evas);
+ mi-icon_object = o;
+ e_icon_file_set(o, mi-icon);
+ e_icon_fill_inside_set(o, 1);
+ e_icon_size_get(mi-icon_object, icon_w, icon_h);
+ }
+ else
+ {
+ Evas_Coord iww, ihh;
+
+ o = edje_object_add(mi-menu-evas);
+ mi-icon_object = o;
+ edje_object_file_set(o, mi-icon, mi-icon_key);
+ edje_object_size_max_get(o, iww, ihh);
+ icon_w = iww;
+ icon_h = ihh;
+ }
}
evas_object_pass_events_set(o, 1);
evas_object_show(o);
@@ -1220,6 +1245,9 @@
}
else
{
+ int icon_w, icon_h;
+
+ o = edje_object_add(mi-menu-evas);
e_icon_size_get(mi-icon_object, icon_w, icon_h);
mi-icon_w = icon_w;
mi-icon_h = icon_h;
@@ -1401,6 +1429,7 @@
mi = l-data;
if (mi-icon) icons_on = 1;
+ if (mi-icon_object) icons_on = 1;
if (mi-label) labels_on = 1;
if (mi-submenu) submenus_on = 1;
if (mi-check) toggles_on = 1;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_menu.h2 Jul 2006 16:19:51 - 1.18
+++ e_menu.h28 Jul 2006 23:22:57 - 1.19
@@ -171,6 +171,7 @@
EAPI int e_menu_item_num_get(E_Menu_Item *mi);
EAPI void e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon);
EAPI void e_menu_item_icon_edje_set(E_Menu_Item *mi, const char *icon,
const char *key);
+EAPI void e_menu_item_icon_object_set(E_Menu_Item *mi, Evas_Object
*obj);
EAPI void e_menu_item_label_set(E_Menu_Item *mi, const char *label);
EAPI void e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub);
EAPI void e_menu_item_separator_set(E_Menu_Item *mi, int sep);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
colorpicker.edc scrollbar.edc tree.edc
Log Message:
* [Theme] Fix a bug in the colorpicker theme, and improve the
scrollbar look.
* [Signal] Fix a bug when calling etk_signal_stop().
* [Widget] Remove etk_widget_event_key_propagation_stop() since we don't
need it anymore. Use etk_signal_stop() instead.
* [Textblock] A lot of fixes, TODO-- and work on it. Add a small IM-like
test app.
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/colorpicker.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- colorpicker.edc 25 May 2006 21:06:59 - 1.4
+++ colorpicker.edc 26 Jul 2006 14:57:18 - 1.5
@@ -12,7 +12,7 @@
}
rel2 {
relative: 1.0 1.0;
- offset: -36 -1;
+ offset: -37 -1;
}
image {
normal: colorpicker_square.png;
@@ -57,7 +57,7 @@
}
rel2 {
relative: 1.0 1.0;
- offset: -40 -11;
+ offset: -41 -11;
}
}
}
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/scrollbar.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- scrollbar.edc 10 Jul 2006 03:26:53 - 1.6
+++ scrollbar.edc 26 Jul 2006 14:57:18 - 1.7
@@ -38,6 +38,28 @@
}
}
part {
+ name: trough_bar;
+ description {
+state: default 0.0;
+rel1 {
+ relative: 1.0 0.5;
+ offset: 1 -1;
+ to_x: left_left_arrow;
+ to_y: trough;
+}
+rel2 {
+ relative: 0.0 0.5;
+ offset: -2 0;
+ to_x: right_left_arrow;
+ to_y: trough;
+}
+image {
+ normal: hscrollbar_trough2.png;
+ border: 4 4 0 0;
+}
+ }
+ }
+ part {
name: confine;
type: RECT;
description {
@@ -102,6 +124,28 @@
image {
normal: vscrollbar_trough.png;
border: 8 8 8 8;
+}
+ }
+ }
+ part {
+ name: trough_bar;
+ description {
+state: default 0.0;
+rel1 {
+ relative: 0.5 1.0;
+ offset: -1 1;
+ to_x: trough;
+ to_y: up_up_arrow;
+}
+rel2 {
+ relative: 0.5 0.0;
+ offset: 0 -2;
+ to_x: trough;
+ to_y: down_up_arrow;
+}
+image {
+ normal: vscrollbar_trough2.png;
+ border: 0 0 4 4;
}
}
}
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- tree.edc10 Jul 2006 03:26:53 - 1.17
+++ tree.edc26 Jul 2006 14:57:18 - 1.18
@@ -122,7 +122,9 @@
description {
state: default 0.0;
visible: 0;
-color: 239 191 114 80;
+//color: 239 191 114 80;
+color: 245 205 109 102;
+//color: 245 205 109 127;
rel1 {
relative: 0.0 0.0;
offset: 0 0;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore sebastid
Enlightenment CVS committal Author : sebastid Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/bin Modified Files: .cvsignore Log Message: ignore hal bin === RCS file: /cvs/e/e17/libs/ecore/src/bin/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- .cvsignore 25 Jul 2006 12:45:35 - 1.3 +++ .cvsignore 27 Jul 2006 15:38:47 - 1.4 @@ -6,3 +6,4 @@ ecore_evas_test ecore_test ecore_dbus_test +ecore_dbus_hal_test - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_entry.c e_fm.c e_test.c
Log Message:
for really big files lists.. efm was being hyper-slow. i knwo why - and it's
fixed :) all hail a better sorting algorithm - incriemntal insertion quick sort
:) (or whatever you want to call it) and a little better scheduling in the
code :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_entry.c 23 Jul 2006 10:24:30 - 1.18
+++ e_entry.c 27 Jul 2006 19:29:16 - 1.19
@@ -886,6 +886,7 @@
sd-entry_object = e_editable_text_add(evas);
e_editable_text_text_set(sd-entry_object, );
evas_object_geometry_get(sd-entry_object, NULL, NULL, w, h);
+ e_editable_text_text_set(sd-entry_object, NULL);
edje_extern_object_min_size_set(sd-entry_object, w, h);
edje_object_part_swallow(sd-edje_object, text_area, sd-entry_object);
edje_object_size_min_calc(sd-edje_object, w, h);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_fm.c 24 Jul 2006 16:59:02 - 1.16
+++ e_fm.c 27 Jul 2006 19:29:16 - 1.17
@@ -26,7 +26,7 @@
struct {
Evas_Coord w, h;
- } max;
+ } max, pmax;
struct {
Evas_Coord x, y;
} pos;
@@ -615,21 +615,58 @@
_e_fm2_queue_process(Evas_Object *obj)
{
E_Fm2_Smart_Data *sd;
+ E_Fm2_Icon *ic, *ic2;
+ Evas_List *l;
+ int added = 0;
+ double t;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if (!sd-queue) return;
+/* double tt = ecore_time_get(); */
+/* int queued = evas_list_count(sd-queue); */
/* take unsorted and insert into the icon list - reprocess regions */
+ t = ecore_time_get();
+ /* pre-sort the queue - this will speed up insertion sort as we can
+* make some assumptions */
+ sd-queue = evas_list_sort(sd-queue, evas_list_count(sd-queue),
_e_fm2_cb_icon_sort);
+ l = sd-icons;
while (sd-queue)
{
- E_Fm2_Icon *ic;
-
+
ic = sd-queue-data;
- sd-icons = evas_list_append(sd-icons, ic);
- /* insertion sort - better than qsort for the way we are doing
-* things - incrimentally scan and sort as we go */
sd-queue = evas_list_remove_list(sd-queue, sd-queue);
- }
- sd-icons = evas_list_sort(sd-icons, evas_list_count(sd-icons),
_e_fm2_cb_icon_sort);
+ /* insertion sort - better than qsort for the way we are doing
+* things - incrimentally scan and sort as we go as we now know
+* that the queue files are in order, we speed up insertions to
+* a worst case of O(n) where n is the # of files in the list
+* so far
+*/
+ for (; l; l = l-next)
+ {
+ic2 = l-data;
+if (_e_fm2_cb_icon_sort(ic, ic2) 0)
+ {
+ sd-icons = evas_list_prepend_relative_list(sd-icons, ic, l);
+ break;
+ }
+ }
+ if (!l)
+ sd-icons = evas_list_append(sd-icons, ic);
+ added++;
+ /* every 5 additions - check to see if we have spent too long adding */
+ if ((added % 5) == 0)
+ {
+/* if we spent more than 1/10th of a second inserting - give up
+ * for now */
+if ((ecore_time_get() - t) 0.05) break;
+ }
+ }
+/* printf(FM: SORT %1.3f (%i files) (%i queued, %i added)\n,
+ ecore_time_get() - tt, evas_list_count(sd-icons), queued, added);
+ */
+ /* FIXME: this could get a lot faster - avoid it or something. scan
+speed goes from 200-250 files/sec to 80 or so in my tests */
if (sd-resize_job) ecore_job_del(sd-resize_job);
sd-resize_job = ecore_job_add(_e_fm2_cb_resize_job, obj);
evas_object_smart_callback_call(sd-obj, files_changed, NULL);
@@ -1264,7 +1301,8 @@
e_thumb_icon_file_set(ic-obj_icon, buf, NULL);
e_thumb_icon_size_set(ic-obj_icon, 64, 64);
evas_object_smart_callback_add(ic-obj_icon, e_thumb_gen,
_e_fm2_cb_icon_thumb_gen, ic);
-if (_e_fm2_icon_visible(ic)) e_thumb_icon_begin(ic-obj_icon);
+if ((_e_fm2_icon_visible(ic)) (!ic-sd-scan_idler))
+ e_thumb_icon_begin(ic-obj_icon);
edje_object_part_swallow(ic-obj, icon_swallow, ic-obj_icon);
evas_object_show(ic-obj_icon);
}
@@ -1277,7 +1315,8 @@
e_thumb_icon_file_set(ic-obj_icon, buf, desktop/background);
e_thumb_icon_size_set(ic-obj_icon, 64, 64);
evas_object_smart_callback_add(ic-obj_icon, e_thumb_gen,
_e_fm2_cb_icon_thumb_gen, ic);
-if (_e_fm2_icon_visible(ic)) e_thumb_icon_begin(ic-obj_icon);
+
E CVS: libs/ecore sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/bin
Modified Files:
ecore_dbus_hal_test.c ecore_dbus_test.c
Log Message:
Add error callback
===
RCS file: /cvs/e/e17/libs/ecore/src/bin/ecore_dbus_hal_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_dbus_hal_test.c 27 Jul 2006 15:06:13 - 1.3
+++ ecore_dbus_hal_test.c 27 Jul 2006 15:28:43 - 1.4
@@ -8,10 +8,9 @@
static int ecore_dbus_event_server_add(void *udata, int ev_type, void *ev);
static int ecore_dbus_event_server_del(void *udata, int ev_type, void *ev);
-static void ecore_dbus_method_name_has_owner_cb(void *data,
Ecore_DBus_Message_Type type,
- Ecore_DBus_Method_Return
*reply);
-static void ecore_dbus_method_add_match_cb(void *data, Ecore_DBus_Message_Type
type,
- Ecore_DBus_Method_Return *reply);
+static void ecore_dbus_method_name_has_owner_cb(void *data,
Ecore_DBus_Method_Return *reply);
+static void ecore_dbus_method_add_match_cb(void *data,
Ecore_DBus_Method_Return *reply);
+static void ecore_dbus_method_error_cb(void *data, const char *error);
static int ecore_dbus_event_server_signal(void *udata, int ev_type, void *ev);
@@ -63,7 +62,8 @@
event = ev;
printf(ecore_dbus_event_server_add\n);
ecore_dbus_method_name_has_owner(event-server, org.freedesktop.Hal,
- ecore_dbus_method_name_has_owner_cb, NULL);
+ ecore_dbus_method_name_has_owner_cb,
+ ecore_dbus_method_error_cb, NULL);
return 0;
}
@@ -80,15 +80,9 @@
}
static void
-ecore_dbus_method_name_has_owner_cb(void *data, Ecore_DBus_Message_Type type,
- Ecore_DBus_Method_Return *reply)
+ecore_dbus_method_name_has_owner_cb(void *data, Ecore_DBus_Method_Return
*reply)
{
unsigned int *exists;
- if (type != ECORE_DBUS_MESSAGE_TYPE_METHOD_RETURN)
- {
- ecore_main_loop_quit();
- return;
- }
printf(ecore_dbus_event_server_method_return %s %s.%s\n,
event_type_get(reply-type),
reply-header.interface,
reply-header.member);
@@ -107,24 +101,26 @@
interface='org.freedesktop.Hal.Manager',
sender='org.freedesktop.Hal',
path='/org/freedesktop/Hal/Manager',
- ecore_dbus_method_add_match_cb, NULL);
+ ecore_dbus_method_add_match_cb,
+ ecore_dbus_method_error_cb, NULL);
}
}
static void
-ecore_dbus_method_add_match_cb(void *data, Ecore_DBus_Message_Type type,
- Ecore_DBus_Method_Return *reply)
+ecore_dbus_method_add_match_cb(void *data, Ecore_DBus_Method_Return *reply)
{
- if (type != ECORE_DBUS_MESSAGE_TYPE_METHOD_RETURN)
- {
- ecore_main_loop_quit();
- return;
- }
printf(ecore_dbus_event_server_method_return %s %s.%s\n,
event_type_get(reply-type),
reply-header.interface,
reply-header.member);
printf(Should be listening for device changes!\n);
+}
+
+static void
+ecore_dbus_method_error_cb(void *data, const char *error)
+{
+ printf(Error: %s\n, error);
+ ecore_main_loop_quit();
}
static int
===
RCS file: /cvs/e/e17/libs/ecore/src/bin/ecore_dbus_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ecore_dbus_test.c 27 Jul 2006 15:06:13 - 1.9
+++ ecore_dbus_test.c 27 Jul 2006 15:28:43 - 1.10
@@ -8,11 +8,10 @@
static int ecore_dbus_event_server_add(void *udata, int ev_type, void *ev);
static int ecore_dbus_event_server_del(void *udata, int ev_type, void *ev);
-static void ecore_dbus_method_list_names_cb(void *data,
- Ecore_DBus_Message_Type type,
- Ecore_DBus_Method_Return *ev);
+static void ecore_dbus_method_list_names_cb(void *data,
Ecore_DBus_Method_Return *reply);
+static void ecore_dbus_method_error_cb(void *data, const char *error);
-static const char * event_type_get(Ecore_DBus_Message_Type type);
+static const char *event_type_get(Ecore_DBus_Message_Type type);
static Ecore_DBus_Server *svr = NULL;
@@ -56,7 +55,9 @@
event = ev;
printf(ecore_dbus_event_server_add\n);
- ecore_dbus_method_list_names(event-server,
ecore_dbus_method_list_names_cb, NULL);
+
