[glade] Adding missing files from Marco's patch.
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] Adding missing files from Marco's patch.
- Date: Wed, 9 Feb 2011 18:59:43 +0000 (UTC)
commit 6c6f14fe8fcc7ab8cfd9df4dcf847b1be7be2be9
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Thu Feb 10 04:07:54 2011 +0900
Adding missing files from Marco's patch.
gladeui/glade-preview-tokens.h | 11 ++
gladeui/glade-preview.c | 342 ++++++++++++++++++++++++++++++++++++++++
gladeui/glade-preview.h | 62 +++++++
3 files changed, 415 insertions(+), 0 deletions(-)
---
diff --git a/gladeui/glade-preview-tokens.h b/gladeui/glade-preview-tokens.h
new file mode 100644
index 0000000..f131a8e
--- /dev/null
+++ b/gladeui/glade-preview-tokens.h
@@ -0,0 +1,11 @@
+#ifndef __GLADE_PREVIEW_TOKENS_H__
+#define __GLADE_PREVIEW_TOKENS_H__
+
+#define UPDATE_TOKEN "<update>\n"
+#define UPDATE_TOKEN_SIZE strlen (UPDATE_TOKEN)
+
+#define QUIT_TOKEN "<quit>\n"
+#define QUIT_TOKEN_SIZE strlen (QUIT_TOKEN)
+
+#endif /* __GLADE_PREVIEW_TOKENS_H__ */
+
diff --git a/gladeui/glade-preview.c b/gladeui/glade-preview.c
new file mode 100644
index 0000000..4a1bbd3
--- /dev/null
+++ b/gladeui/glade-preview.c
@@ -0,0 +1,342 @@
+/*
+ * Copyright (C) 2010 Marco Diego Aurélio Mesquita
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Marco Diego Aurélio Mesquita <marcodiegomesquita gmail com>
+ */
+
+#include <config.h>
+
+/**
+ * SECTION:glade-preview
+ * @Short_Description: The glade preview launch/kill interface.
+ *
+ * This object owns all data that is needed to keep a preview. It stores
+ * the GIOChannel used for comunnication between glade and glade-previewer,
+ * the event source id for a watch (in the case a watch is used to monitor
+ * the communication channel), the previewed widget and the pid of the
+ * corresponding glade-previewer.
+ *
+ */
+
+
+#include <string.h>
+#include <stdlib.h>
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+#include <glib/gstdio.h>
+
+#include "glade.h"
+#include "glade-preview.h"
+#include "glade-project.h"
+#include "glade-app.h"
+
+#include "glade-preview-tokens.h"
+
+/* Private data for glade-preview */
+struct _GladePreviewPrivate
+{
+ GIOChannel *channel; /* Channel user for communication between glade and glade-previewer */
+ guint watch; /* Event source id used to monitor the channel */
+ GladeWidget *previewed_widget;
+ GPid pid; /* Pid of the corresponding glade-previewer process */
+};
+
+G_DEFINE_TYPE (GladePreview, glade_preview, G_TYPE_OBJECT);
+
+#define GLADE_PREVIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GLADE_TYPE_PREVIEW, GladePreviewPrivate))
+
+enum
+{
+ PREVIEW_EXITS,
+ LAST_SIGNAL
+};
+
+static guint glade_preview_signals[LAST_SIGNAL] = { 0 };
+
+/**
+ * glade_preview_kill
+ * @preview: a #GladePreview that will be killed.
+ *
+ * Uses the communication channel and protocol to send the "<quit>" token to the
+ * glade-previewer telling it to commit suicide.
+ *
+ */
+static void
+glade_preview_kill (GladePreview * preview)
+{
+ const gchar *quit = QUIT_TOKEN;
+ GIOChannel *channel;
+ GError *error = NULL;
+ gsize size;
+
+ channel = preview->priv->channel;
+ g_io_channel_write_chars (channel, quit, strlen (quit), &size, &error);
+
+ if (size != strlen (quit) && error != NULL)
+ {
+ g_printerr ("Error passing quit signal trough pipe: %s", error->message);
+ g_error_free (error);
+ }
+
+ g_io_channel_flush (channel, &error);
+ if (error != NULL)
+ {
+ g_printerr ("Error flushing channel: %s", error->message);
+ g_error_free (error);
+ }
+
+ g_io_channel_shutdown (channel, TRUE, &error);
+ if (error != NULL)
+ {
+ g_printerr ("Error shutting down channel: %s", error->message);
+ g_error_free (error);
+ }
+}
+
+static void
+glade_preview_dispose (GObject * gobject)
+{
+ GladePreview *self = GLADE_PREVIEW (gobject);
+
+ if (self->priv->watch)
+ {
+ g_source_remove (self->priv->watch);
+ glade_preview_kill (self);
+ }
+
+ if (self->priv->channel)
+ {
+ g_io_channel_unref (self->priv->channel);
+ self->priv->channel = NULL;
+ }
+
+ G_OBJECT_CLASS (glade_preview_parent_class)->dispose (gobject);
+}
+
+/* We have to use finalize because of the signal that is sent in dispose */
+static void
+glade_preview_finalize (GObject * gobject)
+{
+ G_OBJECT_CLASS (glade_preview_parent_class)->finalize (gobject);
+}
+
+static void
+glade_preview_class_init (GladePreviewClass * klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+ gobject_class->dispose = glade_preview_dispose;
+ gobject_class->finalize = glade_preview_finalize;
+
+ /**
+ * GladePreview::exits:
+ * @gladepreview: the #GladePreview which received the signal.
+ * @gladeproject: the #GladeProject associated with the preview.
+ *
+ * Emitted when @preview exits.
+ */
+ glade_preview_signals[PREVIEW_EXITS] =
+ g_signal_new ("exits",
+ G_TYPE_FROM_CLASS (gobject_class),
+ G_SIGNAL_RUN_FIRST,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+
+ g_type_class_add_private (klass, sizeof (GladePreviewPrivate));
+}
+
+static void
+glade_preview_init (GladePreview * self)
+{
+ GladePreviewPrivate *priv;
+
+ self->priv = priv = GLADE_PREVIEW_GET_PRIVATE (self);
+ priv->channel = NULL;
+}
+
+static void
+glade_preview_internal_watch (GPid pid, gint status, gpointer data)
+{
+ GladePreview *preview = GLADE_PREVIEW (data);
+
+ preview->priv->watch = 0;
+
+ /* This means a preview exited. We'll now signal it */
+ g_signal_emit (preview, glade_preview_signals[PREVIEW_EXITS], 0);
+}
+
+/**
+ * glade_preview_launch:
+ * @widget: Pointer to a local instance of the widget that will be previewed.
+ * @buffer: Contents of an xml definition of the interface which will be previewed
+ *
+ * Creates a new #GladePreview and launches glade-previewer to preview it.
+ *
+ * Returns: a new #GladePreview or NULL if launch fails.
+ *
+ */
+GladePreview *
+glade_preview_launch (GladeWidget * widget,
+ const gchar * buffer)
+{
+ GPid pid;
+ GError *error = NULL;
+ gchar *argv[4];
+ gint child_stdin;
+ gsize bytes_written;
+ GIOChannel *output;
+ GladePreview *preview = NULL;
+
+ g_return_val_if_fail (GLADE_IS_WIDGET (widget), NULL);
+
+#ifdef WINDOWS
+ argv[0] =
+ g_build_filename (glade_app_get_bin_dir (), "glade-previewer.exe", NULL);
+#else
+ argv[0] =
+ g_build_filename (glade_app_get_bin_dir (), "glade-previewer", NULL);
+#endif
+
+ argv[1] = "--listen";
+ argv[2] = g_strdup_printf ("--toplevel=%s", glade_widget_get_name (widget));
+ argv[3] = NULL;
+
+ if (g_spawn_async_with_pipes (NULL,
+ argv,
+ NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL,
+ &pid, &child_stdin, NULL, NULL,
+ &error) == FALSE)
+ {
+ g_printerr (_("Error launching previewer: %s\n"), error->message);
+ glade_util_ui_message (glade_app_get_window (),
+ GLADE_UI_ERROR, NULL,
+ _("Failed to launch preview: %s.\n"),
+ error->message);
+ g_error_free (error);
+ goto end;
+ }
+
+#ifdef WINDOWS
+ output = g_io_channel_win32_new_fd (child_stdin);
+#else
+ output = g_io_channel_unix_new (child_stdin);
+#endif
+
+ g_io_channel_write_chars (output, buffer, strlen (buffer), &bytes_written,
+ &error);
+
+ if (bytes_written != strlen (buffer) && error != NULL)
+ {
+ g_printerr ("Error passing UI trough pipe: %s", error->message);
+ g_error_free (error);
+ }
+
+ g_io_channel_flush (output, &error);
+ if (error != NULL)
+ {
+ g_printerr ("Error flushing UI trough pipe: %s", error->message);
+ g_error_free (error);
+ }
+
+ if (widget != NULL)
+ g_free (argv[2]);
+
+ /* Setting up preview data */
+ preview = g_object_new (GLADE_TYPE_PREVIEW, NULL);
+ preview->priv->channel = output;
+ preview->priv->previewed_widget = widget;
+ preview->priv->pid = pid;
+
+ preview->priv->watch =
+ g_child_watch_add (preview->priv->pid,
+ glade_preview_internal_watch,
+ preview);
+
+end:
+ g_free (argv[0]);
+
+ return preview;
+}
+
+void
+glade_preview_update (GladePreview *preview,
+ const gchar *buffer)
+{
+ const gchar *update_token = UPDATE_TOKEN;
+ gchar *update;
+ GIOChannel *channel;
+ GError *error = NULL;
+ gsize size;
+ gsize bytes_written;
+ GladeWidget *gwidget;
+
+ g_return_if_fail (GLADE_IS_PREVIEW (preview));
+ g_return_if_fail (buffer && buffer[0]);
+
+ gwidget = glade_preview_get_widget (preview);
+
+ update = g_strdup_printf ("%s%s\n", update_token,
+ glade_widget_get_name (gwidget));
+
+ channel = preview->priv->channel;
+ g_io_channel_write_chars (channel, update, strlen (update), &size, &error);
+
+ if (size != strlen (update) && error != NULL)
+ {
+ g_printerr ("Error passing quit signal trough pipe: %s", error->message);
+ g_error_free (error);
+ }
+
+ g_io_channel_flush (channel, &error);
+ if (error != NULL)
+ {
+ g_printerr ("Error flushing channel: %s", error->message);
+ g_error_free (error);
+ }
+
+ /* We'll now send the interface: */
+ g_io_channel_write_chars (channel, buffer, strlen (buffer), &bytes_written,
+ &error);
+
+ if (bytes_written != strlen (buffer) && error != NULL)
+ {
+ g_printerr ("Error passing UI trough pipe: %s", error->message);
+ g_error_free (error);
+ }
+
+ g_io_channel_flush (channel, &error);
+ if (error != NULL)
+ {
+ g_printerr ("Error flushing UI trough pipe: %s", error->message);
+ g_error_free (error);
+ }
+
+ g_free (update);
+}
+
+GladeWidget *
+glade_preview_get_widget (GladePreview * preview)
+{
+ return preview->priv->previewed_widget;
+}
+
+GPid
+glade_preview_get_pid (GladePreview * preview)
+{
+ return preview->priv->pid;
+}
diff --git a/gladeui/glade-preview.h b/gladeui/glade-preview.h
new file mode 100644
index 0000000..fae0195
--- /dev/null
+++ b/gladeui/glade-preview.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2010 Marco Diego Aurélio Mesquita
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Authors:
+ * Marco Diego Aurélio Mesquita <marcodiegomesquita gmail com>
+ */
+
+#ifndef _GLADE_PREVIEW_H_
+#define _GLADE_PREVIEW_H_
+
+#include <glib-object.h>
+#include <glib.h>
+#include <glib/gstdio.h>
+
+G_BEGIN_DECLS
+#define GLADE_TYPE_PREVIEW (glade_preview_get_type ())
+#define GLADE_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GLADE_TYPE_PREVIEW, GladePreview))
+#define GLADE_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GLADE_TYPE_PREVIEW, GladePreviewClass))
+#define GLADE_IS_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GLADE_TYPE_PREVIEW))
+#define GLADE_IS_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GLADE_TYPE_PREVIEW))
+#define GLADE_PREVIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GLADE_TYPE_PREVIEW, GladePreviewClass))
+typedef struct _GladePreview GladePreview;
+typedef struct _GladePreviewClass GladePreviewClass;
+typedef struct _GladePreviewPrivate GladePreviewPrivate;
+
+struct _GladePreview
+{
+ GObject parent_instance;
+
+ GladePreviewPrivate *priv;
+};
+
+struct _GladePreviewClass
+{
+ GObjectClass parent_class;
+};
+
+GType glade_preview_get_type (void) G_GNUC_CONST;
+GladePreview *glade_preview_launch (GladeWidget *widget,
+ const gchar *buffer);
+void glade_preview_update (GladePreview *preview,
+ const gchar *buffer);
+GladeWidget *glade_preview_get_widget (GladePreview *preview);
+GPid glade_preview_get_pid (GladePreview *preview);
+
+G_END_DECLS
+
+#endif /* _GLADE_PREVIEW_H_ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]