[cheese] libcheese: Use Totem's aspect frame
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese] libcheese: Use Totem's aspect frame
- Date: Wed, 27 Jun 2012 12:19:45 +0000 (UTC)
commit 18eb3c5b5b4221ffa2a20ab477a2135d543d0fff
Author: Bastien Nocera <hadess hadess net>
Date: Wed Jun 27 12:47:15 2012 +0100
libcheese: Use Totem's aspect frame
Based on the same code as the CheeseAspectFrame, but with
the mx dependency removed.
https://bugzilla.gnome.org/show_bug.cgi?id=678976
Makefile.am | 4 +-
configure.ac | 2 -
docs/reference/Makefile.am | 2 +-
libcheese/cheese-aspect-frame.c | 399 ---------------------------------------
libcheese/cheese-aspect-frame.h | 91 ---------
libcheese/cheese-widget.c | 7 +-
libcheese/totem-aspect-frame.c | 336 ++++++++++++++++++++++++++++++++
libcheese/totem-aspect-frame.h | 83 ++++++++
8 files changed, 425 insertions(+), 499 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4968385..311e144 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -96,14 +96,14 @@ libcheese_gtk_la_LDFLAGS = \
libcheese_gtk_la_SOURCES = \
libcheese/cheese-avatar-chooser.c \
- libcheese/cheese-aspect-frame.c \
+ libcheese/totem-aspect-frame.c \
libcheese/cheese-flash.c \
libcheese/cheese-gtk.c \
libcheese/cheese-widget.c \
libcheese/um-crop-area.c
noinst_libcheese_gtk_headers = \
- libcheese/cheese-aspect-frame.h \
+ libcheese/totem-aspect-frame.h \
libcheese/cheese-avatar-chooser.h \
libcheese/cheese-flash.h \
libcheese/cheese-widget.h \
diff --git a/configure.ac b/configure.ac
index a22210a..5f4ec5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,6 @@ CLUTTERGTK_REQUIRED="clutter-gtk-1.0 >= 0.91.8"
CLUTTERGST_REQUIRED="clutter-gst-1.0 >= 1.0.0"
GEE_REQUIRED="gee-1.0 >= 0.6.0"
LIBCANBERRA_REQUIRED="libcanberra-gtk3 >= 0.26"
-MX_REQUIRED="mx-1.0"
X11_REQUIRED="x11"
GNOME_VIDEO_EFFECTS_REQUIRED="gnome-video-effects"
@@ -112,7 +111,6 @@ PKG_CHECK_MODULES([CHEESE],
$PANGOCAIRO_REQUIRED
$CLUTTER_REQUIRED
$CLUTTERGST_REQUIRED
- $MX_REQUIRED
$UDEV_REQUIRED])
CHEESE_LIBS="$CHEESE_LIBS -lgstinterfaces-0.10"
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 563e452..9ffd9e0 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -51,7 +51,7 @@ CFILE_GLOB=$(top_srcdir)/libcheese/*.c
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
IGNORE_HFILES= \
- cheese-aspect-frame.h \
+ totem-aspect-frame.h \
cheese-enums.h \
cheese-widget-private.h \
um-crop-area.h \
diff --git a/libcheese/cheese-widget.c b/libcheese/cheese-widget.c
index 5f2166b..4d3ae5b 100644
--- a/libcheese/cheese-widget.c
+++ b/libcheese/cheese-widget.c
@@ -21,13 +21,12 @@
#include <glib/gi18n.h>
#include <clutter-gst/clutter-gst.h>
-#include <mx/mx.h>
#include "cheese-widget.h"
#include "cheese-widget-private.h"
#include "cheese-camera.h"
#include "cheese-enums.h"
-#include "cheese-aspect-frame.h"
+#include "totem-aspect-frame.h"
/**
* SECTION:cheese-widget
@@ -219,11 +218,11 @@ cheese_widget_init (CheeseWidget *widget)
priv->screen = gtk_clutter_embed_new ();
stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (priv->screen));
clutter_stage_set_color (CLUTTER_STAGE (stage), &black);
- frame = cheese_aspect_frame_new ();
+ frame = totem_aspect_frame_new ();
priv->texture = clutter_texture_new ();
clutter_actor_set_size (priv->texture, 400, 300);
- mx_bin_set_child (MX_BIN (frame), priv->texture);
+ totem_aspect_frame_set_child (TOTEM_ASPECT_FRAME (frame), priv->texture);
clutter_container_add_actor (CLUTTER_CONTAINER (stage), frame);
constraint = clutter_bind_constraint_new (stage, CLUTTER_BIND_SIZE, 0.0);
diff --git a/libcheese/totem-aspect-frame.c b/libcheese/totem-aspect-frame.c
new file mode 100644
index 0000000..af4eae2
--- /dev/null
+++ b/libcheese/totem-aspect-frame.c
@@ -0,0 +1,336 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * A container that respects the aspect ratio of its child
+ *
+ * Copyright 2010, 2011 Intel Corporation.
+ * Copyright 2012, Red Hat, Inc.
+ *
+ * Based upon mx-aspect-frame.c
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "totem-aspect-frame.h"
+
+G_DEFINE_TYPE (TotemAspectFrame, totem_aspect_frame, CLUTTER_TYPE_ACTOR)
+
+#define ASPECT_FRAME_PRIVATE(o) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+ TOTEM_TYPE_ASPECT_FRAME, \
+ TotemAspectFramePrivate))
+
+enum
+{
+ PROP_0,
+
+ PROP_EXPAND,
+};
+
+struct _TotemAspectFramePrivate
+{
+ guint expand : 1;
+};
+
+
+static void
+totem_aspect_frame_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ TotemAspectFrame *frame = TOTEM_ASPECT_FRAME (object);
+
+ switch (property_id)
+ {
+ case PROP_EXPAND:
+ g_value_set_boolean (value, totem_aspect_frame_get_expand (frame));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+totem_aspect_frame_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ switch (property_id)
+ {
+ case PROP_EXPAND:
+ totem_aspect_frame_set_expand (TOTEM_ASPECT_FRAME (object),
+ g_value_get_boolean (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+totem_aspect_frame_dispose (GObject *object)
+{
+ G_OBJECT_CLASS (totem_aspect_frame_parent_class)->dispose (object);
+}
+
+static void
+totem_aspect_frame_finalize (GObject *object)
+{
+ G_OBJECT_CLASS (totem_aspect_frame_parent_class)->finalize (object);
+}
+
+static void
+totem_aspect_frame_get_preferred_width (ClutterActor *actor,
+ gfloat for_height,
+ gfloat *min_width_p,
+ gfloat *nat_width_p)
+{
+ gboolean override;
+
+ if (for_height >= 0)
+ override = FALSE;
+ else
+ g_object_get (G_OBJECT (actor), "natural-height-set", &override, NULL);
+
+ if (override)
+ g_object_get (G_OBJECT (actor), "natural-height", &for_height, NULL);
+
+ CLUTTER_ACTOR_CLASS (totem_aspect_frame_parent_class)->
+ get_preferred_width (actor, for_height, min_width_p, nat_width_p);
+}
+
+static void
+totem_aspect_frame_get_preferred_height (ClutterActor *actor,
+ gfloat for_width,
+ gfloat *min_height_p,
+ gfloat *nat_height_p)
+{
+ gboolean override;
+
+ if (for_width >= 0)
+ override = FALSE;
+ else
+ g_object_get (G_OBJECT (actor), "natural-width-set", &override, NULL);
+
+ if (override)
+ g_object_get (G_OBJECT (actor), "natural-width", &for_width, NULL);
+
+ CLUTTER_ACTOR_CLASS (totem_aspect_frame_parent_class)->
+ get_preferred_height (actor, for_width, min_height_p, nat_height_p);
+}
+
+static void
+totem_aspect_frame_allocate (ClutterActor *actor,
+ const ClutterActorBox *box,
+ ClutterAllocationFlags flags)
+{
+ ClutterActor *child;
+ ClutterActorBox child_box;
+ gfloat aspect, child_aspect, width, height, box_width, box_height;
+
+ TotemAspectFramePrivate *priv = TOTEM_ASPECT_FRAME (actor)->priv;
+
+ CLUTTER_ACTOR_CLASS (totem_aspect_frame_parent_class)->
+ allocate (actor, box, flags);
+
+ child = clutter_actor_get_child_at_index (actor, 0);
+ if (!child)
+ return;
+
+ box_width = box->x2 - box->x1;
+ box_height = box->y2 - box->y1;
+ clutter_actor_get_preferred_size (child, NULL, NULL, &width, &height);
+
+ aspect = box_width / box_height;
+ child_aspect = width / height;
+
+ if ((aspect < child_aspect) ^ priv->expand)
+ {
+ width = box_width;
+ height = box_width / child_aspect;
+ }
+ else
+ {
+ height = box_height;
+ width = box_height * child_aspect;
+ }
+
+ child_box.x1 = (box_width - width) / 2;
+ child_box.y1 = (box_height - height) / 2;
+ child_box.x2 = child_box.x1 + width;
+ child_box.y2 = child_box.y1 + height;
+
+ clutter_actor_allocate (child, &child_box, flags);
+}
+
+static void
+totem_aspect_frame_paint (ClutterActor *actor)
+{
+ ClutterActor *child;
+ TotemAspectFramePrivate *priv = TOTEM_ASPECT_FRAME (actor)->priv;
+
+ child = clutter_actor_get_child_at_index (actor, 0);
+
+ if (!child)
+ return;
+
+ if (priv->expand)
+ {
+ gfloat width, height;
+
+ clutter_actor_get_size (actor, &width, &height);
+
+ /* Special-case textures and just munge their coordinates.
+ * This avoids clipping, which can break Clutter's batching.
+ */
+ if (CLUTTER_IS_TEXTURE (child))
+ {
+ guint8 opacity;
+ gfloat x, y, tx, ty;
+ CoglHandle material;
+
+ clutter_actor_get_position (child, &x, &y);
+
+ material =
+ clutter_texture_get_cogl_material (CLUTTER_TEXTURE (child));
+ opacity = clutter_actor_get_paint_opacity (child);
+ cogl_material_set_color4ub (material,
+ opacity, opacity, opacity, opacity);
+ cogl_set_source (material);
+
+ tx = (width / (width - (x * 2.f))) / 2.f;
+ ty = (height / (height - (y * 2.f))) / 2.f;
+
+ cogl_rectangle_with_texture_coords (0.0, 0.0,
+ width,
+ height,
+ 0.5f - tx, 0.5f - ty,
+ 0.5f + tx, 0.5f + ty);
+ }
+ else
+ {
+ cogl_clip_push_rectangle (0.0, 0.0, width, height);
+ clutter_actor_paint (child);
+ cogl_clip_pop ();
+ }
+ }
+ else
+ clutter_actor_paint (child);
+}
+
+static void
+totem_aspect_frame_pick (ClutterActor *actor,
+ const ClutterColor *color)
+{
+ ClutterActorBox box;
+ ClutterActor *child;
+ TotemAspectFramePrivate *priv = TOTEM_ASPECT_FRAME (actor)->priv;
+
+ clutter_actor_get_allocation_box (actor, &box);
+
+ cogl_set_source_color4ub (color->red, color->green,
+ color->blue, color->alpha);
+ cogl_rectangle (box.x1, box.y1, box.x2, box.y2);
+
+ child = clutter_actor_get_child_at_index (actor, 0);
+
+ if (!child)
+ return;
+
+ if (priv->expand)
+ {
+ cogl_clip_push_rectangle (0.0, 0.0, box.x2 - box.x1, box.y2 - box.y1);
+ clutter_actor_paint (child);
+ cogl_clip_pop ();
+ }
+ else
+ clutter_actor_paint (child);
+}
+
+static void
+totem_aspect_frame_class_init (TotemAspectFrameClass *klass)
+{
+ GParamSpec *pspec;
+
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (TotemAspectFramePrivate));
+
+ object_class->get_property = totem_aspect_frame_get_property;
+ object_class->set_property = totem_aspect_frame_set_property;
+ object_class->dispose = totem_aspect_frame_dispose;
+ object_class->finalize = totem_aspect_frame_finalize;
+
+ actor_class->get_preferred_width = totem_aspect_frame_get_preferred_width;
+ actor_class->get_preferred_height = totem_aspect_frame_get_preferred_height;
+ actor_class->allocate = totem_aspect_frame_allocate;
+ actor_class->paint = totem_aspect_frame_paint;
+ actor_class->pick = totem_aspect_frame_pick;
+
+ pspec = g_param_spec_boolean ("expand",
+ "Expand",
+ "Fill the allocated area with the child and "
+ "clip off the excess.",
+ FALSE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (object_class, PROP_EXPAND, pspec);
+}
+
+static void
+totem_aspect_frame_init (TotemAspectFrame *self)
+{
+ self->priv = ASPECT_FRAME_PRIVATE (self);
+}
+
+ClutterActor *
+totem_aspect_frame_new (void)
+{
+ return g_object_new (TOTEM_TYPE_ASPECT_FRAME, NULL);
+}
+
+void
+totem_aspect_frame_set_expand (TotemAspectFrame *frame, gboolean expand)
+{
+ TotemAspectFramePrivate *priv;
+
+ g_return_if_fail (TOTEM_IS_ASPECT_FRAME (frame));
+
+ priv = frame->priv;
+ if (priv->expand != expand)
+ {
+ priv->expand = expand;
+ clutter_actor_queue_relayout (CLUTTER_ACTOR (frame));
+ g_object_notify (G_OBJECT (frame), "expand");
+ }
+}
+
+gboolean
+totem_aspect_frame_get_expand (TotemAspectFrame *frame)
+{
+ g_return_val_if_fail (TOTEM_IS_ASPECT_FRAME (frame), FALSE);
+ return frame->priv->expand;
+}
+
+void
+totem_aspect_frame_set_child (TotemAspectFrame *frame,
+ ClutterActor *child)
+{
+ g_return_if_fail (TOTEM_IS_ASPECT_FRAME (frame));
+
+ clutter_actor_add_child (CLUTTER_ACTOR (frame), child);
+}
diff --git a/libcheese/totem-aspect-frame.h b/libcheese/totem-aspect-frame.h
new file mode 100644
index 0000000..f0e2879
--- /dev/null
+++ b/libcheese/totem-aspect-frame.h
@@ -0,0 +1,83 @@
+
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * mx-aspect-frame.h: A container that respect the aspect ratio of its child
+ *
+ * Copyright 2010, 2011 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __TOTEM_ASPECT_FRAME_H__
+#define __TOTEM_ASPECT_FRAME_H__
+
+#include <glib-object.h>
+#include <clutter/clutter.h>
+
+G_BEGIN_DECLS
+
+#define TOTEM_TYPE_ASPECT_FRAME totem_aspect_frame_get_type()
+
+#define TOTEM_ASPECT_FRAME(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ TOTEM_TYPE_ASPECT_FRAME, TotemAspectFrame))
+
+#define TOTEM_ASPECT_FRAME_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), \
+ TOTEM_TYPE_ASPECT_FRAME, TotemAspectFrameClass))
+
+#define TOTEM_IS_ASPECT_FRAME(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+ TOTEM_TYPE_ASPECT_FRAME))
+
+#define TOTEM_IS_ASPECT_FRAME_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+ TOTEM_TYPE_ASPECT_FRAME))
+
+#define TOTEM_ASPECT_FRAME_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+ TOTEM_TYPE_ASPECT_FRAME, TotemAspectFrameClass))
+
+typedef struct _TotemAspectFrame TotemAspectFrame;
+typedef struct _TotemAspectFrameClass TotemAspectFrameClass;
+typedef struct _TotemAspectFramePrivate TotemAspectFramePrivate;
+
+struct _TotemAspectFrame
+{
+ ClutterActor parent;
+
+ TotemAspectFramePrivate *priv;
+};
+
+struct _TotemAspectFrameClass
+{
+ ClutterActorClass parent_class;
+};
+
+GType totem_aspect_frame_get_type (void) G_GNUC_CONST;
+
+ClutterActor * totem_aspect_frame_new (void);
+
+void totem_aspect_frame_set_child (TotemAspectFrame *frame,
+ ClutterActor *child);
+
+void totem_aspect_frame_set_expand (TotemAspectFrame *frame,
+ gboolean expand);
+gboolean totem_aspect_frame_get_expand (TotemAspectFrame *frame);
+
+G_END_DECLS
+
+#endif /* __TOTEM_ASPECT_FRAME_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
