[Xfce4-commits] <xfce4-weather-plugin:master> Reformat source code: weather-scrollbox
Harald Judt
noreply at xfce.org
Thu Jul 26 16:12:07 CEST 2012
Updating branch refs/heads/master
to 003df4944d9a9756e768c61f87cc3ff162edea4f (commit)
from 392cc48961b0ae62e4a1258c052bf406d6091742 (commit)
commit 003df4944d9a9756e768c61f87cc3ff162edea4f
Author: Harald Judt <h.judt at gmx.at>
Date: Thu Jul 26 16:09:52 2012 +0200
Reformat source code: weather-scrollbox
panel-plugin/weather-scrollbox.c | 379 +++++++++++++++++++-------------------
panel-plugin/weather-scrollbox.h | 58 ++++---
2 files changed, 219 insertions(+), 218 deletions(-)
diff --git a/panel-plugin/weather-scrollbox.c b/panel-plugin/weather-scrollbox.c
index 01545e6..50dfe80 100644
--- a/panel-plugin/weather-scrollbox.c
+++ b/panel-plugin/weather-scrollbox.c
@@ -29,306 +29,297 @@
#define LABEL_REFRESH 3000
#define LABEL_SPEED 25
-static void gtk_scrollbox_finalize (GObject *object);
-static void gtk_scrollbox_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static gboolean gtk_scrollbox_expose_event (GtkWidget *widget, GdkEventExpose *event);
-static gboolean gtk_scrollbox_fade_out (gpointer user_data);
-G_DEFINE_TYPE (GtkScrollbox, gtk_scrollbox, GTK_TYPE_DRAWING_AREA)
+static void gtk_scrollbox_finalize(GObject *object);
+
+static void gtk_scrollbox_size_request(GtkWidget *widget,
+ GtkRequisition *requisition);
+
+static gboolean gtk_scrollbox_expose_event(GtkWidget *widget,
+ GdkEventExpose *event);
+
+static gboolean gtk_scrollbox_fade_out(gpointer user_data);
+
+G_DEFINE_TYPE(GtkScrollbox, gtk_scrollbox, GTK_TYPE_DRAWING_AREA)
+
static void
gtk_scrollbox_class_init (GtkScrollboxClass *klass)
{
- GObjectClass *gobject_class;
- GtkWidgetClass *widget_class;
+ GObjectClass *gobject_class;
+ GtkWidgetClass *widget_class;
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = gtk_scrollbox_finalize;
+ gobject_class = G_OBJECT_CLASS(klass);
+ gobject_class->finalize = gtk_scrollbox_finalize;
- widget_class = GTK_WIDGET_CLASS (klass);
- widget_class->size_request = gtk_scrollbox_size_request;
- widget_class->expose_event = gtk_scrollbox_expose_event;
- //widget_class->style_changed = gtk_scrollbox_style_changed;
+ widget_class = GTK_WIDGET_CLASS(klass);
+ widget_class->size_request = gtk_scrollbox_size_request;
+ widget_class->expose_event = gtk_scrollbox_expose_event;
}
-
static void
-gtk_scrollbox_init (GtkScrollbox *self)
+gtk_scrollbox_init(GtkScrollbox *self)
{
- GTK_WIDGET_SET_FLAGS (self, GTK_NO_WINDOW);
+ GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW);
- self->labels = NULL;
- self->timeout_id = 0;
- self->offset = 0;
- self->active = NULL;
- self->orientation = GTK_ORIENTATION_HORIZONTAL;
+ self->labels = NULL;
+ self->timeout_id = 0;
+ self->offset = 0;
+ self->active = NULL;
+ self->orientation = GTK_ORIENTATION_HORIZONTAL;
}
static void
-gtk_scrollbox_finalize (GObject *object)
+gtk_scrollbox_finalize(GObject *object)
{
- GtkScrollbox *self = GTK_SCROLLBOX (object);
+ GtkScrollbox *self = GTK_SCROLLBOX(object);
- /* stop running timeout */
- if (self->timeout_id != 0)
- g_source_remove (self->timeout_id);
+ /* stop running timeout */
+ if (self->timeout_id != 0)
+ g_source_remove(self->timeout_id);
- /* free all the labels */
- g_slist_foreach (self->labels, (GFunc) g_object_unref, NULL);
- g_slist_free (self->labels);
+ /* free all the labels */
+ g_slist_foreach(self->labels, (GFunc) g_object_unref, NULL);
+ g_slist_free(self->labels);
- G_OBJECT_CLASS (gtk_scrollbox_parent_class)->finalize (object);
+ G_OBJECT_CLASS(gtk_scrollbox_parent_class)->finalize(object);
}
static void
-gtk_scrollbox_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+gtk_scrollbox_size_request(GtkWidget *widget,
+ GtkRequisition *requisition)
{
- GtkScrollbox *self = GTK_SCROLLBOX (widget);
- GSList *li;
- PangoLayout *layout;
- PangoRectangle logical_rect;
- gint width, height;
-
- requisition->width = 0;
- requisition->height = 0;
-
- for (li = self->labels; li != NULL; li = li->next)
- {
- layout = PANGO_LAYOUT (li->data);
- pango_layout_get_extents (layout, NULL, &logical_rect);
- if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
- {
- width = PANGO_PIXELS (logical_rect.width);
- height = PANGO_PIXELS (logical_rect.height);
- }
- else
- {
- height = PANGO_PIXELS (logical_rect.width);
- width = PANGO_PIXELS (logical_rect.height);
+ GtkScrollbox *self = GTK_SCROLLBOX(widget);
+ GSList *li;
+ PangoLayout *layout;
+ PangoRectangle logical_rect;
+ gint width, height;
+
+ requisition->width = 0;
+ requisition->height = 0;
+
+ for (li = self->labels; li != NULL; li = li->next) {
+ layout = PANGO_LAYOUT(li->data);
+ pango_layout_get_extents(layout, NULL, &logical_rect);
+
+ if (self->orientation == GTK_ORIENTATION_HORIZONTAL) {
+ width = PANGO_PIXELS(logical_rect.width);
+ height = PANGO_PIXELS(logical_rect.height);
+ } else {
+ height = PANGO_PIXELS(logical_rect.width);
+ width = PANGO_PIXELS(logical_rect.height);
}
- requisition->width = MAX (width, requisition->width);
- requisition->height = MAX (height, requisition->height);
+ requisition->width = MAX(width, requisition->width);
+ requisition->height = MAX(height, requisition->height);
}
}
static gboolean
-gtk_scrollbox_expose_event (GtkWidget *widget,
- GdkEventExpose *event)
+gtk_scrollbox_expose_event(GtkWidget *widget,
+ GdkEventExpose *event)
{
- GtkScrollbox *self = GTK_SCROLLBOX (widget);
- PangoLayout *layout;
- gint width, height;
- PangoRectangle logical_rect;
- gboolean result = FALSE;
- PangoMatrix matrix = PANGO_MATRIX_INIT;
-
- if (GTK_WIDGET_CLASS (gtk_scrollbox_parent_class)->expose_event != NULL)
- result = GTK_WIDGET_CLASS (gtk_scrollbox_parent_class)->expose_event (widget, event);
-
- if (self->active != NULL)
- {
- layout = PANGO_LAYOUT (self->active->data);
- pango_matrix_rotate(&matrix, (self->orientation == GTK_ORIENTATION_HORIZONTAL) ? 0.0 : -90.0);
- pango_context_set_matrix(pango_layout_get_context (layout), &matrix);
- pango_layout_get_extents (layout, NULL, &logical_rect);
- if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
- {
- width = widget->allocation.x
- + (widget->allocation.width - PANGO_PIXELS(logical_rect.width)) / 2;
- height = widget->allocation.y
- + (widget->allocation.height - PANGO_PIXELS(logical_rect.height)) / 2
- + (self->animate ? self->offset : 0);
+ GtkScrollbox *self = GTK_SCROLLBOX(widget);
+ PangoLayout *layout;
+ gint width, height;
+ PangoRectangle logical_rect;
+ gboolean result = FALSE;
+ PangoMatrix matrix = PANGO_MATRIX_INIT;
+
+ if (GTK_WIDGET_CLASS(gtk_scrollbox_parent_class)->expose_event != NULL)
+ result = GTK_WIDGET_CLASS
+ (gtk_scrollbox_parent_class)->expose_event(widget, event);
+
+ if (self->active != NULL) {
+ layout = PANGO_LAYOUT(self->active->data);
+ pango_matrix_rotate(&matrix,
+ (self->orientation == GTK_ORIENTATION_HORIZONTAL)
+ ? 0.0 : -90.0);
+ pango_context_set_matrix(pango_layout_get_context(layout), &matrix);
+ pango_layout_get_extents(layout, NULL, &logical_rect);
+
+ if (self->orientation == GTK_ORIENTATION_HORIZONTAL) {
+ width = widget->allocation.x
+ + (widget->allocation.width
+ - PANGO_PIXELS(logical_rect.width)) / 2;
+ height = widget->allocation.y
+ + (widget->allocation.height
+ - PANGO_PIXELS(logical_rect.height)) / 2
+ + (self->animate ? self->offset : 0);
+ } else {
+ width = widget->allocation.x
+ + (widget->allocation.width
+ - PANGO_PIXELS(logical_rect.height)) / 2
+ + (self->animate ? self->offset : 0);
+ height = widget->allocation.y
+ + (widget->allocation.height
+ - PANGO_PIXELS(logical_rect.width)) / 2;
}
- else
- {
- width = widget->allocation.x
- + (widget->allocation.width - PANGO_PIXELS(logical_rect.height)) / 2
- + (self->animate ? self->offset : 0);
- height = widget->allocation.y
- + (widget->allocation.height - PANGO_PIXELS(logical_rect.width)) / 2;
- }
- gtk_paint_layout (widget->style, widget->window, GTK_WIDGET_STATE (widget), TRUE, &event->area,
- widget, "GtkScrollbox", width, height, layout);
- }
- return result;
+ gtk_paint_layout(widget->style,
+ widget->window,
+ GTK_WIDGET_STATE(widget), TRUE,
+ &event->area, widget,
+ "GtkScrollbox", width, height, layout);
+ }
+ return result;
}
-
static gboolean
-gtk_scrollbox_sleep (gpointer user_data)
+gtk_scrollbox_sleep(gpointer user_data)
{
- GtkScrollbox *self = GTK_SCROLLBOX (user_data);
-
- self->timeout_id = g_timeout_add (LABEL_SPEED, gtk_scrollbox_fade_out, self);
-
- return FALSE;
+ GtkScrollbox *self = GTK_SCROLLBOX(user_data);
+ self->timeout_id = g_timeout_add(LABEL_SPEED, gtk_scrollbox_fade_out, self);
+ return FALSE;
}
-
static gboolean
-gtk_scrollbox_fade_in (gpointer user_data)
+gtk_scrollbox_fade_in(gpointer user_data)
{
- GtkScrollbox *self = GTK_SCROLLBOX (user_data);
+ GtkScrollbox *self = GTK_SCROLLBOX(user_data);
- /* decrease counter */
- if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
- self->offset--;
- else
- self->offset++;
+ /* decrease counter */
+ if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
+ self->offset--;
+ else
+ self->offset++;
- gtk_widget_queue_draw (GTK_WIDGET (self));
+ gtk_widget_queue_draw(GTK_WIDGET(self));
- if ((self->orientation == GTK_ORIENTATION_HORIZONTAL && self->offset > 0)
- || (self->orientation == GTK_ORIENTATION_VERTICAL && self->offset < 0))
- return TRUE;
- self->timeout_id = g_timeout_add (LABEL_REFRESH, gtk_scrollbox_sleep, self);
+ if ((self->orientation == GTK_ORIENTATION_HORIZONTAL && self->offset > 0) ||
+ (self->orientation == GTK_ORIENTATION_VERTICAL && self->offset < 0))
+ return TRUE;
- return FALSE;
-}
+ self->timeout_id = g_timeout_add(LABEL_REFRESH, gtk_scrollbox_sleep, self);
+ return FALSE;
+}
static gboolean
-gtk_scrollbox_fade_out (gpointer user_data)
+gtk_scrollbox_fade_out(gpointer user_data)
{
- GtkScrollbox *self = GTK_SCROLLBOX (user_data);
+ GtkScrollbox *self = GTK_SCROLLBOX(user_data);
- /* increase counter */
- if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
- self->offset++;
- else
- self->offset--;
+ /* increase counter */
+ if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
+ self->offset++;
+ else
+ self->offset--;
- gtk_widget_queue_draw (GTK_WIDGET (self));
+ gtk_widget_queue_draw(GTK_WIDGET(self));
- if ((self->orientation == GTK_ORIENTATION_HORIZONTAL && self->offset < GTK_WIDGET (self)->allocation.height)
- || (self->orientation == GTK_ORIENTATION_VERTICAL && self->offset > 0 - GTK_WIDGET (self)->allocation.width))
- return TRUE;
+ if ((self->orientation == GTK_ORIENTATION_HORIZONTAL &&
+ self->offset < GTK_WIDGET(self)->allocation.height) ||
+ (self->orientation == GTK_ORIENTATION_VERTICAL &&
+ self->offset > 0 - GTK_WIDGET(self)->allocation.width))
+ return TRUE;
- if (self->active != NULL)
- {
- if (self->active->next != NULL)
- self->active = self->active->next;
- else
- self->active = self->labels;
+ if (self->active != NULL) {
+ if (self->active->next != NULL)
+ self->active = self->active->next;
+ else
+ self->active = self->labels;
- self->timeout_id = g_timeout_add (LABEL_SPEED,
- gtk_scrollbox_fade_in, self);
+ self->timeout_id = g_timeout_add(LABEL_SPEED,
+ gtk_scrollbox_fade_in, self);
}
-
- return FALSE;
+ return FALSE;
}
-
static void
-gtk_scrollbox_start_fade (GtkScrollbox *self)
+gtk_scrollbox_start_fade(GtkScrollbox *self)
{
- if (self->timeout_id != 0)
- {
- g_source_remove (self->timeout_id);
- self->timeout_id = 0;
+ if (self->timeout_id != 0) {
+ g_source_remove(self->timeout_id);
+ self->timeout_id = 0;
}
- self->active = self->labels;
+ self->active = self->labels;
- if (g_slist_length (self->labels) > 1)
- {
- if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
- self->offset = GTK_WIDGET (self)->allocation.height;
- else
- self->offset = 0;
+ if (g_slist_length(self->labels) > 1) {
+ if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
+ self->offset = GTK_WIDGET(self)->allocation.height;
+ else
+ self->offset = 0;
- self->timeout_id = g_timeout_add (LABEL_SPEED,
- gtk_scrollbox_fade_in,
- self);
- }
- else
- {
- self->offset = 0;
- }
+ self->timeout_id = g_timeout_add(LABEL_SPEED,
+ gtk_scrollbox_fade_in,
+ self);
+ } else
+ self->offset = 0;
}
-
void
-gtk_scrollbox_set_label (GtkScrollbox *self,
- gint position,
- gchar *markup)
+gtk_scrollbox_set_label(GtkScrollbox *self,
+ gint position,
+ gchar *markup)
{
- PangoLayout *layout;
-
+ PangoLayout *layout;
- g_return_if_fail (GTK_IS_SCROLLBOX (self));
+ g_return_if_fail(GTK_IS_SCROLLBOX(self));
- layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), NULL);
- pango_layout_set_markup (layout, markup, -1);
- self->labels = g_slist_insert (self->labels, layout, position);
- gtk_widget_queue_resize (GTK_WIDGET (self));
+ layout = gtk_widget_create_pango_layout(GTK_WIDGET(self), NULL);
+ pango_layout_set_markup(layout, markup, -1);
+ self->labels = g_slist_insert(self->labels, layout, position);
+ gtk_widget_queue_resize(GTK_WIDGET(self));
- gtk_scrollbox_start_fade (self);
+ gtk_scrollbox_start_fade(self);
}
-
void
-gtk_scrollbox_set_orientation (GtkScrollbox *self,
- GtkOrientation orientation)
+gtk_scrollbox_set_orientation(GtkScrollbox *self,
+ GtkOrientation orientation)
{
- g_return_if_fail (GTK_IS_SCROLLBOX (self));
+ g_return_if_fail(GTK_IS_SCROLLBOX(self));
- self->orientation = orientation;
- gtk_widget_queue_resize (GTK_WIDGET (self));
+ self->orientation = orientation;
+ gtk_widget_queue_resize(GTK_WIDGET(self));
}
-
GtkWidget *
-gtk_scrollbox_new (void)
+gtk_scrollbox_new(void)
{
- return g_object_new (GTK_TYPE_SCROLLBOX, NULL);
+ return g_object_new(GTK_TYPE_SCROLLBOX, NULL);
}
-
void
-gtk_scrollbox_clear (GtkScrollbox *self)
+gtk_scrollbox_clear(GtkScrollbox *self)
{
- g_return_if_fail (GTK_IS_SCROLLBOX (self));
+ g_return_if_fail(GTK_IS_SCROLLBOX(self));
- g_slist_foreach (self->labels, (GFunc) g_object_unref, NULL);
- g_slist_free (self->labels);
- self->labels = NULL;
+ g_slist_foreach(self->labels, (GFunc) g_object_unref, NULL);
+ g_slist_free(self->labels);
+ self->labels = NULL;
- gtk_widget_queue_resize (GTK_WIDGET (self));
+ gtk_widget_queue_resize(GTK_WIDGET(self));
}
-
-void gtk_scrollbox_set_animate(GtkScrollbox *self, gboolean animate)
+void gtk_scrollbox_set_animate(GtkScrollbox *self,
+ gboolean animate)
{
- self->animate = animate;
+ self->animate = animate;
}
-
void gtk_scrollbox_next_label(GtkScrollbox *self)
{
- if (self->active->next != NULL)
- {
- self->active = self->active->next;
-
- gtk_widget_queue_resize (GTK_WIDGET (self));
+ if (self->active->next != NULL) {
+ self->active = self->active->next;
+ gtk_widget_queue_resize (GTK_WIDGET (self));
}
}
diff --git a/panel-plugin/weather-scrollbox.h b/panel-plugin/weather-scrollbox.h
index d37755f..08fe769 100644
--- a/panel-plugin/weather-scrollbox.h
+++ b/panel-plugin/weather-scrollbox.h
@@ -20,44 +20,54 @@
G_BEGIN_DECLS
-GType gtk_scrollbox_get_type (void);
+GType gtk_scrollbox_get_type(void);
+
+#define GTK_TYPE_SCROLLBOX \
+ (gtk_scrollbox_get_type())
+#define GTK_SCROLLBOX(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_SCROLLBOX, GtkScrollbox))
+#define GTK_SCROLLBOX_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_SCROLLBOX, GtkScrollboxClass))
+#define GTK_IS_SCROLLBOX(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_SCROLLBOX))
+#define GTK_IS_SCROLLBOX_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_SCROLLBOX))
+#define GTK_SCROLLBOX_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_SCROLLBOX, GtkScrollboxClass))
-#define GTK_TYPE_SCROLLBOX (gtk_scrollbox_get_type())
-#define GTK_SCROLLBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_SCROLLBOX, GtkScrollbox))
-#define GTK_SCROLLBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_SCROLLBOX, GtkScrollboxClass))
-#define GTK_IS_SCROLLBOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_SCROLLBOX))
-#define GTK_IS_SCROLLBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_SCROLLBOX))
-#define GTK_SCROLLBOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_SCROLLBOX, GtkScrollboxClass))
typedef struct _GtkScrollbox GtkScrollbox;
typedef struct _GtkScrollboxClass GtkScrollboxClass;
-struct _GtkScrollbox
-{
- GtkDrawingArea __parent__;
+struct _GtkScrollbox {
+ GtkDrawingArea __parent__;
- GSList *labels;
- guint timeout_id;
- gint offset;
- GSList *active;
- gboolean animate;
- GtkOrientation orientation;
+ GSList *labels;
+ guint timeout_id;
+ gint offset;
+ GSList *active;
+ gboolean animate;
+ GtkOrientation orientation;
};
-struct _GtkScrollboxClass
-{
- GtkDrawingAreaClass __parent__;
+struct _GtkScrollboxClass {
+ GtkDrawingAreaClass __parent__;
};
-void gtk_scrollbox_set_label (GtkScrollbox * self, gint position, gchar *markup);
-void gtk_scrollbox_set_orientation (GtkScrollbox *self, GtkOrientation orientation);
+void gtk_scrollbox_set_label(GtkScrollbox *self,
+ gint position,
+ gchar *markup);
-GtkWidget *gtk_scrollbox_new (void);
+void gtk_scrollbox_set_orientation(GtkScrollbox *self,
+ GtkOrientation orientation);
-void gtk_scrollbox_clear (GtkScrollbox * self);
+GtkWidget *gtk_scrollbox_new(void);
-void gtk_scrollbox_set_animate(GtkScrollbox *self, gboolean animate);
+void gtk_scrollbox_clear(GtkScrollbox *self);
+
+void gtk_scrollbox_set_animate(GtkScrollbox *self,
+ gboolean animate);
void gtk_scrollbox_next_label(GtkScrollbox *self);
More information about the Xfce4-commits
mailing list