E CVS: libs/ecore rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib Modified Files: Makefile.am Log Message: move ecore_dbus to proto and flag it as deprecated === RCS file: /cvs/e/e17/libs/ecore/src/lib/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 11 Aug 2006 13:45:39 - 1.10 +++ Makefile.am 11 Jul 2007 05:46:52 - 1.11 @@ -11,5 +11,4 @@ ecore_evas \ ecore_config \ ecore_file \ -ecore_desktop \ -ecore_dbus +ecore_desktop - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: Makefile.am configure.in Log Message: move ecore_dbus to proto and flag it as deprecated === RCS file: /cvs/e/e17/libs/ecore/Makefile.am,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- Makefile.am 1 Jul 2007 17:28:11 - 1.35 +++ Makefile.am 11 Jul 2007 05:46:52 - 1.36 @@ -12,7 +12,6 @@ debian/changelog \ ecore-con.pc \ ecore-config.pc \ - ecore-dbus.pc \ ecore-desktop.pc \ ecore-directfb.pc\ ecore-evas.pc \ @@ -31,7 +30,6 @@ ecore.pc.in \ ecore-con.pc.in \ ecore-config.pc.in \ -ecore-dbus.pc.in \ ecore-desktop.pc.in \ ecore-directfb.pc.in\ ecore-evas.pc.in \ @@ -49,7 +47,6 @@ debian/ecore0-bin.install \ debian/libecore0-con.install \ debian/libecore0-config.install \ -debian/libecore0-dbus.install \ debian/libecore0-desktop.install \ debian/libecore0-dev.install \ debian/libecore0-evas.install \ @@ -70,10 +67,6 @@ pconfig = ecore-config.pc endif -if BUILD_ECORE_DBUS -pdbus = ecore-dbus.pc -endif - if BUILD_ECORE_DIRECTFB pdfb = ecore-directfb.pc endif @@ -116,5 +109,5 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ - ecore.pc $(pcon) $(pconfig) $(pdbus) $(pdfb) $(pevas) \ + ecore.pc $(pcon) $(pconfig) $(pdfb) $(pevas) \ $(pfb) $(pfile) $(pdesktop) $(pipc) $(pjob) $(ptxt) $(px) === RCS file: /cvs/e/e17/libs/ecore/configure.in,v retrieving revision 1.202 retrieving revision 1.203 diff -u -3 -r1.202 -r1.203 --- configure.in10 Jul 2007 00:13:23 - 1.202 +++ configure.in11 Jul 2007 05:46:52 - 1.203 @@ -63,7 +63,6 @@ # only the trivial requirements go here. requirements_ecore_con="" requirements_ecore_config="" -requirements_ecore_dbus="" requirements_ecore_desktop="" requirements_ecore_directfb="" requirements_ecore_evas="evas" @@ -747,7 +746,6 @@ AC_SUBST(requirements_ecore_con) AC_SUBST(requirements_ecore_config) -AC_SUBST(requirements_ecore_dbus) AC_SUBST(requirements_ecore_desktop) AC_SUBST(requirements_ecore_directfb) AC_SUBST(requirements_ecore_evas) @@ -772,7 +770,6 @@ Makefile ecore-con.pc ecore-config.pc -ecore-dbus.pc ecore-desktop.pc ecore-directfb.pc ecore-evas.pc @@ -796,7 +793,6 @@ src/lib/ecore_txt/Makefile src/lib/ecore_config/Makefile src/lib/ecore_file/Makefile -src/lib/ecore_dbus/Makefile src/lib/ecore_desktop/Makefile src/lib/ecore_directfb/Makefile README @@ -828,7 +824,6 @@ echo " Ecore_Evas Buffer Support: $have_ecore_evas_buffer" echo " Ecore_Ipc: $have_ecore_ipc (OpenSSL: $use_openssl)" echo " Ecore_Config.: $have_ecore_config" -echo " Ecore_DBUS...: $have_ecore_dbus" echo " Ecore_Desktop: $have_ecore_desktop" #echo " Ecore_File...: $have_ecore_file (Inotify: $use_inotify) (FAM: $use_fam) (Poll: $use_poll)" echo " Ecore_File...: $have_ecore_file (Inotify: $use_inotify) (Poll: $use_poll) (CURL: $use_curl)" - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_dbus Removed Files: .cvsignore Ecore_DBus.h Makefile.am ecore_dbus.c ecore_dbus_address.c ecore_dbus_marshal.c ecore_dbus_message.c ecore_dbus_methods.c ecore_dbus_object.c ecore_dbus_private.h ecore_dbus_unmarshal.c ecore_dbus_utils.c Log Message: move ecore_dbus to proto and flag it as deprecated - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/ecore_dbus Added Files: .cvsignore DEPRECATED Ecore_DBus.h Makefile.am ecore_dbus.c ecore_dbus_address.c ecore_dbus_marshal.c ecore_dbus_message.c ecore_dbus_methods.c ecore_dbus_object.c ecore_dbus_private.h ecore_dbus_unmarshal.c ecore_dbus_utils.c Log Message: move ecore_dbus to proto and flag it as deprecated - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/ecore_dbus Log Message: Directory /cvs/e/e17/proto/ecore_dbus added to the repository - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/e_dbus/src/lib/notification Modified Files: Makefile.am Log Message: pass distcheck === RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 11 Jul 2007 00:46:13 - 1.3 +++ Makefile.am 11 Jul 2007 00:53:34 - 1.4 @@ -3,10 +3,12 @@ @EDBUS_CFLAGS@ lib_LTLIBRARIES = libenotify.la -include_HEADERS = E_Notify.h +include_HEADERS = E_Notify.h E_Notification_Daemon.h libenotify_la_SOURCES = \ E_Notify.h \ +E_Notification_Daemon.h \ +e_notify_private.h \ notification.c \ marshal.c \ client.c \ - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/bin
Modified Files:
Makefile.am notify.c
Added Files:
notification_daemon.c
Log Message:
add daemon test and implement more of client test
===
RCS file: /cvs/e/e17/proto/e_dbus/src/bin/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 11 Jul 2007 00:45:13 - 1.7
+++ Makefile.am 11 Jul 2007 00:48:59 - 1.8
@@ -14,7 +14,8 @@
e_dbus_test_client \
e_dbus_hal \
e_dbus_nm \
-e_dbus_notify
+e_dbus_notify \
+
e_dbus_notification_daemon
e_dbus_test_SOURCES = \
test.c
@@ -61,3 +62,9 @@
e_dbus_notify_LDADD = $(top_builddir)/src/lib/dbus/libedbus.la
$(top_builddir)/src/lib/notification/libenotify.la $(LIBS)
e_dbus_notify_DEPENDENCIES = $(top_builddir)/src/lib/dbus/libedbus.la
$(top_builddir)/src/lib/notification/libenotify.la
+
+e_dbus_notification_daemon_SOURCES = \
+ notification_daemon.c
+
+e_dbus_notification_daemon_LDADD = $(top_builddir)/src/lib/dbus/libedbus.la
$(top_builddir)/src/lib/notification/libenotify.la $(LIBS)
+e_dbus_notification_daemon_DEPENDENCIES =
$(top_builddir)/src/lib/dbus/libedbus.la
$(top_builddir)/src/lib/notification/libenotify.la
===
RCS file: /cvs/e/e17/proto/e_dbus/src/bin/notify.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- notify.c11 Jul 2007 00:46:37 - 1.3
+++ notify.c11 Jul 2007 00:48:59 - 1.4
@@ -16,19 +16,65 @@
{
printf("Error: %s\n", err->message);
}
- ecore_main_loop_quit();
+
+ free(notify);
+}
+
+int
+cb_timer(void *data)
+{
+ E_Notification *n;
+ char buf[1024];
+ static int num = 0;
+ static const char *icons[] = {
+"xterm",
+"firefox",
+"gvim"
+ };
+
+ snprintf(buf, sizeof(buf), "%s says Hello #%d", icons[num%3],
num / 3);
+ n = e_notification_full_new(icons[num%3], 0, icons[num%3], "Summary", buf,
-1);
+ e_notification_send(n, cb_sent, NULL);
+ e_notification_unref(n);
+ num++;
+
+ return 1;
+}
+
+void
+cb_action_invoked(void *data, int type, void *event)
+{
+ E_Notification_Event_Action_Invoked *ev;
+
+ ev = event;
+ printf("Action (%d): %s\n", ev->notification_id, ev->action_id);
+ free(ev);
+}
+
+void
+cb_note_closed(void *data, int type, void *event)
+{
+ E_Notification_Event_Notification_Closed *ev;
+ static const char *reasons[] = {
+"Expired",
+"Dismissed",
+"Requested",
+"Undefined"
+ };
+
+ ev = event;
+ printf("Note %d closed: %s\n", ev->notification_id, reasons[ev->reason]);
+ free(ev);
}
int
main(int argc, char **argv)
{
int ret = 0;
- E_Notification *n;
ecore_init();
if (e_notification_init())
{
-n = e_notification_full_new("Elicit", 0, "elicit", "Summary", "The
body", -1);
-e_notification_send(n, cb_sent, NULL);
+ecore_timer_add(1, cb_timer, NULL);
ecore_main_loop_begin();
e_notification_shutdown();
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
E_Notification_Daemon.h daemon.c
Log Message:
implement more of the daemon side
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/E_Notification_Daemon.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- E_Notification_Daemon.h 11 Jul 2007 00:46:13 - 1.1
+++ E_Notification_Daemon.h 11 Jul 2007 00:48:49 - 1.2
@@ -1,40 +1,56 @@
#ifndef E_NOTIFICATION_DAEMON_H
#define E_NOTIFICATION_DAEMON_H
-/* daemon events */
-extern int E_NOTIFICATION_EVENT_NOTIFY;
-extern int E_NOTIFICATION_EVENT_CLOSE;
+#define E_NOTIFICATION_DAEMON_VERSION "0.9"
+#include
-typedef struct E_Notification_Context E_Notification_Daemon;
-/* daemon events */
-typedef struct E_Notification_Event_Daemon E_Notification_Event_Daemon;
-typedef struct E_Notification_Event_Daemon E_Notification_Event_Notify;
-typedef struct E_Notification_Event_Daemon E_Notification_Event_Close;
+typedef struct E_Notification_Daemon E_Notification_Daemon;
+
+/* daemon callbacks */
+typedef int (*E_Notification_Daemon_Callback_Notify) (E_Notification_Daemon
*daemon, E_Notification *notification);
+typedef void (*E_Notification_Daemon_Callback_Close_Notification)
(E_Notification_Daemon *daemon, int notification_id);
/* gui */
typedef struct E_Notification_View E_Notification_View;
-struct E_Notification_Context
+struct E_Notification_Daemon
{
E_DBus_Connection *conn;
-};
+ E_DBus_Interface *iface;
+ E_DBus_Object *obj;
-/* daemon event data */
-struct E_Notification_Event_Daemon
-{
- E_Notification *notification;
+ char *name;
+ char *vendor;
+
+ struct
+ {
+E_Notification_Daemon_Callback_Notify notify;
+E_Notification_Daemon_Callback_Close_Notification close_notification;
+ } func;
+ void *data;
+
+ int state;
};
/* daemon */
-E_Notification_Daemon *e_notification_daemon_add(DBusConnection *conn);
+E_Notification_Daemon *e_notification_daemon_add(const char *name, const char
*vendor);
void e_notification_daemon_free(E_Notification_Daemon *d);
void e_notification_daemon_close(E_Notification_Daemon *d,
E_Notification *n, unsigned int reason);
void e_notification_daemon_action_invoke(E_Notification_Daemon *d,
E_Notification *n, const char *action_id);
+void e_notification_daemon_data_set(E_Notification_Daemon *daemon, void
*data);
+void *e_notification_daemon_data_get(E_Notification_Daemon *daemon);
+
+void e_notification_daemon_callback_notify_set(E_Notification_Daemon *daemon,
E_Notification_Daemon_Callback_Notify func);
+void
e_notification_daemon_callback_close_notification_set(E_Notification_Daemon
*daemon, E_Notification_Daemon_Callback_Close_Notification func);
+
+
+void e_notification_daemon_signal_notification_closed(E_Notification_Daemon
*daemon, unsigned int id, E_Notification_Closed_Reason reason);
+void e_notification_daemon_signal_action_invoked(E_Notification_Daemon
*daemon, unsigned int notification_id, const char *action_id);
/* gui */
E_Notification_View *e_notification_view_add(E_Notification_Daemon *d,
E_Notification *n);
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/daemon.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- daemon.c11 Jul 2007 00:46:13 - 1.1
+++ daemon.c11 Jul 2007 00:48:49 - 1.2
@@ -1,20 +1,213 @@
#include "E_Notify.h"
#include "E_Notification_Daemon.h"
#include "e_notify_private.h"
+#include
+
+static int next_id = 0;
+
+DBusMessage *
+method_get_capabilities(E_DBus_Object *obj, DBusMessage *message)
+{
+ const char *capabilities[] = {
+"body",
+"actions",
+NULL
+ };
+ return e_notify_marshal_get_capabilities_return(message, capabilities);
+}
+
+DBusMessage *
+method_notify(E_DBus_Object *obj, DBusMessage *message)
+{
+ E_Notification *n;
+ E_Notification_Daemon *daemon;
+ int id = -1;
+
+ daemon = e_dbus_object_data_get(obj);
+ n = e_notify_unmarshal_notify(message, NULL);
+ if (daemon->func.notify)
+id = daemon->func.notify(daemon, n);
+ else
+return dbus_message_new_error(message,
E_NOTIFICATION_INTERFACE".Unimplemented", "This functionality has not yet been
implemented");
+
+ e_notification_unref(n);
+ return e_notify_marshal_notify_return(message, id);
+}
+
+DBusMessage *
+method_close_notification(E_DBus_Object *obj, DBusMessage *message)
+{
+ E_Notification_Daemon *daemon;
+ dbus_uint32_t id;
+
+ daemon = e_dbus_object_data_get(obj);
+ id = e_notify_unmarshal_close_notification(message, NULL);
+ if (daemon->func.close_notification)
+daemon->func.close_notification(daemon, id);
+ return dbus_message_new_method_return(message);
+}
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/e_dbus/src/lib/notification Modified Files: client.c Log Message: unref messages === RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/client.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- client.c11 Jul 2007 00:47:11 - 1.4 +++ client.c11 Jul 2007 00:48:41 - 1.5 @@ -37,6 +37,7 @@ msg = e_notify_marshal_notify(n); e_dbus_method_call_send(client_conn, msg, e_notify_unmarshal_notify_return, func, -1, data); + dbus_message_unref(msg); } void @@ -46,6 +47,7 @@ msg = e_notify_marshal_get_capabilities(); e_dbus_method_call_send(client_conn, msg, e_notify_unmarshal_get_capabilities_return, func, -1, data); + dbus_message_unref(msg); } void @@ -55,4 +57,5 @@ msg = e_notify_marshal_get_server_information(); e_dbus_method_call_send(client_conn, msg, e_notify_unmarshal_get_server_information_return, func, -1, data); + dbus_message_unref(msg); } - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
e_notify_private.h marshal.c
Log Message:
use const char ** instead of a list for capabilities
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/e_notify_private.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_notify_private.h 11 Jul 2007 00:48:25 - 1.4
+++ e_notify_private.h 11 Jul 2007 00:48:33 - 1.5
@@ -15,10 +15,11 @@
void e_notify_marshal_dict_byte(DBusMessageIter *iter, const char *key, char
value);
void e_notify_marshal_dict_int(DBusMessageIter *iter, const char *key, int
value);
+void e_notify_marshal_string_array(DBusMessageIter *iter, const char
**strings);
void e_notify_marshal_string_list_as_array(DBusMessageIter *iter, Ecore_List
*strings);
Ecore_List * e_notify_unmarshal_string_array_as_list(DBusMessageIter *iter,
DBusError *err);
DBusMessage * e_notify_marshal_get_capabilities();
-DBusMessage * e_notify_marshal_get_capabilities_return(DBusMessage
*method_call, Ecore_List *capabilities);
+DBusMessage * e_notify_marshal_get_capabilities_return(DBusMessage
*method_call, const char **capabilities);
E_Notification_Return_Get_Capabilities *
e_notify_unmarshal_get_capabilities_return(DBusMessage *msg, DBusError *err);
DBusMessage * e_notify_marshal_get_server_information();
DBusMessage * e_notify_marshal_get_server_information_return(DBusMessage
*method_call, const char *name, const char *vendor, const char *version);
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/marshal.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- marshal.c 11 Jul 2007 00:47:19 - 1.5
+++ marshal.c 11 Jul 2007 00:48:33 - 1.6
@@ -60,6 +60,20 @@
}
void
+e_notify_marshal_string_array(DBusMessageIter *iter, const char **strings)
+{
+ const char **str;
+ DBusMessageIter arr;
+
+ dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "s", &arr);
+
+ for (str = strings; *str; str++)
+dbus_message_iter_append_basic(&arr, DBUS_TYPE_STRING, str);
+
+ dbus_message_iter_close_container(iter, &arr);
+}
+
+void
e_notify_marshal_string_list_as_array(DBusMessageIter *iter, Ecore_List
*strings)
{
const char *str;
@@ -113,14 +127,14 @@
}
DBusMessage *
-e_notify_marshal_get_capabilities_return(DBusMessage *method_call, Ecore_List
*capabilities)
+e_notify_marshal_get_capabilities_return(DBusMessage *method_call, const char
**capabilities)
{
DBusMessage *msg;
DBusMessageIter iter;
msg = dbus_message_new_method_return(method_call);
dbus_message_iter_init_append(msg, &iter);
- e_notify_marshal_string_list_as_array(&iter, capabilities);
+ e_notify_marshal_string_array(&iter, capabilities);
return msg;
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
E_Notify.h e_notify_private.h notification.c
Log Message:
add notification_{id,closed}_{get,set}
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/E_Notify.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- E_Notify.h 11 Jul 2007 00:46:13 - 1.6
+++ E_Notify.h 11 Jul 2007 00:48:25 - 1.7
@@ -114,20 +114,24 @@
int expire_timeout);
/* notification mutators */
+void e_notification_id_set(E_Notification *note, unsigned int id);
void e_notification_app_name_set(E_Notification *n, const char *app_name);
void e_notification_app_icon_set(E_Notification *n, const char *app_icon);
void e_notification_summary_set(E_Notification *n, const char *summary);
void e_notification_body_set(E_Notification *n, const char *body);
void e_notification_replaces_id_set(E_Notification *n, int replaces_id);
void e_notification_timeout_set(E_Notification *n, int timeout);
+void e_notification_closed_set(E_Notification *note, unsigned char closed);
/* notification accessors */
+unsigned int e_notification_id_get(E_Notification *note);
const char *e_notification_app_name_get(E_Notification *n);
const char *e_notification_app_icon_get(E_Notification *n);
const char *e_notification_summary_get(E_Notification *n);
const char *e_notification_body_get(E_Notification *n);
-int e_notification_timeout_get(E_Notification *note);
int e_notification_replaces_id_get(E_Notification *note);
+int e_notification_timeout_get(E_Notification *note);
+unsigned char e_notification_closed_get(E_Notification *note);
/* actions */
void e_notification_action_add(E_Notification *n, const char *action_id, const
char *action_name);
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/e_notify_private.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_notify_private.h 11 Jul 2007 00:47:19 - 1.3
+++ e_notify_private.h 11 Jul 2007 00:48:25 - 1.4
@@ -73,6 +73,7 @@
} hints;
int hint_flags;
+ unsigned char closed;
int refcount;
};
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/notification.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- notification.c 11 Jul 2007 00:46:13 - 1.4
+++ notification.c 11 Jul 2007 00:48:25 - 1.5
@@ -64,7 +64,7 @@
if (n->summary) free(n->summary);
if (n->body) free(n->body);
- ecore_list_destroy(n->actions);
+ if (n->actions) ecore_list_destroy(n->actions);
if (n->hints.category) free(n->hints.category);
if (n->hints.desktop) free(n->hints.desktop);
@@ -74,6 +74,11 @@
}
/* mutators */
+void
+e_notification_id_set(E_Notification *note, unsigned int id)
+{
+ note->id = id;
+}
void
e_notification_app_name_set(E_Notification *note, const char *app_name)
@@ -128,8 +133,19 @@
note->expire_timeout = timeout;
}
+void
+e_notification_closed_set(E_Notification *note, unsigned char closed)
+{
+ note->closed = closed;
+}
+
/* accessors */
+unsigned int
+e_notification_id_get(E_Notification *note)
+{
+ return note->id;
+}
const char *
e_notification_app_name_get(E_Notification *note)
@@ -171,6 +187,12 @@
e_notification_timeout_get(E_Notification *note)
{
return note->expire_timeout;
+}
+
+unsigned char
+e_notification_closed_get(E_Notification *note)
+{
+ return note->closed;
}
/* actions */
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/dbus
Modified Files:
E_DBus.h e_dbus_object.c e_dbus_private.h
Log Message:
cleanups and debugging
export interface ref/unref
plug leak in introspection data
add some debugging for introspection
make callback struct opaque
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/E_DBus.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- E_DBus.h11 Jul 2007 00:47:19 - 1.11
+++ E_DBus.h11 Jul 2007 00:48:17 - 1.12
@@ -24,6 +24,17 @@
typedef void (*E_DBus_Object_Property_Get_Cb) (E_DBus_Object *obj, const char
*property, int *type, void **value);
typedef int (*E_DBus_Object_Property_Set_Cb) (E_DBus_Object *obj, const char
*property, int type, void *value);
+/**
+ * A callback function for a DBus call
+ * @param user_data the data passed in to the method call
+ * @param event_data a struct containing the return data.
+ */
+typedef void (*E_DBus_Callback_Func) (void *user_data, void *method_return,
DBusError *error);
+typedef DBusMessage *(*E_DBus_Unmarshal_Func) (DBusMessage *msg, DBusError
*err);
+
+typedef struct E_DBus_Callback E_DBus_Callback;
+
+
int e_dbus_init(void);
void e_dbus_shutdown(void);
@@ -38,6 +49,8 @@
/* receiving method calls */
E_DBus_Interface *e_dbus_interface_new(const char *interface);
+void e_dbus_interface_ref(E_DBus_Interface *iface);
+void e_dbus_interface_unref(E_DBus_Interface *iface);
void e_dbus_object_interface_attach(E_DBus_Object *obj, E_DBus_Interface
*iface);
int e_dbus_interface_method_add(E_DBus_Interface *iface, const char *member,
const char *signature, const char *reply_signature, E_DBus_Method_Cb func);
@@ -54,6 +67,8 @@
DBusPendingCall *e_dbus_message_send(E_DBus_Connection *conn, DBusMessage
*msg, E_DBus_Method_Return_Cb cb_return, int timeout, void *data);
+DBusPendingCall *e_dbus_method_call_send(E_DBus_Connection *conn, DBusMessage
*msg, E_DBus_Unmarshal_Func unmarshal_func, E_DBus_Callback_Func cb_func, int
timeout, void *data);
+
/* signal receiving */
@@ -106,21 +121,6 @@
void *value, E_DBus_Method_Return_Cb cb_return,
void *data);
-/**
- * A callback function for a DBus call
- * @param user_data the data passed in to the method call
- * @param event_data a struct containing the return data.
- */
-typedef void (*E_DBus_Callback_Func) (void *user_data, void *method_return,
DBusError *error);
-typedef DBusMessage *(*E_DBus_Unmarshal_Func) (DBusMessage *msg, DBusError
*err);
-
-typedef struct E_DBus_Callback E_DBus_Callback;
-struct E_DBus_Callback
-{
- E_DBus_Callback_Func cb_func;
- E_DBus_Unmarshal_Func unmarshal_func;
- void *user_data;
-};
E_DBus_Callback *e_dbus_callback_new(E_DBus_Callback_Func cb_func,
E_DBus_Unmarshal_Func unmarshal_func, void *user_data);
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_object.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_dbus_object.c 11 Jul 2007 00:44:54 - 1.10
+++ e_dbus_object.c 11 Jul 2007 00:48:17 - 1.11
@@ -15,8 +15,6 @@
static void e_dbus_object_unregister(DBusConnection *conn, void *user_data);
static DBusHandlerResult e_dbus_object_handler(DBusConnection *conn,
DBusMessage *message, void *user_data);
-static void e_dbus_interface_ref(E_DBus_Interface *iface);
-static void e_dbus_interface_unref(E_DBus_Interface *iface);
static void e_dbus_interface_free(E_DBus_Interface *iface);
static E_DBus_Method *e_dbus_method_new(const char *member, const char
*signature, const char *reply_signature, E_DBus_Method_Cb func);
@@ -84,6 +82,7 @@
return ret;
}
+if (obj->introspection_data) free(obj->introspection_data);
obj->introspection_data = strdup(ecore_strbuf_string_get(buf));
ecore_strbuf_free(buf);
}
@@ -235,7 +234,7 @@
{
if (!obj) return;
- DEBUG(5, "e_dbus_object_free\n");
+ DEBUG(5, "e_dbus_object_free (%s)\n", obj->path);
dbus_connection_unregister_object_path(obj->conn->conn, obj->path);
e_dbus_connection_unref(obj->conn);
@@ -284,17 +283,20 @@
e_dbus_interface_ref(iface);
ecore_list_append(obj->interfaces, iface);
obj->introspection_dirty = 1;
+ DEBUG(4, "e_dbus_object_interface_attach (%s, %s) ", obj->path, iface->name);
}
-static void
+void
e_dbus_interface_ref(E_DBus_Interface *iface)
{
iface->refcount++;
+ DEBUG(4, "e_dbus_interface_ref (%s) = %d\n", iface->name, iface->refcount);
}
-static void
+void
e_dbus_interface_unref(E_DBus_Interface *iface)
{
+ DEBUG(4, "e_dbus_interface_unref (%s) = %d\n", iface->name, iface->refcount
- 1);
if (--(iface->refcount) == 0)
e_dbus_interface_free(iface);
}
@@ -326,6 +328,7 @@
E_DBus_Method *m;
m =
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/e_dbus/src/lib/dbus Modified Files: e_dbus_util.c Log Message: include private header === RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_util.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_dbus_util.c 11 Jul 2007 00:47:19 - 1.5 +++ e_dbus_util.c 11 Jul 2007 00:48:08 - 1.6 @@ -1,4 +1,5 @@ #include "E_DBus.h" +#include "e_dbus_private.h" /** * @internal - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/e_dbus/src/lib/dbus Modified Files: e_dbus_message.c Log Message: free callback === RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_message.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_dbus_message.c11 Jul 2007 00:47:19 - 1.5 +++ e_dbus_message.c11 Jul 2007 00:48:00 - 1.6 @@ -102,6 +102,8 @@ if (dbus_error_is_set(&new_err)) dbus_error_free(&new_err); + + e_dbus_callback_free(cb); } DBusPendingCall * - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/e_dbus/src/lib/dbus Modified Files: e_dbus.c Log Message: ref connection when creating === RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_dbus.c22 Mar 2007 07:15:23 - 1.5 +++ e_dbus.c11 Jul 2007 00:47:52 - 1.6 @@ -437,6 +437,7 @@ shared_connections[type] = econn; } dbus_error_free(&err); + e_dbus_connection_ref(econn); return econn; } - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/dbus
Modified Files:
E_DBus.h e_dbus_message.c e_dbus_util.c
Log Message:
include errors in method return callbacks
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/E_DBus.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- E_DBus.h11 Jul 2007 00:47:11 - 1.10
+++ E_DBus.h11 Jul 2007 00:47:19 - 1.11
@@ -112,7 +112,7 @@
* @param event_data a struct containing the return data.
*/
typedef void (*E_DBus_Callback_Func) (void *user_data, void *method_return,
DBusError *error);
-typedef DBusMessage *(*E_DBus_Unmarshal_Func) (DBusMessage *msg);
+typedef DBusMessage *(*E_DBus_Unmarshal_Func) (DBusMessage *msg, DBusError
*err);
typedef struct E_DBus_Callback E_DBus_Callback;
struct E_DBus_Callback
@@ -126,7 +126,7 @@
void e_dbus_callback_free(E_DBus_Callback *callback);
void e_dbus_callback_call(E_DBus_Callback *cb, void *data, DBusError *error);
-void *e_dbus_callback_unmarshal(E_DBus_Callback *cb, DBusMessage *msg);
+void *e_dbus_callback_unmarshal(E_DBus_Callback *cb, DBusMessage *msg,
DBusError *err);
const char *e_dbus_basic_type_as_string(int type);
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_message.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_dbus_message.c11 Jul 2007 00:47:11 - 1.4
+++ e_dbus_message.c11 Jul 2007 00:47:19 - 1.5
@@ -89,12 +89,19 @@
{
E_DBus_Callback *cb = data;
void *method_return = NULL;
+ DBusError new_err;
if (!cb) return;
+ dbus_error_init(&new_err);
if (!dbus_error_is_set(err))
-method_return = e_dbus_callback_unmarshal(cb, msg);
+method_return = e_dbus_callback_unmarshal(cb, msg, &new_err);
+ else
+dbus_move_error(err, &new_err);
- e_dbus_callback_call(cb, method_return, err);
+ e_dbus_callback_call(cb, method_return, &new_err);
+
+ if (dbus_error_is_set(&new_err))
+dbus_error_free(&new_err);
}
DBusPendingCall *
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_util.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_dbus_util.c 11 Jul 2007 00:47:11 - 1.4
+++ e_dbus_util.c 11 Jul 2007 00:47:19 - 1.5
@@ -39,12 +39,11 @@
cb->cb_func(cb->user_data, data, error);
}
-//XXX this probably should be passed an error pointer
void *
-e_dbus_callback_unmarshal(E_DBus_Callback *cb, DBusMessage *msg)
+e_dbus_callback_unmarshal(E_DBus_Callback *cb, DBusMessage *msg, DBusError
*err)
{
if (cb && cb->unmarshal_func)
-return cb->unmarshal_func(msg);
+return cb->unmarshal_func(msg, err);
else
return NULL;
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
e_notify_private.h marshal.c
Log Message:
include errors in method return callbacks
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/e_notify_private.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_notify_private.h 11 Jul 2007 00:46:13 - 1.2
+++ e_notify_private.h 11 Jul 2007 00:47:19 - 1.3
@@ -1,11 +1,11 @@
#ifndef E_NOTIFY_PRIVATE_H
#define E_NOTIFY_PRIVATE_H
+#define E_NOTIFICATION_BUS_NAME "org.freedesktop.Notifications"
#define E_NOTIFICATION_INTERFACE "org.freedesktop.Notifications"
-#define E_NOTIFICATION_DESTINATION "org.freedesktop.Notifications"
#define E_NOTIFICATION_PATH "/org/freedesktop/Notifications"
-#define e_notification_call_new(member)
dbus_message_new_method_call(E_NOTIFICATION_DESTINATION, E_NOTIFICATION_PATH,
E_NOTIFICATION_INTERFACE, member)
+#define e_notification_call_new(member)
dbus_message_new_method_call(E_NOTIFICATION_BUS_NAME, E_NOTIFICATION_PATH,
E_NOTIFICATION_INTERFACE, member)
typedef void (*E_DBus_Variant_Marshaller) (DBusMessageIter *iter, void *data);
#define E_DBUS_VARIANT_MARSHALLER(x) ((E_DBus_Variant_Marshaller)(x))
@@ -16,23 +16,23 @@
void e_notify_marshal_dict_int(DBusMessageIter *iter, const char *key, int
value);
void e_notify_marshal_string_list_as_array(DBusMessageIter *iter, Ecore_List
*strings);
-Ecore_List * e_notify_unmarshal_string_array_as_list(DBusMessageIter *iter);
+Ecore_List * e_notify_unmarshal_string_array_as_list(DBusMessageIter *iter,
DBusError *err);
DBusMessage * e_notify_marshal_get_capabilities();
DBusMessage * e_notify_marshal_get_capabilities_return(DBusMessage
*method_call, Ecore_List *capabilities);
-E_Notification_Return_Get_Capabilities *
e_notify_unmarshal_get_capabilities_return(DBusMessage *msg);
+E_Notification_Return_Get_Capabilities *
e_notify_unmarshal_get_capabilities_return(DBusMessage *msg, DBusError *err);
DBusMessage * e_notify_marshal_get_server_information();
DBusMessage * e_notify_marshal_get_server_information_return(DBusMessage
*method_call, const char *name, const char *vendor, const char *version);
-E_Notification_Return_Get_Server_Information *
e_notify_unmarshal_get_server_information_return(DBusMessage *msg);
+E_Notification_Return_Get_Server_Information *
e_notify_unmarshal_get_server_information_return(DBusMessage *msg, DBusError
*err);
DBusMessage * e_notify_marshal_close_notification(dbus_uint32_t id);
-dbus_uint32_t e_notify_unmarshal_close_notification(DBusMessage *msg);
+dbus_uint32_t e_notify_unmarshal_close_notification(DBusMessage *msg,
DBusError *err);
DBusMessage * e_notify_marshal_notification_closed_signal(dbus_uint32_t id,
dbus_uint32_t reason);
-E_Notification_Event_Notification_Closed *
e_notify_unmarshal_notification_closed_signal(DBusMessage *msg);
+E_Notification_Event_Notification_Closed *
e_notify_unmarshal_notification_closed_signal(DBusMessage *msg, DBusError *err);
DBusMessage * e_notify_marshal_action_invoked_signal(dbus_uint32_t id, const
char *action_id);
-E_Notification_Event_Action_Invoked *
e_notify_unmarshal_action_invoked_signal(DBusMessage *msg);
+E_Notification_Event_Action_Invoked *
e_notify_unmarshal_action_invoked_signal(DBusMessage *msg, DBusError *err);
DBusMessage * e_notify_marshal_notify(E_Notification *n);
-E_Notification * e_notify_unmarshal_notify(DBusMessage *msg);
+E_Notification * e_notify_unmarshal_notify(DBusMessage *msg, DBusError *err);
DBusMessage * e_notify_marshal_notify_return(DBusMessage *method_call,
dbus_uint32_t notification_id);
-E_Notification_Return_Notify * e_notify_unmarshal_notify_return(DBusMessage
*msg);
+E_Notification_Return_Notify * e_notify_unmarshal_notify_return(DBusMessage
*msg, DBusError *err);
Ecore_List * e_notify_unmarshal_notify_actions(E_Notification *n,
DBusMessageIter *iter);
Ecore_List * e_notify_unmarshal_notify_hints(E_Notification *n,
DBusMessageIter *iter);
void e_notify_marshal_hint_image(DBusMessageIter *iter, E_Notification_Image
*img);
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/marshal.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- marshal.c 11 Jul 2007 00:46:13 - 1.4
+++ marshal.c 11 Jul 2007 00:47:19 - 1.5
@@ -75,7 +75,7 @@
}
Ecore_List *
-e_notify_unmarshal_string_array_as_list(DBusMessageIter *iter)
+e_notify_unmarshal_string_array_as_list(DBusMessageIter *iter, DBusError *err)
{
Ecore_List *strings;
char *sig;
@@ -126,7 +126,7 @@
}
E_Notification_Return_Get_Capabilities *
-e_notify_unmarshal_get_capabilities_return(DBusMessage *msg)
+e_notify_unmarshal_get_capabilities_return(DBusMessage *msg, DBusError *err)
{
DBusMessageIter iter, a
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/dbus
Modified Files:
E_DBus.h e_dbus_message.c e_dbus_util.c
Log Message:
refactor method call return callback into e_dbus
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/E_DBus.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- E_DBus.h11 Jul 2007 00:46:37 - 1.9
+++ E_DBus.h11 Jul 2007 00:47:11 - 1.10
@@ -112,17 +112,21 @@
* @param event_data a struct containing the return data.
*/
typedef void (*E_DBus_Callback_Func) (void *user_data, void *method_return,
DBusError *error);
+typedef DBusMessage *(*E_DBus_Unmarshal_Func) (DBusMessage *msg);
typedef struct E_DBus_Callback E_DBus_Callback;
struct E_DBus_Callback
{
- E_DBus_Callback_Func func;
+ E_DBus_Callback_Func cb_func;
+ E_DBus_Unmarshal_Func unmarshal_func;
void *user_data;
};
-E_DBus_Callback *e_dbus_callback_new(E_DBus_Callback_Func cb_func, void
*user_data);
+E_DBus_Callback *e_dbus_callback_new(E_DBus_Callback_Func cb_func,
E_DBus_Unmarshal_Func unmarshal_func, void *user_data);
+
void e_dbus_callback_free(E_DBus_Callback *callback);
void e_dbus_callback_call(E_DBus_Callback *cb, void *data, DBusError *error);
+void *e_dbus_callback_unmarshal(E_DBus_Callback *cb, DBusMessage *msg);
const char *e_dbus_basic_type_as_string(int type);
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_message.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_dbus_message.c22 Mar 2007 01:44:12 - 1.3
+++ e_dbus_message.c11 Jul 2007 00:47:11 - 1.4
@@ -83,3 +83,24 @@
return pending;
}
+
+static void
+cb_method_call(void *data, DBusMessage *msg, DBusError *err)
+{
+ E_DBus_Callback *cb = data;
+ void *method_return = NULL;
+ if (!cb) return;
+
+ if (!dbus_error_is_set(err))
+method_return = e_dbus_callback_unmarshal(cb, msg);
+
+ e_dbus_callback_call(cb, method_return, err);
+}
+
+DBusPendingCall *
+e_dbus_method_call_send(E_DBus_Connection *conn, DBusMessage *msg,
E_DBus_Unmarshal_Func unmarshal_func, E_DBus_Callback_Func cb_func, int
timeout, void *data)
+{
+ E_DBus_Callback *cb;
+ cb = e_dbus_callback_new(cb_func, unmarshal_func, data);
+ return e_dbus_message_send(conn, msg, cb_method_call, timeout, cb);
+}
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_dbus_util.c 11 Jul 2007 00:46:37 - 1.3
+++ e_dbus_util.c 11 Jul 2007 00:47:11 - 1.4
@@ -7,7 +7,7 @@
* @param user_data data to pass to the callback
*/
E_DBus_Callback *
-e_dbus_callback_new(E_DBus_Callback_Func cb_func, void *user_data)
+e_dbus_callback_new(E_DBus_Callback_Func cb_func, E_DBus_Unmarshal_Func
unmarshal_func, void *user_data)
{
E_DBus_Callback *cb;
@@ -15,7 +15,8 @@
cb = calloc(1, sizeof(E_DBus_Callback));
if (!cb) return NULL;
- cb->func = cb_func;
+ cb->cb_func = cb_func;
+ cb->unmarshal_func = unmarshal_func;
cb->user_data = user_data;
return cb;
}
@@ -34,8 +35,18 @@
void
e_dbus_callback_call(E_DBus_Callback *cb, void *data, DBusError *error)
{
- if (cb && cb->func)
-cb->func(cb->user_data, data, error);
+ if (cb && cb->cb_func)
+cb->cb_func(cb->user_data, data, error);
+}
+
+//XXX this probably should be passed an error pointer
+void *
+e_dbus_callback_unmarshal(E_DBus_Callback *cb, DBusMessage *msg)
+{
+ if (cb && cb->unmarshal_func)
+return cb->unmarshal_func(msg);
+ else
+return NULL;
}
const char *
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
client.c
Log Message:
refactor method call return callback into e_dbus
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/client.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- client.c11 Jul 2007 00:46:37 - 1.3
+++ client.c11 Jul 2007 00:47:11 - 1.4
@@ -30,80 +30,29 @@
}
/ client api /
-
-static void
-cb_notify(void *data, DBusMessage *msg, DBusError *err)
-{
- E_DBus_Callback *cb;
- E_Notification_Return_Notify *ret = NULL;
- cb = data;
- if (!cb) return;
-
- if (!dbus_error_is_set(err))
-ret = e_notify_unmarshal_notify_return(msg);
-
- e_dbus_callback_call(cb, ret, err);
-}
-
void
e_notification_send(E_Notification *n, E_DBus_Callback_Func func, void *data)
{
DBusMessage *msg;
- E_DBus_Callback *cb;
- cb = e_dbus_callback_new(func, data);
msg = e_notify_marshal_notify(n);
- printf("msg: %p\n", msg);
- e_dbus_message_send(client_conn, msg, cb_notify, -1, cb);
-}
-
-
-static void
-cb_get_capabilities(void *data, DBusMessage *msg, DBusError *err)
-{
- E_DBus_Callback *cb;
- E_Notification_Return_Get_Capabilities *ret = NULL;
- cb = data;
- if (!cb) return;
-
- if (!dbus_error_is_set(err))
-ret = e_notify_unmarshal_get_capabilities_return(msg);
-
- e_dbus_callback_call(cb, ret, err);
+ e_dbus_method_call_send(client_conn, msg, e_notify_unmarshal_notify_return,
func, -1, data);
}
void
e_notification_get_capabilities(E_DBus_Callback_Func func, void *data)
{
DBusMessage *msg;
- E_DBus_Callback *cb;
- cb = e_dbus_callback_new(func, data);
msg = e_notify_marshal_get_capabilities();
- e_dbus_message_send(client_conn, msg, cb_notify, -1, cb);
-}
-
-static void
-cb_get_server_information(void *data, DBusMessage *msg, DBusError *err)
-{
- E_DBus_Callback *cb;
- E_Notification_Return_Get_Server_Information *ret = NULL;
- cb = data;
- if (!cb) return;
-
- if (!dbus_error_is_set(err))
-ret = e_notify_unmarshal_get_server_information_return(msg);
-
- e_dbus_callback_call(cb, ret, err);
+ e_dbus_method_call_send(client_conn, msg,
e_notify_unmarshal_get_capabilities_return, func, -1, data);
}
void
e_notification_get_server_information(E_DBus_Callback_Func func, void *data)
{
DBusMessage *msg;
- E_DBus_Callback *cb;
- cb = e_dbus_callback_new(func, data);
msg = e_notify_marshal_get_server_information();
- e_dbus_message_send(client_conn, msg, cb_notify, -1, cb);
+ e_dbus_method_call_send(client_conn, msg,
e_notify_unmarshal_get_server_information_return, func, -1, data);
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/bin
Modified Files:
notify.c
Log Message:
pass errors along in callbacks
===
RCS file: /cvs/e/e17/proto/e_dbus/src/bin/notify.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- notify.c11 Jul 2007 00:46:29 - 1.2
+++ notify.c11 Jul 2007 00:46:37 - 1.3
@@ -4,12 +4,17 @@
static dbus_uint32_t msg_num = 0;
void
-cb_sent(void *data, void *ret)
+cb_sent(void *data, void *ret, DBusError *err)
{
E_Notification_Return_Notify *notify;
notify = ret;
- if (notify) {
+ if (notify)
+ {
printf("id: %d\n", notify->notification_id);
+ }
+ else if (dbus_error_is_set(err))
+ {
+printf("Error: %s\n", err->message);
}
ecore_main_loop_quit();
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/dbus
Modified Files:
E_DBus.h e_dbus_util.c
Log Message:
pass errors along in callbacks
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/E_DBus.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- E_DBus.h11 Jul 2007 00:44:54 - 1.8
+++ E_DBus.h11 Jul 2007 00:46:37 - 1.9
@@ -111,7 +111,7 @@
* @param user_data the data passed in to the method call
* @param event_data a struct containing the return data.
*/
-typedef void (*E_DBus_Callback_Func) (void *user_data, void *method_return);
+typedef void (*E_DBus_Callback_Func) (void *user_data, void *method_return,
DBusError *error);
typedef struct E_DBus_Callback E_DBus_Callback;
struct E_DBus_Callback
@@ -122,7 +122,7 @@
E_DBus_Callback *e_dbus_callback_new(E_DBus_Callback_Func cb_func, void
*user_data);
void e_dbus_callback_free(E_DBus_Callback *callback);
-void e_dbus_callback_call(E_DBus_Callback *cb, void *data);
+void e_dbus_callback_call(E_DBus_Callback *cb, void *data, DBusError *error);
const char *e_dbus_basic_type_as_string(int type);
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_util.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_dbus_util.c 11 Jul 2007 00:44:54 - 1.2
+++ e_dbus_util.c 11 Jul 2007 00:46:37 - 1.3
@@ -32,9 +32,10 @@
}
void
-e_dbus_callback_call(E_DBus_Callback *cb, void *data)
+e_dbus_callback_call(E_DBus_Callback *cb, void *data, DBusError *error)
{
- cb->func(cb->user_data, data);
+ if (cb && cb->func)
+cb->func(cb->user_data, data, error);
}
const char *
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
client.c
Log Message:
pass errors along in callbacks
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/client.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- client.c11 Jul 2007 00:46:21 - 1.2
+++ client.c11 Jul 2007 00:46:37 - 1.3
@@ -35,17 +35,14 @@
cb_notify(void *data, DBusMessage *msg, DBusError *err)
{
E_DBus_Callback *cb;
- E_Notification_Return_Notify *ret;
-
- if (dbus_error_is_set(err))
- {
-fprintf (stderr, "an error occurred: %s\n", err->message);
-return;
- }
+ E_Notification_Return_Notify *ret = NULL;
cb = data;
if (!cb) return;
- ret = e_notify_unmarshal_notify_return(msg);
- e_dbus_callback_call(cb, ret);
+
+ if (!dbus_error_is_set(err))
+ret = e_notify_unmarshal_notify_return(msg);
+
+ e_dbus_callback_call(cb, ret, err);
}
void
@@ -65,16 +62,14 @@
cb_get_capabilities(void *data, DBusMessage *msg, DBusError *err)
{
E_DBus_Callback *cb;
- E_Notification_Return_Get_Capabilities *ret;
- if (dbus_error_is_set(err))
- {
-fprintf (stderr, "an error occurred: %s\n", err->message);
-return;
- }
+ E_Notification_Return_Get_Capabilities *ret = NULL;
cb = data;
if (!cb) return;
- ret = e_notify_unmarshal_get_capabilities_return(msg);
- e_dbus_callback_call(cb, ret);
+
+ if (!dbus_error_is_set(err))
+ret = e_notify_unmarshal_get_capabilities_return(msg);
+
+ e_dbus_callback_call(cb, ret, err);
}
void
@@ -92,15 +87,14 @@
cb_get_server_information(void *data, DBusMessage *msg, DBusError *err)
{
E_DBus_Callback *cb;
- E_Notification_Return_Get_Server_Information *ret;
- if (dbus_error_is_set(err))
- {
-fprintf (stderr, "an error occurred: %s\n", err->message);
-return;
- }
+ E_Notification_Return_Get_Server_Information *ret = NULL;
cb = data;
- ret = e_notify_unmarshal_get_server_information_return(msg);
- e_dbus_callback_call(cb, ret);
+ if (!cb) return;
+
+ if (!dbus_error_is_set(err))
+ret = e_notify_unmarshal_get_server_information_return(msg);
+
+ e_dbus_callback_call(cb, ret, err);
}
void
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/bin
Modified Files:
notify.c
Log Message:
update api
===
RCS file: /cvs/e/e17/proto/e_dbus/src/bin/notify.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- notify.c11 Jul 2007 00:45:13 - 1.1
+++ notify.c11 Jul 2007 00:46:29 - 1.2
@@ -8,37 +8,26 @@
{
E_Notification_Return_Notify *notify;
notify = ret;
- printf("id: %d\n", notify->notification_id);
+ if (notify) {
+printf("id: %d\n", notify->notification_id);
+ }
ecore_main_loop_quit();
}
int
main(int argc, char **argv)
{
- E_DBus_Connection *conn;
int ret = 0;
+ E_Notification *n;
ecore_init();
- e_dbus_init();
-
- conn = e_dbus_bus_get(DBUS_BUS_SESSION);
- if (conn)
+ if (e_notification_init())
{
-E_Notification *n;
-E_Notification_Context *cl;
-
-cl = malloc(sizeof(E_Notification_Context));
-cl->conn = conn;
n = e_notification_full_new("Elicit", 0, "elicit", "Summary", "The
body", -1);
-e_notification_send(cl, n, cb_sent, NULL);
+e_notification_send(n, cb_sent, NULL);
ecore_main_loop_begin();
- }
- else
- {
-printf("Error: could not connect to session bus.\n");
-ret = 1;
+e_notification_shutdown();
}
- e_dbus_shutdown();
ecore_shutdown();
return ret;
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
client.c
Log Message:
fail to init if dbus connection failed
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/client.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- client.c11 Jul 2007 00:45:53 - 1.1
+++ client.c11 Jul 2007 00:46:21 - 1.2
@@ -10,6 +10,11 @@
if (!e_dbus_init()) return 0;
client_conn = e_dbus_bus_get(DBUS_BUS_SESSION);
+ if (!client_conn)
+ {
+e_dbus_shutdown();
+return 0;
+ }
return ++init_count;
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
E_Notify.h Makefile.am e_notify_private.h marshal.c
notification.c
Added Files:
E_Notification_Daemon.h daemon.c
Log Message:
more reorganization
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/E_Notify.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- E_Notify.h 11 Jul 2007 00:46:01 - 1.5
+++ E_Notify.h 11 Jul 2007 00:46:13 - 1.6
@@ -5,21 +5,12 @@
#include
#include
-#define E_NOTIFICATION_INTERFACE "org.freedesktop.Notifications"
-#define E_NOTIFICATION_DESTINATION "org.freedesktop.Notifications"
-#define E_NOTIFICATION_PATH "/org/freedesktop/Notifications"
-
-typedef struct E_Notification_Context E_Notification_Daemon;
/* notifications */
-
-typedef struct E_Notification_Context E_Notification_Context;
-
typedef struct E_Notification_Image E_Notification_Image;
typedef struct E_Notification E_Notification;
typedef struct E_Notification_Action E_Notification_Action;
-
typedef enum E_Notification_Urgency E_Notification_Urgency;
typedef enum E_Notification_Hint_Type E_Notification_Hint_Type;
typedef enum E_Notification_Closed_Reason E_Notification_Closed_Reason;
@@ -29,18 +20,11 @@
typedef struct E_Notification_Return_Get_Capabilities
E_Notification_Return_Get_Capabilities;
typedef struct E_Notification_Return_Get_Server_Information
E_Notification_Return_Get_Server_Information;
-/* daemon events */
-typedef struct E_Notification_Event_Daemon E_Notification_Event_Daemon;
-typedef struct E_Notification_Event_Daemon E_Notification_Event_Notify;
-typedef struct E_Notification_Event_Daemon E_Notification_Event_Close;
/* signal events */
typedef struct E_Notification_Event_Action_Invoked
E_Notification_Event_Action_Invoked;
typedef struct E_Notification_Event_Notification_Closed
E_Notification_Event_Notification_Closed;
-/* gui */
-typedef struct E_Notification_View E_Notification_View;
-
/* enums */
enum E_Notification_Urgency
@@ -69,62 +53,6 @@
E_NOTIFICATION_HINT_IMAGE_DATA = 0x40
};
-struct E_Notification_Context
-{
- E_DBus_Connection *conn;
-};
-
-struct E_Notification_Image
-{
- int width;
- int height;
- int rowstride;
- char has_alpha;
- int bits_per_sample;
- int channels;
- int *data;
-};
-
-struct E_Notification
-{
- int id;
- char *app_name;
- unsigned int replaces_id;
- char *app_icon;
- char *summary;
- char *body;
- int expire_timeout;
-
- Ecore_List *actions;
-
- struct
- {
-char urgency;
-char *category;
-char *desktop;
-char *sound_file;
-char suppress_sound;
-int x, y;
-E_Notification_Image *image_data;
- } hints;
-
- int hint_flags;
-
- int refcount;
-};
-
-struct E_Notification_Action
-{
- char *id;
- char *name;
-};
-
-/* daemon event data */
-struct E_Notification_Event_Daemon
-{
- E_Notification *notification;
-};
-
/* client method returns */
struct E_Notification_Return_Notify
{
@@ -157,34 +85,18 @@
char *action_id;
};
-/* daemon events */
-extern int E_NOTIFICATION_EVENT_NOTIFY;
-extern int E_NOTIFICATION_EVENT_CLOSE;
-
/* client events */
extern int E_NOTIFICATION_EVENT_CLOSED;
extern int E_NOTIFICATION_EVENT_ACTION_INVOKED;
-int e_notify_init();
-void e_notifications_shutdown();
-
-/* daemon */
-E_Notification_Daemon *e_notification_daemon_add(DBusConnection *conn);
-void e_notification_daemon_free(E_Notification_Daemon *d);
-void e_notification_daemon_close(E_Notification_Daemon *d,
- E_Notification *n, unsigned int reason);
-void e_notification_daemon_action_invoke(E_Notification_Daemon *d,
- E_Notification *n, const char *action_id);
+int e_notification_init();
+int e_notification_shutdown();
/* client */
-/*
-E_Notification_Context *e_notification_client_add();
-void e_notification_client_shutdown(E_Notification_Context *t);
-void e_notifications_get_capabilities(E_Notification_Context *nc);
-void e_notifications_get_server_info(E_Notification_Context *nc);
-void e_notifications_close_notification(E_Notification_Context *nc, int id);
-*/
+void e_notification_send(E_Notification *n, E_DBus_Callback_Func func, void
*data);
+void e_notification_get_capabilities(E_DBus_Callback_Func func, void *data);
+void e_notification_get_server_information(E_DBus_Callback_Func func, void
*data);
/* Notifications */
@@ -243,11 +155,6 @@
E_Notification_Image *e_notification_image_new();
void e_notification_image_free(E_Notification_Image *img);
Evas_Object *e_notification_image_object_add(Evas *evas, E_Notification_Image
*img);
-
-/* gui */
-E_Notification_View *e_notification_view_add(E_Notification_Daemon *d,
E_Notification *n);
-void e_notification_view_close(E_Notification_View *nv);
-Evas_O
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/e_dbus/src/lib/notification Modified Files: E_Notify.h Log Message: fix whitespace === RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/E_Notify.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- E_Notify.h 11 Jul 2007 00:45:53 - 1.4 +++ E_Notify.h 11 Jul 2007 00:46:01 - 1.5 @@ -157,8 +157,6 @@ char *action_id; }; - - /* daemon events */ extern int E_NOTIFICATION_EVENT_NOTIFY; extern int E_NOTIFICATION_EVENT_CLOSE; - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
E_Notify.h Makefile.am marshal.c
Added Files:
client.c e_notify_private.h
Log Message:
add private header
move client calls into client.c file
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/E_Notify.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- E_Notify.h 11 Jul 2007 00:45:03 - 1.3
+++ E_Notify.h 11 Jul 2007 00:45:53 - 1.4
@@ -251,6 +251,6 @@
void e_notification_view_close(E_Notification_View *nv);
Evas_Object * e_notification_view_icon_get(Evas *evas, E_Notification *n);
-void e_notification_send(E_Notification_Context *ctx, E_Notification *n,
E_DBus_Callback_Func func, void *data);
+void e_notification_send(E_Notification *n, E_DBus_Callback_Func func, void
*data);
#endif
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 11 Jul 2007 00:44:21 - 1.1
+++ Makefile.am 11 Jul 2007 00:45:53 - 1.2
@@ -8,7 +8,8 @@
libenotify_la_SOURCES = \
E_Notify.h \
notification.c \
-marshal.c
+marshal.c \
+client.c
libenotify_la_LIBADD = \
@EDBUS_LIBS@ \
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/marshal.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- marshal.c 11 Jul 2007 00:45:03 - 1.2
+++ marshal.c 11 Jul 2007 00:45:53 - 1.3
@@ -1,19 +1,9 @@
#include "E_Notify.h"
#include
+#include "e_notify_private.h"
-
-#define e_notification_call_new(member)
dbus_message_new_method_call(E_NOTIFICATION_DESTINATION, E_NOTIFICATION_PATH,
E_NOTIFICATION_INTERFACE, member)
-
-Ecore_List *unmarshal_notify_actions(E_Notification *n, DBusMessageIter *iter);
-Ecore_List *unmarshal_notify_hints(E_Notification *n, DBusMessageIter *iter);
-void marshal_hint_image(DBusMessageIter *iter, E_Notification_Image *img);
-E_Notification_Image *unmarshal_hint_image(DBusMessageIter *iter);
-
-typedef void (*E_DBus_Variant_Marshaller) (DBusMessageIter *iter, void *data);
-#define E_DBUS_VARIANT_MARSHALLER(x) ((E_DBus_Variant_Marshaller)(x))
-
-static void
-marshal_dict_variant(DBusMessageIter *iter, const char *key, char *type_str,
E_DBus_Variant_Marshaller func, void *data)
+void
+e_notify_marshal_dict_variant(DBusMessageIter *iter, const char *key, char
*type_str, E_DBus_Variant_Marshaller func, void *data)
{
DBusMessageIter entry, variant;
@@ -26,8 +16,8 @@
dbus_message_iter_close_container(iter, &entry);
}
-static void
-marshal_dict_string(DBusMessageIter *iter, const char *key, const char *value)
+void
+e_notify_marshal_dict_string(DBusMessageIter *iter, const char *key, const
char *value)
{
DBusMessageIter entry, variant;
@@ -39,8 +29,8 @@
dbus_message_iter_close_container(iter, &entry);
}
-static void
-marshal_dict_byte(DBusMessageIter *iter, const char *key, char value)
+void
+e_notify_marshal_dict_byte(DBusMessageIter *iter, const char *key, char value)
{
DBusMessageIter entry, variant;
@@ -54,8 +44,8 @@
dbus_message_iter_close_container(iter, &entry);
}
-static void
-marshal_dict_int(DBusMessageIter *iter, const char *key, int value)
+void
+e_notify_marshal_dict_int(DBusMessageIter *iter, const char *key, int value)
{
DBusMessageIter entry, variant;
@@ -69,8 +59,8 @@
dbus_message_iter_close_container(iter, &entry);
}
-static void
-marshal_string_list_as_array(DBusMessageIter *iter, Ecore_List *strings)
+void
+e_notify_marshal_string_list_as_array(DBusMessageIter *iter, Ecore_List
*strings)
{
const char *str;
DBusMessageIter arr;
@@ -85,7 +75,7 @@
}
Ecore_List *
-unmarshal_string_array_as_list(DBusMessageIter *iter)
+e_notify_unmarshal_string_array_as_list(DBusMessageIter *iter)
{
Ecore_List *strings;
char *sig;
@@ -114,7 +104,7 @@
DBusMessage *
-marshal_get_capabilities()
+e_notify_marshal_get_capabilities()
{
DBusMessage *msg;
@@ -123,20 +113,20 @@
}
DBusMessage *
-marshal_get_capabilities_return(DBusMessage *method_call, Ecore_List
*capabilities)
+e_notify_marshal_get_capabilities_return(DBusMessage *method_call, Ecore_List
*capabilities)
{
DBusMessage *msg;
DBusMessageIter iter;
msg = dbus_message_new_method_return(method_call);
dbus_message_iter_init_append(msg, &iter);
- marshal_string_list_as_array(&iter, capabilities);
+ e_notify_marshal_string_list_as_array(&iter, capabilities);
return msg;
}
E_Notification_Return_Get_Capabilities *
-unmarshal_get_capabilities_return(DBusMessage *msg)
+e_notify_unmarshal_get_capabilities_return(DBusMessage *msg)
{
DBusMessageIter iter, arr;
E_Notification_Ret
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/e_dbus/src/bin Modified Files: Makefile.am Added Files: notify.c Log Message: add simple notify test === RCS file: /cvs/e/e17/proto/e_dbus/src/bin/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 24 Mar 2007 02:11:09 - 1.6 +++ Makefile.am 11 Jul 2007 00:45:13 - 1.7 @@ -4,6 +4,7 @@ -I$(top_srcdir)/src/lib/dbus \ -I$(top_srcdir)/src/lib/hal \ -I$(top_srcdir)/src/lib/nm \ +-I$(top_srcdir)/src/lib/notification \ @EDBUS_CFLAGS@ LIBS = \ @@ -12,7 +13,8 @@ bin_PROGRAMS = e_dbus_test \ e_dbus_test_client \ e_dbus_hal \ -e_dbus_nm +e_dbus_nm \ +e_dbus_notify e_dbus_test_SOURCES = \ test.c @@ -52,3 +54,10 @@ e_dbus_nm_LDADD = $(top_builddir)/src/lib/dbus/libedbus.la $(top_builddir)/src/lib/nm/libenm.la $(LIBS) e_dbus_nm_DEPENDENCIES = $(top_builddir)/src/lib/dbus/libedbus.la $(top_builddir)/src/lib/nm/libenm.la + + +e_dbus_notify_SOURCES = \ + notify.c + +e_dbus_notify_LDADD = $(top_builddir)/src/lib/dbus/libedbus.la $(top_builddir)/src/lib/notification/libenotify.la $(LIBS) +e_dbus_notify_DEPENDENCIES = $(top_builddir)/src/lib/dbus/libedbus.la $(top_builddir)/src/lib/notification/libenotify.la - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
E_Notify.h marshal.c notification.c
Log Message:
fixes / cleanups
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/E_Notify.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- E_Notify.h 11 Jul 2007 00:44:21 - 1.2
+++ E_Notify.h 11 Jul 2007 00:45:03 - 1.3
@@ -93,7 +93,7 @@
char *app_icon;
char *summary;
char *body;
- unsigned int expire_timeout;
+ int expire_timeout;
Ecore_List *actions;
@@ -196,11 +196,12 @@
void e_notification_unref(E_Notification *n);
void e_notification_free(E_Notification *n);
-E_Notification *e_notification_new2(const char *app_name,
-unsigned int replaces_id,
-const char *app_icon, const char *summary,
-const char *body,
-unsigned int expire_timeout);
+E_Notification *e_notification_full_new(const char *app_name,
+unsigned int replaces_id,
+const char *app_icon,
+const char *summary,
+const char *body,
+int expire_timeout);
/* notification mutators */
void e_notification_app_name_set(E_Notification *n, const char *app_name);
@@ -250,5 +251,6 @@
void e_notification_view_close(E_Notification_View *nv);
Evas_Object * e_notification_view_icon_get(Evas *evas, E_Notification *n);
+void e_notification_send(E_Notification_Context *ctx, E_Notification *n,
E_DBus_Callback_Func func, void *data);
#endif
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/marshal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- marshal.c 11 Jul 2007 00:44:21 - 1.1
+++ marshal.c 11 Jul 2007 00:45:03 - 1.2
@@ -104,7 +104,7 @@
while(dbus_message_iter_has_next(&arr))
{
const char *str;
-dbus_message_get_basic(&arr, &str);
+dbus_message_iter_get_basic(&arr, &str);
ecore_list_append(strings, strdup(str)); //XXX use ecore_string_instance?
dbus_message_iter_next(&arr);
}
@@ -313,7 +313,6 @@
marshal_dict_string(&sub, "desktop_entry", n->hints.desktop);
if (n->hints.image_data)
marshal_dict_variant(&sub, "image_data", "(iiibiiay)",
E_DBUS_VARIANT_MARSHALLER(marshal_hint_image), n->hints.image_data);
-//marshal_hint_image(&sub, "image_data", n->hints.image_data);
if (n->hints.sound_file)
marshal_dict_string(&sub, "sound_file", n->hints.sound_file);
if (n->hints.suppress_sound) /* we only need to send this if its true */
@@ -325,6 +324,7 @@
}
dbus_message_iter_close_container(&iter, &sub);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &(n->expire_timeout));
return msg;
}
@@ -343,7 +343,7 @@
dbus_message_iter_init(msg, &iter);
dbus_message_iter_get_basic(&iter, &s_val);
- e_notification_name_set(n, s_val);
+ e_notification_app_name_set(n, s_val);
dbus_message_iter_next(&iter);
dbus_message_iter_get_basic(&iter, &u_val);
@@ -369,7 +369,7 @@
dbus_message_iter_next(&iter);
dbus_message_iter_get_basic(&iter, &i_val);
- e_notification_expire_timeout_set(n, i_val);
+ e_notification_timeout_set(n, i_val);
return n;
}
@@ -379,7 +379,7 @@
{
DBusMessage *msg;
msg = dbus_message_new_method_return(method_call);
- dbus_message_get_append_args(msg, DBUS_TYPE_UINT32, ¬ification_id,
DBUS_TYPE_INVALID);
+ dbus_message_append_args(msg, DBUS_TYPE_UINT32, ¬ification_id,
DBUS_TYPE_INVALID);
return msg;
}
@@ -404,7 +404,7 @@
{
DBusMessageIter arr;
const char *id, *name;
- dbus_message_recurse(iter, &arr);
+ dbus_message_iter_recurse(iter, &arr);
while (dbus_message_iter_has_next(&arr))
{
dbus_message_iter_get_basic(&arr, &id);
@@ -422,7 +422,7 @@
const char *key;
int x_set = 0, y_set = 0;
int x, y;
- dbus_message_recurse(iter, &arr);
+ dbus_message_iter_recurse(iter, &arr);
while (dbus_message_iter_has_next(&arr))
{
DBusMessageIter dict;
@@ -437,7 +437,7 @@
dbus_message_iter_get_basic(&dict, &key);
dbus_message_iter_next(&dict);
- dbus_message_recurse(&dict, &variant);
+ dbus_message_iter_recurse(&dict, &variant);
switch(dbus_message_iter_get_element_type(&variant))
{
case DBUS_TYPE_STRING:
@@ -460,7 +460,7 @@
else if (!strcmp(key, "category"))
e_notification_hint_category_set(n, s_val);
else if (!strcmp(key, "desktop-entry"))
-e_notification_hint_desktop_entry_set(n, s_val);
+e_notification_hint_desktop_set(n, s_va
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/dbus
Modified Files:
E_DBus.h e_dbus_object.c e_dbus_util.c
Log Message:
fix type int -> string conversion
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/E_DBus.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- E_DBus.h11 Jul 2007 00:43:40 - 1.7
+++ E_DBus.h11 Jul 2007 00:44:54 - 1.8
@@ -124,6 +124,7 @@
void e_dbus_callback_free(E_DBus_Callback *callback);
void e_dbus_callback_call(E_DBus_Callback *cb, void *data);
+const char *e_dbus_basic_type_as_string(int type);
#define DEBUG_LVL 0
#define DEBUG(lvl, ...) if (lvl <= DEBUG_LVL) printf(__VA_ARGS__)
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_object.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_dbus_object.c 3 Apr 2007 19:22:39 - 1.9
+++ e_dbus_object.c 11 Jul 2007 00:44:54 - 1.10
@@ -122,7 +122,7 @@
{
reply = dbus_message_new_method_return(msg);
dbus_message_iter_init_append(msg, &iter);
-dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT,
dbus_message_type_to_string(type), &sub);
+dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT,
e_dbus_basic_type_as_string(type), &sub);
dbus_message_iter_append_basic(&sub, type, &value);
dbus_message_iter_close_container(&iter, &sub);
return reply;
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/e_dbus_util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_dbus_util.c 11 Jul 2007 00:43:40 - 1.1
+++ e_dbus_util.c 11 Jul 2007 00:44:54 - 1.2
@@ -36,3 +36,37 @@
{
cb->func(cb->user_data, data);
}
+
+const char *
+e_dbus_basic_type_as_string(int type)
+{
+ switch (type)
+ {
+case DBUS_TYPE_BYTE:
+ return DBUS_TYPE_BYTE_AS_STRING;
+case DBUS_TYPE_BOOLEAN:
+ return DBUS_TYPE_BOOLEAN_AS_STRING;
+case DBUS_TYPE_INT16:
+ return DBUS_TYPE_INT16_AS_STRING;
+case DBUS_TYPE_UINT16:
+ return DBUS_TYPE_UINT16_AS_STRING;
+case DBUS_TYPE_INT32:
+ return DBUS_TYPE_INT32_AS_STRING;
+case DBUS_TYPE_UINT32:
+ return DBUS_TYPE_UINT32_AS_STRING;
+case DBUS_TYPE_INT64:
+ return DBUS_TYPE_INT64_AS_STRING;
+case DBUS_TYPE_UINT64:
+ return DBUS_TYPE_UINT64_AS_STRING;
+case DBUS_TYPE_DOUBLE:
+ return DBUS_TYPE_DOUBLE_AS_STRING;
+case DBUS_TYPE_STRING:
+ return DBUS_TYPE_STRING_AS_STRING;
+case DBUS_TYPE_OBJECT_PATH:
+ return DBUS_TYPE_OBJECT_PATH_AS_STRING;
+case DBUS_TYPE_SIGNATURE:
+ return DBUS_TYPE_SIGNATURE_AS_STRING;
+default:
+ return NULL;
+ }
+}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/e_dbus/src/lib Modified Files: Makefile.am Log Message: add notification wrappers (untested) === RCS file: /cvs/e/e17/proto/e_dbus/src/lib/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 21 Mar 2007 10:31:16 - 1.2 +++ Makefile.am 11 Jul 2007 00:44:21 - 1.3 @@ -1 +1 @@ -SUBDIRS=dbus hal nm +SUBDIRS=dbus hal nm notification - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/e_dbus Modified Files: configure.in Log Message: add notification wrappers (untested) === RCS file: /cvs/e/e17/proto/e_dbus/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- configure.in10 Jul 2007 00:13:26 - 1.12 +++ configure.in11 Jul 2007 00:44:20 - 1.13 @@ -33,6 +33,7 @@ src/lib/dbus/Makefile src/lib/hal/Makefile src/lib/nm/Makefile +src/lib/notification/Makefile src/bin/Makefile edbus.pc ehal.pc - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/notification
Modified Files:
E_Notify.h notification.c
Added Files:
Makefile.am marshal.c notification-spec-0.9.txt
Log Message:
add notification wrappers (untested)
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/notification/E_Notify.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- E_Notify.h 11 Jul 2007 00:43:30 - 1.1
+++ E_Notify.h 11 Jul 2007 00:44:21 - 1.2
@@ -5,43 +5,52 @@
#include
#include
-typedef struct _E_Notification_Daemon E_Notification_Daemon;
+#define E_NOTIFICATION_INTERFACE "org.freedesktop.Notifications"
+#define E_NOTIFICATION_DESTINATION "org.freedesktop.Notifications"
+#define E_NOTIFICATION_PATH "/org/freedesktop/Notifications"
+
+typedef struct E_Notification_Context E_Notification_Daemon;
/* notifications */
-typedef struct _E_Notification_Client E_Notification_Client;
+typedef struct E_Notification_Context E_Notification_Context;
typedef struct E_Notification_Image E_Notification_Image;
typedef struct E_Notification E_Notification;
typedef struct E_Notification_Action E_Notification_Action;
-typedef enum _E_Notification_Urgency E_Notification_Urgency;
-typedef enum _E_Notification_Hint_Type E_Notification_Hint_Type;
-typedef enum _E_Notification_Closed_Reason E_Notification_Closed_Reason;
-
-/* event structs */
-typedef struct _E_Notification_Event_Daemon E_Notification_Event_Daemon;
-typedef struct _E_Notification_Event_Daemon E_Notification_Event_Notify;
-typedef struct _E_Notification_Event_Daemon E_Notification_Event_Close;
-typedef struct _E_Notification_Event_Action_Invoked
E_Notification_Event_Action_Invoked;
-typedef struct _E_Notification_Event_Server_Capabilities
E_Notification_Event_Server_Capabilities;
-typedef struct _E_Notification_Event_Sent E_Notification_Event_Sent;
-typedef struct _E_Notification_Event_Closed E_Notification_Event_Closed;
+typedef enum E_Notification_Urgency E_Notification_Urgency;
+typedef enum E_Notification_Hint_Type E_Notification_Hint_Type;
+typedef enum E_Notification_Closed_Reason E_Notification_Closed_Reason;
+
+/* method returns */
+typedef struct E_Notification_Return_Notify E_Notification_Return_Notify;
+typedef struct E_Notification_Return_Get_Capabilities
E_Notification_Return_Get_Capabilities;
+typedef struct E_Notification_Return_Get_Server_Information
E_Notification_Return_Get_Server_Information;
+
+/* daemon events */
+typedef struct E_Notification_Event_Daemon E_Notification_Event_Daemon;
+typedef struct E_Notification_Event_Daemon E_Notification_Event_Notify;
+typedef struct E_Notification_Event_Daemon E_Notification_Event_Close;
+
+/* signal events */
+typedef struct E_Notification_Event_Action_Invoked
E_Notification_Event_Action_Invoked;
+typedef struct E_Notification_Event_Notification_Closed
E_Notification_Event_Notification_Closed;
/* gui */
-typedef struct _E_Notification_View E_Notification_View;
+typedef struct E_Notification_View E_Notification_View;
/* enums */
-enum _E_Notification_Urgency
+enum E_Notification_Urgency
{
E_NOTIFICATION_URGENCY_LOW,
E_NOTIFICATION_URGENCY_NORMAL,
E_NOTIFICATION_URGENCY_CRITICAL
};
-enum _E_Notification_Closed_Reason
+enum E_Notification_Closed_Reason
{
E_NOTIFICATION_CLOSED_EXPIRED,
E_NOTIFICATION_CLOSED_DISMISSED,
@@ -49,7 +58,7 @@
E_NOTIFICATION_CLOSED_UNDEFINED
};
-enum _E_Notification_Hint_Type
+enum E_Notification_Hint_Type
{
E_NOTIFICATION_HINT_URGENCY= 0x1,
E_NOTIFICATION_HINT_CATEGORY = 0x2,
@@ -60,8 +69,9 @@
E_NOTIFICATION_HINT_IMAGE_DATA = 0x40
};
-struct _E_Notification_Client
+struct E_Notification_Context
{
+ E_DBus_Connection *conn;
};
struct E_Notification_Image
@@ -110,19 +120,32 @@
};
/* daemon event data */
-struct _E_Notification_Event_Daemon
+struct E_Notification_Event_Daemon
{
E_Notification *notification;
};
-/* client event data */
-struct E_Notification_Event_Sent
+/* client method returns */
+struct E_Notification_Return_Notify
{
- int notification_id;
+ unsigned int notification_id;
E_Notification *notification;
};
-struct E_Notification_Event_Closed
+struct E_Notification_Return_Get_Capabilities
+{
+ Ecore_List *capabilities;
+};
+
+struct E_Notification_Return_Get_Server_Information
+{
+ const char *name;
+ const char *vendor;
+ const char *version;
+};
+
+/* signals */
+struct E_Notification_Event_Notification_Closed
{
int notification_id;
E_Notification_Closed_Reason reason;
@@ -134,10 +157,6 @@
char *action_id;
};
-struct E_Notification_Event_Server_Capabilities
-{
- Ecore_List *capabilities; /* list of char* */
-};
/* daemon events */
@@ -145,10 +164,8 @@
extern int E_NOTIFICATION_EVENT_CLOSE;
/* client events */
-extern int E_NOTIFICATION_EVENT_SENT;
extern int E_NOTI
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/dbus
Modified Files:
E_DBus.h Makefile.am
Added Files:
e_dbus_util.c
Log Message:
add callback helpers to dbus
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/E_DBus.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- E_DBus.h24 Mar 2007 02:11:09 - 1.6
+++ E_DBus.h11 Jul 2007 00:43:40 - 1.7
@@ -106,6 +106,23 @@
void *value, E_DBus_Method_Return_Cb cb_return,
void *data);
+/**
+ * A callback function for a DBus call
+ * @param user_data the data passed in to the method call
+ * @param event_data a struct containing the return data.
+ */
+typedef void (*E_DBus_Callback_Func) (void *user_data, void *method_return);
+
+typedef struct E_DBus_Callback E_DBus_Callback;
+struct E_DBus_Callback
+{
+ E_DBus_Callback_Func func;
+ void *user_data;
+};
+
+E_DBus_Callback *e_dbus_callback_new(E_DBus_Callback_Func cb_func, void
*user_data);
+void e_dbus_callback_free(E_DBus_Callback *callback);
+void e_dbus_callback_call(E_DBus_Callback *cb, void *data);
#define DEBUG_LVL 0
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/dbus/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 22 Mar 2007 07:15:23 - 1.5
+++ Makefile.am 11 Jul 2007 00:43:40 - 1.6
@@ -11,6 +11,7 @@
e_dbus_methods.c \
e_dbus_interfaces.c \
e_dbus_object.c \
+ e_dbus_util.c \
e_dbus_signal.c
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/e_dbus/src/lib/notification Added Files: E_Notify.h notification.c Log Message: copy notification code over - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : proto Dir : e17/proto/e_dbus/src/lib/notification Log Message: Directory /cvs/e/e17/proto/e_dbus/src/lib/notification added to the repository - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : proto
Dir : e17/proto/e_dbus/src/lib/hal
Modified Files:
e_hal_device.c e_hal_manager.c
Log Message:
init vars (patch from Joel Klinghed)
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/hal/e_hal_device.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_hal_device.c 3 Jul 2007 15:29:24 - 1.5
+++ e_hal_device.c 10 Jul 2007 23:44:01 - 1.6
@@ -13,7 +13,7 @@
cb_device_get_property(void *data, DBusMessage *msg, DBusError *err)
{
E_Hal_Callback *cb = data;
- E_Hal_Device_Get_Property_Return *ret;
+ E_Hal_Device_Get_Property_Return *ret = NULL;
DBusMessageIter iter;
int type;
@@ -78,7 +78,7 @@
cb_device_get_all_properties(void *data, DBusMessage *msg, DBusError *err)
{
E_Hal_Callback *cb = data;
- E_Hal_Device_Get_All_Properties_Return *ret;
+ E_Hal_Device_Get_All_Properties_Return *ret = NULL;
DBusMessageIter iter, a_iter, s_iter, v_iter;
if (!cb) return;
@@ -197,7 +197,7 @@
cb_device_query_capability(void *data, DBusMessage *msg, DBusError *err)
{
E_Hal_Callback *cb = data;
- E_Hal_Device_Query_Capability_Return *ret;
+ E_Hal_Device_Query_Capability_Return *ret = NULL;
dbus_bool_t val;
if (!cb) return;
===
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/hal/e_hal_manager.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_hal_manager.c 3 Jul 2007 15:29:24 - 1.6
+++ e_hal_manager.c 10 Jul 2007 23:44:01 - 1.7
@@ -16,7 +16,7 @@
cb_manager_get_all_devices(void *data, DBusMessage *msg, DBusError *err)
{
E_Hal_Callback *cb = data;
- E_Hal_Manager_Get_All_Devices_Return *ret;
+ E_Hal_Manager_Get_All_Devices_Return *ret = NULL;
DBusMessageIter iter, sub;
if (!cb) return;
@@ -76,7 +76,7 @@
cb_manager_device_exists(void *data, DBusMessage *msg, DBusError *err)
{
E_Hal_Callback *cb = data;
- E_Hal_Manager_Device_Exists_Return *ret;
+ E_Hal_Manager_Device_Exists_Return *ret = NULL;
dbus_bool_t val;
if (!cb) return;
@@ -124,7 +124,7 @@
cb_manager_find_device_string_match(void *data, DBusMessage *msg, DBusError
*err)
{
E_Hal_Callback *cb = data;
- E_Hal_Manager_Find_Device_String_Match_Return *ret;
+ E_Hal_Manager_Find_Device_String_Match_Return *ret = NULL;
DBusMessageIter iter, sub;
if (!cb) return;
@@ -182,7 +182,7 @@
cb_manager_find_device_by_capability(void *data, DBusMessage *msg, DBusError
*err)
{
E_Hal_Callback *cb = data;
- E_Hal_Manager_Find_Device_By_Capability_Return *ret;
+ E_Hal_Manager_Find_Device_By_Capability_Return *ret = NULL;
DBusMessageIter iter, sub;
if (!cb) return;
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp Modified Files: eflpp.prj Added Files: .cvsignore Log Message: some cvsignore === RCS file: /cvs/e/e17/proto/eflpp/eflpp.prj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- eflpp.prj 10 Jul 2007 21:38:08 - 1.2 +++ eflpp.prj 10 Jul 2007 21:46:53 - 1.3 @@ -106,7 +106,9 @@ esmart/eflpp_esmart_container.cpp\ esmart/eflpp_esmart_container.h\ esmart/eflpp_esmart_textentry.cpp\ - esmart/eflpp_esmart_textentry.h + esmart/eflpp_esmart_textentry.h\ + esmart/eflpp_esmart_group.cpp\ + esmart/eflpp_esmart_group.h module.pixmap.name=pixmaps module.pixmap.type= - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/data/edjes Added Files: .cvsignore Log Message: some cvsignore - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/data Added Files: .cvsignore Log Message: some cvsignore - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/data/fonts Added Files: .cvsignore Log Message: some cvsignore - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/data/images Added Files: .cvsignore Log Message: some cvsignore - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal
Author : andreas
Project : e17
Module : proto
Dir : e17/proto/eflpp/src/esmart
Modified Files:
Makefile.am eflpp_esmart.cpp eflpp_esmart.h
Added Files:
eflpp_esmart_group.cpp eflpp_esmart_group.h
Log Message:
- improved EsmartTextEntry and example
- abstract EvasEsmart class that eases Esmart object creation
- New EvasEsmartGroup with sample implementation of the EvasEsmart class (not
complete)
===
RCS file: /cvs/e/e17/proto/eflpp/src/esmart/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 3 Jul 2007 22:42:36 - 1.1
+++ Makefile.am 10 Jul 2007 21:38:10 - 1.2
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Created by Anjuta - will *NOT* be overwritten
-INCLUDES = -I../common -I../evas
+INCLUDES = -I../common -I../evas -I../edje
AM_CXXFLAGS = @PACKAGE_CFLAGS@ \
-Wall
@@ -9,11 +9,17 @@
noinst_LTLIBRARIES = libeflpp_esmart.la
libeflpp_esmart_la_SOURCES = \
- eflpp_esmart.cpp
+ eflpp_esmart.cpp \
+ eflpp_esmart_container.cpp \
+ eflpp_esmart_textentry.cpp \
+ eflpp_esmart_group.cpp
libeflpp_includedir = $(pkgincludedir)
libeflpp_include_DATA = \
- eflpp_esmart.h
+ eflpp_esmart.h \
+ eflpp_esmart_container.h \
+ eflpp_esmart_textentry.h \
+ eflpp_esmart_group.h
EXTRA_DIST = $(libeflpp_include_DATA)
===
RCS file: /cvs/e/e17/proto/eflpp/src/esmart/eflpp_esmart.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eflpp_esmart.cpp3 Jul 2007 22:42:36 - 1.1
+++ eflpp_esmart.cpp10 Jul 2007 21:38:10 - 1.2
@@ -6,218 +6,98 @@
namespace efl {
+static EvasEsmart *selfEsmartPointer;
+
//===
-// EvasEsmartContainer
+// EvasEsmart
//===
-
-EvasEsmartContainer::EvasEsmartContainer( EvasCanvas* canvas, const char* name
)
- :EvasObject( canvas, "esmart_container", name )
-{
-}
-
-EvasEsmartContainer::EvasEsmartContainer( Direction dir, EvasCanvas* canvas,
const char* name )
- :EvasObject( canvas, "esmart_container", name )
+EvasEsmart::EvasEsmart(EvasCanvas *canvas, const char *type, const char *name )
+:EvasObject( canvas, type, name )
{
-setDirection( dir );
+ selfEsmartPointer = this;
}
-EvasEsmartContainer::EvasEsmartContainer( int x, int y, Direction dir,
EvasCanvas* canvas, const char* name )
- :EvasObject( canvas, "esmart_container", name )
+EvasEsmart::~EvasEsmart()
{
-setDirection( dir );
-move( x, y );
}
-EvasEsmartContainer::EvasEsmartContainer( int x, int y, int width, int height,
Direction dir, EvasCanvas* canvas, const char* name )
- :EvasObject( canvas, "esmart_container", name )
+Evas_Object *EvasEsmart::newEsmart( const char *name )
{
-setDirection( dir );
-move( x, y );
-resize( width, height );
-}
-
-EvasEsmartContainer::~EvasEsmartContainer()
-{
-}
+ Evas_Object *evasobj;
-void EvasEsmartContainer::setDirection( Direction dir )
-{
-esmart_container_direction_set( o, static_cast( dir )
);
-}
+ evasobj = evas_object_smart_add(canvas()->obj(), getEsmart(name));
-EvasEsmartContainer::Direction EvasEsmartContainer::direction() const
-{
-return static_cast(
esmart_container_direction_get( o ) );
+ return evasobj;
}
-void EvasEsmartContainer::setPadding( double l, double r, double t, double b )
-{
-esmart_container_padding_set( o, l, r, t, b );
-}
-/* Padding EvasEsmartContainer::padding() const;
+Evas_Smart *EvasEsmart::getEsmart( const char *name )
{
-double l;
-double r;
-double t;
-double b;
-esmart_container_padding_get( o, &l, &r, &t, &b );
-return Padding( l, r, t, b );
-}*/
+ Evas_Smart *smart = evas_smart_new (name,
+ wrap_add,
+ wrap_del,
+ NULL, //deprecated
+ NULL, //deprecated
+ NULL, //deprecated
+ NULL, //deprecated
+ NULL, //deprecated
+ wrap_move,
+ wrap_resize,
+ wrap_show,
+ wrap_hide,
+ wrap_color_set,
+ wrap_clip_set,
+ wrap_clip_unset,
+ NULL
+ );
-void EvasEsmartContainer::setFillPolicy( FillPolicy fill )
-{
-esmart_container_fill_policy_set( o, static_cast(
fill ) );
+ return smart;
}
-EvasEsmartContainer::FillPolicy EvasEsmartContainer::fillPolicy() con
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/examples/esmart/container Modified Files: main.cpp Log Message: - improved EsmartTextEntry and example - abstract EvasEsmart class that eases Esmart object creation - New EvasEsmartGroup with sample implementation of the EvasEsmart class (not complete) === RCS file: /cvs/e/e17/proto/eflpp/examples/esmart/container/main.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- main.cpp3 Jul 2007 22:42:33 - 1.1 +++ main.cpp10 Jul 2007 21:38:09 - 1.2 @@ -1,6 +1,6 @@ #include #include -#include +#include #define WIDTH 240 #define HEIGHT 320 - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/examples/ecore/timers Modified Files: main.cpp Log Message: - improved EsmartTextEntry and example - abstract EvasEsmart class that eases Esmart object creation - New EvasEsmartGroup with sample implementation of the EvasEsmart class (not complete) === RCS file: /cvs/e/e17/proto/eflpp/examples/ecore/timers/main.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- main.cpp3 Jul 2007 22:42:32 - 1.1 +++ main.cpp10 Jul 2007 21:38:09 - 1.2 @@ -36,7 +36,7 @@ shadow->resize( evas->size() ); shadow->setFill( 0, 0, evas->size() ); shadow->show(); -shadow->setFocus(); +shadow->setFocus( true ); logo = new efl::EvasImage( 40, 20, PACKAGE_DATA_DIR "/images/e_logo.png", evas ); logo->setColor( 255, 255, 255, 0 ); @@ -100,4 +100,3 @@ delete app; return 0; } - - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/src Modified Files: Makefile.am Log Message: - improved EsmartTextEntry and example - abstract EvasEsmart class that eases Esmart object creation - New EvasEsmartGroup with sample implementation of the EvasEsmart class (not complete) === RCS file: /cvs/e/e17/proto/eflpp/src/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 6 Jul 2007 22:25:27 - 1.3 +++ Makefile.am 10 Jul 2007 21:38:09 - 1.4 @@ -11,8 +11,7 @@ libeflpp_la_SOURCES = -libeflpp_la_LDFLAGS = @[EMAIL PROTECTED] - common/libeflpp_common.la\ +libeflpp_la_LDFLAGS = common/libeflpp_common.la\ ecore/libeflpp_ecore.la\ edb/libeflpp_edb.la\ edje/libeflpp_edje.la\ @@ -25,4 +24,4 @@ misc/libeflpp_misc.la -libeflpp_la_LIBADD = +libeflpp_la_LIBADD = @PACKAGE_LIBS@ - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/examples/esmart/textentry Modified Files: Makefile.am main.cpp Log Message: - improved EsmartTextEntry and example - abstract EvasEsmart class that eases Esmart object creation - New EvasEsmartGroup with sample implementation of the EvasEsmart class (not complete) === RCS file: /cvs/e/e17/proto/eflpp/examples/esmart/textentry/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 3 Jul 2007 22:42:33 - 1.1 +++ Makefile.am 10 Jul 2007 21:38:09 - 1.2 @@ -6,6 +6,7 @@ @PACKAGE_CFLAGS@ \ -I$(top_srcdir)/src/ecore/ \ -I$(top_srcdir)/src/evas/ \ +-I$(top_srcdir)/src/edje/ \ -I$(top_srcdir)/src/esmart/ \ -I$(top_srcdir)/src/common/ \ -Wall === RCS file: /cvs/e/e17/proto/eflpp/examples/esmart/textentry/main.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- main.cpp3 Jul 2007 22:42:33 - 1.1 +++ main.cpp10 Jul 2007 21:38:09 - 1.2 @@ -1,9 +1,10 @@ #include #include -#include +#include +#include -#define WIDTH 240 -#define HEIGHT 320 +#define WIDTH 300 +#define HEIGHT 30 using namespace efl; @@ -25,9 +26,17 @@ rect->setLayer( 0 ); rect->show(); -EvasEsmartTextEntry* passwd = new EvasEsmartTextEntry( 50, 50, 100, 10, evas ); +EvasEdje* edje = new EvasEdje( 0, 0, PACKAGE_DATA_DIR "/edjes/esmart_text_entry_test.edj", "text_entry", evas ); + +edje->resize( WIDTH, HEIGHT ); +edje->setLayer( 1 ); +edje->show(); + +EvasEsmartTextEntry* passwd = new EvasEsmartTextEntry( 0, 0, WIDTH, HEIGHT, evas ); +passwd->setEdjePart (edje, "text"); passwd->setColor( 0, 0, 0, 255 ); -passwd->setLayer( 10 ); +passwd->setLayer( 0 ); +passwd->setFocus (true); passwd->show(); /* Enter the application main loop */ @@ -38,4 +47,3 @@ return 0; } - - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal
Author : andreas
Project : e17
Module : proto
Dir : e17/proto/eflpp/examples/ecore/paint
Modified Files:
main.cpp
Log Message:
- improved EsmartTextEntry and example
- abstract EvasEsmart class that eases Esmart object creation
- New EvasEsmartGroup with sample implementation of the EvasEsmart class (not
complete)
===
RCS file: /cvs/e/e17/proto/eflpp/examples/ecore/paint/main.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- main.cpp3 Jul 2007 22:42:32 - 1.1
+++ main.cpp10 Jul 2007 21:38:09 - 1.2
@@ -26,7 +26,7 @@
{
setLayer( 10 );
setColor( 255, 255, 255, 0 ); // fully transparent, to catch the mouse
events
-setFocus();
+setFocus( true );
}
virtual ~PaintArea() { };
@@ -120,5 +120,3 @@
return 0;
}
-
-
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/examples/esmart Modified Files: Makefile.am Log Message: - improved EsmartTextEntry and example - abstract EvasEsmart class that eases Esmart object creation - New EvasEsmartGroup with sample implementation of the EvasEsmart class (not complete) === RCS file: /cvs/e/e17/proto/eflpp/examples/esmart/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 3 Jul 2007 22:42:33 - 1.1 +++ Makefile.am 10 Jul 2007 21:38:09 - 1.2 @@ -1 +1 @@ -SUBDIRS = container textentry +SUBDIRS = container textentry group - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/data/edjes Modified Files: Makefile.am Added Files: esmart_text_entry_test.edc Log Message: - improved EsmartTextEntry and example - abstract EvasEsmart class that eases Esmart object creation - New EvasEsmartGroup with sample implementation of the EvasEsmart class (not complete) === RCS file: /cvs/e/e17/proto/eflpp/data/edjes/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 3 Jul 2007 22:42:22 - 1.1 +++ Makefile.am 10 Jul 2007 21:38:08 - 1.2 @@ -8,7 +8,7 @@ @EDJE_DEF@ filesdir = $(pkgdatadir)/edjes -files_DATA = simple.edj angstrom-bootmanager.edj angstrom-calibrate.edj angstrom-installer.edj +files_DATA = simple.edj angstrom-bootmanager.edj angstrom-calibrate.edj angstrom-installer.edj esmart_text_entry_test.edj EXTRA_DIST = angstrom-background.edc \ angstrom-bootmanager.edc \ @@ -16,7 +16,8 @@ angstrom-installer.edc \ e17-default-clock.edc \ entrance-buttons.edc \ -simple.edc +simple.edc \ +esmart_text_entry_test.edc simple.edj: Makefile simple.edc $(EDJE_CC) $(EDJE_FLAGS) \ @@ -33,6 +34,10 @@ angstrom-installer.edj: Makefile angstrom-installer.edc $(EDJE_CC) $(EDJE_FLAGS) \ $(top_srcdir)/data/edjes/angstrom-installer.edc + +esmart_text_entry_test.edj: Makefile esmart_text_entry_test.edc + $(EDJE_CC) $(EDJE_FLAGS) \ + $(top_srcdir)/data/edjes/esmart_text_entry_test.edc clean-local: rm -f *.edj - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/examples/ecore/simple Modified Files: main.cpp Log Message: - improved EsmartTextEntry and example - abstract EvasEsmart class that eases Esmart object creation - New EvasEsmartGroup with sample implementation of the EvasEsmart class (not complete) === RCS file: /cvs/e/e17/proto/eflpp/examples/ecore/simple/main.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- main.cpp3 Jul 2007 22:42:32 - 1.1 +++ main.cpp10 Jul 2007 21:38:09 - 1.2 @@ -22,7 +22,7 @@ image->resize( evas->size() ); image->setFill( 0, 0, image->trueSize() ); image->show(); -image->setFocus(); +image->setFocus( true ); efl::EvasImage* shadow = new efl::EvasImage( 0, 0, PACKAGE_DATA_DIR "/images/panel_shadow.png", evas ); shadow->resize( evas->size() ); @@ -45,5 +45,3 @@ return 0; } - - - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp Modified Files: configure.ac eflpp.prj Log Message: - improved EsmartTextEntry and example - abstract EvasEsmart class that eases Esmart object creation - New EvasEsmartGroup with sample implementation of the EvasEsmart class (not complete) === RCS file: /cvs/e/e17/proto/eflpp/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- configure.ac4 Jul 2007 19:56:04 - 1.3 +++ configure.ac10 Jul 2007 21:38:08 - 1.4 @@ -147,6 +147,7 @@ examples/esmart/Makefile examples/esmart/container/Makefile examples/esmart/textentry/Makefile +examples/esmart/group/Makefile examples/etk/Makefile examples/etk/embed/Makefile examples/etk/simple/Makefile === RCS file: /cvs/e/e17/proto/eflpp/eflpp.prj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eflpp.prj 3 Jul 2007 22:42:22 - 1.1 +++ eflpp.prj 10 Jul 2007 21:38:08 - 1.2 @@ -1,4 +1,4 @@ -# Anjuta Version 1.2.4 +# Anjuta Version 1.2.4a Compatibility Level: 1 @@ -22,7 +22,7 @@ props.file.type=project -anjuta.version=1.2.4 +anjuta.version=1.2.4a anjuta.compatibility.level=1 project.name=eflpp @@ -102,7 +102,11 @@ ewl/eflpp_ewl.cpp\ ewl/eflpp_ewl.h\ misc/eflpp_housekeeping.cpp\ - misc/eflpp_housekeeping.h + misc/eflpp_housekeeping.h\ + esmart/eflpp_esmart_container.cpp\ + esmart/eflpp_esmart_container.h\ + esmart/eflpp_esmart_textentry.cpp\ + esmart/eflpp_esmart_textentry.h module.pixmap.name=pixmaps module.pixmap.type= - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/examples/ecore/callbacks Modified Files: main.cpp Log Message: - improved EsmartTextEntry and example - abstract EvasEsmart class that eases Esmart object creation - New EvasEsmartGroup with sample implementation of the EvasEsmart class (not complete) === RCS file: /cvs/e/e17/proto/eflpp/examples/ecore/callbacks/main.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- main.cpp3 Jul 2007 22:42:32 - 1.1 +++ main.cpp10 Jul 2007 21:38:09 - 1.2 @@ -36,7 +36,7 @@ shadow->resize( WIDTH, HEIGHT ); shadow->setFill( 0, 0, WIDTH, HEIGHT ); shadow->show(); -shadow->setFocus(); +shadow->setFocus( true ); logo = new efl::EvasImage( 40, 20, PACKAGE_DATA_DIR "/images/e_logo.png", evas ); logo->setColor( 255, 255, 255, 0 ); @@ -100,4 +100,3 @@ delete app; return 0; } - - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/data/images Modified Files: Makefile.am Added Files: entry_cursor.png text_view_bg.png text_view_over.png Log Message: - improved EsmartTextEntry and example - abstract EvasEsmart class that eases Esmart object creation - New EvasEsmartGroup with sample implementation of the EvasEsmart class (not complete) === RCS file: /cvs/e/e17/proto/eflpp/data/images/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 3 Jul 2007 22:42:29 - 1.1 +++ Makefile.am 10 Jul 2007 21:38:09 - 1.2 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +# TODO: not all images need to be installed! + eflpp_pixmapsdir = @PACKAGE_DATA_DIR@/images eflpp_pixmaps_DATA = \ - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal
Author : andreas
Project : e17
Module : proto
Dir : e17/proto/eflpp/src/evas
Modified Files:
eflpp_evas.cpp eflpp_evas.h
Log Message:
- improved EsmartTextEntry and example
- abstract EvasEsmart class that eases Esmart object creation
- New EvasEsmartGroup with sample implementation of the EvasEsmart class (not
complete)
===
RCS file: /cvs/e/e17/proto/eflpp/src/evas/eflpp_evas.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eflpp_evas.cpp 3 Jul 2007 22:42:36 - 1.1
+++ eflpp_evas.cpp 10 Jul 2007 21:38:10 - 1.2
@@ -399,10 +399,10 @@
hide();
}
-void EvasObject::setFocus()
+void EvasObject::setFocus( bool focus )
{
-Dout( dc::notice, *this << " setFocus" );
-evas_object_focus_set( o, true );
+Dout( dc::notice, *this << " setFocus:" << focus );
+evas_object_focus_set( o, focus );
}
bool EvasObject::hasFocus() const
===
RCS file: /cvs/e/e17/proto/eflpp/src/evas/eflpp_evas.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eflpp_evas.h3 Jul 2007 22:42:36 - 1.1
+++ eflpp_evas.h10 Jul 2007 21:38:10 - 1.2
@@ -154,7 +154,7 @@
virtual void setVisible( bool visibility );
/* Focus */
-virtual void setFocus();
+virtual void setFocus( bool focus );
virtual bool hasFocus() const;
/* Events */
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e morlenxus
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: de.po Log Message: New german translation by Thomas Gstaedtner ([EMAIL PROTECTED]). Thank you. - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal
Author : andreas
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart/data
Modified Files:
esmart_text_entry_test.edc
Log Message:
better EDC file
===
RCS file: /cvs/e/e17/libs/esmart/data/esmart_text_entry_test.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- esmart_text_entry_test.edc 10 Jul 2007 17:33:54 - 1.1
+++ esmart_text_entry_test.edc 10 Jul 2007 21:03:26 - 1.2
@@ -15,6 +15,19 @@
parts {
part {
+name, "back_clip";
+
+description {
+state, "default" 0.0;
+
+rel1 {
+relative, 0 0;
+offset, 0 0;
+}
+}
+}
+
+part {
name, "background";
type, IMAGE;
mouse_events, 1;
@@ -94,11 +107,12 @@
name, "cursor";
type, IMAGE;
mouse_events, 1;
+ clip_to: "back_clip";
description {
state, "default" 0.0;
aspect: 1.0 1.0;
-aspect_preference: BOTH;
+aspect_preference: VERTICAL;
align: 0.0 0.5;
rel1 {
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-edje/edje Modified Files: edje.c_edje_object.pxi Log Message: Fix segfault with python-edje === RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- edje.c_edje_object.pxi 7 Jul 2007 00:42:01 - 1.7 +++ edje.c_edje_object.pxi 10 Jul 2007 19:30:56 - 1.8 @@ -205,7 +205,12 @@ edje_object_part_text_set(self.obj, part, text) def part_text_get(self, char *part): -return edje_object_part_text_get(self.obj, part) +cdef char *s +s = edje_object_part_text_get(self.obj, part) +if s == NULL: +return None +else: +return s def part_swallow(self, char *part, obj): cdef evas.c_evas.Object o - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal
Author : andreas
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart/src/lib/esmart_text_entry
Modified Files:
Esmart_Text_Entry.h
Log Message:
typo
===
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_text_entry/Esmart_Text_Entry.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Esmart_Text_Entry.h 10 Jul 2007 17:33:54 - 1.7
+++ Esmart_Text_Entry.h 10 Jul 2007 18:06:10 - 1.8
@@ -28,7 +28,7 @@
extern "C" {
#endif
-// TODO: No characters Non-ASCII caracters supported! Find out how to use
unicode...
+// TODO: No non-ASCII caracters supported! Find out how to use unicode...
/* create a new text entry */
EAPI Evas_Object *esmart_text_entry_new (Evas * e);
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart Modified Files: configure.in Log Message: don't build file_dialog by default, as it's unmaintained currently -> you'll need a theme file before using it. If you have one please tell me :-) === RCS file: /cvs/e/e17/libs/esmart/configure.in,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- configure.in10 Jul 2007 17:33:54 - 1.26 +++ configure.in10 Jul 2007 18:03:44 - 1.27 @@ -128,6 +128,7 @@ have_esmart_textarea=no +have_esmart_file_dialog=no AM_CONDITIONAL(BUILD_ESMART_CONTAINER, test $have_esmart_container = yes) AM_CONDITIONAL(BUILD_ESMART_DRAGGIES, test $have_esmart_draggies = yes) - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart/src/lib/esmart_draggies Modified Files: Makefile.am Log Message: - added test for esmart_text_entry - added EDC file for esmart_text_entry -> not perfect, but good enough for a test (If you are a good EDC creator fix it.) - fixed some config.h stuff - added configure check for edje_cc === RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_draggies/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Makefile.am 21 Mar 2007 16:28:23 - 1.7 +++ Makefile.am 10 Jul 2007 17:33:54 - 1.8 @@ -10,6 +10,6 @@ libesmart_draggies_la_SOURCES = esmart_draggies.c \ Esmart_Draggies.h -libesmart_draggies_la_LDFLAGS = -version-info 0:9:0 -libesmart_draggies_la_LIBADD = @DRAGGIES_LIBS@ +libesmart_draggies_la_LDFLAGS = @DRAGGIES_LIBS@ -version-info 0:9:0 +libesmart_draggies_la_LIBADD = - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart/src/lib/esmart_thumb Modified Files: Makefile.am Log Message: - added test for esmart_text_entry - added EDC file for esmart_text_entry -> not perfect, but good enough for a test (If you are a good EDC creator fix it.) - fixed some config.h stuff - added configure check for edje_cc === RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_thumb/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 21 Mar 2007 16:28:24 - 1.6 +++ Makefile.am 10 Jul 2007 17:33:55 - 1.7 @@ -10,6 +10,6 @@ libesmart_thumb_la_SOURCES = esmart_thumb.c \ Esmart_Thumb.h -libesmart_thumb_la_LDFLAGS = -version-info 0:9:0 -libesmart_thumb_la_LIBADD = @THUMB_LIBS@ +libesmart_thumb_la_LDFLAGS = @THUMB_LIBS@ -version-info 0:9:0 +libesmart_thumb_la_LIBADD = - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart/src/lib/esmart_textarea Modified Files: Makefile.am Log Message: - added test for esmart_text_entry - added EDC file for esmart_text_entry -> not perfect, but good enough for a test (If you are a good EDC creator fix it.) - fixed some config.h stuff - added configure check for edje_cc === RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_textarea/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 21 Mar 2007 16:28:23 - 1.5 +++ Makefile.am 10 Jul 2007 17:33:55 - 1.6 @@ -15,5 +15,5 @@ Esmart_Textarea.h \ esmart_textarea_private.h -libesmart_textarea_la_LDFLAGS = -version-info 0:9:0 -libesmart_textarea_la_LIBADD = @TEXT_AREA_LIBS@ +libesmart_textarea_la_LDFLAGS = @TEXT_AREA_LIBS@ -version-info 0:9:0 +libesmart_textarea_la_LIBADD = - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart/src/lib/esmart_file_dialog Modified Files: Makefile.am Log Message: - added test for esmart_text_entry - added EDC file for esmart_text_entry -> not perfect, but good enough for a test (If you are a good EDC creator fix it.) - fixed some config.h stuff - added configure check for edje_cc === RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_file_dialog/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Makefile.am 21 Mar 2007 16:28:23 - 1.7 +++ Makefile.am 10 Jul 2007 17:33:54 - 1.8 @@ -14,8 +14,7 @@ libesmart_file_dialog_la_SOURCES = esmart_file_dialog.c \ Esmart_File_Dialog.h -libesmart_file_dialog_la_LDFLAGS = -version-info 0:9:0 +libesmart_file_dialog_la_LDFLAGS = @FILE_DIALOG_LIBS@ -version-info 0:9:0 libesmart_file_dialog_la_LIBADD = \ $(top_builddir)/src/lib/esmart_container/libesmart_container.la \ - $(top_builddir)/src/lib/esmart_text_entry/libesmart_text_entry.la \ -@FILE_DIALOG_LIBS@ + $(top_builddir)/src/lib/esmart_text_entry/libesmart_text_entry.la - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart Modified Files: configure.in Log Message: - added test for esmart_text_entry - added EDC file for esmart_text_entry -> not perfect, but good enough for a test (If you are a good EDC creator fix it.) - fixed some config.h stuff - added configure check for edje_cc === RCS file: /cvs/e/e17/libs/esmart/configure.in,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- configure.in10 Jul 2007 00:13:25 - 1.25 +++ configure.in10 Jul 2007 17:33:54 - 1.26 @@ -112,6 +112,21 @@ ] ) +dnl Check for edce_cc +EDJE_DEF="" +AC_SUBST(EDJE_DEF) +AC_ARG_WITH(edje-cc, +AC_HELP_STRING([--with-edje-cc=PATH],[Specify a specific path to edje_cc]), +[ + v=$withval; + edje_cc=$v + echo " Enlightenment edje_cc explicitly set to "$edje_cc; +],[ + edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc +]) +AC_SUBST(edje_cc) + + have_esmart_textarea=no AM_CONDITIONAL(BUILD_ESMART_CONTAINER, test $have_esmart_container = yes) - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal
Author : andreas
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart/src/lib/esmart_text_entry
Modified Files:
Esmart_Text_Entry.h Makefile.am
Log Message:
- added test for esmart_text_entry
- added EDC file for esmart_text_entry
-> not perfect, but good enough for a test (If you are a good EDC creator fix
it.)
- fixed some config.h stuff
- added configure check for edje_cc
===
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_text_entry/Esmart_Text_Entry.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Esmart_Text_Entry.h 6 Sep 2006 07:17:48 - 1.6
+++ Esmart_Text_Entry.h 10 Jul 2007 17:33:54 - 1.7
@@ -28,6 +28,8 @@
extern "C" {
#endif
+// TODO: No characters Non-ASCII caracters supported! Find out how to use
unicode...
+
/* create a new text entry */
EAPI Evas_Object *esmart_text_entry_new (Evas * e);
@@ -42,6 +44,11 @@
/* you've gotta free this resut */
EAPI const char *esmart_text_entry_text_get(Evas_Object *o);
+/** Handle key input, text delete and return key (Hint: Set focus to the
esmart object).
+ * @param o The Esmart_Text_Entry object to handle.
+ * @param func The callback function.
+ * @param data The data that is passed to the callback function.
+ */
EAPI void esmart_text_entry_return_key_callback_set (Evas_Object * o,
void (*func) (void *data,
const char
*str),
===
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_text_entry/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 21 Mar 2007 16:28:23 - 1.7
+++ Makefile.am 10 Jul 2007 17:33:54 - 1.8
@@ -8,8 +8,8 @@
installed_headers_DATA = Esmart_Text_Entry.h
libesmart_text_entry_la_SOURCES = esmart_text_entry.c \
-
Esmart_Text_Entry.h
+ Esmart_Text_Entry.h
-libesmart_text_entry_la_LDFLAGS = -version-info 0:9:0
-libesmart_text_entry_la_LIBADD = @TEXT_ENTRY_LIBS@
+libesmart_text_entry_la_LDFLAGS = @TEXT_ENTRY_LIBS@ -version-info 0:9:0
+libesmart_text_entry_la_LIBADD =
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart/src/lib/esmart_resize Modified Files: Makefile.am Log Message: - added test for esmart_text_entry - added EDC file for esmart_text_entry -> not perfect, but good enough for a test (If you are a good EDC creator fix it.) - fixed some config.h stuff - added configure check for edje_cc === RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_resize/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 26 Jun 2007 20:01:39 - 1.1 +++ Makefile.am 10 Jul 2007 17:33:54 - 1.2 @@ -10,6 +10,6 @@ libesmart_resize_la_SOURCES = esmart_resize.c \ Esmart_Resize.h -libesmart_resize_la_LDFLAGS = -version-info 0:9:0 -libesmart_resize_la_LIBADD = @RESIZE_LIBS@ +libesmart_resize_la_LDFLAGS = @RESIZE_LIBS@ -version-info 0:9:0 +libesmart_resize_la_LIBADD = - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart/src/lib/esmart_container Modified Files: Makefile.am Log Message: - added test for esmart_text_entry - added EDC file for esmart_text_entry -> not perfect, but good enough for a test (If you are a good EDC creator fix it.) - fixed some config.h stuff - added configure check for edje_cc === RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_container/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 21 Mar 2007 16:28:23 - 1.10 +++ Makefile.am 10 Jul 2007 17:33:54 - 1.11 @@ -17,5 +17,5 @@ esmart_container_smart.c \ esmart_container_util.c -libesmart_container_la_LDFLAGS = -version-info 0:9:0 -libesmart_container_la_LIBADD = @CONTAINER_LIBS@ -lltdl -lm +libesmart_container_la_LDFLAGS = @CONTAINER_LIBS@ -version-info 0:9:0 +libesmart_container_la_LIBADD = -lltdl -lm - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart/src/bin Modified Files: Makefile.am esmart_file_dialog_test.c esmart_test.c Added Files: esmart_text_entry_test.c Log Message: - added test for esmart_text_entry - added EDC file for esmart_text_entry -> not perfect, but good enough for a test (If you are a good EDC creator fix it.) - fixed some config.h stuff - added configure check for edje_cc === RCS file: /cvs/e/e17/libs/esmart/src/bin/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 21 Mar 2007 16:28:23 - 1.6 +++ Makefile.am 10 Jul 2007 17:33:54 - 1.7 @@ -9,7 +9,7 @@ -I$(top_srcdir)/src/lib/esmart_file_dialog \ @CONTAINER_CFLAGS@ @THUMB_CFLAGS@ -bin_PROGRAMS = esmart_test esmart_file_dialog_test +bin_PROGRAMS = esmart_test esmart_file_dialog_test esmart_text_entry_test #esmart_test_DEPENDENCIES = $(top_builddir)/src/lib/libesmart.la esmart_test_SOURCES= esmart_test.c @@ -28,3 +28,12 @@ $(top_builddir)/src/lib/esmart_container/libesmart_container.la \ $(top_builddir)/src/lib/esmart_file_dialog/libesmart_file_dialog.la \ @FILE_DIALOG_LIBS@ + +esmart_text_entry_test_SOURCES = esmart_text_entry_test.c + +esmart_text_entry_test_LDADD = \ + $(top_builddir)/src/lib/esmart_text_entry/libesmart_text_entry.la \ + $(top_builddir)/src/lib/esmart_container/libesmart_container.la \ + $(top_builddir)/src/lib/esmart_file_dialog/libesmart_file_dialog.la \ +@TEXT_ENTRY_LIBS@ + === RCS file: /cvs/e/e17/libs/esmart/src/bin/esmart_file_dialog_test.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- esmart_file_dialog_test.c 5 Sep 2005 10:57:41 - 1.3 +++ esmart_file_dialog_test.c 10 Jul 2007 17:33:54 - 1.4 @@ -17,7 +17,9 @@ #include #include -#include "../config.h" +#ifdef HAVE_CONFIG_H + #include +#endif /** * the callback signal the file dialog calls when events happen === RCS file: /cvs/e/e17/libs/esmart/src/bin/esmart_test.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- esmart_test.c 17 Oct 2004 17:54:22 - 1.3 +++ esmart_test.c 10 Jul 2007 17:33:54 - 1.4 @@ -17,7 +17,10 @@ #include #include #include -#include "../config.h" + +#ifdef HAVE_CONFIG_H + #include +#endif #define MOVE_REFRESH 0.06 #define RESIZE_REFRESH 0.02 - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart/data Modified Files: Makefile.am Added Files: esmart_text_entry_test.edc Log Message: - added test for esmart_text_entry - added EDC file for esmart_text_entry -> not perfect, but good enough for a test (If you are a good EDC creator fix it.) - fixed some config.h stuff - added configure check for edje_cc === RCS file: /cvs/e/e17/libs/esmart/data/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -3 -r1.1.1.1 -r1.2 --- Makefile.am 5 May 2004 05:56:59 - 1.1.1.1 +++ Makefile.am 10 Jul 2007 17:33:54 - 1.2 @@ -1,2 +1,21 @@ -SUBDIRS = images +MAINTAINERCLEANFILES = Makefile.in + +EDJE_CC = @edje_cc@ +EDJE_FLAGS = \ + -v \ + -id $(top_srcdir)/data/images \ + -fd $(top_srcdir)/data/fonts \ + @EDJE_DEF@ + +filesdir = $(pkgdatadir) +files_DATA = esmart_text_entry_test.edj + +EXTRA_DIST = esmart_text_entry_test.edc + +esmart_text_entry_test.edj: Makefile esmart_text_entry_test.edc + $(EDJE_CC) $(EDJE_FLAGS) \ + $(top_srcdir)/data/esmart_text_entry_test.edc + +clean-local: + rm -f *.edj - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart/src/lib/esmart_trans_x11 Modified Files: Makefile.am Log Message: - added test for esmart_text_entry - added EDC file for esmart_text_entry -> not perfect, but good enough for a test (If you are a good EDC creator fix it.) - fixed some config.h stuff - added configure check for edje_cc === RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_trans_x11/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Makefile.am 21 Mar 2007 16:28:24 - 1.7 +++ Makefile.am 10 Jul 2007 17:33:55 - 1.8 @@ -10,7 +10,7 @@ libesmart_trans_x11_la_SOURCES = esmart_trans_x11.c \ Esmart_Trans_X11.h -libesmart_trans_x11_la_LDFLAGS = -version-info 0:9:0 \ +libesmart_trans_x11_la_LDFLAGS = @TRANSX11_LIBS@ -version-info 0:9:0 \ -L/usr/X11R6/lib -libesmart_trans_x11_la_LIBADD = @TRANSX11_LIBS@ +libesmart_trans_x11_la_LIBADD = - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/esmart andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : libs/esmart Dir : e17/libs/esmart/data/images Added Files: entry_cursor.png text_view_bg.png text_view_over.png Log Message: - added test for esmart_text_entry - added EDC file for esmart_text_entry -> not perfect, but good enough for a test (If you are a good EDC creator fix it.) - fixed some config.h stuff - added configure check for edje_cc - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
Re: [E-devel] E CVS: libs/evas raster
On Tue, 10 Jul 2007 00:54:04 -0300 "Gustavo Sverzut Barbieri" <[EMAIL PROTECTED]> babbled: > On 7/9/07, Enlightenment CVS <[EMAIL PROTECTED]> wrote: > > + * EVAS_COLORSPACE_RGB565_A5P: > > + * > > + * In the process of being implemented in 1 engine only. This may change. > > + * > > + * This is a pointer to image data for 16-bit half-word pixel data in 16bpp > > + * RGB 565 format (5 bits red, 6 bits green, 5 bits blue), with the > > high-byte > > + * containing red and the low byte containing blue, per pixel. This data is > > + * packed row by row from the top-left to the bottom right. > > + * > > + * If the image has an alpha channel enabled there will be an extra alpha > > plane > > + * after the color pixel plane. If not, then this data will not exist and > > + * should not be accessed in any way. This plane is a set of pixels with 1 > > + * byte per pixel defining the alpha values of all pixels in the image from > > + * the top-left to the bottom right of the image, row by row. Even though > > + * the values of the alpha pixels can be 0 to 255, only values 0 through > > to 32 > > + * are used, 32 being solid and 0 being transparent. > > current implementation is solid is 31 (5 bits, all 1). really? hmm - so you didn't use the code i originally had for this that was 0-32 to avoid an extra add in the blend routine. > > > + * RGB values can be 0 to 31 for red and blue and 0 to 63 for green, with 0 > > + * being black and 31 or 63 being full red, green or blue respectively. > > This > > + * colorspace is also pre-multiplied like EVAS_COLORSPACE_ARGB so: > > + * > > + * R = (r * a) / 32; G = (g * a) / 32; B = (b * a) / 32; > > No, this is not pre-multiplied, I just convert RGB 888 to 565: > > *da = A_VAL(sp) >> 3; > *dp = RGB_565_FROM_COMPONENTS(R_VAL(sp), G_VAL(sp), B_VAL > (sp)); > > RGB_565_FROM_COMPONENTS() just discard less significant bits and then > bitwise-OR to pack them in the correct format. or do you mean "sp" is > already pre-multiplied? I never considered this and results looks ok. sp is already pre-multiplied - thus the rgb565 will be too :) > > /** > > @@ -583,7 +654,7 @@ > > * Sets the raw image data. > > * load for the given image object. > > * @param obj The given image object. > > - * @param data The given data as 32 bit unsigned integer in format ARGB. > > is this in ARGB 888 pre-multiplied? > > -- > Gustavo Sverzut Barbieri > -- > Jabber: [EMAIL PROTECTED] >MSN: [EMAIL PROTECTED] > ICQ#: 17249123 > Skype: gsbarbieri > Mobile: +55 (81) 9927 0010 > > - > This SF.net email is sponsored by DB2 Express > Download DB2 Express C - the FREE version of DB2 express and take > control of your XML. No limits. Just data. Click to get it now. > http://sourceforge.net/powerbar/db2/ > ___ > enlightenment-devel mailing list > [EMAIL PROTECTED] > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- - Codito, ergo sum - "I code, therefore I am" -- The Rasterman (Carsten Haitzler)[EMAIL PROTECTED] 裸好多 Tokyo, Japan (東京 日本) - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ 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/data/themes/images Modified Files: Makefile.am Log Message: and add image to Makefile.am! remember! === RCS file: /cvs/e/e17/apps/e/data/themes/images/Makefile.am,v retrieving revision 1.101 retrieving revision 1.102 diff -u -3 -r1.101 -r1.102 --- Makefile.am 10 Jul 2007 00:13:21 - 1.101 +++ Makefile.am 10 Jul 2007 15:19:22 - 1.102 @@ -550,4 +550,5 @@ x-office-calendar.png \ x-office-document.png \ x-office-presentation.png \ -x-office-spreadsheet.png +x-office-spreadsheet.png \ +e17_icon_fileman_desktop.png - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/engycad glassy
Enlightenment CVS committal
Author : glassy
Project : e17
Module : apps/engycad
Dir : e17/apps/engycad/src
Modified Files:
drawing.c guiserv.c layer.c main.c menu.c serv.c shell.c
Log Message:
more work on leaks
===
RCS file: /cvs/e/e17/apps/engycad/src/drawing.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- drawing.c 9 Jul 2007 17:19:54 - 1.3
+++ drawing.c 10 Jul 2007 15:16:10 - 1.4
@@ -61,7 +61,7 @@
if (fn)
fn++;
if (!fn)
-fn = DUP(shell->drawingfile);
+fn = shell->drawingfile;
f = fopen(full, "rb");
if (!f)
new_file = 1;
===
RCS file: /cvs/e/e17/apps/engycad/src/guiserv.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- guiserv.c 8 Jul 2007 04:15:49 - 1.1
+++ guiserv.c 10 Jul 2007 15:16:10 - 1.2
@@ -135,7 +135,7 @@
s = _gui_get_string();
IFCMD("logo") logo_init();
- IFCMD("_exit") exit(0);
+ IFCMD("_exit") ecore_main_loop_quit();
// GLS
// IFCMD("cl_toggle") cl_toggle();
IFCMD("log_toggle") log_toggle();
@@ -182,7 +182,9 @@
IFCMD("cl_set_hint")
{
- cl_hint_set(o_cl, _gui_get_string());
+ char * hint = _gui_get_string();
+ cl_hint_set(o_cl, hint);
+ FREE(hint);
fl2 = 1;
}
IFCMD("_clean") evas_damage_rectangle_add(shell->evas, 0, 0,
shell->w,
@@ -284,6 +286,10 @@
log_add_string(DUP(s));
if (!fl)
serv_put_string(s);
+ else
+ {
+ FREE(s);
+ }
if (!fl2)
cl_hint_set(o_cl, DUP(_("cmd: ")));
}
===
RCS file: /cvs/e/e17/apps/engycad/src/layer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- layer.c 9 Jul 2007 17:19:54 - 1.3
+++ layer.c 10 Jul 2007 15:16:10 - 1.4
@@ -343,6 +343,7 @@
ENGY_ASSERT(res);
sprintf(buf, "/layer/%d/label", layer->id);
+IF_FREE(layer->label);
E_DB_STR_GET(f, buf, layer->label, res);
ENGY_ASSERT(res);
if(layer->label && (strlen(layer->label)>4000))
===
RCS file: /cvs/e/e17/apps/engycad/src/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- main.c 8 Jul 2007 04:15:49 - 1.1
+++ main.c 10 Jul 2007 15:16:10 - 1.2
@@ -1,48 +1,4 @@
-#include "engy.h"
-
-#define R(a) engy_utils_report((a),1)
-
-int
-handler_signal_exit(void *data, int ev_type, void *ev)
-{
- Ecore_Event_Signal_Exit *e;
-
- e = ev;
- if (e->interrupt) printf("exit: interrupt\n");
- if (e->quit) printf("exit: quit\n");
- if (e->terminate) printf("exit: terminate\n");
-
- ecore_main_loop_quit();
- return 1;
-}
-
-
-int main1(int argc, char *argv[])
-{
-
- int res;
- Evas * evas;
-
-// res = engy_pro_args_parse(argc, argv);
-// R(res);
-
- if (!ecore_init()) return -1;
- ecore_app_args_set(argc, (const char **)argv);
-
- ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT,
- handler_signal_exit, NULL);
-
- engy_window_init();
-
- engy_cl_init();
-
- engy_edje_init();
-
- ecore_main_loop_begin();
-
- return 0;
-}
-
+// ready to be removed
===
RCS file: /cvs/e/e17/apps/engycad/src/menu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- menu.c 9 Jul 2007 17:19:54 - 1.3
+++ menu.c 10 Jul 2007 15:16:10 - 1.4
@@ -251,6 +251,8 @@
if(s && (strlen(s)>4000)) s[4000]=0;
if (strcmp(s, "NULL"))
mi->pic = s;
+else
+ free(s);
menu_item_create_evas_object(mi);
@@ -810,6 +812,7 @@
Menu_Item *mi = l->data;
IF_FREE(mi->label);
IF_FREE(mi->param);
+ IF_FREE(mi->pic);
free(mi);
}
===
RCS file: /cvs/e/e17/apps/engycad/src/serv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- serv.c 8 Jul 2007 14:56:23 - 1.2
+++ serv.c 10 Jul 2007 15:16:10 - 1.3
@@ -42,6 +42,7 @@
Evas_List *serv_queue = NULL;
int parsed_flag;
+intfl_shutdown = FALSE;
/* protos */
char *_serv_get_string(void);
@@ -213,7 +214,7 @@
void
serv_loop(void)
{
-while (1)
+while (!fl_shutdown)
{
char *s;
@@ -221,
E CVS: libs/evas barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/software_16
Modified Files:
evas_engine.c
Log Message:
fix evas software 16 engine build and to add the missing image_data_get method.
By Andre Magalhaes
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_16/evas_engine.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_engine.c 19 Jun 2007 22:52:12 - 1.4
+++ evas_engine.c 10 Jul 2007 15:01:52 - 1.5
@@ -320,12 +320,7 @@
static int
eng_image_colorspace_get(void *data, void *image)
{
- Soft16_Image *im;
-
- if (!image) return EVAS_COLORSPACE_RGB565;
- im = image;
- if (im->have_alpha) return EVAS_COLORSPACE_RGB565_A5P;
- return EVAS_COLORSPACE_RGB565;
+ return EVAS_COLORSPACE_RGB565_A5P;
}
static void *
@@ -431,8 +426,31 @@
static void *
eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data)
{
- // FIXME: implement
- *image_data = NULL;
+ Soft16_Image *im;
+
+ if (!image)
+ {
+ *image_data = NULL;
+ return NULL;
+ }
+
+ im = image;
+
+ if (to_write)
+ {
+ if (im->references > 1)
+ {
+Soft16_Image *im_new;
+
+im_new = soft16_image_new(im->w, im->h, im->stride,
im->have_alpha, im->pixels, 1);
+if (!im_new) return im;
+soft16_image_free(im);
+im = im_new;
+ }
+ }
+
+ if (image_data) *image_data = (DATA32 *) im->pixels;
+
return image;
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: rage manowarrior
Enlightenment CVS committal Author : manowarrior Project : misc Module : rage Dir : misc/rage/data Modified Files: video.png Log Message: update Videos icon === RCS file: /cvs/e/misc/rage/data/video.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsvTY0oV and /tmp/cvsryS2Oy differ - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: rage manowarrior
Enlightenment CVS committal Author : manowarrior Project : misc Module : rage Dir : misc/rage/data Modified Files: update.png Log Message: update icon === RCS file: /cvs/e/misc/rage/data/update.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsHDr19P and /tmp/cvsJXIIZo differ - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e manowarrior
Enlightenment CVS committal Author : manowarrior Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Modified Files: e17_icon_fileman_desktop.png Log Message: New Desktop icon === RCS file: /cvs/e/e17/apps/e/data/themes/images/e17_icon_fileman_desktop.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsQdcy7I and /tmp/cvsSqGWTe differ - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ 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_widget_ilist.h e_widget_ilist.c e_ilist.h e_ilist.c
e_int_config_apps.c
Log Message:
Give menu apps dialogs (favs, ibar, etc, etc) ability to move items up/down
in the list. Allows user to "customize" their order in the menus, as per
ManoWarrior feature request.
Added some API to ilist widget to help with this. iList can now do
append_relative, prepend, and prepend_relative.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_ilist.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_widget_ilist.h7 Jun 2007 03:49:09 - 1.20
+++ e_widget_ilist.h10 Jul 2007 11:15:34 - 1.21
@@ -10,6 +10,9 @@
EAPI void e_widget_ilist_freeze(Evas_Object *obj);
EAPI void e_widget_ilist_thaw(Evas_Object *obj);
EAPI void e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon,
const char *label, void (*func) (void *data), void *data, const char *val);
+EAPI void e_widget_ilist_append_relative(Evas_Object *obj, Evas_Object
*icon, const char *label, void (*func) (void *data), void *data, const char
*val, int relative);
+EAPI void e_widget_ilist_prepend(Evas_Object *obj, Evas_Object *icon,
const char *label, void (*func) (void *data), void *data, const char *val);
+EAPI void e_widget_ilist_prepend_relative(Evas_Object *obj,
Evas_Object *icon, const char *label, void (*func) (void *data), void *data,
const char *val, int relative);
EAPI void e_widget_ilist_header_append(Evas_Object *obj, Evas_Object
*icon, const char *label);
EAPI void e_widget_ilist_selector_set(Evas_Object *obj, int selector);
EAPI void e_widget_ilist_go(Evas_Object *obj);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_ilist.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- e_widget_ilist.c7 Jun 2007 03:49:09 - 1.36
+++ e_widget_ilist.c10 Jul 2007 11:15:34 - 1.37
@@ -100,6 +100,79 @@
}
EAPI void
+e_widget_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char
*label, void (*func) (void *data), void *data, const char *val, int relative)
+{
+ E_Widget_Data *wd;
+ E_Widget_Callback *wcb, *rcb;
+
+ wd = e_widget_data_get(obj);
+ wcb = E_NEW(E_Widget_Callback, 1);
+ if (!wcb) return;
+ wcb->func = func;
+ wcb->data = data;
+ if (val) wcb->value = strdup(val);
+
+ rcb = evas_list_nth(wd->callbacks, relative);
+ if (rcb)
+ {
+ wd->callbacks = evas_list_append_relative(wd->callbacks, wcb, rcb);
+ e_ilist_append_relative(wd->o_ilist, icon, label, 0,
_e_wid_cb_item_sel, _e_wid_cb_item_hilight, wd, wcb, relative);
+ }
+ else
+ {
+ wd->callbacks = evas_list_append(wd->callbacks, wcb);
+ e_ilist_append(wd->o_ilist, icon, label, 0, _e_wid_cb_item_sel,
_e_wid_cb_item_hilight, wd, wcb);
+ }
+
+ if (icon) evas_object_show(icon);
+}
+
+EAPI void
+e_widget_ilist_prepend(Evas_Object *obj, Evas_Object *icon, const char *label,
void (*func) (void *data), void *data, const char *val)
+{
+ E_Widget_Data *wd;
+ E_Widget_Callback *wcb;
+
+ wd = e_widget_data_get(obj);
+ wcb = E_NEW(E_Widget_Callback, 1);
+ if (!wcb) return;
+ wcb->func = func;
+ wcb->data = data;
+ if (val) wcb->value = strdup(val);
+ wd->callbacks = evas_list_prepend(wd->callbacks, wcb);
+ e_ilist_prepend(wd->o_ilist, icon, label, 0, _e_wid_cb_item_sel,
_e_wid_cb_item_hilight, wd, wcb);
+ if (icon) evas_object_show(icon);
+}
+
+EAPI void
+e_widget_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const
char *label, void (*func) (void *data), void *data, const char *val, int
relative)
+{
+ E_Widget_Data *wd;
+ E_Widget_Callback *wcb, *rcb;
+
+ wd = e_widget_data_get(obj);
+ wcb = E_NEW(E_Widget_Callback, 1);
+ if (!wcb) return;
+ wcb->func = func;
+ wcb->data = data;
+ if (val) wcb->value = strdup(val);
+
+ rcb = evas_list_nth(wd->callbacks, relative);
+ if (rcb)
+ {
+ wd->callbacks = evas_list_prepend_relative(wd->callbacks, wcb, rcb);
+ e_ilist_prepend_relative(wd->o_ilist, icon, label, 0,
_e_wid_cb_item_sel, _e_wid_cb_item_hilight, wd, wcb, relative);
+ }
+ else
+ {
+ wd->callbacks = evas_list_prepend(wd->callbacks, wcb);
+ e_ilist_prepend(wd->o_ilist, icon, label, 0, _e_wid_cb_item_sel,
_e_wid_cb_item_hilight, wd, wcb);
+ }
+
+ if (icon) evas_object_show(icon);
+}
+
+EAPI void
e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char
*label)
{
E_Widget_Data *wd;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_ilist.h,v
retrieving revision 1.18
retrieving revisio
E CVS: libs/etk codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/lib
Modified Files:
etk_box.c
Log Message:
fixes by andre
===
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_box.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- etk_box.c 25 Mar 2007 18:22:00 - 1.24
+++ etk_box.c 10 Jul 2007 07:51:20 - 1.25
@@ -1046,8 +1046,8 @@
}
box->cells_count[group]++;
- etk_object_data_set(ETK_OBJECT(child), "_Etk_Box::Cell", cell);
etk_widget_parent_set(child, ETK_WIDGET(box));
+ etk_object_data_set(ETK_OBJECT(child), "_Etk_Box::Cell", cell);
etk_signal_emit_by_name("child-added", ETK_OBJECT(box), NULL, child);
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
exhibit_comment.c exhibit_main.c
Log Message:
fixes from andre
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_comment.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- exhibit_comment.c 1 Sep 2006 23:39:22 - 1.12
+++ exhibit_comment.c 10 Jul 2007 07:49:54 - 1.13
@@ -70,8 +70,8 @@
_ex_comment_load(Exhibit *e)
{
char *file;
- char *comment;
- unsigned int len;
+ char *comment = NULL;
+ unsigned int len = 0;
file = ((Ex_Tab *) e->cur_tab)->cur_file;
if (_ex_file_is_jpg(file))
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -3 -r1.114 -r1.115
--- exhibit_main.c 9 Jul 2007 23:50:41 - 1.114
+++ exhibit_main.c 10 Jul 2007 07:49:54 - 1.115
@@ -890,7 +890,9 @@
char *homedir;
const char **dnd_types;
int dnd_types_num;
-
+
+ memset(file, 0, PATH_MAX);
+
e = calloc(1, sizeof(Exhibit));
e->mouse.down = 0;
e->menu = NULL;
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
