[gnome-games] Remove our private copy of gtk-clutter-embed.h and rename all calls to it
- From: Jason Clinton <jclinton src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-games] Remove our private copy of gtk-clutter-embed.h and rename all calls to it
- Date: Mon, 20 Apr 2009 23:08:05 -0400 (EDT)
commit 9c4239652a48a68a4e8f19b59c732cf7dc6c9f89
Author: Jason Clinton <jclinton src gnome org>
Date: Mon Mar 30 01:25:03 2009 +0000
Remove our private copy of gtk-clutter-embed.h and rename all calls to it
This is due new features upstream, API changes and a lack of desire to
maintain our own private copy. Our private copy did not have any
features over the newest fixed upstream anyways after upstream fixed our
reported issues.
svn path=/branches/clutter-0-9/; revision=8952
---
aisleriot/board.c | 11 +-
aisleriot/sol.c | 5 +-
gnometris/main.cpp | 2 +-
libgames-support/Makefile.am | 2 -
libgames-support/games-clutter-embed.c | 508 --------------------------------
libgames-support/games-clutter-embed.h | 100 -------
6 files changed, 7 insertions(+), 621 deletions(-)
diff --git a/aisleriot/board.c b/aisleriot/board.c
index 2cf59e3..8acc9de 100644
--- a/aisleriot/board.c
+++ b/aisleriot/board.c
@@ -28,7 +28,6 @@
#include <gdk/gdkkeysyms.h>
#include <clutter/clutter.h>
-// #include <clutter-gtk/gtk-clutter-util.h>
#include <libgames-support/games-card-textures-cache.h>
#include <libgames-support/games-clutter-embed.h>
@@ -415,7 +414,7 @@ set_background_from_baize (AisleriotBoard *board)
if (priv->baize_actor == NULL) {
ClutterActor *stage;
- stage = games_clutter_embed_get_stage (GAMES_CLUTTER_EMBED (board));
+ stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (board));
priv->baize_actor = g_object_ref_sink (aisleriot_baize_new ());
clutter_container_add (CLUTTER_CONTAINER (stage),
@@ -1038,7 +1037,7 @@ slot_update_card_images_full (AisleriotBoard *board,
AisleriotBoardPrivate *priv = board->priv;
ClutterActor *stage;
- stage = games_clutter_embed_get_stage (GAMES_CLUTTER_EMBED (board));
+ stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (board));
if (!priv->geometry_set)
return;
@@ -1263,7 +1262,7 @@ drag_begin (AisleriotBoard *board)
slot_update_card_images (board, hslot);
aisleriot_game_reset_old_cards (hslot);
- stage = games_clutter_embed_get_stage (GAMES_CLUTTER_EMBED (board));
+ stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (board));
clutter_container_add (CLUTTER_CONTAINER (stage),
priv->moving_cards_group, NULL);
@@ -2299,7 +2298,7 @@ slot_changed_cb (AisleriotGame *game,
/* Class implementation */
-G_DEFINE_TYPE (AisleriotBoard, aisleriot_board, GAMES_TYPE_CLUTTER_EMBED);
+G_DEFINE_TYPE (AisleriotBoard, aisleriot_board, GTK_TYPE_CLUTTER_EMBED);
/* AisleriotBoardClass methods */
@@ -3192,7 +3191,7 @@ aisleriot_board_init (AisleriotBoard *board)
gtk_widget_tap_and_hold_setup (widget, NULL, NULL, GTK_TAP_AND_HOLD_PASS_PRESS);
#endif
- stage = games_clutter_embed_get_stage (GAMES_CLUTTER_EMBED (board));
+ stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (board));
priv->animation_layer = g_object_ref_sink (clutter_group_new ());
clutter_container_add (CLUTTER_CONTAINER (stage),
priv->animation_layer, NULL);
diff --git a/aisleriot/sol.c b/aisleriot/sol.c
index f26edc0..f19d445 100644
--- a/aisleriot/sol.c
+++ b/aisleriot/sol.c
@@ -32,6 +32,7 @@
#ifdef HAVE_CLUTTER
#include <clutter/clutter.h>
+#include <clutter-gtk/gtk-clutter-embed.h>
#endif
#ifdef HAVE_HILDON
@@ -71,10 +72,6 @@
#include "util.h"
#include "window.h"
-#ifdef HAVE_CLUTTER
-#include <libgames-support/games-clutter-embed.h>
-#endif
-
typedef struct {
AisleriotWindow *window;
char *variation;
diff --git a/gnometris/main.cpp b/gnometris/main.cpp
index 6664824..7697465 100644
--- a/gnometris/main.cpp
+++ b/gnometris/main.cpp
@@ -27,7 +27,7 @@
#include <libgames-support/games-runtime.h>
#ifdef HAVE_CLUTTER
-#include <libgames-support/games-clutter-embed.h>
+#include <clutter-gtk/gtk-clutter-embed.h>
#endif
#include "tetris.h"
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 4bde620..1ca6a85 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -110,8 +110,6 @@ if HAVE_CLUTTER
libgames_support_la_SOURCES += \
games-card-textures-cache.c \
games-card-textures-cache.h \
- games-clutter-embed.c \
- games-clutter-embed.h \
$(NULL)
endif
diff --git a/libgames-support/games-clutter-embed.c b/libgames-support/games-clutter-embed.c
deleted file mode 100644
index 9f27899..0000000
--- a/libgames-support/games-clutter-embed.c
+++ /dev/null
@@ -1,508 +0,0 @@
-/* gtk-clutter-embed.c: Embeddable ClutterStage
- *
- * Copyright (C) 2007 OpenedHand
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that 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 library. If not see <http://www.fsf.org/licensing>.
- *
- * Authors:
- * Iain Holmes <iain openedhand com>
- * Emmanuele Bassi <ebassi openedhand com>
- */
-
-/**
- * SECTION:gtk-clutter-embed
- * @short_description: Widget for embedding a Clutter scene
- *
- * #GamesClutterEmbed is a GTK+ widget embedding a #ClutterStage. Using
- * a #GamesClutterEmbed widget is possible to build, show and interact with
- * a scene built using Clutter inside a GTK+ application.
- *
- * <note>To avoid flickering on show, you should call gtk_widget_show()
- * or gtk_widget_realize() before calling clutter_actor_show() on the
- * embedded #ClutterStage actor. This is needed for Clutter to be able
- * to paint on the #GamesClutterEmbed widget.</note>
- *
- * Since: 0.6
- */
-
-#include <config.h>
-
-#include <glib-object.h>
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-#include <clutter/clutter.h>
-
-#if defined(GDK_WINDOWING_X11)
-
-#include <clutter/x11/clutter-x11.h>
-#include <gdk/gdkx.h>
-
-#elif defined(GDK_WINDOWING_WIN32)
-
-#include <clutter/clutter-win32.h>
-#include <gdk/gdkwin32.h>
-
-#endif /* HAVE_CLUTTER_GTK_{X11,WIN32} */
-
-#include "games-clutter-embed.h"
-
-G_DEFINE_TYPE (GamesClutterEmbed, games_clutter_embed, GTK_TYPE_WIDGET);
-
-#define GAMES_CLUTTER_EMBED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GAMES_TYPE_CLUTTER_EMBED, GamesClutterEmbedPrivate))
-
-struct _GamesClutterEmbedPrivate
-{
- ClutterActor *stage;
-};
-
-static void
-games_clutter_embed_send_configure (GamesClutterEmbed *embed)
-{
- GtkWidget *widget;
- GdkEvent *event = gdk_event_new (GDK_CONFIGURE);
-
- widget = GTK_WIDGET (embed);
-
- event->configure.window = g_object_ref (widget->window);
- event->configure.send_event = TRUE;
- event->configure.x = widget->allocation.x;
- event->configure.y = widget->allocation.y;
- event->configure.width = widget->allocation.width;
- event->configure.height = widget->allocation.height;
-
- gtk_widget_event (widget, event);
- gdk_event_free (event);
-}
-
-static void
-games_clutter_embed_dispose (GObject *gobject)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (gobject)->priv;
-
- if (priv->stage)
- {
- clutter_actor_destroy (priv->stage);
- priv->stage = NULL;
- }
-
- G_OBJECT_CLASS (games_clutter_embed_parent_class)->dispose (gobject);
-}
-
-static void
-games_clutter_embed_show (GtkWidget *widget)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (widget)->priv;
-
- if (GTK_WIDGET_REALIZED (widget))
- clutter_actor_show (priv->stage);
-
- GTK_WIDGET_CLASS (games_clutter_embed_parent_class)->show (widget);
-}
-
-static void
-games_clutter_embed_hide (GtkWidget *widget)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (widget)->priv;
-
- clutter_actor_hide (priv->stage);
-
- GTK_WIDGET_CLASS (games_clutter_embed_parent_class)->hide (widget);
-}
-
-static void
-games_clutter_embed_realize (GtkWidget *widget)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (widget)->priv;
- GdkWindowAttr attributes;
- int attributes_mask;
-
- /* we must realize the stage to get it ready for embedding */
- clutter_actor_realize (priv->stage);
-
-#ifdef GDK_WINDOWING_X11
- {
- const XVisualInfo *xvinfo;
- GdkVisual *visual;
- GdkColormap *colormap;
-
- /* We need to use the colormap from the Clutter visual */
- xvinfo = clutter_x11_get_stage_visual (CLUTTER_STAGE (priv->stage));
- visual = gdk_x11_screen_lookup_visual (gtk_widget_get_screen (widget),
- xvinfo->visualid);
- colormap = gdk_colormap_new (visual, FALSE);
- gtk_widget_set_colormap (widget, colormap);
- }
-#endif
-
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
-
- /* NOTE: GDK_MOTION_NOTIFY above should be safe as Clutter does its own
- * throtling.
- */
- attributes.event_mask = gtk_widget_get_events (widget)
- | GDK_EXPOSURE_MASK
- | GDK_BUTTON_PRESS_MASK
- | GDK_BUTTON_RELEASE_MASK
- | GDK_KEY_PRESS_MASK
- | GDK_KEY_RELEASE_MASK
- | GDK_POINTER_MOTION_MASK;
-
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-
- widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
- &attributes,
- attributes_mask);
- gdk_window_set_user_data (widget->window, widget);
-
- widget->style = gtk_style_attach (widget->style, widget->window);
- gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-
- gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
-
-#if defined(GDK_WINDOWING_X11)
- clutter_x11_set_stage_foreign (CLUTTER_STAGE (priv->stage),
- GDK_WINDOW_XID (widget->window));
-#elif defined(GDK_WINDOWING_WIN32)
- clutter_win32_set_stage_foreign (CLUTTER_STAGE (priv->stage),
- GDK_WINDOW_HWND (widget->window));
-#endif /* GDK_WINDOWING_{X11,WIN32} */
-
- clutter_actor_queue_redraw (CLUTTER_ACTOR (priv->stage));
-
- if (GTK_WIDGET_VISIBLE (widget))
- clutter_actor_show (priv->stage);
-
- games_clutter_embed_send_configure (GAMES_CLUTTER_EMBED (widget));
-}
-
-static void
-games_clutter_embed_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (widget)->priv;
-
- widget->allocation = *allocation;
-
- if (GTK_WIDGET_REALIZED (widget))
- {
- gdk_window_move_resize (widget->window,
- allocation->x, allocation->y,
- allocation->width, allocation->height);
-
- games_clutter_embed_send_configure (GAMES_CLUTTER_EMBED (widget));
- }
-
- clutter_actor_set_size (priv->stage,
- allocation->width,
- allocation->height);
-
- clutter_actor_queue_relayout (priv->stage);
-}
-
-static gboolean
-games_clutter_embed_motion_notify_event (GtkWidget *widget,
- GdkEventMotion *event)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (widget)->priv;
- ClutterEvent cevent = { 0, };
-
- cevent.type = CLUTTER_MOTION;
- cevent.any.stage = CLUTTER_STAGE (priv->stage);
- cevent.motion.x = event->x;
- cevent.motion.y = event->y;
- cevent.motion.time = event->time;
-
- clutter_do_event (&cevent);
-
- /* doh - motion events can push ENTER/LEAVE events onto Clutters
- * internal event queue which we do really ever touch (essentially
- * proxying from gtks queue). The below pumps them back out and
- * processes.
- * *could* be side effects with below though doubful as no other
- * events reach the queue (we shut down event collection). Maybe
- * a peek_mask type call could be even safer.
- */
- while (clutter_events_pending())
- {
- ClutterEvent *ev = clutter_event_get ();
- if (ev)
- {
- clutter_do_event (ev);
- clutter_event_free (ev);
- }
- }
-
- return FALSE;
-}
-
-static gboolean
-games_clutter_embed_button_event (GtkWidget *widget,
- GdkEventButton *event)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (widget)->priv;
- ClutterEvent cevent = { 0, };
-
- if (event->type == GDK_BUTTON_PRESS ||
- event->type == GDK_2BUTTON_PRESS ||
- event->type == GDK_3BUTTON_PRESS)
- cevent.type = cevent.button.type = CLUTTER_BUTTON_PRESS;
- else if (event->type == GDK_BUTTON_RELEASE)
- cevent.type = cevent.button.type = CLUTTER_BUTTON_RELEASE;
- else
- return FALSE;
-
- cevent.any.stage = CLUTTER_STAGE (priv->stage);
- cevent.button.x = event->x;
- cevent.button.y = event->y;
- cevent.button.time = event->time;
- cevent.button.click_count =
- (event->type == GDK_BUTTON_PRESS ? 1
- : (event->type == GDK_2BUTTON_PRESS ? 2
- : 3));
- cevent.button.modifier_state = event->state;
- cevent.button.button = event->button;
-
- clutter_do_event (&cevent);
-
- return FALSE;
-}
-
-static gboolean
-games_clutter_embed_key_event (GtkWidget *widget,
- GdkEventKey *event)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (widget)->priv;
- ClutterEvent cevent = { 0, };
-
- if (event->type == GDK_KEY_PRESS)
- cevent.type = cevent.key.type = CLUTTER_KEY_PRESS;
- else if (event->type == GDK_KEY_RELEASE)
- cevent.type = cevent.key.type = CLUTTER_KEY_RELEASE;
- else
- return FALSE;
-
- cevent.any.stage = CLUTTER_STAGE (priv->stage);
- cevent.key.time = event->time;
- cevent.key.modifier_state = event->state;
- cevent.key.keyval = event->keyval;
- cevent.key.hardware_keycode = event->hardware_keycode;
-
- clutter_do_event (&cevent);
-
- return FALSE;
-}
-
-static gboolean
-games_clutter_embed_expose_event (GtkWidget *widget,
- GdkEventExpose *event)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (widget)->priv;
-
- if (CLUTTER_ACTOR_IS_VISIBLE (priv->stage))
- clutter_actor_queue_redraw (priv->stage);
-
- return FALSE;
-}
-
-static gboolean
-games_clutter_embed_map_event (GtkWidget *widget,
- GdkEventAny *event)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (widget)->priv;
-
- /* The backend wont get the XEvent as we go strait to do_event().
- * So we have to make sure we set the event here.
- */
- CLUTTER_ACTOR_SET_FLAGS (priv->stage, CLUTTER_ACTOR_MAPPED);
-
- return FALSE;
-}
-
-static gboolean
-games_clutter_embed_focus_out (GtkWidget *widget,
- GdkEventFocus *event)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (widget)->priv;
-
- /* give back key focus to the stage */
- clutter_stage_set_key_focus (CLUTTER_STAGE (priv->stage), NULL);
-
- return FALSE;
-}
-
-static gboolean
-games_clutter_embed_scroll_event (GtkWidget *widget,
- GdkEventScroll *event)
-{
- GamesClutterEmbedPrivate *priv = GAMES_CLUTTER_EMBED (widget)->priv;
-
- ClutterEvent cevent = { 0, };
-
- if (event->type == GDK_SCROLL)
- cevent.type = cevent.scroll.type = CLUTTER_SCROLL;
- else
- return FALSE;
-
- cevent.any.stage = CLUTTER_STAGE (priv->stage);
- cevent.scroll.x = (gint) event->x;
- cevent.scroll.y = (gint) event->y;
- cevent.scroll.time = event->time;
- cevent.scroll.direction = event->direction;
- cevent.scroll.modifier_state = event->state;
-
- clutter_do_event (&cevent);
-
- return FALSE;
-}
-
-static void
-games_clutter_embed_class_init (GamesClutterEmbedClass *klass)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
- g_type_class_add_private (klass, sizeof (GamesClutterEmbedPrivate));
-
- gobject_class->dispose = games_clutter_embed_dispose;
-
- widget_class->size_allocate = games_clutter_embed_size_allocate;
- widget_class->realize = games_clutter_embed_realize;
- widget_class->show = games_clutter_embed_show;
- widget_class->hide = games_clutter_embed_hide;
- widget_class->button_press_event = games_clutter_embed_button_event;
- widget_class->button_release_event = games_clutter_embed_button_event;
- widget_class->key_press_event = games_clutter_embed_key_event;
- widget_class->key_release_event = games_clutter_embed_key_event;
- widget_class->motion_notify_event = games_clutter_embed_motion_notify_event;
- widget_class->expose_event = games_clutter_embed_expose_event;
- widget_class->map_event = games_clutter_embed_map_event;
- widget_class->focus_out_event = games_clutter_embed_focus_out;
- widget_class->scroll_event = games_clutter_embed_scroll_event;
-}
-
-static void
-games_clutter_embed_init (GamesClutterEmbed *embed)
-{
- GamesClutterEmbedPrivate *priv;
-
- embed->priv = priv = GAMES_CLUTTER_EMBED_GET_PRIVATE (embed);
-
- GTK_WIDGET_SET_FLAGS (embed, GTK_CAN_FOCUS);
-
- /* disable double-buffering: it's automatically provided
- * by OpenGL
- */
- gtk_widget_set_double_buffered (GTK_WIDGET (embed), FALSE);
-
- /* we always create new stages rather than use the default */
- priv->stage = clutter_stage_new ();
-}
-
-/**
- * games_clutter_init:
- * @argc: pointer to the arguments count, or %NULL
- * @argv: pointer to the arguments vector, or %NULL
- *
- * This function should be called instead of clutter_init() and
- * gtk_init().
- *
- * Return value: %CLUTTER_INIT_SUCCESS on success, a negative integer
- * on failure.
- *
- * Since: 0.8
- */
-ClutterInitError
-games_clutter_init (int *argc,
- char ***argv)
-{
- if (!gtk_init_check (argc, argv))
- return GAMES_CLUTTER_INIT_ERROR_GTK;
-
-#if defined(GDK_WINDOWING_X11)
- clutter_x11_set_display (GDK_DISPLAY());
- clutter_x11_disable_event_retrieval ();
-#elif defined(GDK_WINDOWING_WIN32)
- clutter_win32_disable_event_retrieval ();
-#endif /* HAVE_CLUTTER_GTK_{X11,WIN32} */
-
- return clutter_init (argc, argv);
-}
-
-ClutterInitError
-games_clutter_init_with_args (int *argc,
- char ***argv,
- const char *parameter_string,
- GOptionEntry *entries,
- const char *translation_domain,
- GError **error)
-{
- if (!gtk_init_with_args (argc, argv, (char*) parameter_string, entries, (char*) translation_domain, error))
- return GAMES_CLUTTER_INIT_ERROR_GTK;
-
-#if defined(GDK_WINDOWING_X11)
- clutter_x11_set_display (GDK_DISPLAY());
- clutter_x11_disable_event_retrieval ();
-#elif defined(GDK_WINDOWING_WIN32)
- clutter_win32_disable_event_retrieval ();
-#endif /* GDK_WINDOWING_{X11,WIN32} */
-
- return clutter_init_with_args (argc, argv, NULL, NULL, NULL, error);
-}
-
-/**
- * games_clutter_embed_new:
- *
- * Creates a new #GamesClutterEmbed widget. This widget can be
- * used to build a scene using Clutter API into a GTK+ application.
- *
- * Return value: the newly created #GamesClutterEmbed
- *
- * Since: 0.6
- */
-GtkWidget *
-games_clutter_embed_new (void)
-{
- return g_object_new (GAMES_TYPE_CLUTTER_EMBED, NULL);
-}
-
-/**
- * games_clutter_embed_get_stage:
- * @embed: a #GamesClutterEmbed
- *
- * Retrieves the #ClutterStage from @embed. The returned stage can be
- * used to add actors to the Clutter scene.
- *
- * Return value: the Clutter stage. You should never destroy or unref
- * the returned actor.
- *
- * Since: 0.6
- */
-ClutterActor *
-games_clutter_embed_get_stage (GamesClutterEmbed *embed)
-{
- g_return_val_if_fail (GAMES_IS_CLUTTER_EMBED (embed), NULL);
-
- return embed->priv->stage;
-}
diff --git a/libgames-support/games-clutter-embed.h b/libgames-support/games-clutter-embed.h
deleted file mode 100644
index 149b245..0000000
--- a/libgames-support/games-clutter-embed.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* gtk-clutter-embed.h: Embeddable ClutterStage
- *
- * Copyright (C) 2007 OpenedHand
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that 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 library. If not see <http://www.fsf.org/licensing>.
- *
- * Authors:
- * Iain Holmes <iain openedhand com>
- * Emmanuele Bassi <ebassi openedhand com>
- */
-
-#ifndef __GAMES_CLUTTER_EMBED_H__
-#define __GAMES_CLUTTER_EMBED_H__
-
-#include <gtk/gtk.h>
-#include <clutter/clutter.h>
-
-G_BEGIN_DECLS
-
-#define GAMES_TYPE_CLUTTER_EMBED (games_clutter_embed_get_type ())
-#define GAMES_CLUTTER_EMBED(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAMES_TYPE_CLUTTER_EMBED, GamesClutterEmbed))
-#define GAMES_IS_CLUTTER_EMBED(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GAMES_TYPE_CLUTTER_EMBED))
-#define GAMES_CLUTTER_EMBED_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GAMES_TYPE_CLUTTER_EMBED, GamesClutterEmbedClass))
-#define GAMES_IS_CLUTTER_EMBED_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GAMES_TYPE_CLUTTER_EMBED))
-#define GAMES_CLUTTER_EMBED_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GAMES_TYPE_CLUTTER_EMBED, GamesClutterEmbedClass))
-
-typedef struct _GamesClutterEmbed GamesClutterEmbed;
-typedef struct _GamesClutterEmbedPrivate GamesClutterEmbedPrivate;
-typedef struct _GamesClutterEmbedClass GamesClutterEmbedClass;
-
-/**
- * ClutterGamesInitError:
- * @CLUTTER_INIT_ERROR_LAST: Placeholder
- * @CLUTTER_INIT_ERROR_GTK: Unable to initialize GTK+
- *
- * Extension of the #ClutterInitError enumeration for the integration
- * with GTK+
- *
- * Since: 0.8
- */
-typedef enum {
- GAMES_CLUTTER_INIT_ERROR_LAST = CLUTTER_INIT_ERROR_INTERNAL,
-
- GAMES_CLUTTER_INIT_ERROR_GTK = (GAMES_CLUTTER_INIT_ERROR_LAST - 1)
-} ClutterGamesInitError;
-
-/**
- * GamesClutterEmbed:
- *
- * A #GtkWidget containing the default Clutter stage.
- *
- * Since: 0.6
- */
-struct _GamesClutterEmbed
-{
- /*< private >*/
- GtkWidget parent_instance;
-
- GamesClutterEmbedPrivate *priv;
-};
-
-/**
- * GamesClutterEmbedClass:
- *
- * Base class for #GamesClutterEmbed.
- *
- * Since: 0.6
- */
-struct _GamesClutterEmbedClass
-{
- /*< private >*/
- GtkWidgetClass parent_class;
-};
-
-GType games_clutter_embed_get_type (void) G_GNUC_CONST;
-GtkWidget * games_clutter_embed_new (void);
-ClutterActor *games_clutter_embed_get_stage (GamesClutterEmbed *embed);
-
-ClutterInitError games_clutter_init (gint *argc,
- gchar ***argv);
-ClutterInitError games_clutter_init_with_args (int *argc,
- char ***argv,
- const char *parameter_string,
- GOptionEntry *entries,
- const char *translation_domain,
- GError **error);
-G_END_DECLS
-
-#endif /* __GAMES_CLUTTER_EMBED_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
