dbus/tools/dbus-names-model.c
Colin Walters beb9cd2eb2 2005-06-12 Colin Walters <walters@verbum.org>
Async signals and various bugfixes and testing by
	Ross Burton <ross@burtonini.com>.

	* glib/dbus-gvalue.h: (struct DBusBasicGValue): Delete.
	(dbus_gvalue_genmarshal_name_from_type)
	(dbus_gvalue_ctype_from_type): Moved to dbus-binding-tool-glib.c.
	(dbus_gtype_to_dbus_type): Renamed to dbus_gtype_from_signature.
	(dbus_g_value_types_init, dbus_gtype_from_signature)
	(dbus_gtype_from_signature_iter, dbus_gtype_to_signature)
	(dbus_gtypes_from_arg_signature): New function prototypes.
	(dbus_gvalue_demarshal): Take context and error arguments.
	(dbus_gvalue_demarshal_variant): New function.
	(dbus_gvalue_demarshal_message): New function.
	(dbus_gvalue_store): Delete.

	* glib/dbus-gvalue.c:

	File has been almost entirely rewritten; now we special-case
	more types such as DBUS_TYPE_SIGNATURE, handle arrays and
	hash tables correctly, etc.  Full support for recursive values
	is not yet complete.

	* glib/dbus-gproxy.c (dbus_g_proxy_class_init): Change last
	argument of signal to G_TYPE_POINTER since we now pass a
	structure.
	(lookup_g_marshaller): Delete in favor of
	_dbus_gobject_lookup_marshaller.
	(marshal_dbus_message_to_g_marshaller): Use
	_dbus_gobject_lookup_marshaller and dbus_gvalue_demarshal_message
	to handle remote signal callbacks.
	(dbus_g_proxy_new_from_proxy): New function; creates a new
	DBusGProxy by copying an existing one.
	(dbus_g_proxy_get_interface, dbus_g_proxy_set_interface)
	(dbus_g_proxy_get_path): New functions.
	(dbus_g_proxy_marshal_args_to_message): New function;
	factored out of existing code.
	(DBUS_G_VALUE_ARRAY_COLLECT_ALL): Collect all arguments
	from a varargs array.
	(dbus_g_proxy_begin_call_internal): New function.
	(dbus_g_proxy_end_call_internal): New function.
	(dbus_g_proxy_begin_call): Take GTypes instead of DBus types
	as arguments; simply invoke dbus_g_proxy_begin_call_internal
	after collecting args into value array.
	(dbus_g_proxy_end_call): Take GTypes instead of DBus types;
	invoke dbus_g_proxy_end_call_internal.
	(dbus_g_proxy_invoke): Simply invoke begin_call_interanl and
	end_call_internal.
	(dbus_g_proxy_call_no_reply): Take GTypes instead of DBus
	types.
	(array_free_all): New function.
	(dbus_g_proxy_add_signal): Take GTypes.

	* glib/dbus-gobject.h:
	(_dbus_glib_marshal_dbus_message_to_gvalue_array): Delete.
	(_dbus_gobject_get_path, _dbus_gobject_lookup_marshaller):
	Prototype.

	* glib/dbus-gobject.c: Add a global marshal_table hash which
	stores mappings from type signatures to marshallers.  Change lots
	of invocations of dbus_gtype_to_dbus_type to
	dbus_gtype_to_signature.
	(_dbus_glib_marshal_dbus_message_to_gvalue_array): Delete.
	(introspect_signals): Fix test for query.return_type.
	(set_object_property): Update invocation of dbus_gvalue_demarshal.
	(invoke_object_method): Many changes.  Handle asynchronous
	invocations.  Convert arguments with
	dbus_gvalue_demarshal_message.  Handle errors.  Use
	DBusSignatureIter instead of strlen on args. Handle all arguments
	generically.  Special-case variants.
	(dbus_g_method_return, dbus_g_method_return_error): New function.
	(DBusGSignalClosure): New structure, closes over signal
	information.
	(dbus_g_signal_closure_new): New function.
	(dbus_g_signal_closure_finalize): New function.
	(signal_emitter_marshaller): New function; is special marshaller
	which emits signals on bus.
	(export_signals): New function; introspects object signals and
	connects to them.
	(dbus_g_object_type_install_info): Take GType instead of
	GObjectClass.
	(dbus_g_connection_register_g_object): Invoke export_signals.
	(dbus_g_connection_lookup_g_object): New function.
	(DBusGFuncSignature) New structure; used for mapping type
	signatures to marshallers.
	(funcsig_hash): New function; hashes DBusGFuncSignature.
	(funcsig_equal): New function; compares DBusGFuncSignature.
	(_dbus_gobject_lookup_marshaller): New function.
	(dbus_g_object_register_marshaller): New function; used to
	register a marshaller at runtime for a particular signature.

	* glib/dbus-gmain.c (_dbus_gmain_test): Add various tests.

	* glib/dbus-binding-tool-glib.h: Add DBUS_GLIB_ANNOTATION_ASYNC
	which notes a server method implementation should be
	asynchronous.

	* glib/dbus-binding-tool-glib.c
	(dbus_binding_tool_output_glib_server): Call
	dbus_g_value_types_init.
	(write_formal_parameters): Use dbus_gtype_from_signature.  Handle
	variants specially.
	(dbus_g_type_get_lookup_function): Turn GType into an invocation
	of a lookup function.
	(write_args_for_direction): Use dbus_g_type_get_lookup_function.
	(write_untyped_out_args): New method; write output arguments.
	(write_formal_declarations_for_direction): Function for
	writing prototypes.
	(write_formal_parameters_for_direction): Function for
	writing implementations.
	(write_typed_args_for_direction): Function for writing
	arguments prefixed with GTypes.
	(write_async_method_client): Write out async version
	of method.

	* glib/dbus-binding-tool-glib.c: Include dbus-gvalue-utils.h.
	(dbus_g_type_get_marshal_name): Move mapping from GType
	to marshal name into here.
	(dbus_g_type_get_c_name): Move into here.
	(compute_marshaller): Convert signature to type with
	dbus_gtype_from_signature, use dbus_g_type_get_marshal_name.
	(compute_marshaller_name): Ditto.
	(compute_marshaller): Handle async signal annotations.
	(gather_marshallers): Return if we don't have a known
	prefix.
	(generate_glue): Collect introspection blob here, and
	write all of the blob at the end.  This allows an object
	with multiple interfaces to work.
	Mark async methods in introspection blob.

	* glib/Makefile.am (libdbus_glib_1_la_SOURCES): Add
	dbus-gtype-specialized.c, dbus-gtype-specialized.h,
	dbus-gvalue-utils.h, dbus-gvalue-utils.c.

	* dbus/dbus-glib.h: Don't include dbus-protocol.h; this
	avoids people accidentally using DBUS_TYPE_* which should
	not be necessary anymore.
	Do include dbus-gtype-specialized.h, which are utilities
	for GLib container types.
	Add various #defines for types such as
	DBUS_TYPE_G_BOOLEAN_ARRAY.
	(DBusGValueIterator, DBusGValue): Define, not fully used
	yet.
	(dbus_g_value_get_g_type): Type for recursive value.
	(dbus_g_value_open, dbus_g_value_iterator_get_value)
	(dbus_g_value_iterator_get_values, dbus_g_value_iterator_recurse)
	(dbus_g_value_free): Prototypes.
	(dbus_g_object_register_marshaller, dbus_g_proxy_new_from_proxy): Prototype.
	(dbus_g_proxy_set_interface): Prototype.
	(dbus_g_proxy_begin_call, dbus_g_proxy_end_call)
	(dbus_g_proxy_call_no_reply): Take GLib types instead of DBus
	types.
	(dbus_g_proxy_get_path, dbus_g_proxy_get_interface):
	Accessors.
	(DBusGAsyncData, DBusGMethodInvocation): Structures for
	doing async invocations.
	(dbus_g_method_return, dbus_g_method_return_error):
	Prototypes.
	* doc/dbus-tutorial.xml: Update GLib section.

	* tools/dbus-viewer.c (load_child_nodes): Update
	for new invocation type of dbus_g_proxy_end_call.
	(load_from_service_thread_func): Ditto.

	* tools/print-introspect.c (main): Ditto.

	* tools/dbus-names-model.c (have_names_notify)
	(names_model_reload, names_model_set_connection)
	Use GTypes.

	* python/Makefile.am (INCLUDES): Define DBUS_COMPILATION,
	needed since Python bindings use GLib bindings.

	* test/glib/Makefile.am (INCLUDES): Define DBUS_COMPILATION.
	Add --prefix argument.

	* tools/Makefile.am: Define DBUS_COMPILATION.  Remove
	unneeded --ignore-unsupported arg.

	* test/glib/test-service-glib.c:
	* test/glib/test-service-glib.xml:
	* test/glib/test-dbus-glib.c: Add many more tests.
2005-06-13 03:01:30 +00:00

392 lines
11 KiB
C

/* -*- mode: C; c-file-style: "gnu" -*- */
/* dbus-names-model.c GtkTreeModel for names on the bus
*
* Copyright (C) 2005 Red Hat, Inc.
*
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#include "dbus-names-model.h"
#include <glib/gi18n.h>
#include <string.h>
#include <dbus/dbus-protocol.h>
enum
{
MODEL_COLUMN_NAME,
MODEL_COLUMN_LAST
};
typedef struct NamesModel NamesModel;
typedef struct NamesModelClass NamesModelClass;
GType names_model_get_type (void);
struct NamesModel
{
GtkListStore parent;
DBusGConnection *connection;
DBusGProxy *driver_proxy;
DBusGPendingCall *pending_list_names;
};
struct NamesModelClass
{
GtkListStoreClass parent;
};
#define TYPE_NAMES_MODEL (names_model_get_type ())
#define NAMES_MODEL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TYPE_NAMES_MODEL, NamesModel))
#define NAMES_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NAMES_MODEL, NamesModelClass))
#define IS_NAMES_MODEL(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TYPE_NAMES_MODEL))
#define IS_NAMES_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NAMES_MODEL))
#define NAMES_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NAMES_MODEL, NamesModelClass))
static void
have_names_notify (DBusGPendingCall *call,
void *data)
{
NamesModel *names_model;
GError *error;
char **names;
int n_elements;
int i;
names_model = NAMES_MODEL (data);
g_assert (names_model->pending_list_names);
g_assert (names_model->driver_proxy);
names = NULL;
error = NULL;
if (!dbus_g_proxy_end_call (names_model->driver_proxy,
names_model->pending_list_names,
&error, G_TYPE_STRV,
&names, &n_elements, G_TYPE_INVALID))
{
g_assert (names == NULL);
g_assert (error != NULL);
g_printerr (_("Failed to load names on the bus: %s\n"), error->message);
g_error_free (error);
return;
}
i = 0;
while (names[i])
{
GtkTreeIter iter;
g_assert (i < n_elements);
#if 0
g_printerr ("%d of %d: %s\n",
i, n_elements, names[i]);
#endif
gtk_list_store_append (GTK_LIST_STORE (names_model),
&iter);
gtk_list_store_set (GTK_LIST_STORE (names_model),
&iter,
MODEL_COLUMN_NAME, names[i],
-1);
++i;
}
g_strfreev (names);
}
static gboolean
names_model_find_name (NamesModel *names_model,
const char *name,
GtkTreeIter *iter_p)
{
GtkTreeIter iter;
if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (names_model),
&iter))
return FALSE;
do
{
char *s;
gtk_tree_model_get (GTK_TREE_MODEL (names_model),
&iter,
MODEL_COLUMN_NAME, &s,
-1);
if (s && strcmp (s, name) == 0)
{
*iter_p = iter;
g_free (s);
return TRUE;
}
g_free (s);
}
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (names_model),
&iter));
return FALSE;
}
static void
name_owner_changed (DBusGProxy *driver_proxy,
const char *name,
const char *old_owner,
const char *new_owner,
void *data)
{
NamesModel *names_model = NAMES_MODEL (data);
#if 0
g_printerr ("Name '%s' changed owner '%s' -> '%s'\n",
name, old_owner, new_owner);
#endif
if (*new_owner == '\0')
{
/* this name has vanished */
GtkTreeIter iter;
if (names_model_find_name (names_model, name, &iter))
gtk_list_store_remove (GTK_LIST_STORE (names_model),
&iter);
}
else if (*old_owner == '\0')
{
/* this name has been added */
GtkTreeIter iter;
if (!names_model_find_name (names_model, name, &iter))
{
gtk_list_store_append (GTK_LIST_STORE (names_model),
&iter);
gtk_list_store_set (GTK_LIST_STORE (names_model),
&iter,
MODEL_COLUMN_NAME, name,
-1);
}
}
}
static void
names_model_reload (NamesModel *names_model)
{
GtkListStore *list_store;
list_store = GTK_LIST_STORE (names_model);
if (names_model->pending_list_names)
{
dbus_g_pending_call_cancel (names_model->pending_list_names);
dbus_g_pending_call_unref (names_model->pending_list_names);
names_model->pending_list_names = NULL;
}
gtk_list_store_clear (list_store);
if (names_model->connection == NULL)
return;
names_model->pending_list_names =
dbus_g_proxy_begin_call (names_model->driver_proxy,
"ListNames",
G_TYPE_INVALID);
dbus_g_pending_call_set_notify (names_model->pending_list_names,
have_names_notify, names_model, NULL);
}
static void
names_model_set_connection (NamesModel *names_model,
DBusGConnection *connection)
{
g_return_if_fail (IS_NAMES_MODEL (names_model));
if (connection == names_model->connection)
return;
if (names_model->connection)
{
dbus_g_proxy_disconnect_signal (names_model->driver_proxy,
"NameOwnerChanged",
G_CALLBACK (name_owner_changed),
names_model);
g_object_unref (names_model->driver_proxy);
names_model->driver_proxy = NULL;
dbus_g_connection_unref (names_model->connection);
names_model->connection = NULL;
}
if (connection)
{
names_model->connection = connection;
dbus_g_connection_ref (names_model->connection);
names_model->driver_proxy =
dbus_g_proxy_new_for_name (names_model->connection,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
g_assert (names_model->driver_proxy);
dbus_g_proxy_add_signal (names_model->driver_proxy,
"NameOwnerChanged",
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_INVALID);
dbus_g_proxy_connect_signal (names_model->driver_proxy,
"NameOwnerChanged",
G_CALLBACK (name_owner_changed),
names_model,
NULL);
}
names_model_reload (names_model);
}
G_DEFINE_TYPE(NamesModel, names_model, GTK_TYPE_LIST_STORE)
/* Properties */
enum
{
PROP_0,
PROP_CONNECTION
};
static void
names_model_dispose (GObject *object)
{
NamesModel *names_model = NAMES_MODEL (object);
names_model_set_connection (names_model, NULL);
g_assert (names_model->connection == NULL);
g_assert (names_model->driver_proxy == NULL);
g_assert (names_model->pending_list_names == NULL);
(G_OBJECT_CLASS (names_model_parent_class)->dispose) (object);
}
static void
names_model_finalize (GObject *object)
{
NamesModel *names_model = NAMES_MODEL (object);
g_assert (names_model->connection == NULL);
g_assert (names_model->driver_proxy == NULL);
g_assert (names_model->pending_list_names == NULL);
(G_OBJECT_CLASS (names_model_parent_class)->finalize) (object);
}
static void
names_model_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
NamesModel *names_model;
names_model = NAMES_MODEL (object);
switch (prop_id)
{
case PROP_CONNECTION:
names_model_set_connection (names_model, g_value_get_boxed (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
names_model_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
NamesModel *names_model;
names_model = NAMES_MODEL (object);
switch (prop_id)
{
case PROP_CONNECTION:
g_value_set_boxed (value, names_model->connection);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
names_model_init (NamesModel *names_model)
{
GtkListStore *list_store;
GType types[MODEL_COLUMN_LAST];
list_store = GTK_LIST_STORE (names_model);
types[0] = G_TYPE_STRING; /* name */
gtk_list_store_set_column_types (list_store, MODEL_COLUMN_LAST, types);
}
static void
names_model_class_init (NamesModelClass *names_model_class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (names_model_class);
gobject_class->finalize = names_model_finalize;
gobject_class->dispose = names_model_dispose;
gobject_class->set_property = names_model_set_property;
gobject_class->get_property = names_model_get_property;
g_object_class_install_property (gobject_class,
PROP_CONNECTION,
g_param_spec_boxed ("connection",
_("Bus connection"),
_("Connection to the message bus"),
DBUS_TYPE_G_CONNECTION,
G_PARAM_READWRITE));
}
GtkTreeModel*
names_model_new (DBusGConnection *connection)
{
NamesModel *names_model;
names_model = g_object_new (TYPE_NAMES_MODEL,
"connection", connection,
NULL);
return GTK_TREE_MODEL (names_model);
}