[gtkhtml] Coding style and whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkhtml] Coding style and whitespace cleanup.
- Date: Sun, 4 Sep 2011 11:48:08 +0000 (UTC)
commit 4869202d427d52854ee280b9656ee6af3b5a7b5b
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Aug 22 22:35:59 2011 -0400
Coding style and whitespace cleanup.
a11y/cell.c | 5 +-
a11y/cell.h | 2 +-
a11y/factory.c | 2 +-
a11y/html.c | 40 +-
a11y/hyperlink.c | 16 +-
a11y/image.c | 14 +-
a11y/image.h | 2 +-
a11y/object.c | 29 +-
a11y/object.h | 2 +-
a11y/paragraph.c | 3 +-
a11y/paragraph.h | 2 +-
a11y/table.c | 121 +++--
a11y/table.h | 2 +-
a11y/text.c | 164 ++++--
a11y/text.h | 2 +-
a11y/utils.c | 6 +-
components/editor/gtkhtml-color-combo.c | 8 +-
components/editor/gtkhtml-color-swatch.c | 3 +-
components/editor/gtkhtml-editor-actions.c | 2 +-
components/editor/gtkhtml-editor-private.c | 2 +-
components/editor/gtkhtml-editor.c | 7 +-
components/editor/gtkhtml-spell-language.c | 10 +-
components/editor/main.c | 3 +-
gtkhtml/dllmain.c | 4 +-
gtkhtml/gtkhtml-embedded.c | 46 +-
gtkhtml/gtkhtml-embedded.h | 2 +-
gtkhtml/gtkhtml-enums.h | 38 +-
gtkhtml/gtkhtml-keybinding.h | 38 +-
gtkhtml/gtkhtml-private.h | 34 +-
gtkhtml/gtkhtml-properties.c | 38 +-
gtkhtml/gtkhtml-properties.h | 36 +-
gtkhtml/gtkhtml-search.c | 69 ++-
gtkhtml/gtkhtml-search.h | 36 +-
gtkhtml/gtkhtml-stream.c | 73 ++--
gtkhtml/gtkhtml-stream.h | 34 +-
gtkhtml/gtkhtml-types.h | 36 +-
gtkhtml/gtkhtml.c | 744 +++++++++++++++----------
gtkhtml/gtkhtml.h | 36 +-
gtkhtml/gtkhtmldebug.c | 59 +-
gtkhtml/gtkhtmldebug.h | 34 +-
gtkhtml/gtkhtmlfontstyle.c | 36 +-
gtkhtml/gtkhtmlfontstyle.h | 34 +-
gtkhtml/htmlanchor.c | 64 ++-
gtkhtml/htmlanchor.h | 38 +-
gtkhtml/htmlbutton.c | 56 +-
gtkhtml/htmlbutton.h | 34 +-
gtkhtml/htmlcheckbox.c | 57 +-
gtkhtml/htmlcheckbox.h | 34 +-
gtkhtml/htmlclue.c | 234 +++++---
gtkhtml/htmlclue.h | 34 +-
gtkhtml/htmlcluealigned.c | 62 ++-
gtkhtml/htmlcluealigned.h | 34 +-
gtkhtml/htmlclueflow.c | 470 +++++++++++-----
gtkhtml/htmlclueflow.h | 40 +-
gtkhtml/htmlclueh.c | 61 ++-
gtkhtml/htmlclueh.h | 34 +-
gtkhtml/htmlcluev.c | 171 ++++--
gtkhtml/htmlcluev.h | 34 +-
gtkhtml/htmlcolor.c | 55 +-
gtkhtml/htmlcolor.h | 36 +-
gtkhtml/htmlcolorset.c | 61 ++-
gtkhtml/htmlcolorset.h | 36 +-
gtkhtml/htmlcursor.c | 197 ++++---
gtkhtml/htmlcursor.h | 38 +-
gtkhtml/htmldrawqueue.c | 61 +-
gtkhtml/htmldrawqueue.h | 32 +-
gtkhtml/htmlembedded.c | 97 ++--
gtkhtml/htmlembedded.h | 34 +-
gtkhtml/htmlengine-edit-clueflowstyle.c | 117 ++--
gtkhtml/htmlengine-edit-clueflowstyle.h | 34 +-
gtkhtml/htmlengine-edit-cursor.c | 69 ++-
gtkhtml/htmlengine-edit-cursor.h | 34 +-
gtkhtml/htmlengine-edit-cut-and-paste.c | 319 ++++++++---
gtkhtml/htmlengine-edit-cut-and-paste.h | 38 +-
gtkhtml/htmlengine-edit-fontstyle.c | 88 ++--
gtkhtml/htmlengine-edit-fontstyle.h | 34 +-
gtkhtml/htmlengine-edit-images.c | 62 +-
gtkhtml/htmlengine-edit-images.h | 34 +-
gtkhtml/htmlengine-edit-movement.c | 53 +-
gtkhtml/htmlengine-edit-movement.h | 34 +-
gtkhtml/htmlengine-edit-rule.c | 71 ++-
gtkhtml/htmlengine-edit-rule.h | 34 +-
gtkhtml/htmlengine-edit-selection-updater.c | 38 +-
gtkhtml/htmlengine-edit-selection-updater.h | 34 +-
gtkhtml/htmlengine-edit-table.c | 272 +++++++---
gtkhtml/htmlengine-edit-table.h | 38 +-
gtkhtml/htmlengine-edit-tablecell.c | 230 ++++++---
gtkhtml/htmlengine-edit-tablecell.h | 36 +-
gtkhtml/htmlengine-edit-text.c | 48 +-
gtkhtml/htmlengine-edit-text.h | 34 +-
gtkhtml/htmlengine-edit.c | 91 ++--
gtkhtml/htmlengine-edit.h | 34 +-
gtkhtml/htmlengine-print.c | 125 ++--
gtkhtml/htmlengine-print.h | 34 +-
gtkhtml/htmlengine-save.c | 101 ++--
gtkhtml/htmlengine-save.h | 52 +-
gtkhtml/htmlengine-search.c | 56 +-
gtkhtml/htmlengine-search.h | 34 +-
gtkhtml/htmlengine.c | 812 ++++++++++++++++++---------
gtkhtml/htmlengine.h | 62 +-
gtkhtml/htmlentity.c | 9 +-
gtkhtml/htmlenums.h | 50 +-
gtkhtml/htmlenumutils.c | 38 +-
gtkhtml/htmlenumutils.h | 38 +-
gtkhtml/htmlfontmanager.c | 137 +++--
gtkhtml/htmlfontmanager.h | 34 +-
gtkhtml/htmlform.c | 60 ++-
gtkhtml/htmlform.h | 32 +-
gtkhtml/htmlframe.c | 168 ++++---
gtkhtml/htmlframe.h | 34 +-
gtkhtml/htmlframeset.c | 90 ++--
gtkhtml/htmlframeset.h | 34 +-
gtkhtml/htmlgdkpainter.c | 225 +++++---
gtkhtml/htmlgdkpainter.h | 34 +-
gtkhtml/htmlhidden.c | 37 +-
gtkhtml/htmlhidden.h | 34 +-
gtkhtml/htmliframe.c | 171 ++++---
gtkhtml/htmliframe.h | 34 +-
gtkhtml/htmlimage.c | 280 ++++++----
gtkhtml/htmlimage.h | 38 +-
gtkhtml/htmlimageinput.c | 71 ++-
gtkhtml/htmlimageinput.h | 34 +-
gtkhtml/htmlinterval.c | 133 +++--
gtkhtml/htmlinterval.h | 36 +-
gtkhtml/htmllist.c | 34 +-
gtkhtml/htmllist.h | 34 +-
gtkhtml/htmlmap.c | 41 +-
gtkhtml/htmlmap.h | 34 +-
gtkhtml/htmlmarshal.c | 132 +++---
gtkhtml/htmlobject.c | 716 ++++++++++++++++--------
gtkhtml/htmlobject.h | 82 ++--
gtkhtml/htmlpainter.c | 302 +++++++----
gtkhtml/htmlpainter.h | 38 +-
gtkhtml/htmlplainpainter.c | 95 ++--
gtkhtml/htmlplainpainter.h | 34 +-
gtkhtml/htmlprinter.c | 161 ++++--
gtkhtml/htmlprinter.h | 36 +-
gtkhtml/htmlradio.c | 61 +-
gtkhtml/htmlradio.h | 34 +-
gtkhtml/htmlreplace.c | 43 +-
gtkhtml/htmlreplace.h | 36 +-
gtkhtml/htmlrule.c | 97 ++--
gtkhtml/htmlrule.h | 34 +-
gtkhtml/htmlsearch.c | 21 +-
gtkhtml/htmlsearch.h | 36 +-
gtkhtml/htmlselect.c | 48 +-
gtkhtml/htmlselect.h | 34 +-
gtkhtml/htmlselection.c | 90 ++--
gtkhtml/htmlselection.h | 34 +-
gtkhtml/htmlsettings.c | 46 +-
gtkhtml/htmlsettings.h | 38 +-
gtkhtml/htmlshape.c | 121 +++--
gtkhtml/htmlshape.h | 34 +-
gtkhtml/htmlstack.c | 40 +-
gtkhtml/htmlstack.h | 34 +-
gtkhtml/htmlstringtokenizer.c | 42 +-
gtkhtml/htmlstringtokenizer.h | 38 +-
gtkhtml/htmlstyle.c | 155 +++---
gtkhtml/htmlstyle.h | 34 +-
gtkhtml/htmltable.c | 441 ++++++++++-----
gtkhtml/htmltable.h | 34 +-
gtkhtml/htmltablecell.c | 133 +++--
gtkhtml/htmltablecell.h | 38 +-
gtkhtml/htmltablepriv.h | 36 +-
gtkhtml/htmltext.c | 776 ++++++++++++++++++--------
gtkhtml/htmltext.h | 38 +-
gtkhtml/htmltextarea.c | 57 +-
gtkhtml/htmltextarea.h | 34 +-
gtkhtml/htmltextinput.c | 69 ++--
gtkhtml/htmltextinput.h | 34 +-
gtkhtml/htmltextslave.c | 299 +++++++---
gtkhtml/htmltextslave.h | 34 +-
gtkhtml/htmltokenizer.c | 157 +++--
gtkhtml/htmltokenizer.h | 40 +-
gtkhtml/htmltype.c | 40 +-
gtkhtml/htmltype.h | 38 +-
gtkhtml/htmltypes.h | 36 +-
gtkhtml/htmlundo-action.c | 41 +-
gtkhtml/htmlundo-action.h | 34 +-
gtkhtml/htmlundo.c | 134 +++--
gtkhtml/htmlundo.h | 34 +-
gtkhtml/htmlurl.c | 61 ++-
gtkhtml/htmlurl.h | 38 +-
gtkhtml/test-stress.c | 25 +-
gtkhtml/test-suite.c | 5 +-
gtkhtml/test.c | 66 ++-
gtkhtml/testgtkhtml.c | 190 ++++---
187 files changed, 8912 insertions(+), 5920 deletions(-)
---
diff --git a/a11y/cell.c b/a11y/cell.c
index 6ed9f3b..8921b9b 100644
--- a/a11y/cell.c
+++ b/a11y/cell.c
@@ -65,7 +65,8 @@ html_a11y_cell_finalize (GObject *obj)
}
static void
-html_a11y_cell_initialize (AtkObject *obj, gpointer data)
+html_a11y_cell_initialize (AtkObject *obj,
+ gpointer data)
{
/* printf ("html_a11y_cell_initialize\n"); */
@@ -90,7 +91,7 @@ html_a11y_cell_init (HTMLA11YCell *a11y_cell)
{
}
-AtkObject*
+AtkObject *
html_a11y_cell_new (HTMLObject *html_obj)
{
GObject *object;
diff --git a/a11y/cell.h b/a11y/cell.h
index f43df4f..82d9925 100644
--- a/a11y/cell.h
+++ b/a11y/cell.h
@@ -51,6 +51,6 @@ struct _HTMLA11YCellClass {
HTMLA11YClass parent_class;
};
-AtkObject* html_a11y_cell_new (HTMLObject *o);
+AtkObject * html_a11y_cell_new (HTMLObject *o);
#endif
diff --git a/a11y/factory.c b/a11y/factory.c
index b051c75..4604d95 100644
--- a/a11y/factory.c
+++ b/a11y/factory.c
@@ -10,7 +10,7 @@ gtk_html_a11y_factory_get_accessible_type (void)
return G_TYPE_GTK_HTML_A11Y;
}
-static AtkObject*
+static AtkObject *
gtk_html_a11y_factory_create_accessible (GObject *obj)
{
GtkWidget *widget;
diff --git a/a11y/html.c b/a11y/html.c
index eb26eaa..d92444c 100644
--- a/a11y/html.c
+++ b/a11y/html.c
@@ -37,7 +37,7 @@ static void html_a11y_class_init (HTMLA11YClass *klass);
static void html_a11y_init (HTMLA11Y *a11y_paragraph);
static void atk_component_interface_init (AtkComponentIface *iface);
-static AtkObject* html_a11y_get_parent (AtkObject *accessible);
+static AtkObject * html_a11y_get_parent (AtkObject *accessible);
static gint html_a11y_get_index_in_parent (AtkObject *accessible);
static AtkStateSet * html_a11y_ref_state_set (AtkObject *accessible);
static gint html_a11y_get_n_children (AtkObject *accessible);
@@ -86,14 +86,14 @@ atk_component_interface_init (AtkComponentIface *iface)
iface->get_size = html_a11y_get_size;
/* FIX2
- iface->add_focus_handler = gail_widget_add_focus_handler;
- iface->get_extents = gail_widget_get_extents;
- iface->get_layer = gail_widget_get_layer;
- iface->grab_focus = gail_widget_grab_focus;
- iface->remove_focus_handler = gail_widget_remove_focus_handler;
- iface->set_extents = gail_widget_set_extents;
- iface->set_position = gail_widget_set_position;
- iface->set_size = gail_widget_set_size;
+ * iface->add_focus_handler = gail_widget_add_focus_handler;
+ * iface->get_extents = gail_widget_get_extents;
+ * iface->get_layer = gail_widget_get_layer;
+ * iface->grab_focus = gail_widget_grab_focus;
+ * iface->remove_focus_handler = gail_widget_remove_focus_handler;
+ * iface->set_extents = gail_widget_set_extents;
+ * iface->set_position = gail_widget_set_position;
+ * iface->set_size = gail_widget_set_size;
*/
}
@@ -104,7 +104,8 @@ html_a11y_finalize (GObject *obj)
}
static void
-html_a11y_initialize (AtkObject *obj, gpointer data)
+html_a11y_initialize (AtkObject *obj,
+ gpointer data)
{
/* printf ("html_a11y_initialize\n"); */
@@ -147,7 +148,7 @@ get_parent_html (AtkObject *accessible)
return obj ? obj->parent : NULL;
}
-static AtkObject*
+static AtkObject *
html_a11y_get_parent (AtkObject *accessible)
{
AtkObject *parent, *p;
@@ -232,7 +233,8 @@ html_a11y_get_n_children (AtkObject *accessible)
}
static AtkObject *
-html_a11y_ref_child (AtkObject *accessible, gint index)
+html_a11y_ref_child (AtkObject *accessible,
+ gint index)
{
HTMLObject *parent, *child;
AtkObject *accessible_child = NULL;
@@ -296,7 +298,12 @@ html_a11y_get_top_gtkhtml_parent (HTMLA11Y *a11y)
}
void
-html_a11y_get_extents (AtkComponent *component, gint *x, gint *y, gint *width, gint *height, AtkCoordType coord_type)
+html_a11y_get_extents (AtkComponent *component,
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height,
+ AtkCoordType coord_type)
{
HTMLObject *obj = HTML_A11Y_HTML (component);
GtkHTMLA11Y *top_html_a11y;
@@ -323,7 +330,9 @@ html_a11y_get_extents (AtkComponent *component, gint *x, gint *y, gint *width, g
}
void
-html_a11y_get_size (AtkComponent *component, gint *width, gint *height)
+html_a11y_get_size (AtkComponent *component,
+ gint *width,
+ gint *height)
{
HTMLObject *obj = HTML_A11Y_HTML (component);
@@ -334,7 +343,8 @@ html_a11y_get_size (AtkComponent *component, gint *width, gint *height)
}
AtkObject *
-html_a11y_new (HTMLObject *html_obj, AtkRole role)
+html_a11y_new (HTMLObject *html_obj,
+ AtkRole role)
{
GObject *object;
AtkObject *accessible;
diff --git a/a11y/hyperlink.c b/a11y/hyperlink.c
index b58ffe6..eed97a2 100644
--- a/a11y/hyperlink.c
+++ b/a11y/hyperlink.c
@@ -135,7 +135,8 @@ html_a11y_hyper_link_init (HTMLA11YHyperLink *a11y_hyper_link)
}
AtkHyperlink *
-html_a11y_hyper_link_new (HTMLA11Y *a11y, gint link_index)
+html_a11y_hyper_link_new (HTMLA11Y *a11y,
+ gint link_index)
{
HTMLA11YHyperLink *hl;
@@ -156,7 +157,8 @@ html_a11y_hyper_link_new (HTMLA11Y *a11y, gint link_index)
*/
static gboolean
-html_a11y_hyper_link_do_action (AtkAction *action, gint i)
+html_a11y_hyper_link_do_action (AtkAction *action,
+ gint i)
{
HTMLA11YHyperLink *hl;
gboolean result = FALSE;
@@ -188,7 +190,8 @@ html_a11y_hyper_link_get_n_actions (AtkAction *action)
}
static const gchar *
-html_a11y_hyper_link_get_description (AtkAction *action, gint i)
+html_a11y_hyper_link_get_description (AtkAction *action,
+ gint i)
{
if (i == 0) {
HTMLA11YHyperLink *hl;
@@ -202,13 +205,16 @@ html_a11y_hyper_link_get_description (AtkAction *action, gint i)
}
static const gchar *
-html_a11y_hyper_link_get_name (AtkAction *action, gint i)
+html_a11y_hyper_link_get_name (AtkAction *action,
+ gint i)
{
return i == 0 ? "link click" : NULL;
}
static gboolean
-html_a11y_hyper_link_set_description (AtkAction *action, gint i, const gchar *description)
+html_a11y_hyper_link_set_description (AtkAction *action,
+ gint i,
+ const gchar *description)
{
if (i == 0) {
HTMLA11YHyperLink *hl;
diff --git a/a11y/image.c b/a11y/image.c
index bd5e434..9a112f1 100644
--- a/a11y/image.c
+++ b/a11y/image.c
@@ -92,7 +92,8 @@ html_a11y_image_finalize (GObject *obj)
}
static void
-html_a11y_image_initialize (AtkObject *obj, gpointer data)
+html_a11y_image_initialize (AtkObject *obj,
+ gpointer data)
{
/* printf ("html_a11y_image_initialize\n"); */
@@ -118,7 +119,7 @@ html_a11y_image_init (HTMLA11YImage *a11y_image)
{
}
-AtkObject*
+AtkObject *
html_a11y_image_new (HTMLObject *html_obj)
{
GObject *object;
@@ -163,7 +164,10 @@ html_a11y_image_get_name (AtkObject *accessible)
*/
static void
-html_a11y_image_get_image_position (AtkImage *image, gint *x, gint *y, AtkCoordType coord_type)
+html_a11y_image_get_image_position (AtkImage *image,
+ gint *x,
+ gint *y,
+ AtkCoordType coord_type)
{
HTMLImage *img = HTML_IMAGE (HTML_A11Y_HTML (image));
@@ -174,7 +178,9 @@ html_a11y_image_get_image_position (AtkImage *image, gint *x, gint *y, AtkCoordT
}
static void
-html_a11y_image_get_image_size (AtkImage *image, gint *width, gint *height)
+html_a11y_image_get_image_size (AtkImage *image,
+ gint *width,
+ gint *height)
{
HTMLImage *img = HTML_IMAGE (HTML_A11Y_HTML (image));
diff --git a/a11y/image.h b/a11y/image.h
index 82afd1a..a34431e 100644
--- a/a11y/image.h
+++ b/a11y/image.h
@@ -51,6 +51,6 @@ struct _HTMLA11YImageClass {
HTMLA11YClass parent_class;
};
-AtkObject* html_a11y_image_new (HTMLObject *o);
+AtkObject * html_a11y_image_new (HTMLObject *o);
#endif
diff --git a/a11y/object.c b/a11y/object.c
index 59ac3f2..767837d 100644
--- a/a11y/object.c
+++ b/a11y/object.c
@@ -45,7 +45,8 @@ get_n_actions (AtkAction *action)
}
static const gchar *
-get_description (AtkAction *action, gint i)
+get_description (AtkAction *action,
+ gint i)
{
if (i == 0)
return _("grab focus");
@@ -54,7 +55,8 @@ get_description (AtkAction *action, gint i)
}
static const gchar *
-action_get_name (AtkAction *action, gint i)
+action_get_name (AtkAction *action,
+ gint i)
{
if (i == 0)
return _("grab focus");
@@ -63,7 +65,8 @@ action_get_name (AtkAction *action, gint i)
}
static gboolean
-do_action (AtkAction * action, gint i)
+do_action (AtkAction *action,
+ gint i)
{
GtkWidget *widget;
gboolean return_value = TRUE;
@@ -155,7 +158,8 @@ gtk_html_a11y_finalize (GObject *obj)
}
static void
-gtk_html_a11y_initialize (AtkObject *obj, gpointer data)
+gtk_html_a11y_initialize (AtkObject *obj,
+ gpointer data)
{
/* printf ("gtk_html_a11y_initialize\n"); */
@@ -203,7 +207,8 @@ gtk_html_a11y_get_n_children (AtkObject *accessible)
}
static AtkObject *
-gtk_html_a11y_ref_child (AtkObject *accessible, gint index)
+gtk_html_a11y_ref_child (AtkObject *accessible,
+ gint index)
{
HTMLObject *child;
AtkObject *accessible_child = NULL;
@@ -275,7 +280,7 @@ gtk_html_a11y_init (GtkHTMLA11Y *a11y)
}
static AtkObject *
-gtk_html_a11y_get_focus_object (GtkWidget * widget)
+gtk_html_a11y_get_focus_object (GtkWidget *widget)
{
GtkHTML * html;
HTMLObject * htmlobj = NULL;
@@ -300,7 +305,7 @@ gtk_html_a11y_get_focus_object (GtkWidget * widget)
static AtkObject * gtk_html_a11y_focus_object = NULL;
static void
-gtk_html_a11y_grab_focus_cb (GtkWidget * widget)
+gtk_html_a11y_grab_focus_cb (GtkWidget *widget)
{
AtkObject *focus_object, *obj, *clue;
@@ -339,7 +344,9 @@ gtk_html_a11y_cursor_changed_cb (GtkWidget *widget)
}
static void
-gtk_html_a11y_insert_object_cb (GtkWidget * widget, gint pos, gint len)
+gtk_html_a11y_insert_object_cb (GtkWidget *widget,
+ gint pos,
+ gint len)
{
AtkObject * a11y;
@@ -360,7 +367,9 @@ gtk_html_a11y_insert_object_cb (GtkWidget * widget, gint pos, gint len)
}
static void
-gtk_html_a11y_delete_object_cb (GtkWidget * widget, gint pos, gint len)
+gtk_html_a11y_delete_object_cb (GtkWidget *widget,
+ gint pos,
+ gint len)
{
AtkObject * a11y;
@@ -377,7 +386,7 @@ gtk_html_a11y_delete_object_cb (GtkWidget * widget, gint pos, gint len)
}
}
-AtkObject*
+AtkObject *
gtk_html_a11y_new (GtkWidget *widget)
{
GtkHTML *html;
diff --git a/a11y/object.h b/a11y/object.h
index a1ce11e..5d71712 100644
--- a/a11y/object.h
+++ b/a11y/object.h
@@ -52,6 +52,6 @@ struct _GtkHTMLA11YClass
GtkAccessibleClass parent_class;
};
-AtkObject* gtk_html_a11y_new (GtkWidget *widget);
+AtkObject * gtk_html_a11y_new (GtkWidget *widget);
#endif
diff --git a/a11y/paragraph.c b/a11y/paragraph.c
index 460a737..9af0617 100644
--- a/a11y/paragraph.c
+++ b/a11y/paragraph.c
@@ -61,7 +61,8 @@ html_a11y_paragraph_finalize (GObject *obj)
}
static void
-html_a11y_paragraph_initialize (AtkObject *obj, gpointer data)
+html_a11y_paragraph_initialize (AtkObject *obj,
+ gpointer data)
{
/* printf ("html_a11y_paragraph_initialize\n"); */
diff --git a/a11y/paragraph.h b/a11y/paragraph.h
index 7e7a03c..d50563a 100644
--- a/a11y/paragraph.h
+++ b/a11y/paragraph.h
@@ -51,6 +51,6 @@ struct _HTMLA11YParagraphClass {
HTMLA11YClass parent_class;
};
-AtkObject* html_a11y_paragraph_new (HTMLObject *o);
+AtkObject * html_a11y_paragraph_new (HTMLObject *o);
#endif
diff --git a/a11y/table.c b/a11y/table.c
index 577f3dd..97db46b 100644
--- a/a11y/table.c
+++ b/a11y/table.c
@@ -107,7 +107,8 @@ html_a11y_table_finalize (GObject *obj)
}
static void
-html_a11y_table_initialize (AtkObject *obj, gpointer data)
+html_a11y_table_initialize (AtkObject *obj,
+ gpointer data)
{
/* printf ("html_a11y_table_initialize\n"); */
@@ -132,7 +133,7 @@ html_a11y_table_init (HTMLA11YTable *a11y_table)
{
}
-AtkObject*
+AtkObject *
html_a11y_table_new (HTMLObject *html_obj)
{
GObject *object;
@@ -184,7 +185,9 @@ is_valid (AtkObject *table)
*/
static AtkObject *
-html_a11y_table_ref_at (AtkTable *table, gint row, gint column)
+html_a11y_table_ref_at (AtkTable *table,
+ gint row,
+ gint column)
{
AtkObject *accessible = NULL;
HTMLTable *to = HTML_TABLE (HTML_A11Y_HTML (table));
@@ -208,7 +211,9 @@ html_a11y_table_ref_at (AtkTable *table, gint row, gint column)
}
static gint
-html_a11y_table_get_index_at (AtkTable *table, gint row, gint column)
+html_a11y_table_get_index_at (AtkTable *table,
+ gint row,
+ gint column)
{
HTMLTable *to = HTML_TABLE (HTML_A11Y_HTML (table));
@@ -223,7 +228,8 @@ html_a11y_table_get_index_at (AtkTable *table, gint row, gint column)
}
static gint
-html_a11y_table_get_column_at_index (AtkTable *table, gint index)
+html_a11y_table_get_column_at_index (AtkTable *table,
+ gint index)
{
HTMLTable *to = HTML_TABLE (HTML_A11Y_HTML (table));
HTMLTableCell *cell;
@@ -237,7 +243,8 @@ html_a11y_table_get_column_at_index (AtkTable *table, gint index)
}
static gint
-html_a11y_table_get_row_at_index (AtkTable *table, gint index)
+html_a11y_table_get_row_at_index (AtkTable *table,
+ gint index)
{
HTMLTable *to = HTML_TABLE (HTML_A11Y_HTML (table));
HTMLTableCell *cell;
@@ -273,7 +280,9 @@ html_a11y_table_get_n_rows (AtkTable *table)
}
static gint
-html_a11y_table_get_column_extent_at (AtkTable *table, gint row, gint column)
+html_a11y_table_get_column_extent_at (AtkTable *table,
+ gint row,
+ gint column)
{
HTMLTable *to = HTML_TABLE (HTML_A11Y_HTML (table));
@@ -288,7 +297,9 @@ html_a11y_table_get_column_extent_at (AtkTable *table, gint row, gint column)
}
static gint
-html_a11y_table_get_row_extent_at (AtkTable *table, gint row, gint column)
+html_a11y_table_get_row_extent_at (AtkTable *table,
+ gint row,
+ gint column)
{
HTMLTable *to = HTML_TABLE (HTML_A11Y_HTML (table));
@@ -303,7 +314,8 @@ html_a11y_table_get_row_extent_at (AtkTable *table, gint row, gint column)
}
static AtkObject *
-html_a11y_table_get_column_header (AtkTable *table, gint column)
+html_a11y_table_get_column_header (AtkTable *table,
+ gint column)
{
HTMLTable *to = HTML_TABLE (HTML_A11Y_HTML (table));
@@ -318,7 +330,8 @@ html_a11y_table_get_column_header (AtkTable *table, gint column)
}
static AtkObject *
-html_a11y_table_get_row_header (AtkTable *table, gint row)
+html_a11y_table_get_row_header (AtkTable *table,
+ gint row)
{
HTMLTable *to = HTML_TABLE (HTML_A11Y_HTML (table));
@@ -333,47 +346,47 @@ html_a11y_table_get_row_header (AtkTable *table, gint row)
}
/* unsupported calls
-
- AtkObject*
- (* get_caption) (AtkTable *table);
- const gchar * (* get_column_description) (AtkTable *table,
- gint column);
- const gchar * (* get_row_description) (AtkTable *table,
- gint row);
- AtkObject* (* get_summary) (AtkTable *table);
- void (* set_caption) (AtkTable *table,
- AtkObject *caption);
- void (* set_column_description) (AtkTable *table,
- gint column,
- const gchar *description);
- void (* set_column_header) (AtkTable *table,
- gint column,
- AtkObject *header);
- void (* set_row_description) (AtkTable *table,
- gint row,
- const gchar *description);
- void (* set_row_header) (AtkTable *table,
- gint row,
- AtkObject *header);
- void (* set_summary) (AtkTable *table,
- AtkObject *accessible);
- gint (* get_selected_columns) (AtkTable *table,
- gint **selected);
- gint (* get_selected_rows) (AtkTable *table,
- gint **selected);
- gboolean (* is_column_selected) (AtkTable *table,
- gint column);
- gboolean (* is_row_selected) (AtkTable *table,
- gint row);
- gboolean (* is_selected) (AtkTable *table,
- gint row,
- gint column);
- gboolean (* add_row_selection) (AtkTable *table,
- gint row);
- gboolean (* remove_row_selection) (AtkTable *table,
- gint row);
- gboolean (* add_column_selection) (AtkTable *table,
- gint column);
- gboolean (* remove_column_selection) (AtkTable *table,
- gint column);
-*/
+ *
+ * AtkObject*
+ * (* get_caption) (AtkTable *table);
+ * const gchar * (* get_column_description) (AtkTable *table,
+ * gint column);
+ * const gchar * (* get_row_description) (AtkTable *table,
+ * gint row);
+ * AtkObject* (* get_summary) (AtkTable *table);
+ * void (* set_caption) (AtkTable *table,
+ * AtkObject *caption);
+ * void (* set_column_description) (AtkTable *table,
+ * gint column,
+ * const gchar *description);
+ * void (* set_column_header) (AtkTable *table,
+ * gint column,
+ * AtkObject *header);
+ * void (* set_row_description) (AtkTable *table,
+ * gint row,
+ * const gchar *description);
+ * void (* set_row_header) (AtkTable *table,
+ * gint row,
+ * AtkObject *header);
+ * void (* set_summary) (AtkTable *table,
+ * AtkObject *accessible);
+ * gint (* get_selected_columns) (AtkTable *table,
+ * gint **selected);
+ * gint (* get_selected_rows) (AtkTable *table,
+ * gint **selected);
+ * gboolean (* is_column_selected) (AtkTable *table,
+ * gint column);
+ * gboolean (* is_row_selected) (AtkTable *table,
+ * gint row);
+ * gboolean (* is_selected) (AtkTable *table,
+ * gint row,
+ * gint column);
+ * gboolean (* add_row_selection) (AtkTable *table,
+ * gint row);
+ * gboolean (* remove_row_selection) (AtkTable *table,
+ * gint row);
+ * gboolean (* add_column_selection) (AtkTable *table,
+ * gint column);
+ * gboolean (* remove_column_selection) (AtkTable *table,
+ * gint column);
+ */
diff --git a/a11y/table.h b/a11y/table.h
index 097c942..ff9046c 100644
--- a/a11y/table.h
+++ b/a11y/table.h
@@ -51,6 +51,6 @@ struct _HTMLA11YTableClass {
HTMLA11YClass parent_class;
};
-AtkObject* html_a11y_table_new (HTMLObject *o);
+AtkObject * html_a11y_table_new (HTMLObject *o);
#endif
diff --git a/a11y/text.c b/a11y/text.c
index 99df3c7..2eb64c2 100644
--- a/a11y/text.c
+++ b/a11y/text.c
@@ -103,9 +103,9 @@ static void html_a11y_text_delete_text (AtkEditableText *text,
static void html_a11y_text_paste_text (AtkEditableText *text,
gint position);
-static AtkStateSet* html_a11y_text_ref_state_set (AtkObject *accessible);
+static AtkStateSet * html_a11y_text_ref_state_set (AtkObject *accessible);
-static AtkAttributeSet* html_a11y_text_get_run_attributes (AtkText *text,
+static AtkAttributeSet * html_a11y_text_get_run_attributes (AtkText *text,
gint offset,
gint *start_offset,
gint *end_offset);
@@ -119,7 +119,8 @@ get_n_actions (AtkAction *action)
}
static const gchar *
-action_get_name (AtkAction *action, gint i)
+action_get_name (AtkAction *action,
+ gint i)
{
if (i == 0)
return _("grab focus");
@@ -128,7 +129,8 @@ action_get_name (AtkAction *action, gint i)
}
static gboolean
-do_action (AtkAction * action, gint i)
+do_action (AtkAction *action,
+ gint i)
{
switch (i) {
case 0:
@@ -256,7 +258,8 @@ html_a11y_text_finalize (GObject *obj)
}
static void
-html_a11y_text_initialize (AtkObject *obj, gpointer data)
+html_a11y_text_initialize (AtkObject *obj,
+ gpointer data)
{
GtkTextBuffer *buffer;
HTMLText *to;
@@ -295,7 +298,7 @@ html_a11y_text_init (HTMLA11YText *a11y_text)
{
}
-AtkObject*
+AtkObject *
html_a11y_text_new (HTMLObject *html_obj)
{
GObject *object;
@@ -317,7 +320,7 @@ html_a11y_text_new (HTMLObject *html_obj)
/* atkobject.h */
-static AtkStateSet*
+static AtkStateSet *
html_a11y_text_ref_state_set (AtkObject *accessible)
{
AtkStateSet *state_set;
@@ -348,7 +351,12 @@ html_a11y_text_ref_state_set (AtkObject *accessible)
*/
static void
-html_a11y_text_get_extents (AtkComponent *component, gint *x, gint *y, gint *width, gint *height, AtkCoordType coord_type)
+html_a11y_text_get_extents (AtkComponent *component,
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height,
+ AtkCoordType coord_type)
{
HTMLObject *obj = HTML_A11Y_HTML (component);
GtkHTMLA11Y *top_html_a11y;
@@ -395,7 +403,9 @@ html_a11y_text_get_extents (AtkComponent *component, gint *x, gint *y, gint *wid
}
static void
-html_a11y_text_get_size (AtkComponent *component, gint *width, gint *height)
+html_a11y_text_get_size (AtkComponent *component,
+ gint *width,
+ gint *height)
{
gint x, y;
@@ -421,7 +431,9 @@ html_a11y_text_grab_focus (AtkComponent *comp)
*/
static gchar *
-html_a11y_text_get_text (AtkText *text, gint start_offset, gint end_offset)
+html_a11y_text_get_text (AtkText *text,
+ gint start_offset,
+ gint end_offset)
{
HTMLText *to = HTML_TEXT (HTML_A11Y_HTML (text));
gchar *str;
@@ -447,7 +459,7 @@ html_a11y_text_get_text (AtkText *text, gint start_offset, gint end_offset)
}
static gint
-html_a11y_text_get_caret_offset (AtkText * text)
+html_a11y_text_get_caret_offset (AtkText *text)
{
HTMLObject * p;
HTMLEngine * e;
@@ -470,7 +482,8 @@ html_a11y_text_get_caret_offset (AtkText * text)
}
static gboolean
-html_a11y_text_set_caret_offset (AtkText * text, gint offset)
+html_a11y_text_set_caret_offset (AtkText *text,
+ gint offset)
{
GtkHTML * html;
HTMLEngine * e;
@@ -487,8 +500,11 @@ html_a11y_text_set_caret_offset (AtkText * text, gint offset)
}
static gchar *
-html_a11y_text_get_text_after_offset (AtkText *text, gint offset, AtkTextBoundary boundary_type,
- gint *start_offset, gint *end_offset)
+html_a11y_text_get_text_after_offset (AtkText *text,
+ gint offset,
+ AtkTextBoundary boundary_type,
+ gint *start_offset,
+ gint *end_offset)
{
HTMLText *to = HTML_TEXT (HTML_A11Y_HTML (text));
HTMLTextSlave *start_slave, *end_slave;
@@ -537,8 +553,11 @@ html_a11y_text_get_text_after_offset (AtkText *text, gint offset, AtkTextBoundar
}
static gchar *
-html_a11y_text_get_text_at_offset (AtkText *text, gint offset, AtkTextBoundary boundary_type,
- gint *start_offset, gint *end_offset)
+html_a11y_text_get_text_at_offset (AtkText *text,
+ gint offset,
+ AtkTextBoundary boundary_type,
+ gint *start_offset,
+ gint *end_offset)
{
HTMLText *to = HTML_TEXT (HTML_A11Y_HTML (text));
HTMLTextSlave *start_slave, *end_slave;
@@ -594,7 +613,8 @@ html_a11y_text_get_text_at_offset (AtkText *text, gint offset, AtkTextBoundary b
}
static gunichar
-html_a11y_text_get_character_at_offset (AtkText *text, gint offset)
+html_a11y_text_get_character_at_offset (AtkText *text,
+ gint offset)
{
HTMLText *to = HTML_TEXT (HTML_A11Y_HTML (text));
@@ -604,8 +624,11 @@ html_a11y_text_get_character_at_offset (AtkText *text, gint offset)
}
static gchar *
-html_a11y_text_get_text_before_offset (AtkText *text, gint offset, AtkTextBoundary boundary_type,
- gint *start_offset, gint *end_offset)
+html_a11y_text_get_text_before_offset (AtkText *text,
+ gint offset,
+ AtkTextBoundary boundary_type,
+ gint *start_offset,
+ gint *end_offset)
{
HTMLText *to = HTML_TEXT (HTML_A11Y_HTML (text));
HTMLTextSlave *start_slave, *end_slave;
@@ -672,7 +695,10 @@ html_a11y_text_get_n_selections (AtkText *text)
}
static gchar *
-html_a11y_text_get_selection (AtkText *text, gint selection_num, gint *start_offset, gint *end_offset)
+html_a11y_text_get_selection (AtkText *text,
+ gint selection_num,
+ gint *start_offset,
+ gint *end_offset)
{
HTMLText *to = HTML_TEXT (HTML_A11Y_HTML (text));
@@ -686,7 +712,9 @@ html_a11y_text_get_selection (AtkText *text, gint selection_num, gint *start_off
}
static gboolean
-html_a11y_text_add_selection (AtkText *text, gint start_offset, gint end_offset)
+html_a11y_text_add_selection (AtkText *text,
+ gint start_offset,
+ gint end_offset)
{
GtkHTML *html = GTK_HTML_A11Y_GTKHTML (html_a11y_get_gtkhtml_parent (HTML_A11Y (text)));
HTMLObject *obj = HTML_A11Y_HTML (text);
@@ -704,7 +732,8 @@ html_a11y_text_add_selection (AtkText *text, gint start_offset, gint end_offset)
}
static gboolean
-html_a11y_text_remove_selection (AtkText *text, gint selection_num)
+html_a11y_text_remove_selection (AtkText *text,
+ gint selection_num)
{
GtkHTML *html = GTK_HTML_A11Y_GTKHTML (html_a11y_get_gtkhtml_parent (HTML_A11Y (text)));
HTMLObject *obj = HTML_A11Y_HTML (text);
@@ -718,7 +747,10 @@ html_a11y_text_remove_selection (AtkText *text, gint selection_num)
}
static gboolean
-html_a11y_text_set_selection (AtkText *text, gint selection_num, gint start_offset, gint end_offset)
+html_a11y_text_set_selection (AtkText *text,
+ gint selection_num,
+ gint start_offset,
+ gint end_offset)
{
if (selection_num)
return FALSE;
@@ -731,9 +763,9 @@ html_a11y_text_set_selection (AtkText *text, gint selection_num, gint start_offs
static AtkAttributeSet *
html_a11y_text_get_run_attributes (AtkText *text,
- gint offset,
- gint *start_offset,
- gint *end_offset)
+ gint offset,
+ gint *start_offset,
+ gint *end_offset)
{
PangoAttrIterator *iter;
PangoAttrList *attr;
@@ -795,14 +827,14 @@ html_a11y_text_get_run_attributes (AtkText *text,
}
/* Get attributes */
- if ((pango_string = (PangoAttrString*) pango_attr_iterator_get (iter,
+ if ((pango_string = (PangoAttrString *) pango_attr_iterator_get (iter,
PANGO_ATTR_FAMILY)) != NULL) {
value = g_strdup_printf("%s", pango_string->value);
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_FAMILY_NAME,
value);
}
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
+ if ((pango_int = (PangoAttrInt *) pango_attr_iterator_get (iter,
PANGO_ATTR_STYLE)) != NULL) {
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_STYLE,
@@ -810,70 +842,70 @@ html_a11y_text_get_run_attributes (AtkText *text,
pango_int->value)));
}
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
+ if ((pango_int = (PangoAttrInt *) pango_attr_iterator_get (iter,
PANGO_ATTR_WEIGHT)) != NULL) {
value = g_strdup_printf("%i", pango_int->value);
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_WEIGHT,
value);
}
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
+ if ((pango_int = (PangoAttrInt *) pango_attr_iterator_get (iter,
PANGO_ATTR_VARIANT)) != NULL) {
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_VARIANT,
g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_VARIANT,
pango_int->value)));
}
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
+ if ((pango_int = (PangoAttrInt *) pango_attr_iterator_get (iter,
PANGO_ATTR_STRETCH)) != NULL) {
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_STRETCH,
g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_STRETCH,
pango_int->value)));
}
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
+ if ((pango_int = (PangoAttrInt *) pango_attr_iterator_get (iter,
PANGO_ATTR_SIZE)) != NULL) {
value = g_strdup_printf("%i", pango_int->value / PANGO_SCALE);
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_SIZE,
value);
}
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
+ if ((pango_int = (PangoAttrInt *) pango_attr_iterator_get (iter,
PANGO_ATTR_UNDERLINE)) != NULL) {
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_UNDERLINE,
g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_UNDERLINE,
pango_int->value)));
}
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
+ if ((pango_int = (PangoAttrInt *) pango_attr_iterator_get (iter,
PANGO_ATTR_STRIKETHROUGH)) != NULL) {
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_STRIKETHROUGH,
g_strdup (atk_text_attribute_get_value (ATK_TEXT_ATTR_STRIKETHROUGH,
pango_int->value)));
}
- if ((pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter,
+ if ((pango_int = (PangoAttrInt *) pango_attr_iterator_get (iter,
PANGO_ATTR_RISE)) != NULL) {
value = g_strdup_printf("%i", pango_int->value);
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_RISE,
value);
}
- if ((pango_lang = (PangoAttrLanguage*) pango_attr_iterator_get (iter,
+ if ((pango_lang = (PangoAttrLanguage *) pango_attr_iterator_get (iter,
PANGO_ATTR_LANGUAGE)) != NULL) {
value = g_strdup ( pango_language_to_string ( pango_lang->value));
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_LANGUAGE,
value);
}
- if ((pango_float = (PangoAttrFloat*) pango_attr_iterator_get (iter,
+ if ((pango_float = (PangoAttrFloat *) pango_attr_iterator_get (iter,
PANGO_ATTR_SCALE)) != NULL) {
value = g_strdup_printf("%g", pango_float->value);
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_SCALE,
value);
}
- if ((pango_color = (PangoAttrColor*) pango_attr_iterator_get (iter,
+ if ((pango_color = (PangoAttrColor *) pango_attr_iterator_get (iter,
PANGO_ATTR_FOREGROUND)) != NULL) {
value = g_strdup_printf ("%u,%u,%u",
pango_color->color.red,
@@ -883,7 +915,7 @@ html_a11y_text_get_run_attributes (AtkText *text,
ATK_TEXT_ATTR_FG_COLOR,
value);
}
- if ((pango_color = (PangoAttrColor*) pango_attr_iterator_get (iter,
+ if ((pango_color = (PangoAttrColor *) pango_attr_iterator_get (iter,
PANGO_ATTR_BACKGROUND)) != NULL) {
value = g_strdup_printf ("%u,%u,%u",
pango_color->color.red,
@@ -901,12 +933,14 @@ html_a11y_text_get_run_attributes (AtkText *text,
}
/*
- AtkAttributeSet* (* get_default_attributes) (AtkText *text);
+ AtkAttributeSet * (* get_default_attributes) (AtkText *text);
*/
static gint
-html_a11y_text_get_offset_at_point (AtkText *text, gint x, gint y,
- AtkCoordType coords)
+html_a11y_text_get_offset_at_point (AtkText *text,
+ gint x,
+ gint y,
+ AtkCoordType coords)
{
GtkHTML *top_html;
GtkHTMLA11Y *top_a11y;
@@ -948,9 +982,13 @@ html_a11y_text_get_offset_at_point (AtkText *text, gint x, gint y,
}
static void
-html_a11y_text_get_character_extents (AtkText *text, gint offset,
- gint *x, gint *y, gint *width, gint *height,
- AtkCoordType coords)
+html_a11y_text_get_character_extents (AtkText *text,
+ gint offset,
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height,
+ AtkCoordType coords)
{
HTMLObject *obj;
GtkHTML *html;
@@ -998,7 +1036,7 @@ atk_editable_text_interface_init (AtkEditableTextIface *iface)
static void
html_a11y_text_set_text_contents (AtkEditableText *text,
- const gchar *string)
+ const gchar *string)
{
GtkHTML * html;
HTMLText *t;
@@ -1024,9 +1062,9 @@ html_a11y_text_set_text_contents (AtkEditableText *text,
static void
html_a11y_text_insert_text (AtkEditableText *text,
- const gchar *string,
- gint length,
- gint *position)
+ const gchar *string,
+ gint length,
+ gint *position)
{
GtkHTML * html;
HTMLText *t;
@@ -1044,9 +1082,9 @@ html_a11y_text_insert_text (AtkEditableText *text,
}
static void
-html_a11y_text_copy_text (AtkEditableText *text,
- gint start_pos,
- gint end_pos)
+html_a11y_text_copy_text (AtkEditableText *text,
+ gint start_pos,
+ gint end_pos)
{
GtkHTML * html;
HTMLText *t;
@@ -1069,8 +1107,8 @@ html_a11y_text_copy_text (AtkEditableText *text,
static void
html_a11y_text_cut_text (AtkEditableText *text,
- gint start_pos,
- gint end_pos)
+ gint start_pos,
+ gint end_pos)
{
GtkHTML * html;
HTMLText *t;
@@ -1093,9 +1131,9 @@ html_a11y_text_cut_text (AtkEditableText *text,
}
static void
-html_a11y_text_delete_text (AtkEditableText *text,
- gint start_pos,
- gint end_pos)
+html_a11y_text_delete_text (AtkEditableText *text,
+ gint start_pos,
+ gint end_pos)
{
GtkHTML * html;
HTMLText *t;
@@ -1107,13 +1145,13 @@ html_a11y_text_delete_text (AtkEditableText *text,
g_return_if_fail (t);
html_cursor_jump_to (html->engine->cursor, html->engine, HTML_OBJECT (t), start_pos);
- html_engine_delete_n (html->engine, end_pos-start_pos, TRUE);
+ html_engine_delete_n (html->engine, end_pos - start_pos, TRUE);
g_signal_emit_by_name(html, "grab_focus");
}
static void
-html_a11y_text_paste_text (AtkEditableText *text,
- gint position)
+html_a11y_text_paste_text (AtkEditableText *text,
+ gint position)
{
GtkHTML * html;
HTMLText *t;
@@ -1148,7 +1186,8 @@ atk_hyper_text_interface_init (AtkHypertextIface *iface)
*/
static AtkHyperlink *
-html_a11y_text_get_link (AtkHypertext *hypertext, gint link_index)
+html_a11y_text_get_link (AtkHypertext *hypertext,
+ gint link_index)
{
return html_a11y_hyper_link_new (HTML_A11Y (hypertext), link_index);
}
@@ -1163,7 +1202,8 @@ html_a11y_text_get_n_links (AtkHypertext *hypertext)
}
static gint
-html_a11y_text_get_link_index (AtkHypertext *hypertext, gint char_index)
+html_a11y_text_get_link_index (AtkHypertext *hypertext,
+ gint char_index)
{
HTMLObject *obj = HTML_A11Y_HTML (hypertext);
Link *link = html_text_get_link_at_offset (HTML_TEXT (obj), char_index);
diff --git a/a11y/text.h b/a11y/text.h
index 1558006..2f78eda 100644
--- a/a11y/text.h
+++ b/a11y/text.h
@@ -54,6 +54,6 @@ struct _HTMLA11YTextClass {
HTMLA11YClass parent_class;
};
-AtkObject* html_a11y_text_new (HTMLObject *o);
+AtkObject * html_a11y_text_new (HTMLObject *o);
#endif
diff --git a/a11y/utils.c b/a11y/utils.c
index 1ee1ee2..b7ad982 100644
--- a/a11y/utils.c
+++ b/a11y/utils.c
@@ -32,7 +32,8 @@
#include "utils.h"
static AtkObject *
-create_accessible (HTMLObject *o, AtkObject *parent)
+create_accessible (HTMLObject *o,
+ AtkObject *parent)
{
AtkObject *accessible = NULL;
@@ -102,7 +103,8 @@ acc_unref (gpointer data)
}
AtkObject *
-html_utils_get_accessible (HTMLObject *o, AtkObject *parent)
+html_utils_get_accessible (HTMLObject *o,
+ AtkObject *parent)
{
AtkObject *accessible;
diff --git a/components/editor/gtkhtml-color-combo.c b/components/editor/gtkhtml-color-combo.c
index be6dee1..8ea4d9f 100644
--- a/components/editor/gtkhtml-color-combo.c
+++ b/components/editor/gtkhtml-color-combo.c
@@ -597,8 +597,8 @@ color_combo_dispose (GObject *object)
static void
color_combo_get_preferred_width (GtkWidget *widget,
- gint *minimum_width,
- gint *natural_width)
+ gint *minimum_width,
+ gint *natural_width)
{
GtkhtmlColorComboPrivate *priv;
@@ -609,8 +609,8 @@ color_combo_get_preferred_width (GtkWidget *widget,
static void
color_combo_get_preferred_height (GtkWidget *widget,
- gint *minimum_height,
- gint *natural_height)
+ gint *minimum_height,
+ gint *natural_height)
{
GtkhtmlColorComboPrivate *priv;
diff --git a/components/editor/gtkhtml-color-swatch.c b/components/editor/gtkhtml-color-swatch.c
index 83cee12..03bf499 100644
--- a/components/editor/gtkhtml-color-swatch.c
+++ b/components/editor/gtkhtml-color-swatch.c
@@ -36,7 +36,8 @@ struct _GtkhtmlColorSwatchPrivate {
static gpointer parent_class;
static gboolean
-color_swatch_draw_cb (GtkWidget *drawing_area, cairo_t *cr)
+color_swatch_draw_cb (GtkWidget *drawing_area,
+ cairo_t *cr)
{
GtkStyle *style;
GdkColor *color;
diff --git a/components/editor/gtkhtml-editor-actions.c b/components/editor/gtkhtml-editor-actions.c
index 2bf01f2..4769410 100644
--- a/components/editor/gtkhtml-editor-actions.c
+++ b/components/editor/gtkhtml-editor-actions.c
@@ -2070,7 +2070,7 @@ editor_actions_setup_spell_check_menu (GtkhtmlEditor *editor)
action_name = g_strdup_printf ("context-spell-add-%s", code);
/* Translators: %s will be replaced with the actual dictionary name,
- where a user can add a word to. This is part of an "Add Word To" submenu. */
+ * where a user can add a word to. This is part of an "Add Word To" submenu. */
action_label = g_strdup_printf (_("%s Dictionary"), name);
action = gtk_action_new (
diff --git a/components/editor/gtkhtml-editor-private.c b/components/editor/gtkhtml-editor-private.c
index 7126c39..d09eb53 100644
--- a/components/editor/gtkhtml-editor-private.c
+++ b/components/editor/gtkhtml-editor-private.c
@@ -109,7 +109,7 @@ editor_recheck_cb (GtkhtmlEditor *editor,
static void
editor_replace_cb (GtkhtmlEditor *editor,
const gchar *correction,
- GtkhtmlSpellDialog *dialog)
+ GtkhtmlSpellDialog *dialog)
{
GtkHTML *html;
diff --git a/components/editor/gtkhtml-editor.c b/components/editor/gtkhtml-editor.c
index 8971f43..a15c0f5 100644
--- a/components/editor/gtkhtml-editor.c
+++ b/components/editor/gtkhtml-editor.c
@@ -61,7 +61,7 @@ static void
editor_show_popup_menu (GtkhtmlEditor *editor,
GdkEventButton *event,
HTMLObject *object,
- guint offset)
+ guint offset)
{
GtkHTML *html;
GtkWidget *menu;
@@ -218,7 +218,8 @@ editor_url_requested_cb (GtkhtmlEditor *editor,
}
static void
-engine_undo_changed_cb (GtkhtmlEditor *editor, HTMLEngine *engine)
+engine_undo_changed_cb (GtkhtmlEditor *editor,
+ HTMLEngine *engine)
{
g_object_notify (G_OBJECT (editor), "changed");
}
@@ -421,7 +422,7 @@ editor_method_set_language (GtkHTML *html,
g_free (action_name);
/* silently ignore when such language doesn't exist, it might mean that
- user doesn't have installed language for locale the editor is run in
+ * user doesn't have installed language for locale the editor is run in
*/
if (action != NULL)
gtk_action_activate (action);
diff --git a/components/editor/gtkhtml-spell-language.c b/components/editor/gtkhtml-spell-language.c
index d700dce..9bab4b2 100644
--- a/components/editor/gtkhtml-spell-language.c
+++ b/components/editor/gtkhtml-spell-language.c
@@ -49,13 +49,13 @@ static HMODULE hmodule;
BOOL WINAPI
DllMain (HINSTANCE hinstDLL,
- DWORD fdwReason,
- LPVOID lpvReserved);
+ DWORD fdwReason,
+ LPVOID lpvReserved);
BOOL WINAPI
DllMain (HINSTANCE hinstDLL,
- DWORD fdwReason,
- LPVOID lpvReserved)
+ DWORD fdwReason,
+ LPVOID lpvReserved)
{
switch (fdwReason)
{
@@ -188,7 +188,7 @@ static GMarkupParser iso_3166_parser = {
static void
iso_codes_parse (const GMarkupParser *parser,
const gchar *basename,
- GHashTable *hash_table)
+ GHashTable *hash_table)
{
GMappedFile *mapped_file;
gchar *filename;
diff --git a/components/editor/main.c b/components/editor/main.c
index a10d12e..70431a8 100644
--- a/components/editor/main.c
+++ b/components/editor/main.c
@@ -361,7 +361,8 @@ static GtkActionEntry view_entries[] = {
};
gint
-main (gint argc, gchar **argv)
+main (gint argc,
+ gchar **argv)
{
GtkActionGroup *action_group;
GtkUIManager *manager;
diff --git a/gtkhtml/dllmain.c b/gtkhtml/dllmain.c
index b97f38e..eff7ee3 100644
--- a/gtkhtml/dllmain.c
+++ b/gtkhtml/dllmain.c
@@ -92,8 +92,8 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL,
/* DllMain used to tuck away the the DLL's HMODULE */
BOOL WINAPI
DllMain (HINSTANCE hinstDLL,
- DWORD fdwReason,
- LPVOID lpvReserved)
+ DWORD fdwReason,
+ LPVOID lpvReserved)
{
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
diff --git a/gtkhtml/gtkhtml-embedded.c b/gtkhtml/gtkhtml-embedded.c
index bd50290..06990f2 100644
--- a/gtkhtml/gtkhtml-embedded.c
+++ b/gtkhtml/gtkhtml-embedded.c
@@ -74,7 +74,9 @@ gtk_html_embedded_get_type (void)
}
static void
-free_param (gpointer key, gpointer value, gpointer data)
+free_param (gpointer key,
+ gpointer value,
+ gpointer data)
{
g_free (key);
g_free (value);
@@ -124,15 +126,15 @@ typedef void (*draw_print_signal)(GObject *, gpointer, gpointer);
typedef void (*draw_gdk_signal)(GObject *, gpointer, gint, gint, gpointer);
static void
-draw_gdk_signal_marshaller (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+draw_gdk_signal_marshaller (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
register draw_gdk_signal ff;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 5);
@@ -210,7 +212,9 @@ gtk_html_embedded_class_init (GtkHTMLEmbeddedClass *class)
}
static void
-gtk_html_embedded_get_preferred_height (GtkWidget *widget, gint *minimum_height, gint *natural_height)
+gtk_html_embedded_get_preferred_height (GtkWidget *widget,
+ gint *minimum_height,
+ gint *natural_height)
{
GtkWidget *child;
@@ -225,7 +229,9 @@ gtk_html_embedded_get_preferred_height (GtkWidget *widget, gint *minimum_height,
}
static void
-gtk_html_embedded_get_preferred_width (GtkWidget *widget, gint *minimum_width, gint *natural_width)
+gtk_html_embedded_get_preferred_width (GtkWidget *widget,
+ gint *minimum_width,
+ gint *natural_width)
{
GtkWidget *child;
@@ -240,7 +246,8 @@ gtk_html_embedded_get_preferred_width (GtkWidget *widget, gint *minimum_width, g
}
static void
-gtk_html_embedded_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+gtk_html_embedded_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
{
GtkWidget *child;
@@ -271,7 +278,12 @@ gtk_html_embedded_init (GtkHTMLEmbedded *ge)
* Return value: A new GtkHTMLEmbedded widget.
**/
GtkWidget *
-gtk_html_embedded_new (gchar *classid, gchar *name, gchar *type, gchar *data, gint width, gint height)
+gtk_html_embedded_new (gchar *classid,
+ gchar *name,
+ gchar *type,
+ gchar *data,
+ gint width,
+ gint height)
{
GtkHTMLEmbedded *em;
@@ -298,7 +310,8 @@ gtk_html_embedded_new (gchar *classid, gchar *name, gchar *type, gchar *data, gi
* Returns: the value of the parameter.
*/
gchar *
-gtk_html_embedded_get_parameter (GtkHTMLEmbedded *ge, gchar *param)
+gtk_html_embedded_get_parameter (GtkHTMLEmbedded *ge,
+ gchar *param)
{
return g_hash_table_lookup (ge->params, param);
}
@@ -312,7 +325,9 @@ gtk_html_embedded_get_parameter (GtkHTMLEmbedded *ge, gchar *param)
* The parameter named @name to the @value.
*/
void
-gtk_html_embedded_set_parameter (GtkHTMLEmbedded *ge, gchar *param, gchar *value)
+gtk_html_embedded_set_parameter (GtkHTMLEmbedded *ge,
+ gchar *param,
+ gchar *value)
{
gchar *lookup;
@@ -334,7 +349,8 @@ gtk_html_embedded_set_parameter (GtkHTMLEmbedded *ge, gchar *param, gchar *value
* Set the descent of the widget beneath the baseline.
*/
void
-gtk_html_embedded_set_descent (GtkHTMLEmbedded *ge, gint descent)
+gtk_html_embedded_set_descent (GtkHTMLEmbedded *ge,
+ gint descent)
{
if (ge->descent == descent)
return;
diff --git a/gtkhtml/gtkhtml-embedded.h b/gtkhtml/gtkhtml-embedded.h
index a7e64ff..af50c14 100644
--- a/gtkhtml/gtkhtml-embedded.h
+++ b/gtkhtml/gtkhtml-embedded.h
@@ -60,7 +60,7 @@ struct _GtkHTMLEmbeddedClass {
};
/* FIXME: There needs to be a way for embedded objects in forms to encode
- themselves for a form */
+ * themselves for a form */
GType gtk_html_embedded_get_type (void);
GtkWidget *gtk_html_embedded_new (gchar *classid, gchar *name, gchar *type, gchar *data, gint width, gint height);
diff --git a/gtkhtml/gtkhtml-enums.h b/gtkhtml/gtkhtml-enums.h
index 92d4c0f..11e5e52 100644
--- a/gtkhtml/gtkhtml-enums.h
+++ b/gtkhtml/gtkhtml-enums.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- Copyright (C) 2000 Helix Code, Inc.
-
- The Gnome Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The Gnome Library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the Gnome Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Radek Doulik <rodo helixcode com>
-
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Radek Doulik <rodo helixcode com>
+ *
*/
#ifndef _GTK_HTML_ENUMS_H
diff --git a/gtkhtml/gtkhtml-keybinding.h b/gtkhtml/gtkhtml-keybinding.h
index bd8fa68..7527ced 100644
--- a/gtkhtml/gtkhtml-keybinding.h
+++ b/gtkhtml/gtkhtml-keybinding.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Ettore Perazzoli <ettore helixcode com>
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Ettore Perazzoli <ettore helixcode com>
*/
#ifndef _GTKHTML_KEYBINDING_H
diff --git a/gtkhtml/gtkhtml-private.h b/gtkhtml/gtkhtml-private.h
index c668f7c..c753b57 100644
--- a/gtkhtml/gtkhtml-private.h
+++ b/gtkhtml/gtkhtml-private.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GTKHTML_PRIVATE_H
diff --git a/gtkhtml/gtkhtml-properties.c b/gtkhtml/gtkhtml-properties.c
index 1683df1..9438418 100644
--- a/gtkhtml/gtkhtml-properties.c
+++ b/gtkhtml/gtkhtml-properties.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
-Copyright (C) 2000 Helix Code, Inc.
-Authors: Radek Doulik (rodo helixcode com)
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with this library; see the file COPYING.LIB. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
-*/
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
#include <config.h>
#include <string.h>
diff --git a/gtkhtml/gtkhtml-properties.h b/gtkhtml/gtkhtml-properties.h
index 04ff4e8..4fc7be6 100644
--- a/gtkhtml/gtkhtml-properties.h
+++ b/gtkhtml/gtkhtml-properties.h
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
- Authors: Radek Doulik (rodo helixcode com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GTK_HTML_PROPERTIES_H_
diff --git a/gtkhtml/gtkhtml-search.c b/gtkhtml/gtkhtml-search.c
index 0cfa278..70200cc 100644
--- a/gtkhtml/gtkhtml-search.c
+++ b/gtkhtml/gtkhtml-search.c
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright 1999, 2000 Helix Code, Inc.
- Authors: Radek Doulik (rodo helixcode com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright 1999, 2000 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -40,7 +40,8 @@ struct _GtkHTMLISearch {
typedef struct _GtkHTMLISearch GtkHTMLISearch;
static void
-changed (GtkEntry *entry, GtkHTMLISearch *data)
+changed (GtkEntry *entry,
+ GtkHTMLISearch *data)
{
/* printf ("isearch changed to '%s'\n", gtk_entry_get_text (entry)); */
if (*gtk_entry_get_text (GTK_ENTRY (data->html->priv->search_input_line))) {
@@ -53,7 +54,8 @@ changed (GtkEntry *entry, GtkHTMLISearch *data)
}
static void
-continue_search (GtkHTMLISearch *data, gboolean forward)
+continue_search (GtkHTMLISearch *data,
+ gboolean forward)
{
HTMLEngine *e = data->html->engine;
@@ -88,7 +90,9 @@ data_destroy (GtkHTMLISearch *data)
}
static gint
-key_press (GtkWidget *widget, GdkEventKey *event, GtkHTMLISearch *data)
+key_press (GtkWidget *widget,
+ GdkEventKey *event,
+ GtkHTMLISearch *data)
{
gint rv = TRUE;
@@ -105,7 +109,9 @@ key_press (GtkWidget *widget, GdkEventKey *event, GtkHTMLISearch *data)
}
static gint
-focus_out_event (GtkWidget *widget, GdkEventFocus *event, GtkHTMLISearch *data)
+focus_out_event (GtkWidget *widget,
+ GdkEventFocus *event,
+ GtkHTMLISearch *data)
{
hide (data);
@@ -113,13 +119,15 @@ focus_out_event (GtkWidget *widget, GdkEventFocus *event, GtkHTMLISearch *data)
}
static void
-destroy (GtkWidget *w, GtkHTMLISearch *data)
+destroy (GtkWidget *w,
+ GtkHTMLISearch *data)
{
data_destroy (data);
}
void
-gtk_html_isearch (GtkHTML *html, gboolean forward)
+gtk_html_isearch (GtkHTML *html,
+ gboolean forward)
{
GtkHTMLISearch *data;
@@ -160,13 +168,18 @@ gtk_html_isearch (GtkHTML *html, gboolean forward)
}
gboolean
-gtk_html_engine_search (GtkHTML *html, const gchar *text, gboolean case_sensitive, gboolean forward, gboolean regular)
+gtk_html_engine_search (GtkHTML *html,
+ const gchar *text,
+ gboolean case_sensitive,
+ gboolean forward,
+ gboolean regular)
{
return html_engine_search (html->engine, text, case_sensitive, forward, regular);
}
void
-gtk_html_engine_search_set_forward (GtkHTML *html, gboolean forward)
+gtk_html_engine_search_set_forward (GtkHTML *html,
+ gboolean forward)
{
html_engine_search_set_forward (html->engine, forward);
}
@@ -178,7 +191,9 @@ gtk_html_engine_search_next (GtkHTML *html)
}
gboolean
-gtk_html_engine_search_incremental (GtkHTML *html, const gchar *text, gboolean forward)
+gtk_html_engine_search_incremental (GtkHTML *html,
+ const gchar *text,
+ gboolean forward)
{
return html_engine_search_incremental (html->engine, text, forward);
}
diff --git a/gtkhtml/gtkhtml-search.h b/gtkhtml/gtkhtml-search.h
index 0669265..ee690e1 100644
--- a/gtkhtml/gtkhtml-search.h
+++ b/gtkhtml/gtkhtml-search.h
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright 1999, 2000 Helix Code, Inc.
- Authors: Radek Doulik (rodo helixcode com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright 1999, 2000 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GTK_HTML_SEARCH_
diff --git a/gtkhtml/gtkhtml-stream.c b/gtkhtml/gtkhtml-stream.c
index 3b11312..e07c4ce 100644
--- a/gtkhtml/gtkhtml-stream.c
+++ b/gtkhtml/gtkhtml-stream.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -32,10 +32,10 @@
GtkHTMLStream *
gtk_html_stream_new (GtkHTML *html,
- GtkHTMLStreamTypesFunc types_func,
- GtkHTMLStreamWriteFunc write_func,
- GtkHTMLStreamCloseFunc close_func,
- gpointer user_data)
+ GtkHTMLStreamTypesFunc types_func,
+ GtkHTMLStreamWriteFunc write_func,
+ GtkHTMLStreamCloseFunc close_func,
+ gpointer user_data)
{
GtkHTMLStream *new_stream;
@@ -68,8 +68,8 @@ gtk_html_stream_destroy (GtkHTMLStream *stream)
*/
void
gtk_html_stream_write (GtkHTMLStream *stream,
- const gchar *buffer,
- gsize size)
+ const gchar *buffer,
+ gsize size)
{
g_return_if_fail (stream != NULL);
g_return_if_fail (buffer != NULL);
@@ -81,8 +81,8 @@ gtk_html_stream_write (GtkHTMLStream *stream,
gint
gtk_html_stream_vprintf (GtkHTMLStream *stream,
- const gchar *format,
- va_list ap)
+ const gchar *format,
+ va_list ap)
{
gsize len;
gchar *buf = NULL;
@@ -114,8 +114,8 @@ gtk_html_stream_vprintf (GtkHTMLStream *stream,
gint
gtk_html_stream_printf (GtkHTMLStream *stream,
- const gchar *format,
- ...)
+ const gchar *format,
+ ...)
{
va_list ap;
gint rv;
@@ -129,7 +129,7 @@ gtk_html_stream_printf (GtkHTMLStream *stream,
void
gtk_html_stream_close (GtkHTMLStream *stream,
- GtkHTMLStreamStatus status)
+ GtkHTMLStreamStatus status)
{
g_return_if_fail (stream != NULL);
@@ -156,7 +156,7 @@ struct _GtkHTMLLog {
static gchar **
stream_log_types (GtkHTMLStream *stream,
- gpointer user_data)
+ gpointer user_data)
{
GtkHTMLLog *log = user_data;
@@ -165,14 +165,14 @@ stream_log_types (GtkHTMLStream *stream,
static void
stream_log_write (GtkHTMLStream *stream,
- const gchar *buffer,
- gsize size,
- gpointer user_data)
+ const gchar *buffer,
+ gsize size,
+ gpointer user_data)
{
GtkHTMLLog *log = user_data;
gint i;
- for (i=0; i<size; i++)
+ for (i = 0; i < size; i++)
fprintf (log->file, "%c", buffer [i]);
gtk_html_stream_write (log->stream, buffer, size);
@@ -181,8 +181,8 @@ stream_log_write (GtkHTMLStream *stream,
static void
stream_log_close (GtkHTMLStream *stream,
- GtkHTMLStreamStatus status,
- gpointer user_data)
+ GtkHTMLStreamStatus status,
+ gpointer user_data)
{
GtkHTMLLog *log = user_data;
@@ -193,7 +193,8 @@ stream_log_close (GtkHTMLStream *stream,
}
GtkHTMLStream *
-gtk_html_stream_log_new (GtkHTML *html, GtkHTMLStream *stream)
+gtk_html_stream_log_new (GtkHTML *html,
+ GtkHTMLStream *stream)
{
GtkHTMLLog *log;
GtkHTMLStream *new_stream;
diff --git a/gtkhtml/gtkhtml-stream.h b/gtkhtml/gtkhtml-stream.h
index ffcc70e..16824fd 100644
--- a/gtkhtml/gtkhtml-stream.h
+++ b/gtkhtml/gtkhtml-stream.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GTKHTML_STREAM_H
diff --git a/gtkhtml/gtkhtml-types.h b/gtkhtml/gtkhtml-types.h
index c8d5c65..5de9a69 100644
--- a/gtkhtml/gtkhtml-types.h
+++ b/gtkhtml/gtkhtml-types.h
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
- Author: Radek Doulik <rodo helixcode com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Author: Radek Doulik <rodo helixcode com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GTK_HTML_TYPES_H_
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index c754a99..d738c7e 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -175,24 +175,38 @@ static guint signals[LAST_SIGNAL] = { 0 };
static void
gtk_html_update_scrollbars_on_resize (GtkHTML *html,
- gdouble old_doc_width, gdouble old_doc_height,
- gdouble old_width, gdouble old_height,
- gboolean *changed_x, gboolean *changed_y);
-
-static void update_primary_selection (GtkHTML *html);
-static void clipboard_paste_received_cb (GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- gpointer user_data);
-static gboolean motion_notify_event (GtkWidget *widget, GdkEventMotion *event);
+ gdouble old_doc_width,
+ gdouble old_doc_height,
+ gdouble old_width,
+ gdouble old_height,
+ gboolean *changed_x,
+ gboolean *changed_y);
+
+static void update_primary_selection (GtkHTML *html);
+static void clipboard_paste_received_cb (GtkClipboard *clipboard,
+ GtkSelectionData *selection_data,
+ gpointer user_data);
+static gboolean motion_notify_event (GtkWidget *widget,
+ GdkEventMotion *event);
/* keybindings signal hadlers */
-static void scroll (GtkHTML *html, GtkOrientation orientation, GtkScrollType scroll_type, gfloat position);
-static void cursor_move (GtkHTML *html, GtkDirectionType dir_type, GtkHTMLCursorSkipType skip);
-static gboolean command (GtkHTML *html, GtkHTMLCommandType com_type);
-static gint mouse_change_pos (GtkWidget *widget, GdkWindow *window, gint x, gint y, gint state);
-static void add_bindings (GtkHTMLClass *klass);
-static const gchar * get_value_nick (GtkHTMLCommandType com_type);
-static void gtk_html_adjust_cursor_position (GtkHTML *html);
+static void scroll (GtkHTML *html,
+ GtkOrientation orientation,
+ GtkScrollType scroll_type,
+ gfloat position);
+static void cursor_move (GtkHTML *html,
+ GtkDirectionType dir_type,
+ GtkHTMLCursorSkipType skip);
+static gboolean command (GtkHTML *html,
+ GtkHTMLCommandType com_type);
+static gint mouse_change_pos (GtkWidget *widget,
+ GdkWindow *window,
+ gint x,
+ gint y,
+ gint state);
+static void add_bindings (GtkHTMLClass *klass);
+static const gchar *get_value_nick (GtkHTMLCommandType com_type);
+static void gtk_html_adjust_cursor_position (GtkHTML *html);
static gboolean any_has_cursor_moved (GtkHTML *html);
static gboolean any_has_skip_update_cursor (GtkHTML *html);
@@ -201,7 +215,8 @@ static gboolean any_has_skip_update_cursor (GtkHTML *html);
GtkHTMLParagraphStyle
-clueflow_style_to_paragraph_style (HTMLClueFlowStyle style, HTMLListType item_type)
+clueflow_style_to_paragraph_style (HTMLClueFlowStyle style,
+ HTMLListType item_type)
{
switch (style) {
case HTML_CLUEFLOW_STYLE_NORMAL:
@@ -243,7 +258,9 @@ clueflow_style_to_paragraph_style (HTMLClueFlowStyle style, HTMLListType item_ty
}
void
-paragraph_style_to_clueflow_style (GtkHTMLParagraphStyle style, HTMLClueFlowStyle *flow_style, HTMLListType *item_type)
+paragraph_style_to_clueflow_style (GtkHTMLParagraphStyle style,
+ HTMLClueFlowStyle *flow_style,
+ HTMLListType *item_type)
{
*item_type = HTML_LIST_TYPE_BLOCKQUOTE;
*flow_style = HTML_CLUEFLOW_STYLE_LIST_ITEM;
@@ -441,7 +458,8 @@ queue_draw (GtkHTML *html)
/* HTMLEngine callbacks. */
static void
-html_engine_title_changed_cb (HTMLEngine *engine, gpointer data)
+html_engine_title_changed_cb (HTMLEngine *engine,
+ gpointer data)
{
GtkHTML *gtk_html;
@@ -450,7 +468,9 @@ html_engine_title_changed_cb (HTMLEngine *engine, gpointer data)
}
static void
-html_engine_set_base_cb (HTMLEngine *engine, const gchar *base, gpointer data)
+html_engine_set_base_cb (HTMLEngine *engine,
+ const gchar *base,
+ gpointer data)
{
GtkHTML *gtk_html;
@@ -460,7 +480,9 @@ html_engine_set_base_cb (HTMLEngine *engine, const gchar *base, gpointer data)
}
static void
-html_engine_set_base_target_cb (HTMLEngine *engine, const gchar *base_target, gpointer data)
+html_engine_set_base_target_cb (HTMLEngine *engine,
+ const gchar *base_target,
+ gpointer data)
{
GtkHTML *gtk_html;
@@ -469,7 +491,8 @@ html_engine_set_base_target_cb (HTMLEngine *engine, const gchar *base_target, gp
}
static void
-html_engine_load_done_cb (HTMLEngine *engine, gpointer data)
+html_engine_load_done_cb (HTMLEngine *engine,
+ gpointer data)
{
GtkHTML *gtk_html;
@@ -479,9 +502,9 @@ html_engine_load_done_cb (HTMLEngine *engine, gpointer data)
static void
html_engine_url_requested_cb (HTMLEngine *engine,
- const gchar *url,
- GtkHTMLStream *handle,
- gpointer data)
+ const gchar *url,
+ GtkHTMLStream *handle,
+ gpointer data)
{
GtkHTML *gtk_html;
gchar *expanded = NULL;
@@ -497,7 +520,7 @@ html_engine_url_requested_cb (HTMLEngine *engine,
static void
html_engine_draw_pending_cb (HTMLEngine *engine,
- gpointer data)
+ gpointer data)
{
GtkHTML *html;
@@ -508,9 +531,9 @@ html_engine_draw_pending_cb (HTMLEngine *engine,
static void
html_engine_redirect_cb (HTMLEngine *engine,
- const gchar *url,
- gint delay,
- gpointer data)
+ const gchar *url,
+ gint delay,
+ gpointer data)
{
GtkHTML *gtk_html;
@@ -521,10 +544,10 @@ html_engine_redirect_cb (HTMLEngine *engine,
static void
html_engine_submit_cb (HTMLEngine *engine,
- const gchar *method,
- const gchar *url,
- const gchar *encoding,
- gpointer data)
+ const gchar *method,
+ const gchar *url,
+ const gchar *encoding,
+ gpointer data)
{
GtkHTML *gtk_html;
@@ -535,8 +558,8 @@ html_engine_submit_cb (HTMLEngine *engine,
static gboolean
html_engine_object_requested_cb (HTMLEngine *engine,
- GtkHTMLEmbedded *eb,
- gpointer data)
+ GtkHTMLEmbedded *eb,
+ gpointer data)
{
GtkHTML *gtk_html;
gboolean object_found = FALSE;
@@ -569,7 +592,8 @@ scroll_update_mouse (GtkWidget *widget)
}
static void
-vertical_scroll_cb (GtkAdjustment *adjustment, gpointer data)
+vertical_scroll_cb (GtkAdjustment *adjustment,
+ gpointer data)
{
GtkHTML *html = GTK_HTML (data);
@@ -581,7 +605,8 @@ vertical_scroll_cb (GtkAdjustment *adjustment, gpointer data)
}
static void
-horizontal_scroll_cb (GtkAdjustment *adjustment, gpointer data)
+horizontal_scroll_cb (GtkAdjustment *adjustment,
+ gpointer data)
{
GtkHTML *html = GTK_HTML (data);
@@ -654,7 +679,10 @@ vadjustment_notify_cb (GtkHTML *html)
/* Scroll timeout handling. */
static void
-inc_adjustment (GtkAdjustment *adj, gint doc_width, gint alloc_width, gint inc)
+inc_adjustment (GtkAdjustment *adj,
+ gint doc_width,
+ gint alloc_width,
+ gint inc)
{
gfloat value;
gint max;
@@ -848,7 +876,8 @@ gtk_html_get_top_html (GtkHTML *html)
}
void
-gtk_html_set_fonts (GtkHTML *html, HTMLPainter *painter)
+gtk_html_set_fonts (GtkHTML *html,
+ HTMLPainter *painter)
{
GtkWidget *top_level;
GtkStyle *style;
@@ -924,7 +953,8 @@ gtk_html_set_fonts (GtkHTML *html, HTMLPainter *painter)
}
static void
-set_caret_mode (HTMLEngine *engine, gboolean caret_mode)
+set_caret_mode (HTMLEngine *engine,
+ gboolean caret_mode)
{
if (engine->editable)
return;
@@ -951,12 +981,13 @@ set_caret_mode (HTMLEngine *engine, gboolean caret_mode)
/* GtkWidget methods. */
static void
-style_set (GtkWidget *widget, GtkStyle *previous_style)
+style_set (GtkWidget *widget,
+ GtkStyle *previous_style)
{
HTMLEngine *engine = GTK_HTML (widget)->engine;
/* we don't need to set font's in idle time so call idle callback directly to avoid
- recalculating whole document
+ * recalculating whole document
*/
if (engine) {
gtk_html_set_fonts (GTK_HTML (widget), engine->painter);
@@ -974,7 +1005,8 @@ style_set (GtkWidget *widget, GtkStyle *previous_style)
}
static void
-update_mouse_cursor (GtkWidget *widget, guint state)
+update_mouse_cursor (GtkWidget *widget,
+ guint state)
{
GdkEventMotion event;
@@ -989,7 +1021,8 @@ update_mouse_cursor (GtkWidget *widget, guint state)
}
static gboolean
-key_press_event (GtkWidget *widget, GdkEventKey *event)
+key_press_event (GtkWidget *widget,
+ GdkEventKey *event)
{
GtkHTML *html = GTK_HTML (widget);
GtkHTMLClass *html_class = GTK_HTML_CLASS (GTK_WIDGET_GET_CLASS (html));
@@ -1073,7 +1106,8 @@ key_press_event (GtkWidget *widget, GdkEventKey *event)
}
static gboolean
-key_release_event (GtkWidget *widget, GdkEventKey *event)
+key_release_event (GtkWidget *widget,
+ GdkEventKey *event)
{
GtkHTML *html = GTK_HTML (widget);
@@ -1146,7 +1180,7 @@ realize (GtkWidget *widget)
gdk_window_set_cursor (window, NULL);
/* This sets the backing pixmap to None, so that scrolling does not
- erase the newly exposed area, thus making the thing smoother. */
+ * erase the newly exposed area, thus making the thing smoother. */
gdk_window_set_background_pattern (bin_window, NULL);
/* If someone was silly enough to stick us in something that doesn't
@@ -1186,7 +1220,8 @@ unrealize (GtkWidget *widget)
}
static gboolean
-draw (GtkWidget *widget, cairo_t *cr)
+draw (GtkWidget *widget,
+ cairo_t *cr)
{
html_engine_draw_cb (GTK_HTML (widget)->engine, cr);
@@ -1197,7 +1232,9 @@ draw (GtkWidget *widget, cairo_t *cr)
}
static void
-gtk_html_get_preferred_height (GtkWidget *widget, gint *minimum_height, gint *natural_height)
+gtk_html_get_preferred_height (GtkWidget *widget,
+ gint *minimum_height,
+ gint *natural_height)
{
HTMLEngine *e = GTK_HTML (widget)->engine;
if (!e->writing) {
@@ -1215,7 +1252,9 @@ gtk_html_get_preferred_height (GtkWidget *widget, gint *minimum_height, gint *na
}
static void
-gtk_html_get_preferred_width (GtkWidget *widget, gint *minimum_width, gint *natural_width)
+gtk_html_get_preferred_width (GtkWidget *widget,
+ gint *minimum_width,
+ gint *natural_width)
{
HTMLEngine *e = GTK_HTML (widget)->engine;
if (!e->writing) {
@@ -1233,7 +1272,9 @@ gtk_html_get_preferred_width (GtkWidget *widget, gint *minimum_width, gint *natu
}
static void
-child_size_allocate (HTMLObject *o, HTMLEngine *e, gpointer data)
+child_size_allocate (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (html_object_is_embedded (o)) {
HTMLEmbedded *eo = HTML_EMBEDDED (o);
@@ -1319,7 +1360,8 @@ gtk_layout_faux_size_allocate (GtkWidget *widget,
}
static void
-size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
{
GtkHTML *html;
gboolean changed_x = FALSE, changed_y = FALSE;
@@ -1331,7 +1373,7 @@ size_allocate (GtkWidget *widget, GtkAllocation *allocation)
html = GTK_HTML (widget);
/* isolate children from layout - we want to set them after calc size is performed
- and we know the position of the children */
+ * and we know the position of the children */
gtk_layout_faux_size_allocate (widget, allocation);
@@ -1361,7 +1403,8 @@ size_allocate (GtkWidget *widget, GtkAllocation *allocation)
}
static void
-set_pointer_url (GtkHTML *html, const gchar *url)
+set_pointer_url (GtkHTML *html,
+ const gchar *url)
{
if (url == html->pointer_url)
return;
@@ -1375,7 +1418,9 @@ set_pointer_url (GtkHTML *html, const gchar *url)
}
static void
-dnd_link_set (GtkWidget *widget, HTMLObject *o, gint offset)
+dnd_link_set (GtkWidget *widget,
+ HTMLObject *o,
+ gint offset)
{
if (!html_engine_get_editable (GTK_HTML (widget)->engine)) {
/* printf ("dnd_link_set %p\n", o); */
@@ -1401,7 +1446,12 @@ dnd_link_unset (GtkWidget *widget)
}
static void
-on_object (GtkWidget *widget, GdkWindow *window, HTMLObject *obj, gint offset, gint x, gint y)
+on_object (GtkWidget *widget,
+ GdkWindow *window,
+ HTMLObject *obj,
+ gint offset,
+ gint x,
+ gint y)
{
GtkHTML *html = GTK_HTML (widget);
@@ -1454,7 +1504,11 @@ on_object (GtkWidget *widget, GdkWindow *window, HTMLObject *obj, gint offset, g
#define HTML_DIST(x,y) sqrt(x*x + y*y)
static gint
-mouse_change_pos (GtkWidget *widget, GdkWindow *window, gint x, gint y, gint state)
+mouse_change_pos (GtkWidget *widget,
+ GdkWindow *window,
+ gint x,
+ gint y,
+ gint state)
{
GtkHTML *html;
HTMLEngine *engine;
@@ -1519,7 +1573,7 @@ mouse_change_pos (GtkWidget *widget, GdkWindow *window, gint x, gint y, gint sta
remove_scroll_timeout (html);
/* This will put the mark at the position of the
- previous click. */
+ * previous click. */
if (engine->mark == NULL && engine->editable)
html_engine_set_mark (engine);
@@ -1581,7 +1635,8 @@ skip_host (const gchar *url)
}
static gsize
-path_len (const gchar *base, gboolean absolute)
+path_len (const gchar *base,
+ gboolean absolute)
{
const gchar *last;
const gchar *cur;
@@ -1636,15 +1691,15 @@ static gboolean
url_is_absolute (const gchar *url)
{
/*
- URI Syntactic Components
-
- The URI syntax is dependent upon the scheme. In general, absolute
- URI are written as follows:
-
- <scheme>:<scheme-specific-part>
-
- scheme = alpha *( alpha | digit | "+" | "-" | "." )
- */
+ * URI Syntactic Components
+ *
+ * The URI syntax is dependent upon the scheme. In general, absolute
+ * URI are written as follows:
+ *
+ * <scheme>:<scheme-specific-part>
+ *
+ * scheme = alpha *( alpha | digit | "+" | "-" | "." )
+ */
if (!url)
return FALSE;
@@ -1660,7 +1715,8 @@ url_is_absolute (const gchar *url)
}
static gchar *
-expand_relative (const gchar *base, const gchar *url)
+expand_relative (const gchar *base,
+ const gchar *url)
{
gchar *new_url = NULL;
gsize base_len, url_len;
@@ -1696,20 +1752,22 @@ expand_relative (const gchar *base, const gchar *url)
new_url[base_len + url_len] = '\0';
/*
- g_warning ("base = %s url = %s new_url = %s",
- base, url, new_url);
+ * g_warning ("base = %s url = %s new_url = %s",
+ * base, url, new_url);
*/
return new_url;
}
gchar *
-gtk_html_get_url_base_relative (GtkHTML *html, const gchar *url)
+gtk_html_get_url_base_relative (GtkHTML *html,
+ const gchar *url)
{
return expand_relative (gtk_html_get_base (html), url);
}
static gchar *
-expand_frame_url (GtkHTML *html, const gchar *url)
+expand_frame_url (GtkHTML *html,
+ const gchar *url)
{
gchar *new_url;
@@ -1728,7 +1786,9 @@ expand_frame_url (GtkHTML *html, const gchar *url)
}
gchar *
-gtk_html_get_url_object_relative (GtkHTML *html, HTMLObject *o, const gchar *url)
+gtk_html_get_url_object_relative (GtkHTML *html,
+ HTMLObject *o,
+ const gchar *url)
{
HTMLEngine *e;
HTMLObject *parent;
@@ -1762,7 +1822,9 @@ gtk_html_get_url_object_relative (GtkHTML *html, HTMLObject *o, const gchar *url
}
static GtkWidget *
-shift_to_iframe_parent (GtkWidget *widget, gint *x, gint *y)
+shift_to_iframe_parent (GtkWidget *widget,
+ gint *x,
+ gint *y)
{
while (GTK_HTML (widget)->iframe_parent) {
GtkAllocation allocation;
@@ -1816,7 +1878,9 @@ motion_notify_event (GtkWidget *widget,
}
static gboolean
-toplevel_unmap (GtkWidget *widget, GdkEvent *event, GtkHTML *html)
+toplevel_unmap (GtkWidget *widget,
+ GdkEvent *event,
+ GtkHTML *html)
{
html_image_factory_stop_animations (html->engine->image_factory);
@@ -1825,7 +1889,7 @@ toplevel_unmap (GtkWidget *widget, GdkEvent *event, GtkHTML *html)
static void
hierarchy_changed (GtkWidget *widget,
- GtkWidget *old_toplevel)
+ GtkWidget *old_toplevel)
{
GtkWidget *toplevel;
GtkHTMLPrivate *priv = GTK_HTML (widget)->priv;
@@ -1846,7 +1910,7 @@ hierarchy_changed (GtkWidget *widget,
static gint
visibility_notify_event (GtkWidget *widget,
- GdkEventVisibility *event)
+ GdkEventVisibility *event)
{
if (event->state == GDK_VISIBILITY_FULLY_OBSCURED)
html_image_factory_stop_animations (GTK_HTML (widget)->engine->image_factory);
@@ -1858,7 +1922,7 @@ visibility_notify_event (GtkWidget *widget,
static gint
button_press_event (GtkWidget *widget,
- GdkEventButton *event)
+ GdkEventButton *event)
{
GtkHTML *html;
GtkWidget *orig_widget = widget;
@@ -2050,7 +2114,7 @@ any_has_skip_update_cursor (GtkHTML *html)
static gint
button_release_event (GtkWidget *initial_widget,
- GdkEventButton *event)
+ GdkEventButton *event)
{
GtkWidget *widget;
GtkHTML *html;
@@ -2126,7 +2190,8 @@ button_release_event (GtkWidget *initial_widget,
}
static void
-gtk_html_keymap_direction_changed (GdkKeymap *keymap, GtkHTML *html)
+gtk_html_keymap_direction_changed (GdkKeymap *keymap,
+ GtkHTML *html)
{
if (html_engine_get_editable (html->engine)) {
html_engine_edit_set_direction (html->engine, html_text_direction_pango_to_html (gdk_keymap_get_direction (keymap)));
@@ -2171,7 +2236,7 @@ goto_caret_anchor (GtkHTML *html)
static gint
focus_in_event (GtkWidget *widget,
- GdkEventFocus *event)
+ GdkEventFocus *event)
{
GtkHTML *html = GTK_HTML (widget);
@@ -2199,7 +2264,7 @@ focus_in_event (GtkWidget *widget,
static gint
focus_out_event (GtkWidget *widget,
- GdkEventFocus *event)
+ GdkEventFocus *event)
{
GtkHTML *html = GTK_HTML (widget);
@@ -2220,7 +2285,8 @@ focus_out_event (GtkWidget *widget,
}
static gint
-enter_notify_event (GtkWidget *widget, GdkEventCrossing *event)
+enter_notify_event (GtkWidget *widget,
+ GdkEventCrossing *event)
{
GdkWindow *window;
gint x, y;
@@ -2260,7 +2326,11 @@ utf16_order (gboolean swap)
}
static gchar *
-get_selection_string (GtkHTML *html, gint *len, gboolean selection, gboolean primary, gboolean html_format)
+get_selection_string (GtkHTML *html,
+ gint *len,
+ gboolean selection,
+ gboolean primary,
+ gboolean html_format)
{
HTMLObject *selection_object = NULL;
gchar *selection_string = NULL;
@@ -2312,25 +2382,29 @@ get_selection_string (GtkHTML *html, gint *len, gboolean selection, gboolean pri
/* returned pointer should be freed with g_free */
gchar *
-gtk_html_get_selection_html (GtkHTML *html, gint *len)
+gtk_html_get_selection_html (GtkHTML *html,
+ gint *len)
{
return get_selection_string (html, len, TRUE, FALSE, TRUE);
}
/* returned pointer should be freed with g_free */
gchar *
-gtk_html_get_selection_plain_text (GtkHTML *html, gint *len)
+gtk_html_get_selection_plain_text (GtkHTML *html,
+ gint *len)
{
return get_selection_string (html, len, TRUE, FALSE, FALSE);
}
static gchar *
-utf16_to_utf8_with_bom_check (guchar *data, guint len) {
- const gchar *fromcode = NULL;
- GError *error = NULL;
- guint16 c;
- gsize read_len, written_len;
- gchar *utf8_ret;
+utf16_to_utf8_with_bom_check (guchar *data,
+ guint len) {
+ const gchar *fromcode = NULL;
+ GError *error = NULL;
+ guint16 c;
+ gsize read_len,
+ written_len;
+ gchar *utf8_ret;
/*
* Unicode Techinical Report 20
@@ -2340,48 +2414,51 @@ utf16_to_utf8_with_bom_check (guchar *data, guint len) {
* order
*/
- memcpy (&c, data, 2);
- switch (c) {
- case 0xfeff:
- case 0xfffe:
- fromcode = utf16_order (c == 0xfeff);
- data += 2;
- len -= 2;
- break;
- default:
+ memcpy (&c,
+ data,
+ 2);
+ switch (c) {
+ case 0xfeff:
+ case 0xfffe:
+ fromcode = utf16_order (c == 0xfeff);
+ data += 2;
+ len -= 2;
+ break;
+ default:
fromcode = "UTF-16";
- break;
- }
+ break;
+ }
utf8_ret = g_convert ((gchar *) data, len, "UTF-8", fromcode, &read_len, &written_len, &error);
- if (error) {
+ if (error) {
g_warning ("g_convert error: %s\n", error->message);
- g_error_free (error);
- }
- return (utf8_ret);
+ g_error_free (error);
+ }
+ return (utf8_ret);
}
/* removes useless leading BOM from UTF-8 string if present */
static gchar *
utf8_filter_out_bom (gchar *str) {
- if (!str)
- return NULL;
+ if (!str)
+ return NULL;
/* input is always valid, NUL-terminated UTF-8 sequence, we don't need
* to validated it again */
- if (g_utf8_get_char (str) == 0xfeff) {
- gchar *out = g_strdup (g_utf8_next_char (str));
- g_free (str);
- return out;
- }
+ if (g_utf8_get_char (str) == 0xfeff) {
+ gchar *out = g_strdup (g_utf8_next_char (str));
+ g_free (str);
+ return out;
+ }
- return str;
+ return str;
}
/* Initialization. */
static void
-set_focus_child (GtkContainer *containter, GtkWidget *w)
+set_focus_child (GtkContainer *containter,
+ GtkWidget *w)
{
HTMLObject *o = NULL;
@@ -2395,7 +2472,8 @@ set_focus_child (GtkContainer *containter, GtkWidget *w)
}
static gboolean
-focus (GtkWidget *w, GtkDirectionType direction)
+focus (GtkWidget *w,
+ GtkDirectionType direction)
{
HTMLEngine *e = GTK_HTML (w)->engine;
@@ -2449,20 +2527,20 @@ focus (GtkWidget *w, GtkDirectionType direction)
e->x_offset = x2 - e->width;
if (x1 < e->x_offset)
e->x_offset = x1;
- if (e->width > 2*RIGHT_BORDER && e->x_offset == x2 - e->width)
+ if (e->width > 2 * RIGHT_BORDER && e->x_offset == x2 - e->width)
e->x_offset = MIN (x2 - e->width + RIGHT_BORDER + 1,
html_engine_get_doc_width (e) - e->width);
- if (e->width > 2*LEFT_BORDER && e->x_offset >= x1)
+ if (e->width > 2 * LEFT_BORDER && e->x_offset >= x1)
e->x_offset = MAX (x1 - LEFT_BORDER, 0);
if (y2 >= e->y_offset + e->height)
e->y_offset = y2 - e->height + 1;
if (y1 < e->y_offset)
e->y_offset = y1;
- if (e->height > 2*BOTTOM_BORDER && e->y_offset == y2 - e->height + 1)
+ if (e->height > 2 * BOTTOM_BORDER && e->y_offset == y2 - e->height + 1)
e->y_offset = MIN (y2 - e->height + BOTTOM_BORDER + 1,
html_engine_get_doc_height (e) - e->height);
- if (e->height > 2*TOP_BORDER && e->y_offset >= y1)
+ if (e->height > 2 * TOP_BORDER && e->y_offset >= y1)
e->y_offset = MAX (y1 - TOP_BORDER, 0);
if (e->x_offset != xo) {
@@ -2478,7 +2556,7 @@ focus (GtkWidget *w, GtkDirectionType direction)
gtk_adjustment_set_value (adjustment, (gfloat) e->y_offset);
}
/* printf ("engine pos: %d,%d x %d,%d\n",
- e->x_offset, e->y_offset, e->x_offset + e->width, e->y_offset + e->height); */
+ * e->x_offset, e->y_offset, e->x_offset + e->width, e->y_offset + e->height); */
if (!gtk_widget_has_focus (w) && !html_object_is_embedded (obj))
gtk_widget_grab_focus (w);
@@ -2498,7 +2576,8 @@ focus (GtkWidget *w, GtkDirectionType direction)
/* dnd begin */
static void
-drag_begin (GtkWidget *widget, GdkDragContext *context)
+drag_begin (GtkWidget *widget,
+ GdkDragContext *context)
{
HTMLInterval *i;
HTMLObject *o;
@@ -2513,7 +2592,8 @@ drag_begin (GtkWidget *widget, GdkDragContext *context)
}
static void
-drag_end (GtkWidget *widget, GdkDragContext *context)
+drag_end (GtkWidget *widget,
+ GdkDragContext *context)
{
GtkHTML *html;
@@ -2526,7 +2606,11 @@ drag_end (GtkWidget *widget, GdkDragContext *context)
}
static void
-drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint time)
+drag_data_get (GtkWidget *widget,
+ GdkDragContext *context,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time)
{
/* printf ("drag_data_get\n"); */
switch (info) {
@@ -2596,14 +2680,17 @@ drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *sel
}
static void
-drag_data_delete (GtkWidget *widget, GdkDragContext *context)
+drag_data_delete (GtkWidget *widget,
+ GdkDragContext *context)
{
g_free (GTK_HTML (widget)->priv->dnd_url);
GTK_HTML (widget)->priv->dnd_url = NULL;
}
static gchar *
-next_uri (guchar **uri_list, gint *len, gint *list_len)
+next_uri (guchar **uri_list,
+ gint *len,
+ gint *list_len)
{
guchar *uri, *begin;
@@ -2626,7 +2713,10 @@ next_uri (guchar **uri_list, gint *len, gint *list_len)
}
static HTMLObject *
-new_img_obj_from_uri (HTMLEngine *e, gchar *uri, gchar *title, gint len)
+new_img_obj_from_uri (HTMLEngine *e,
+ gchar *uri,
+ gchar *title,
+ gint len)
{
if (!strncmp (uri, "file:", 5)) {
if (!HTML_IS_PLAIN_PAINTER (e->painter)) {
@@ -2649,7 +2739,9 @@ new_img_obj_from_uri (HTMLEngine *e, gchar *uri, gchar *title, gint len)
}
static void
-move_before_paste (GtkWidget *widget, gint x, gint y)
+move_before_paste (GtkWidget *widget,
+ gint x,
+ gint y)
{
HTMLEngine *engine = GTK_HTML (widget)->engine;
@@ -2671,8 +2763,13 @@ move_before_paste (GtkWidget *widget, gint x, gint y)
}
static void
-drag_data_received (GtkWidget *widget, GdkDragContext *context,
- gint x, gint y, GtkSelectionData *selection_data, guint info, guint time)
+drag_data_received (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time)
{
HTMLEngine *engine = GTK_HTML (widget)->engine;
GdkWindow *bin_window;
@@ -2727,7 +2824,11 @@ drag_data_received (GtkWidget *widget, GdkDragContext *context,
}
static gboolean
-drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint time)
+drag_motion (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time)
{
GdkWindow *window;
GdkWindow *bin_window;
@@ -2787,7 +2888,8 @@ settings_cursor_blink_changed (GSettings *settings,
}
static void
-gtk_html_direction_changed (GtkWidget *widget, GtkTextDirection previous_dir)
+gtk_html_direction_changed (GtkWidget *widget,
+ GtkTextDirection previous_dir)
{
GtkHTML *html = GTK_HTML (widget);
@@ -3207,7 +3309,9 @@ gtk_html_im_reset (GtkHTML *html)
}
static void
-gtk_html_im_commit_cb (GtkIMContext *context, const gchar *str, GtkHTML *html)
+gtk_html_im_commit_cb (GtkIMContext *context,
+ const gchar *str,
+ GtkHTML *html)
{
gboolean state = html->priv->im_block_reset;
gint pos;
@@ -3240,13 +3344,15 @@ gtk_html_im_commit_cb (GtkIMContext *context, const gchar *str, GtkHTML *html)
}
static void
-gtk_html_im_preedit_start_cb (GtkIMContext *context, GtkHTML *html)
+gtk_html_im_preedit_start_cb (GtkIMContext *context,
+ GtkHTML *html)
{
html->priv->im_pre_len = 0;
}
static void
-gtk_html_im_preedit_changed_cb (GtkIMContext *context, GtkHTML *html)
+gtk_html_im_preedit_changed_cb (GtkIMContext *context,
+ GtkHTML *html)
{
PangoAttrList *attrs;
gchar *preedit_string;
@@ -3312,7 +3418,7 @@ gtk_html_im_preedit_changed_cb (GtkIMContext *context, GtkHTML *html)
html_engine_selection_pop (html->engine);
}
/* that works for now, but idealy we should be able to have cursor positioned outside selection, so that preedit
- cursor is in the right place */
+ * cursor is in the right place */
if (html->priv->im_pre_len == 0)
html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine,
initial_position >= html->priv->im_pre_pos + deleted ? initial_position - deleted : initial_position);
@@ -3331,7 +3437,8 @@ gtk_html_im_preedit_changed_cb (GtkIMContext *context, GtkHTML *html)
}
static gchar *
-get_surrounding_text (HTMLEngine *e, gint *offset)
+get_surrounding_text (HTMLEngine *e,
+ gint *offset)
{
HTMLObject *o = e->cursor->object;
HTMLObject *prev;
@@ -3379,7 +3486,8 @@ get_surrounding_text (HTMLEngine *e, gint *offset)
}
static gboolean
-gtk_html_im_retrieve_surrounding_cb (GtkIMContext *context, GtkHTML *html)
+gtk_html_im_retrieve_surrounding_cb (GtkIMContext *context,
+ GtkHTML *html)
{
gint offset = 0;
gchar *text;
@@ -3399,7 +3507,10 @@ gtk_html_im_retrieve_surrounding_cb (GtkIMContext *context, GtkHTML *html)
}
static gboolean
-gtk_html_im_delete_surrounding_cb (GtkIMContext *slave, gint offset, gint n_chars, GtkHTML *html)
+gtk_html_im_delete_surrounding_cb (GtkIMContext *slave,
+ gint offset,
+ gint n_chars,
+ GtkHTML *html)
{
D_IM (printf ("IM gtk_html_im_delete_surrounding_cb\n");)
if (html_engine_get_editable (html->engine) && !html_engine_is_selection_active (html->engine)) {
@@ -3417,7 +3528,7 @@ gtk_html_im_delete_surrounding_cb (GtkIMContext *slave, gint offset, gint n_char
}
static void
-gtk_html_init (GtkHTML* html)
+gtk_html_init (GtkHTML *html)
{
GSettings *settings;
@@ -3569,7 +3680,8 @@ gtk_html_new (void)
**/
GtkWidget *
-gtk_html_new_from_string (const gchar *str, gint len)
+gtk_html_new_from_string (const gchar *str,
+ gint len)
{
GtkWidget *html;
@@ -3611,7 +3723,7 @@ gtk_html_construct (GtkHTML *html)
void
gtk_html_enable_debug (GtkHTML *html,
- gboolean debug)
+ gboolean debug)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -3622,7 +3734,7 @@ gtk_html_enable_debug (GtkHTML *html,
void
gtk_html_allow_selection (GtkHTML *html,
- gboolean allow)
+ gboolean allow)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -3643,10 +3755,10 @@ gtk_html_allow_selection (GtkHTML *html,
* Returns: a new GtkHTMLStream to specified frame
*/
GtkHTMLStream *
-gtk_html_begin_full (GtkHTML *html,
- gchar *target_frame,
- const gchar *content_type,
- GtkHTMLBeginFlags flags)
+gtk_html_begin_full (GtkHTML *html,
+ gchar *target_frame,
+ const gchar *content_type,
+ GtkHTMLBeginFlags flags)
{
GtkHTMLStream *handle;
@@ -3718,7 +3830,8 @@ gtk_html_begin (GtkHTML *html)
* Returns: a new GtkHTMLStream to store new content.
**/
GtkHTMLStream *
-gtk_html_begin_content (GtkHTML *html, const gchar *content_type)
+gtk_html_begin_content (GtkHTML *html,
+ const gchar *content_type)
{
g_return_val_if_fail (!gtk_html_get_editable (html), NULL);
@@ -3736,9 +3849,9 @@ gtk_html_begin_content (GtkHTML *html, const gchar *content_type)
**/
void
gtk_html_write (GtkHTML *html,
- GtkHTMLStream *handle,
- const gchar *buffer,
- gsize size)
+ GtkHTMLStream *handle,
+ const gchar *buffer,
+ gsize size)
{
gtk_html_stream_write (handle, buffer, size);
}
@@ -3754,8 +3867,8 @@ gtk_html_write (GtkHTML *html,
**/
void
gtk_html_end (GtkHTML *html,
- GtkHTMLStream *handle,
- GtkHTMLStreamStatus status)
+ GtkHTMLStream *handle,
+ GtkHTMLStreamStatus status)
{
gtk_html_stream_close (handle, status);
}
@@ -3803,7 +3916,8 @@ gtk_html_get_title (GtkHTML *html)
*
**/
void
-gtk_html_set_title (GtkHTML *html, const gchar *title)
+gtk_html_set_title (GtkHTML *html,
+ const gchar *title)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -3823,7 +3937,7 @@ gtk_html_set_title (GtkHTML *html, const gchar *title)
**/
gboolean
gtk_html_jump_to_anchor (GtkHTML *html,
- const gchar *anchor)
+ const gchar *anchor)
{
g_return_val_if_fail (html != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HTML (html), FALSE);
@@ -3834,8 +3948,8 @@ gtk_html_jump_to_anchor (GtkHTML *html,
gboolean
gtk_html_save (GtkHTML *html,
- GtkHTMLSaveReceiverFn receiver,
- gpointer data)
+ GtkHTMLSaveReceiverFn receiver,
+ gpointer data)
{
g_return_val_if_fail (html != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HTML (html), FALSE);
@@ -3859,9 +3973,9 @@ gtk_html_save (GtkHTML *html,
**/
gboolean
gtk_html_export (GtkHTML *html,
- const gchar *content_type,
- GtkHTMLSaveReceiverFn receiver,
- gpointer user_data)
+ const gchar *content_type,
+ GtkHTMLSaveReceiverFn receiver,
+ gpointer user_data)
{
g_return_val_if_fail (html != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HTML (html), FALSE);
@@ -3881,9 +3995,12 @@ gtk_html_export (GtkHTML *html,
static void
gtk_html_update_scrollbars_on_resize (GtkHTML *html,
- gdouble old_doc_width, gdouble old_doc_height,
- gdouble old_width, gdouble old_height,
- gboolean *changed_x, gboolean *changed_y)
+ gdouble old_doc_width,
+ gdouble old_doc_height,
+ gdouble old_width,
+ gdouble old_height,
+ gboolean *changed_x,
+ gboolean *changed_y)
{
GtkAdjustment *vadj, *hadj;
gdouble doc_width, doc_height;
@@ -3919,7 +4036,9 @@ gtk_html_update_scrollbars_on_resize (GtkHTML *html,
}
void
-gtk_html_private_calc_scrollbars (GtkHTML *html, gboolean *changed_x, gboolean *changed_y)
+gtk_html_private_calc_scrollbars (GtkHTML *html,
+ gboolean *changed_x,
+ gboolean *changed_y)
{
GtkLayout *layout;
GtkAdjustment *vadj, *hadj;
@@ -3973,10 +4092,10 @@ gtk_html_private_calc_scrollbars (GtkHTML *html, gboolean *changed_x, gboolean *
#ifdef USE_PROPS
static void
-gtk_html_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+gtk_html_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GtkHTML *html = GTK_HTML (object);
@@ -4000,10 +4119,10 @@ gtk_html_set_property (GObject *object,
}
static void
-gtk_html_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+gtk_html_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
GtkHTML *html = GTK_HTML (object);
@@ -4029,7 +4148,7 @@ gtk_html_get_property (GObject *object,
void
gtk_html_set_editable (GtkHTML *html,
- gboolean editable)
+ gboolean editable)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4041,7 +4160,7 @@ gtk_html_set_editable (GtkHTML *html,
}
gboolean
-gtk_html_get_editable (const GtkHTML *html)
+gtk_html_get_editable (const GtkHTML *html)
{
g_return_val_if_fail (html != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HTML (html), FALSE);
@@ -4051,7 +4170,7 @@ gtk_html_get_editable (const GtkHTML *html)
void
gtk_html_set_inline_spelling (GtkHTML *html,
- gboolean inline_spell)
+ gboolean inline_spell)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4079,7 +4198,7 @@ gtk_html_get_inline_spelling (const GtkHTML *html)
void
gtk_html_set_magic_links (GtkHTML *html,
- gboolean links)
+ gboolean links)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4098,7 +4217,7 @@ gtk_html_get_magic_links (const GtkHTML *html)
void
gtk_html_set_magic_smileys (GtkHTML *html,
- gboolean smile)
+ gboolean smile)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4116,7 +4235,9 @@ gtk_html_get_magic_smileys (const GtkHTML *html)
}
static void
-frame_set_animate (HTMLObject *o, HTMLEngine *e, gpointer data)
+frame_set_animate (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (HTML_IS_FRAME (o)) {
html_image_factory_set_animate (GTK_HTML (HTML_FRAME (o)->html)->engine->image_factory,
@@ -4128,7 +4249,8 @@ frame_set_animate (HTMLObject *o, HTMLEngine *e, gpointer data)
}
void
-gtk_html_set_caret_mode (GtkHTML * html, gboolean caret_mode)
+gtk_html_set_caret_mode (GtkHTML *html,
+ gboolean caret_mode)
{
g_return_if_fail (GTK_IS_HTML (html));
g_return_if_fail (HTML_IS_ENGINE (html->engine));
@@ -4156,7 +4278,8 @@ gtk_html_get_caret_mode (const GtkHTML *html)
* or NULL to not look for the anchor.
**/
void
-gtk_html_set_caret_first_focus_anchor (GtkHTML *html, const gchar *name)
+gtk_html_set_caret_first_focus_anchor (GtkHTML *html,
+ const gchar *name)
{
g_return_if_fail (GTK_IS_HTML (html));
g_return_if_fail (html->priv != NULL);
@@ -4166,7 +4289,8 @@ gtk_html_set_caret_first_focus_anchor (GtkHTML *html, const gchar *name)
}
void
-gtk_html_set_animate (GtkHTML *html, gboolean animate)
+gtk_html_set_animate (GtkHTML *html,
+ gboolean animate)
{
g_return_if_fail (GTK_IS_HTML (html));
g_return_if_fail (HTML_IS_ENGINE (html->engine));
@@ -4195,7 +4319,9 @@ gtk_html_load_empty (GtkHTML *html)
}
void
-gtk_html_load_from_string (GtkHTML *html, const gchar *str, gint len)
+gtk_html_load_from_string (GtkHTML *html,
+ const gchar *str,
+ gint len)
{
GtkHTMLStream *stream;
@@ -4205,7 +4331,8 @@ gtk_html_load_from_string (GtkHTML *html, const gchar *str, gint len)
}
void
-gtk_html_set_base (GtkHTML *html, const gchar *url)
+gtk_html_set_base (GtkHTML *html,
+ const gchar *url)
{
g_return_if_fail (GTK_IS_HTML (html));
@@ -4224,7 +4351,8 @@ gtk_html_get_base (GtkHTML *html)
/* Printing. */
void
-gtk_html_print_page (GtkHTML *html, GtkPrintContext *context)
+gtk_html_print_page (GtkHTML *html,
+ GtkPrintContext *context)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4234,12 +4362,12 @@ gtk_html_print_page (GtkHTML *html, GtkPrintContext *context)
void
gtk_html_print_page_with_header_footer (GtkHTML *html,
- GtkPrintContext *context,
- gdouble header_height,
- gdouble footer_height,
- GtkHTMLPrintCallback header_print,
- GtkHTMLPrintCallback footer_print,
- gpointer user_data)
+ GtkPrintContext *context,
+ gdouble header_height,
+ gdouble footer_height,
+ GtkHTMLPrintCallback header_print,
+ GtkHTMLPrintCallback footer_print,
+ gpointer user_data)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4254,7 +4382,7 @@ gtk_html_print_page_with_header_footer (GtkHTML *html,
void
gtk_html_set_paragraph_style (GtkHTML *html,
- GtkHTMLParagraphStyle style)
+ GtkHTMLParagraphStyle style)
{
HTMLClueFlowStyle current_style;
HTMLClueFlowStyle clueflow_style;
@@ -4302,7 +4430,7 @@ gtk_html_get_paragraph_indentation (GtkHTML *html)
void
gtk_html_set_indent (GtkHTML *html,
- GByteArray *levels)
+ GByteArray *levels)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4317,7 +4445,8 @@ gtk_html_set_indent (GtkHTML *html,
static void
gtk_html_modify_indent_by_delta (GtkHTML *html,
- gint delta, guint8 *levels)
+ gint delta,
+ guint8 *levels)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4329,7 +4458,8 @@ gtk_html_modify_indent_by_delta (GtkHTML *html,
}
void
-gtk_html_indent_push_level (GtkHTML *html, HTMLListType level_type)
+gtk_html_indent_push_level (GtkHTML *html,
+ HTMLListType level_type)
{
guint8 type = (guint8) level_type;
gtk_html_modify_indent_by_delta (html, +1, &type);
@@ -4343,8 +4473,8 @@ gtk_html_indent_pop_level (GtkHTML *html)
void
gtk_html_set_font_style (GtkHTML *html,
- GtkHTMLFontStyle and_mask,
- GtkHTMLFontStyle or_mask)
+ GtkHTMLFontStyle and_mask,
+ GtkHTMLFontStyle or_mask)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4354,7 +4484,8 @@ gtk_html_set_font_style (GtkHTML *html,
}
void
-gtk_html_set_color (GtkHTML *html, HTMLColor *color)
+gtk_html_set_color (GtkHTML *html,
+ HTMLColor *color)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4365,7 +4496,7 @@ gtk_html_set_color (GtkHTML *html, HTMLColor *color)
void
gtk_html_toggle_font_style (GtkHTML *html,
- GtkHTMLFontStyle style)
+ GtkHTMLFontStyle style)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4380,16 +4511,15 @@ gtk_html_toggle_font_style (GtkHTML *html,
GtkHTMLParagraphAlignment
gtk_html_get_paragraph_alignment (GtkHTML *html)
{
- /* This makes the function return a HTMLHalignType. Should the blow call really be
- * html_alignment_to_paragraph()?
- */
+ /* This makes the function return a HTMLHalignType. Should the below
+ * call really be html_alignment_to_paragraph()? */
return paragraph_alignment_to_html (html_engine_get_current_clueflow_alignment (html->engine));
}
void
gtk_html_set_paragraph_alignment (GtkHTML *html,
- GtkHTMLParagraphAlignment alignment)
+ GtkHTMLParagraphAlignment alignment)
{
HTMLHAlignType align;
@@ -4423,10 +4553,10 @@ free_contents (ClipboardContents *contents)
}
static void
-clipboard_get_contents_cb (GtkClipboard *clipboard,
+clipboard_get_contents_cb (GtkClipboard *clipboard,
GtkSelectionData *selection_data,
- guint info,
- gpointer data)
+ guint info,
+ gpointer data)
{
ClipboardContents *contents = (ClipboardContents *) data;
@@ -4444,7 +4574,7 @@ clipboard_get_contents_cb (GtkClipboard *clipboard,
static void
clipboard_clear_contents_cb (GtkClipboard *clipboard,
- gpointer data)
+ gpointer data)
{
ClipboardContents *contents = (ClipboardContents *) data;
@@ -4452,9 +4582,9 @@ clipboard_clear_contents_cb (GtkClipboard *clipboard,
}
static void
-clipboard_paste_received_cb (GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- gpointer user_data)
+clipboard_paste_received_cb (GtkClipboard *clipboard,
+ GtkSelectionData *selection_data,
+ gpointer user_data)
{
gint i = 0;
GtkWidget *widget = GTK_WIDGET (user_data);
@@ -4608,7 +4738,8 @@ gtk_html_copy (GtkHTML *html)
}
void
-gtk_html_paste (GtkHTML *html, gboolean as_cite)
+gtk_html_paste (GtkHTML *html,
+ gboolean as_cite)
{
g_return_if_fail (html != NULL);
g_return_if_fail (GTK_IS_HTML (html));
@@ -4672,7 +4803,8 @@ gtk_html_redo (GtkHTML *html)
/* misc utils */
/* if engine_type == false - default behaviour*/
void
-gtk_html_set_default_engine (GtkHTML *html, gboolean engine_type)
+gtk_html_set_default_engine (GtkHTML *html,
+ gboolean engine_type)
{
html_engine_set_engine_type ( html->engine, engine_type);
}
@@ -4684,7 +4816,8 @@ gtk_html_get_default_engine (GtkHTML *html)
}
void
-gtk_html_set_default_content_type (GtkHTML *html, const gchar *content_type)
+gtk_html_set_default_content_type (GtkHTML *html,
+ const gchar *content_type)
{
html_engine_set_content_type ( html->engine, content_type);
}
@@ -4696,7 +4829,8 @@ gtk_html_get_default_content_type (GtkHTML *html)
}
gpointer
-gtk_html_get_object_by_id (GtkHTML *html, const gchar *id)
+gtk_html_get_object_by_id (GtkHTML *html,
+ const gchar *id)
{
g_return_val_if_fail (html, NULL);
g_return_val_if_fail (id, NULL);
@@ -4707,9 +4841,9 @@ gtk_html_get_object_by_id (GtkHTML *html, const gchar *id)
}
/*******************************************
-
- keybindings
-
+ *
+ * keybindings
+ *
*/
static gint
@@ -4729,9 +4863,9 @@ get_line_height (GtkHTML *html)
static void
scroll (GtkHTML *html,
- GtkOrientation orientation,
- GtkScrollType scroll_type,
- gfloat position)
+ GtkOrientation orientation,
+ GtkScrollType scroll_type,
+ gfloat position)
{
GtkAdjustment *adjustment;
gint line_height;
@@ -4802,7 +4936,7 @@ scroll (GtkHTML *html,
static gboolean
scroll_command (GtkHTML *html,
- GtkScrollType scroll_type)
+ GtkScrollType scroll_type)
{
GtkAdjustment *adjustment;
gint line_height;
@@ -4858,7 +4992,8 @@ scroll_command (GtkHTML *html,
}
static void
-scroll_by_amount (GtkHTML *html, gint amount)
+scroll_by_amount (GtkHTML *html,
+ gint amount)
{
GtkAdjustment *adjustment;
gdouble value;
@@ -4878,7 +5013,9 @@ scroll_by_amount (GtkHTML *html, gint amount)
}
static void
-cursor_move (GtkHTML *html, GtkDirectionType dir_type, GtkHTMLCursorSkipType skip)
+cursor_move (GtkHTML *html,
+ GtkDirectionType dir_type,
+ GtkHTMLCursorSkipType skip)
{
gint amount;
@@ -4991,7 +5128,8 @@ cursor_move (GtkHTML *html, GtkDirectionType dir_type, GtkHTMLCursorSkipType ski
}
static gboolean
-move_selection (GtkHTML *html, GtkHTMLCommandType com_type)
+move_selection (GtkHTML *html,
+ GtkHTMLCommandType com_type)
{
GtkAllocation allocation;
gboolean rv;
@@ -5069,7 +5207,8 @@ move_selection (GtkHTML *html, GtkHTMLCommandType com_type)
}
inline static void
-delete_one (HTMLEngine *e, gboolean forward)
+delete_one (HTMLEngine *e,
+ gboolean forward)
{
if (e->cursor->object && html_object_is_container (e->cursor->object)
&& ((forward && !e->cursor->offset) || (!forward && e->cursor->offset)))
@@ -5101,7 +5240,8 @@ indent_more_or_next_cell (GtkHTML *html)
}
static gboolean
-command (GtkHTML *html, GtkHTMLCommandType com_type)
+command (GtkHTML *html,
+ GtkHTMLCommandType com_type)
{
HTMLEngine *e = html->engine;
gboolean rv = TRUE;
@@ -5848,7 +5988,9 @@ add_bindings (GtkHTMLClass *klass)
}
gint
-gtk_html_set_iframe_parent (GtkHTML *html, GtkWidget *parent, HTMLObject *frame)
+gtk_html_set_iframe_parent (GtkHTML *html,
+ GtkWidget *parent,
+ HTMLObject *frame)
{
GtkWidget *top_level;
gint depth = 0;
@@ -5922,8 +6064,8 @@ gtk_html_select_paragraph (GtkHTML *html)
if (html_engine_get_editable (e))
html_engine_select_paragraph_editable (e);
/* FIXME: does anybody need this? if so bother me. rodo
- else
- html_engine_select_paragraph (e); */
+ * else
+ * html_engine_select_paragraph (e); */
html_engine_update_selection_active_state (html->engine, html->priv->event_time);
update_primary_selection (html);
@@ -5941,8 +6083,8 @@ gtk_html_select_paragraph_extended (GtkHTML *html)
if (html_engine_get_editable (e))
html_engine_select_paragraph_extended (e);
/* FIXME: does anybody need this? if so bother me. rodo
- else
- html_engine_select_paragraph (e); */
+ * else
+ * html_engine_select_paragraph (e); */
html_engine_update_selection_active_state (html->engine, html->priv->event_time);
update_primary_selection (html);
@@ -5993,7 +6135,9 @@ gtk_html_api_set_language (GtkHTML *html)
}
void
-gtk_html_set_editor_api (GtkHTML *html, GtkHTMLEditorAPI *api, gpointer data)
+gtk_html_set_editor_api (GtkHTML *html,
+ GtkHTMLEditorAPI *api,
+ gpointer data)
{
html->editor_api = api;
html->editor_data = data;
@@ -6019,7 +6163,9 @@ get_value_nick (GtkHTMLCommandType com_type)
}
void
-gtk_html_editor_event_command (GtkHTML *html, GtkHTMLCommandType com_type, gboolean before)
+gtk_html_editor_event_command (GtkHTML *html,
+ GtkHTMLCommandType com_type,
+ gboolean before)
{
GValue arg;
@@ -6034,7 +6180,9 @@ gtk_html_editor_event_command (GtkHTML *html, GtkHTMLCommandType com_type, gbool
}
void
-gtk_html_editor_event (GtkHTML *html, GtkHTMLEditorEventType event, GValue *args)
+gtk_html_editor_event (GtkHTML *html,
+ GtkHTMLEditorEventType event,
+ GValue *args)
{
GValue *retval = NULL;
@@ -6048,7 +6196,8 @@ gtk_html_editor_event (GtkHTML *html, GtkHTMLEditorEventType event, GValue *args
}
gboolean
-gtk_html_command (GtkHTML *html, const gchar *command_name)
+gtk_html_command (GtkHTML *html,
+ const gchar *command_name)
{
GEnumClass *class;
GEnumValue *val;
@@ -6100,7 +6249,9 @@ gtk_html_build_with_gconf (void)
}
static void
-reparent_embedded (HTMLObject *o, HTMLEngine *e, gpointer data)
+reparent_embedded (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (html_object_is_embedded (o)) {
HTMLEmbedded *eo = HTML_EMBEDDED (o);
@@ -6133,7 +6284,10 @@ reparent_embedded (HTMLObject *o, HTMLEngine *e, gpointer data)
}
static void
-gtk_html_insert_html_generic (GtkHTML *html, GtkHTML *tmp, const gchar *html_src, gboolean obj_only)
+gtk_html_insert_html_generic (GtkHTML *html,
+ GtkHTML *tmp,
+ const gchar *html_src,
+ gboolean obj_only)
{
GtkWidget *window, *sw;
HTMLObject *o;
@@ -6193,7 +6347,8 @@ gtk_html_insert_html_generic (GtkHTML *html, GtkHTML *tmp, const gchar *html_src
}
void
-gtk_html_insert_html (GtkHTML *html, const gchar *html_src)
+gtk_html_insert_html (GtkHTML *html,
+ const gchar *html_src)
{
g_return_if_fail (GTK_IS_HTML (html));
@@ -6201,7 +6356,8 @@ gtk_html_insert_html (GtkHTML *html, const gchar *html_src)
}
void
-gtk_html_insert_gtk_html (GtkHTML *html, GtkHTML *to_be_destroyed)
+gtk_html_insert_gtk_html (GtkHTML *html,
+ GtkHTML *to_be_destroyed)
{
g_return_if_fail (GTK_IS_HTML (html));
@@ -6209,7 +6365,8 @@ gtk_html_insert_gtk_html (GtkHTML *html, GtkHTML *to_be_destroyed)
}
void
-gtk_html_append_html (GtkHTML *html, const gchar *html_src)
+gtk_html_append_html (GtkHTML *html,
+ const gchar *html_src)
{
g_return_if_fail (GTK_IS_HTML (html));
@@ -6217,7 +6374,9 @@ gtk_html_append_html (GtkHTML *html, const gchar *html_src)
}
static void
-set_magnification (HTMLObject *o, HTMLEngine *e, gpointer data)
+set_magnification (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (HTML_IS_FRAME (o)) {
html_font_manager_set_magnification (>K_HTML (HTML_FRAME (o)->html)->engine->painter->font_manager,
@@ -6230,13 +6389,14 @@ set_magnification (HTMLObject *o, HTMLEngine *e, gpointer data)
}
void
-gtk_html_set_magnification (GtkHTML *html, gdouble magnification)
+gtk_html_set_magnification (GtkHTML *html,
+ gdouble magnification)
{
g_return_if_fail (GTK_IS_HTML (html));
if (magnification > 0.05 && magnification < 20.0
- && magnification * html->engine->painter->font_manager.var_size >= 4*PANGO_SCALE
- && magnification * html->engine->painter->font_manager.fix_size >= 4*PANGO_SCALE) {
+ && magnification * html->engine->painter->font_manager.var_size >= 4 * PANGO_SCALE
+ && magnification * html->engine->painter->font_manager.fix_size >= 4 * PANGO_SCALE) {
html_font_manager_set_magnification (&html->engine->painter->font_manager, magnification);
if (html->engine->clue) {
html_object_forall (html->engine->clue, html->engine,
@@ -6264,7 +6424,7 @@ gtk_html_zoom_out (GtkHTML *html)
g_return_if_fail (GTK_IS_HTML (html));
g_return_if_fail (HTML_IS_ENGINE (html->engine));
- gtk_html_set_magnification (html, html->engine->painter->font_manager.magnification * (1.0/MAG_STEP));
+ gtk_html_set_magnification (html, html->engine->painter->font_manager.magnification * (1.0 / MAG_STEP));
}
void
@@ -6276,7 +6436,8 @@ gtk_html_zoom_reset (GtkHTML *html)
}
void
-gtk_html_set_allow_frameset (GtkHTML *html, gboolean allow)
+gtk_html_set_allow_frameset (GtkHTML *html,
+ gboolean allow)
{
g_return_if_fail (GTK_IS_HTML (html));
g_return_if_fail (HTML_IS_ENGINE (html->engine));
@@ -6306,40 +6467,45 @@ gtk_html_images_unref (GtkHTML *html)
}
void
-gtk_html_image_ref (GtkHTML *html, const gchar *url)
+gtk_html_image_ref (GtkHTML *html,
+ const gchar *url)
{
html_image_factory_ref_image_ptr (HTML_IMAGE_FACTORY (html->engine->image_factory), url);
}
void
-gtk_html_image_unref (GtkHTML *html, const gchar *url)
+gtk_html_image_unref (GtkHTML *html,
+ const gchar *url)
{
html_image_factory_unref_image_ptr (HTML_IMAGE_FACTORY (html->engine->image_factory), url);
}
void
-gtk_html_image_preload (GtkHTML *html, const gchar *url)
+gtk_html_image_preload (GtkHTML *html,
+ const gchar *url)
{
html_image_factory_register (HTML_IMAGE_FACTORY (html->engine->image_factory), NULL, url, FALSE);
}
void
-gtk_html_set_blocking (GtkHTML *html, gboolean block)
+gtk_html_set_blocking (GtkHTML *html,
+ gboolean block)
{
html->engine->block = block;
}
void
-gtk_html_set_images_blocking (GtkHTML *html, gboolean block)
+gtk_html_set_images_blocking (GtkHTML *html,
+ gboolean block)
{
html->engine->block_images = block;
}
gint
gtk_html_print_page_get_pages_num (GtkHTML *html,
- GtkPrintContext *context,
- gdouble header_height,
- gdouble footer_height)
+ GtkPrintContext *context,
+ gdouble header_height,
+ gdouble footer_height)
{
return html_engine_print_get_pages_num (
html->engine, context, header_height, footer_height);
@@ -6350,8 +6516,8 @@ gtk_html_print_operation_run (GtkHTML *html,
GtkPrintOperation *operation,
GtkPrintOperationAction action,
GtkWindow *parent,
- GtkHTMLPrintCalcHeight calc_header_height,
- GtkHTMLPrintCalcHeight calc_footer_height,
+ GtkHTMLPrintCalcHeight calc_header_height,
+ GtkHTMLPrintCalcHeight calc_footer_height,
GtkHTMLPrintDrawFunc draw_header,
GtkHTMLPrintDrawFunc draw_footer,
gpointer user_data,
@@ -6382,7 +6548,9 @@ gtk_html_flush (GtkHTML *html)
}
const gchar *
-gtk_html_get_object_id_at (GtkHTML *html, gint x, gint y)
+gtk_html_get_object_id_at (GtkHTML *html,
+ gint x,
+ gint y)
{
HTMLObject *o = html_engine_get_object_at (html->engine, x, y, NULL, FALSE);
const gchar *id = NULL;
@@ -6398,7 +6566,9 @@ gtk_html_get_object_id_at (GtkHTML *html, gint x, gint y)
}
gchar *
-gtk_html_get_url_at (GtkHTML *html, gint x, gint y)
+gtk_html_get_url_at (GtkHTML *html,
+ gint x,
+ gint y)
{
HTMLObject *obj;
gint offset;
@@ -6434,7 +6604,9 @@ gtk_html_get_cursor_url (GtkHTML *html)
}
gchar *
-gtk_html_get_image_src_at (GtkHTML *html, gint x, gint y)
+gtk_html_get_image_src_at (GtkHTML *html,
+ gint x,
+ gint y)
{
HTMLObject *obj;
gint offset;
@@ -6444,7 +6616,7 @@ gtk_html_get_image_src_at (GtkHTML *html, gint x, gint y)
obj = html_engine_get_object_at (html->engine, x, y, (guint *) &offset, FALSE);
if (obj && HTML_IS_IMAGE (obj)) {
- HTMLImage *image = (HTMLImage*) obj;
+ HTMLImage *image = (HTMLImage *) obj;
if (!image->image_ptr)
return NULL;
@@ -6457,7 +6629,9 @@ gtk_html_get_image_src_at (GtkHTML *html, gint x, gint y)
/* Unref when done with it */
GdkPixbufAnimation *
-gtk_html_get_image_at (GtkHTML *html, gint x, gint y)
+gtk_html_get_image_at (GtkHTML *html,
+ gint x,
+ gint y)
{
HTMLObject *obj;
gint offset;
@@ -6467,7 +6641,7 @@ gtk_html_get_image_at (GtkHTML *html, gint x, gint y)
obj = html_engine_get_object_at (html->engine, x, y, (guint *) &offset, FALSE);
if (obj && HTML_IS_IMAGE (obj)) {
- HTMLImage *image = (HTMLImage*) obj;
+ HTMLImage *image = (HTMLImage *) obj;
if (!image->image_ptr || !image->image_ptr->animation)
return NULL;
@@ -6493,7 +6667,7 @@ gtk_html_get_cursor_image_src (GtkHTML *html)
obj = html_engine_get_focus_object (html->engine, &offset);
if (obj && HTML_IS_IMAGE (obj)) {
- HTMLImage *image = (HTMLImage*) obj;
+ HTMLImage *image = (HTMLImage *) obj;
if (!image->image_ptr)
return NULL;
@@ -6505,7 +6679,8 @@ gtk_html_get_cursor_image_src (GtkHTML *html)
}
void
-gtk_html_set_tokenizer (GtkHTML *html, HTMLTokenizer *tokenizer)
+gtk_html_set_tokenizer (GtkHTML *html,
+ HTMLTokenizer *tokenizer)
{
g_return_if_fail (GTK_IS_HTML (html));
@@ -6513,7 +6688,9 @@ gtk_html_set_tokenizer (GtkHTML *html, HTMLTokenizer *tokenizer)
}
gboolean
-gtk_html_get_cursor_pos (GtkHTML *html, gint *position, gint *offset)
+gtk_html_get_cursor_pos (GtkHTML *html,
+ gint *position,
+ gint *offset)
{
gboolean read = FALSE;
@@ -6755,7 +6932,8 @@ static const gchar *const tests[][3] = {
};
gint
-main (gint argc, gchar **argv)
+main (gint argc,
+ gchar **argv)
{
gint failures = 0;
gint i;
diff --git a/gtkhtml/gtkhtml.h b/gtkhtml/gtkhtml.h
index 9ba5c2a..25d1781 100644
--- a/gtkhtml/gtkhtml.h
+++ b/gtkhtml/gtkhtml.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GTKHTML_H_
@@ -47,7 +47,7 @@ struct _GtkHTML {
HTMLEngine *engine;
/* The URL of the link over which the pointer currently is. NULL if
- the pointer is not over a link. */
+ * the pointer is not over a link. */
gchar *pointer_url;
/* The cursors we use within the widget. */
diff --git a/gtkhtml/gtkhtmldebug.c b/gtkhtml/gtkhtmldebug.c
index 2e9d9ab..cff716c 100644
--- a/gtkhtml/gtkhtmldebug.c
+++ b/gtkhtml/gtkhtmldebug.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/* Various debugging routines. */
@@ -58,8 +58,8 @@
**/
void
gtk_html_debug_log (GtkHTML *html,
- const gchar *format,
- ...)
+ const gchar *format,
+ ...)
{
va_list ap;
@@ -118,7 +118,7 @@ direction_to_string (HTMLDirection dir)
void
gtk_html_debug_dump_table (HTMLObject *o,
- gint level)
+ gint level)
{
gint c, r;
HTMLTable *table = HTML_TABLE (o);
@@ -132,7 +132,8 @@ gtk_html_debug_dump_table (HTMLObject *o,
}
static void
-gtk_html_debug_dump_table_simple (HTMLObject *o, gint level)
+gtk_html_debug_dump_table_simple (HTMLObject *o,
+ gint level)
{
gint c, r;
HTMLTable *table = HTML_TABLE (o);
@@ -147,7 +148,7 @@ gtk_html_debug_dump_table_simple (HTMLObject *o, gint level)
void
gtk_html_debug_dump_object (HTMLObject *obj,
- gint level)
+ gint level)
{
gint i;
for (i = 0; i < level; i++)
@@ -302,7 +303,7 @@ gtk_html_debug_dump_object (HTMLObject *obj,
void
gtk_html_debug_dump_tree (HTMLObject *o,
- gint level)
+ gint level)
{
HTMLObject *obj;
@@ -314,7 +315,9 @@ gtk_html_debug_dump_tree (HTMLObject *o,
}
static void
-dump_data (GQuark key_id, gpointer data, gpointer user_data)
+dump_data (GQuark key_id,
+ gpointer data,
+ gpointer user_data)
{
gint i, level = GPOINTER_TO_INT (user_data);
@@ -326,7 +329,7 @@ dump_data (GQuark key_id, gpointer data, gpointer user_data)
static void
dump_object_simple (HTMLObject *obj,
- gint level)
+ gint level)
{
gint i;
@@ -343,7 +346,7 @@ dump_object_simple (HTMLObject *obj,
HTMLTextSlave *slave = HTML_TEXT_SLAVE (obj);
gchar *text;
- text = alloca (slave->posLen+1);
+ text = alloca (slave->posLen + 1);
text[slave->posLen] = 0;
strncpy (text, slave->owner->text + slave->posStart, slave->posLen);
g_print ("%s `%s'\n",
@@ -376,7 +379,7 @@ gtk_html_debug_dump_object_type (HTMLObject *o)
void
gtk_html_debug_dump_tree_simple (HTMLObject *o,
- gint level)
+ gint level)
{
HTMLObject *obj;
@@ -405,7 +408,7 @@ gtk_html_debug_dump_tree_simple (HTMLObject *o,
void
gtk_html_debug_dump_list_simple (GList *list,
- gint level)
+ gint level)
{
HTMLObject *obj;
GList *p;
diff --git a/gtkhtml/gtkhtmldebug.h b/gtkhtml/gtkhtmldebug.h
index ff04acc..c95da39 100644
--- a/gtkhtml/gtkhtmldebug.h
+++ b/gtkhtml/gtkhtmldebug.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _GTKHTML_DEBUG_H_
diff --git a/gtkhtml/gtkhtmlfontstyle.c b/gtkhtml/gtkhtmlfontstyle.c
index 90ac3b7..34e2dc5 100644
--- a/gtkhtml/gtkhtmlfontstyle.c
+++ b/gtkhtml/gtkhtmlfontstyle.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -25,7 +25,7 @@
GtkHTMLFontStyle
gtk_html_font_style_merge (GtkHTMLFontStyle a,
- GtkHTMLFontStyle b)
+ GtkHTMLFontStyle b)
{
GtkHTMLFontStyle retval;
diff --git a/gtkhtml/gtkhtmlfontstyle.h b/gtkhtml/gtkhtmlfontstyle.h
index 84a1d8f..a9f2e69 100644
--- a/gtkhtml/gtkhtmlfontstyle.h
+++ b/gtkhtml/gtkhtmlfontstyle.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLFONTSTYLE_H
diff --git a/gtkhtml/htmlanchor.c b/gtkhtml/htmlanchor.c
index d830138..bc5cd51 100644
--- a/gtkhtml/htmlanchor.c
+++ b/gtkhtml/htmlanchor.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -54,7 +54,10 @@ copy (HTMLObject *self,
}
static HTMLAnchor *
-find_anchor (HTMLObject *o, const gchar *name, gint *x, gint *y)
+find_anchor (HTMLObject *o,
+ const gchar *name,
+ gint *x,
+ gint *y)
{
if (strcmp (name, HTML_ANCHOR (o)->name->str) == 0) {
*x += o->x;
@@ -67,16 +70,19 @@ find_anchor (HTMLObject *o, const gchar *name, gint *x, gint *y)
static HTMLObject *
check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
return NULL;
}
static gboolean
-html_anchor_real_calc_size (HTMLObject *self, HTMLPainter *painter, GList **changed_objs)
+html_anchor_real_calc_size (HTMLObject *self,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
self->width = 0;
self->ascent = 1;
@@ -93,8 +99,8 @@ html_anchor_type_init (void)
void
html_anchor_class_init (HTMLAnchorClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
HTMLObjectClass *object_class;
@@ -113,8 +119,8 @@ html_anchor_class_init (HTMLAnchorClass *klass,
void
html_anchor_init (HTMLAnchor *anchor,
- HTMLAnchorClass *klass,
- const gchar *name)
+ HTMLAnchorClass *klass,
+ const gchar *name)
{
html_object_init (HTML_OBJECT (anchor), HTML_OBJECT_CLASS (klass));
diff --git a/gtkhtml/htmlanchor.h b/gtkhtml/htmlanchor.h
index 10d1524..9829b4f 100644
--- a/gtkhtml/htmlanchor.h
+++ b/gtkhtml/htmlanchor.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLANCHOR_H
diff --git a/gtkhtml/htmlbutton.c b/gtkhtml/htmlbutton.c
index 535cdd2..3d934f9 100644
--- a/gtkhtml/htmlbutton.c
+++ b/gtkhtml/htmlbutton.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -32,7 +32,8 @@ static HTMLEmbeddedClass *parent_class = NULL;
static void
-clicked_event (GtkWidget *widget, gpointer data)
+clicked_event (GtkWidget *widget,
+ gpointer data)
{
HTMLButton *b = HTML_BUTTON (data);
HTMLEmbedded *e = HTML_EMBEDDED (data);
@@ -95,8 +96,8 @@ html_button_type_init (void)
void
html_button_class_init (HTMLButtonClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
HTMLEmbeddedClass *element_class;
HTMLObjectClass *object_class;
@@ -114,10 +115,11 @@ html_button_class_init (HTMLButtonClass *klass,
void
html_button_init (HTMLButton *button,
- HTMLButtonClass *klass,
- GtkWidget *parent,
- gchar *name, gchar *value,
- HTMLButtonType type)
+ HTMLButtonClass *klass,
+ GtkWidget *parent,
+ gchar *name,
+ gchar *value,
+ HTMLButtonType type)
{
HTMLEmbedded *element;
GtkWidget *widget;
@@ -157,9 +159,9 @@ html_button_init (HTMLButton *button,
HTMLObject *
html_button_new (GtkWidget *parent,
- gchar *name,
- gchar *value,
- HTMLButtonType type)
+ gchar *name,
+ gchar *value,
+ HTMLButtonType type)
{
HTMLButton *button;
diff --git a/gtkhtml/htmlbutton.h b/gtkhtml/htmlbutton.h
index ec3fcc1..96a2f39 100644
--- a/gtkhtml/htmlbutton.h
+++ b/gtkhtml/htmlbutton.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLBUTTON_H_
#define _HTMLBUTTON_H_
diff --git a/gtkhtml/htmlcheckbox.c b/gtkhtml/htmlcheckbox.c
index 7b95eb3..d53631a 100644
--- a/gtkhtml/htmlcheckbox.c
+++ b/gtkhtml/htmlcheckbox.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -38,7 +38,8 @@ copy (HTMLObject *self,
}
static gchar *
-encode (HTMLEmbedded *e, const gchar *codepage)
+encode (HTMLEmbedded *e,
+ const gchar *codepage)
{
GString *encoding = g_string_new ("");
gchar *ptr;
@@ -77,8 +78,8 @@ html_checkbox_type_init (void)
void
html_checkbox_class_init (HTMLCheckBoxClass *klass,
- HTMLType type,
- guint size)
+ HTMLType type,
+ guint size)
{
HTMLEmbeddedClass *element_class;
HTMLObjectClass *object_class;
@@ -100,11 +101,11 @@ html_checkbox_class_init (HTMLCheckBoxClass *klass,
void
html_checkbox_init (HTMLCheckBox *checkbox,
- HTMLCheckBoxClass *klass,
- GtkWidget *parent,
- gchar *name,
- gchar *value,
- gboolean checked)
+ HTMLCheckBoxClass *klass,
+ GtkWidget *parent,
+ gchar *name,
+ gchar *value,
+ gboolean checked)
{
HTMLEmbedded *element;
GtkWidget *check;
@@ -128,9 +129,9 @@ html_checkbox_init (HTMLCheckBox *checkbox,
HTMLObject *
html_checkbox_new (GtkWidget *parent,
- gchar *name,
- gchar *value,
- gboolean checked)
+ gchar *name,
+ gchar *value,
+ gboolean checked)
{
HTMLCheckBox *checkbox;
diff --git a/gtkhtml/htmlcheckbox.h b/gtkhtml/htmlcheckbox.h
index 7823316..b473113 100644
--- a/gtkhtml/htmlcheckbox.h
+++ b/gtkhtml/htmlcheckbox.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLCHECKBOX_H_
#define _HTMLCHECKBOX_H_
diff --git a/gtkhtml/htmlclue.c b/gtkhtml/htmlclue.c
index 3e552bd..afc97b4 100644
--- a/gtkhtml/htmlclue.c
+++ b/gtkhtml/htmlclue.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -70,7 +70,8 @@ get_n_children (HTMLObject *o)
}
static HTMLObject *
-get_child (HTMLObject *o, gint index)
+get_child (HTMLObject *o,
+ gint index)
{
HTMLObject *cur = HTML_CLUE (o)->head;
@@ -87,7 +88,8 @@ get_child (HTMLObject *o, gint index)
}
static gint
-get_child_index (HTMLObject *self, HTMLObject *child)
+get_child_index (HTMLObject *self,
+ HTMLObject *child)
{
HTMLObject *cur = HTML_CLUE (self)->head;
gint index = 0;
@@ -131,7 +133,14 @@ copy (HTMLObject *self,
}
static HTMLObject *
-op_helper (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GList *right, guint *len, gboolean cut)
+op_helper (HTMLObject *self,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ GList *left,
+ GList *right,
+ guint *len,
+ gboolean cut)
{
HTMLClue *clue = HTML_CLUE (self);
HTMLObject *cc;
@@ -171,13 +180,24 @@ op_helper (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left,
}
static HTMLObject *
-op_copy (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList *to, guint *len)
+op_copy (HTMLObject *self,
+ HTMLObject *parent,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ guint *len)
{
return op_helper (self, e, from, to, NULL, NULL, len, FALSE);
}
static HTMLObject *
-op_cut (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GList *right, guint *len)
+op_cut (HTMLObject *self,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ GList *left,
+ GList *right,
+ guint *len)
{
HTMLObject *rv;
HTMLClue *clue;
@@ -195,7 +215,12 @@ op_cut (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GL
}
static gboolean
-merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **right, HTMLCursor *cursor)
+merge (HTMLObject *self,
+ HTMLObject *with,
+ HTMLEngine *e,
+ GList **left,
+ GList **right,
+ HTMLCursor *cursor)
{
HTMLClue *clue1, *clue2;
@@ -211,13 +236,20 @@ merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **
}
static void
-remove_child (HTMLObject *self, HTMLObject *child)
+remove_child (HTMLObject *self,
+ HTMLObject *child)
{
html_clue_remove (HTML_CLUE (self), child);
}
static void
-split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint level, GList **left, GList **right)
+split (HTMLObject *self,
+ HTMLEngine *e,
+ HTMLObject *child,
+ gint offset,
+ gint level,
+ GList **left,
+ GList **right)
{
HTMLObject *dup;
@@ -250,9 +282,12 @@ split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint lev
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLObject *obj;
@@ -274,7 +309,9 @@ draw (HTMLObject *o,
}
static void
-set_max_height (HTMLObject *o, HTMLPainter *painter, gint height)
+set_max_height (HTMLObject *o,
+ HTMLPainter *painter,
+ gint height)
{
HTMLClue *clue = HTML_CLUE (o);
HTMLObject *obj;
@@ -283,7 +320,7 @@ set_max_height (HTMLObject *o, HTMLPainter *painter, gint height)
for (obj = HTML_CLUE (o)->head; obj != 0; obj = obj->next) {
html_object_set_max_height (obj, painter, height);
if (clue->valign == HTML_VALIGN_MIDDLE)
- obj->y += (height - o->ascent)/2;
+ obj->y += (height - o->ascent) / 2;
else if (clue->valign == HTML_VALIGN_BOTTOM)
obj->y += height - o->ascent;
}
@@ -306,12 +343,14 @@ reset (HTMLObject *clue)
}
static gboolean
-html_clue_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_clue_real_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
gboolean changed;
/* If we have already called calc_size for the children, then just
- continue from the last object done in previous call. */
+ * continue from the last object done in previous call. */
if (HTML_CLUE (o)->curr == NULL) {
o->ascent = 0;
HTML_CLUE (o)->curr = HTML_CLUE (o)->head;
@@ -325,7 +364,7 @@ html_clue_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_o
}
/* Remember the last object so that we can start from here next time
- we are called */
+ * we are called */
HTML_CLUE (o)->curr = HTML_CLUE (o)->tail;
return changed;
@@ -333,7 +372,7 @@ html_clue_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_o
static gint
calc_preferred_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
gint prefWidth = 0;
HTMLObject *obj;
@@ -352,7 +391,7 @@ calc_preferred_width (HTMLObject *o,
/* FIXME: This should be in HTMLClueV. */
static gint
calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLObject *obj;
gint minWidth = 0;
@@ -369,7 +408,10 @@ calc_min_width (HTMLObject *o,
}
static HTMLAnchor *
-find_anchor (HTMLObject *self, const gchar *name, gint *x, gint *y)
+find_anchor (HTMLObject *self,
+ const gchar *name,
+ gint *x,
+ gint *y)
{
HTMLClue *clue;
HTMLObject *obj;
@@ -391,12 +433,13 @@ find_anchor (HTMLObject *self, const gchar *name, gint *x, gint *y)
return 0;
}
-static HTMLObject*
+static HTMLObject *
check_point (HTMLObject *o,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
HTMLObject *obj;
HTMLObject *obj2;
@@ -420,7 +463,9 @@ check_point (HTMLObject *o,
}
static gint
-check_page_split (HTMLObject *self, HTMLPainter *painter, gint y)
+check_page_split (HTMLObject *self,
+ HTMLPainter *painter,
+ gint y)
{
HTMLClue *clue;
HTMLObject *p;
@@ -446,9 +491,9 @@ check_page_split (HTMLObject *self, HTMLPainter *painter, gint y)
static void
forall (HTMLObject *self,
- HTMLEngine *e,
- HTMLObjectForallFunc func,
- gpointer data)
+ HTMLEngine *e,
+ HTMLObjectForallFunc func,
+ gpointer data)
{
HTMLObject *p, *pnext;
@@ -485,8 +530,8 @@ save (HTMLObject *self,
static gboolean
save_plain (HTMLObject *self,
- HTMLEngineSaveState *state,
- gint requested_width)
+ HTMLEngineSaveState *state,
+ gint requested_width)
{
HTMLObject *p;
HTMLClue *clue;
@@ -504,24 +549,29 @@ save_plain (HTMLObject *self,
/* HTMLClue methods. */
static gint
-get_left_clear (HTMLClue *o, gint y)
+get_left_clear (HTMLClue *o,
+ gint y)
{
return y;
}
static gint
-get_right_clear (HTMLClue *o, gint y)
+get_right_clear (HTMLClue *o,
+ gint y)
{
return y;
}
static void
find_free_area (HTMLClue *clue,
- HTMLPainter *painter,
- gint y,
- gint width, gint height,
- gint indent, gint *y_pos,
- gint *lmargin, gint *rmargin)
+ HTMLPainter *painter,
+ gint y,
+ gint width,
+ gint height,
+ gint indent,
+ gint *y_pos,
+ gint *lmargin,
+ gint *rmargin)
{
*y_pos = y;
*lmargin = 0;
@@ -529,7 +579,12 @@ find_free_area (HTMLClue *clue,
}
static void
-append_right_aligned (HTMLClue *clue, HTMLPainter *painter, HTMLClue *aclue, gint *lmargin, gint *rmargin, gint indent)
+append_right_aligned (HTMLClue *clue,
+ HTMLPainter *painter,
+ HTMLClue *aclue,
+ gint *lmargin,
+ gint *rmargin,
+ gint indent)
{
/* This needs to be implemented in the subclasses. */
g_warning ("`%s' does not implement `append_right_aligned()'.",
@@ -537,13 +592,15 @@ append_right_aligned (HTMLClue *clue, HTMLPainter *painter, HTMLClue *aclue, gin
}
static gboolean
-appended (HTMLClue *clue, HTMLClue *aclue)
+appended (HTMLClue *clue,
+ HTMLClue *aclue)
{
return FALSE;
}
static gboolean
-search (HTMLObject *obj, HTMLSearch *info)
+search (HTMLObject *obj,
+ HTMLSearch *info)
{
HTMLObject *cur;
HTMLClue *clue = HTML_CLUE (obj);
@@ -574,7 +631,7 @@ search (HTMLObject *obj, HTMLSearch *info)
static void
append_selection_string (HTMLObject *self,
- GString *buffer)
+ GString *buffer)
{
HTMLObject *o = HTML_CLUE (self)->head;
@@ -608,8 +665,8 @@ html_clue_type_init (void)
void
html_clue_class_init (HTMLClueClass *klass,
- HTMLType type,
- guint size)
+ HTMLType type,
+ guint size)
{
HTMLObjectClass *object_class;
@@ -660,7 +717,7 @@ html_clue_class_init (HTMLClueClass *klass,
void
html_clue_init (HTMLClue *clue,
- HTMLClueClass *klass)
+ HTMLClueClass *klass)
{
HTMLObject *object;
@@ -677,30 +734,40 @@ html_clue_init (HTMLClue *clue,
gint
-html_clue_get_left_clear (HTMLClue *clue, gint y)
+html_clue_get_left_clear (HTMLClue *clue,
+ gint y)
{
return (* HC_CLASS (clue)->get_left_clear) (clue, y);
}
gint
-html_clue_get_right_clear (HTMLClue *clue, gint y)
+html_clue_get_right_clear (HTMLClue *clue,
+ gint y)
{
return (* HC_CLASS (clue)->get_right_clear) (clue, y);
}
void
html_clue_find_free_area (HTMLClue *clue,
- HTMLPainter *painter,
- gint y,
- gint width, gint height, gint indent, gint *y_pos,
- gint *lmargin, gint *rmargin)
+ HTMLPainter *painter,
+ gint y,
+ gint width,
+ gint height,
+ gint indent,
+ gint *y_pos,
+ gint *lmargin,
+ gint *rmargin)
{
(* HC_CLASS (clue)->find_free_area) (clue, painter, y, width, height, indent, y_pos, lmargin, rmargin);
}
void
-html_clue_append_right_aligned (HTMLClue *clue, HTMLPainter *painter,
- HTMLClue *aclue, gint *lmargin, gint *rmargin, gint indent)
+html_clue_append_right_aligned (HTMLClue *clue,
+ HTMLPainter *painter,
+ HTMLClue *aclue,
+ gint *lmargin,
+ gint *rmargin,
+ gint indent)
{
g_assert (clue != NULL);
g_assert (aclue != NULL);
@@ -711,8 +778,12 @@ html_clue_append_right_aligned (HTMLClue *clue, HTMLPainter *painter,
}
void
-html_clue_append_left_aligned (HTMLClue *clue, HTMLPainter *painter,
- HTMLClue *aclue, gint *lmargin, gint *rmargin, gint indent)
+html_clue_append_left_aligned (HTMLClue *clue,
+ HTMLPainter *painter,
+ HTMLClue *aclue,
+ gint *lmargin,
+ gint *rmargin,
+ gint indent)
{
g_assert (clue != NULL);
g_assert (aclue != NULL);
@@ -723,7 +794,8 @@ html_clue_append_left_aligned (HTMLClue *clue, HTMLPainter *painter,
}
gboolean
-html_clue_appended (HTMLClue *clue, HTMLClue *aclue)
+html_clue_appended (HTMLClue *clue,
+ HTMLClue *aclue)
{
return (* HC_CLASS (clue)->appended) (clue, aclue);
}
@@ -745,8 +817,8 @@ get_tail (HTMLObject *p)
static void
set_parent (HTMLObject *o,
- HTMLObject *tail,
- HTMLObject *parent)
+ HTMLObject *tail,
+ HTMLObject *parent)
{
while (o) {
html_object_set_parent (o, parent);
@@ -766,8 +838,8 @@ set_parent (HTMLObject *o,
**/
void
html_clue_append_after (HTMLClue *clue,
- HTMLObject *o,
- HTMLObject *where)
+ HTMLObject *o,
+ HTMLObject *where)
{
HTMLObject *tail;
@@ -806,7 +878,7 @@ html_clue_append_after (HTMLClue *clue,
**/
void
html_clue_append (HTMLClue *clue,
- HTMLObject *o)
+ HTMLObject *o)
{
HTMLObject *tail;
@@ -843,7 +915,7 @@ html_clue_append (HTMLClue *clue,
**/
void
html_clue_prepend (HTMLClue *clue,
- HTMLObject *o)
+ HTMLObject *o)
{
HTMLObject *tail;
@@ -878,7 +950,7 @@ html_clue_prepend (HTMLClue *clue,
**/
void
html_clue_remove (HTMLClue *clue,
- HTMLObject *o)
+ HTMLObject *o)
{
g_return_if_fail (clue != NULL);
g_return_if_fail (o != NULL);
diff --git a/gtkhtml/htmlclue.h b/gtkhtml/htmlclue.h
index e32d0a1..d3aeb9f 100644
--- a/gtkhtml/htmlclue.h
+++ b/gtkhtml/htmlclue.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef HTMLCLUE_H
#define HTMLCLUE_H
diff --git a/gtkhtml/htmlcluealigned.c b/gtkhtml/htmlcluealigned.c
index c924623..b49962e 100644
--- a/gtkhtml/htmlcluealigned.c
+++ b/gtkhtml/htmlcluealigned.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -42,7 +42,9 @@ copy (HTMLObject *self,
}
static gboolean
-html_clue_aligned_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_clue_aligned_real_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLObject *obj;
gboolean changed;
@@ -86,7 +88,9 @@ html_clue_aligned_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **c
}
static void
-set_max_width (HTMLObject *o, HTMLPainter *painter, gint max_width)
+set_max_width (HTMLObject *o,
+ HTMLPainter *painter,
+ gint max_width)
{
HTMLObject *obj;
@@ -105,8 +109,8 @@ html_cluealigned_type_init (void)
void
html_cluealigned_class_init (HTMLClueAlignedClass *klass,
- HTMLType type,
- guint size)
+ HTMLType type,
+ guint size)
{
HTMLObjectClass *object_class;
HTMLClueClass *clue_class;
@@ -127,10 +131,12 @@ html_cluealigned_class_init (HTMLClueAlignedClass *klass,
void
html_cluealigned_init (HTMLClueAligned *aligned,
- HTMLClueAlignedClass *klass,
- HTMLObject *parent,
- gint x, gint y,
- gint max_width, gint percent)
+ HTMLClueAlignedClass *klass,
+ HTMLObject *parent,
+ gint x,
+ gint y,
+ gint max_width,
+ gint percent)
{
HTMLClue *clue;
HTMLObject *object;
@@ -159,8 +165,10 @@ html_cluealigned_init (HTMLClueAligned *aligned,
HTMLObject *
html_cluealigned_new (HTMLObject *parent,
- gint x, gint y,
- gint max_width, gint percent)
+ gint x,
+ gint y,
+ gint max_width,
+ gint percent)
{
HTMLClueAligned *aclue;
diff --git a/gtkhtml/htmlcluealigned.h b/gtkhtml/htmlcluealigned.h
index e4f20c0..32840de 100644
--- a/gtkhtml/htmlcluealigned.h
+++ b/gtkhtml/htmlcluealigned.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTML_CLUEALIGNED_H_
#define _HTML_CLUEALIGNED_H_
diff --git a/gtkhtml/htmlclueflow.c b/gtkhtml/htmlclueflow.c
index 50e8fd3..7cab960 100644
--- a/gtkhtml/htmlclueflow.c
+++ b/gtkhtml/htmlclueflow.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/* This is the object that defines a paragraph in the HTML document. */
@@ -63,7 +63,8 @@ static gint get_similar_depth (HTMLClueFlow *self
HTMLClueFlow *neighbor);
static void
-copy_levels (GByteArray *dst, GByteArray *src)
+copy_levels (GByteArray *dst,
+ GByteArray *src)
{
gint i;
@@ -74,7 +75,8 @@ copy_levels (GByteArray *dst, GByteArray *src)
}
static gboolean
-is_levels_equal (HTMLClueFlow *me, HTMLClueFlow *you)
+is_levels_equal (HTMLClueFlow *me,
+ HTMLClueFlow *you)
{
if (!you)
return FALSE;
@@ -138,7 +140,8 @@ is_blockquote (HTMLListType type)
}
static inline gboolean
-items_are_relative (HTMLObject *self, HTMLObject *next_object)
+items_are_relative (HTMLObject *self,
+ HTMLObject *next_object)
{
HTMLClueFlow *flow, *next;
@@ -197,7 +200,8 @@ get_next_relative_item (HTMLObject *self)
}
static void
-update_item_number (HTMLObject *self, HTMLEngine *e)
+update_item_number (HTMLObject *self,
+ HTMLEngine *e)
{
HTMLObject *prev, *next;
@@ -254,7 +258,14 @@ prev_flow_in_cluevs (HTMLObject *o)
}
static HTMLObject *
-op_helper (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GList *right, guint *len, gboolean cut)
+op_helper (HTMLObject *self,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ GList *left,
+ GList *right,
+ guint *len,
+ gboolean cut)
{
HTMLObject *o;
@@ -267,7 +278,7 @@ op_helper (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left,
if (!from && prev_flow_in_cluevs (self)) {
(*len) ++;
/* if (cut)
- e->cursor->position--; */
+ * e->cursor->position--; */
}
if (cut)
html_clue_remove_text_slaves (HTML_CLUE (self));
@@ -283,13 +294,24 @@ op_helper (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left,
}
static HTMLObject *
-op_copy (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList *to, guint *len)
+op_copy (HTMLObject *self,
+ HTMLObject *parent,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ guint *len)
{
return op_helper (self, e, from, to, NULL, NULL, len, FALSE);
}
static HTMLObject *
-op_cut (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GList *right, guint *len)
+op_cut (HTMLObject *self,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ GList *left,
+ GList *right,
+ guint *len)
{
HTMLObject *rv, *prev, *next;
@@ -329,17 +351,23 @@ set_tail_size (HTMLObject *o)
static void
set_around_size (HTMLObject *o) {
- if (o) {
- o->change |= HTML_CHANGE_SIZE;
- if (o->next)
- o->next->change |= HTML_CHANGE_SIZE;
- if (o->prev)
- o->prev->change |= HTML_CHANGE_SIZE;
- }
+ if (o) {
+ o->change |= HTML_CHANGE_SIZE;
+ if (o->next)
+ o->next->change |= HTML_CHANGE_SIZE;
+ if (o->prev)
+ o->prev->change |= HTML_CHANGE_SIZE;
+ }
}
static void
-split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint level, GList **left, GList **right)
+split (HTMLObject *self,
+ HTMLEngine *e,
+ HTMLObject *child,
+ gint offset,
+ gint level,
+ GList **left,
+ GList **right)
{
set_around_size (child);
html_clue_remove_text_slaves (HTML_CLUE (self));
@@ -349,7 +377,12 @@ split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint lev
}
static gboolean
-merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **right, HTMLCursor *cursor)
+merge (HTMLObject *self,
+ HTMLObject *with,
+ HTMLEngine *e,
+ GList **left,
+ GList **right,
+ HTMLCursor *cursor)
{
HTMLClueFlow *cf1, *cf2;
HTMLObject *cf2_next_relative;
@@ -383,8 +416,8 @@ merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **
if (rv) {
if (is_item (cf1)) {
/* cf2 will be removed, update item numbers around
- as if it was already removed - it has to have
- the same item style as cf1 to not break item lists*/
+ * as if it was already removed - it has to have
+ * the same item style as cf1 to not break item lists*/
g_byte_array_free (cf2->levels, TRUE);
cf2->levels = html_clueflow_dup_levels (cf1);
cf2->style = cf1->style;
@@ -414,7 +447,8 @@ calc_padding (HTMLPainter *painter)
}
static gboolean
-is_cite (HTMLClueFlow *flow, gint level)
+is_cite (HTMLClueFlow *flow,
+ gint level)
{
if (flow->levels->data[level] == HTML_LIST_TYPE_BLOCKQUOTE_CITE)
return TRUE;
@@ -439,7 +473,8 @@ is_header (HTMLClueFlow *flow)
}
static gboolean
-need_blockquote_padding (HTMLClueFlow *flow, HTMLClueFlow *prev)
+need_blockquote_padding (HTMLClueFlow *flow,
+ HTMLClueFlow *prev)
{
gint i = get_similar_depth (flow, prev);
@@ -478,7 +513,8 @@ need_blockquote_padding (HTMLClueFlow *flow, HTMLClueFlow *prev)
}
static guint
-get_pre_padding (HTMLClueFlow *flow, guint pad)
+get_pre_padding (HTMLClueFlow *flow,
+ guint pad)
{
HTMLObject *prev_object;
@@ -520,7 +556,7 @@ get_pre_padding (HTMLClueFlow *flow, guint pad)
static guint
get_post_padding (HTMLClueFlow *flow,
- guint pad)
+ guint pad)
{
HTMLObject *next_object;
@@ -559,7 +595,7 @@ get_post_padding (HTMLClueFlow *flow,
static void
add_pre_padding (HTMLClueFlow *flow,
- guint pad)
+ guint pad)
{
guint real_pad;
@@ -571,7 +607,7 @@ add_pre_padding (HTMLClueFlow *flow,
static void
add_post_padding (HTMLClueFlow *flow,
- guint pad)
+ guint pad)
{
guint real_pad;
@@ -583,8 +619,8 @@ add_post_padding (HTMLClueFlow *flow,
static guint
get_level_indent (HTMLClueFlow *flow,
- gint level,
- HTMLPainter *painter)
+ gint level,
+ HTMLPainter *painter)
{
HTMLDirection dir = html_object_get_direction (HTML_OBJECT (flow));
guint indent = 0;
@@ -622,14 +658,15 @@ get_level_indent (HTMLClueFlow *flow,
}
static void
-set_painter (HTMLObject *o, HTMLPainter *painter)
+set_painter (HTMLObject *o,
+ HTMLPainter *painter)
{
HTML_CLUEFLOW (o)->indent_width = -1;
}
static guint
get_indent (HTMLClueFlow *flow,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
if (flow->indent_width < 0 )
flow->indent_width = get_level_indent (flow, flow->levels->len -1, painter);
@@ -641,8 +678,8 @@ get_indent (HTMLClueFlow *flow,
static void
set_max_width (HTMLObject *o,
- HTMLPainter *painter,
- gint max_width)
+ HTMLPainter *painter,
+ gint max_width)
{
HTMLObject *obj;
guint indent;
@@ -658,7 +695,7 @@ set_max_width (HTMLObject *o,
static gint
calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLObject *cur;
gint min_width = 0;
@@ -688,7 +725,9 @@ calc_min_width (HTMLObject *o,
}
static gint
-pref_left_margin (HTMLPainter *p, HTMLObject *o, gint indent)
+pref_left_margin (HTMLPainter *p,
+ HTMLObject *o,
+ gint indent)
{
gint margin = html_object_get_left_margin (o->parent, p, o->y, TRUE);
@@ -705,7 +744,9 @@ pref_left_margin (HTMLPainter *p, HTMLObject *o, gint indent)
}
static gint
-pref_right_margin (HTMLPainter *p, HTMLObject *o, gint indent)
+pref_right_margin (HTMLPainter *p,
+ HTMLObject *o,
+ gint indent)
{
gint margin = html_object_get_right_margin (o->parent, p, o->y, TRUE);
@@ -722,7 +763,10 @@ pref_right_margin (HTMLPainter *p, HTMLObject *o, gint indent)
}
static void
-add_clear_area (GList **changed_objs, HTMLObject *o, gint x, gint w)
+add_clear_area (GList **changed_objs,
+ HTMLObject *o,
+ gint x,
+ gint w)
{
HTMLObjectClearRectangle *cr;
@@ -740,20 +784,29 @@ add_clear_area (GList **changed_objs, HTMLObject *o, gint x, gint w)
}
static void
-calc_margins (HTMLObject *o, HTMLPainter *painter, gint indent, gint *lmargin, gint *rmargin)
+calc_margins (HTMLObject *o,
+ HTMLPainter *painter,
+ gint indent,
+ gint *lmargin,
+ gint *rmargin)
{
*lmargin = pref_left_margin (painter, o, indent);
*rmargin = pref_right_margin (painter, o, indent);
}
static inline gint
-width_left (HTMLObject *o, gint x, gint rmargin, gboolean printing)
+width_left (HTMLObject *o,
+ gint x,
+ gint rmargin,
+ gboolean printing)
{
return (!printing && HTML_CLUEFLOW (o)->style == HTML_CLUEFLOW_STYLE_PRE) ? G_MAXINT : rmargin - x;
}
static gint
-object_nb_width (HTMLObject *o, HTMLPainter *painter, gboolean lineBegin)
+object_nb_width (HTMLObject *o,
+ HTMLPainter *painter,
+ gboolean lineBegin)
{
if (HTML_IS_TEXT_SLAVE (o))
return html_text_slave_get_nb_width (HTML_TEXT_SLAVE (o), painter, lineBegin);
@@ -768,7 +821,8 @@ is_top_aligned (HTMLVAlignType valign)
}
static inline void
-update_leafs_children_changed_size (HTMLObject *o, gboolean *leaf_children_changed_size)
+update_leafs_children_changed_size (HTMLObject *o,
+ gboolean *leaf_children_changed_size)
{
if (o && o->change & HTML_CHANGE_SIZE
&& HTML_OBJECT_TYPE (o) != HTML_TYPE_TEXTSLAVE && !html_object_is_container (o))
@@ -776,7 +830,12 @@ update_leafs_children_changed_size (HTMLObject *o, gboolean *leaf_children_chang
}
static inline void
-update_height (HTMLObject *o, HTMLVAlignType valign, gint *a, gint *d, gint *height, gboolean *top)
+update_height (HTMLObject *o,
+ HTMLVAlignType valign,
+ gint *a,
+ gint *d,
+ gint *height,
+ gboolean *top)
{
switch (valign) {
case HTML_VALIGN_TOP:
@@ -803,7 +862,11 @@ update_height (HTMLObject *o, HTMLVAlignType valign, gint *a, gint *d, gint *hei
}
static inline void
-update_top_height (HTMLObject *begin, HTMLObject *end, gint *a, gint *d, gint *height)
+update_top_height (HTMLObject *begin,
+ HTMLObject *end,
+ gint *a,
+ gint *d,
+ gint *height)
{
while (begin && begin != end) {
if (html_object_get_valign (begin) == HTML_VALIGN_TOP) {
@@ -853,7 +916,13 @@ html_clueflow_get_halignment (HTMLClueFlow *flow)
}
static inline void
-update_line_positions (HTMLObject *clue, HTMLObject *begin, HTMLObject *end, gint left, gint a, gint d, gint height)
+update_line_positions (HTMLObject *clue,
+ HTMLObject *begin,
+ HTMLObject *end,
+ gint left,
+ gint a,
+ gint d,
+ gint height)
{
gint xinc = 0;
@@ -890,9 +959,14 @@ update_line_positions (HTMLObject *clue, HTMLObject *begin, HTMLObject *end, gin
}
static HTMLObject *
-layout_line (HTMLObject *o, HTMLPainter *painter, HTMLObject *begin,
- GList **changed_objs, gboolean *leaf_children_changed_size,
- gint *lmargin, gint *rmargin, gint indent)
+layout_line (HTMLObject *o,
+ HTMLPainter *painter,
+ HTMLObject *begin,
+ GList **changed_objs,
+ gboolean *leaf_children_changed_size,
+ gint *lmargin,
+ gint *rmargin,
+ gint indent)
{
HTMLObject *cur;
gboolean first = TRUE;
@@ -983,9 +1057,15 @@ layout_line (HTMLObject *o, HTMLPainter *painter, HTMLObject *begin,
}
static HTMLObject *
-layout_aligned (HTMLObject *o, HTMLPainter *painter, HTMLObject *cur,
- GList **changed_objs, gboolean *leaf_children_changed_size,
- gint *lmargin, gint *rmargin, gint indent, gboolean *changed)
+layout_aligned (HTMLObject *o,
+ HTMLPainter *painter,
+ HTMLObject *cur,
+ GList **changed_objs,
+ gboolean *leaf_children_changed_size,
+ gint *lmargin,
+ gint *rmargin,
+ gint indent,
+ gboolean *changed)
{
if (!html_clue_appended (HTML_CLUE (o->parent), HTML_CLUE (cur))) {
html_object_calc_size (cur, painter, changed_objs);
@@ -1003,7 +1083,10 @@ layout_aligned (HTMLObject *o, HTMLPainter *painter, HTMLObject *cur,
}
static gboolean
-html_clue_flow_layout (HTMLObject *o, HTMLPainter *painter, GList **changed_objs, gboolean *leaf_children_changed_size)
+html_clue_flow_layout (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs,
+ gboolean *leaf_children_changed_size)
{
HTMLClueFlow *cf = HTML_CLUEFLOW (o);
HTMLObject *cur = HTML_CLUE (o)->head;
@@ -1027,7 +1110,9 @@ html_clue_flow_layout (HTMLObject *o, HTMLPainter *painter, GList **changed_objs
}
static gboolean
-html_clue_flow_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_clue_flow_real_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLClueFlow *cf = HTML_CLUEFLOW (o);
gint oa, od, ow, padding;
@@ -1066,7 +1151,9 @@ html_clue_flow_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **chan
}
static void
-set_max_height (HTMLObject *o, HTMLPainter *painter, gint max_height)
+set_max_height (HTMLObject *o,
+ HTMLPainter *painter,
+ gint max_height)
{
}
@@ -1078,7 +1165,7 @@ get_clear (HTMLObject *self)
static gint
calc_preferred_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLObject *obj, *next;
gint maxw = 0, w = 0;
@@ -1104,7 +1191,8 @@ calc_preferred_width (HTMLObject *o,
}
static gchar *
-get_alpha_value (gint value, gboolean lower)
+get_alpha_value (gint value,
+ gboolean lower)
{
GString *str;
gchar *rv;
@@ -1126,7 +1214,8 @@ get_alpha_value (gint value, gboolean lower)
#define BASES 7
static gchar *
-get_roman_value (gint value, gboolean lower)
+get_roman_value (gint value,
+ gboolean lower)
{
GString *str;
const gchar *base = "IVXLCDM";
@@ -1167,7 +1256,8 @@ get_roman_value (gint value, gboolean lower)
}
static gchar *
-get_item_marker_str (HTMLClueFlow *flow, gboolean ascii_only)
+get_item_marker_str (HTMLClueFlow *flow,
+ gboolean ascii_only)
{
HTMLListType type = flow->item_type;
@@ -1210,7 +1300,12 @@ get_item_marker_str (HTMLClueFlow *flow, gboolean ascii_only)
}
static void
-draw_cite_line (HTMLObject *cur, HTMLPainter *p, const gchar *cite_str, gint offset, gint x, gint y)
+draw_cite_line (HTMLObject *cur,
+ HTMLPainter *p,
+ const gchar *cite_str,
+ gint offset,
+ gint x,
+ gint y)
{
gint cy, w, a, d;
@@ -1234,9 +1329,14 @@ draw_cite_line (HTMLObject *cur, HTMLPainter *p, const gchar *cite_str, gint off
}
static void
-draw_quotes (HTMLObject *self, HTMLPainter *painter,
- gint x, gint y, gint width, gint height,
- gint tx, gint ty)
+draw_quotes (HTMLObject *self,
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLClueFlow *flow;
GdkRectangle paint, area, clip;
@@ -1311,7 +1411,14 @@ draw_quotes (HTMLObject *self, HTMLPainter *painter,
}
static void
-draw_item (HTMLObject *self, HTMLPainter *painter, gint x, gint y, gint width, gint height, gint tx, gint ty)
+draw_item (HTMLObject *self,
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLClueFlow *flow;
HTMLObject *first;
@@ -1361,9 +1468,12 @@ draw_item (HTMLObject *self, HTMLPainter *painter, gint x, gint y, gint width, g
static void
draw (HTMLObject *self,
HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
if (y > self->y + self->descent || y + height < self->y - self->ascent)
return;
@@ -1377,12 +1487,13 @@ draw (HTMLObject *self,
(* HTML_OBJECT_CLASS (&html_clue_class)->draw) (self, painter, x, y, width, height, tx, ty);
}
-static HTMLObject*
+static HTMLObject *
check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
HTMLObject *obj, *p, *pnext, *eol, *cur;
HTMLClue *clue;
@@ -1485,7 +1596,8 @@ check_point (HTMLObject *self,
/* Saving support. */
static gboolean
-write_indent (HTMLEngineSaveState *state, gint level)
+write_indent (HTMLEngineSaveState *state,
+ gint level)
{
while (level > 0) {
if (!html_engine_save_output_string (state, " "))
@@ -1609,7 +1721,8 @@ get_end_indent_item (HTMLListType type)
}
static gint
-get_similar_depth (HTMLClueFlow *self, HTMLClueFlow *neighbor)
+get_similar_depth (HTMLClueFlow *self,
+ HTMLClueFlow *neighbor)
{
gint i;
gint max_depth;
@@ -1628,7 +1741,10 @@ get_similar_depth (HTMLClueFlow *self, HTMLClueFlow *neighbor)
}
static gboolean
-save_indent_string (HTMLClueFlow *self, HTMLEngineSaveState *state, const gchar *format, ...)
+save_indent_string (HTMLClueFlow *self,
+ HTMLEngineSaveState *state,
+ const gchar *format,
+ ...)
{
va_list args;
gboolean retval;
@@ -1645,7 +1761,8 @@ save_indent_string (HTMLClueFlow *self, HTMLEngineSaveState *state, const gchar
}
static const gchar *
-get_p_str (HTMLClueFlow *self, HTMLEngineSaveState *state)
+get_p_str (HTMLClueFlow *self,
+ HTMLEngineSaveState *state)
{
const gchar *p_str = NULL;
@@ -1667,7 +1784,8 @@ get_p_str (HTMLClueFlow *self, HTMLEngineSaveState *state)
}
static gboolean
-write_flow_tag (HTMLClueFlow *self, HTMLEngineSaveState *state)
+write_flow_tag (HTMLClueFlow *self,
+ HTMLEngineSaveState *state)
{
HTMLClueFlow *next = NULL;
HTMLClueFlow *prev = NULL;
@@ -1849,7 +1967,8 @@ save (HTMLObject *s,
}
static void
-write_item_marker (GString *pad_string, HTMLClueFlow *flow)
+write_item_marker (GString *pad_string,
+ HTMLClueFlow *flow)
{
gchar *marker;
@@ -1876,7 +1995,9 @@ write_item_marker (GString *pad_string, HTMLClueFlow *flow)
}
static gint
-plain_padding (HTMLClueFlow *flow, GString *out, gboolean firstline)
+plain_padding (HTMLClueFlow *flow,
+ GString *out,
+ gboolean firstline)
{
GString *pad_string = NULL;
gint pad_len = 0;
@@ -1919,7 +2040,7 @@ plain_padding (HTMLClueFlow *flow, GString *out, gboolean firstline)
static void
append_selection_string (HTMLObject *self,
- GString *buffer)
+ GString *buffer)
{
(*HTML_OBJECT_CLASS (parent_class)->append_selection_string) (self, buffer);
@@ -1935,7 +2056,8 @@ append_selection_string (HTMLObject *self,
* zero-width or combined characters.)
*/
static gint
-utf8_width (const gchar *str, gint len)
+utf8_width (const gchar *str,
+ gint len)
{
gunichar c;
gint width = 0;
@@ -1953,7 +2075,9 @@ utf8_width (const gchar *str, gint len)
* not exceeding the given width.
*/
static gint
-utf8_length_in_width (const gchar *str, gint len, gint width)
+utf8_length_in_width (const gchar *str,
+ gint len,
+ gint width)
{
gunichar c;
gint l = 0;
@@ -1972,8 +2096,8 @@ utf8_length_in_width (const gchar *str, gint len, gint width)
static gboolean
save_plain (HTMLObject *self,
- HTMLEngineSaveState *state,
- gint requested_width)
+ HTMLEngineSaveState *state,
+ gint requested_width)
{
HTMLClueFlow *flow;
HTMLEngineSaveState *buffer_state;
@@ -2197,7 +2321,11 @@ get_default_font_style (const HTMLClueFlow *self)
}
static void
-search_set_info (HTMLObject *cur, HTMLSearch *info, guchar *text, guint index, guint bytes)
+search_set_info (HTMLObject *cur,
+ HTMLSearch *info,
+ guchar *text,
+ guint index,
+ guint bytes)
{
guint text_bytes = 0;
guint cur_bytes;
@@ -2237,7 +2365,8 @@ search_set_info (HTMLObject *cur, HTMLSearch *info, guchar *text, guint index, g
/* search text objects ([TextMaster, LinkTextMaster], TextSlave*) */
static gboolean
-search_text (HTMLObject **beg, HTMLSearch *info)
+search_text (HTMLObject **beg,
+ HTMLSearch *info)
{
HTMLObject *cur = *beg;
HTMLObject *end = cur;
@@ -2313,7 +2442,7 @@ search_text (HTMLObject **beg, HTMLSearch *info)
/* guchar *p=par+pos; */
/* FIXME UTF8
- replace 's with spaces
+ * replace 's with spaces
while (*p) {
if (*p == ENTITY_NBSP) {
*p = ' ';
@@ -2355,7 +2484,7 @@ search_text (HTMLObject **beg, HTMLSearch *info)
#endif
} else {
/* substring search - simple one - could be improved
- go thru par and look for info->text */
+ * go thru par and look for info->text */
while ((info->forward && par[index])
|| (!info->forward && index >= 0)) {
gunichar unicode_info, unicode_par;
@@ -2374,7 +2503,7 @@ search_text (HTMLObject **beg, HTMLSearch *info)
/* The above par + index is always at the beginning of the last character matched */
index = (guchar *) g_utf8_next_char ((gchar *) par + index) - par - eq_bytes;
search_set_info (head, info, par, index, info->text_bytes);
- retval=TRUE;
+ retval = TRUE;
break;
}
} else {
@@ -2398,7 +2527,8 @@ search_text (HTMLObject **beg, HTMLSearch *info)
}
static gboolean
-search (HTMLObject *obj, HTMLSearch *info)
+search (HTMLObject *obj,
+ HTMLSearch *info)
{
HTMLClue *clue = HTML_CLUE (obj);
HTMLObject *cur;
@@ -2456,15 +2586,16 @@ search (HTMLObject *obj, HTMLSearch *info)
}
static gboolean
-search_next (HTMLObject *obj, HTMLSearch *info)
+search_next (HTMLObject *obj,
+ HTMLSearch *info)
{
return FALSE;
}
static gboolean
relayout (HTMLObject *self,
- HTMLEngine *engine,
- HTMLObject *child)
+ HTMLEngine *engine,
+ HTMLObject *child)
{
gint mw;
@@ -2512,8 +2643,8 @@ html_clueflow_real_get_direction (HTMLObject *o)
void
html_clueflow_class_init (HTMLClueFlowClass *klass,
- HTMLType type,
- guint size)
+ HTMLType type,
+ guint size)
{
HTMLClueClass *clue_class;
HTMLObjectClass *object_class;
@@ -2553,9 +2684,13 @@ html_clueflow_class_init (HTMLClueFlowClass *klass,
}
void
-html_clueflow_init (HTMLClueFlow *clueflow, HTMLClueFlowClass *klass,
- HTMLClueFlowStyle style, GByteArray *levels, HTMLListType item_type, gint item_number,
- HTMLClearType clear)
+html_clueflow_init (HTMLClueFlow *clueflow,
+ HTMLClueFlowClass *klass,
+ HTMLClueFlowStyle style,
+ GByteArray *levels,
+ HTMLListType item_type,
+ gint item_number,
+ HTMLClearType clear)
{
HTMLObject *object;
HTMLClue *clue;
@@ -2583,7 +2718,11 @@ html_clueflow_init (HTMLClueFlow *clueflow, HTMLClueFlowClass *klass,
}
HTMLObject *
-html_clueflow_new (HTMLClueFlowStyle style, GByteArray *levels, HTMLListType item_type, gint item_number, HTMLClearType clear)
+html_clueflow_new (HTMLClueFlowStyle style,
+ GByteArray *levels,
+ HTMLListType item_type,
+ gint item_number,
+ HTMLClearType clear)
{
HTMLClueFlow *clueflow;
@@ -2631,7 +2770,7 @@ html_clueflow_get_default_font_style (const HTMLClueFlow *self)
**/
HTMLClueFlow *
html_clueflow_split (HTMLClueFlow *clue,
- HTMLObject *child)
+ HTMLObject *child)
{
HTMLClueFlow *new;
HTMLObject *prev;
@@ -2669,7 +2808,7 @@ html_clueflow_split (HTMLClueFlow *clue,
static void
relayout_and_draw (HTMLObject *object,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
if (engine == NULL)
return;
@@ -2679,12 +2818,12 @@ relayout_and_draw (HTMLObject *object,
}
/* This performs a relayout of the object when the indentation level
- has changed. In this case, we need to relayout the previous
- paragraph and the following one, because their padding might change
- after the level change. */
+ * has changed. In this case, we need to relayout the previous
+ * paragraph and the following one, because their padding might change
+ * after the level change. */
static void
relayout_with_siblings (HTMLClueFlow *flow,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
if (engine == NULL)
return;
@@ -2703,8 +2842,8 @@ relayout_with_siblings (HTMLClueFlow *flow,
void
html_clueflow_set_style (HTMLClueFlow *flow,
- HTMLEngine *engine,
- HTMLClueFlowStyle style)
+ HTMLEngine *engine,
+ HTMLClueFlowStyle style)
{
g_return_if_fail (flow != NULL);
g_return_if_fail (engine != NULL);
@@ -2732,8 +2871,8 @@ html_clueflow_dup_levels (HTMLClueFlow *flow)
void
html_clueflow_set_levels (HTMLClueFlow *flow,
- HTMLEngine *engine,
- GByteArray *levels)
+ HTMLEngine *engine,
+ GByteArray *levels)
{
HTMLObject *next_relative;
@@ -2749,8 +2888,8 @@ html_clueflow_set_levels (HTMLClueFlow *flow,
void
html_clueflow_set_item_type (HTMLClueFlow *flow,
- HTMLEngine *engine,
- HTMLListType item_type)
+ HTMLEngine *engine,
+ HTMLListType item_type)
{
g_return_if_fail (flow != NULL);
g_return_if_fail (engine != NULL);
@@ -2789,8 +2928,8 @@ html_clueflow_get_item_type (HTMLClueFlow *flow)
void
html_clueflow_set_halignment (HTMLClueFlow *flow,
- HTMLEngine *engine,
- HTMLHAlignType alignment)
+ HTMLEngine *engine,
+ HTMLHAlignType alignment)
{
g_return_if_fail (flow != NULL);
g_return_if_fail (engine != NULL);
@@ -2803,9 +2942,9 @@ html_clueflow_set_halignment (HTMLClueFlow *flow,
void
html_clueflow_modify_indentation_by_delta (HTMLClueFlow *flow,
- HTMLEngine *engine,
- gint indentation_delta,
- guint8 *indentation_levels)
+ HTMLEngine *engine,
+ gint indentation_delta,
+ guint8 *indentation_levels)
{
HTMLObject *next_relative;
gint indentation;
@@ -2837,9 +2976,9 @@ html_clueflow_modify_indentation_by_delta (HTMLClueFlow *flow,
void
html_clueflow_set_indentation (HTMLClueFlow *flow,
- HTMLEngine *engine,
- gint indentation,
- guint8 *indentation_levels)
+ HTMLEngine *engine,
+ gint indentation,
+ guint8 *indentation_levels)
{
HTMLObject *next_relative;
gint i;
@@ -2876,10 +3015,10 @@ html_clueflow_get_indentation (HTMLClueFlow *flow)
#if 0
void
html_clueflow_set_properties (HTMLClueFlow *flow,
- HTMLEngine *engine,
- HTMLClueFlowStyle style,
- guint8 indentation,
- HTMLHAlignType alignment)
+ HTMLEngine *engine,
+ HTMLClueFlowStyle style,
+ guint8 indentation,
+ HTMLHAlignType alignment)
{
g_return_if_fail (flow != NULL);
g_return_if_fail (engine != NULL);
@@ -2895,9 +3034,9 @@ html_clueflow_set_properties (HTMLClueFlow *flow,
void
html_clueflow_get_properties (HTMLClueFlow *flow,
- HTMLClueFlowStyle *style_return,
- guint8 *indentation_return,
- HTMLHAlignType *alignment_return)
+ HTMLClueFlowStyle *style_return,
+ guint8 *indentation_return,
+ HTMLHAlignType *alignment_return)
{
g_return_if_fail (flow != NULL);
@@ -2915,7 +3054,8 @@ html_clueflow_get_properties (HTMLClueFlow *flow,
#include "htmlinterval.h"
static guint
-get_text_bytes (HTMLClue *clue, HTMLInterval *i)
+get_text_bytes (HTMLClue *clue,
+ HTMLInterval *i)
{
HTMLObject *obj;
guint bytes;
@@ -2937,7 +3077,8 @@ get_text_bytes (HTMLClue *clue, HTMLInterval *i)
}
static gchar *
-get_text (HTMLClue *clue, HTMLInterval *i)
+get_text (HTMLClue *clue,
+ HTMLInterval *i)
{
HTMLObject *obj;
guint cb, bytes = 0;
@@ -2967,7 +3108,10 @@ get_text (HTMLClue *clue, HTMLInterval *i)
}
static HTMLObject *
-next_obj_and_clear (HTMLObject *obj, guint *off, gboolean *is_text, HTMLInterval *i)
+next_obj_and_clear (HTMLObject *obj,
+ guint *off,
+ gboolean *is_text,
+ HTMLInterval *i)
{
*off += html_object_get_length (obj) - html_interval_get_start (i, obj);
obj = obj->next;
@@ -2978,7 +3122,11 @@ next_obj_and_clear (HTMLObject *obj, guint *off, gboolean *is_text, HTMLInterval
}
static HTMLObject *
-spell_check_word_mark (HTMLObject *obj, const gchar *text, const gchar *word, guint *off, HTMLInterval *i)
+spell_check_word_mark (HTMLObject *obj,
+ const gchar *text,
+ const gchar *word,
+ guint *off,
+ HTMLInterval *i)
{
guint w_off, ioff;
guint len = g_utf8_strlen (word, -1);
@@ -3005,7 +3153,7 @@ spell_check_word_mark (HTMLObject *obj, const gchar *text, const gchar *word, gu
g_utf8_offset_to_pointer (t, toff + ioff + tlen)
- g_utf8_offset_to_pointer (t, toff + ioff)));
/* printf ("add spell error - word: %s off: %d beg: %s len: %d\n",
- word, *off, HTML_TEXT (obj)->text + toff, tlen); */
+ * word, *off, HTML_TEXT (obj)->text + toff, tlen); */
html_text_spell_errors_add (HTML_TEXT (obj),
ioff + toff, tlen);
len -= tlen;
@@ -3022,7 +3170,9 @@ spell_check_word_mark (HTMLObject *obj, const gchar *text, const gchar *word, gu
}
static gchar *
-begin_of_word (gchar *text, gchar *ct, gboolean *cited)
+begin_of_word (gchar *text,
+ gchar *ct,
+ gboolean *cited)
{
gunichar uc;
@@ -3035,7 +3185,8 @@ begin_of_word (gchar *text, gchar *ct, gboolean *cited)
}
static gchar *
-end_of_word (gchar *ct, gboolean cited)
+end_of_word (gchar *ct,
+ gboolean cited)
{
gunichar uc, ucn;
gchar *cn;
@@ -3056,14 +3207,18 @@ end_of_word (gchar *ct, gboolean cited)
}
static void
-queue_draw (HTMLObject *o, HTMLEngine *e, HTMLInterval *i)
+queue_draw (HTMLObject *o,
+ HTMLEngine *e,
+ HTMLInterval *i)
{
if (html_object_is_text (o))
html_text_queue_draw (HTML_TEXT (o), e, html_interval_get_start (i, o), html_interval_get_length (i, o));
}
void
-html_clueflow_spell_check (HTMLClueFlow *flow, HTMLEngine *e, HTMLInterval *interval)
+html_clueflow_spell_check (HTMLClueFlow *flow,
+ HTMLEngine *e,
+ HTMLInterval *interval)
{
HTMLObject *obj;
HTMLClue *clue;
@@ -3075,7 +3230,7 @@ html_clueflow_spell_check (HTMLClueFlow *flow, HTMLEngine *e, HTMLInterval *inte
g_return_if_fail (HTML_OBJECT_TYPE (flow) == HTML_TYPE_CLUEFLOW);
/* if (interval)
- printf ("html_clueflow_spell_check %p %p %d %d\n", i->from, i->to, i->from_offset, i->to_offset); */
+ * printf ("html_clueflow_spell_check %p %p %d %d\n", i->from, i->to, i->from_offset, i->to_offset); */
clue = HTML_CLUE (flow);
if (!e->widget->editor_api || !gtk_html_get_inline_spelling (e->widget) || !clue || !clue->tail)
@@ -3166,7 +3321,9 @@ html_clueflow_contains_table (HTMLClueFlow *flow)
}
gint
-html_clueflow_get_line_offset (HTMLClueFlow *flow, HTMLPainter *painter, HTMLObject *child)
+html_clueflow_get_line_offset (HTMLClueFlow *flow,
+ HTMLPainter *painter,
+ HTMLObject *child)
{
HTMLObject *o, *head;
gint line_offset;
@@ -3209,14 +3366,16 @@ html_clueflow_get_line_offset (HTMLClueFlow *flow, HTMLPainter *painter, HTMLObj
}
gboolean
-html_clueflow_tabs (HTMLClueFlow *flow, HTMLPainter *p)
+html_clueflow_tabs (HTMLClueFlow *flow,
+ HTMLPainter *p)
{
return (flow && HTML_IS_CLUEFLOW (flow) && flow->style == HTML_CLUEFLOW_STYLE_PRE) || HTML_IS_PLAIN_PAINTER (p)
? TRUE : FALSE;
}
void
-html_clueflow_set_item_color (HTMLClueFlow *flow, HTMLColor *color)
+html_clueflow_set_item_color (HTMLClueFlow *flow,
+ HTMLColor *color)
{
if (flow->item_color)
html_color_unref (flow->item_color);
@@ -3226,7 +3385,8 @@ html_clueflow_set_item_color (HTMLClueFlow *flow, HTMLColor *color)
}
gboolean
-html_clueflow_style_equals (HTMLClueFlow *cf1, HTMLClueFlow *cf2)
+html_clueflow_style_equals (HTMLClueFlow *cf1,
+ HTMLClueFlow *cf2)
{
if (!cf1 || !cf2
|| !HTML_IS_CLUEFLOW (cf1) || !HTML_IS_CLUEFLOW (cf2)
diff --git a/gtkhtml/htmlclueflow.h b/gtkhtml/htmlclueflow.h
index 26c9007..0a1a768 100644
--- a/gtkhtml/htmlclueflow.h
+++ b/gtkhtml/htmlclueflow.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLCLUEFLOW_H_
@@ -44,7 +44,7 @@ struct _HTMLClueFlow {
gint indent_width;
/* list item attributes - this will be ideally moved to list item type
- based on HTMLClueFlow once we have real types */
+ * based on HTMLClueFlow once we have real types */
HTMLListType item_type;
gint item_number;
HTMLColor *item_color;
diff --git a/gtkhtml/htmlclueh.c b/gtkhtml/htmlclueh.c
index df37b09..fbc6e87 100644
--- a/gtkhtml/htmlclueh.c
+++ b/gtkhtml/htmlclueh.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -38,7 +38,9 @@ copy (HTMLObject *self,
}
static void
-set_max_width (HTMLObject *o, HTMLPainter *painter, gint w)
+set_max_width (HTMLObject *o,
+ HTMLPainter *painter,
+ gint w)
{
HTMLObject *obj;
@@ -59,7 +61,9 @@ set_max_width (HTMLObject *o, HTMLPainter *painter, gint w)
}
static gboolean
-html_clueh_real_calc_size (HTMLObject *clue, HTMLPainter *painter, GList **changed_objs)
+html_clueh_real_calc_size (HTMLObject *clue,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLObject *obj;
gint lmargin = 0;
@@ -127,7 +131,7 @@ html_clueh_real_calc_size (HTMLObject *clue, HTMLPainter *painter, GList **chang
static gint
calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLObject *obj;
gint minWidth = 0;
@@ -140,7 +144,7 @@ calc_min_width (HTMLObject *o,
static gint
calc_preferred_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLObject *obj;
gint prefWidth = 0;
@@ -160,8 +164,8 @@ html_clueh_type_init (void)
void
html_clueh_class_init (HTMLClueHClass *klass,
- HTMLType type,
- guint size)
+ HTMLType type,
+ guint size)
{
HTMLClueClass *clue_class;
HTMLObjectClass *object_class;
@@ -181,8 +185,11 @@ html_clueh_class_init (HTMLClueHClass *klass,
}
void
-html_clueh_init (HTMLClueH *clueh, HTMLClueHClass *klass,
- gint x, gint y, gint max_width)
+html_clueh_init (HTMLClueH *clueh,
+ HTMLClueHClass *klass,
+ gint x,
+ gint y,
+ gint max_width)
{
HTMLObject *object;
HTMLClue *clue;
@@ -205,7 +212,9 @@ html_clueh_init (HTMLClueH *clueh, HTMLClueHClass *klass,
}
HTMLObject *
-html_clueh_new (gint x, gint y, gint max_width)
+html_clueh_new (gint x,
+ gint y,
+ gint max_width)
{
HTMLClueH *clueh;
diff --git a/gtkhtml/htmlclueh.h b/gtkhtml/htmlclueh.h
index 1f4c986..b732c19 100644
--- a/gtkhtml/htmlclueh.h
+++ b/gtkhtml/htmlclueh.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLCLUEH_H_
#define _HTMLCLUEH_H_
diff --git a/gtkhtml/htmlcluev.c b/gtkhtml/htmlcluev.c
index e07f9ae..33e20c5 100644
--- a/gtkhtml/htmlcluev.c
+++ b/gtkhtml/htmlcluev.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -37,10 +37,10 @@ static HTMLClueClass *parent_class = NULL;
/* FIXME this must be rewritten as the multiple type casts make my head spin.
- The types in `HTMLClueAligned' are chosen wrong. */
+ * The types in `HTMLClueAligned' are chosen wrong. */
static void
-remove_aligned_by_parent ( HTMLClueV *cluev,
- HTMLObject *p )
+remove_aligned_by_parent (HTMLClueV *cluev,
+ HTMLObject *p)
{
HTMLClueAligned *tmp;
HTMLObject *obj;
@@ -93,14 +93,20 @@ cluev_next_aligned (HTMLObject *aclue)
}
static gint
-get_lmargin (HTMLObject *o, HTMLPainter *painter)
+get_lmargin (HTMLObject *o,
+ HTMLPainter *painter)
{
return (HTML_CLUEV (o)->padding + HTML_CLUEV (o)->border_width) * html_painter_get_pixel_size (painter)
+ (o->parent ? html_object_get_left_margin (o->parent, painter, o->y, TRUE) : 0);
}
static void
-add_clear_area_behind (GList **changed_objs, HTMLObject *o, gint x, gint y, gint w, gint h)
+add_clear_area_behind (GList **changed_objs,
+ HTMLObject *o,
+ gint x,
+ gint y,
+ gint w,
+ gint h)
{
HTMLObjectClearRectangle *cr;
@@ -118,7 +124,10 @@ add_clear_area_behind (GList **changed_objs, HTMLObject *o, gint x, gint y, gint
}
static gboolean
-html_cluev_do_layout (HTMLObject *o, HTMLPainter *painter, gboolean calc_size, GList **changed_objs)
+html_cluev_do_layout (HTMLObject *o,
+ HTMLPainter *painter,
+ gboolean calc_size,
+ GList **changed_objs)
{
HTMLClueV *cluev;
HTMLClue *clue;
@@ -155,7 +164,7 @@ html_cluev_do_layout (HTMLObject *o, HTMLPainter *painter, gboolean calc_size, G
lmargin = get_lmargin (o, painter);
/* If we have already called calc_size for the children, then just
- continue from the last object done in previous call. */
+ * continue from the last object done in previous call. */
if (clue->curr != NULL) {
if (clue->curr->prev)
@@ -173,7 +182,7 @@ html_cluev_do_layout (HTMLObject *o, HTMLPainter *painter, gboolean calc_size, G
while (clue->curr != NULL) {
gint old_y, old_y_off, new_y_off;
/* Set an initial ypos so that the alignment stuff knows where
- the top of this object is */
+ * the top of this object is */
old_y = clue->curr->y;
old_y_off = clue->curr->y - clue->curr->ascent;
clue->curr->y = o->ascent;
@@ -219,7 +228,7 @@ html_cluev_do_layout (HTMLObject *o, HTMLPainter *painter, gboolean calc_size, G
if (first_change) {
first_change = FALSE;
/* if it's new one (y == 0) clear from new y_off, else from old one or new one,
- which one is higher */
+ * which one is higher */
first_y_off = old_y && old_y_off < new_y_off ? old_y_off : new_y_off;
/* printf ("\nfirst_y_off: %d x %d --> %d\n", old_y_off, new_y_off, first_y_off); */
}
@@ -235,7 +244,7 @@ html_cluev_do_layout (HTMLObject *o, HTMLPainter *painter, gboolean calc_size, G
o->ascent += padding;
/* Remember the last object so that we can start from here next time
- we are called. */
+ * we are called. */
clue->curr = clue->tail;
if (o->max_width != 0 && o->width < o->max_width)
@@ -311,14 +320,16 @@ copy (HTMLObject *self,
}
static gboolean
-html_cluev_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_cluev_real_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
return html_cluev_do_layout (o, painter, TRUE, changed_objs);
}
static gint
calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
return (* HTML_OBJECT_CLASS (parent_class)->calc_min_width) (o, painter)
+ 2 * html_painter_get_pixel_size (painter) * (HTML_CLUEV (o)->padding + HTML_CLUEV (o)->border_width);
@@ -326,14 +337,16 @@ calc_min_width (HTMLObject *o,
static gint
calc_preferred_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
return (* HTML_OBJECT_CLASS (parent_class)->calc_preferred_width) (o, painter)
+ 2 * html_painter_get_pixel_size (painter) * (HTML_CLUEV (o)->padding + HTML_CLUEV (o)->border_width);
}
static void
-set_max_width (HTMLObject *o, HTMLPainter *painter, gint max_width)
+set_max_width (HTMLObject *o,
+ HTMLPainter *painter,
+ gint max_width)
{
HTMLObject *obj;
@@ -344,7 +357,9 @@ set_max_width (HTMLObject *o, HTMLPainter *painter, gint max_width)
}
static void
-set_max_height (HTMLObject *o, HTMLPainter *painter, gint height)
+set_max_height (HTMLObject *o,
+ HTMLPainter *painter,
+ gint height)
{
HTMLClue *clue = HTML_CLUE (o);
@@ -372,9 +387,12 @@ reset (HTMLObject *clue)
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLObject *aclue;
HTMLClueV *cluev;
@@ -448,10 +466,11 @@ draw (HTMLObject *o,
static HTMLObject *
check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
HTMLObject *p;
HTMLObject *obj;
@@ -545,7 +564,7 @@ check_point (HTMLObject *self,
if (!for_cursor) {
if (x >= 0 && y >= 0 && x < self->width && y < self->ascent + self->descent) {
if (offset_return) {
- if (x < self->width/2)
+ if (x < self->width / 2)
*offset_return = 0;
else
*offset_return = 1;
@@ -559,8 +578,8 @@ check_point (HTMLObject *self,
static gboolean
relayout (HTMLObject *self,
- HTMLEngine *engine,
- HTMLObject *child)
+ HTMLEngine *engine,
+ HTMLObject *child)
{
gint prev_width, prev_ascent, prev_descent;
gboolean changed;
@@ -601,9 +620,9 @@ relayout (HTMLObject *self,
}
/* If the object has shrunk, we have to clean the areas around
- it so that we don't leave garbage on the screen. FIXME:
- this wastes some time if there is an object on the right of
- or under this one. */
+ * it so that we don't leave garbage on the screen. FIXME:
+ * this wastes some time if there is an object on the right of
+ * or under this one. */
if (prev_ascent + prev_descent > self->ascent + self->descent)
html_engine_queue_clear (engine,
@@ -624,7 +643,10 @@ relayout (HTMLObject *self,
}
static gint
-get_left_margin (HTMLObject *self, HTMLPainter *painter, gint y, gboolean with_aligned)
+get_left_margin (HTMLObject *self,
+ HTMLPainter *painter,
+ gint y,
+ gboolean with_aligned)
{
HTMLObject *aclue;
HTMLClueV *cluev;
@@ -648,7 +670,10 @@ get_left_margin (HTMLObject *self, HTMLPainter *painter, gint y, gboolean with_a
}
static gint
-get_right_margin (HTMLObject *self, HTMLPainter *painter, gint y, gboolean with_aligned)
+get_right_margin (HTMLObject *self,
+ HTMLPainter *painter,
+ gint y,
+ gboolean with_aligned)
{
HTMLClueV *cluev;
/* FIXME: Should be HTMLAligned */
@@ -674,8 +699,15 @@ get_right_margin (HTMLObject *self, HTMLPainter *painter, gint y, gboolean with_
/* HTMLClue methods. */
static void
-find_free_area (HTMLClue *clue, HTMLPainter *painter, gint y, gint width, gint height,
- gint indent, gint *y_pos, gint *_lmargin, gint *_rmargin)
+find_free_area (HTMLClue *clue,
+ HTMLPainter *painter,
+ gint y,
+ gint width,
+ gint height,
+ gint indent,
+ gint *y_pos,
+ gint *_lmargin,
+ gint *_rmargin)
{
HTMLClueV *cluev = HTML_CLUEV (clue);
gint try_y = y;
@@ -683,7 +715,7 @@ find_free_area (HTMLClue *clue, HTMLPainter *painter, gint y, gint width, gint h
gint rmargin;
gint lm, rm;
HTMLObject *aclue;
- gint next_y, top_y, base_y=0;
+ gint next_y, top_y, base_y = 0;
next_y = 0;
while (1) {
@@ -743,7 +775,8 @@ find_free_area (HTMLClue *clue, HTMLPainter *painter, gint y, gint width, gint h
}
static gboolean
-appended (HTMLClue *clue, HTMLClue *aclue)
+appended (HTMLClue *clue,
+ HTMLClue *aclue)
{
/* Returns whether aclue is already in the alignList */
HTMLClueAligned *aligned;
@@ -764,7 +797,12 @@ appended (HTMLClue *clue, HTMLClue *aclue)
}
static void
-append_left_aligned (HTMLClue *clue, HTMLPainter *painter, HTMLClue *aclue, gint *lmargin, gint *rmargin, gint indent)
+append_left_aligned (HTMLClue *clue,
+ HTMLPainter *painter,
+ HTMLClue *aclue,
+ gint *lmargin,
+ gint *rmargin,
+ gint indent)
{
gint y_pos, y_inc;
@@ -802,7 +840,12 @@ append_left_aligned (HTMLClue *clue, HTMLPainter *painter, HTMLClue *aclue, gint
}
static void
-append_right_aligned (HTMLClue *clue, HTMLPainter *painter, HTMLClue *aclue, gint *lmargin, gint *rmargin, gint indent)
+append_right_aligned (HTMLClue *clue,
+ HTMLPainter *painter,
+ HTMLClue *aclue,
+ gint *lmargin,
+ gint *rmargin,
+ gint indent)
{
gint y_pos, y_inc;
@@ -840,7 +883,7 @@ append_right_aligned (HTMLClue *clue, HTMLPainter *painter, HTMLClue *aclue, gin
static gint
get_left_clear (HTMLClue *self,
- gint y)
+ gint y)
{
HTMLObject *p;
gint top_y, base_y;
@@ -862,7 +905,7 @@ get_left_clear (HTMLClue *self,
static gint
get_right_clear (HTMLClue *self,
- gint y)
+ gint y)
{
HTMLObject *p;
gint top_y, base_y;
@@ -917,8 +960,8 @@ html_cluev_type_init (void)
void
html_cluev_class_init (HTMLClueVClass *klass,
- HTMLType type,
- guint size)
+ HTMLType type,
+ guint size)
{
HTMLObjectClass *object_class;
HTMLClueClass *clue_class;
@@ -955,9 +998,10 @@ html_cluev_class_init (HTMLClueVClass *klass,
void
html_cluev_init (HTMLClueV *cluev,
- HTMLClueVClass *klass,
- gint x, gint y,
- gint percent)
+ HTMLClueVClass *klass,
+ gint x,
+ gint y,
+ gint percent)
{
HTMLObject *object;
HTMLClue *clue;
@@ -986,7 +1030,9 @@ html_cluev_init (HTMLClueV *cluev,
}
HTMLObject *
-html_cluev_new (gint x, gint y, gint percent)
+html_cluev_new (gint x,
+ gint y,
+ gint percent)
{
HTMLClueV *cluev;
@@ -997,7 +1043,8 @@ html_cluev_new (gint x, gint y, gint percent)
}
void
-html_cluev_set_style (HTMLClueV *cluev, HTMLStyle *style)
+html_cluev_set_style (HTMLClueV *cluev,
+ HTMLStyle *style)
{
if (style != NULL) {
if (cluev->border_color)
diff --git a/gtkhtml/htmlcluev.h b/gtkhtml/htmlcluev.h
index 3818ff7..58e7f7c 100644
--- a/gtkhtml/htmlcluev.h
+++ b/gtkhtml/htmlcluev.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLCLUEV_H_
#define _HTMLCLUEV_H_
diff --git a/gtkhtml/htmlcolor.c b/gtkhtml/htmlcolor.c
index 17870a9..b9b05bf 100644
--- a/gtkhtml/htmlcolor.c
+++ b/gtkhtml/htmlcolor.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
- Authors: Radek Doulik (rodo helixcode com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
*/
#include <config.h>
@@ -47,7 +47,9 @@ html_color_new_from_gdk_color (const GdkColor *color)
}
HTMLColor *
-html_color_new_from_rgb (gushort red, gushort green, gushort blue)
+html_color_new_from_rgb (gushort red,
+ gushort green,
+ gushort blue)
{
HTMLColor *nc = html_color_new ();
@@ -76,14 +78,15 @@ html_color_unref (HTMLColor *color)
if (!color->refcount) {
/* if (color->allocated)
- g_warning ("FIXME, color free\n"); */
+ * g_warning ("FIXME, color free\n"); */
/* FIXME commented out to catch g_asserts on refcount so we could hunt "too much unrefs" bugs */
g_free (color);
}
}
void
-html_color_alloc (HTMLColor *color, HTMLPainter *painter)
+html_color_alloc (HTMLColor *color,
+ HTMLPainter *painter)
{
g_assert (color);
@@ -94,7 +97,8 @@ html_color_alloc (HTMLColor *color, HTMLPainter *painter)
}
gboolean
-html_color_equal (HTMLColor *color1, HTMLColor *color2)
+html_color_equal (HTMLColor *color1,
+ HTMLColor *color2)
{
if (color1 == color2)
return TRUE;
@@ -105,10 +109,11 @@ html_color_equal (HTMLColor *color1, HTMLColor *color2)
}
void
-html_color_set (HTMLColor *color, GdkColor *c)
+html_color_set (HTMLColor *color,
+ GdkColor *c)
{
/* if (color->allocated)
- g_warning ("FIXME, color free\n"); */
+ * g_warning ("FIXME, color free\n"); */
color->allocated = FALSE;
color->color = *c;
}
diff --git a/gtkhtml/htmlcolor.h b/gtkhtml/htmlcolor.h
index b23ce98..c3ca1d4 100644
--- a/gtkhtml/htmlcolor.h
+++ b/gtkhtml/htmlcolor.h
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
- Authors: Radek Doulik (rodo helixcode com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTML_COLOR_H_
diff --git a/gtkhtml/htmlcolorset.c b/gtkhtml/htmlcolorset.c
index ec904f0..0f5fb25 100644
--- a/gtkhtml/htmlcolorset.c
+++ b/gtkhtml/htmlcolorset.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -73,13 +73,16 @@ html_colorset_destroy (HTMLColorSet *set)
}
void
-html_colorset_add_slave (HTMLColorSet *set, HTMLColorSet *slave)
+html_colorset_add_slave (HTMLColorSet *set,
+ HTMLColorSet *slave)
{
set->slaves = g_slist_prepend (set->slaves, slave);
}
void
-html_colorset_set_color (HTMLColorSet *s, GdkColor *color, HTMLColorId idx)
+html_colorset_set_color (HTMLColorSet *s,
+ GdkColor *color,
+ HTMLColorId idx)
{
GSList *cur;
HTMLColorSet *cs;
@@ -97,24 +100,28 @@ html_colorset_set_color (HTMLColorSet *s, GdkColor *color, HTMLColorId idx)
}
HTMLColor *
-html_colorset_get_color (HTMLColorSet *s, HTMLColorId idx)
+html_colorset_get_color (HTMLColorSet *s,
+ HTMLColorId idx)
{
return s->color[idx];
}
HTMLColor *
-html_colorset_get_color_allocated (HTMLColorSet *s, HTMLPainter *painter, HTMLColorId idx)
+html_colorset_get_color_allocated (HTMLColorSet *s,
+ HTMLPainter *painter,
+ HTMLColorId idx)
{
html_color_alloc (s->color[idx], painter);
return s->color[idx];
}
void
-html_colorset_set_by (HTMLColorSet *s, HTMLColorSet *o)
+html_colorset_set_by (HTMLColorSet *s,
+ HTMLColorSet *o)
{
HTMLColorId i;
- for (i=0; i < HTMLColors; i++) {
+ for (i = 0; i < HTMLColors; i++) {
html_colorset_set_color (s, &o->color[i]->color, i);
/* unset the changed flag */
s->changed[i] = FALSE;
@@ -122,11 +129,12 @@ html_colorset_set_by (HTMLColorSet *s, HTMLColorSet *o)
}
void
-html_colorset_set_unchanged (HTMLColorSet *s, HTMLColorSet *o)
+html_colorset_set_unchanged (HTMLColorSet *s,
+ HTMLColorSet *o)
{
HTMLColorId i;
- for (i=0; i < HTMLColors; i++) {
+ for (i = 0; i < HTMLColors; i++) {
if (!s->changed[i]) {
html_colorset_set_color (s, &o->color[i]->color, i);
s->changed[i] = FALSE;
@@ -167,7 +175,8 @@ get_prop_color (GtkWidget *w,
}
void
-html_colorset_set_style (HTMLColorSet *s, GtkWidget *w)
+html_colorset_set_style (HTMLColorSet *s,
+ GtkWidget *w)
{
GdkColor *color = NULL;
GtkStyle *style = gtk_widget_get_style (w);
diff --git a/gtkhtml/htmlcolorset.h b/gtkhtml/htmlcolorset.h
index fd25886..b186651 100644
--- a/gtkhtml/htmlcolorset.h
+++ b/gtkhtml/htmlcolorset.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLCOLORSET_H_
@@ -32,7 +32,7 @@ struct _HTMLColorSet
gboolean changed[HTMLColors];
/* slave sets - they must be updated when setting this one
- engine has master set and painters have slave ones
+ * engine has master set and painters have slave ones
*/
GSList *slaves;
};
diff --git a/gtkhtml/htmlcursor.c b/gtkhtml/htmlcursor.c
index 769b80a..cead86c 100644
--- a/gtkhtml/htmlcursor.c
+++ b/gtkhtml/htmlcursor.c
@@ -1,28 +1,28 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/* This file is a bit of a hack. To make things work in a really nice way, we
- should have some extra methods in the various subclasses to implement cursor
- movement. But for now, I think this is a reasonable way to get things to
- work. */
+ * should have some extra methods in the various subclasses to implement cursor
+ * movement. But for now, I think this is a reasonable way to get things to
+ * work. */
#include <config.h>
#include <stdlib.h>
@@ -78,7 +78,7 @@ debug_location (const HTMLCursor *cursor)
static void
normalize (HTMLObject **object,
- guint *offset)
+ guint *offset)
{
if (*offset == 0 && (*object)->prev != NULL) {
*object = html_object_prev_not_slave (*object);
@@ -89,7 +89,9 @@ normalize (HTMLObject **object,
inline void
-html_cursor_init (HTMLCursor *cursor, HTMLObject *o, guint offset)
+html_cursor_init (HTMLCursor *cursor,
+ HTMLObject *o,
+ guint offset)
{
cursor->object = o;
cursor->offset = offset;
@@ -130,7 +132,7 @@ html_cursor_destroy (HTMLCursor *cursor)
**/
void
html_cursor_copy (HTMLCursor *dest,
- const HTMLCursor *src)
+ const HTMLCursor *src)
{
g_return_if_fail (dest != NULL);
g_return_if_fail (src != NULL);
@@ -163,7 +165,7 @@ html_cursor_normalize (HTMLCursor *cursor)
void
html_cursor_home (HTMLCursor *cursor,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
HTMLObject *obj;
@@ -205,8 +207,8 @@ html_cursor_home (HTMLCursor *cursor,
static gboolean
forward (HTMLCursor *cursor,
- HTMLEngine *engine,
- gboolean exact_position)
+ HTMLEngine *engine,
+ gboolean exact_position)
{
gboolean retval;
gboolean (*forward_func) (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
@@ -234,8 +236,8 @@ forward (HTMLCursor *cursor,
static gboolean
html_cursor_real_forward (HTMLCursor *cursor,
- HTMLEngine *engine,
- gboolean exact_position)
+ HTMLEngine *engine,
+ gboolean exact_position)
{
gboolean retval;
@@ -257,22 +259,22 @@ html_cursor_real_forward (HTMLCursor *cursor,
gboolean
html_cursor_forward (HTMLCursor *cursor,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
return html_cursor_real_forward (cursor, engine, FALSE);
}
gboolean
html_cursor_forward_one (HTMLCursor *cursor,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
return html_cursor_real_forward (cursor, engine, TRUE);
}
static gboolean
backward (HTMLCursor *cursor,
- HTMLEngine *engine,
- gboolean exact_position)
+ HTMLEngine *engine,
+ gboolean exact_position)
{
gboolean retval;
gboolean (*backward_func) (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine);
@@ -299,8 +301,8 @@ backward (HTMLCursor *cursor,
static gboolean
html_cursor_real_backward (HTMLCursor *cursor,
- HTMLEngine *engine,
- gboolean exact_position)
+ HTMLEngine *engine,
+ gboolean exact_position)
{
gboolean retval;
@@ -322,14 +324,14 @@ html_cursor_real_backward (HTMLCursor *cursor,
gboolean
html_cursor_backward (HTMLCursor *cursor,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
return html_cursor_real_backward (cursor, engine, FALSE);
}
gboolean
html_cursor_backward_one (HTMLCursor *cursor,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
return html_cursor_real_backward (cursor, engine, TRUE);
}
@@ -337,7 +339,7 @@ html_cursor_backward_one (HTMLCursor *cursor,
gboolean
html_cursor_up (HTMLCursor *cursor,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
HTMLCursor orig_cursor;
HTMLCursor prev_cursor;
@@ -417,7 +419,7 @@ html_cursor_up (HTMLCursor *cursor,
}
/* Choose the character which is the nearest to the
- target X. */
+ * target X. */
if (prev_y == y && x - target_x >= target_x - prev_x) {
cursor->object = prev_cursor.object;
cursor->offset = prev_cursor.offset;
@@ -435,7 +437,7 @@ html_cursor_up (HTMLCursor *cursor,
}
/* Choose the character which is the nearest to the
- target X. */
+ * target X. */
if (prev_y == y && target_x - x >= prev_x - target_x) {
cursor->object = prev_cursor.object;
cursor->offset = prev_cursor.offset;
@@ -452,7 +454,7 @@ html_cursor_up (HTMLCursor *cursor,
gboolean
html_cursor_down (HTMLCursor *cursor,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
HTMLCursor orig_cursor;
HTMLCursor prev_cursor;
@@ -536,7 +538,7 @@ html_cursor_down (HTMLCursor *cursor,
}
/* Choose the character which is the nearest to the
- target X. */
+ * target X. */
if (prev_y == y && target_x - x >= prev_x - target_x) {
cursor->object = prev_cursor.object;
cursor->offset = prev_cursor.offset;
@@ -554,7 +556,7 @@ html_cursor_down (HTMLCursor *cursor,
}
/* Choose the character which is the nearest to the
- target X. */
+ * target X. */
if (prev_y == y && x - target_x >= target_x - prev_x) {
cursor->object = prev_cursor.object;
cursor->offset = prev_cursor.offset;
@@ -571,10 +573,10 @@ html_cursor_down (HTMLCursor *cursor,
static gboolean
html_cursor_real_jump_to (HTMLCursor *cursor,
- HTMLEngine *engine,
- HTMLObject *object,
- guint offset,
- gboolean exact_position)
+ HTMLEngine *engine,
+ HTMLObject *object,
+ guint offset,
+ gboolean exact_position)
{
HTMLCursor original;
@@ -623,9 +625,9 @@ html_cursor_real_jump_to (HTMLCursor *cursor,
**/
gboolean
html_cursor_jump_to (HTMLCursor *cursor,
- HTMLEngine *engine,
- HTMLObject *object,
- guint offset)
+ HTMLEngine *engine,
+ HTMLObject *object,
+ guint offset)
{
return html_cursor_real_jump_to (cursor, engine, object, offset, FALSE);
}
@@ -642,9 +644,9 @@ html_cursor_jump_to (HTMLCursor *cursor,
**/
gboolean
html_cursor_exactly_jump_to (HTMLCursor *cursor,
- HTMLEngine *engine,
- HTMLObject *object,
- guint offset)
+ HTMLEngine *engine,
+ HTMLObject *object,
+ guint offset)
{
return html_cursor_real_jump_to (cursor, engine, object, offset, TRUE);
}
@@ -654,7 +656,7 @@ html_cursor_exactly_jump_to (HTMLCursor *cursor,
void
html_cursor_beginning_of_document (HTMLCursor *cursor,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
g_return_if_fail (cursor != NULL);
g_return_if_fail (engine != NULL);
@@ -671,7 +673,7 @@ html_cursor_beginning_of_document (HTMLCursor *cursor,
void
html_cursor_end_of_document (HTMLCursor *cursor,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
g_return_if_fail (cursor != NULL);
g_return_if_fail (engine != NULL);
@@ -696,9 +698,9 @@ html_cursor_get_position (HTMLCursor *cursor)
static void
html_cursor_real_jump_to_position (HTMLCursor *cursor,
- HTMLEngine *engine,
- gint position,
- gboolean exact_position)
+ HTMLEngine *engine,
+ gint position,
+ gboolean exact_position)
{
g_return_if_fail (cursor != NULL);
g_return_if_fail (position >= 0);
@@ -722,25 +724,25 @@ html_cursor_real_jump_to_position (HTMLCursor *cursor,
void
html_cursor_jump_to_position (HTMLCursor *cursor,
- HTMLEngine *engine,
- gint position)
+ HTMLEngine *engine,
+ gint position)
{
html_cursor_real_jump_to_position (cursor, engine, position, FALSE);
}
void
html_cursor_exactly_jump_to_position (HTMLCursor *cursor,
- HTMLEngine *engine,
- gint position)
+ HTMLEngine *engine,
+ gint position)
{
html_cursor_real_jump_to_position (cursor, engine, position, TRUE);
}
static void
html_cursor_real_jump_to_position_no_spell (HTMLCursor *cursor,
- HTMLEngine *engine,
- gint position,
- gboolean exact_position)
+ HTMLEngine *engine,
+ gint position,
+ gboolean exact_position)
{
gboolean need_spell_check;
@@ -752,16 +754,16 @@ html_cursor_real_jump_to_position_no_spell (HTMLCursor *cursor,
void
html_cursor_jump_to_position_no_spell (HTMLCursor *cursor,
- HTMLEngine *engine,
- gint position)
+ HTMLEngine *engine,
+ gint position)
{
html_cursor_real_jump_to_position_no_spell (cursor, engine, position, FALSE);
}
void
html_cursor_exactly_jump_to_position_no_spell (HTMLCursor *cursor,
- HTMLEngine *engine,
- gint position)
+ HTMLEngine *engine,
+ gint position)
{
html_cursor_real_jump_to_position_no_spell (cursor, engine, position, TRUE);
}
@@ -771,7 +773,7 @@ html_cursor_exactly_jump_to_position_no_spell (HTMLCursor *cursor,
gboolean
html_cursor_equal (const HTMLCursor *a,
- const HTMLCursor *b)
+ const HTMLCursor *b)
{
g_return_val_if_fail (a != NULL, FALSE);
g_return_val_if_fail (b != NULL, FALSE);
@@ -781,7 +783,7 @@ html_cursor_equal (const HTMLCursor *a,
gboolean
html_cursor_precedes (const HTMLCursor *a,
- const HTMLCursor *b)
+ const HTMLCursor *b)
{
g_return_val_if_fail (a != NULL, FALSE);
g_return_val_if_fail (b != NULL, FALSE);
@@ -791,7 +793,7 @@ html_cursor_precedes (const HTMLCursor *a,
gboolean
html_cursor_follows (const HTMLCursor *a,
- const HTMLCursor *b)
+ const HTMLCursor *b)
{
g_return_val_if_fail (a != NULL, FALSE);
g_return_val_if_fail (b != NULL, FALSE);
@@ -846,7 +848,8 @@ html_cursor_get_prev_char (const HTMLCursor *cursor)
}
gboolean
-html_cursor_beginning_of_paragraph (HTMLCursor *cursor, HTMLEngine *engine)
+html_cursor_beginning_of_paragraph (HTMLCursor *cursor,
+ HTMLEngine *engine)
{
HTMLCursor copy;
HTMLObject *flow;
@@ -884,7 +887,8 @@ html_cursor_beginning_of_paragraph (HTMLCursor *cursor, HTMLEngine *engine)
}
gboolean
-html_cursor_end_of_paragraph (HTMLCursor *cursor, HTMLEngine *engine)
+html_cursor_end_of_paragraph (HTMLCursor *cursor,
+ HTMLEngine *engine)
{
HTMLCursor copy;
HTMLObject *flow;
@@ -922,7 +926,9 @@ html_cursor_end_of_paragraph (HTMLCursor *cursor, HTMLEngine *engine)
}
gboolean
-html_cursor_forward_n (HTMLCursor *cursor, HTMLEngine *e, guint n)
+html_cursor_forward_n (HTMLCursor *cursor,
+ HTMLEngine *e,
+ guint n)
{
gboolean rv = FALSE;
@@ -935,7 +941,9 @@ html_cursor_forward_n (HTMLCursor *cursor, HTMLEngine *e, guint n)
}
gboolean
-html_cursor_backward_n (HTMLCursor *cursor, HTMLEngine *e, guint n)
+html_cursor_backward_n (HTMLCursor *cursor,
+ HTMLEngine *e,
+ guint n)
{
gboolean rv = FALSE;
@@ -948,7 +956,8 @@ html_cursor_backward_n (HTMLCursor *cursor, HTMLEngine *e, guint n)
}
HTMLObject *
-html_cursor_child_of (HTMLCursor *cursor, HTMLObject *parent)
+html_cursor_child_of (HTMLCursor *cursor,
+ HTMLObject *parent)
{
HTMLObject *child = cursor->object;
@@ -962,7 +971,8 @@ html_cursor_child_of (HTMLCursor *cursor, HTMLObject *parent)
}
static gboolean
-move_to_next_object (HTMLCursor *cursor, HTMLEngine *e)
+move_to_next_object (HTMLCursor *cursor,
+ HTMLEngine *e)
{
HTMLObject *next;
@@ -986,7 +996,8 @@ move_to_next_object (HTMLCursor *cursor, HTMLEngine *e)
}
static gboolean
-move_to_prev_object (HTMLCursor *cursor, HTMLEngine *e)
+move_to_prev_object (HTMLCursor *cursor,
+ HTMLEngine *e)
{
HTMLObject *prev;
@@ -1010,7 +1021,8 @@ move_to_prev_object (HTMLCursor *cursor, HTMLEngine *e)
}
static gboolean
-move_left (HTMLCursor *cursor, HTMLEngine *e)
+move_left (HTMLCursor *cursor,
+ HTMLEngine *e)
{
if (!html_object_cursor_left (cursor->object, e->painter, cursor)) {
if (cursor->object->parent) {
@@ -1025,7 +1037,8 @@ move_left (HTMLCursor *cursor, HTMLEngine *e)
}
gboolean
-html_cursor_left (HTMLCursor *cursor, HTMLEngine *engine)
+html_cursor_left (HTMLCursor *cursor,
+ HTMLEngine *engine)
{
gboolean retval;
@@ -1046,7 +1059,8 @@ html_cursor_left (HTMLCursor *cursor, HTMLEngine *engine)
}
static gboolean
-left_in_flow (HTMLCursor *cursor, HTMLEngine *e)
+left_in_flow (HTMLCursor *cursor,
+ HTMLEngine *e)
{
gboolean retval;
@@ -1071,7 +1085,8 @@ left_in_flow (HTMLCursor *cursor, HTMLEngine *e)
}
static gboolean
-html_cursor_left_edge_of_line (HTMLCursor *cursor, HTMLEngine *engine)
+html_cursor_left_edge_of_line (HTMLCursor *cursor,
+ HTMLEngine *engine)
{
HTMLCursor prev_cursor;
gint x, y, prev_y;
@@ -1109,7 +1124,8 @@ html_cursor_left_edge_of_line (HTMLCursor *cursor, HTMLEngine *engine)
}
static gboolean
-move_right (HTMLCursor *cursor, HTMLEngine *e)
+move_right (HTMLCursor *cursor,
+ HTMLEngine *e)
{
gboolean retval;
@@ -1137,7 +1153,8 @@ move_right (HTMLCursor *cursor, HTMLEngine *e)
}
gboolean
-html_cursor_right (HTMLCursor *cursor, HTMLEngine *engine)
+html_cursor_right (HTMLCursor *cursor,
+ HTMLEngine *engine)
{
gboolean retval;
@@ -1158,7 +1175,8 @@ html_cursor_right (HTMLCursor *cursor, HTMLEngine *engine)
}
static gboolean
-right_in_flow (HTMLCursor *cursor, HTMLEngine *e)
+right_in_flow (HTMLCursor *cursor,
+ HTMLEngine *e)
{
gboolean retval;
@@ -1184,7 +1202,8 @@ right_in_flow (HTMLCursor *cursor, HTMLEngine *e)
}
static gboolean
-html_cursor_right_edge_of_line (HTMLCursor *cursor, HTMLEngine *engine)
+html_cursor_right_edge_of_line (HTMLCursor *cursor,
+ HTMLEngine *engine)
{
HTMLCursor prev_cursor;
gint x, y, prev_y;
@@ -1221,7 +1240,8 @@ html_cursor_right_edge_of_line (HTMLCursor *cursor, HTMLEngine *engine)
}
gboolean
-html_cursor_beginning_of_line (HTMLCursor *cursor, HTMLEngine *engine)
+html_cursor_beginning_of_line (HTMLCursor *cursor,
+ HTMLEngine *engine)
{
if (html_object_get_direction (cursor->object) == HTML_DIRECTION_RTL)
return html_cursor_right_edge_of_line (cursor, engine);
@@ -1230,7 +1250,8 @@ html_cursor_beginning_of_line (HTMLCursor *cursor, HTMLEngine *engine)
}
gboolean
-html_cursor_end_of_line (HTMLCursor *cursor, HTMLEngine *engine)
+html_cursor_end_of_line (HTMLCursor *cursor,
+ HTMLEngine *engine)
{
if (html_object_get_direction (cursor->object) == HTML_DIRECTION_RTL)
return html_cursor_left_edge_of_line (cursor, engine);
diff --git a/gtkhtml/htmlcursor.h b/gtkhtml/htmlcursor.h
index 3ed3983..373a838 100644
--- a/gtkhtml/htmlcursor.h
+++ b/gtkhtml/htmlcursor.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Ettore Perazzoli <ettore helixcode com>
+ *
+ * Copyright 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Ettore Perazzoli <ettore helixcode com>
*/
#ifndef HTMLCURSOR_H
diff --git a/gtkhtml/htmldrawqueue.c b/gtkhtml/htmldrawqueue.c
index 8d5c655..224bbbb 100644
--- a/gtkhtml/htmldrawqueue.c
+++ b/gtkhtml/htmldrawqueue.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -35,11 +35,11 @@
/* HTMLDrawQueueClearElement handling. */
static HTMLDrawQueueClearElement *
-clear_element_new (gint x,
- gint y,
- guint width,
- guint height,
- const GdkColor *background_color)
+clear_element_new (gint x,
+ gint y,
+ guint width,
+ guint height,
+ const GdkColor *background_color)
{
HTMLDrawQueueClearElement *new;
@@ -115,7 +115,8 @@ html_draw_queue_destroy (HTMLDrawQueue *queue)
}
void
-html_draw_queue_add (HTMLDrawQueue *queue, HTMLObject *object)
+html_draw_queue_add (HTMLDrawQueue *queue,
+ HTMLObject *object)
{
g_return_if_fail (queue != NULL);
g_return_if_fail (object != NULL);
@@ -139,7 +140,7 @@ html_draw_queue_add (HTMLDrawQueue *queue, HTMLObject *object)
static void
add_clear (HTMLDrawQueue *queue,
- HTMLDrawQueueClearElement *elem)
+ HTMLDrawQueueClearElement *elem)
{
queue->clear_last = g_list_append (queue->clear_last, elem);
if (queue->elems == NULL && queue->clear_elems == NULL)
@@ -153,11 +154,11 @@ add_clear (HTMLDrawQueue *queue,
void
html_draw_queue_add_clear (HTMLDrawQueue *queue,
- gint x,
- gint y,
- guint width,
- guint height,
- const GdkColor *background_color)
+ gint x,
+ gint y,
+ guint width,
+ guint height,
+ const GdkColor *background_color)
{
HTMLDrawQueueClearElement *new;
@@ -170,7 +171,7 @@ html_draw_queue_add_clear (HTMLDrawQueue *queue,
static void
draw_obj (HTMLDrawQueue *queue,
- HTMLObject *obj)
+ HTMLObject *obj)
{
HTMLEngine *e;
gint x1, y1, x2, y2;
diff --git a/gtkhtml/htmldrawqueue.h b/gtkhtml/htmldrawqueue.h
index b87b707..0169ebf 100644
--- a/gtkhtml/htmldrawqueue.h
+++ b/gtkhtml/htmldrawqueue.h
@@ -1,21 +1,21 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
- Copyright (C) 1999 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLDRAWQUEUE_H
diff --git a/gtkhtml/htmlembedded.c b/gtkhtml/htmlembedded.c
index e35d0ea..ec71abd 100644
--- a/gtkhtml/htmlembedded.c
+++ b/gtkhtml/htmlembedded.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -63,9 +63,12 @@ copy (HTMLObject *self,
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLEmbedded *element = HTML_EMBEDDED (o);
gint new_x, new_y;
@@ -141,7 +144,7 @@ reset (HTMLEmbedded *e)
static gint
calc_min_width (HTMLObject *self,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
GtkRequisition requisition;
GtkWidget *widget;
@@ -163,7 +166,9 @@ calc_min_width (HTMLObject *self,
}
static gboolean
-html_embedded_real_calc_size (HTMLObject *self, HTMLPainter *painter, GList **changed_objs)
+html_embedded_real_calc_size (HTMLObject *self,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
GtkWidget *widget;
HTMLEmbedded *emb = HTML_EMBEDDED (self);
@@ -204,7 +209,8 @@ accepts_cursor (HTMLObject *o)
}
static gchar *
-encode (HTMLEmbedded *e, const gchar * codepage)
+encode (HTMLEmbedded *e,
+ const gchar *codepage)
{
return g_strdup ("");
}
@@ -216,25 +222,29 @@ html_embedded_reset (HTMLEmbedded *e)
}
gchar *
-html_embedded_encode (HTMLEmbedded *e, const gchar * codepage)
+html_embedded_encode (HTMLEmbedded *e,
+ const gchar *codepage)
{
return HTML_EMBEDDED_CLASS (HTML_OBJECT (e)->klass)->encode (e, codepage);
}
void
-html_embedded_reparent (HTMLEmbedded *e, GtkWidget *new_parent)
+html_embedded_reparent (HTMLEmbedded *e,
+ GtkWidget *new_parent)
{
HTML_EMBEDDED_CLASS (HTML_OBJECT (e)->klass)->reparent (e, new_parent);
}
void
-html_embedded_set_form (HTMLEmbedded *e, HTMLForm *form)
+html_embedded_set_form (HTMLEmbedded *e,
+ HTMLForm *form)
{
e->form = form;
}
gchar *
-html_embedded_encode_string (const gchar *before, const gchar *codepage)
+html_embedded_encode_string (const gchar *before,
+ const gchar *codepage)
{
const gchar * str = before;
static const gchar *safe = "$-._!*(),"; /* RFC 1738 */
@@ -293,8 +303,8 @@ html_embedded_type_init (void)
void
html_embedded_class_init (HTMLEmbeddedClass *klass,
- HTMLType type,
- guint size)
+ HTMLType type,
+ guint size)
{
HTMLObjectClass *object_class;
@@ -320,10 +330,10 @@ html_embedded_class_init (HTMLEmbeddedClass *klass,
void
html_embedded_init (HTMLEmbedded *element,
- HTMLEmbeddedClass *klass,
- GtkWidget *parent,
- const gchar *name,
- const gchar *value)
+ HTMLEmbeddedClass *klass,
+ GtkWidget *parent,
+ const gchar *name,
+ const gchar *value)
{
HTMLObject *object;
@@ -350,7 +360,8 @@ html_embedded_init (HTMLEmbedded *element,
}
static gboolean
-html_embedded_grab_cursor (GtkWidget *eb, GdkEvent *event)
+html_embedded_grab_cursor (GtkWidget *eb,
+ GdkEvent *event)
{
/* Keep the focus! Fight the power */
return TRUE;
@@ -358,7 +369,8 @@ html_embedded_grab_cursor (GtkWidget *eb, GdkEvent *event)
/* called when some state in an embedded html object has changed ... do a redraw */
static void
-html_embedded_object_changed (GtkHTMLEmbedded *eb, HTMLEngine *e)
+html_embedded_object_changed (GtkHTMLEmbedded *eb,
+ HTMLEngine *e)
{
HTMLObject *object;
@@ -370,7 +382,9 @@ html_embedded_object_changed (GtkHTMLEmbedded *eb, HTMLEngine *e)
}
HTMLEmbedded *
-html_embedded_new_widget (GtkWidget *parent, GtkHTMLEmbedded *eb, HTMLEngine *engine)
+html_embedded_new_widget (GtkWidget *parent,
+ GtkHTMLEmbedded *eb,
+ HTMLEngine *engine)
{
HTMLEmbedded *em;
@@ -391,7 +405,9 @@ html_embedded_new_widget (GtkWidget *parent, GtkHTMLEmbedded *eb, HTMLEngine *en
}
static void
-html_embedded_allocate (GtkWidget *w, GtkAllocation *allocation, HTMLEmbedded *e)
+html_embedded_allocate (GtkWidget *w,
+ GtkAllocation *allocation,
+ HTMLEmbedded *e)
{
GtkWidget *parent;
@@ -410,7 +426,8 @@ html_embedded_allocate (GtkWidget *w, GtkAllocation *allocation, HTMLEmbedded *
}
void
-html_embedded_set_widget (HTMLEmbedded *emb, GtkWidget *w)
+html_embedded_set_widget (HTMLEmbedded *emb,
+ GtkWidget *w)
{
emb->widget = w;
diff --git a/gtkhtml/htmlembedded.h b/gtkhtml/htmlembedded.h
index b8d4aba..06c1c34 100644
--- a/gtkhtml/htmlembedded.h
+++ b/gtkhtml/htmlembedded.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef HTMLEMBEDDED_H
#define HTMLEMBEDDED_H
diff --git a/gtkhtml/htmlengine-edit-clueflowstyle.c b/gtkhtml/htmlengine-edit-clueflowstyle.c
index 6c3b68e..ba03656 100644
--- a/gtkhtml/htmlengine-edit-clueflowstyle.c
+++ b/gtkhtml/htmlengine-edit-clueflowstyle.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -41,7 +41,7 @@ struct _ClueFlowStyleOperation {
HTMLUndoData data;
/* Whether we should go backward or forward when re-setting
- the style. */
+ * the style. */
gboolean forward;
/* List of properties for the paragraphs (ClueFlowProps). */
@@ -78,7 +78,8 @@ style_operation_destroy (HTMLUndoData *data)
}
static ClueFlowStyleOperation *
-style_operation_new (GList *prop_list, gboolean forward)
+style_operation_new (GList *prop_list,
+ gboolean forward)
{
ClueFlowStyleOperation *op;
@@ -110,13 +111,13 @@ get_props (HTMLClueFlow *clueflow)
static void
set_props (HTMLEngine *engine,
- HTMLClueFlow *clueflow,
- HTMLClueFlowStyle style,
- HTMLListType item_type,
- HTMLHAlignType alignment,
- gint indentation_delta,
- guint8 *indentation_levels,
- HTMLEngineSetClueFlowStyleMask mask)
+ HTMLClueFlow *clueflow,
+ HTMLClueFlowStyle style,
+ HTMLListType item_type,
+ HTMLHAlignType alignment,
+ gint indentation_delta,
+ guint8 *indentation_levels,
+ HTMLEngineSetClueFlowStyleMask mask)
{
if (mask & HTML_ENGINE_SET_CLUEFLOW_INDENTATION)
html_clueflow_set_indentation (clueflow, engine, indentation_delta, indentation_levels);
@@ -151,7 +152,10 @@ set_props (HTMLEngine *engine,
static void add_undo (HTMLEngine *engine, ClueFlowStyleOperation *op, HTMLUndoDirection dir);
static void
-undo_or_redo (HTMLEngine *engine, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+undo_or_redo (HTMLEngine *engine,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
ClueFlowStyleOperation *op, *new_op;
ClueFlowProps *props, *orig_props;
@@ -197,7 +201,7 @@ undo_or_redo (HTMLEngine *engine, HTMLUndoData *data, HTMLUndoDirection dir, gui
break;
/* Go forward object by object, until we find one
- whose parent (i.e. paragraph) is different. */
+ * whose parent (i.e. paragraph) is different. */
do {
if (op->forward)
obj = html_object_next_leaf (obj);
@@ -229,7 +233,7 @@ undo_or_redo (HTMLEngine *engine, HTMLUndoData *data, HTMLUndoDirection dir, gui
static HTMLUndoAction *
undo_action_from_op (HTMLEngine *engine,
- ClueFlowStyleOperation *op)
+ ClueFlowStyleOperation *op)
{
return html_undo_action_new ("Paragraph style change",
undo_or_redo, HTML_UNDO_DATA (op),
@@ -239,7 +243,8 @@ undo_action_from_op (HTMLEngine *engine,
static void
add_undo (HTMLEngine *engine,
- ClueFlowStyleOperation *op, HTMLUndoDirection dir)
+ ClueFlowStyleOperation *op,
+ HTMLUndoDirection dir)
{
html_undo_add_action (engine->undo, engine, undo_action_from_op (engine, op), dir);
}
@@ -249,14 +254,14 @@ add_undo (HTMLEngine *engine,
static void
set_clueflow_style_in_region (HTMLEngine *engine,
- HTMLClueFlowStyle style,
- HTMLListType item_type,
- HTMLHAlignType alignment,
- gint indentation_delta,
- guint8 *indentation_levels,
- HTMLEngineSetClueFlowStyleMask mask,
- HTMLUndoDirection dir,
- gboolean do_undo)
+ HTMLClueFlowStyle style,
+ HTMLListType item_type,
+ HTMLHAlignType alignment,
+ gint indentation_delta,
+ guint8 *indentation_levels,
+ HTMLEngineSetClueFlowStyleMask mask,
+ HTMLUndoDirection dir,
+ gboolean do_undo)
{
HTMLClueFlow *clueflow;
HTMLObject *start, *end, *p;
@@ -312,13 +317,14 @@ set_clueflow_style_in_region (HTMLEngine *engine,
static void
set_clueflow_style_at_cursor (HTMLEngine *engine,
- HTMLClueFlowStyle style,
- HTMLListType item_type,
- HTMLHAlignType alignment,
- gint indentation_delta,
- guint8 *indentation_levels,
- HTMLEngineSetClueFlowStyleMask mask,
- HTMLUndoDirection dir, gboolean do_undo)
+ HTMLClueFlowStyle style,
+ HTMLListType item_type,
+ HTMLHAlignType alignment,
+ gint indentation_delta,
+ guint8 *indentation_levels,
+ HTMLEngineSetClueFlowStyleMask mask,
+ HTMLUndoDirection dir,
+ gboolean do_undo)
{
HTMLClueFlow *clueflow;
HTMLObject *curr;
@@ -345,13 +351,14 @@ set_clueflow_style_at_cursor (HTMLEngine *engine,
gboolean
html_engine_set_clueflow_style (HTMLEngine *engine,
- HTMLClueFlowStyle style,
- HTMLListType item_type,
- HTMLHAlignType alignment,
- gint indentation_delta,
- guint8 *indentation_levels,
- HTMLEngineSetClueFlowStyleMask mask,
- HTMLUndoDirection dir, gboolean do_undo)
+ HTMLClueFlowStyle style,
+ HTMLListType item_type,
+ HTMLHAlignType alignment,
+ gint indentation_delta,
+ guint8 *indentation_levels,
+ HTMLEngineSetClueFlowStyleMask mask,
+ HTMLUndoDirection dir,
+ gboolean do_undo)
{
g_return_val_if_fail (engine != NULL, FALSE);
g_return_val_if_fail (HTML_IS_ENGINE (engine), FALSE);
@@ -377,7 +384,7 @@ html_engine_set_clueflow_style (HTMLEngine *engine,
/* The following functions are used to report the current indentation
- as it should be shown e.g in a toolbar. */
+ * as it should be shown e.g in a toolbar. */
static HTMLClueFlow *
get_current_para (HTMLEngine *engine)
@@ -400,7 +407,9 @@ get_current_para (HTMLEngine *engine)
}
void
-html_engine_get_current_clueflow_style (HTMLEngine *engine, HTMLClueFlowStyle *style, HTMLListType *item_type)
+html_engine_get_current_clueflow_style (HTMLEngine *engine,
+ HTMLClueFlowStyle *style,
+ HTMLListType *item_type)
{
HTMLClueFlow *para;
diff --git a/gtkhtml/htmlengine-edit-clueflowstyle.h b/gtkhtml/htmlengine-edit-clueflowstyle.h
index cee5bf8..b47f33a 100644
--- a/gtkhtml/htmlengine-edit-clueflowstyle.h
+++ b/gtkhtml/htmlengine-edit-clueflowstyle.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLENGINE_EDIT_CLUEFLOW_STYLE_H
diff --git a/gtkhtml/htmlengine-edit-cursor.c b/gtkhtml/htmlengine-edit-cursor.c
index ec3fd26..bac61a7 100644
--- a/gtkhtml/htmlengine-edit-cursor.c
+++ b/gtkhtml/htmlengine-edit-cursor.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -55,7 +55,7 @@ html_engine_set_cursor_blink_timeout (gint timeout)
}
void
-html_engine_hide_cursor (HTMLEngine *engine)
+html_engine_hide_cursor (HTMLEngine *engine)
{
HTMLEngine *e = engine;
@@ -77,7 +77,7 @@ html_engine_hide_cursor (HTMLEngine *engine)
}
void
-html_engine_show_cursor (HTMLEngine *engine)
+html_engine_show_cursor (HTMLEngine *engine)
{
HTMLEngine * e = engine;
@@ -101,7 +101,15 @@ html_engine_show_cursor (HTMLEngine *engine)
}
static gboolean
-clip_cursor (HTMLEngine *engine, gint x, gint y, gint width, gint height, gint *x1, gint *y1, gint *x2, gint *y2)
+clip_cursor (HTMLEngine *engine,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint *x1,
+ gint *y1,
+ gint *x2,
+ gint *y2)
{
if (*x1 > x + width || *y1 > y + height || *x2 < x || *y2 < y)
return FALSE;
@@ -115,9 +123,14 @@ clip_cursor (HTMLEngine *engine, gint x, gint y, gint width, gint height, gint *
}
static void
-draw_cursor_rectangle (HTMLEngine *e, gint x1, gint y1, gint x2, gint y2,
- GdkColor *on_color, GdkColor *off_color,
- gint offset)
+draw_cursor_rectangle (HTMLEngine *e,
+ gint x1,
+ gint y1,
+ gint x2,
+ gint y2,
+ GdkColor *on_color,
+ GdkColor *off_color,
+ gint offset)
{
cairo_t *cr;
const double dashes[2] = { 1, 3 };
@@ -140,7 +153,9 @@ draw_cursor_rectangle (HTMLEngine *e, gint x1, gint y1, gint x2, gint y2,
static gint cursor_enabled = TRUE;
static inline void
-refresh_under_cursor (HTMLEngine *e, HTMLCursorRectangle *cr, gboolean *enabled)
+refresh_under_cursor (HTMLEngine *e,
+ HTMLCursorRectangle *cr,
+ gboolean *enabled)
{
if (cr->x1 > cr->x2 || cr->y1 > cr->y2)
return;
@@ -282,8 +297,10 @@ html_engine_draw_table_cursor (HTMLEngine *e)
void
html_engine_draw_cursor_in_area (HTMLEngine *engine,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
HTMLObject *obj;
guint offset;
diff --git a/gtkhtml/htmlengine-edit-cursor.h b/gtkhtml/htmlengine-edit-cursor.h
index c63ddee..715be19 100644
--- a/gtkhtml/htmlengine-edit-cursor.h
+++ b/gtkhtml/htmlengine-edit-cursor.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLENGINE_CURSOR_H
diff --git a/gtkhtml/htmlengine-edit-cut-and-paste.c b/gtkhtml/htmlengine-edit-cut-and-paste.c
index b71924b..3ca1fb3 100644
--- a/gtkhtml/htmlengine-edit-cut-and-paste.c
+++ b/gtkhtml/htmlengine-edit-cut-and-paste.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000, 2001, 2002 Ximian, Inc.
- Authors: Radek Doulik (rodo ximian com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
+ *
+ * Copyright (C) 2000, 2001, 2002 Ximian, Inc.
+ * Authors: Radek Doulik (rodo ximian com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
*/
#include <config.h>
@@ -68,7 +68,9 @@ static void insert_setup_undo (HTMLEngine *e, guint len, guint position_b
/* #define OP_DEBUG */
static void
-html_cursor_get_left (HTMLCursor *cursor, HTMLObject **obj, gint *off)
+html_cursor_get_left (HTMLCursor *cursor,
+ HTMLObject **obj,
+ gint *off)
{
if (cursor->offset == 0) {
*obj = html_object_prev_not_slave (cursor->object);
@@ -82,7 +84,8 @@ html_cursor_get_left (HTMLCursor *cursor, HTMLObject **obj, gint *off)
}
static void
-html_point_get_left (HTMLPoint *source, HTMLPoint *dest)
+html_point_get_left (HTMLPoint *source,
+ HTMLPoint *dest)
{
if (source->offset == 0) {
dest->object = html_object_prev_not_slave (source->object);
@@ -96,7 +99,8 @@ html_point_get_left (HTMLPoint *source, HTMLPoint *dest)
}
static void
-html_point_get_right (HTMLPoint *source, HTMLPoint *dest)
+html_point_get_right (HTMLPoint *source,
+ HTMLPoint *dest)
{
if (source->offset >= html_object_get_length (source->object)) {
dest->object = html_object_next_not_slave (source->object);
@@ -110,7 +114,9 @@ html_point_get_right (HTMLPoint *source, HTMLPoint *dest)
}
static void
-object_get_parent_list (HTMLObject *o, gint level, GList **list)
+object_get_parent_list (HTMLObject *o,
+ gint level,
+ GList **list)
{
while (level > 0 && o) {
*list = g_list_prepend (*list, o);
@@ -120,7 +126,9 @@ object_get_parent_list (HTMLObject *o, gint level, GList **list)
}
static GList *
-point_get_parent_list (HTMLPoint *point, gint level, gboolean include_offset)
+point_get_parent_list (HTMLPoint *point,
+ gint level,
+ gboolean include_offset)
{
GList *list;
@@ -132,7 +140,8 @@ point_get_parent_list (HTMLPoint *point, gint level, gboolean include_offset)
}
static gint
-get_parent_depth (HTMLObject *o, HTMLObject *parent)
+get_parent_depth (HTMLObject *o,
+ HTMLObject *parent)
{
gint level = 1;
@@ -157,7 +166,8 @@ is_parent (HTMLObject *o,HTMLObject *parent)
}
static HTMLObject *
-try_find_common_parent_of (HTMLObject *child, HTMLObject *parent)
+try_find_common_parent_of (HTMLObject *child,
+ HTMLObject *parent)
{
while (parent) {
if (is_parent (child, parent))
@@ -169,7 +179,8 @@ try_find_common_parent_of (HTMLObject *child, HTMLObject *parent)
}
static HTMLObject *
-get_common_parent (HTMLObject *from, HTMLObject *to)
+get_common_parent (HTMLObject *from,
+ HTMLObject *to)
{
HTMLObject *parent;
@@ -179,8 +190,11 @@ get_common_parent (HTMLObject *from, HTMLObject *to)
}
static gint
-prepare_delete_bounds (HTMLEngine *e, GList **from_list, GList **to_list,
- GList **bound_left, GList **bound_right)
+prepare_delete_bounds (HTMLEngine *e,
+ GList **from_list,
+ GList **to_list,
+ GList **bound_left,
+ GList **bound_right)
{
HTMLPoint b_left, b_right, begin, end;
HTMLObject *common_parent;
@@ -222,7 +236,11 @@ prepare_delete_bounds (HTMLEngine *e, GList **from_list, GList **to_list,
}
static void
-remove_empty_and_merge (HTMLEngine *e, gboolean merge, GList *left_orig, GList *right_orig, HTMLCursor *c)
+remove_empty_and_merge (HTMLEngine *e,
+ gboolean merge,
+ GList *left_orig,
+ GList *right_orig,
+ HTMLCursor *c)
{
HTMLObject *lo, *ro, *prev;
@@ -351,7 +369,7 @@ remove_empty_and_merge (HTMLEngine *e, gboolean merge, GList *left_orig, GList *
g_list_free (right_old);
#ifdef OP_DEBUG
/* printf ("-- finished\n");
- gtk_html_debug_dump_tree_simple (left_orig, 0); */
+ * gtk_html_debug_dump_tree_simple (left_orig, 0); */
printf ("-- after\n");
gtk_html_debug_dump_tree_simple (e->clue, 0);
printf ("-- END merge\n");
@@ -359,7 +377,10 @@ remove_empty_and_merge (HTMLEngine *e, gboolean merge, GList *left_orig, GList *
}
static void
-split_and_add_empty_texts (HTMLEngine *e, gint level, GList **left, GList **right)
+split_and_add_empty_texts (HTMLEngine *e,
+ gint level,
+ GList **left,
+ GList **right)
{
#ifdef OP_DEBUG
printf ("-- SPLIT begin\ne->clue:\n");
@@ -387,7 +408,9 @@ split_and_add_empty_texts (HTMLEngine *e, gint level, GList **left, GList **righ
/* end of helper */
void
-html_engine_copy_object (HTMLEngine *e, HTMLObject **o, guint *len)
+html_engine_copy_object (HTMLEngine *e,
+ HTMLObject **o,
+ guint *len)
{
if (e->clue && HTML_CLUE (e->clue)->head && html_engine_is_selection_active (e)) {
GList *from = NULL, *to = NULL;
@@ -433,7 +456,10 @@ delete_undo_destroy (HTMLUndoData *data)
}
static void
-delete_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+delete_undo_action (HTMLEngine *e,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
DeleteUndo *undo;
HTMLObject *buffer;
@@ -445,7 +471,12 @@ delete_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, gu
}
static void
-delete_setup_undo (HTMLEngine *e, HTMLObject *buffer, guint len, guint position_after, gint level, HTMLUndoDirection dir)
+delete_setup_undo (HTMLEngine *e,
+ HTMLObject *buffer,
+ guint len,
+ guint position_after,
+ gint level,
+ HTMLUndoDirection dir)
{
DeleteUndo *undo;
@@ -500,7 +531,8 @@ place_cursor_before_mark (HTMLEngine *e)
}
static gboolean
-haligns_equal (HTMLHAlignType a1, HTMLHAlignType a2)
+haligns_equal (HTMLHAlignType a1,
+ HTMLHAlignType a2)
{
return a1 == a2
|| (a1 == HTML_HALIGN_LEFT && a2 == HTML_HALIGN_NONE)
@@ -509,7 +541,8 @@ haligns_equal (HTMLHAlignType a1, HTMLHAlignType a2)
}
static gboolean
-levels_equal (HTMLClueFlow *me, HTMLClueFlow *you)
+levels_equal (HTMLClueFlow *me,
+ HTMLClueFlow *you)
{
if (!you)
return FALSE;
@@ -524,7 +557,8 @@ levels_equal (HTMLClueFlow *me, HTMLClueFlow *you)
}
static void
-check_flows (HTMLEngine *e, HTMLUndoDirection dir)
+check_flows (HTMLEngine *e,
+ HTMLUndoDirection dir)
{
/* I assume here that cursor is before mark */
HTMLClueFlow *flow1, *flow2;
@@ -577,7 +611,11 @@ check_flows (HTMLEngine *e, HTMLUndoDirection dir)
}
static gint
-delete_object_do (HTMLEngine *e, HTMLObject **object, guint *len, HTMLUndoDirection dir, gboolean add_undo)
+delete_object_do (HTMLEngine *e,
+ HTMLObject **object,
+ guint *len,
+ HTMLUndoDirection dir,
+ gboolean add_undo)
{
GList *from, *to, *left, *right;
guint position;
@@ -634,7 +672,10 @@ check_table_1 (HTMLEngine *e)
}
static gboolean
-validate_tables (HTMLEngine *e, HTMLUndoDirection dir, gboolean add_undo, gboolean *fix_para)
+validate_tables (HTMLEngine *e,
+ HTMLUndoDirection dir,
+ gboolean add_undo,
+ gboolean *fix_para)
{
HTMLObject *next = html_object_next_not_slave (e->cursor->object);
@@ -692,7 +733,10 @@ fix_empty_aligned_undo_destroy (HTMLUndoData *data)
}
static void
-fix_empty_aligned_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+fix_empty_aligned_undo_action (HTMLEngine *e,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLObject *ac, *flow;
@@ -713,7 +757,9 @@ fix_empty_aligned_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirect
}
static void
-fix_empty_aligned_setup_undo (HTMLEngine *e, HTMLUndoDirection dir, HTMLObject *ac)
+fix_empty_aligned_setup_undo (HTMLEngine *e,
+ HTMLUndoDirection dir,
+ HTMLObject *ac)
{
FixEmptyAlignedUndo *undo;
@@ -731,7 +777,9 @@ fix_empty_aligned_setup_undo (HTMLEngine *e, HTMLUndoDirection dir, HTMLObject *
}
static void
-fix_empty_aligned (HTMLEngine *e, HTMLUndoDirection dir, gboolean add_undo)
+fix_empty_aligned (HTMLEngine *e,
+ HTMLUndoDirection dir,
+ gboolean add_undo)
{
if (html_object_is_text (e->cursor->object) && e->cursor->object->parent && HTML_IS_CLUEALIGNED (e->cursor->object->parent)) {
HTMLObject *ac = e->cursor->object->parent;
@@ -751,7 +799,11 @@ fix_empty_aligned (HTMLEngine *e, HTMLUndoDirection dir, gboolean add_undo)
}
static gint
-delete_object (HTMLEngine *e, HTMLObject **ret_object, guint *ret_len, HTMLUndoDirection dir, gboolean add_undo)
+delete_object (HTMLEngine *e,
+ HTMLObject **ret_object,
+ guint *ret_len,
+ HTMLUndoDirection dir,
+ gboolean add_undo)
{
html_engine_edit_selection_updater_update_now (e->selection_updater);
if (html_engine_is_selection_active (e)) {
@@ -842,7 +894,9 @@ html_engine_cut (HTMLEngine *e)
*/
static void
-set_cursor_at_end_of_object (HTMLEngine *e, HTMLObject *o, guint len)
+set_cursor_at_end_of_object (HTMLEngine *e,
+ HTMLObject *o,
+ guint len)
{
guint save_position;
gboolean need_spell_check;
@@ -859,8 +913,12 @@ set_cursor_at_end_of_object (HTMLEngine *e, HTMLObject *o, guint len)
}
static inline void
-isolate_tables (HTMLEngine *e, HTMLUndoDirection dir, guint position_before, guint position_after,
- gboolean *delete_paragraph_before, gboolean *delete_paragraph_after)
+isolate_tables (HTMLEngine *e,
+ HTMLUndoDirection dir,
+ guint position_before,
+ guint position_after,
+ gboolean *delete_paragraph_before,
+ gboolean *delete_paragraph_after)
{
HTMLObject *next;
@@ -885,8 +943,13 @@ isolate_tables (HTMLEngine *e, HTMLUndoDirection dir, guint position_before, gui
}
static inline void
-insert_object_do (HTMLEngine *e, HTMLObject *obj, guint *len, gint level, guint position_after,
- gboolean check, HTMLUndoDirection dir)
+insert_object_do (HTMLEngine *e,
+ HTMLObject *obj,
+ guint *len,
+ gint level,
+ guint position_after,
+ gboolean check,
+ HTMLUndoDirection dir)
{
HTMLCursor *orig;
GList *left = NULL, *right = NULL;
@@ -950,7 +1013,10 @@ struct _InsertUndo {
typedef struct _InsertUndo InsertUndo;
static void
-insert_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+insert_undo_action (HTMLEngine *e,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
InsertUndo *undo;
@@ -977,8 +1043,12 @@ insert_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, gu
}
static void
-insert_setup_undo (HTMLEngine *e, guint len, guint position_before, HTMLUndoDirection dir,
- gboolean delete_paragraph_before, gboolean delete_paragraph_after)
+insert_setup_undo (HTMLEngine *e,
+ guint len,
+ guint position_before,
+ HTMLUndoDirection dir,
+ gboolean delete_paragraph_before,
+ gboolean delete_paragraph_after)
{
InsertUndo *undo;
@@ -1002,7 +1072,10 @@ insert_setup_undo (HTMLEngine *e, guint len, guint position_before, HTMLUndoDire
static gboolean fix_aligned_position (HTMLEngine *e, guint *position_after, HTMLUndoDirection dir);
static void
-fix_aligned_redo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+fix_aligned_redo_action (HTMLEngine *e,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
guint pa;
@@ -1010,7 +1083,10 @@ fix_aligned_redo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection di
}
static void
-fix_aligned_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+fix_aligned_undo_action (HTMLEngine *e,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLObject *cf = e->cursor->object->parent;
HTMLUndoData *undo;
@@ -1034,7 +1110,9 @@ fix_aligned_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection di
}
static void
-fix_align_setup_undo (HTMLEngine *e, guint position_before, HTMLUndoDirection dir)
+fix_align_setup_undo (HTMLEngine *e,
+ guint position_before,
+ HTMLUndoDirection dir)
{
HTMLUndoData *undo;
@@ -1051,7 +1129,9 @@ fix_align_setup_undo (HTMLEngine *e, guint position_before, HTMLUndoDirection di
}
static gboolean
-fix_aligned_position (HTMLEngine *e, guint *position_after, HTMLUndoDirection dir)
+fix_aligned_position (HTMLEngine *e,
+ guint *position_after,
+ HTMLUndoDirection dir)
{
gboolean rv = FALSE;
if (in_aligned (e->cursor)) {
@@ -1119,8 +1199,13 @@ fix_aligned_position (HTMLEngine *e, guint *position_after, HTMLUndoDirection di
}
static void
-insert_object_for_undo (HTMLEngine *e, HTMLObject *obj, guint len, guint position_after, gint level,
- HTMLUndoDirection dir, gboolean check)
+insert_object_for_undo (HTMLEngine *e,
+ HTMLObject *obj,
+ guint len,
+ guint position_after,
+ gint level,
+ HTMLUndoDirection dir,
+ gboolean check)
{
gboolean delete_paragraph_before = FALSE;
gboolean delete_paragraph_after = FALSE;
@@ -1136,21 +1221,31 @@ insert_object_for_undo (HTMLEngine *e, HTMLObject *obj, guint len, guint positio
}
static void
-insert_object (HTMLEngine *e, HTMLObject *obj, guint len, guint position_after, gint level,
- HTMLUndoDirection dir, gboolean check)
+insert_object (HTMLEngine *e,
+ HTMLObject *obj,
+ guint len,
+ guint position_after,
+ gint level,
+ HTMLUndoDirection dir,
+ gboolean check)
{
fix_aligned_position (e, &position_after, dir);
insert_object_for_undo (e, obj, len, position_after, level, dir, check);
}
void
-html_engine_insert_object (HTMLEngine *e, HTMLObject *o, guint len, gint level)
+html_engine_insert_object (HTMLEngine *e,
+ HTMLObject *o,
+ guint len,
+ gint level)
{
insert_object (e, o, len, e->cursor->position + len, level, HTML_UNDO_UNDO, TRUE);
}
void
-html_engine_paste_object (HTMLEngine *e, HTMLObject *o, guint len)
+html_engine_paste_object (HTMLEngine *e,
+ HTMLObject *o,
+ guint len)
{
html_undo_level_begin (e->undo, "Paste", "Paste");
html_engine_delete (e);
@@ -1171,7 +1266,9 @@ html_engine_paste (HTMLEngine *e)
}
static void
-check_magic_link (HTMLEngine *e, const gchar *text, guint len)
+check_magic_link (HTMLEngine *e,
+ const gchar *text,
+ guint len)
{
if (HTML_IS_TEXT (e->cursor->object)
&& gtk_html_get_magic_links (e->widget)
@@ -1181,9 +1278,11 @@ check_magic_link (HTMLEngine *e, const gchar *text, guint len)
}
static void
-insert_empty_paragraph (HTMLEngine *e, HTMLUndoDirection dir, gboolean add_undo)
+insert_empty_paragraph (HTMLEngine *e,
+ HTMLUndoDirection dir,
+ gboolean add_undo)
{
- GList *left=NULL, *right=NULL;
+ GList *left = NULL, *right = NULL;
HTMLCursor *orig;
guint position_before;
guint position_after;
@@ -1203,7 +1302,7 @@ insert_empty_paragraph (HTMLEngine *e, HTMLUndoDirection dir, gboolean add_undo)
/* FIXME-link if (HTML_IS_LINK_TEXT (e->cursor->object) && html_clueflow_is_empty (HTML_CLUEFLOW (e->cursor->object->parent))) {
HTMLObject *flow = e->cursor->object->parent;
HTMLObject *new_text;
-
+ *
new_text = html_link_text_to_text (HTML_LINK_TEXT (e->cursor->object), e);
html_clue_remove (HTML_CLUE (flow), e->cursor->object);
html_object_destroy (e->cursor->object);
@@ -1396,7 +1495,10 @@ use_pictograms (HTMLEngine *e)
}
void
-html_engine_insert_text_with_extra_attributes (HTMLEngine *e, const gchar *ptext, gint len, PangoAttrList *attrs)
+html_engine_insert_text_with_extra_attributes (HTMLEngine *e,
+ const gchar *ptext,
+ gint len,
+ PangoAttrList *attrs)
{
gchar *nl, *sanitized_text = NULL;
const gchar *text;
@@ -1458,13 +1560,18 @@ html_engine_insert_text_with_extra_attributes (HTMLEngine *e, const gchar *ptext
}
void
-html_engine_insert_text (HTMLEngine *e, const gchar *text, gint len)
+html_engine_insert_text (HTMLEngine *e,
+ const gchar *text,
+ gint len)
{
html_engine_insert_text_with_extra_attributes (e, text, len, NULL);
}
void
-html_engine_paste_text_with_extra_attributes (HTMLEngine *e, const gchar *text, guint len, PangoAttrList *attrs)
+html_engine_paste_text_with_extra_attributes (HTMLEngine *e,
+ const gchar *text,
+ guint len,
+ PangoAttrList *attrs)
{
gchar *undo_name = g_strdup_printf ("Paste text: '%s'", text);
gchar *redo_name = g_strdup_printf ("Unpaste text: '%s'", text);
@@ -1478,13 +1585,18 @@ html_engine_paste_text_with_extra_attributes (HTMLEngine *e, const gchar *text,
}
void
-html_engine_paste_text (HTMLEngine *e, const gchar *text, guint len)
+html_engine_paste_text (HTMLEngine *e,
+ const gchar *text,
+ guint len)
{
html_engine_paste_text_with_extra_attributes (e, text, len, NULL);
}
void
-html_engine_paste_link (HTMLEngine *e, const gchar *text, gint len, const gchar *complete_url)
+html_engine_paste_link (HTMLEngine *e,
+ const gchar *text,
+ gint len,
+ const gchar *complete_url)
{
gchar *url, *target;
@@ -1523,7 +1635,9 @@ html_engine_delete_container (HTMLEngine *e)
}
void
-html_engine_delete_n (HTMLEngine *e, guint len, gboolean forward)
+html_engine_delete_n (HTMLEngine *e,
+ guint len,
+ gboolean forward)
{
if (html_engine_is_selection_active (e))
html_engine_delete (e);
@@ -1588,7 +1702,9 @@ typedef struct {
} HTMLEngineLinkInsertData;
static void
-change_link (HTMLObject *o, HTMLEngine *e, gpointer data)
+change_link (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
HTMLObject *changed;
HTMLEngineLinkInsertData *d = (HTMLEngineLinkInsertData *) data;
@@ -1612,7 +1728,9 @@ change_link (HTMLObject *o, HTMLEngine *e, gpointer data)
}
void
-html_engine_set_insertion_link (HTMLEngine *e, const gchar *url, const gchar *target)
+html_engine_set_insertion_link (HTMLEngine *e,
+ const gchar *url,
+ const gchar *target)
{
html_engine_set_url (e, url);
html_engine_set_target (e, target);
@@ -1623,7 +1741,9 @@ html_engine_set_insertion_link (HTMLEngine *e, const gchar *url, const gchar *ta
}
void
-html_engine_edit_set_link (HTMLEngine *e, const gchar *url, const gchar *target)
+html_engine_edit_set_link (HTMLEngine *e,
+ const gchar *url,
+ const gchar *target)
{
if (html_engine_is_selection_active (e)) {
HTMLEngineLinkInsertData data;
@@ -1642,7 +1762,8 @@ html_engine_edit_set_link (HTMLEngine *e, const gchar *url, const gchar *target)
}
static void
-prepare_empty_flow (HTMLEngine *e, HTMLUndoDirection dir)
+prepare_empty_flow (HTMLEngine *e,
+ HTMLUndoDirection dir)
{
if (!html_clueflow_is_empty (HTML_CLUEFLOW (e->cursor->object->parent))) {
insert_empty_paragraph (e, dir, TRUE);
@@ -1657,7 +1778,10 @@ prepare_empty_flow (HTMLEngine *e, HTMLUndoDirection dir)
}
static void
-append_object (HTMLEngine *e, HTMLObject *o, guint len, HTMLUndoDirection dir)
+append_object (HTMLEngine *e,
+ HTMLObject *o,
+ guint len,
+ HTMLUndoDirection dir)
{
HTMLObject *c, *cn;
HTMLClue *clue;
@@ -1689,7 +1813,9 @@ append_object (HTMLEngine *e, HTMLObject *o, guint len, HTMLUndoDirection dir)
}
void
-html_engine_append_object (HTMLEngine *e, HTMLObject *o, guint len)
+html_engine_append_object (HTMLEngine *e,
+ HTMLObject *o,
+ guint len)
{
html_undo_level_begin (e->undo, "Append object", "Remove appended object");
append_object (e, o, len, HTML_UNDO_UNDO);
@@ -1697,7 +1823,8 @@ html_engine_append_object (HTMLEngine *e, HTMLObject *o, guint len)
}
static void
-replace_objects_in_clue_from_another (HTMLClue *dest, HTMLClue *src)
+replace_objects_in_clue_from_another (HTMLClue *dest,
+ HTMLClue *src)
{
HTMLObject *cur, *next;
@@ -1715,7 +1842,10 @@ replace_objects_in_clue_from_another (HTMLClue *dest, HTMLClue *src)
}
static void
-append_flow (HTMLEngine *e, HTMLObject *o, guint len, HTMLUndoDirection dir)
+append_flow (HTMLEngine *e,
+ HTMLObject *o,
+ guint len,
+ HTMLUndoDirection dir)
{
HTMLObject *where;
guint position, position_before;
@@ -1758,7 +1888,9 @@ append_flow (HTMLEngine *e, HTMLObject *o, guint len, HTMLUndoDirection dir)
}
void
-html_engine_append_flow (HTMLEngine *e, HTMLObject *o, guint len)
+html_engine_append_flow (HTMLEngine *e,
+ HTMLObject *o,
+ guint len)
{
html_undo_level_begin (e->undo, "Append flow", "Remove appended flow");
append_flow (e, o, len, HTML_UNDO_UNDO);
@@ -1766,7 +1898,9 @@ html_engine_append_flow (HTMLEngine *e, HTMLObject *o, guint len)
}
void
-html_engine_cut_and_paste_begin (HTMLEngine *e, const gchar *undo_op_name, const gchar *redo_op_name)
+html_engine_cut_and_paste_begin (HTMLEngine *e,
+ const gchar *undo_op_name,
+ const gchar *redo_op_name)
{
guint position;
gint level;
@@ -1804,8 +1938,11 @@ html_engine_cut_and_paste_end (HTMLEngine *e)
}
void
-html_engine_cut_and_paste (HTMLEngine *e, const gchar *undo_op_name, const gchar *redo_op_name,
- HTMLObjectForallFunc iterator, gpointer data)
+html_engine_cut_and_paste (HTMLEngine *e,
+ const gchar *undo_op_name,
+ const gchar *redo_op_name,
+ HTMLObjectForallFunc iterator,
+ gpointer data)
{
html_engine_edit_selection_updater_update_now (e->selection_updater);
html_engine_cut_and_paste_begin (e, undo_op_name, redo_op_name);
@@ -1815,7 +1952,11 @@ html_engine_cut_and_paste (HTMLEngine *e, const gchar *undo_op_name, const gchar
}
static void
-delete_upto (HTMLEngine *e, HTMLCursor **start, HTMLCursor **end, HTMLObject *object, guint offset)
+delete_upto (HTMLEngine *e,
+ HTMLCursor **start,
+ HTMLCursor **end,
+ HTMLObject *object,
+ guint offset)
{
guint position;
@@ -1831,7 +1972,8 @@ delete_upto (HTMLEngine *e, HTMLCursor **start, HTMLCursor **end, HTMLObject *ob
}
static gboolean
-check_for_simple_containers (HTMLObject *child, HTMLObject *parent)
+check_for_simple_containers (HTMLObject *child,
+ HTMLObject *parent)
{
while (child && child != parent) {
if (html_object_is_container (child)) {
@@ -1852,7 +1994,8 @@ check_for_simple_containers (HTMLObject *child, HTMLObject *parent)
}
static gboolean
-check_for_simple_delete (HTMLObject *start, HTMLObject *end)
+check_for_simple_delete (HTMLObject *start,
+ HTMLObject *end)
{
HTMLObject *common_parent = get_common_parent (start, end);
@@ -1913,7 +2056,7 @@ html_engine_delete (HTMLEngine *e)
if (prev) {
/* cluev end is in the selection. Lets handle this case just like simple delete
- since text is the selection itself*/
+ since text is the selection itself */
if (e->mark)
html_cursor_destroy (e->mark);
html_cursor_destroy (e->cursor);
diff --git a/gtkhtml/htmlengine-edit-cut-and-paste.h b/gtkhtml/htmlengine-edit-cut-and-paste.h
index 1a9e794..e745b48 100644
--- a/gtkhtml/htmlengine-edit-cut-and-paste.h
+++ b/gtkhtml/htmlengine-edit-cut-and-paste.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000, 2001 Helix Code, Inc.
- Authors: Radek Doulik (rodo helixcode com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
+ *
+ * Copyright (C) 2000, 2001 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
*/
#ifndef HTML_ENGINE_EDIT_CUT_AND_PASTE
diff --git a/gtkhtml/htmlengine-edit-fontstyle.c b/gtkhtml/htmlengine-edit-fontstyle.c
index 2a63a66..2c6d3e3 100644
--- a/gtkhtml/htmlengine-edit-fontstyle.c
+++ b/gtkhtml/htmlengine-edit-fontstyle.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -276,7 +276,9 @@ struct tmp_font {
};
static void
-object_set_font_style (HTMLObject *o, HTMLEngine *e, gpointer data)
+object_set_font_style (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (html_object_is_text (o)) {
struct tmp_font *tf = (struct tmp_font *) data;
@@ -297,7 +299,10 @@ typedef struct _HTMLEmptyParaSetStyle HTMLEmptyParaSetStyle;
static void set_empty_flow_style (HTMLEngine *e, GtkHTMLFontStyle and_mask, GtkHTMLFontStyle or_mask, HTMLUndoDirection dir);
static void
-set_empty_flow_style_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+set_empty_flow_style_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLEmptyParaSetStyle *undo = (HTMLEmptyParaSetStyle *) undo_data;
@@ -305,7 +310,10 @@ set_empty_flow_style_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUn
}
static void
-set_empty_flow_style (HTMLEngine *e, GtkHTMLFontStyle and_mask, GtkHTMLFontStyle or_mask, HTMLUndoDirection dir)
+set_empty_flow_style (HTMLEngine *e,
+ GtkHTMLFontStyle and_mask,
+ GtkHTMLFontStyle or_mask,
+ HTMLUndoDirection dir)
{
HTMLEmptyParaSetStyle *undo;
GtkHTMLFontStyle old_or_mask;
@@ -329,8 +337,8 @@ set_empty_flow_style (HTMLEngine *e, GtkHTMLFontStyle and_mask, GtkHTMLFontStyle
gboolean
html_engine_set_font_style (HTMLEngine *e,
- GtkHTMLFontStyle and_mask,
- GtkHTMLFontStyle or_mask)
+ GtkHTMLFontStyle and_mask,
+ GtkHTMLFontStyle or_mask)
{
gboolean rv;
GtkHTMLFontStyle old = e->insertion_font_style;
@@ -365,7 +373,8 @@ html_engine_set_font_style (HTMLEngine *e,
}
gboolean
-html_engine_toggle_font_style (HTMLEngine *engine, GtkHTMLFontStyle style)
+html_engine_toggle_font_style (HTMLEngine *engine,
+ GtkHTMLFontStyle style)
{
GtkHTMLFontStyle cur_style;
@@ -378,7 +387,8 @@ html_engine_toggle_font_style (HTMLEngine *engine, GtkHTMLFontStyle style)
}
static GtkHTMLFontStyle
-inc_dec_size (GtkHTMLFontStyle style, gboolean inc)
+inc_dec_size (GtkHTMLFontStyle style,
+ gboolean inc)
{
GtkHTMLFontStyle size;
@@ -398,7 +408,9 @@ inc_dec_size (GtkHTMLFontStyle style, gboolean inc)
}
static void
-inc_dec_size_cb (HTMLObject *o, HTMLEngine *e, gpointer data)
+inc_dec_size_cb (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (html_object_is_text (o)) {
html_text_set_font_style (HTML_TEXT (o), e, inc_dec_size (HTML_TEXT (o)->font_style, GPOINTER_TO_INT (data)));
@@ -408,7 +420,8 @@ inc_dec_size_cb (HTMLObject *o, HTMLEngine *e, gpointer data)
}
void
-html_engine_font_size_inc_dec (HTMLEngine *e, gboolean inc)
+html_engine_font_size_inc_dec (HTMLEngine *e,
+ gboolean inc)
{
if (html_engine_is_selection_active (e))
html_engine_cut_and_paste (e,
@@ -420,7 +433,9 @@ html_engine_font_size_inc_dec (HTMLEngine *e, gboolean inc)
}
static void
-set_color (HTMLObject *o, HTMLEngine *e, gpointer data)
+set_color (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (html_object_is_text (o)) {
HTMLObject *prev;
@@ -437,7 +452,8 @@ set_color (HTMLObject *o, HTMLEngine *e, gpointer data)
}
gboolean
-html_engine_set_color (HTMLEngine *e, HTMLColor *color)
+html_engine_set_color (HTMLEngine *e,
+ HTMLColor *color)
{
gboolean rv = TRUE;
@@ -459,8 +475,8 @@ html_engine_set_color (HTMLEngine *e, HTMLColor *color)
}
/* URL/Target
-
- get actual url/target
+ *
+ * get actual url/target
*/
const gchar *
@@ -476,7 +492,8 @@ html_engine_get_target (HTMLEngine *e)
}
void
-html_engine_set_url (HTMLEngine *e, const gchar *url)
+html_engine_set_url (HTMLEngine *e,
+ const gchar *url)
{
if (e->insertion_url)
g_free (e->insertion_url);
@@ -484,7 +501,8 @@ html_engine_set_url (HTMLEngine *e, const gchar *url)
}
void
-html_engine_set_target (HTMLEngine *e, const gchar *target)
+html_engine_set_target (HTMLEngine *e,
+ const gchar *target)
{
if (e->insertion_target)
g_free (e->insertion_target);
@@ -494,7 +512,8 @@ html_engine_set_target (HTMLEngine *e, const gchar *target)
/* get url/target from document */
static const gchar *
-get_url_or_target_from_selection (HTMLEngine *e, gboolean get_url)
+get_url_or_target_from_selection (HTMLEngine *e,
+ gboolean get_url)
{
const gchar *str = NULL;
HTMLPoint p;
@@ -519,7 +538,8 @@ get_url_or_target_from_selection (HTMLEngine *e, gboolean get_url)
}
static HTMLObject *
-html_engine_text_style_object (HTMLEngine *e, gint *offset)
+html_engine_text_style_object (HTMLEngine *e,
+ gint *offset)
{
if (HTML_IS_TEXT (e->cursor->object)
|| (e->cursor->offset && e->cursor->offset != html_object_get_length (e->cursor->object))) {
diff --git a/gtkhtml/htmlengine-edit-fontstyle.h b/gtkhtml/htmlengine-edit-fontstyle.h
index 519c13b..8468a31 100644
--- a/gtkhtml/htmlengine-edit-fontstyle.h
+++ b/gtkhtml/htmlengine-edit-fontstyle.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef HTMLENGINE_EDIT_FONTSTYLE_H
diff --git a/gtkhtml/htmlengine-edit-images.c b/gtkhtml/htmlengine-edit-images.c
index 0c9b55c..caa50c8 100644
--- a/gtkhtml/htmlengine-edit-images.c
+++ b/gtkhtml/htmlengine-edit-images.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -30,20 +30,20 @@
void
html_engine_insert_image (HTMLEngine *e,
- const gchar *file,
- const gchar *url,
- const gchar *target,
- gint16 width,
- gint16 height,
- gboolean percent_width,
- gboolean percent_height,
- gint8 border,
- HTMLColor *border_color,
- HTMLHAlignType halign,
- HTMLVAlignType valign,
- gint8 hspace,
- gint8 vspace,
- gboolean reload)
+ const gchar *file,
+ const gchar *url,
+ const gchar *target,
+ gint16 width,
+ gint16 height,
+ gboolean percent_width,
+ gboolean percent_height,
+ gint8 border,
+ HTMLColor *border_color,
+ HTMLHAlignType halign,
+ HTMLVAlignType valign,
+ gint8 hspace,
+ gint8 vspace,
+ gboolean reload)
{
HTMLObject *image;
diff --git a/gtkhtml/htmlengine-edit-images.h b/gtkhtml/htmlengine-edit-images.h
index d629854..eb52e08 100644
--- a/gtkhtml/htmlengine-edit-images.h
+++ b/gtkhtml/htmlengine-edit-images.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLENGINE_EDIT_IMAGES_H
diff --git a/gtkhtml/htmlengine-edit-movement.c b/gtkhtml/htmlengine-edit-movement.c
index 8ba7fa6..2ae9420 100644
--- a/gtkhtml/htmlengine-edit-movement.c
+++ b/gtkhtml/htmlengine-edit-movement.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -42,8 +42,8 @@ html_engine_update_selection_if_necessary (HTMLEngine *e)
guint
html_engine_move_cursor (HTMLEngine *e,
- HTMLEngineCursorMovement movement,
- guint count)
+ HTMLEngineCursorMovement movement,
+ guint count)
{
gboolean (* movement_func) (HTMLCursor *, HTMLEngine *);
guint c;
@@ -104,8 +104,8 @@ html_engine_move_cursor (HTMLEngine *e,
**/
void
html_engine_jump_to_object (HTMLEngine *e,
- HTMLObject *object,
- guint offset)
+ HTMLObject *object,
+ guint offset)
{
g_return_if_fail (e != NULL);
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -132,7 +132,8 @@ html_engine_jump_to_object (HTMLEngine *e,
**/
void
html_engine_jump_at (HTMLEngine *e,
- gint x, gint y)
+ gint x,
+ gint y)
{
HTMLObject *obj;
guint offset;
@@ -281,8 +282,8 @@ html_engine_scroll_down (HTMLEngine *engine,
html_object_get_cursor_base (cursor->object, engine->painter, cursor->offset, &x, &new_y);
/* FIXME html_cursor_down() is broken. It should
- return FALSE and TRUE appropriately. But I am lazy
- now. */
+ * return FALSE and TRUE appropriately. But I am lazy
+ * now. */
if (new_y == y)
break;
@@ -334,8 +335,8 @@ html_engine_scroll_up (HTMLEngine *engine,
html_object_get_cursor_base (cursor->object, engine->painter, cursor->offset, &x, &new_y);
/* FIXME html_cursor_down() is broken. It should
- return FALSE and TRUE appropriately. But I am lazy
- now. */
+ * return FALSE and TRUE appropriately. But I am lazy
+ * now. */
if (new_y == y)
break;
diff --git a/gtkhtml/htmlengine-edit-movement.h b/gtkhtml/htmlengine-edit-movement.h
index c024e5b..7d4228e 100644
--- a/gtkhtml/htmlengine-edit-movement.h
+++ b/gtkhtml/htmlengine-edit-movement.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLENGINE_EDIT_MOVEMENT_H
diff --git a/gtkhtml/htmlengine-edit-rule.c b/gtkhtml/htmlengine-edit-rule.c
index c4979c1..1c6c033 100644
--- a/gtkhtml/htmlengine-edit-rule.c
+++ b/gtkhtml/htmlengine-edit-rule.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -27,12 +27,12 @@
#include "htmlengine-edit-rule.h"
void
-html_engine_insert_rule (HTMLEngine *e,
- gint length,
- gint percent,
- gint size,
- gboolean shade,
- HTMLHAlignType halign)
+html_engine_insert_rule (HTMLEngine *e,
+ gint length,
+ gint percent,
+ gint size,
+ gboolean shade,
+ HTMLHAlignType halign)
{
HTMLObject *rule;
@@ -48,7 +48,13 @@ html_engine_insert_rule (HTMLEngine *e,
#define SETO(x) if (HTML_OBJECT (rule)->x != x) { changed = TRUE; HTML_OBJECT (rule)->x = x; }
void
-html_rule_set (HTMLRule *rule, HTMLEngine *e, gint length, gint percent, gint size, gboolean shade, HTMLHAlignType halign)
+html_rule_set (HTMLRule *rule,
+ HTMLEngine *e,
+ gint length,
+ gint percent,
+ gint size,
+ gboolean shade,
+ HTMLHAlignType halign)
{
gboolean changed = FALSE;
@@ -63,7 +69,10 @@ html_rule_set (HTMLRule *rule, HTMLEngine *e, gint length, gint percent, gint si
}
void
-html_rule_set_length (HTMLRule *rule, HTMLEngine *e, gint length, gint percent)
+html_rule_set_length (HTMLRule *rule,
+ HTMLEngine *e,
+ gint length,
+ gint percent)
{
gboolean changed = FALSE;
@@ -75,7 +84,9 @@ html_rule_set_length (HTMLRule *rule, HTMLEngine *e, gint length, gint percent)
}
void
-html_rule_set_size (HTMLRule *rule, HTMLEngine *e, gint size)
+html_rule_set_size (HTMLRule *rule,
+ HTMLEngine *e,
+ gint size)
{
gboolean changed = FALSE;
@@ -86,7 +97,9 @@ html_rule_set_size (HTMLRule *rule, HTMLEngine *e, gint size)
}
void
-html_rule_set_shade (HTMLRule *rule, HTMLEngine *e, gboolean shade)
+html_rule_set_shade (HTMLRule *rule,
+ HTMLEngine *e,
+ gboolean shade)
{
gboolean changed = FALSE;
@@ -97,7 +110,9 @@ html_rule_set_shade (HTMLRule *rule, HTMLEngine *e, gboolean shade)
}
void
-html_rule_set_align (HTMLRule *rule, HTMLEngine *e, HTMLHAlignType halign)
+html_rule_set_align (HTMLRule *rule,
+ HTMLEngine *e,
+ HTMLHAlignType halign)
{
gboolean changed = FALSE;
diff --git a/gtkhtml/htmlengine-edit-rule.h b/gtkhtml/htmlengine-edit-rule.h
index ad84072..d1c8176 100644
--- a/gtkhtml/htmlengine-edit-rule.h
+++ b/gtkhtml/htmlengine-edit-rule.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLENGINE_EDIT_RULE_H
diff --git a/gtkhtml/htmlengine-edit-selection-updater.c b/gtkhtml/htmlengine-edit-selection-updater.c
index 9ebf498..4887225 100644
--- a/gtkhtml/htmlengine-edit-selection-updater.c
+++ b/gtkhtml/htmlengine-edit-selection-updater.c
@@ -1,27 +1,27 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/* WARNING / FIXME : All of this code assumes that the only kind of
- selectable object that does not accept the cursor is
- `HTMLClueFlow'. */
+ * selectable object that does not accept the cursor is
+ * `HTMLClueFlow'. */
#include <config.h>
diff --git a/gtkhtml/htmlengine-edit-selection-updater.h b/gtkhtml/htmlengine-edit-selection-updater.h
index 98b4f49..22bdb2c 100644
--- a/gtkhtml/htmlengine-edit-selection-updater.h
+++ b/gtkhtml/htmlengine-edit-selection-updater.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLENGINE_EDIT_SELECTION_UPDATER_H
diff --git a/gtkhtml/htmlengine-edit-table.c b/gtkhtml/htmlengine-edit-table.c
index a22f53a..435fdb2 100644
--- a/gtkhtml/htmlengine-edit-table.c
+++ b/gtkhtml/htmlengine-edit-table.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
- Copyright (C) 2001, 2002 Ximian, Inc.
- Authors: Radek Doulik
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2001, 2002 Ximian, Inc.
+ * Authors: Radek Doulik
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -51,7 +51,8 @@ html_engine_get_table (HTMLEngine *e)
}
HTMLTableCell *
-html_engine_new_cell (HTMLEngine *e, HTMLTable *table)
+html_engine_new_cell (HTMLEngine *e,
+ HTMLTable *table)
{
HTMLObject *cell;
HTMLObject *text;
@@ -101,8 +102,14 @@ html_engine_insert_table_1_1 (HTMLEngine *e)
**/
void
-html_engine_insert_table (HTMLEngine *e, gint cols, gint rows, gint width, gint percent,
- gint padding, gint spacing, gint border)
+html_engine_insert_table (HTMLEngine *e,
+ gint cols,
+ gint rows,
+ gint width,
+ gint percent,
+ gint padding,
+ gint spacing,
+ gint border)
{
HTMLObject *table;
gint r, c;
@@ -119,8 +126,8 @@ html_engine_insert_table (HTMLEngine *e, gint cols, gint rows, gint width, gint
html_table_end_row (HTML_TABLE (table));
}
- html_engine_append_object (e, table, 1 + rows*cols);
- html_cursor_backward_n (e->cursor, e, rows*cols);
+ html_engine_append_object (e, table, 1 + rows * cols);
+ html_cursor_backward_n (e->cursor, e, rows * cols);
}
/*
@@ -147,13 +154,19 @@ insert_undo_data_new (gint pos)
}
static void
-insert_column_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+insert_column_undo_action (HTMLEngine *e,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
html_table_delete_column (html_engine_get_table (e), e, INSERT_UNDO (data)->pos, html_undo_direction_reverse (dir));
}
static void
-insert_column_setup_undo (HTMLEngine *e, gint col, guint position_before, HTMLUndoDirection dir)
+insert_column_setup_undo (HTMLEngine *e,
+ gint col,
+ guint position_before,
+ HTMLUndoDirection dir)
{
html_undo_add_action (e->undo, e,
html_undo_action_new ("Insert table column", insert_column_undo_action,
@@ -163,13 +176,17 @@ insert_column_setup_undo (HTMLEngine *e, gint col, guint position_before, HTMLUn
}
gboolean
-html_engine_goto_table_0 (HTMLEngine *e, HTMLTable *table)
+html_engine_goto_table_0 (HTMLEngine *e,
+ HTMLTable *table)
{
return html_cursor_jump_to (e->cursor, e, HTML_OBJECT (table), 0);
}
gboolean
-html_engine_goto_table (HTMLEngine *e, HTMLTable *table, gint row, gint col)
+html_engine_goto_table (HTMLEngine *e,
+ HTMLTable *table,
+ gint row,
+ gint col)
{
HTMLTableCell *cell;
@@ -185,7 +202,9 @@ html_engine_goto_table (HTMLEngine *e, HTMLTable *table, gint row, gint col)
}
gboolean
-html_engine_table_goto_col (HTMLEngine *e, HTMLTable *table, gint col)
+html_engine_table_goto_col (HTMLEngine *e,
+ HTMLTable *table,
+ gint col)
{
HTMLTableCell *cell;
@@ -204,7 +223,9 @@ html_engine_table_goto_col (HTMLEngine *e, HTMLTable *table, gint col)
}
gboolean
-html_engine_table_goto_row (HTMLEngine *e, HTMLTable *table, gint row)
+html_engine_table_goto_row (HTMLEngine *e,
+ HTMLTable *table,
+ gint row)
{
HTMLTableCell *cell;
@@ -223,7 +244,11 @@ html_engine_table_goto_row (HTMLEngine *e, HTMLTable *table, gint row)
}
void
-html_table_insert_column (HTMLTable *t, HTMLEngine *e, gint col, HTMLTableCell **column, HTMLUndoDirection dir)
+html_table_insert_column (HTMLTable *t,
+ HTMLEngine *e,
+ gint col,
+ HTMLTableCell **column,
+ HTMLUndoDirection dir)
{
HTMLTableCell *cell;
HTMLPoint pos;
@@ -285,7 +310,8 @@ html_table_insert_column (HTMLTable *t, HTMLEngine *e, gint col, HTMLTableCell *
**/
void
-html_engine_insert_table_column (HTMLEngine *e, gboolean after)
+html_engine_insert_table_column (HTMLEngine *e,
+ gboolean after)
{
HTMLTable *table;
HTMLTableCell *cell;
@@ -322,7 +348,9 @@ delete_cells_undo_destroy (HTMLUndoData *undo_data)
}
static DeleteCellsUndo *
-delete_cells_undo_new (HTMLTableCell **cells, gint size, gint pos)
+delete_cells_undo_new (HTMLTableCell **cells,
+ gint size,
+ gint pos)
{
DeleteCellsUndo *data;
@@ -339,7 +367,10 @@ delete_cells_undo_new (HTMLTableCell **cells, gint size, gint pos)
}
static void
-delete_column_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+delete_column_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
DeleteCellsUndo *data = (DeleteCellsUndo *) undo_data;
HTMLTable *table;
@@ -355,7 +386,12 @@ delete_column_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirec
}
static void
-delete_column_setup_undo (HTMLEngine *e, HTMLTableCell **column, gint size, guint position_after, gint col, HTMLUndoDirection dir)
+delete_column_setup_undo (HTMLEngine *e,
+ HTMLTableCell **column,
+ gint size,
+ guint position_after,
+ gint col,
+ HTMLUndoDirection dir)
{
html_undo_add_action (e->undo, e,
html_undo_action_new ("Delete table column", delete_column_undo_action,
@@ -365,7 +401,9 @@ delete_column_setup_undo (HTMLEngine *e, HTMLTableCell **column, gint size, guin
}
static void
-backward_before_col (HTMLEngine *e, HTMLTable *table, gint col)
+backward_before_col (HTMLEngine *e,
+ HTMLTable *table,
+ gint col)
{
HTMLObject *cell;
@@ -377,7 +415,10 @@ backward_before_col (HTMLEngine *e, HTMLTable *table, gint col)
}
void
-html_table_delete_column (HTMLTable *t, HTMLEngine *e, gint col, HTMLUndoDirection dir)
+html_table_delete_column (HTMLTable *t,
+ HTMLEngine *e,
+ gint col,
+ HTMLUndoDirection dir)
{
HTMLTableCell **column;
HTMLTableCell *cell;
@@ -430,7 +471,9 @@ html_table_delete_column (HTMLTable *t, HTMLEngine *e, gint col, HTMLUndoDirecti
}
static gboolean
-html_engine_get_table_start_end_cells (HTMLEngine *e, HTMLTableCell **start_cell, HTMLTableCell **end_cell)
+html_engine_get_table_start_end_cells (HTMLEngine *e,
+ HTMLTableCell **start_cell,
+ HTMLTableCell **end_cell)
{
if (!e->cursor->object->parent ||
!e->cursor->object->parent->parent ||
@@ -500,13 +543,19 @@ html_engine_delete_table_column (HTMLEngine *e)
*/
static void
-insert_row_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+insert_row_undo_action (HTMLEngine *e,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
html_table_delete_row (html_engine_get_table (e), e, INSERT_UNDO (data)->pos, html_undo_direction_reverse (dir));
}
static void
-insert_row_setup_undo (HTMLEngine *e, gint row, guint position_before, HTMLUndoDirection dir)
+insert_row_setup_undo (HTMLEngine *e,
+ gint row,
+ guint position_before,
+ HTMLUndoDirection dir)
{
html_undo_add_action (e->undo, e,
html_undo_action_new ("Insert table row", insert_row_undo_action,
@@ -517,7 +566,11 @@ insert_row_setup_undo (HTMLEngine *e, gint row, guint position_before, HTMLUndoD
}
void
-html_table_insert_row (HTMLTable *t, HTMLEngine *e, gint row, HTMLTableCell **row_cells, HTMLUndoDirection dir)
+html_table_insert_row (HTMLTable *t,
+ HTMLEngine *e,
+ gint row,
+ HTMLTableCell **row_cells,
+ HTMLUndoDirection dir)
{
HTMLTableCell *cell;
HTMLPoint pos;
@@ -577,7 +630,8 @@ html_table_insert_row (HTMLTable *t, HTMLEngine *e, gint row, HTMLTableCell **ro
**/
void
-html_engine_insert_table_row (HTMLEngine *e, gboolean after)
+html_engine_insert_table_row (HTMLEngine *e,
+ gboolean after)
{
HTMLTable *table;
HTMLTableCell *cell;
@@ -593,7 +647,10 @@ html_engine_insert_table_row (HTMLEngine *e, gboolean after)
*/
static void
-delete_row_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+delete_row_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
DeleteCellsUndo *data = (DeleteCellsUndo *) undo_data;
HTMLTable *table;
@@ -609,8 +666,12 @@ delete_row_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirectio
}
static void
-delete_row_setup_undo (HTMLEngine *e, HTMLTableCell **row_cells, gint size, guint position_after,
- gint row, HTMLUndoDirection dir)
+delete_row_setup_undo (HTMLEngine *e,
+ HTMLTableCell **row_cells,
+ gint size,
+ guint position_after,
+ gint row,
+ HTMLUndoDirection dir)
{
html_undo_add_action (e->undo, e,
html_undo_action_new ("Delete table row", delete_row_undo_action,
@@ -620,7 +681,9 @@ delete_row_setup_undo (HTMLEngine *e, HTMLTableCell **row_cells, gint size, guin
}
static void
-backward_before_row (HTMLEngine *e, HTMLTable *table, gint row)
+backward_before_row (HTMLEngine *e,
+ HTMLTable *table,
+ gint row)
{
HTMLObject *cell;
@@ -632,7 +695,10 @@ backward_before_row (HTMLEngine *e, HTMLTable *table, gint row)
}
void
-html_table_delete_row (HTMLTable *t, HTMLEngine *e, gint row, HTMLUndoDirection dir)
+html_table_delete_row (HTMLTable *t,
+ HTMLEngine *e,
+ gint row,
+ HTMLUndoDirection dir)
{
HTMLTableCell **row_cells;
HTMLTableCell *cell;
@@ -786,14 +852,21 @@ attr_undo_new (HTMLTableAttrType type)
static void table_set_border_width (HTMLEngine *e, HTMLTable *t, gint border_width, gboolean relative, HTMLUndoDirection dir);
static void
-table_set_border_width_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_set_border_width_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
table_set_border_width (e, html_engine_get_table (e), ((HTMLTableSetAttrUndo *) undo_data)->attr.border, FALSE,
html_undo_direction_reverse (dir));
}
static void
-table_set_border_width (HTMLEngine *e, HTMLTable *t, gint border_width, gboolean relative, HTMLUndoDirection dir)
+table_set_border_width (HTMLEngine *e,
+ HTMLTable *t,
+ gint border_width,
+ gboolean relative,
+ HTMLUndoDirection dir)
{
HTMLTableSetAttrUndo *undo;
gint new_border;
@@ -826,7 +899,10 @@ table_set_border_width (HTMLEngine *e, HTMLTable *t, gint border_width, gboolean
}
void
-html_engine_table_set_border_width (HTMLEngine *e, HTMLTable *t, gint border_width, gboolean relative)
+html_engine_table_set_border_width (HTMLEngine *e,
+ HTMLTable *t,
+ gint border_width,
+ gboolean relative)
{
table_set_border_width (e, t, border_width, relative, HTML_UNDO_UNDO);
}
@@ -839,7 +915,10 @@ html_engine_table_set_border_width (HTMLEngine *e, HTMLTable *t, gint border_wid
static void table_set_bg_color (HTMLEngine *e, HTMLTable *t, GdkColor *c, HTMLUndoDirection dir);
static void
-table_set_bg_color_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_set_bg_color_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableSetAttrUndo *data = (HTMLTableSetAttrUndo *) undo_data;
HTMLTable *table = html_engine_get_table (e);
@@ -852,7 +931,10 @@ table_set_bg_color_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndo
}
static void
-table_set_bg_color (HTMLEngine *e, HTMLTable *t, GdkColor *c, HTMLUndoDirection dir)
+table_set_bg_color (HTMLEngine *e,
+ HTMLTable *t,
+ GdkColor *c,
+ HTMLUndoDirection dir)
{
HTMLTableSetAttrUndo *undo;
@@ -880,7 +962,9 @@ table_set_bg_color (HTMLEngine *e, HTMLTable *t, GdkColor *c, HTMLUndoDirection
}
void
-html_engine_table_set_bg_color (HTMLEngine *e, HTMLTable *t, GdkColor *c)
+html_engine_table_set_bg_color (HTMLEngine *e,
+ HTMLTable *t,
+ GdkColor *c)
{
table_set_bg_color (e, t, c, HTML_UNDO_UNDO);
}
@@ -893,7 +977,10 @@ html_engine_table_set_bg_color (HTMLEngine *e, HTMLTable *t, GdkColor *c)
static void table_set_bg_pixmap (HTMLEngine *e, HTMLTable *t, gchar *url, HTMLUndoDirection dir);
static void
-table_set_bg_pixmap_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_set_bg_pixmap_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableSetAttrUndo *data = (HTMLTableSetAttrUndo *) undo_data;
@@ -901,7 +988,10 @@ table_set_bg_pixmap_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUnd
}
static void
-table_set_bg_pixmap (HTMLEngine *e, HTMLTable *t, gchar *url, HTMLUndoDirection dir)
+table_set_bg_pixmap (HTMLEngine *e,
+ HTMLTable *t,
+ gchar *url,
+ HTMLUndoDirection dir)
{
HTMLImagePointer *iptr;
HTMLTableSetAttrUndo *undo;
@@ -922,7 +1012,9 @@ table_set_bg_pixmap (HTMLEngine *e, HTMLTable *t, gchar *url, HTMLUndoDirection
}
void
-html_engine_table_set_bg_pixmap (HTMLEngine *e, HTMLTable *t, gchar *url)
+html_engine_table_set_bg_pixmap (HTMLEngine *e,
+ HTMLTable *t,
+ gchar *url)
{
table_set_bg_pixmap (e, t, url, HTML_UNDO_UNDO);
}
@@ -935,7 +1027,10 @@ html_engine_table_set_bg_pixmap (HTMLEngine *e, HTMLTable *t, gchar *url)
static void table_set_spacing (HTMLEngine *e, HTMLTable *t, gint spacing, gboolean relative, HTMLUndoDirection dir);
static void
-table_set_spacing_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_set_spacing_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableSetAttrUndo *data = (HTMLTableSetAttrUndo *) undo_data;
@@ -943,7 +1038,11 @@ table_set_spacing_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoD
}
static void
-table_set_spacing (HTMLEngine *e, HTMLTable *t, gint spacing, gboolean relative, HTMLUndoDirection dir)
+table_set_spacing (HTMLEngine *e,
+ HTMLTable *t,
+ gint spacing,
+ gboolean relative,
+ HTMLUndoDirection dir)
{
HTMLTableSetAttrUndo *undo;
gint new_spacing;
@@ -973,7 +1072,10 @@ table_set_spacing (HTMLEngine *e, HTMLTable *t, gint spacing, gboolean relative,
}
void
-html_engine_table_set_spacing (HTMLEngine *e, HTMLTable *t, gint spacing, gboolean relative)
+html_engine_table_set_spacing (HTMLEngine *e,
+ HTMLTable *t,
+ gint spacing,
+ gboolean relative)
{
table_set_spacing (e, t, spacing, relative, HTML_UNDO_UNDO);
}
@@ -986,7 +1088,10 @@ html_engine_table_set_spacing (HTMLEngine *e, HTMLTable *t, gint spacing, gboole
static void table_set_padding (HTMLEngine *e, HTMLTable *t, gint padding, gboolean relative, HTMLUndoDirection dir);
static void
-table_set_padding_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_set_padding_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableSetAttrUndo *data = (HTMLTableSetAttrUndo *) undo_data;
@@ -994,7 +1099,11 @@ table_set_padding_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoD
}
static void
-table_set_padding (HTMLEngine *e, HTMLTable *t, gint padding, gboolean relative, HTMLUndoDirection dir)
+table_set_padding (HTMLEngine *e,
+ HTMLTable *t,
+ gint padding,
+ gboolean relative,
+ HTMLUndoDirection dir)
{
HTMLTableSetAttrUndo *undo;
gint r, c;
@@ -1032,7 +1141,10 @@ table_set_padding (HTMLEngine *e, HTMLTable *t, gint padding, gboolean relative,
}
void
-html_engine_table_set_padding (HTMLEngine *e, HTMLTable *t, gint padding, gboolean relative)
+html_engine_table_set_padding (HTMLEngine *e,
+ HTMLTable *t,
+ gint padding,
+ gboolean relative)
{
table_set_padding (e, t, padding, relative, HTML_UNDO_UNDO);
}
@@ -1045,7 +1157,10 @@ html_engine_table_set_padding (HTMLEngine *e, HTMLTable *t, gint padding, gboole
static void table_set_align (HTMLEngine *e, HTMLTable *t, HTMLHAlignType align, HTMLUndoDirection dir);
static void
-table_set_align_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_set_align_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableSetAttrUndo *data = (HTMLTableSetAttrUndo *) undo_data;
@@ -1053,7 +1168,10 @@ table_set_align_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDir
}
static void
-table_set_align (HTMLEngine *e, HTMLTable *t, HTMLHAlignType align, HTMLUndoDirection dir)
+table_set_align (HTMLEngine *e,
+ HTMLTable *t,
+ HTMLHAlignType align,
+ HTMLUndoDirection dir)
{
HTMLTableSetAttrUndo *undo;
@@ -1099,7 +1217,9 @@ table_set_align (HTMLEngine *e, HTMLTable *t, HTMLHAlignType align, HTMLUndoDire
}
void
-html_engine_table_set_align (HTMLEngine *e, HTMLTable *t, HTMLHAlignType align)
+html_engine_table_set_align (HTMLEngine *e,
+ HTMLTable *t,
+ HTMLHAlignType align)
{
table_set_align (e, t, align, HTML_UNDO_UNDO);
}
@@ -1112,7 +1232,10 @@ html_engine_table_set_align (HTMLEngine *e, HTMLTable *t, HTMLHAlignType align)
static void table_set_width (HTMLEngine *e, HTMLTable *t, gint width, gboolean percent, HTMLUndoDirection dir);
static void
-table_set_width_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_set_width_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableSetAttrUndo *data = (HTMLTableSetAttrUndo *) undo_data;
@@ -1121,7 +1244,11 @@ table_set_width_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDir
}
static void
-table_set_width (HTMLEngine *e, HTMLTable *t, gint width, gboolean percent, HTMLUndoDirection dir)
+table_set_width (HTMLEngine *e,
+ HTMLTable *t,
+ gint width,
+ gboolean percent,
+ HTMLUndoDirection dir)
{
HTMLTableSetAttrUndo *undo;
@@ -1154,7 +1281,10 @@ table_set_width (HTMLEngine *e, HTMLTable *t, gint width, gboolean percent, HTML
}
void
-html_engine_table_set_width (HTMLEngine *e, HTMLTable *t, gint width, gboolean percent)
+html_engine_table_set_width (HTMLEngine *e,
+ HTMLTable *t,
+ gint width,
+ gboolean percent)
{
table_set_width (e, t, width, percent, HTML_UNDO_UNDO);
}
@@ -1164,7 +1294,8 @@ html_engine_table_set_width (HTMLEngine *e, HTMLTable *t, gint width, gboolean p
*/
void
-html_engine_table_set_cols (HTMLEngine *e, gint cols)
+html_engine_table_set_cols (HTMLEngine *e,
+ gint cols)
{
HTMLTable *table = html_engine_get_table (e);
@@ -1192,7 +1323,8 @@ html_engine_table_set_cols (HTMLEngine *e, gint cols)
*/
void
-html_engine_table_set_rows (HTMLEngine *e, gint rows)
+html_engine_table_set_rows (HTMLEngine *e,
+ gint rows)
{
HTMLTable *table = html_engine_get_table (e);
diff --git a/gtkhtml/htmlengine-edit-table.h b/gtkhtml/htmlengine-edit-table.h
index 0cf98b1..1d1b3da 100644
--- a/gtkhtml/htmlengine-edit-table.h
+++ b/gtkhtml/htmlengine-edit-table.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
- Copyright (C) 2001 Ximian, Inc.
- Authors: Radek Doulik
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2001 Ximian, Inc.
+ * Authors: Radek Doulik
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLENGINE_EDIT_TABLES_H
diff --git a/gtkhtml/htmlengine-edit-tablecell.c b/gtkhtml/htmlengine-edit-tablecell.c
index 68987b6..6c628ee 100644
--- a/gtkhtml/htmlengine-edit-tablecell.c
+++ b/gtkhtml/htmlengine-edit-tablecell.c
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2001 Ximian, Inc.
- Authors: Radek Doulik
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2001 Ximian, Inc.
+ * Authors: Radek Doulik
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -117,7 +117,10 @@ attr_undo_new (HTMLTableCellAttrType type)
static void table_cell_set_bg_color (HTMLEngine *e, HTMLTableCell *cell, GdkColor *c, HTMLUndoDirection dir);
static void
-table_cell_set_bg_color_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_cell_set_bg_color_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableCellSetAttrUndo *data = (HTMLTableCellSetAttrUndo *) undo_data;
@@ -126,7 +129,10 @@ table_cell_set_bg_color_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTM
}
static void
-table_cell_set_bg_color (HTMLEngine *e, HTMLTableCell *cell, GdkColor *c, HTMLUndoDirection dir)
+table_cell_set_bg_color (HTMLEngine *e,
+ HTMLTableCell *cell,
+ GdkColor *c,
+ HTMLUndoDirection dir)
{
HTMLTableCellSetAttrUndo *undo;
@@ -144,7 +150,9 @@ table_cell_set_bg_color (HTMLEngine *e, HTMLTableCell *cell, GdkColor *c, HTMLUn
}
void
-html_engine_table_cell_set_bg_color (HTMLEngine *e, HTMLTableCell *cell, GdkColor *c)
+html_engine_table_cell_set_bg_color (HTMLEngine *e,
+ HTMLTableCell *cell,
+ GdkColor *c)
{
table_cell_set_bg_color (e, cell, c, HTML_UNDO_UNDO);
}
@@ -157,7 +165,10 @@ html_engine_table_cell_set_bg_color (HTMLEngine *e, HTMLTableCell *cell, GdkColo
static void table_cell_set_bg_pixmap (HTMLEngine *e, HTMLTableCell *cell, gchar *url, HTMLUndoDirection dir);
static void
-table_cell_set_bg_pixmap_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_cell_set_bg_pixmap_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableCellSetAttrUndo *data = (HTMLTableCellSetAttrUndo *) undo_data;
@@ -165,7 +176,10 @@ table_cell_set_bg_pixmap_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HT
}
static void
-table_cell_set_bg_pixmap (HTMLEngine *e, HTMLTableCell *cell, gchar *url, HTMLUndoDirection dir)
+table_cell_set_bg_pixmap (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gchar *url,
+ HTMLUndoDirection dir)
{
HTMLImagePointer *iptr;
HTMLTableCellSetAttrUndo *undo;
@@ -187,7 +201,9 @@ table_cell_set_bg_pixmap (HTMLEngine *e, HTMLTableCell *cell, gchar *url, HTMLUn
}
void
-html_engine_table_cell_set_bg_pixmap (HTMLEngine *e, HTMLTableCell *cell, gchar *url)
+html_engine_table_cell_set_bg_pixmap (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gchar *url)
{
table_cell_set_bg_pixmap (e, cell, url, HTML_UNDO_UNDO);
}
@@ -200,7 +216,10 @@ html_engine_table_cell_set_bg_pixmap (HTMLEngine *e, HTMLTableCell *cell, gchar
static void table_cell_set_halign (HTMLEngine *e, HTMLTableCell *cell, HTMLHAlignType halign, HTMLUndoDirection dir);
static void
-table_cell_set_halign_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_cell_set_halign_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableCellSetAttrUndo *data = (HTMLTableCellSetAttrUndo *) undo_data;
@@ -208,7 +227,10 @@ table_cell_set_halign_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLU
}
static void
-table_cell_set_halign (HTMLEngine *e, HTMLTableCell *cell, HTMLHAlignType halign, HTMLUndoDirection dir)
+table_cell_set_halign (HTMLEngine *e,
+ HTMLTableCell *cell,
+ HTMLHAlignType halign,
+ HTMLUndoDirection dir)
{
HTMLTableCellSetAttrUndo *undo;
@@ -225,7 +247,9 @@ table_cell_set_halign (HTMLEngine *e, HTMLTableCell *cell, HTMLHAlignType halign
}
void
-html_engine_table_cell_set_halign (HTMLEngine *e, HTMLTableCell *cell, HTMLHAlignType halign)
+html_engine_table_cell_set_halign (HTMLEngine *e,
+ HTMLTableCell *cell,
+ HTMLHAlignType halign)
{
table_cell_set_halign (e, cell, halign, HTML_UNDO_UNDO);
}
@@ -238,7 +262,10 @@ html_engine_table_cell_set_halign (HTMLEngine *e, HTMLTableCell *cell, HTMLHAlig
static void table_cell_set_valign (HTMLEngine *e, HTMLTableCell *cell, HTMLVAlignType valign, HTMLUndoDirection dir);
static void
-table_cell_set_valign_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_cell_set_valign_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableCellSetAttrUndo *data = (HTMLTableCellSetAttrUndo *) undo_data;
@@ -246,7 +273,10 @@ table_cell_set_valign_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLU
}
static void
-table_cell_set_valign (HTMLEngine *e, HTMLTableCell *cell, HTMLVAlignType valign, HTMLUndoDirection dir)
+table_cell_set_valign (HTMLEngine *e,
+ HTMLTableCell *cell,
+ HTMLVAlignType valign,
+ HTMLUndoDirection dir)
{
HTMLTableCellSetAttrUndo *undo;
@@ -263,7 +293,9 @@ table_cell_set_valign (HTMLEngine *e, HTMLTableCell *cell, HTMLVAlignType valign
}
void
-html_engine_table_cell_set_valign (HTMLEngine *e, HTMLTableCell *cell, HTMLVAlignType valign)
+html_engine_table_cell_set_valign (HTMLEngine *e,
+ HTMLTableCell *cell,
+ HTMLVAlignType valign)
{
table_cell_set_valign (e, cell, valign, HTML_UNDO_UNDO);
}
@@ -276,7 +308,10 @@ html_engine_table_cell_set_valign (HTMLEngine *e, HTMLTableCell *cell, HTMLVAlig
static void table_cell_set_no_wrap (HTMLEngine *e, HTMLTableCell *cell, gboolean no_wrap, HTMLUndoDirection dir);
static void
-table_cell_set_no_wrap_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_cell_set_no_wrap_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableCellSetAttrUndo *data = (HTMLTableCellSetAttrUndo *) undo_data;
@@ -284,7 +319,10 @@ table_cell_set_no_wrap_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTML
}
static void
-table_cell_set_no_wrap (HTMLEngine *e, HTMLTableCell *cell, gboolean no_wrap, HTMLUndoDirection dir)
+table_cell_set_no_wrap (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gboolean no_wrap,
+ HTMLUndoDirection dir)
{
if (cell->no_wrap != no_wrap) {
HTMLTableCellSetAttrUndo *undo;
@@ -303,7 +341,9 @@ table_cell_set_no_wrap (HTMLEngine *e, HTMLTableCell *cell, gboolean no_wrap, HT
}
void
-html_engine_table_cell_set_no_wrap (HTMLEngine *e, HTMLTableCell *cell, gboolean no_wrap)
+html_engine_table_cell_set_no_wrap (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gboolean no_wrap)
{
table_cell_set_no_wrap (e, cell, no_wrap, HTML_UNDO_UNDO);
}
@@ -316,7 +356,10 @@ html_engine_table_cell_set_no_wrap (HTMLEngine *e, HTMLTableCell *cell, gboolean
static void table_cell_set_heading (HTMLEngine *e, HTMLTableCell *cell, gboolean heading, HTMLUndoDirection dir);
static void
-table_cell_set_heading_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_cell_set_heading_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableCellSetAttrUndo *data = (HTMLTableCellSetAttrUndo *) undo_data;
@@ -324,7 +367,10 @@ table_cell_set_heading_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTML
}
static void
-table_cell_set_heading (HTMLEngine *e, HTMLTableCell *cell, gboolean heading, HTMLUndoDirection dir)
+table_cell_set_heading (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gboolean heading,
+ HTMLUndoDirection dir)
{
if (cell->heading != heading) {
HTMLTableCellSetAttrUndo *undo;
@@ -345,7 +391,9 @@ table_cell_set_heading (HTMLEngine *e, HTMLTableCell *cell, gboolean heading, HT
}
void
-html_engine_table_cell_set_heading (HTMLEngine *e, HTMLTableCell *cell, gboolean heading)
+html_engine_table_cell_set_heading (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gboolean heading)
{
table_cell_set_heading (e, cell, heading, HTML_UNDO_UNDO);
}
@@ -357,7 +405,10 @@ html_engine_table_cell_set_heading (HTMLEngine *e, HTMLTableCell *cell, gboolean
static void table_cell_set_width (HTMLEngine *e, HTMLTableCell *cell, gint width, gboolean percent, HTMLUndoDirection dir);
static void
-table_cell_set_width_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUndoDirection dir, guint position_after)
+table_cell_set_width_undo_action (HTMLEngine *e,
+ HTMLUndoData *undo_data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLTableCellSetAttrUndo *data = (HTMLTableCellSetAttrUndo *) undo_data;
@@ -366,7 +417,11 @@ table_cell_set_width_undo_action (HTMLEngine *e, HTMLUndoData *undo_data, HTMLUn
}
static void
-table_cell_set_width (HTMLEngine *e, HTMLTableCell *cell, gint width, gboolean percent, HTMLUndoDirection dir)
+table_cell_set_width (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gint width,
+ gboolean percent,
+ HTMLUndoDirection dir)
{
if (cell->percent_width != percent || cell->fixed_width != width) {
HTMLTableCellSetAttrUndo *undo;
@@ -392,7 +447,10 @@ table_cell_set_width (HTMLEngine *e, HTMLTableCell *cell, gint width, gboolean p
}
void
-html_engine_table_cell_set_width (HTMLEngine *e, HTMLTableCell *cell, gint width, gboolean percent)
+html_engine_table_cell_set_width (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gint width,
+ gboolean percent)
{
table_cell_set_width (e, cell, width, percent, HTML_UNDO_UNDO);
}
@@ -431,15 +489,16 @@ struct MoveCellRDUndo {
};
static struct MoveCellRDUndo *
-move_cell_rd_undo_new (gint rspan, gint cspan)
+move_cell_rd_undo_new (gint rspan,
+ gint cspan)
{
struct MoveCellRDUndo *undo;
undo = g_new (struct MoveCellRDUndo, 1);
undo->rspan = rspan;
undo->cspan = cspan;
- undo->moved = g_new0 (struct Move, rspan*cspan);
- undo->removed = g_new0 (HTMLTableCell *, rspan*cspan);
+ undo->moved = g_new0 (struct Move, rspan * cspan);
+ undo->removed = g_new0 (HTMLTableCell *, rspan * cspan);
return undo;
}
@@ -449,7 +508,7 @@ move_cell_rd_undo_free (struct MoveCellRDUndo *undo)
{
gint i;
- for (i = 0; i < undo->rspan*undo->cspan; i++)
+ for (i = 0; i < undo->rspan * undo->cspan; i++)
if (undo->removed[i])
html_object_destroy (HTML_OBJECT (undo->removed[i]));
g_free (undo->removed);
@@ -457,7 +516,10 @@ move_cell_rd_undo_free (struct MoveCellRDUndo *undo)
}
static struct MoveCellRDUndo *
-move_cell_rd (HTMLTable *t, HTMLTableCell *cell, gint rs, gint cs)
+move_cell_rd (HTMLTable *t,
+ HTMLTableCell *cell,
+ gint rs,
+ gint cs)
{
struct MoveCellRDUndo *undo;
gint r, c;
@@ -474,7 +536,7 @@ move_cell_rd (HTMLTable *t, HTMLTableCell *cell, gint rs, gint cs)
/* printf ("exchange: %dx%d <--> %dx%d (%p)\n", rs + r, cs + c, nr, nc, t->cells [rs][nc]); */
t->cells[nr][nc] = t->cells[rs + r][cs + c];
if (t->cells[nr][nc]) {
- struct Move *move = &undo->moved[(r - cell->row)*cell->cspan + c - cell->col];
+ struct Move *move = &undo->moved[(r - cell->row) * cell->cspan + c - cell->col];
html_table_cell_set_position (t->cells[nr][nc], nr, nc);
move->rs = rs + r;
@@ -490,7 +552,7 @@ move_cell_rd (HTMLTable *t, HTMLTableCell *cell, gint rs, gint cs)
/* printf ("move destroy: %dx%d\n", rs + r, cs + c); */
/* html_object_destroy (HTML_OBJECT (t->cells [rs + r][cs + c])); */
/* printf ("removed: %dx%d (%d, %d)\n", rs + r, cs + c, r - cell->row, c - cell->col); */
- undo->removed[(r - cell->row)*cell->cspan + c - cell->col] = t->cells[r][c];
+ undo->removed[(r - cell->row) * cell->cspan + c - cell->col] = t->cells[r][c];
}
t->cells[r][c] = NULL;
}
@@ -530,7 +592,8 @@ expand_undo_destroy (HTMLUndoData *undo_data)
}
static HTMLUndoData *
-expand_undo_data_new (gint span, GSList *slist)
+expand_undo_data_new (gint span,
+ GSList *slist)
{
ExpandSpanUndo *ud = g_new0 (ExpandSpanUndo, 1);
@@ -543,15 +606,16 @@ expand_undo_data_new (gint span, GSList *slist)
}
static void
-move_cell_rd_undo (HTMLTable *table, struct MoveCellRDUndo *undo)
+move_cell_rd_undo (HTMLTable *table,
+ struct MoveCellRDUndo *undo)
{
HTMLTableCell *cell = table->cells[undo->move.rt][undo->move.ct];
gint r, c;
for (r = 0; r < undo->rspan; r++)
for (c = 0; c < undo->cspan; c++)
- if (undo->moved[r*undo->cspan + c].move) {
- struct Move *move = &undo->moved[r*undo->cspan + c];
+ if (undo->moved[r * undo->cspan + c].move) {
+ struct Move *move = &undo->moved[r * undo->cspan + c];
/* printf ("move back: %dx%d --> %dx%d (%d, %d) %p\n", move->rt, move->ct, move->rs, move->cs, r, c, table->cells [move->rt][move->ct]); */
table->cells[move->rs][move->cs] = table->cells[move->rt][move->ct];
@@ -570,7 +634,10 @@ move_cell_rd_undo (HTMLTable *table, struct MoveCellRDUndo *undo)
}
static void
-expand_cspan_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+expand_cspan_undo_action (HTMLEngine *e,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
GSList *slist;
@@ -582,7 +649,11 @@ expand_cspan_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection d
}
static void
-expand_cspan_setup_undo (HTMLEngine *e, GSList *slist, gint cspan, guint position_before, HTMLUndoDirection dir)
+expand_cspan_setup_undo (HTMLEngine *e,
+ GSList *slist,
+ gint cspan,
+ guint position_before,
+ HTMLUndoDirection dir)
{
html_undo_add_action (e->undo, e,
html_undo_action_new ("Expand Column Span", expand_cspan_undo_action,
@@ -592,7 +663,10 @@ expand_cspan_setup_undo (HTMLEngine *e, GSList *slist, gint cspan, guint positio
}
static void
-expand_cspan (HTMLEngine *e, HTMLTableCell *cell, gint cspan, HTMLUndoDirection dir)
+expand_cspan (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gint cspan,
+ HTMLUndoDirection dir)
{
HTMLTable *table = HTML_TABLE (HTML_OBJECT (cell)->parent);
GSList *slist = NULL;
@@ -656,7 +730,10 @@ collapse_undo_data_new (gint span)
}
static void
-collapse_cspan_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+collapse_cspan_undo_action (HTMLEngine *e,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
html_engine_freeze (e);
expand_cspan (e, html_engine_get_table_cell (e), COLLAPSE_UNDO (data)->span, html_undo_direction_reverse (dir));
@@ -664,7 +741,10 @@ collapse_cspan_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection
}
static void
-collapse_cspan_setup_undo (HTMLEngine *e, gint cspan, guint position_before, HTMLUndoDirection dir)
+collapse_cspan_setup_undo (HTMLEngine *e,
+ gint cspan,
+ guint position_before,
+ HTMLUndoDirection dir)
{
html_undo_add_action (e->undo, e,
html_undo_action_new ("Collapse Column Span", collapse_cspan_undo_action,
@@ -674,7 +754,10 @@ collapse_cspan_setup_undo (HTMLEngine *e, gint cspan, guint position_before, HTM
}
static void
-collapse_cspan (HTMLEngine *e, HTMLTableCell *cell, gint cspan, HTMLUndoDirection dir)
+collapse_cspan (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gint cspan,
+ HTMLUndoDirection dir)
{
HTMLTable *table;
guint position_before = e->cursor->position;
@@ -694,7 +777,8 @@ collapse_cspan (HTMLEngine *e, HTMLTableCell *cell, gint cspan, HTMLUndoDirectio
}
void
-html_engine_set_cspan (HTMLEngine *e, gint cspan)
+html_engine_set_cspan (HTMLEngine *e,
+ gint cspan)
{
HTMLTableCell *cell = html_engine_get_table_cell (e);
@@ -713,7 +797,8 @@ html_engine_set_cspan (HTMLEngine *e, gint cspan)
}
static gint
-calc_rspan_max_move (HTMLTableCell *cell, gint rspan)
+calc_rspan_max_move (HTMLTableCell *cell,
+ gint rspan)
{
HTMLTable *table = HTML_TABLE (HTML_OBJECT (cell)->parent);
gint r, c, *move_cols, max_move;
@@ -734,7 +819,10 @@ calc_rspan_max_move (HTMLTableCell *cell, gint rspan)
}
static void
-expand_rspan (HTMLEngine *e, HTMLTableCell *cell, gint rspan, HTMLUndoDirection dir)
+expand_rspan (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gint rspan,
+ HTMLUndoDirection dir)
{
HTMLTable *table = HTML_TABLE (HTML_OBJECT (cell)->parent);
GSList *slist = NULL;
@@ -767,7 +855,10 @@ expand_rspan (HTMLEngine *e, HTMLTableCell *cell, gint rspan, HTMLUndoDirection
}
static void
-collapse_rspan_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+collapse_rspan_undo_action (HTMLEngine *e,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
html_engine_freeze (e);
expand_rspan (e, html_engine_get_table_cell (e), COLLAPSE_UNDO (data)->span, html_undo_direction_reverse (dir));
@@ -775,7 +866,10 @@ collapse_rspan_undo_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection
}
static void
-collapse_rspan_setup_undo (HTMLEngine *e, gint rspan, guint position_before, HTMLUndoDirection dir)
+collapse_rspan_setup_undo (HTMLEngine *e,
+ gint rspan,
+ guint position_before,
+ HTMLUndoDirection dir)
{
html_undo_add_action (e->undo, e,
html_undo_action_new ("Collapse Row Span", collapse_rspan_undo_action,
@@ -785,7 +879,10 @@ collapse_rspan_setup_undo (HTMLEngine *e, gint rspan, guint position_before, HTM
}
static void
-collapse_rspan (HTMLEngine *e, HTMLTableCell *cell, gint rspan, HTMLUndoDirection dir)
+collapse_rspan (HTMLEngine *e,
+ HTMLTableCell *cell,
+ gint rspan,
+ HTMLUndoDirection dir)
{
HTMLTable *table;
guint position_before = e->cursor->position;
@@ -805,7 +902,8 @@ collapse_rspan (HTMLEngine *e, HTMLTableCell *cell, gint rspan, HTMLUndoDirectio
}
void
-html_engine_set_rspan (HTMLEngine *e, gint rspan)
+html_engine_set_rspan (HTMLEngine *e,
+ gint rspan)
{
HTMLTableCell *cell = html_engine_get_table_cell (e);
@@ -824,7 +922,8 @@ html_engine_set_rspan (HTMLEngine *e, gint rspan)
}
gboolean
-html_engine_cspan_delta (HTMLEngine *e, gint delta)
+html_engine_cspan_delta (HTMLEngine *e,
+ gint delta)
{
HTMLTableCell *cell;
@@ -840,7 +939,8 @@ html_engine_cspan_delta (HTMLEngine *e, gint delta)
}
gboolean
-html_engine_rspan_delta (HTMLEngine *e, gint delta)
+html_engine_rspan_delta (HTMLEngine *e,
+ gint delta)
{
HTMLTableCell *cell;
diff --git a/gtkhtml/htmlengine-edit-tablecell.h b/gtkhtml/htmlengine-edit-tablecell.h
index 1fd2d70..3eb581c 100644
--- a/gtkhtml/htmlengine-edit-tablecell.h
+++ b/gtkhtml/htmlengine-edit-tablecell.h
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2001 Ximian, Inc.
- Authors: Radek Doulik
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2001 Ximian, Inc.
+ * Authors: Radek Doulik
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLENGINE_EDIT_TABLE_CELL_H
diff --git a/gtkhtml/htmlengine-edit-text.c b/gtkhtml/htmlengine-edit-text.c
index 34f45ae..68fa0de 100644
--- a/gtkhtml/htmlengine-edit-text.c
+++ b/gtkhtml/htmlengine-edit-text.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -50,7 +50,9 @@ find_first (HTMLEngine *e)
}
static void
-upper_lower (HTMLObject *obj, HTMLEngine *e, gpointer data)
+upper_lower (HTMLObject *obj,
+ HTMLEngine *e,
+ gpointer data)
{
if (html_object_is_text (obj)) {
gboolean up = GPOINTER_TO_INT (data);
@@ -87,7 +89,8 @@ html_engine_capitalize_word (HTMLEngine *e)
}
void
-html_engine_upcase_downcase_word (HTMLEngine *e, gboolean up)
+html_engine_upcase_downcase_word (HTMLEngine *e,
+ gboolean up)
{
if (find_first (e)) {
html_engine_set_mark (e);
@@ -101,7 +104,9 @@ html_engine_upcase_downcase_word (HTMLEngine *e, gboolean up)
}
static void
-set_link (HTMLObject *obj, HTMLEngine *e, gpointer data)
+set_link (HTMLObject *obj,
+ HTMLEngine *e,
+ gpointer data)
{
const gchar *complete_url = data;
@@ -140,7 +145,8 @@ set_link (HTMLObject *obj, HTMLEngine *e, gpointer data)
}
void
-html_engine_set_link (HTMLEngine *e, const gchar *complete_url)
+html_engine_set_link (HTMLEngine *e,
+ const gchar *complete_url)
{
html_engine_cut_and_paste (e,
complete_url ? "Set link" : "Remove link",
diff --git a/gtkhtml/htmlengine-edit-text.h b/gtkhtml/htmlengine-edit-text.h
index c401710..12edfcd 100644
--- a/gtkhtml/htmlengine-edit-text.h
+++ b/gtkhtml/htmlengine-edit-text.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef HTMLENGINE_EDIT_TEXT_H
diff --git a/gtkhtml/htmlengine-edit.c b/gtkhtml/htmlengine-edit.c
index d33fd57..314b64e 100644
--- a/gtkhtml/htmlengine-edit.c
+++ b/gtkhtml/htmlengine-edit.c
@@ -1,26 +1,26 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1999, 2000 Helix Code, Inc.
- Copyright (C) 2001 Ximian, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Authors: Ettore Perazzoli <ettore helixcode com>
- Radek Doulik <rodo ximian com>
+ *
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ * Copyright (C) 2001 Ximian, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Authors: Ettore Perazzoli <ettore helixcode com>
+ * Radek Doulik <rodo ximian com>
*/
@@ -172,7 +172,9 @@ html_engine_selection_pop (HTMLEngine *e)
}
gboolean
-html_engine_selection_stack_top (HTMLEngine *e, gint *cpos, gint *mpos)
+html_engine_selection_stack_top (HTMLEngine *e,
+ gint *cpos,
+ gint *mpos)
{
Selection *selection = e->selection_stack ? e->selection_stack->data : NULL;
@@ -189,7 +191,8 @@ html_engine_selection_stack_top (HTMLEngine *e, gint *cpos, gint *mpos)
}
gboolean
-html_engine_selection_stack_top_modify (HTMLEngine *e, gint delta)
+html_engine_selection_stack_top_modify (HTMLEngine *e,
+ gint delta)
{
Selection *selection = e->selection_stack ? e->selection_stack->data : NULL;
@@ -204,14 +207,18 @@ html_engine_selection_stack_top_modify (HTMLEngine *e, gint delta)
}
static void
-spell_check_object (HTMLObject *o, HTMLEngine *e, gpointer data)
+spell_check_object (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (HTML_OBJECT_TYPE (o) == HTML_TYPE_CLUEFLOW)
html_clueflow_spell_check (HTML_CLUEFLOW (o), e, (HTMLInterval *) data);
}
void
-html_engine_spell_check_range (HTMLEngine *e, HTMLCursor *begin, HTMLCursor *end)
+html_engine_spell_check_range (HTMLEngine *e,
+ HTMLCursor *begin,
+ HTMLCursor *end)
{
HTMLInterval *i;
gboolean cited;
@@ -336,7 +343,9 @@ struct SetData {
};
static void
-set_data (HTMLObject *o, HTMLEngine *e, gpointer p)
+set_data (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer p)
{
struct SetData *data = (struct SetData *) p;
@@ -347,7 +356,10 @@ set_data (HTMLObject *o, HTMLEngine *e, gpointer p)
}
void
-html_engine_set_data_by_type (HTMLEngine *e, HTMLType object_type, const gchar *key, const gchar * value)
+html_engine_set_data_by_type (HTMLEngine *e,
+ HTMLType object_type,
+ const gchar *key,
+ const gchar *value)
{
struct SetData *data = g_new (struct SetData, 1);
@@ -372,7 +384,9 @@ html_engine_clipboard_clear (HTMLEngine *e)
}
HTMLObject *
-html_engine_new_text (HTMLEngine *e, const gchar *text, gint len)
+html_engine_new_text (HTMLEngine *e,
+ const gchar *text,
+ gint len)
{
HTMLObject *to;
@@ -389,7 +403,10 @@ html_engine_new_text (HTMLEngine *e, const gchar *text, gint len)
}
HTMLObject *
-html_engine_new_link (HTMLEngine *e, const gchar *text, gint len, gchar *url)
+html_engine_new_link (HTMLEngine *e,
+ const gchar *text,
+ gint len,
+ gchar *url)
{
HTMLObject *link;
gchar *real_url, *real_target;
@@ -442,7 +459,8 @@ html_engine_get_indent (HTMLEngine *e)
#define LINE_LEN 71
static inline guint
-inc_line_offset (guint line_offset, gunichar uc)
+inc_line_offset (guint line_offset,
+ gunichar uc)
{
return uc == '\t'
? line_offset + 8 - (line_offset % 8)
@@ -450,7 +468,9 @@ inc_line_offset (guint line_offset, gunichar uc)
}
static guint
-try_break_this_line (HTMLEngine *e, guint line_offset, guint last_space)
+try_break_this_line (HTMLEngine *e,
+ guint line_offset,
+ guint last_space)
{
HTMLObject *flow;
gunichar uc;
@@ -730,7 +750,8 @@ html_engine_break_and_fill_line (HTMLEngine *e)
}
gboolean
-html_engine_next_cell (HTMLEngine *e, gboolean create)
+html_engine_next_cell (HTMLEngine *e,
+ gboolean create)
{
HTMLTableCell *cell, *current_cell;
@@ -779,7 +800,8 @@ html_engine_prev_cell (HTMLEngine *e)
}
void
-html_engine_set_title (HTMLEngine *e, const gchar *title)
+html_engine_set_title (HTMLEngine *e,
+ const gchar *title)
{
if (e->title)
g_string_free (e->title, TRUE);
@@ -800,7 +822,8 @@ void html_engine_edit_set_direction (HTMLEngine *e,
}
gint
-html_engine_get_insert_level_for_object (HTMLEngine *e, HTMLObject *o)
+html_engine_get_insert_level_for_object (HTMLEngine *e,
+ HTMLObject *o)
{
gint cursor_level = 3, level = html_object_get_insert_level (o);
diff --git a/gtkhtml/htmlengine-edit.h b/gtkhtml/htmlengine-edit.h
index 8d6505c..69b7894 100644
--- a/gtkhtml/htmlengine-edit.h
+++ b/gtkhtml/htmlengine-edit.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
- Copyright (C) 1999, 2000 Helix Code, Inc.
- Copyright (C) 2001 Ximian, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ * Copyright (C) 2001 Ximian, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLENGINE_EDIT_H
diff --git a/gtkhtml/htmlengine-print.c b/gtkhtml/htmlengine-print.c
index 5c55b46..d2fd369 100644
--- a/gtkhtml/htmlengine-print.c
+++ b/gtkhtml/htmlengine-print.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -36,12 +36,12 @@
static void
print_header_footer (HTMLPainter *painter,
- HTMLEngine *engine,
- gint width,
- gint y,
- gdouble height,
- GtkHTMLPrintCallback callback,
- gpointer user_data)
+ HTMLEngine *engine,
+ gint width,
+ gint y,
+ gdouble height,
+ GtkHTMLPrintCallback callback,
+ gpointer user_data)
{
HTMLPrinter *printer = HTML_PRINTER (painter);
GtkPrintContext *context = printer->context;
@@ -67,16 +67,16 @@ print_header_footer (HTMLPainter *painter,
static void
print_page (HTMLPainter *painter,
- HTMLEngine *engine,
- gint start_y,
- gint page_width,
- gint page_height,
- gint body_height,
- gdouble header_height,
- gdouble footer_height,
- GtkHTMLPrintCallback header_print,
- GtkHTMLPrintCallback footer_print,
- gpointer user_data)
+ HTMLEngine *engine,
+ gint start_y,
+ gint page_width,
+ gint page_height,
+ gint body_height,
+ gdouble header_height,
+ gdouble footer_height,
+ GtkHTMLPrintCallback header_print,
+ GtkHTMLPrintCallback footer_print,
+ gpointer user_data)
{
HTMLPrinter *printer = HTML_PRINTER (painter);
GtkPrintContext *context = printer->context;
@@ -119,13 +119,13 @@ print_page (HTMLPainter *painter,
static gint
print_all_pages (HTMLPainter *painter,
- HTMLEngine *engine,
- gdouble header_height,
- gdouble footer_height,
- GtkHTMLPrintCallback header_print,
- GtkHTMLPrintCallback footer_print,
- gpointer user_data,
- gboolean do_print)
+ HTMLEngine *engine,
+ gdouble header_height,
+ gdouble footer_height,
+ GtkHTMLPrintCallback header_print,
+ GtkHTMLPrintCallback footer_print,
+ gpointer user_data,
+ gboolean do_print)
{
HTMLPrinter *printer = HTML_PRINTER (painter);
gint new_split_offset, split_offset;
@@ -176,13 +176,13 @@ print_all_pages (HTMLPainter *painter,
static gint
print_with_header_footer (HTMLEngine *engine,
- GtkPrintContext *context,
- gdouble header_height,
- gdouble footer_height,
- GtkHTMLPrintCallback header_print,
- GtkHTMLPrintCallback footer_print,
- gpointer user_data,
- gboolean do_print)
+ GtkPrintContext *context,
+ gdouble header_height,
+ gdouble footer_height,
+ GtkHTMLPrintCallback header_print,
+ GtkHTMLPrintCallback footer_print,
+ gpointer user_data,
+ gboolean do_print)
{
HTMLPainter *printer;
HTMLFont *default_font;
@@ -238,12 +238,12 @@ print_with_header_footer (HTMLEngine *engine,
void
html_engine_print (HTMLEngine *engine,
- GtkPrintContext *context,
- gdouble header_height,
- gdouble footer_height,
- GtkHTMLPrintCallback header_print,
- GtkHTMLPrintCallback footer_print,
- gpointer user_data)
+ GtkPrintContext *context,
+ gdouble header_height,
+ gdouble footer_height,
+ GtkHTMLPrintCallback header_print,
+ GtkHTMLPrintCallback footer_print,
+ gpointer user_data)
{
print_with_header_footer (
engine, context, header_height, footer_height,
@@ -252,9 +252,9 @@ html_engine_print (HTMLEngine *engine,
gint
html_engine_print_get_pages_num (HTMLEngine *engine,
- GtkPrintContext *context,
- gdouble header_height,
- gdouble footer_height)
+ GtkPrintContext *context,
+ gdouble header_height,
+ gdouble footer_height)
{
return print_with_header_footer (
engine, context, header_height, footer_height,
@@ -262,7 +262,8 @@ html_engine_print_get_pages_num (HTMLEngine *engine,
}
void
-html_engine_print_set_min_split_index (HTMLEngine *engine, gdouble index)
+html_engine_print_set_min_split_index (HTMLEngine *engine,
+ gdouble index)
{
engine->min_split_index = index;
}
@@ -476,14 +477,14 @@ engine_print_end_print (GtkPrintOperation *operation,
GtkPrintOperationResult
html_engine_print_operation_run (HTMLEngine *engine,
GtkPrintOperation *operation,
- GtkPrintOperationAction action,
- GtkWindow *parent,
- GtkHTMLPrintCalcHeight calc_header_height,
- GtkHTMLPrintCalcHeight calc_footer_height,
+ GtkPrintOperationAction action,
+ GtkWindow *parent,
+ GtkHTMLPrintCalcHeight calc_header_height,
+ GtkHTMLPrintCalcHeight calc_footer_height,
GtkHTMLPrintDrawFunc draw_header,
GtkHTMLPrintDrawFunc draw_footer,
gpointer user_data,
- GError **error)
+ GError **error)
{
EnginePrintData data;
diff --git a/gtkhtml/htmlengine-print.h b/gtkhtml/htmlengine-print.h
index bb529c3..cbfed71 100644
--- a/gtkhtml/htmlengine-print.h
+++ b/gtkhtml/htmlengine-print.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLENGINE_PRINT_H
diff --git a/gtkhtml/htmlengine-save.c b/gtkhtml/htmlengine-save.c
index 7ee37c6..8886110 100644
--- a/gtkhtml/htmlengine-save.c
+++ b/gtkhtml/htmlengine-save.c
@@ -1,27 +1,27 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1998 World Wide Web Consortium
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Ettore Perazzoli <ettore helixcode com>
- `encode_entities ()' adapted from gnome-xml by Daniel Veillard
- <Daniel Veillard w3 org>.
+ *
+ * Copyright (C) 1998 World Wide Web Consortium
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Ettore Perazzoli <ettore helixcode com>
+ * `encode_entities ()' adapted from gnome-xml by Daniel Veillard
+ * <Daniel Veillard w3 org>.
*/
#include <string.h>
@@ -39,9 +39,11 @@
/* This routine was originally written by Daniel Velliard, (C) 1998 World Wide
- Web Consortium. */
+ * Web Consortium. */
gchar *
-html_encode_entities (const gchar *input, guint len, guint *encoded_len_return)
+html_encode_entities (const gchar *input,
+ guint len,
+ guint *encoded_len_return)
{
gunichar uc;
const gchar *p;
@@ -127,8 +129,8 @@ html_encode_entities (const gchar *input, guint len, guint *encoded_len_return)
gboolean
html_engine_save_encode (HTMLEngineSaveState *state,
- const gchar *buffer,
- guint length)
+ const gchar *buffer,
+ guint length)
{
gchar *encoded_buffer;
guint encoded_length;
@@ -149,7 +151,7 @@ html_engine_save_encode (HTMLEngineSaveState *state,
gboolean
html_engine_save_encode_string (HTMLEngineSaveState *state,
- const gchar *s)
+ const gchar *s)
{
guint len;
@@ -163,8 +165,8 @@ html_engine_save_encode_string (HTMLEngineSaveState *state,
gboolean
html_engine_save_output_stringv (HTMLEngineSaveState *state,
- const gchar *format,
- va_list ap)
+ const gchar *format,
+ va_list ap)
{
gchar *string;
gboolean retval;
@@ -178,8 +180,8 @@ html_engine_save_output_stringv (HTMLEngineSaveState *state,
gboolean
html_engine_save_output_string (HTMLEngineSaveState *state,
- const gchar *format,
- ...)
+ const gchar *format,
+ ...)
{
va_list args;
gboolean retval;
@@ -195,7 +197,9 @@ html_engine_save_output_string (HTMLEngineSaveState *state,
}
gboolean
-html_engine_save_output_buffer (HTMLEngineSaveState *state, const gchar *buffer, gint bytes)
+html_engine_save_output_buffer (HTMLEngineSaveState *state,
+ const gchar *buffer,
+ gint bytes)
{
if (bytes == -1)
bytes = strlen (buffer);
@@ -204,8 +208,8 @@ html_engine_save_output_buffer (HTMLEngineSaveState *state, const gchar *buffer,
gboolean
html_engine_save_delims_and_vals (HTMLEngineSaveState *state,
- const gchar *first,
- ...)
+ const gchar *first,
+ ...)
{
va_list args;
gboolean retval;
@@ -227,7 +231,8 @@ html_engine_save_delims_and_vals (HTMLEngineSaveState *state,
static gchar *
-color_to_string (const gchar *s, HTMLColor *c)
+color_to_string (const gchar *s,
+ HTMLColor *c)
{
gchar color[20];
@@ -334,8 +339,8 @@ write_end (HTMLEngineSaveState *state)
gboolean
html_engine_save (HTMLEngine *engine,
- HTMLEngineSaveReceiverFn receiver,
- gpointer user_data)
+ HTMLEngineSaveReceiverFn receiver,
+ gpointer user_data)
{
HTMLEngineSaveState state;
@@ -369,8 +374,8 @@ html_engine_save (HTMLEngine *engine,
gboolean
html_engine_save_plain (HTMLEngine *engine,
- HTMLEngineSaveReceiverFn receiver,
- gpointer user_data)
+ HTMLEngineSaveReceiverFn receiver,
+ gpointer user_data)
{
HTMLEngineSaveState state;
@@ -399,9 +404,9 @@ html_engine_save_plain (HTMLEngine *engine,
static gboolean
html_engine_save_buffer_receiver (const HTMLEngine *engine,
- const gchar *data,
- guint len,
- gpointer user_data)
+ const gchar *data,
+ guint len,
+ gpointer user_data)
{
g_string_append ((GString *) user_data, (gchar *) data);
@@ -409,7 +414,8 @@ html_engine_save_buffer_receiver (const HTMLEngine *engine,
}
gchar *
-html_engine_save_buffer_free (HTMLEngineSaveState *state, gboolean free_string)
+html_engine_save_buffer_free (HTMLEngineSaveState *state,
+ gboolean free_string)
{
GString *string;
gchar *rv = NULL;
@@ -449,7 +455,8 @@ html_engine_save_buffer_peek_text_bytes (HTMLEngineSaveState *state)
}
HTMLEngineSaveState *
-html_engine_save_buffer_new (HTMLEngine *engine, gboolean inline_frames)
+html_engine_save_buffer_new (HTMLEngine *engine,
+ gboolean inline_frames)
{
HTMLEngineSaveState *state = g_new0 (HTMLEngineSaveState, 1);
@@ -468,7 +475,7 @@ html_engine_save_buffer_new (HTMLEngine *engine, gboolean inline_frames)
gchar *
html_engine_save_get_sample_body (HTMLEngine *e,
- HTMLObject *o)
+ HTMLObject *o)
{
return get_body (e);
}
@@ -525,7 +532,9 @@ html_engine_save_get_paragraph_align (GtkHTMLParagraphAlignment align)
}
gint
-html_engine_save_string_append_nonbsp (GString *out, const guchar *s, guint length)
+html_engine_save_string_append_nonbsp (GString *out,
+ const guchar *s,
+ guint length)
{
guint len = length;
diff --git a/gtkhtml/htmlengine-save.h b/gtkhtml/htmlengine-save.h
index 69b998d..c775fec 100644
--- a/gtkhtml/htmlengine-save.h
+++ b/gtkhtml/htmlengine-save.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Ettore Perazzoli <ettore helixcode com>
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Ettore Perazzoli <ettore helixcode com>
*/
#ifndef _HTMLENGINE_SAVE_H
@@ -45,7 +45,7 @@ struct _HTMLEngineSaveState {
/* Entity encoding. This is used by the HTML objects to output stuff through
- entity-based encoding. */
+ * entity-based encoding. */
gboolean html_engine_save_encode (HTMLEngineSaveState *state,
const gchar *buffer,
guint length);
@@ -53,7 +53,7 @@ gboolean html_engine_save_encode_string (HTMLEngineSaveS
const gchar *s);
/* Output function (no encoding). This is used for tags and other things that
- must not be entity-encoded. */
+ * must not be entity-encoded. */
gboolean html_engine_save_output_stringv (HTMLEngineSaveState *state,
const gchar *format,
va_list ap);
@@ -65,11 +65,11 @@ gboolean html_engine_save_output_buffer (HTMLEngineSaveS
gint len);
/* Takes a string sequence of the form (delim, (val, delim)*, NULL)
- and outputs the delimiters verbatim and the values entity-encoded.
- Useful for writing properly-encoded tags with attributes.
-
- Example: html_engine_save_delims_and_vals (state, "<TAG ATTR1=\"", attr1, "\" ATTR2=\"", attr2, "\">", NULL);
- */
+ * and outputs the delimiters verbatim and the values entity-encoded.
+ * Useful for writing properly-encoded tags with attributes.
+ *
+ * Example: html_engine_save_delims_and_vals (state, "<TAG ATTR1=\"", attr1, "\" ATTR2=\"", attr2, "\">", NULL);
+ * */
gboolean html_engine_save_delims_and_vals (HTMLEngineSaveState *state,
const gchar *first,
...);
diff --git a/gtkhtml/htmlengine-search.c b/gtkhtml/htmlengine-search.c
index ed9421b..7f02e71 100644
--- a/gtkhtml/htmlengine-search.c
+++ b/gtkhtml/htmlengine-search.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -38,7 +38,9 @@ get_root_engine (HTMLEngine *e)
}
static void
-add_iframe_off (HTMLEngine *e, gint *x, gint *y)
+add_iframe_off (HTMLEngine *e,
+ gint *x,
+ gint *y)
{
g_assert (e);
g_assert (e->widget);
@@ -76,7 +78,7 @@ move_to_found (HTMLSearch *info)
while (first->next && HTML_OBJECT_TYPE (first->next) == HTML_TYPE_TEXTSLAVE) {
first = first->next;
slave = HTML_TEXT_SLAVE (first);
- if (slave->posStart+slave->posLen >= info->start_pos) {
+ if (slave->posStart + slave->posLen >= info->start_pos) {
html_object_calc_abs_position (HTML_OBJECT (slave), &x, &y);
add_iframe_off (e, &x, &y);
break;
@@ -89,7 +91,7 @@ move_to_found (HTMLSearch *info)
while (last->next && HTML_OBJECT_TYPE (last->next) == HTML_TYPE_TEXTSLAVE) {
last = last->next;
slave = HTML_TEXT_SLAVE (last);
- if (slave->posStart+slave->posLen >= info->start_pos) {
+ if (slave->posStart + slave->posLen >= info->start_pos) {
html_object_calc_abs_position (HTML_OBJECT (slave), &ex, &ey);
add_iframe_off (e, &ex, &ey);
break;
@@ -147,8 +149,11 @@ display_search_results (HTMLSearch *info)
}
gboolean
-html_engine_search (HTMLEngine *e, const gchar *text,
- gboolean case_sensitive, gboolean forward, gboolean regular)
+html_engine_search (HTMLEngine *e,
+ const gchar *text,
+ gboolean case_sensitive,
+ gboolean forward,
+ gboolean regular)
{
HTMLSearch *info;
HTMLObject *p;
@@ -170,7 +175,8 @@ html_engine_search (HTMLEngine *e, const gchar *text,
}
void
-html_engine_search_set_forward (HTMLEngine *e, gboolean forward)
+html_engine_search_set_forward (HTMLEngine *e,
+ gboolean forward)
{
html_search_set_forward (e->search_info, forward);
}
@@ -222,7 +228,9 @@ html_engine_search_next (HTMLEngine *e)
}
gboolean
-html_engine_search_incremental (HTMLEngine *e, const gchar *text, gboolean forward)
+html_engine_search_incremental (HTMLEngine *e,
+ const gchar *text,
+ gboolean forward)
{
HTMLSearch *info = e->search_info;
diff --git a/gtkhtml/htmlengine-search.h b/gtkhtml/htmlengine-search.h
index 1f84e13..d117156 100644
--- a/gtkhtml/htmlengine-search.h
+++ b/gtkhtml/htmlengine-search.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include "htmlengine.h"
diff --git a/gtkhtml/htmlengine.c b/gtkhtml/htmlengine.c
index 35e4df2..c23c0f1 100644
--- a/gtkhtml/htmlengine.c
+++ b/gtkhtml/htmlengine.c
@@ -1,30 +1,30 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999 Anders Carlsson (andersca gnu org)
- Copyright (C) 1999, 2000, Helix Code, Inc.
- Copyright (C) 2001, 2002, 2003 Ximian Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999 Anders Carlsson (andersca gnu org)
+ * Copyright (C) 1999, 2000, Helix Code, Inc.
+ * Copyright (C) 2001, 2002, 2003 Ximian Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/* RULE: You should never create a new flow without inserting anything in it.
- If `e->flow' is not NULL, it must contain something. */
+ * If `e->flow' is not NULL, it must contain something. */
#include <config.h>
#include "gtkhtml-compat.h"
@@ -248,7 +248,8 @@ parse_element_name (const gchar *str)
}
static HTMLElement *
-html_element_new (HTMLEngine *e, const gchar *name)
+html_element_new (HTMLEngine *e,
+ const gchar *name)
{
HTMLElement *element;
@@ -259,7 +260,9 @@ html_element_new (HTMLEngine *e, const gchar *name)
}
static HTMLElement *
-html_element_new_parse (HTMLEngine *e, const gchar *str) {
+html_element_new_parse (HTMLEngine *e,
+ const gchar *str)
+{
HTMLElement *element;
gchar *name;
@@ -312,7 +315,9 @@ html_element_new_parse (HTMLEngine *e, const gchar *str) {
#define html_element_has_attr(node, key) g_hash_table_lookup_extended (node->attributes, key, NULL, NULL)
#else
gboolean
-html_element_get_attr (HTMLElement *node, gchar *name, gchar **value)
+html_element_get_attr (HTMLElement *node,
+ gchar *name,
+ gchar **value)
{
gchar *orig_key;
@@ -330,7 +335,7 @@ html_element_parse_i18n (HTMLElement *node)
/*
<!ENTITY % i18n
"lang %LanguageCode; #IMPLIED -- language code --
- dir (ltr|rtl) #IMPLIED -- direction for weak/neutral text --"
+ dir (ltr | rtl) #IMPLIED -- direction for weak / neutral text --"
>
*/
@@ -351,8 +356,8 @@ html_element_parse_coreattrs (HTMLElement *node)
/*
<!ENTITY % coreattrs
- "id ID #IMPLIED -- document-wide unique id --
- class CDATA #IMPLIED -- space-separated list of classes --
+ "id ID #IMPLIED -- document - wide unique id --
+ class CDATA #IMPLIED -- space - separated list of classes --
style %StyleSheet; #IMPLIED -- associated style info --
title %Text; #IMPLIED -- advisory title --"
>
@@ -363,7 +368,9 @@ html_element_parse_coreattrs (HTMLElement *node)
}
static void
-html_element_set_coreattr_to_object (HTMLElement *element, HTMLObject *o, HTMLEngine *engine)
+html_element_set_coreattr_to_object (HTMLElement *element,
+ HTMLObject *o,
+ HTMLEngine *engine)
{
gchar *value;
@@ -378,18 +385,18 @@ static void
html_element_parse_events (HTMLElement *node)
{
/*
- <!ENTITY % events
- "onclick %Script; #IMPLIED -- a pointer button was clicked --
- ondblclick %Script; #IMPLIED -- a pointer button was double clicked--
- onmousedown %Script; #IMPLIED -- a pointer button was pressed down --
- onmouseup %Script; #IMPLIED -- a pointer button was released --
- onmouseover %Script; #IMPLIED -- a pointer was moved onto --
- onmousemove %Script; #IMPLIED -- a pointer was moved within --
- onmouseout %Script; #IMPLIED -- a pointer was moved away --
- onkeypress %Script; #IMPLIED -- a key was pressed and released --
- onkeydown %Script; #IMPLIED -- a key was pressed down --
- onkeyup %Script; #IMPLIED -- a key was released --"
- >
+ * <!ENTITY % events
+ * "onclick %Script; #IMPLIED -- a pointer button was clicked --
+ * ondblclick %Script; #IMPLIED -- a pointer button was double clicked--
+ * onmousedown %Script; #IMPLIED -- a pointer button was pressed down --
+ * onmouseup %Script; #IMPLIED -- a pointer button was released --
+ * onmouseover %Script; #IMPLIED -- a pointer was moved onto --
+ * onmousemove %Script; #IMPLIED -- a pointer was moved within --
+ * onmouseout %Script; #IMPLIED -- a pointer was moved away --
+ * onkeypress %Script; #IMPLIED -- a key was pressed and released --
+ * onkeydown %Script; #IMPLIED -- a key was pressed down --
+ * onkeyup %Script; #IMPLIED -- a key was released --"
+ * >
*/
}
#endif
@@ -405,7 +412,10 @@ html_element_free (HTMLElement *element)
}
static void
-push_element (HTMLEngine *e, const gchar *name, const gchar *class, HTMLStyle *style)
+push_element (HTMLEngine *e,
+ const gchar *name,
+ const gchar *class,
+ HTMLStyle *style)
{
HTMLElement *element;
@@ -419,7 +429,8 @@ push_element (HTMLEngine *e, const gchar *name, const gchar *class, HTMLStyle *s
#define DI(x)
static HTMLColor *
-current_color (HTMLEngine *e) {
+current_color (HTMLEngine *e)
+{
HTMLElement *span;
GList *item;
@@ -439,7 +450,8 @@ current_color (HTMLEngine *e) {
}
static GdkColor *
-current_bg_color (HTMLEngine *e) {
+current_bg_color (HTMLEngine *e)
+{
HTMLElement *span;
GList *item;
@@ -664,7 +676,8 @@ parse_scroll (const gchar *token)
}
static HTMLHAlignType
-parse_halign (const gchar *token, HTMLHAlignType default_val)
+parse_halign (const gchar *token,
+ HTMLHAlignType default_val)
{
if (g_ascii_strcasecmp (token, "right") == 0)
return HTML_HALIGN_RIGHT;
@@ -695,7 +708,7 @@ current_clueflow_style (HTMLEngine *e)
static void
push_clueflow_style (HTMLEngine *e,
- HTMLClueFlowStyle style)
+ HTMLClueFlowStyle style)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -719,7 +732,10 @@ static void finish_flow (HTMLEngine *e, HTMLObject *clue);
static void pop_element (HTMLEngine *e, const gchar *name);
static HTMLObject *
-text_new (HTMLEngine *e, const gchar *text, GtkHTMLFontStyle style, HTMLColor *color)
+text_new (HTMLEngine *e,
+ const gchar *text,
+ GtkHTMLFontStyle style,
+ HTMLColor *color)
{
HTMLObject *o;
@@ -730,7 +746,11 @@ text_new (HTMLEngine *e, const gchar *text, GtkHTMLFontStyle style, HTMLColor *c
}
static HTMLObject *
-flow_new (HTMLEngine *e, HTMLClueFlowStyle style, HTMLListType item_type, gint item_number, HTMLClearType clear)
+flow_new (HTMLEngine *e,
+ HTMLClueFlowStyle style,
+ HTMLListType item_type,
+ gint item_number,
+ HTMLClearType clear)
{
HTMLObject *o;
GByteArray *levels;
@@ -769,9 +789,9 @@ create_empty_text (HTMLEngine *e)
static void
add_line_break (HTMLEngine *e,
- HTMLObject *clue,
- HTMLClearType clear,
- HTMLDirection dir)
+ HTMLObject *clue,
+ HTMLClearType clear,
+ HTMLDirection dir)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -781,7 +801,9 @@ add_line_break (HTMLEngine *e,
}
static void
-finish_flow (HTMLEngine *e, HTMLObject *clue) {
+finish_flow (HTMLEngine *e,
+ HTMLObject *clue)
+{
g_return_if_fail (HTML_IS_ENGINE (e));
if (e->flow && HTML_CLUE (e->flow)->tail == NULL) {
@@ -793,7 +815,8 @@ finish_flow (HTMLEngine *e, HTMLObject *clue) {
}
static void
-close_flow (HTMLEngine *e, HTMLObject *clue)
+close_flow (HTMLEngine *e,
+ HTMLObject *clue)
{
HTMLObject *last;
@@ -817,7 +840,8 @@ close_flow (HTMLEngine *e, HTMLObject *clue)
}
static void
-update_flow_align (HTMLEngine *e, HTMLObject *clue)
+update_flow_align (HTMLEngine *e,
+ HTMLObject *clue)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -830,7 +854,11 @@ update_flow_align (HTMLEngine *e, HTMLObject *clue)
}
static void
-new_flow (HTMLEngine *e, HTMLObject *clue, HTMLObject *first_object, HTMLClearType clear, HTMLDirection dir)
+new_flow (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLObject *first_object,
+ HTMLClearType clear,
+ HTMLDirection dir)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -851,8 +879,8 @@ new_flow (HTMLEngine *e, HTMLObject *clue, HTMLObject *first_object, HTMLClearTy
static void
append_element (HTMLEngine *e,
- HTMLObject *clue,
- HTMLObject *obj)
+ HTMLObject *clue,
+ HTMLObject *obj)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -865,7 +893,13 @@ append_element (HTMLEngine *e,
}
static void
-apply_attributes (HTMLText *text, HTMLEngine *e, GtkHTMLFontStyle style, HTMLColor *color, GdkColor *bg_color, gint last_pos, gboolean link)
+apply_attributes (HTMLText *text,
+ HTMLEngine *e,
+ GtkHTMLFontStyle style,
+ HTMLColor *color,
+ GdkColor *bg_color,
+ gint last_pos,
+ gboolean link)
{
PangoAttribute *attr;
@@ -889,8 +923,8 @@ apply_attributes (HTMLText *text, HTMLEngine *e, GtkHTMLFontStyle style, HTMLCol
static void
insert_text (HTMLEngine *e,
- HTMLObject *clue,
- const gchar *text)
+ HTMLObject *clue,
+ const gchar *text)
{
GtkHTMLFontStyle font_style;
HTMLObject *prev;
@@ -967,7 +1001,9 @@ static void pop_element_by_type (HTMLEngine *e, HTMLDisplayType display);
/* Block stack. */
static void
-html_element_push (HTMLElement *node, HTMLEngine *e, HTMLObject *clue)
+html_element_push (HTMLElement *node,
+ HTMLEngine *e,
+ HTMLObject *clue)
{
HTMLObject *block_clue;
@@ -1012,12 +1048,12 @@ html_element_push (HTMLElement *node, HTMLEngine *e, HTMLObject *clue)
static void
push_block_element (HTMLEngine *e,
- const gchar *name,
- HTMLStyle *style,
- HTMLDisplayType level,
- BlockFunc exitFunc,
- gint miscData1,
- gint miscData2)
+ const gchar *name,
+ HTMLStyle *style,
+ HTMLDisplayType level,
+ BlockFunc exitFunc,
+ gint miscData1,
+ gint miscData2)
{
HTMLElement *element = html_element_new (e, name);
@@ -1036,17 +1072,18 @@ push_block_element (HTMLEngine *e,
static void
push_block (HTMLEngine *e,
- const gchar *name,
- gint level,
- BlockFunc exitFunc,
- gint miscData1,
- gint miscData2)
+ const gchar *name,
+ gint level,
+ BlockFunc exitFunc,
+ gint miscData1,
+ gint miscData2)
{
push_block_element (e, name, NULL, level, exitFunc, miscData1, miscData2);
}
static GList *
-remove_element (HTMLEngine *e, GList *item)
+remove_element (HTMLEngine *e,
+ GList *item)
{
HTMLElement *elem = item->data;
GList *next = item->next;
@@ -1066,7 +1103,8 @@ remove_element (HTMLEngine *e, GList *item)
}
static void
-pop_block (HTMLEngine *e, HTMLElement *elem)
+pop_block (HTMLEngine *e,
+ HTMLElement *elem)
{
GList *l;
@@ -1088,7 +1126,8 @@ pop_block (HTMLEngine *e, HTMLElement *elem)
}
static void
-pop_inline (HTMLEngine *e, HTMLElement *elem)
+pop_inline (HTMLEngine *e,
+ HTMLElement *elem)
{
GList *l;
@@ -1111,7 +1150,8 @@ pop_inline (HTMLEngine *e, HTMLElement *elem)
}
static void
-pop_element_by_type (HTMLEngine *e, HTMLDisplayType display)
+pop_element_by_type (HTMLEngine *e,
+ HTMLDisplayType display)
{
HTMLElement *elem = NULL;
GList *l;
@@ -1152,7 +1192,8 @@ pop_element_by_type (HTMLEngine *e, HTMLDisplayType display)
}
static void
-pop_element (HTMLEngine *e, const gchar *name)
+pop_element (HTMLEngine *e,
+ const gchar *name)
{
HTMLElement *elem = NULL;
GList *l;
@@ -1189,7 +1230,9 @@ pop_element (HTMLEngine *e, const gchar *name)
/* The following are callbacks that are called at the end of a block. */
static void
-block_end_display_block (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_display_block (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
if (html_clue_is_empty (HTML_CLUE (clue)))
new_flow (e, clue, create_empty_text (e), HTML_CLEAR_NONE, HTML_DIRECTION_DERIVED);
@@ -1198,7 +1241,9 @@ block_end_display_block (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-block_end_p (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_p (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1212,7 +1257,9 @@ block_end_p (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-block_end_map (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_map (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1220,7 +1267,9 @@ block_end_map (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-block_end_option (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_option (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1231,7 +1280,9 @@ block_end_option (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-block_end_select (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_select (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1244,7 +1295,9 @@ block_end_select (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-block_end_textarea (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_textarea (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1274,7 +1327,8 @@ push_clue_style (HTMLEngine *e)
}
static void
-push_clue (HTMLEngine *e, HTMLObject *clue)
+push_clue (HTMLEngine *e,
+ HTMLObject *clue)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1315,7 +1369,9 @@ pop_clue (HTMLEngine *e)
}
static void
-block_end_cell (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_cell (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
if (html_clue_is_empty (HTML_CLUE (clue)))
new_flow (e, clue, create_empty_text (e), HTML_CLEAR_NONE, HTML_DIRECTION_DERIVED);
@@ -1326,7 +1382,9 @@ block_end_cell (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
/* docment section parsers */
static void
-block_end_title (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_title (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1340,7 +1398,9 @@ block_end_title (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-element_parse_title (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_title (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1353,7 +1413,9 @@ element_parse_title (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-parse_text (HTMLEngine *e, HTMLObject *clue, gchar *str)
+parse_text (HTMLEngine *e,
+ HTMLObject *clue,
+ gchar *str)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1367,7 +1429,8 @@ parse_text (HTMLEngine *e, HTMLObject *clue, gchar *str)
}
static gchar *
-new_parse_body (HTMLEngine *e, const gchar *end[])
+new_parse_body (HTMLEngine *e,
+ const gchar *end[])
{
HTMLObject *clue = NULL;
gchar *rv = NULL;
@@ -1440,7 +1503,8 @@ new_parse_body (HTMLEngine *e, const gchar *end[])
}
static gboolean
-discard_body (HTMLEngine *p, const gchar *end[])
+discard_body (HTMLEngine *p,
+ const gchar *end[])
{
gchar *str = NULL;
@@ -1454,7 +1518,7 @@ discard_body (HTMLEngine *p, const gchar *end[])
continue;
}
- if ((*str == ' ' && *(str+1) == '\0')
+ if ((*str == ' ' && *(str + 1) == '\0')
|| (*str != TAG_ESCAPE)) {
/* do nothing */
}
@@ -1489,7 +1553,9 @@ is_leading_space (guchar *str)
}
static void
-element_parse_param (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_param (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
GtkHTMLEmbedded *eb;
HTMLElement *element;
@@ -1513,7 +1579,8 @@ element_parse_param (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static gboolean
-parse_object_params (HTMLEngine *p, HTMLObject *clue)
+parse_object_params (HTMLEngine *p,
+ HTMLObject *clue)
{
gchar *str;
@@ -1553,7 +1620,9 @@ parse_object_params (HTMLEngine *p, HTMLObject *clue)
}
static void
-block_end_object (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_object (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1564,7 +1633,9 @@ block_end_object (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-element_parse_object (HTMLEngine *e, HTMLObject *clue, const gchar *attr)
+element_parse_object (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *attr)
{
gchar *classid = NULL;
gchar *name = NULL;
@@ -1581,7 +1652,7 @@ element_parse_object (HTMLEngine *e, HTMLObject *clue, const gchar *attr)
g_return_if_fail (HTML_IS_ENGINE (e));
/* this might have to do something different for form object
- elements - check the spec MPZ */
+ * elements - check the spec MPZ */
element = html_element_new_parse (e, attr);
@@ -1654,7 +1725,9 @@ element_parse_object (HTMLEngine *e, HTMLObject *clue, const gchar *attr)
/* Frame parsers */
static void
-element_parse_noframe (HTMLEngine *e, HTMLObject *clue, const gchar *str )
+element_parse_noframe (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
static const gchar *end[] = {"</noframe", NULL};
@@ -1665,7 +1738,9 @@ element_parse_noframe (HTMLEngine *e, HTMLObject *clue, const gchar *str )
}
static void
-block_end_frameset (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_frameset (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1674,7 +1749,9 @@ block_end_frameset (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-element_parse_frameset (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_frameset (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
HTMLObject *frame;
@@ -1719,7 +1796,9 @@ element_parse_frameset (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_iframe (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_iframe (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
gchar *value = NULL;
@@ -1809,7 +1888,9 @@ element_parse_iframe (HTMLEngine *e, HTMLObject *clue, const gchar *str)
static void
-element_parse_area (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_area (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLShape *shape;
gchar *type = NULL;
@@ -1852,7 +1933,9 @@ element_parse_area (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-block_end_anchor (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_anchor (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1866,7 +1949,9 @@ block_end_anchor (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-element_parse_a (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_a (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
gchar *url = NULL;
@@ -1928,15 +2013,17 @@ element_parse_a (HTMLEngine *e, HTMLObject *clue, const gchar *str)
/* block parsing */
static void
block_end_clueflow_style (HTMLEngine *e,
- HTMLObject *clue,
- HTMLElement *elem)
+ HTMLObject *clue,
+ HTMLElement *elem)
{
finish_flow (e, clue);
pop_clueflow_style (e);
}
static void
-element_parse_address (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_address (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLStyle *style = NULL;
@@ -1952,7 +2039,9 @@ element_parse_address (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-block_end_pre (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_pre (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1964,7 +2053,9 @@ block_end_pre (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-element_parse_pre (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_pre (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -1978,7 +2069,9 @@ element_parse_pre (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_center (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_center (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
@@ -1994,7 +2087,9 @@ element_parse_center (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_html (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_html (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
gchar *value;
@@ -2016,7 +2111,9 @@ element_parse_html (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_div (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_div (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
gchar *value;
@@ -2035,7 +2132,9 @@ element_parse_div (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_p (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_p (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -2093,7 +2192,9 @@ element_parse_p (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_br (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_br (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLClearType clear;
HTMLDirection dir = HTML_DIRECTION_DERIVED;
@@ -2133,7 +2234,9 @@ element_parse_br (HTMLEngine *e, HTMLObject *clue, const gchar *str)
static void
-element_parse_body (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_body (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
GdkColor color;
@@ -2207,7 +2310,9 @@ element_parse_body (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_base (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_base (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -2224,7 +2329,9 @@ element_parse_base (HTMLEngine *e, HTMLObject *clue, const gchar *str)
static void
-element_parse_data (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_data (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
gchar *key = NULL;
gchar *class_name = NULL;
@@ -2275,7 +2382,9 @@ form_begin (HTMLEngine *e,
}
static void
-block_end_form (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_form (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -2287,7 +2396,9 @@ block_end_form (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-element_parse_input (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_input (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
enum InputType { CheckBox, Hidden, Radio, Reset, Submit, Text, Image,
Button, Password, Undefined };
@@ -2420,7 +2531,9 @@ element_parse_input (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_form (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_form (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
gchar *action = NULL;
const gchar *method = "GET";
@@ -2450,7 +2563,9 @@ element_parse_form (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_frame (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_frame (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
gchar *value = NULL;
@@ -2519,7 +2634,9 @@ element_parse_frame (HTMLEngine *e, HTMLObject *clue, const gchar *str)
static void
-element_parse_hr (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_hr (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
gint size = 2;
@@ -2572,8 +2689,8 @@ element_parse_hr (HTMLEngine *e, HTMLObject *clue, const gchar *str)
static void
block_end_heading (HTMLEngine *e,
- HTMLObject *clue,
- HTMLElement *elem)
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -2583,7 +2700,9 @@ block_end_heading (HTMLEngine *e,
}
static void
-element_end_heading (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_end_heading (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
pop_element (e, "h1");
pop_element (e, "h2");
@@ -2594,7 +2713,9 @@ element_end_heading (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_heading (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_heading (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLClueFlowStyle fstyle;
HTMLStyle *style = NULL;
@@ -2654,7 +2775,9 @@ element_parse_heading (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_img (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_img (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
HTMLObject *image = 0;
@@ -2779,21 +2902,23 @@ element_parse_img (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
void
-html_engine_set_engine_type ( HTMLEngine *e, gboolean engine_type)
+html_engine_set_engine_type (HTMLEngine *e,
+ gboolean engine_type)
{
g_return_if_fail (HTML_IS_ENGINE (e));
html_tokenizer_set_engine_type (e->ht, engine_type);
}
gboolean
-html_engine_get_engine_type ( HTMLEngine *e)
+html_engine_get_engine_type (HTMLEngine *e)
{
g_return_val_if_fail (HTML_IS_ENGINE (e), FALSE);
return html_tokenizer_get_engine_type (e->ht);
}
void
-html_engine_set_content_type (HTMLEngine *e, const gchar * content_type)
+html_engine_set_content_type (HTMLEngine *e,
+ const gchar *content_type)
{
g_return_if_fail (HTML_IS_ENGINE (e));
html_tokenizer_change_content_type (e->ht, content_type);
@@ -2807,7 +2932,9 @@ html_engine_get_content_type (HTMLEngine *e)
}
static void
-element_parse_meta (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_meta (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
gint refresh = 0;
gint contenttype = 0;
@@ -2854,7 +2981,9 @@ element_parse_meta (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_map (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_map (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -2901,13 +3030,17 @@ get_list_type (const gchar *value)
}
static void
-block_end_item (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_item (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
finish_flow (e, clue);
}
static void
-element_parse_li (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_li (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLListType listType;
gint itemNumber;
@@ -2957,7 +3090,9 @@ element_parse_li (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-block_end_list (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_list (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -2969,7 +3104,9 @@ block_end_list (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-element_parse_ol (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_ol (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLListType listType = HTML_LIST_TYPE_ORDERED_ARABIC;
@@ -2993,7 +3130,9 @@ element_parse_ol (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_ul (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_ul (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -3010,7 +3149,9 @@ element_parse_ul (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_blockquote (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_blockquote (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
gboolean type = HTML_LIST_TYPE_BLOCKQUOTE;
@@ -3035,7 +3176,9 @@ element_parse_blockquote (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-block_end_glossary (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_glossary (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -3044,7 +3187,9 @@ block_end_glossary (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-element_parse_dd (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_dd (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -3058,7 +3203,9 @@ element_parse_dd (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_dt (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_dt (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
pop_element (e, ID_DT);
pop_element (e, ID_DD);
@@ -3070,7 +3217,9 @@ element_parse_dt (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_dl (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_dl (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -3081,7 +3230,9 @@ element_parse_dl (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_dir (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_dir (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -3095,7 +3246,9 @@ element_parse_dir (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_option (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_option (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
gchar *value = NULL;
@@ -3126,7 +3279,9 @@ element_parse_option (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_select (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_select (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
gchar *value;
@@ -3173,7 +3328,9 @@ pop_clue_style_for_table (HTMLEngine *e)
/* table parsing logic */
static void
-block_end_table (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_table (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
HTMLTable *table;
HTMLHAlignType table_align = elem->miscData1;
@@ -3221,7 +3378,9 @@ block_end_table (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
}
static void
-block_end_inline_table (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_inline_table (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -3265,7 +3424,9 @@ push_clue_style_for_table (HTMLEngine *e)
}
static void
-element_parse_table (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_table (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
HTMLTable *table;
@@ -3284,7 +3445,7 @@ element_parse_table (HTMLEngine *e, HTMLObject *clue, const gchar *str)
if (html_element_get_attr (element, "cellpadding", &value) && value)
padding = atoi (value);
if (padding < 0)
- padding=0;
+ padding = 0;
if (html_element_get_attr (element, "cellspacing", &value) && value)
spacing = atoi (value);
@@ -3377,7 +3538,9 @@ element_parse_table (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-block_end_row (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
+block_end_row (HTMLEngine *e,
+ HTMLObject *clue,
+ HTMLElement *elem)
{
HTMLTable *table;
@@ -3421,7 +3584,9 @@ block_ensure_row (HTMLEngine *e)
}
static void
-element_parse_tr (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_tr (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element;
gchar *value;
@@ -3462,7 +3627,9 @@ element_parse_tr (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_caption (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_caption (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLTable *table;
HTMLStyle *style = NULL;
@@ -3509,7 +3676,9 @@ element_parse_caption (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_cell (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_cell (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLTable *table = html_stack_top (e->table_stack);
gint rowSpan = 1;
@@ -3641,7 +3810,9 @@ element_parse_cell (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_textarea (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_textarea (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
gchar *name = NULL;
gint rows = 5, cols = 40;
@@ -3678,7 +3849,9 @@ element_parse_textarea (HTMLEngine *e, HTMLObject *clue, const gchar *str)
/* inline elements */
static void
-element_parse_big (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_big (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
@@ -3690,7 +3863,9 @@ element_parse_big (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_cite (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_cite (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
@@ -3703,7 +3878,9 @@ element_parse_cite (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_small (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_small (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
@@ -3715,7 +3892,9 @@ element_parse_small (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_sub (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_sub (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
@@ -3727,7 +3906,9 @@ element_parse_sub (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_sup (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_sup (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
@@ -3739,7 +3920,9 @@ element_parse_sup (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_inline_strikeout (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_inline_strikeout (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
@@ -3751,7 +3934,9 @@ element_parse_inline_strikeout (HTMLEngine *e, HTMLObject *clue, const gchar *st
}
static void
-element_parse_u (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_u (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
@@ -3763,7 +3948,9 @@ element_parse_u (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_inline_fixed (HTMLEngine *e, HTMLObject *clue, const gchar *str )
+element_parse_inline_fixed (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
@@ -3775,7 +3962,9 @@ element_parse_inline_fixed (HTMLEngine *e, HTMLObject *clue, const gchar *str )
}
static void
-element_parse_inline_italic (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_inline_italic (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
@@ -3787,7 +3976,9 @@ element_parse_inline_italic (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_inline_bold (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_inline_bold (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
@@ -3799,7 +3990,9 @@ element_parse_inline_bold (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_span (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_span (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
@@ -3810,7 +4003,9 @@ element_parse_span (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
static void
-element_parse_font (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+element_parse_font (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
HTMLElement *element = html_element_new_parse (e, str);
gchar *value;
@@ -3956,7 +4151,9 @@ dispatch_table_new (HTMLDispatchEntry *entry)
}
static void
-parse_one_token (HTMLEngine *e, HTMLObject *clue, const gchar *str)
+parse_one_token (HTMLEngine *e,
+ HTMLObject *clue,
+ const gchar *str)
{
static GHashTable *basic = NULL;
gchar *name = NULL;
@@ -4234,7 +4431,10 @@ html_engine_finalize (GObject *object)
}
static void
-html_engine_set_property (GObject *object, guint id, const GValue *value, GParamSpec *pspec)
+html_engine_set_property (GObject *object,
+ guint id,
+ const GValue *value,
+ GParamSpec *pspec)
{
HTMLEngine *engine = HTML_ENGINE (object);
@@ -4483,7 +4683,7 @@ html_engine_new (GtkWidget *w)
void
html_engine_realize (HTMLEngine *e,
- GdkWindow *window)
+ GdkWindow *window)
{
g_return_if_fail (e != NULL);
g_return_if_fail (window != NULL);
@@ -4518,11 +4718,11 @@ html_engine_unrealize (HTMLEngine *e)
/* This function makes sure @engine can be edited properly. In order
- to be editable, the beginning of the document must have the
- following structure:
-
- HTMLClueV (cluev)
- HTMLClueFlow (head)
+ * to be editable, the beginning of the document must have the
+ * following structure:
+ *
+ * HTMLClueV (cluev)
+ * HTMLClueFlow (head)
HTMLObject (child) */
void
html_engine_ensure_editable (HTMLEngine *engine)
@@ -4559,7 +4759,10 @@ html_engine_ensure_editable (HTMLEngine *engine)
void
html_engine_draw_background (HTMLEngine *e,
- gint x, gint y, gint w, gint h)
+ gint x,
+ gint y,
+ gint w,
+ gint h)
{
HTMLImagePointer *bgpixmap;
GdkPixbuf *pixbuf = NULL;
@@ -4601,7 +4804,9 @@ html_engine_stop_parser (HTMLEngine *e)
/* used for cleaning up the id hash table */
static gboolean
-id_table_free_func (gpointer key, gpointer val, gpointer data)
+id_table_free_func (gpointer key,
+ gpointer val,
+ gpointer data)
{
g_free (key);
return TRUE;
@@ -4620,7 +4825,9 @@ html_engine_id_table_clear (HTMLEngine *e)
}
static gboolean
-class_data_free_func (gpointer key, gpointer val, gpointer data)
+class_data_free_func (gpointer key,
+ gpointer val,
+ gpointer data)
{
g_free (key);
g_free (val);
@@ -4629,7 +4836,9 @@ class_data_free_func (gpointer key, gpointer val, gpointer data)
}
static gboolean
-class_data_table_free_func (gpointer key, gpointer val, gpointer data)
+class_data_table_free_func (gpointer key,
+ gpointer val,
+ gpointer data)
{
GHashTable *t;
@@ -4657,7 +4866,8 @@ html_engine_class_data_clear (HTMLEngine *e)
#define LOG_INPUT 1
GtkHTMLStream *
-html_engine_begin (HTMLEngine *e, const gchar *content_type)
+html_engine_begin (HTMLEngine *e,
+ const gchar *content_type)
{
GtkHTMLStream *new_stream;
@@ -4702,7 +4912,9 @@ html_engine_begin (HTMLEngine *e, const gchar *content_type)
}
static void
-html_engine_stop_forall (HTMLObject *o, HTMLEngine *e, gpointer data)
+html_engine_stop_forall (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (HTML_IS_FRAME (o))
GTK_HTML (HTML_FRAME (o)->html)->engine->stopped = TRUE;
@@ -4723,16 +4935,16 @@ static gchar *engine_content_types[]= { (gchar *) "text/html", NULL};
static gchar **
html_engine_stream_types (GtkHTMLStream *handle,
- gpointer data)
+ gpointer data)
{
return engine_content_types;
}
static void
html_engine_stream_write (GtkHTMLStream *handle,
- const gchar *buffer,
- gsize size,
- gpointer data)
+ const gchar *buffer,
+ gsize size,
+ gpointer data)
{
HTMLEngine *e;
@@ -4749,7 +4961,8 @@ html_engine_stream_write (GtkHTMLStream *handle,
}
static void
-update_embedded (GtkWidget *widget, gpointer data)
+update_embedded (GtkWidget *widget,
+ gpointer data)
{
HTMLObject *obj;
@@ -4868,7 +5081,7 @@ html_engine_schedule_update (HTMLEngine *e)
gboolean
html_engine_goto_anchor (HTMLEngine *e,
- const gchar *anchor)
+ const gchar *anchor)
{
GtkAdjustment *vadjustment;
GtkLayout *layout;
@@ -4910,13 +5123,16 @@ struct {
} respon
static void
-find_engine (HTMLObject *o, HTMLEngine *e, HTMLEngine **parent_engine)
+find_engine (HTMLObject *o,
+ HTMLEngine *e,
+ HTMLEngine **parent_engine)
{
}
gchar *
-html_engine_get_object_base (HTMLEngine *e, HTMLObject *o)
+html_engine_get_object_base (HTMLEngine *e,
+ HTMLObject *o)
{
HTMLEngine *parent_engine = NULL;
@@ -4994,8 +5210,8 @@ fix_last_clueflow (HTMLEngine *engine)
static void
html_engine_stream_end (GtkHTMLStream *stream,
- GtkHTMLStreamStatus status,
- gpointer data)
+ GtkHTMLStreamStatus status,
+ gpointer data)
{
HTMLEngine *e;
@@ -5034,7 +5250,12 @@ html_engine_stream_end (GtkHTMLStream *stream,
}
static void
-html_engine_draw_real (HTMLEngine *e, gint x, gint y, gint width, gint height, gboolean expose)
+html_engine_draw_real (HTMLEngine *e,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gboolean expose)
{
gint x1, x2, y1, y2;
@@ -5075,7 +5296,8 @@ html_engine_draw_real (HTMLEngine *e, gint x, gint y, gint width, gint height, g
}
void
-html_engine_draw_cb (HTMLEngine *e, cairo_t *cr)
+html_engine_draw_cb (HTMLEngine *e,
+ cairo_t *cr)
{
GdkRectangle rect;
GdkWindow *bin_window;
@@ -5122,7 +5344,11 @@ html_engine_draw_cb (HTMLEngine *e, cairo_t *cr)
}
void
-html_engine_draw (HTMLEngine *e, gint x, gint y, gint width, gint height)
+html_engine_draw (HTMLEngine *e,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
if (html_engine_frozen (e))
html_engine_add_expose (e, x, y, width, height, FALSE);
@@ -5260,7 +5486,8 @@ html_engine_get_max_height (HTMLEngine *e)
}
gboolean
-html_engine_calc_size (HTMLEngine *e, GList **changed_objs)
+html_engine_calc_size (HTMLEngine *e,
+ GList **changed_objs)
{
gint max_width; /* , max_height; */
gboolean redraw_whole;
@@ -5294,7 +5521,8 @@ html_engine_calc_size (HTMLEngine *e, GList **changed_objs)
}
static void
-destroy_form (gpointer data, gpointer user_data)
+destroy_form (gpointer data,
+ gpointer user_data)
{
html_form_destroy (HTML_FORM (data));
}
@@ -5374,9 +5602,10 @@ html_engine_parse (HTMLEngine *e)
HTMLObject *
html_engine_get_object_at (HTMLEngine *e,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
HTMLObject *clue;
HTMLObject *obj;
@@ -5417,8 +5646,9 @@ html_engine_get_object_at (HTMLEngine *e,
HTMLPoint *
html_engine_get_point_at (HTMLEngine *e,
- gint x, gint y,
- gboolean for_cursor)
+ gint x,
+ gint y,
+ gboolean for_cursor)
{
HTMLObject *o;
guint off;
@@ -5429,7 +5659,9 @@ html_engine_get_point_at (HTMLEngine *e,
}
const gchar *
-html_engine_get_link_at (HTMLEngine *e, gint x, gint y)
+html_engine_get_link_at (HTMLEngine *e,
+ gint x,
+ gint y)
{
HTMLObject *obj;
gint offset;
@@ -5458,7 +5690,7 @@ html_engine_get_link_at (HTMLEngine *e, gint x, gint y)
**/
void
html_engine_set_editable (HTMLEngine *e,
- gboolean editable)
+ gboolean editable)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -5503,7 +5735,9 @@ html_engine_get_editable (HTMLEngine *e)
}
static void
-set_focus (HTMLObject *o, HTMLEngine *e, gpointer data)
+set_focus (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (HTML_IS_IFRAME (o) || HTML_IS_FRAME (o)) {
HTMLEngine *cur_e = GTK_HTML (HTML_IS_FRAME (o) ? HTML_FRAME (o)->html : HTML_IFRAME (o)->html)->engine;
@@ -5513,7 +5747,7 @@ set_focus (HTMLObject *o, HTMLEngine *e, gpointer data)
void
html_engine_set_focus (HTMLEngine *engine,
- gboolean have_focus)
+ gboolean have_focus)
{
g_return_if_fail (HTML_IS_ENGINE (engine));
@@ -5539,7 +5773,7 @@ html_engine_set_focus (HTMLEngine *engine,
*/
void
html_engine_set_tokenizer (HTMLEngine *engine,
- HTMLTokenizer *tok)
+ HTMLTokenizer *tok)
{
g_return_if_fail (engine && HTML_IS_ENGINE (engine));
g_return_if_fail (tok && HTML_IS_TOKENIZER (tok));
@@ -5595,7 +5829,8 @@ html_engine_flush_draw_queue (HTMLEngine *e)
}
void
-html_engine_queue_draw (HTMLEngine *e, HTMLObject *o)
+html_engine_queue_draw (HTMLEngine *e,
+ HTMLObject *o)
{
g_return_if_fail (HTML_IS_ENGINE (e));
g_return_if_fail (o != NULL);
@@ -5606,8 +5841,10 @@ html_engine_queue_draw (HTMLEngine *e, HTMLObject *o)
void
html_engine_queue_clear (HTMLEngine *e,
- gint x, gint y,
- guint width, guint height)
+ gint x,
+ gint y,
+ guint width,
+ guint height)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -5620,9 +5857,9 @@ html_engine_queue_clear (HTMLEngine *e,
void
html_engine_form_submitted (HTMLEngine *e,
- const gchar *method,
- const gchar *action,
- const gchar *encoding)
+ const gchar *method,
+ const gchar *action,
+ const gchar *encoding)
{
g_signal_emit (e, signals[SUBMIT], 0, method, action, encoding);
}
@@ -5693,7 +5930,8 @@ html_engine_freeze (HTMLEngine *engine)
}
static void
-html_engine_get_viewport (HTMLEngine *e, GdkRectangle *viewport)
+html_engine_get_viewport (HTMLEngine *e,
+ GdkRectangle *viewport)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -5704,7 +5942,11 @@ html_engine_get_viewport (HTMLEngine *e, GdkRectangle *viewport)
}
gboolean
-html_engine_intersection (HTMLEngine *e, gint *x1, gint *y1, gint *x2, gint *y2)
+html_engine_intersection (HTMLEngine *e,
+ gint *x1,
+ gint *y1,
+ gint *x2,
+ gint *y2)
{
HTMLEngine *top = html_engine_get_top_html_engine (e);
GdkRectangle draw;
@@ -5745,7 +5987,9 @@ html_engine_intersection (HTMLEngine *e, gint *x1, gint *y1, gint *x2, gint *y2)
}
static void
-get_changed_objects (HTMLEngine *e, cairo_region_t *region, GList *changed_objs)
+get_changed_objects (HTMLEngine *e,
+ cairo_region_t *region,
+ GList *changed_objs)
{
GList *cur;
@@ -5791,7 +6035,8 @@ struct HTMLEngineExpose {
};
static void
-get_pending_expose (HTMLEngine *e, cairo_region_t *region)
+get_pending_expose (HTMLEngine *e,
+ cairo_region_t *region)
{
GSList *l, *next;
@@ -5812,7 +6057,8 @@ get_pending_expose (HTMLEngine *e, cairo_region_t *region)
}
static void
-free_expose_data (gpointer data, gpointer user_data)
+free_expose_data (gpointer data,
+ gpointer user_data)
{
g_free (data);
}
@@ -5996,9 +6242,13 @@ html_engine_load_empty (HTMLEngine *e)
}
void
-html_engine_replace (HTMLEngine *e, const gchar *text, const gchar *rep_text,
- gboolean case_sensitive, gboolean forward, gboolean regular,
- void (*ask)(HTMLEngine *, gpointer), gpointer ask_data)
+html_engine_replace (HTMLEngine *e,
+ const gchar *text,
+ const gchar *rep_text,
+ gboolean case_sensitive,
+ gboolean forward,
+ gboolean regular,
+ void (*ask)(HTMLEngine *, gpointer), gpointer ask_data)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -6042,7 +6292,8 @@ replace (HTMLEngine *e)
}
gboolean
-html_engine_replace_do (HTMLEngine *e, HTMLReplaceQueryAnswer answer)
+html_engine_replace_do (HTMLEngine *e,
+ HTMLReplaceQueryAnswer answer)
{
gboolean finished = FALSE;
@@ -6080,7 +6331,9 @@ html_engine_replace_do (HTMLEngine *e, HTMLReplaceQueryAnswer answer)
/* spell checking */
static void
-check_paragraph (HTMLObject *o, HTMLEngine *unused, HTMLEngine *e)
+check_paragraph (HTMLObject *o,
+ HTMLEngine *unused,
+ HTMLEngine *e)
{
if (HTML_OBJECT_TYPE (o) == HTML_TYPE_CLUEFLOW)
html_clueflow_spell_check (HTML_CLUEFLOW (o), e, NULL);
@@ -6099,7 +6352,9 @@ html_engine_spell_check (HTMLEngine *e)
}
static void
-clear_spell_check (HTMLObject *o, HTMLEngine *unused, HTMLEngine *e)
+clear_spell_check (HTMLObject *o,
+ HTMLEngine *unused,
+ HTMLEngine *e)
{
if (html_object_is_text (o))
html_text_spell_errors_clear (HTML_TEXT (o));
@@ -6225,7 +6480,8 @@ html_engine_spell_word_is_valid (HTMLEngine *e)
}
void
-html_engine_replace_spell_word_with (HTMLEngine *e, const gchar *word)
+html_engine_replace_spell_word_with (HTMLEngine *e,
+ const gchar *word)
{
HTMLObject *replace_text = NULL;
HTMLText *orig;
@@ -6265,7 +6521,8 @@ html_engine_get_cursor (HTMLEngine *e)
}
void
-html_engine_set_painter (HTMLEngine *e, HTMLPainter *painter)
+html_engine_set_painter (HTMLEngine *e,
+ HTMLPainter *painter)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (e != NULL);
@@ -6310,7 +6567,9 @@ html_engine_get_view_height (HTMLEngine *e)
/* beginnings of ID support */
void
-html_engine_add_object_with_id (HTMLEngine *e, const gchar *id, HTMLObject *obj)
+html_engine_add_object_with_id (HTMLEngine *e,
+ const gchar *id,
+ HTMLObject *obj)
{
gpointer old_key;
gpointer old_val;
@@ -6327,7 +6586,8 @@ html_engine_add_object_with_id (HTMLEngine *e, const gchar *id, HTMLObject *obj)
}
HTMLObject *
-html_engine_get_object_by_id (HTMLEngine *e, const gchar *id)
+html_engine_get_object_by_id (HTMLEngine *e,
+ const gchar *id)
{
g_return_val_if_fail ( e != NULL, NULL);
if (e->id_table == NULL)
@@ -6337,14 +6597,16 @@ html_engine_get_object_by_id (HTMLEngine *e, const gchar *id)
}
GHashTable *
-html_engine_get_class_table (HTMLEngine *e, const gchar *class_name)
+html_engine_get_class_table (HTMLEngine *e,
+ const gchar *class_name)
{
g_return_val_if_fail ( e != NULL, NULL);
return (class_name && e->class_data) ? g_hash_table_lookup (e->class_data, class_name) : NULL;
}
static inline GHashTable *
-get_class_table_sure (HTMLEngine *e, const gchar *class_name)
+get_class_table_sure (HTMLEngine *e,
+ const gchar *class_name)
{
GHashTable *t = NULL;
g_return_val_if_fail ( e != NULL, t);
@@ -6362,7 +6624,10 @@ get_class_table_sure (HTMLEngine *e, const gchar *class_name)
}
void
-html_engine_set_class_data (HTMLEngine *e, const gchar *class_name, const gchar *key, const gchar *value)
+html_engine_set_class_data (HTMLEngine *e,
+ const gchar *class_name,
+ const gchar *key,
+ const gchar *value)
{
GHashTable *t;
gpointer old_key;
@@ -6386,7 +6651,9 @@ html_engine_set_class_data (HTMLEngine *e, const gchar *class_name, const gchar
}
void
-html_engine_clear_class_data (HTMLEngine *e, const gchar *class_name, const gchar *key)
+html_engine_clear_class_data (HTMLEngine *e,
+ const gchar *class_name,
+ const gchar *key)
{
GHashTable *t;
gpointer old_key;
@@ -6403,7 +6670,9 @@ html_engine_clear_class_data (HTMLEngine *e, const gchar *class_name, const gcha
}
static gboolean
-remove_class_data (gpointer key, gpointer val, gpointer data)
+remove_class_data (gpointer key,
+ gpointer val,
+ gpointer data)
{
/* printf ("remove: %s, %s\n", key, val); */
g_free (key);
@@ -6413,7 +6682,9 @@ remove_class_data (gpointer key, gpointer val, gpointer data)
}
static gboolean
-remove_all_class_data (gpointer key, gpointer val, gpointer data)
+remove_all_class_data (gpointer key,
+ gpointer val,
+ gpointer data)
{
g_hash_table_foreach_remove ((GHashTable *) val, remove_class_data, NULL);
/* printf ("remove table: %s\n", key); */
@@ -6436,21 +6707,26 @@ html_engine_clear_all_class_data (HTMLEngine *e)
}
const gchar *
-html_engine_get_class_data (HTMLEngine *e, const gchar *class_name, const gchar *key)
+html_engine_get_class_data (HTMLEngine *e,
+ const gchar *class_name,
+ const gchar *key)
{
GHashTable *t = html_engine_get_class_table (e, class_name);
return t ? g_hash_table_lookup (t, key) : NULL;
}
static void
-set_object_data (gpointer key, gpointer value, gpointer data)
+set_object_data (gpointer key,
+ gpointer value,
+ gpointer data)
{
/* printf ("set %s\n", (const gchar *) key); */
html_object_set_data (HTML_OBJECT (data), (const gchar *) key, (const gchar *) value);
}
static void
-html_engine_set_object_data (HTMLEngine *e, HTMLObject *o)
+html_engine_set_object_data (HTMLEngine *e,
+ HTMLObject *o)
{
GHashTable *t;
@@ -6471,7 +6747,12 @@ html_engine_get_top_html_engine (HTMLEngine *e)
}
void
-html_engine_add_expose (HTMLEngine *e, gint x, gint y, gint width, gint height, gboolean expose)
+html_engine_add_expose (HTMLEngine *e,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gboolean expose)
{
struct HTMLEngineExpose *r;
@@ -6516,7 +6797,8 @@ html_engine_redraw_selection (HTMLEngine *e)
}
void
-html_engine_set_language (HTMLEngine *e, const gchar *language)
+html_engine_set_language (HTMLEngine *e,
+ const gchar *language)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -6543,7 +6825,9 @@ html_engine_get_language (HTMLEngine *e)
}
static void
-draw_link_text (HTMLText *text, HTMLEngine *e, gint offset)
+draw_link_text (HTMLText *text,
+ HTMLEngine *e,
+ gint offset)
{
HTMLTextSlave *start, *end;
@@ -6558,7 +6842,8 @@ draw_link_text (HTMLText *text, HTMLEngine *e, gint offset)
}
HTMLObject *
-html_engine_get_focus_object (HTMLEngine *e, gint *offset)
+html_engine_get_focus_object (HTMLEngine *e,
+ gint *offset)
{
HTMLObject *o;
HTMLEngine *object_engine;
@@ -6580,7 +6865,10 @@ html_engine_get_focus_object (HTMLEngine *e, gint *offset)
}
static HTMLObject *
-move_focus_object (HTMLObject *o, gint *offset, HTMLEngine *e, GtkDirectionType dir)
+move_focus_object (HTMLObject *o,
+ gint *offset,
+ HTMLEngine *e,
+ GtkDirectionType dir)
{
if (HTML_IS_TEXT (o) && ((dir == GTK_DIR_TAB_FORWARD && html_text_next_link_offset (HTML_TEXT (o), offset))
|| (dir == GTK_DIR_TAB_BACKWARD && html_text_prev_link_offset (HTML_TEXT (o), offset))))
@@ -6601,7 +6889,8 @@ move_focus_object (HTMLObject *o, gint *offset, HTMLEngine *e, GtkDirectionType
}
gboolean
-html_engine_focus (HTMLEngine *e, GtkDirectionType dir)
+html_engine_focus (HTMLEngine *e,
+ GtkDirectionType dir)
{
g_return_val_if_fail (HTML_IS_ENGINE (e), FALSE);
@@ -6676,7 +6965,9 @@ html_engine_focus (HTMLEngine *e, GtkDirectionType dir)
}
static void
-draw_focus_object (HTMLEngine *e, HTMLObject *o, gint offset)
+draw_focus_object (HTMLEngine *e,
+ HTMLObject *o,
+ gint offset)
{
e = html_object_engine (o, e);
if (HTML_IS_TEXT (o) && html_object_get_url (o, offset))
@@ -6686,7 +6977,8 @@ draw_focus_object (HTMLEngine *e, HTMLObject *o, gint offset)
}
static void
-reset_focus_object_forall (HTMLObject *o, HTMLEngine *e)
+reset_focus_object_forall (HTMLObject *o,
+ HTMLEngine *e)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -6733,7 +7025,9 @@ set_frame_parents_focus_object (HTMLEngine *e)
}
void
-html_engine_update_focus_if_necessary (HTMLEngine *e, HTMLObject *obj, gint offset)
+html_engine_update_focus_if_necessary (HTMLEngine *e,
+ HTMLObject *obj,
+ gint offset)
{
gchar *url = NULL;
@@ -6748,7 +7042,9 @@ html_engine_update_focus_if_necessary (HTMLEngine *e, HTMLObject *obj, gint offs
}
void
-html_engine_set_focus_object (HTMLEngine *e, HTMLObject *o, gint offset)
+html_engine_set_focus_object (HTMLEngine *e,
+ HTMLObject *o,
+ gint offset)
{
/* printf ("set focus object to: %p\n", o); */
@@ -6787,7 +7083,8 @@ html_engine_saved (HTMLEngine *e)
}
static void
-html_engine_add_map (HTMLEngine *e, const gchar *name)
+html_engine_add_map (HTMLEngine *e,
+ const gchar *name)
{
gpointer old_key = NULL, old_val;
@@ -6808,7 +7105,9 @@ html_engine_add_map (HTMLEngine *e, const gchar *name)
}
static gboolean
-map_table_free_func (gpointer key, gpointer val, gpointer data)
+map_table_free_func (gpointer key,
+ gpointer val,
+ gpointer data)
{
html_map_destroy (HTML_MAP (val));
return TRUE;
@@ -6827,7 +7126,8 @@ html_engine_map_table_clear (HTMLEngine *e)
}
HTMLMap *
-html_engine_get_map (HTMLEngine *e, const gchar *name)
+html_engine_get_map (HTMLEngine *e,
+ const gchar *name)
{
g_return_val_if_fail (HTML_IS_ENGINE (e), NULL);
@@ -6841,7 +7141,9 @@ struct HTMLEngineCheckSelectionType
};
static void
-check_type_in_selection (HTMLObject *o, HTMLEngine *e, struct HTMLEngineCheckSelectionType *tmp)
+check_type_in_selection (HTMLObject *o,
+ HTMLEngine *e,
+ struct HTMLEngineCheckSelectionType *tmp)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -6850,7 +7152,8 @@ check_type_in_selection (HTMLObject *o, HTMLEngine *e, struct HTMLEngineCheckSel
}
gboolean
-html_engine_selection_contains_object_type (HTMLEngine *e, HTMLType obj_type)
+html_engine_selection_contains_object_type (HTMLEngine *e,
+ HTMLType obj_type)
{
struct HTMLEngineCheckSelectionType tmp;
@@ -6865,7 +7168,9 @@ html_engine_selection_contains_object_type (HTMLEngine *e, HTMLType obj_type)
}
static void
-check_link_in_selection (HTMLObject *o, HTMLEngine *e, gboolean *has_link)
+check_link_in_selection (HTMLObject *o,
+ HTMLEngine *e,
+ gboolean *has_link)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -6960,7 +7265,8 @@ html_engine_opened_streams_decrement (HTMLEngine *e)
}
void
-html_engine_opened_streams_set (HTMLEngine *e, gint value)
+html_engine_opened_streams_set (HTMLEngine *e,
+ gint value)
{
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -6987,7 +7293,9 @@ html_engine_opened_streams_set (HTMLEngine *e, gint value)
}
static void
-calc_font_size (HTMLObject *o, HTMLEngine *e, gpointer data)
+calc_font_size (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (HTML_IS_TEXT (o))
html_text_calc_font_size (HTML_TEXT (o), e);
diff --git a/gtkhtml/htmlengine.h b/gtkhtml/htmlengine.h
index 23691fb..1cf1dde 100644
--- a/gtkhtml/htmlengine.h
+++ b/gtkhtml/htmlengine.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLENGINE_H_
@@ -72,8 +72,8 @@ struct _HTMLEngine {
guint primary_len;
/* Freeze counter. When greater than zero, we never trigger relayouts
- nor repaints. When going from nonzero to zero, we relayout and
- repaint everything. */
+ * nor repaints. When going from nonzero to zero, we relayout and
+ * repaint everything. */
guint freeze_count;
guint thaw_idle_id;
gint block_redraw;
@@ -167,10 +167,10 @@ struct _HTMLEngine {
GString *formText;
/* This is TRUE if we cannot insert a paragraph break (which is just an
- extra empty line). It's set to FALSE as soon as some element is
- added to a flow. The purpose is to avoid having paragraph breaks to
- be inserted in sequence, or after elements that have some vspace of
- their own. */
+ * extra empty line). It's set to FALSE as soon as some element is
+ * added to a flow. The purpose is to avoid having paragraph breaks to
+ * be inserted in sequence, or after elements that have some vspace of
+ * their own. */
gboolean avoid_para;
/* Whether we have the keyboard focus. */
@@ -187,12 +187,12 @@ struct _HTMLEngine {
HTMLCursor *cursor;
/* If no region is active, this is NULL. Otherwise, this is
- one extreme of the selected region. The other extreme is
- always the cursor. */
+ * one extreme of the selected region. The other extreme is
+ * always the cursor. */
HTMLCursor *mark;
/* Hide counter for the cursor. When greater than zero, it
- means the cursor is invisible. */
+ * means the cursor is invisible. */
gint cursor_hide_count;
/* Timer ID for cursor blink. */
@@ -202,7 +202,7 @@ struct _HTMLEngine {
gboolean blinking_status;
/* Font style for insertion. If HTML_FONT_STYLE_DEFAULT, use that of
- the text we are in. */
+ * the text we are in. */
GtkHTMLFontStyle insertion_font_style;
HTMLColor *insertion_color;
gchar *insertion_url;
@@ -212,11 +212,11 @@ struct _HTMLEngine {
gboolean shift_selection;
/* This object is used to update the keyboard selection in the
- idle loop. */
+ * idle loop. */
HTMLEngineEditSelectionUpdater *selection_updater;
/* keeps selection between operation, which are changing selection
- and need restore it after done */
+ * and need restore it after done */
GList *selection_stack;
/* search & replace */
diff --git a/gtkhtml/htmlentity.c b/gtkhtml/htmlentity.c
index 81d7331..e1750dd 100644
--- a/gtkhtml/htmlentity.c
+++ b/gtkhtml/htmlentity.c
@@ -84,7 +84,8 @@ inline
#endif
#endif
static guint
-hash (register const gchar *str, register guint len)
+hash (register const gchar *str,
+ register guint len)
{
static gushort asso_values[] =
{
@@ -143,7 +144,8 @@ __attribute__ ((__gnu_inline__))
#endif
#endif
static struct _EntityEntry *
-html_entity_hash (register const gchar *str, register guint len)
+html_entity_hash (register const gchar *str,
+ register guint len)
{
static guchar lengthtable[] =
{
@@ -866,7 +868,8 @@ html_entity_hash (register const gchar *str, register guint len)
#line 293 "htmlentity.gperf"
gulong
-html_entity_parse (const gchar *s, guint len)
+html_entity_parse (const gchar *s,
+ guint len)
{
struct _EntityEntry * result = html_entity_hash ( s, len);
if (result == NULL )
diff --git a/gtkhtml/htmlenums.h b/gtkhtml/htmlenums.h
index 36931ab..bc8f743 100644
--- a/gtkhtml/htmlenums.h
+++ b/gtkhtml/htmlenums.h
@@ -1,25 +1,25 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- Copyright (C) 2000 Helix Code, Inc.
- Copyright (C) 2001 Ximian, Inc.
-
- The Gnome Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The Gnome Library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the Gnome Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Radek Doulik <rodo ximian com>
-
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2001 Ximian, Inc.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Radek Doulik <rodo ximian com>
+ *
*/
#ifndef _HTML_ENUMS_H
@@ -163,11 +163,11 @@ typedef enum {
} HTMLReplaceQueryAnswer;
/* This is a list of the HTML object classes we are using. We use a static
- system because (a) it's faster and (b) we don't need/want an extensible
- object system.
-
- If you add new HTML classes, you should (a) update this list and (b) update
- the `html_types_init ()' function in `htmltype.c'. */
+ * system because (a) it's faster and (b) we don't need/want an extensible
+ * object system.
+ *
+ * If you add new HTML classes, you should (a) update this list and (b) update
+ * the `html_types_init ()' function in `htmltype.c'. */
typedef enum {
HTML_TYPE_NONE,
diff --git a/gtkhtml/htmlenumutils.c b/gtkhtml/htmlenumutils.c
index 4048334..8fc35f1 100644
--- a/gtkhtml/htmlenumutils.c
+++ b/gtkhtml/htmlenumutils.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- Copyright (C) 2000 Helix Code, Inc.
-
- The Gnome Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The Gnome Library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the Gnome Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Radek Doulik <rodo helixcode com>
-
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Radek Doulik <rodo helixcode com>
+ *
*/
#include "htmlenumutils.h"
diff --git a/gtkhtml/htmlenumutils.h b/gtkhtml/htmlenumutils.h
index 5ac982b..6666a2c 100644
--- a/gtkhtml/htmlenumutils.h
+++ b/gtkhtml/htmlenumutils.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/*
- Copyright (C) 2000 Helix Code, Inc.
-
- The Gnome Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The Gnome Library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the Gnome Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Radek Doulik <rodo helixcode com>
-
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Radek Doulik <rodo helixcode com>
+ *
*/
#ifndef _HTML_ENUM_UTILS_H
diff --git a/gtkhtml/htmlfontmanager.c b/gtkhtml/htmlfontmanager.c
index 4f3739f..4fe1a9f 100644
--- a/gtkhtml/htmlfontmanager.c
+++ b/gtkhtml/htmlfontmanager.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -29,7 +29,8 @@
#include "htmlengine.h"
static void
-html_font_set_init (HTMLFontSet *set, gchar *face)
+html_font_set_init (HTMLFontSet *set,
+ gchar *face)
{
memset (set, 0, GTK_HTML_FONT_STYLE_MAX_FONT * sizeof (HTMLFont *));
set->ref_count = 1;
@@ -48,7 +49,8 @@ html_font_set_new (gchar *face)
}
static gboolean
-html_font_set_face (HTMLFontSet *set, gchar *face)
+html_font_set_face (HTMLFontSet *set,
+ gchar *face)
{
if (!set->face || strcmp (set->face, face)) {
if (set->face)
@@ -60,11 +62,12 @@ html_font_set_face (HTMLFontSet *set, gchar *face)
}
static void
-html_font_set_release (HTMLFontSet *set, HTMLPainter *painter)
+html_font_set_release (HTMLFontSet *set,
+ HTMLPainter *painter)
{
gint i;
- for (i=0; i<GTK_HTML_FONT_STYLE_MAX_FONT; i++) {
+ for (i = 0; i < GTK_HTML_FONT_STYLE_MAX_FONT; i++) {
if (set->font[i])
html_font_unref (set->font[i], painter);
set->font[i] = NULL;
@@ -72,7 +75,8 @@ html_font_set_release (HTMLFontSet *set, HTMLPainter *painter)
}
static void
-html_font_set_unref (HTMLFontSet *set, HTMLPainter *painter)
+html_font_set_unref (HTMLFontSet *set,
+ HTMLPainter *painter)
{
set->ref_count--;
if (!set->ref_count) {
@@ -85,12 +89,13 @@ html_font_set_unref (HTMLFontSet *set, HTMLPainter *painter)
}
void
-html_font_manager_init (HTMLFontManager *manager, HTMLPainter *painter)
+html_font_manager_init (HTMLFontManager *manager,
+ HTMLPainter *painter)
{
manager->font_sets = g_hash_table_new (g_str_hash, g_str_equal);
- manager->var_size = 12*PANGO_SCALE;
+ manager->var_size = 12 * PANGO_SCALE;
manager->var_points = FALSE;
- manager->fix_size = 12*PANGO_SCALE;
+ manager->fix_size = 12 * PANGO_SCALE;
manager->fix_points = FALSE;
manager->magnification = 1.0;
manager->painter = painter;
@@ -100,7 +105,8 @@ html_font_manager_init (HTMLFontManager *manager, HTMLPainter *painter)
}
void
-html_font_manager_set_magnification (HTMLFontManager *manager, gdouble magnification)
+html_font_manager_set_magnification (HTMLFontManager *manager,
+ gdouble magnification)
{
g_return_if_fail (magnification > 0.0);
@@ -111,7 +117,9 @@ html_font_manager_set_magnification (HTMLFontManager *manager, gdouble magnifica
}
static gboolean
-destroy_font_set_foreach (gpointer key, gpointer font_set, gpointer data)
+destroy_font_set_foreach (gpointer key,
+ gpointer font_set,
+ gpointer data)
{
g_free (key);
html_font_set_unref (font_set, HTML_PAINTER (data));
@@ -146,8 +154,13 @@ html_font_manager_finalize (HTMLFontManager *manager)
}
void
-html_font_manager_set_default (HTMLFontManager *manager, gchar *variable, gchar *fixed,
- gint var_size, gboolean var_points, gint fix_size, gboolean fix_points)
+html_font_manager_set_default (HTMLFontManager *manager,
+ gchar *variable,
+ gchar *fixed,
+ gint var_size,
+ gboolean var_points,
+ gint fix_size,
+ gboolean fix_points)
{
gboolean changed = FALSE;
@@ -177,7 +190,7 @@ html_font_manager_set_default (HTMLFontManager *manager, gchar *variable, gchar
* NOTE we clear both if fixed changes because the plain painter pulls nasty
* tricks with using fixed fonts in the variable manager so if the fixed font
* change the variable font may change too.
- */
+ * */
html_font_set_release (&manager->variable, manager->painter);
html_font_set_release (&manager->fixed, manager->painter);
}
@@ -198,7 +211,9 @@ html_font_set_get_idx (GtkHTMLFontStyle style)
}
static HTMLFontSet *
-get_font_set (HTMLFontManager *manager, gchar *face, GtkHTMLFontStyle style)
+get_font_set (HTMLFontManager *manager,
+ gchar *face,
+ GtkHTMLFontStyle style)
{
return (face)
? g_hash_table_lookup (manager->font_sets, face)
@@ -206,16 +221,20 @@ get_font_set (HTMLFontManager *manager, gchar *face, GtkHTMLFontStyle style)
}
static gdouble
-get_real_font_size (HTMLFontManager *manager, GtkHTMLFontStyle style)
+get_real_font_size (HTMLFontManager *manager,
+ GtkHTMLFontStyle style)
{
gint size = (get_font_num (style) & GTK_HTML_FONT_STYLE_SIZE_MASK) - GTK_HTML_FONT_STYLE_SIZE_3;
gint base_size = style & GTK_HTML_FONT_STYLE_FIXED ? manager->fix_size : manager->var_size;
- return manager->magnification * (base_size + (size > 0 ? (1 << size) : size) * base_size/8.0);
+ return manager->magnification * (base_size + (size > 0 ? (1 << size) : size) * base_size / 8.0);
}
static void
-html_font_set_font (HTMLFontManager *manager, HTMLFontSet *set, GtkHTMLFontStyle style, HTMLFont *font)
+html_font_set_font (HTMLFontManager *manager,
+ HTMLFontSet *set,
+ GtkHTMLFontStyle style,
+ HTMLFont *font)
{
gint idx;
@@ -230,7 +249,10 @@ html_font_set_font (HTMLFontManager *manager, HTMLFontSet *set, GtkHTMLFontStyle
}
static HTMLFont *
-get_font (HTMLFontManager *manager, HTMLFontSet **set, gchar *face, GtkHTMLFontStyle style)
+get_font (HTMLFontManager *manager,
+ HTMLFontSet **set,
+ gchar *face,
+ GtkHTMLFontStyle style)
{
HTMLFont *font = NULL;
@@ -241,12 +263,13 @@ get_font (HTMLFontManager *manager, HTMLFontSet **set, gchar *face, GtkHTMLFontS
}
gchar *
-html_font_manager_get_attr (gchar *font_name, gint n)
+html_font_manager_get_attr (gchar *font_name,
+ gint n)
{
gchar *s, *end;
/* Search paramether */
- for (s=font_name; n; n--,s++)
+ for (s = font_name; n; n--,s++)
s = strchr (s,'-');
if (s && *s != 0) {
@@ -260,13 +283,16 @@ html_font_manager_get_attr (gchar *font_name, gint n)
}
static gboolean
-get_points (HTMLFontManager *manager, GtkHTMLFontStyle style)
+get_points (HTMLFontManager *manager,
+ GtkHTMLFontStyle style)
{
return (style & GTK_HTML_FONT_STYLE_FIXED) ? manager->fix_points : manager->var_points;
}
static gpointer
-manager_alloc_font (HTMLFontManager *manager, gchar *face, GtkHTMLFontStyle style)
+manager_alloc_font (HTMLFontManager *manager,
+ gchar *face,
+ GtkHTMLFontStyle style)
{
return html_painter_alloc_font (manager->painter, face, get_real_font_size (manager, style), get_points (manager, style), style);
}
@@ -287,7 +313,10 @@ strip_white_space (gchar *name)
}
static HTMLFont *
-alloc_new_font (HTMLFontManager *manager, HTMLFontSet **set, gchar *face_list, GtkHTMLFontStyle style)
+alloc_new_font (HTMLFontManager *manager,
+ HTMLFontSet **set,
+ gchar *face_list,
+ GtkHTMLFontStyle style)
{
HTMLFont *font = NULL;
gchar **faces;
@@ -331,7 +360,9 @@ alloc_new_font (HTMLFontManager *manager, HTMLFontSet **set, gchar *face_list, G
}
HTMLFont *
-html_font_manager_get_font (HTMLFontManager *manager, gchar *face_list, GtkHTMLFontStyle style)
+html_font_manager_get_font (HTMLFontManager *manager,
+ gchar *face_list,
+ GtkHTMLFontStyle style)
{
HTMLFontSet *set;
HTMLFont *font = NULL;
@@ -366,15 +397,15 @@ html_font_manager_get_font (HTMLFontManager *manager, gchar *face_list, GtkHTMLF
HTMLFont *
html_font_new (gpointer data,
- guint space_width,
- guint space_asc,
- guint space_dsc,
- guint nbsp_width,
- guint tab_width,
- guint e_width,
- guint indent_width,
- guint cite_width_ltr,
- guint cite_width_rtl)
+ guint space_width,
+ guint space_asc,
+ guint space_dsc,
+ guint nbsp_width,
+ guint tab_width,
+ guint e_width,
+ guint indent_width,
+ guint cite_width_ltr,
+ guint cite_width_rtl)
{
HTMLFont *font = g_new (HTMLFont, 1);
@@ -400,14 +431,16 @@ html_font_destroy (HTMLFont *font)
}
void
-html_font_ref (HTMLFont *font, HTMLPainter *painter)
+html_font_ref (HTMLFont *font,
+ HTMLPainter *painter)
{
html_painter_ref_font (painter, font);
font->ref_count++;
}
void
-html_font_unref (HTMLFont *font, HTMLPainter *painter)
+html_font_unref (HTMLFont *font,
+ HTMLPainter *painter)
{
font->ref_count--;
html_painter_unref_font (painter, font);
diff --git a/gtkhtml/htmlfontmanager.h b/gtkhtml/htmlfontmanager.h
index 92a9821..6fb97f0 100644
--- a/gtkhtml/htmlfontmanager.h
+++ b/gtkhtml/htmlfontmanager.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTML_FONT_MANAGER_H_
diff --git a/gtkhtml/htmlform.c b/gtkhtml/htmlform.c
index 77bdc22..bbc2ece 100644
--- a/gtkhtml/htmlform.c
+++ b/gtkhtml/htmlform.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML widget.
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
*/
#include <config.h>
@@ -26,7 +26,9 @@
HTMLForm *
-html_form_new (HTMLEngine *engine, const gchar *_action, const gchar *_method)
+html_form_new (HTMLEngine *engine,
+ const gchar *_action,
+ const gchar *_method)
{
HTMLForm *new;
@@ -44,7 +46,8 @@ html_form_new (HTMLEngine *engine, const gchar *_action, const gchar *_method)
}
void
-html_form_add_element (HTMLForm *form, HTMLEmbedded *element)
+html_form_add_element (HTMLForm *form,
+ HTMLEmbedded *element)
{
form->elements = g_list_append (form->elements, element);
@@ -52,7 +55,8 @@ html_form_add_element (HTMLForm *form, HTMLEmbedded *element)
}
void
-html_form_add_hidden (HTMLForm *form, HTMLHidden *hidden)
+html_form_add_hidden (HTMLForm *form,
+ HTMLHidden *hidden)
{
html_form_add_element (form, HTML_EMBEDDED (hidden));
@@ -60,7 +64,9 @@ html_form_add_hidden (HTMLForm *form, HTMLHidden *hidden)
}
void
-html_form_add_radio (HTMLForm *form, const gchar *name, GtkRadioButton *button)
+html_form_add_radio (HTMLForm *form,
+ const gchar *name,
+ GtkRadioButton *button)
{
GtkWidget *master;
GSList *group;
@@ -85,20 +91,23 @@ html_form_add_radio (HTMLForm *form, const gchar *name, GtkRadioButton *button)
}
static void
-destroy_hidden (gpointer o, gpointer data)
+destroy_hidden (gpointer o,
+ gpointer data)
{
html_object_destroy (HTML_OBJECT (o));
}
static void
-destroy_radio (gchar *key, gpointer *master)
+destroy_radio (gchar *key,
+ gpointer *master)
{
g_free (key);
g_object_unref (master);
}
static void
-reset_element (gpointer o, gpointer data)
+reset_element (gpointer o,
+ gpointer data)
{
html_embedded_reset (HTML_EMBEDDED (o));
}
@@ -148,7 +157,8 @@ html_form_submit (HTMLForm *form)
}
void
-html_form_set_engine (HTMLForm *form, HTMLEngine *engine)
+html_form_set_engine (HTMLForm *form,
+ HTMLEngine *engine)
{
g_return_if_fail (HTML_IS_ENGINE (engine));
form->engine = engine;
diff --git a/gtkhtml/htmlform.h b/gtkhtml/htmlform.h
index 2e45677..203499e 100644
--- a/gtkhtml/htmlform.h
+++ b/gtkhtml/htmlform.h
@@ -1,21 +1,21 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLFORM_H_
diff --git a/gtkhtml/htmlframe.c b/gtkhtml/htmlframe.c
index b3bdd19..b243db3 100644
--- a/gtkhtml/htmlframe.c
+++ b/gtkhtml/htmlframe.c
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -40,7 +40,10 @@ HTMLFrameClass html_frame_class;
static HTMLEmbeddedClass *parent_class = NULL;
static void
-frame_url_requested (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data)
+frame_url_requested (GtkHTML *html,
+ const gchar *url,
+ GtkHTMLStream *handle,
+ gpointer data)
{
HTMLFrame *frame = HTML_FRAME (data);
GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (frame)->parent);
@@ -50,7 +53,9 @@ frame_url_requested (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpo
}
static void
-frame_set_base (GtkHTML *html, const gchar *url, gpointer data)
+frame_set_base (GtkHTML *html,
+ const gchar *url,
+ gpointer data)
{
gchar *new_url = NULL;
@@ -61,10 +66,10 @@ frame_set_base (GtkHTML *html, const gchar *url, gpointer data)
static void
frame_submit (GtkHTML *html,
- const gchar *method,
- const gchar *action,
- const gchar *encoding,
- gpointer data)
+ const gchar *method,
+ const gchar *action,
+ const gchar *encoding,
+ gpointer data)
{
HTMLFrame *frame = HTML_FRAME (data);
GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (frame)->parent);
@@ -73,7 +78,8 @@ frame_submit (GtkHTML *html,
}
static void
-frame_size_changed (GtkHTML *html, gpointer data)
+frame_size_changed (GtkHTML *html,
+ gpointer data)
{
HTMLFrame *frame = HTML_FRAME (data);
GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (frame)->parent);
@@ -82,7 +88,9 @@ frame_size_changed (GtkHTML *html, gpointer data)
}
static gboolean
-frame_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
+frame_object_requested (GtkHTML *html,
+ GtkHTMLEmbedded *eb,
+ gpointer data)
{
HTMLFrame *frame = HTML_FRAME (data);
GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (frame)->parent);
@@ -94,7 +102,8 @@ frame_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
}
static void
-frame_set_gdk_painter (HTMLFrame *frame, HTMLPainter *painter)
+frame_set_gdk_painter (HTMLFrame *frame,
+ HTMLPainter *painter)
{
if (painter)
g_object_ref (G_OBJECT (painter));
@@ -107,10 +116,10 @@ frame_set_gdk_painter (HTMLFrame *frame, HTMLPainter *painter)
HTMLObject *
html_frame_new (GtkWidget *parent,
- gchar *src,
- gint width,
- gint height,
- gboolean border)
+ gchar *src,
+ gint width,
+ gint height,
+ gboolean border)
{
HTMLFrame *frame;
@@ -128,7 +137,8 @@ html_frame_new (GtkWidget *parent,
}
static gboolean
-html_frame_grab_cursor (GtkWidget *frame, GdkEvent *event)
+html_frame_grab_cursor (GtkWidget *frame,
+ GdkEvent *event)
{
/* Keep the focus! Fight the power */
return TRUE;
@@ -136,7 +146,7 @@ html_frame_grab_cursor (GtkWidget *frame, GdkEvent *event)
static gint
calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
gint min_width;
@@ -149,7 +159,9 @@ calc_min_width (HTMLObject *o,
}
static void
-set_max_width (HTMLObject *o, HTMLPainter *painter, gint max_width)
+set_max_width (HTMLObject *o,
+ HTMLPainter *painter,
+ gint max_width)
{
HTMLEngine *e = GTK_HTML (HTML_FRAME (o)->html)->engine;
@@ -160,9 +172,12 @@ set_max_width (HTMLObject *o, HTMLPainter *painter, gint max_width)
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLFrame *frame = HTML_FRAME (o);
HTMLEngine *e = GTK_HTML (frame->html)->engine;
@@ -184,7 +199,8 @@ draw (HTMLObject *o,
}
static void
-set_painter (HTMLObject *o, HTMLPainter *painter)
+set_painter (HTMLObject *o,
+ HTMLPainter *painter)
{
HTMLFrame *frame;
@@ -199,9 +215,9 @@ set_painter (HTMLObject *o, HTMLPainter *painter)
static void
forall (HTMLObject *self,
- HTMLEngine *e,
- HTMLObjectForallFunc func,
- gpointer data)
+ HTMLEngine *e,
+ HTMLObjectForallFunc func,
+ gpointer data)
{
HTMLFrame *frame;
@@ -211,13 +227,17 @@ forall (HTMLObject *self,
}
static gint
-check_page_split (HTMLObject *self, HTMLPainter *p, gint y)
+check_page_split (HTMLObject *self,
+ HTMLPainter *p,
+ gint y)
{
return html_object_check_page_split (GTK_HTML (HTML_FRAME (self)->html)->engine->clue, p, y);
}
static gboolean
-html_frame_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_frame_real_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLFrame *frame;
HTMLEngine *e;
@@ -253,7 +273,8 @@ html_frame_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_
}
static gboolean
-search (HTMLObject *self, HTMLSearch *info)
+search (HTMLObject *self,
+ HTMLSearch *info)
{
HTMLEngine *e = GTK_HTML (HTML_FRAME (self)->html)->engine;
@@ -293,17 +314,19 @@ tail (HTMLObject *self)
}
static HTMLEngine *
-get_engine (HTMLObject *self, HTMLEngine *e)
+get_engine (HTMLObject *self,
+ HTMLEngine *e)
{
return GTK_HTML (HTML_FRAME (self)->html)->engine;
}
-static HTMLObject*
+static HTMLObject *
check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
HTMLEngine *e = GTK_HTML (HTML_FRAME (self)->html)->engine;
@@ -333,13 +356,14 @@ is_container (HTMLObject *self)
static void
append_selection_string (HTMLObject *self,
- GString *buffer)
+ GString *buffer)
{
html_object_append_selection_string (GTK_HTML (HTML_FRAME (self)->html)->engine->clue, buffer);
}
static void
-reparent (HTMLEmbedded *emb, GtkWidget *html)
+reparent (HTMLEmbedded *emb,
+ GtkWidget *html)
{
HTMLFrame *frame = HTML_FRAME (emb);
@@ -351,10 +375,10 @@ reparent (HTMLEmbedded *emb, GtkWidget *html)
static gboolean
select_range (HTMLObject *self,
- HTMLEngine *engine,
- guint start,
- gint length,
- gboolean queue_draw)
+ HTMLEngine *engine,
+ guint start,
+ gint length,
+ gboolean queue_draw)
{
return html_object_select_range (GTK_HTML (HTML_FRAME (self)->html)->engine->clue,
GTK_HTML (HTML_FRAME (self)->html)->engine,
@@ -378,7 +402,10 @@ destroy (HTMLObject *o)
}
static HTMLAnchor *
-find_anchor (HTMLObject *self, const gchar *name, gint *x, gint *y)
+find_anchor (HTMLObject *self,
+ const gchar *name,
+ gint *x,
+ gint *y)
{
HTMLFrame *frame;
HTMLAnchor *anchor;
@@ -401,7 +428,8 @@ find_anchor (HTMLObject *self, const gchar *name, gint *x, gint *y)
}
void
-html_frame_set_margin_width (HTMLFrame *frame, gint margin_width)
+html_frame_set_margin_width (HTMLFrame *frame,
+ gint margin_width)
{
HTMLEngine *e;
@@ -412,7 +440,8 @@ html_frame_set_margin_width (HTMLFrame *frame, gint margin_width)
}
void
-html_frame_set_margin_height (HTMLFrame *frame, gint margin_height)
+html_frame_set_margin_height (HTMLFrame *frame,
+ gint margin_height)
{
HTMLEngine *e;
@@ -423,7 +452,8 @@ html_frame_set_margin_height (HTMLFrame *frame, gint margin_height)
}
void
-html_frame_set_scrolling (HTMLFrame *frame, GtkPolicyType scroll)
+html_frame_set_scrolling (HTMLFrame *frame,
+ GtkPolicyType scroll)
{
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (frame->scroll),
@@ -431,7 +461,9 @@ html_frame_set_scrolling (HTMLFrame *frame, GtkPolicyType scroll)
}
void
-html_frame_set_size (HTMLFrame *frame, gint width, gint height)
+html_frame_set_size (HTMLFrame *frame,
+ gint width,
+ gint height)
{
g_return_if_fail (frame != NULL);
@@ -446,12 +478,12 @@ html_frame_set_size (HTMLFrame *frame, gint width, gint height)
void
html_frame_init (HTMLFrame *frame,
- HTMLFrameClass *klass,
- GtkWidget *parent,
- gchar *src,
- gint width,
- gint height,
- gboolean border)
+ HTMLFrameClass *klass,
+ GtkWidget *parent,
+ gchar *src,
+ gint width,
+ gint height,
+ gboolean border)
{
HTMLEmbedded *em = HTML_EMBEDDED (frame);
HTMLTokenizer *new_tokenizer;
@@ -561,8 +593,8 @@ html_frame_type_init (void)
void
html_frame_class_init (HTMLFrameClass *klass,
- HTMLType type,
- guint size)
+ HTMLType type,
+ guint size)
{
HTMLEmbeddedClass *embedded_class;
HTMLObjectClass *object_class;
diff --git a/gtkhtml/htmlframe.h b/gtkhtml/htmlframe.h
index a908ae3..032f89b 100644
--- a/gtkhtml/htmlframe.h
+++ b/gtkhtml/htmlframe.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLFRAME_H_
diff --git a/gtkhtml/htmlframeset.c b/gtkhtml/htmlframeset.c
index 34f0241..67193dd 100644
--- a/gtkhtml/htmlframeset.c
+++ b/gtkhtml/htmlframeset.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -72,7 +72,8 @@ html_frameset_get_view_width (HTMLFrameset *set)
}
gboolean
-html_frameset_append (HTMLFrameset *set, HTMLObject *frame)
+html_frameset_append (HTMLFrameset *set,
+ HTMLObject *frame)
{
g_return_val_if_fail (frame != NULL, FALSE);
g_return_val_if_fail (set != NULL, FALSE);
@@ -86,7 +87,9 @@ html_frameset_append (HTMLFrameset *set, HTMLObject *frame)
}
static void
-calc_dimension (GPtrArray *dim, gint *span, gint total)
+calc_dimension (GPtrArray *dim,
+ gint *span,
+ gint total)
{
HTMLLength *len;
gint i;
@@ -147,7 +150,9 @@ calc_dimension (GPtrArray *dim, gint *span, gint total)
}
static gboolean
-html_frameset_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_frameset_real_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLFrameset *set = HTML_FRAMESET (o);
HTMLObject *frame = NULL;
@@ -241,9 +246,12 @@ html_frameset_init (HTMLFrameset *set,
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLFrameset *set;
gint i;
@@ -278,7 +286,9 @@ destroy (HTMLObject *self)
}
static void
-set_max_width (HTMLObject *o, HTMLPainter *painter, gint w)
+set_max_width (HTMLObject *o,
+ HTMLPainter *painter,
+ gint w)
{
HTMLFrameset *set = HTML_FRAMESET (o);
gint remain_x;
@@ -300,12 +310,13 @@ set_max_width (HTMLObject *o, HTMLPainter *painter, gint w)
g_free (widths);
}
-static HTMLObject*
+static HTMLObject *
check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
HTMLFrameset *set = HTML_FRAMESET (self);
HTMLObject *obj;
@@ -337,19 +348,19 @@ reset (HTMLObject *self)
{
HTMLFrameset *set;
gint i;
-
+ *
(* HTML_OBJECT_CLASS (parent_class)->reset) (self);
set = HTML_FRAMESET (self);
for (i = 0; i < set->frames->len; i++)
html_object_reset (g_ptr_array_index (set->frames, i));
-
+ *
} */
static void
forall (HTMLObject *self,
- HTMLEngine *e,
- HTMLObjectForallFunc func,
- gpointer data)
+ HTMLEngine *e,
+ HTMLObjectForallFunc func,
+ gpointer data)
{
HTMLFrameset *set;
gint i;
@@ -361,7 +372,9 @@ forall (HTMLObject *self,
}
HTMLObject *
-html_frameset_new (GtkHTML *parent, gchar *rows, gchar *cols)
+html_frameset_new (GtkHTML *parent,
+ gchar *rows,
+ gchar *cols)
{
HTMLFrameset *set;
@@ -373,7 +386,8 @@ html_frameset_new (GtkHTML *parent, gchar *rows, gchar *cols)
}
static gint
-calc_min_width (HTMLObject *o, HTMLPainter *p)
+calc_min_width (HTMLObject *o,
+ HTMLPainter *p)
{
return -1;
}
@@ -386,8 +400,8 @@ html_frameset_type_init (void)
void
html_frameset_class_init (HTMLFramesetClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
HTMLObjectClass *object_class = HTML_OBJECT_CLASS (klass);
diff --git a/gtkhtml/htmlframeset.h b/gtkhtml/htmlframeset.h
index fda0110..ff19a0e 100644
--- a/gtkhtml/htmlframeset.h
+++ b/gtkhtml/htmlframeset.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2001 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2001 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLFRAMESET_H_
diff --git a/gtkhtml/htmlgdkpainter.c b/gtkhtml/htmlgdkpainter.c
index 27fa197..4ffe0ec 100644
--- a/gtkhtml/htmlgdkpainter.c
+++ b/gtkhtml/htmlgdkpainter.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -68,22 +68,22 @@ finalize (GObject *object)
static void
alloc_color (HTMLPainter *painter,
- GdkColor *color)
+ GdkColor *color)
{
}
static void
free_color (HTMLPainter *painter,
- GdkColor *color)
+ GdkColor *color)
{
}
static void
-_cairo_draw_line (cairo_t *cr,
- gint x1,
- gint y1,
- gint x2,
- gint y2)
+_cairo_draw_line (cairo_t *cr,
+ gint x1,
+ gint y1,
+ gint x2,
+ gint y2)
{
cairo_save (cr);
@@ -119,11 +119,11 @@ _cairo_draw_rectangle (cairo_t *cr,
static void
_cairo_draw_ellipse (cairo_t *cr,
- gboolean filled,
- gint x,
- gint y,
- gint width,
- gint height)
+ gboolean filled,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
cairo_save (cr);
@@ -141,11 +141,11 @@ _cairo_draw_ellipse (cairo_t *cr,
}
static void
-_cairo_draw_glyphs (cairo_t *cr,
- PangoFont *font,
- gint x,
- gint y,
- PangoGlyphString *glyphs)
+_cairo_draw_glyphs (cairo_t *cr,
+ PangoFont *font,
+ gint x,
+ gint y,
+ PangoGlyphString *glyphs)
{
cairo_save (cr);
cairo_move_to (cr, x, y);
@@ -155,7 +155,11 @@ _cairo_draw_glyphs (cairo_t *cr,
static void
-begin (HTMLPainter *painter, gint x1, gint y1, gint x2, gint y2)
+begin (HTMLPainter *painter,
+ gint x1,
+ gint y1,
+ gint x2,
+ gint y2)
{
HTMLGdkPainter *gdk_painter;
@@ -256,8 +260,10 @@ clear (HTMLPainter *painter)
static void
set_clip_rectangle (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
HTMLGdkPainter *gdk_painter;
GdkRectangle rect;
@@ -280,14 +286,14 @@ set_clip_rectangle (HTMLPainter *painter,
static void
set_background_color (HTMLPainter *painter,
- const GdkColor *color)
+ const GdkColor *color)
{
g_warning ("HTMLGdkPainter::set_background_color() needs to be implemented.");
}
static void
set_pen (HTMLPainter *painter,
- const GdkColor *color)
+ const GdkColor *color)
{
HTMLGdkPainter *gdk_painter;
@@ -311,25 +317,33 @@ get_black (const HTMLPainter *painter)
static void
draw_line (HTMLPainter *painter,
- gint x1, gint y1,
- gint x2, gint y2)
+ gint x1,
+ gint y1,
+ gint x2,
+ gint y2)
{
- HTMLGdkPainter *gdk_painter;
+ HTMLGdkPainter *gdk_painter;
- gdk_painter = HTML_GDK_PAINTER (painter);
+ gdk_painter = HTML_GDK_PAINTER (painter);
- x1 -= gdk_painter->x1;
- y1 -= gdk_painter->y1;
- x2 -= gdk_painter->x1;
- y2 -= gdk_painter->y1;
+ x1 -= gdk_painter->x1;
+ y1 -= gdk_painter->y1;
+ x2 -= gdk_painter->x1;
+ y2 -= gdk_painter->y1;
- _cairo_draw_line (gdk_painter->cr, x1, y1, x2, y2);
+ _cairo_draw_line (gdk_painter->cr,
+ x1,
+ y1,
+ x2,
+ y2);
}
static void
draw_ellipse (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
HTMLGdkPainter *gdk_painter;
@@ -341,8 +355,10 @@ draw_ellipse (HTMLPainter *painter,
static void
draw_rect (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
HTMLGdkPainter *gdk_painter;
@@ -355,11 +371,13 @@ draw_rect (HTMLPainter *painter,
static void
draw_border (HTMLPainter *painter,
- GdkColor *bg,
- gint x, gint y,
- gint width, gint height,
- HTMLBorderStyle style,
- gint bordersize)
+ GdkColor *bg,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ HTMLBorderStyle style,
+ gint bordersize)
{
HTMLGdkPainter *gdk_painter;
GdkColor *col1 = NULL, *col2 = NULL;
@@ -431,11 +449,14 @@ draw_border (HTMLPainter *painter,
static void
draw_background (HTMLPainter *painter,
- GdkColor *color,
- GdkPixbuf *pixbuf,
- gint x, gint y,
- gint width, gint height,
- gint tile_x, gint tile_y)
+ GdkColor *color,
+ GdkPixbuf *pixbuf,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tile_x,
+ gint tile_y)
{
HTMLGdkPainter *gdk_painter;
gint pw;
@@ -549,10 +570,12 @@ draw_background (HTMLPainter *painter,
static void
draw_pixmap (HTMLPainter *painter,
- GdkPixbuf *pixbuf,
- gint x, gint y,
- gint scale_width, gint scale_height,
- const GdkColor *color)
+ GdkPixbuf *pixbuf,
+ gint x,
+ gint y,
+ gint scale_width,
+ gint scale_height,
+ const GdkColor *color)
{
GdkRectangle clip, image, paint;
HTMLGdkPainter *gdk_painter;
@@ -672,8 +695,10 @@ draw_pixmap (HTMLPainter *painter,
static void
fill_rect (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
HTMLGdkPainter *gdk_painter;
@@ -685,7 +710,10 @@ fill_rect (HTMLPainter *painter,
}
static gint
-draw_spell_error (HTMLPainter *painter, gint x, gint y, gint width)
+draw_spell_error (HTMLPainter *painter,
+ gint x,
+ gint y,
+ gint width)
{
HTMLGdkPainter *gdk_painter;
const double dashes[] = { 2, 2 };
@@ -709,7 +737,10 @@ draw_spell_error (HTMLPainter *painter, gint x, gint y, gint width)
}
static void
-draw_embedded (HTMLPainter * p, HTMLEmbedded *o, gint x, gint y)
+draw_embedded (HTMLPainter *p,
+ HTMLEmbedded *o,
+ gint x,
+ gint y)
{
HTMLGdkPainter *gdk_painter = HTML_GDK_PAINTER (p);
GtkWidget *embedded_widget;
@@ -724,8 +755,8 @@ draw_embedded (HTMLPainter * p, HTMLEmbedded *o, gint x, gint y)
}
static void
-set_gdk_color_from_pango_color (GdkColor *gdkc,
- PangoColor *pc)
+set_gdk_color_from_pango_color (GdkColor *gdkc,
+ PangoColor *pc)
{
gdkc->red = pc->red;
gdkc->green = pc->green;
@@ -733,7 +764,10 @@ set_gdk_color_from_pango_color (GdkColor *gdkc,
}
static void
-set_item_gc (HTMLPainter *p, HTMLPangoProperties *properties, GdkColor **fg_color, GdkColor **bg_color)
+set_item_gc (HTMLPainter *p,
+ HTMLPangoProperties *properties,
+ GdkColor **fg_color,
+ GdkColor **bg_color)
{
if (properties->fg_color) {
*fg_color = g_new0 (GdkColor, 1);
@@ -750,7 +784,12 @@ set_item_gc (HTMLPainter *p, HTMLPangoProperties *properties, GdkColor **fg_colo
}
static gint
-draw_lines (PangoGlyphString *str, gint x, gint y, cairo_t *cr, PangoItem *item, HTMLPangoProperties *properties)
+draw_lines (PangoGlyphString *str,
+ gint x,
+ gint y,
+ cairo_t *cr,
+ PangoItem *item,
+ HTMLPangoProperties *properties)
{
PangoRectangle log_rect;
gint width, dsc, asc;
@@ -765,13 +804,19 @@ draw_lines (PangoGlyphString *str, gint x, gint y, cairo_t *cr, PangoItem *item,
_cairo_draw_line (cr, x, y + dsc - 2, x + PANGO_PIXELS (width), y + dsc - 2);
if (properties->strikethrough)
- _cairo_draw_line (cr, x, y - asc + (asc + dsc)/2, x + PANGO_PIXELS (width), y - asc + (asc + dsc)/2);
+ _cairo_draw_line (cr, x, y - asc + (asc + dsc) / 2, x + PANGO_PIXELS (width), y - asc + (asc + dsc) / 2);
return width;
}
static gint
-draw_glyphs (HTMLPainter *painter, gint x, gint y, PangoItem *item, PangoGlyphString *glyphs, GdkColor *fg, GdkColor *bg)
+draw_glyphs (HTMLPainter *painter,
+ gint x,
+ gint y,
+ PangoItem *item,
+ PangoGlyphString *glyphs,
+ GdkColor *fg,
+ GdkColor *bg)
{
HTMLGdkPainter *gdk_painter;
guint i;
@@ -819,7 +864,7 @@ draw_glyphs (HTMLPainter *painter, gint x, gint y, PangoItem *item, PangoGlyphSt
if (properties.strikethrough || properties.underline)
cw = draw_lines (glyphs, x, y, gdk_painter->cr, item, &properties);
else
- for (i=0; i < glyphs->num_glyphs; i++)
+ for (i = 0; i < glyphs->num_glyphs; i++)
cw += glyphs->glyphs[i].geometry.width;
if (fg_text_color || fg)
@@ -836,8 +881,9 @@ draw_glyphs (HTMLPainter *painter, gint x, gint y, PangoItem *item, PangoGlyphSt
static void
draw_shade_line (HTMLPainter *painter,
- gint x, gint y,
- gint width)
+ gint x,
+ gint y,
+ gint width)
{
HTMLGdkPainter *gdk_painter;
@@ -849,7 +895,7 @@ draw_shade_line (HTMLPainter *painter,
cairo_save (gdk_painter->cr);
gdk_cairo_set_source_color (gdk_painter->cr, &gdk_painter->dark);
- _cairo_draw_line (gdk_painter->cr, x, y, x+width, y);
+ _cairo_draw_line (gdk_painter->cr, x, y, x + width, y);
gdk_cairo_set_source_color (gdk_painter->cr, &gdk_painter->light);
_cairo_draw_line (gdk_painter->cr, x, y + 1, x + width, y + 1);
@@ -863,19 +909,24 @@ get_pixel_size (HTMLPainter *painter)
}
static guint
-get_page_width (HTMLPainter *painter, HTMLEngine *e)
+get_page_width (HTMLPainter *painter,
+ HTMLEngine *e)
{
return html_engine_get_view_width (e) + html_engine_get_left_border (e) + html_engine_get_right_border (e);
}
static guint
-get_page_height (HTMLPainter *painter, HTMLEngine *e)
+get_page_height (HTMLPainter *painter,
+ HTMLEngine *e)
{
return html_engine_get_view_height (e) + html_engine_get_top_border (e) + html_engine_get_bottom_border (e);
}
static void
-init_color (GdkColor *color, gushort red, gushort green, gushort blue)
+init_color (GdkColor *color,
+ gushort red,
+ gushort green,
+ gushort blue)
{
color->pixel = 0;
color->red = red;
@@ -911,7 +962,8 @@ html_gdk_painter_init (GObject *object)
}
static void
-html_gdk_painter_real_set_widget (HTMLPainter *painter, GtkWidget *widget)
+html_gdk_painter_real_set_widget (HTMLPainter *painter,
+ GtkWidget *widget)
{
parent_class->set_widget (painter, widget);
@@ -982,7 +1034,8 @@ html_gdk_painter_get_type (void)
}
HTMLPainter *
-html_gdk_painter_new (GtkWidget *widget, gboolean double_buffer)
+html_gdk_painter_new (GtkWidget *widget,
+ gboolean double_buffer)
{
HTMLGdkPainter *new;
@@ -996,7 +1049,7 @@ html_gdk_painter_new (GtkWidget *widget, gboolean double_buffer)
void
html_gdk_painter_realize (HTMLGdkPainter *gdk_painter,
- GdkWindow *window)
+ GdkWindow *window)
{
g_return_if_fail (gdk_painter != NULL);
g_return_if_fail (window != NULL);
diff --git a/gtkhtml/htmlgdkpainter.h b/gtkhtml/htmlgdkpainter.h
index d7c4212..98755b5 100644
--- a/gtkhtml/htmlgdkpainter.h
+++ b/gtkhtml/htmlgdkpainter.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLGDKPAINTER_H
diff --git a/gtkhtml/htmlhidden.c b/gtkhtml/htmlhidden.c
index 748d7fa..95bad05 100644
--- a/gtkhtml/htmlhidden.c
+++ b/gtkhtml/htmlhidden.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -28,7 +28,8 @@ static HTMLEmbeddedClass *parent_class = NULL;
static gchar *
-encode (HTMLEmbedded *e, const gchar *codepage)
+encode (HTMLEmbedded *e,
+ const gchar *codepage)
{
GString *encoding = g_string_new ("");
gchar *ptr;
diff --git a/gtkhtml/htmlhidden.h b/gtkhtml/htmlhidden.h
index a40ab8f..4c68fa8 100644
--- a/gtkhtml/htmlhidden.h
+++ b/gtkhtml/htmlhidden.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLHIDDEN_H_
#define _HTMLHIDDEN_H_
diff --git a/gtkhtml/htmliframe.c b/gtkhtml/htmliframe.c
index 8560127..af905b0 100644
--- a/gtkhtml/htmliframe.c
+++ b/gtkhtml/htmliframe.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -42,7 +42,9 @@ HTMLIFrameClass html_iframe_class;
static HTMLEmbeddedClass *parent_class = NULL;
static void
-iframe_set_base (GtkHTML *html, const gchar *url, gpointer data)
+iframe_set_base (GtkHTML *html,
+ const gchar *url,
+ gpointer data)
{
gchar *new_url = gtk_html_get_url_base_relative (html, url);
@@ -51,7 +53,10 @@ iframe_set_base (GtkHTML *html, const gchar *url, gpointer data)
}
static void
-iframe_url_requested (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data)
+iframe_url_requested (GtkHTML *html,
+ const gchar *url,
+ GtkHTMLStream *handle,
+ gpointer data)
{
HTMLIFrame *iframe = HTML_IFRAME (data);
GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (iframe)->parent);
@@ -61,7 +66,8 @@ iframe_url_requested (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gp
}
static void
-iframe_size_changed (GtkHTML *html, gpointer data)
+iframe_size_changed (GtkHTML *html,
+ gpointer data)
{
HTMLIFrame *iframe = HTML_IFRAME (data);
GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (iframe)->parent);
@@ -70,7 +76,9 @@ iframe_size_changed (GtkHTML *html, gpointer data)
}
static gboolean
-iframe_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
+iframe_object_requested (GtkHTML *html,
+ GtkHTMLEmbedded *eb,
+ gpointer data)
{
HTMLIFrame *iframe = HTML_IFRAME (data);
GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (iframe)->parent);
@@ -82,7 +90,8 @@ iframe_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
}
static void
-iframe_set_gdk_painter (HTMLIFrame *iframe, HTMLPainter *painter)
+iframe_set_gdk_painter (HTMLIFrame *iframe,
+ HTMLPainter *painter)
{
if (painter)
g_object_ref (G_OBJECT (painter));
@@ -95,10 +104,10 @@ iframe_set_gdk_painter (HTMLIFrame *iframe, HTMLPainter *painter)
HTMLObject *
html_iframe_new (GtkWidget *parent,
- gchar *src,
- gint width,
- gint height,
- gboolean border)
+ gchar *src,
+ gint width,
+ gint height,
+ gboolean border)
{
HTMLIFrame *iframe;
@@ -116,7 +125,8 @@ html_iframe_new (GtkWidget *parent,
}
static gboolean
-html_iframe_grab_cursor (GtkWidget *iframe, GdkEvent *event)
+html_iframe_grab_cursor (GtkWidget *iframe,
+ GdkEvent *event)
{
/* Keep the focus! Fight the power */
return TRUE;
@@ -124,7 +134,7 @@ html_iframe_grab_cursor (GtkWidget *iframe, GdkEvent *event)
static gint
calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLIFrame *iframe;
@@ -136,7 +146,9 @@ calc_min_width (HTMLObject *o,
}
static void
-set_max_width (HTMLObject *o, HTMLPainter *painter, gint max_width)
+set_max_width (HTMLObject *o,
+ HTMLPainter *painter,
+ gint max_width)
{
HTMLEngine *e = GTK_HTML (HTML_IFRAME (o)->html)->engine;
@@ -161,9 +173,12 @@ reset (HTMLObject *o)
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLIFrame *iframe = HTML_IFRAME (o);
HTMLEngine *e = GTK_HTML (iframe->html)->engine;
@@ -185,7 +200,8 @@ draw (HTMLObject *o,
}
static void
-set_painter (HTMLObject *o, HTMLPainter *painter)
+set_painter (HTMLObject *o,
+ HTMLPainter *painter)
{
HTMLIFrame *iframe;
@@ -200,9 +216,9 @@ set_painter (HTMLObject *o, HTMLPainter *painter)
static void
forall (HTMLObject *self,
- HTMLEngine *e,
- HTMLObjectForallFunc func,
- gpointer data)
+ HTMLEngine *e,
+ HTMLObjectForallFunc func,
+ gpointer data)
{
HTMLIFrame *iframe;
@@ -212,13 +228,15 @@ forall (HTMLObject *self,
}
static gint
-check_page_split (HTMLObject *self, HTMLPainter *p, gint y)
+check_page_split (HTMLObject *self,
+ HTMLPainter *p,
+ gint y)
{
HTMLEngine *e = GTK_HTML (HTML_IFRAME (self)->html)->engine;
gint y1, y2, pixel_size = html_painter_get_pixel_size (p);
- y1 = self->y - self->ascent + pixel_size*html_engine_get_top_border (e);
- y2 = self->y + self->descent + pixel_size*html_engine_get_bottom_border (e);
+ y1 = self->y - self->ascent + pixel_size * html_engine_get_top_border (e);
+ y2 = self->y + self->descent + pixel_size * html_engine_get_bottom_border (e);
if (y1 > y)
return 0;
@@ -257,7 +275,12 @@ copy (HTMLObject *self,
}
static HTMLObject *
-op_copy (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList *to, guint *len)
+op_copy (HTMLObject *self,
+ HTMLObject *parent,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ guint *len)
{
HTMLObject *dup, *clue;
@@ -273,7 +296,10 @@ op_copy (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList
}
static HTMLAnchor *
-find_anchor (HTMLObject *self, const gchar *name, gint *x, gint *y)
+find_anchor (HTMLObject *self,
+ const gchar *name,
+ gint *x,
+ gint *y)
{
HTMLIFrame *iframe;
HTMLAnchor *anchor;
@@ -296,7 +322,8 @@ find_anchor (HTMLObject *self, const gchar *name, gint *x, gint *y)
}
void
-html_iframe_set_margin_width (HTMLIFrame *iframe, gint margin_width)
+html_iframe_set_margin_width (HTMLIFrame *iframe,
+ gint margin_width)
{
HTMLEngine *e;
@@ -307,7 +334,8 @@ html_iframe_set_margin_width (HTMLIFrame *iframe, gint margin_width)
}
void
-html_iframe_set_margin_height (HTMLIFrame *iframe, gint margin_height)
+html_iframe_set_margin_height (HTMLIFrame *iframe,
+ gint margin_height)
{
HTMLEngine *e;
@@ -318,14 +346,17 @@ html_iframe_set_margin_height (HTMLIFrame *iframe, gint margin_height)
}
void
-html_iframe_set_scrolling (HTMLIFrame *iframe, GtkPolicyType scroll)
+html_iframe_set_scrolling (HTMLIFrame *iframe,
+ GtkPolicyType scroll)
{
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (iframe->scroll),
scroll, scroll);
}
static gboolean
-html_iframe_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_iframe_real_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLIFrame *iframe;
HTMLEngine *e;
@@ -364,7 +395,8 @@ html_iframe_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed
}
static gboolean
-search (HTMLObject *self, HTMLSearch *info)
+search (HTMLObject *self,
+ HTMLSearch *info)
{
HTMLEngine *e = GTK_HTML (HTML_IFRAME (self)->html)->engine;
@@ -404,17 +436,19 @@ tail (HTMLObject *self)
}
static HTMLEngine *
-get_engine (HTMLObject *self, HTMLEngine *e)
+get_engine (HTMLObject *self,
+ HTMLEngine *e)
{
return GTK_HTML (HTML_IFRAME (self)->html)->engine;
}
-static HTMLObject*
+static HTMLObject *
check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
HTMLEngine *e = GTK_HTML (HTML_IFRAME (self)->html)->engine;
@@ -436,13 +470,14 @@ is_container (HTMLObject *self)
static void
append_selection_string (HTMLObject *self,
- GString *buffer)
+ GString *buffer)
{
html_object_append_selection_string (GTK_HTML (HTML_IFRAME (self)->html)->engine->clue, buffer);
}
static void
-reparent (HTMLEmbedded *emb, GtkWidget *html)
+reparent (HTMLEmbedded *emb,
+ GtkWidget *html)
{
HTMLIFrame *iframe = HTML_IFRAME (emb);
@@ -454,10 +489,10 @@ reparent (HTMLEmbedded *emb, GtkWidget *html)
/* static gboolean
select_range (HTMLObject *self,
- HTMLEngine *engine,
- guint start,
- gint length,
- gboolean queue_draw)
+ * HTMLEngine *engine,
+ * guint start,
+ * gint length,
+ * gboolean queue_draw)
{
return html_object_select_range (GTK_HTML (HTML_IFRAME (self)->html)->engine->clue,
GTK_HTML (HTML_IFRAME (self)->html)->engine,
@@ -522,8 +557,8 @@ save (HTMLObject *s,
static gboolean
save_plain (HTMLObject *s,
- HTMLEngineSaveState *state,
- gint requested_width)
+ HTMLEngineSaveState *state,
+ gint requested_width)
{
HTMLIFrame *iframe = HTML_IFRAME (s);
HTMLEngineSaveState *buffer;
@@ -566,12 +601,12 @@ destroy (HTMLObject *o)
void
html_iframe_init (HTMLIFrame *iframe,
- HTMLIFrameClass *klass,
- GtkWidget *parent,
- gchar *src,
- gint width,
- gint height,
- gboolean border)
+ HTMLIFrameClass *klass,
+ GtkWidget *parent,
+ gchar *src,
+ gint width,
+ gint height,
+ gboolean border)
{
HTMLEmbedded *em = HTML_EMBEDDED (iframe);
HTMLTokenizer *new_tokenizer;
@@ -689,8 +724,8 @@ html_iframe_type_init (void)
void
html_iframe_class_init (HTMLIFrameClass *klass,
- HTMLType type,
- guint size)
+ HTMLType type,
+ guint size)
{
HTMLEmbeddedClass *embedded_class;
HTMLObjectClass *object_class;
diff --git a/gtkhtml/htmliframe.h b/gtkhtml/htmliframe.h
index f1ba464..7320b51 100644
--- a/gtkhtml/htmliframe.h
+++ b/gtkhtml/htmliframe.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLIFRAME_H_
diff --git a/gtkhtml/htmlimage.c b/gtkhtml/htmlimage.c
index 802e974..9e7210d 100644
--- a/gtkhtml/htmlimage.c
+++ b/gtkhtml/htmlimage.c
@@ -1,26 +1,26 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999 Red Hat Software
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999 Red Hat Software
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
*/
#include <config.h>
@@ -73,7 +73,8 @@ static void html_image_pointer_start_animation (HTMLImagePointe
static GdkPixbuf * html_image_factory_get_missing (HTMLImageFactory *factory);
guint
-html_image_get_actual_width (HTMLImage *image, HTMLPainter *painter)
+html_image_get_actual_width (HTMLImage *image,
+ HTMLPainter *painter)
{
GdkPixbufAnimation *anim = image->image_ptr->animation;
gint pixel_size = painter ? html_painter_get_pixel_size (painter) : 1;
@@ -81,7 +82,7 @@ html_image_get_actual_width (HTMLImage *image, HTMLPainter *painter)
if (image->percent_width) {
/* The cast to `gdouble' is to avoid overflow (eg. when
- printing). */
+ * printing). */
width = ((gdouble) HTML_OBJECT (image)->max_width
* image->specified_width) / 100;
} else if (image->specified_width > 0) {
@@ -106,7 +107,8 @@ html_image_get_actual_width (HTMLImage *image, HTMLPainter *painter)
}
guint
-html_image_get_actual_height (HTMLImage *image, HTMLPainter *painter)
+html_image_get_actual_height (HTMLImage *image,
+ HTMLPainter *painter)
{
GdkPixbufAnimation *anim = image->image_ptr->animation;
gint pixel_size = painter ? html_painter_get_pixel_size (painter) : 1;
@@ -114,7 +116,7 @@ html_image_get_actual_height (HTMLImage *image, HTMLPainter *painter)
if (image->percent_height) {
/* The cast to `gdouble' is to avoid overflow (eg. when
- printing). */
+ * printing). */
height = ((gdouble) html_engine_get_view_height (image->image_ptr->factory->engine)
* image->specified_height) / 100;
} else if (image->specified_height > 0) {
@@ -141,9 +143,9 @@ html_image_get_actual_height (HTMLImage *image, HTMLPainter *painter)
/* HTMLObject methods. */
/* FIXME: We should close the stream here, too. But in practice we cannot
- because the stream pointer might be invalid at this point, and there is no
- way to set it to NULL when the stream is closed. This clearly sucks and
- must be fixed. */
+ * because the stream pointer might be invalid at this point, and there is no
+ * way to set it to NULL when the stream is closed. This clearly sucks and
+ * must be fixed. */
static void
destroy (HTMLObject *o)
{
@@ -209,7 +211,9 @@ copy (HTMLObject *self,
}
static void
-image_update_url (HTMLImage *image, gint x, gint y)
+image_update_url (HTMLImage *image,
+ gint x,
+ gint y)
{
HTMLMap *map;
HTMLObject *o = HTML_OBJECT (image);
@@ -243,10 +247,11 @@ image_update_url (HTMLImage *image, gint x, gint y)
static HTMLObject *
check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
if ((x >= self->x)
&& (x < (self->x + self->width))
@@ -264,7 +269,7 @@ check_point (HTMLObject *self,
static gint
calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLImage *image = HTML_IMAGE (o);
guint pixel_size;
@@ -284,7 +289,7 @@ calc_min_width (HTMLObject *o,
static gint
calc_preferred_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLImage *image = HTML_IMAGE (o);
guint width;
@@ -296,7 +301,9 @@ calc_preferred_width (HTMLObject *o,
}
static gboolean
-html_image_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_image_real_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLImage *image;
guint pixel_size;
@@ -339,7 +346,14 @@ html_image_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_
}
static void
-draw_plain (HTMLObject *o, HTMLPainter *p, gint x, gint y, gint width, gint height, gint tx, gint ty)
+draw_plain (HTMLObject *o,
+ HTMLPainter *p,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLImage *img = HTML_IMAGE (o);
HTMLEngine *e;
@@ -375,7 +389,9 @@ draw_plain (HTMLObject *o, HTMLPainter *p, gint x, gint y, gint width, gint heig
}
static void
-draw_focus (HTMLImage *image, HTMLPainter *painter, GdkRectangle *box)
+draw_focus (HTMLImage *image,
+ HTMLPainter *painter,
+ GdkRectangle *box)
{
HTMLGdkPainter *p;
const double dashes[] = { 1, 1 };
@@ -407,9 +423,12 @@ draw_focus (HTMLImage *image, HTMLPainter *painter, GdkRectangle *box)
static void
draw (HTMLObject *o,
HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLImage *image;
HTMLImagePointer *ip;
@@ -553,7 +572,8 @@ draw (HTMLObject *o,
}
gchar *
-html_image_resolve_image_url (GtkHTML *html, gchar *image_url)
+html_image_resolve_image_url (GtkHTML *html,
+ gchar *image_url)
{
gchar *url = NULL;
@@ -671,8 +691,8 @@ save (HTMLObject *self,
static gboolean
save_plain (HTMLObject *self,
- HTMLEngineSaveState *state,
- gint requested_width)
+ HTMLEngineSaveState *state,
+ gint requested_width)
{
HTMLImage *image;
gboolean rv = TRUE;
@@ -686,7 +706,8 @@ save_plain (HTMLObject *self,
}
static const gchar *
-get_url (HTMLObject *o, gint offset)
+get_url (HTMLObject *o,
+ gint offset)
{
HTMLImage *image;
@@ -695,7 +716,8 @@ get_url (HTMLObject *o, gint offset)
}
static const gchar *
-get_target (HTMLObject *o, gint offset)
+get_target (HTMLObject *o,
+ gint offset)
{
HTMLImage *image;
@@ -713,7 +735,10 @@ get_src (HTMLObject *o)
}
static HTMLObject *
-set_link (HTMLObject *self, HTMLColor *color, const gchar *url, const gchar *target)
+set_link (HTMLObject *self,
+ HTMLColor *color,
+ const gchar *url,
+ const gchar *target)
{
HTMLImage *image = HTML_IMAGE (self);
@@ -750,10 +775,10 @@ get_valign (HTMLObject *self)
static gboolean
select_range (HTMLObject *self,
- HTMLEngine *engine,
- guint offset,
- gint length,
- gboolean queue_draw)
+ HTMLEngine *engine,
+ guint offset,
+ gint length,
+ gboolean queue_draw)
{
/* printf ("IMAGE: select range\n"); */
if ((*parent_class->select_range) (self, engine, offset, length, queue_draw)) {
@@ -775,8 +800,8 @@ html_image_type_init (void)
void
html_image_class_init (HTMLImageClass *image_class,
- HTMLType type,
- guint size)
+ HTMLType type,
+ guint size)
{
HTMLObjectClass *object_class;
@@ -806,17 +831,19 @@ html_image_class_init (HTMLImageClass *image_class,
void
html_image_init (HTMLImage *image,
- HTMLImageClass *klass,
- HTMLImageFactory *imf,
- const gchar *filename,
- const gchar *url,
- const gchar *target,
- gint16 width, gint16 height,
- gboolean percent_width, gboolean percent_height,
- gint8 border,
- HTMLColor *color,
- HTMLVAlignType valign,
- gboolean reload)
+ HTMLImageClass *klass,
+ HTMLImageFactory *imf,
+ const gchar *filename,
+ const gchar *url,
+ const gchar *target,
+ gint16 width,
+ gint16 height,
+ gboolean percent_width,
+ gboolean percent_height,
+ gint8 border,
+ HTMLColor *color,
+ HTMLVAlignType valign,
+ gboolean reload)
{
HTMLObject *object;
@@ -862,15 +889,17 @@ html_image_init (HTMLImage *image,
HTMLObject *
html_image_new (HTMLImageFactory *imf,
- const gchar *filename,
- const gchar *url,
- const gchar *target,
- gint16 width, gint16 height,
- gboolean percent_width, gboolean percent_height,
- gint8 border,
- HTMLColor *color,
- HTMLVAlignType valign,
- gboolean reload)
+ const gchar *filename,
+ const gchar *url,
+ const gchar *target,
+ gint16 width,
+ gint16 height,
+ gboolean percent_width,
+ gboolean percent_height,
+ gint8 border,
+ HTMLColor *color,
+ HTMLVAlignType valign,
+ gboolean reload)
{
HTMLImage *image;
@@ -892,7 +921,9 @@ html_image_new (HTMLImageFactory *imf,
}
void
-html_image_set_spacing (HTMLImage *image, gint hspace, gint vspace)
+html_image_set_spacing (HTMLImage *image,
+ gint hspace,
+ gint vspace)
{
gboolean changed = FALSE;
@@ -913,7 +944,8 @@ html_image_set_spacing (HTMLImage *image, gint hspace, gint vspace)
}
void
-html_image_edit_set_url (HTMLImage *image, const gchar *url)
+html_image_edit_set_url (HTMLImage *image,
+ const gchar *url)
{
if (url) {
HTMLImageFactory *imf = image->image_ptr->factory;
@@ -927,7 +959,8 @@ html_image_edit_set_url (HTMLImage *image, const gchar *url)
}
void
-html_image_set_url (HTMLImage *image, const gchar *url)
+html_image_set_url (HTMLImage *image,
+ const gchar *url)
{
if (url && strcmp (image->image_ptr->url, url)) {
HTMLImageFactory *imf = image->image_ptr->factory;
@@ -938,7 +971,8 @@ html_image_set_url (HTMLImage *image, const gchar *url)
}
void
-html_image_set_valign (HTMLImage *image, HTMLVAlignType valign)
+html_image_set_valign (HTMLImage *image,
+ HTMLVAlignType valign)
{
if (image->valign != valign) {
image->valign = valign;
@@ -947,7 +981,8 @@ html_image_set_valign (HTMLImage *image, HTMLVAlignType valign)
}
void
-html_image_set_border (HTMLImage *image, gint border)
+html_image_set_border (HTMLImage *image,
+ gint border)
{
if (image->border != border) {
image->border = border;
@@ -957,14 +992,17 @@ html_image_set_border (HTMLImage *image, gint border)
}
void
-html_image_set_alt (HTMLImage *image, const gchar *alt)
+html_image_set_alt (HTMLImage *image,
+ const gchar *alt)
{
g_free (image->alt);
image->alt = g_strdup (alt);
}
void
-html_image_set_map (HTMLImage *image, gchar *usemap, gboolean ismap)
+html_image_set_map (HTMLImage *image,
+ gchar *usemap,
+ gboolean ismap)
{
gchar *url = NULL;
@@ -980,7 +1018,11 @@ html_image_set_map (HTMLImage *image, gchar *usemap, gboolean ismap)
}
void
-html_image_set_size (HTMLImage *image, gint w, gint h, gboolean pw, gboolean ph)
+html_image_set_size (HTMLImage *image,
+ gint w,
+ gint h,
+ gboolean pw,
+ gboolean ph)
{
gboolean changed = FALSE;
@@ -1014,7 +1056,7 @@ static gchar *fallback_image_content_types[] = { (gchar *) "image/*", NULL};
static gchar **
html_image_factory_types (GtkHTMLStream *stream,
- gpointer user_data)
+ gpointer user_data)
{
static gchar **image_content_types = NULL;
@@ -1081,7 +1123,7 @@ update_or_redraw (HTMLImagePointer *ip)
+ (image->border * 2 + 2 * image->vspace) * pixel_size;
/* printf ("%dx%d <--> %dx%d\n", w, h, HTML_OBJECT (list->data)->width,
- HTML_OBJECT (list->data)->ascent + HTML_OBJECT (list->data)->descent); */
+ * HTML_OBJECT (list->data)->ascent + HTML_OBJECT (list->data)->descent); */
if (w != HTML_OBJECT (list->data)->width
|| h != HTML_OBJECT (list->data)->ascent + HTML_OBJECT (list->data)->descent) {
@@ -1109,8 +1151,8 @@ update_or_redraw (HTMLImagePointer *ip)
static void
html_image_factory_end_pixbuf (GtkHTMLStream *stream,
- GtkHTMLStreamStatus status,
- gpointer user_data)
+ GtkHTMLStreamStatus status,
+ gpointer user_data)
{
HTMLImagePointer *ip = user_data;
@@ -1142,9 +1184,9 @@ html_image_factory_end_pixbuf (GtkHTMLStream *stream,
static void
html_image_factory_write_pixbuf (GtkHTMLStream *stream,
- const gchar *buffer,
- gsize size,
- gpointer user_data)
+ const gchar *buffer,
+ gsize size,
+ gpointer user_data)
{
HTMLImagePointer *p = user_data;
@@ -1216,7 +1258,12 @@ html_image_pointer_stop_animation (HTMLImagePointer *ip)
}
static void
-html_image_factory_area_updated (GdkPixbufLoader *loader, guint x, guint y, guint width, guint height, HTMLImagePointer *ip)
+html_image_factory_area_updated (GdkPixbufLoader *loader,
+ guint x,
+ guint y,
+ guint width,
+ guint height,
+ HTMLImagePointer *ip)
{
html_image_pointer_stop_animation (ip);
/* update will requeue */
@@ -1224,7 +1271,8 @@ html_image_factory_area_updated (GdkPixbufLoader *loader, guint x, guint y, guin
}
static void
-html_image_factory_area_prepared (GdkPixbufLoader *loader, HTMLImagePointer *ip)
+html_image_factory_area_prepared (GdkPixbufLoader *loader,
+ HTMLImagePointer *ip)
{
if (!ip->animation) {
ip->animation = gdk_pixbuf_loader_get_animation (loader);
@@ -1259,7 +1307,9 @@ html_image_factory_new (HTMLEngine *e)
}
static gboolean
-cleanup_images (gpointer key, gpointer value, gpointer free_everything)
+cleanup_images (gpointer key,
+ gpointer value,
+ gpointer free_everything)
{
HTMLImagePointer *ip = value;
@@ -1305,7 +1355,8 @@ html_image_factory_free (HTMLImageFactory *factory)
#define STALL_INTERVAL 1000
static HTMLImagePointer *
-html_image_pointer_new (const gchar *filename, HTMLImageFactory *factory)
+html_image_pointer_new (const gchar *filename,
+ HTMLImageFactory *factory)
{
HTMLImagePointer *retval;
@@ -1424,7 +1475,10 @@ html_image_pointer_load (HTMLImagePointer *ip)
}
HTMLImagePointer *
-html_image_factory_register (HTMLImageFactory *factory, HTMLImage *i, const gchar *url, gboolean reload)
+html_image_factory_register (HTMLImageFactory *factory,
+ HTMLImage *i,
+ const gchar *url,
+ gboolean reload)
{
HTMLImagePointer *ip;
GtkHTMLStream *stream = NULL;
@@ -1479,7 +1533,9 @@ html_image_factory_get_engine (HTMLImageFactory *factory)
#endif
void
-html_image_factory_unregister (HTMLImageFactory *factory, HTMLImagePointer *pointer, HTMLImage *i)
+html_image_factory_unregister (HTMLImageFactory *factory,
+ HTMLImagePointer *pointer,
+ HTMLImage *i)
{
pointer->interests = g_slist_remove (pointer->interests, i);
@@ -1503,7 +1559,9 @@ html_image_factory_unregister (HTMLImageFactory *factory, HTMLImagePointer *poin
}
static void
-stop_anim (gpointer key, gpointer value, gpointer user_data)
+stop_anim (gpointer key,
+ gpointer value,
+ gpointer user_data)
{
HTMLImagePointer *ip = value;
html_image_pointer_remove_stall (ip);
@@ -1518,7 +1576,9 @@ html_image_factory_stop_animations (HTMLImageFactory *factory)
}
static void
-start_anim (gpointer key, gpointer value, gpointer user_data)
+start_anim (gpointer key,
+ gpointer value,
+ gpointer user_data)
{
HTMLImagePointer *ip = value;
html_image_pointer_start_animation (ip);
@@ -1538,7 +1598,8 @@ html_image_factory_get_animate (HTMLImageFactory *factory)
}
void
-html_image_factory_set_animate (HTMLImageFactory *factory, gboolean animate)
+html_image_factory_set_animate (HTMLImageFactory *factory,
+ gboolean animate)
{
if (animate != factory->animate) {
factory->animate = animate;
@@ -1551,7 +1612,9 @@ html_image_factory_set_animate (HTMLImageFactory *factory, gboolean animate)
}
static gboolean
-move_image_pointers (gpointer key, gpointer value, gpointer data)
+move_image_pointers (gpointer key,
+ gpointer value,
+ gpointer data)
{
HTMLImageFactory *dst = HTML_IMAGE_FACTORY (data);
HTMLImagePointer *ip = HTML_IMAGE_POINTER (value);
@@ -1566,13 +1629,16 @@ move_image_pointers (gpointer key, gpointer value, gpointer data)
}
void
-html_image_factory_move_images (HTMLImageFactory *dst, HTMLImageFactory *src)
+html_image_factory_move_images (HTMLImageFactory *dst,
+ HTMLImageFactory *src)
{
g_hash_table_foreach_remove (src->loaded_images, move_image_pointers, dst);
}
static void
-deactivate_anim (gpointer key, gpointer value, gpointer user_data)
+deactivate_anim (gpointer key,
+ gpointer value,
+ gpointer user_data)
{
HTMLImagePointer *ip = value;
GSList *cur = ip->interests;
@@ -1594,7 +1660,9 @@ html_image_factory_deactivate_animations (HTMLImageFactory *factory)
}
static void
-ref_image_ptr (gpointer key, gpointer val, gpointer data)
+ref_image_ptr (gpointer key,
+ gpointer val,
+ gpointer data)
{
if (HTML_IMAGE_POINTER (val)->animation)
html_image_pointer_ref (HTML_IMAGE_POINTER (val));
@@ -1602,7 +1670,9 @@ ref_image_ptr (gpointer key, gpointer val, gpointer data)
}
static void
-unref_image_ptr (gpointer key, gpointer val, gpointer data)
+unref_image_ptr (gpointer key,
+ gpointer val,
+ gpointer data)
{
if (HTML_IMAGE_POINTER (val)->animation)
html_image_pointer_unref (HTML_IMAGE_POINTER (val));
@@ -1627,7 +1697,8 @@ html_image_factory_unref_all_images (HTMLImageFactory *factory)
}
void
-html_image_factory_ref_image_ptr (HTMLImageFactory *factory, const gchar *url)
+html_image_factory_ref_image_ptr (HTMLImageFactory *factory,
+ const gchar *url)
{
HTMLImagePointer *ptr;
@@ -1640,7 +1711,8 @@ html_image_factory_ref_image_ptr (HTMLImageFactory *factory, const gchar *url)
}
void
-html_image_factory_unref_image_ptr (HTMLImageFactory *factory, const gchar *url)
+html_image_factory_unref_image_ptr (HTMLImageFactory *factory,
+ const gchar *url)
{
HTMLImagePointer *ptr;
diff --git a/gtkhtml/htmlimage.h b/gtkhtml/htmlimage.h
index 4163e6d..0e85fb3 100644
--- a/gtkhtml/htmlimage.h
+++ b/gtkhtml/htmlimage.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLIMAGE_H_
#define _HTMLIMAGE_H_
diff --git a/gtkhtml/htmlimageinput.c b/gtkhtml/htmlimageinput.c
index 5db1e57..dc7ca03 100644
--- a/gtkhtml/htmlimageinput.c
+++ b/gtkhtml/htmlimageinput.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -55,9 +55,12 @@ copy (HTMLObject *self,
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTML_OBJECT (HTML_IMAGEINPUT (o)->image)->x = o->x;
HTML_OBJECT (HTML_IMAGEINPUT (o)->image)->y = o->y;
@@ -71,12 +74,12 @@ draw (HTMLObject *o,
/* Even if it's an HTMLEmbeddable, HTMLImageInput does not use a
- widget, so we need to implement these methods ourselves instead of
- using the HTMLEmbeddable default implementations. */
+ * widget, so we need to implement these methods ourselves instead of
+ * using the HTMLEmbeddable default implementations. */
static gint
calc_min_width (HTMLObject *self,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLImageInput *image_input;
@@ -87,7 +90,9 @@ calc_min_width (HTMLObject *self,
}
static gboolean
-html_image_input_real_calc_size (HTMLObject *self, HTMLPainter *painter, GList **changed_objs)
+html_image_input_real_calc_size (HTMLObject *self,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLImageInput *image_input;
HTMLObject *image_object;
@@ -107,7 +112,8 @@ html_image_input_real_calc_size (HTMLObject *self, HTMLPainter *painter, GList *
static gchar *
-encode (HTMLEmbedded *e, const gchar *codepage)
+encode (HTMLEmbedded *e,
+ const gchar *codepage)
{
GString *encoding = g_string_new ("");
gchar *ptr;
@@ -145,8 +151,8 @@ html_imageinput_type_init (void)
void
html_imageinput_class_init (HTMLImageInputClass *klass,
- HTMLType type,
- guint size)
+ HTMLType type,
+ guint size)
{
HTMLEmbeddedClass *element_class;
HTMLObjectClass *object_class;
@@ -171,9 +177,10 @@ html_imageinput_class_init (HTMLImageInputClass *klass,
void
html_imageinput_init (HTMLImageInput *img,
- HTMLImageInputClass *klass,
- HTMLImageFactory *imf,
- gchar *name, gchar *url)
+ HTMLImageInputClass *klass,
+ HTMLImageFactory *imf,
+ gchar *name,
+ gchar *url)
{
HTMLEmbedded *element;
HTMLObject *object;
@@ -198,8 +205,8 @@ html_imageinput_init (HTMLImageInput *img,
HTMLObject *
html_imageinput_new (HTMLImageFactory *imf,
- gchar *name,
- gchar *url)
+ gchar *name,
+ gchar *url)
{
HTMLImageInput *img;
diff --git a/gtkhtml/htmlimageinput.h b/gtkhtml/htmlimageinput.h
index 3796567..5f795e4 100644
--- a/gtkhtml/htmlimageinput.h
+++ b/gtkhtml/htmlimageinput.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLIMAGEINPUT_H_
#define _HTMLIMAGEINPUT_H_
diff --git a/gtkhtml/htmlinterval.c b/gtkhtml/htmlinterval.c
index 41e5148..e29fb55 100644
--- a/gtkhtml/htmlinterval.c
+++ b/gtkhtml/htmlinterval.c
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
- Authors: Radek Doulik (rodo helixcode com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -28,14 +28,17 @@
#include "htmlselection.h"
inline void
-html_point_construct (HTMLPoint *p, HTMLObject *o, guint off)
+html_point_construct (HTMLPoint *p,
+ HTMLObject *o,
+ guint off)
{
p->object = o;
p->offset = off;
}
HTMLPoint *
-html_point_new (HTMLObject *o, guint off)
+html_point_new (HTMLObject *o,
+ guint off)
{
HTMLPoint *np = g_new (HTMLPoint, 1);
html_point_construct (np, o, off);
@@ -50,7 +53,8 @@ html_point_destroy (HTMLPoint *p)
}
gboolean
-html_point_cursor_object_eq (HTMLPoint *p, HTMLPoint *c)
+html_point_cursor_object_eq (HTMLPoint *p,
+ HTMLPoint *c)
{
return p->object == c->object && (!html_object_is_container (p->object) || p->offset == c->offset);
}
@@ -62,7 +66,10 @@ html_point_next_cursor (HTMLPoint *p)
}
HTMLInterval *
-html_interval_new (HTMLObject *from, HTMLObject *to, guint from_offset, guint to_offset)
+html_interval_new (HTMLObject *from,
+ HTMLObject *to,
+ guint from_offset,
+ guint to_offset)
{
HTMLInterval *i = g_new (HTMLInterval, 1);
@@ -73,7 +80,8 @@ html_interval_new (HTMLObject *from, HTMLObject *to, guint from_offset, guint to
}
inline HTMLInterval *
-html_interval_new_from_cursor (HTMLCursor *a, HTMLCursor *b)
+html_interval_new_from_cursor (HTMLCursor *a,
+ HTMLCursor *b)
{
HTMLCursor *begin, *end;
@@ -89,7 +97,8 @@ html_interval_new_from_cursor (HTMLCursor *a, HTMLCursor *b)
}
inline HTMLInterval *
-html_interval_new_from_points (HTMLPoint *from, HTMLPoint *to)
+html_interval_new_from_points (HTMLPoint *from,
+ HTMLPoint *to)
{
return html_interval_new (from->object, to->object, from->offset, to->offset);
}
@@ -101,7 +110,8 @@ html_interval_destroy (HTMLInterval *i)
}
guint
-html_interval_get_length (HTMLInterval *i, HTMLObject *obj)
+html_interval_get_length (HTMLInterval *i,
+ HTMLObject *obj)
{
if (obj != i->from.object && obj != i->to.object)
return html_object_get_length (obj);
@@ -115,7 +125,8 @@ html_interval_get_length (HTMLInterval *i, HTMLObject *obj)
}
guint
-html_interval_get_bytes (HTMLInterval *i, HTMLObject *obj)
+html_interval_get_bytes (HTMLInterval *i,
+ HTMLObject *obj)
{
if (obj != i->from.object && obj != i->to.object)
return html_object_get_bytes (obj);
@@ -129,19 +140,23 @@ html_interval_get_bytes (HTMLInterval *i, HTMLObject *obj)
}
guint
-html_interval_get_start (HTMLInterval *i, HTMLObject *obj)
+html_interval_get_start (HTMLInterval *i,
+ HTMLObject *obj)
{
return (obj != i->from.object) ? 0 : i->from.offset;
}
guint
-html_interval_get_start_index (HTMLInterval *i, HTMLObject *obj)
+html_interval_get_start_index (HTMLInterval *i,
+ HTMLObject *obj)
{
return (obj != i->from.object) ? 0 : html_interval_get_from_index (i);
}
static void
-select_object (HTMLObject *o, HTMLEngine *e, gpointer data)
+select_object (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
HTMLInterval *i = (HTMLInterval *) data;
HTMLEngine *etop = html_engine_get_top_html_engine (e);
@@ -163,7 +178,8 @@ select_object (HTMLObject *o, HTMLEngine *e, gpointer data)
}
void
-html_interval_select (HTMLInterval *i, HTMLEngine *e)
+html_interval_select (HTMLInterval *i,
+ HTMLEngine *e)
{
html_engine_get_top_html_engine (e)->selected_in = FALSE;
i = html_interval_flat (i);
@@ -172,14 +188,17 @@ html_interval_select (HTMLInterval *i, HTMLEngine *e)
}
static void
-unselect_object (HTMLObject *o, HTMLEngine *e, gpointer data)
+unselect_object (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
if (html_interval_get_length ((HTMLInterval *) data, o))
html_object_select_range (o, e, 0, 0, !html_engine_frozen (e));
}
void
-html_interval_unselect (HTMLInterval *i, HTMLEngine *e)
+html_interval_unselect (HTMLInterval *i,
+ HTMLEngine *e)
{
i = html_interval_flat (i);
html_interval_forall (i, e, unselect_object, i);
@@ -216,7 +235,9 @@ get_downtree_line (HTMLObject *o)
}
static HTMLEngine *
-do_downtree_lines_intersection (GSList **l1, GSList **l2, HTMLEngine *e)
+do_downtree_lines_intersection (GSList **l1,
+ GSList **l2,
+ HTMLEngine *e)
{
GSList *link;
@@ -237,7 +258,12 @@ do_downtree_lines_intersection (GSList **l1, GSList **l2, HTMLEngine *e)
}
static void
-interval_forall (HTMLObject *parent, GSList *from_down, GSList *to_down, HTMLEngine *e, HTMLObjectForallFunc f, gpointer data)
+interval_forall (HTMLObject *parent,
+ GSList *from_down,
+ GSList *to_down,
+ HTMLEngine *e,
+ HTMLObjectForallFunc f,
+ gpointer data)
{
HTMLObject *o, *from, *to;
@@ -287,7 +313,10 @@ html_interval_flat (HTMLInterval *i)
}
void
-html_interval_forall (HTMLInterval *i, HTMLEngine *e, HTMLObjectForallFunc f, gpointer data)
+html_interval_forall (HTMLInterval *i,
+ HTMLEngine *e,
+ HTMLObjectForallFunc f,
+ gpointer data)
{
GSList *from_downline, *to_downline;
HTMLEngine *engine;
@@ -315,7 +344,8 @@ html_interval_forall (HTMLInterval *i, HTMLEngine *e, HTMLObjectForallFunc f, gp
}
static HTMLObject *
-html_object_children_max (HTMLObject *a, HTMLObject *b)
+html_object_children_max (HTMLObject *a,
+ HTMLObject *b)
{
HTMLObject *o;
@@ -323,14 +353,15 @@ html_object_children_max (HTMLObject *a, HTMLObject *b)
g_return_val_if_fail (b->parent, NULL);
g_return_val_if_fail (a->parent == b->parent, NULL);
- for (o=a; o; o = html_object_next_not_slave (o))
+ for (o = a; o; o = html_object_next_not_slave (o))
if (o == b)
return b;
return a;
}
HTMLPoint *
-html_point_max (HTMLPoint *a, HTMLPoint *b)
+html_point_max (HTMLPoint *a,
+ HTMLPoint *b)
{
GSList *a_downline, *b_downline;
HTMLPoint *rv = NULL;
@@ -358,13 +389,15 @@ html_point_max (HTMLPoint *a, HTMLPoint *b)
}
inline HTMLPoint *
-html_point_min (HTMLPoint *a, HTMLPoint *b)
+html_point_min (HTMLPoint *a,
+ HTMLPoint *b)
{
return a == html_point_max (a, b) ? b : a;
}
static HTMLPoint *
-max_from (HTMLInterval *a, HTMLInterval *b)
+max_from (HTMLInterval *a,
+ HTMLInterval *b)
{
if (!a->from.object)
return &b->from;
@@ -375,7 +408,8 @@ max_from (HTMLInterval *a, HTMLInterval *b)
}
static HTMLPoint *
-min_to (HTMLInterval *a, HTMLInterval *b)
+min_to (HTMLInterval *a,
+ HTMLInterval *b)
{
if (!a->to.object)
return &b->to;
@@ -386,7 +420,8 @@ min_to (HTMLInterval *a, HTMLInterval *b)
}
HTMLInterval *
-html_interval_intersection (HTMLInterval *a, HTMLInterval *b)
+html_interval_intersection (HTMLInterval *a,
+ HTMLInterval *b)
{
HTMLPoint *from, *to;
@@ -398,7 +433,10 @@ html_interval_intersection (HTMLInterval *a, HTMLInterval *b)
}
gpointer
-html_interval_substract (HTMLInterval *a, HTMLInterval *b, HTMLInterval **s1, HTMLInterval **s2)
+html_interval_substract (HTMLInterval *a,
+ HTMLInterval *b,
+ HTMLInterval **s1,
+ HTMLInterval **s2)
{
return NULL;
}
@@ -416,19 +454,22 @@ html_interval_validate (HTMLInterval *i)
}
gboolean
-html_point_eq (const HTMLPoint *a, const HTMLPoint *b)
+html_point_eq (const HTMLPoint *a,
+ const HTMLPoint *b)
{
return a->object == b->object && a->offset == b->offset;
}
gboolean
-html_interval_eq (const HTMLInterval *a, const HTMLInterval *b)
+html_interval_eq (const HTMLInterval *a,
+ const HTMLInterval *b)
{
return html_point_eq (&a->from, &b->from) && html_point_eq (&a->to, &b->to);
}
HTMLObject *
-html_interval_get_head (HTMLInterval *i, HTMLObject *o)
+html_interval_get_head (HTMLInterval *i,
+ HTMLObject *o)
{
return o == i->from.object->parent ? i->from.object : html_object_head (o);
}
diff --git a/gtkhtml/htmlinterval.h b/gtkhtml/htmlinterval.h
index d84c744..af1a967 100644
--- a/gtkhtml/htmlinterval.h
+++ b/gtkhtml/htmlinterval.h
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
- Authors: Radek Doulik (rodo helixcode com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTML_INTERVAL_H_
diff --git a/gtkhtml/htmllist.c b/gtkhtml/htmllist.c
index 29dcd6c..d988631 100644
--- a/gtkhtml/htmllist.c
+++ b/gtkhtml/htmllist.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
diff --git a/gtkhtml/htmllist.h b/gtkhtml/htmllist.h
index bdb7bb7..dd7ed7f 100644
--- a/gtkhtml/htmllist.h
+++ b/gtkhtml/htmllist.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLLIST_H_
#define _HTMLLIST_H_
diff --git a/gtkhtml/htmlmap.c b/gtkhtml/htmlmap.c
index d789e3d..48c7c37 100644
--- a/gtkhtml/htmlmap.c
+++ b/gtkhtml/htmlmap.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2001, Ximian, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2001, Ximian, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -41,7 +41,8 @@ html_map_destroy (HTMLMap *map)
}
void
-html_map_add_shape (HTMLMap *map, HTMLShape *shape)
+html_map_add_shape (HTMLMap *map,
+ HTMLShape *shape)
{
g_return_if_fail (shape != NULL);
@@ -49,7 +50,9 @@ html_map_add_shape (HTMLMap *map, HTMLShape *shape)
}
gchar *
-html_map_calc_point (HTMLMap *map, gint x, gint y)
+html_map_calc_point (HTMLMap *map,
+ gint x,
+ gint y)
{
gint i;
diff --git a/gtkhtml/htmlmap.h b/gtkhtml/htmlmap.h
index 035a7ea..62a7469 100644
--- a/gtkhtml/htmlmap.h
+++ b/gtkhtml/htmlmap.h
@@ -1,21 +1,21 @@
/* This file is part of the GtkHTML library
-
- Copyright (C) 2001, Ximian Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2001, Ximian Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLMAP_H
diff --git a/gtkhtml/htmlmarshal.c b/gtkhtml/htmlmarshal.c
index ecf477f..6ae2089 100644
--- a/gtkhtml/htmlmarshal.c
+++ b/gtkhtml/htmlmarshal.c
@@ -48,18 +48,18 @@
/* BOOL:OBJECT (htmlclosures.list:1) */
void
-html_g_cclosure_marshal_BOOLEAN__OBJECT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
+html_g_cclosure_marshal_BOOLEAN__OBJECT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT) (gpointer data1,
gpointer arg_1,
gpointer data2);
register GMarshalFunc_BOOLEAN__OBJECT callback;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
gboolean v_return;
@@ -87,18 +87,18 @@ html_g_cclosure_marshal_BOOLEAN__OBJECT (GClosure *closure,
/* BOOL:ENUM (htmlclosures.list:2) */
void
-html_g_cclosure_marshal_BOOLEAN__ENUM (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
+html_g_cclosure_marshal_BOOLEAN__ENUM (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef gboolean (*GMarshalFunc_BOOLEAN__ENUM) (gpointer data1,
gint arg_1,
gpointer data2);
register GMarshalFunc_BOOLEAN__ENUM callback;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
gboolean v_return;
@@ -126,19 +126,19 @@ html_g_cclosure_marshal_BOOLEAN__ENUM (GClosure *closure,
/* VOID:STRING,POINTER (htmlclosures.list:3) */
void
-html_g_cclosure_marshal_VOID__STRING_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
+html_g_cclosure_marshal_VOID__STRING_POINTER (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__STRING_POINTER) (gpointer data1,
gpointer arg_1,
gpointer arg_2,
gpointer data2);
register GMarshalFunc_VOID__STRING_POINTER callback;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
@@ -163,19 +163,19 @@ html_g_cclosure_marshal_VOID__STRING_POINTER (GClosure *closure,
/* VOID:POINTER,INT (htmlclosures.list:4) */
void
-html_g_cclosure_marshal_VOID__POINTER_INT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
+html_g_cclosure_marshal_VOID__POINTER_INT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__POINTER_INT) (gpointer data1,
gpointer arg_1,
gint arg_2,
gpointer data2);
register GMarshalFunc_VOID__POINTER_INT callback;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
@@ -200,12 +200,12 @@ html_g_cclosure_marshal_VOID__POINTER_INT (GClosure *closure,
/* VOID:STRING,STRING,STRING (htmlclosures.list:5) */
void
-html_g_cclosure_marshal_VOID__STRING_STRING_STRING (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
+html_g_cclosure_marshal_VOID__STRING_STRING_STRING (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING) (gpointer data1,
gpointer arg_1,
@@ -213,7 +213,7 @@ html_g_cclosure_marshal_VOID__STRING_STRING_STRING (GClosure *closure,
gpointer arg_3,
gpointer data2);
register GMarshalFunc_VOID__STRING_STRING_STRING callback;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 4);
@@ -239,12 +239,12 @@ html_g_cclosure_marshal_VOID__STRING_STRING_STRING (GClosure *closure,
/* VOID:INT,INT,FLOAT (htmlclosures.list:6) */
void
-html_g_cclosure_marshal_VOID__INT_INT_FLOAT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
+html_g_cclosure_marshal_VOID__INT_INT_FLOAT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_INT_FLOAT) (gpointer data1,
gint arg_1,
@@ -252,7 +252,7 @@ html_g_cclosure_marshal_VOID__INT_INT_FLOAT (GClosure *closure,
gfloat arg_3,
gpointer data2);
register GMarshalFunc_VOID__INT_INT_FLOAT callback;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 4);
@@ -278,12 +278,12 @@ html_g_cclosure_marshal_VOID__INT_INT_FLOAT (GClosure *closure,
/* VOID:ENUM,ENUM,FLOAT (htmlclosures.list:7) */
void
-html_g_cclosure_marshal_VOID__ENUM_ENUM_FLOAT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
+html_g_cclosure_marshal_VOID__ENUM_ENUM_FLOAT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__ENUM_ENUM_FLOAT) (gpointer data1,
gint arg_1,
@@ -291,7 +291,7 @@ html_g_cclosure_marshal_VOID__ENUM_ENUM_FLOAT (GClosure *closure,
gfloat arg_3,
gpointer data2);
register GMarshalFunc_VOID__ENUM_ENUM_FLOAT callback;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 4);
@@ -317,19 +317,19 @@ html_g_cclosure_marshal_VOID__ENUM_ENUM_FLOAT (GClosure *closure,
/* VOID:INT,INT (htmlclosures.list:8) */
void
-html_g_cclosure_marshal_VOID__INT_INT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
+html_g_cclosure_marshal_VOID__INT_INT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
gint arg_1,
gint arg_2,
gpointer data2);
register GMarshalFunc_VOID__INT_INT callback;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
@@ -354,19 +354,19 @@ html_g_cclosure_marshal_VOID__INT_INT (GClosure *closure,
/* VOID:ENUM,ENUM (htmlclosures.list:9) */
void
-html_g_cclosure_marshal_VOID__ENUM_ENUM (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
+html_g_cclosure_marshal_VOID__ENUM_ENUM (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__ENUM_ENUM) (gpointer data1,
gint arg_1,
gint arg_2,
gpointer data2);
register GMarshalFunc_VOID__ENUM_ENUM callback;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
@@ -391,12 +391,12 @@ html_g_cclosure_marshal_VOID__ENUM_ENUM (GClosure *closure,
/* VOID:POINTER,BOOL,BOOL,BOOL (htmlclosures.list:10) */
void
-html_g_cclosure_marshal_VOID__POINTER_BOOLEAN_BOOLEAN_BOOLEAN (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
+html_g_cclosure_marshal_VOID__POINTER_BOOLEAN_BOOLEAN_BOOLEAN (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__POINTER_BOOLEAN_BOOLEAN_BOOLEAN) (gpointer data1,
gpointer arg_1,
@@ -405,7 +405,7 @@ html_g_cclosure_marshal_VOID__POINTER_BOOLEAN_BOOLEAN_BOOLEAN (GClosure *clo
gboolean arg_4,
gpointer data2);
register GMarshalFunc_VOID__POINTER_BOOLEAN_BOOLEAN_BOOLEAN callback;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
g_return_if_fail (n_param_values == 5);
@@ -432,17 +432,17 @@ html_g_cclosure_marshal_VOID__POINTER_BOOLEAN_BOOLEAN_BOOLEAN (GClosure *clo
/* POINTER:VOID (htmlclosures.list:11) */
void
-html_g_cclosure_marshal_POINTER__VOID (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
+html_g_cclosure_marshal_POINTER__VOID (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ gpointer invocation_hint,
+ gpointer marshal_data)
{
typedef gpointer (*GMarshalFunc_POINTER__VOID) (gpointer data1,
gpointer data2);
register GMarshalFunc_POINTER__VOID callback;
- register GCClosure *cc = (GCClosure*) closure;
+ register GCClosure *cc = (GCClosure *) closure;
register gpointer data1, data2;
gpointer v_return;
diff --git a/gtkhtml/htmlobject.c b/gtkhtml/htmlobject.c
index b3e3c33..feae156 100644
--- a/gtkhtml/htmlobject.c
+++ b/gtkhtml/htmlobject.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -113,7 +113,12 @@ copy (HTMLObject *self,
}
static HTMLObject *
-op_copy (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList *to, guint *len)
+op_copy (HTMLObject *self,
+ HTMLObject *parent,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ guint *len)
{
if ((!from || GPOINTER_TO_INT (from->data) == 0)
&& (!to || GPOINTER_TO_INT (to->data) == html_object_get_length (self))) {
@@ -125,7 +130,13 @@ op_copy (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList
}
static HTMLObject *
-op_cut (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GList *right, guint *len)
+op_cut (HTMLObject *self,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ GList *left,
+ GList *right,
+ guint *len)
{
if ((!from || GPOINTER_TO_INT (from->data) == 0)
&& (!to || GPOINTER_TO_INT (to->data) == html_object_get_length (self))) {
@@ -153,7 +164,12 @@ op_cut (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GL
}
static gboolean
-merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **right, HTMLCursor *cursor)
+merge (HTMLObject *self,
+ HTMLObject *with,
+ HTMLEngine *e,
+ GList **left,
+ GList **right,
+ HTMLCursor *cursor)
{
if (self->parent) {
html_object_change_set (self->parent, HTML_CHANGE_ALL_CALC);
@@ -164,7 +180,8 @@ merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **
}
static void
-remove_child (HTMLObject *self, HTMLObject *child)
+remove_child (HTMLObject *self,
+ HTMLObject *child)
{
g_warning ("REMOVE CHILD unimplemented for ");
gtk_html_debug_dump_object_type (self);
@@ -172,7 +189,13 @@ remove_child (HTMLObject *self, HTMLObject *child)
}
static void
-split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint level, GList **left, GList **right)
+split (HTMLObject *self,
+ HTMLEngine *e,
+ HTMLObject *child,
+ gint offset,
+ gint level,
+ GList **left,
+ GList **right)
{
if (child || (offset && html_object_get_length (self) != offset)) {
g_warning ("don't know how to SPLIT ");
@@ -204,9 +227,12 @@ split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint lev
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
/* Do nothing by default. We don't know how to paint ourselves. */
}
@@ -219,60 +245,75 @@ is_transparent (HTMLObject *self)
static HTMLFitType
fit_line (HTMLObject *o,
- HTMLPainter *painter,
- gboolean start_of_line,
- gboolean first_run,
- gboolean next_to_floating,
- gint width_left)
+ HTMLPainter *painter,
+ gboolean start_of_line,
+ gboolean first_run,
+ gboolean next_to_floating,
+ gint width_left)
{
return (o->width <= width_left || (first_run && !next_to_floating)) ? HTML_FIT_COMPLETE : HTML_FIT_NONE;
}
static gboolean
-html_object_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_object_real_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
return FALSE;
}
static gint
-calc_min_width (HTMLObject *o, HTMLPainter *painter)
+calc_min_width (HTMLObject *o,
+ HTMLPainter *painter)
{
html_object_calc_size (o, painter, NULL);
return o->width;
}
static gint
-calc_preferred_width (HTMLObject *o, HTMLPainter *painter)
+calc_preferred_width (HTMLObject *o,
+ HTMLPainter *painter)
{
html_object_calc_size (o, painter, NULL);
return o->width;
}
static void
-set_max_width (HTMLObject *o, HTMLPainter *painter, gint max_width)
+set_max_width (HTMLObject *o,
+ HTMLPainter *painter,
+ gint max_width)
{
o->max_width = max_width;
}
static void
-set_max_height (HTMLObject *o, HTMLPainter *painter, gint max_height)
+set_max_height (HTMLObject *o,
+ HTMLPainter *painter,
+ gint max_height)
{
}
static gint
-get_left_margin (HTMLObject *self, HTMLPainter *painter, gint y, gboolean with_aligned)
+get_left_margin (HTMLObject *self,
+ HTMLPainter *painter,
+ gint y,
+ gboolean with_aligned)
{
return 0;
}
static gint
-get_right_margin (HTMLObject *self, HTMLPainter *painter, gint y, gboolean with_aligned)
+get_right_margin (HTMLObject *self,
+ HTMLPainter *painter,
+ gint y,
+ gboolean with_aligned)
{
return MAX (self->max_width, self->width);
}
static void
-set_painter (HTMLObject *o, HTMLPainter *painter)
+set_painter (HTMLObject *o,
+ HTMLPainter *painter)
{
}
@@ -280,18 +321,20 @@ static void
reset (HTMLObject *o)
{
/* o->width = 0;
- o->ascent = 0;
- o->descent = 0; */
+ * o->ascent = 0;
+ * o->descent = 0; */
}
static const gchar *
-get_url (HTMLObject *o, gint offset)
+get_url (HTMLObject *o,
+ gint offset)
{
return NULL;
}
static const gchar *
-get_target (HTMLObject *o, gint offset)
+get_target (HTMLObject *o,
+ gint offset)
{
return NULL;
}
@@ -304,21 +347,22 @@ get_src (HTMLObject *o)
static HTMLAnchor *
find_anchor (HTMLObject *o,
- const gchar *name,
- gint *x, gint *y)
+ const gchar *name,
+ gint *x,
+ gint *y)
{
return NULL;
}
static void
set_bg_color (HTMLObject *o,
- GdkColor *color)
+ GdkColor *color)
{
}
static GdkColor *
get_bg_color (HTMLObject *o,
- HTMLPainter *p)
+ HTMLPainter *p)
{
if (o->parent)
return html_object_get_bg_color (o->parent, p);
@@ -331,12 +375,13 @@ get_bg_color (HTMLObject *o,
return NULL;
}
-static HTMLObject*
+static HTMLObject *
check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
if (x >= self->x
&& x < self->x + self->width
@@ -352,11 +397,11 @@ check_point (HTMLObject *self,
static gboolean
relayout (HTMLObject *self,
- HTMLEngine *engine,
- HTMLObject *child)
+ HTMLEngine *engine,
+ HTMLObject *child)
{
/* FIXME gint types of this stuff might change in `htmlobject.h',
- remember to sync. */
+ * remember to sync. */
guint prev_width;
guint prev_ascent, prev_descent;
gboolean changed;
@@ -369,7 +414,7 @@ relayout (HTMLObject *self,
prev_descent = self->descent;
/* Notice that this will reset ascent and descent which we
- need afterwards. Yeah, yuck, bleargh. */
+ * need afterwards. Yeah, yuck, bleargh. */
html_object_reset (self);
/* Crappy hack to make crappy htmlclueflow.c happy. */
@@ -413,9 +458,9 @@ relayout (HTMLObject *self,
}
/* If the object has shrunk, we have to clean the areas around
- it so that we don't leave garbage on the screen. FIXME:
- this wastes some time if there is an object on the right of
- or under this one. */
+ * it so that we don't leave garbage on the screen. FIXME:
+ * this wastes some time if there is an object on the right of
+ * or under this one. */
if (prev_ascent + prev_descent > self->ascent + self->descent)
html_engine_queue_clear (engine,
@@ -449,10 +494,12 @@ accepts_cursor (HTMLObject *self)
static void
get_cursor (HTMLObject *self,
- HTMLPainter *painter,
- guint offset,
- gint *x1, gint *y1,
- gint *x2, gint *y2)
+ HTMLPainter *painter,
+ guint offset,
+ gint *x1,
+ gint *y1,
+ gint *x2,
+ gint *y2)
{
html_object_get_cursor_base (self, painter, offset, x2, y2);
@@ -463,9 +510,10 @@ get_cursor (HTMLObject *self,
static void
get_cursor_base (HTMLObject *self,
- HTMLPainter *painter,
- guint offset,
- gint *x, gint *y)
+ HTMLPainter *painter,
+ guint offset,
+ gint *x,
+ gint *y)
{
html_object_calc_abs_position (self, x, y);
@@ -480,7 +528,9 @@ get_length (HTMLObject *self)
}
static guint
-get_line_length (HTMLObject *self, HTMLPainter *p, gint line_offset)
+get_line_length (HTMLObject *self,
+ HTMLPainter *p,
+ gint line_offset)
{
return html_object_get_length (self);
}
@@ -493,10 +543,10 @@ get_recursive_length (HTMLObject *self)
static gboolean
select_range (HTMLObject *self,
- HTMLEngine *engine,
- guint start,
- gint length,
- gboolean queue_draw)
+ HTMLEngine *engine,
+ guint start,
+ gint length,
+ gboolean queue_draw)
{
gboolean selected;
gboolean changed;
@@ -511,22 +561,22 @@ select_range (HTMLObject *self,
static void
append_selection_string (HTMLObject *self,
- GString *buffer)
+ GString *buffer)
{
}
static void
forall (HTMLObject *self,
- HTMLEngine *e,
- HTMLObjectForallFunc func,
- gpointer data)
+ HTMLEngine *e,
+ HTMLObjectForallFunc func,
+ gpointer data)
{
(* func) (self, e, data);
}
static HTMLEngine *
get_engine (HTMLObject *self,
- HTMLEngine *e)
+ HTMLEngine *e)
{
return e;
}
@@ -546,33 +596,38 @@ save (HTMLObject *self,
static gboolean
save_plain (HTMLObject *self,
- HTMLEngineSaveState *state,
- gint requested_width)
+ HTMLEngineSaveState *state,
+ gint requested_width)
{
return TRUE;
}
static gint
-check_page_split (HTMLObject *self, HTMLPainter *p, gint y)
+check_page_split (HTMLObject *self,
+ HTMLPainter *p,
+ gint y)
{
return 0;
}
static gboolean
-search (HTMLObject *self, HTMLSearch *info)
+search (HTMLObject *self,
+ HTMLSearch *info)
{
/* not found by default */
return FALSE;
}
static HTMLObject *
-next (HTMLObject *self, HTMLObject *child)
+next (HTMLObject *self,
+ HTMLObject *child)
{
return child->next;
}
static HTMLObject *
-prev (HTMLObject *self, HTMLObject *child)
+prev (HTMLObject *self,
+ HTMLObject *child)
{
return child->prev;
}
@@ -605,7 +660,9 @@ html_object_real_get_direction (HTMLObject *o)
}
static gboolean
-html_object_real_cursor_forward (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+html_object_real_cursor_forward (HTMLObject *self,
+ HTMLCursor *cursor,
+ HTMLEngine *engine)
{
gint len;
@@ -625,7 +682,8 @@ html_object_real_cursor_forward (HTMLObject *self, HTMLCursor *cursor, HTMLEngin
}
static gboolean
-html_cursor_allow_zero_offset (HTMLCursor *cursor, HTMLObject *o)
+html_cursor_allow_zero_offset (HTMLCursor *cursor,
+ HTMLObject *o)
{
if (cursor->offset == 1) {
HTMLObject *prev;
@@ -646,7 +704,9 @@ html_cursor_allow_zero_offset (HTMLCursor *cursor, HTMLObject *o)
}
static gboolean
-html_object_real_cursor_backward (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+html_object_real_cursor_backward (HTMLObject *self,
+ HTMLCursor *cursor,
+ HTMLEngine *engine)
{
g_assert (self);
g_assert (cursor->object == self);
@@ -664,7 +724,9 @@ html_object_real_cursor_backward (HTMLObject *self, HTMLCursor *cursor, HTMLEngi
}
static gboolean
-html_object_real_cursor_right (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor)
+html_object_real_cursor_right (HTMLObject *self,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
HTMLDirection dir = html_object_get_direction (self);
@@ -696,7 +758,9 @@ html_object_real_cursor_right (HTMLObject *self, HTMLPainter *painter, HTMLCurso
}
static gboolean
-html_object_real_cursor_left (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor)
+html_object_real_cursor_left (HTMLObject *self,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
HTMLDirection dir = html_object_get_direction (self);
@@ -728,7 +792,9 @@ html_object_real_cursor_left (HTMLObject *self, HTMLPainter *painter, HTMLCursor
}
static gboolean
-html_object_real_backspace (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+html_object_real_backspace (HTMLObject *self,
+ HTMLCursor *cursor,
+ HTMLEngine *engine)
{
html_cursor_backward (cursor, engine);
html_engine_delete (engine);
@@ -737,13 +803,17 @@ html_object_real_backspace (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *en
}
static gint
-html_object_real_get_right_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offset)
+html_object_real_get_right_edge_offset (HTMLObject *o,
+ HTMLPainter *painter,
+ gint offset)
{
return html_object_get_length (o);
}
static gint
-html_object_real_get_left_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offset)
+html_object_real_get_left_edge_offset (HTMLObject *o,
+ HTMLPainter *painter,
+ gint offset)
{
return 0;
}
@@ -758,8 +828,8 @@ html_object_type_init (void)
void
html_object_class_init (HTMLObjectClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
g_return_if_fail (klass != NULL);
@@ -832,7 +902,7 @@ html_object_class_init (HTMLObjectClass *klass,
void
html_object_init (HTMLObject *o,
- HTMLObjectClass *klass)
+ HTMLObjectClass *klass)
{
o->klass = klass;
@@ -896,19 +966,35 @@ html_object_dup (HTMLObject *object)
}
HTMLObject *
-html_object_op_copy (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList *to, guint *len)
+html_object_op_copy (HTMLObject *self,
+ HTMLObject *parent,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ guint *len)
{
return (* HO_CLASS (self)->op_copy) (self, parent, e, from, to, len);
}
HTMLObject *
-html_object_op_cut (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GList *right, guint *len)
+html_object_op_cut (HTMLObject *self,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ GList *left,
+ GList *right,
+ guint *len)
{
return (* HO_CLASS (self)->op_cut) (self, e, from, to, left, right, len);
}
gboolean
-html_object_merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **right, HTMLCursor *cursor)
+html_object_merge (HTMLObject *self,
+ HTMLObject *with,
+ HTMLEngine *e,
+ GList **left,
+ GList **right,
+ HTMLCursor *cursor)
{
if ((HTML_OBJECT_TYPE (self) == HTML_OBJECT_TYPE (with)
/* FIXME */
@@ -924,7 +1010,8 @@ html_object_merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **le
}
void
-html_object_remove_child (HTMLObject *self, HTMLObject *child)
+html_object_remove_child (HTMLObject *self,
+ HTMLObject *child)
{
g_assert (self);
g_assert (child);
@@ -933,8 +1020,13 @@ html_object_remove_child (HTMLObject *self, HTMLObject *child)
}
void
-html_object_split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint level,
- GList **left, GList **right)
+html_object_split (HTMLObject *self,
+ HTMLEngine *e,
+ HTMLObject *child,
+ gint offset,
+ gint level,
+ GList **left,
+ GList **right)
{
g_assert (self);
@@ -943,14 +1035,16 @@ html_object_split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offs
void
-html_object_set_parent (HTMLObject *o, HTMLObject *parent)
+html_object_set_parent (HTMLObject *o,
+ HTMLObject *parent)
{
o->parent = parent;
}
static void
frame_offset (HTMLObject *o,
- gint *x_return, gint *y_return)
+ gint *x_return,
+ gint *y_return)
{
if (html_object_is_frame (o)) {
HTMLEngine *e = html_object_get_engine (o, NULL);
@@ -961,7 +1055,8 @@ frame_offset (HTMLObject *o,
void
html_object_calc_abs_position (HTMLObject *o,
- gint *x_return, gint *y_return)
+ gint *x_return,
+ gint *y_return)
{
HTMLObject *p;
@@ -981,7 +1076,9 @@ html_object_calc_abs_position (HTMLObject *o,
}
void
-html_object_calc_abs_position_in_frame (HTMLObject *o, gint *x_return, gint *y_return)
+html_object_calc_abs_position_in_frame (HTMLObject *o,
+ gint *x_return,
+ gint *y_return)
{
HTMLObject *p;
@@ -1001,7 +1098,8 @@ html_object_calc_abs_position_in_frame (HTMLObject *o, gint *x_return, gint *y_r
}
GdkRectangle *
-html_object_get_bounds (HTMLObject *o, GdkRectangle *bounds)
+html_object_get_bounds (HTMLObject *o,
+ GdkRectangle *bounds)
{
if (!bounds)
bounds = g_new (GdkRectangle, 1);
@@ -1015,7 +1113,12 @@ html_object_get_bounds (HTMLObject *o, GdkRectangle *bounds)
}
gboolean
-html_object_intersect (HTMLObject *o, GdkRectangle *result, gint x, gint y, gint width, gint height)
+html_object_intersect (HTMLObject *o,
+ GdkRectangle *result,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
GdkRectangle b;
GdkRectangle a;
@@ -1039,17 +1142,20 @@ html_object_destroy (HTMLObject *self)
void
html_object_copy (HTMLObject *self,
- HTMLObject *dest)
+ HTMLObject *dest)
{
(* HO_CLASS (self)->copy) (self, dest);
}
void
html_object_draw (HTMLObject *o,
- HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ HTMLPainter *p,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
(* HO_CLASS (o)->draw) (o, p, x, y, width, height, tx, ty);
}
@@ -1064,17 +1170,19 @@ html_object_is_transparent (HTMLObject *self)
HTMLFitType
html_object_fit_line (HTMLObject *o,
- HTMLPainter *painter,
- gboolean start_of_line,
- gboolean first_run,
- gboolean next_to_floating,
- gint width_left)
+ HTMLPainter *painter,
+ gboolean start_of_line,
+ gboolean first_run,
+ gboolean next_to_floating,
+ gint width_left)
{
return (* HO_CLASS (o)->fit_line) (o, painter, start_of_line, first_run, next_to_floating, width_left);
}
gboolean
-html_object_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_object_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
gboolean rv;
@@ -1085,37 +1193,50 @@ html_object_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs
}
void
-html_object_set_max_width (HTMLObject *o, HTMLPainter *painter, gint max_width)
+html_object_set_max_width (HTMLObject *o,
+ HTMLPainter *painter,
+ gint max_width)
{
(* HO_CLASS (o)->set_max_width) (o, painter, max_width);
}
void
-html_object_set_max_height (HTMLObject *o, HTMLPainter *painter, gint max_height)
+html_object_set_max_height (HTMLObject *o,
+ HTMLPainter *painter,
+ gint max_height)
{
(* HO_CLASS (o)->set_max_height) (o, painter, max_height);
}
gint
-html_object_get_left_margin (HTMLObject *self, HTMLPainter *painter, gint y, gboolean with_aligned)
+html_object_get_left_margin (HTMLObject *self,
+ HTMLPainter *painter,
+ gint y,
+ gboolean with_aligned)
{
return (* HO_CLASS (self)->get_left_margin) (self, painter, y, with_aligned);
}
gint
-html_object_get_right_margin (HTMLObject *self, HTMLPainter *painter, gint y, gboolean with_aligned)
+html_object_get_right_margin (HTMLObject *self,
+ HTMLPainter *painter,
+ gint y,
+ gboolean with_aligned)
{
return (* HO_CLASS (self)->get_right_margin) (self, painter, y, with_aligned);
}
static void
-set_painter_forall (HTMLObject *o, HTMLEngine *e, gpointer data)
+set_painter_forall (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
(* HO_CLASS (o)->set_painter) (o, HTML_PAINTER (data));
}
void
-html_object_set_painter (HTMLObject *o, HTMLPainter *painter)
+html_object_set_painter (HTMLObject *o,
+ HTMLPainter *painter)
{
html_object_forall (o, NULL, set_painter_forall, painter);
}
@@ -1128,7 +1249,7 @@ html_object_reset (HTMLObject *o)
gint
html_object_calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
if (o->change & HTML_CHANGE_MIN_WIDTH) {
o->min_width = (* HO_CLASS (o)->calc_min_width) (o, painter);
@@ -1139,7 +1260,7 @@ html_object_calc_min_width (HTMLObject *o,
gint
html_object_calc_preferred_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
if (o->change & HTML_CHANGE_PREF_WIDTH) {
o->pref_width = (* HO_CLASS (o)->calc_preferred_width) (o, painter);
@@ -1150,26 +1271,32 @@ html_object_calc_preferred_width (HTMLObject *o,
#if 0
gint
-html_object_get_uris (HTMLObject *o, gchar **link, gchar **target, gchar **src)
+html_object_get_uris (HTMLObject *o,
+ gchar **link,
+ gchar **target,
+ gchar **src)
{
return TRUE;
}
#endif
const gchar *
-html_object_get_url (HTMLObject *o, gint offset)
+html_object_get_url (HTMLObject *o,
+ gint offset)
{
return (* HO_CLASS (o)->get_url) (o, offset);
}
const gchar *
-html_object_get_target (HTMLObject *o, gint offset)
+html_object_get_target (HTMLObject *o,
+ gint offset)
{
return (* HO_CLASS (o)->get_target) (o, offset);
}
gchar *
-html_object_get_complete_url (HTMLObject *o, gint offset)
+html_object_get_complete_url (HTMLObject *o,
+ gint offset)
{
const gchar *url, *target;
@@ -1187,30 +1314,34 @@ html_object_get_src (HTMLObject *o)
HTMLAnchor *
html_object_find_anchor (HTMLObject *o,
- const gchar *name,
- gint *x, gint *y)
+ const gchar *name,
+ gint *x,
+ gint *y)
{
return (* HO_CLASS (o)->find_anchor) (o, name, x, y);
}
void
-html_object_set_bg_color (HTMLObject *o, GdkColor *color)
+html_object_set_bg_color (HTMLObject *o,
+ GdkColor *color)
{
(* HO_CLASS (o)->set_bg_color) (o, color);
}
GdkColor *
-html_object_get_bg_color (HTMLObject *o, HTMLPainter *p)
+html_object_get_bg_color (HTMLObject *o,
+ HTMLPainter *p)
{
return (* HO_CLASS (o)->get_bg_color) (o, p);
}
HTMLObject *
html_object_check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
if (self->width == 0 || self->ascent + self->descent == 0)
return NULL;
@@ -1220,8 +1351,8 @@ html_object_check_point (HTMLObject *self,
gboolean
html_object_relayout (HTMLObject *self,
- HTMLEngine *engine,
- HTMLObject *child)
+ HTMLEngine *engine,
+ HTMLObject *child)
{
g_return_val_if_fail (self != NULL, TRUE);
return (* HO_CLASS (self)->relayout) (self, engine, child);
@@ -1242,13 +1373,15 @@ html_object_accepts_cursor (HTMLObject *self)
}
/* Warning: `calc_size()' must have been called on `self' before this so that
- this works correctly. */
+ * this works correctly. */
void
html_object_get_cursor (HTMLObject *self,
- HTMLPainter *painter,
- guint offset,
- gint *x1, gint *y1,
- gint *x2, gint *y2)
+ HTMLPainter *painter,
+ guint offset,
+ gint *x1,
+ gint *y1,
+ gint *x2,
+ gint *y2)
{
(* HO_CLASS (self)->get_cursor) (self, painter, offset, x1, y1, x2, y2);
@@ -1264,12 +1397,13 @@ html_object_get_cursor (HTMLObject *self,
}
/* Warning: `calc_size()' must have been called on `self' before this so that
- this works correctly. */
+ * this works correctly. */
void
html_object_get_cursor_base (HTMLObject *self,
- HTMLPainter *painter,
- guint offset,
- gint *x, gint *y)
+ HTMLPainter *painter,
+ guint offset,
+ gint *x,
+ gint *y)
{
(* HO_CLASS (self)->get_cursor_base) (self, painter, offset, x, y);
}
@@ -1277,17 +1411,17 @@ html_object_get_cursor_base (HTMLObject *self,
gboolean
html_object_select_range (HTMLObject *self,
- HTMLEngine *engine,
- guint start,
- gint length,
- gboolean queue_draw)
+ HTMLEngine *engine,
+ guint start,
+ gint length,
+ gboolean queue_draw)
{
return (* HO_CLASS (self)->select_range) (self, engine, start, length, queue_draw);
}
void
html_object_append_selection_string (HTMLObject *self,
- GString *buffer)
+ GString *buffer)
{
g_return_if_fail (self != NULL);
g_return_if_fail (buffer != NULL);
@@ -1296,13 +1430,15 @@ html_object_append_selection_string (HTMLObject *self,
}
HTMLEngine *
-html_object_get_engine (HTMLObject *self, HTMLEngine *e)
+html_object_get_engine (HTMLObject *self,
+ HTMLEngine *e)
{
return (* HO_CLASS (self)->get_engine) (self, e);
}
HTMLEngine *
-html_object_engine (HTMLObject *o, HTMLEngine *e)
+html_object_engine (HTMLObject *o,
+ HTMLEngine *e)
{
while (o) {
e = html_object_get_engine (o, e);
@@ -1316,9 +1452,9 @@ html_object_engine (HTMLObject *o, HTMLEngine *e)
void
html_object_forall (HTMLObject *self,
- HTMLEngine *e,
- HTMLObjectForallFunc func,
- gpointer data)
+ HTMLEngine *e,
+ HTMLObjectForallFunc func,
+ gpointer data)
{
(* HO_CLASS (self)->forall) (self, e, func, data);
}
@@ -1359,7 +1495,8 @@ html_object_is_clue (HTMLObject *object)
}
HTMLObject *
-html_object_next_not_type (HTMLObject *object, HTMLType t)
+html_object_next_not_type (HTMLObject *object,
+ HTMLType t)
{
HTMLObject *p;
@@ -1374,7 +1511,8 @@ html_object_next_not_type (HTMLObject *object, HTMLType t)
}
HTMLObject *
-html_object_prev_not_type (HTMLObject *object, HTMLType t)
+html_object_prev_not_type (HTMLObject *object,
+ HTMLType t)
{
HTMLObject *p;
@@ -1403,21 +1541,23 @@ html_object_prev_not_slave (HTMLObject *object)
gboolean
html_object_save (HTMLObject *self,
- HTMLEngineSaveState *state)
+ HTMLEngineSaveState *state)
{
return (* HO_CLASS (self)->save) (self, state);
}
gboolean
html_object_save_plain (HTMLObject *self,
- HTMLEngineSaveState *state,
- gint requested_width)
+ HTMLEngineSaveState *state,
+ gint requested_width)
{
return (* HO_CLASS (self)->save_plain) (self, state, requested_width);
}
gint
-html_object_check_page_split (HTMLObject *self, HTMLPainter *p, gint y)
+html_object_check_page_split (HTMLObject *self,
+ HTMLPainter *p,
+ gint y)
{
g_return_val_if_fail (self != NULL, 0);
@@ -1425,7 +1565,8 @@ html_object_check_page_split (HTMLObject *self, HTMLPainter *p, gint y)
}
void
-html_object_change_set (HTMLObject *self, HTMLChangeFlags f)
+html_object_change_set (HTMLObject *self,
+ HTMLChangeFlags f)
{
HTMLObject *obj = self;
@@ -1440,41 +1581,46 @@ html_object_change_set (HTMLObject *self, HTMLChangeFlags f)
}
static void
-change (HTMLObject *o, HTMLEngine *e, gpointer data)
+change (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
o->change |= GPOINTER_TO_INT (data);
}
void
-html_object_change_set_down (HTMLObject *self, HTMLChangeFlags f)
+html_object_change_set_down (HTMLObject *self,
+ HTMLChangeFlags f)
{
html_object_forall (self, NULL, (HTMLObjectForallFunc) change, GINT_TO_POINTER (f));
}
gboolean
-html_object_search (HTMLObject *self, HTMLSearch *info)
+html_object_search (HTMLObject *self,
+ HTMLSearch *info)
{
return (* HO_CLASS (self)->search) (self, info);
}
gboolean
-html_object_search_next (HTMLObject *self, HTMLSearch *info)
+html_object_search_next (HTMLObject *self,
+ HTMLSearch *info)
{
return (* HO_CLASS (self)->search_next) (self, info);
}
HTMLObject *
html_object_set_link (HTMLObject *self,
- HTMLColor *color,
- const gchar *url,
- const gchar *target)
+ HTMLColor *color,
+ const gchar *url,
+ const gchar *target)
{
return (HO_CLASS (self)->set_link) ? (* HO_CLASS (self)->set_link) (self, color, url, target) : NULL;
}
HTMLObject *
html_object_remove_link (HTMLObject *self,
- HTMLColor *color)
+ HTMLColor *color)
{
return (HO_CLASS (self)->set_link) ? (* HO_CLASS (self)->set_link) (self, color, NULL, NULL) : NULL;
}
@@ -1486,7 +1632,9 @@ html_object_get_length (HTMLObject *self)
}
guint
-html_object_get_line_length (HTMLObject *self, HTMLPainter *p, gint line_offset)
+html_object_get_line_length (HTMLObject *self,
+ HTMLPainter *p,
+ gint line_offset)
{
return (* HO_CLASS (self)->get_line_length) (self, p, line_offset);
}
@@ -1498,7 +1646,8 @@ html_object_get_recursive_length (HTMLObject *self)
}
HTMLObject *
-html_object_next_by_type (HTMLObject *self, HTMLType t)
+html_object_next_by_type (HTMLObject *self,
+ HTMLType t)
{
HTMLObject *next;
@@ -1512,7 +1661,8 @@ html_object_next_by_type (HTMLObject *self, HTMLType t)
}
HTMLObject *
-html_object_prev_by_type (HTMLObject *self, HTMLType t)
+html_object_prev_by_type (HTMLObject *self,
+ HTMLType t)
{
HTMLObject *prev;
@@ -1528,13 +1678,15 @@ html_object_prev_by_type (HTMLObject *self, HTMLType t)
/* Movement functions */
HTMLObject *
-html_object_next (HTMLObject *self, HTMLObject *child)
+html_object_next (HTMLObject *self,
+ HTMLObject *child)
{
return (* HO_CLASS (self)->next) (self, child);
}
HTMLObject *
-html_object_prev (HTMLObject *self, HTMLObject *child)
+html_object_prev (HTMLObject *self,
+ HTMLObject *child)
{
return (* HO_CLASS (self)->prev) (self, child);
}
@@ -1562,43 +1714,57 @@ html_object_tail_not_slave (HTMLObject *self)
}
gboolean
-html_object_cursor_forward (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+html_object_cursor_forward (HTMLObject *self,
+ HTMLCursor *cursor,
+ HTMLEngine *engine)
{
return (* HO_CLASS (self)->cursor_forward) (self, cursor, engine);
}
gboolean
-html_object_cursor_forward_one (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+html_object_cursor_forward_one (HTMLObject *self,
+ HTMLCursor *cursor,
+ HTMLEngine *engine)
{
return (* HO_CLASS (self)->cursor_forward_one) (self, cursor, engine);
}
gboolean
-html_object_cursor_backward (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+html_object_cursor_backward (HTMLObject *self,
+ HTMLCursor *cursor,
+ HTMLEngine *engine)
{
return (* HO_CLASS (self)->cursor_backward) (self, cursor, engine);
}
gboolean
-html_object_cursor_backward_one (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+html_object_cursor_backward_one (HTMLObject *self,
+ HTMLCursor *cursor,
+ HTMLEngine *engine)
{
return (* HO_CLASS (self)->cursor_backward_one) (self, cursor, engine);
}
gboolean
-html_object_cursor_right (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor)
+html_object_cursor_right (HTMLObject *self,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
return (* HO_CLASS (self)->cursor_right) (self, painter, cursor);
}
gboolean
-html_object_cursor_left (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor)
+html_object_cursor_left (HTMLObject *self,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
return (* HO_CLASS (self)->cursor_left) (self, painter, cursor);
}
gboolean
-html_object_backspace (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+html_object_backspace (HTMLObject *self,
+ HTMLCursor *cursor,
+ HTMLEngine *engine)
{
return (* HO_CLASS (self)->backspace) (self, cursor, engine);
}
@@ -1610,7 +1776,9 @@ html_object_backspace (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
/* go up in tree so long as we can get object in neighborhood given by function next_fn */
static HTMLObject *
-next_object_uptree (HTMLObject *obj, HTMLObject * (*next_fn ) (HTMLObject *, HTMLObject *))
+next_object_uptree (HTMLObject *obj,
+ HTMLObject * (*next_fn) (HTMLObject *,
+ HTMLObject *))
{
HTMLObject *next = NULL;
@@ -1623,7 +1791,8 @@ next_object_uptree (HTMLObject *obj, HTMLObject * (*next_fn ) (HTMLObject *, HTM
/* go down in tree to leaf in way given by down_fn children */
static HTMLObject *
-move_object_downtree (HTMLObject *obj, HTMLObject * (*down_fn ) (HTMLObject *))
+move_object_downtree (HTMLObject *obj,
+ HTMLObject * (*down_fn) (HTMLObject *))
{
HTMLObject *down;
@@ -1634,7 +1803,10 @@ move_object_downtree (HTMLObject *obj, HTMLObject * (*down_fn ) (HTMLObject *))
}
static HTMLObject *
-move_object (HTMLObject *obj, HTMLObject * (*next_fn ) (HTMLObject *, HTMLObject *), HTMLObject * (*down_fn ) (HTMLObject *))
+move_object (HTMLObject *obj,
+ HTMLObject * (*next_fn) (HTMLObject *,
+ HTMLObject *),
+ HTMLObject * (*down_fn) (HTMLObject *))
{
obj = next_object_uptree (obj, next_fn);
if (obj)
@@ -1649,7 +1821,8 @@ html_object_next_leaf (HTMLObject *self)
}
HTMLObject *
-html_object_next_leaf_not_type (HTMLObject *self, HTMLType t)
+html_object_next_leaf_not_type (HTMLObject *self,
+ HTMLType t)
{
HTMLObject *rv = self;
while ((rv = html_object_next_leaf (rv)) && HTML_OBJECT_TYPE (rv) == t);
@@ -1664,7 +1837,8 @@ html_object_prev_leaf (HTMLObject *self)
}
HTMLObject *
-html_object_prev_leaf_not_type (HTMLObject *self, HTMLType t)
+html_object_prev_leaf_not_type (HTMLObject *self,
+ HTMLType t)
{
HTMLObject *rv = self;
while ((rv = html_object_prev_leaf (rv)) && HTML_OBJECT_TYPE (rv) == t);
@@ -1677,7 +1851,8 @@ html_object_prev_leaf_not_type (HTMLObject *self, HTMLType t)
/* go up in tree so long as we can get object in neighborhood given by function next_fn */
static HTMLObject *
-next_object_uptree_cursor (HTMLObject *obj, HTMLObject * (*next_fn ) (HTMLObject *))
+next_object_uptree_cursor (HTMLObject *obj,
+ HTMLObject * (*next_fn) (HTMLObject *))
{
HTMLObject *next = NULL;
@@ -1693,7 +1868,9 @@ next_object_uptree_cursor (HTMLObject *obj, HTMLObject * (*next_fn ) (HTMLObject
/* go down in tree to leaf in way given by down_fn children */
static HTMLObject *
-move_object_downtree_cursor (HTMLObject *obj, HTMLObject * (*down_fn ) (HTMLObject *), HTMLObject * (*next_fn ) (HTMLObject *))
+move_object_downtree_cursor (HTMLObject *obj,
+ HTMLObject * (*down_fn) (HTMLObject *),
+ HTMLObject * (*next_fn) (HTMLObject *))
{
HTMLObject *last_obj = obj;
@@ -1720,8 +1897,10 @@ move_object_downtree_cursor (HTMLObject *obj, HTMLObject * (*down_fn ) (HTMLObje
}
static HTMLObject *
-move_object_cursor (HTMLObject *obj, gint *offset, gboolean forward,
- HTMLObject * (*next_fn ) (HTMLObject *), HTMLObject * (*down_fn ) (HTMLObject *))
+move_object_cursor (HTMLObject *obj,
+ gint *offset,
+ gboolean forward,
+ HTMLObject * (*next_fn) (HTMLObject *), HTMLObject * (*down_fn) (HTMLObject *))
{
HTMLObject *down, *before;
@@ -1765,13 +1944,15 @@ move_object_cursor (HTMLObject *obj, gint *offset, gboolean forward,
}
HTMLObject *
-html_object_next_cursor (HTMLObject *self, gint *offset)
+html_object_next_cursor (HTMLObject *self,
+ gint *offset)
{
return move_object_cursor (self, offset, TRUE, html_object_next_not_slave, html_object_head);
}
HTMLObject *
-html_object_prev_cursor (HTMLObject *self, gint *offset)
+html_object_prev_cursor (HTMLObject *self,
+ gint *offset)
{
return move_object_cursor (self, offset, FALSE, html_object_prev_not_slave, html_object_tail_not_slave);
}
@@ -1785,49 +1966,64 @@ html_object_get_bytes (HTMLObject *self)
}
guint
-html_object_get_index (HTMLObject *self, guint offset)
+html_object_get_index (HTMLObject *self,
+ guint offset)
{
return html_object_is_text (self) ? html_text_get_index (HTML_TEXT (self), offset) : offset;
}
void
-html_object_set_data_nocp (HTMLObject *object, const gchar *key, const gchar *value)
+html_object_set_data_nocp (HTMLObject *object,
+ const gchar *key,
+ const gchar *value)
{
g_datalist_set_data_full (&object->object_data_nocp, key, g_strdup (value), g_free);
}
void
-html_object_set_data_full_nocp (HTMLObject *object, const gchar *key, gconstpointer value, GDestroyNotify func)
+html_object_set_data_full_nocp (HTMLObject *object,
+ const gchar *key,
+ gconstpointer value,
+ GDestroyNotify func)
{
g_datalist_set_data_full (&object->object_data_nocp, key, (gpointer) value, func);
}
gpointer
-html_object_get_data_nocp (HTMLObject *object, const gchar *key)
+html_object_get_data_nocp (HTMLObject *object,
+ const gchar *key)
{
return g_datalist_get_data (&object->object_data_nocp, key);
}
void
-html_object_set_data (HTMLObject *object, const gchar *key, const gchar *value)
+html_object_set_data (HTMLObject *object,
+ const gchar *key,
+ const gchar *value)
{
g_datalist_set_data_full (&object->object_data, key, g_strdup (value), g_free);
}
void
-html_object_set_data_full (HTMLObject *object, const gchar *key, gconstpointer value, GDestroyNotify func)
+html_object_set_data_full (HTMLObject *object,
+ const gchar *key,
+ gconstpointer value,
+ GDestroyNotify func)
{
g_datalist_set_data_full (&object->object_data, key, (gpointer) value, func);
}
gpointer
-html_object_get_data (HTMLObject *object, const gchar *key)
+html_object_get_data (HTMLObject *object,
+ const gchar *key)
{
return g_datalist_get_data (&object->object_data, key);
}
static void
-copy_data (GQuark key_id, gpointer data, gpointer user_data)
+copy_data (GQuark key_id,
+ gpointer data,
+ gpointer user_data)
{
HTMLObject *o = HTML_OBJECT (user_data);
@@ -1837,13 +2033,16 @@ copy_data (GQuark key_id, gpointer data, gpointer user_data)
}
void
-html_object_copy_data_from_object (HTMLObject *dst, HTMLObject *src)
+html_object_copy_data_from_object (HTMLObject *dst,
+ HTMLObject *src)
{
g_datalist_foreach (&src->object_data, copy_data, dst);
}
static void
-object_save_data (GQuark key_id, gpointer data, gpointer user_data)
+object_save_data (GQuark key_id,
+ gpointer data,
+ gpointer user_data)
{
HTMLEngineSaveState *state = (HTMLEngineSaveState *) user_data;
const gchar *str;
@@ -1862,7 +2061,9 @@ object_save_data (GQuark key_id, gpointer data, gpointer user_data)
}
static void
-handle_object_data (gpointer key, gpointer value, gpointer data)
+handle_object_data (gpointer key,
+ gpointer value,
+ gpointer data)
{
HTMLEngineSaveState *state = (HTMLEngineSaveState *) data;
gchar *str;
@@ -1888,13 +2089,15 @@ handle_object_data (gpointer key, gpointer value, gpointer data)
}
static void
-clear_data (gchar *key, HTMLEngineSaveState *state)
+clear_data (gchar *key,
+ HTMLEngineSaveState *state)
{
html_engine_clear_class_data (state->engine, state->save_data_class_name, key);
}
gboolean
-html_object_save_data (HTMLObject *self, HTMLEngineSaveState *state)
+html_object_save_data (HTMLObject *self,
+ HTMLEngineSaveState *state)
{
if (state->engine->save_data) {
GHashTable *t;
@@ -1915,7 +2118,8 @@ html_object_save_data (HTMLObject *self, HTMLEngineSaveState *state)
}
GList *
-html_object_get_bound_list (HTMLObject *self, GList *list)
+html_object_get_bound_list (HTMLObject *self,
+ GList *list)
{
return list && list->next
? (HTML_OBJECT (list->data) == self ? list->next : NULL)
@@ -1923,7 +2127,8 @@ html_object_get_bound_list (HTMLObject *self, GList *list)
}
void
-html_object_move_cursor_before_remove (HTMLObject *o, HTMLEngine *e)
+html_object_move_cursor_before_remove (HTMLObject *o,
+ HTMLEngine *e)
{
if (e->cursor->object == o) {
if (html_object_next_not_slave (o))
@@ -1934,7 +2139,11 @@ html_object_move_cursor_before_remove (HTMLObject *o, HTMLEngine *e)
}
gboolean
-html_object_could_remove_whole (HTMLObject *o, GList *from, GList *to, GList *left, GList *right)
+html_object_could_remove_whole (HTMLObject *o,
+ GList *from,
+ GList *to,
+ GList *left,
+ GList *right)
{
return ((!from && !to)
|| html_object_next_not_slave (HTML_OBJECT (o))
@@ -1944,7 +2153,10 @@ html_object_could_remove_whole (HTMLObject *o, GList *from, GList *to, GList *le
}
void
-html_object_check_cut_lists (HTMLObject *self, HTMLObject *replacement, GList *left, GList *right)
+html_object_check_cut_lists (HTMLObject *self,
+ HTMLObject *replacement,
+ GList *left,
+ GList *right)
{
if (left && left->data == self)
left->data = replacement;
@@ -1959,7 +2171,9 @@ typedef struct {
} tmpSelData;
static void
-select_object (HTMLObject *o, HTMLEngine *e, gpointer data)
+select_object (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
tmpSelData *d = (tmpSelData *) data;
@@ -1975,13 +2189,16 @@ select_object (HTMLObject *o, HTMLEngine *e, gpointer data)
}
static void
-unselect_object (HTMLObject *o, HTMLEngine *e, gpointer data)
+unselect_object (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
o->selected = FALSE;
}
gchar *
-html_object_get_selection_string (HTMLObject *o, HTMLEngine *e)
+html_object_get_selection_string (HTMLObject *o,
+ HTMLEngine *e)
{
HTMLObject *tail;
tmpSelData data;
@@ -2034,7 +2251,8 @@ html_object_get_head_leaf (HTMLObject *o)
}
HTMLObject *
-html_object_nth_parent (HTMLObject *self, gint n)
+html_object_nth_parent (HTMLObject *self,
+ gint n)
{
while (self && n > 0) {
self = self->parent;
@@ -2088,7 +2306,9 @@ html_object_tails_list (HTMLObject *o)
}
static void
-merge_down (HTMLEngine *e, GList *left, GList *right)
+merge_down (HTMLEngine *e,
+ GList *left,
+ GList *right)
{
HTMLObject *lo;
HTMLObject *ro;
@@ -2104,13 +2324,16 @@ merge_down (HTMLEngine *e, GList *left, GList *right)
}
void
-html_object_merge_down (HTMLObject *o, HTMLObject *w, HTMLEngine *e)
+html_object_merge_down (HTMLObject *o,
+ HTMLObject *w,
+ HTMLEngine *e)
{
merge_down (e, html_object_tails_list (o), html_object_heads_list (w));
}
gboolean
-html_object_is_parent (HTMLObject *parent, HTMLObject *child)
+html_object_is_parent (HTMLObject *parent,
+ HTMLObject *child)
{
g_assert (parent && child);
@@ -2147,7 +2370,10 @@ html_object_get_insert_level (HTMLObject *o)
}
void
-html_object_engine_translation (HTMLObject *o, HTMLEngine *e, gint *tx, gint *ty)
+html_object_engine_translation (HTMLObject *o,
+ HTMLEngine *e,
+ gint *tx,
+ gint *ty)
{
HTMLObject *p;
@@ -2164,7 +2390,14 @@ html_object_engine_translation (HTMLObject *o, HTMLEngine *e, gint *tx, gint *ty
}
gboolean
-html_object_engine_intersection (HTMLObject *o, HTMLEngine *e, gint tx, gint ty, gint *x1, gint *y1, gint *x2, gint *y2)
+html_object_engine_intersection (HTMLObject *o,
+ HTMLEngine *e,
+ gint tx,
+ gint ty,
+ gint *x1,
+ gint *y1,
+ gint *x2,
+ gint *y2)
{
*x1 = o->x + tx;
*y1 = o->y - o->ascent + ty;
@@ -2175,7 +2408,8 @@ html_object_engine_intersection (HTMLObject *o, HTMLEngine *e, gint tx, gint ty,
}
void
-html_object_add_to_changed (GList **changed_objs, HTMLObject *o)
+html_object_add_to_changed (GList **changed_objs,
+ HTMLObject *o)
{
GList *l, *next;
@@ -2206,13 +2440,15 @@ html_object_get_n_children (HTMLObject *self)
}
HTMLObject *
-html_object_get_child (HTMLObject *self, gint index)
+html_object_get_child (HTMLObject *self,
+ gint index)
{
return HO_CLASS (self)->get_child ? (* HO_CLASS (self)->get_child) (self, index) : NULL;
}
gint
-html_object_get_child_index (HTMLObject *self, HTMLObject *child)
+html_object_get_child_index (HTMLObject *self,
+ HTMLObject *child)
{
return HO_CLASS (self)->get_child_index ? (* HO_CLASS (self)->get_child_index) (self, child) : -1;
}
@@ -2224,7 +2460,10 @@ html_object_get_clear (HTMLObject *self)
}
static HTMLObject *
-next_prev_cursor_object (HTMLObject *o, HTMLEngine *e, gint *offset, gboolean forward)
+next_prev_cursor_object (HTMLObject *o,
+ HTMLEngine *e,
+ gint *offset,
+ gboolean forward)
{
HTMLCursor cursor;
gboolean result;
@@ -2238,19 +2477,24 @@ next_prev_cursor_object (HTMLObject *o, HTMLEngine *e, gint *offset, gboolean fo
}
HTMLObject *
-html_object_next_cursor_object (HTMLObject *o, HTMLEngine *e, gint *offset)
+html_object_next_cursor_object (HTMLObject *o,
+ HTMLEngine *e,
+ gint *offset)
{
return next_prev_cursor_object (o, e, offset, TRUE);
}
HTMLObject *
-html_object_prev_cursor_object (HTMLObject *o, HTMLEngine *e, gint *offset)
+html_object_prev_cursor_object (HTMLObject *o,
+ HTMLEngine *e,
+ gint *offset)
{
return next_prev_cursor_object (o, e, offset, FALSE);
}
HTMLObject *
-html_object_next_cursor_leaf (HTMLObject *o, HTMLEngine *e)
+html_object_next_cursor_leaf (HTMLObject *o,
+ HTMLEngine *e)
{
gint offset = html_object_get_length (o);
@@ -2262,7 +2506,8 @@ html_object_next_cursor_leaf (HTMLObject *o, HTMLEngine *e)
}
HTMLObject *
-html_object_prev_cursor_leaf (HTMLObject *o, HTMLEngine *e)
+html_object_prev_cursor_leaf (HTMLObject *o,
+ HTMLEngine *e)
{
gint offset = html_object_get_length (o);
@@ -2286,7 +2531,8 @@ html_object_get_id (HTMLObject *o)
}
void
-html_object_set_id (HTMLObject *o, const gchar *id)
+html_object_set_id (HTMLObject *o,
+ const gchar *id)
{
g_free (o->id);
o->id = g_strdup (id);
@@ -2302,13 +2548,17 @@ html_object_get_flow (HTMLObject *o)
}
gint
-html_object_get_right_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offset)
+html_object_get_right_edge_offset (HTMLObject *o,
+ HTMLPainter *painter,
+ gint offset)
{
return (* HO_CLASS (o)->get_right_edge_offset) (o, painter, offset);
}
gint
-html_object_get_left_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offset)
+html_object_get_left_edge_offset (HTMLObject *o,
+ HTMLPainter *painter,
+ gint offset)
{
return (* HO_CLASS (o)->get_left_edge_offset) (o, painter, offset);
}
diff --git a/gtkhtml/htmlobject.h b/gtkhtml/htmlobject.h
index 305f33f..1064ca6 100644
--- a/gtkhtml/htmlobject.h
+++ b/gtkhtml/htmlobject.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLOBJECT_H_
@@ -61,8 +61,8 @@ struct _HTMLObject {
guint selected : 1;
/* If an object has a redraw pending and is being destroyed, this flag
- is set to TRUE instead of g_free () ing the object. When the draw
- queue is flushed, the g_free () is performed. */
+ * is set to TRUE instead of g_free () ing the object. When the draw
+ * queue is flushed, the g_free () is performed. */
guint free_pending : 1;
/* FIXME add the other dynamic pusedo-classes... */
@@ -91,7 +91,7 @@ struct _HTMLObjectClass {
void (* destroy) (HTMLObject *o);
/* Copy an object into another one. @dest can just point to a
- memory area of the proper size. */
+ * memory area of the proper size. */
void (* copy) (HTMLObject *self, HTMLObject *dest);
/* copy/cut/paste operations */
@@ -136,15 +136,15 @@ struct _HTMLObjectClass {
void (* set_max_height) (HTMLObject *o, HTMLPainter *painter, gint max_height);
/* Relayout object `o' starting from child `child'. This
- method can be called by the child when it changes any of
- its layout properties. */
+ * method can be called by the child when it changes any of
+ * its layout properties. */
gboolean (* layout) (HTMLObject *o, HTMLObject *child);
- /* This method is used to draw the object. @x & @y are in
- object coordinates (e.g. the same coordinate system as o->x
- and o->y). @tx & @ty are used to translate the object
- coordinates into painter coordinates. */
+ /* This method is used to draw the object. @x & @y are in
+ * object coordinates (e.g. the same coordinate system as o->x
+ * and o->y). @tx & @ty are used to translate the object
+ * coordinates into painter coordinates. */
void (* draw) (HTMLObject *o,
HTMLPainter *painter,
@@ -153,7 +153,7 @@ struct _HTMLObjectClass {
gint tx, gint ty);
/* "Transparent" objects (i.e. objects that don't draw all the
- area they occupy, such as text) should return `TRUE' here. */
+ * area they occupy, such as text) should return `TRUE' here. */
gboolean (* is_transparent) (HTMLObject *self);
@@ -169,9 +169,9 @@ struct _HTMLObjectClass {
GdkColor * (* get_bg_color) (HTMLObject *o, HTMLPainter *p);
/* Margins. This should actually be used only by objects that
- contain other objects, so it should be in HTMLClue. But
- HTMLTable does not derive from HTMLClue and we don't want
- to spend time reorganizing the hierarchy now. */
+ * contain other objects, so it should be in HTMLClue. But
+ * HTMLTable does not derive from HTMLClue and we don't want
+ * to spend time reorganizing the hierarchy now. */
gint (* get_left_margin) (HTMLObject *self, HTMLPainter *painter, gint y, gboolean with_aligned);
gint (* get_right_margin) (HTMLObject *self, HTMLPainter *painter, gint y, gboolean with_aligned);
@@ -179,7 +179,7 @@ struct _HTMLObjectClass {
void (* set_painter) (HTMLObject *o, HTMLPainter *painter);
/* Resetting the object. Do this before using a different
- HTMLPainter. */
+ * HTMLPainter. */
void (* reset) (HTMLObject *o);
@@ -194,17 +194,17 @@ struct _HTMLObjectClass {
gboolean for_cursor);
/* Relayout this object. The object will relayout all the children
- starting from `child'. Children before `child' are not affected.
- The return value is FALSE if nothing has changed during relayout,
- TRUE otherwise. */
+ * starting from `child'. Children before `child' are not affected.
+ * The return value is FALSE if nothing has changed during relayout,
+ * TRUE otherwise. */
gboolean (* relayout) (HTMLObject *self, HTMLEngine *engine, HTMLObject *child);
/* Return the vertical alignment for the object in an HTMLClueFlow. If
- the returned value is `HTML_VALIGN_BOTTOM', the bottom of the object
- is aligned to the base line; if the value is `HTML_VALIGN_TOP', the
- top of the object is aligned to the top of the line; if the value is
- `HTML_VALIGN_MIDDLE', the center of the object is aligned to the
- baseline. */
+ * the returned value is `HTML_VALIGN_BOTTOM', the bottom of the object
+ * is aligned to the base line; if the value is `HTML_VALIGN_TOP', the
+ * top of the object is aligned to the top of the line; if the value is
+ * `HTML_VALIGN_MIDDLE', the center of the object is aligned to the
+ * baseline. */
HTMLVAlignType (* get_valign) (HTMLObject *self);
/* Cursor handling. */
diff --git a/gtkhtml/htmlpainter.c b/gtkhtml/htmlpainter.c
index dd2b432..f549683 100644
--- a/gtkhtml/htmlpainter.c
+++ b/gtkhtml/htmlpainter.c
@@ -1,25 +1,25 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
- Copyright (C) 2000, 2001, 2002, 2003 Ximian, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ * Copyright (C) 2000, 2001, 2002, 2003 Ximian, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -107,7 +107,8 @@ DEFINE_UNIMPLEMENTED (get_page_width)
DEFINE_UNIMPLEMENTED (get_page_height)
static void
-html_painter_init (GObject *object, HTMLPainterClass *real_klass)
+html_painter_init (GObject *object,
+ HTMLPainterClass *real_klass)
{
HTMLPainter *painter;
@@ -120,7 +121,8 @@ html_painter_init (GObject *object, HTMLPainterClass *real_klass)
}
static void
-html_painter_real_set_widget (HTMLPainter *painter, GtkWidget *widget)
+html_painter_real_set_widget (HTMLPainter *painter,
+ GtkWidget *widget)
{
if (painter->widget)
g_object_unref (painter->widget);
@@ -129,7 +131,10 @@ html_painter_real_set_widget (HTMLPainter *painter, GtkWidget *widget)
}
static gint
-text_width (HTMLPainter *painter, PangoFontDescription *desc, const gchar *text, gint bytes)
+text_width (HTMLPainter *painter,
+ PangoFontDescription *desc,
+ const gchar *text,
+ gint bytes)
{
HTMLTextPangoInfo *pi;
GList *glyphs;
@@ -142,7 +147,7 @@ text_width (HTMLPainter *painter, PangoFontDescription *desc, const gchar *text,
gint i;
for (list = glyphs; list; list = list->next->next) {
PangoGlyphString *str = (PangoGlyphString *) list->data;
- for (i=0; i < str->num_glyphs; i++)
+ for (i = 0; i < str->num_glyphs; i++)
width += str->glyphs[i].geometry.width;
}
}
@@ -155,9 +160,15 @@ text_width (HTMLPainter *painter, PangoFontDescription *desc, const gchar *text,
}
static void
-text_size (HTMLPainter *painter, PangoFontDescription *desc, const gchar *text, gint bytes,
- HTMLTextPangoInfo *pi, GList *glyphs,
- gint *width_out, gint *ascent_out, gint *descent_out)
+text_size (HTMLPainter *painter,
+ PangoFontDescription *desc,
+ const gchar *text,
+ gint bytes,
+ HTMLTextPangoInfo *pi,
+ GList *glyphs,
+ gint *width_out,
+ gint *ascent_out,
+ gint *descent_out)
{
gboolean temp_pi = FALSE;
gint ascent = 0;
@@ -285,7 +296,10 @@ html_painter_get_type (void)
void
html_painter_begin (HTMLPainter *painter,
- gint x1, gint y1, gint x2, gint y2)
+ gint x1,
+ gint y1,
+ gint x2,
+ gint y2)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -308,7 +322,7 @@ html_painter_end (HTMLPainter *painter)
/* Color control. */
void
html_painter_alloc_color (HTMLPainter *painter,
- GdkColor *color)
+ GdkColor *color)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -319,7 +333,7 @@ html_painter_alloc_color (HTMLPainter *painter,
void
html_painter_free_color (HTMLPainter *painter,
- GdkColor *color)
+ GdkColor *color)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -333,7 +347,7 @@ html_painter_free_color (HTMLPainter *painter,
void
html_painter_set_font_style (HTMLPainter *painter,
- GtkHTMLFontStyle font_style)
+ GtkHTMLFontStyle font_style)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -353,7 +367,7 @@ html_painter_get_font_style (HTMLPainter *painter)
void
html_painter_set_font_face (HTMLPainter *painter,
- HTMLFontFace *face)
+ HTMLFontFace *face)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -365,7 +379,9 @@ html_painter_set_font_face (HTMLPainter *painter,
}
gpointer
-html_painter_get_font (HTMLPainter *painter, HTMLFontFace *face, GtkHTMLFontStyle style)
+html_painter_get_font (HTMLPainter *painter,
+ HTMLFontFace *face,
+ GtkHTMLFontStyle style)
{
HTMLFont *font;
@@ -374,10 +390,10 @@ html_painter_get_font (HTMLPainter *painter, HTMLFontFace *face, GtkHTMLFontStyl
}
static void
-get_font_info (HTMLPainter *painter,
- HTMLTextPangoInfo *pi,
- HTMLFontFace **font_face,
- GtkHTMLFontStyle *font_style)
+get_font_info (HTMLPainter *painter,
+ HTMLTextPangoInfo *pi,
+ HTMLFontFace **font_face,
+ GtkHTMLFontStyle *font_style)
{
if (pi && pi->have_font) {
*font_face = pi->face;
@@ -389,8 +405,8 @@ get_font_info (HTMLPainter *painter,
}
static gint
-get_space_width (HTMLPainter *painter,
- HTMLTextPangoInfo *pi)
+get_space_width (HTMLPainter *painter,
+ HTMLTextPangoInfo *pi)
{
HTMLFontFace *font_face;
GtkHTMLFontStyle font_style;
@@ -427,9 +443,14 @@ get_space_width (HTMLPainter *painter,
**/
void
html_painter_calc_entries_size (HTMLPainter *painter,
- const gchar *text, guint len,
- HTMLTextPangoInfo *pi, GList *glyphs, gint *line_offset,
- gint *width, gint *asc, gint *dsc)
+ const gchar *text,
+ guint len,
+ HTMLTextPangoInfo *pi,
+ GList *glyphs,
+ gint *line_offset,
+ gint *width,
+ gint *asc,
+ gint *dsc)
{
HTMLFontFace *font_face = NULL;
GtkHTMLFontStyle font_style = GTK_HTML_FONT_STYLE_DEFAULT;
@@ -470,8 +491,11 @@ html_painter_calc_entries_size (HTMLPainter *painter,
**/
void
html_painter_calc_text_size (HTMLPainter *painter,
- const gchar *text, guint len,
- gint *width, gint *asc, gint *dsc)
+ const gchar *text,
+ guint len,
+ gint *width,
+ gint *asc,
+ gint *dsc)
{
gint line_offset = 0;
@@ -487,7 +511,7 @@ html_painter_calc_text_size (HTMLPainter *painter,
void
html_painter_set_pen (HTMLPainter *painter,
- const GdkColor *color)
+ const GdkColor *color)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -498,8 +522,10 @@ html_painter_set_pen (HTMLPainter *painter,
void
html_painter_draw_line (HTMLPainter *painter,
- gint x1, gint y1,
- gint x2, gint y2)
+ gint x1,
+ gint y1,
+ gint x2,
+ gint y2)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -509,8 +535,10 @@ html_painter_draw_line (HTMLPainter *painter,
void
html_painter_draw_rect (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -519,7 +547,9 @@ html_painter_draw_rect (HTMLPainter *painter,
}
void
-html_replace_tabs (const gchar *text, gchar *translated, guint bytes)
+html_replace_tabs (const gchar *text,
+ gchar *translated,
+ guint bytes)
{
const gchar *t, *tab;
gchar *tt;
@@ -562,10 +592,14 @@ html_replace_tabs (const gchar *text, gchar *translated, guint bytes)
* Draws a piece of text, using provided Pango layout information.
**/
void
-html_painter_draw_entries (HTMLPainter *painter, gint x, gint y,
- const gchar *text, gint len,
- HTMLTextPangoInfo *pi, GList *glyphs,
- gint line_offset)
+html_painter_draw_entries (HTMLPainter *painter,
+ gint x,
+ gint y,
+ const gchar *text,
+ gint len,
+ HTMLTextPangoInfo *pi,
+ GList *glyphs,
+ gint line_offset)
{
const gchar *tab, *c_text;
gint bytes;
@@ -631,7 +665,13 @@ html_painter_draw_entries (HTMLPainter *painter, gint x, gint y,
}
gint
-html_painter_draw_glyphs (HTMLPainter *painter, gint x, gint y, PangoItem *item, PangoGlyphString *glyphs, GdkColor *fg, GdkColor *bg)
+html_painter_draw_glyphs (HTMLPainter *painter,
+ gint x,
+ gint y,
+ PangoItem *item,
+ PangoGlyphString *glyphs,
+ GdkColor *fg,
+ GdkColor *bg)
{
return (* HP_CLASS (painter)->draw_glyphs) (painter, x, y, item, glyphs, fg, bg);
}
@@ -647,8 +687,11 @@ html_painter_draw_glyphs (HTMLPainter *painter, gint x, gint y, PangoItem *item,
* Draws a piece of text.
**/
void
-html_painter_draw_text (HTMLPainter *painter, gint x, gint y,
- const gchar *text, gint len)
+html_painter_draw_text (HTMLPainter *painter,
+ gint x,
+ gint y,
+ const gchar *text,
+ gint len)
{
HTMLTextPangoInfo *pi;
GList *glyphs;
@@ -675,8 +718,10 @@ html_painter_draw_text (HTMLPainter *painter, gint x, gint y,
void
html_painter_fill_rect (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -685,11 +730,13 @@ html_painter_fill_rect (HTMLPainter *painter,
}
void
-html_painter_draw_pixmap (HTMLPainter *painter,
- GdkPixbuf *pixbuf,
- gint x, gint y,
- gint scale_width, gint scale_height,
- const GdkColor *color)
+html_painter_draw_pixmap (HTMLPainter *painter,
+ GdkPixbuf *pixbuf,
+ gint x,
+ gint y,
+ gint scale_width,
+ gint scale_height,
+ const GdkColor *color)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -700,8 +747,10 @@ html_painter_draw_pixmap (HTMLPainter *painter,
void
html_painter_draw_ellipse (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -720,7 +769,7 @@ html_painter_clear (HTMLPainter *painter)
void
html_painter_set_background_color (HTMLPainter *painter,
- const GdkColor *color)
+ const GdkColor *color)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -731,8 +780,9 @@ html_painter_set_background_color (HTMLPainter *painter,
void
html_painter_draw_shade_line (HTMLPainter *painter,
- gint x, gint y,
- gint width)
+ gint x,
+ gint y,
+ gint width)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -742,11 +792,13 @@ html_painter_draw_shade_line (HTMLPainter *painter,
void
html_painter_draw_border (HTMLPainter *painter,
- GdkColor *bg,
- gint x, gint y,
- gint width, gint height,
- HTMLBorderStyle style,
- gint bordersize)
+ GdkColor *bg,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ HTMLBorderStyle style,
+ gint bordersize)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -755,7 +807,10 @@ html_painter_draw_border (HTMLPainter *painter,
}
void
-html_painter_draw_embedded (HTMLPainter *painter, HTMLEmbedded *element, gint x, gint y)
+html_painter_draw_embedded (HTMLPainter *painter,
+ HTMLEmbedded *element,
+ gint x,
+ gint y)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -767,8 +822,10 @@ html_painter_draw_embedded (HTMLPainter *painter, HTMLEmbedded *element, gint x,
/* Passing 0 for width/height means remove clip rectangle */
void
html_painter_set_clip_rectangle (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -785,8 +842,10 @@ html_painter_set_clip_rectangle (HTMLPainter *painter,
void
html_painter_get_clip_rectangle (HTMLPainter *painter,
- gint *x, gint *y,
- gint *width, gint *height)
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height)
{
*x = painter->clip_x;
*y = painter->clip_y;
@@ -797,11 +856,14 @@ html_painter_get_clip_rectangle (HTMLPainter *painter,
/* Passing 0 for pix_width / pix_height makes it use the image width */
void
html_painter_draw_background (HTMLPainter *painter,
- GdkColor *color,
- GdkPixbuf *pixbuf,
- gint x, gint y,
- gint width, gint height,
- gint tile_x, gint tile_y)
+ GdkColor *color,
+ GdkPixbuf *pixbuf,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tile_x,
+ gint tile_y)
{
g_return_if_fail (painter != NULL);
g_return_if_fail (HTML_IS_PAINTER (painter));
@@ -819,13 +881,20 @@ html_painter_get_pixel_size (HTMLPainter *painter)
}
gint
-html_painter_draw_spell_error (HTMLPainter *painter, gint x, gint y, gint width)
+html_painter_draw_spell_error (HTMLPainter *painter,
+ gint x,
+ gint y,
+ gint width)
{
return (* HP_CLASS (painter)->draw_spell_error) (painter, x, y, width);
}
HTMLFont *
-html_painter_alloc_font (HTMLPainter *painter, gchar *face, gdouble size, gboolean points, GtkHTMLFontStyle style)
+html_painter_alloc_font (HTMLPainter *painter,
+ gchar *face,
+ gdouble size,
+ gboolean points,
+ GtkHTMLFontStyle style)
{
PangoFontDescription *desc = NULL;
gint space_width, space_asc, space_dsc;
@@ -867,12 +936,14 @@ html_painter_alloc_font (HTMLPainter *painter, gchar *face, gdouble size, gboole
}
void
-html_painter_ref_font (HTMLPainter *painter, HTMLFont *font)
+html_painter_ref_font (HTMLPainter *painter,
+ HTMLFont *font)
{
}
void
-html_painter_unref_font (HTMLPainter *painter, HTMLFont *font)
+html_painter_unref_font (HTMLPainter *painter,
+ HTMLFont *font)
{
if (font->ref_count < 1) {
pango_font_description_free (font->data);
@@ -881,50 +952,65 @@ html_painter_unref_font (HTMLPainter *painter, HTMLFont *font)
}
guint
-html_painter_get_space_width (HTMLPainter *painter, GtkHTMLFontStyle style, HTMLFontFace *face)
+html_painter_get_space_width (HTMLPainter *painter,
+ GtkHTMLFontStyle style,
+ HTMLFontFace *face)
{
return html_font_manager_get_font (&painter->font_manager, face, style)->space_width;
}
guint
-html_painter_get_space_asc (HTMLPainter *painter, GtkHTMLFontStyle style, HTMLFontFace *face)
+html_painter_get_space_asc (HTMLPainter *painter,
+ GtkHTMLFontStyle style,
+ HTMLFontFace *face)
{
return html_font_manager_get_font (&painter->font_manager, face, style)->space_asc;
}
guint
-html_painter_get_space_dsc (HTMLPainter *painter, GtkHTMLFontStyle style, HTMLFontFace *face)
+html_painter_get_space_dsc (HTMLPainter *painter,
+ GtkHTMLFontStyle style,
+ HTMLFontFace *face)
{
return html_font_manager_get_font (&painter->font_manager, face, style)->space_dsc;
}
guint
-html_painter_get_e_width (HTMLPainter *painter, GtkHTMLFontStyle style, HTMLFontFace *face)
+html_painter_get_e_width (HTMLPainter *painter,
+ GtkHTMLFontStyle style,
+ HTMLFontFace *face)
{
return html_font_manager_get_font (&painter->font_manager, face, style)->e_width;
}
guint
-html_painter_get_block_indent_width (HTMLPainter *painter, GtkHTMLFontStyle style, HTMLFontFace *face)
+html_painter_get_block_indent_width (HTMLPainter *painter,
+ GtkHTMLFontStyle style,
+ HTMLFontFace *face)
{
return html_font_manager_get_font (&painter->font_manager, face, style)->indent_width;
}
guint
-html_painter_get_block_cite_width (HTMLPainter *painter, GtkHTMLFontStyle style, HTMLFontFace *face, HTMLDirection dir)
+html_painter_get_block_cite_width (HTMLPainter *painter,
+ GtkHTMLFontStyle style,
+ HTMLFontFace *face,
+ HTMLDirection dir)
{
HTMLFont *font = html_font_manager_get_font (&painter->font_manager, face, style);
return dir == HTML_DIRECTION_RTL ? font->cite_width_rtl : font->cite_width_ltr;
}
guint
-html_painter_get_page_width (HTMLPainter *painter, HTMLEngine *e)
+html_painter_get_page_width (HTMLPainter *painter,
+ HTMLEngine *e)
{
return (* HP_CLASS (painter)->get_page_width) (painter, e);
}
guint
-html_painter_get_page_height (HTMLPainter *painter, HTMLEngine *e)
+html_painter_get_page_height (HTMLPainter *painter,
+ HTMLEngine *e)
{
return (* HP_CLASS (painter)->get_page_height) (painter, e);
}
@@ -941,8 +1027,8 @@ html_painter_get_page_height (HTMLPainter *painter, HTMLEngine *e)
* Return value: distance converted to engine coordinates.
**/
gint
-html_painter_pango_to_engine (HTMLPainter *painter,
- gint pango_units)
+html_painter_pango_to_engine (HTMLPainter *painter,
+ gint pango_units)
{
gdouble tmp = 0.5 + pango_units / painter->engine_to_pango;
return (gint) CLAMP (tmp, G_MININT, G_MAXINT);
@@ -960,27 +1046,34 @@ html_painter_pango_to_engine (HTMLPainter *painter,
* Return value: distance converted to Pango units
**/
gint
-html_painter_engine_to_pango (HTMLPainter *painter,
- gint engine_units)
+html_painter_engine_to_pango (HTMLPainter *painter,
+ gint engine_units)
{
gdouble tmp = 0.5 + engine_units * painter->engine_to_pango;
return (gint) CLAMP (tmp, G_MININT, G_MAXINT);
}
void
-html_painter_set_focus (HTMLPainter *p, gboolean focus)
+html_painter_set_focus (HTMLPainter *p,
+ gboolean focus)
{
p->focus = focus;
}
void
-html_painter_set_widget (HTMLPainter *painter, GtkWidget *widget)
+html_painter_set_widget (HTMLPainter *painter,
+ GtkWidget *widget)
{
(* HP_CLASS (painter)->set_widget) (painter, widget);
}
HTMLTextPangoInfo *
-html_painter_text_itemize_and_prepare_glyphs (HTMLPainter *painter, PangoFontDescription *desc, const gchar *text, gint bytes, GList **glyphs, PangoAttrList *attrs)
+html_painter_text_itemize_and_prepare_glyphs (HTMLPainter *painter,
+ PangoFontDescription *desc,
+ const gchar *text,
+ gint bytes,
+ GList **glyphs,
+ PangoAttrList *attrs)
{
PangoAttribute *attr;
GList *items = NULL;
@@ -1046,7 +1139,8 @@ html_painter_glyphs_destroy (GList *glyphs)
* structure form.
**/
void
-html_pango_get_item_properties (PangoItem *item, HTMLPangoProperties *properties)
+html_pango_get_item_properties (PangoItem *item,
+ HTMLPangoProperties *properties)
{
GSList *tmp_list = item->analysis.extra_attrs;
diff --git a/gtkhtml/htmlpainter.h b/gtkhtml/htmlpainter.h
index ac84f0b..929efd7 100644
--- a/gtkhtml/htmlpainter.h
+++ b/gtkhtml/htmlpainter.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLPAINTER_H_
diff --git a/gtkhtml/htmlplainpainter.c b/gtkhtml/htmlplainpainter.c
index 01a66d7..99566fd 100644
--- a/gtkhtml/htmlplainpainter.c
+++ b/gtkhtml/htmlplainpainter.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -35,21 +35,26 @@ static HTMLGdkPainterClass *parent_class = NULL;
static void
draw_border (HTMLPainter *painter,
- GdkColor *bg,
- gint x, gint y,
- gint width, gint height,
- HTMLBorderStyle style,
- gint bordersize)
+ GdkColor *bg,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ HTMLBorderStyle style,
+ gint bordersize)
{
}
static void
draw_background (HTMLPainter *painter,
- GdkColor *color,
- GdkPixbuf *pixbuf,
- gint x, gint y,
- gint width, gint height,
- gint tile_x, gint tile_y)
+ GdkColor *color,
+ GdkPixbuf *pixbuf,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tile_x,
+ gint tile_y)
{
HTMLGdkPainter *gdk_painter;
GdkRectangle expose, paint, clip;
@@ -83,17 +88,21 @@ draw_background (HTMLPainter *painter,
static void
draw_pixmap (HTMLPainter *painter,
- GdkPixbuf *pixbuf,
- gint x, gint y,
- gint scale_width, gint scale_height,
- const GdkColor *color)
+ GdkPixbuf *pixbuf,
+ gint x,
+ gint y,
+ gint scale_width,
+ gint scale_height,
+ const GdkColor *color)
{
}
static void
fill_rect (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
HTMLGdkPainter *gdk_painter;
@@ -105,8 +114,9 @@ fill_rect (HTMLPainter *painter,
static void
draw_shade_line (HTMLPainter *painter,
- gint x, gint y,
- gint width)
+ gint x,
+ gint y,
+ gint width)
{
}
@@ -117,13 +127,16 @@ html_plain_painter_init (GObject *object)
static void
draw_rect (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
}
static guint
-get_page_width (HTMLPainter *painter, HTMLEngine *e)
+get_page_width (HTMLPainter *painter,
+ HTMLEngine *e)
{
return MIN (72 * MAX (html_painter_get_space_width (painter, GTK_HTML_FONT_STYLE_SIZE_3 | GTK_HTML_FONT_STYLE_FIXED, NULL),
html_painter_get_e_width (painter, GTK_HTML_FONT_STYLE_SIZE_3 | GTK_HTML_FONT_STYLE_FIXED, NULL)),
@@ -131,7 +144,8 @@ get_page_width (HTMLPainter *painter, HTMLEngine *e)
}
static guint
-get_page_height (HTMLPainter *painter, HTMLEngine *e)
+get_page_height (HTMLPainter *painter,
+ HTMLEngine *e)
{
return html_engine_get_view_height (e) + (html_engine_get_top_border (e) + html_engine_get_bottom_border (e));
}
@@ -179,7 +193,8 @@ html_plain_painter_get_type (void)
}
HTMLPainter *
-html_plain_painter_new (GtkWidget *widget, gboolean double_buffer)
+html_plain_painter_new (GtkWidget *widget,
+ gboolean double_buffer)
{
HTMLPlainPainter *new;
diff --git a/gtkhtml/htmlplainpainter.h b/gtkhtml/htmlplainpainter.h
index c8e8ee5..bb3118d 100644
--- a/gtkhtml/htmlplainpainter.h
+++ b/gtkhtml/htmlplainpainter.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLPLAINPAINTER_H
diff --git a/gtkhtml/htmlprinter.c b/gtkhtml/htmlprinter.c
index 0a55051..d7a4cf5 100644
--- a/gtkhtml/htmlprinter.c
+++ b/gtkhtml/htmlprinter.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -59,7 +59,8 @@ printer_get_page_width (HTMLPrinter *printer)
}
gdouble
-html_printer_scale_to_gnome_print (HTMLPrinter *printer, gint x)
+html_printer_scale_to_gnome_print (HTMLPrinter *printer,
+ gint x)
{
return SCALE_ENGINE_TO_GNOME_PRINT (x);
}
@@ -85,8 +86,10 @@ finalize (GObject *object)
static void
begin (HTMLPainter *painter,
- gint x1, gint y1,
- gint x2, gint y2)
+ gint x1,
+ gint y1,
+ gint x2,
+ gint y2)
{
HTMLPrinter *printer;
GtkPrintContext *pc;
@@ -137,19 +140,21 @@ clear (HTMLPainter *painter)
static void
-alloc_color (HTMLPainter *painter, GdkColor *color)
+alloc_color (HTMLPainter *painter,
+ GdkColor *color)
{
}
static void
-free_color (HTMLPainter *painter, GdkColor *color)
+free_color (HTMLPainter *painter,
+ GdkColor *color)
{
}
static void
set_pen (HTMLPainter *painter,
- const GdkColor *color)
+ const GdkColor *color)
{
HTMLPrinter *printer;
cairo_t *cr;
@@ -170,7 +175,11 @@ get_black (const HTMLPainter *painter)
}
static void
-prepare_rectangle (HTMLPainter *painter, gint _x, gint _y, gint w, gint h)
+prepare_rectangle (HTMLPainter *painter,
+ gint _x,
+ gint _y,
+ gint w,
+ gint h)
{
HTMLPrinter *printer = HTML_PRINTER (painter);
GtkPrintContext *context = printer->context;
@@ -191,7 +200,12 @@ prepare_rectangle (HTMLPainter *painter, gint _x, gint _y, gint w, gint h)
}
static void
-do_rectangle (HTMLPainter *painter, gint x, gint y, gint w, gint h, gint lw)
+do_rectangle (HTMLPainter *painter,
+ gint x,
+ gint y,
+ gint w,
+ gint h,
+ gint lw)
{
HTMLPrinter *printer = HTML_PRINTER (painter);
GtkPrintContext *context = printer->context;
@@ -205,8 +219,10 @@ do_rectangle (HTMLPainter *painter, gint x, gint y, gint w, gint h, gint lw)
static void
set_clip_rectangle (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
cairo_t *cr;
prepare_rectangle (painter, x, y, width, height);
@@ -218,8 +234,10 @@ set_clip_rectangle (HTMLPainter *painter,
static void
draw_line (HTMLPainter *painter,
- gint x1, gint y1,
- gint x2, gint y2)
+ gint x1,
+ gint y1,
+ gint x2,
+ gint y2)
{
HTMLPrinter *printer;
gdouble printer_x1, printer_y1;
@@ -245,19 +263,23 @@ draw_line (HTMLPainter *painter,
static void
draw_rect (HTMLPainter *painter,
- gint x, gint y,
- gint width, gint height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
do_rectangle (painter, x, y, width, height, 1);
}
static void
draw_border (HTMLPainter *painter,
- GdkColor *bg,
- gint _x, gint _y,
- gint w, gint h,
- HTMLBorderStyle style,
- gint bordersize)
+ GdkColor *bg,
+ gint _x,
+ gint _y,
+ gint w,
+ gint h,
+ HTMLBorderStyle style,
+ gint bordersize)
{
HTMLPrinter *printer = HTML_PRINTER (painter);
GtkPrintContext *pc = printer->context;
@@ -334,11 +356,14 @@ draw_border (HTMLPainter *painter,
static void
draw_background (HTMLPainter *painter,
- GdkColor *color,
- GdkPixbuf *pixbuf,
- gint ix, gint iy,
- gint pix_width, gint pix_height,
- gint tile_x, gint tile_y)
+ GdkColor *color,
+ GdkPixbuf *pixbuf,
+ gint ix,
+ gint iy,
+ gint pix_width,
+ gint pix_height,
+ gint tile_x,
+ gint tile_y)
{
GtkPrintContext *pc;
HTMLPrinter *printer;
@@ -368,7 +393,8 @@ draw_background (HTMLPainter *painter,
}
static void
-print_pixbuf (GtkPrintContext *pc, GdkPixbuf *pixbuf)
+print_pixbuf (GtkPrintContext *pc,
+ GdkPixbuf *pixbuf)
{
cairo_t *cr;
if (!pixbuf || (gdk_pixbuf_get_colorspace (pixbuf) != GDK_COLORSPACE_RGB))
@@ -389,7 +415,13 @@ print_pixbuf (GtkPrintContext *pc, GdkPixbuf *pixbuf)
}
static void
-draw_pixmap (HTMLPainter *painter, GdkPixbuf *pixbuf, gint x, gint y, gint scale_width, gint scale_height, const GdkColor *color)
+draw_pixmap (HTMLPainter *painter,
+ GdkPixbuf *pixbuf,
+ gint x,
+ gint y,
+ gint scale_width,
+ gint scale_height,
+ const GdkColor *color)
{
HTMLPrinter *printer;
gdouble print_x, print_y;
@@ -411,7 +443,11 @@ draw_pixmap (HTMLPainter *painter, GdkPixbuf *pixbuf, gint x, gint y, gint scale
}
static void
-fill_rect (HTMLPainter *painter, gint x, gint y, gint width, gint height)
+fill_rect (HTMLPainter *painter,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
HTMLPrinter *printer;
gdouble printer_x, printer_y;
@@ -435,7 +471,12 @@ fill_rect (HTMLPainter *painter, gint x, gint y, gint width, gint height)
}
static void
-draw_lines (HTMLPrinter *printer, double x, double y, double width, PangoAnalysis *analysis, HTMLPangoProperties *properties)
+draw_lines (HTMLPrinter *printer,
+ double x,
+ double y,
+ double width,
+ PangoAnalysis *analysis,
+ HTMLPangoProperties *properties)
{
PangoFontMetrics *metrics;
cairo_t *cr;
@@ -473,7 +514,13 @@ draw_lines (HTMLPrinter *printer, double x, double y, double width, PangoAnalysi
}
static gint
-draw_glyphs (HTMLPainter *painter, gint x, gint y, PangoItem *item, PangoGlyphString *glyphs, GdkColor *fg, GdkColor *bg)
+draw_glyphs (HTMLPainter *painter,
+ gint x,
+ gint y,
+ PangoItem *item,
+ PangoGlyphString *glyphs,
+ GdkColor *fg,
+ GdkColor *bg)
{
HTMLPrinter *printer;
gdouble print_x, print_y;
@@ -527,7 +574,10 @@ draw_glyphs (HTMLPainter *painter, gint x, gint y, PangoItem *item, PangoGlyphSt
}
static void
-draw_embedded (HTMLPainter *p, HTMLEmbedded *o, gint x, gint y)
+draw_embedded (HTMLPainter *p,
+ HTMLEmbedded *o,
+ gint x,
+ gint y)
{
gdouble print_x, print_y;
HTMLPrinter *printer = HTML_PRINTER (p);
@@ -552,8 +602,9 @@ draw_embedded (HTMLPainter *p, HTMLEmbedded *o, gint x, gint y)
static void
draw_shade_line (HTMLPainter *painter,
- gint x, gint y,
- gint width)
+ gint x,
+ gint y,
+ gint width)
{
HTMLPrinter *printer;
@@ -572,13 +623,15 @@ get_pixel_size (HTMLPainter *painter)
}
static guint
-get_page_width (HTMLPainter *painter, HTMLEngine *e)
+get_page_width (HTMLPainter *painter,
+ HTMLEngine *e)
{
return html_printer_get_page_width (HTML_PRINTER (painter));
}
static guint
-get_page_height (HTMLPainter *painter, HTMLEngine *e)
+get_page_height (HTMLPainter *painter,
+ HTMLEngine *e)
{
return html_printer_get_page_height (HTML_PRINTER (painter));
}
@@ -650,7 +703,8 @@ html_printer_get_type (void)
}
HTMLPainter *
-html_printer_new (GtkWidget *widget, GtkPrintContext *context)
+html_printer_new (GtkWidget *widget,
+ GtkPrintContext *context)
{
GtkStyle *style;
HTMLPrinter *printer;
@@ -711,7 +765,8 @@ html_printer_get_page_height (HTMLPrinter *printer)
* will be multiplied by @scale.
**/
void
-html_printer_set_scale (HTMLPrinter *printer, gdouble scale)
+html_printer_set_scale (HTMLPrinter *printer,
+ gdouble scale)
{
HTMLPainter *painter;
diff --git a/gtkhtml/htmlprinter.h b/gtkhtml/htmlprinter.h
index d22be93..f1aefee 100644
--- a/gtkhtml/htmlprinter.h
+++ b/gtkhtml/htmlprinter.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLPRINTER_H
@@ -32,7 +32,7 @@
#define HTML_IS_PRINTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), HTML_TYPE_PRINTER))
/* The following macros are used to convert between the HTMLEngine coordinate
- system (which uses integers) to the GnomePrint one (which uses doubles). */
+ * system (which uses integers) to the GnomePrint one (which uses doubles). */
#define SCALE_ENGINE_TO_GNOME_PRINT(x) ((printer->scale * (x)) / 1024.0)
#define SCALE_GNOME_PRINT_TO_ENGINE(x) ((gint) (((x) * 1024.0 / printer->scale) + 0.5))
diff --git a/gtkhtml/htmlradio.c b/gtkhtml/htmlradio.c
index e79bcc8..969a02f 100644
--- a/gtkhtml/htmlradio.c
+++ b/gtkhtml/htmlradio.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -49,7 +49,8 @@ reset (HTMLEmbedded *e)
}
static gchar *
-encode (HTMLEmbedded *e, const gchar *codepage)
+encode (HTMLEmbedded *e,
+ const gchar *codepage)
{
GString *encoding = g_string_new ("");
gchar *ptr;
@@ -82,8 +83,8 @@ html_radio_type_init (void)
void
html_radio_class_init (HTMLRadioClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
HTMLEmbeddedClass *element_class;
HTMLObjectClass *object_class;
@@ -105,12 +106,12 @@ html_radio_class_init (HTMLRadioClass *klass,
void
html_radio_init (HTMLRadio *radio,
- HTMLRadioClass *klass,
- GtkWidget *parent,
- gchar *name,
- gchar *value,
- gboolean checked,
- HTMLForm *form)
+ HTMLRadioClass *klass,
+ GtkWidget *parent,
+ gchar *name,
+ gchar *value,
+ gboolean checked,
+ HTMLForm *form)
{
HTMLEmbedded *element;
GtkWidget *widget;
@@ -132,10 +133,10 @@ html_radio_init (HTMLRadio *radio,
HTMLObject *
html_radio_new (GtkWidget *parent,
- gchar *name,
- gchar *value,
- gboolean checked,
- HTMLForm *form)
+ gchar *name,
+ gchar *value,
+ gboolean checked,
+ HTMLForm *form)
{
HTMLRadio *radio;
diff --git a/gtkhtml/htmlradio.h b/gtkhtml/htmlradio.h
index 5ad97da..c50576a 100644
--- a/gtkhtml/htmlradio.h
+++ b/gtkhtml/htmlradio.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLRADIO_H_
#define _HTMLRADIO_H_
diff --git a/gtkhtml/htmlreplace.c b/gtkhtml/htmlreplace.c
index 928f85c..76fd92b 100644
--- a/gtkhtml/htmlreplace.c
+++ b/gtkhtml/htmlreplace.c
@@ -1,31 +1,34 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Helix Code, Inc.
- Authors: Radek Doulik (rodo helixcode com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
*/
#include <config.h>
#include "htmlreplace.h"
HTMLReplace *
-html_replace_new (const gchar *text, void (*ask) (HTMLEngine *, gpointer), gpointer ask_data)
+html_replace_new (const gchar *text,
+ void (*ask) (HTMLEngine *,
+ gpointer),
+ gpointer ask_data)
{
HTMLReplace *nr = g_new (HTMLReplace, 1);
diff --git a/gtkhtml/htmlreplace.h b/gtkhtml/htmlreplace.h
index 98bb405..113f546 100644
--- a/gtkhtml/htmlreplace.h
+++ b/gtkhtml/htmlreplace.h
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
- Authors: Radek Doulik (rodo helixcode com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTML_REPLACE_H_
diff --git a/gtkhtml/htmlrule.c b/gtkhtml/htmlrule.c
index 0b58214..e87abbb 100644
--- a/gtkhtml/htmlrule.c
+++ b/gtkhtml/htmlrule.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -54,14 +54,16 @@ copy (HTMLObject *self,
}
static void
-set_max_width (HTMLObject *o, HTMLPainter *painter, gint max_width)
+set_max_width (HTMLObject *o,
+ HTMLPainter *painter,
+ gint max_width)
{
o->max_width = max_width;
}
static gint
calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
gint pixel_size;
@@ -75,11 +77,11 @@ calc_min_width (HTMLObject *o,
static HTMLFitType
fit_line (HTMLObject *o,
- HTMLPainter *painter,
- gboolean start_of_line,
- gboolean first_run,
- gboolean next_to_floating,
- gint width_left)
+ HTMLPainter *painter,
+ gboolean start_of_line,
+ gboolean first_run,
+ gboolean next_to_floating,
+ gint width_left)
{
if (!start_of_line)
return HTML_FIT_NONE;
@@ -97,7 +99,9 @@ fit_line (HTMLObject *o,
}
static gboolean
-html_rule_real_calc_size (HTMLObject *self, HTMLPainter *painter, GList **changed_objs)
+html_rule_real_calc_size (HTMLObject *self,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLRule *rule;
gint ascent, descent;
@@ -140,9 +144,12 @@ html_rule_real_calc_size (HTMLObject *self, HTMLPainter *painter, GList **change
static void
html_rule_draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLRule *rule;
guint w, h;
@@ -168,7 +175,7 @@ html_rule_draw (HTMLObject *o,
w = o->width;
else
/* The cast to `gdouble' is to avoid overflow (eg. when
- printing). */
+ * printing). */
w = ((gdouble) o->width * o->percent) / 100;
switch (rule->halign) {
@@ -231,8 +238,8 @@ save (HTMLObject *self,
static gboolean
save_plain (HTMLObject *self,
- HTMLEngineSaveState *state,
- gint requested_width)
+ HTMLEngineSaveState *state,
+ gint requested_width)
{
gint i;
@@ -258,8 +265,8 @@ html_rule_type_init (void)
void
html_rule_class_init (HTMLRuleClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
HTMLObjectClass *object_class;
@@ -282,12 +289,12 @@ html_rule_class_init (HTMLRuleClass *klass,
void
html_rule_init (HTMLRule *rule,
- HTMLRuleClass *klass,
- gint length,
- gint percent,
- gint size,
- gboolean shade,
- HTMLHAlignType halign)
+ HTMLRuleClass *klass,
+ gint length,
+ gint percent,
+ gint size,
+ gboolean shade,
+ HTMLHAlignType halign)
{
HTMLObject *object;
@@ -317,10 +324,10 @@ html_rule_init (HTMLRule *rule,
HTMLObject *
html_rule_new (gint length,
- gint percent,
- gint size,
- gboolean shade,
- HTMLHAlignType halign)
+ gint percent,
+ gint size,
+ gboolean shade,
+ HTMLHAlignType halign)
{
HTMLRule *rule;
diff --git a/gtkhtml/htmlrule.h b/gtkhtml/htmlrule.h
index ef7862d..a15fe46 100644
--- a/gtkhtml/htmlrule.h
+++ b/gtkhtml/htmlrule.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLRULE_H_
diff --git a/gtkhtml/htmlsearch.c b/gtkhtml/htmlsearch.c
index eeab7cb..18dc862 100644
--- a/gtkhtml/htmlsearch.c
+++ b/gtkhtml/htmlsearch.c
@@ -38,14 +38,19 @@
#include "htmlengine.h"
static void
-set_text (HTMLSearch *s, const gchar *text)
+set_text (HTMLSearch *s,
+ const gchar *text)
{
s->text = g_strdup (text);
s->text_bytes = strlen (text);
}
HTMLSearch *
-html_search_new (HTMLEngine *e, const gchar *text, gboolean case_sensitive, gboolean forward, gboolean regular)
+html_search_new (HTMLEngine *e,
+ const gchar *text,
+ gboolean case_sensitive,
+ gboolean forward,
+ gboolean regular)
{
HTMLSearch *ns = g_new0 (HTMLSearch, 1);
@@ -125,7 +130,8 @@ html_search_destroy (HTMLSearch *search)
}
void
-html_search_push (HTMLSearch *search, HTMLObject *obj)
+html_search_push (HTMLSearch *search,
+ HTMLObject *obj)
{
search->stack = g_slist_prepend (search->stack, obj);
}
@@ -142,7 +148,8 @@ html_search_pop (HTMLSearch *search)
}
gboolean
-html_search_child_on_stack (HTMLSearch *search, HTMLObject *obj)
+html_search_child_on_stack (HTMLSearch *search,
+ HTMLObject *obj)
{
return search->stack && HTML_OBJECT (search->stack->data)->parent == obj;
}
@@ -156,14 +163,16 @@ html_search_next_parent (HTMLSearch *search)
}
void
-html_search_set_text (HTMLSearch *search, const gchar *text)
+html_search_set_text (HTMLSearch *search,
+ const gchar *text)
{
g_free (search->text);
set_text (search, text);
}
void
-html_search_set_forward (HTMLSearch *search, gboolean forward)
+html_search_set_forward (HTMLSearch *search,
+ gboolean forward)
{
if (search)
search->forward = forward;
diff --git a/gtkhtml/htmlsearch.h b/gtkhtml/htmlsearch.h
index 5b0b7e8..2155e83 100644
--- a/gtkhtml/htmlsearch.h
+++ b/gtkhtml/htmlsearch.h
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
- Authors: Radek Doulik (rodo helixcode com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Authors: Radek Doulik (rodo helixcode com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTML_SEARCH_H_
diff --git a/gtkhtml/htmlselect.c b/gtkhtml/htmlselect.c
index c842006..f6386e4 100644
--- a/gtkhtml/htmlselect.c
+++ b/gtkhtml/htmlselect.c
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
- Copyright (C) 2000, 2001, 2002 Ximian, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
+ * Copyright (C) 2000, 2001, 2002 Ximian, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -102,7 +102,7 @@ add_selected (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
struct EmbeddedSelectionInfo *info,
- const gchar * codepage)
+ const gchar *codepage)
{
gchar *value, *encoded;
@@ -125,7 +125,8 @@ add_selected (GtkTreeModel *model,
}
static gchar *
-encode (HTMLEmbedded *e, const gchar *codepage)
+encode (HTMLEmbedded *e,
+ const gchar *codepage)
{
struct EmbeddedSelectionInfo info;
HTMLSelect *s = HTML_SELECT (e);
@@ -270,7 +271,9 @@ html_select_new (GtkWidget *parent,
}
void
-html_select_add_option (HTMLSelect *select, const gchar *value, gboolean selected)
+html_select_add_option (HTMLSelect *select,
+ const gchar *value,
+ gboolean selected)
{
GtkListStore *store;
GtkTreeIter iter;
@@ -314,7 +317,8 @@ html_select_add_option (HTMLSelect *select, const gchar *value, gboolean selecte
}
void
-html_select_set_text (HTMLSelect *select, const gchar *text)
+html_select_set_text (HTMLSelect *select,
+ const gchar *text)
{
GtkWidget *w = GTK_WIDGET (HTML_EMBEDDED (select)->widget);
GtkListStore *store;
diff --git a/gtkhtml/htmlselect.h b/gtkhtml/htmlselect.h
index 5b5b2f5..2cb3809 100644
--- a/gtkhtml/htmlselect.h
+++ b/gtkhtml/htmlselect.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLSELECT_H_
#define _HTMLSELECT_H_
diff --git a/gtkhtml/htmlselection.c b/gtkhtml/htmlselection.c
index 7b091fb..38b981a 100644
--- a/gtkhtml/htmlselection.c
+++ b/gtkhtml/htmlselection.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <gtk/gtk.h>
@@ -31,7 +31,8 @@
#include "htmlengine-edit-selection-updater.h"
static gboolean
-optimize_selection (HTMLEngine *e, HTMLInterval *i)
+optimize_selection (HTMLEngine *e,
+ HTMLInterval *i)
{
HTMLInterval *s = e->selection;
gboolean optimized = FALSE;
@@ -39,8 +40,8 @@ optimize_selection (HTMLEngine *e, HTMLInterval *i)
g_return_val_if_fail (s, FALSE);
/* printf ("change selection (%3d,%3d) --> (%3d,%3d)\n",
- s->from.offset, s->to.offset,
- i->from.offset, i->to.offset); */
+ * s->from.offset, s->to.offset,
+ * i->from.offset, i->to.offset); */
if (html_point_eq (&i->from, &s->from)) {
HTMLPoint *max;
@@ -121,22 +122,23 @@ optimize_selection (HTMLEngine *e, HTMLInterval *i)
}
/* if (optimized)
- printf ("Optimized\n"); */
+ * printf ("Optimized\n"); */
return optimized;
}
static void
clear_primary (HTMLEngine *e) {
- if (e->primary)
- html_object_destroy (e->primary);
+ if (e->primary)
+ html_object_destroy (e->primary);
- e->primary = NULL;
- e->primary_len = 0;
+ e->primary = NULL;
+ e->primary_len = 0;
}
void
-html_engine_select_interval (HTMLEngine *e, HTMLInterval *i)
+html_engine_select_interval (HTMLEngine *e,
+ HTMLInterval *i)
{
e = html_engine_get_top_html_engine (e);
html_engine_hide_cursor (e);
@@ -159,8 +161,10 @@ html_engine_select_interval (HTMLEngine *e, HTMLInterval *i)
void
html_engine_select_region (HTMLEngine *e,
- gint x1, gint y1,
- gint x2, gint y2)
+ gint x1,
+ gint y1,
+ gint x2,
+ gint y2)
{
HTMLPoint *a, *b;
@@ -281,7 +285,9 @@ html_engine_disable_selection (HTMLEngine *e)
}
static gboolean
-line_interval (HTMLEngine *e, HTMLCursor *begin, HTMLCursor *end)
+line_interval (HTMLEngine *e,
+ HTMLCursor *begin,
+ HTMLCursor *end)
{
return html_cursor_beginning_of_line (begin, e) && html_cursor_end_of_line (end, e);
}
@@ -294,7 +300,8 @@ html_selection_word (gunichar uc)
}
gboolean
-html_selection_spell_word (gunichar uc, gboolean *cited)
+html_selection_spell_word (gunichar uc,
+ gboolean *cited)
{
if (uc == '\'' || uc == '`') {
*cited = TRUE;
@@ -305,7 +312,9 @@ html_selection_spell_word (gunichar uc, gboolean *cited)
}
static gboolean
-word_interval (HTMLEngine *e, HTMLCursor *begin, HTMLCursor *end)
+word_interval (HTMLEngine *e,
+ HTMLCursor *begin,
+ HTMLCursor *end)
{
/* move to the begin of word */
while (html_selection_word (html_cursor_get_prev_char (begin)))
@@ -318,7 +327,10 @@ word_interval (HTMLEngine *e, HTMLCursor *begin, HTMLCursor *end)
}
static void
-selection_helper (HTMLEngine *e, gboolean (*get_interval)(HTMLEngine *e, HTMLCursor *begin, HTMLCursor *end))
+selection_helper (HTMLEngine *e,
+ gboolean (*get_interval)(HTMLEngine *e,
+ HTMLCursor *begin,
+ HTMLCursor *end))
{
HTMLCursor *cursor, *begin, *end;
HTMLInterval *i;
@@ -365,7 +377,9 @@ html_engine_is_selection_active (HTMLEngine *e)
}
static void
-test_point (HTMLObject *o, HTMLEngine *e, gpointer data)
+test_point (HTMLObject *o,
+ HTMLEngine *e,
+ gpointer data)
{
HTMLPoint *point = (HTMLPoint *) data;
@@ -381,7 +395,9 @@ test_point (HTMLObject *o, HTMLEngine *e, gpointer data)
}
gboolean
-html_engine_point_in_selection (HTMLEngine *e, HTMLObject *obj, guint offset)
+html_engine_point_in_selection (HTMLEngine *e,
+ HTMLObject *obj,
+ guint offset)
{
HTMLPoint *point;
gboolean rv;
@@ -399,7 +415,8 @@ html_engine_point_in_selection (HTMLEngine *e, HTMLObject *obj, guint offset)
}
void
-html_engine_activate_selection (HTMLEngine *e, guint32 time)
+html_engine_activate_selection (HTMLEngine *e,
+ guint32 time)
{
/* printf ("activate selection\n"); */
@@ -424,7 +441,8 @@ html_engine_unblock_selection (HTMLEngine *e)
}
void
-html_engine_update_selection_active_state (HTMLEngine *e, guint32 time)
+html_engine_update_selection_active_state (HTMLEngine *e,
+ guint32 time)
{
if (html_engine_is_selection_active (e))
html_engine_activate_selection (e, time ? time : gtk_get_current_event_time ());
diff --git a/gtkhtml/htmlselection.h b/gtkhtml/htmlselection.h
index 48ff1f8..1c64158 100644
--- a/gtkhtml/htmlselection.h
+++ b/gtkhtml/htmlselection.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTML_SELECTION_H_
diff --git a/gtkhtml/htmlsettings.c b/gtkhtml/htmlsettings.c
index dd1b642..a9b1bdd 100644
--- a/gtkhtml/htmlsettings.c
+++ b/gtkhtml/htmlsettings.c
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1999 Anders Carlsson (andersca gnu org)
- (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1999 Anders Carlsson (andersca gnu org)
+ * (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -63,7 +63,7 @@ html_settings_destroy (HTMLSettings *settings)
void
html_settings_set_font_sizes (HTMLSettings *settings,
- const gint *newFontSizes)
+ const gint *newFontSizes)
{
guint i;
@@ -73,7 +73,7 @@ html_settings_set_font_sizes (HTMLSettings *settings,
void
html_settings_get_font_sizes (HTMLSettings *settings,
- gint *fontSizes)
+ gint *fontSizes)
{
guint i;
@@ -89,7 +89,7 @@ html_settings_reset_font_sizes (HTMLSettings *settings)
void
html_settings_copy (HTMLSettings *dest,
- HTMLSettings *src)
+ HTMLSettings *src)
{
g_free (dest->fontBaseFace);
g_free (dest->fixedFontFace);
@@ -102,7 +102,7 @@ html_settings_copy (HTMLSettings *dest,
void
html_settings_set_font_base_face (HTMLSettings *settings,
- const gchar *face)
+ const gchar *face)
{
g_free (settings->fontBaseFace);
settings->fontBaseFace = g_strdup (face);
@@ -110,7 +110,7 @@ html_settings_set_font_base_face (HTMLSettings *settings,
void
html_settings_set_fixed_font_face (HTMLSettings *settings,
- const gchar *face)
+ const gchar *face)
{
g_free (settings->fixedFontFace);
settings->fixedFontFace = g_strdup (face);
diff --git a/gtkhtml/htmlsettings.h b/gtkhtml/htmlsettings.h
index cb32a94..c48b255 100644
--- a/gtkhtml/htmlsettings.h
+++ b/gtkhtml/htmlsettings.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLSETTINGS_H_
diff --git a/gtkhtml/htmlshape.c b/gtkhtml/htmlshape.c
index dbf722a..567fa14 100644
--- a/gtkhtml/htmlshape.c
+++ b/gtkhtml/htmlshape.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2001, Ximian, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2001, Ximian, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <glib.h>
@@ -36,49 +36,51 @@ struct _HTMLShape {
static HTMLLength *
parse_length (const gchar **str) {
- const gchar *cur = *str;
- HTMLLength *len = g_new0 (HTMLLength, 1);
+ const gchar *cur = *str;
+ HTMLLength *len = g_new0 (HTMLLength,
+ 1);
/* g_warning ("begin \"%s\"", *str); */
- while (isspace (*cur)) cur++;
+ while (isspace (*cur)) cur++;
- len->val = atoi (cur);
- len->type = HTML_LENGTH_TYPE_PIXELS;
+ len->val = atoi (cur);
+ len->type = HTML_LENGTH_TYPE_PIXELS;
- while (isdigit (*cur) || *cur == '-') cur++;
+ while (isdigit (*cur) || *cur == '-') cur++;
- switch (*cur) {
- case '*':
- if (len->val == 0)
- len->val = 1;
- len->type = HTML_LENGTH_TYPE_FRACTION;
- cur++;
- break;
- case '%':
- len->type = HTML_LENGTH_TYPE_PERCENT;
+ switch (*cur) {
+ case '*':
+ if (len->val == 0)
+ len->val = 1;
+ len->type = HTML_LENGTH_TYPE_FRACTION;
cur++;
- break;
- }
+ break;
+ case '%':
+ len->type = HTML_LENGTH_TYPE_PERCENT;
+ cur++;
+ break;
+ }
- if (cur <= *str) {
- g_free (len);
- return NULL;
- }
+ if (cur <= *str) {
+ g_free (len);
+ return NULL;
+ }
/* g_warning ("length len->val=%d, len->type=%d", len->val, len->type); */
*str = cur;
cur = strstr (cur, ",");
- if (cur) {
- cur++;
+ if (cur) {
+ cur++;
*str = cur;
- }
+ }
- return len;
+ return len;
}
void
-html_length_array_parse (GPtrArray *array, const gchar *str)
+html_length_array_parse (GPtrArray *array,
+ const gchar *str)
{
HTMLLength *length;
@@ -102,7 +104,9 @@ html_length_array_destroy (GPtrArray *array)
#define HTML_DIST(x,y) (gint)sqrt((x)*(x) + (y)*(y))
gboolean
-html_shape_point (HTMLShape *shape, gint x, gint y)
+html_shape_point (HTMLShape *shape,
+ gint x,
+ gint y)
{
gint i;
gint j = 0;
@@ -130,16 +134,16 @@ html_shape_point (HTMLShape *shape, gint x, gint y)
break;
case HTML_SHAPE_POLY:
- for (i=0; i < shape->coords->len; i+=2) {
+ for (i = 0; i < shape->coords->len; i+=2) {
j+=2;
if (j == shape->coords->len)
- j=0;
+ j = 0;
- if ((poly[i+1]->val < y && poly[j+1]->val >= y)
- || (poly[j+1]->val < y && poly[i+1]->val >= y)) {
+ if ((poly[i + 1]->val < y && poly[j + 1]->val >= y)
+ || (poly[j + 1]->val < y && poly[i + 1]->val >= y)) {
- if (poly[i]->val + (y - poly[i+1]->val)
- / (poly[j+1]->val - poly[i+1]->val)
+ if (poly[i]->val + (y - poly[i + 1]->val)
+ / (poly[j + 1]->val - poly[i + 1]->val)
* (poly[j]->val - poly[i]->val) < x) {
odd = !odd;
}
@@ -156,18 +160,18 @@ html_shape_point (HTMLShape *shape, gint x, gint y)
static HTMLShapeType
parse_shape_type (gchar *token) {
- HTMLShapeType type = HTML_SHAPE_RECT;
+ HTMLShapeType type = HTML_SHAPE_RECT;
if (!token || g_ascii_strncasecmp (token, "rect", 4) == 0)
- type = HTML_SHAPE_RECT;
+ type = HTML_SHAPE_RECT;
else if (g_ascii_strncasecmp (token, "poly", 4) == 0)
- type = HTML_SHAPE_POLY;
+ type = HTML_SHAPE_POLY;
else if (g_ascii_strncasecmp (token, "circle", 6) == 0)
- type = HTML_SHAPE_CIRCLE;
+ type = HTML_SHAPE_CIRCLE;
else if (g_ascii_strncasecmp (token, "default", 7) == 0)
- type = HTML_SHAPE_DEFAULT;
+ type = HTML_SHAPE_DEFAULT;
- return type;
+ return type;
}
gchar *
@@ -177,7 +181,10 @@ html_shape_get_url (HTMLShape *shape)
}
HTMLShape *
-html_shape_new (gchar *type_str, gchar *coords, gchar *url, gchar *target)
+html_shape_new (gchar *type_str,
+ gchar *coords,
+ gchar *url,
+ gchar *target)
{
HTMLShape *shape;
HTMLShapeType type = parse_shape_type (type_str);
diff --git a/gtkhtml/htmlshape.h b/gtkhtml/htmlshape.h
index 8b4bad7..cc0f241 100644
--- a/gtkhtml/htmlshape.h
+++ b/gtkhtml/htmlshape.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2001, Ximian, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2001, Ximian, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef HTML_SHAPE_H_
diff --git a/gtkhtml/htmlstack.c b/gtkhtml/htmlstack.c
index 4ebd9fb..0b7abc1 100644
--- a/gtkhtml/htmlstack.c
+++ b/gtkhtml/htmlstack.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML widget.
-
- Copyright (C) 1999 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Ettore Perazzoli <ettore gnu org>
+ *
+ * Copyright (C) 1999 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Ettore Perazzoli <ettore gnu org>
*/
#include <config.h>
@@ -86,7 +86,7 @@ html_stack_top (HTMLStack *stack)
void
html_stack_push (HTMLStack *stack,
- gpointer data)
+ gpointer data)
{
stack->list = g_list_prepend (stack->list, data);
}
diff --git a/gtkhtml/htmlstack.h b/gtkhtml/htmlstack.h
index 71c9a5f..b2863a3 100644
--- a/gtkhtml/htmlstack.h
+++ b/gtkhtml/htmlstack.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLSTACK_H_
diff --git a/gtkhtml/htmlstringtokenizer.c b/gtkhtml/htmlstringtokenizer.c
index ef35485..8c81841 100644
--- a/gtkhtml/htmlstringtokenizer.c
+++ b/gtkhtml/htmlstringtokenizer.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
@@ -66,8 +66,8 @@ typedef enum _QuoteType QuoteType;
void
html_string_tokenizer_tokenize (HTMLStringTokenizer *t,
- const gchar *str,
- const gchar *separators)
+ const gchar *str,
+ const gchar *separators)
{
const gchar *src, *x;
QuoteType quoted;
diff --git a/gtkhtml/htmlstringtokenizer.h b/gtkhtml/htmlstringtokenizer.h
index 7e24269..aca39fb 100644
--- a/gtkhtml/htmlstringtokenizer.h
+++ b/gtkhtml/htmlstringtokenizer.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLSTRINGTOKENIZER_H_
#define _HTMLSTRINGTOKENIZER_H_
diff --git a/gtkhtml/htmlstyle.c b/gtkhtml/htmlstyle.c
index c884ef8..2706f61 100644
--- a/gtkhtml/htmlstyle.c
+++ b/gtkhtml/htmlstyle.c
@@ -1,22 +1,22 @@
/* "a -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2002, Ximian Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2002, Ximian Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <string.h>
@@ -27,7 +27,7 @@
/* Color handling. */
gboolean
html_parse_color (const gchar *text,
- GdkColor *color)
+ GdkColor *color)
{
gchar c[8];
gint len = strlen (text);
@@ -74,51 +74,52 @@ html_parse_color (const gchar *text,
}
if (len < 7)
- memset (c + len, '\0', 7-len);
+ memset (c + len, '\0', 7 - len);
return gdk_color_parse (c, color);
}
static HTMLLength *
parse_length (gchar *str) {
- gchar *cur = str;
- HTMLLength *len;
+ gchar *cur = str;
+ HTMLLength *len;
- len = g_new0 (HTMLLength, 1);
+ len = g_new0 (HTMLLength,
+ 1);
- if (!str)
- return len;
+ if (!str)
+ return len;
/* g_warning ("begin \"%s\"", *str); */
- while (isspace (*cur)) cur++;
+ while (isspace (*cur)) cur++;
- len->val = atoi (cur);
- len->type = HTML_LENGTH_TYPE_PIXELS;
+ len->val = atoi (cur);
+ len->type = HTML_LENGTH_TYPE_PIXELS;
- while (isdigit (*cur) || *cur == '-') cur++;
+ while (isdigit (*cur) || *cur == '-') cur++;
- switch (*cur) {
- case '*':
- if (len->val == 0)
- len->val = 1;
- len->type = HTML_LENGTH_TYPE_FRACTION;
- cur++;
- break;
- case '%':
- len->type = HTML_LENGTH_TYPE_PERCENT;
+ switch (*cur) {
+ case '*':
+ if (len->val == 0)
+ len->val = 1;
+ len->type = HTML_LENGTH_TYPE_FRACTION;
cur++;
- break;
- }
+ break;
+ case '%':
+ len->type = HTML_LENGTH_TYPE_PERCENT;
+ cur++;
+ break;
+ }
- if (cur <= str) {
- g_free (len);
- return NULL;
- }
+ if (cur <= str) {
+ g_free (len);
+ return NULL;
+ }
/* g_warning ("length len->val=%d, len->type=%d", len->val, len->type); */
- return len;
+ return len;
}
HTMLStyle *
@@ -165,7 +166,8 @@ html_style_free (HTMLStyle *style)
}
HTMLStyle *
-html_style_add_color (HTMLStyle *style, HTMLColor *color)
+html_style_add_color (HTMLStyle *style,
+ HTMLColor *color)
{
HTMLColor *old;
@@ -186,7 +188,8 @@ html_style_add_color (HTMLStyle *style, HTMLColor *color)
}
HTMLStyle *
-html_style_unset_decoration (HTMLStyle *style, GtkHTMLFontStyle font_style)
+html_style_unset_decoration (HTMLStyle *style,
+ GtkHTMLFontStyle font_style)
{
if (!style)
style = html_style_new ();
@@ -199,7 +202,8 @@ html_style_unset_decoration (HTMLStyle *style, GtkHTMLFontStyle font_style)
}
HTMLStyle *
-html_style_set_decoration (HTMLStyle *style, GtkHTMLFontStyle font_style)
+html_style_set_decoration (HTMLStyle *style,
+ GtkHTMLFontStyle font_style)
{
if (!style)
style = html_style_new ();
@@ -212,7 +216,8 @@ html_style_set_decoration (HTMLStyle *style, GtkHTMLFontStyle font_style)
}
HTMLStyle *
-html_style_set_font_size (HTMLStyle *style, GtkHTMLFontStyle font_style)
+html_style_set_font_size (HTMLStyle *style,
+ GtkHTMLFontStyle font_style)
{
if (!style)
style = html_style_new ();
@@ -225,7 +230,8 @@ html_style_set_font_size (HTMLStyle *style, GtkHTMLFontStyle font_style)
}
HTMLStyle *
-html_style_add_font_face (HTMLStyle *style, const HTMLFontFace *face)
+html_style_add_font_face (HTMLStyle *style,
+ const HTMLFontFace *face)
{
if (!style)
style = html_style_new ();
@@ -237,7 +243,8 @@ html_style_add_font_face (HTMLStyle *style, const HTMLFontFace *face)
}
HTMLStyle *
-html_style_add_text_align (HTMLStyle *style, HTMLHAlignType type)
+html_style_add_text_align (HTMLStyle *style,
+ HTMLHAlignType type)
{
if (!style)
style = html_style_new ();
@@ -248,7 +255,8 @@ html_style_add_text_align (HTMLStyle *style, HTMLHAlignType type)
}
HTMLStyle *
-html_style_add_text_valign (HTMLStyle *style, HTMLVAlignType type)
+html_style_add_text_valign (HTMLStyle *style,
+ HTMLVAlignType type)
{
if (!style)
style = html_style_new ();
@@ -259,7 +267,8 @@ html_style_add_text_valign (HTMLStyle *style, HTMLVAlignType type)
}
HTMLStyle *
-html_style_add_background_color (HTMLStyle *style, HTMLColor *color)
+html_style_add_background_color (HTMLStyle *style,
+ HTMLColor *color)
{
HTMLColor *old;
@@ -280,7 +289,8 @@ html_style_add_background_color (HTMLStyle *style, HTMLColor *color)
}
HTMLStyle *
-html_style_set_display (HTMLStyle *style, HTMLDisplayType display)
+html_style_set_display (HTMLStyle *style,
+ HTMLDisplayType display)
{
if (!style)
style = html_style_new ();
@@ -291,7 +301,8 @@ html_style_set_display (HTMLStyle *style, HTMLDisplayType display)
}
HTMLStyle *
-html_style_set_clear (HTMLStyle *style, HTMLClearType clear)
+html_style_set_clear (HTMLStyle *style,
+ HTMLClearType clear)
{
if (!style)
style = html_style_new ();
@@ -302,7 +313,8 @@ html_style_set_clear (HTMLStyle *style, HTMLClearType clear)
}
HTMLStyle *
-html_style_add_width (HTMLStyle *style, gchar *len)
+html_style_add_width (HTMLStyle *style,
+ gchar *len)
{
if (!style)
style = html_style_new ();
@@ -315,7 +327,8 @@ html_style_add_width (HTMLStyle *style, gchar *len)
}
HTMLStyle *
-html_style_add_height (HTMLStyle *style, gchar *len)
+html_style_add_height (HTMLStyle *style,
+ gchar *len)
{
if (!style)
style = html_style_new ();
@@ -328,7 +341,8 @@ html_style_add_height (HTMLStyle *style, gchar *len)
}
HTMLStyle *
-html_style_add_background_image (HTMLStyle *style, const gchar *url)
+html_style_add_background_image (HTMLStyle *style,
+ const gchar *url)
{
if (!style)
style = html_style_new ();
@@ -340,7 +354,8 @@ html_style_add_background_image (HTMLStyle *style, const gchar *url)
}
HTMLStyle *
-html_style_set_border_style (HTMLStyle *style, HTMLBorderStyle bstyle)
+html_style_set_border_style (HTMLStyle *style,
+ HTMLBorderStyle bstyle)
{
if (!style)
style = html_style_new ();
@@ -351,7 +366,8 @@ html_style_set_border_style (HTMLStyle *style, HTMLBorderStyle bstyle)
}
HTMLStyle *
-html_style_set_border_width (HTMLStyle *style, gint width)
+html_style_set_border_width (HTMLStyle *style,
+ gint width)
{
if (!style)
style = html_style_new ();
@@ -362,7 +378,8 @@ html_style_set_border_width (HTMLStyle *style, gint width)
}
HTMLStyle *
-html_style_set_padding (HTMLStyle *style, gint padding)
+html_style_set_padding (HTMLStyle *style,
+ gint padding)
{
if (!style)
style = html_style_new ();
@@ -373,7 +390,8 @@ html_style_set_padding (HTMLStyle *style, gint padding)
}
HTMLStyle *
-html_style_set_border_color (HTMLStyle *style, HTMLColor *color)
+html_style_set_border_color (HTMLStyle *style,
+ HTMLColor *color)
{
HTMLColor *old;
@@ -394,7 +412,8 @@ html_style_set_border_color (HTMLStyle *style, HTMLColor *color)
}
static HTMLStyle *
-parse_border_style (HTMLStyle *style, gchar *value)
+parse_border_style (HTMLStyle *style,
+ gchar *value)
{
while (isspace (*value))
value++;
@@ -408,7 +427,8 @@ parse_border_style (HTMLStyle *style, gchar *value)
}
static HTMLStyle *
-parse_border_color (HTMLStyle *style, gchar *value)
+parse_border_color (HTMLStyle *style,
+ gchar *value)
{
GdkColor color;
@@ -422,7 +442,8 @@ parse_border_color (HTMLStyle *style, gchar *value)
}
static HTMLStyle *
-parse_border_width (HTMLStyle *style, gchar *value)
+parse_border_width (HTMLStyle *style,
+ gchar *value)
{
while (isspace (*value))
value++;
@@ -440,7 +461,8 @@ parse_border_width (HTMLStyle *style, gchar *value)
}
static HTMLStyle *
-parse_border (HTMLStyle *style, gchar *value)
+parse_border (HTMLStyle *style,
+ gchar *value)
{
while (value && *value) {
gchar *next;
@@ -476,7 +498,8 @@ parse_border (HTMLStyle *style, gchar *value)
}
HTMLStyle *
-html_style_add_attribute (HTMLStyle *style, const gchar *attr)
+html_style_add_attribute (HTMLStyle *style,
+ const gchar *attr)
{
gchar **prop;
diff --git a/gtkhtml/htmlstyle.h b/gtkhtml/htmlstyle.h
index e8047ca..dab517b 100644
--- a/gtkhtml/htmlstyle.h
+++ b/gtkhtml/htmlstyle.h
@@ -1,22 +1,22 @@
/* "a -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2002, Ximian Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2002, Ximian Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef __HTML_STYLE_H__
diff --git a/gtkhtml/htmltable.c b/gtkhtml/htmltable.c
index 5a2caa5..12d23bb 100644
--- a/gtkhtml/htmltable.c
+++ b/gtkhtml/htmltable.c
@@ -1,25 +1,25 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999 Anders Carlsson (andersca gnu org)
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999 Anders Carlsson (andersca gnu org)
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -70,7 +70,9 @@ static void html_table_set_max_width (HTMLObject *o, HTMLPainter *painter, gint
static inline gboolean
-invalid_cell (HTMLTable *table, gint r, gint c)
+invalid_cell (HTMLTable *table,
+ gint r,
+ gint c)
{
return (table->cells[r][c] == NULL
|| c != table->cells[r][c]->col
@@ -115,7 +117,10 @@ destroy (HTMLObject *o)
}
static void
-copy_sized (HTMLObject *self, HTMLObject *dest, gint rows, gint cols)
+copy_sized (HTMLObject *self,
+ HTMLObject *dest,
+ gint rows,
+ gint cols)
{
HTMLTable *d = HTML_TABLE (dest);
HTMLTable *s = HTML_TABLE (self);
@@ -146,7 +151,8 @@ copy_sized (HTMLObject *self, HTMLObject *dest, gint rows, gint cols)
}
static void
-copy (HTMLObject *self, HTMLObject *dest)
+copy (HTMLObject *self,
+ HTMLObject *dest)
{
copy_sized (self, dest, HTML_TABLE (self)->totalRows, HTML_TABLE (self)->totalCols);
}
@@ -154,7 +160,12 @@ copy (HTMLObject *self, HTMLObject *dest)
static HTMLObject * op_copy (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList *to, guint *len);
static HTMLObject *
-copy_as_leaf (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList *to, guint *len)
+copy_as_leaf (HTMLObject *self,
+ HTMLObject *parent,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ guint *len)
{
if ((!from || GPOINTER_TO_INT (from->data) == 0)
&& (!to || GPOINTER_TO_INT (to->data) == html_object_get_length (self)))
@@ -164,7 +175,12 @@ copy_as_leaf (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from,
}
static HTMLObject *
-op_copy (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList *to, guint *len)
+op_copy (HTMLObject *self,
+ HTMLObject *parent,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ guint *len)
{
HTMLTableCell *start, *end;
HTMLTable *nt, *t;
@@ -254,7 +270,8 @@ get_n_children (HTMLObject *self)
}
static HTMLObject *
-get_child (HTMLObject *self, gint index)
+get_child (HTMLObject *self,
+ gint index)
{
HTMLTable *t = HTML_TABLE (self);
HTMLObject *child = NULL;
@@ -276,7 +293,8 @@ get_child (HTMLObject *self, gint index)
}
static gint
-get_child_index (HTMLObject *self, HTMLObject *child)
+get_child_index (HTMLObject *self,
+ HTMLObject *child)
{
HTMLTable *t = HTML_TABLE (self);
guint r, c;
@@ -310,13 +328,14 @@ get_recursive_length (HTMLObject *self)
len += html_object_get_recursive_length (HTML_OBJECT (t->cells[r][c])) + 1;
/* if (len > 0)
- len--; */
+ * len--; */
len++;
return len;
}
static void
-remove_cell (HTMLTable *t, HTMLTableCell *cell)
+remove_cell (HTMLTable *t,
+ HTMLTableCell *cell)
{
gint r, c;
@@ -344,7 +363,8 @@ remove_cell (HTMLTable *t, HTMLTableCell *cell)
}
static HTMLObject *
-cut_whole (HTMLObject *self, guint *len)
+cut_whole (HTMLObject *self,
+ guint *len)
{
if (self->parent)
html_object_remove_child (self->parent, self);
@@ -357,7 +377,13 @@ cut_whole (HTMLObject *self, guint *len)
}
static HTMLObject *
-cut_partial (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GList *right, guint *len)
+cut_partial (HTMLObject *self,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ GList *left,
+ GList *right,
+ guint *len)
{
HTMLObject *rv;
@@ -422,7 +448,13 @@ cut_partial (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *lef
}
static HTMLObject *
-op_cut (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GList *right, guint *len)
+op_cut (HTMLObject *self,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ GList *left,
+ GList *right,
+ guint *len)
{
if ((!from || !from->next) && (!to || !to->next))
return (*parent_class->op_cut) (self, e, from, to, left, right, len);
@@ -434,7 +466,13 @@ op_cut (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GL
}
static void
-split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint level, GList **left, GList **right)
+split (HTMLObject *self,
+ HTMLEngine *e,
+ HTMLObject *child,
+ gint offset,
+ gint level,
+ GList **left,
+ GList **right)
{
HTMLObject *dup;
HTMLTable *t = HTML_TABLE (self);
@@ -542,7 +580,8 @@ split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint lev
}
static gboolean
-could_merge (HTMLTable *t1, HTMLTable *t2)
+could_merge (HTMLTable *t1,
+ HTMLTable *t2)
{
gint r, c;
gboolean first = TRUE;
@@ -581,7 +620,8 @@ could_merge (HTMLTable *t1, HTMLTable *t2)
}
static HTMLTableCell *
-object_get_parent_cell (HTMLObject *o, HTMLObject *parent_table)
+object_get_parent_cell (HTMLObject *o,
+ HTMLObject *parent_table)
{
while (o) {
if (o->parent == parent_table)
@@ -593,16 +633,24 @@ object_get_parent_cell (HTMLObject *o, HTMLObject *parent_table)
}
static void
-update_cursor (HTMLCursor *cursor, HTMLTableCell *c)
+update_cursor (HTMLCursor *cursor,
+ HTMLTableCell *c)
{
cursor->object = html_object_get_head_leaf (HTML_OBJECT (c));
cursor->offset = 0;
}
static void
-move_cell (HTMLTable *t1, HTMLTable *t2, HTMLTableCell *c1, HTMLTableCell *c2,
- HTMLTableCell *cursor_cell_1, HTMLTableCell *cursor_cell_2, gint r, gint c,
- HTMLCursor *cursor_1, HTMLCursor *cursor_2)
+move_cell (HTMLTable *t1,
+ HTMLTable *t2,
+ HTMLTableCell *c1,
+ HTMLTableCell *c2,
+ HTMLTableCell *cursor_cell_1,
+ HTMLTableCell *cursor_cell_2,
+ gint r,
+ gint c,
+ HTMLCursor *cursor_1,
+ HTMLCursor *cursor_2)
{
if (cursor_1 && cursor_cell_1 == c1)
update_cursor (cursor_1, c2);
@@ -616,7 +664,12 @@ move_cell (HTMLTable *t1, HTMLTable *t2, HTMLTableCell *c1, HTMLTableCell *c2,
}
static gboolean
-merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **right, HTMLCursor *cursor)
+merge (HTMLObject *self,
+ HTMLObject *with,
+ HTMLEngine *e,
+ GList **left,
+ GList **right,
+ HTMLCursor *cursor)
{
HTMLTable *t1 = HTML_TABLE (self);
HTMLTable *t2 = HTML_TABLE (with);
@@ -676,14 +729,14 @@ merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **
e->cursor->object = html_object_get_tail_leaf (HTML_OBJECT (c1));
e->cursor->offset = html_object_get_length (e->cursor->object);
- e->cursor->position -= (t1->totalRows - c1->row - 1)*t1->totalCols
+ e->cursor->position -= (t1->totalRows - c1->row - 1) * t1->totalCols
+ (t1->totalCols - c1->col);
for (list = *left; list; list = list->next)
if (list->data && HTML_IS_TABLE (list->data))
e->cursor->position--;
/* printf ("3rd dec: %d t1_tail %d,%d\n",
- (t1->totalRows - c1->row - 1)*t1->totalCols
+ (t1->totalRows - c1->row - 1) * t1->totalCols
+ (t1->totalCols - c1->col), c1->row, c1->col); */
}
@@ -708,16 +761,16 @@ merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **
if (e->cursor->object == self && t1_tail) {
e->cursor->object = html_object_get_tail_leaf (HTML_OBJECT (t1_tail));
e->cursor->offset = html_object_get_length (HTML_OBJECT (e->cursor->object));
- e->cursor->position -= (t1->totalRows - t1_tail->row - 1)*t1->totalCols
+ e->cursor->position -= (t1->totalRows - t1_tail->row - 1) * t1->totalCols
+ (t1->totalCols - t1_tail->col);
/* printf ("1st dec: %d t1_tail %d,%d\n", (t1->totalRows - t1_tail->row - 1)*t1->totalCols
- + (t1->totalCols - t1_tail->col), t1_tail->row, t1_tail->col); */
+ * + (t1->totalCols - t1_tail->col), t1_tail->row, t1_tail->col); */
}
if (cursor_in_t2 && cursor && cursor_cell_2) {
e->cursor->position -= cursor_cell_2->row * t1->totalCols + cursor_cell_2->col + 1;
/* printf ("2nd dec: %d cell_2 %d,%d\n", cursor_cell_2->row * t1->totalCols + cursor_cell_2->col + 1,
- cursor_cell_2->row, cursor_cell_2->col); */
+ * cursor_cell_2->row, cursor_cell_2->col); */
}
if (cursor && cursor->object == with)
@@ -727,7 +780,8 @@ merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **
}
static void
-remove_child (HTMLObject *self, HTMLObject *child)
+remove_child (HTMLObject *self,
+ HTMLObject *child)
{
remove_cell (HTML_TABLE (self), HTML_TABLE_CELL (child));
}
@@ -745,7 +799,10 @@ is_container (HTMLObject *object)
}
static void
-forall (HTMLObject *self, HTMLEngine *e, HTMLObjectForallFunc func, gpointer data)
+forall (HTMLObject *self,
+ HTMLEngine *e,
+ HTMLObjectForallFunc func,
+ gpointer data)
{
HTMLTableCell *cell;
HTMLTable *table;
@@ -767,17 +824,19 @@ forall (HTMLObject *self, HTMLEngine *e, HTMLObjectForallFunc func, gpointer dat
}
static void
-previous_rows_do_cspan (HTMLTable *table, gint c)
+previous_rows_do_cspan (HTMLTable *table,
+ gint c)
{
gint i;
if (c)
- for (i=0; i < table->totalRows - 1; i++)
+ for (i = 0; i < table->totalRows - 1; i++)
if (table->cells[i][c - 1])
do_cspan (table, i, c, table->cells[i][c - 1]);
}
static void
-expand_columns (HTMLTable *table, gint num)
+expand_columns (HTMLTable *table,
+ gint num)
{
gint r;
@@ -789,14 +848,16 @@ expand_columns (HTMLTable *table, gint num)
}
static void
-inc_columns (HTMLTable *table, gint num)
+inc_columns (HTMLTable *table,
+ gint num)
{
expand_columns (table, num);
previous_rows_do_cspan (table, table->totalCols - num);
}
static void
-expand_rows (HTMLTable *table, gint num)
+expand_rows (HTMLTable *table,
+ gint num)
{
gint r;
@@ -811,7 +872,8 @@ expand_rows (HTMLTable *table, gint num)
}
static void
-inc_rows (HTMLTable *table, gint num)
+inc_rows (HTMLTable *table,
+ gint num)
{
if (table->totalRows + num > table->allocRows)
expand_rows (table, num + MAX (10, table->allocRows >> 2));
@@ -821,13 +883,15 @@ inc_rows (HTMLTable *table, gint num)
}
static inline gint
-cell_end_col (HTMLTable *table, HTMLTableCell *cell)
+cell_end_col (HTMLTable *table,
+ HTMLTableCell *cell)
{
return MIN (table->totalCols, cell->col + cell->cspan);
}
static inline gint
-cell_end_row (HTMLTable *table, HTMLTableCell *cell)
+cell_end_row (HTMLTable *table,
+ HTMLTableCell *cell)
{
return MIN (table->totalRows, cell->row + cell->rspan);
}
@@ -836,8 +900,11 @@ cell_end_row (HTMLTable *table, HTMLTableCell *cell)
#define LL (unsigned long long)
static gboolean
-calc_column_width_step (HTMLTable *table, HTMLPainter *painter, GArray *array, gint *sizes,
- gint (*calc_fn)(HTMLObject *, HTMLPainter *), gint span)
+calc_column_width_step (HTMLTable *table,
+ HTMLPainter *painter,
+ GArray *array,
+ gint *sizes,
+ gint (*calc_fn)(HTMLObject *, HTMLPainter *), gint span)
{
gboolean has_greater_cspan = FALSE;
gint r, c, i, pixel_size = html_painter_get_pixel_size (painter);
@@ -882,7 +949,7 @@ calc_column_width_step (HTMLTable *table, HTMLPainter *painter, GArray *array, g
sizes[cell->col + i] = new_width;
}
/* printf ("%d added %d col_width %d span_width %d\n",
- col_width - added, added, col_width, span_width); */
+ * col_width - added, added, col_width, span_width); */
}
}
@@ -890,8 +957,10 @@ calc_column_width_step (HTMLTable *table, HTMLPainter *painter, GArray *array, g
}
static void
-calc_column_width_template (HTMLTable *table, HTMLPainter *painter, GArray *array,
- gint (*calc_fn)(HTMLObject *, HTMLPainter *), GArray *pref)
+calc_column_width_template (HTMLTable *table,
+ HTMLPainter *painter,
+ GArray *array,
+ gint (*calc_fn)(HTMLObject *, HTMLPainter *), GArray *pref)
{
gint c, add, span;
gint pixel_size = html_painter_get_pixel_size (painter);
@@ -925,19 +994,23 @@ calc_column_width_template (HTMLTable *table, HTMLPainter *painter, GArray *arra
}
static void
-do_cspan (HTMLTable *table, gint row, gint col, HTMLTableCell *cell)
+do_cspan (HTMLTable *table,
+ gint row,
+ gint col,
+ HTMLTableCell *cell)
{
gint i;
g_assert (cell);
g_assert (cell->col <= col);
- for (i=col - cell->col; i < cell->cspan && cell->col + i < table->totalCols; i++)
+ for (i = col - cell->col; i < cell->cspan && cell->col + i < table->totalCols; i++)
html_table_set_cell (table, row, cell->col + i, cell);
}
static void
-prev_col_do_cspan (HTMLTable *table, gint row)
+prev_col_do_cspan (HTMLTable *table,
+ gint row)
{
g_assert (row >= 0);
@@ -950,13 +1023,14 @@ prev_col_do_cspan (HTMLTable *table, gint row)
}
static void
-do_rspan (HTMLTable *table, gint row)
+do_rspan (HTMLTable *table,
+ gint row)
{
gint i;
g_assert (row > 0);
- for (i=0; i<table->totalCols; i++)
+ for (i = 0; i < table->totalCols; i++)
if (table->cells[row - 1][i]
&& (table->cells[row - 1][i])->row + (table->cells[row - 1][i])->rspan
> row) {
@@ -966,7 +1040,10 @@ do_rspan (HTMLTable *table, gint row)
}
void
-html_table_set_cell (HTMLTable *table, gint r, gint c, HTMLTableCell *cell)
+html_table_set_cell (HTMLTable *table,
+ gint r,
+ gint c,
+ HTMLTableCell *cell)
{
if (!table->cells[r][c]) {
#ifdef GTKHTML_DEBUG_TABLE
@@ -978,7 +1055,9 @@ html_table_set_cell (HTMLTable *table, gint r, gint c, HTMLTableCell *cell)
}
void
-html_table_alloc_cell (HTMLTable *table, gint r, gint c)
+html_table_alloc_cell (HTMLTable *table,
+ gint r,
+ gint c)
{
if (c >= table->totalCols)
inc_columns (table, c + 1 - table->totalCols);
@@ -991,7 +1070,7 @@ html_table_alloc_cell (HTMLTable *table, gint r, gint c)
static void
calc_row_heights (HTMLTable *table,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLTableCell *cell;
gint r, c, rl, height, pixel_size = html_painter_get_pixel_size (painter);
@@ -1021,7 +1100,9 @@ calc_row_heights (HTMLTable *table,
}
static void
-calc_cells_size (HTMLTable *table, HTMLPainter *painter, GList **changed_objs)
+calc_cells_size (HTMLTable *table,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLTableCell *cell;
gint r, c;
@@ -1035,7 +1116,8 @@ calc_cells_size (HTMLTable *table, HTMLPainter *painter, GList **changed_objs)
}
static void
-html_table_set_cells_position (HTMLTable *table, HTMLPainter *painter)
+html_table_set_cells_position (HTMLTable *table,
+ HTMLPainter *painter)
{
HTMLTableCell *cell;
gint r, c, rl, pixel_size = html_painter_get_pixel_size (painter);
@@ -1058,7 +1140,10 @@ html_table_set_cells_position (HTMLTable *table, HTMLPainter *painter)
}
static void
-add_clear_area (GList **changed_objs, HTMLObject *o, gint x, gint w)
+add_clear_area (GList **changed_objs,
+ HTMLObject *o,
+ gint x,
+ gint w)
{
HTMLObjectClearRectangle *cr;
@@ -1079,14 +1164,18 @@ add_clear_area (GList **changed_objs, HTMLObject *o, gint x, gint w)
}
static void
-html_table_set_max_height (HTMLObject *o, HTMLPainter *painter, gint height)
+html_table_set_max_height (HTMLObject *o,
+ HTMLPainter *painter,
+ gint height)
{
/* for now just remember it, it will be passed down once size is calculated */
HTML_TABLE (o)->max_height = height;
}
static gboolean
-html_table_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_table_real_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLTable *table = HTML_TABLE (o);
gint old_width, old_ascent, pixel_size;
@@ -1119,7 +1208,7 @@ html_table_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_
break;
case HTML_HALIGN_CENTER:
/* FIXME +/-1 pixel */
- add_clear_area (changed_objs, o, -(old_width - o->width)/2,
+ add_clear_area (changed_objs, o, -(old_width - o->width) / 2,
(old_width - o->width) / 2);
add_clear_area (changed_objs, o, o->width,
(old_width - o->width) / 2);
@@ -1138,7 +1227,10 @@ html_table_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_
#define ARR(i) g_array_index (a, gint, i)
static gint
-bin_search_index (GArray *a, gint l, gint h, gint val)
+bin_search_index (GArray *a,
+ gint l,
+ gint h,
+ gint val)
{
gint i;
@@ -1156,13 +1248,23 @@ bin_search_index (GArray *a, gint l, gint h, gint val)
}
static inline gint
-to_index (gint val, gint l, gint h)
+to_index (gint val,
+ gint l,
+ gint h)
{
return MIN (MAX (val, l), h);
}
static void
-get_bounds (HTMLTable *table, gint x, gint y, gint width, gint height, gint *sc, gint *ec, gint *sr, gint *er)
+get_bounds (HTMLTable *table,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint *sc,
+ gint *ec,
+ gint *sr,
+ gint *er)
{
g_return_if_fail (table->rowHeights);
g_return_if_fail (table->columnOpt);
@@ -1186,9 +1288,10 @@ get_bounds (HTMLTable *table, gint x, gint y, gint width, gint height, gint *sc,
static void
draw_background_helper (HTMLTable *table,
- HTMLPainter *p,
- GdkRectangle *paint,
- gint tx, gint ty)
+ HTMLPainter *p,
+ GdkRectangle *paint,
+ gint tx,
+ gint ty)
{
GdkPixbuf *pixbuf = NULL;
GdkColor *color = table->bgColor;
@@ -1215,9 +1318,12 @@ draw_background_helper (HTMLTable *table,
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLTableCell *cell;
HTMLTable *table = HTML_TABLE (o);
@@ -1303,7 +1409,7 @@ draw (HTMLObject *o,
static gint
calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLTable *table = HTML_TABLE (o);
@@ -1318,7 +1424,7 @@ calc_min_width (HTMLObject *o,
static gint
calc_preferred_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLTable *table = HTML_TABLE (o);
gint min_width;
@@ -1338,7 +1444,10 @@ calc_preferred_width (HTMLObject *o,
#define PERC(c) (col_percent [c + 1] - col_percent [c])
static gboolean
-calc_percentage_step (HTMLTable *table, gint *col_percent, gint *span_percent, gint span)
+calc_percentage_step (HTMLTable *table,
+ gint *col_percent,
+ gint *span_percent,
+ gint span)
{
HTMLTableCell *cell;
gboolean higher_span = FALSE;
@@ -1401,7 +1510,8 @@ calc_percentage_step (HTMLTable *table, gint *col_percent, gint *span_percent, g
}
static void
-calc_col_percentage (HTMLTable *table, gint *col_percent)
+calc_col_percentage (HTMLTable *table,
+ gint *col_percent)
{
gint c, span, *percent, add;
gboolean next = TRUE;
@@ -1426,7 +1536,8 @@ calc_col_percentage (HTMLTable *table, gint *col_percent)
}
static gint
-calc_not_percented (HTMLTable *table, gint *col_percent)
+calc_not_percented (HTMLTable *table,
+ gint *col_percent)
{
gint c, not_percented;
@@ -1439,7 +1550,11 @@ calc_not_percented (HTMLTable *table, gint *col_percent)
}
static gint
-divide_into_percented (HTMLTable *table, gint *col_percent, gint *max_size, gint max_width, gint left)
+divide_into_percented (HTMLTable *table,
+ gint *col_percent,
+ gint *max_size,
+ gint max_width,
+ gint left)
{
gint added, add, c, to_fill, request, filled;
@@ -1477,8 +1592,14 @@ divide_into_percented (HTMLTable *table, gint *col_percent, gint *max_size, gint
#define PREF(i) (g_array_index (pref, gint, i))
static gboolean
-calc_lowest_fill (HTMLTable *table, GArray *pref, gint *max_size, gint *col_percent, gint pixel_size,
- gint *ret_col, gint *ret_total_pref, gint *ret_total)
+calc_lowest_fill (HTMLTable *table,
+ GArray *pref,
+ gint *max_size,
+ gint *col_percent,
+ gint pixel_size,
+ gint *ret_col,
+ gint *ret_total_pref,
+ gint *ret_total)
{
gint c, pw, border_extra = table->border ? 2 : 0, min_fill = COLUMN_PREF (table, table->totalCols);
@@ -1504,8 +1625,12 @@ calc_lowest_fill (HTMLTable *table, GArray *pref, gint *max_size, gint *col_perc
}
inline static gint
-divide_upto_preferred_width (HTMLTable *table, HTMLPainter *painter, GArray *pref,
- gint *col_percent, gint *max_size, gint left)
+divide_upto_preferred_width (HTMLTable *table,
+ HTMLPainter *painter,
+ GArray *pref,
+ gint *col_percent,
+ gint *max_size,
+ gint left)
{
gint added, part, c, pw, pixel_size = html_painter_get_pixel_size (painter);
gint total, total_pref, to_divide, min_col, min_fill, min_pw, processed_pw, border_extra = table->border ? 2 : 0;
@@ -1558,8 +1683,11 @@ divide_upto_preferred_width (HTMLTable *table, HTMLPainter *painter, GArray *pre
}
inline static void
-divide_left_by_preferred_width (HTMLTable *table, HTMLPainter *painter,
- gint *col_percent, gint *max_size, gint left)
+divide_left_by_preferred_width (HTMLTable *table,
+ HTMLPainter *painter,
+ gint *col_percent,
+ gint *max_size,
+ gint left)
{
gint added, part, c, pref, pw, pixel_size = html_painter_get_pixel_size (painter);
gint total_fill, processed_pw, border_extra = table->border ? 2 : 0;
@@ -1573,8 +1701,8 @@ divide_left_by_preferred_width (HTMLTable *table, HTMLPainter *painter,
pref += COLUMN_PREF (table, c + 1) - COLUMN_PREF (table, c)
- pixel_size * (table->spacing + border_extra);
/* printf ("col pref: %d size: %d\n", COLUMN_PREF (table, c + 1)
- - COLUMN_PREF (table, c)
- - pixel_size * (table->spacing + border_extra), max_size[c]); */
+ * - COLUMN_PREF (table, c)
+ * - pixel_size * (table->spacing + border_extra), max_size[c]); */
added = 0;
processed_pw = 0;
@@ -1588,7 +1716,7 @@ divide_left_by_preferred_width (HTMLTable *table, HTMLPainter *painter,
processed_pw += pw;
part = (LL total_fill * processed_pw) / pref;
/* printf ("pw %d part %d total %d processed %d\n",
- pw, part, total_fill, processed_pw); */
+ * pw, part, total_fill, processed_pw); */
if (LL total_fill * processed_pw - LL part * pref
> LL (part + 1) * pref - LL total_fill * processed_pw)
part++;
@@ -1604,8 +1732,11 @@ divide_left_by_preferred_width (HTMLTable *table, HTMLPainter *painter,
}
inline static void
-divide_into_variable_all (HTMLTable *table, HTMLPainter *painter,
- gint *col_percent, gint *max_size, gint left)
+divide_into_variable_all (HTMLTable *table,
+ HTMLPainter *painter,
+ gint *col_percent,
+ gint *max_size,
+ gint left)
{
/* printf ("left %d cols: %d\n", left, table->totalCols); */
html_object_calc_preferred_width (HTML_OBJECT (table), painter);
@@ -1618,7 +1749,11 @@ divide_into_variable_all (HTMLTable *table, HTMLPainter *painter,
}
inline static void
-divide_into_percented_all (HTMLTable *table, gint *col_percent, gint *max_size, gint max_width, gint left)
+divide_into_percented_all (HTMLTable *table,
+ gint *col_percent,
+ gint *max_size,
+ gint max_width,
+ gint left)
{
gdouble sub_percent, percent;
gint c, sub_width, width;
@@ -1660,7 +1795,9 @@ divide_into_percented_all (HTMLTable *table, gint *col_percent, gint *max_size,
#define CSPAN (MIN (cell->col + cell->cspan, table->totalCols) - cell->col - 1)
static void
-html_table_set_cells_max_width (HTMLTable *table, HTMLPainter *painter, gint *max_size)
+html_table_set_cells_max_width (HTMLTable *table,
+ HTMLPainter *painter,
+ gint *max_size)
{
HTMLTableCell *cell;
gint r, c, size, pixel_size = html_painter_get_pixel_size (painter);
@@ -1680,7 +1817,9 @@ html_table_set_cells_max_width (HTMLTable *table, HTMLPainter *painter, gint *ma
}
static void
-set_columns_optimal_width (HTMLTable *table, gint *max_size, gint pixel_size)
+set_columns_optimal_width (HTMLTable *table,
+ gint *max_size,
+ gint pixel_size)
{
gint c;
@@ -1693,7 +1832,11 @@ set_columns_optimal_width (HTMLTable *table, gint *max_size, gint pixel_size)
}
static void
-divide_left_width (HTMLTable *table, HTMLPainter *painter, gint *max_size, gint max_width, gint width_left)
+divide_left_width (HTMLTable *table,
+ HTMLPainter *painter,
+ gint *max_size,
+ gint max_width,
+ gint width_left)
{
gint not_percented, c;
gint *col_percent;
@@ -1723,21 +1866,22 @@ divide_left_width (HTMLTable *table, HTMLPainter *painter, gint *max_size, gint
}
static gint *
-alloc_max_size (HTMLTable *table, gint pixel_size)
+alloc_max_size (HTMLTable *table,
+ gint pixel_size)
{
gint *max_size, c, border_extra = table->border ? 2 : 0;
max_size = g_new (gint, table->totalCols);
for (c = 0; c < table->totalCols; c++)
- max_size[c] = COLUMN_MIN (table, c+1) - COLUMN_MIN (table, c) - pixel_size * (table->spacing + border_extra);
+ max_size[c] = COLUMN_MIN (table, c + 1) - COLUMN_MIN (table, c) - pixel_size * (table->spacing + border_extra);
return max_size;
}
static void
html_table_set_max_width (HTMLObject *o,
- HTMLPainter *painter,
- gint max_width)
+ HTMLPainter *painter,
+ gint max_width)
{
HTMLTable *table = HTML_TABLE (o);
gint *max_size, pixel_size, glue, border_extra = table->border ? 2 : 0;
@@ -1788,7 +1932,10 @@ reset (HTMLObject *o)
}
static HTMLAnchor *
-find_anchor (HTMLObject *self, const gchar *name, gint *x, gint *y)
+find_anchor (HTMLObject *self,
+ const gchar *name,
+ gint *x,
+ gint *y)
{
HTMLTable *table;
HTMLTableCell *cell;
@@ -1806,10 +1953,10 @@ find_anchor (HTMLObject *self, const gchar *name, gint *x, gint *y)
continue;
if (c < table->totalCols - 1
- && cell == table->cells[r][c+1])
+ && cell == table->cells[r][c + 1])
continue;
if (r < table->totalRows - 1
- && table->cells[r+1][c] == cell)
+ && table->cells[r + 1][c] == cell)
continue;
anchor = html_object_find_anchor (HTML_OBJECT (cell),
@@ -1827,10 +1974,11 @@ find_anchor (HTMLObject *self, const gchar *name, gint *x, gint *y)
static HTMLObject *
check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
HTMLTableCell *cell;
HTMLObject *obj;
@@ -1880,9 +2028,9 @@ check_point (HTMLObject *self,
if (cell == NULL)
continue;
- if (c < end_col - 1 && cell == table->cells[r][c+1])
+ if (c < end_col - 1 && cell == table->cells[r][c + 1])
continue;
- if (r < end_row - 1 && table->cells[r+1][c] == cell)
+ if (r < end_row - 1 && table->cells[r + 1][c] == cell)
continue;
co = HTML_OBJECT (cell);
@@ -1909,7 +2057,7 @@ check_point (HTMLObject *self,
if (!for_cursor) {
if (x >= 0 && y >= 0 && x < self->width && y < self->ascent + self->descent) {
if (offset_return) {
- if (x < self->width/2)
+ if (x < self->width / 2)
*offset_return = 0;
else
*offset_return = 1;
@@ -1922,7 +2070,8 @@ check_point (HTMLObject *self,
}
static gboolean
-search (HTMLObject *obj, HTMLSearch *info)
+search (HTMLObject *obj,
+ HTMLSearch *info)
{
HTMLTable *table = HTML_TABLE (obj);
HTMLTableCell *cell;
@@ -2001,7 +2150,7 @@ search (HTMLObject *obj, HTMLSearch *info)
static void
append_selection_string (HTMLObject *self,
- GString *buffer)
+ GString *buffer)
{
HTMLTable *table;
HTMLTableCell *cell;
@@ -2031,7 +2180,7 @@ append_selection_string (HTMLObject *self,
/* remove last \n from added text */
if (buffer->len != len) {
tab = TRUE;
- if (buffer->str[buffer->len-1] == '\n')
+ if (buffer->str[buffer->len - 1] == '\n')
g_string_truncate (buffer, buffer->len - 1);
}
}
@@ -2075,7 +2224,8 @@ tail (HTMLObject *self)
}
static HTMLObject *
-next (HTMLObject *self, HTMLObject *child)
+next (HTMLObject *self,
+ HTMLObject *child)
{
HTMLTable *table;
gint r, c;
@@ -2095,7 +2245,8 @@ next (HTMLObject *self, HTMLObject *child)
}
static HTMLObject *
-prev (HTMLObject *self, HTMLObject *child)
+prev (HTMLObject *self,
+ HTMLObject *child)
{
HTMLTable *table;
gint r, c;
@@ -2109,7 +2260,7 @@ prev (HTMLObject *self, HTMLObject *child)
continue;
return HTML_OBJECT (table->cells[r][c]);
}
- c = table->totalCols-1;
+ c = table->totalCols - 1;
}
return NULL;
}
@@ -2172,8 +2323,8 @@ save (HTMLObject *self,
static gboolean
save_plain (HTMLObject *self,
- HTMLEngineSaveState *state,
- gint requested_width)
+ HTMLEngineSaveState *state,
+ gint requested_width)
{
HTMLTable *table;
gint r, c;
@@ -2196,7 +2347,10 @@ save_plain (HTMLObject *self,
}
static gboolean
-check_row_split (HTMLTable *table, HTMLPainter *painter, gint r, gint *min_y)
+check_row_split (HTMLTable *table,
+ HTMLPainter *painter,
+ gint r,
+ gint *min_y)
{
HTMLTableCell *cell;
gboolean changed = FALSE;
@@ -2227,7 +2381,9 @@ check_row_split (HTMLTable *table, HTMLPainter *painter, gint r, gint *min_y)
}
static gint
-check_page_split (HTMLObject *self, HTMLPainter *painter, gint y)
+check_page_split (HTMLObject *self,
+ HTMLPainter *painter,
+ gint y)
{
HTMLTable *table;
gint r, min_y;
@@ -2240,9 +2396,9 @@ check_page_split (HTMLObject *self, HTMLPainter *painter, gint y)
/* printf ("y: %d rh: %d rh+1: %d\n", y, ROW_HEIGHT (table, r), ROW_HEIGHT (table, r+1)); */
/* if (r >= table->totalRows)
- return MIN (y, ROW_HEIGHT (table, table->totalRows)); */
+ * return MIN (y, ROW_HEIGHT (table, table->totalRows)); */
- min_y = MIN (y, ROW_HEIGHT (table, r+1));
+ min_y = MIN (y, ROW_HEIGHT (table, r + 1));
while (check_row_split (table, painter, r, &min_y));
/* printf ("min_y=%d\n", min_y); */
@@ -2252,7 +2408,7 @@ check_page_split (HTMLObject *self, HTMLPainter *painter, gint y)
static GdkColor *
get_bg_color (HTMLObject *o,
- HTMLPainter *p)
+ HTMLPainter *p)
{
return HTML_TABLE (o)->bgColor
@@ -2269,8 +2425,8 @@ html_table_type_init (void)
void
html_table_class_init (HTMLTableClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
HTMLObjectClass *object_class;
@@ -2317,9 +2473,12 @@ html_table_class_init (HTMLTableClass *klass,
void
html_table_init (HTMLTable *table,
- HTMLTableClass *klass,
- gint width, gint percent,
- gint padding, gint spacing, gint border)
+ HTMLTableClass *klass,
+ gint width,
+ gint percent,
+ gint padding,
+ gint spacing,
+ gint border)
{
HTMLObject *object;
gint r;
@@ -2364,8 +2523,11 @@ html_table_init (HTMLTable *table,
}
HTMLObject *
-html_table_new (gint width, gint percent,
- gint padding, gint spacing, gint border)
+html_table_new (gint width,
+ gint percent,
+ gint padding,
+ gint spacing,
+ gint border)
{
HTMLTable *table;
@@ -2379,7 +2541,8 @@ html_table_new (gint width, gint percent,
void
-html_table_add_cell (HTMLTable *table, HTMLTableCell *cell)
+html_table_add_cell (HTMLTable *table,
+ HTMLTableCell *cell)
{
html_table_alloc_cell (table, table->row, table->col);
prev_col_do_cspan (table, table->row);
diff --git a/gtkhtml/htmltable.h b/gtkhtml/htmltable.h
index feaa2ff..d57c470 100644
--- a/gtkhtml/htmltable.h
+++ b/gtkhtml/htmltable.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLTABLE_H_
#define _HTMLTABLE_H_
diff --git a/gtkhtml/htmltablecell.c b/gtkhtml/htmltablecell.c
index 119726e..8566635 100644
--- a/gtkhtml/htmltablecell.c
+++ b/gtkhtml/htmltablecell.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999 Anders Carlsson (andersca gnu org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999 Anders Carlsson (andersca gnu org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -34,7 +34,7 @@
#include "htmltablecell.h"
/* FIXME: This always behaves as a transparent object, even when it
- actually is not. */
+ * actually is not. */
HTMLTableCellClass html_table_cell_class;
@@ -43,9 +43,10 @@ static HTMLClueVClass *parent_class = NULL;
static void
draw_background_helper (HTMLTableCell *cell,
- HTMLPainter *p,
- GdkRectangle *paint,
- gint tx, gint ty)
+ HTMLPainter *p,
+ GdkRectangle *paint,
+ gint tx,
+ gint ty)
{
HTMLObject *o;
HTMLClueV *cluev;
@@ -73,12 +74,12 @@ draw_background_helper (HTMLTableCell *cell,
html_painter_draw_background (p,
color,
pixbuf,
- tx + paint->x + pixel_size*cluev->border_width,
- ty + paint->y + pixel_size*cluev->border_width,
- paint->width - 2*pixel_size*cluev->border_width,
- paint->height - 2*pixel_size*cluev->border_width,
- paint->x - o->x + pixel_size*cluev->border_width,
- paint->y - (o->y - o->ascent) + pixel_size*cluev->border_width);
+ tx + paint->x + pixel_size * cluev->border_width,
+ ty + paint->y + pixel_size * cluev->border_width,
+ paint->width - 2 * pixel_size * cluev->border_width,
+ paint->height - 2 * pixel_size * cluev->border_width,
+ paint->x - o->x + pixel_size * cluev->border_width,
+ paint->y - (o->y - o->ascent) + pixel_size * cluev->border_width);
}
@@ -108,7 +109,8 @@ reset (HTMLObject *self)
}
static void
-copy (HTMLObject *self, HTMLObject *dest)
+copy (HTMLObject *self,
+ HTMLObject *dest)
{
HTMLTableCell *d = HTML_TABLE_CELL (dest);
HTMLTableCell *s = HTML_TABLE_CELL (self);
@@ -121,7 +123,12 @@ copy (HTMLObject *self, HTMLObject *dest)
}
static gboolean
-merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **right, HTMLCursor *cursor)
+merge (HTMLObject *self,
+ HTMLObject *with,
+ HTMLEngine *e,
+ GList **left,
+ GList **right,
+ HTMLCursor *cursor)
{
HTMLTableCell *c1 = HTML_TABLE_CELL (self);
HTMLTableCell *c2 = HTML_TABLE_CELL (with);
@@ -147,7 +154,7 @@ merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **
static gint
calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
if (HTML_TABLE_CELL (o)->no_wrap)
return MAX ((* HTML_OBJECT_CLASS (parent_class)->calc_preferred_width) (o, painter),
@@ -160,7 +167,7 @@ calc_min_width (HTMLObject *o,
static gint
calc_preferred_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
return o->flags & HTML_OBJECT_FLAG_FIXEDWIDTH
? MAX (html_object_calc_min_width (o, painter),
@@ -171,9 +178,12 @@ calc_preferred_width (HTMLObject *o,
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLTableCell *cell = HTML_TABLE_CELL (o);
GdkRectangle paint;
@@ -187,7 +197,9 @@ draw (HTMLObject *o,
}
static void
-clue_move_children (HTMLClue *clue, gint x_delta, gint y_delta)
+clue_move_children (HTMLClue *clue,
+ gint x_delta,
+ gint y_delta)
{
HTMLObject *o;
@@ -198,7 +210,9 @@ clue_move_children (HTMLClue *clue, gint x_delta, gint y_delta)
}
static gboolean
-html_table_cell_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **changed_objs)
+html_table_cell_real_calc_size (HTMLObject *o,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLTableCell *cell;
gboolean rv;
@@ -238,7 +252,8 @@ html_table_cell_real_calc_size (HTMLObject *o, HTMLPainter *painter, GList **cha
}
static void
-set_bg_color (HTMLObject *object, GdkColor *color)
+set_bg_color (HTMLObject *object,
+ GdkColor *color)
{
HTMLTableCell *cell;
@@ -258,7 +273,7 @@ set_bg_color (HTMLObject *object, GdkColor *color)
static GdkColor *
get_bg_color (HTMLObject *o,
- HTMLPainter *p)
+ HTMLPainter *p)
{
return HTML_TABLE_CELL (o)->have_bg
@@ -319,10 +334,10 @@ save (HTMLObject *self,
save at least for emty cell
it's not really clean behavior, but I think it's better than saving empty cells.
let me know if you have better idea
-
+ *
if (HTML_CLUE (self)->head && HTML_CLUE (self)->head == HTML_CLUE (self)->tail
- && HTML_IS_CLUEFLOW (HTML_CLUE (self)->head) && html_clueflow_is_empty (HTML_CLUEFLOW (HTML_CLUE (self)->head)))
- SB " " SE; */
+ * && HTML_IS_CLUEFLOW (HTML_CLUE (self)->head) && html_clueflow_is_empty (HTML_CLUEFLOW (HTML_CLUE (self)->head)))
+ * SB " " SE; */
SB cell->heading ? "</TH>\n" : "</TD>\n" SE;
@@ -348,8 +363,8 @@ html_table_cell_type_init (void)
void
html_table_cell_class_init (HTMLTableCellClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
HTMLObjectClass *object_class;
HTMLClueVClass *cluev_class;
@@ -377,9 +392,10 @@ html_table_cell_class_init (HTMLTableCellClass *klass,
void
html_table_cell_init (HTMLTableCell *cell,
- HTMLTableCellClass *klass,
- gint rs, gint cs,
- gint pad)
+ HTMLTableCellClass *klass,
+ gint rs,
+ gint cs,
+ gint pad)
{
HTMLObject *object;
HTMLClueV *cluev;
@@ -418,7 +434,9 @@ html_table_cell_init (HTMLTableCell *cell,
}
HTMLObject *
-html_table_cell_new (gint rs, gint cs, gint pad)
+html_table_cell_new (gint rs,
+ gint cs,
+ gint pad)
{
HTMLTableCell *cell;
@@ -429,7 +447,9 @@ html_table_cell_new (gint rs, gint cs, gint pad)
}
void
-html_table_cell_set_fixed_width (HTMLTableCell *cell, gint width, gboolean percented)
+html_table_cell_set_fixed_width (HTMLTableCell *cell,
+ gint width,
+ gboolean percented)
{
if (percented)
HTML_OBJECT (cell)->flags &= ~HTML_OBJECT_FLAG_FIXEDWIDTH;
@@ -440,7 +460,9 @@ html_table_cell_set_fixed_width (HTMLTableCell *cell, gint width, gboolean perce
}
void
-html_table_cell_set_fixed_height (HTMLTableCell *cell, gint height, gboolean percented)
+html_table_cell_set_fixed_height (HTMLTableCell *cell,
+ gint height,
+ gboolean percented)
{
cell->fixed_height = height;
cell->percent_height = percented;
@@ -448,7 +470,7 @@ html_table_cell_set_fixed_height (HTMLTableCell *cell, gint height, gboolean per
void
html_table_cell_set_bg_pixmap (HTMLTableCell *cell,
- HTMLImagePointer *imagePtr)
+ HTMLImagePointer *imagePtr)
{
if (imagePtr) {
cell->have_bgPixmap = TRUE;
@@ -457,14 +479,17 @@ html_table_cell_set_bg_pixmap (HTMLTableCell *cell,
}
void
-html_table_cell_set_position (HTMLTableCell *cell, gint row, gint col)
+html_table_cell_set_position (HTMLTableCell *cell,
+ gint row,
+ gint col)
{
cell->col = col;
cell->row = row;
}
gint
-html_table_cell_get_fixed_width (HTMLTableCell *cell, HTMLPainter *painter)
+html_table_cell_get_fixed_width (HTMLTableCell *cell,
+ HTMLPainter *painter)
{
return html_painter_get_pixel_size (painter) * cell->fixed_width;
}
diff --git a/gtkhtml/htmltablecell.h b/gtkhtml/htmltablecell.h
index 80bde78..2e73957 100644
--- a/gtkhtml/htmltablecell.h
+++ b/gtkhtml/htmltablecell.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of GtkHTML.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLTABLECELL_H_
diff --git a/gtkhtml/htmltablepriv.h b/gtkhtml/htmltablepriv.h
index 8aacfdc..c2f511d 100644
--- a/gtkhtml/htmltablepriv.h
+++ b/gtkhtml/htmltablepriv.h
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2001 Ximian, Inc.
- Authors: Radek Doulik (rodo ximian com)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2001 Ximian, Inc.
+ * Authors: Radek Doulik (rodo ximian com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLTABLE_PRIV_H_
diff --git a/gtkhtml/htmltext.c b/gtkhtml/htmltext.c
index eed8218..c5482ba 100644
--- a/gtkhtml/htmltext.c
+++ b/gtkhtml/htmltext.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -72,12 +72,13 @@ static void remove_text_slaves (HTMLObject *self);
/* void
debug_spell_errors (GList *se)
{
- for (;se;se = se->next)
+ for (; se; se = se->next)
printf ("SE: %4d, %4d\n", ((SpellError *) se->data)->off, ((SpellError *) se->data)->len);
} */
static inline gboolean
-is_in_the_save_cluev (HTMLObject *text, HTMLObject *o)
+is_in_the_save_cluev (HTMLObject *text,
+ HTMLObject *o)
{
return html_object_nth_parent (o, 2) == html_object_nth_parent (text, 2);
}
@@ -195,19 +196,23 @@ copy (HTMLObject *s,
debug_word_width (HTMLText *t)
{
guint i;
-
+ *
printf ("words: %d | ", t->words);
for (i = 0; i < t->words; i++)
printf ("%d ", t->word_width [i]);
printf ("\n");
}
-
+ *
static void
-word_get_position (HTMLText *text, guint off, guint *word_out, guint *left_out, guint *right_out)
+word_get_position (HTMLText *text,
+ * guint off,
+ * guint *word_out,
+ * guint *left_out,
+ * guint *right_out)
{
const gchar *s, *ls;
guint coff, loff;
-
+ *
coff = 0;
*word_out = 0;
s = text->text;
@@ -220,15 +225,16 @@ word_get_position (HTMLText *text, guint off, guint *word_out, guint *left_out,
if (s)
s++;
} while (s && coff < off);
-
+ *
*left_out = off - loff;
*right_out = coff - off;
-
+ *
printf ("get position w: %d l: %d r: %d\n", *word_out, *left_out, *right_out);
} */
static gboolean
-cut_attr_list_filter (PangoAttribute *attr, gpointer data)
+cut_attr_list_filter (PangoAttribute *attr,
+ gpointer data)
{
PangoAttribute *range = (PangoAttribute *) data;
gint delta;
@@ -254,7 +260,9 @@ cut_attr_list_filter (PangoAttribute *attr, gpointer data)
}
static void
-cut_attr_list_list (PangoAttrList *attr_list, gint begin_index, gint end_index)
+cut_attr_list_list (PangoAttrList *attr_list,
+ gint begin_index,
+ gint end_index)
{
PangoAttrList *removed;
PangoAttribute range;
@@ -268,7 +276,9 @@ cut_attr_list_list (PangoAttrList *attr_list, gint begin_index, gint end_index)
}
static void
-cut_attr_list (HTMLText *text, gint begin_index, gint end_index)
+cut_attr_list (HTMLText *text,
+ gint begin_index,
+ gint end_index)
{
cut_attr_list_list (text->attr_list, begin_index, end_index);
if (text->extra_attr_list)
@@ -276,7 +286,13 @@ cut_attr_list (HTMLText *text, gint begin_index, gint end_index)
}
static void
-cut_links_full (HTMLText *text, gint start_offset, gint end_offset, gint start_index, gint end_index, gint shift_offset, gint shift_index)
+cut_links_full (HTMLText *text,
+ gint start_offset,
+ gint end_offset,
+ gint start_index,
+ gint end_index,
+ gint shift_offset,
+ gint shift_index)
{
GSList *l, *next;
Link *link;
@@ -329,13 +345,20 @@ cut_links_full (HTMLText *text, gint start_offset, gint end_offset, gint start_i
}
static void
-cut_links (HTMLText *text, gint start_offset, gint end_offset, gint start_index, gint end_index)
+cut_links (HTMLText *text,
+ gint start_offset,
+ gint end_offset,
+ gint start_index,
+ gint end_index)
{
cut_links_full (text, start_offset, end_offset, start_index, end_index, end_offset - start_offset, end_index - start_index);
}
HTMLObject *
-html_text_op_copy_helper (HTMLText *text, GList *from, GList *to, guint *len)
+html_text_op_copy_helper (HTMLText *text,
+ GList *from,
+ GList *to,
+ guint *len)
{
HTMLObject *rv;
HTMLText *rvt;
@@ -375,7 +398,13 @@ html_text_op_copy_helper (HTMLText *text, GList *from, GList *to, guint *len)
}
HTMLObject *
-html_text_op_cut_helper (HTMLText *text, HTMLEngine *e, GList *from, GList *to, GList *left, GList *right, guint *len)
+html_text_op_cut_helper (HTMLText *text,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ GList *left,
+ GList *right,
+ guint *len)
{
HTMLObject *rv;
HTMLText *rvt;
@@ -388,7 +417,7 @@ html_text_op_cut_helper (HTMLText *text, HTMLEngine *e, GList *from, GList *to,
g_assert (end <= text->text_len);
/* printf ("before cut '%s'\n", text->text);
- debug_word_width (text); */
+ * debug_word_width (text); */
remove_text_slaves (HTML_OBJECT (text));
if (!html_object_could_remove_whole (HTML_OBJECT (text), from, to, left, right) || begin || end < text->text_len) {
@@ -454,25 +483,37 @@ html_text_op_cut_helper (HTMLText *text, HTMLEngine *e, GList *from, GList *to,
html_object_change_set (HTML_OBJECT (text), HTML_CHANGE_ALL_CALC);
/* printf ("after cut '%s'\n", text->text);
- debug_word_width (text); */
+ * debug_word_width (text); */
return rv;
}
static HTMLObject *
-op_copy (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList *to, guint *len)
+op_copy (HTMLObject *self,
+ HTMLObject *parent,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ guint *len)
{
return html_text_op_copy_helper (HTML_TEXT (self), from, to, len);
}
static HTMLObject *
-op_cut (HTMLObject *self, HTMLEngine *e, GList *from, GList *to, GList *left, GList *right, guint *len)
+op_cut (HTMLObject *self,
+ HTMLEngine *e,
+ GList *from,
+ GList *to,
+ GList *left,
+ GList *right,
+ guint *len)
{
return html_text_op_cut_helper (HTML_TEXT (self), e, from, to, left, right, len);
}
static void
-merge_links (HTMLText *t1, HTMLText *t2)
+merge_links (HTMLText *t1,
+ HTMLText *t2)
{
Link *tail, *head;
GSList *l;
@@ -505,7 +546,12 @@ merge_links (HTMLText *t1, HTMLText *t2)
}
static gboolean
-object_merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, GList **right, HTMLCursor *cursor)
+object_merge (HTMLObject *self,
+ HTMLObject *with,
+ HTMLEngine *e,
+ GList **left,
+ GList **right,
+ HTMLCursor *cursor)
{
HTMLText *t1, *t2;
gchar *to_free;
@@ -523,10 +569,10 @@ object_merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, G
}
/* printf ("--- before merge\n");
- debug_spell_errors (t1->spell_errors);
- printf ("---\n");
- debug_spell_errors (t2->spell_errors);
- printf ("---\n");
+ * debug_spell_errors (t1->spell_errors);
+ * printf ("---\n");
+ * debug_spell_errors (t2->spell_errors);
+ * printf ("---\n");
*/
move_spell_errors (t2->spell_errors, 0, t1->text_len);
t1->spell_errors = merge_spell_errors (t1->spell_errors, t2->spell_errors);
@@ -552,15 +598,16 @@ object_merge (HTMLObject *self, HTMLObject *with, HTMLEngine *e, GList **left, G
/* html_text_request_word_width (t1, e->painter); */
/* printf ("merged '%s'\n", t1->text);
- printf ("--- after merge\n");
- debug_spell_errors (t1->spell_errors);
- printf ("---\n"); */
+ * printf ("--- after merge\n");
+ * debug_spell_errors (t1->spell_errors);
+ * printf ("---\n"); */
return TRUE;
}
static gboolean
-split_attrs_filter_head (PangoAttribute *attr, gpointer data)
+split_attrs_filter_head (PangoAttribute *attr,
+ gpointer data)
{
gint index = GPOINTER_TO_INT (data);
@@ -573,7 +620,8 @@ split_attrs_filter_head (PangoAttribute *attr, gpointer data)
}
static gboolean
-split_attrs_filter_tail (PangoAttribute *attr, gpointer data)
+split_attrs_filter_tail (PangoAttribute *attr,
+ gpointer data)
{
gint index = GPOINTER_TO_INT (data);
@@ -590,7 +638,9 @@ split_attrs_filter_tail (PangoAttribute *attr, gpointer data)
}
static void
-split_attrs (HTMLText *t1, HTMLText *t2, gint index)
+split_attrs (HTMLText *t1,
+ HTMLText *t2,
+ gint index)
{
PangoAttrList *delete;
@@ -613,7 +663,10 @@ split_attrs (HTMLText *t1, HTMLText *t2, gint index)
}
static void
-split_links (HTMLText *t1, HTMLText *t2, gint offset, gint index)
+split_links (HTMLText *t1,
+ HTMLText *t2,
+ gint offset,
+ gint index)
{
GSList *l, *prev = NULL;
@@ -676,7 +729,13 @@ split_links (HTMLText *t1, HTMLText *t2, gint offset, gint index)
}
static void
-object_split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint level, GList **left, GList **right)
+object_split (HTMLObject *self,
+ HTMLEngine *e,
+ HTMLObject *child,
+ gint offset,
+ gint level,
+ GList **left,
+ GList **right)
{
HTMLObject *dup, *prev;
HTMLText *t1, *t2;
@@ -718,7 +777,7 @@ object_split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, g
html_object_merge (dup, dup->next, e, NULL, NULL, NULL);
/* printf ("--- before split offset %d dup len %d\n", offset, HTML_TEXT (dup)->text_len);
- debug_spell_errors (HTML_TEXT (self)->spell_errors); */
+ * debug_spell_errors (HTML_TEXT (self)->spell_errors); */
HTML_TEXT (self)->spell_errors = remove_spell_errors (HTML_TEXT (self)->spell_errors,
offset, HTML_TEXT (dup)->text_len);
@@ -727,11 +786,11 @@ object_split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, g
move_spell_errors (HTML_TEXT (dup)->spell_errors, 0, - HTML_TEXT (self)->text_len);
/* printf ("--- after split\n");
- printf ("left\n");
- debug_spell_errors (HTML_TEXT (self)->spell_errors);
- printf ("right\n");
- debug_spell_errors (HTML_TEXT (dup)->spell_errors);
- printf ("---\n");
+ * printf ("left\n");
+ * debug_spell_errors (HTML_TEXT (self)->spell_errors);
+ * printf ("right\n");
+ * debug_spell_errors (HTML_TEXT (dup)->spell_errors);
+ * printf ("---\n");
*/
*left = g_list_prepend (*left, self);
@@ -748,7 +807,9 @@ object_split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, g
}
static gboolean
-html_text_real_calc_size (HTMLObject *self, HTMLPainter *painter, GList **changed_objs)
+html_text_real_calc_size (HTMLObject *self,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
self->width = 0;
html_object_calc_preferred_width (self, painter);
@@ -757,7 +818,10 @@ html_text_real_calc_size (HTMLObject *self, HTMLPainter *painter, GList **change
}
static const gchar *
-html_utf8_strnchr (const gchar *s, gchar c, gint len, gint *offset)
+html_utf8_strnchr (const gchar *s,
+ gchar c,
+ gint len,
+ gint *offset)
{
const gchar *res = NULL;
@@ -775,7 +839,10 @@ html_utf8_strnchr (const gchar *s, gchar c, gint len, gint *offset)
}
gint
-html_text_text_line_length (const gchar *text, gint *line_offset, guint len, gint *tabs)
+html_text_text_line_length (const gchar *text,
+ gint *line_offset,
+ guint len,
+ gint *tabs)
{
const gchar *tab, *found_tab;
gint cl, l, skip, sum_skip;
@@ -812,7 +879,9 @@ html_text_text_line_length (const gchar *text, gint *line_offset, guint len, gin
}
static guint
-get_line_length (HTMLObject *self, HTMLPainter *p, gint line_offset)
+get_line_length (HTMLObject *self,
+ HTMLPainter *p,
+ gint line_offset)
{
return html_clueflow_tabs (HTML_CLUEFLOW (self->parent), p)
? html_text_text_line_length (HTML_TEXT (self)->text, &line_offset, HTML_TEXT (self)->text_len, NULL)
@@ -820,7 +889,9 @@ get_line_length (HTMLObject *self, HTMLPainter *p, gint line_offset)
}
gint
-html_text_get_line_offset (HTMLText *text, HTMLPainter *painter, gint offset)
+html_text_get_line_offset (HTMLText *text,
+ HTMLPainter *painter,
+ gint offset)
{
gint line_offset = -1;
@@ -845,7 +916,10 @@ html_text_get_line_offset (HTMLText *text, HTMLPainter *painter, gint offset)
}
gint
-html_text_get_item_index (HTMLText *text, HTMLPainter *painter, gint offset, gint *item_offset)
+html_text_get_item_index (HTMLText *text,
+ HTMLPainter *painter,
+ gint offset,
+ gint *item_offset)
{
HTMLTextPangoInfo *pi = html_text_get_pango_info (text, painter);
gint idx = 0;
@@ -863,7 +937,10 @@ html_text_get_item_index (HTMLText *text, HTMLPainter *painter, gint offset, gin
}
static void
-update_asc_dsc (HTMLPainter *painter, PangoItem *item, gint *asc, gint *dsc)
+update_asc_dsc (HTMLPainter *painter,
+ PangoItem *item,
+ gint *asc,
+ gint *dsc)
{
PangoFontMetrics *pfm;
@@ -876,7 +953,10 @@ update_asc_dsc (HTMLPainter *painter, PangoItem *item, gint *asc, gint *dsc)
}
static void
-html_text_get_attr_list_list (PangoAttrList *get_attrs, PangoAttrList *attr_list, gint start_index, gint end_index)
+html_text_get_attr_list_list (PangoAttrList *get_attrs,
+ PangoAttrList *attr_list,
+ gint start_index,
+ gint end_index)
{
PangoAttrIterator *iter = pango_attr_list_get_iterator (attr_list);
@@ -914,7 +994,9 @@ html_text_get_attr_list_list (PangoAttrList *get_attrs, PangoAttrList *attr_list
}
PangoAttrList *
-html_text_get_attr_list (HTMLText *text, gint start_index, gint end_index)
+html_text_get_attr_list (HTMLText *text,
+ gint start_index,
+ gint end_index)
{
PangoAttrList *attrs = pango_attr_list_new ();
@@ -926,10 +1008,16 @@ html_text_get_attr_list (HTMLText *text, gint start_index, gint end_index)
}
void
-html_text_calc_text_size (HTMLText *t, HTMLPainter *painter,
- gint start_byte_offset,
- guint len, HTMLTextPangoInfo *pi, GList *glyphs, gint *line_offset,
- gint *width, gint *asc, gint *dsc)
+html_text_calc_text_size (HTMLText *t,
+ HTMLPainter *painter,
+ gint start_byte_offset,
+ guint len,
+ HTMLTextPangoInfo *pi,
+ GList *glyphs,
+ gint *line_offset,
+ gint *width,
+ gint *asc,
+ gint *dsc)
{
gchar *text = t->text + start_byte_offset;
@@ -938,7 +1026,13 @@ html_text_calc_text_size (HTMLText *t, HTMLPainter *painter,
}
gint
-html_text_calc_part_width (HTMLText *text, HTMLPainter *painter, gchar *start, gint offset, gint len, gint *asc, gint *dsc)
+html_text_calc_part_width (HTMLText *text,
+ HTMLPainter *painter,
+ gchar *start,
+ gint offset,
+ gint len,
+ gint *asc,
+ gint *dsc)
{
gint idx, width = 0, line_offset;
gint ascent = 0, descent = 0; /* Quiet GCC */
@@ -984,7 +1078,7 @@ html_text_calc_part_width (HTMLText *text, HTMLPainter *painter, gchar *start, g
if (*s == '\t') {
gint skip = 8 - (line_offset % 8);
- width += skip*pi->entries[idx].widths[offset];
+ width += skip * pi->entries[idx].widths[offset];
line_offset += skip;
} else {
width += pi->entries[idx].widths[offset];
@@ -1013,7 +1107,7 @@ out:
static gint
calc_preferred_width (HTMLObject *self,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
HTMLText *text;
gint width;
@@ -1052,11 +1146,11 @@ remove_text_slaves (HTMLObject *self)
static HTMLFitType
ht_fit_line (HTMLObject *o,
- HTMLPainter *painter,
- gboolean startOfLine,
- gboolean firstRun,
- gboolean next_to_floating,
- gint widthLeft)
+ HTMLPainter *painter,
+ gboolean startOfLine,
+ gboolean firstRun,
+ gboolean next_to_floating,
+ gint widthLeft)
{
HTMLText *text;
HTMLObject *text_slave;
@@ -1074,7 +1168,10 @@ ht_fit_line (HTMLObject *o,
#if 0 /* No longer used? */
static gint
-min_word_width_calc_tabs (HTMLText *text, HTMLPainter *p, gint idx, gint *len)
+min_word_width_calc_tabs (HTMLText *text,
+ HTMLPainter *p,
+ gint idx,
+ gint *len)
{
gchar *str, *end;
gint rv = 0, line_offset, wt, wl, i;
@@ -1136,7 +1233,9 @@ min_word_width_calc_tabs (HTMLText *text, HTMLPainter *p, gint idx, gint *len)
#endif
gint
-html_text_pango_info_get_index (HTMLTextPangoInfo *pi, gint byte_offset, gint idx)
+html_text_pango_info_get_index (HTMLTextPangoInfo *pi,
+ gint byte_offset,
+ gint idx)
{
while (idx < pi->n && pi->entries[idx].glyph_item.item->offset + pi->entries[idx].glyph_item.item->length <= byte_offset)
idx++;
@@ -1145,7 +1244,10 @@ html_text_pango_info_get_index (HTMLTextPangoInfo *pi, gint byte_offset, gint id
}
static void
-html_text_add_cite_color (PangoAttrList *attrs, HTMLText *text, HTMLClueFlow *flow, HTMLEngine *e)
+html_text_add_cite_color (PangoAttrList *attrs,
+ HTMLText *text,
+ HTMLClueFlow *flow,
+ HTMLEngine *e)
{
HTMLColor *cite_color = html_colorset_get_color (e->settings->color_set, HTMLCiteColor);
@@ -1160,7 +1262,9 @@ html_text_add_cite_color (PangoAttrList *attrs, HTMLText *text, HTMLClueFlow *fl
}
void
-html_text_remove_unwanted_line_breaks (gchar *s, gint len, PangoLogAttr *attrs)
+html_text_remove_unwanted_line_breaks (gchar *s,
+ gint len,
+ PangoLogAttr *attrs)
{
gint i;
gunichar last_uc = 0;
@@ -1191,7 +1295,8 @@ html_text_remove_unwanted_line_breaks (gchar *s, gint len, PangoLogAttr *attrs)
}
PangoAttrList *
-html_text_prepare_attrs (HTMLText *text, HTMLPainter *painter)
+html_text_prepare_attrs (HTMLText *text,
+ HTMLPainter *painter)
{
PangoAttrList *attrs;
HTMLClueFlow *flow = NULL;
@@ -1216,14 +1321,14 @@ html_text_prepare_attrs (HTMLText *text, HTMLPainter *painter)
attr->end_index = text->text_bytes;
pango_attr_list_insert (attrs, attr);
if (painter->font_manager.fix_size != painter->font_manager.var_size || fabs (painter->font_manager.magnification - 1.0) > 0.001) {
- attr = pango_attr_size_new (painter->font_manager.fix_size*painter->font_manager.magnification);
+ attr = pango_attr_size_new (painter->font_manager.fix_size * painter->font_manager.magnification);
attr->start_index = 0;
attr->end_index = text->text_bytes;
pango_attr_list_insert (attrs, attr);
}
} else {
if (fabs (painter->font_manager.magnification - 1.0) > 0.001) {
- attr = pango_attr_size_new (painter->font_manager.var_size*painter->font_manager.magnification);
+ attr = pango_attr_size_new (painter->font_manager.var_size * painter->font_manager.magnification);
attr->start_index = 0;
attr->end_index = text->text_bytes;
pango_attr_list_insert (attrs, attr);
@@ -1309,10 +1414,10 @@ get_pango_base_direction (HTMLText *text)
void
html_tmp_fix_pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs,
- const gchar *text,
- gint length,
- gint embedding_level,
- gint *logical_widths)
+ const gchar *text,
+ gint length,
+ gint embedding_level,
+ gint *logical_widths)
{
gint i, j;
gint last_cluster = 0;
@@ -1322,7 +1427,7 @@ html_tmp_fix_pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs,
/* printf ("html_tmp_fix_pango_glyph_string_get_logical_widths"); */
- for (i=0; i<=glyphs->num_glyphs; i++)
+ for (i = 0; i <= glyphs->num_glyphs; i++)
{
gint glyph_index = (embedding_level % 2 == 0) ? i : glyphs->num_glyphs - i - 1;
@@ -1368,7 +1473,8 @@ html_tmp_fix_pango_glyph_string_get_logical_widths (PangoGlyphString *glyphs,
}
static void
-html_text_shape_tab (HTMLText *text, PangoGlyphString *glyphs)
+html_text_shape_tab (HTMLText *text,
+ PangoGlyphString *glyphs)
{
/* copied from pango sources */
pango_glyph_string_set_size (glyphs, 1);
@@ -1384,7 +1490,8 @@ html_text_shape_tab (HTMLText *text, PangoGlyphString *glyphs)
}
HTMLTextPangoInfo *
-html_text_get_pango_info (HTMLText *text, HTMLPainter *painter)
+html_text_get_pango_info (HTMLText *text,
+ HTMLPainter *painter)
{
if (HTML_OBJECT (text)->change & HTML_CHANGE_RECALC_PI) {
pango_info_destroy (text);
@@ -1462,7 +1569,9 @@ html_text_get_pango_info (HTMLText *text, HTMLPainter *painter)
}
gboolean
-html_text_pi_backward (HTMLTextPangoInfo *pi, gint *ii, gint *io)
+html_text_pi_backward (HTMLTextPangoInfo *pi,
+ gint *ii,
+ gint *io)
{
if (*io <= 0) {
if (*ii <= 0)
@@ -1476,7 +1585,9 @@ html_text_pi_backward (HTMLTextPangoInfo *pi, gint *ii, gint *io)
}
gboolean
-html_text_pi_forward (HTMLTextPangoInfo *pi, gint *ii, gint *io)
+html_text_pi_forward (HTMLTextPangoInfo *pi,
+ gint *ii,
+ gint *io)
{
if (*io >= pi->entries[*ii].glyph_item.item->num_chars - 1) {
if (*ii >= pi->n -1)
@@ -1505,7 +1616,14 @@ html_text_pi_forward (HTMLTextPangoInfo *pi, gint *ii, gint *io)
* Return value: width of found trailing white space, in Pango units
**/
gint
-html_text_tail_white_space (HTMLText *text, HTMLPainter *painter, gint offset, gint ii, gint io, gint *white_len, gint line_offset, gchar *s)
+html_text_tail_white_space (HTMLText *text,
+ HTMLPainter *painter,
+ gint offset,
+ gint ii,
+ gint io,
+ gint *white_len,
+ gint line_offset,
+ gchar *s)
{
HTMLTextPangoInfo *pi = html_text_get_pango_info (text, painter);
gint wl = 0;
@@ -1525,7 +1643,7 @@ html_text_tail_white_space (HTMLText *text, HTMLPainter *painter, gint offset, g
skip--;
} while (s && co > 0 && *s != '\t');
- ww += skip*pi->entries[ii].widths[io];
+ ww += skip * pi->entries[ii].widths[io];
} else {
ww += pi->entries[ii].widths[io];
}
@@ -1540,9 +1658,18 @@ html_text_tail_white_space (HTMLText *text, HTMLPainter *painter, gint offset, g
}
static void
-update_mw (HTMLText *text, HTMLPainter *painter, gint offset, gint *last_offset, gint *ww, gint *mw, gint ii, gint io, gchar *s, gint line_offset) {
+update_mw (HTMLText *text,
+ HTMLPainter *painter,
+ gint offset,
+ gint *last_offset,
+ gint *ww,
+ gint *mw,
+ gint ii,
+ gint io,
+ gchar *s,
+ gint line_offset) {
*ww -= html_text_tail_white_space (text, painter, offset, ii, io, NULL, line_offset, s);
- if (*ww > *mw)
+ if (*ww > *mw)
*mw = *ww;
*ww = 0;
@@ -1556,7 +1683,8 @@ html_text_is_line_break (PangoLogAttr attr)
}
static gint
-calc_min_width (HTMLObject *self, HTMLPainter *painter)
+calc_min_width (HTMLObject *self,
+ HTMLPainter *painter)
{
HTMLText *text = HTML_TEXT (self);
HTMLTextPangoInfo *pi = html_text_get_pango_info (text, painter);
@@ -1576,7 +1704,7 @@ calc_min_width (HTMLObject *self, HTMLPainter *painter)
if (*s == '\t') {
gint skip = 8 - (line_offset % 8);
- ww += skip*pi->entries[ii].widths[io];
+ ww += skip * pi->entries[ii].widths[io];
line_offset += skip;
} else {
ww += pi->entries[ii].widths[io];
@@ -1598,9 +1726,12 @@ calc_min_width (HTMLObject *self, HTMLPainter *painter)
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
}
@@ -1611,7 +1742,8 @@ accepts_cursor (HTMLObject *object)
}
static gboolean
-save_open_attrs (HTMLEngineSaveState *state, GSList *attrs)
+save_open_attrs (HTMLEngineSaveState *state,
+ GSList *attrs)
{
gboolean rv = TRUE;
@@ -1677,7 +1809,8 @@ save_open_attrs (HTMLEngineSaveState *state, GSList *attrs)
}
static gboolean
-save_close_attrs (HTMLEngineSaveState *state, GSList *attrs)
+save_close_attrs (HTMLEngineSaveState *state,
+ GSList *attrs)
{
for (; attrs; attrs = attrs->next) {
PangoAttribute *attr = (PangoAttribute *) attrs->data;
@@ -1729,7 +1862,10 @@ save_close_attrs (HTMLEngineSaveState *state, GSList *attrs)
}
static gboolean
-save_text_part (HTMLText *text, HTMLEngineSaveState *state, guint start_index, guint end_index)
+save_text_part (HTMLText *text,
+ HTMLEngineSaveState *state,
+ guint start_index,
+ guint end_index)
{
gchar *str;
gint len;
@@ -1744,7 +1880,8 @@ save_text_part (HTMLText *text, HTMLEngineSaveState *state, guint start_index, g
}
static gboolean
-save_link_open (Link *link, HTMLEngineSaveState *state)
+save_link_open (Link *link,
+ HTMLEngineSaveState *state)
{
return html_engine_save_delims_and_vals (state,
"<A HREF=\"", link->url,
@@ -1752,13 +1889,19 @@ save_link_open (Link *link, HTMLEngineSaveState *state)
}
static gboolean
-save_link_close (Link *link, HTMLEngineSaveState *state)
+save_link_close (Link *link,
+ HTMLEngineSaveState *state)
{
return html_engine_save_output_string (state, "%s", "</A>");
}
static gboolean
-save_text (HTMLText *text, HTMLEngineSaveState *state, guint start_index, guint end_index, GSList **l, gboolean *link_started)
+save_text (HTMLText *text,
+ HTMLEngineSaveState *state,
+ guint start_index,
+ guint end_index,
+ GSList **l,
+ gboolean *link_started)
{
if (*l) {
Link *link;
@@ -1795,7 +1938,8 @@ save_text (HTMLText *text, HTMLEngineSaveState *state, guint start_index, guint
}
static gboolean
-save (HTMLObject *self, HTMLEngineSaveState *state)
+save (HTMLObject *self,
+ HTMLEngineSaveState *state)
{
HTMLText *text = HTML_TEXT (self);
PangoAttrIterator *iter = pango_attr_list_get_iterator (text->attr_list);
@@ -1836,8 +1980,8 @@ save (HTMLObject *self, HTMLEngineSaveState *state)
static gboolean
save_plain (HTMLObject *self,
- HTMLEngineSaveState *state,
- gint requested_width)
+ HTMLEngineSaveState *state,
+ gint requested_width)
{
HTMLText *text;
@@ -1864,7 +2008,9 @@ struct TmpDeltaRecord
/* Called when current character is not white space or at end of string */
static gboolean
-check_last_white (gint white_space, gunichar last_white, gint *delta_out)
+check_last_white (gint white_space,
+ gunichar last_white,
+ gint *delta_out)
{
if (white_space > 0 && last_white == ENTITY_NBSP) {
(*delta_out) --; /* => &sp; is one byte shorter in UTF-8 */
@@ -1876,7 +2022,9 @@ check_last_white (gint white_space, gunichar last_white, gint *delta_out)
/* Called when current character is white space */
static gboolean
-check_prev_white (gint white_space, gunichar last_white, gint *delta_out)
+check_prev_white (gint white_space,
+ gunichar last_white,
+ gint *delta_out)
{
if (white_space > 0 && last_white == ' ') {
(*delta_out) ++; /* &sp; => is one byte longer in UTF-8 */
@@ -1887,7 +2035,9 @@ check_prev_white (gint white_space, gunichar last_white, gint *delta_out)
}
static GSList *
-add_change (GSList *list, gint index, gint delta)
+add_change (GSList *list,
+ gint index,
+ gint delta)
{
struct TmpDeltaRecord *rec = g_new (struct TmpDeltaRecord, 1);
@@ -1907,7 +2057,9 @@ add_change (GSList *list, gint index, gint delta)
* returns: %TRUE if any records were stored in changes_out
*/
static gboolean
-is_convert_nbsp_needed (const gchar *s, gint *delta_out, GSList **changes_out)
+is_convert_nbsp_needed (const gchar *s,
+ gint *delta_out,
+ GSList **changes_out)
{
gunichar uc, last_white = 0;
gboolean change;
@@ -1944,7 +2096,8 @@ is_convert_nbsp_needed (const gchar *s, gint *delta_out, GSList **changes_out)
/* Called when current character is white space */
static void
-write_prev_white_space (gint white_space, gchar **fill)
+write_prev_white_space (gint white_space,
+ gchar **fill)
{
if (white_space > 0) {
#ifdef DEBUG_NBSP
@@ -1957,7 +2110,8 @@ write_prev_white_space (gint white_space, gchar **fill)
/* Called when current character is not white space or at end of string */
static void
-write_last_white_space (gint white_space, gchar **fill)
+write_last_white_space (gint white_space,
+ gchar **fill)
{
if (white_space > 0) {
#ifdef DEBUG_NBSP
@@ -1971,7 +2125,8 @@ write_last_white_space (gint white_space, gchar **fill)
* into N-1   and 1 &sp;.
*/
static void
-convert_nbsp (gchar *fill, const gchar *text)
+convert_nbsp (gchar *fill,
+ const gchar *text)
{
gint white_space;
gunichar uc;
@@ -2013,8 +2168,8 @@ convert_nbsp (gchar *fill, const gchar *text)
static void
update_index_interval (guint *start_index,
- guint *end_index,
- GSList *changes)
+ guint *end_index,
+ GSList *changes)
{
GSList *c;
gint index, delta;
@@ -2054,7 +2209,8 @@ update_index_interval (guint *start_index,
}
static gboolean
-update_attributes_filter (PangoAttribute *attr, gpointer data)
+update_attributes_filter (PangoAttribute *attr,
+ gpointer data)
{
update_index_interval (&attr->start_index, &attr->end_index, (GSList *) data);
@@ -2062,13 +2218,15 @@ update_attributes_filter (PangoAttribute *attr, gpointer data)
}
static void
-update_attributes (PangoAttrList *attrs, GSList *changes)
+update_attributes (PangoAttrList *attrs,
+ GSList *changes)
{
pango_attr_list_filter (attrs, update_attributes_filter, changes);
}
static void
-update_links (GSList *links, GSList *changes)
+update_links (GSList *links,
+ GSList *changes)
{
GSList *cl;
@@ -2089,7 +2247,8 @@ free_changes (GSList *changes)
}
gboolean
-html_text_convert_nbsp (HTMLText *text, gboolean free_text)
+html_text_convert_nbsp (HTMLText *text,
+ gboolean free_text)
{
GSList *changes = NULL;
gint delta;
@@ -2119,7 +2278,9 @@ html_text_convert_nbsp (HTMLText *text, gboolean free_text)
}
static void
-move_spell_errors (GList *spell_errors, guint offset, gint delta)
+move_spell_errors (GList *spell_errors,
+ guint offset,
+ gint delta)
{
SpellError *se;
@@ -2135,7 +2296,8 @@ move_spell_errors (GList *spell_errors, guint offset, gint delta)
}
static GList *
-remove_one (GList *list, GList *link)
+remove_one (GList *list,
+ GList *link)
{
spell_error_destroy ((SpellError *) link->data);
list = g_list_remove_link (list, link);
@@ -2145,7 +2307,9 @@ remove_one (GList *list, GList *link)
}
static GList *
-remove_spell_errors (GList *spell_errors, guint offset, guint len)
+remove_spell_errors (GList *spell_errors,
+ guint offset,
+ guint len)
{
SpellError *se;
GList *cur, *cnext;
@@ -2179,7 +2343,8 @@ remove_spell_errors (GList *spell_errors, guint offset, guint len)
}
static gint
-se_cmp (SpellError *a, SpellError *b)
+se_cmp (SpellError *a,
+ SpellError *b)
{
guint o1 = a->off;
guint o2 = b->off;
@@ -2188,7 +2353,8 @@ se_cmp (SpellError *a, SpellError *b)
}
static GList *
-merge_spell_errors (GList *se1, GList *se2)
+merge_spell_errors (GList *se1,
+ GList *se2)
{
GList *merged = NULL;
GList *link;
@@ -2227,19 +2393,20 @@ merge_spell_errors (GList *se1, GList *se2)
static HTMLObject *
check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
return NULL;
}
static void
queue_draw (HTMLText *text,
- HTMLEngine *engine,
- guint offset,
- guint len)
+ HTMLEngine *engine,
+ guint offset,
+ guint len)
{
HTMLObject *obj;
@@ -2261,7 +2428,7 @@ queue_draw (HTMLText *text,
}
/* This is necessary to merge the text-specified font style with that of the
- HTMLClueFlow parent. */
+ * HTMLClueFlow parent. */
static GtkHTMLFontStyle
get_font_style (const HTMLText *text)
{
@@ -2284,8 +2451,8 @@ get_font_style (const HTMLText *text)
static void
set_font_style (HTMLText *text,
- HTMLEngine *engine,
- GtkHTMLFontStyle style)
+ HTMLEngine *engine,
+ GtkHTMLFontStyle style)
{
if (text->font_style == style)
return;
@@ -2323,10 +2490,10 @@ destroy (HTMLObject *obj)
static gboolean
select_range (HTMLObject *self,
- HTMLEngine *engine,
- guint offset,
- gint length,
- gboolean queue_draw)
+ HTMLEngine *engine,
+ guint offset,
+ gint length,
+ gboolean queue_draw)
{
HTMLText *text;
HTMLObject *p;
@@ -2415,7 +2582,10 @@ select_range (HTMLObject *self,
}
static HTMLObject *
-set_link (HTMLObject *self, HTMLColor *color, const gchar *url, const gchar *target)
+set_link (HTMLObject *self,
+ HTMLColor *color,
+ const gchar *url,
+ const gchar *target)
{
/* HTMLText *text = HTML_TEXT (self); */
@@ -2425,7 +2595,7 @@ set_link (HTMLObject *self, HTMLColor *color, const gchar *url, const gchar *tar
static void
append_selection_string (HTMLObject *self,
- GString *buffer)
+ GString *buffer)
{
HTMLText *text;
const gchar *p, *last;
@@ -2439,7 +2609,7 @@ append_selection_string (HTMLObject *self,
/* OPTIMIZED
last = html_text_get_text (text,
- text->select_start + text->select_length);
+ * text->select_start + text->select_length);
*/
html_engine_save_string_append_nonbsp (buffer,
(guchar *) p,
@@ -2449,10 +2619,12 @@ append_selection_string (HTMLObject *self,
static void
get_cursor (HTMLObject *self,
- HTMLPainter *painter,
- guint offset,
- gint *x1, gint *y1,
- gint *x2, gint *y2)
+ HTMLPainter *painter,
+ guint offset,
+ gint *x1,
+ gint *y1,
+ gint *x2,
+ gint *y2)
{
HTMLObject *slave;
guint ascent, descent;
@@ -2475,9 +2647,10 @@ get_cursor (HTMLObject *self,
static void
html_text_get_cursor_base (HTMLObject *self,
- HTMLPainter *painter,
- guint offset,
- gint *x, gint *y)
+ HTMLPainter *painter,
+ guint offset,
+ gint *x,
+ gint *y)
{
HTMLTextSlave *slave = html_text_get_slave_at_offset (HTML_TEXT (self), NULL, offset);
@@ -2492,7 +2665,8 @@ html_text_get_cursor_base (HTMLObject *self,
}
Link *
-html_text_get_link_at_offset (HTMLText *text, gint offset)
+html_text_get_link_at_offset (HTMLText *text,
+ gint offset)
{
GSList *l;
@@ -2507,7 +2681,8 @@ html_text_get_link_at_offset (HTMLText *text, gint offset)
}
static const gchar *
-get_url (HTMLObject *object, gint offset)
+get_url (HTMLObject *object,
+ gint offset)
{
Link *link = html_text_get_link_at_offset (HTML_TEXT (object), offset);
@@ -2515,7 +2690,8 @@ get_url (HTMLObject *object, gint offset)
}
static const gchar *
-get_target (HTMLObject *object, gint offset)
+get_target (HTMLObject *object,
+ gint offset)
{
Link *link = html_text_get_link_at_offset (HTML_TEXT (object), offset);
@@ -2523,7 +2699,9 @@ get_target (HTMLObject *object, gint offset)
}
HTMLTextSlave *
-html_text_get_slave_at_offset (HTMLText *text, HTMLTextSlave *start, gint offset)
+html_text_get_slave_at_offset (HTMLText *text,
+ HTMLTextSlave *start,
+ gint offset)
{
HTMLObject *obj = start ? HTML_OBJECT (start) : HTML_OBJECT (text)->next;
@@ -2537,7 +2715,9 @@ html_text_get_slave_at_offset (HTMLText *text, HTMLTextSlave *start, gint offset
}
static gboolean
-html_text_cursor_prev_slave (HTMLObject *slave, HTMLPainter *painter, HTMLCursor *cursor)
+html_text_cursor_prev_slave (HTMLObject *slave,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
gint offset = cursor->offset;
@@ -2556,7 +2736,9 @@ html_text_cursor_prev_slave (HTMLObject *slave, HTMLPainter *painter, HTMLCursor
}
static gboolean
-html_text_cursor_next_slave (HTMLObject *slave, HTMLPainter *painter, HTMLCursor *cursor)
+html_text_cursor_next_slave (HTMLObject *slave,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
gint offset = cursor->offset;
@@ -2575,7 +2757,9 @@ html_text_cursor_next_slave (HTMLObject *slave, HTMLPainter *painter, HTMLCursor
}
static gboolean
-html_text_cursor_forward (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+html_text_cursor_forward (HTMLObject *self,
+ HTMLCursor *cursor,
+ HTMLEngine *engine)
{
HTMLText *text;
HTMLTextPangoInfo *pi = NULL;
@@ -2609,7 +2793,8 @@ html_text_cursor_forward (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engi
}
static gboolean
-html_cursor_allow_zero_offset (HTMLCursor *cursor, HTMLObject *o)
+html_cursor_allow_zero_offset (HTMLCursor *cursor,
+ HTMLObject *o)
{
if (cursor->offset == 1) {
HTMLObject *prev;
@@ -2630,7 +2815,9 @@ html_cursor_allow_zero_offset (HTMLCursor *cursor, HTMLObject *o)
}
static gboolean
-html_text_cursor_backward (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+html_text_cursor_backward (HTMLObject *self,
+ HTMLCursor *cursor,
+ HTMLEngine *engine)
{
HTMLText *text;
HTMLTextPangoInfo *pi = NULL;
@@ -2664,7 +2851,9 @@ html_text_cursor_backward (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *eng
}
static gboolean
-html_text_cursor_right (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor)
+html_text_cursor_right (HTMLObject *self,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
HTMLTextSlave *slave;
@@ -2690,7 +2879,9 @@ html_text_cursor_right (HTMLObject *self, HTMLPainter *painter, HTMLCursor *curs
}
static gboolean
-html_text_cursor_left (HTMLObject *self, HTMLPainter *painter, HTMLCursor *cursor)
+html_text_cursor_left (HTMLObject *self,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
HTMLTextSlave *slave;
@@ -2716,7 +2907,9 @@ html_text_cursor_left (HTMLObject *self, HTMLPainter *painter, HTMLCursor *curso
}
static gboolean
-html_text_backspace (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
+html_text_backspace (HTMLObject *self,
+ HTMLCursor *cursor,
+ HTMLEngine *engine)
{
HTMLText *text;
HTMLTextPangoInfo *pi = NULL;
@@ -2789,7 +2982,9 @@ html_text_backspace (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
}
static gint
-html_text_get_right_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offset)
+html_text_get_right_edge_offset (HTMLObject *o,
+ HTMLPainter *painter,
+ gint offset)
{
HTMLTextSlave *slave = html_text_get_slave_at_offset (HTML_TEXT (o), NULL, offset);
@@ -2803,7 +2998,9 @@ html_text_get_right_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offse
}
static gint
-html_text_get_left_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offset)
+html_text_get_left_edge_offset (HTMLObject *o,
+ HTMLPainter *painter,
+ gint offset)
{
HTMLTextSlave *slave = html_text_get_slave_at_offset (HTML_TEXT (o), NULL, offset);
@@ -2824,8 +3021,8 @@ html_text_type_init (void)
void
html_text_class_init (HTMLTextClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
HTMLObjectClass *object_class;
@@ -2876,7 +3073,8 @@ html_text_class_init (HTMLTextClass *klass,
/* almost identical copy of glib's _g_utf8_make_valid() */
static gchar *
-_html_text_utf8_make_valid (const gchar *name, gint len)
+_html_text_utf8_make_valid (const gchar *name,
+ gint len)
{
GString *string;
const gchar *remainder, *invalid;
@@ -2948,7 +3146,9 @@ _html_text_utf8_make_valid (const gchar *name, gint len)
* Return value: number of bytes in the output value of @str
**/
gsize
-html_text_sanitize (const gchar *str_in, gchar **str_out, gint *len)
+html_text_sanitize (const gchar *str_in,
+ gchar **str_out,
+ gint *len)
{
g_return_val_if_fail (str_in != NULL, 0);
g_return_val_if_fail (str_out != NULL, 0);
@@ -2963,11 +3163,11 @@ html_text_sanitize (const gchar *str_in, gchar **str_out, gint *len)
void
html_text_init (HTMLText *text,
- HTMLTextClass *klass,
- const gchar *str,
- gint len,
- GtkHTMLFontStyle font_style,
- HTMLColor *color)
+ HTMLTextClass *klass,
+ const gchar *str,
+ gint len,
+ GtkHTMLFontStyle font_style,
+ HTMLColor *color)
{
g_assert (color);
@@ -2991,7 +3191,10 @@ html_text_init (HTMLText *text,
}
HTMLObject *
-html_text_new_with_len (const gchar *str, gint len, GtkHTMLFontStyle font, HTMLColor *color)
+html_text_new_with_len (const gchar *str,
+ gint len,
+ GtkHTMLFontStyle font,
+ HTMLColor *color)
{
HTMLText *text;
@@ -3004,17 +3207,17 @@ html_text_new_with_len (const gchar *str, gint len, GtkHTMLFontStyle font, HTMLC
HTMLObject *
html_text_new (const gchar *text,
- GtkHTMLFontStyle font,
- HTMLColor *color)
+ GtkHTMLFontStyle font,
+ HTMLColor *color)
{
return html_text_new_with_len (text, -1, font, color);
}
void
html_text_queue_draw (HTMLText *text,
- HTMLEngine *engine,
- guint offset,
- guint len)
+ HTMLEngine *engine,
+ guint offset,
+ guint len)
{
g_return_if_fail (text != NULL);
g_return_if_fail (engine != NULL);
@@ -3033,8 +3236,8 @@ html_text_get_font_style (const HTMLText *text)
void
html_text_set_font_style (HTMLText *text,
- HTMLEngine *engine,
- GtkHTMLFontStyle style)
+ HTMLEngine *engine,
+ GtkHTMLFontStyle style)
{
g_return_if_fail (text != NULL);
@@ -3042,7 +3245,8 @@ html_text_set_font_style (HTMLText *text,
}
void
-html_text_set_font_face (HTMLText *text, HTMLFontFace *face)
+html_text_set_font_face (HTMLText *text,
+ HTMLFontFace *face)
{
if (text->face)
g_free (text->face);
@@ -3050,13 +3254,14 @@ html_text_set_font_face (HTMLText *text, HTMLFontFace *face)
}
void
-html_text_set_text (HTMLText *text, const gchar *new_text)
+html_text_set_text (HTMLText *text,
+ const gchar *new_text)
{
g_free (text->text);
text->text = NULL;
text->text_len = -1;
text->text_bytes = html_text_sanitize (new_text, &text->text,
- (gint *)&text->text_len);
+ (gint *) &text->text_len);
html_object_change_set (HTML_OBJECT (text), HTML_CHANGE_ALL);
}
@@ -3065,7 +3270,8 @@ html_text_set_text (HTMLText *text, const gchar *new_text)
#include "htmlinterval.h"
static SpellError *
-spell_error_new (guint off, guint len)
+spell_error_new (guint off,
+ guint len)
{
SpellError *se = g_new (SpellError, 1);
@@ -3090,7 +3296,8 @@ html_text_spell_errors_clear (HTMLText *text)
}
void
-html_text_spell_errors_clear_interval (HTMLText *text, HTMLInterval *i)
+html_text_spell_errors_clear_interval (HTMLText *text,
+ HTMLInterval *i)
{
GList *cur, *cnext;
SpellError *se;
@@ -3116,7 +3323,9 @@ html_text_spell_errors_clear_interval (HTMLText *text, HTMLInterval *i)
}
void
-html_text_spell_errors_add (HTMLText *text, guint off, guint len)
+html_text_spell_errors_add (HTMLText *text,
+ guint off,
+ guint len)
{
text->spell_errors = merge_spell_errors (
text->spell_errors, g_list_prepend (
@@ -3130,7 +3339,8 @@ html_text_get_bytes (HTMLText *text)
}
gchar *
-html_text_get_text (HTMLText *text, guint offset)
+html_text_get_text (HTMLText *text,
+ guint offset)
{
gchar *s = text->text;
@@ -3141,13 +3351,15 @@ html_text_get_text (HTMLText *text, guint offset)
}
guint
-html_text_get_index (HTMLText *text, guint offset)
+html_text_get_index (HTMLText *text,
+ guint offset)
{
return html_text_get_text (text, offset) - text->text;
}
gunichar
-html_text_get_char (HTMLText *text, guint offset)
+html_text_get_char (HTMLText *text,
+ guint offset)
{
gunichar uc;
@@ -3193,7 +3405,11 @@ html_engine_init_magic_links (void)
}
static void
-paste_link (HTMLEngine *engine, HTMLText *text, gint so, gint eo, const gchar *prefix)
+paste_link (HTMLEngine *engine,
+ HTMLText *text,
+ gint so,
+ gint eo,
+ const gchar *prefix)
{
gchar *href;
gchar *base;
@@ -3207,7 +3423,9 @@ paste_link (HTMLEngine *engine, HTMLText *text, gint so, gint eo, const gchar *p
}
gboolean
-html_text_magic_link (HTMLText *text, HTMLEngine *engine, guint offset)
+html_text_magic_link (HTMLText *text,
+ HTMLEngine *engine,
+ guint offset)
{
regmatch_t pmatch[2];
gint i;
@@ -3286,14 +3504,17 @@ html_text_magic_link (HTMLText *text, HTMLEngine *engine, guint offset)
*/
gint
-html_text_trail_space_width (HTMLText *text, HTMLPainter *painter)
+html_text_trail_space_width (HTMLText *text,
+ HTMLPainter *painter)
{
return text->text_len > 0 && html_text_get_char (text, text->text_len - 1) == ' '
? html_painter_get_space_width (painter, html_text_get_font_style (text), text->face) : 0;
}
void
-html_text_append (HTMLText *text, const gchar *pstr, gint len)
+html_text_append (HTMLText *text,
+ const gchar *pstr,
+ gint len)
{
gchar *to_delete, *str = NULL;
guint bytes;
@@ -3315,20 +3536,34 @@ html_text_append (HTMLText *text, const gchar *pstr, gint len)
}
void
-html_text_append_link_full (HTMLText *text, gchar *url, gchar *target, gint start_index, gint end_index, gint start_offset, gint end_offset)
+html_text_append_link_full (HTMLText *text,
+ gchar *url,
+ gchar *target,
+ gint start_index,
+ gint end_index,
+ gint start_offset,
+ gint end_offset)
{
text->links = g_slist_prepend (text->links, html_link_new (url, target, start_index, end_index, start_offset, end_offset, FALSE));
}
static void
-html_text_offsets_to_indexes (HTMLText *text, gint so, gint eo, gint *si, gint *ei)
+html_text_offsets_to_indexes (HTMLText *text,
+ gint so,
+ gint eo,
+ gint *si,
+ gint *ei)
{
*si = html_text_get_index (text, so);
*ei = g_utf8_offset_to_pointer (text->text + *si, eo - so) - text->text;
}
void
-html_text_append_link (HTMLText *text, gchar *url, gchar *target, gint start_offset, gint end_offset)
+html_text_append_link (HTMLText *text,
+ gchar *url,
+ gchar *target,
+ gint start_offset,
+ gint end_offset)
{
gint start_index, end_index;
@@ -3337,7 +3572,14 @@ html_text_append_link (HTMLText *text, gchar *url, gchar *target, gint start_off
}
void
-html_text_add_link_full (HTMLText *text, HTMLEngine *e, gchar *url, gchar *target, gint start_index, gint end_index, gint start_offset, gint end_offset)
+html_text_add_link_full (HTMLText *text,
+ HTMLEngine *e,
+ gchar *url,
+ gchar *target,
+ gint start_index,
+ gint end_index,
+ gint start_offset,
+ gint end_offset)
{
GSList *l, *prev = NULL;
Link *link;
@@ -3386,7 +3628,12 @@ html_text_add_link_full (HTMLText *text, HTMLEngine *e, gchar *url, gchar *targe
}
void
-html_text_add_link (HTMLText *text, HTMLEngine *e, gchar *url, gchar *target, gint start_offset, gint end_offset)
+html_text_add_link (HTMLText *text,
+ HTMLEngine *e,
+ gchar *url,
+ gchar *target,
+ gint start_offset,
+ gint end_offset)
{
gint start_index, end_index;
@@ -3425,7 +3672,10 @@ html_text_remove_links (HTMLText *text)
/* } */
Link *
-html_text_get_link_slaves_at_offset (HTMLText *text, gint offset, HTMLTextSlave **start, HTMLTextSlave **end)
+html_text_get_link_slaves_at_offset (HTMLText *text,
+ gint offset,
+ HTMLTextSlave **start,
+ HTMLTextSlave **end)
{
Link *link = html_text_get_link_at_offset (text, offset);
@@ -3441,7 +3691,13 @@ html_text_get_link_slaves_at_offset (HTMLText *text, gint offset, HTMLTextSlave
}
gboolean
-html_text_get_link_rectangle (HTMLText *text, HTMLPainter *painter, gint offset, gint *x1, gint *y1, gint *x2, gint *y2)
+html_text_get_link_rectangle (HTMLText *text,
+ HTMLPainter *painter,
+ gint offset,
+ gint *x1,
+ gint *y1,
+ gint *x2,
+ gint *y2)
{
HTMLTextSlave *start;
HTMLTextSlave *end;
@@ -3472,7 +3728,8 @@ html_text_get_link_rectangle (HTMLText *text, HTMLPainter *painter, gint offset,
}
gboolean
-html_text_prev_link_offset (HTMLText *text, gint *offset)
+html_text_prev_link_offset (HTMLText *text,
+ gint *offset)
{
GSList *l;
@@ -3492,7 +3749,8 @@ html_text_prev_link_offset (HTMLText *text, gint *offset)
}
gboolean
-html_text_next_link_offset (HTMLText *text, gint *offset)
+html_text_next_link_offset (HTMLText *text,
+ gint *offset)
{
GSList *l, *prev = NULL;
@@ -3513,7 +3771,8 @@ html_text_next_link_offset (HTMLText *text, gint *offset)
}
gboolean
-html_text_first_link_offset (HTMLText *text, gint *offset)
+html_text_first_link_offset (HTMLText *text,
+ gint *offset)
{
if (text->links)
*offset = ((Link *) g_slist_last (text->links)->data)->start_offset + 1;
@@ -3522,7 +3781,8 @@ html_text_first_link_offset (HTMLText *text, gint *offset)
}
gboolean
-html_text_last_link_offset (HTMLText *text, gint *offset)
+html_text_last_link_offset (HTMLText *text,
+ gint *offset)
{
if (text->links)
*offset = ((Link *) text->links->data)->end_offset - 1;
@@ -3531,7 +3791,8 @@ html_text_last_link_offset (HTMLText *text, gint *offset)
}
gchar *
-html_text_get_link_text (HTMLText *text, gint offset)
+html_text_get_link_text (HTMLText *text,
+ gint offset)
{
Link *link = html_text_get_link_at_offset (text, offset);
gchar *start;
@@ -3542,7 +3803,9 @@ html_text_get_link_text (HTMLText *text, gint offset)
}
void
-html_link_set_url_and_target (Link *link, gchar *url, gchar *target)
+html_link_set_url_and_target (Link *link,
+ gchar *url,
+ gchar *target)
{
if (!link)
return;
@@ -3581,14 +3844,21 @@ html_link_free (Link *link)
}
gboolean
-html_link_equal (Link *l1, Link *l2)
+html_link_equal (Link *l1,
+ Link *l2)
{
return l1->url && l2->url && !g_ascii_strcasecmp (l1->url, l2->url)
&& (l1->target == l2->target || (l1->target && l2->target && !g_ascii_strcasecmp (l1->target, l2->target)));
}
Link *
-html_link_new (gchar *url, gchar *target, guint start_index, guint end_index, gint start_offset, gint end_offset, gboolean is_visited)
+html_link_new (gchar *url,
+ gchar *target,
+ guint start_index,
+ guint end_index,
+ gint start_offset,
+ gint end_offset,
+ gboolean is_visited)
{
Link *link = g_new0 (Link, 1);
@@ -3623,7 +3893,8 @@ html_pango_attr_font_size_destroy (PangoAttribute *attr)
}
static gboolean
-html_pango_attr_font_size_equal (const PangoAttribute *attr1, const PangoAttribute *attr2)
+html_pango_attr_font_size_equal (const PangoAttribute *attr1,
+ const PangoAttribute *attr2)
{
const HTMLPangoAttrFontSize *font_size_attr1 = (const HTMLPangoAttrFontSize *) attr1;
const HTMLPangoAttrFontSize *font_size_attr2 = (const HTMLPangoAttrFontSize *) attr2;
@@ -3632,7 +3903,8 @@ html_pango_attr_font_size_equal (const PangoAttribute *attr1, const PangoAttribu
}
void
-html_pango_attr_font_size_calc (HTMLPangoAttrFontSize *attr, HTMLEngine *e)
+html_pango_attr_font_size_calc (HTMLPangoAttrFontSize *attr,
+ HTMLEngine *e)
{
gint size, base_size, real_size;
@@ -3641,7 +3913,7 @@ html_pango_attr_font_size_calc (HTMLPangoAttrFontSize *attr, HTMLEngine *e)
size = (attr->style & GTK_HTML_FONT_STYLE_SIZE_MASK) - GTK_HTML_FONT_STYLE_SIZE_3;
else
size = 0;
- real_size = e->painter->font_manager.magnification * ((gdouble) base_size + (size > 0 ? (1 << size) : size) * base_size/8.0);
+ real_size = e->painter->font_manager.magnification * ((gdouble) base_size + (size > 0 ? (1 << size) : size) * base_size / 8.0);
attr->attr_int.value = real_size;
}
@@ -3664,7 +3936,8 @@ html_pango_attr_font_size_new (GtkHTMLFontStyle style)
}
static gboolean
-calc_font_size_filter (PangoAttribute *attr, gpointer data)
+calc_font_size_filter (PangoAttribute *attr,
+ gpointer data)
{
HTMLEngine *e = HTML_ENGINE (data);
@@ -3672,7 +3945,7 @@ calc_font_size_filter (PangoAttribute *attr, gpointer data)
html_pango_attr_font_size_calc ((HTMLPangoAttrFontSize *) attr, e);
else if (attr->klass->type == PANGO_ATTR_FAMILY) {
/* FIXME: this is not very nice. we set it here as it's only used when fonts changed.
- once family in style is used again, that code must be updated */
+ * once family in style is used again, that code must be updated */
PangoAttrString *sa = (PangoAttrString *) attr;
g_free (sa->value);
sa->value = g_strdup (e->painter->font_manager.fixed.face);
@@ -3682,7 +3955,8 @@ calc_font_size_filter (PangoAttribute *attr, gpointer data)
}
void
-html_text_calc_font_size (HTMLText *text, HTMLEngine *e)
+html_text_calc_font_size (HTMLText *text,
+ HTMLEngine *e)
{
pango_attr_list_filter (text->attr_list, calc_font_size_filter, e);
}
@@ -3727,7 +4001,8 @@ style_from_attrs (PangoAttrIterator *iter)
}
GtkHTMLFontStyle
-html_text_get_fontstyle_at_index (HTMLText *text, gint index)
+html_text_get_fontstyle_at_index (HTMLText *text,
+ gint index)
{
GtkHTMLFontStyle style = GTK_HTML_FONT_STYLE_DEFAULT;
PangoAttrIterator *iter = pango_attr_list_get_iterator (text->attr_list);
@@ -3750,7 +4025,10 @@ html_text_get_fontstyle_at_index (HTMLText *text, gint index)
}
GtkHTMLFontStyle
-html_text_get_style_conflicts (HTMLText *text, GtkHTMLFontStyle style, gint start_index, gint end_index)
+html_text_get_style_conflicts (HTMLText *text,
+ GtkHTMLFontStyle style,
+ gint start_index,
+ gint end_index)
{
GtkHTMLFontStyle conflicts = GTK_HTML_FONT_STYLE_DEFAULT;
PangoAttrIterator *iter = pango_attr_list_get_iterator (text->attr_list);
@@ -3773,7 +4051,12 @@ html_text_get_style_conflicts (HTMLText *text, GtkHTMLFontStyle style, gint star
}
void
-html_text_change_attrs (PangoAttrList *attr_list, GtkHTMLFontStyle style, HTMLEngine *e, gint start_index, gint end_index, gboolean avoid_default_size)
+html_text_change_attrs (PangoAttrList *attr_list,
+ GtkHTMLFontStyle style,
+ HTMLEngine *e,
+ gint start_index,
+ gint end_index,
+ gboolean avoid_default_size)
{
PangoAttribute *attr;
@@ -3827,19 +4110,26 @@ html_text_change_attrs (PangoAttrList *attr_list, GtkHTMLFontStyle style, HTMLEn
}
void
-html_text_set_style_in_range (HTMLText *text, GtkHTMLFontStyle style, HTMLEngine *e, gint start_index, gint end_index)
+html_text_set_style_in_range (HTMLText *text,
+ GtkHTMLFontStyle style,
+ HTMLEngine *e,
+ gint start_index,
+ gint end_index)
{
html_text_change_attrs (text->attr_list, style, e, start_index, end_index, TRUE);
}
void
-html_text_set_style (HTMLText *text, GtkHTMLFontStyle style, HTMLEngine *e)
+html_text_set_style (HTMLText *text,
+ GtkHTMLFontStyle style,
+ HTMLEngine *e)
{
html_text_set_style_in_range (text, style, e, 0, text->text_bytes);
}
static gboolean
-unset_style_filter (PangoAttribute *attr, gpointer data)
+unset_style_filter (PangoAttribute *attr,
+ gpointer data)
{
GtkHTMLFontStyle style = GPOINTER_TO_INT (data);
@@ -3876,7 +4166,8 @@ unset_style_filter (PangoAttribute *attr, gpointer data)
}
void
-html_text_unset_style (HTMLText *text, GtkHTMLFontStyle style)
+html_text_unset_style (HTMLText *text,
+ GtkHTMLFontStyle style)
{
pango_attr_list_filter (text->attr_list, unset_style_filter, GINT_TO_POINTER (style));
}
@@ -3908,7 +4199,10 @@ color_from_attrs (PangoAttrIterator *iter)
}
static HTMLColor *
-html_text_get_first_color_in_range (HTMLText *text, HTMLEngine *e, gint start_index, gint end_index)
+html_text_get_first_color_in_range (HTMLText *text,
+ HTMLEngine *e,
+ gint start_index,
+ gint end_index)
{
HTMLColor *color = NULL;
PangoAttrIterator *iter = pango_attr_list_get_iterator (text->attr_list);
@@ -3936,19 +4230,26 @@ html_text_get_first_color_in_range (HTMLText *text, HTMLEngine *e, gint start_in
}
HTMLColor *
-html_text_get_color_at_index (HTMLText *text, HTMLEngine *e, gint index)
+html_text_get_color_at_index (HTMLText *text,
+ HTMLEngine *e,
+ gint index)
{
return html_text_get_first_color_in_range (text, e, index, index);
}
HTMLColor *
-html_text_get_color (HTMLText *text, HTMLEngine *e, gint start_index)
+html_text_get_color (HTMLText *text,
+ HTMLEngine *e,
+ gint start_index)
{
return html_text_get_first_color_in_range (text, e, start_index, text->text_bytes);
}
void
-html_text_set_color_in_range (HTMLText *text, HTMLColor *color, gint start_index, gint end_index)
+html_text_set_color_in_range (HTMLText *text,
+ HTMLColor *color,
+ gint start_index,
+ gint end_index)
{
PangoAttribute *attr = pango_attr_foreground_new (color->color.red, color->color.green, color->color.blue);
@@ -3958,7 +4259,8 @@ html_text_set_color_in_range (HTMLText *text, HTMLColor *color, gint start_index
}
void
-html_text_set_color (HTMLText *text, HTMLColor *color)
+html_text_set_color (HTMLText *text,
+ HTMLColor *color)
{
html_text_set_color_in_range (text, color, 0, text->text_bytes);
}
@@ -3977,7 +4279,8 @@ html_text_direction_pango_to_html (PangoDirection pdir)
}
void
-html_text_change_set (HTMLText *text, HTMLChangeFlags flags)
+html_text_change_set (HTMLText *text,
+ HTMLChangeFlags flags)
{
HTMLObject *slave = HTML_OBJECT (text)->next;
@@ -3988,9 +4291,12 @@ html_text_change_set (HTMLText *text, HTMLChangeFlags flags)
}
void
-html_text_set_link_visited (HTMLText *text, gint offset, HTMLEngine *engine, gboolean is_visited)
+html_text_set_link_visited (HTMLText *text,
+ gint offset,
+ HTMLEngine *engine,
+ gboolean is_visited)
{
- HTMLEngine *object_engine=html_object_engine (HTML_OBJECT (text),engine);
+ HTMLEngine *object_engine = html_object_engine (HTML_OBJECT (text),engine);
Link *link = html_text_get_link_at_offset (text,offset);
if (link) {
diff --git a/gtkhtml/htmltext.h b/gtkhtml/htmltext.h
index ab86337..68455b9 100644
--- a/gtkhtml/htmltext.h
+++ b/gtkhtml/htmltext.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999, 2000, 2001 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999, 2000, 2001 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLTEXT_H_
#define _HTMLTEXT_H_
diff --git a/gtkhtml/htmltextarea.c b/gtkhtml/htmltextarea.c
index 4c7d972..93db07c 100644
--- a/gtkhtml/htmltextarea.c
+++ b/gtkhtml/htmltextarea.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -63,7 +63,8 @@ reset (HTMLEmbedded *e)
}
static gchar *
-encode (HTMLEmbedded *e, const gchar *codepage)
+encode (HTMLEmbedded *e,
+ const gchar *codepage)
{
GString *encoding = g_string_new ("");
gchar *encoded_str, *utf8_str, *gtk_text;
@@ -101,8 +102,8 @@ html_textarea_type_init (void)
void
html_textarea_class_init (HTMLTextAreaClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
HTMLEmbeddedClass *element_class;
HTMLObjectClass *object_class;
@@ -125,11 +126,11 @@ html_textarea_class_init (HTMLTextAreaClass *klass,
void
html_textarea_init (HTMLTextArea *ta,
- HTMLTextAreaClass *klass,
- GtkWidget *parent,
- gchar *name,
- gint row,
- gint col)
+ HTMLTextAreaClass *klass,
+ GtkWidget *parent,
+ gchar *name,
+ gint row,
+ gint col)
{
GtkWidget *sw;
GtkStyle *style;
@@ -169,9 +170,9 @@ html_textarea_init (HTMLTextArea *ta,
HTMLObject *
html_textarea_new (GtkWidget *parent,
- gchar *name,
- gint row,
- gint col)
+ gchar *name,
+ gint row,
+ gint col)
{
HTMLTextArea *ta;
diff --git a/gtkhtml/htmltextarea.h b/gtkhtml/htmltextarea.h
index cad82bb..fe4498d 100644
--- a/gtkhtml/htmltextarea.h
+++ b/gtkhtml/htmltextarea.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLTEXTAREA_H_
#define _HTMLTEXTAREA_H_
diff --git a/gtkhtml/htmltextinput.c b/gtkhtml/htmltextinput.c
index b7f7df8..647feec 100644
--- a/gtkhtml/htmltextinput.c
+++ b/gtkhtml/htmltextinput.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -68,7 +68,9 @@ reset (HTMLEmbedded *e)
}
static gboolean
-html_text_input_key_pressed (GtkWidget *w, GdkEventKey *ev, gpointer p)
+html_text_input_key_pressed (GtkWidget *w,
+ GdkEventKey *ev,
+ gpointer p)
{
HTMLEmbedded *e = HTML_EMBEDDED (p);
HTMLEmbedded *next = NULL;
@@ -108,7 +110,8 @@ html_text_input_key_pressed (GtkWidget *w, GdkEventKey *ev, gpointer p)
/* HTMLEmbedded methods. */
static gchar *
-encode (HTMLEmbedded *e, const gchar * codepage)
+encode (HTMLEmbedded *e,
+ const gchar *codepage)
{
GString *encoding = g_string_new ("");
gchar *ptr;
@@ -142,8 +145,8 @@ html_text_input_type_init (void)
void
html_text_input_class_init (HTMLTextInputClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
HTMLEmbeddedClass *element_class;
HTMLObjectClass *object_class;
@@ -166,13 +169,13 @@ html_text_input_class_init (HTMLTextInputClass *klass,
void
html_text_input_init (HTMLTextInput *ti,
- HTMLTextInputClass *klass,
- GtkWidget *parent,
- gchar *name,
- gchar *value,
- gint size,
- gint maxlen,
- gboolean password)
+ HTMLTextInputClass *klass,
+ GtkWidget *parent,
+ gchar *name,
+ gchar *value,
+ gint size,
+ gint maxlen,
+ gboolean password)
{
HTMLEmbedded *element;
GtkWidget *entry;
@@ -204,11 +207,11 @@ html_text_input_init (HTMLTextInput *ti,
HTMLObject *
html_text_input_new (GtkWidget *parent,
- gchar *name,
- gchar *value,
- gint size,
- gint maxlen,
- gboolean password)
+ gchar *name,
+ gchar *value,
+ gint size,
+ gint maxlen,
+ gboolean password)
{
HTMLTextInput *ti;
diff --git a/gtkhtml/htmltextinput.h b/gtkhtml/htmltextinput.h
index 4bbb6c1..7d7bc2c 100644
--- a/gtkhtml/htmltextinput.h
+++ b/gtkhtml/htmltextinput.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Jonas Borgströjonas_b bitsmart com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLTEXTINPUT_H_
#define _HTMLTEXTINPUT_H_
diff --git a/gtkhtml/htmltextslave.c b/gtkhtml/htmltextslave.c
index be3468b..dbe085d 100644
--- a/gtkhtml/htmltextslave.c
+++ b/gtkhtml/htmltextslave.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 1999 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 1999 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -58,7 +58,10 @@ html_text_slave_get_text (HTMLTextSlave *slave)
/* Split this TextSlave at the specified offset. */
static void
-split (HTMLTextSlave *slave, guint offset, gint skip, gchar *start_pointer)
+split (HTMLTextSlave *slave,
+ guint offset,
+ gint skip,
+ gchar *start_pointer)
{
HTMLObject *obj;
HTMLObject *new;
@@ -101,7 +104,10 @@ html_text_slave_get_start_byte_offset (HTMLTextSlave *slave)
}
static void
-hts_update_asc_dsc (HTMLPainter *painter, PangoItem *item, gint *asc, gint *dsc)
+hts_update_asc_dsc (HTMLPainter *painter,
+ PangoItem *item,
+ gint *asc,
+ gint *dsc)
{
PangoFontMetrics *pfm;
@@ -114,16 +120,19 @@ hts_update_asc_dsc (HTMLPainter *painter, PangoItem *item, gint *asc, gint *dsc)
}
static gint
-hts_calc_width (HTMLTextSlave *slave, HTMLPainter *painter, gint *asc, gint *dsc)
+hts_calc_width (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ gint *asc,
+ gint *dsc)
{
/*HTMLText *text = slave->owner;
gint line_offset, tabs = 0, width = 0;
-
+ *
line_offset = html_text_slave_get_line_offset (slave, 0, painter);
if (line_offset != -1)
width += (html_text_text_line_length (html_text_slave_get_text (slave), &line_offset, slave->posLen, &tabs) - slave->posLen)*
html_painter_get_space_width (painter, html_text_get_font_style (text), text->face);
-
+ *
width += html_text_calc_part_width (text, painter, html_text_slave_get_text (slave), slave->posStart, slave->posLen, asc, dsc); */
GSList *cur, *gilist = html_text_slave_get_glyph_items (slave, painter);
@@ -194,7 +203,9 @@ glyph_items_destroy (GSList *glyph_items)
}
static gboolean
-html_text_slave_real_calc_size (HTMLObject *self, HTMLPainter *painter, GList **changed_objs)
+html_text_slave_real_calc_size (HTMLObject *self,
+ HTMLPainter *painter,
+ GList **changed_objs)
{
HTMLText *owner;
HTMLTextSlave *slave;
@@ -243,7 +254,9 @@ html_text_slave_real_calc_size (HTMLObject *self, HTMLPainter *painter, GList **
#ifdef HTML_TEXT_SLAVE_DEBUG
static void
-debug_print (HTMLFitType rv, gchar *text, gint len)
+debug_print (HTMLFitType rv,
+ gchar *text,
+ gint len)
{
gint i;
@@ -268,7 +281,9 @@ debug_print (HTMLFitType rv, gchar *text, gint len)
#endif
gint
-html_text_slave_get_line_offset (HTMLTextSlave *slave, gint offset, HTMLPainter *p)
+html_text_slave_get_line_offset (HTMLTextSlave *slave,
+ gint offset,
+ HTMLPainter *p)
{
HTMLObject *head = HTML_OBJECT (slave->owner)->next;
@@ -294,7 +309,8 @@ html_text_slave_get_line_offset (HTMLTextSlave *slave, gint offset, HTMLPainter
}
static gboolean
-could_remove_leading_space (HTMLTextSlave *slave, gboolean lineBegin)
+could_remove_leading_space (HTMLTextSlave *slave,
+ gboolean lineBegin)
{
HTMLObject *o = HTML_OBJECT (slave->owner);
@@ -311,7 +327,9 @@ could_remove_leading_space (HTMLTextSlave *slave, gboolean lineBegin)
}
gchar *
-html_text_slave_remove_leading_space (HTMLTextSlave *slave, HTMLPainter *painter, gboolean lineBegin)
+html_text_slave_remove_leading_space (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ gboolean lineBegin)
{
gchar *begin;
@@ -327,7 +345,9 @@ html_text_slave_remove_leading_space (HTMLTextSlave *slave, HTMLPainter *painter
}
gint
-html_text_slave_get_nb_width (HTMLTextSlave *slave, HTMLPainter *painter, gboolean lineBegin)
+html_text_slave_get_nb_width (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ gboolean lineBegin)
{
html_text_slave_remove_leading_space (slave, painter, lineBegin);
@@ -351,8 +371,20 @@ html_text_slave_get_nb_width (HTMLTextSlave *slave, HTMLPainter *painter, gboole
* We'll actually break the item at the last break position that still fits.
*/
static gboolean
-update_lb (HTMLTextSlave *slave, HTMLPainter *painter, gint widthLeft, gint offset, gchar *s, gint ii, gint io, gint line_offset,
- gint w, gint *lwl, gint *lbw, gint *lbo, gchar **lbsp, gboolean *force_fit)
+update_lb (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ gint widthLeft,
+ gint offset,
+ gchar *s,
+ gint ii,
+ gint io,
+ gint line_offset,
+ gint w,
+ gint *lwl,
+ gint *lbw,
+ gint *lbo,
+ gchar **lbsp,
+ gboolean *force_fit)
{
gint new_ltw, new_lwl, aw;
@@ -374,8 +406,12 @@ update_lb (HTMLTextSlave *slave, HTMLPainter *painter, gint widthLeft, gint offs
}
static HTMLFitType
-hts_fit_line (HTMLObject *o, HTMLPainter *painter,
- gboolean lineBegin, gboolean firstRun, gboolean next_to_floating, gint widthLeft)
+hts_fit_line (HTMLObject *o,
+ HTMLPainter *painter,
+ gboolean lineBegin,
+ gboolean firstRun,
+ gboolean next_to_floating,
+ gint widthLeft)
{
HTMLTextSlave *slave = HTML_TEXT_SLAVE (o);
gint lbw, w, lbo, lwl, offset;
@@ -416,7 +452,7 @@ hts_fit_line (HTMLObject *o, HTMLPainter *painter,
}
pi->entries[ii].glyph_item.glyphs->glyphs[0].geometry.width = pi->entries[ii].widths[io]
- = skip*html_painter_get_space_width (painter, font_style, face) * PANGO_SCALE;
+ = skip * html_painter_get_space_width (painter, font_style, face) * PANGO_SCALE;
line_offset += skip;
} else {
line_offset++;
@@ -444,9 +480,10 @@ hts_fit_line (HTMLObject *o, HTMLPainter *painter,
static gboolean
select_range (HTMLObject *self,
- HTMLEngine *engine,
- guint start, gint length,
- gboolean queue_draw)
+ HTMLEngine *engine,
+ guint start,
+ gint length,
+ gboolean queue_draw)
{
return FALSE;
}
@@ -461,14 +498,15 @@ get_length (HTMLObject *self)
/* HTMLObject::draw() implementation. */
static gint
-get_ys (HTMLText *text, HTMLPainter *p)
+get_ys (HTMLText *text,
+ HTMLPainter *p)
{
if (text->font_style & GTK_HTML_FONT_STYLE_SUBSCRIPT || text->font_style & GTK_HTML_FONT_STYLE_SUPERSCRIPT) {
gint height2;
height2 = (HTML_OBJECT (text)->ascent + HTML_OBJECT (text)->descent) / 2;
/* FIX2? (html_painter_calc_ascent (p, text->font_style, text->face)
- + html_painter_calc_descent (p, text->font_style, text->face)) >> 1; */
+ * + html_painter_calc_descent (p, text->font_style, text->face)) >> 1; */
return (text->font_style & GTK_HTML_FONT_STYLE_SUBSCRIPT) ? height2 : -height2;
} else
@@ -476,7 +514,11 @@ get_ys (HTMLText *text, HTMLPainter *p)
}
static inline GList *
-get_glyphs_base_text (GList *glyphs, PangoItem *item, gint ii, const gchar *text, gint bytes)
+get_glyphs_base_text (GList *glyphs,
+ PangoItem *item,
+ gint ii,
+ const gchar *text,
+ gint bytes)
{
PangoGlyphString *str;
@@ -489,7 +531,12 @@ get_glyphs_base_text (GList *glyphs, PangoItem *item, gint ii, const gchar *text
}
GList *
-html_get_glyphs_non_tab (GList *glyphs, PangoItem *item, gint ii, const gchar *text, gint bytes, gint len)
+html_get_glyphs_non_tab (GList *glyphs,
+ PangoItem *item,
+ gint ii,
+ const gchar *text,
+ gint bytes,
+ gint len)
{
gchar *tab;
@@ -513,7 +560,8 @@ html_get_glyphs_non_tab (GList *glyphs, PangoItem *item, gint ii, const gchar *t
*/
static GSList *
-reorder_glyph_items (GSList *glyph_items, gint n_items)
+reorder_glyph_items (GSList *glyph_items,
+ gint n_items)
{
GSList *tmp_list, *level_start_node;
gint i, level_start_i;
@@ -568,7 +616,10 @@ reorder_glyph_items (GSList *glyph_items, gint n_items)
}
static GSList *
-get_glyph_items_in_range (HTMLTextSlave *slave, HTMLPainter *painter, gint start_offset, gint len)
+get_glyph_items_in_range (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ gint start_offset,
+ gint len)
{
HTMLTextPangoInfo *pi = html_text_get_pango_info (slave->owner, painter);
gint i, offset, end_offset, n_items = 0;
@@ -657,7 +708,8 @@ get_glyph_items_in_range (HTMLTextSlave *slave, HTMLPainter *painter, gint start
}
GSList *
-html_text_slave_get_glyph_items (HTMLTextSlave *slave, HTMLPainter *painter)
+html_text_slave_get_glyph_items (HTMLTextSlave *slave,
+ HTMLPainter *painter)
{
if (painter && (!slave->glyph_items || (HTML_OBJECT (slave)->change & HTML_CHANGE_RECALC_PI))) {
clear_glyph_items (slave);
@@ -670,7 +722,14 @@ html_text_slave_get_glyph_items (HTMLTextSlave *slave, HTMLPainter *painter)
}
static gboolean
-calc_glyph_range_size (HTMLText *text, PangoGlyphItem *glyph_item, gint start_index, gint end_index, gint *x_offset, gint *width, gint *asc, gint *height)
+calc_glyph_range_size (HTMLText *text,
+ PangoGlyphItem *glyph_item,
+ gint start_index,
+ gint end_index,
+ gint *x_offset,
+ gint *width,
+ gint *asc,
+ gint *height)
{
gint isect_start, isect_end;
@@ -708,10 +767,10 @@ calc_glyph_range_size (HTMLText *text, PangoGlyphItem *glyph_item, gint start_in
pango_glyph_string_extents (glyph_item->glyphs, glyph_item->item->analysis.font, NULL, &log_rect);
/* printf ("selection_start_index %d selection_end_index %d isect_start %d isect_end %d start_x %d end_x %d cwidth %d width %d\n",
- selection_start_index, selection_end_index, isect_start, isect_end,
- html_painter_pango_to_engine (p, start_x), html_painter_pango_to_engine (p, end_x),
- html_painter_pango_to_engine (p, start_x < end_x ? (end_x - start_x) : (start_x - end_x)),
- html_painter_pango_to_engine (p, log_rect.width)); */
+ * selection_start_index, selection_end_index, isect_start, isect_end,
+ * html_painter_pango_to_engine (p, start_x), html_painter_pango_to_engine (p, end_x),
+ * html_painter_pango_to_engine (p, start_x < end_x ? (end_x - start_x) : (start_x - end_x)),
+ * html_painter_pango_to_engine (p, log_rect.width)); */
if (x_offset)
*x_offset = MIN (start_x, end_x);
@@ -730,11 +789,14 @@ calc_glyph_range_size (HTMLText *text, PangoGlyphItem *glyph_item, gint start_in
static void
draw_text (HTMLTextSlave *self,
- HTMLPainter *p,
- GtkHTMLFontStyle font_style,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ HTMLPainter *p,
+ GtkHTMLFontStyle font_style,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLObject *obj;
HTMLText *text = self->owner;
@@ -804,7 +866,7 @@ draw_text (HTMLTextSlave *self,
html_painter_pango_to_engine (p, height));
/* printf ("draw selection %d %d %d at %d, %d\n", selection_bg.red, selection_bg.green, selection_bg.blue,
- obj->x + tx + run_width, obj->y + ty + get_ys (text, p)); */
+ * obj->x + tx + run_width, obj->y + ty + get_ys (text, p)); */
html_painter_draw_glyphs (p, obj->x + tx + html_painter_pango_to_engine (p, run_width),
obj->y + ty + get_ys (text, p), gi->glyph_item.item, gi->glyph_item.glyphs,
&selection_fg, &selection_bg);
@@ -851,7 +913,9 @@ draw_text (HTMLTextSlave *self,
}
static void
-draw_focus_rectangle (HTMLTextSlave *slave, HTMLPainter *painter, GdkRectangle *box)
+draw_focus_rectangle (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ GdkRectangle *box)
{
HTMLGdkPainter *p;
const double dashes[] = { 1, 2 };
@@ -886,7 +950,10 @@ draw_focus_rectangle (HTMLTextSlave *slave, HTMLPainter *painter, GdkRectangle
}
static void
-draw_focus (HTMLTextSlave *slave, HTMLPainter *p, gint tx, gint ty)
+draw_focus (HTMLTextSlave *slave,
+ HTMLPainter *p,
+ gint tx,
+ gint ty)
{
GdkRectangle rect;
Link *link = html_text_get_link_at_offset (slave->owner, slave->owner->focused_link_offset);
@@ -910,9 +977,12 @@ draw_focus (HTMLTextSlave *slave, HTMLPainter *p, gint tx, gint ty)
static void
draw (HTMLObject *o,
HTMLPainter *p,
- gint x, gint y,
- gint width, gint height,
- gint tx, gint ty)
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint tx,
+ gint ty)
{
HTMLTextSlave *slave;
HTMLText *owner;
@@ -936,20 +1006,21 @@ draw (HTMLObject *o,
static gint
calc_min_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
return 0;
}
static gint
calc_preferred_width (HTMLObject *o,
- HTMLPainter *painter)
+ HTMLPainter *painter)
{
return 0;
}
static const gchar *
-get_url (HTMLObject *o, gint offset)
+get_url (HTMLObject *o,
+ gint offset)
{
HTMLTextSlave *slave;
@@ -958,7 +1029,9 @@ get_url (HTMLObject *o, gint offset)
}
static gint
-calc_offset (HTMLTextSlave *slave, HTMLPainter *painter, gint x)
+calc_offset (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ gint x)
{
GSList *cur, *glyphs = html_text_slave_get_glyph_items (slave, painter);
gint width = 0, offset = html_object_get_direction (HTML_OBJECT (slave->owner)) == HTML_DIRECTION_RTL ? slave->posLen : 0;
@@ -1013,7 +1086,10 @@ calc_offset (HTMLTextSlave *slave, HTMLPainter *painter, gint x)
}
static guint
-get_offset_for_pointer (HTMLTextSlave *slave, HTMLPainter *painter, gint x, gint y)
+get_offset_for_pointer (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ gint x,
+ gint y)
{
g_return_val_if_fail (slave != NULL, 0);
@@ -1033,10 +1109,11 @@ get_offset_for_pointer (HTMLTextSlave *slave, HTMLPainter *painter, gint x, gint
static HTMLObject *
check_point (HTMLObject *self,
- HTMLPainter *painter,
- gint x, gint y,
- guint *offset_return,
- gboolean for_cursor)
+ HTMLPainter *painter,
+ gint x,
+ gint y,
+ guint *offset_return,
+ gboolean for_cursor)
{
if (x >= self->x
&& x < self->x + MAX (1, self->width)
@@ -1081,8 +1158,8 @@ html_text_slave_type_init (void)
void
html_text_slave_class_init (HTMLTextSlaveClass *klass,
- HTMLType type,
- guint object_size)
+ HTMLType type,
+ guint object_size)
{
HTMLObjectClass *object_class;
@@ -1107,10 +1184,10 @@ html_text_slave_class_init (HTMLTextSlaveClass *klass,
void
html_text_slave_init (HTMLTextSlave *slave,
- HTMLTextSlaveClass *klass,
- HTMLText *owner,
- guint posStart,
- guint posLen)
+ HTMLTextSlaveClass *klass,
+ HTMLText *owner,
+ guint posStart,
+ guint posLen)
{
HTMLObject *object;
@@ -1134,7 +1211,9 @@ html_text_slave_init (HTMLTextSlave *slave,
}
HTMLObject *
-html_text_slave_new (HTMLText *owner, guint posStart, guint posLen)
+html_text_slave_new (HTMLText *owner,
+ guint posStart,
+ guint posLen)
{
HTMLTextSlave *slave;
@@ -1145,7 +1224,11 @@ html_text_slave_new (HTMLText *owner, guint posStart, guint posLen)
}
static gboolean
-html_text_slave_is_index_in_glyph (HTMLTextSlave *slave, HTMLTextSlave *next_slave, GSList *cur, gint index, PangoItem *item)
+html_text_slave_is_index_in_glyph (HTMLTextSlave *slave,
+ HTMLTextSlave *next_slave,
+ GSList *cur,
+ gint index,
+ PangoItem *item)
{
if (item->analysis.level % 2 == 0) {
/* LTR */
@@ -1167,7 +1250,13 @@ html_text_slave_is_index_in_glyph (HTMLTextSlave *slave, HTMLTextSlave *next_sla
}
static HTMLTextSlaveGlyphItem *
-html_text_slave_get_glyph_item_at_offset (HTMLTextSlave *slave, HTMLPainter *painter, gint offset, HTMLTextSlaveGlyphItem **prev, HTMLTextSlaveGlyphItem **next, gint *start_width, gint *index_out)
+html_text_slave_get_glyph_item_at_offset (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ gint offset,
+ HTMLTextSlaveGlyphItem **prev,
+ HTMLTextSlaveGlyphItem **next,
+ gint *start_width,
+ gint *index_out)
{
HTMLTextSlaveGlyphItem *rv = NULL;
HTMLTextSlaveGlyphItem *prev_gi, *next_gi;
@@ -1217,7 +1306,9 @@ html_text_slave_get_glyph_item_at_offset (HTMLTextSlave *slave, HTMLPainter *pai
}
static gboolean
-html_text_slave_gi_left_edge (HTMLTextSlave *slave, HTMLCursor *cursor, HTMLTextSlaveGlyphItem *gi)
+html_text_slave_gi_left_edge (HTMLTextSlave *slave,
+ HTMLCursor *cursor,
+ HTMLTextSlaveGlyphItem *gi)
{
gint old_offset = cursor->offset;
@@ -1237,7 +1328,9 @@ html_text_slave_gi_left_edge (HTMLTextSlave *slave, HTMLCursor *cursor, HTMLText
}
static gboolean
-html_text_slave_gi_right_edge (HTMLTextSlave *slave, HTMLCursor *cursor, HTMLTextSlaveGlyphItem *gi)
+html_text_slave_gi_right_edge (HTMLTextSlave *slave,
+ HTMLCursor *cursor,
+ HTMLTextSlaveGlyphItem *gi)
{
gint old_offset = cursor->offset;
@@ -1257,7 +1350,9 @@ html_text_slave_gi_right_edge (HTMLTextSlave *slave, HTMLCursor *cursor, HTMLTex
}
static gboolean
-html_text_slave_cursor_right_one (HTMLTextSlave *slave, HTMLPainter *painter, HTMLCursor *cursor)
+html_text_slave_cursor_right_one (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
HTMLTextSlaveGlyphItem *prev, *next;
gint index;
@@ -1304,7 +1399,9 @@ html_text_slave_cursor_right_one (HTMLTextSlave *slave, HTMLPainter *painter, HT
}
gboolean
-html_text_slave_cursor_right (HTMLTextSlave *slave, HTMLPainter *painter, HTMLCursor *cursor)
+html_text_slave_cursor_right (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
HTMLTextPangoInfo *pi = html_text_get_pango_info (slave->owner, painter);
gboolean step_success;
@@ -1317,7 +1414,9 @@ html_text_slave_cursor_right (HTMLTextSlave *slave, HTMLPainter *painter, HTMLCu
}
static gboolean
-html_text_slave_cursor_left_one (HTMLTextSlave *slave, HTMLPainter *painter, HTMLCursor *cursor)
+html_text_slave_cursor_left_one (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
HTMLTextSlaveGlyphItem *prev, *next;
gint index;
@@ -1369,7 +1468,9 @@ html_text_slave_cursor_left_one (HTMLTextSlave *slave, HTMLPainter *painter, HTM
}
gboolean
-html_text_slave_cursor_left (HTMLTextSlave *slave, HTMLPainter *painter, HTMLCursor *cursor)
+html_text_slave_cursor_left (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
HTMLTextPangoInfo *pi = html_text_get_pango_info (slave->owner, painter);
gboolean step_success;
@@ -1382,7 +1483,9 @@ html_text_slave_cursor_left (HTMLTextSlave *slave, HTMLPainter *painter, HTMLCur
}
static gboolean
-html_text_slave_get_left_edge (HTMLTextSlave *slave, HTMLPainter *painter, HTMLCursor *cursor)
+html_text_slave_get_left_edge (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
HTMLTextPangoInfo *pi = html_text_get_pango_info (slave->owner, painter);
gint old_offset = cursor->offset;
@@ -1403,7 +1506,9 @@ html_text_slave_get_left_edge (HTMLTextSlave *slave, HTMLPainter *painter, HTMLC
}
static gboolean
-html_text_slave_get_right_edge (HTMLTextSlave *slave, HTMLPainter *painter, HTMLCursor *cursor)
+html_text_slave_get_right_edge (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ HTMLCursor *cursor)
{
HTMLTextPangoInfo *pi = html_text_get_pango_info (slave->owner, painter);
gint old_offset = cursor->offset;
@@ -1424,7 +1529,9 @@ html_text_slave_get_right_edge (HTMLTextSlave *slave, HTMLPainter *painter, HTML
}
gboolean
-html_text_slave_cursor_head (HTMLTextSlave *slave, HTMLCursor *cursor, HTMLPainter *painter)
+html_text_slave_cursor_head (HTMLTextSlave *slave,
+ HTMLCursor *cursor,
+ HTMLPainter *painter)
{
if (html_text_slave_get_glyph_items (slave, painter)) {
cursor->object = HTML_OBJECT (slave->owner);
@@ -1442,7 +1549,9 @@ html_text_slave_cursor_head (HTMLTextSlave *slave, HTMLCursor *cursor, HTMLPaint
}
gboolean
-html_text_slave_cursor_tail (HTMLTextSlave *slave, HTMLCursor *cursor, HTMLPainter *painter)
+html_text_slave_cursor_tail (HTMLTextSlave *slave,
+ HTMLCursor *cursor,
+ HTMLPainter *painter)
{
if (html_text_slave_get_glyph_items (slave, painter)) {
cursor->object = HTML_OBJECT (slave->owner);
@@ -1460,7 +1569,11 @@ html_text_slave_cursor_tail (HTMLTextSlave *slave, HTMLCursor *cursor, HTMLPaint
}
void
-html_text_slave_get_cursor_base (HTMLTextSlave *slave, HTMLPainter *painter, guint offset, gint *x, gint *y)
+html_text_slave_get_cursor_base (HTMLTextSlave *slave,
+ HTMLPainter *painter,
+ guint offset,
+ gint *x,
+ gint *y)
{
HTMLTextSlaveGlyphItem *gi;
gint index, start_width;
@@ -1484,7 +1597,8 @@ html_text_slave_get_cursor_base (HTMLTextSlave *slave, HTMLPainter *painter, gui
}
gint
-html_text_slave_get_left_edge_offset (HTMLTextSlave *slave, HTMLPainter *painter)
+html_text_slave_get_left_edge_offset (HTMLTextSlave *slave,
+ HTMLPainter *painter)
{
GSList *gis = html_text_slave_get_glyph_items (slave, painter);
@@ -1509,7 +1623,8 @@ html_text_slave_get_left_edge_offset (HTMLTextSlave *slave, HTMLPainter *painter
}
gint
-html_text_slave_get_right_edge_offset (HTMLTextSlave *slave, HTMLPainter *painter)
+html_text_slave_get_right_edge_offset (HTMLTextSlave *slave,
+ HTMLPainter *painter)
{
GSList *gis = html_text_slave_get_glyph_items (slave, painter);
diff --git a/gtkhtml/htmltextslave.h b/gtkhtml/htmltextslave.h
index aab821a..30eb657 100644
--- a/gtkhtml/htmltextslave.h
+++ b/gtkhtml/htmltextslave.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the KDE libraries
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLTEXTSLAVE_H_
#define _HTMLTEXTSLAVE_H_
diff --git a/gtkhtml/htmltokenizer.c b/gtkhtml/htmltokenizer.c
index 2aaf3a0..952a190 100644
--- a/gtkhtml/htmltokenizer.c
+++ b/gtkhtml/htmltokenizer.c
@@ -1,25 +1,25 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- Copyright (C) 1997 Martin Jones (mjones kde org)
- (C) 1997 Torben Weis (weis kde org)
- (C) 1999 Anders Carlsson (andersca gnu org)
- (C) 2000 Helix Code, Inc., Radek Doulik (rodo helixcode com)
- (C) 2001 Ximian, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * (C) 1997 Torben Weis (weis kde org)
+ * (C) 1999 Anders Carlsson (andersca gnu org)
+ * (C) 2000 Helix Code, Inc., Radek Doulik (rodo helixcode com)
+ * (C) 2001 Ximian, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
/* The HTML Tokenizer */
@@ -354,7 +354,9 @@ html_token_buffer_destroy (HTMLTokenBuffer *tb)
}
static gboolean
-html_token_buffer_append_token (HTMLTokenBuffer * buf, const gchar *token, gint len)
+html_token_buffer_append_token (HTMLTokenBuffer *buf,
+ const gchar *token,
+ gint len)
{
/* check if we have enough free space */
@@ -423,15 +425,15 @@ html_tokenizer_real_peek_token (HTMLTokenizer *t)
gboolean
is_valid_g_iconv (const GIConv iconv_cd)
{
- return iconv_cd != NULL && iconv_cd != (GIConv)-1;
+ return iconv_cd != NULL && iconv_cd != (GIConv) - 1;
}
/*Convert only chars when code >127*/
gboolean
-is_need_convert (const gchar * token)
+is_need_convert (const gchar *token)
{
- gint i=strlen (token);
- for (;i>=0;i--)
+ gint i = strlen (token);
+ for (; i >= 0; i--)
if (token[i]&128)
return TRUE;
return FALSE;
@@ -475,10 +477,10 @@ html_tokenizer_convert_entity (gchar *token)
if (*read_pos == '#') {
/* � */
if (isdigit (*(read_pos + 1))) {
- value=strtoull (read_pos + 1, NULL, 10);
+ value = strtoull (read_pos + 1, NULL, 10);
/* Ý */
} else if (*(read_pos + 1) == 'x') {
- value=strtoull (read_pos + 2, NULL, 16);
+ value = strtoull (read_pos + 2, NULL, 16);
}
} else {
value = html_entity_parse (read_pos, strlen (read_pos));
@@ -521,14 +523,14 @@ convert_text_encoding (const GIConv iconv_cd,
if (is_valid_g_iconv (iconv_cd) && is_need_convert (token)) {
currlength = strlen (token);
current = token;
- newlength = currlength*7+1;
+ newlength = currlength * 7 + 1;
oldlength = newlength;
newbuffer = g_new (gchar, newlength);
returnbuffer = newbuffer;
while (currlength > 0) {
/*function not change current, but g_iconv use not const source*/
- g_iconv (iconv_cd, (gchar **)¤t, &currlength, &newbuffer, &newlength);
+ g_iconv (iconv_cd, (gchar **) ¤t, &currlength, &newbuffer, &newlength);
if (currlength > 0) {
g_warning ("IconvError=%s", current);
*newbuffer = INVALID_ENTITY_CHARACTER_MARKER;
@@ -547,7 +549,7 @@ convert_text_encoding (const GIConv iconv_cd,
static gchar *
html_tokenizer_converted_token (HTMLTokenizer *t,
- const gchar * token)
+ const gchar *token)
{
if (token != NULL) {
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -676,7 +678,7 @@ is_text (const gchar *content_type)
}
static const gchar *
-get_encoding_from_content_type (const gchar * content_type)
+get_encoding_from_content_type (const gchar *content_type)
{
gchar * charset;
if (content_type)
@@ -693,7 +695,7 @@ get_encoding_from_content_type (const gchar * content_type)
}
GIConv
-generate_iconv_from (const gchar * content_type)
+generate_iconv_from (const gchar *content_type)
{
if (content_type)
if (!charset_is_utf8 (content_type))
@@ -706,7 +708,7 @@ generate_iconv_from (const gchar * content_type)
}
GIConv
-generate_iconv_to (const gchar * content_type)
+generate_iconv_to (const gchar *content_type)
{
if (content_type)
if (!charset_is_utf8 (content_type))
@@ -719,7 +721,8 @@ generate_iconv_to (const gchar * content_type)
}
static void
-html_tokenizer_real_engine_type (HTMLTokenizer *t, gboolean engine_type)
+html_tokenizer_real_engine_type (HTMLTokenizer *t,
+ gboolean engine_type)
{
struct _HTMLTokenizerPrivate *p;
p = t->priv;
@@ -728,7 +731,8 @@ html_tokenizer_real_engine_type (HTMLTokenizer *t, gboolean engine_type)
}
static void
-html_tokenizer_real_change (HTMLTokenizer *t, const gchar *content_type)
+html_tokenizer_real_change (HTMLTokenizer *t,
+ const gchar *content_type)
{
struct _HTMLTokenizerPrivate *p;
if (!is_text (content_type))
@@ -758,7 +762,8 @@ html_tokenizer_real_change (HTMLTokenizer *t, const gchar *content_type)
}
static void
-html_tokenizer_real_begin (HTMLTokenizer *t, const gchar *content_type)
+html_tokenizer_real_begin (HTMLTokenizer *t,
+ const gchar *content_type)
{
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -786,7 +791,8 @@ html_tokenizer_real_begin (HTMLTokenizer *t, const gchar *content_type)
}
static void
-destroy_blocking (gpointer data, gpointer user_data)
+destroy_blocking (gpointer data,
+ gpointer user_data)
{
g_free (data);
}
@@ -818,7 +824,9 @@ html_tokenizer_real_end (HTMLTokenizer *t)
}
static void
-html_tokenizer_append_token (HTMLTokenizer *t, const gchar *string, gint len)
+html_tokenizer_append_token (HTMLTokenizer *t,
+ const gchar *string,
+ gint len)
{
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -831,7 +839,7 @@ html_tokenizer_append_token (HTMLTokenizer *t, const gchar *string, gint len)
/* try append token to current buffer, if not successful, create append new token buffer */
if (!html_token_buffer_append_token (p->write_buf, string, len)) {
- html_tokenizer_append_token_buffer (t, len+1);
+ html_tokenizer_append_token_buffer (t, len + 1);
/* now it must pass as we have enough space */
g_assert (html_token_buffer_append_token (p->write_buf, string, len));
}
@@ -844,17 +852,19 @@ html_tokenizer_append_token (HTMLTokenizer *t, const gchar *string, gint len)
}
static void
-add_byte (HTMLTokenizer *t, const gchar **c)
+add_byte (HTMLTokenizer *t,
+ const gchar **c)
{
add_char (t,**c);
(*c) ++;
}
static void
-add_char (HTMLTokenizer *t, gchar c)
+add_char (HTMLTokenizer *t,
+ gchar c)
{
struct _HTMLTokenizerPrivate *p = t->priv;
- if (c!='\0')
+ if (c != '\0')
{
*(p->dest) = c;
p->dest++;
@@ -863,7 +873,8 @@ add_char (HTMLTokenizer *t, gchar c)
}
static void
-html_tokenizer_append_token_buffer (HTMLTokenizer *t, gint min_size)
+html_tokenizer_append_token_buffer (HTMLTokenizer *t,
+ gint min_size)
{
struct _HTMLTokenizerPrivate *p = t->priv;
HTMLTokenBuffer *nb;
@@ -946,7 +957,8 @@ prepare_enough_space (HTMLTokenizer *t)
}
static void
-in_comment (HTMLTokenizer *t, const gchar **src)
+in_comment (HTMLTokenizer *t,
+ const gchar **src)
{
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -974,7 +986,8 @@ in_comment (HTMLTokenizer *t, const gchar **src)
}
static inline void
-extension_one_char (HTMLTokenizer *t, const gchar **src)
+extension_one_char (HTMLTokenizer *t,
+ const gchar **src)
{
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -984,7 +997,8 @@ extension_one_char (HTMLTokenizer *t, const gchar **src)
}
static void
-in_extension (HTMLTokenizer *t, const gchar **src)
+in_extension (HTMLTokenizer *t,
+ const gchar **src)
{
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -1012,7 +1026,8 @@ in_extension (HTMLTokenizer *t, const gchar **src)
}
static void
-in_script_or_style (HTMLTokenizer *t, const gchar **src)
+in_script_or_style (HTMLTokenizer *t,
+ const gchar **src)
{
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -1043,7 +1058,7 @@ in_script_or_style (HTMLTokenizer *t, const gchar **src)
}
else if (p->searchFor[p->searchCount] == '>') {
/* There can be any number of white-space characters between
- tag name and closing '>' so try to move through them, if possible */
+ * tag name and closing '>' so try to move through them, if possible */
const gchar **p = src;
while (isspace (**p))
@@ -1080,7 +1095,8 @@ in_script_or_style (HTMLTokenizer *t, const gchar **src)
}
static void
-in_tag (HTMLTokenizer *t, const gchar **src)
+in_tag (HTMLTokenizer *t,
+ const gchar **src)
{
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -1123,7 +1139,8 @@ in_tag (HTMLTokenizer *t, const gchar **src)
}
static void
-start_tag (HTMLTokenizer *t, const gchar **src)
+start_tag (HTMLTokenizer *t,
+ const gchar **src)
{
(*src)++;
t->priv->startTag = TRUE;
@@ -1131,7 +1148,8 @@ start_tag (HTMLTokenizer *t, const gchar **src)
}
static void
-end_tag (HTMLTokenizer *t, const gchar **src)
+end_tag (HTMLTokenizer *t,
+ const gchar **src)
{
struct _HTMLTokenizerPrivate *p = t->priv;
gchar *ptr;
@@ -1218,7 +1236,8 @@ end_tag (HTMLTokenizer *t, const gchar **src)
}
static void
-in_crlf (HTMLTokenizer *t, const gchar **src)
+in_crlf (HTMLTokenizer *t,
+ const gchar **src)
{
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -1260,7 +1279,8 @@ in_crlf (HTMLTokenizer *t, const gchar **src)
}
static void
-in_space_or_tab (HTMLTokenizer *t, const gchar **src)
+in_space_or_tab (HTMLTokenizer *t,
+ const gchar **src)
{
if (t->priv->tquote) {
if (t->priv->discard == NoneDiscard)
@@ -1286,7 +1306,8 @@ in_space_or_tab (HTMLTokenizer *t, const gchar **src)
}
static void
-in_quoted (HTMLTokenizer *t, const gchar **src)
+in_quoted (HTMLTokenizer *t,
+ const gchar **src)
{
/* We treat ' and " the same in tags " */
t->priv->discard = NoneDiscard;
@@ -1296,7 +1317,7 @@ in_quoted (HTMLTokenizer *t, const gchar **src)
|| (t->priv->tquote == DOUBLE_QUOTE && **src == '\'')) {
add_char (t, **src);
(*src)++;
- } else if (*(t->priv->dest-1) == '=' && !t->priv->tquote) {
+ } else if (*(t->priv->dest - 1) == '=' && !t->priv->tquote) {
t->priv->discard = SpaceDiscard;
t->priv->pending = NonePending;
@@ -1326,7 +1347,8 @@ in_quoted (HTMLTokenizer *t, const gchar **src)
}
static void
-in_assignment (HTMLTokenizer *t, const gchar **src)
+in_assignment (HTMLTokenizer *t,
+ const gchar **src)
{
t->priv->discard = NoneDiscard;
if (t->priv->tag) {
@@ -1347,7 +1369,8 @@ in_assignment (HTMLTokenizer *t, const gchar **src)
}
inline static void
-in_plain (HTMLTokenizer *t, const gchar **src)
+in_plain (HTMLTokenizer *t,
+ const gchar **src)
{
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -1378,7 +1401,8 @@ in_plain (HTMLTokenizer *t, const gchar **src)
}
static void
-html_tokenizer_tokenize_one_char (HTMLTokenizer *t, const gchar **src)
+html_tokenizer_tokenize_one_char (HTMLTokenizer *t,
+ const gchar **src)
{
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -1414,7 +1438,9 @@ html_tokenizer_tokenize_one_char (HTMLTokenizer *t, const gchar **src)
}
static void
-html_tokenizer_real_write (HTMLTokenizer *t, const gchar *string, gsize size)
+html_tokenizer_real_write (HTMLTokenizer *t,
+ const gchar *string,
+ gsize size)
{
const gchar *src = string;
@@ -1434,7 +1460,8 @@ html_tokenizer_blocking_get_name (HTMLTokenizer *t)
}
static void
-html_tokenizer_blocking_push (HTMLTokenizer *t, HTMLTokenType tt)
+html_tokenizer_blocking_push (HTMLTokenizer *t,
+ HTMLTokenType tt)
{
struct _HTMLTokenizerPrivate *p = t->priv;
@@ -1463,7 +1490,8 @@ html_tokenizer_blocking_pop (HTMLTokenizer *t)
/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
void
-html_tokenizer_begin (HTMLTokenizer *t, const gchar *content_type)
+html_tokenizer_begin (HTMLTokenizer *t,
+ const gchar *content_type)
{
g_return_if_fail (t && HTML_IS_TOKENIZER (t));
@@ -1472,7 +1500,8 @@ html_tokenizer_begin (HTMLTokenizer *t, const gchar *content_type)
}
void
-html_tokenizer_set_engine_type (HTMLTokenizer *t, gboolean engine_type)
+html_tokenizer_set_engine_type (HTMLTokenizer *t,
+ gboolean engine_type)
{
g_return_if_fail (t && HTML_IS_TOKENIZER (t));
@@ -1496,7 +1525,9 @@ html_tokenizer_end (HTMLTokenizer *t)
}
void
-html_tokenizer_write (HTMLTokenizer *t, const gchar *str, gsize size)
+html_tokenizer_write (HTMLTokenizer *t,
+ const gchar *str,
+ gsize size)
{
HTMLTokenizerClass *klass;
diff --git a/gtkhtml/htmltokenizer.h b/gtkhtml/htmltokenizer.h
index 87abe65..a78453c 100644
--- a/gtkhtml/htmltokenizer.h
+++ b/gtkhtml/htmltokenizer.h
@@ -1,25 +1,25 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library.
-
- Copyright (C) 1997 Martin Jones (mjones kde org)
- Copyright (C) 1997 Torben Weis (weis kde org)
- Copyright (C) 2000 Helix Code, Inc.
- Copyright (C) 2001 Ximian, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1997 Martin Jones (mjones kde org)
+ * Copyright (C) 1997 Torben Weis (weis kde org)
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Copyright (C) 2001 Ximian, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTMLTOKENIZER_H_
diff --git a/gtkhtml/htmltype.c b/gtkhtml/htmltype.c
index c188e69..77468d7 100644
--- a/gtkhtml/htmltype.c
+++ b/gtkhtml/htmltype.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* htmltype.h
-
- Copyright (C) 1999, 2000 Helix Code, Inc.
-
- The Gnome Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The Gnome Library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the Gnome Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Ettore Perazzoli <ettore comm2000 it>
+ *
+ * Copyright (C) 1999, 2000 Helix Code, Inc.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Ettore Perazzoli <ettore comm2000 it>
*/
#include <config.h>
@@ -65,7 +65,7 @@ build_type_names_table (void)
type_names = g_hash_table_new (g_str_hash, g_str_equal);
- for (t = HTML_TYPE_NONE + 1; t<HTML_NUM_TYPES; t++)
+ for (t = HTML_TYPE_NONE + 1; t < HTML_NUM_TYPES; t++)
g_hash_table_insert (type_names, (gpointer) html_type_name (t), GINT_TO_POINTER (t));
}
diff --git a/gtkhtml/htmltype.h b/gtkhtml/htmltype.h
index ff45f3d..34a2af9 100644
--- a/gtkhtml/htmltype.h
+++ b/gtkhtml/htmltype.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/* htmltype.h
-
- Copyright (C) 1999 Helix Code, Inc.
-
- The Gnome Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The Gnome Library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the Gnome Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Ettore Perazzoli <ettore comm2000 it>
+ *
+ * Copyright (C) 1999 Helix Code, Inc.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB. If not,
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Ettore Perazzoli <ettore comm2000 it>
*/
#ifndef _HTMLTYPE_H
diff --git a/gtkhtml/htmltypes.h b/gtkhtml/htmltypes.h
index 6e8c1b9..bf54133 100644
--- a/gtkhtml/htmltypes.h
+++ b/gtkhtml/htmltypes.h
@@ -1,23 +1,23 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
- Author: Radek Doulik <rodo helixcode com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ * Author: Radek Doulik <rodo helixcode com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTML_TYPES_H_
diff --git a/gtkhtml/htmlundo-action.c b/gtkhtml/htmlundo-action.c
index e8f83b1..f02cfc6 100644
--- a/gtkhtml/htmlundo-action.c
+++ b/gtkhtml/htmlundo-action.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -25,8 +25,11 @@
HTMLUndoAction *
-html_undo_action_new (const gchar *description, HTMLUndoFunc function, HTMLUndoData *data,
- guint position, guint position_after)
+html_undo_action_new (const gchar *description,
+ HTMLUndoFunc function,
+ HTMLUndoData *data,
+ guint position,
+ guint position_after)
{
HTMLUndoAction *action;
diff --git a/gtkhtml/htmlundo-action.h b/gtkhtml/htmlundo-action.h
index 2419c92..7167b99 100644
--- a/gtkhtml/htmlundo-action.h
+++ b/gtkhtml/htmlundo-action.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTML_UNDO_ACTION_H
diff --git a/gtkhtml/htmlundo.c b/gtkhtml/htmlundo.c
index 891f70d..bca72f7 100644
--- a/gtkhtml/htmlundo.c
+++ b/gtkhtml/htmlundo.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include <config.h>
@@ -36,7 +36,7 @@ struct _HTMLUndo {
HTMLUndoStack undo_used;
/* these lists are stacks containing other
- levels undo/redo after calling html_undo_level_start */
+ * levels undo/redo after calling html_undo_level_start */
GSList *undo_levels;
GSList *redo_levels;
guint level;
@@ -57,14 +57,16 @@ static void add_used_and_redo_to_undo (HTMLUndo *undo, HTMLEngine *engine);
static void level_destroy (HTMLUndoData *data);
inline static void
-stack_copy (HTMLUndoStack *src, HTMLUndoStack *dst)
+stack_copy (HTMLUndoStack *src,
+ HTMLUndoStack *dst)
{
dst->stack = src->stack;
dst->size = src->size;
}
inline static void
-stack_dup (HTMLUndoStack *src, HTMLUndoStack *dst)
+stack_dup (HTMLUndoStack *src,
+ HTMLUndoStack *dst)
{
dst->stack = g_list_copy (src->stack);
dst->size = src->size;
@@ -100,7 +102,7 @@ html_undo_new (void)
}
void
-html_undo_destroy (HTMLUndo *undo)
+html_undo_destroy (HTMLUndo *undo)
{
g_return_if_fail (undo != NULL);
@@ -123,7 +125,10 @@ html_undo_destroy (HTMLUndo *undo)
static void
-action_do_and_destroy_redo (HTMLEngine *engine, HTMLUndo *undo, GList **stack, HTMLUndoDirection dir)
+action_do_and_destroy_redo (HTMLEngine *engine,
+ HTMLUndo *undo,
+ GList **stack,
+ HTMLUndoDirection dir)
{
HTMLUndoAction *action;
GList *first;
@@ -148,7 +153,9 @@ action_do_and_destroy_redo (HTMLEngine *engine, HTMLUndo *undo, GList **stack, H
}
static void
-action_do_and_destroy_undo (HTMLEngine *engine, HTMLUndo *undo, HTMLUndoDirection dir)
+action_do_and_destroy_undo (HTMLEngine *engine,
+ HTMLUndo *undo,
+ HTMLUndoDirection dir)
{
HTMLUndoAction *action;
GList *first;
@@ -171,7 +178,7 @@ action_do_and_destroy_undo (HTMLEngine *engine, HTMLUndo *undo, HTMLUndoDirectio
void
html_undo_do_undo (HTMLUndo *undo,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
g_return_if_fail (undo != NULL);
g_return_if_fail (engine != NULL);
@@ -201,7 +208,7 @@ html_undo_do_undo (HTMLUndo *undo,
void
html_undo_do_redo (HTMLUndo *undo,
- HTMLEngine *engine)
+ HTMLEngine *engine)
{
g_return_if_fail (undo != NULL);
g_return_if_fail (engine != NULL);
@@ -251,7 +258,9 @@ html_undo_discard_redo (HTMLUndo *undo)
}
void
-html_undo_add_undo_action (HTMLUndo *undo, HTMLEngine *engine, HTMLUndoAction *action)
+html_undo_add_undo_action (HTMLUndo *undo,
+ HTMLEngine *engine,
+ HTMLUndoAction *action)
{
g_return_if_fail (undo != NULL);
g_return_if_fail (action != NULL);
@@ -295,8 +304,8 @@ html_undo_add_undo_action (HTMLUndo *undo, HTMLEngine *engine, HTMLUndoAction *
}
void
-html_undo_add_redo_action (HTMLUndo *undo,
- HTMLUndoAction *action)
+html_undo_add_redo_action (HTMLUndo *undo,
+ HTMLUndoAction *action)
{
g_return_if_fail (undo != NULL);
g_return_if_fail (action != NULL);
@@ -309,7 +318,10 @@ html_undo_add_redo_action (HTMLUndo *undo,
}
void
-html_undo_add_action (HTMLUndo *undo, HTMLEngine *engine, HTMLUndoAction *action, HTMLUndoDirection dir)
+html_undo_add_action (HTMLUndo *undo,
+ HTMLEngine *engine,
+ HTMLUndoAction *action,
+ HTMLUndoDirection dir)
{
if (undo->freeze_count > 0)
return;
@@ -321,33 +333,33 @@ html_undo_add_action (HTMLUndo *undo, HTMLEngine *engine, HTMLUndoAction *actio
}
void
-html_undo_freeze (HTMLUndo *undo)
+html_undo_freeze (HTMLUndo *undo)
{
undo->freeze_count++;
}
void
-html_undo_thaw (HTMLUndo *undo)
+html_undo_thaw (HTMLUndo *undo)
{
undo->freeze_count--;
}
/*
- undo levels
-
- * IDEA: it closes number of undo steps into one
- * examples: paste
- - it first cuts active selection and then inserts objects
- from cut_buffer on actual cursor position
- - if you don't use udo levels, it will generate two undo steps/actions
- replace
- - replace uses paste operation, so when it replaces N occurences,
- it generates 2*N steps (without using undo levels in paste and replace)
-
- * usage is simple - just call html_undo_level_begin before using functions with undo
- and html_undo_level_end after them
-
-*/
+ * undo levels
+ *
+ * IDEA: it closes number of undo steps into one
+ * examples: paste
+ * - it first cuts active selection and then inserts objects
+ * from cut_buffer on actual cursor position
+ * - if you don't use udo levels, it will generate two undo
+ * steps/actions replace
+ * - replace uses paste operation, so when it replaces N occurences,
+ * it generates 2*N steps (without using undo levels in paste and
+ * replace)
+ *
+ * usage is simple - just call html_undo_level_begin before using functions
+ * with undo and html_undo_level_end after them
+ */
#define HTML_UNDO_LEVEL(x) ((HTMLUndoLevel *) x)
struct _HTMLUndoLevel {
@@ -381,7 +393,10 @@ level_destroy (HTMLUndoData *data)
}
static HTMLUndoLevel *
-level_new (HTMLUndo *undo, HTMLUndoStack *stack, const gchar *undo_description, const gchar *redo_description)
+level_new (HTMLUndo *undo,
+ HTMLUndoStack *stack,
+ const gchar *undo_description,
+ const gchar *redo_description)
{
HTMLUndoLevel *nl = g_new (HTMLUndoLevel, 1);
@@ -398,7 +413,9 @@ level_new (HTMLUndo *undo, HTMLUndoStack *stack, const gchar *undo_description,
}
void
-html_undo_level_begin (HTMLUndo *undo, const gchar *undo_desription, const gchar *redo_desription)
+html_undo_level_begin (HTMLUndo *undo,
+ const gchar *undo_desription,
+ const gchar *redo_desription)
{
undo->undo_levels = g_slist_prepend (undo->undo_levels, level_new (undo, &undo->undo,
undo_desription, redo_desription));
@@ -409,7 +426,9 @@ html_undo_level_begin (HTMLUndo *undo, const gchar *undo_desription, const gchar
}
static void
-redo_level_begin (HTMLUndo *undo, const gchar *redo_desription, const gchar *undo_desription)
+redo_level_begin (HTMLUndo *undo,
+ const gchar *redo_desription,
+ const gchar *undo_desription)
{
undo->redo_levels = g_slist_prepend (undo->redo_levels, level_new (undo, &undo->redo,
undo_desription, redo_desription));
@@ -465,7 +484,8 @@ redo_level_end (HTMLUndo *undo)
}
void
-html_undo_level_end (HTMLUndo *undo, HTMLEngine *engine)
+html_undo_level_end (HTMLUndo *undo,
+ HTMLEngine *engine)
{
HTMLUndoLevel *level;
HTMLUndoStack save_undo;
@@ -509,7 +529,10 @@ html_undo_level_end (HTMLUndo *undo, HTMLEngine *engine)
}
static void
-undo_step_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guint position_after)
+undo_step_action (HTMLEngine *e,
+ HTMLUndoData *data,
+ HTMLUndoDirection dir,
+ guint position_after)
{
HTMLUndo *undo;
HTMLUndoLevel *level;
@@ -552,7 +575,7 @@ undo_step_action (HTMLEngine *e, HTMLUndoData *data, HTMLUndoDirection dir, guin
}
void
-html_undo_data_init (HTMLUndoData *data)
+html_undo_data_init (HTMLUndoData *data)
{
data->ref_count = 1;
data->destroy = NULL;
@@ -588,7 +611,8 @@ html_undo_direction_reverse (HTMLUndoDirection dir)
}
static void
-add_used_and_redo_to_undo (HTMLUndo *undo, HTMLEngine *engine)
+add_used_and_redo_to_undo (HTMLUndo *undo,
+ HTMLEngine *engine)
{
GList *stack;
GList *cur;
@@ -616,7 +640,9 @@ add_used_and_redo_to_undo (HTMLUndo *undo, HTMLEngine *engine)
#ifdef UNDO_DEBUG
static void
-print_stack (GList *stack, guint size, gint l)
+print_stack (GList *stack,
+ guint size,
+ gint l)
{
gint i;
diff --git a/gtkhtml/htmlundo.h b/gtkhtml/htmlundo.h
index c0dce18..6cd8352 100644
--- a/gtkhtml/htmlundo.h
+++ b/gtkhtml/htmlundo.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* This file is part of the GtkHTML library
-
- Copyright (C) 2000 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHcANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifndef _HTML_UNDO_H
diff --git a/gtkhtml/htmlurl.c b/gtkhtml/htmlurl.c
index e5aca17..057ba5b 100644
--- a/gtkhtml/htmlurl.c
+++ b/gtkhtml/htmlurl.c
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* htmlurl.c
-
- Copyright (C) 1999 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Ettore Perazzoli (ettore helixcode com) */
+ *
+ * Copyright (C) 1999 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Ettore Perazzoli (ettore helixcode com) */
#include <config.h>
#include <stdio.h>
@@ -38,7 +38,8 @@ strdup_nonempty_or_null (const gchar *s)
}
static gchar *
-strndup_nonempty_or_null (const gchar *s, guint n)
+strndup_nonempty_or_null (const gchar *s,
+ guint n)
{
if (n == 0)
return NULL;
@@ -50,7 +51,8 @@ strndup_nonempty_or_null (const gchar *s, guint n)
}
static const gchar *
-scan_host_info (HTMLURL *url, const gchar *s)
+scan_host_info (HTMLURL *url,
+ const gchar *s)
{
const gchar *slash_ptr;
const gchar *at_ptr;
@@ -138,7 +140,7 @@ html_url_new (const gchar *s)
/* Scan for the protocol part. */
/* FIXME I am assuming that the correct regexp for detecting it is
- `^[a-zA-Z0-9]:'. */
+ * `^[a-zA-Z0-9]:'. */
p = s;
while ((*p >= 'a' && *p <= 'z')
@@ -222,7 +224,8 @@ html_url_destroy (HTMLURL *url)
}
HTMLURL *
-html_url_dup (const HTMLURL *url, HTMLURLDupFlags flags)
+html_url_dup (const HTMLURL *url,
+ HTMLURLDupFlags flags)
{
HTMLURL *new;
gchar *ptr;
@@ -297,7 +300,8 @@ SET_STR_FUNC (path)
SET_STR_FUNC (reference)
void
-html_url_set_port (HTMLURL *url, gushort port)
+html_url_set_port (HTMLURL *url,
+ gushort port)
{
g_return_if_fail (url != NULL);
@@ -447,7 +451,7 @@ html_url_to_string (const HTMLURL *url)
}
/* Notice that the `path' part is always supposed to start with a
- slash, so we don't need to append the slash here. */
+ * slash, so we don't need to append the slash here. */
if (path_length != 0)
APPEND_MEMBER (path);
@@ -469,7 +473,8 @@ html_url_to_string (const HTMLURL *url)
#define PATH_SEP_STR "/"
static gchar *
-concat_dir_and_file (const gchar *dir, const gchar *file)
+concat_dir_and_file (const gchar *dir,
+ const gchar *file)
{
/* If the directory name doesn't have a / on the end, we need
to add one so we get a proper path to the file */
@@ -481,7 +486,7 @@ concat_dir_and_file (const gchar *dir, const gchar *file)
HTMLURL *
html_url_append_path (const HTMLURL *url,
- const gchar *path)
+ const gchar *path)
{
HTMLURL *new;
gchar *new_path, *tmppath, *ptr;
@@ -504,7 +509,7 @@ html_url_append_path (const HTMLURL *url,
i = strlen (tmppath);
/* Remove first '/' from the right */
- while (i && tmppath[i-1] != '/')
+ while (i && tmppath[i - 1] != '/')
i--;
if (i)
diff --git a/gtkhtml/htmlurl.h b/gtkhtml/htmlurl.h
index c8e7642..774f3a1 100644
--- a/gtkhtml/htmlurl.h
+++ b/gtkhtml/htmlurl.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* htmlurl.h
-
- Copyright (C) 1999 Helix Code, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- Author: Ettore Perazzoli (ettore helixcode com)
+ *
+ * Copyright (C) 1999 Helix Code, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * Author: Ettore Perazzoli (ettore helixcode com)
*/
#ifndef _HTMLURL_H
diff --git a/gtkhtml/test-stress.c b/gtkhtml/test-stress.c
index d86a183..41d07d5 100644
--- a/gtkhtml/test-stress.c
+++ b/gtkhtml/test-stress.c
@@ -37,7 +37,8 @@ static HTMLGdkPainter *gdk_painter = NULL;
static HTMLGdkPainter *plain_painter = NULL;
static void
-set_format (GtkHTML *html, gboolean format_html)
+set_format (GtkHTML *html,
+ gboolean format_html)
{
HTMLGdkPainter *p, *old_p;
@@ -86,11 +87,11 @@ static gint test_level_1 (GtkHTML *html)
srand (2);
for (i = 0; i < 200; i++) {
- gint j, len = 1 + (gint) (10.0*rand ()/(RAND_MAX+1.0));
+ gint j, len = 1 + (gint) (10.0 * rand () / (RAND_MAX + 1.0));
gchar word[12];
for (j = 0; j < len; j++)
- word[j] = 'a' + (gint) (26.0*rand ()/(RAND_MAX+1.0));
+ word[j] = 'a' + (gint) (26.0 * rand () / (RAND_MAX + 1.0));
word[len] = ' ';
word[len + 1] = 0;
total_len += len + 1;
@@ -107,12 +108,12 @@ static gint test_level_1 (GtkHTML *html)
for (i = 0; i < 1000; i++) {
gint j, new_pos, pos, len;
- len = 1 + (gint) (120.0*rand ()/(RAND_MAX+1.0));
- pos = MAX (0, (gint) (((double) (total_len - len))*rand ()/(RAND_MAX+1.0)));
+ len = 1 + (gint) (120.0 * rand () / (RAND_MAX + 1.0));
+ pos = MAX (0, (gint) (((double) (total_len - len)) * rand () / (RAND_MAX + 1.0)));
printf ("step: %d pos: %d len: %d\n", i, pos, len);
- switch ((gint) (10.0*rand ()/(RAND_MAX+1.0))) {
+ switch ((gint) (10.0 * rand () / (RAND_MAX + 1.0))) {
case 0:
/* cut'n'paste */
printf ("cut'n'paste\n");
@@ -121,7 +122,7 @@ static gint test_level_1 (GtkHTML *html)
html_cursor_jump_to_position (html->engine->cursor, html->engine, pos + len);
html_engine_cut (html->engine);
- new_pos = (gint) (((double) (total_len - len))*rand ()/(RAND_MAX+1.0));
+ new_pos = (gint) (((double) (total_len - len)) * rand () / (RAND_MAX + 1.0));
html_cursor_jump_to_position (html->engine->cursor, html->engine, new_pos);
html_engine_paste (html->engine);
@@ -131,7 +132,7 @@ static gint test_level_1 (GtkHTML *html)
printf ("insert text\n");
html_cursor_jump_to_position (html->engine->cursor, html->engine, pos);
for (j = 0; j < len; j++) {
- gint et = (gint) (10.0*rand ()/(RAND_MAX+1.0));
+ gint et = (gint) (10.0 * rand () / (RAND_MAX + 1.0));
if (et == 0)
gtk_html_command (html, "insert-tab");
else {
@@ -140,7 +141,7 @@ static gint test_level_1 (GtkHTML *html)
if (et == 1)
ch[0] = ' ';
else
- ch[0] = 'a' + (gint) (26.0*rand ()/(RAND_MAX+1.0));
+ ch[0] = 'a' + (gint) (26.0 * rand () / (RAND_MAX + 1.0));
ch[1] = 0;
html_engine_insert_text (html->engine, ch, 1);
}
@@ -178,7 +179,7 @@ static gint test_level_1 (GtkHTML *html)
html_cursor_jump_to_position (html->engine->cursor, html->engine, pos + len);
gtk_html_cut (html);
- new_pos = (gint) (((double) (total_len - len))*rand ()/(RAND_MAX+1.0));
+ new_pos = (gint) (((double) (total_len - len)) * rand () / (RAND_MAX + 1.0));
html_cursor_jump_to_position (html->engine->cursor, html->engine, new_pos);
gtk_html_paste (html, TRUE);
@@ -186,14 +187,14 @@ static gint test_level_1 (GtkHTML *html)
case 6:
/* left */
printf ("left\n");
- for (j = 0; j < 5*len; j++) {
+ for (j = 0; j < 5 * len; j++) {
html_cursor_left (html->engine->cursor, html->engine);
}
break;
case 7:
/* right */
printf ("right\n");
- for (j = 0; j < 5*len; j++) {
+ for (j = 0; j < 5 * len; j++) {
html_cursor_right (html->engine->cursor, html->engine);
}
break;
diff --git a/gtkhtml/test-suite.c b/gtkhtml/test-suite.c
index a3528da..631d772 100644
--- a/gtkhtml/test-suite.c
+++ b/gtkhtml/test-suite.c
@@ -75,7 +75,10 @@ static void load_editable (GtkHTML *html, const gchar *s)
}
static gboolean
-plain_save_receiver (gpointer engine, const gchar *data, gsize len, gpointer user_data)
+plain_save_receiver (gpointer engine,
+ const gchar *data,
+ gsize len,
+ gpointer user_data)
{
GString *str = (GString *) user_data;
diff --git a/gtkhtml/test.c b/gtkhtml/test.c
index a9619ac..9ba9f5c 100644
--- a/gtkhtml/test.c
+++ b/gtkhtml/test.c
@@ -1,25 +1,25 @@
/* -*- mode: c; c-basic-offset: 8 -*- */
/*
- This file is part of the GuileRepl library
-
- Copyright 2001 Ariel Rios <ariel linuxppc org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
+ * This file is part of the GuileRepl library
+ *
+ * Copyright 2001 Ariel Rios <ariel linuxppc org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
*/
#include <sys/types.h>
#include <sys/stat.h>
@@ -59,7 +59,10 @@ static const gchar *welcome =
"Japanese <span lang=\"ja\">åæ éç<BR></FONT>";
static void
-url_requested (GtkHTML *unused, const gchar *url, GtkHTMLStream *stream, gpointer data)
+url_requested (GtkHTML *unused,
+ const gchar *url,
+ GtkHTMLStream *stream,
+ gpointer data)
{
gint fd;
gchar *filename;
@@ -110,7 +113,8 @@ encode_html (const gchar *txt)
}
static void
-example_changed_cb (GtkComboBox *combo_box, gpointer data)
+example_changed_cb (GtkComboBox *combo_box,
+ gpointer data)
{
gint i = gtk_combo_box_get_active (combo_box);
Example *example = examples->pdata[i];
@@ -132,7 +136,8 @@ quit_cb (GtkWidget *button)
}
static void
-dump_cb (GtkWidget *widget, gpointer data)
+dump_cb (GtkWidget *widget,
+ gpointer data)
{
g_print ("Object Tree\n");
g_print ("-----------\n");
@@ -141,7 +146,8 @@ dump_cb (GtkWidget *widget, gpointer data)
}
static void
-dump_simple_cb (GtkWidget *widget, gpointer data)
+dump_simple_cb (GtkWidget *widget,
+ gpointer data)
{
g_print ("Simple Object Tree\n");
g_print ("-----------\n");
@@ -150,14 +156,17 @@ dump_simple_cb (GtkWidget *widget, gpointer data)
}
static void
-draw_page_cb (GtkPrintOperation *operation, GtkPrintContext *context,
- gint page_nr, gpointer user_data)
+draw_page_cb (GtkPrintOperation *operation,
+ GtkPrintContext *context,
+ gint page_nr,
+ gpointer user_data)
{
gtk_html_print_page (GTK_HTML (html), context);
}
static void
-print_cb (GtkWidget *widget, gpointer data)
+print_cb (GtkWidget *widget,
+ gpointer data)
{
GtkPrintOperation *operation;
@@ -180,7 +189,7 @@ print_cb (GtkWidget *widget, gpointer data)
*/
static gint
compare_examples (gconstpointer a,
- gconstpointer b)
+ gconstpointer b)
{
const Example *example_a = *(const Example *const *) a;
const Example *example_b = *(const Example *const *) b;
@@ -311,7 +320,8 @@ find_examples (void)
}
gint
-main (gint argc, gchar **argv)
+main (gint argc,
+ gchar **argv)
{
GtkWidget *window;
GtkWidget *vbox;
diff --git a/gtkhtml/testgtkhtml.c b/gtkhtml/testgtkhtml.c
index 7de67ca..5e6fec5 100644
--- a/gtkhtml/testgtkhtml.c
+++ b/gtkhtml/testgtkhtml.c
@@ -1,19 +1,19 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#include "config.h"
@@ -203,7 +203,8 @@ static const gchar *ui_info =
/* find examples*/
static void
-example_changed_cb (GtkComboBox *combo_box, gpointer data)
+example_changed_cb (GtkComboBox *combo_box,
+ gpointer data)
{
gint i = gtk_combo_box_get_active (combo_box);
Example *example = examples->pdata[i];
@@ -219,7 +220,7 @@ example_changed_cb (GtkComboBox *combo_box, gpointer data)
*/
static gint
compare_examples (gconstpointer a,
- gconstpointer b)
+ gconstpointer b)
{
const Example *example_a = *(const Example *const *) a;
const Example *example_b = *(const Example *const *) b;
@@ -476,8 +477,13 @@ static gint page_num, pages;
static PangoLayout *layout;
static void
-print_footer (GtkHTML *html, GtkPrintContext *context, gdouble x, gdouble y,
- gdouble width, gdouble height, gpointer user_data)
+print_footer (GtkHTML *html,
+ GtkPrintContext *context,
+ gdouble x,
+ gdouble y,
+ gdouble width,
+ gdouble height,
+ gpointer user_data)
{
gchar *text;
cairo_t *cr;
@@ -498,8 +504,10 @@ print_footer (GtkHTML *html, GtkPrintContext *context, gdouble x, gdouble y,
}
static void
-draw_page_cb (GtkPrintOperation *operation, GtkPrintContext *context,
- gint page_nr, gpointer user_data)
+draw_page_cb (GtkPrintOperation *operation,
+ GtkPrintContext *context,
+ gint page_nr,
+ gpointer user_data)
{
/* XXX GtkHTML's printing API doesn't really fit well with GtkPrint.
* Instead of calling a function for each page, GtkHTML prints
@@ -537,7 +545,7 @@ draw_page_cb (GtkPrintOperation *operation, GtkPrintContext *context,
static void
print_preview_cb (GtkWidget *widget,
- gpointer data)
+ gpointer data)
{
GtkPrintOperation *operation;
@@ -555,7 +563,8 @@ print_preview_cb (GtkWidget *widget,
}
static void
-dump_cb (GtkWidget *widget, gpointer data)
+dump_cb (GtkWidget *widget,
+ gpointer data)
{
g_print ("Object Tree\n");
g_print ("-----------\n");
@@ -564,7 +573,8 @@ dump_cb (GtkWidget *widget, gpointer data)
}
static void
-dump_simple_cb (GtkWidget *widget, gpointer data)
+dump_simple_cb (GtkWidget *widget,
+ gpointer data)
{
g_print ("Simple Object Tree\n");
g_print ("-----------\n");
@@ -573,34 +583,40 @@ dump_simple_cb (GtkWidget *widget, gpointer data)
}
static void
-resize_cb (GtkWidget *widget, gpointer data)
+resize_cb (GtkWidget *widget,
+ gpointer data)
{
g_print ("forcing resize\n");
html_engine_calc_size (html->engine, NULL);
}
static void
-select_all_cb (GtkWidget *widget, gpointer data)
+select_all_cb (GtkWidget *widget,
+ gpointer data)
{
g_print ("select all\n");
gtk_html_select_all (html);
}
static void
-redraw_cb (GtkWidget *widget, gpointer data)
+redraw_cb (GtkWidget *widget,
+ gpointer data)
{
g_print ("forcing redraw\n");
gtk_widget_queue_draw (GTK_WIDGET (html));
}
static void
-animate_cb (GtkToggleButton *togglebutton, gpointer data)
+animate_cb (GtkToggleButton *togglebutton,
+ gpointer data)
{
gtk_html_set_animate (html, !gtk_toggle_button_get_mode (togglebutton));
}
static void
-title_changed_cb (GtkHTML *html, const gchar *title, gpointer data)
+title_changed_cb (GtkHTML *html,
+ const gchar *title,
+ gpointer data)
{
gchar *s;
@@ -610,7 +626,8 @@ title_changed_cb (GtkHTML *html, const gchar *title, gpointer data)
}
static void
-entry_goto_url (GtkWidget *widget, gpointer data)
+entry_goto_url (GtkWidget *widget,
+ gpointer data)
{
gchar *tmpurl;
@@ -632,13 +649,15 @@ entry_goto_url (GtkWidget *widget, gpointer data)
}
static void
-home_cb (GtkWidget *widget, gpointer data)
+home_cb (GtkWidget *widget,
+ gpointer data)
{
goto_url("http://www.gnome.org";, 0);
}
static void
-back_cb (GtkWidget *widget, gpointer data)
+back_cb (GtkWidget *widget,
+ gpointer data)
{
go_item *item;
@@ -661,7 +680,8 @@ back_cb (GtkWidget *widget, gpointer data)
}
static void
-forward_cb (GtkWidget *widget, gpointer data)
+forward_cb (GtkWidget *widget,
+ gpointer data)
{
go_item *item;
@@ -683,7 +703,8 @@ forward_cb (GtkWidget *widget, gpointer data)
}
static void
-reload_cb (GtkWidget *widget, gpointer data)
+reload_cb (GtkWidget *widget,
+ gpointer data)
{
go_item *item;
@@ -694,7 +715,8 @@ reload_cb (GtkWidget *widget, gpointer data)
}
static void
-stop_cb (GtkWidget *widget, gpointer data)
+stop_cb (GtkWidget *widget,
+ gpointer data)
{
/* Kill all requests */
soup_session_abort (session);
@@ -705,14 +727,15 @@ static void
load_done (GtkHTML *html)
{
/* TODO2 animator stop
-
+ *
if (exit_when_done)
gtk_main_quit ();
*/
}
static gint
-on_button_press_event (GtkWidget *widget, GdkEventButton *event)
+on_button_press_event (GtkWidget *widget,
+ GdkEventButton *event)
{
GtkMenu *menu;
@@ -734,7 +757,9 @@ on_button_press_event (GtkWidget *widget, GdkEventButton *event)
}
static void
-on_set_base (GtkHTML *html, const gchar *url, gpointer data)
+on_set_base (GtkHTML *html,
+ const gchar *url,
+ gpointer data)
{
gtk_entry_set_text (GTK_ENTRY (entry), url);
if (baseURL)
@@ -750,47 +775,60 @@ on_set_base (GtkHTML *html, const gchar *url, gpointer data)
static gboolean
redirect_timer_event (gpointer data) {
g_print("Redirecting to '%s' NOW\n", redirect_url);
- goto_url (redirect_url, 0);
+ goto_url (redirect_url,
+ 0);
/* OBS: redirect_url is freed in goto_url */
- return FALSE;
+ return FALSE;
}
static void
-on_redirect (GtkHTML *html, const gchar *url, gint delay, gpointer data) {
+on_redirect (GtkHTML *html,
+ const gchar *url,
+ gint delay,
+ gpointer data) {
g_print("Redirecting to '%s' in %d seconds\n", url, delay);
- if (redirect_timerId == 0) {
+ if (redirect_timerId == 0) {
- redirect_url = g_strdup (url);
+ redirect_url = g_strdup (url);
- redirect_timerId = g_timeout_add (delay * 1000,(GSourceFunc) redirect_timer_event, NULL);
- }
+ redirect_timerId = g_timeout_add (delay *1000,(GSourceFunc) redirect_timer_event,
+ NULL);
+ }
}
static void
-on_submit (GtkHTML *html, const gchar *method, const gchar *action, const gchar *encoding, gpointer data) {
- GString *tmpstr = g_string_new (action);
+on_submit (GtkHTML *html,
+ const gchar *method,
+ const gchar *action,
+ const gchar *encoding,
+ gpointer data) {
+ GString *tmpstr = g_string_new (action);
g_print("submitting '%s' to '%s' using method '%s'\n", encoding, action, method);
if (g_ascii_strcasecmp(method, "GET") == 0) {
- tmpstr = g_string_append_c (tmpstr, '?');
- tmpstr = g_string_append (tmpstr, encoding);
+ tmpstr = g_string_append_c (tmpstr, '?');
+ tmpstr = g_string_append (tmpstr,
+ encoding);
- goto_url (tmpstr->str, 0);
+ goto_url (tmpstr->str,
+ 0);
- g_string_free (tmpstr, TRUE);
- } else {
+ g_string_free (tmpstr,
+ TRUE);
+ } else {
g_warning ("Unsupported submit method '%s'\n", method);
- }
+ }
}
static void
-change_status_bar (GtkStatusbar * statusbar, const gchar * text)
+change_status_bar (GtkStatusbar *statusbar,
+ const gchar *text)
{
gchar *msg;
@@ -809,13 +847,17 @@ change_status_bar (GtkStatusbar * statusbar, const gchar * text)
}
static void
-on_url (GtkHTML *html, const gchar *url, gpointer data)
+on_url (GtkHTML *html,
+ const gchar *url,
+ gpointer data)
{
change_status_bar (GTK_STATUSBAR (statusbar), url);
}
static void
-on_link_clicked (GtkHTML *html, const gchar *url, gpointer data)
+on_link_clicked (GtkHTML *html,
+ const gchar *url,
+ gpointer data)
{
goto_url (url, 0);
}
@@ -830,7 +872,7 @@ object_timeout (GtkHTMLEmbedded *eb)
gtk_widget_show (w);
printf("inserting custom widget after a delay ...\n");
- gtk_html_embedded_set_descent (eb, rand ()%8);
+ gtk_html_embedded_set_descent (eb, rand () % 8);
gtk_container_add (GTK_CONTAINER (eb), w);
g_object_unref (eb);
@@ -838,7 +880,9 @@ object_timeout (GtkHTMLEmbedded *eb)
}
static gboolean
-object_requested_cmd (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
+object_requested_cmd (GtkHTML *html,
+ GtkHTMLEmbedded *eb,
+ gpointer data)
{
/* printf("object requested, wiaint a bit before creating it ...\n"); */
@@ -853,7 +897,9 @@ object_requested_cmd (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
}
static void
-got_data (SoupSession *session, SoupMessage *msg, gpointer user_data)
+got_data (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
const gchar *ContentType;
GtkHTMLStream *handle = user_data;
@@ -877,7 +923,10 @@ got_data (SoupSession *session, SoupMessage *msg, gpointer user_data)
}
static void
-url_requested (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data)
+url_requested (GtkHTML *html,
+ const gchar *url,
+ GtkHTMLStream *handle,
+ gpointer data)
{
gchar *full_url = NULL;
@@ -893,7 +942,7 @@ url_requested (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer
gchar *buf;
gint fd, nread, total;
- fd = g_open (filename, O_RDONLY|O_BINARY, 0);
+ fd = g_open (filename, O_RDONLY | O_BINARY, 0);
g_free (filename);
if (fd != -1 && fstat (fd, &st) != -1) {
buf = g_malloc (st.st_size);
@@ -985,7 +1034,8 @@ parse_href (const gchar *s)
}
static void
-go_list_cb (GtkWidget *widget, gpointer data)
+go_list_cb (GtkWidget *widget,
+ gpointer data)
{
go_item *item;
gint num;
@@ -1027,7 +1077,8 @@ static void remove_go_list (gpointer data, gpointer user_data) {
}
static void
-goto_url (const gchar *url, gint back_or_forward)
+goto_url (const gchar *url,
+ gint back_or_forward)
{
gint tmp, i;
go_item *item;
@@ -1104,7 +1155,7 @@ goto_url (const gchar *url, gint back_or_forward)
tmp = g_list_length (go_list);
group = NULL;
- for (i=0;i<tmp;i++) {
+ for (i = 0; i < tmp; i++) {
item = g_list_nth_data (go_list, i);
item->widget = gtk_radio_menu_item_new_with_label (group, item->url);
@@ -1141,7 +1192,8 @@ goto_url (const gchar *url, gint back_or_forward)
}
static void
-bug_cb (GtkWidget *widget, gpointer data)
+bug_cb (GtkWidget *widget,
+ gpointer data)
{
gchar *cwd, *filename, *url;
@@ -1155,13 +1207,16 @@ bug_cb (GtkWidget *widget, gpointer data)
}
static void
-exit_cb (GtkWidget *widget, gpointer data)
+exit_cb (GtkWidget *widget,
+ gpointer data)
{
gtk_main_quit ();
}
static gboolean
-motion_notify_event (GtkHTML *html, GdkEventMotion *event, gpointer data)
+motion_notify_event (GtkHTML *html,
+ GdkEventMotion *event,
+ gpointer data)
{
const gchar *id;
@@ -1173,7 +1228,8 @@ motion_notify_event (GtkHTML *html, GdkEventMotion *event, gpointer data)
}
gint
-main (gint argc, gchar *argv[])
+main (gint argc,
+ gchar *argv[])
{
GtkWidget *app, *bar, *main_table;
GtkWidget *html_widget;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
