
2003-10-01 Not Zed <NotZed@Ximian.com> * em-format-html.c (efh_init): turn off blocking writes. (efh_format_timeout): don't do a htmlbegin on the page yet, it'll be handled by em-html-stream when it has data, to reduce flicker. (efh_format_do): close the main gtkhtml stream as soon as we're done writing the body. any sub-jobs should be using frames etc. (efh_text_plain): dont write a table around the text, try to reduce flickering. layout may be out now though. * em-html-stream.c (emhs_sync_write): if we have no html_stream yet, begin a new one. svn path=/trunk/; revision=22784
172 lines
4.4 KiB
C
172 lines
4.4 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
|
|
/*
|
|
* Authors: Jeffrey Stedfast <fejj@ximian.com>
|
|
* Michael Zucchi <notzed@ximian.com>
|
|
*
|
|
* Copyright 2003 Ximian, Inc. (www.ximian.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of version 2 of the GNU General Public
|
|
* License as published by the Free Software Foundation.
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <gtkhtml/gtkhtml.h>
|
|
#include <gtkhtml/gtkhtml-stream.h>
|
|
#include <gtk/gtkmain.h>
|
|
#include "em-html-stream.h"
|
|
|
|
#define d(x)
|
|
|
|
static void em_html_stream_class_init (EMHTMLStreamClass *klass);
|
|
static void em_html_stream_init (CamelObject *object);
|
|
static void em_html_stream_finalize (CamelObject *object);
|
|
|
|
static ssize_t emhs_sync_write(CamelStream *stream, const char *buffer, size_t n);
|
|
static int emhs_sync_close(CamelStream *stream);
|
|
static int emhs_sync_flush(CamelStream *stream);
|
|
|
|
static EMSyncStreamClass *parent_class = NULL;
|
|
|
|
CamelType
|
|
em_html_stream_get_type (void)
|
|
{
|
|
static CamelType type = CAMEL_INVALID_TYPE;
|
|
|
|
if (type == CAMEL_INVALID_TYPE) {
|
|
parent_class = (EMSyncStreamClass *)em_sync_stream_get_type();
|
|
type = camel_type_register (em_sync_stream_get_type(),
|
|
"EMHTMLStream",
|
|
sizeof (EMHTMLStream),
|
|
sizeof (EMHTMLStreamClass),
|
|
(CamelObjectClassInitFunc) em_html_stream_class_init,
|
|
NULL,
|
|
(CamelObjectInitFunc) em_html_stream_init,
|
|
(CamelObjectFinalizeFunc) em_html_stream_finalize);
|
|
}
|
|
|
|
return type;
|
|
}
|
|
|
|
static void
|
|
em_html_stream_class_init (EMHTMLStreamClass *klass)
|
|
{
|
|
((EMSyncStreamClass *)klass)->sync_write = emhs_sync_write;
|
|
((EMSyncStreamClass *)klass)->sync_flush = emhs_sync_flush;
|
|
((EMSyncStreamClass *)klass)->sync_close = emhs_sync_close;
|
|
}
|
|
|
|
static void
|
|
em_html_stream_init (CamelObject *object)
|
|
{
|
|
/*EMHTMLStream *emhs = (EMHTMLStream *)object;*/
|
|
}
|
|
|
|
static void
|
|
emhs_cleanup(EMHTMLStream *emhs)
|
|
{
|
|
emhs->html_stream = NULL;
|
|
emhs->sync.cancel = TRUE;
|
|
g_signal_handler_disconnect(emhs->html, emhs->destroy_id);
|
|
g_object_unref(emhs->html);
|
|
emhs->html = NULL;
|
|
}
|
|
|
|
static void
|
|
em_html_stream_finalize (CamelObject *object)
|
|
{
|
|
EMHTMLStream *emhs = (EMHTMLStream *)object;
|
|
|
|
d(printf("%p: finalising stream\n", object));
|
|
if (emhs->html_stream) {
|
|
d(printf("%p: html stream still open - error\n", object));
|
|
/* set 'in finalise' flag */
|
|
camel_stream_close((CamelStream *)emhs);
|
|
}
|
|
}
|
|
|
|
static ssize_t
|
|
emhs_sync_write(CamelStream *stream, const char *buffer, size_t n)
|
|
{
|
|
EMHTMLStream *emhs = EM_HTML_STREAM (stream);
|
|
|
|
if (emhs->html == NULL)
|
|
return -1;
|
|
|
|
if (emhs->html_stream == NULL)
|
|
emhs->html_stream = gtk_html_begin(emhs->html);
|
|
|
|
gtk_html_stream_write(emhs->html_stream, buffer, n);
|
|
|
|
return (ssize_t) n;
|
|
}
|
|
|
|
static int
|
|
emhs_sync_flush(CamelStream *stream)
|
|
{
|
|
EMHTMLStream *emhs = (EMHTMLStream *)stream;
|
|
|
|
if (emhs->html_stream == NULL)
|
|
return -1;
|
|
|
|
/* FIXME: flush html stream via gtkhtml_stream_flush which doens't exist yet ... */
|
|
while (gtk_events_pending ())
|
|
gtk_main_iteration ();
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
emhs_sync_close(CamelStream *stream)
|
|
{
|
|
EMHTMLStream *emhs = (EMHTMLStream *)stream;
|
|
|
|
if (emhs->html_stream == NULL)
|
|
return -1;
|
|
|
|
gtk_html_stream_close(emhs->html_stream, GTK_HTML_STREAM_OK);
|
|
emhs_cleanup(emhs);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
emhs_gtkhtml_destroy(struct _GtkHTML *html, EMHTMLStream *emhs)
|
|
{
|
|
d(printf("%p: emhs gtkhtml destroy\n", emhs));
|
|
emhs_cleanup(emhs);
|
|
}
|
|
|
|
/* TODO: Could pass NULL for html_stream, and do a gtk_html_begin
|
|
on first data -> less flashing */
|
|
CamelStream *
|
|
em_html_stream_new(struct _GtkHTML *html, struct _GtkHTMLStream *html_stream)
|
|
{
|
|
EMHTMLStream *new;
|
|
|
|
new = EM_HTML_STREAM (camel_object_new (EM_HTML_STREAM_TYPE));
|
|
new->html_stream = html_stream;
|
|
new->html = html;
|
|
g_object_ref(html);
|
|
new->destroy_id = g_signal_connect(html, "destroy", G_CALLBACK(emhs_gtkhtml_destroy), new);
|
|
|
|
em_sync_stream_set_buffer_size(&new->sync, 8192);
|
|
|
|
return (CamelStream *)new;
|
|
}
|