[libchamplain] Indentation fixes
- From: Jiří Techet <jiritechet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libchamplain] Indentation fixes
- Date: Thu, 24 Mar 2011 23:13:12 +0000 (UTC)
commit 3cf7dfbbe9163e71e1f3cd51b2c8d8f474c5abd5
Author: JiÅ?Ã Techet <techet gmail com>
Date: Sun Mar 20 00:23:52 2011 +0100
Indentation fixes
champlain-gtk/gtk-champlain-embed.c | 8 +-
champlain/champlain-adjustment.c | 321 ++++++++++++-----------
champlain/champlain-adjustment.h | 87 +++---
champlain/champlain-bounding-box.c | 28 +-
champlain/champlain-bounding-box.h | 3 +-
champlain/champlain-coordinate.c | 51 ++--
champlain/champlain-coordinate.h | 2 +-
champlain/champlain-custom-marker.c | 73 +++---
champlain/champlain-custom-marker.h | 2 +-
champlain/champlain-file-cache.c | 78 +++---
champlain/champlain-file-tile-source.c | 20 +-
champlain/champlain-group.c | 120 +++++----
champlain/champlain-group.h | 58 ++--
champlain/champlain-image-renderer.c | 2 +-
champlain/champlain-kinetic-scroll-view.c | 340 +++++++++++++-----------
champlain/champlain-kinetic-scroll-view.h | 14 +-
champlain/champlain-label.c | 14 +-
champlain/champlain-layer.c | 6 +-
champlain/champlain-layer.h | 2 +-
champlain/champlain-license.c | 33 ++--
champlain/champlain-location.c | 15 +-
champlain/champlain-location.h | 12 +-
champlain/champlain-map-source-chain.c | 6 +-
champlain/champlain-map-source-desc.c | 54 ++--
champlain/champlain-map-source-desc.h | 22 +-
champlain/champlain-map-source-factory.c | 295 ++++++++++----------
champlain/champlain-map-source.c | 36 ++--
champlain/champlain-marker-layer.c | 117 ++++----
champlain/champlain-marker-layer.h | 2 +-
champlain/champlain-marker.c | 183 +++++++-------
champlain/champlain-memory-cache.c | 28 +-
champlain/champlain-memphis-renderer.c | 6 +-
champlain/champlain-memphis-renderer.h | 12 +-
champlain/champlain-network-bbox-tile-source.c | 58 ++--
champlain/champlain-network-tile-source.c | 61 ++---
champlain/champlain-null-tile-source.c | 5 +-
champlain/champlain-path-layer.c | 105 ++++----
champlain/champlain-path-layer.h | 4 +-
champlain/champlain-point.c | 36 ++--
champlain/champlain-point.h | 2 +-
champlain/champlain-renderer.c | 2 +-
champlain/champlain-scale.c | 37 ++--
champlain/champlain-scale.h | 2 +-
champlain/champlain-tile-source.c | 86 +++---
champlain/champlain-tile.c | 24 +-
champlain/champlain-view.c | 151 ++++++------
champlain/champlain-view.h | 14 +-
champlain/champlain-viewport.c | 267 ++++++++++---------
champlain/champlain-viewport.h | 36 ++--
49 files changed, 1506 insertions(+), 1434 deletions(-)
---
diff --git a/champlain-gtk/gtk-champlain-embed.c b/champlain-gtk/gtk-champlain-embed.c
index 4462508..00951ee 100644
--- a/champlain-gtk/gtk-champlain-embed.c
+++ b/champlain-gtk/gtk-champlain-embed.c
@@ -251,11 +251,11 @@ gtk_champlain_embed_init (GtkChamplainEmbed *embed)
static void
gdk_to_clutter_color (GdkColor *gtk_color,
- ClutterColor *color)
+ ClutterColor *color)
{
- color->red = CLAMP (((gtk_color->red / 65535.0) * 255), 0, 255);
+ color->red = CLAMP (((gtk_color->red / 65535.0) * 255), 0, 255);
color->green = CLAMP (((gtk_color->green / 65535.0) * 255), 0, 255);
- color->blue = CLAMP (((gtk_color->blue / 65535.0) * 255), 0, 255);
+ color->blue = CLAMP (((gtk_color->blue / 65535.0) * 255), 0, 255);
color->alpha = 255;
}
@@ -267,7 +267,7 @@ view_realize_cb (GtkWidget *widget,
ClutterColor color = { 0, 0, 0, };
GtkChamplainEmbedPrivate *priv = view->priv;
GtkStyle *style;
-
+
/* Setup mouse cursor to a hand */
gdk_window_set_cursor (gtk_widget_get_window (priv->clutter_embed), priv->cursor_hand_open);
diff --git a/champlain/champlain-adjustment.c b/champlain/champlain-adjustment.c
index 766f5c1..56d1fd6 100644
--- a/champlain/champlain-adjustment.c
+++ b/champlain/champlain-adjustment.c
@@ -46,12 +46,12 @@ struct _ChamplainAdjustmentPrivate
/* For interpolation */
ClutterTimeline *interpolation;
- gdouble dx;
- gdouble old_position;
- gdouble new_position;
+ gdouble dx;
+ gdouble old_position;
+ gdouble new_position;
/* For elasticity */
- gboolean elastic;
+ gboolean elastic;
ClutterAlpha *bounce_alpha;
};
@@ -78,22 +78,22 @@ enum
static guint signals[LAST_SIGNAL] = { 0, };
-static void champlain_adjustment_set_lower (ChamplainAdjustment *adjustment,
- gdouble lower);
-static void champlain_adjustment_set_upper (ChamplainAdjustment *adjustment,
- gdouble upper);
+static void champlain_adjustment_set_lower (ChamplainAdjustment *adjustment,
+ gdouble lower);
+static void champlain_adjustment_set_upper (ChamplainAdjustment *adjustment,
+ gdouble upper);
static void champlain_adjustment_set_step_increment (ChamplainAdjustment *adjustment,
- gdouble step);
+ gdouble step);
static void champlain_adjustment_set_page_increment (ChamplainAdjustment *adjustment,
- gdouble page);
-static void champlain_adjustment_set_page_size (ChamplainAdjustment *adjustment,
- gdouble size);
+ gdouble page);
+static void champlain_adjustment_set_page_size (ChamplainAdjustment *adjustment,
+ gdouble size);
static void
-champlain_adjustment_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+champlain_adjustment_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
ChamplainAdjustmentPrivate *priv = CHAMPLAIN_ADJUSTMENT (object)->priv;
@@ -133,11 +133,12 @@ champlain_adjustment_get_property (GObject *object,
}
}
+
static void
-champlain_adjustment_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+champlain_adjustment_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
ChamplainAdjustment *adj = CHAMPLAIN_ADJUSTMENT (object);
@@ -177,10 +178,12 @@ champlain_adjustment_set_property (GObject *object,
}
}
+
static void
stop_interpolation (ChamplainAdjustment *adjustment)
{
ChamplainAdjustmentPrivate *priv = adjustment->priv;
+
if (priv->interpolation)
{
clutter_timeline_stop (priv->interpolation);
@@ -195,20 +198,23 @@ stop_interpolation (ChamplainAdjustment *adjustment)
}
}
+
void
champlain_adjustment_interpolate_stop (ChamplainAdjustment *adjustment)
{
stop_interpolation (adjustment);
}
+
static void
champlain_adjustment_dispose (GObject *object)
{
stop_interpolation (CHAMPLAIN_ADJUSTMENT (object));
-
+
G_OBJECT_CLASS (champlain_adjustment_parent_class)->dispose (object);
}
+
static void
champlain_adjustment_class_init (ChamplainAdjustmentClass *klass)
{
@@ -219,106 +225,109 @@ champlain_adjustment_class_init (ChamplainAdjustmentClass *klass)
object_class->get_property = champlain_adjustment_get_property;
object_class->set_property = champlain_adjustment_set_property;
object_class->dispose = champlain_adjustment_dispose;
-
+
g_object_class_install_property (object_class,
- PROP_LOWER,
- g_param_spec_double ("lower",
- "Lower",
- "Lower bound",
- -G_MAXDOUBLE,
- G_MAXDOUBLE,
- 0.0,
- CHAMPLAIN_PARAM_READWRITE));
+ PROP_LOWER,
+ g_param_spec_double ("lower",
+ "Lower",
+ "Lower bound",
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.0,
+ CHAMPLAIN_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_UPPER,
- g_param_spec_double ("upper",
- "Upper",
- "Upper bound",
- -G_MAXDOUBLE,
- G_MAXDOUBLE,
- 0.0,
- CHAMPLAIN_PARAM_READWRITE));
+ PROP_UPPER,
+ g_param_spec_double ("upper",
+ "Upper",
+ "Upper bound",
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.0,
+ CHAMPLAIN_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_VALUE,
- g_param_spec_double ("value",
- "Value",
- "Current value",
- -G_MAXDOUBLE,
- G_MAXDOUBLE,
- 0.0,
- CHAMPLAIN_PARAM_READWRITE));
+ PROP_VALUE,
+ g_param_spec_double ("value",
+ "Value",
+ "Current value",
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.0,
+ CHAMPLAIN_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_STEP_INC,
- g_param_spec_double ("step-increment",
- "Step Increment",
- "Step increment",
- -G_MAXDOUBLE,
- G_MAXDOUBLE,
- 0.0,
- CHAMPLAIN_PARAM_READWRITE));
+ PROP_STEP_INC,
+ g_param_spec_double ("step-increment",
+ "Step Increment",
+ "Step increment",
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.0,
+ CHAMPLAIN_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_PAGE_INC,
- g_param_spec_double ("page-increment",
- "Page Increment",
- "Page increment",
- -G_MAXDOUBLE,
- G_MAXDOUBLE,
- 0.0,
- CHAMPLAIN_PARAM_READWRITE));
+ PROP_PAGE_INC,
+ g_param_spec_double ("page-increment",
+ "Page Increment",
+ "Page increment",
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.0,
+ CHAMPLAIN_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_PAGE_SIZE,
- g_param_spec_double ("page-size",
- "Page Size",
- "Page size",
- -G_MAXDOUBLE,
- G_MAXDOUBLE,
- 0.0,
- CHAMPLAIN_PARAM_READWRITE));
+ PROP_PAGE_SIZE,
+ g_param_spec_double ("page-size",
+ "Page Size",
+ "Page size",
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.0,
+ CHAMPLAIN_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_ELASTIC,
- g_param_spec_boolean ("elastic",
- "Elastic",
- "Make interpolation "
- "behave in an "
- "'elastic' way and "
- "stop clamping value.",
- FALSE,
- CHAMPLAIN_PARAM_READWRITE));
+ PROP_ELASTIC,
+ g_param_spec_boolean ("elastic",
+ "Elastic",
+ "Make interpolation "
+ "behave in an "
+ "'elastic' way and "
+ "stop clamping value.",
+ FALSE,
+ CHAMPLAIN_PARAM_READWRITE));
signals[CHANGED] =
g_signal_new ("changed",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ChamplainAdjustmentClass, changed),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ChamplainAdjustmentClass, changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
}
+
static void
champlain_adjustment_init (ChamplainAdjustment *self)
{
self->priv = ADJUSTMENT_PRIVATE (self);
}
+
ChamplainAdjustment *
champlain_adjustment_new (gdouble value,
- gdouble lower,
- gdouble upper,
- gdouble step_increment,
- gdouble page_increment,
- gdouble page_size)
+ gdouble lower,
+ gdouble upper,
+ gdouble step_increment,
+ gdouble page_increment,
+ gdouble page_size)
{
return g_object_new (CHAMPLAIN_TYPE_ADJUSTMENT,
- "value", value,
- "lower", lower,
- "upper", upper,
- "step-increment", step_increment,
- "page-increment", page_increment,
- "page-size", page_size,
- NULL);
+ "value", value,
+ "lower", lower,
+ "upper", upper,
+ "step-increment", step_increment,
+ "page-increment", page_increment,
+ "page-size", page_size,
+ NULL);
}
+
gdouble
champlain_adjustment_get_value (ChamplainAdjustment *adjustment)
{
@@ -327,9 +336,10 @@ champlain_adjustment_get_value (ChamplainAdjustment *adjustment)
return adjustment->priv->value;
}
+
void
champlain_adjustment_set_value (ChamplainAdjustment *adjustment,
- double value)
+ double value)
{
ChamplainAdjustmentPrivate *priv;
@@ -341,7 +351,7 @@ champlain_adjustment_set_value (ChamplainAdjustment *adjustment,
if (!priv->elastic)
value = CLAMP (value, priv->lower, MAX (priv->lower,
- priv->upper - priv->page_size));
+ priv->upper - priv->page_size));
if (priv->value != value)
{
@@ -350,10 +360,11 @@ champlain_adjustment_set_value (ChamplainAdjustment *adjustment,
}
}
+
static void
champlain_adjustment_clamp_page (ChamplainAdjustment *adjustment,
- double lower,
- double upper)
+ double lower,
+ double upper)
{
gboolean changed;
ChamplainAdjustmentPrivate *priv;
@@ -385,9 +396,10 @@ champlain_adjustment_clamp_page (ChamplainAdjustment *adjustment,
g_object_notify (G_OBJECT (adjustment), "value");
}
+
static void
champlain_adjustment_set_lower (ChamplainAdjustment *adjustment,
- gdouble lower)
+ gdouble lower)
{
ChamplainAdjustmentPrivate *priv = adjustment->priv;
@@ -403,9 +415,10 @@ champlain_adjustment_set_lower (ChamplainAdjustment *adjustment,
}
}
+
static void
champlain_adjustment_set_upper (ChamplainAdjustment *adjustment,
- gdouble upper)
+ gdouble upper)
{
ChamplainAdjustmentPrivate *priv = adjustment->priv;
@@ -421,9 +434,10 @@ champlain_adjustment_set_upper (ChamplainAdjustment *adjustment,
}
}
+
static void
champlain_adjustment_set_step_increment (ChamplainAdjustment *adjustment,
- gdouble step)
+ gdouble step)
{
ChamplainAdjustmentPrivate *priv = adjustment->priv;
@@ -437,9 +451,10 @@ champlain_adjustment_set_step_increment (ChamplainAdjustment *adjustment,
}
}
+
static void
champlain_adjustment_set_page_increment (ChamplainAdjustment *adjustment,
- gdouble page)
+ gdouble page)
{
ChamplainAdjustmentPrivate *priv = adjustment->priv;
@@ -453,9 +468,10 @@ champlain_adjustment_set_page_increment (ChamplainAdjustment *adjustment,
}
}
+
static void
champlain_adjustment_set_page_size (ChamplainAdjustment *adjustment,
- gdouble size)
+ gdouble size)
{
ChamplainAdjustmentPrivate *priv = adjustment->priv;
@@ -471,14 +487,15 @@ champlain_adjustment_set_page_size (ChamplainAdjustment *adjustment,
}
}
+
void
champlain_adjustment_get_values (ChamplainAdjustment *adjustment,
- gdouble *value,
- gdouble *lower,
- gdouble *upper,
- gdouble *step_increment,
- gdouble *page_increment,
- gdouble *page_size)
+ gdouble *value,
+ gdouble *lower,
+ gdouble *upper,
+ gdouble *step_increment,
+ gdouble *page_increment,
+ gdouble *page_size)
{
ChamplainAdjustmentPrivate *priv;
@@ -505,10 +522,11 @@ champlain_adjustment_get_values (ChamplainAdjustment *adjustment,
*page_size = priv->page_size;
}
+
static void
interpolation_new_frame_cb (ClutterTimeline *timeline,
- gint frame_num,
- ChamplainAdjustment *adjustment)
+ gint frame_num,
+ ChamplainAdjustment *adjustment)
{
ChamplainAdjustmentPrivate *priv = adjustment->priv;
@@ -523,22 +541,24 @@ interpolation_new_frame_cb (ClutterTimeline *timeline,
}
else
champlain_adjustment_set_value (adjustment,
- priv->old_position +
- frame_num * priv->dx);
+ priv->old_position +
+ frame_num * priv->dx);
priv->interpolation = timeline;
}
+
static void
interpolation_completed_cb (ClutterTimeline *timeline,
- ChamplainAdjustment *adjustment)
+ ChamplainAdjustment *adjustment)
{
ChamplainAdjustmentPrivate *priv = adjustment->priv;
-
+
stop_interpolation (adjustment);
champlain_adjustment_set_value (adjustment,
- priv->new_position);
+ priv->new_position);
}
+
/* Note, there's super-optimal code that does a similar thing in
* clutter-alpha.c
*
@@ -546,26 +566,26 @@ interpolation_completed_cb (ClutterTimeline *timeline,
* better. Leaving code here in case this is revisited.
*/
/*
-static guint32
-bounce_alpha_func (ClutterAlpha *alpha,
+ static guint32
+ bounce_alpha_func (ClutterAlpha *alpha,
gpointer user_data)
-{
- gdouble progress, angle;
- ClutterTimeline *timeline = clutter_alpha_get_timeline (alpha);
-
- progress = clutter_timeline_get_progressx (timeline);
- angle = clutter_qmulx (CFX_PI_2 + CFX_PI_4/2, progress);
-
- return clutter_sinx (angle) +
+ {
+ gdouble progress, angle;
+ ClutterTimeline *timeline = clutter_alpha_get_timeline (alpha);
+
+ progress = clutter_timeline_get_progressx (timeline);
+ angle = clutter_qmulx (CFX_PI_2 + CFX_PI_4/2, progress);
+
+ return clutter_sinx (angle) +
(CFX_ONE - clutter_sinx (CFX_PI_2 + CFX_PI_4/2));
-}
-*/
+ }
+ */
void
champlain_adjustment_interpolate (ChamplainAdjustment *adjustment,
- gdouble value,
- guint n_frames,
- guint fps)
+ gdouble value,
+ guint n_frames,
+ guint fps)
{
ChamplainAdjustmentPrivate *priv = adjustment->priv;
@@ -581,42 +601,45 @@ champlain_adjustment_interpolate (ChamplainAdjustment *adjustment,
priv->new_position = value;
priv->dx = (priv->new_position - priv->old_position) * n_frames;
- priv->interpolation = clutter_timeline_new (((float)n_frames / fps) * 1000);
+ priv->interpolation = clutter_timeline_new (((float) n_frames / fps) * 1000);
if (priv->elastic)
priv->bounce_alpha = clutter_alpha_new_full (priv->interpolation,
- CLUTTER_EASE_OUT_SINE);
+ CLUTTER_EASE_OUT_SINE);
g_signal_connect (priv->interpolation,
- "new-frame",
- G_CALLBACK (interpolation_new_frame_cb),
- adjustment);
+ "new-frame",
+ G_CALLBACK (interpolation_new_frame_cb),
+ adjustment);
g_signal_connect (priv->interpolation,
- "completed",
- G_CALLBACK (interpolation_completed_cb),
- adjustment);
+ "completed",
+ G_CALLBACK (interpolation_completed_cb),
+ adjustment);
clutter_timeline_start (priv->interpolation);
}
+
gboolean
champlain_adjustment_get_elastic (ChamplainAdjustment *adjustment)
{
return adjustment->priv->elastic;
}
+
void
champlain_adjustment_set_elastic (ChamplainAdjustment *adjustment,
- gboolean elastic)
+ gboolean elastic)
{
adjustment->priv->elastic = elastic;
}
+
gboolean
champlain_adjustment_clamp (ChamplainAdjustment *adjustment,
- gboolean interpolate,
- guint n_frames,
- guint fps)
+ gboolean interpolate,
+ guint n_frames,
+ guint fps)
{
ChamplainAdjustmentPrivate *priv = adjustment->priv;
gdouble dest = priv->value;
@@ -630,9 +653,9 @@ champlain_adjustment_clamp (ChamplainAdjustment *adjustment,
{
if (interpolate)
champlain_adjustment_interpolate (adjustment,
- dest,
- n_frames,
- fps);
+ dest,
+ n_frames,
+ fps);
else
champlain_adjustment_set_value (adjustment, dest);
diff --git a/champlain/champlain-adjustment.h b/champlain/champlain-adjustment.h
index 50a7e2f..dfe0eba 100644
--- a/champlain/champlain-adjustment.h
+++ b/champlain/champlain-adjustment.h
@@ -28,16 +28,16 @@
G_BEGIN_DECLS
-#define CHAMPLAIN_TYPE_ADJUSTMENT (champlain_adjustment_get_type())
+#define CHAMPLAIN_TYPE_ADJUSTMENT (champlain_adjustment_get_type ())
#define CHAMPLAIN_ADJUSTMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_ADJUSTMENT, ChamplainAdjustment))
#define CHAMPLAIN_IS_ADJUSTMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_ADJUSTMENT))
#define CHAMPLAIN_ADJUSTMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_ADJUSTMENT, ChamplainAdjustmentClass))
#define CHAMPLAIN_IS_ADJUSTMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_ADJUSTMENT))
#define CHAMPLAIN_ADJUSTMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_ADJUSTMENT, ChamplainAdjustmentClass))
-typedef struct _ChamplainAdjustment ChamplainAdjustment;
-typedef struct _ChamplainAdjustmentPrivate ChamplainAdjustmentPrivate;
-typedef struct _ChamplainAdjustmentClass ChamplainAdjustmentClass;
+typedef struct _ChamplainAdjustment ChamplainAdjustment;
+typedef struct _ChamplainAdjustmentPrivate ChamplainAdjustmentPrivate;
+typedef struct _ChamplainAdjustmentClass ChamplainAdjustmentClass;
/**
* ChamplainAdjustment:
@@ -66,51 +66,50 @@ struct _ChamplainAdjustmentClass
GObjectClass parent_class;
/*< public >*/
- void (* changed) (ChamplainAdjustment *adjustment);
+ void (*changed)(ChamplainAdjustment *adjustment);
};
GType champlain_adjustment_get_type (void) G_GNUC_CONST;
-ChamplainAdjustment *champlain_adjustment_new (gdouble value,
- gdouble lower,
- gdouble upper,
- gdouble step_increment,
- gdouble page_increment,
- gdouble page_size);
-gdouble champlain_adjustment_get_value (ChamplainAdjustment *adjustment);
-void champlain_adjustment_set_value (ChamplainAdjustment *adjustment,
- gdouble value);
-void champlain_adjustment_set_values (ChamplainAdjustment *adjustment,
- gdouble value,
- gdouble lower,
- gdouble upper,
- gdouble step_increment,
- gdouble page_increment,
- gdouble page_size);
-void champlain_adjustment_get_values (ChamplainAdjustment *adjustment,
- gdouble *value,
- gdouble *lower,
- gdouble *upper,
- gdouble *step_increment,
- gdouble *page_increment,
- gdouble *page_size);
-
-void champlain_adjustment_interpolate (ChamplainAdjustment *adjustment,
- gdouble value,
- guint n_frames,
- guint fps);
-
-gboolean champlain_adjustment_get_elastic (ChamplainAdjustment *adjustment);
-void champlain_adjustment_set_elastic (ChamplainAdjustment *adjustment,
- gboolean elastic);
-
-gboolean champlain_adjustment_clamp (ChamplainAdjustment *adjustment,
- gboolean interpolate,
- guint n_frames,
- guint fps);
-void champlain_adjustment_interpolate_stop (ChamplainAdjustment *adjustment);
+ChamplainAdjustment *champlain_adjustment_new (gdouble value,
+ gdouble lower,
+ gdouble upper,
+ gdouble step_increment,
+ gdouble page_increment,
+ gdouble page_size);
+gdouble champlain_adjustment_get_value (ChamplainAdjustment *adjustment);
+void champlain_adjustment_set_value (ChamplainAdjustment *adjustment,
+ gdouble value);
+void champlain_adjustment_set_values (ChamplainAdjustment *adjustment,
+ gdouble value,
+ gdouble lower,
+ gdouble upper,
+ gdouble step_increment,
+ gdouble page_increment,
+ gdouble page_size);
+void champlain_adjustment_get_values (ChamplainAdjustment *adjustment,
+ gdouble *value,
+ gdouble *lower,
+ gdouble *upper,
+ gdouble *step_increment,
+ gdouble *page_increment,
+ gdouble *page_size);
+
+void champlain_adjustment_interpolate (ChamplainAdjustment *adjustment,
+ gdouble value,
+ guint n_frames,
+ guint fps);
+
+gboolean champlain_adjustment_get_elastic (ChamplainAdjustment *adjustment);
+void champlain_adjustment_set_elastic (ChamplainAdjustment *adjustment,
+ gboolean elastic);
+
+gboolean champlain_adjustment_clamp (ChamplainAdjustment *adjustment,
+ gboolean interpolate,
+ guint n_frames,
+ guint fps);
+void champlain_adjustment_interpolate_stop (ChamplainAdjustment *adjustment);
G_END_DECLS
#endif /* __CHAMPLAIN_ADJUSTMENT_H__ */
-
diff --git a/champlain/champlain-bounding-box.c b/champlain/champlain-bounding-box.c
index 1833525..bd1cc7d 100644
--- a/champlain/champlain-bounding-box.c
+++ b/champlain/champlain-bounding-box.c
@@ -38,9 +38,9 @@ champlain_bounding_box_get_type (void)
if (G_UNLIKELY (type == 0))
{
type = g_boxed_type_register_static (
- g_intern_static_string ("ChamplainBoundingBox"),
- (GBoxedCopyFunc) champlain_bounding_box_copy,
- (GBoxedFreeFunc) champlain_bounding_box_free);
+ g_intern_static_string ("ChamplainBoundingBox"),
+ (GBoxedCopyFunc) champlain_bounding_box_copy,
+ (GBoxedFreeFunc) champlain_bounding_box_free);
}
return type;
@@ -61,9 +61,9 @@ ChamplainBoundingBox *
champlain_bounding_box_new (void)
{
ChamplainBoundingBox *bbox;
-
+
bbox = g_slice_new (ChamplainBoundingBox);
-
+
bbox->left = CHAMPLAIN_MAX_LONGITUDE;
bbox->right = CHAMPLAIN_MIN_LONGITUDE;
bbox->bottom = CHAMPLAIN_MAX_LATITUDE;
@@ -149,10 +149,10 @@ champlain_bounding_box_compose (ChamplainBoundingBox *bbox,
ChamplainBoundingBox *other)
{
g_return_if_fail (CHAMPLAIN_BOUNDING_BOX (bbox));
-
+
if (other->left < bbox->left)
bbox->left = other->left;
-
+
if (other->right > bbox->right)
bbox->right = other->right;
@@ -175,11 +175,12 @@ champlain_bounding_box_compose (ChamplainBoundingBox *bbox,
*
* Since: 0.10
*/
-void champlain_bounding_box_extend (ChamplainBoundingBox *bbox,
+void
+champlain_bounding_box_extend (ChamplainBoundingBox *bbox,
gdouble latitude, gdouble longitude)
{
g_return_if_fail (CHAMPLAIN_BOUNDING_BOX (bbox));
-
+
if (longitude < bbox->left)
bbox->left = longitude;
@@ -210,9 +211,8 @@ champlain_bounding_box_is_valid (ChamplainBoundingBox *bbox)
g_return_val_if_fail (CHAMPLAIN_BOUNDING_BOX (bbox), FALSE);
return (bbox->left < bbox->right) && (bbox->bottom < bbox->top) &&
- (bbox->left > CHAMPLAIN_MIN_LONGITUDE) && (bbox->left < CHAMPLAIN_MAX_LONGITUDE) &&
- (bbox->right > CHAMPLAIN_MIN_LONGITUDE) && (bbox->right < CHAMPLAIN_MAX_LONGITUDE) &&
- (bbox->bottom > CHAMPLAIN_MIN_LATITUDE) && (bbox->bottom < CHAMPLAIN_MAX_LATITUDE) &&
- (bbox->top > CHAMPLAIN_MIN_LATITUDE) && (bbox->top < CHAMPLAIN_MAX_LATITUDE);
+ (bbox->left > CHAMPLAIN_MIN_LONGITUDE) && (bbox->left < CHAMPLAIN_MAX_LONGITUDE) &&
+ (bbox->right > CHAMPLAIN_MIN_LONGITUDE) && (bbox->right < CHAMPLAIN_MAX_LONGITUDE) &&
+ (bbox->bottom > CHAMPLAIN_MIN_LATITUDE) && (bbox->bottom < CHAMPLAIN_MAX_LATITUDE) &&
+ (bbox->top > CHAMPLAIN_MIN_LATITUDE) && (bbox->top < CHAMPLAIN_MAX_LATITUDE);
}
-
diff --git a/champlain/champlain-bounding-box.h b/champlain/champlain-bounding-box.h
index bbd3715..3173144 100644
--- a/champlain/champlain-bounding-box.h
+++ b/champlain/champlain-bounding-box.h
@@ -68,7 +68,8 @@ void champlain_bounding_box_compose (ChamplainBoundingBox *bbox,
ChamplainBoundingBox *other);
void champlain_bounding_box_extend (ChamplainBoundingBox *bbox,
- gdouble latitude, gdouble longitude);
+ gdouble latitude,
+ gdouble longitude);
gboolean champlain_bounding_box_is_valid (ChamplainBoundingBox *bbox);
diff --git a/champlain/champlain-coordinate.c b/champlain/champlain-coordinate.c
index dd0dba0..57d17b9 100644
--- a/champlain/champlain-coordinate.c
+++ b/champlain/champlain-coordinate.c
@@ -19,7 +19,7 @@
/**
* SECTION:champlain-coordinate
* @short_description: The simpliest implementation of #ChamplainLocation
- *
+ *
* #ChamplainCoordinate is a simple object implementing #ChamplainLocation.
*/
@@ -47,8 +47,8 @@ static gdouble get_longitude (ChamplainLocation *location);
static void location_interface_init (ChamplainLocationIface *iface);
G_DEFINE_TYPE_WITH_CODE (ChamplainCoordinate, champlain_coordinate, G_TYPE_INITIALLY_UNOWNED,
- G_IMPLEMENT_INTERFACE (CHAMPLAIN_TYPE_LOCATION,
- location_interface_init));
+ G_IMPLEMENT_INTERFACE (CHAMPLAIN_TYPE_LOCATION,
+ location_interface_init));
#define CHAMPLAIN_COORDINATE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CHAMPLAIN_TYPE_COORDINATE, ChamplainCoordinatePrivate))
@@ -77,7 +77,7 @@ champlain_coordinate_get_property (GObject *object,
case PROP_LATITUDE:
g_value_set_double (value, priv->lat);
break;
-
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@@ -96,18 +96,18 @@ champlain_coordinate_set_property (GObject *object,
switch (prop_id)
{
case PROP_LONGITUDE:
- {
- gdouble lon = g_value_get_double (value);
- set_location (CHAMPLAIN_LOCATION (coordinate), priv->lat, lon);
- break;
- }
+ {
+ gdouble lon = g_value_get_double (value);
+ set_location (CHAMPLAIN_LOCATION (coordinate), priv->lat, lon);
+ break;
+ }
case PROP_LATITUDE:
- {
- gdouble lat = g_value_get_double (value);
- set_location (CHAMPLAIN_LOCATION (coordinate), lat, priv->lon);
- break;
- }
+ {
+ gdouble lat = g_value_get_double (value);
+ set_location (CHAMPLAIN_LOCATION (coordinate), lat, priv->lon);
+ break;
+ }
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -189,12 +189,12 @@ champlain_coordinate_class_init (ChamplainCoordinateClass *coordinate_class)
object_class->set_property = champlain_coordinate_set_property;
g_object_class_override_property (object_class,
- PROP_LONGITUDE,
- "longitude");
+ PROP_LONGITUDE,
+ "longitude");
g_object_class_override_property (object_class,
- PROP_LATITUDE,
- "latitude");
+ PROP_LATITUDE,
+ "latitude");
}
@@ -209,6 +209,7 @@ champlain_coordinate_init (ChamplainCoordinate *coordinate)
priv->lon = 0;
}
+
/**
* champlain_coordinate_new:
*
@@ -229,8 +230,8 @@ champlain_coordinate_new ()
* champlain_coordinate_new_full:
* @latitude: the latitude coordinate
* @longitude: the longitude coordinate
- *
- * Creates a new instance of #ChamplainCoordinate initialized with the given
+ *
+ * Creates a new instance of #ChamplainCoordinate initialized with the given
* coordinates.
*
* Returns: the created instance.
@@ -238,11 +239,11 @@ champlain_coordinate_new ()
* Since: 0.10
*/
ChamplainCoordinate *
-champlain_coordinate_new_full (gdouble latitude,
+champlain_coordinate_new_full (gdouble latitude,
gdouble longitude)
{
- return CHAMPLAIN_COORDINATE (g_object_new (CHAMPLAIN_TYPE_COORDINATE,
- "latitude", latitude,
- "longitude", longitude,
- NULL));
+ return CHAMPLAIN_COORDINATE (g_object_new (CHAMPLAIN_TYPE_COORDINATE,
+ "latitude", latitude,
+ "longitude", longitude,
+ NULL));
}
diff --git a/champlain/champlain-coordinate.h b/champlain/champlain-coordinate.h
index f07353f..43609d1 100644
--- a/champlain/champlain-coordinate.h
+++ b/champlain/champlain-coordinate.h
@@ -69,7 +69,7 @@ GType champlain_coordinate_get_type (void);
ChamplainCoordinate *champlain_coordinate_new (void);
-ChamplainCoordinate *champlain_coordinate_new_full (gdouble latitude,
+ChamplainCoordinate *champlain_coordinate_new_full (gdouble latitude,
gdouble longitude);
G_END_DECLS
diff --git a/champlain/champlain-custom-marker.c b/champlain/champlain-custom-marker.c
index 77b2919..76474d3 100644
--- a/champlain/champlain-custom-marker.c
+++ b/champlain/champlain-custom-marker.c
@@ -19,10 +19,10 @@
/**
* SECTION:champlain-custom-marker
* @short_description: #ChamplainCustomMarker is a marker implementing the
- * #ClutterContainer interface.
- *
- * #ChamplainCustomMarker is a marker implementing the #ClutterContainer
- * interface. You can insert your custom actors into the container. Don't forget
+ * #ClutterContainer interface.
+ *
+ * #ChamplainCustomMarker is a marker implementing the #ClutterContainer
+ * interface. You can insert your custom actors into the container. Don't forget
* to set the anchor position in the marker using #clutter_actor_set_anchor_point.
*/
@@ -56,13 +56,12 @@ struct _ChamplainCustomMarkerPrivate
ClutterContainer *content_group;
};
-static void
-clutter_container_iface_init (ClutterContainerIface *iface);
+static void clutter_container_iface_init (ClutterContainerIface *iface);
G_DEFINE_TYPE_WITH_CODE (ChamplainCustomMarker, champlain_custom_marker, CHAMPLAIN_TYPE_MARKER,
- G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
- clutter_container_iface_init));
+ G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
+ clutter_container_iface_init));
#define GET_PRIVATE(obj) \
@@ -75,57 +74,63 @@ add_actor (ClutterContainer *container,
ClutterActor *actor)
{
ChamplainCustomMarkerPrivate *priv = GET_PRIVATE (container);
-
- clutter_container_add_actor (priv->content_group, actor);
+
+ clutter_container_add_actor (priv->content_group, actor);
}
+
static void
remove_actor (ClutterContainer *container,
ClutterActor *actor)
{
ChamplainCustomMarkerPrivate *priv = GET_PRIVATE (container);
-
- clutter_container_remove_actor (priv->content_group, actor);
+
+ clutter_container_remove_actor (priv->content_group, actor);
}
+
static void
foreach_actor (ClutterContainer *container,
ClutterCallback callback,
gpointer user_data)
{
ChamplainCustomMarkerPrivate *priv = GET_PRIVATE (container);
-
- clutter_container_foreach (priv->content_group, callback, user_data);
+
+ clutter_container_foreach (priv->content_group, callback, user_data);
}
+
static void
raise_actor (ClutterContainer *container,
ClutterActor *actor,
ClutterActor *sibling)
{
ChamplainCustomMarkerPrivate *priv = GET_PRIVATE (container);
-
- clutter_container_raise_child (priv->content_group, actor, sibling);
+
+ clutter_container_raise_child (priv->content_group, actor, sibling);
}
+
static void
lower_actor (ClutterContainer *container,
ClutterActor *actor,
ClutterActor *sibling)
{
ChamplainCustomMarkerPrivate *priv = GET_PRIVATE (container);
-
- clutter_container_lower_child (priv->content_group, actor, sibling);
+
+ clutter_container_lower_child (priv->content_group, actor, sibling);
}
+
static void
sort_depth_order (ClutterContainer *container)
{
ChamplainCustomMarkerPrivate *priv = GET_PRIVATE (container);
-
- clutter_container_sort_depth_order (priv->content_group);
+
+ clutter_container_sort_depth_order (priv->content_group);
}
+
static void
clutter_container_iface_init (ClutterContainerIface *iface)
{
@@ -146,9 +151,10 @@ paint (ClutterActor *actor)
clutter_actor_paint (CLUTTER_ACTOR (priv->content_group));
}
+
static void
-pick (ClutterActor *actor,
- const ClutterColor *color)
+pick (ClutterActor *actor,
+ const ClutterColor *color)
{
ChamplainCustomMarkerPrivate *priv = GET_PRIVATE (actor);
@@ -157,11 +163,12 @@ pick (ClutterActor *actor,
clutter_actor_paint (CLUTTER_ACTOR (priv->content_group));
}
+
static void
get_preferred_width (ClutterActor *actor,
- gfloat for_height,
- gfloat *min_width,
- gfloat *natural_width)
+ gfloat for_height,
+ gfloat *min_width,
+ gfloat *natural_width)
{
ChamplainCustomMarkerPrivate *priv = GET_PRIVATE (actor);
@@ -171,11 +178,12 @@ get_preferred_width (ClutterActor *actor,
natural_width);
}
+
static void
get_preferred_height (ClutterActor *actor,
- gfloat for_width,
- gfloat *min_height,
- gfloat *natural_height)
+ gfloat for_width,
+ gfloat *min_height,
+ gfloat *natural_height)
{
ChamplainCustomMarkerPrivate *priv = GET_PRIVATE (actor);
@@ -185,6 +193,7 @@ get_preferred_height (ClutterActor *actor,
natural_height);
}
+
static void
allocate (ClutterActor *actor,
const ClutterActorBox *box,
@@ -231,7 +240,7 @@ static void
champlain_custom_marker_dispose (GObject *object)
{
ChamplainCustomMarkerPrivate *priv = CHAMPLAIN_CUSTOM_MARKER (object)->priv;
-
+
if (priv->content_group)
{
clutter_actor_unparent (CLUTTER_ACTOR (priv->content_group));
@@ -245,7 +254,7 @@ champlain_custom_marker_dispose (GObject *object)
static void
champlain_custom_marker_finalize (GObject *object)
{
-// ChamplainCustomMarkerPrivate *priv = CHAMPLAIN_CUSTOM_MARKER (object)->priv;
+/* ChamplainCustomMarkerPrivate *priv = CHAMPLAIN_CUSTOM_MARKER (object)->priv; */
G_OBJECT_CLASS (champlain_custom_marker_parent_class)->finalize (object);
}
@@ -256,7 +265,7 @@ champlain_custom_marker_class_init (ChamplainCustomMarkerClass *klass)
{
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
g_type_class_add_private (klass, sizeof (ChamplainCustomMarkerPrivate));
object_class->finalize = champlain_custom_marker_finalize;
@@ -286,7 +295,7 @@ champlain_custom_marker_init (ChamplainCustomMarker *custom_marker)
/**
* champlain_custom_marker_new:
- *
+ *
* Creates an instance of #ChamplainCustomMarker.
*
* Returns: a new #ChamplainCustomMarker.
diff --git a/champlain/champlain-custom-marker.h b/champlain/champlain-custom-marker.h
index 89e310d..9cdec59 100644
--- a/champlain/champlain-custom-marker.h
+++ b/champlain/champlain-custom-marker.h
@@ -56,7 +56,7 @@ struct _ChamplainCustomMarker
{
ChamplainMarker parent;
- ChamplainCustomMarkerPrivate *priv;
+ ChamplainCustomMarkerPrivate *priv;
};
struct _ChamplainCustomMarkerClass
diff --git a/champlain/champlain-file-cache.c b/champlain/champlain-file-cache.c
index 06e25bf..90d757c 100644
--- a/champlain/champlain-file-cache.c
+++ b/champlain/champlain-file-cache.c
@@ -210,9 +210,9 @@ init_cache (ChamplainFileCache *file_cache)
g_return_if_fail (create_cache_dir (priv->cache_dir));
filename = g_build_filename (priv->cache_dir,
- "cache.db", NULL);
+ "cache.db", NULL);
error = sqlite3_open_v2 (filename, &priv->db,
- SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
+ SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
g_free (filename);
if (error == SQLITE_ERROR)
@@ -247,8 +247,8 @@ init_cache (ChamplainFileCache *file_cache)
}
error = sqlite3_prepare_v2 (priv->db,
- "SELECT etag FROM tiles WHERE filename = ?", -1,
- &priv->stmt_select, NULL);
+ "SELECT etag FROM tiles WHERE filename = ?", -1,
+ &priv->stmt_select, NULL);
if (error != SQLITE_OK)
{
priv->stmt_select = NULL;
@@ -258,8 +258,8 @@ init_cache (ChamplainFileCache *file_cache)
}
error = sqlite3_prepare_v2 (priv->db,
- "UPDATE tiles SET popularity = popularity + 1 WHERE filename = ?", -1,
- &priv->stmt_update, NULL);
+ "UPDATE tiles SET popularity = popularity + 1 WHERE filename = ?", -1,
+ &priv->stmt_update, NULL);
if (error != SQLITE_OK)
{
priv->stmt_update = NULL;
@@ -284,8 +284,8 @@ champlain_file_cache_constructed (GObject *object)
priv->cache_dir = g_strdup ("/home/user/MyDocs/.Maps/");
#else
priv->cache_dir = g_build_path (G_DIR_SEPARATOR_S,
- g_get_user_cache_dir (),
- "champlain", NULL);
+ g_get_user_cache_dir (),
+ "champlain", NULL);
#endif
}
@@ -322,12 +322,12 @@ champlain_file_cache_class_init (ChamplainFileCacheClass *klass)
* Since: 0.4
*/
pspec = g_param_spec_uint ("size-limit",
- "Size Limit",
- "The cache's size limit (Mb)",
- 1,
- G_MAXINT,
- 100000000,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
+ "Size Limit",
+ "The cache's size limit (Mb)",
+ 1,
+ G_MAXINT,
+ 100000000,
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_SIZE_LIMIT, pspec);
/**
@@ -338,10 +338,10 @@ champlain_file_cache_class_init (ChamplainFileCacheClass *klass)
* Since: 0.6
*/
pspec = g_param_spec_string ("cache-dir",
- "Cache Directory",
- "The directory of the cache",
- cache_dir,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
+ "Cache Directory",
+ "The directory of the cache",
+ cache_dir,
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_CACHE_DIR, pspec);
tile_cache_class->store_tile = store_tile;
@@ -389,10 +389,10 @@ champlain_file_cache_new_full (guint size_limit,
ChamplainFileCache *cache;
cache = g_object_new (CHAMPLAIN_TYPE_FILE_CACHE,
- "size-limit", size_limit,
- "cache-dir", cache_dir,
- "renderer", renderer,
- NULL);
+ "size-limit", size_limit,
+ "cache-dir", cache_dir,
+ "renderer", renderer,
+ NULL);
return cache;
}
@@ -470,14 +470,14 @@ get_filename (ChamplainFileCache *file_cache,
ChamplainMapSource *map_source = CHAMPLAIN_MAP_SOURCE (file_cache);
gchar *filename = g_strdup_printf ("%s" G_DIR_SEPARATOR_S
- "%s" G_DIR_SEPARATOR_S
- "%d" G_DIR_SEPARATOR_S
- "%d" G_DIR_SEPARATOR_S "%d.png",
- priv->cache_dir,
- champlain_map_source_get_id (map_source),
- champlain_tile_get_zoom_level (tile),
- champlain_tile_get_x (tile),
- champlain_tile_get_y (tile));
+ "%s" G_DIR_SEPARATOR_S
+ "%d" G_DIR_SEPARATOR_S
+ "%d" G_DIR_SEPARATOR_S "%d.png",
+ priv->cache_dir,
+ champlain_map_source_get_id (map_source),
+ champlain_tile_get_zoom_level (tile),
+ champlain_tile_get_x (tile),
+ champlain_tile_get_y (tile));
return filename;
}
@@ -548,8 +548,8 @@ tile_rendered_cb (ChamplainTile *tile,
/* Retrieve modification time */
info = g_file_query_info (file,
- G_FILE_ATTRIBUTE_TIME_MODIFIED,
- G_FILE_QUERY_INFO_NONE, NULL, NULL);
+ G_FILE_ATTRIBUTE_TIME_MODIFIED,
+ G_FILE_QUERY_INFO_NONE, NULL, NULL);
if (info)
{
g_file_info_get_modification_time (info, &modified_time);
@@ -644,7 +644,7 @@ file_loaded_cb (GFile *file,
{
gchar *path;
- path = g_file_get_path(file);
+ path = g_file_get_path (file);
DEBUG ("Failed to load tile %s, error: %s", path, error->message);
g_free (path);
contents = NULL;
@@ -728,7 +728,7 @@ refresh_tile_time (ChamplainTileCache *tile_cache,
g_free (filename);
info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
- G_FILE_QUERY_INFO_NONE, NULL, NULL);
+ G_FILE_QUERY_INFO_NONE, NULL, NULL);
if (info)
{
@@ -740,7 +740,7 @@ refresh_tile_time (ChamplainTileCache *tile_cache,
g_file_set_attributes_from_info (file, info, G_FILE_QUERY_INFO_NONE, NULL, NULL);
g_object_unref (info);
- }
+ }
g_object_unref (file);
@@ -810,9 +810,9 @@ store_tile (ChamplainTileCache *tile_cache,
g_object_unref (ostream);
query = sqlite3_mprintf ("REPLACE INTO tiles (filename, etag, size) VALUES (%Q, %Q, %d)",
- filename,
- champlain_tile_get_etag (tile),
- size);
+ filename,
+ champlain_tile_get_etag (tile),
+ size);
sqlite3_exec (priv->db, query, NULL, NULL, &error);
if (error != NULL)
{
@@ -1006,7 +1006,7 @@ champlain_file_cache_purge (ChamplainFileCache *file_cache)
sqlite3_finalize (stmt);
query = sqlite3_mprintf ("UPDATE tiles SET popularity = popularity - %d",
- highest_popularity);
+ highest_popularity);
sqlite3_exec (priv->db, query, NULL, NULL, &error);
if (error != NULL)
{
diff --git a/champlain/champlain-file-tile-source.c b/champlain/champlain-file-tile-source.c
index a832199..c631fd0 100644
--- a/champlain/champlain-file-tile-source.c
+++ b/champlain/champlain-file-tile-source.c
@@ -104,16 +104,16 @@ champlain_file_tile_source_new_full (const gchar *id,
ChamplainFileTileSource *source;
source = g_object_new (CHAMPLAIN_TYPE_FILE_TILE_SOURCE,
- "id", id,
- "name", name,
- "license", license,
- "license-uri", license_uri,
- "min-zoom-level", min_zoom,
- "max-zoom-level", max_zoom,
- "tile-size", tile_size,
- "projection", projection,
- "renderer", renderer,
- NULL);
+ "id", id,
+ "name", name,
+ "license", license,
+ "license-uri", license_uri,
+ "min-zoom-level", min_zoom,
+ "max-zoom-level", max_zoom,
+ "tile-size", tile_size,
+ "projection", projection,
+ "renderer", renderer,
+ NULL);
return source;
}
diff --git a/champlain/champlain-group.c b/champlain/champlain-group.c
index 8704503..c3df8a4 100644
--- a/champlain/champlain-group.c
+++ b/champlain/champlain-group.c
@@ -30,7 +30,7 @@
* This is a shameless coppy of ClutterGroup. The only difference is that
* it doesn't sort actors by depth, which slows down things in libchamplain
* considerably.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -64,30 +64,30 @@ enum
static void clutter_container_iface_init (ClutterContainerIface *iface);
G_DEFINE_TYPE_WITH_CODE (ChamplainGroup, champlain_group, CLUTTER_TYPE_ACTOR,
- G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
- clutter_container_iface_init));
+ G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
+ clutter_container_iface_init));
/*
-static gint
-sort_by_depth (gconstpointer a,
+ static gint
+ sort_by_depth (gconstpointer a,
gconstpointer b)
-{
- gfloat depth_a = clutter_actor_get_depth (CLUTTER_ACTOR(a));
- gfloat depth_b = clutter_actor_get_depth (CLUTTER_ACTOR(b));
+ {
+ gfloat depth_a = clutter_actor_get_depth (CLUTTER_ACTOR(a));
+ gfloat depth_b = clutter_actor_get_depth (CLUTTER_ACTOR(b));
- if (depth_a < depth_b)
+ if (depth_a < depth_b)
return -1;
- if (depth_a > depth_b)
+ if (depth_a > depth_b)
return 1;
- return 0;
-}
-*/
+ return 0;
+ }
+ */
static void
champlain_group_real_add (ClutterContainer *container,
- ClutterActor *actor)
+ ClutterActor *actor)
{
ChamplainGroupPrivate *priv = CHAMPLAIN_GROUP (container)->priv;
@@ -108,9 +108,10 @@ champlain_group_real_add (ClutterContainer *container,
g_object_unref (actor);
}
+
static void
champlain_group_real_remove (ClutterContainer *container,
- ClutterActor *actor)
+ ClutterActor *actor)
{
ChamplainGroupPrivate *priv = CHAMPLAIN_GROUP (container)->priv;
@@ -135,10 +136,11 @@ champlain_group_real_remove (ClutterContainer *container,
g_object_unref (actor);
}
+
static void
champlain_group_real_foreach (ClutterContainer *container,
- ClutterCallback callback,
- gpointer user_data)
+ ClutterCallback callback,
+ gpointer user_data)
{
ChamplainGroupPrivate *priv = CHAMPLAIN_GROUP (container)->priv;
@@ -149,10 +151,11 @@ champlain_group_real_foreach (ClutterContainer *container,
g_list_foreach (priv->children, (GFunc) callback, user_data);
}
+
static void
champlain_group_real_raise (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling)
+ ClutterActor *actor,
+ ClutterActor *sibling)
{
ChamplainGroupPrivate *priv = CHAMPLAIN_GROUP (container)->priv;
@@ -192,10 +195,11 @@ champlain_group_real_raise (ClutterContainer *container,
clutter_actor_queue_redraw (CLUTTER_ACTOR (container));
}
+
static void
champlain_group_real_lower (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling)
+ ClutterActor *actor,
+ ClutterActor *sibling)
{
ChamplainGroup *self = CHAMPLAIN_GROUP (container);
ChamplainGroupPrivate *priv = self->priv;
@@ -231,16 +235,18 @@ champlain_group_real_lower (ClutterContainer *container,
clutter_actor_queue_redraw (CLUTTER_ACTOR (container));
}
+
static void
champlain_group_real_sort_depth_order (ClutterContainer *container)
{
-// ChamplainGroupPrivate *priv = CHAMPLAIN_GROUP (container)->priv;
+/* ChamplainGroupPrivate *priv = CHAMPLAIN_GROUP (container)->priv; */
-// priv->children = g_list_sort (priv->children, sort_by_depth);
+/* priv->children = g_list_sort (priv->children, sort_by_depth); */
-// clutter_actor_queue_redraw (CLUTTER_ACTOR (container));
+/* clutter_actor_queue_redraw (CLUTTER_ACTOR (container)); */
}
+
static void
clutter_container_iface_init (ClutterContainerIface *iface)
{
@@ -252,6 +258,7 @@ clutter_container_iface_init (ClutterContainerIface *iface)
iface->sort_depth_order = champlain_group_real_sort_depth_order;
}
+
static void
champlain_group_real_paint (ClutterActor *actor)
{
@@ -260,9 +267,10 @@ champlain_group_real_paint (ClutterActor *actor)
g_list_foreach (priv->children, (GFunc) clutter_actor_paint, NULL);
}
+
static void
-champlain_group_real_pick (ClutterActor *actor,
- const ClutterColor *pick)
+champlain_group_real_pick (ClutterActor *actor,
+ const ClutterColor *pick)
{
ChamplainGroupPrivate *priv = CHAMPLAIN_GROUP (actor)->priv;
@@ -272,38 +280,41 @@ champlain_group_real_pick (ClutterActor *actor,
g_list_foreach (priv->children, (GFunc) clutter_actor_paint, NULL);
}
+
static void
champlain_group_real_get_preferred_width (ClutterActor *actor,
- gfloat for_height,
- gfloat *min_width,
- gfloat *natural_width)
+ gfloat for_height,
+ gfloat *min_width,
+ gfloat *natural_width)
{
ChamplainGroupPrivate *priv = CHAMPLAIN_GROUP (actor)->priv;
clutter_layout_manager_get_preferred_width (priv->layout,
- CLUTTER_CONTAINER (actor),
- for_height,
- min_width, natural_width);
+ CLUTTER_CONTAINER (actor),
+ for_height,
+ min_width, natural_width);
}
+
static void
champlain_group_real_get_preferred_height (ClutterActor *actor,
- gfloat for_width,
- gfloat *min_height,
- gfloat *natural_height)
+ gfloat for_width,
+ gfloat *min_height,
+ gfloat *natural_height)
{
ChamplainGroupPrivate *priv = CHAMPLAIN_GROUP (actor)->priv;
clutter_layout_manager_get_preferred_height (priv->layout,
- CLUTTER_CONTAINER (actor),
- for_width,
- min_height, natural_height);
+ CLUTTER_CONTAINER (actor),
+ for_width,
+ min_height, natural_height);
}
+
static void
-champlain_group_real_allocate (ClutterActor *actor,
- const ClutterActorBox *allocation,
- ClutterAllocationFlags flags)
+champlain_group_real_allocate (ClutterActor *actor,
+ const ClutterActorBox *allocation,
+ ClutterAllocationFlags flags)
{
ChamplainGroupPrivate *priv = CHAMPLAIN_GROUP (actor)->priv;
ClutterActorClass *klass;
@@ -315,10 +326,11 @@ champlain_group_real_allocate (ClutterActor *actor,
return;
clutter_layout_manager_allocate (priv->layout,
- CLUTTER_CONTAINER (actor),
- allocation, flags);
+ CLUTTER_CONTAINER (actor),
+ allocation, flags);
}
+
static void
champlain_group_dispose (GObject *object)
{
@@ -343,27 +355,27 @@ champlain_group_dispose (GObject *object)
G_OBJECT_CLASS (champlain_group_parent_class)->dispose (object);
}
+
static void
champlain_group_real_show_all (ClutterActor *actor)
{
clutter_container_foreach (CLUTTER_CONTAINER (actor),
- CLUTTER_CALLBACK (clutter_actor_show),
- NULL);
+ CLUTTER_CALLBACK (clutter_actor_show),
+ NULL);
clutter_actor_show (actor);
}
+
static void
champlain_group_real_hide_all (ClutterActor *actor)
{
clutter_actor_hide (actor);
clutter_container_foreach (CLUTTER_CONTAINER (actor),
- CLUTTER_CALLBACK (clutter_actor_hide),
- NULL);
+ CLUTTER_CALLBACK (clutter_actor_hide),
+ NULL);
}
-
-
static void
champlain_group_class_init (ChamplainGroupClass *klass)
{
@@ -381,9 +393,9 @@ champlain_group_class_init (ChamplainGroupClass *klass)
actor_class->hide_all = champlain_group_real_hide_all;
gobject_class->dispose = champlain_group_dispose;
-
}
+
static void
champlain_group_init (ChamplainGroup *self)
{
@@ -393,9 +405,10 @@ champlain_group_init (ChamplainGroup *self)
g_object_ref_sink (self->priv->layout);
clutter_layout_manager_set_container (self->priv->layout,
- CLUTTER_CONTAINER (self));
+ CLUTTER_CONTAINER (self));
}
+
/**
* champlain_group_new:
*
@@ -409,6 +422,7 @@ champlain_group_new (void)
return g_object_new (CHAMPLAIN_TYPE_GROUP, NULL);
}
+
/**
* champlain_group_remove_all:
* @group: A #ChamplainGroup
@@ -432,6 +446,7 @@ champlain_group_remove_all (ChamplainGroup *group)
}
}
+
/**
* champlain_group_get_n_children:
* @self: A #ChamplainGroup
@@ -450,6 +465,7 @@ champlain_group_get_n_children (ChamplainGroup *self)
return g_list_length (self->priv->children);
}
+
/**
* champlain_group_get_nth_child:
* @self: A #ChamplainGroup
@@ -464,7 +480,7 @@ champlain_group_get_n_children (ChamplainGroup *self)
*/
ClutterActor *
champlain_group_get_nth_child (ChamplainGroup *self,
- gint index_)
+ gint index_)
{
g_return_val_if_fail (CHAMPLAIN_IS_GROUP (self), NULL);
diff --git a/champlain/champlain-group.h b/champlain/champlain-group.h
index 03069ef..e146a91 100644
--- a/champlain/champlain-group.h
+++ b/champlain/champlain-group.h
@@ -29,30 +29,30 @@
G_BEGIN_DECLS
-#define CHAMPLAIN_TYPE_GROUP champlain_group_get_type()
+#define CHAMPLAIN_TYPE_GROUP champlain_group_get_type ()
#define CHAMPLAIN_GROUP(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- CHAMPLAIN_TYPE_GROUP, ChamplainGroup))
+ CHAMPLAIN_TYPE_GROUP, ChamplainGroup))
#define CHAMPLAIN_GROUP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), \
- CHAMPLAIN_TYPE_GROUP, ChamplainGroupClass))
+ CHAMPLAIN_TYPE_GROUP, ChamplainGroupClass))
#define CHAMPLAIN_IS_GROUP(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
- CHAMPLAIN_TYPE_GROUP))
+ CHAMPLAIN_TYPE_GROUP))
#define CHAMPLAIN_IS_GROUP_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
- CHAMPLAIN_TYPE_GROUP))
+ CHAMPLAIN_TYPE_GROUP))
#define CHAMPLAIN_GROUP_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
- CHAMPLAIN_TYPE_GROUP, ChamplainGroupClass))
+ CHAMPLAIN_TYPE_GROUP, ChamplainGroupClass))
-typedef struct _ChamplainGroup ChamplainGroup;
-typedef struct _ChamplainGroupClass ChamplainGroupClass;
+typedef struct _ChamplainGroup ChamplainGroup;
+typedef struct _ChamplainGroupClass ChamplainGroupClass;
typedef struct _ChamplainGroupPrivate ChamplainGroupPrivate;
/**
@@ -84,30 +84,30 @@ struct _ChamplainGroupClass
ClutterActorClass parent_class;
/* padding for future expansion */
- void (*_clutter_reserved1) (void);
- void (*_clutter_reserved2) (void);
- void (*_clutter_reserved3) (void);
- void (*_clutter_reserved4) (void);
- void (*_clutter_reserved5) (void);
- void (*_clutter_reserved6) (void);
+ void (*_clutter_reserved1)(void);
+ void (*_clutter_reserved2)(void);
+ void (*_clutter_reserved3)(void);
+ void (*_clutter_reserved4)(void);
+ void (*_clutter_reserved5)(void);
+ void (*_clutter_reserved6)(void);
};
-GType champlain_group_get_type (void) G_GNUC_CONST;
-ClutterActor *champlain_group_new (void);
-ClutterActor *champlain_group_get_nth_child (ChamplainGroup *self,
- gint index_);
-gint champlain_group_get_n_children (ChamplainGroup *self);
-void champlain_group_remove_all (ChamplainGroup *group);
+GType champlain_group_get_type (void) G_GNUC_CONST;
+ClutterActor *champlain_group_new (void);
+ClutterActor *champlain_group_get_nth_child (ChamplainGroup *self,
+ gint index_);
+gint champlain_group_get_n_children (ChamplainGroup *self);
+void champlain_group_remove_all (ChamplainGroup *group);
/* for Mr. Mallum */
-#define champlain_group_add(group,actor) G_STMT_START { \
- ClutterActor *_actor = (ClutterActor *) (actor); \
- if (CHAMPLAIN_IS_GROUP ((group)) && CLUTTER_IS_ACTOR ((_actor))) \
- { \
- ClutterContainer *_container = (ClutterContainer *) (group); \
- clutter_container_add_actor (_container, _actor); \
- } } G_STMT_END
-
-G_END_DECLS
+#define champlain_group_add(group, actor) G_STMT_START { \
+ ClutterActor *_actor = (ClutterActor *) (actor); \
+ if (CHAMPLAIN_IS_GROUP ((group)) && CLUTTER_IS_ACTOR ((_actor))) \
+ { \
+ ClutterContainer *_container = (ClutterContainer *) (group); \
+ clutter_container_add_actor (_container, _actor); \
+ } } G_STMT_END
+
+ G_END_DECLS
#endif /* __CHAMPLAIN_GROUP_H__ */
diff --git a/champlain/champlain-image-renderer.c b/champlain/champlain-image-renderer.c
index 6548f7b..949b4cc 100644
--- a/champlain/champlain-image-renderer.c
+++ b/champlain/champlain-image-renderer.c
@@ -132,7 +132,7 @@ render (ChamplainRenderer *renderer, ChamplainTile *tile)
if (!priv->data || priv->size == 0)
goto finish;
-
+
loader = gdk_pixbuf_loader_new ();
if (!gdk_pixbuf_loader_write (loader,
(const guchar *) priv->data,
diff --git a/champlain/champlain-kinetic-scroll-view.c b/champlain/champlain-kinetic-scroll-view.c
index 2f36e3e..3da751c 100644
--- a/champlain/champlain-kinetic-scroll-view.c
+++ b/champlain/champlain-kinetic-scroll-view.c
@@ -31,19 +31,20 @@
static void clutter_container_iface_init (ClutterContainerIface *iface);
G_DEFINE_TYPE_WITH_CODE (ChamplainKineticScrollView, champlain_kinetic_scroll_view, CLUTTER_TYPE_ACTOR,
- G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
- clutter_container_iface_init))
+ G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
+ clutter_container_iface_init))
#define KINETIC_SCROLL_VIEW_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
- CHAMPLAIN_TYPE_KINETIC_SCROLL_VIEW, \
- ChamplainKineticScrollViewPrivate))
+ CHAMPLAIN_TYPE_KINETIC_SCROLL_VIEW, \
+ ChamplainKineticScrollViewPrivate))
-typedef struct {
+typedef struct
+{
/* Units to store the origin of a click when scrolling */
gfloat x;
gfloat y;
- GTimeVal time;
+ GTimeVal time;
} ChamplainKineticScrollViewMotion;
struct _ChamplainKineticScrollViewPrivate
@@ -51,20 +52,21 @@ struct _ChamplainKineticScrollViewPrivate
/* Scroll mode */
gboolean kinetic;
- GArray *motion_buffer;
- guint last_motion;
+ GArray *motion_buffer;
+ guint last_motion;
/* Variables for storing acceleration information for kinetic mode */
- ClutterTimeline *deceleration_timeline;
- gdouble dx;
- gdouble dy;
- gdouble decel_rate;
+ ClutterTimeline *deceleration_timeline;
+ gdouble dx;
+ gdouble dy;
+ gdouble decel_rate;
ClutterActor *child;
gboolean in_drag;
};
-enum {
+enum
+{
PROP_MODE = 1,
PROP_DECEL_RATE,
PROP_BUFFER,
@@ -81,51 +83,59 @@ static guint signals[LAST_SIGNAL] = { 0, };
static void
champlain_kinetic_scroll_view_get_property (GObject *object, guint property_id,
- GValue *value, GParamSpec *pspec)
+ GValue *value, GParamSpec *pspec)
{
ChamplainKineticScrollViewPrivate *priv = CHAMPLAIN_KINETIC_SCROLL_VIEW (object)->priv;
switch (property_id)
{
- case PROP_MODE :
+ case PROP_MODE:
g_value_set_boolean (value, priv->kinetic);
break;
- case PROP_DECEL_RATE :
+
+ case PROP_DECEL_RATE:
g_value_set_double (value, priv->decel_rate);
break;
- case PROP_BUFFER :
+
+ case PROP_BUFFER:
g_value_set_uint (value, priv->motion_buffer->len);
break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
}
+
static void
champlain_kinetic_scroll_view_set_property (GObject *object, guint property_id,
- const GValue *value, GParamSpec *pspec)
+ const GValue *value, GParamSpec *pspec)
{
ChamplainKineticScrollViewPrivate *priv = CHAMPLAIN_KINETIC_SCROLL_VIEW (object)->priv;
switch (property_id)
{
- case PROP_MODE :
+ case PROP_MODE:
priv->kinetic = g_value_get_boolean (value);
g_object_notify (object, "mode");
break;
- case PROP_DECEL_RATE :
+
+ case PROP_DECEL_RATE:
priv->decel_rate = g_value_get_double (value);
g_object_notify (object, "decel-rate");
break;
- case PROP_BUFFER :
+
+ case PROP_BUFFER:
g_array_set_size (priv->motion_buffer, g_value_get_uint (value));
g_object_notify (object, "motion-buffer");
break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
}
+
static void
champlain_kinetic_scroll_view_dispose (GObject *object)
{
@@ -144,6 +154,7 @@ champlain_kinetic_scroll_view_dispose (GObject *object)
G_OBJECT_CLASS (champlain_kinetic_scroll_view_parent_class)->dispose (object);
}
+
static void
champlain_kinetic_scroll_view_finalize (GObject *object)
{
@@ -178,11 +189,10 @@ champlain_kinetic_scroll_view_pick (ClutterActor *actor, const ClutterColor *col
static void
champlain_kinetic_scroll_view_get_preferred_width (ClutterActor *actor,
- gfloat for_height,
- gfloat *min_width_p,
- gfloat *natural_width_p)
+ gfloat for_height,
+ gfloat *min_width_p,
+ gfloat *natural_width_p)
{
-
ChamplainKineticScrollViewPrivate *priv = CHAMPLAIN_KINETIC_SCROLL_VIEW (actor)->priv;
if (!priv->child)
@@ -191,19 +201,18 @@ champlain_kinetic_scroll_view_get_preferred_width (ClutterActor *actor,
/* Our natural width is the natural width of the child */
clutter_actor_get_preferred_width (priv->child,
- for_height,
- NULL,
- natural_width_p);
-
+ for_height,
+ NULL,
+ natural_width_p);
}
+
static void
champlain_kinetic_scroll_view_get_preferred_height (ClutterActor *actor,
- gfloat for_width,
- gfloat *min_height_p,
- gfloat *natural_height_p)
+ gfloat for_width,
+ gfloat *min_height_p,
+ gfloat *natural_height_p)
{
-
ChamplainKineticScrollViewPrivate *priv = CHAMPLAIN_KINETIC_SCROLL_VIEW (actor)->priv;
if (!priv->child)
@@ -212,15 +221,16 @@ champlain_kinetic_scroll_view_get_preferred_height (ClutterActor *actor,
/* Our natural height is the natural height of the child */
clutter_actor_get_preferred_height (priv->child,
- for_width,
- NULL,
- natural_height_p);
+ for_width,
+ NULL,
+ natural_height_p);
}
+
static void
-champlain_kinetic_scroll_view_allocate (ClutterActor *actor,
- const ClutterActorBox *box,
- ClutterAllocationFlags flags)
+champlain_kinetic_scroll_view_allocate (ClutterActor *actor,
+ const ClutterActorBox *box,
+ ClutterAllocationFlags flags)
{
ClutterActorBox child_box;
@@ -228,7 +238,7 @@ champlain_kinetic_scroll_view_allocate (ClutterActor *actor,
/* Chain up */
CLUTTER_ACTOR_CLASS (champlain_kinetic_scroll_view_parent_class)->
- allocate (actor, box, flags);
+ allocate (actor, box, flags);
/* Child */
child_box.x1 = 0;
@@ -240,14 +250,14 @@ champlain_kinetic_scroll_view_allocate (ClutterActor *actor,
{
clutter_actor_allocate (priv->child, &child_box, flags);
clutter_actor_set_clip (priv->child,
- child_box.x1,
- child_box.y1,
- child_box.x2 - child_box.x1,
- child_box.y2 - child_box.y1);
+ child_box.x1,
+ child_box.y1,
+ child_box.x2 - child_box.x1,
+ child_box.y2 - child_box.y1);
}
-
}
+
static void
champlain_kinetic_scroll_view_class_init (ChamplainKineticScrollViewClass *klass)
{
@@ -268,44 +278,44 @@ champlain_kinetic_scroll_view_class_init (ChamplainKineticScrollViewClass *klass
actor_class->allocate = champlain_kinetic_scroll_view_allocate;
g_object_class_install_property (object_class,
- PROP_MODE,
- g_param_spec_boolean ("mode",
- "ChamplainKineticScrollViewMode",
- "Scrolling mode",
- FALSE,
- G_PARAM_READWRITE));
+ PROP_MODE,
+ g_param_spec_boolean ("mode",
+ "ChamplainKineticScrollViewMode",
+ "Scrolling mode",
+ FALSE,
+ G_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_DECEL_RATE,
- g_param_spec_double ("decel-rate",
- "Deceleration rate",
- "Rate at which the view "
- "will decelerate in "
- "kinetic mode.",
- G_MINFLOAT + 1,
- G_MAXFLOAT,
- 1.1,
- G_PARAM_READWRITE));
+ PROP_DECEL_RATE,
+ g_param_spec_double ("decel-rate",
+ "Deceleration rate",
+ "Rate at which the view "
+ "will decelerate in "
+ "kinetic mode.",
+ G_MINFLOAT + 1,
+ G_MAXFLOAT,
+ 1.1,
+ G_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_BUFFER,
- g_param_spec_uint ("motion-buffer",
- "Motion buffer",
- "Amount of motion "
- "events to buffer",
- 1, G_MAXUINT, 3,
- G_PARAM_READWRITE));
+ PROP_BUFFER,
+ g_param_spec_uint ("motion-buffer",
+ "Motion buffer",
+ "Amount of motion "
+ "events to buffer",
+ 1, G_MAXUINT, 3,
+ G_PARAM_READWRITE));
signals[PANNING_COMPLETED] =
- g_signal_new ("panning-completed", G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST, 0, NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ g_signal_new ("panning-completed", G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+ g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
}
static void
champlain_kinetic_scroll_view_add_actor (ClutterContainer *container,
- ClutterActor *actor)
+ ClutterActor *actor)
{
ChamplainKineticScrollView *self = CHAMPLAIN_KINETIC_SCROLL_VIEW (container);
ChamplainKineticScrollViewPrivate *priv = self->priv;
@@ -313,14 +323,14 @@ champlain_kinetic_scroll_view_add_actor (ClutterContainer *container,
if (priv->child)
{
g_warning ("Attempting to add an actor of type %s to "
- "a ChamplainKineticScrollView that already contains "
- "an actor of type %s.",
- g_type_name (G_OBJECT_TYPE (actor)),
- g_type_name (G_OBJECT_TYPE (priv->child)));
+ "a ChamplainKineticScrollView that already contains "
+ "an actor of type %s.",
+ g_type_name (G_OBJECT_TYPE (actor)),
+ g_type_name (G_OBJECT_TYPE (priv->child)));
}
else
{
- if (CHAMPLAIN_IS_VIEWPORT(actor))
+ if (CHAMPLAIN_IS_VIEWPORT (actor))
{
priv->child = actor;
clutter_actor_set_parent (actor, CLUTTER_ACTOR (container));
@@ -333,15 +343,16 @@ champlain_kinetic_scroll_view_add_actor (ClutterContainer *container,
else
{
g_warning ("Attempting to add an actor to "
- "a ChamplainKineticScrollView, but the actor does "
- "not implement ChamplainViewport.");
+ "a ChamplainKineticScrollView, but the actor does "
+ "not implement ChamplainViewport.");
}
}
}
+
static void
champlain_kinetic_scroll_view_remove_actor (ClutterContainer *container,
- ClutterActor *actor)
+ ClutterActor *actor)
{
ChamplainKineticScrollViewPrivate *priv = CHAMPLAIN_KINETIC_SCROLL_VIEW (container)->priv;
@@ -362,10 +373,11 @@ champlain_kinetic_scroll_view_remove_actor (ClutterContainer *container,
}
}
+
static void
champlain_kinetic_scroll_view_foreach (ClutterContainer *container,
- ClutterCallback callback,
- gpointer callback_data)
+ ClutterCallback callback,
+ gpointer callback_data)
{
ChamplainKineticScrollViewPrivate *priv = CHAMPLAIN_KINETIC_SCROLL_VIEW (container)->priv;
@@ -373,28 +385,32 @@ champlain_kinetic_scroll_view_foreach (ClutterContainer *container,
callback (priv->child, callback_data);
}
+
static void
champlain_kinetic_scroll_view_lower (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling)
+ ClutterActor *actor,
+ ClutterActor *sibling)
{
/* single child */
}
+
static void
champlain_kinetic_scroll_view_raise (ClutterContainer *container,
- ClutterActor *actor,
- ClutterActor *sibling)
+ ClutterActor *actor,
+ ClutterActor *sibling)
{
/* single child */
}
+
static void
champlain_kinetic_scroll_view_sort_depth_order (ClutterContainer *container)
{
/* single child */
}
+
static void
clutter_container_iface_init (ClutterContainerIface *iface)
{
@@ -407,11 +423,10 @@ clutter_container_iface_init (ClutterContainerIface *iface)
}
-
static gboolean
motion_event_cb (ClutterActor *stage,
- ClutterMotionEvent *event,
- ChamplainKineticScrollView *scroll)
+ ClutterMotionEvent *event,
+ ChamplainKineticScrollView *scroll)
{
ChamplainKineticScrollViewPrivate *priv = scroll->priv;
ClutterActor *actor = CLUTTER_ACTOR (scroll);
@@ -421,9 +436,9 @@ motion_event_cb (ClutterActor *stage,
return FALSE;
if (clutter_actor_transform_stage_point (actor,
- event->x,
- event->y,
- &x, &y))
+ event->x,
+ event->y,
+ &x, &y))
{
ChamplainKineticScrollViewMotion *motion;
@@ -432,7 +447,7 @@ motion_event_cb (ClutterActor *stage,
guint threshold = 4;
motion = &g_array_index (priv->motion_buffer,
- ChamplainKineticScrollViewMotion, 0);
+ ChamplainKineticScrollViewMotion, 0);
if ((ABS (motion->x - x) >= threshold) ||
(ABS (motion->y - y) >= threshold))
@@ -450,36 +465,36 @@ motion_event_cb (ClutterActor *stage,
ChamplainAdjustment *hadjust, *vadjust;
champlain_viewport_get_adjustments (CHAMPLAIN_VIEWPORT (priv->child),
- &hadjust,
- &vadjust);
+ &hadjust,
+ &vadjust);
motion = &g_array_index (priv->motion_buffer,
- ChamplainKineticScrollViewMotion, priv->last_motion);
+ ChamplainKineticScrollViewMotion, priv->last_motion);
if (hadjust)
{
dx = (motion->x - x) +
- champlain_adjustment_get_value (hadjust);
+ champlain_adjustment_get_value (hadjust);
champlain_adjustment_set_value (hadjust, dx);
}
-
+
if (vadjust)
{
dy = (motion->y - y) +
- champlain_adjustment_get_value (vadjust);
+ champlain_adjustment_get_value (vadjust);
champlain_adjustment_set_value (vadjust, dy);
}
}
- priv->last_motion ++;
+ priv->last_motion++;
if (priv->last_motion == priv->motion_buffer->len)
{
priv->motion_buffer = g_array_remove_index (priv->motion_buffer, 0);
g_array_set_size (priv->motion_buffer, priv->last_motion);
- priv->last_motion --;
+ priv->last_motion--;
}
motion = &g_array_index (priv->motion_buffer,
- ChamplainKineticScrollViewMotion, priv->last_motion);
+ ChamplainKineticScrollViewMotion, priv->last_motion);
motion->x = x;
motion->y = y;
g_get_current_time (&motion->time);
@@ -488,11 +503,12 @@ motion_event_cb (ClutterActor *stage,
return TRUE;
}
+
static void
clamp_adjustments (ChamplainKineticScrollView *scroll)
{
ChamplainKineticScrollViewPrivate *priv = scroll->priv;
-
+
if (priv->child)
{
guint fps, n_frames;
@@ -500,7 +516,7 @@ clamp_adjustments (ChamplainKineticScrollView *scroll)
gboolean snap;
champlain_viewport_get_adjustments (CHAMPLAIN_VIEWPORT (priv->child),
- &hadj, &vadj);
+ &hadj, &vadj);
/* FIXME: Hard-coded value here */
fps = clutter_get_default_frame_rate ();
@@ -516,9 +532,9 @@ clamp_adjustments (ChamplainKineticScrollView *scroll)
gdouble d, value, lower, step_increment;
champlain_adjustment_get_values (hadj, &value, &lower, NULL,
- &step_increment, NULL, NULL);
+ &step_increment, NULL, NULL);
d = (rint ((value - lower) / step_increment) *
- step_increment) + lower;
+ step_increment) + lower;
champlain_adjustment_set_value (hadj, d);
}
@@ -532,17 +548,18 @@ clamp_adjustments (ChamplainKineticScrollView *scroll)
gdouble d, value, lower, step_increment;
champlain_adjustment_get_values (vadj, &value, &lower, NULL,
- &step_increment, NULL, NULL);
+ &step_increment, NULL, NULL);
d = (rint ((value - lower) / step_increment) *
- step_increment) + lower;
+ step_increment) + lower;
champlain_adjustment_set_value (vadj, d);
}
}
}
+
static void
deceleration_completed_cb (ClutterTimeline *timeline,
- ChamplainKineticScrollView *scroll)
+ ChamplainKineticScrollView *scroll)
{
clamp_adjustments (scroll);
g_object_unref (timeline);
@@ -551,39 +568,40 @@ deceleration_completed_cb (ClutterTimeline *timeline,
g_signal_emit_by_name (scroll, "panning-completed", NULL);
}
+
static void
deceleration_new_frame_cb (ClutterTimeline *timeline,
- gint frame_num,
- ChamplainKineticScrollView *scroll)
+ gint frame_num,
+ ChamplainKineticScrollView *scroll)
{
ChamplainKineticScrollViewPrivate *priv = scroll->priv;
if (priv->child)
{
- gdouble value, lower, upper, page_size;
+ gdouble value, lower, upper, page_size;
ChamplainAdjustment *hadjust, *vadjust;
gint i;
gboolean stop = TRUE;
champlain_viewport_get_adjustments (CHAMPLAIN_VIEWPORT (priv->child),
- &hadjust,
- &vadjust);
+ &hadjust,
+ &vadjust);
for (i = 0; i < clutter_timeline_get_delta (timeline) / 15; i++)
{
champlain_adjustment_set_value (hadjust,
- priv->dx +
- champlain_adjustment_get_value (hadjust));
+ priv->dx +
+ champlain_adjustment_get_value (hadjust));
champlain_adjustment_set_value (vadjust,
- priv->dy +
- champlain_adjustment_get_value (vadjust));
+ priv->dy +
+ champlain_adjustment_get_value (vadjust));
priv->dx = (priv->dx / priv->decel_rate);
priv->dy = (priv->dy / priv->decel_rate);
}
/* Check if we've hit the upper or lower bounds and stop the timeline */
champlain_adjustment_get_values (hadjust, &value, &lower, &upper,
- NULL, NULL, &page_size);
+ NULL, NULL, &page_size);
if (((priv->dx > 0) && (value < upper - page_size)) ||
((priv->dx < 0) && (value > lower)))
stop = FALSE;
@@ -591,7 +609,7 @@ deceleration_new_frame_cb (ClutterTimeline *timeline,
if (stop)
{
champlain_adjustment_get_values (vadjust, &value, &lower, &upper,
- NULL, NULL, &page_size);
+ NULL, NULL, &page_size);
if (((priv->dy > 0) && (value < upper - page_size)) ||
((priv->dy < 0) && (value > lower)))
stop = FALSE;
@@ -605,10 +623,11 @@ deceleration_new_frame_cb (ClutterTimeline *timeline,
}
}
+
static gboolean
button_release_event_cb (ClutterActor *stage,
- ClutterButtonEvent *event,
- ChamplainKineticScrollView *scroll)
+ ClutterButtonEvent *event,
+ ChamplainKineticScrollView *scroll)
{
ChamplainKineticScrollViewPrivate *priv = scroll->priv;
ClutterActor *actor = CLUTTER_ACTOR (scroll);
@@ -619,11 +638,11 @@ button_release_event_cb (ClutterActor *stage,
return FALSE;
g_signal_handlers_disconnect_by_func (stage,
- motion_event_cb,
- scroll);
+ motion_event_cb,
+ scroll);
g_signal_handlers_disconnect_by_func (stage,
- button_release_event_cb,
- scroll);
+ button_release_event_cb,
+ scroll);
if (!priv->in_drag)
return FALSE;
@@ -635,23 +654,23 @@ button_release_event_cb (ClutterActor *stage,
gfloat x, y;
if (clutter_actor_transform_stage_point (actor,
- event->x,
- event->y,
- &x, &y))
+ event->x,
+ event->y,
+ &x, &y))
{
double frac, x_origin, y_origin;
GTimeVal release_time, motion_time;
ChamplainAdjustment *hadjust, *vadjust;
glong time_diff;
gint i;
-
+
priv->in_drag = TRUE;
/* Get time delta */
g_get_current_time (&release_time);
/* Get average position/time of last x mouse events */
- priv->last_motion ++;
+ priv->last_motion++;
x_origin = y_origin = 0;
motion_time = (GTimeVal){ 0, 0 };
for (i = 0; i < priv->last_motion; i++)
@@ -678,7 +697,7 @@ button_release_event_cb (ClutterActor *stage,
time_diff = release_time.tv_usec - motion_time.tv_usec;
else
time_diff = release_time.tv_usec +
- (G_USEC_PER_SEC - motion_time.tv_usec);
+ (G_USEC_PER_SEC - motion_time.tv_usec);
/* On a macbook that's running Ubuntu 9.04 sometimes 'time_diff' is 0
and this causes a division by 0 when computing 'frac'. This check
@@ -687,7 +706,7 @@ button_release_event_cb (ClutterActor *stage,
if (time_diff != 0)
{
/* Work out the fraction of 1/60th of a second that has elapsed */
- frac = (time_diff/1000.0) / (1000.0/60.0);
+ frac = (time_diff / 1000.0) / (1000.0 / 60.0);
/* See how many units to move in 1/60th of a second */
priv->dx = (x_origin - x) / frac;
@@ -695,11 +714,11 @@ button_release_event_cb (ClutterActor *stage,
/* Get adjustments to do step-increment snapping */
champlain_viewport_get_adjustments (CHAMPLAIN_VIEWPORT (priv->child),
- &hadjust,
- &vadjust);
+ &hadjust,
+ &vadjust);
- if (ABS(priv->dx) > 1 ||
- ABS(priv->dy) > 1)
+ if (ABS (priv->dx) > 1 ||
+ ABS (priv->dy) > 1)
{
gdouble value, lower, step_increment, d, a, x, y, n;
@@ -716,7 +735,7 @@ button_release_event_cb (ClutterActor *stage,
* As z = 1, this will cause stops to be slightly abrupt -
* add a constant 15 frames to compensate.
*/
- x = MAX(ABS(priv->dx), ABS(priv->dy));
+ x = MAX (ABS (priv->dx), ABS (priv->dy));
y = priv->decel_rate;
n = logf (x) / logf (y) + 15.0;
@@ -746,7 +765,7 @@ button_release_event_cb (ClutterActor *stage,
/* Solving for dx */
d = a * priv->dx;
champlain_adjustment_get_values (hadjust, &value, &lower, NULL,
- &step_increment, NULL, NULL);
+ &step_increment, NULL, NULL);
d = ((rint (((value + d) - lower) / step_increment) *
step_increment) + lower) - value;
priv->dx = (d / a);
@@ -754,7 +773,7 @@ button_release_event_cb (ClutterActor *stage,
/* Solving for dy */
d = a * (priv->dy);
champlain_adjustment_get_values (vadjust, &value, &lower, NULL,
- &step_increment, NULL, NULL);
+ &step_increment, NULL, NULL);
d = ((rint (((value + d) - lower) / step_increment) *
step_increment) + lower) - value;
priv->dy = (d / a);
@@ -772,13 +791,13 @@ button_release_event_cb (ClutterActor *stage,
a = (1.0 - 1.0 / pow (y, 4 + 1)) / (1.0 - 1.0 / y);
champlain_adjustment_get_values (hadjust, &value, &lower, NULL,
- &step_increment, NULL, NULL);
+ &step_increment, NULL, NULL);
d = ((rint ((value - lower) / step_increment) *
step_increment) + lower) - value;
priv->dx = (d / a);
champlain_adjustment_get_values (vadjust, &value, &lower, NULL,
- &step_increment, NULL, NULL);
+ &step_increment, NULL, NULL);
d = ((rint ((value - lower) / step_increment) *
step_increment) + lower) - value;
priv->dy = (d / a);
@@ -787,9 +806,9 @@ button_release_event_cb (ClutterActor *stage,
}
g_signal_connect (priv->deceleration_timeline, "new_frame",
- G_CALLBACK (deceleration_new_frame_cb), scroll);
+ G_CALLBACK (deceleration_new_frame_cb), scroll);
g_signal_connect (priv->deceleration_timeline, "completed",
- G_CALLBACK (deceleration_completed_cb), scroll);
+ G_CALLBACK (deceleration_completed_cb), scroll);
clutter_timeline_start (priv->deceleration_timeline);
decelerating = TRUE;
}
@@ -810,14 +829,13 @@ button_release_event_cb (ClutterActor *stage,
}
-
static gboolean
-button_press_event_cb (ClutterActor *actor,
- ClutterEvent *event,
- ChamplainKineticScrollView *scroll)
+button_press_event_cb (ClutterActor *actor,
+ ClutterEvent *event,
+ ChamplainKineticScrollView *scroll)
{
ChamplainKineticScrollViewPrivate *priv = scroll->priv;
- ClutterButtonEvent *bevent = (ClutterButtonEvent *)event;
+ ClutterButtonEvent *bevent = (ClutterButtonEvent *) event;
ClutterActor *stage = clutter_actor_get_stage (actor);
if ((event->type == CLUTTER_BUTTON_PRESS) &&
@@ -831,7 +849,7 @@ button_press_event_cb (ClutterActor *actor,
motion = &g_array_index (priv->motion_buffer, ChamplainKineticScrollViewMotion, 0);
if (clutter_actor_transform_stage_point (actor, bevent->x, bevent->y,
- &motion->x, &motion->y))
+ &motion->x, &motion->y))
{
g_get_current_time (&motion->time);
@@ -843,13 +861,13 @@ button_press_event_cb (ClutterActor *actor,
}
g_signal_connect (stage,
- "captured-event",
- G_CALLBACK (motion_event_cb),
- scroll);
+ "captured-event",
+ G_CALLBACK (motion_event_cb),
+ scroll);
g_signal_connect (stage,
- "captured-event",
- G_CALLBACK (button_release_event_cb),
- scroll);
+ "captured-event",
+ G_CALLBACK (button_release_event_cb),
+ scroll);
priv->in_drag = FALSE;
}
@@ -865,7 +883,7 @@ champlain_kinetic_scroll_view_init (ChamplainKineticScrollView *self)
ChamplainKineticScrollViewPrivate *priv = self->priv = KINETIC_SCROLL_VIEW_PRIVATE (self);
priv->motion_buffer = g_array_sized_new (FALSE, TRUE,
- sizeof (ChamplainKineticScrollViewMotion), 3);
+ sizeof (ChamplainKineticScrollViewMotion), 3);
g_array_set_size (priv->motion_buffer, 3);
priv->decel_rate = 1.1f;
priv->child = NULL;
@@ -873,18 +891,18 @@ champlain_kinetic_scroll_view_init (ChamplainKineticScrollView *self)
clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE);
g_signal_connect (self, "button-press-event",
- G_CALLBACK (button_press_event_cb), self);
-
-
+ G_CALLBACK (button_press_event_cb), self);
}
+
ClutterActor *
champlain_kinetic_scroll_view_new (gboolean kinetic)
{
return CLUTTER_ACTOR (g_object_new (CHAMPLAIN_TYPE_KINETIC_SCROLL_VIEW,
- "mode", kinetic, NULL));
+ "mode", kinetic, NULL));
}
+
void
champlain_kinetic_scroll_view_stop (ChamplainKineticScrollView *scroll)
{
diff --git a/champlain/champlain-kinetic-scroll-view.h b/champlain/champlain-kinetic-scroll-view.h
index 6a0f205..cb041ab 100644
--- a/champlain/champlain-kinetic-scroll-view.h
+++ b/champlain/champlain-kinetic-scroll-view.h
@@ -28,7 +28,7 @@
G_BEGIN_DECLS
-#define CHAMPLAIN_TYPE_KINETIC_SCROLL_VIEW (champlain_kinetic_scroll_view_get_type())
+#define CHAMPLAIN_TYPE_KINETIC_SCROLL_VIEW (champlain_kinetic_scroll_view_get_type ())
#define CHAMPLAIN_KINETIC_SCROLL_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_KINETIC_SCROLL_VIEW, ChamplainKineticScrollView))
#define CHAMPLAIN_IS_KINETIC_SCROLL_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_KINETIC_SCROLL_VIEW))
#define CHAMPLAIN_KINETIC_SCROLL_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_KINETIC_SCROLL_VIEW, ChamplainKineticScrollViewClass))
@@ -36,15 +36,15 @@ G_BEGIN_DECLS
#define CHAMPLAIN_KINETIC_SCROLL_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_KINETIC_SCROLL_VIEW, ChamplainKineticScrollViewClass))
-typedef struct _ChamplainKineticScrollView ChamplainKineticScrollView;
-typedef struct _ChamplainKineticScrollViewPrivate ChamplainKineticScrollViewPrivate;
-typedef struct _ChamplainKineticScrollViewClass ChamplainKineticScrollViewClass;
+typedef struct _ChamplainKineticScrollView ChamplainKineticScrollView;
+typedef struct _ChamplainKineticScrollViewPrivate ChamplainKineticScrollViewPrivate;
+typedef struct _ChamplainKineticScrollViewClass ChamplainKineticScrollViewClass;
struct _ChamplainKineticScrollView
{
/*< private >*/
ClutterActor parent_instance;
-
+
ChamplainKineticScrollViewPrivate *priv;
};
@@ -55,9 +55,9 @@ struct _ChamplainKineticScrollViewClass
GType champlain_kinetic_scroll_view_get_type (void) G_GNUC_CONST;
-ClutterActor *champlain_kinetic_scroll_view_new (gboolean kinetic);
+ClutterActor *champlain_kinetic_scroll_view_new (gboolean kinetic);
-void champlain_kinetic_scroll_view_stop (ChamplainKineticScrollView *scroll);
+void champlain_kinetic_scroll_view_stop (ChamplainKineticScrollView *scroll);
G_END_DECLS
diff --git a/champlain/champlain-label.c b/champlain/champlain-label.c
index e1d9efa..0b2fc3c 100644
--- a/champlain/champlain-label.c
+++ b/champlain/champlain-label.c
@@ -101,8 +101,8 @@ struct _ChamplainLabelPrivate
ClutterActor *shadow;
ClutterActor *background;
guint redraw_id;
-
- ClutterGroup *content_group;
+
+ ClutterGroup *content_group;
};
G_DEFINE_TYPE (ChamplainLabel, champlain_label, CHAMPLAIN_TYPE_MARKER);
@@ -245,13 +245,13 @@ static void
paint (ClutterActor *self)
{
ChamplainLabelPrivate *priv = GET_PRIVATE (self);
-
+
clutter_actor_paint (CLUTTER_ACTOR (priv->content_group));
}
static void
-pick (ClutterActor *self,
+pick (ClutterActor *self,
const ClutterColor *color)
{
ChamplainLabelPrivate *priv = GET_PRIVATE (self);
@@ -423,7 +423,7 @@ champlain_label_class_init (ChamplainLabelClass *klass)
{
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
g_type_class_add_private (klass, sizeof (ChamplainLabelPrivate));
object_class->finalize = champlain_label_finalize;
@@ -636,7 +636,7 @@ draw_shadow (ChamplainLabel *label,
cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (shadow));
cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
- cairo_paint(cr);
+ cairo_paint (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
cairo_matrix_init (&matrix,
@@ -684,7 +684,7 @@ draw_background (ChamplainLabel *label,
cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (bg));
cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
- cairo_paint(cr);
+ cairo_paint (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
/* If selected, add the selection color to the marker's color */
diff --git a/champlain/champlain-layer.c b/champlain/champlain-layer.c
index fc77898..880d02b 100644
--- a/champlain/champlain-layer.c
+++ b/champlain/champlain-layer.c
@@ -54,6 +54,7 @@ champlain_layer_class_init (ChamplainLayerClass *klass)
klass->get_bounding_box = NULL;
}
+
/**
* champlain_layer_set_view:
* @layer: a #ChamplainLayer
@@ -67,7 +68,8 @@ champlain_layer_class_init (ChamplainLayerClass *klass)
*
* Since: 0.10
*/
-void champlain_layer_set_view (ChamplainLayer *layer,
+void
+champlain_layer_set_view (ChamplainLayer *layer,
ChamplainView *view)
{
g_return_if_fail (CHAMPLAIN_IS_LAYER (layer));
@@ -83,7 +85,7 @@ void champlain_layer_set_view (ChamplainLayer *layer,
* Gets the bounding box occupied by the elements inside the layer.
*
* Returns: The bounding box.
- *
+ *
* Since: 0.10
*/
ChamplainBoundingBox *
diff --git a/champlain/champlain-layer.h b/champlain/champlain-layer.h
index aca14d6..28126ad 100644
--- a/champlain/champlain-layer.h
+++ b/champlain/champlain-layer.h
@@ -60,7 +60,7 @@ struct _ChamplainLayerClass
void (*set_view)(ChamplainLayer *layer,
ChamplainView *view);
- ChamplainBoundingBox * (*get_bounding_box) (ChamplainLayer *layer);
+ ChamplainBoundingBox * (*get_bounding_box)(ChamplainLayer * layer);
};
GType champlain_layer_get_type (void);
diff --git a/champlain/champlain-license.c b/champlain/champlain-license.c
index 7e73aa4..7631dd7 100644
--- a/champlain/champlain-license.c
+++ b/champlain/champlain-license.c
@@ -59,7 +59,7 @@ struct _ChamplainLicensePrivate
gchar *extra_text; /* Extra license text */
ClutterActor *license_actor;
ClutterGroup *content_group;
-
+
ChamplainView *view;
};
@@ -116,13 +116,13 @@ static void
paint (ClutterActor *self)
{
ChamplainLicensePrivate *priv = GET_PRIVATE (self);
-
+
clutter_actor_paint (CLUTTER_ACTOR (priv->content_group));
}
static void
-pick (ClutterActor *self,
+pick (ClutterActor *self,
const ClutterColor *color)
{
ChamplainLicensePrivate *priv = GET_PRIVATE (self);
@@ -212,15 +212,15 @@ redraw_license (ChamplainLicense *license)
gchar *text;
gfloat width, height;
ChamplainMapSource *map_source;
-
+
if (!priv->view)
return;
map_source = champlain_view_get_map_source (priv->view);
-
+
if (!map_source)
return;
-
+
if (priv->extra_text)
text = g_strjoin ("\n",
priv->extra_text,
@@ -351,7 +351,7 @@ champlain_license_init (ChamplainLicense *license)
/**
* champlain_license_new:
- *
+ *
* Creates an instance of #ChamplainLicense.
*
* Returns: a new #ChamplainLicense.
@@ -369,18 +369,18 @@ champlain_license_new (void)
* champlain_license_connect_view:
* @license: The license
* @view: a #ChamplainView
- *
+ *
* This method connects to the necessary signals of #ChamplainView to make the
* license change automatically when the map source changes.
*
* Since: 0.10
*/
-void
+void
champlain_license_connect_view (ChamplainLicense *license,
ChamplainView *view)
{
g_return_if_fail (CHAMPLAIN_IS_LICENSE (license));
-
+
license->priv->view = view;
g_signal_connect (view, "notify::map-source",
@@ -392,19 +392,19 @@ champlain_license_connect_view (ChamplainLicense *license,
/**
* champlain_license_disconnect_view:
* @license: The license
- *
+ *
* This method disconnects from the signals previously connected by champlain_license_connect_view().
*
* Since: 0.10
*/
-void
+void
champlain_license_disconnect_view (ChamplainLicense *license)
{
g_return_if_fail (CHAMPLAIN_IS_LICENSE (license));
-
+
g_signal_handlers_disconnect_by_func (license->priv->view,
- redraw_license_cb,
- license);
+ redraw_license_cb,
+ license);
license->priv->view = NULL;
}
@@ -434,6 +434,7 @@ champlain_license_set_extra_text (ChamplainLicense *license,
redraw_license (license);
}
+
/**
* champlain_license_get_extra_text:
* @license: a #ChamplainLicense
@@ -451,5 +452,3 @@ champlain_license_get_extra_text (ChamplainLicense *license)
return license->priv->extra_text;
}
-
-
diff --git a/champlain/champlain-location.c b/champlain/champlain-location.c
index 1a8c38f..bcccb5a 100644
--- a/champlain/champlain-location.c
+++ b/champlain/champlain-location.c
@@ -19,7 +19,7 @@
/**
* SECTION:champlain-location
* @short_description: An interface common to objects having latitude and longitude
- *
+ *
* By implementing #ChamplainLocation the object declares that it has latitude
* and longitude and can be used to specify location on the map.
*/
@@ -27,7 +27,7 @@
#include "champlain-location.h"
#include "champlain-private.h"
-typedef ChamplainLocationIface ChamplainLocationInterface;
+typedef ChamplainLocationIface ChamplainLocationInterface;
G_DEFINE_INTERFACE (ChamplainLocation, champlain_location, G_TYPE_OBJECT);
@@ -70,14 +70,14 @@ champlain_location_default_init (ChamplainLocationInterface *iface)
*
* Since: 0.10
*/
-void
+void
champlain_location_set_location (ChamplainLocation *location,
gdouble latitude,
gdouble longitude)
{
CHAMPLAIN_LOCATION_GET_IFACE (location)->set_location (location,
- latitude,
- longitude);
+ latitude,
+ longitude);
}
@@ -91,7 +91,7 @@ champlain_location_set_location (ChamplainLocation *location,
*
* Since: 0.10
*/
-gdouble
+gdouble
champlain_location_get_latitude (ChamplainLocation *location)
{
return CHAMPLAIN_LOCATION_GET_IFACE (location)->get_latitude (location);
@@ -108,9 +108,8 @@ champlain_location_get_latitude (ChamplainLocation *location)
*
* Since: 0.10
*/
-gdouble
+gdouble
champlain_location_get_longitude (ChamplainLocation *location)
{
return CHAMPLAIN_LOCATION_GET_IFACE (location)->get_longitude (location);
}
-
diff --git a/champlain/champlain-location.h b/champlain/champlain-location.h
index b9f61f6..464d081 100644
--- a/champlain/champlain-location.h
+++ b/champlain/champlain-location.h
@@ -46,7 +46,7 @@ typedef struct _ChamplainLocationIface ChamplainLocationIface;
* @get_latitude: virtual function for obtaining latitude.
* @get_longitude: virtual function for obtaining longitude.
* @set_location: virtual function for setting position.
- *
+ *
* An interface common to objects having latitude and longitude.
*/
struct _ChamplainLocationIface
@@ -55,11 +55,11 @@ struct _ChamplainLocationIface
GTypeInterface g_iface;
/*< public >*/
- gdouble (* get_latitude) (ChamplainLocation *location);
- gdouble (* get_longitude) (ChamplainLocation *location);
- void (* set_location) (ChamplainLocation *location,
- gdouble latitude,
- gdouble longitude);
+ gdouble (*get_latitude)(ChamplainLocation *location);
+ gdouble (*get_longitude)(ChamplainLocation *location);
+ void (*set_location)(ChamplainLocation *location,
+ gdouble latitude,
+ gdouble longitude);
};
GType champlain_location_get_type (void) G_GNUC_CONST;
diff --git a/champlain/champlain-map-source-chain.c b/champlain/champlain-map-source-chain.c
index a2e52bc..076c586 100644
--- a/champlain/champlain-map-source-chain.c
+++ b/champlain/champlain-map-source-chain.c
@@ -23,7 +23,7 @@
* This map source simplifies creation of map chains by providing two
* functions for their creation and modification in a stack-like manner:
* champlain_map_source_chain_push() and champlain_map_source_chain_pop().
- * For instance, to create a chain consisting of #ChamplainMemoryCache,
+ * For instance, to create a chain consisting of #ChamplainMemoryCache,
* #ChamplainFileCache and #ChamplainNetworkTileSource, the map
* sources have to be pushed into the chain in the reverse order starting
* from #ChamplainNetworkTileSource. After its creation, #ChamplainMapSourceChain
@@ -111,7 +111,7 @@ champlain_map_source_chain_init (ChamplainMapSourceChain *source_chain)
priv->stack_top = NULL;
priv->stack_bottom = NULL;
-
+
g_signal_connect (source_chain, "notify::next-source",
G_CALLBACK (on_set_next_source_cb), NULL);
}
@@ -255,7 +255,7 @@ on_set_next_source_cb (ChamplainMapSourceChain *source_chain,
ChamplainMapSourceChainPrivate *priv = source_chain->priv;
ChamplainMapSource *map_source = CHAMPLAIN_MAP_SOURCE (source_chain);
ChamplainMapSource *next_source;
-
+
next_source = champlain_map_source_get_next_source (map_source);
if (priv->stack_bottom)
diff --git a/champlain/champlain-map-source-desc.c b/champlain/champlain-map-source-desc.c
index 0066ff8..27ea415 100644
--- a/champlain/champlain-map-source-desc.c
+++ b/champlain/champlain-map-source-desc.c
@@ -39,8 +39,8 @@ enum
PROP_MIN_ZOOM_LEVEL,
PROP_MAX_ZOOM_LEVEL,
PROP_TILE_SIZE,
- PROP_PROJECTION,
- PROP_CONSTRUCTOR,
+ PROP_PROJECTION,
+ PROP_CONSTRUCTOR,
PROP_DATA,
};
@@ -211,7 +211,7 @@ champlain_map_source_desc_set_property (GObject *object,
static void
champlain_map_source_desc_dispose (GObject *object)
{
-// ChamplainMapSourceDesc *desc = CHAMPLAIN_MAP_SOURCE_DESC (object);
+/* ChamplainMapSourceDesc *desc = CHAMPLAIN_MAP_SOURCE_DESC (object); */
G_OBJECT_CLASS (champlain_map_source_desc_parent_class)->dispose (object);
}
@@ -221,13 +221,13 @@ static void
champlain_map_source_desc_finalize (GObject *object)
{
ChamplainMapSourceDescPrivate *priv = CHAMPLAIN_MAP_SOURCE_DESC (object)->priv;
-
+
g_free (priv->id);
g_free (priv->name);
g_free (priv->license);
g_free (priv->license_uri);
g_free (priv->uri_format);
-
+
G_OBJECT_CLASS (champlain_map_source_desc_parent_class)->finalize (object);
}
@@ -273,7 +273,7 @@ champlain_map_source_desc_class_init (ChamplainMapSourceDescClass *klass)
"Map source name",
"",
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
+
/**
* ChamplainMapSourceDesc:license:
*
@@ -288,7 +288,7 @@ champlain_map_source_desc_class_init (ChamplainMapSourceDescClass *klass)
"Map source license",
"",
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
+
/**
* ChamplainMapSourceDesc:license-uri:
*
@@ -331,7 +331,7 @@ champlain_map_source_desc_class_init (ChamplainMapSourceDescClass *klass)
g_param_spec_uint ("min-zoom-level",
"Min zoom level",
"The lowest allowed level of zoom",
- 0, 20, 0,
+ 0, 20, 0,
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
/**
@@ -346,7 +346,7 @@ champlain_map_source_desc_class_init (ChamplainMapSourceDescClass *klass)
g_param_spec_uint ("max-zoom-level",
"Max zoom level",
"The highest allowed level of zoom",
- 0, 20, 20,
+ 0, 20, 20,
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
/**
@@ -430,7 +430,6 @@ champlain_map_source_desc_init (ChamplainMapSourceDesc *desc)
priv->projection = CHAMPLAIN_MAP_PROJECTION_MERCATOR;
priv->constructor = NULL;
priv->data = NULL;
-
}
@@ -448,7 +447,7 @@ champlain_map_source_desc_init (ChamplainMapSourceDesc *desc)
* @constructor: the map source's constructor
* @data: user data passed to the constructor
*
- * Constructor of #ChamplainMapSourceDesc which describes a #ChamplainMapSource.
+ * Constructor of #ChamplainMapSourceDesc which describes a #ChamplainMapSource.
* This is returned by #champlain_map_source_factory_get_registered
*
* Returns: a constructed #ChamplainMapSourceDesc object
@@ -457,26 +456,26 @@ champlain_map_source_desc_init (ChamplainMapSourceDesc *desc)
*/
ChamplainMapSourceDesc *
champlain_map_source_desc_new_full (
- gchar *id,
- gchar *name,
- gchar *license,
- gchar *license_uri,
- guint min_zoom,
- guint max_zoom,
- guint tile_size,
- ChamplainMapProjection projection,
- gchar *uri_format,
- ChamplainMapSourceConstructor constructor,
- gpointer data)
+ gchar *id,
+ gchar *name,
+ gchar *license,
+ gchar *license_uri,
+ guint min_zoom,
+ guint max_zoom,
+ guint tile_size,
+ ChamplainMapProjection projection,
+ gchar *uri_format,
+ ChamplainMapSourceConstructor constructor,
+ gpointer data)
{
- return g_object_new (CHAMPLAIN_TYPE_MAP_SOURCE_DESC,
- "id", id,
+ return g_object_new (CHAMPLAIN_TYPE_MAP_SOURCE_DESC,
+ "id", id,
"name", name,
"license", license,
"license-uri", license_uri,
"min-zoom-level", min_zoom,
"max-zoom-level", max_zoom,
- "tile-size", tile_size,
+ "tile-size", tile_size,
"projection", projection,
"uri-format", uri_format,
"constructor", constructor,
@@ -685,12 +684,12 @@ champlain_map_source_desc_get_data (ChamplainMapSourceDesc *desc)
*
* Since: 0.10
*/
-ChamplainMapSourceConstructor
+ChamplainMapSourceConstructor
champlain_map_source_desc_get_constructor (ChamplainMapSourceDesc *desc)
{
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE_DESC (desc), NULL);
- return desc->priv->constructor;
+ return desc->priv->constructor;
}
@@ -839,4 +838,3 @@ set_constructor (ChamplainMapSourceDesc *desc,
g_object_notify (G_OBJECT (desc), "constructor");
}
-
diff --git a/champlain/champlain-map-source-desc.h b/champlain/champlain-map-source-desc.h
index 2505b88..145cc36 100644
--- a/champlain/champlain-map-source-desc.h
+++ b/champlain/champlain-map-source-desc.h
@@ -82,17 +82,17 @@ typedef ChamplainMapSource * (*ChamplainMapSourceConstructor)
GType champlain_map_source_desc_get_type (void);
ChamplainMapSourceDesc *champlain_map_source_desc_new_full (
- gchar *id,
- gchar *name,
- gchar *license,
- gchar *license_uri,
- guint min_zoom,
- guint max_zoom,
- guint tile_size,
- ChamplainMapProjection projection,
- gchar *uri_format,
- ChamplainMapSourceConstructor constructor,
- gpointer data);
+ gchar *id,
+ gchar *name,
+ gchar *license,
+ gchar *license_uri,
+ guint min_zoom,
+ guint max_zoom,
+ guint tile_size,
+ ChamplainMapProjection projection,
+ gchar *uri_format,
+ ChamplainMapSourceConstructor constructor,
+ gpointer data);
const gchar *champlain_map_source_desc_get_id (ChamplainMapSourceDesc *desc);
const gchar *champlain_map_source_desc_get_name (ChamplainMapSourceDesc *desc);
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index d3bc4fd..ef7c570 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -112,7 +112,7 @@ champlain_map_source_factory_constructor (GType type,
if (instance == NULL)
{
retval = G_OBJECT_CLASS (champlain_map_source_factory_parent_class)->constructor
- (type, n_construct_params, construct_params);
+ (type, n_construct_params, construct_params);
instance = CHAMPLAIN_MAP_SOURCE_FACTORY (retval);
g_object_add_weak_pointer (retval, (gpointer *) &instance);
@@ -148,133 +148,133 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
priv->registered_sources = NULL;
desc = champlain_map_source_desc_new_full (
- CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK,
- "OpenStreetMap Mapnik",
- "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
- "http://creativecommons.org/licenses/by-sa/2.0/";,
- 0,
- 18,
- 256,
- CHAMPLAIN_MAP_PROJECTION_MERCATOR,
- "http://tile.openstreetmap.org/#Z#/#X#/#Y#.png";,
- champlain_map_source_new_generic,
- NULL);
+ CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK,
+ "OpenStreetMap Mapnik",
+ "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
+ "http://creativecommons.org/licenses/by-sa/2.0/";,
+ 0,
+ 18,
+ 256,
+ CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+ "http://tile.openstreetmap.org/#Z#/#X#/#Y#.png";,
+ champlain_map_source_new_generic,
+ NULL);
champlain_map_source_factory_register (factory, desc);
desc = champlain_map_source_desc_new_full (
- CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER,
- "OpenStreetMap Osmarender",
- "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
- "http://creativecommons.org/licenses/by-sa/2.0/";,
- 0,
- 17,
- 256,
- CHAMPLAIN_MAP_PROJECTION_MERCATOR,
- "http://tah.openstreetmap.org/Tiles/tile/#Z#/#X#/#Y#.png";,
- champlain_map_source_new_generic,
- NULL);
+ CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER,
+ "OpenStreetMap Osmarender",
+ "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
+ "http://creativecommons.org/licenses/by-sa/2.0/";,
+ 0,
+ 17,
+ 256,
+ CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+ "http://tah.openstreetmap.org/Tiles/tile/#Z#/#X#/#Y#.png";,
+ champlain_map_source_new_generic,
+ NULL);
champlain_map_source_factory_register (factory, desc);
desc = champlain_map_source_desc_new_full (
- CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST,
- "MapQuest OSM",
- "Data, imagery and map information provided by MapQuest, Open Street Map and contributors",
- "http://creativecommons.org/licenses/by-sa/2.0/";,
- 0,
- 17,
- 256,
- CHAMPLAIN_MAP_PROJECTION_MERCATOR,
- "http://otile1.mqcdn.com/tiles/1.0.0/osm/#Z#/#X#/#Y#.png";,
- champlain_map_source_new_generic,
- NULL);
+ CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST,
+ "MapQuest OSM",
+ "Data, imagery and map information provided by MapQuest, Open Street Map and contributors",
+ "http://creativecommons.org/licenses/by-sa/2.0/";,
+ 0,
+ 17,
+ 256,
+ CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+ "http://otile1.mqcdn.com/tiles/1.0.0/osm/#Z#/#X#/#Y#.png";,
+ champlain_map_source_new_generic,
+ NULL);
champlain_map_source_factory_register (factory, desc);
desc = champlain_map_source_desc_new_full (
- CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP,
- "OpenStreetMap Cycle Map",
- "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
- "http://creativecommons.org/licenses/by-sa/2.0/";,
- 0,
- 18,
- 256,
- CHAMPLAIN_MAP_PROJECTION_MERCATOR,
- "http://andy.sandbox.cloudmade.com/tiles/cycle/#Z#/#X#/#Y#.png";,
- champlain_map_source_new_generic,
- NULL);
+ CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP,
+ "OpenStreetMap Cycle Map",
+ "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
+ "http://creativecommons.org/licenses/by-sa/2.0/";,
+ 0,
+ 18,
+ 256,
+ CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+ "http://andy.sandbox.cloudmade.com/tiles/cycle/#Z#/#X#/#Y#.png";,
+ champlain_map_source_new_generic,
+ NULL);
champlain_map_source_factory_register (factory, desc);
desc = champlain_map_source_desc_new_full (
- CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP,
- "OpenStreetMap Transport Map",
- "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
- "http://creativecommons.org/licenses/by-sa/2.0/";,
- 0,
- 18,
- 256,
- CHAMPLAIN_MAP_PROJECTION_MERCATOR,
- "http://tile.xn--pnvkarte-m4a.de/tilegen/#Z#/#X#/#Y#.png";,
- champlain_map_source_new_generic,
- NULL);
+ CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP,
+ "OpenStreetMap Transport Map",
+ "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
+ "http://creativecommons.org/licenses/by-sa/2.0/";,
+ 0,
+ 18,
+ 256,
+ CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+ "http://tile.xn--pnvkarte-m4a.de/tilegen/#Z#/#X#/#Y#.png";,
+ champlain_map_source_new_generic,
+ NULL);
champlain_map_source_factory_register (factory, desc);
#if 0
/* Disabling until OpenArealMap works again */
desc = champlain_map_source_desc_new_full (
- CHAMPLAIN_MAP_SOURCE_OAM,
- "OpenAerialMap",
- "(CC) BY 3.0 OpenAerialMap contributors",
- "http://creativecommons.org/licenses/by/3.0/";,
- 0,
- 17,
- 256,
- CHAMPLAIN_MAP_PROJECTION_MERCATOR,
- "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z#/#X#/#Y#.jpg";,
- champlain_map_source_new_generic,
- NULL);
+ CHAMPLAIN_MAP_SOURCE_OAM,
+ "OpenAerialMap",
+ "(CC) BY 3.0 OpenAerialMap contributors",
+ "http://creativecommons.org/licenses/by/3.0/";,
+ 0,
+ 17,
+ 256,
+ CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+ "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z#/#X#/#Y#.jpg";,
+ champlain_map_source_new_generic,
+ NULL);
champlain_map_source_factory_register (factory, desc);
#endif
desc = champlain_map_source_desc_new_full (
- CHAMPLAIN_MAP_SOURCE_MFF_RELIEF,
- "Maps for Free Relief",
- "Map data available under GNU Free Documentation license, Version 1.2 or later",
- "http://www.gnu.org/copyleft/fdl.html";,
- 0,
- 11,
- 256,
- CHAMPLAIN_MAP_PROJECTION_MERCATOR,
- "http://maps-for-free.com/layer/relief/z#Z#/row#Y#/#Z#_#X#-#Y#.jpg";,
- champlain_map_source_new_generic,
- NULL);
+ CHAMPLAIN_MAP_SOURCE_MFF_RELIEF,
+ "Maps for Free Relief",
+ "Map data available under GNU Free Documentation license, Version 1.2 or later",
+ "http://www.gnu.org/copyleft/fdl.html";,
+ 0,
+ 11,
+ 256,
+ CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+ "http://maps-for-free.com/layer/relief/z#Z#/row#Y#/#Z#_#X#-#Y#.jpg";,
+ champlain_map_source_new_generic,
+ NULL);
champlain_map_source_factory_register (factory, desc);
#ifdef CHAMPLAIN_HAS_MEMPHIS
desc = champlain_map_source_desc_new_full (
- CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL,
- "OpenStreetMap Memphis Local Map",
- "(CC) BY 2.0 OpenStreetMap contributors",
- "http://creativecommons.org/licenses/by/2.0/";,
- 12,
- 18,
- 256,
- CHAMPLAIN_MAP_PROJECTION_MERCATOR,
- "",
- champlain_map_source_new_memphis,
- NULL);
+ CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL,
+ "OpenStreetMap Memphis Local Map",
+ "(CC) BY 2.0 OpenStreetMap contributors",
+ "http://creativecommons.org/licenses/by/2.0/";,
+ 12,
+ 18,
+ 256,
+ CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+ "",
+ champlain_map_source_new_memphis,
+ NULL);
champlain_map_source_factory_register (factory, desc);
desc = champlain_map_source_desc_new_full (
- CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK,
- "OpenStreetMap Memphis Network Map",
- "(CC) BY 2.0 OpenStreetMap contributors",
- "http://creativecommons.org/licenses/by/2.0/";,
- 12,
- 18,
- 256,
- CHAMPLAIN_MAP_PROJECTION_MERCATOR,
- "",
- champlain_map_source_new_memphis,
- NULL);
+ CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK,
+ "OpenStreetMap Memphis Network Map",
+ "(CC) BY 2.0 OpenStreetMap contributors",
+ "http://creativecommons.org/licenses/by/2.0/";,
+ 12,
+ 18,
+ 256,
+ CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+ "",
+ champlain_map_source_new_memphis,
+ NULL);
champlain_map_source_factory_register (factory, desc);
#endif
}
@@ -342,7 +342,7 @@ champlain_map_source_factory_create (ChamplainMapSourceFactory *factory,
if (strcmp (champlain_map_source_desc_get_id (desc), id) == 0)
{
ChamplainMapSourceConstructor constructor;
-
+
constructor = champlain_map_source_desc_get_constructor (desc);
return constructor (desc);
}
@@ -432,7 +432,7 @@ champlain_map_source_factory_create_error_source (ChamplainMapSourceFactory *fac
* Registers the new map source with the given constructor. When this map
* source is requested, the given constructor will be used to build the
* map source. #ChamplainMapSourceFactory will take ownership of the passed
- * #ChamplainMapSourceDesc, so don't free it.
+ * #ChamplainMapSourceDesc, so don't free it.
*
* Returns: TRUE if the registration suceeded.
*
@@ -456,32 +456,32 @@ champlain_map_source_new_generic (ChamplainMapSourceDesc *desc)
gchar *id, *name, *license, *license_uri, *uri_format;
guint min_zoom, max_zoom, tile_size;
ChamplainMapProjection projection;
-
- g_object_get (G_OBJECT (desc),
- "id", &id,
+
+ g_object_get (G_OBJECT (desc),
+ "id", &id,
"name", &name,
"license", &license,
"license-uri", &license_uri,
"min-zoom-level", &min_zoom,
"max-zoom-level", &max_zoom,
- "tile-size", &tile_size,
+ "tile-size", &tile_size,
"projection", &projection,
"uri-format", &uri_format,
NULL);
renderer = CHAMPLAIN_RENDERER (champlain_image_renderer_new ());
-
+
map_source = CHAMPLAIN_MAP_SOURCE (champlain_network_tile_source_new_full (
- id,
- name,
- license,
- license_uri,
- min_zoom,
- max_zoom,
- tile_size,
- projection,
- uri_format,
- renderer));
+ id,
+ name,
+ license,
+ license_uri,
+ min_zoom,
+ max_zoom,
+ tile_size,
+ projection,
+ uri_format,
+ renderer));
return map_source;
}
@@ -496,48 +496,49 @@ champlain_map_source_new_memphis (ChamplainMapSourceDesc *desc)
gchar *id, *name, *license, *license_uri;
guint min_zoom, max_zoom, tile_size;
ChamplainMapProjection projection;
-
- g_object_get (G_OBJECT (desc),
- "id", &id,
- "name", &name,
- "license", &license,
- "license-uri", &license_uri,
- "min-zoom-level", &min_zoom,
- "max-zoom-level", &max_zoom,
- "tile-size", &tile_size,
- "projection", &projection,
- NULL);
+
+ g_object_get (G_OBJECT (desc),
+ "id", &id,
+ "name", &name,
+ "license", &license,
+ "license-uri", &license_uri,
+ "min-zoom-level", &min_zoom,
+ "max-zoom-level", &max_zoom,
+ "tile-size", &tile_size,
+ "projection", &projection,
+ NULL);
renderer = CHAMPLAIN_RENDERER (champlain_memphis_renderer_new_full (tile_size));
-
+
if (g_strcmp0 (id, CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL) == 0)
{
map_source = CHAMPLAIN_MAP_SOURCE (champlain_file_tile_source_new_full (
- id,
- name,
- license,
- license_uri,
- min_zoom,
- max_zoom,
- tile_size,
- projection,
- renderer));
+ id,
+ name,
+ license,
+ license_uri,
+ min_zoom,
+ max_zoom,
+ tile_size,
+ projection,
+ renderer));
}
else
{
map_source = CHAMPLAIN_MAP_SOURCE (champlain_network_bbox_tile_source_new_full (
- id,
- name,
- license,
- license_uri,
- min_zoom,
- max_zoom,
- tile_size,
- projection,
- renderer));
+ id,
+ name,
+ license,
+ license_uri,
+ min_zoom,
+ max_zoom,
+ tile_size,
+ projection,
+ renderer));
}
return map_source;
}
+
#endif
diff --git a/champlain/champlain-map-source.c b/champlain/champlain-map-source.c
index a50fa03..1f25d0c 100644
--- a/champlain/champlain-map-source.c
+++ b/champlain/champlain-map-source.c
@@ -194,10 +194,10 @@ champlain_map_source_class_init (ChamplainMapSourceClass *klass)
* Since: 0.6
*/
pspec = g_param_spec_object ("next-source",
- "Next Source",
- "Next source in the loading chain",
- CHAMPLAIN_TYPE_MAP_SOURCE,
- G_PARAM_READWRITE);
+ "Next Source",
+ "Next source in the loading chain",
+ CHAMPLAIN_TYPE_MAP_SOURCE,
+ G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_NEXT_SOURCE, pspec);
/**
@@ -208,10 +208,10 @@ champlain_map_source_class_init (ChamplainMapSourceClass *klass)
* Since: 0.8
*/
pspec = g_param_spec_object ("renderer",
- "Tile renderer",
- "Tile renderer used to render tiles",
- CHAMPLAIN_TYPE_RENDERER,
- G_PARAM_READWRITE);
+ "Tile renderer",
+ "Tile renderer used to render tiles",
+ CHAMPLAIN_TYPE_RENDERER,
+ G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_RENDERER, pspec);
}
@@ -527,9 +527,9 @@ champlain_map_source_get_y (ChamplainMapSource *map_source,
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (map_source), 0);
latitude = CLAMP (latitude, CHAMPLAIN_MIN_LATITUDE, CHAMPLAIN_MAX_LATITUDE);
-
+
/* FIXME: support other projections */
- return ((1.0 - log (tan (latitude * M_PI / 180.0) + 1.0 / cos (latitude * M_PI / 180.0)) / M_PI) /
+ return ((1.0 - log (tan (latitude * M_PI / 180.0) + 1.0 / cos (latitude * M_PI / 180.0)) / M_PI) /
2.0 * pow (2.0, zoom_level)) * champlain_map_source_get_tile_size (map_source);
}
@@ -553,12 +553,12 @@ champlain_map_source_get_longitude (ChamplainMapSource *map_source,
gdouble x)
{
gdouble longitude;
-
+
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (map_source), 0.0);
/* FIXME: support other projections */
gdouble dx = (gdouble) x / champlain_map_source_get_tile_size (map_source);
- longitude = dx / pow (2.0, zoom_level) * 360.0 - 180.0;
-
+ longitude = dx / pow (2.0, zoom_level) * 360.0 - 180.0;
+
return CLAMP (longitude, CHAMPLAIN_MIN_LONGITUDE, CHAMPLAIN_MAX_LONGITUDE);
}
@@ -582,13 +582,13 @@ champlain_map_source_get_latitude (ChamplainMapSource *map_source,
gdouble y)
{
gdouble latitude;
-
+
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (map_source), 0.0);
/* FIXME: support other projections */
gdouble dy = (gdouble) y / champlain_map_source_get_tile_size (map_source);
gdouble n = M_PI - 2.0 * M_PI * dy / pow (2.0, zoom_level);
- latitude = 180.0 / M_PI * atan (0.5 * (exp (n) - exp (-n)));
-
+ latitude = 180.0 / M_PI *atan (0.5 * (exp (n) - exp (-n)));
+
return CLAMP (latitude, CHAMPLAIN_MIN_LATITUDE, CHAMPLAIN_MAX_LATITUDE);
}
@@ -659,7 +659,7 @@ champlain_map_source_get_meters_per_pixel (ChamplainMapSource *map_source,
{
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (map_source), 0.0);
- /*
+ /*
* Width is in pixels. (1 px)
* m/px = radius_at_latitude / width_in_pixels
* k = radius of earth = 6 378.1 km
@@ -668,7 +668,7 @@ champlain_map_source_get_meters_per_pixel (ChamplainMapSource *map_source,
gdouble tile_size = champlain_map_source_get_tile_size (map_source);
/* FIXME: support other projections */
- return 2.0 * M_PI *EARTH_RADIUS * sin (M_PI / 2.0 - M_PI / 180.0 * latitude) /
+ return 2.0 *M_PI *EARTH_RADIUS *sin (M_PI / 2.0 - M_PI / 180.0 *latitude) /
(tile_size * champlain_map_source_get_row_count (map_source, zoom_level));
}
diff --git a/champlain/champlain-marker-layer.c b/champlain/champlain-marker-layer.c
index 4bf0665..ebbf025 100644
--- a/champlain/champlain-marker-layer.c
+++ b/champlain/champlain-marker-layer.c
@@ -22,7 +22,7 @@
* @short_description: A container for #ChamplainMarker
*
* A ChamplainMarkerLayer displays markers on the map. It is responsible for
- * positioning markers correctly, marker selections and group marker operations.
+ * positioning markers correctly, marker selections and group marker operations.
*/
#include "config.h"
@@ -59,7 +59,7 @@ struct _ChamplainMarkerLayerPrivate
{
ChamplainSelectionMode mode;
ChamplainView *view;
-
+
ClutterGroup *content_group;
};
@@ -67,7 +67,7 @@ struct _ChamplainMarkerLayerPrivate
static void marker_selected_cb (ChamplainMarker *marker,
G_GNUC_UNUSED GParamSpec *arg1,
ChamplainMarkerLayer *layer);
-
+
static void set_view (ChamplainLayer *layer,
ChamplainView *view);
@@ -82,13 +82,13 @@ champlain_marker_layer_get_property (GObject *object,
{
ChamplainMarkerLayer *self = CHAMPLAIN_MARKER_LAYER (object);
ChamplainMarkerLayerPrivate *priv = self->priv;
-
+
switch (property_id)
{
case PROP_SELECTION_MODE:
g_value_set_enum (value, priv->mode);
break;
-
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -102,13 +102,13 @@ champlain_marker_layer_set_property (GObject *object,
GParamSpec *pspec)
{
ChamplainMarkerLayer *self = CHAMPLAIN_MARKER_LAYER (object);
-
+
switch (property_id)
{
case PROP_SELECTION_MODE:
champlain_marker_layer_set_selection_mode (self, g_value_get_enum (value));
break;
-
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -119,13 +119,13 @@ static void
paint (ClutterActor *self)
{
ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (self);
-
+
clutter_actor_paint (CLUTTER_ACTOR (priv->content_group));
}
static void
-pick (ClutterActor *self,
+pick (ClutterActor *self,
const ClutterColor *color)
{
ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (self);
@@ -213,7 +213,7 @@ champlain_marker_layer_dispose (GObject *object)
{
ChamplainMarkerLayer *self = CHAMPLAIN_MARKER_LAYER (object);
ChamplainMarkerLayerPrivate *priv = self->priv;
-
+
if (priv->view != NULL)
{
set_view (CHAMPLAIN_LAYER (self), NULL);
@@ -244,12 +244,12 @@ champlain_marker_layer_class_init (ChamplainMarkerLayerClass *klass)
ChamplainLayerClass *layer_class = CHAMPLAIN_LAYER_CLASS (klass);
g_type_class_add_private (klass, sizeof (ChamplainMarkerLayerPrivate));
-
+
object_class->finalize = champlain_marker_layer_finalize;
object_class->dispose = champlain_marker_layer_dispose;
object_class->get_property = champlain_marker_layer_get_property;
object_class->set_property = champlain_marker_layer_set_property;
-
+
actor_class->get_preferred_width = get_preferred_width;
actor_class->get_preferred_height = get_preferred_height;
actor_class->allocate = allocate;
@@ -257,7 +257,7 @@ champlain_marker_layer_class_init (ChamplainMarkerLayerClass *klass)
actor_class->pick = pick;
actor_class->map = map;
actor_class->unmap = unmap;
-
+
layer_class->set_view = set_view;
layer_class->get_bounding_box = get_bounding_box;
@@ -276,7 +276,6 @@ champlain_marker_layer_class_init (ChamplainMarkerLayerClass *klass)
CHAMPLAIN_TYPE_SELECTION_MODE,
CHAMPLAIN_SELECTION_NONE,
CHAMPLAIN_PARAM_READWRITE));
-
}
@@ -284,13 +283,13 @@ static void
champlain_marker_layer_init (ChamplainMarkerLayer *self)
{
ChamplainMarkerLayerPrivate *priv;
-
+
self->priv = GET_PRIVATE (self);
priv = self->priv;
priv->mode = CHAMPLAIN_SELECTION_NONE;
priv->view = NULL;
- //TODO destroy + ref()
+ /* TODO destroy + ref() */
priv->content_group = CLUTTER_GROUP (clutter_group_new ());
clutter_actor_set_parent (CLUTTER_ACTOR (priv->content_group), CLUTTER_ACTOR (self));
@@ -339,24 +338,24 @@ set_selected_all_but_one (ChamplainMarkerLayer *layer,
ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
GList *elem;
GList *markers;
-
+
markers = clutter_container_get_children (CLUTTER_CONTAINER (priv->content_group));
for (elem = markers; elem != NULL; elem = elem->next)
{
ChamplainMarker *marker = CHAMPLAIN_MARKER (elem->data);
-
+
if (marker != not_selected)
{
- g_signal_handlers_block_by_func (marker,
- G_CALLBACK (marker_selected_cb),
+ g_signal_handlers_block_by_func (marker,
+ G_CALLBACK (marker_selected_cb),
layer);
champlain_marker_set_selected (marker, select);
champlain_marker_set_selectable (marker, layer->priv->mode != CHAMPLAIN_SELECTION_NONE);
- g_signal_handlers_unblock_by_func (marker,
- G_CALLBACK (marker_selected_cb),
+ g_signal_handlers_unblock_by_func (marker,
+ G_CALLBACK (marker_selected_cb),
layer);
}
}
@@ -382,16 +381,16 @@ set_marker_position (ChamplainMarkerLayer *layer, ChamplainMarker *marker)
{
ChamplainMarkerLayerPrivate *priv = layer->priv;
gint x, y, origin_x, origin_y;
-
+
/* layer not yet added to the view */
if (priv->view == NULL)
return;
champlain_view_get_viewport_origin (priv->view, &origin_x, &origin_y);
- x = champlain_view_longitude_to_x (priv->view,
- champlain_location_get_longitude (CHAMPLAIN_LOCATION (marker))) + origin_x;
- y = champlain_view_latitude_to_y (priv->view,
- champlain_location_get_latitude (CHAMPLAIN_LOCATION (marker))) + origin_y;
+ x = champlain_view_longitude_to_x (priv->view,
+ champlain_location_get_longitude (CHAMPLAIN_LOCATION (marker))) + origin_x;
+ y = champlain_view_latitude_to_y (priv->view,
+ champlain_location_get_latitude (CHAMPLAIN_LOCATION (marker))) + origin_y;
clutter_actor_set_position (CLUTTER_ACTOR (marker), x, y);
}
@@ -419,13 +418,13 @@ marker_move_by_cb (ChamplainMarker *marker,
x = champlain_view_longitude_to_x (view, champlain_location_get_longitude (CHAMPLAIN_LOCATION (marker)));
y = champlain_view_latitude_to_y (view, champlain_location_get_latitude (CHAMPLAIN_LOCATION (marker)));
-
+
x += dx;
y += dy;
lon = champlain_view_x_to_longitude (view, x);
lat = champlain_view_y_to_latitude (view, y);
-
+
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), lat, lon);
}
@@ -458,7 +457,7 @@ champlain_marker_layer_add_marker (ChamplainMarkerLayer *layer,
g_signal_connect (G_OBJECT (marker), "drag-motion",
G_CALLBACK (marker_move_by_cb), layer);
-
+
clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), CLUTTER_ACTOR (marker));
set_marker_position (layer, marker);
}
@@ -472,12 +471,13 @@ champlain_marker_layer_add_marker (ChamplainMarkerLayer *layer,
*
* Since: 0.10
*/
-void champlain_marker_layer_remove_all (ChamplainMarkerLayer *layer)
+void
+champlain_marker_layer_remove_all (ChamplainMarkerLayer *layer)
{
ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
GList *elem;
GList *markers;
-
+
g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer));
markers = clutter_container_get_children (CLUTTER_CONTAINER (priv->content_group));
@@ -485,7 +485,7 @@ void champlain_marker_layer_remove_all (ChamplainMarkerLayer *layer)
for (elem = markers; elem != NULL; elem = elem->next)
{
GObject *marker = G_OBJECT (elem->data);
-
+
g_signal_handlers_disconnect_by_func (marker,
G_CALLBACK (marker_selected_cb), layer);
@@ -504,7 +504,7 @@ void champlain_marker_layer_remove_all (ChamplainMarkerLayer *layer)
*
* Gets a copy of the list of all markers inserted into the layer. You should
* free the list but not its contents.
- *
+ *
* Returns: (transfer container) (element-type ChamplainMarker): the list
*
* Since: 0.10
@@ -523,7 +523,7 @@ champlain_marker_layer_get_markers (ChamplainMarkerLayer *layer)
* @layer: a #ChamplainMarkerLayer
*
* Gets a list of selected markers.
- *
+ *
* Returns: (transfer container) (element-type ChamplainMarker): the list
*
* Since: 0.10
@@ -539,7 +539,7 @@ champlain_marker_layer_get_selected (ChamplainMarkerLayer *layer)
g_return_val_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer), NULL);
markers = clutter_container_get_children (CLUTTER_CONTAINER (priv->content_group));
-
+
for (elem = markers; elem != NULL; elem = elem->next)
{
ChamplainMarker *marker = CHAMPLAIN_MARKER (elem->data);
@@ -549,7 +549,7 @@ champlain_marker_layer_get_selected (ChamplainMarkerLayer *layer)
}
g_list_free (markers);
-
+
return selected;
}
@@ -568,7 +568,7 @@ champlain_marker_layer_remove_marker (ChamplainMarkerLayer *layer,
ChamplainMarker *marker)
{
ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
-
+
g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer));
g_return_if_fail (CHAMPLAIN_IS_MARKER (marker));
@@ -601,7 +601,7 @@ champlain_marker_layer_animate_in_all_markers (ChamplainMarkerLayer *layer)
g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer));
markers = clutter_container_get_children (CLUTTER_CONTAINER (priv->content_group));
-
+
for (elem = markers; elem != NULL; elem = elem->next)
{
ChamplainMarker *marker = CHAMPLAIN_MARKER (elem->data);
@@ -626,7 +626,7 @@ void
champlain_marker_layer_animate_out_all_markers (ChamplainMarkerLayer *layer)
{
ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
-
+
GList *elem;
guint delay = 0;
GList *markers;
@@ -634,7 +634,7 @@ champlain_marker_layer_animate_out_all_markers (ChamplainMarkerLayer *layer)
g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer));
markers = clutter_container_get_children (CLUTTER_CONTAINER (priv->content_group));
-
+
for (elem = markers; elem != NULL; elem = elem->next)
{
ChamplainMarker *marker = CHAMPLAIN_MARKER (elem->data);
@@ -676,6 +676,7 @@ champlain_marker_layer_show_all_markers (ChamplainMarkerLayer *layer)
g_list_free (markers);
}
+
/**
* champlain_marker_layer_hide_all_markers:
* @layer: a #ChamplainMarkerLayer
@@ -787,7 +788,7 @@ champlain_marker_layer_unselect_all_markers (ChamplainMarkerLayer *layer)
* champlain_marker_layer_select_all_markers:
* @layer: a #ChamplainMarkerLayer
*
- * Selects all markers in the layer.
+ * Selects all markers in the layer.
*
* Since: 0.10
*/
@@ -819,13 +820,13 @@ champlain_marker_layer_set_selection_mode (ChamplainMarkerLayer *layer,
g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer));
gboolean select;
-
+
if (layer->priv->mode == mode)
return;
layer->priv->mode = mode;
select = mode != CHAMPLAIN_SELECTION_NONE &&
- mode != CHAMPLAIN_SELECTION_SINGLE;
+ mode != CHAMPLAIN_SELECTION_SINGLE;
set_selected_all_but_one (layer, NULL, select);
@@ -857,7 +858,7 @@ static void
relocate (ChamplainMarkerLayer *layer)
{
g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer));
-
+
ChamplainMarkerLayerPrivate *priv = layer->priv;
GList *elem;
GList *markers;
@@ -869,7 +870,7 @@ relocate (ChamplainMarkerLayer *layer)
for (elem = markers; elem != NULL; elem = elem->next)
{
ChamplainMarker *marker = CHAMPLAIN_MARKER (elem->data);
-
+
set_marker_position (layer, marker);
}
@@ -882,34 +883,34 @@ relocate_cb (G_GNUC_UNUSED GObject *gobject,
ChamplainMarkerLayer *layer)
{
g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer));
-
+
relocate (layer);
}
-static void
+static void
set_view (ChamplainLayer *layer,
ChamplainView *view)
{
g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer) && (CHAMPLAIN_IS_VIEW (view) || view == NULL));
-
+
ChamplainMarkerLayer *marker_layer = CHAMPLAIN_MARKER_LAYER (layer);
-
+
if (marker_layer->priv->view != NULL)
{
g_signal_handlers_disconnect_by_func (marker_layer->priv->view,
- G_CALLBACK (relocate_cb), marker_layer);
+ G_CALLBACK (relocate_cb), marker_layer);
g_object_unref (marker_layer->priv->view);
}
-
+
marker_layer->priv->view = view;
if (view != NULL)
{
g_object_ref (view);
-
+
g_signal_connect (view, "layer-relocated",
- G_CALLBACK (relocate_cb), layer);
+ G_CALLBACK (relocate_cb), layer);
relocate (marker_layer);
}
@@ -925,7 +926,7 @@ get_bounding_box (ChamplainLayer *layer)
GList *markers;
g_return_val_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer), NULL);
-
+
bbox = champlain_bounding_box_new ();
markers = clutter_container_get_children (CLUTTER_CONTAINER (priv->content_group));
@@ -934,15 +935,15 @@ get_bounding_box (ChamplainLayer *layer)
{
ChamplainMarker *marker = CHAMPLAIN_MARKER (elem->data);
gdouble lat, lon;
-
+
g_object_get (G_OBJECT (marker), "latitude", &lat, "longitude", &lon,
NULL);
- champlain_bounding_box_extend (bbox, lat, lon);
+ champlain_bounding_box_extend (bbox, lat, lon);
}
g_list_free (markers);
-
+
if (bbox->left == bbox->right)
{
bbox->left -= 0.0001;
diff --git a/champlain/champlain-marker-layer.h b/champlain/champlain-marker-layer.h
index 0647035..aa58c1a 100644
--- a/champlain/champlain-marker-layer.h
+++ b/champlain/champlain-marker-layer.h
@@ -74,7 +74,7 @@ typedef enum
struct _ChamplainMarkerLayer
{
ChamplainLayer parent;
-
+
ChamplainMarkerLayerPrivate *priv;
};
diff --git a/champlain/champlain-marker.c b/champlain/champlain-marker.c
index cfefb75..3df4646 100644
--- a/champlain/champlain-marker.c
+++ b/champlain/champlain-marker.c
@@ -85,8 +85,8 @@ static gdouble get_longitude (ChamplainLocation *location);
static void location_interface_init (ChamplainLocationIface *iface);
G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ChamplainMarker, champlain_marker, CLUTTER_TYPE_ACTOR,
- G_IMPLEMENT_INTERFACE (CHAMPLAIN_TYPE_LOCATION,
- location_interface_init));
+ G_IMPLEMENT_INTERFACE (CHAMPLAIN_TYPE_LOCATION,
+ location_interface_init));
#define CHAMPLAIN_MARKER_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CHAMPLAIN_TYPE_MARKER, ChamplainMarkerPrivate))
@@ -98,7 +98,7 @@ struct _ChamplainMarkerPrivate
gboolean selected;
gboolean selectable;
gboolean draggable;
-
+
gfloat click_x;
gfloat click_y;
gboolean moved;
@@ -201,11 +201,11 @@ champlain_marker_get_property (GObject *object,
case PROP_SELECTABLE:
g_value_set_boolean (value, priv->selectable);
break;
-
+
case PROP_DRAGGABLE:
g_value_set_boolean (value, priv->draggable);
break;
-
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@@ -224,39 +224,39 @@ champlain_marker_set_property (GObject *object,
switch (prop_id)
{
case PROP_LONGITUDE:
- {
- gdouble lon = g_value_get_double (value);
- set_location (CHAMPLAIN_LOCATION (marker), priv->lat, lon);
- break;
- }
+ {
+ gdouble lon = g_value_get_double (value);
+ set_location (CHAMPLAIN_LOCATION (marker), priv->lat, lon);
+ break;
+ }
case PROP_LATITUDE:
- {
- gdouble lat = g_value_get_double (value);
- set_location (CHAMPLAIN_LOCATION (marker), lat, priv->lon);
- break;
- }
+ {
+ gdouble lat = g_value_get_double (value);
+ set_location (CHAMPLAIN_LOCATION (marker), lat, priv->lon);
+ break;
+ }
case PROP_SELECTED:
- {
- gboolean bvalue = g_value_get_boolean (value);
- champlain_marker_set_selected (marker, bvalue);
- break;
- }
+ {
+ gboolean bvalue = g_value_get_boolean (value);
+ champlain_marker_set_selected (marker, bvalue);
+ break;
+ }
case PROP_SELECTABLE:
- {
- gboolean bvalue = g_value_get_boolean (value);
- champlain_marker_set_selectable (marker, bvalue);
- break;
- }
+ {
+ gboolean bvalue = g_value_get_boolean (value);
+ champlain_marker_set_selectable (marker, bvalue);
+ break;
+ }
case PROP_DRAGGABLE:
- {
- gboolean bvalue = g_value_get_boolean (value);
- champlain_marker_set_draggable (marker, bvalue);
- break;
- }
+ {
+ gboolean bvalue = g_value_get_boolean (value);
+ champlain_marker_set_draggable (marker, bvalue);
+ break;
+ }
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -348,7 +348,7 @@ champlain_marker_class_init (ChamplainMarkerClass *marker_class)
g_param_spec_boolean ("selected", "Selected",
"The sighlighted state of the marker",
FALSE, CHAMPLAIN_PARAM_READWRITE));
-
+
/**
* ChamplainMarker:selectable:
*
@@ -375,7 +375,7 @@ champlain_marker_class_init (ChamplainMarkerClass *marker_class)
/**
* ChamplainMarker::button-press:
- * @event: the underlying ClutterEvent
+ * @event: the underlying ClutterEvent
*
* Emitted when button is pressed.
*
@@ -388,7 +388,7 @@ champlain_marker_class_init (ChamplainMarkerClass *marker_class)
/**
* ChamplainMarker::button-release:
- * @event: the underlying ClutterEvent
+ * @event: the underlying ClutterEvent
*
* Emitted when button is released. This signal is not emmitted at the end of dragging.
*
@@ -401,9 +401,9 @@ champlain_marker_class_init (ChamplainMarkerClass *marker_class)
/**
* ChamplainMarker::drag-motion:
- * @dx: by how much the marker has been moved in the x direction
- * @dy: by how much the marker has been moved in the y direction
- * @event: the underlying ClutterEvent
+ * @dx: by how much the marker has been moved in the x direction
+ * @dy: by how much the marker has been moved in the y direction
+ * @event: the underlying ClutterEvent
*
* Emmitted when the marker is dragged by mouse. dx and dy specify by how much
* the marker has been dragged since last time.
@@ -414,10 +414,10 @@ champlain_marker_class_init (ChamplainMarkerClass *marker_class)
g_signal_new ("drag-motion", G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
_champlain_marshal_VOID__DOUBLE_DOUBLE_BOXED, G_TYPE_NONE, 3, G_TYPE_DOUBLE, G_TYPE_DOUBLE, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
-
+
/**
* ChamplainMarker::drag-finish:
- * @event: the underlying ClutterEvent
+ * @event: the underlying ClutterEvent
*
* Emitted when marker dragging ends (i.e. the button is released at the end
* of dragging).
@@ -429,21 +429,21 @@ champlain_marker_class_init (ChamplainMarkerClass *marker_class)
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, CLUTTER_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
-
+
g_object_class_override_property (object_class,
- PROP_LONGITUDE,
- "longitude");
+ PROP_LONGITUDE,
+ "longitude");
g_object_class_override_property (object_class,
- PROP_LATITUDE,
- "latitude");
+ PROP_LATITUDE,
+ "latitude");
}
static gboolean
-motion_event_cb (ClutterActor *stage,
- ClutterMotionEvent *event,
- ChamplainMarker *marker)
+motion_event_cb (ClutterActor *stage,
+ ClutterMotionEvent *event,
+ ChamplainMarker *marker)
{
ChamplainMarkerPrivate *priv = marker->priv;
gfloat x, y;
@@ -452,9 +452,9 @@ motion_event_cb (ClutterActor *stage,
return FALSE;
if (clutter_actor_transform_stage_point (CLUTTER_ACTOR (marker),
- event->x,
- event->y,
- &x, &y))
+ event->x,
+ event->y,
+ &x, &y))
{
g_signal_emit_by_name (marker, "drag-motion", x - priv->click_x, y - priv->click_y, event);
priv->moved = TRUE;
@@ -465,9 +465,9 @@ motion_event_cb (ClutterActor *stage,
static gboolean
-capture_release_event_cb (ClutterActor *stage,
- ClutterButtonEvent *event,
- ChamplainMarker *marker)
+capture_release_event_cb (ClutterActor *stage,
+ ClutterButtonEvent *event,
+ ChamplainMarker *marker)
{
ChamplainMarkerPrivate *priv = marker->priv;
@@ -476,34 +476,34 @@ capture_release_event_cb (ClutterActor *stage,
return FALSE;
g_signal_handlers_disconnect_by_func (stage,
- motion_event_cb,
- marker);
+ motion_event_cb,
+ marker);
g_signal_handlers_disconnect_by_func (stage,
- capture_release_event_cb,
- marker);
-
+ capture_release_event_cb,
+ marker);
+
if (priv->moved)
g_signal_emit_by_name (marker, "drag-finish", event);
else
g_signal_emit_by_name (marker, "button-release", event);
-
+
return TRUE;
}
static gboolean
-button_release_event_cb (ClutterActor *actor,
- ClutterButtonEvent *event,
- ChamplainMarker *marker)
+button_release_event_cb (ClutterActor *actor,
+ ClutterButtonEvent *event,
+ ChamplainMarker *marker)
{
if ((event->type != CLUTTER_BUTTON_RELEASE) ||
(event->button != 1))
return FALSE;
g_signal_handlers_disconnect_by_func (marker,
- button_release_event_cb,
- marker);
-
+ button_release_event_cb,
+ marker);
+
g_signal_emit_by_name (marker, "button-release", event);
return TRUE;
@@ -511,12 +511,12 @@ button_release_event_cb (ClutterActor *actor,
static gboolean
-button_press_event_cb (ClutterActor *actor,
- ClutterEvent *event,
- ChamplainMarker *marker)
+button_press_event_cb (ClutterActor *actor,
+ ClutterEvent *event,
+ ChamplainMarker *marker)
{
ChamplainMarkerPrivate *priv = marker->priv;
- ClutterButtonEvent *bevent = (ClutterButtonEvent *)event;
+ ClutterButtonEvent *bevent = (ClutterButtonEvent *) event;
ClutterActor *stage = clutter_actor_get_stage (actor);
if (event->type != CLUTTER_BUTTON_PRESS ||
@@ -526,34 +526,34 @@ button_press_event_cb (ClutterActor *actor,
return FALSE;
}
- if (priv->draggable)
+ if (priv->draggable)
{
if (clutter_actor_transform_stage_point (actor, bevent->x, bevent->y,
- &priv->click_x, &priv->click_y))
+ &priv->click_x, &priv->click_y))
{
priv->moved = FALSE;
g_signal_connect (stage,
- "captured-event",
- G_CALLBACK (motion_event_cb),
- marker);
-
+ "captured-event",
+ G_CALLBACK (motion_event_cb),
+ marker);
+
g_signal_connect (stage,
- "captured-event",
- G_CALLBACK (capture_release_event_cb),
- marker);
+ "captured-event",
+ G_CALLBACK (capture_release_event_cb),
+ marker);
}
}
else
{
g_signal_connect (marker,
- "button-release-event",
- G_CALLBACK (button_release_event_cb),
- marker);
+ "button-release-event",
+ G_CALLBACK (button_release_event_cb),
+ marker);
}
if (priv->selectable)
champlain_marker_set_selected (marker, TRUE);
-
+
if (priv->selectable || priv->draggable)
clutter_actor_raise (CLUTTER_ACTOR (marker), NULL);
@@ -575,17 +575,16 @@ champlain_marker_init (ChamplainMarker *marker)
priv->selected = FALSE;
priv->selectable = TRUE;
priv->draggable = FALSE;
-
+
clutter_actor_set_reactive (CLUTTER_ACTOR (marker), TRUE);
-
+
g_signal_connect (marker,
- "button-press-event",
- G_CALLBACK (button_press_event_cb),
- marker);
+ "button-press-event",
+ G_CALLBACK (button_press_event_cb),
+ marker);
}
-
/**
* champlain_marker_set_selected:
* @marker: a #ChamplainMarker
@@ -632,7 +631,7 @@ champlain_marker_get_selected (ChamplainMarker *marker)
* @marker: a #ChamplainMarker
* @value: the selectable state
*
- * Sets the marker as selectable or not.
+ * Sets the marker as selectable or not.
*
* Since: 0.10
*/
@@ -666,12 +665,13 @@ champlain_marker_get_selectable (ChamplainMarker *marker)
return marker->priv->selectable;
}
+
/**
* champlain_marker_set_draggable:
* @marker: a #ChamplainMarker
* @value: the draggable state
*
- * Sets the marker as draggable or not.
+ * Sets the marker as draggable or not.
*
* Since: 0.10
*/
@@ -705,6 +705,7 @@ champlain_marker_get_draggable (ChamplainMarker *marker)
return marker->priv->draggable;
}
+
/**
* champlain_marker_animate_in:
* @marker: The marker
@@ -819,8 +820,8 @@ champlain_marker_animate_out_with_delay (ChamplainMarker *marker,
timeline = clutter_timeline_new (750);
clutter_timeline_set_delay (timeline, delay);
animation = clutter_actor_animate_with_timeline (CLUTTER_ACTOR (marker),
- CLUTTER_EASE_IN_BACK, timeline, "opacity", 0, "y", y - 100,
- "scale-x", 2.0, "scale-y", 2.0, NULL);
+ CLUTTER_EASE_IN_BACK, timeline, "opacity", 0, "y", y - 100,
+ "scale-x", 2.0, "scale-y", 2.0, NULL);
g_signal_connect (animation, "completed",
G_CALLBACK (on_animation_completed), marker);
}
diff --git a/champlain/champlain-memory-cache.c b/champlain/champlain-memory-cache.c
index 11da11b..ea65623 100644
--- a/champlain/champlain-memory-cache.c
+++ b/champlain/champlain-memory-cache.c
@@ -23,7 +23,7 @@
* #ChamplainMemoryCache is a cache that stores and retrieves tiles from the
* memory. The cache contents is not preserved between application restarts
* so this cache serves mostly as a quick access temporary cache to the
- * most recently used tiles.
+ * most recently used tiles.
*/
#define DEBUG_FLAG CHAMPLAIN_DEBUG_CACHE
@@ -156,12 +156,12 @@ champlain_memory_cache_class_init (ChamplainMemoryCacheClass *klass)
* Since: 0.8
*/
pspec = g_param_spec_uint ("size-limit",
- "Size Limit",
- "Maximal number of stored tiles",
- 1,
- G_MAXINT,
- 100,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
+ "Size Limit",
+ "Maximal number of stored tiles",
+ 1,
+ G_MAXINT,
+ 100,
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_SIZE_LIMIT, pspec);
tile_cache_class->store_tile = store_tile;
@@ -190,9 +190,9 @@ champlain_memory_cache_new_full (guint size_limit,
ChamplainMemoryCache *cache;
cache = g_object_new (CHAMPLAIN_TYPE_MEMORY_CACHE,
- "size-limit", size_limit,
- "renderer", renderer,
- NULL);
+ "size-limit", size_limit,
+ "renderer", renderer,
+ NULL);
return cache;
}
@@ -262,10 +262,10 @@ generate_queue_key (ChamplainMemoryCache *memory_cache,
gchar *key;
key = g_strdup_printf ("%d/%d/%d/%s",
- champlain_tile_get_zoom_level (tile),
- champlain_tile_get_x (tile),
- champlain_tile_get_y (tile),
- champlain_map_source_get_id (map_source));
+ champlain_tile_get_zoom_level (tile),
+ champlain_tile_get_x (tile),
+ champlain_tile_get_y (tile),
+ champlain_map_source_get_id (map_source));
return key;
}
diff --git a/champlain/champlain-memphis-renderer.c b/champlain/champlain-memphis-renderer.c
index ba2bca5..fe65a2f 100644
--- a/champlain/champlain-memphis-renderer.c
+++ b/champlain/champlain-memphis-renderer.c
@@ -256,7 +256,7 @@ champlain_memphis_renderer_init (ChamplainMemphisRenderer *renderer)
priv->renderer = memphis_renderer_new_full (priv->rules, memphis_map_new ());
priv->thpool = g_thread_pool_new (memphis_worker_thread, renderer,
- MAX_THREADS, FALSE, NULL);
+ MAX_THREADS, FALSE, NULL);
priv->bbox = NULL;
}
@@ -337,8 +337,8 @@ tile_loaded_cb (gpointer worker_data)
cairo_image_surface_get_stride (cst) * cairo_image_surface_get_height (cst));
pixbuf = gdk_pixbuf_new_from_data (cairo_image_surface_get_data (cst),
- GDK_COLORSPACE_RGB, TRUE, 8, size, size,
- cairo_image_surface_get_stride (cst), NULL, NULL);
+ GDK_COLORSPACE_RGB, TRUE, 8, size, size,
+ cairo_image_surface_get_stride (cst), NULL, NULL);
if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &buffer_size, "png", NULL, NULL))
goto finish;
diff --git a/champlain/champlain-memphis-renderer.h b/champlain/champlain-memphis-renderer.h
index b98a8da..361d3ed 100644
--- a/champlain/champlain-memphis-renderer.h
+++ b/champlain/champlain-memphis-renderer.h
@@ -62,8 +62,8 @@ typedef struct _ChamplainMemphisRuleAttr ChamplainMemphisRuleAttr;
* @CHAMPLAIN_MEMPHIS_RULE_TYPE_NODE: MEMPHIS_RULE_TYPE_NODE
* @CHAMPLAIN_MEMPHIS_RULE_TYPE_WAY: MEMPHIS_RULE_TYPE_WAY
* @CHAMPLAIN_MEMPHIS_RULE_TYPE_RELATION: MEMPHIS_RULE_TYPE_RELATION
- *
- * A wrapper of the MemphisRuleType union. For details see the libmemphis
+ *
+ * A wrapper of the MemphisRuleType union. For details see the libmemphis
* documentation.
*
* Since: 0.8
@@ -98,8 +98,8 @@ struct _ChamplainMemphisRendererClass
* @color_alpha: color_alpha
* @style: style
* @size: size
- *
- * A wrapper of the MemphisRuleAttr structure. For details see the libmemphis
+ *
+ * A wrapper of the MemphisRuleAttr structure. For details see the libmemphis
* documentation.
*
* Since: 0.8
@@ -125,8 +125,8 @@ struct _ChamplainMemphisRuleAttr
* @line: line
* @border: border
* @text: text
- *
- * A wrapper of the MemphisRule structure. For details see the libmemphis
+ *
+ * A wrapper of the MemphisRule structure. For details see the libmemphis
* documentation.
*
* Since: 0.8
diff --git a/champlain/champlain-network-bbox-tile-source.c b/champlain/champlain-network-bbox-tile-source.c
index dc458c4..9a8c53e 100644
--- a/champlain/champlain-network-bbox-tile-source.c
+++ b/champlain/champlain-network-bbox-tile-source.c
@@ -214,21 +214,21 @@ champlain_network_bbox_tile_source_class_init (ChamplainNetworkBboxTileSourceCla
G_PARAM_READWRITE));
/**
- * ChamplainNetworkBboxTileSource:state:
- *
- * The map source's state. Useful to know if the data source is loading
- * or not.
- *
- * Since: 0.8
- */
+ * ChamplainNetworkBboxTileSource:state:
+ *
+ * The map source's state. Useful to know if the data source is loading
+ * or not.
+ *
+ * Since: 0.8
+ */
g_object_class_install_property (object_class,
- PROP_STATE,
- g_param_spec_enum ("state",
- "map data source's state",
- "The state of the map data source",
- CHAMPLAIN_TYPE_STATE,
- CHAMPLAIN_STATE_NONE,
- G_PARAM_READWRITE));
+ PROP_STATE,
+ g_param_spec_enum ("state",
+ "map data source's state",
+ "The state of the map data source",
+ CHAMPLAIN_TYPE_STATE,
+ CHAMPLAIN_STATE_NONE,
+ G_PARAM_READWRITE));
}
@@ -243,11 +243,11 @@ champlain_network_bbox_tile_source_init (ChamplainNetworkBboxTileSource *self)
/* informationfreeway.org is a load-balancer for different api servers */
priv->proxy_uri = g_strdup ("");
priv->soup_session = soup_session_async_new_with_options (
- "proxy-uri", soup_uri_new (priv->proxy_uri),
+ "proxy-uri", soup_uri_new (priv->proxy_uri),
#ifdef HAVE_LIBSOUP_GNOME
- SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME,
+ SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME,
#endif
- NULL);
+ NULL);
g_object_set (G_OBJECT (priv->soup_session),
"user-agent", "libchamplain/" CHAMPLAIN_VERSION_S,
"max-conns-per-host", 2, NULL);
@@ -288,15 +288,15 @@ champlain_network_bbox_tile_source_new_full (const gchar *id,
ChamplainNetworkBboxTileSource *source;
source = g_object_new (CHAMPLAIN_TYPE_NETWORK_BBOX_TILE_SOURCE, "id", id,
- "name", name,
- "license", license,
- "license-uri", license_uri,
- "min-zoom-level", min_zoom,
- "max-zoom-level", max_zoom,
- "tile-size", tile_size,
- "projection", projection,
- "renderer", renderer,
- NULL);
+ "name", name,
+ "license", license,
+ "license-uri", license_uri,
+ "min-zoom-level", min_zoom,
+ "max-zoom-level", max_zoom,
+ "tile-size", tile_size,
+ "projection", projection,
+ "renderer", renderer,
+ NULL);
return source;
}
@@ -328,7 +328,7 @@ load_map_data_cb (G_GNUC_UNUSED SoupSession *session, SoupMessage *msg,
* champlain_network_bbox_tile_source_load_map_data:
* @map_data_source: a #ChamplainNetworkBboxTileSource
* @bbox: bounding box of the requested area
- *
+ *
* Asynchronously loads map data within a bounding box from the server.
* The box must not exceed an edge size of 0.25 degree. There are also
* limitations on the maximum number of nodes that can be requested.
@@ -354,8 +354,8 @@ champlain_network_bbox_tile_source_load_map_data (
gchar *url;
url = g_strdup_printf (
- "http://api.openstreetmap.org/api/0.6/map?bbox=%f,%f,%f,%f";,
- bbox->left, bbox->bottom, bbox->right, bbox->top);
+ "http://api.openstreetmap.org/api/0.6/map?bbox=%f,%f,%f,%f";,
+ bbox->left, bbox->bottom, bbox->right, bbox->top);
msg = soup_message_new ("GET", url);
DEBUG ("Request BBox data: '%s'", url);
diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c
index d77f45f..3e6695f 100644
--- a/champlain/champlain-network-tile-source.c
+++ b/champlain/champlain-network-tile-source.c
@@ -103,8 +103,7 @@ typedef struct
static void fill_tile (ChamplainMapSource *map_source,
ChamplainTile *tile);
-static void
-tile_state_notify (ChamplainTile *tile,
+static void tile_state_notify (ChamplainTile *tile,
G_GNUC_UNUSED GParamSpec *pspec,
TileCancelledData *data);
@@ -229,10 +228,10 @@ champlain_network_tile_source_class_init (ChamplainNetworkTileSourceClass *klass
* Since: 0.4
*/
pspec = g_param_spec_string ("uri-format",
- "URI Format",
- "The URI format",
- "",
- (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ "URI Format",
+ "The URI format",
+ "",
+ (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_URI_FORMAT, pspec);
/**
@@ -243,10 +242,10 @@ champlain_network_tile_source_class_init (ChamplainNetworkTileSourceClass *klass
* Since: 0.4
*/
pspec = g_param_spec_boolean ("offline",
- "Offline",
- "Offline",
- FALSE,
- G_PARAM_READWRITE);
+ "Offline",
+ "Offline",
+ FALSE,
+ G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_OFFLINE, pspec);
/**
@@ -257,10 +256,10 @@ champlain_network_tile_source_class_init (ChamplainNetworkTileSourceClass *klass
* Since: 0.4
*/
pspec = g_param_spec_string ("proxy-uri",
- "Proxy URI",
- "The proxy URI to use to access network",
- "",
- G_PARAM_READWRITE);
+ "Proxy URI",
+ "The proxy URI to use to access network",
+ "",
+ G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_PROXY_URI, pspec);
}
@@ -277,11 +276,11 @@ champlain_network_tile_source_init (ChamplainNetworkTileSource *tile_source)
priv->offline = FALSE;
priv->soup_session = soup_session_async_new_with_options (
- "proxy-uri", NULL,
+ "proxy-uri", NULL,
#ifdef HAVE_LIBSOUP_GNOME
- SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME,
+ SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME,
#endif
- NULL);
+ NULL);
g_object_set (G_OBJECT (priv->soup_session),
"user-agent", "libchamplain/" CHAMPLAIN_VERSION_S,
"max-conns-per-host", 2, NULL); /* This is as required by OSM */
@@ -322,17 +321,17 @@ champlain_network_tile_source_new_full (const gchar *id,
ChamplainNetworkTileSource *source;
source = g_object_new (CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE,
- "id", id,
- "name", name,
- "license", license,
- "license-uri", license_uri,
- "min-zoom-level", min_zoom,
- "max-zoom-level", max_zoom,
- "tile-size", tile_size,
- "projection", projection,
- "uri-format", uri_format,
- "renderer", renderer,
- NULL);
+ "id", id,
+ "name", name,
+ "license", license,
+ "license-uri", license_uri,
+ "min-zoom-level", min_zoom,
+ "max-zoom-level", max_zoom,
+ "tile-size", tile_size,
+ "projection", projection,
+ "uri-format", uri_format,
+ "renderer", renderer,
+ NULL);
return source;
}
@@ -723,9 +722,9 @@ fill_tile (ChamplainMapSource *map_source,
gchar *uri;
uri = get_tile_uri (tile_source,
- champlain_tile_get_x (tile),
- champlain_tile_get_y (tile),
- champlain_tile_get_zoom_level (tile));
+ champlain_tile_get_x (tile),
+ champlain_tile_get_y (tile),
+ champlain_tile_get_zoom_level (tile));
msg = soup_message_new (SOUP_METHOD_GET, uri);
g_free (uri);
diff --git a/champlain/champlain-null-tile-source.c b/champlain/champlain-null-tile-source.c
index dd4d8ef..22bcb94 100644
--- a/champlain/champlain-null-tile-source.c
+++ b/champlain/champlain-null-tile-source.c
@@ -88,8 +88,8 @@ champlain_null_tile_source_new_full (ChamplainRenderer *renderer)
ChamplainNullTileSource *source;
source = g_object_new (CHAMPLAIN_TYPE_NULL_TILE_SOURCE,
- "renderer", renderer,
- NULL);
+ "renderer", renderer,
+ NULL);
return source;
}
@@ -163,4 +163,3 @@ fill_tile (ChamplainMapSource *map_source,
champlain_tile_display_content (tile);
}
}
-
diff --git a/champlain/champlain-path-layer.c b/champlain/champlain-path-layer.c
index 3156c06..ff81f19 100644
--- a/champlain/champlain-path-layer.c
+++ b/champlain/champlain-path-layer.c
@@ -67,12 +67,12 @@ enum
static ClutterColor DEFAULT_FILL_COLOR = { 0xcc, 0x00, 0x00, 0xaa };
static ClutterColor DEFAULT_STROKE_COLOR = { 0xa4, 0x00, 0x00, 0xff };
-//static guint signals[LAST_SIGNAL] = { 0, };
+/* static guint signals[LAST_SIGNAL] = { 0, }; */
struct _ChamplainPathLayerPrivate
{
ChamplainView *view;
-
+
gboolean closed_path;
ClutterColor *stroke_color;
gboolean fill;
@@ -80,7 +80,7 @@ struct _ChamplainPathLayerPrivate
gboolean stroke;
gdouble stroke_width;
gboolean visible;
-
+
ClutterGroup *content_group;
ClutterActor *path_actor;
GList *nodes;
@@ -105,7 +105,7 @@ champlain_path_layer_get_property (GObject *object,
{
ChamplainPathLayer *self = CHAMPLAIN_PATH_LAYER (object);
ChamplainPathLayerPrivate *priv = self->priv;
-
+
switch (property_id)
{
case PROP_CLOSED_PATH:
@@ -135,7 +135,7 @@ champlain_path_layer_get_property (GObject *object,
case PROP_VISIBLE:
g_value_set_boolean (value, priv->visible);
break;
-
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -150,7 +150,7 @@ champlain_path_layer_set_property (GObject *object,
{
ChamplainPathLayer *self = CHAMPLAIN_PATH_LAYER (object);
ChamplainPathLayerPrivate *priv = self->priv;
-
+
switch (property_id)
{
case PROP_CLOSED_PATH:
@@ -183,10 +183,10 @@ champlain_path_layer_set_property (GObject *object,
break;
case PROP_VISIBLE:
- champlain_path_layer_set_visible (CHAMPLAIN_PATH_LAYER (object),
- g_value_get_boolean (value));
+ champlain_path_layer_set_visible (CHAMPLAIN_PATH_LAYER (object),
+ g_value_get_boolean (value));
break;
-
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -197,13 +197,13 @@ static void
paint (ClutterActor *self)
{
ChamplainPathLayerPrivate *priv = GET_PRIVATE (self);
-
+
clutter_actor_paint (CLUTTER_ACTOR (priv->content_group));
}
static void
-pick (ClutterActor *self,
+pick (ClutterActor *self,
const ClutterColor *color)
{
ChamplainPathLayerPrivate *priv = GET_PRIVATE (self);
@@ -286,13 +286,12 @@ unmap (ClutterActor *self)
}
-
static void
champlain_path_layer_dispose (GObject *object)
{
ChamplainPathLayer *self = CHAMPLAIN_PATH_LAYER (object);
ChamplainPathLayerPrivate *priv = self->priv;
-
+
if (priv->view != NULL)
{
set_view (CHAMPLAIN_LAYER (self), NULL);
@@ -313,7 +312,7 @@ champlain_path_layer_finalize (GObject *object)
{
ChamplainPathLayer *self = CHAMPLAIN_PATH_LAYER (object);
ChamplainPathLayerPrivate *priv = self->priv;
-
+
clutter_color_free (priv->stroke_color);
clutter_color_free (priv->fill_color);
g_list_free (priv->nodes);
@@ -330,12 +329,12 @@ champlain_path_layer_class_init (ChamplainPathLayerClass *klass)
ChamplainLayerClass *layer_class = CHAMPLAIN_LAYER_CLASS (klass);
g_type_class_add_private (klass, sizeof (ChamplainPathLayerPrivate));
-
+
object_class->finalize = champlain_path_layer_finalize;
object_class->dispose = champlain_path_layer_dispose;
object_class->get_property = champlain_path_layer_get_property;
object_class->set_property = champlain_path_layer_set_property;
-
+
actor_class->get_preferred_width = get_preferred_width;
actor_class->get_preferred_height = get_preferred_height;
actor_class->allocate = allocate;
@@ -343,7 +342,7 @@ champlain_path_layer_class_init (ChamplainPathLayerClass *klass)
actor_class->pick = pick;
actor_class->map = map;
actor_class->unmap = unmap;
-
+
layer_class->set_view = set_view;
layer_class->get_bounding_box = get_bounding_box;
@@ -449,7 +448,6 @@ champlain_path_layer_class_init (ChamplainPathLayerClass *klass)
"The path's visibility",
TRUE,
CHAMPLAIN_PARAM_READWRITE));
-
}
@@ -457,7 +455,7 @@ static void
champlain_path_layer_init (ChamplainPathLayer *self)
{
ChamplainPathLayerPrivate *priv;
-
+
self->priv = GET_PRIVATE (self);
priv = self->priv;
priv->view = NULL;
@@ -475,8 +473,8 @@ champlain_path_layer_init (ChamplainPathLayer *self)
priv->content_group = CLUTTER_GROUP (clutter_group_new ());
clutter_actor_set_parent (CLUTTER_ACTOR (priv->content_group), CLUTTER_ACTOR (self));
- //TODO destroy + ref()
- priv->path_actor = clutter_cairo_texture_new (256, 256);
+ /* TODO destroy + ref() */
+ priv->path_actor = clutter_cairo_texture_new (256, 256);
clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), priv->path_actor);
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
@@ -526,7 +524,7 @@ add_node (ChamplainPathLayer *layer,
if (append)
priv->nodes = g_list_append (priv->nodes, location);
- else
+ else
priv->nodes = g_list_insert (priv->nodes, location, position);
schedule_redraw (layer);
}
@@ -560,21 +558,21 @@ champlain_path_layer_add_node (ChamplainPathLayer *layer,
*
* Since: 0.10
*/
-void
+void
champlain_path_layer_remove_all (ChamplainPathLayer *layer)
{
ChamplainPathLayerPrivate *priv = GET_PRIVATE (layer);
GList *elem;
-
+
g_return_if_fail (CHAMPLAIN_IS_PATH_LAYER (layer));
for (elem = priv->nodes; elem != NULL; elem = elem->next)
{
GObject *node = G_OBJECT (elem->data);
-
+
g_signal_handlers_disconnect_by_func (node,
G_CALLBACK (position_notify), layer);
-
+
g_object_unref (node);
}
@@ -590,7 +588,7 @@ champlain_path_layer_remove_all (ChamplainPathLayer *layer)
*
* Gets a copy of the list of all #ChamplainLocation objects inserted into the layer. You should
* free the list but not its contents.
- *
+ *
* Returns: (transfer container) (element-type ChamplainLocation): the list
*
* Since: 0.10
@@ -618,7 +616,7 @@ champlain_path_layer_remove_node (ChamplainPathLayer *layer,
ChamplainLocation *location)
{
ChamplainPathLayerPrivate *priv = GET_PRIVATE (layer);
-
+
g_return_if_fail (CHAMPLAIN_IS_PATH_LAYER (layer));
g_return_if_fail (CHAMPLAIN_IS_LOCATION (location));
@@ -641,7 +639,7 @@ champlain_path_layer_remove_node (ChamplainPathLayer *layer,
*
* Since: 0.10
*/
-void
+void
champlain_path_layer_insert_node (ChamplainPathLayer *layer,
ChamplainLocation *location,
guint position)
@@ -653,14 +651,12 @@ champlain_path_layer_insert_node (ChamplainPathLayer *layer,
}
-
-
static void
relocate_cb (G_GNUC_UNUSED GObject *gobject,
ChamplainPathLayer *layer)
{
g_return_if_fail (CHAMPLAIN_IS_PATH_LAYER (layer));
-
+
schedule_redraw (layer);
}
@@ -675,9 +671,9 @@ redraw_path (ChamplainPathLayer *layer)
ChamplainView *view = priv->view;
gint x, y;
guint last_width, last_height;
-
+
priv->redraw_scheduled = FALSE;
-
+
/* layer not yet added to the view */
if (view == NULL)
return FALSE;
@@ -686,10 +682,10 @@ redraw_path (ChamplainPathLayer *layer)
if (!priv->visible || width == 0.0 || height == 0.0)
return FALSE;
-
+
clutter_cairo_texture_get_surface_size (CLUTTER_CAIRO_TEXTURE (priv->path_actor), &last_width, &last_height);
- if ((guint)width != last_width || (guint)height != last_height)
+ if ((guint) width != last_width || (guint) height != last_height)
clutter_cairo_texture_set_surface_size (CLUTTER_CAIRO_TEXTURE (priv->path_actor), width, height);
champlain_view_get_viewport_origin (priv->view, &x, &y);
@@ -697,11 +693,11 @@ redraw_path (ChamplainPathLayer *layer)
cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (priv->path_actor));
- /* Clear the drawing area */
+ /* Clear the drawing area */
cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
- cairo_paint(cr);
+ cairo_paint (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-
+
for (elem = priv->nodes; elem != NULL; elem = elem->next)
{
ChamplainLocation *location = CHAMPLAIN_LOCATION (elem->data);
@@ -737,7 +733,7 @@ redraw_path (ChamplainPathLayer *layer)
cairo_stroke (cr);
cairo_destroy (cr);
-
+
return FALSE;
}
@@ -765,33 +761,33 @@ redraw_path_cb (G_GNUC_UNUSED GObject *gobject,
}
-static void
+static void
set_view (ChamplainLayer *layer,
ChamplainView *view)
{
g_return_if_fail (CHAMPLAIN_IS_PATH_LAYER (layer) && (CHAMPLAIN_IS_VIEW (view) || view == NULL));
-
+
ChamplainPathLayer *path_layer = CHAMPLAIN_PATH_LAYER (layer);
-
+
if (path_layer->priv->view != NULL)
{
g_signal_handlers_disconnect_by_func (path_layer->priv->view,
- G_CALLBACK (relocate_cb), path_layer);
+ G_CALLBACK (relocate_cb), path_layer);
g_object_unref (path_layer->priv->view);
}
-
+
path_layer->priv->view = view;
if (view != NULL)
{
g_object_ref (view);
-
+
g_signal_connect (view, "layer-relocated",
- G_CALLBACK (relocate_cb), layer);
+ G_CALLBACK (relocate_cb), layer);
g_signal_connect (view, "notify::latitude",
- G_CALLBACK (redraw_path_cb), layer);
-
+ G_CALLBACK (redraw_path_cb), layer);
+
schedule_redraw (path_layer);
}
}
@@ -803,18 +799,18 @@ get_bounding_box (ChamplainLayer *layer)
ChamplainPathLayerPrivate *priv = GET_PRIVATE (layer);
GList *elem;
ChamplainBoundingBox *bbox;
-
+
bbox = champlain_bounding_box_new ();
for (elem = priv->nodes; elem != NULL; elem = elem->next)
{
ChamplainLocation *location = CHAMPLAIN_LOCATION (elem->data);
gdouble lat, lon;
-
+
g_object_get (G_OBJECT (location), "latitude", &lat, "longitude", &lon,
NULL);
-
- champlain_bounding_box_extend (bbox, lat, lon);
+
+ champlain_bounding_box_extend (bbox, lat, lon);
}
if (bbox->left == bbox->right)
@@ -1080,11 +1076,10 @@ champlain_path_layer_set_visible (ChamplainPathLayer *layer,
*
* Since: 0.10
*/
-gboolean
+gboolean
champlain_path_layer_get_visible (ChamplainPathLayer *layer)
{
g_return_val_if_fail (CHAMPLAIN_IS_PATH_LAYER (layer), FALSE);
return layer->priv->visible;
}
-
diff --git a/champlain/champlain-path-layer.h b/champlain/champlain-path-layer.h
index 8942af2..bf9fe15 100644
--- a/champlain/champlain-path-layer.h
+++ b/champlain/champlain-path-layer.h
@@ -60,7 +60,7 @@ typedef struct _ChamplainPathLayerClass ChamplainPathLayerClass;
struct _ChamplainPathLayer
{
ChamplainLayer parent;
-
+
ChamplainPathLayerPrivate *priv;
};
@@ -104,7 +104,7 @@ void champlain_path_layer_set_stroke_width (ChamplainPathLayer *layer,
gdouble value);
gboolean champlain_path_layer_get_visible (ChamplainPathLayer *layer);
-void champlain_path_layer_set_visible (ChamplainPathLayer *layer,
+void champlain_path_layer_set_visible (ChamplainPathLayer *layer,
gboolean value);
G_END_DECLS
diff --git a/champlain/champlain-point.c b/champlain/champlain-point.c
index b74763f..6f04bda 100644
--- a/champlain/champlain-point.c
+++ b/champlain/champlain-point.c
@@ -90,11 +90,11 @@ champlain_point_get_property (GObject *object,
case PROP_COLOR:
clutter_value_set_color (value, priv->color);
break;
-
+
case PROP_SIZE:
g_value_set_double (value, priv->size);
break;
-
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@@ -118,7 +118,7 @@ champlain_point_set_property (GObject *object,
case PROP_SIZE:
champlain_point_set_size (point, g_value_get_double (value));
break;
-
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@@ -129,13 +129,13 @@ static void
paint (ClutterActor *self)
{
ChamplainPointPrivate *priv = GET_PRIVATE (self);
-
+
clutter_actor_paint (CLUTTER_ACTOR (priv->content_group));
}
static void
-pick (ClutterActor *self,
+pick (ClutterActor *self,
const ClutterColor *color)
{
ChamplainPointPrivate *priv = GET_PRIVATE (self);
@@ -222,7 +222,7 @@ static void
champlain_point_dispose (GObject *object)
{
ChamplainPointPrivate *priv = CHAMPLAIN_POINT (object)->priv;
-
+
if (priv->content_group)
{
clutter_actor_unparent (CLUTTER_ACTOR (priv->content_group));
@@ -253,7 +253,7 @@ champlain_point_class_init (ChamplainPointClass *klass)
{
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
g_type_class_add_private (klass, sizeof (ChamplainPointPrivate));
object_class->finalize = champlain_point_finalize;
@@ -288,7 +288,7 @@ draw_point (ChamplainPoint *point)
gdouble size = priv->size;
gdouble radius = size / 2.0;
const ClutterColor *color;
-
+
clutter_group_remove_all (CLUTTER_GROUP (priv->content_group));
cairo_texture = clutter_cairo_texture_new (size, size);
clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), cairo_texture);
@@ -297,23 +297,23 @@ draw_point (ChamplainPoint *point)
cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (cairo_texture));
cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
- cairo_paint(cr);
+ cairo_paint (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
if (champlain_marker_get_selected (CHAMPLAIN_MARKER (point)))
color = champlain_marker_get_selection_color ();
else
- color = priv->color;
-
+ color = priv->color;
+
cairo_set_source_rgba (cr,
color->red / 255.0,
color->green / 255.0,
color->blue / 255.0,
color->alpha / 255.0);
-
+
cairo_arc (cr, radius, radius, radius, 0, 2 * M_PI);
cairo_fill (cr);
-
+
cairo_fill_preserve (cr);
cairo_set_line_width (cr, 1.0);
@@ -343,7 +343,7 @@ champlain_point_init (ChamplainPoint *point)
priv->size = 12;
priv->content_group = CLUTTER_GROUP (clutter_group_new ());
clutter_actor_set_parent (CLUTTER_ACTOR (priv->content_group), CLUTTER_ACTOR (point));
-
+
draw_point (point);
g_signal_connect (point, "notify::selected", G_CALLBACK (notify_selected), NULL);
@@ -353,7 +353,7 @@ champlain_point_init (ChamplainPoint *point)
/**
* champlain_point_new:
- *
+ *
* Creates an instance of #ChamplainPoint with default size and color.
*
* Returns: a new #ChamplainPoint.
@@ -371,7 +371,7 @@ champlain_point_new (void)
* champlain_point_new_full:
* @size: Marker size
* @color: Marker color
- *
+ *
* Creates an instance of #ChamplainPoint with the specified size and color.
*
* Returns: a new #ChamplainPoint.
@@ -379,14 +379,14 @@ champlain_point_new (void)
* Since: 0.10
*/
ClutterActor *
-champlain_point_new_full (gdouble size,
+champlain_point_new_full (gdouble size,
const ClutterColor *color)
{
ChamplainPoint *point = CHAMPLAIN_POINT (champlain_point_new ());
champlain_point_set_size (point, size);
champlain_point_set_color (point, color);
-
+
return CLUTTER_ACTOR (point);
}
diff --git a/champlain/champlain-point.h b/champlain/champlain-point.h
index 86ac7b6..405eebb 100644
--- a/champlain/champlain-point.h
+++ b/champlain/champlain-point.h
@@ -68,7 +68,7 @@ GType champlain_point_get_type (void);
ClutterActor *champlain_point_new (void);
-ClutterActor *champlain_point_new_full (gdouble size,
+ClutterActor *champlain_point_new_full (gdouble size,
const ClutterColor *color);
void champlain_point_set_color (ChamplainPoint *point,
diff --git a/champlain/champlain-renderer.c b/champlain/champlain-renderer.c
index 23f6e2d..ef650a3 100644
--- a/champlain/champlain-renderer.c
+++ b/champlain/champlain-renderer.c
@@ -83,7 +83,7 @@ champlain_renderer_set_data (ChamplainRenderer *renderer,
*
* Renders the texture for the provided tile and calls champlain_tile_set_content()
* to set the content of the tile. When the rendering is finished, the renderer
- * emits the #ChamplainTile::render-complete signal. The tile has to be displayed manually by
+ * emits the #ChamplainTile::render-complete signal. The tile has to be displayed manually by
* calling champlain_tile_display_content().
*
* Since: 0.8
diff --git a/champlain/champlain-scale.c b/champlain/champlain-scale.c
index d341f05..8231855 100644
--- a/champlain/champlain-scale.c
+++ b/champlain/champlain-scale.c
@@ -62,7 +62,7 @@ struct _ChamplainScalePrivate
gfloat text_height;
ClutterGroup *content_group;
gboolean redraw_scheduled;
-
+
ChamplainView *view;
};
@@ -130,13 +130,13 @@ static void
paint (ClutterActor *self)
{
ChamplainScalePrivate *priv = GET_PRIVATE (self);
-
+
clutter_actor_paint (CLUTTER_ACTOR (priv->content_group));
}
static void
-pick (ClutterActor *self,
+pick (ClutterActor *self,
const ClutterColor *color)
{
ChamplainScalePrivate *priv = GET_PRIVATE (self);
@@ -237,7 +237,7 @@ champlain_scale_dispose (GObject *object)
static void
champlain_scale_finalize (GObject *object)
{
-// ChamplainScalePrivate *priv = CHAMPLAIN_SCALE (object)->priv;
+/* ChamplainScalePrivate *priv = CHAMPLAIN_SCALE (object)->priv; */
G_OBJECT_CLASS (champlain_scale_parent_class)->finalize (object);
}
@@ -248,7 +248,7 @@ champlain_scale_class_init (ChamplainScaleClass *klass)
{
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
g_type_class_add_private (klass, sizeof (ChamplainScalePrivate));
object_class->finalize = champlain_scale_finalize;
@@ -297,7 +297,6 @@ champlain_scale_class_init (ChamplainScaleClass *klass)
CHAMPLAIN_TYPE_UNIT,
CHAMPLAIN_UNIT_KM,
G_PARAM_READWRITE));
-
}
@@ -332,7 +331,7 @@ redraw_scale (ChamplainScale *scale)
map_source = champlain_view_get_map_source (priv->view);
g_object_get (G_OBJECT (priv->view), "latitude", &lat, "longitude", &lon, NULL);
m_per_pixel = champlain_map_source_get_meters_per_pixel (map_source,
- zoom_level, lat, lon);
+ zoom_level, lat, lon);
/* Don't redraw too often, 1 meters difference is a good value
* since at low levels the value changes alot, and not at high levels */
@@ -414,7 +413,7 @@ redraw_scale (ChamplainScale *scale)
cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (line));
cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
- cairo_paint(cr);
+ cairo_paint (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
cairo_set_source_rgb (cr, 0, 0, 0);
@@ -483,7 +482,7 @@ create_scale (ChamplainScale *scale)
clutter_actor_get_size (text, &width, &priv->text_height);
clutter_actor_set_position (text, SCALE_INSIDE_PADDING - width / 2, SCALE_INSIDE_PADDING);
- scale_actor = clutter_cairo_texture_new (priv->max_scale_width + 2 * SCALE_INSIDE_PADDING, SCALE_HEIGHT + priv->text_height + GAP_SIZE + 2*SCALE_INSIDE_PADDING);
+ scale_actor = clutter_cairo_texture_new (priv->max_scale_width + 2 * SCALE_INSIDE_PADDING, SCALE_HEIGHT + priv->text_height + GAP_SIZE + 2 * SCALE_INSIDE_PADDING);
clutter_actor_set_name (scale_actor, "scale-line");
clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), scale_actor);
@@ -505,14 +504,14 @@ champlain_scale_init (ChamplainScale *scale)
priv->content_group = CLUTTER_GROUP (clutter_group_new ());
clutter_actor_set_parent (CLUTTER_ACTOR (priv->content_group), CLUTTER_ACTOR (scale));
clutter_actor_queue_relayout (CLUTTER_ACTOR (scale));
-
+
create_scale (scale);
}
/**
* champlain_scale_new:
- *
+ *
* Creates an instance of #ChamplainScale.
*
* Returns: a new #ChamplainScale.
@@ -618,18 +617,18 @@ redraw_scale_cb (G_GNUC_UNUSED GObject *gobject,
* champlain_scale_connect_view:
* @scale: The scale
* @view: a #ChamplainView
- *
+ *
* This method connects to the necessary signals of #ChamplainView to make the
* scale adapt to the current latitude and longitude.
*
* Since: 0.10
*/
-void
+void
champlain_scale_connect_view (ChamplainScale *scale,
ChamplainView *view)
{
g_return_if_fail (CHAMPLAIN_IS_SCALE (scale));
-
+
scale->priv->view = view;
g_signal_connect (view, "notify::latitude",
G_CALLBACK (redraw_scale_cb), scale);
@@ -640,18 +639,18 @@ champlain_scale_connect_view (ChamplainScale *scale,
/**
* champlain_scale_disconnect_view:
* @scale: The scale
- *
+ *
* This method disconnects from the signals previously connected by champlain_scale_connect_view().
*
* Since: 0.10
*/
-void
+void
champlain_scale_disconnect_view (ChamplainScale *scale)
{
g_return_if_fail (CHAMPLAIN_IS_SCALE (scale));
-
+
g_signal_handlers_disconnect_by_func (scale->priv->view,
- redraw_scale_cb,
- scale);
+ redraw_scale_cb,
+ scale);
scale->priv->view = NULL;
}
diff --git a/champlain/champlain-scale.h b/champlain/champlain-scale.h
index bbec904..d97b1a2 100644
--- a/champlain/champlain-scale.h
+++ b/champlain/champlain-scale.h
@@ -86,7 +86,7 @@ void champlain_scale_set_max_width (ChamplainScale *scale,
guint value);
void champlain_scale_set_unit (ChamplainScale *scale,
ChamplainUnit unit);
-
+
guint champlain_scale_get_max_width (ChamplainScale *scale);
ChamplainUnit champlain_scale_get_unit (ChamplainScale *scale);
diff --git a/champlain/champlain-tile-source.c b/champlain/champlain-tile-source.c
index 557e303..ccb7889 100644
--- a/champlain/champlain-tile-source.c
+++ b/champlain/champlain-tile-source.c
@@ -251,10 +251,10 @@ champlain_tile_source_class_init (ChamplainTileSourceClass *klass)
* Since: 0.4
*/
pspec = g_param_spec_string ("id",
- "Id",
- "The id of the tile source",
- "",
- (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ "Id",
+ "The id of the tile source",
+ "",
+ (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_ID, pspec);
/**
@@ -265,10 +265,10 @@ champlain_tile_source_class_init (ChamplainTileSourceClass *klass)
* Since: 0.4
*/
pspec = g_param_spec_string ("name",
- "Name",
- "The name of the tile source",
- "",
- (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ "Name",
+ "The name of the tile source",
+ "",
+ (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_NAME, pspec);
/**
@@ -279,10 +279,10 @@ champlain_tile_source_class_init (ChamplainTileSourceClass *klass)
* Since: 0.4
*/
pspec = g_param_spec_string ("license",
- "License",
- "The usage license of the tile source",
- "",
- (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ "License",
+ "The usage license of the tile source",
+ "",
+ (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_LICENSE, pspec);
/**
@@ -293,10 +293,10 @@ champlain_tile_source_class_init (ChamplainTileSourceClass *klass)
* Since: 0.4
*/
pspec = g_param_spec_string ("license-uri",
- "License-uri",
- "The usage license's uri for more information",
- "",
- (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ "License-uri",
+ "The usage license's uri for more information",
+ "",
+ (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_LICENSE_URI, pspec);
/**
@@ -307,12 +307,12 @@ champlain_tile_source_class_init (ChamplainTileSourceClass *klass)
* Since: 0.4
*/
pspec = g_param_spec_uint ("min-zoom-level",
- "Minimum Zoom Level",
- "The minimum zoom level",
- 0,
- 50,
- 0,
- (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ "Minimum Zoom Level",
+ "The minimum zoom level",
+ 0,
+ 50,
+ 0,
+ (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_MIN_ZOOM_LEVEL, pspec);
/**
@@ -323,12 +323,12 @@ champlain_tile_source_class_init (ChamplainTileSourceClass *klass)
* Since: 0.4
*/
pspec = g_param_spec_uint ("max-zoom-level",
- "Maximum Zoom Level",
- "The maximum zoom level",
- 0,
- 50,
- 18,
- (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ "Maximum Zoom Level",
+ "The maximum zoom level",
+ 0,
+ 50,
+ 18,
+ (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_MAX_ZOOM_LEVEL, pspec);
/**
@@ -339,12 +339,12 @@ champlain_tile_source_class_init (ChamplainTileSourceClass *klass)
* Since: 0.4
*/
pspec = g_param_spec_uint ("tile-size",
- "Tile Size",
- "The tile size",
- 0,
- 2048,
- 256,
- (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ "Tile Size",
+ "The tile size",
+ 0,
+ 2048,
+ 256,
+ (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_TILE_SIZE, pspec);
/**
@@ -355,11 +355,11 @@ champlain_tile_source_class_init (ChamplainTileSourceClass *klass)
* Since: 0.4
*/
pspec = g_param_spec_enum ("projection",
- "Projection",
- "The map projection",
- CHAMPLAIN_TYPE_MAP_PROJECTION,
- CHAMPLAIN_MAP_PROJECTION_MERCATOR,
- (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ "Projection",
+ "The map projection",
+ CHAMPLAIN_TYPE_MAP_PROJECTION,
+ CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+ (G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_MAP_PROJECTION, pspec);
/**
@@ -370,10 +370,10 @@ champlain_tile_source_class_init (ChamplainTileSourceClass *klass)
* Since: 0.6
*/
pspec = g_param_spec_object ("cache",
- "Cache",
- "Cache used for tile sorage",
- CHAMPLAIN_TYPE_TILE_CACHE,
- G_PARAM_READWRITE);
+ "Cache",
+ "Cache used for tile sorage",
+ CHAMPLAIN_TYPE_TILE_CACHE,
+ G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_CACHE, pspec);
}
diff --git a/champlain/champlain-tile.c b/champlain/champlain-tile.c
index 220d8de..2d857f4 100644
--- a/champlain/champlain-tile.c
+++ b/champlain/champlain-tile.c
@@ -73,7 +73,7 @@ struct _ChamplainTilePrivate
ChamplainState state; /* The tile state: loading, validation, done */
/* The tile actor that will be displayed after champlain_tile_display_content () */
- ClutterActor *content_actor;
+ ClutterActor *content_actor;
ClutterGroup *content_group; /* A group used for the fade in effect */
gboolean fade_in;
@@ -181,13 +181,13 @@ static void
paint (ClutterActor *self)
{
ChamplainTilePrivate *priv = GET_PRIVATE (self);
-
+
clutter_actor_paint (CLUTTER_ACTOR (priv->content_group));
}
static void
-pick (ClutterActor *self,
+pick (ClutterActor *self,
const ClutterColor *color)
{
ChamplainTilePrivate *priv = GET_PRIVATE (self);
@@ -461,7 +461,7 @@ champlain_tile_class_init (ChamplainTileClass *klass)
* @data: the result of the rendering
* @size: size of data
* @error: TRUE if there was an error during rendering
- *
+ *
* The #ChamplainTile::render-complete signal is emitted when rendering of the tile is
* completed by the renderer.
*
@@ -889,18 +889,18 @@ champlain_tile_display_content (ChamplainTile *self)
if (priv->fade_in)
{
animation = clutter_actor_animate (CLUTTER_ACTOR (priv->content_actor),
- CLUTTER_EASE_IN_CUBIC,
- 500,
- "opacity", 255,
- NULL);
+ CLUTTER_EASE_IN_CUBIC,
+ 500,
+ "opacity", 255,
+ NULL);
}
else
{
animation = clutter_actor_animate (CLUTTER_ACTOR (priv->content_actor),
- CLUTTER_LINEAR,
- 150,
- "opacity", 255,
- NULL);
+ CLUTTER_LINEAR,
+ 150,
+ "opacity", 255,
+ NULL);
}
g_signal_connect (animation, "completed", G_CALLBACK (fade_in_completed), self);
diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index f6cbbc5..30022c7 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -42,7 +42,7 @@
* an error occurs during download, an error tile will be displayed.
*
* The button-press-event and button-release-event signals are emitted each
- * time a mouse button is pressed on the @view.
+ * time a mouse button is pressed on the @view.
*/
#include "config.h"
@@ -71,7 +71,7 @@
#include <champlain-viewport.h>
#include <champlain-adjustment.h>
-//#define VIEW_LOG
+/* #define VIEW_LOG */
#ifdef VIEW_LOG
#define DEBUG_LOG() g_print ("%s\n", __FUNCTION__);
#else
@@ -109,9 +109,9 @@ static guint signals[LAST_SIGNAL] = { 0, };
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CHAMPLAIN_TYPE_VIEW, ChamplainViewPrivate))
#define ZOOM_LEVEL_OUT_OF_RANGE(priv, level) \
(level < priv->min_zoom_level || \
- level > priv->max_zoom_level || \
+ level > priv->max_zoom_level || \
level < champlain_map_source_get_min_zoom_level (priv->map_source) || \
- level > champlain_map_source_get_max_zoom_level (priv->map_source))
+ level > champlain_map_source_get_max_zoom_level (priv->map_source))
/* Between state values for go_to */
typedef struct
@@ -159,12 +159,12 @@ struct _ChamplainViewPrivate
ClutterActor *kinetic_scroll; /* Contains the viewport */
ClutterActor *viewport; /* Contains the map_layer, license and markers */
ClutterActor *map_layer; /* Contains tiles actors (grouped by zoom level) */
-
+
gint viewport_x;
gint viewport_y;
gint viewport_width;
gint viewport_height;
-
+
ClutterActor *viewport_container;
ClutterActor *user_layers; /* Contains the markers */
@@ -233,9 +233,9 @@ static gboolean fill_tile_cb (FillTileCallbackData *data);
/* Updates the internals after the viewport changed */
static void
-update_viewport (ChamplainView *view,
- gfloat x,
- gfloat y,
+update_viewport (ChamplainView *view,
+ gfloat x,
+ gfloat y,
gboolean force_relocate,
gboolean set_coords)
{
@@ -247,12 +247,12 @@ update_viewport (ChamplainView *view,
if (set_coords)
{
priv->longitude = champlain_map_source_get_longitude (priv->map_source,
- priv->zoom_level,
- x);
+ priv->zoom_level,
+ x);
priv->latitude = champlain_map_source_get_latitude (priv->map_source,
- priv->zoom_level,
- y);
+ priv->zoom_level,
+ y);
}
relocate = view_update_anchor (view, x, y);
@@ -260,7 +260,7 @@ update_viewport (ChamplainView *view,
priv->viewport_x = x - priv->anchor_x - priv->viewport_width / 2.0;
priv->viewport_y = y - priv->anchor_y - priv->viewport_height / 2.0;
-
+
if (relocate || force_relocate)
{
g_signal_handlers_block_by_func (priv->viewport, G_CALLBACK (viewport_pos_changed_cb), view);
@@ -268,7 +268,7 @@ update_viewport (ChamplainView *view,
priv->viewport_x,
priv->viewport_y);
g_signal_handlers_unblock_by_func (priv->viewport, G_CALLBACK (viewport_pos_changed_cb), view);
-
+
g_signal_emit_by_name (view, "layer-relocated", NULL);
}
@@ -296,7 +296,7 @@ panning_completed (G_GNUC_UNUSED ChamplainKineticScrollView *scroll,
absolute_x = x + priv->anchor_x + priv->viewport_width / 2.0;
absolute_y = y + priv->anchor_y + priv->viewport_height / 2.0;
-
+
update_viewport (view, absolute_x, absolute_y, FALSE, TRUE);
}
@@ -567,7 +567,7 @@ champlain_view_finalize (GObject *object)
{
DEBUG_LOG ()
-// ChamplainViewPrivate *priv = CHAMPLAIN_VIEW (object)->priv;
+/* ChamplainViewPrivate *priv = CHAMPLAIN_VIEW (object)->priv; */
G_OBJECT_CLASS (champlain_view_parent_class)->finalize (object);
}
@@ -609,7 +609,7 @@ champlain_view_allocate (ClutterActor *actor,
/* Chain up */
CLUTTER_ACTOR_CLASS (champlain_view_parent_class)->allocate (actor, box, flags);
-
+
width = box->x2 - box->x1;
height = box->y2 - box->y1;
@@ -646,7 +646,7 @@ champlain_view_realize (ClutterActor *actor)
* CLUTTER_ACTOR_CLASS (champlain_view_parent_class)->realize (actor);
* ClutterStage uses clutter_actor_realize.
*/
-
+
clutter_actor_realize (actor);
/* Setup the viewport according to the zoom level */
@@ -706,13 +706,13 @@ static void
paint (ClutterActor *self)
{
ChamplainViewPrivate *priv = GET_PRIVATE (self);
-
+
clutter_actor_paint (CLUTTER_ACTOR (priv->view_box));
}
static void
-pick (ClutterActor *self,
+pick (ClutterActor *self,
const ClutterColor *color)
{
ChamplainViewPrivate *priv = GET_PRIVATE (self);
@@ -941,7 +941,7 @@ champlain_view_class_init (ChamplainViewClass *champlainViewClass)
g_signal_new ("animation-completed", G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL,
g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 0);
-
+
/**
* ChamplainView::layer-relocated:
*
@@ -956,7 +956,6 @@ champlain_view_class_init (ChamplainViewClass *champlainViewClass)
g_signal_new ("layer-relocated", G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
}
@@ -998,7 +997,7 @@ champlain_view_init (ChamplainView *view)
priv->longitude = 0.0f;
priv->goto_context = NULL;
priv->tiles_loading = 0;
- priv->update_viewport_timer = g_timer_new();
+ priv->update_viewport_timer = g_timer_new ();
/* Setup map layer */
priv->map_layer = g_object_ref (champlain_group_new ());
@@ -1020,7 +1019,7 @@ champlain_view_init (ChamplainView *view)
/* Setup viewport */
priv->viewport = g_object_ref (champlain_viewport_new ());
champlain_viewport_set_child (CHAMPLAIN_VIEWPORT (priv->viewport), priv->viewport_container);
-
+
g_object_set (G_OBJECT (priv->viewport), "sync-adjustments", FALSE, NULL);
g_signal_connect (priv->viewport, "notify::x-origin",
@@ -1050,12 +1049,12 @@ champlain_view_init (ChamplainView *view)
/* Setup stage */
priv->layout_manager = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER,
- CLUTTER_BIN_ALIGNMENT_CENTER);
+ CLUTTER_BIN_ALIGNMENT_CENTER);
priv->view_box = g_object_ref (clutter_box_new (priv->layout_manager));
clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (priv->layout_manager), priv->kinetic_scroll,
- CLUTTER_BIN_ALIGNMENT_FILL,
- CLUTTER_BIN_ALIGNMENT_FILL);
+ CLUTTER_BIN_ALIGNMENT_FILL,
+ CLUTTER_BIN_ALIGNMENT_FILL);
clutter_actor_set_parent (CLUTTER_ACTOR (priv->view_box), CLUTTER_ACTOR (view));
clutter_actor_queue_relayout (CLUTTER_ACTOR (view));
@@ -1066,8 +1065,8 @@ champlain_view_init (ChamplainView *view)
priv->license_actor = g_object_ref (champlain_license_new ());
champlain_license_connect_view (CHAMPLAIN_LICENSE (priv->license_actor), view);
champlain_view_bin_layout_add (view, priv->license_actor,
- CLUTTER_BIN_ALIGNMENT_END,
- CLUTTER_BIN_ALIGNMENT_END);
+ CLUTTER_BIN_ALIGNMENT_END,
+ CLUTTER_BIN_ALIGNMENT_END);
priv->state = CHAMPLAIN_STATE_DONE;
g_object_notify (G_OBJECT (view), "state");
@@ -1091,12 +1090,12 @@ viewport_pos_changed_cb (G_GNUC_UNUSED GObject *gobject,
g_timer_elapsed (priv->update_viewport_timer, NULL) > 0.25)
{
gdouble absolute_x, absolute_y;
-
+
absolute_x = x + priv->anchor_x + priv->viewport_width / 2.0;
absolute_y = y + priv->anchor_y + priv->viewport_height / 2.0;
-
+
update_viewport (view, absolute_x, absolute_y, FALSE, TRUE);
-
+
g_timer_start (priv->update_viewport_timer);
}
}
@@ -1152,7 +1151,7 @@ scroll_to (ChamplainView *view,
if (priv->kinetic_mode)
champlain_view_go_to_with_duration (view, lat, lon, 300);
- else
+ else
champlain_view_center_on (view, lat, lon);
}
@@ -1336,7 +1335,7 @@ view_update_anchor (ChamplainView *view,
priv->anchor_y = 0;
DEBUG ("Clear Anchor at (%d, %d)", x, y);
}
-
+
priv->anchor_zoom_level = priv->zoom_level;
}
@@ -1677,7 +1676,7 @@ champlain_view_add_layer (ChamplainView *view,
g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
g_return_if_fail (CHAMPLAIN_IS_LAYER (layer));
-
+
clutter_container_add_actor (CLUTTER_CONTAINER (view->priv->user_layers),
CLUTTER_ACTOR (layer));
champlain_layer_set_view (layer, view);
@@ -1703,7 +1702,7 @@ champlain_view_remove_layer (ChamplainView *view,
g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
g_return_if_fail (CHAMPLAIN_IS_LAYER (layer));
- champlain_layer_set_view (layer, NULL);
+ champlain_layer_set_view (layer, NULL);
clutter_container_remove_actor (CLUTTER_CONTAINER (view->priv->user_layers),
CLUTTER_ACTOR (layer));
@@ -1718,7 +1717,7 @@ champlain_view_remove_layer (ChamplainView *view,
* Converts the view's x coordinate to longitude.
*
* Returns: the longitude
- *
+ *
* Since: 0.10
*/
gdouble
@@ -1730,11 +1729,11 @@ champlain_view_x_to_longitude (ChamplainView *view,
DEBUG_LOG ()
- g_return_val_if_fail (CHAMPLAIN_IS_VIEW (view), 0.0);
-
+ g_return_val_if_fail (CHAMPLAIN_IS_VIEW (view), 0.0);
+
longitude = champlain_map_source_get_longitude (priv->map_source,
- priv->zoom_level,
- x + priv->viewport_x + priv->anchor_x);
+ priv->zoom_level,
+ x + priv->viewport_x + priv->anchor_x);
return longitude;
}
@@ -1757,14 +1756,14 @@ champlain_view_y_to_latitude (ChamplainView *view,
{
ChamplainViewPrivate *priv = view->priv;
gdouble latitude;
-
+
DEBUG_LOG ()
g_return_val_if_fail (CHAMPLAIN_IS_VIEW (view), 0.0);
latitude = champlain_map_source_get_latitude (priv->map_source,
- priv->zoom_level,
- y + priv->viewport_y + priv->anchor_y);
+ priv->zoom_level,
+ y + priv->viewport_y + priv->anchor_y);
return latitude;
}
@@ -1782,12 +1781,12 @@ champlain_view_y_to_latitude (ChamplainView *view,
* Since: 0.10
*/
gdouble
-champlain_view_longitude_to_x (ChamplainView *view,
+champlain_view_longitude_to_x (ChamplainView *view,
gdouble longitude)
{
ChamplainViewPrivate *priv = view->priv;
gdouble x;
-
+
DEBUG_LOG ()
g_return_val_if_fail (CHAMPLAIN_IS_VIEW (view), 0);
@@ -1810,12 +1809,12 @@ champlain_view_longitude_to_x (ChamplainView *view,
* Since: 0.10
*/
gdouble
-champlain_view_latitude_to_y (ChamplainView *view,
+champlain_view_latitude_to_y (ChamplainView *view,
gdouble latitude)
{
ChamplainViewPrivate *priv = view->priv;
gdouble y;
-
+
DEBUG_LOG ()
g_return_val_if_fail (CHAMPLAIN_IS_VIEW (view), 0);
@@ -1836,19 +1835,19 @@ champlain_view_latitude_to_y (ChamplainView *view,
*
* Since: 0.10
*/
-void
-champlain_view_get_viewport_origin (ChamplainView *view,
- gint *x,
+void
+champlain_view_get_viewport_origin (ChamplainView *view,
+ gint *x,
gint *y)
{
DEBUG_LOG ()
g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
ChamplainViewPrivate *priv = view->priv;
-
+
if (x)
*x = priv->viewport_x;
-
+
if (y)
*y = priv->viewport_y;
}
@@ -1921,7 +1920,7 @@ view_load_visible_tiles (ChamplainView *view)
tile_y < y_first || tile_y >= y_end ||
zoom_level != priv->zoom_level)
{
- // inform map source to terminate loading the tile
+ /* inform map source to terminate loading the tile */
champlain_tile_set_state (tile, CHAMPLAIN_STATE_DONE);
clutter_container_remove_actor (CLUTTER_CONTAINER (priv->map_layer), CLUTTER_ACTOR (tile));
}
@@ -2096,7 +2095,6 @@ tile_state_notify (ChamplainTile *tile,
priv->state = CHAMPLAIN_STATE_DONE;
g_object_notify (G_OBJECT (view), "state");
}
-
}
}
@@ -2261,7 +2259,7 @@ champlain_view_ensure_visible (ChamplainView *view,
guint zoom_level = priv->zoom_level;
gboolean good_size = FALSE;
gdouble lat, lon;
-
+
if (!champlain_bounding_box_is_valid (bbox))
return;
@@ -2271,7 +2269,7 @@ champlain_view_ensure_visible (ChamplainView *view,
do
{
gint min_x, min_y, max_x, max_y;
-
+
min_x = champlain_map_source_get_x (priv->map_source, zoom_level, bbox->left);
min_y = champlain_map_source_get_y (priv->map_source, zoom_level, bbox->bottom);
max_x = champlain_map_source_get_x (priv->map_source, zoom_level, bbox->right);
@@ -2317,11 +2315,11 @@ champlain_view_ensure_layers_visible (ChamplainView *view,
GList *layers, *elem;
ChamplainBoundingBox *bbox;
-
+
bbox = champlain_bounding_box_new ();
-
+
layers = clutter_container_get_children (CLUTTER_CONTAINER (view->priv->user_layers));
-
+
for (elem = layers; elem != NULL; elem = elem->next)
{
ChamplainLayer *layer = CHAMPLAIN_LAYER (elem->data);
@@ -2363,11 +2361,11 @@ view_set_zoom_level_at (ChamplainView *view,
/* Keep the lon, lat where the mouse is */
lon = champlain_map_source_get_longitude (priv->map_source,
- priv->zoom_level,
- priv->viewport_x + x + priv->anchor_x);
+ priv->zoom_level,
+ priv->viewport_x + x + priv->anchor_x);
lat = champlain_map_source_get_latitude (priv->map_source,
- priv->zoom_level,
- priv->viewport_y + y + priv->anchor_y);
+ priv->zoom_level,
+ priv->viewport_y + y + priv->anchor_y);
/* How far was it from the center of the viewport (in px) */
x_diff = priv->viewport_width / 2 - x;
@@ -2381,9 +2379,9 @@ view_set_zoom_level_at (ChamplainView *view,
/* Get the new lon,lat of these new x,y minus the distance from the
* viewport center */
lon2 = champlain_map_source_get_longitude (priv->map_source,
- priv->zoom_level, x2 + x_diff);
+ priv->zoom_level, x2 + x_diff);
lat2 = champlain_map_source_get_latitude (priv->map_source,
- priv->zoom_level, y2 + y_diff);
+ priv->zoom_level, y2 + y_diff);
resize_viewport (view);
champlain_view_center_on (view, lat2, lon2);
@@ -2577,10 +2575,11 @@ champlain_view_get_zoom_on_double_click (ChamplainView *view)
*
* Since: 0.10
*/
-void champlain_view_bin_layout_add (ChamplainView *view,
- ClutterActor *child,
- ClutterBinAlignment x_align,
- ClutterBinAlignment y_align)
+void
+champlain_view_bin_layout_add (ChamplainView *view,
+ ClutterActor *child,
+ ClutterBinAlignment x_align,
+ ClutterBinAlignment y_align)
{
ChamplainViewPrivate *priv = view->priv;
ClutterBinLayout *layout_manager;
@@ -2588,14 +2587,13 @@ void champlain_view_bin_layout_add (ChamplainView *view,
DEBUG_LOG ()
g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
-
+
layout_manager = CLUTTER_BIN_LAYOUT (priv->layout_manager);
clutter_bin_layout_add (layout_manager, child, x_align, y_align);
clutter_actor_queue_relayout (CLUTTER_ACTOR (view));
}
-
/**
* champlain_view_get_license_actor:
* @view: The view
@@ -2608,11 +2606,12 @@ void champlain_view_bin_layout_add (ChamplainView *view,
*
* Since: 0.10
*/
-ChamplainLicense *champlain_view_get_license_actor (ChamplainView *view)
+ChamplainLicense *
+champlain_view_get_license_actor (ChamplainView *view)
{
DEBUG_LOG ()
g_return_val_if_fail (CHAMPLAIN_IS_VIEW (view), NULL);
-
- return CHAMPLAIN_LICENSE (view->priv->license_actor);
+
+ return CHAMPLAIN_LICENSE (view->priv->license_actor);
}
diff --git a/champlain/champlain-view.h b/champlain/champlain-view.h
index 2431d01..8ab0b6e 100644
--- a/champlain/champlain-view.h
+++ b/champlain/champlain-view.h
@@ -126,17 +126,19 @@ gdouble champlain_view_x_to_longitude (ChamplainView *view,
gdouble x);
gdouble champlain_view_y_to_latitude (ChamplainView *view,
gdouble y);
-gdouble champlain_view_longitude_to_x (ChamplainView *view,
+gdouble champlain_view_longitude_to_x (ChamplainView *view,
gdouble longitude);
-gdouble champlain_view_latitude_to_y (ChamplainView *view,
+gdouble champlain_view_latitude_to_y (ChamplainView *view,
gdouble latitude);
-void champlain_view_get_viewport_origin (ChamplainView *view, gint *x, gint *y);
+void champlain_view_get_viewport_origin (ChamplainView *view,
+ gint *x,
+ gint *y);
void champlain_view_bin_layout_add (ChamplainView *view,
- ClutterActor *child,
- ClutterBinAlignment x_align,
- ClutterBinAlignment y_align);
+ ClutterActor *child,
+ ClutterBinAlignment x_align,
+ ClutterBinAlignment y_align);
ChamplainLicense *champlain_view_get_license_actor (ChamplainView *view);
diff --git a/champlain/champlain-viewport.c b/champlain/champlain-viewport.c
index b8deccb..acf2f5c 100644
--- a/champlain/champlain-viewport.c
+++ b/champlain/champlain-viewport.c
@@ -34,7 +34,7 @@ G_DEFINE_TYPE (ChamplainViewport, champlain_viewport, CLUTTER_TYPE_ACTOR)
#define GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), CHAMPLAIN_TYPE_VIEWPORT, \
- ChamplainViewportPrivate))
+ ChamplainViewportPrivate))
struct _ChamplainViewportPrivate
{
@@ -61,10 +61,10 @@ enum
};
static void
-champlain_viewport_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+champlain_viewport_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
ChamplainAdjustment *adjustment;
@@ -80,17 +80,17 @@ champlain_viewport_get_property (GObject *object,
g_value_set_int (value, priv->y);
break;
- case PROP_HADJUST :
+ case PROP_HADJUST:
champlain_viewport_get_adjustments (CHAMPLAIN_VIEWPORT (object), &adjustment, NULL);
g_value_set_object (value, adjustment);
break;
- case PROP_VADJUST :
+ case PROP_VADJUST:
champlain_viewport_get_adjustments (CHAMPLAIN_VIEWPORT (object), NULL, &adjustment);
g_value_set_object (value, adjustment);
break;
- case PROP_SYNC_ADJUST :
+ case PROP_SYNC_ADJUST:
g_value_set_boolean (value, priv->sync_adjustments);
break;
@@ -100,11 +100,12 @@ champlain_viewport_get_property (GObject *object,
}
}
+
static void
-champlain_viewport_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+champlain_viewport_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
ChamplainViewport *viewport = CHAMPLAIN_VIEWPORT (object);
ChamplainViewportPrivate *priv = viewport->priv;
@@ -113,29 +114,29 @@ champlain_viewport_set_property (GObject *object,
{
case PROP_X_ORIGIN:
champlain_viewport_set_origin (viewport,
- g_value_get_int (value),
- priv->y);
+ g_value_get_int (value),
+ priv->y);
break;
case PROP_Y_ORIGIN:
champlain_viewport_set_origin (viewport,
- priv->x,
- g_value_get_int (value));
+ priv->x,
+ g_value_get_int (value));
break;
- case PROP_HADJUST :
+ case PROP_HADJUST:
champlain_viewport_set_adjustments (CHAMPLAIN_VIEWPORT (object),
- g_value_get_object (value),
- priv->vadjustment);
+ g_value_get_object (value),
+ priv->vadjustment);
break;
- case PROP_VADJUST :
+ case PROP_VADJUST:
champlain_viewport_set_adjustments (CHAMPLAIN_VIEWPORT (object),
- priv->hadjustment,
- g_value_get_object (value));
+ priv->hadjustment,
+ g_value_get_object (value));
break;
- case PROP_SYNC_ADJUST :
+ case PROP_SYNC_ADJUST:
priv->sync_adjustments = g_value_get_boolean (value);
break;
@@ -145,6 +146,7 @@ champlain_viewport_set_property (GObject *object,
}
}
+
void
champlain_viewport_stop (ChamplainViewport *viewport)
{
@@ -154,6 +156,7 @@ champlain_viewport_stop (ChamplainViewport *viewport)
champlain_adjustment_interpolate_stop (priv->vadjustment);
}
+
static void
champlain_viewport_dispose (GObject *gobject)
{
@@ -187,13 +190,13 @@ static void
paint (ClutterActor *self)
{
ChamplainViewportPrivate *priv = GET_PRIVATE (self);
-
+
clutter_actor_paint (priv->content_group);
}
static void
-pick (ClutterActor *self,
+pick (ClutterActor *self,
const ClutterColor *color)
{
ChamplainViewportPrivate *priv = GET_PRIVATE (self);
@@ -257,9 +260,9 @@ unmap (ClutterActor *self)
static void
-allocate (ClutterActor *self,
- const ClutterActorBox *box,
- ClutterAllocationFlags flags)
+allocate (ClutterActor *self,
+ const ClutterActorBox *box,
+ ClutterAllocationFlags flags)
{
ClutterActorBox child_box;
CoglFixed prev_value;
@@ -268,7 +271,7 @@ allocate (ClutterActor *self,
/* Chain up */
CLUTTER_ACTOR_CLASS (champlain_viewport_parent_class)->
- allocate (self, box, flags);
+ allocate (self, box, flags);
/* Refresh adjustments */
if (priv->sync_adjustments)
@@ -276,9 +279,9 @@ allocate (ClutterActor *self,
if (priv->hadjustment)
{
g_object_set (G_OBJECT (priv->hadjustment),
- "lower", 0.0,
- "upper", (box->x2 - box->x1),
- NULL);
+ "lower", 0.0,
+ "upper", (box->x2 - box->x1),
+ NULL);
/* Make sure value is clamped */
prev_value = champlain_adjustment_get_value (priv->hadjustment);
@@ -288,9 +291,9 @@ allocate (ClutterActor *self,
if (priv->vadjustment)
{
g_object_set (G_OBJECT (priv->vadjustment),
- "lower", 0.0,
- "upper", (box->y2 - box->y1),
- NULL);
+ "lower", 0.0,
+ "upper", (box->y2 - box->y1),
+ NULL);
prev_value = champlain_adjustment_get_value (priv->vadjustment);
champlain_adjustment_set_value (priv->vadjustment, prev_value);
@@ -305,6 +308,7 @@ allocate (ClutterActor *self,
clutter_actor_allocate (CLUTTER_ACTOR (priv->content_group), &child_box, flags);
}
+
static void
champlain_viewport_class_init (ChamplainViewportClass *klass)
{
@@ -326,57 +330,57 @@ champlain_viewport_class_init (ChamplainViewportClass *klass)
actor_class->unmap = unmap;
g_object_class_install_property (gobject_class,
- PROP_X_ORIGIN,
- g_param_spec_int ("x-origin",
- "X Origin",
- "Origin's X coordinate in pixels",
- -G_MAXINT, G_MAXINT,
- 0,
- G_PARAM_READWRITE));
+ PROP_X_ORIGIN,
+ g_param_spec_int ("x-origin",
+ "X Origin",
+ "Origin's X coordinate in pixels",
+ -G_MAXINT, G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
- PROP_Y_ORIGIN,
- g_param_spec_int ("y-origin",
- "Y Origin",
- "Origin's Y coordinate in pixels",
- -G_MAXINT, G_MAXINT,
- 0,
- G_PARAM_READWRITE));
+ PROP_Y_ORIGIN,
+ g_param_spec_int ("y-origin",
+ "Y Origin",
+ "Origin's Y coordinate in pixels",
+ -G_MAXINT, G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
- PROP_SYNC_ADJUST,
- g_param_spec_boolean ("sync-adjustments",
- "Synchronise "
- "adjustments",
- "Whether to "
- "synchronise "
- "adjustments with "
- "viewport size",
- TRUE,
- G_PARAM_READWRITE));
+ PROP_SYNC_ADJUST,
+ g_param_spec_boolean ("sync-adjustments",
+ "Synchronise "
+ "adjustments",
+ "Whether to "
+ "synchronise "
+ "adjustments with "
+ "viewport size",
+ TRUE,
+ G_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
- PROP_HADJUST,
- g_param_spec_object ("hadjustment",
- "ChamplainAdjustment",
- "Horizontal adjustment",
- CHAMPLAIN_TYPE_ADJUSTMENT,
- G_PARAM_READWRITE));
+ PROP_HADJUST,
+ g_param_spec_object ("hadjustment",
+ "ChamplainAdjustment",
+ "Horizontal adjustment",
+ CHAMPLAIN_TYPE_ADJUSTMENT,
+ G_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
- PROP_VADJUST,
- g_param_spec_object ("vadjustment",
- "ChamplainAdjustment",
- "Vertical adjustment",
- CHAMPLAIN_TYPE_ADJUSTMENT,
- G_PARAM_READWRITE));
-
+ PROP_VADJUST,
+ g_param_spec_object ("vadjustment",
+ "ChamplainAdjustment",
+ "Vertical adjustment",
+ CHAMPLAIN_TYPE_ADJUSTMENT,
+ G_PARAM_READWRITE));
}
+
static void
hadjustment_value_notify_cb (ChamplainAdjustment *adjustment,
- GParamSpec *pspec,
- ChamplainViewport *viewport)
+ GParamSpec *pspec,
+ ChamplainViewport *viewport)
{
ChamplainViewportPrivate *priv = viewport->priv;
gdouble value;
@@ -384,13 +388,14 @@ hadjustment_value_notify_cb (ChamplainAdjustment *adjustment,
value = champlain_adjustment_get_value (adjustment);
champlain_viewport_set_origin (viewport,
- value,
- priv->y);
+ value,
+ priv->y);
}
+
static void
vadjustment_value_notify_cb (ChamplainAdjustment *adjustment, GParamSpec *arg1,
- ChamplainViewport *viewport)
+ ChamplainViewport *viewport)
{
ChamplainViewportPrivate *priv = viewport->priv;
gdouble value;
@@ -398,14 +403,15 @@ vadjustment_value_notify_cb (ChamplainAdjustment *adjustment, GParamSpec *arg1,
value = champlain_adjustment_get_value (adjustment);
champlain_viewport_set_origin (viewport,
- priv->x,
- value);
+ priv->x,
+ value);
}
+
void
champlain_viewport_set_adjustments (ChamplainViewport *viewport,
- ChamplainAdjustment *hadjustment,
- ChamplainAdjustment *vadjustment)
+ ChamplainAdjustment *hadjustment,
+ ChamplainAdjustment *vadjustment)
{
ChamplainViewportPrivate *priv = CHAMPLAIN_VIEWPORT (viewport)->priv;
@@ -414,8 +420,8 @@ champlain_viewport_set_adjustments (ChamplainViewport *viewport,
if (priv->hadjustment)
{
g_signal_handlers_disconnect_by_func (priv->hadjustment,
- hadjustment_value_notify_cb,
- viewport);
+ hadjustment_value_notify_cb,
+ viewport);
g_object_unref (priv->hadjustment);
}
@@ -423,8 +429,8 @@ champlain_viewport_set_adjustments (ChamplainViewport *viewport,
{
g_object_ref (hadjustment);
g_signal_connect (hadjustment, "notify::value",
- G_CALLBACK (hadjustment_value_notify_cb),
- viewport);
+ G_CALLBACK (hadjustment_value_notify_cb),
+ viewport);
}
priv->hadjustment = hadjustment;
@@ -435,8 +441,8 @@ champlain_viewport_set_adjustments (ChamplainViewport *viewport,
if (priv->vadjustment)
{
g_signal_handlers_disconnect_by_func (priv->vadjustment,
- vadjustment_value_notify_cb,
- viewport);
+ vadjustment_value_notify_cb,
+ viewport);
g_object_unref (priv->vadjustment);
}
@@ -444,24 +450,25 @@ champlain_viewport_set_adjustments (ChamplainViewport *viewport,
{
g_object_ref (vadjustment);
g_signal_connect (vadjustment, "notify::value",
- G_CALLBACK (vadjustment_value_notify_cb),
- viewport);
+ G_CALLBACK (vadjustment_value_notify_cb),
+ viewport);
}
priv->vadjustment = vadjustment;
}
}
+
void
champlain_viewport_get_adjustments (ChamplainViewport *viewport,
- ChamplainAdjustment **hadjustment,
- ChamplainAdjustment **vadjustment)
+ ChamplainAdjustment **hadjustment,
+ ChamplainAdjustment **vadjustment)
{
ChamplainViewportPrivate *priv;
g_return_if_fail (CHAMPLAIN_IS_VIEWPORT (viewport));
- priv = ((ChamplainViewport *)viewport)->priv;
+ priv = ((ChamplainViewport *) viewport)->priv;
if (hadjustment)
{
@@ -472,19 +479,19 @@ champlain_viewport_get_adjustments (ChamplainViewport *viewport,
ChamplainAdjustment *adjustment;
guint width, stage_width, increment;
- width = clutter_actor_get_width (CLUTTER_ACTOR(viewport));
+ width = clutter_actor_get_width (CLUTTER_ACTOR (viewport));
stage_width = clutter_actor_get_width (clutter_stage_get_default ());
- increment = MAX (1, MIN(stage_width, width));
+ increment = MAX (1, MIN (stage_width, width));
adjustment = champlain_adjustment_new (priv->x,
- 0,
- width,
- 1,
- increment,
- increment);
+ 0,
+ width,
+ 1,
+ increment,
+ increment);
champlain_viewport_set_adjustments (viewport,
- adjustment,
- priv->vadjustment);
+ adjustment,
+ priv->vadjustment);
*hadjustment = adjustment;
}
}
@@ -498,19 +505,19 @@ champlain_viewport_get_adjustments (ChamplainViewport *viewport,
ChamplainAdjustment *adjustment;
guint height, stage_height, increment;
- height = clutter_actor_get_height (CLUTTER_ACTOR(viewport));
+ height = clutter_actor_get_height (CLUTTER_ACTOR (viewport));
stage_height = clutter_actor_get_height (clutter_stage_get_default ());
- increment = MAX (1, MIN(stage_height, height));
+ increment = MAX (1, MIN (stage_height, height));
adjustment = champlain_adjustment_new (priv->y,
- 0,
- height,
- 1,
- increment,
- increment);
+ 0,
+ height,
+ 1,
+ increment,
+ increment);
champlain_viewport_set_adjustments (viewport,
- priv->hadjustment,
- adjustment);
+ priv->hadjustment,
+ adjustment);
*vadjustment = adjustment;
}
}
@@ -519,8 +526,8 @@ champlain_viewport_get_adjustments (ChamplainViewport *viewport,
static void
clip_notify_cb (ClutterActor *actor,
- GParamSpec *pspec,
- ChamplainViewport *self)
+ GParamSpec *pspec,
+ ChamplainViewport *self)
{
gfloat width, height;
ChamplainViewportPrivate *priv = self->priv;
@@ -531,21 +538,22 @@ clip_notify_cb (ClutterActor *actor,
if (!clutter_actor_has_clip (actor))
{
if (priv->hadjustment)
- g_object_set (priv->hadjustment, "page-size", (gdouble)1.0, NULL);
+ g_object_set (priv->hadjustment, "page-size", (gdouble) 1.0, NULL);
if (priv->vadjustment)
- g_object_set (priv->vadjustment, "page-size", (gdouble)1.0, NULL);
+ g_object_set (priv->vadjustment, "page-size", (gdouble) 1.0, NULL);
return;
}
clutter_actor_get_clip (actor, NULL, NULL, &width, &height);
if (priv->hadjustment)
- g_object_set (priv->hadjustment, "page-size", (gdouble)width, NULL);
+ g_object_set (priv->hadjustment, "page-size", (gdouble) width, NULL);
if (priv->vadjustment)
- g_object_set (priv->vadjustment, "page-size", (gdouble)height, NULL);
+ g_object_set (priv->vadjustment, "page-size", (gdouble) height, NULL);
}
+
static void
champlain_viewport_init (ChamplainViewport *self)
{
@@ -559,19 +567,21 @@ champlain_viewport_init (ChamplainViewport *self)
clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
g_signal_connect (self, "notify::clip",
- G_CALLBACK (clip_notify_cb), self);
+ G_CALLBACK (clip_notify_cb), self);
}
+
ClutterActor *
champlain_viewport_new (void)
{
return g_object_new (CHAMPLAIN_TYPE_VIEWPORT, NULL);
}
+
void
champlain_viewport_set_origin (ChamplainViewport *viewport,
- float x,
- float y)
+ float x,
+ float y)
{
ChamplainViewportPrivate *priv;
@@ -588,7 +598,7 @@ champlain_viewport_set_origin (ChamplainViewport *viewport,
if (priv->hadjustment)
champlain_adjustment_set_value (priv->hadjustment,
- x);
+ x);
}
if (y != priv->y)
@@ -598,21 +608,22 @@ champlain_viewport_set_origin (ChamplainViewport *viewport,
if (priv->vadjustment)
champlain_adjustment_set_value (priv->vadjustment,
- y);
+ y);
}
g_object_thaw_notify (G_OBJECT (viewport));
-
+
if (priv->child)
clutter_actor_set_position (priv->child, -x, -y);
clutter_actor_queue_redraw (CLUTTER_ACTOR (viewport));
}
+
void
champlain_viewport_get_origin (ChamplainViewport *viewport,
- float *x,
- float *y)
+ float *x,
+ float *y)
{
ChamplainViewportPrivate *priv;
@@ -628,14 +639,14 @@ champlain_viewport_get_origin (ChamplainViewport *viewport,
}
-void
+void
champlain_viewport_set_child (ChamplainViewport *viewport, ClutterActor *child)
{
ChamplainViewportPrivate *priv = viewport->priv;
-
+
if (priv->child)
clutter_container_remove_actor (CLUTTER_CONTAINER (priv->content_group), priv->child);
-
+
priv->child = child;
- clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), child);
+ clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), child);
}
diff --git a/champlain/champlain-viewport.h b/champlain/champlain-viewport.h
index 7b62f44..72d7782 100644
--- a/champlain/champlain-viewport.h
+++ b/champlain/champlain-viewport.h
@@ -29,16 +29,16 @@
G_BEGIN_DECLS
-#define CHAMPLAIN_TYPE_VIEWPORT (champlain_viewport_get_type())
+#define CHAMPLAIN_TYPE_VIEWPORT (champlain_viewport_get_type ())
#define CHAMPLAIN_VIEWPORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_VIEWPORT, ChamplainViewport))
#define CHAMPLAIN_IS_VIEWPORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_VIEWPORT))
#define CHAMPLAIN_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_VIEWPORT, ChamplainViewportClass))
#define CHAMPLAIN_IS_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_VIEWPORT))
#define CHAMPLAIN_VIEWPORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_VIEWPORT, ChamplainViewportClass))
-typedef struct _ChamplainViewport ChamplainViewport;
-typedef struct _ChamplainViewportPrivate ChamplainViewportPrivate;
-typedef struct _ChamplainViewportClass ChamplainViewportClass;
+typedef struct _ChamplainViewport ChamplainViewport;
+typedef struct _ChamplainViewportPrivate ChamplainViewportPrivate;
+typedef struct _ChamplainViewportClass ChamplainViewportClass;
struct _ChamplainViewport
{
@@ -54,28 +54,28 @@ struct _ChamplainViewportClass
GType champlain_viewport_get_type (void) G_GNUC_CONST;
-ClutterActor * champlain_viewport_new (void);
+ClutterActor *champlain_viewport_new (void);
-void champlain_viewport_set_origin (ChamplainViewport *viewport,
- float x,
- float y);
+void champlain_viewport_set_origin (ChamplainViewport *viewport,
+ float x,
+ float y);
-void champlain_viewport_get_origin (ChamplainViewport *viewport,
- gfloat *x,
- gfloat *y);
-void champlain_viewport_stop (ChamplainViewport *viewport);
+void champlain_viewport_get_origin (ChamplainViewport *viewport,
+ gfloat *x,
+ gfloat *y);
+void champlain_viewport_stop (ChamplainViewport *viewport);
void champlain_viewport_get_adjustments (ChamplainViewport *viewport,
- ChamplainAdjustment **hadjustment,
- ChamplainAdjustment **vadjustment);
+ ChamplainAdjustment **hadjustment,
+ ChamplainAdjustment **vadjustment);
void champlain_viewport_set_adjustments (ChamplainViewport *viewport,
- ChamplainAdjustment *hadjustment,
- ChamplainAdjustment *vadjustment);
+ ChamplainAdjustment *hadjustment,
+ ChamplainAdjustment *vadjustment);
-void champlain_viewport_set_child (ChamplainViewport *viewport, ClutterActor *child);
+void champlain_viewport_set_child (ChamplainViewport *viewport,
+ ClutterActor *child);
G_END_DECLS
#endif /* __CHAMPLAIN_VIEWPORT_H__ */
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
![http://tile.openstreetmap.org/#Z#/#X#/#Y#.png"](http://tile.openstreetmap.org/#Z#/#X#/#Y#.png"){kind=link}
![http://tah.openstreetmap.org/Tiles/tile/#Z#/#X#/#Y#.png"](http://tah.openstreetmap.org/Tiles/tile/#Z#/#X#/#Y#.png"){kind=link}
![http://otile1.mqcdn.com/tiles/1.0.0/osm/#Z#/#X#/#Y#.png"](http://otile1.mqcdn.com/tiles/1.0.0/osm/#Z#/#X#/#Y#.png"){kind=link}
![http://andy.sandbox.cloudmade.com/tiles/cycle/#Z#/#X#/#Y#.png"](http://andy.sandbox.cloudmade.com/tiles/cycle/#Z#/#X#/#Y#.png"){kind=link}
![http://tile.xn--pnvkarte-m4a.de/tilegen/#Z#/#X#/#Y#.png"](http://tile.xn--pnvkarte-m4a.de/tilegen/#Z#/#X#/#Y#.png"){kind=link}
![http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z#/#X#/#Y#.jpg"](http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z#/#X#/#Y#.jpg"){kind=link}
![http://maps-for-free.com/layer/relief/z#Z#/row#Y#/#Z#_#X#-#Y#.jpg"](http://maps-for-free.com/layer/relief/z#Z#/row#Y#/#Z#_#X#-#Y#.jpg"){kind=link}