On 08/15/2012 06:59 PM, Gustavo Sverzut Barbieri wrote:
> On Wed, Aug 15, 2012 at 2:55 PM, Daniel Willmann
> <d.willm...@samsung.com>wrote:
>
>> On 08/15/2012 06:27 PM, Gustavo Sverzut Barbieri wrote:
>>> That dbus support is horrible and we'll replace it with a proper version
>>> soon :-)
>>
>> Maybe we should just delete the example then? Or take out the dbus calls
>> and print a notice that it's incomplete?
>
> Feel free to delete everything related to dbus in elev8. We'll not use any
> of that.
Easier said than done. :-)
I've attached a patch that removes the dbus module as well as the
example. Any takers?
Regards,
Daniel
>From 106adcf4805a15b1fd272c0e12a73525188e97fc Mon Sep 17 00:00:00 2001
From: Daniel Willmann <d.willm...@samsung.com>
Date: Fri, 17 Aug 2012 10:20:58 +0100
Subject: [PATCH] elev8: Remove dbus module and example
This was not working and will be replaced by a different version soon
(according to Gustavo)
Signed-off-by: Daniel Willmann <d.willm...@samsung.com>
---
trunk/PROTO/elev8/configure.ac | 2 -
trunk/PROTO/elev8/data/javascript/Makefile.am | 1 -
trunk/PROTO/elev8/data/javascript/dbus_test.js | 82 --
trunk/PROTO/elev8/src/modules/Makefile.am | 2 +-
trunk/PROTO/elev8/src/modules/dbus/Makefile.am | 21 -
trunk/PROTO/elev8/src/modules/dbus/elev8_dbus.cc | 871 ----------------------
trunk/PROTO/elev8/src/modules/dbus/elev8_dbus.h | 109 ---
7 files changed, 1 insertion(+), 1087 deletions(-)
delete mode 100644 trunk/PROTO/elev8/data/javascript/dbus_test.js
delete mode 100644 trunk/PROTO/elev8/src/modules/dbus/Makefile.am
delete mode 100644 trunk/PROTO/elev8/src/modules/dbus/elev8_dbus.cc
delete mode 100644 trunk/PROTO/elev8/src/modules/dbus/elev8_dbus.h
diff --git a/trunk/PROTO/elev8/configure.ac b/trunk/PROTO/elev8/configure.ac
index 8c0417f..b24ecbe 100644
--- a/trunk/PROTO/elev8/configure.ac
+++ b/trunk/PROTO/elev8/configure.ac
@@ -112,7 +112,6 @@ PKG_CHECK_MODULES([ELEMENTARY], [
evas >= 1.0.999
ecore-evas >= 1.0.999
])
-PKG_CHECK_MODULES([EDBUS], [edbus >= 1.0.999 dbus-1])
PKG_CHECK_MODULES([ECORECON], [ecore-con >= 1.0.999])
PKG_CHECK_MODULES([EIO], [eio])
@@ -151,7 +150,6 @@ Makefile
src/Makefile
src/bin/Makefile
src/modules/Makefile
-src/modules/dbus/Makefile
src/modules/http/Makefile
src/modules/elm/Makefile
src/modules/fs/Makefile
diff --git a/trunk/PROTO/elev8/data/javascript/Makefile.am b/trunk/PROTO/elev8/data/javascript/Makefile.am
index dbd680a..ae84645 100644
--- a/trunk/PROTO/elev8/data/javascript/Makefile.am
+++ b/trunk/PROTO/elev8/data/javascript/Makefile.am
@@ -21,7 +21,6 @@ files_SCRIPTS = \
ctxpopup.js \
datetime.js \
dayselector.js \
- dbus_test.js \
dilbert.js \
elev8_demo.js \
entry.js \
diff --git a/trunk/PROTO/elev8/data/javascript/dbus_test.js b/trunk/PROTO/elev8/data/javascript/dbus_test.js
deleted file mode 100644
index 8de52bf..0000000
--- a/trunk/PROTO/elev8/data/javascript/dbus_test.js
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/local/bin/elev8
-
-var EXPAND_BOTH = { x : 1.0, y : 1.0 };
-var FILL_BOTH = { x : -1.0, y : -1.0 };
-
-var interface;
-
-var my_window = elm.Window({
- type : "main",
- label : "D-Feet Demo",
- width : 320,
- height : 480,
- align : FILL_BOTH,
- elements : {
- the_background : elm.Background({
- weight : EXPAND_BOTH,
- align : FILL_BOTH,
- resize : true,
- }),
- the_box : elm.Box ({
- weight : EXPAND_BOTH,
- resize : true,
- elements : {
- the_entry : elm.Entry({
- weight : EXPAND_BOTH,
- align : FILL_BOTH,
- line_wrap : 3,
- editable : false,
- }),
- the_bus : elm.Entry({
- text : "org.freedesktop.DBus",
- weight : EXPAND_BOTH,
- align : FILL_BOTH,
- }),
- the_buttons : elm.Box({
- weight : EXPAND_BOTH,
- horizontal : true,
- resize : true,
- elements : {
- fdo : elm.Button({
- label : "System Bus : UPower",
- weight : { x : -1.0, y : -1.0 },
- on_click : function() {
- print("Button Clicked");
- var test = new dbus("System");
- test.on_introspect= function(args){
- my_window.elements.the_box.elements.the_bus.text = arguments[0];
- print("Test Interfaces " + arguments[1][0]);
- print("Test Interfaces " + arguments[1][1]);
- interface = arguments[1][0];
-
- },
- test.introspect("org.freedesktop.UPower", "/org/freedesktop/UPower");
- },
- }),
- bz : elm.Button({
- label : "Session Bus : BlueZ",
- weight : { x : -1.0, y : -1.0 },
- on_click : function() {
- print("Button Clicked");
- var test = new dbus("Session");
- test.on_introspect= function(args){
- my_window.elements.the_box.elements.the_bus.text = arguments[0];
- print("Test Interfaces " + arguments[1][0]);
- print("Test Interfaces " + arguments[1][1]);
- print("Test Interfaces " + arguments[1][2]);
- interface = arguments[1][1];
-
- print("Printing Name = " + interface.name);
- interface.GetAll();
- },
- test.introspect("org.freedesktop.Notifications", "/org/freedesktop/Notifications");
- },
- }),
- },
- }),
- }
- }),
- },
-});
-
-var e = elm.realise(my_window);
diff --git a/trunk/PROTO/elev8/src/modules/Makefile.am b/trunk/PROTO/elev8/src/modules/Makefile.am
index b50ed38..c0f0a76 100644
--- a/trunk/PROTO/elev8/src/modules/Makefile.am
+++ b/trunk/PROTO/elev8/src/modules/Makefile.am
@@ -1,4 +1,4 @@
AUTOMAKE_OPTIONS = 1.4 foreign
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = dbus http elm fs ecore
+SUBDIRS = http elm fs ecore
diff --git a/trunk/PROTO/elev8/src/modules/dbus/Makefile.am b/trunk/PROTO/elev8/src/modules/dbus/Makefile.am
deleted file mode 100644
index e04f2c7..0000000
--- a/trunk/PROTO/elev8/src/modules/dbus/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-AUTOMAKE_OPTIONS = 1.4 foreign
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--Wall -Wextra \
--I$(top_srcdir) \
--I$(top_srcdir)/src/include \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
--DPACKAGE_TMP_DIR=\"/tmp\" \
-@EDBUS_CFLAGS@
-
-moddir = $(libdir)/$(PACKAGE)/$(MODULE_ARCH)
-mod_LTLIBRARIES = libdbus.la
-
-libdbus_la_SOURCES = elev8_dbus.cc
-
-libdbus_la_LIBADD = @EDBUS_LIBS@ @V8_LIBS@
-libdbus_la_LDFLAGS = -module -avoid-version -no-undefined
-libdbus_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/trunk/PROTO/elev8/src/modules/dbus/elev8_dbus.cc b/trunk/PROTO/elev8/src/modules/dbus/elev8_dbus.cc
deleted file mode 100644
index 3fb911f..0000000
--- a/trunk/PROTO/elev8/src/modules/dbus/elev8_dbus.cc
+++ /dev/null
@@ -1,871 +0,0 @@
-#include <elev8_dbus.h>
-
-using namespace v8;
-
-int elev8_dbus_log_domain = -1;
-Handle<ObjectTemplate> dbusObj;
-
-extern "C" void RegisterModule(Handle<ObjectTemplate>);
-
-#define DBUS_MODULE_NAME "dbus"
-
-static Eina_Bool cb_parse_method_argument_attributes(void *data, const char *key, const char *value)
-{
- struct DBus_Method_Argument *ma = (struct DBus_Method_Argument *)data;
-
- DBUS_INF( "%s - %s", key, value);
-
- if (strcmp(key, "name") == 0)
- eina_stringshare_replace(&ma->name, (value));
- else if (strcmp(key, "type") == 0)
- eina_stringshare_replace(&ma->type, (value));
- else if (strcmp(key, "direction") == 0)
- {
- if (strcmp(value, "out") == 0)
- ma->is_output = EINA_TRUE;
- else if (strcmp(value, "in") == 0)
- ma->is_output = EINA_FALSE;
- else
- {
- DBUS_ERR( "Error: unknown method argument direction %s", value);
- return EINA_FALSE;
- }
- }
- else
- {
- DBUS_ERR( "Error: unknown method argument attribute %s=%s",
- key, value);
- return EINA_FALSE;
- }
-
- return EINA_TRUE;
-}
-
-static Eina_Bool parse_method_argument(struct DBus_Method *m, const char *attrs, unsigned length)
-{
- struct DBus_Method_Argument *ma;
-
- ma = (struct DBus_Method_Argument *)calloc(1, sizeof(struct DBus_Method_Argument));
- if (!ma)
- {
- DBUS_ERR( "Error: could not allocate memory");
- return EINA_FALSE;
- }
-
- if (!eina_simple_xml_attributes_parse
- (attrs, length, cb_parse_method_argument_attributes, ma))
- {
- DBUS_ERR( "Error: could not parse method argument attributes");
- eina_stringshare_del(ma->name);
- eina_stringshare_del(ma->type);
- free(ma);
- return EINA_FALSE;
- }
-
- if (!ma->type)
- {
- DBUS_ERR( "Error: method argument must have a type!");
- eina_stringshare_del(ma->name);
- eina_stringshare_del(ma->type);
- free(ma);
- return EINA_FALSE;
- }
-
- m->arguments = eina_inlist_append(m->arguments, EINA_INLIST_GET(ma));
- return EINA_TRUE;
-}
-
-static void free_method_argument(struct DBus_Method_Argument *ma)
-{
- eina_stringshare_del(ma->type);
- eina_stringshare_del(ma->name);
- free(ma);
-}
-
-static Eina_Bool cb_parse_method_attributes(void *data, const char *key, const char *value)
-{
- struct DBus_Method *m = (struct DBus_Method *)data;
- if (strcmp(key, "name") != 0) return EINA_FALSE;
-
- eina_stringshare_replace(&m->name, (value));
- return EINA_TRUE;
-}
-
-static struct DBus_Method *parse_method(const char *attrs, unsigned length)
-{
- struct DBus_Method *m = (struct DBus_Method *)calloc(1, sizeof(struct DBus_Method));
- if (!m)
- {
- DBUS_ERR( "Error: could not allocate memory");
- return NULL;
- }
-
- if (!eina_simple_xml_attributes_parse
- (attrs, length, cb_parse_method_attributes, m))
- {
- DBUS_ERR( "Error: could not parse method attributes");
- free(m);
- return NULL;
- }
-
- if (!m->name)
- {
- DBUS_ERR( "Error: method must have a name!");
- free(m);
- return NULL;
- }
-
- return m;
-}
-
-static void free_method(struct DBus_Method *m)
-{
- while (m->arguments)
- {
- struct DBus_Method_Argument *tmp = EINA_INLIST_CONTAINER_GET
- (m->arguments, struct DBus_Method_Argument);
- m->arguments = m->arguments->next;
- free_method_argument(tmp);
- }
-
- eina_stringshare_del(m->name);
- free(m);
-}
-
-static Eina_Bool cb_parse_signal_argument_attributes(void *data, const char *key, const char *value)
-{
- struct DBus_Signal_Argument *sa = (struct DBus_Signal_Argument *)data;
-
- if (strcmp(key, "name") == 0)
- eina_stringshare_replace(&sa->name, (value));
- else if (strcmp(key, "type") == 0)
- eina_stringshare_replace(&sa->type, (value));
- else
- {
- DBUS_ERR( "Error: unknown signal argument attribute %s=%s",
- key, value);
- return EINA_FALSE;
- }
-
- return EINA_TRUE;
-}
-
-static Eina_Bool parse_signal_argument(struct DBus_Signal *s, const char *attrs, unsigned length)
-{
- struct DBus_Signal_Argument *sa;
-
- sa = (struct DBus_Signal_Argument *)calloc(1, sizeof(struct DBus_Signal_Argument));
- if (!sa)
- {
- DBUS_ERR( "Error: could not allocate memory");
- return EINA_FALSE;
- }
-
- if (!eina_simple_xml_attributes_parse
- (attrs, length, cb_parse_signal_argument_attributes, sa))
- {
- DBUS_ERR( "Error: could not parse signal argument attributes");
- eina_stringshare_del(sa->name);
- eina_stringshare_del(sa->type);
- free(sa);
- return EINA_FALSE;
- }
-
- if (!sa->type)
- {
- DBUS_ERR( "Error: signal argument must have a type!");
- eina_stringshare_del(sa->name);
- eina_stringshare_del(sa->type);
- free(sa);
- return EINA_FALSE;
- }
-
- s->arguments = eina_inlist_append(s->arguments, EINA_INLIST_GET(sa));
- return EINA_TRUE;
-}
-
-static void free_signal_argument(struct DBus_Signal_Argument *sa)
-{
- eina_stringshare_del(sa->type);
- eina_stringshare_del(sa->name);
- free(sa);
-}
-
-static Eina_Bool cb_parse_signal_attributes(void *data, const char *key, const char *value)
-{
- struct DBus_Signal *s = (struct DBus_Signal *)data;
- if (strcmp(key, "name") != 0) return EINA_FALSE;
-
- eina_stringshare_replace(&s->name, (value));
- return EINA_TRUE;
-}
-
-static struct DBus_Signal *parse_signal(const char *attrs, unsigned length)
-{
- struct DBus_Signal *s = (struct DBus_Signal *)calloc(1, sizeof(struct DBus_Signal));
- if (!s)
- {
- DBUS_ERR( "Error: could not allocate memory");
- return NULL;
- }
-
- if (!eina_simple_xml_attributes_parse
- (attrs, length, cb_parse_signal_attributes, s))
- {
- DBUS_ERR( "Error: could not parse signal attributes");
- free(s);
- return NULL;
- }
-
- if (!s->name)
- {
- DBUS_ERR( "Error: signal must have a name!");
- free(s);
- return NULL;
- }
-
- return s;
-}
-
-static void free_signal(struct DBus_Signal *s)
-{
- while (s->arguments)
- {
- struct DBus_Signal_Argument *tmp = EINA_INLIST_CONTAINER_GET
- (s->arguments, struct DBus_Signal_Argument);
- s->arguments = s->arguments->next;
- free_signal_argument(tmp);
- }
-
- eina_stringshare_del(s->name);
- free(s);
-}
-
-static Eina_Bool cb_parse_property_attributes(void *data, const char *key, const char *value)
-{
- struct DBus_Property *p = (struct DBus_Property *)data;
- if (strcmp(key, "name") == 0)
- eina_stringshare_replace(&p->name, (value));
- else if (strcmp(key, "type") == 0)
- eina_stringshare_replace(&p->type, (value));
- else if (strcmp(key, "access") == 0)
- {
- if (strcmp(value, "read") == 0)
- {
- p->can_read = EINA_TRUE;
- p->can_write = EINA_FALSE;
- }
- else if (strcmp(value, "write") == 0)
- {
- p->can_read = EINA_FALSE;
- p->can_write = EINA_TRUE;
- }
- else if (strcmp(value, "readwrite") == 0)
- {
- p->can_read = EINA_TRUE;
- p->can_write = EINA_TRUE;
- }
- else
- {
- DBUS_ERR( "Error: unknown access value '%s'", value);
- return EINA_FALSE;
- }
- }
- else
- {
- DBUS_ERR( "Error: unknown property attribute %s=%s",
- key, value);
- return EINA_FALSE;
- }
-
- return EINA_TRUE;
-}
-
-static struct DBus_Property *parse_property(const char *attrs, unsigned length)
-{
- struct DBus_Property *p = (struct DBus_Property *)calloc(1, sizeof(struct DBus_Property));
- if (!p)
- {
- DBUS_ERR( "Error: could not allocate memory");
- return NULL;
- }
-
- p->can_read = EINA_TRUE;
- p->can_write = EINA_TRUE;
- if (!eina_simple_xml_attributes_parse
- (attrs, length, cb_parse_property_attributes, p))
- {
- DBUS_ERR( "Error: could not parse property attributes");
- free(p);
- return NULL;
- }
-
- if (!p->name)
- {
- DBUS_ERR( "Error: property must have a name!");
- free(p);
- return NULL;
- }
-
- return p;
-}
-
-static void free_property(struct DBus_Property *p)
-{
- eina_stringshare_del(p->name);
- eina_stringshare_del(p->type);
- free(p);
-}
-
-static Eina_Bool cb_parse_interface_attributes(void *data, const char *key, const char *value)
-{
- struct DBus_Interface *i = (struct DBus_Interface *)data;
- if (strcmp(key, "name") != 0) return EINA_FALSE;
-
- eina_stringshare_replace(&i->name, (value));
-
- return EINA_TRUE;
-}
-
-static struct DBus_Interface *parse_interface(const char *attrs, unsigned length)
-{
- struct DBus_Interface *i = (struct DBus_Interface *)calloc
- (1,sizeof(struct DBus_Interface));
- if (!i)
- {
- DBUS_ERR( "Error: could not allocate memory");
- return NULL;
- }
-
- if (!eina_simple_xml_attributes_parse
- (attrs, length, cb_parse_interface_attributes, i))
- {
- DBUS_ERR( "Error: could not parse interface attributes");
- free(i);
- return NULL;
- }
-
- if (!i->name)
- {
- DBUS_ERR( "Error: interface must have a name!");
- free(i);
- return NULL;
- }
-
- return i;
-}
-
-static void free_interface(struct DBus_Interface *i)
-{
- while (i->methods)
- {
- struct DBus_Method *tmp = EINA_INLIST_CONTAINER_GET
- (i->methods, struct DBus_Method);
- i->methods = i->methods->next;
- free_method(tmp);
- }
-
- while (i->signals)
- {
- struct DBus_Signal *tmp = EINA_INLIST_CONTAINER_GET
- (i->signals, struct DBus_Signal);
- i->signals = i->signals->next;
- free_signal(tmp);
- }
-
- while (i->properties)
- {
- struct DBus_Property *tmp = EINA_INLIST_CONTAINER_GET
- (i->properties, struct DBus_Property);
- i->properties = i->properties->next;
- free_property(tmp);
- }
-
- eina_stringshare_del(i->name);
- free(i);
-}
-
-static Eina_Bool cb_parse_node_attributes(void *data, const char *key, const char *value)
-{
- struct DBus_Node *n = (struct DBus_Node *)data;
- if (strcmp(key, "name") != 0) return EINA_FALSE;
-
- eina_stringshare_replace(&n->name, (value));
- DBUS_INF("Name = %s", n->name);
- return EINA_TRUE;
-}
-
-static struct DBus_Node *parse_node(const char *attrs, unsigned length)
-{
- struct DBus_Node *n = (struct DBus_Node *)calloc(1, sizeof(struct DBus_Node));
- if (!n)
- {
- DBUS_ERR( "Error: could not allocate memory");
- return NULL;
- }
-
- if (!attrs) return n;
-
- if (!eina_simple_xml_attributes_parse
- (attrs, length, cb_parse_node_attributes, n))
- {
- DBUS_ERR( "Error: could not parse node attributes");
- free(n);
- return NULL;
- }
- return n;
-}
-
-static void free_node(struct DBus_Node *n)
-{
- while (n->children)
- {
- struct DBus_Node *tmp = EINA_INLIST_CONTAINER_GET
- (n->children, struct DBus_Node);
- n->children = n->children->next;
- free_node(tmp);
- }
-
- while (n->interfaces)
- {
- struct DBus_Interface *tmp = EINA_INLIST_CONTAINER_GET
- (n->interfaces, struct DBus_Interface);
- n->interfaces = n->interfaces->next;
- free_interface(tmp);
- }
-
- eina_stringshare_del(n->name);
- free(n);
-}
-
-static Eina_Bool cb_parse(void *data, Eina_Simple_XML_Type type, const char *content, unsigned offset, unsigned length)
-{
- struct DBus_Introspection_Parse_Ctxt *ctxt = (struct DBus_Introspection_Parse_Ctxt *)data;
-
- switch (type)
- {
- case EINA_SIMPLE_XML_OPEN:
- case EINA_SIMPLE_XML_OPEN_EMPTY:
- {
- /* split tag name and attributes */
- const char *attrs = eina_simple_xml_tag_attributes_find
- (content, length);
- unsigned attrslen = 0;
- int sz = length;
- if (attrs)
- {
- attrslen = length - (attrs - content);
- sz = attrs - content;
- while ((sz > 0) && (isspace(content[sz - 1])))
- sz--;
- }
-
- if (!ctxt->node)
- {
- if (strncmp("node", content, sz) != 0)
- {
- DBUS_ERR( "Error: expected <node>, got %.*s",
- length, content);
- return EINA_FALSE;
- }
-
- ctxt->node = parse_node(attrs, attrslen);
- if (!ctxt->node) return EINA_FALSE;
- ctxt->nodes = eina_inlist_append
- (ctxt->nodes, EINA_INLIST_GET(ctxt->node));
- }
- else
- {
- if (strncmp("node", content, sz) == 0)
- {
- struct DBus_Node *n = parse_node(attrs, attrslen);
- if (!n) return EINA_FALSE;
-
-
- ctxt->node->children = eina_inlist_append
- (ctxt->node->children, EINA_INLIST_GET(n));
-
- if (type != EINA_SIMPLE_XML_OPEN_EMPTY)
- ctxt->node = n;
-
- DBUS_INF( "Node Name = %s", n->name);
- }
- else if (strncmp("interface", content, sz) == 0)
- {
- if (!ctxt->node)
- {
- DBUS_ERR(
- "Error: cannot have <%.*s> outside <node>!",
- length, content);
- return EINA_FALSE;
- }
-
- ctxt->interface = parse_interface(attrs, attrslen);
- if (!ctxt->interface) return EINA_FALSE;
- DBUS_INF( "Interface %s %p",
- ctxt->interface->name, ctxt->interface);
- ctxt->node->interfaces = eina_inlist_append
- (ctxt->node->interfaces, EINA_INLIST_GET(ctxt->interface));
- }
- else if (strncmp("method", content, sz) == 0)
- {
- struct DBus_Method *m;
-
- if (!ctxt->interface)
- {
- DBUS_ERR(
- "Error: cannot have <%.*s> outside "
- "<interface>!",
- length, content);
- return EINA_FALSE;
- }
-
- m = parse_method(attrs, attrslen);
- if (!m) return EINA_FALSE;
- ctxt->interface->methods = eina_inlist_append
- (ctxt->interface->methods, EINA_INLIST_GET(m));
-
- if (type != EINA_SIMPLE_XML_OPEN_EMPTY)
- ctxt->method = m;
-
- DBUS_INF( "Method Name = %s", m->name);
- }
- else if (strncmp("signal", content, sz) == 0)
- {
- struct DBus_Signal *s;
-
- if (!ctxt->interface)
- {
- DBUS_ERR(
- "Error: cannot have <%.*s> outside "
- "<interface>!",
- length, content);
- return EINA_FALSE;
- }
-
- s = parse_signal(attrs, attrslen);
- if (!s) return EINA_FALSE;
- ctxt->interface->signals = eina_inlist_append
- (ctxt->interface->signals, EINA_INLIST_GET(s));
-
- if (type != EINA_SIMPLE_XML_OPEN_EMPTY)
- ctxt->signal = s;
-
- DBUS_INF( "Signal Name = %s", s->name);
- }
- else if (strncmp("property", content, sz) == 0)
- {
- struct DBus_Property *p;
-
- if (!ctxt->interface)
- {
- DBUS_ERR(
- "Error: cannot have <%.*s> outside "
- "<interface>!",
- length, content);
- return EINA_FALSE;
- }
-
- p = parse_property(attrs, attrslen);
- if (!p) return EINA_FALSE;
- ctxt->interface->properties = eina_inlist_append
- (ctxt->interface->properties, EINA_INLIST_GET(p));
-
- DBUS_INF( "Property Name = %s Type = %s", p->name, p->type);
- }
- else if (strncmp("arg", content, sz) == 0)
- {
- if (ctxt->method)
- {
- if (!parse_method_argument
- (ctxt->method, attrs, attrslen))
- {
- DBUS_ERR(
- "Error: cannot parse method's <%.*s>",
- length, content);
- return EINA_FALSE;
- }
- }
- else if (ctxt->signal)
- {
- if (!parse_signal_argument
- (ctxt->signal, attrs, attrslen))
- {
- DBUS_ERR(
- "Error: cannot parse signal's <%.*s>",
- length, content);
- return EINA_FALSE;
- }
- }
- else
- {
- DBUS_ERR(
- "Error: cannot have <%.*s> outside "
- "<method> or <signal>!",
- length, content);
- return EINA_FALSE;
- }
- }
- else
- {
- DBUS_ERR( "Error: unexpected element <%.*s>",
- length, content);
- return EINA_FALSE;
- }
- }
- }
- break;
- case EINA_SIMPLE_XML_CLOSE:
- if (strncmp("node", content, length) == 0)
- ctxt->node = NULL;
- else if (strncmp("interface", content, length) == 0)
- ctxt->interface = NULL;
- else if (strncmp("method", content, length) == 0)
- ctxt->method = NULL;
- else if (strncmp("signal", content, length) == 0)
- ctxt->signal = NULL;
- break;
- case EINA_SIMPLE_XML_DATA:
- case EINA_SIMPLE_XML_CDATA:
- case EINA_SIMPLE_XML_PROCESSING:
- case EINA_SIMPLE_XML_DOCTYPE:
- case EINA_SIMPLE_XML_COMMENT:
- case EINA_SIMPLE_XML_IGNORED:
- /*DBUS_ERR( "Ignored: contents at offset %u-%u: %.*s",
- offset, length, length, content);*/
- break;
- case EINA_SIMPLE_XML_ERROR:
- DBUS_ERR( "Error: parser error at offset %u-%u: %.*s",
- offset, length, length, content);
- break;
- }
- return EINA_TRUE;
-}
-
-static Handle<Value> dbus_method_invoke(const Arguments&)
-{
- HandleScope scope;
-
- DBUS_INF("Invoking DBUS Method API");
-
- return Undefined();
-}
-
-static void invoke_js_callback(void *data)
-{
- DBus *dbus = ((struct dbus_cache *)(data))->dbus;
- if (dbus->js_introspect_cb->IsFunction())
- {
- Local<Function> func = Function::Cast(*(dbus->js_introspect_cb));
- if (!func.IsEmpty())
- {
- Persistent<String> path = static_cast<Persistent<String> >(
- ((struct dbus_cache *)(data))->service);
-
-
- v8::String::Utf8Value service(((struct dbus_cache *)(data))->service);
-
- DBUS_INF("Service Name = %s", *service);
-
- Eina_Inlist *il = ((struct DBus_Node *)(dbus->ctxt->nodes))->interfaces;
- struct DBus_Interface *l = NULL;
- struct DBus_Method *m = NULL;
- Local<ObjectTemplate> methods = v8::ObjectTemplate::New();
- Local<FunctionTemplate> invoke = FunctionTemplate::New();
- invoke->SetCallHandler(dbus_method_invoke);
-
- Handle<Object> interfaces = v8::Array::New();
-
-
- int i = 0;
-
- EINA_INLIST_FOREACH(il, l)
- {
- DBUS_INF("i/f = %s", l->name);
- v8::Handle<v8::Number> y = v8::Number::New(i);
- Eina_Inlist *ml=
- ((struct DBus_Interface *)(l))->methods;
-
- EINA_INLIST_FOREACH(ml, m)
- {
- DBUS_INF("method=%s",m->name);
- methods->Set(String::New("name"),String::New(l->name));
- methods->Set(String::New(m->name), invoke);
- interfaces->Set(y, methods->NewInstance());
- }
- i++;
- }
- Handle<Value> args[2] = { path, interfaces };
- func->Call(dbus->obj, 2, args);
-
- }
- }
-}
-
-static void cb_introspect(void *data, DBusMessage *msg, DBusError *error)
-{
- DBusError e;
- DBus *dbus = ((struct dbus_cache *)(data))->dbus;
-
- if ((error) && (dbus_error_is_set(error)))
- {
- DBUS_ERR( "Error: DBus error %s: %s",
- error->name, error->message);
- return;
- }
-
- dbus_error_init(&e);
- dbus->ctxt = (struct DBus_Introspection_Parse_Ctxt *)calloc(1, sizeof(struct DBus_Introspection_Parse_Ctxt));
- if (!dbus_message_get_args(msg, &e, DBUS_TYPE_STRING, &dbus->ctxt->xml_str,
- DBUS_TYPE_INVALID))
- {
- DBUS_ERR( "Error: could not get arguments %s: %s",
- e.name, e.message);
- return;
- }
-
-
- if (!eina_simple_xml_parse(dbus->ctxt->xml_str, strlen(dbus->ctxt->xml_str), EINA_TRUE, cb_parse, dbus->ctxt))
- {
- DBUS_ERR( "Error: could not parse XML:\n%s", dbus->ctxt->xml_str);
- if (dbus->ctxt) free(dbus->ctxt);
- return;
- }
-
-
- v8::String::Utf8Value service(((struct dbus_cache *)(data))->service);
- invoke_js_callback(data);
-}
-
-
-static Handle<Value> dbus_msg_introspect(const Arguments &args)
-{
- HandleScope scope;
-
- DBUS_INF("Calling Introspect API");
- Local<Object> self = args.Holder();
- Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
- void *ptr = wrap->Value();
- DBus *dbus = (DBus *)ptr;
-
- if (args[0]->IsString() && args[1]->IsString())
- {
- String::Utf8Value service(args[0]->ToString());
- String::Utf8Value path(args[1]->ToString());
- DBUS_INF( "%s-%s", *service, *path);
-
- /* check if the bus has already been introspected */
-
- DBUS_INF( "Looking for %s", *service);
-
- DBusPendingCall *pc;
- struct dbus_cache *dc = (struct dbus_cache *)calloc(1, sizeof(struct dbus_cache));
- dc->dbus = dbus;
- dc->service = v8::String::New(*service);
- pc = e_dbus_introspect(dbus->conn, *service, *path, cb_introspect, dc);
-
- if (!pc)
- {
- DBUS_ERR( "Cannot introspect the given path");
- return Undefined();
- }
- DBUS_INF( "Introspect called %s",*service);
- }
- return Undefined();
-}
-
-static void on_introspect(Local<String> property,
- Local<Value> value,
- const AccessorInfo& info)
-{
- Local<Object> self = info.Holder();
- Local<External> wrap = Local<External>::Cast(self->GetInternalField(0));
- void *ptr = wrap->Value();
- DBus *dbus = (DBus *)ptr;
-
- String::Utf8Value prop_name(property);
- dbus->js_introspect_cb.Dispose();
- dbus->js_introspect_cb = Persistent<Value>::New(value);
- DBUS_INF( "Introspect result set.");
-}
-
-static Handle<Value> createDBusInstance(const Arguments& args)
-{
- HandleScope scope;
-
- if (args[0]->IsString())
- {
- String::Utf8Value method(args[0]->ToString());
- if (!(strstr(*method, "System") || strstr(*method, "Session")
- || strstr(*method, "Starter")))
- {
- DBUS_ERR("Undefined Session type");
- return Undefined();
- }
- }
- else
- {
- DBUS_ERR("Please specify System or Session as parameter");
- return Undefined();
- }
-
- DBUS_INF( "Creating DBUS Instance");
- String::Utf8Value method(args[0]->ToString());
- DBus *dbus = new DBus();
-
- /* After this step, dbus is integrated to main loop */
- if (!strstr(*method, "System"))
- {
- dbus->conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
- }
-
- if (!strstr(*method, "Session"))
- {
- dbus->conn = e_dbus_bus_get(DBUS_BUS_SESSION);
- }
-
- if (!strstr(*method, "Starter"))
- {
- dbus->conn = e_dbus_bus_get(DBUS_BUS_STARTER);
- }
-
- if (dbus->conn==NULL)
- {
- DBUS_ERR( "Cannot create DBus");
- delete dbus;
- return Undefined();
- }
-
- Local<FunctionTemplate> introspect = FunctionTemplate::New();
- introspect->SetCallHandler(dbus_msg_introspect);
- dbusObj->Set(String::New("introspect"), introspect);
-
- dbusObj->SetAccessor(String::New("on_introspect"),NULL, on_introspect, Null());
-
- dbus->obj.Dispose();
- dbus->obj = Persistent<Object>::New(dbusObj->NewInstance());
- dbus->obj->SetInternalField(0, External::New(dbus));
-
- DBUS_INF( "DBus Interface initialized");
- return dbus->obj;
-}
-
-extern "C"
-void RegisterModule(Handle<ObjectTemplate>)
-{
- elev8_dbus_log_domain = eina_log_domain_register("elev8-dbus", EINA_COLOR_ORANGE);
- if (!elev8_dbus_log_domain)
- {
- DBUS_ERR( "could not register elev8-dbus log domain.");
- elev8_dbus_log_domain = EINA_LOG_DOMAIN_GLOBAL;
- }
- DBUS_INF("elev8-dbus Logging initialized. %d", elev8_dbus_log_domain);
-
- if (e_dbus_init())
- {
- /* Add support for DBus Service Introspection */
- dbusObj = ObjectTemplate::New();
- dbusObj->SetInternalFieldCount(1);
- dbusObj->Set(String::NewSymbol("dbus"), FunctionTemplate::New(createDBusInstance)->GetFunction());
- }
-}
diff --git a/trunk/PROTO/elev8/src/modules/dbus/elev8_dbus.h b/trunk/PROTO/elev8/src/modules/dbus/elev8_dbus.h
deleted file mode 100644
index 4b76eac..0000000
--- a/trunk/PROTO/elev8/src/modules/dbus/elev8_dbus.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef ELEV8_DBUS_H
-#define ELEV8_DBUS_H
-
-#include <v8.h>
-#include <dbus/dbus.h>
-#include <E_DBus.h>
-#include <Ecore.h>
-#include <Eina.h>
-#include <ctype.h>
-#include <map>
-#include <elev8_common.h>
-
-#define DBUS_DBG(...) EINA_LOG_DOM_DBG(elev8_dbus_log_domain, __VA_ARGS__)
-#define DBUS_INF(...) EINA_LOG_DOM_INFO(elev8_dbus_log_domain, __VA_ARGS__)
-#define DBUS_WRN(...) EINA_LOG_DOM_WARN(elev8_dbus_log_domain, __VA_ARGS__)
-#define DBUS_ERR(...) EINA_LOG_DOM_ERR(elev8_dbus_log_domain, __VA_ARGS__)
-#define DBUS_CRT(...) EINA_LOG_DOM_CRITICAL(elev8_dbus_log_domain, __VA_ARGS__)
-
-
-/* memory efficient structures to hold introspection information.
- * maybe Eina_Inlist could be replaced with single array of structures
- * (not to be confused with Eina_Array!!!!)
- */
-
-struct DBus_Method_Argument
-{
- EINA_INLIST;
- const char *type;
- const char *name;
- Eina_Bool is_output:1;
-};
-
-struct DBus_Method
-{
- EINA_INLIST;
- const char *name;
- Eina_Inlist *arguments;
-};
-
-struct DBus_Signal_Argument
-{
- EINA_INLIST;
- const char *type;
- const char *name;
-};
-
-struct DBus_Signal
-{
- EINA_INLIST;
- const char *name;
- Eina_Inlist *arguments;
-};
-
-struct DBus_Property
-{
- EINA_INLIST;
- const char *name;
- const char *type;
- Eina_Bool can_read:1;
- Eina_Bool can_write:1;
-};
-
-struct DBus_Interface
-{
- EINA_INLIST;
- const char *name;
- Eina_Inlist *methods;
- Eina_Inlist *signals;
- Eina_Inlist *properties;
-};
-
-struct DBus_Node
-{
- EINA_INLIST;
- const char *name;
- Eina_Inlist *interfaces;
- Eina_Inlist *children;
-};
-
-struct DBus_Introspection_Parse_Ctxt
-{
- struct DBus_Node *node;
- struct DBus_Interface *interface;
- struct DBus_Method *method;
- struct DBus_Signal *signal;
- // the above fields in this struct only aid in parsing the xml response.
- // after parsing is done, they are set to NULL.
-
- // master nodes list which stores multiple nodes - based on user request.
- Eina_Inlist *nodes;
- const char *xml_str;
-};
-
-class DBus {
-
- public:
- E_DBus_Connection *conn;
- v8::Persistent<v8::Value> js_introspect_cb;
- v8::Persistent<v8::Object> obj;
- struct DBus_Introspection_Parse_Ctxt *ctxt;
-};
-
-struct dbus_cache
-{
- v8::Local<v8::String> service;
- DBus *dbus;
-};
-
-#endif
--
1.7.9.5
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
