awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dbus: add support for fixed size byte array 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2009-03-11 16:19:40 +01:00
parent 6e1c9875c5
commit 7e36c9df91
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dbus.c
View File

@ -92,9 +92,6 @@ a_dbus_message_iter(DBusMessageIter *iter)
{ {
int array_type = dbus_message_iter_get_element_type(iter); int array_type = dbus_message_iter_get_element_type(iter);
/* create a new table to store all the value */
lua_newtable(globalconf.L);
if(dbus_type_is_fixed(array_type)) if(dbus_type_is_fixed(array_type))
{ {
DBusMessageIter sub; DBusMessageIter sub;
@ -106,7 +103,8 @@ a_dbus_message_iter(DBusMessageIter *iter)
#define DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER(type, dbustype) \ #define DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER(type, dbustype) \
case dbustype: \ case dbustype: \
{ \ { \
type *data; \ const type *data; \
lua_newtable(globalconf.L); \
dbus_message_iter_get_fixed_array(&sub, &data, &datalen); \ dbus_message_iter_get_fixed_array(&sub, &data, &datalen); \
for(int i = 0; i < datalen; i++) \ for(int i = 0; i < datalen; i++) \
{ \ { \
@ -122,12 +120,21 @@ a_dbus_message_iter(DBusMessageIter *iter)
DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER(int64_t, DBUS_TYPE_INT64) DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER(int64_t, DBUS_TYPE_INT64)
DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER(uint64_t, DBUS_TYPE_UINT64) DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER(uint64_t, DBUS_TYPE_UINT64)
#undef DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER #undef DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER
case DBUS_TYPE_BYTE:
{
const char *c;
dbus_message_iter_get_fixed_array(&sub, &c, &datalen);
lua_pushlstring(globalconf.L, c, datalen);
}
break;
} }
} }
else if(array_type == DBUS_TYPE_DICT_ENTRY) else if(array_type == DBUS_TYPE_DICT_ENTRY)
{ {
DBusMessageIter subiter; DBusMessageIter subiter;
lua_newtable(globalconf.L);
/* initialize a sub iterator */ /* initialize a sub iterator */
dbus_message_iter_recurse(iter, &subiter); dbus_message_iter_recurse(iter, &subiter);
/* get the keys and the values /* get the keys and the values
@ -141,6 +148,8 @@ a_dbus_message_iter(DBusMessageIter *iter)
{ {
DBusMessageIter subiter; DBusMessageIter subiter;
lua_newtable(globalconf.L);
/* prepare to dig into the array*/ /* prepare to dig into the array*/
dbus_message_iter_recurse(iter, &subiter); dbus_message_iter_recurse(iter, &subiter);