summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am18
-rw-r--r--tools/dbus-monitor.c17
-rw-r--r--tools/dbus-print-message.c56
-rw-r--r--tools/dbus-send.129
-rw-r--r--tools/dbus-send.c82
-rw-r--r--tools/dbus-tree-view.c373
-rw-r--r--tools/dbus-tree-view.h36
-rw-r--r--tools/dbus-viewer.c320
8 files changed, 898 insertions, 33 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 80957854..a6a38a97 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS)
+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
if HAVE_GLIB
GLIB_TOOLS=dbus-monitor
@@ -6,7 +6,13 @@ else
GLIB_TOOLS=
endif
-bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets
+if HAVE_GTK
+GTK_TOOLS=dbus-viewer
+else
+GTK_TOOLS=
+endif
+
+bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
dbus_send_SOURCES= \
dbus-print-message.c \
@@ -24,9 +30,17 @@ dbus_launch_SOURCES= \
dbus_cleanup_sockets_SOURCES= \
dbus-cleanup-sockets.c
+dbus_viewer_SOURCES= \
+ dbus-tree-view.c \
+ dbus-tree-view.h \
+ dbus-viewer.c
+
dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la
dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
dbus_launch_LDADD= $(DBUS_X_LIBS)
+dbus_viewer_LDADD= $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS)
man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
EXTRA_DIST = $(man_MANS)
+
+
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index dac15292..23ee346a 100644
--- a/tools/dbus-monitor.c
+++ b/tools/dbus-monitor.c
@@ -30,17 +30,18 @@
#include "dbus-print-message.h"
static DBusHandlerResult
-handler_func (DBusMessageHandler *handler,
- DBusConnection *connection,
- DBusMessage *message,
- void *user_data)
+filter_func (DBusConnection *connection,
+ DBusMessage *message,
+ void *user_data)
{
print_message (message);
- if (dbus_message_has_name (message, DBUS_MESSAGE_LOCAL_DISCONNECT))
+ if (dbus_message_is_signal (message,
+ DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+ "Disconnected"))
exit (0);
- return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
static void
@@ -56,7 +57,6 @@ main (int argc, char *argv[])
DBusConnection *connection;
DBusError error;
DBusBusType type = DBUS_BUS_SESSION;
- DBusMessageHandler *handler;
GMainLoop *loop;
int i;
@@ -94,8 +94,7 @@ main (int argc, char *argv[])
dbus_connection_setup_with_g_main (connection, NULL);
- handler = dbus_message_handler_new (handler_func, NULL, NULL);
- dbus_connection_add_filter (connection, handler);
+ dbus_connection_add_filter (connection, filter_func, NULL, NULL);
g_main_loop_run (loop);
diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index bb380ce5..43c41c73 100644
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -21,18 +21,64 @@
*/
#include "dbus-print-message.h"
+static const char*
+type_to_name (int message_type)
+{
+ switch (message_type)
+ {
+ case DBUS_MESSAGE_TYPE_SIGNAL:
+ return "signal";
+ case DBUS_MESSAGE_TYPE_METHOD_CALL:
+ return "method call";
+ case DBUS_MESSAGE_TYPE_METHOD_RETURN:
+ return "method return";
+ case DBUS_MESSAGE_TYPE_ERROR:
+ return "error";
+ default:
+ return "(unknown message type)";
+ }
+}
+
void
print_message (DBusMessage *message)
{
DBusMessageIter iter;
const char *sender;
+ int message_type;
+ message_type = dbus_message_get_type (message);
sender = dbus_message_get_sender (message);
-
- printf ("message name=%s; sender=%s\n",
- dbus_message_get_name (message),
- sender ? sender : "(no sender)");
-
+
+ switch (message_type)
+ {
+ case DBUS_MESSAGE_TYPE_METHOD_CALL:
+ case DBUS_MESSAGE_TYPE_SIGNAL:
+ printf ("%s interface=%s; member=%s; sender=%s\n",
+ type_to_name (message_type),
+ dbus_message_get_interface (message),
+ dbus_message_get_member (message),
+ sender ? sender : "(no sender)");
+ break;
+
+ case DBUS_MESSAGE_TYPE_METHOD_RETURN:
+ printf ("%s; sender=%s\n",
+ type_to_name (message_type),
+ sender ? sender : "(no sender)");
+ break;
+
+ case DBUS_MESSAGE_TYPE_ERROR:
+ printf ("%s name=%s; sender=%s\n",
+ type_to_name (message_type),
+ dbus_message_get_error_name (message),
+ sender ? sender : "(no sender)");
+ break;
+
+ default:
+ printf ("Message of unknown type %d received\n",
+ message_type);
+ break;
+ }
+
dbus_message_iter_init (message, &iter);
do
diff --git a/tools/dbus-send.1 b/tools/dbus-send.1
index 08ea1335..725507c0 100644
--- a/tools/dbus-send.1
+++ b/tools/dbus-send.1
@@ -8,7 +8,8 @@ dbus-send \- Send a message to a message bus
.SH SYNOPSIS
.PP
.B dbus-send
-[\-\-system | \-\-session] [\-\-dest=SERVICE] [\-\-print-reply] <message name> [contents ...]
+[\-\-system | \-\-session] [\-\-dest=SERVICE] [\-\-print-reply]
+[\-\-type=TYPE] <destination object path> <message name> [contents ...]
.SH DESCRIPTION
@@ -28,26 +29,31 @@ specified, \fIdbus-send\fP sends to the session bus.
Nearly all uses of \fIdbus-send\fP must provide the \-\-dest argument
which is the name of a service on the bus to send the message to. If
\-\-dest is omitted, a default service name of
-"org.freedesktop.DBus.Broadcast" is used.
+"org.freedesktop.Broadcast" is used.
.PP
-The name of the message to send must always be specified. Following
-arguments, if any, are the message contents (message arguments).
-These are given as a type name, a colon, and then the value of the
-argument. The possible type names are: string, int32, uint32, double,
-byte, boolean. (D-BUS supports more types than these, but
-\fIdbus-send\fP currently does not.)
+The object path and the name of the message to send must always be
+specified. Following arguments, if any, are the message contents
+(message arguments). These are given as a type name, a colon, and
+then the value of the argument. The possible type names are: string,
+int32, uint32, double, byte, boolean. (D-BUS supports more types than
+these, but \fIdbus-send\fP currently does not.)
.PP
Here is an example invocation:
.nf
- dbus-send \-\-dest='org.freedesktop.ExampleService' \\
- org.freedesktop.ExampleMessage \\
+ dbus-send \-\-dest='org.freedesktop.ExampleService' \\
+ /org/freedesktop/sample/object/name \\
+ org.freedesktop.ExampleInterface.ExampleMethod \\
int32:47 string:'hello world' double:65.32
.fi
+Note that the interface is separated from a method or signal
+name by a dot, though in the actual protocol the interface
+and the interface member are separate fields.
+
.SH OPTIONS
The following options are supported:
.TP
@@ -62,6 +68,9 @@ Send to the system message bus.
.TP
.I "--session"
Send to the session message bus. (This is the default.)
+.TP
+.I "--type=TYPE"
+Specify "method_call" or "signal" (defaults to "signal").
.SH AUTHOR
dbus-send was written by Philip Blundell.
diff --git a/tools/dbus-send.c b/tools/dbus-send.c
index 12ad5c8c..06a87adb 100644
--- a/tools/dbus-send.c
+++ b/tools/dbus-send.c
@@ -30,7 +30,7 @@
static void
usage (char *name, int ecode)
{
- fprintf (stderr, "Usage: %s [--help] [--system | --session] [--dest=SERVICE] [--print-reply] <message type> [contents ...]\n", name);
+ fprintf (stderr, "Usage: %s [--help] [--system | --session] [--dest=SERVICE] [--type=TYPE] [--print-reply] <destination object path> <message name> [contents ...]\n", name);
exit (ecode);
}
@@ -44,10 +44,13 @@ main (int argc, char *argv[])
DBusMessageIter iter;
int i;
DBusBusType type = DBUS_BUS_SESSION;
- char *dest = DBUS_SERVICE_BROADCAST;
- char *name = NULL;
-
- if (argc < 2)
+ const char *dest = NULL;
+ const char *name = NULL;
+ const char *path = NULL;
+ int message_type = DBUS_MESSAGE_TYPE_SIGNAL;
+ const char *type_str = NULL;
+
+ if (argc < 3)
usage (argv[0], 1);
print_reply = FALSE;
@@ -64,17 +67,37 @@ main (int argc, char *argv[])
print_reply = TRUE;
else if (strstr (arg, "--dest=") == arg)
dest = strchr (arg, '=') + 1;
+ else if (strstr (arg, "--type=") == arg)
+ type_str = strchr (arg, '=') + 1;
else if (!strcmp(arg, "--help"))
usage (argv[0], 0);
else if (arg[0] == '-')
usage (argv[0], 1);
+ else if (path == NULL)
+ path = arg;
+ else if (name == NULL)
+ name = arg;
else
- name = arg;
+ usage (argv[0], 1);
}
if (name == NULL)
usage (argv[0], 1);
+ if (type_str != NULL)
+ {
+ if (strcmp (type_str, "method_call") == 0)
+ message_type = DBUS_MESSAGE_TYPE_METHOD_CALL;
+ else if (strcmp (type_str, "signal") == 0)
+ message_type = DBUS_MESSAGE_TYPE_SIGNAL;
+ else
+ {
+ fprintf (stderr, "Message type \"%s\" is not supported\n",
+ type_str);
+ exit (1);
+ }
+ }
+
dbus_error_init (&error);
connection = dbus_bus_get (type, &error);
if (connection == NULL)
@@ -86,13 +109,57 @@ main (int argc, char *argv[])
exit (1);
}
- message = dbus_message_new (name, dest);
+ if (message_type == DBUS_MESSAGE_TYPE_METHOD_CALL)
+ {
+ char *last_dot;
+
+ last_dot = strrchr (name, '.');
+ if (last_dot == NULL)
+ {
+ fprintf (stderr, "Must use org.mydomain.Interface.Method notation, no dot in \"%s\"\n",
+ name);
+ exit (1);
+ }
+ *last_dot = '\0';
+
+ message = dbus_message_new_method_call (NULL,
+ path,
+ name,
+ last_dot + 1);
+ }
+ else if (message_type == DBUS_MESSAGE_TYPE_SIGNAL)
+ {
+ char *last_dot;
+
+ last_dot = strrchr (name, '.');
+ if (last_dot == NULL)
+ {
+ fprintf (stderr, "Must use org.mydomain.Interface.Signal notation, no dot in \"%s\"\n",
+ name);
+ exit (1);
+ }
+ *last_dot = '\0';
+
+ message = dbus_message_new_signal (path, name, last_dot + 1);
+ }
+ else
+ {
+ fprintf (stderr, "Internal error, unknown message type\n");
+ exit (1);
+ }
+
if (message == NULL)
{
fprintf (stderr, "Couldn't allocate D-BUS message\n");
exit (1);
}
+ if (dest && !dbus_message_set_destination (message, dest))
+ {
+ fprintf (stderr, "Not enough memory\n");
+ exit (1);
+ }
+
dbus_message_append_iter_init (message, &iter);
while (i < argc)
@@ -135,6 +202,7 @@ main (int argc, char *argv[])
exit (1);
}
+ /* FIXME - we are ignoring OOM returns on all these functions */
switch (type)
{
case DBUS_TYPE_BYTE:
diff --git a/tools/dbus-tree-view.c b/tools/dbus-tree-view.c
new file mode 100644
index 00000000..863ad1e0
--- /dev/null
+++ b/tools/dbus-tree-view.c
@@ -0,0 +1,373 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* dbus-tree-view.c GtkTreeView for a D-BUS interface description
+ *
+ * Copyright (C) 2003 Red Hat, Inc.
+ *
+ * Licensed under the Academic Free License version 1.2
+ *
+ * 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 <string.h>
+#include <config.h>
+#include "dbus-tree-view.h"
+
+#include <libintl.h>
+#define _(x) dgettext (GETTEXT_PACKAGE, x)
+#define N_(x) x
+
+enum
+{
+ MODEL_COLUMN_INFO,
+
+ MODEL_COLUMN_LAST
+};
+
+enum
+{
+ VIEW_COLUMN_NAME,
+
+ VIEW_COLUMN_LAST
+};
+
+/* We stuff the node tree into a GtkTreeStore, rather
+ * than bothering to write a custom model
+ */
+static GtkTreeModel*
+model_new (void)
+{
+ GtkTreeModel *model;
+ GtkTreeStore *store;
+
+ store = gtk_tree_store_new (MODEL_COLUMN_LAST,
+ G_TYPE_POINTER);
+ /* FIXME, BASE_INFO_TYPE doesn't work right (crashes),
+ * G_TYPE_POINTER has a memleak. BASE_INFO_TYPE problem maybe just a
+ * bad GTK build on my laptop.
+ */
+ /* BASE_INFO_TYPE); */
+
+ model = GTK_TREE_MODEL (store);
+
+ return model;
+}
+
+static void set_info (GtkTreeModel *model,
+ GtkTreeIter *root,
+ BaseInfo *info);
+
+static void
+append_child_list (GtkTreeModel *model,
+ GtkTreeIter *parent,
+ GSList *children)
+{
+ GSList *tmp;
+ GtkTreeStore *store;
+
+ store = GTK_TREE_STORE (model);
+
+ /* parent may be NULL for root */
+
+ tmp = children;
+ while (tmp != NULL)
+ {
+ GtkTreeIter iter;
+
+ gtk_tree_store_append (store, &iter, parent);
+
+ set_info (model, &iter, tmp->data);
+
+ tmp = tmp->next;
+ }
+}
+
+static void
+set_info (GtkTreeModel *model,
+ GtkTreeIter *root,
+ BaseInfo *info)
+{
+ GtkTreeStore *store;
+ GtkTreeIter child;
+
+ store = GTK_TREE_STORE (model);
+
+ /* Remeber that root is NULL for "/" path */
+
+ /* Clear existing children */
+ while (gtk_tree_model_iter_children (model, &child, root))
+ gtk_tree_store_remove (store, &child);
+
+ /* Set our new value; we simply discard NodeInfo for "/" at the
+ * moment.
+ */
+ if (root != NULL)
+ {
+ base_info_ref (info); /* FIXME once boxed types are working */
+ gtk_tree_store_set (store, root,
+ MODEL_COLUMN_INFO, info,
+ -1);
+ }
+
+ /* Fill in new children */
+ switch (base_info_get_type (info))
+ {
+ case INFO_TYPE_NODE:
+ append_child_list (model, root,
+ node_info_get_interfaces ((NodeInfo*)info));
+ append_child_list (model, root,
+ node_info_get_nodes ((NodeInfo*)info));
+ break;
+ case INFO_TYPE_INTERFACE:
+ append_child_list (model, root,
+ interface_info_get_methods ((InterfaceInfo*)info));
+ append_child_list (model, root,
+ interface_info_get_signals ((InterfaceInfo*)info));
+ break;
+ case INFO_TYPE_METHOD:
+ append_child_list (model, root,
+ method_info_get_args ((MethodInfo*)info));
+ break;
+ case INFO_TYPE_SIGNAL:
+ append_child_list (model, root,
+ signal_info_get_args ((SignalInfo*)info));
+ break;
+ case INFO_TYPE_ARG:
+ /* no children */
+ break;
+ }
+}
+
+static void
+ensure_tree_node (GtkTreeModel *model,
+ const char **path,
+ GtkTreeIter *iter)
+{
+ GtkTreeStore *store;
+ int i;
+ GtkTreeIter child;
+ GtkTreeIter *parent;
+ GtkTreeIter prev;
+
+ store = GTK_TREE_STORE (model);
+
+ /* The path[0] == NULL case for path "/" can't happen since no tree
+ * node is created for that
+ */
+ g_assert (path[0] != NULL);
+
+ parent = NULL;
+
+ i = 0;
+ while (path[i] != NULL)
+ {
+ gboolean found;
+
+ found = FALSE;
+
+ if (gtk_tree_model_iter_children (model, &child, parent))
+ {
+ /* Scan for the right path */
+ do
+ {
+ BaseInfo *info;
+
+ info = NULL;
+ gtk_tree_model_get (model, &child,
+ MODEL_COLUMN_INFO, &info,
+ -1);
+
+ if (info != NULL &&
+ base_info_get_type (info) == INFO_TYPE_NODE &&
+ strcmp (base_info_get_name (info), path[i]) == 0)
+ {
+ /* Found it */
+ found = TRUE;
+ break;
+ }
+ }
+ while (gtk_tree_model_iter_next (model, &child));
+ }
+
+ if (!found)
+ {
+ NodeInfo *node;
+
+ node = node_info_new (path[i]);
+
+ gtk_tree_store_append (store, &child, parent);
+ gtk_tree_store_set (store, &child,
+ MODEL_COLUMN_INFO, node,
+ -1);
+ }
+
+ prev = child;
+ parent = &prev;
+
+ ++i;
+ }
+
+ g_assert (parent == &prev);
+ *iter = prev;
+}
+
+static void
+model_update (GtkTreeModel *model,
+ const char **path,
+ NodeInfo *node)
+{
+ GtkTreeStore *store;
+
+ store = GTK_TREE_STORE (model);
+
+ if (path[0] == NULL)
+ {
+ /* Setting '/' */
+
+ set_info (model, NULL, (BaseInfo*) node);
+ }
+ else
+ {
+ GtkTreeIter iter;
+ BaseInfo *old;
+
+ /* Be sure we have the parent node */
+ ensure_tree_node (model, path, &iter);
+
+ /* Force the canonical relative path name on the node */
+ old = NULL;
+ gtk_tree_model_get (model, &iter,
+ MODEL_COLUMN_INFO, &old,
+ -1);
+ base_info_set_name ((BaseInfo*) node,
+ base_info_get_name (old));
+
+ /* Fill in the new children */
+ set_info (model, &iter, (BaseInfo*) node);
+ }
+}
+
+static void
+info_set_func_text (GtkTreeViewColumn *tree_column,
+ GtkCellRenderer *cell,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ BaseInfo *info;
+ GString *str;
+
+ info = NULL;
+ gtk_tree_model_get (model, iter,
+ MODEL_COLUMN_INFO, &info,
+ -1);
+
+ if (info == NULL)
+ return;
+
+ str = g_string_new (NULL);
+
+ switch (base_info_get_type (info))
+ {
+ case INFO_TYPE_NODE:
+ g_string_append (str, "<i>path</i>");
+ break;
+ case INFO_TYPE_INTERFACE:
+ g_string_append (str, "<i>interface</i>");
+ break;
+ case INFO_TYPE_METHOD:
+ g_string_append (str, "<i>method</i>");
+ break;
+ case INFO_TYPE_SIGNAL:
+ g_string_append (str, "<i>signal</i>");
+ break;
+ case INFO_TYPE_ARG:
+ g_string_append (str, "<i>arg</i>");
+ break;
+ }
+
+ g_string_append (str, " ");
+ g_string_append (str, base_info_get_name (info));
+
+ g_object_set (GTK_CELL_RENDERER (cell),
+ "markup", str->str,
+ NULL);
+
+ g_string_free (str, TRUE);
+
+ /* base_info_unref (info); */
+}
+
+GtkWidget*
+dbus_tree_view_new (void)
+{
+ GtkWidget *treeview;
+ GtkCellRenderer *cell_renderer;
+ GtkTreeViewColumn *column;
+
+ treeview = gtk_tree_view_new ();
+
+ column = gtk_tree_view_column_new ();
+ gtk_tree_view_column_set_title (column, _("Name"));
+
+ cell_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (column,
+ cell_renderer,
+ TRUE);
+ gtk_tree_view_column_set_cell_data_func (column, cell_renderer,
+ info_set_func_text, NULL, NULL);
+
+ gtk_tree_view_append_column (GTK_TREE_VIEW (treeview),
+ column);
+
+ return treeview;
+}
+
+void
+dbus_tree_view_update (GtkTreeView *view,
+ const char **path,
+ NodeInfo *node)
+{
+ GtkTreeModel *model;
+
+ g_return_if_fail (GTK_IS_TREE_VIEW (view));
+
+ model = gtk_tree_view_get_model (view);
+
+ if (model == NULL)
+ {
+ model = model_new ();
+ model_update (model, path, node);
+ gtk_tree_view_set_model (view, model);
+ g_object_unref (G_OBJECT (model));
+ }
+ else
+ {
+ model_update (model, path, node);
+ }
+}
+
+void
+dbus_tree_view_clear (GtkTreeView *view)
+{
+ GtkTreeModel *model;
+
+ g_return_if_fail (GTK_IS_TREE_VIEW (view));
+
+ model = gtk_tree_view_get_model (view);
+
+ if (model != NULL)
+ gtk_tree_store_clear (GTK_TREE_STORE (model));
+}
+
diff --git a/tools/dbus-tree-view.h b/tools/dbus-tree-view.h
new file mode 100644
index 00000000..3377ac88
--- /dev/null
+++ b/tools/dbus-tree-view.h
@@ -0,0 +1,36 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* dbus-tree-view.h GtkTreeView for a D-BUS interface description
+ *
+ * Copyright (C) 2003 Red Hat, Inc.
+ *
+ * Licensed under the Academic Free License version 1.2
+ *
+ * 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
+ *
+ */
+#ifndef DBUS_TREE_VIEW_H
+#define DBUS_TREE_VIEW_H
+
+#include <gtk/gtk.h>
+#include <glib/dbus-glib.h>
+#include <glib/dbus-gidl.h>
+
+GtkWidget* dbus_tree_view_new (void);
+void dbus_tree_view_update (GtkTreeView *view,
+ const char **path,
+ NodeInfo *info);
+void dbus_tree_view_clear (GtkTreeView *view);
+
+#endif /* DBUS_TREE_VIEW_H */
diff --git a/tools/dbus-viewer.c b/tools/dbus-viewer.c
new file mode 100644
index 00000000..561a65af
--- /dev/null
+++ b/tools/dbus-viewer.c
@@ -0,0 +1,320 @@
+/* -*- mode: C; c-file-style: "gnu" -*- */
+/* dbus-viewer.c Graphical D-BUS frontend utility
+ *
+ * Copyright (C) 2003 Red Hat, Inc.
+ *
+ * Licensed under the Academic Free License version 1.2
+ *
+ * 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 <config.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include "dbus-tree-view.h"
+#include <glib/dbus-gparser.h>
+#include <glib/dbus-gutils.h>
+
+#include <libintl.h>
+#define _(x) dgettext (GETTEXT_PACKAGE, x)
+#define N_(x) x
+
+typedef struct
+{
+ int refcount;
+ char *name;
+
+} ServiceData;
+
+static ServiceData*
+service_data_new (const char *name)
+{
+ ServiceData *sd;
+
+ sd = g_new0 (ServiceData, 1);
+
+ sd->refcount = 1;
+ sd->name = g_strdup (name);
+
+ return sd;
+}
+
+static void
+service_data_ref (ServiceData *sd)
+{
+ sd->refcount += 1;
+}
+
+static void
+service_data_unref (ServiceData *sd)
+{
+ sd->refcount -= 1;
+ if (sd->refcount == 0)
+ {
+ g_free (sd->name);
+ g_free (sd);
+ }
+}
+
+typedef struct
+{
+ GtkWidget *window;
+ GtkWidget *treeview;
+ GtkWidget *service_menu;
+
+ GSList *services;
+
+} TreeWindow;
+
+static void
+window_closed_callback (GtkWidget *window,
+ TreeWindow *w)
+{
+ g_assert (window == w->window);
+ w->window = NULL;
+ gtk_main_quit ();
+}
+
+static TreeWindow*
+tree_window_new (void)
+{
+ TreeWindow *w;
+ GtkWidget *sw;
+ GtkWidget *vbox;
+ GtkWidget *hbox;
+
+ /* Should use glade, blah */
+
+ w = g_new0 (TreeWindow, 1);
+ w->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+ gtk_window_set_title (GTK_WINDOW (w->window), "D-BUS Viewer");
+ gtk_window_set_default_size (GTK_WINDOW (w->window), 400, 500);
+
+ g_signal_connect (w->window, "destroy", G_CALLBACK (window_closed_callback),
+ w);
+ gtk_container_set_border_width (GTK_CONTAINER (w->window), 6);
+
+ vbox = gtk_vbox_new (FALSE, 6);
+ gtk_container_add (GTK_CONTAINER (w->window), vbox);
+
+ hbox = gtk_hbox_new (FALSE, 6);
+ gtk_container_add (GTK_CONTAINER (vbox), hbox);
+
+ /* Create tree view */
+
+ sw = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
+
+ gtk_box_pack_start (GTK_BOX (hbox), sw, TRUE, TRUE, 0);
+
+ w->treeview = dbus_tree_view_new ();
+
+ gtk_container_add (GTK_CONTAINER (sw), w->treeview);
+
+ /* Create services option menu */
+
+
+
+ /* Show everything */
+ gtk_widget_show_all (w->window);
+
+ return w;
+}
+
+static void
+show_error_dialog (GtkWindow *transient_parent,
+ GtkWidget **weak_ptr,
+ const char *message_format,
+ ...)
+{
+ char *message;
+ va_list args;
+
+ if (message_format)
+ {
+ va_start (args, message_format);
+ message = g_strdup_vprintf (message_format, args);
+ va_end (args);
+ }
+ else
+ message = NULL;
+
+ if (weak_ptr == NULL || *weak_ptr == NULL)
+ {
+ GtkWidget *dialog;
+ dialog = gtk_message_dialog_new (transient_parent,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ message);
+
+ g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL);
+
+ if (weak_ptr != NULL)
+ {
+ *weak_ptr = dialog;
+ g_object_add_weak_pointer (G_OBJECT (dialog), (void**)weak_ptr);
+ }
+
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+ gtk_widget_show_all (dialog);
+ }
+ else
+ {
+ g_return_if_fail (GTK_IS_MESSAGE_DIALOG (*weak_ptr));
+
+ gtk_label_set_text (GTK_LABEL (GTK_MESSAGE_DIALOG (*weak_ptr)->label), message);
+
+ gtk_window_present (GTK_WINDOW (*weak_ptr));
+ }
+}
+
+static void
+usage (int ecode)
+{
+ fprintf (stderr, "dbus-viewer [--version] [--help]\n");
+ exit (ecode);
+}
+
+static void
+version (void)
+{
+ printf ("D-BUS Message Bus Viewer %s\n"
+ "Copyright (C) 2003 Red Hat, Inc.\n"
+ "This is free software; see the source for copying conditions.\n"
+ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n",
+ VERSION);
+ exit (0);
+}
+
+int
+main (int argc, char **argv)
+{
+ const char *prev_arg;
+ int i;
+ GSList *files;
+ gboolean end_of_args;
+ GSList *tmp;
+
+ bindtextdomain (GETTEXT_PACKAGE, DBUS_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
+ gtk_init (&argc, &argv);
+
+ end_of_args = FALSE;
+ files = NULL;
+ prev_arg = NULL;
+ i = 1;
+ while (i < argc)
+ {
+ const char *arg = argv[i];
+
+ if (!end_of_args)
+ {
+ if (strcmp (arg, "--help") == 0 ||
+ strcmp (arg, "-h") == 0 ||
+ strcmp (arg, "-?") == 0)
+ usage (0);
+ else if (strcmp (arg, "--version") == 0)
+ version ();
+ else if (arg[0] == '-' &&
+ arg[1] == '-' &&
+ arg[2] == '\0')
+ end_of_args = TRUE;
+ else if (arg[0] == '-')
+ {
+ usage (1);
+ }
+ else
+ {
+ files = g_slist_prepend (files, (char*) arg);
+ }
+ }
+ else
+ files = g_slist_prepend (files, (char*) arg);
+
+ prev_arg = arg;
+
+ ++i;
+ }
+
+ files = g_slist_reverse (files);
+
+ tmp = files;
+ while (tmp != NULL)
+ {
+ NodeInfo *node;
+ GError *error;
+ const char *filename;
+
+ filename = tmp->data;
+
+ error = NULL;
+ node = description_load_from_file (filename,
+ &error);
+ if (node == NULL)
+ {
+ g_assert (error != NULL);
+ show_error_dialog (NULL, NULL,
+ _("Unable to load \"%s\": %s\n"),
+ filename, error->message);
+ g_error_free (error);
+ }
+ else
+ {
+ TreeWindow *w;
+ char **path;
+ const char *name;
+
+ name = node_info_get_name (node);
+ if (name == NULL ||
+ name[0] != '/')
+ {
+ g_printerr (_("Assuming root node of \"%s\" is at path /, since no absolute path is specified"), filename);
+ name = "/";
+ }
+
+ path = _dbus_gutils_split_path (name);
+
+ w = tree_window_new ();
+ dbus_tree_view_update (GTK_TREE_VIEW (w->treeview),
+ (const char**) path,
+ node);
+ node_info_unref (node);
+
+ g_strfreev (path);
+ }
+
+ tmp = tmp->next;
+ }
+
+ gtk_main ();
+
+ return 0;
+}
+
+
+
+
+
+