2006-11-30 Emmanuele Bassi <ebassi@openedhand.com>

* Makefile.am: Remove the gtk directory from the SUBDIRS.

	* clutter/clutter-stage.h:
	* clutter/clutter-stage.c: Add clutter_stage_swap_buffers(),
	which swaps the GL buffers.  This fixes the redraw in the
	GTK widget.
This commit is contained in:
Emmanuele Bassi 2006-11-30 11:08:54 +00:00
parent 56132b57ca
commit 69707e94a4
5 changed files with 25 additions and 6 deletions

View File

@ -1,3 +1,12 @@
2006-11-30 Emmanuele Bassi <ebassi@openedhand.com>
* Makefile.am: Remove the gtk directory from the SUBDIRS.
* clutter/clutter-stage.h:
* clutter/clutter-stage.c: Add clutter_stage_swap_buffers(),
which swaps the GL buffers. This fixes the redraw in the
GTK widget.
2006-11-29 Emmanuele Bassi <ebassi@openedhand.com> 2006-11-29 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-stage.c: * clutter/clutter-stage.c:

View File

@ -1,9 +1,5 @@
SUBDIRS=clutter doc examples SUBDIRS=clutter doc examples
if ENABLE_GTK
SUBDIRS += gtk
endif
pcfiles = clutter-@CLUTTER_MAJORMINOR@.pc pcfiles = clutter-@CLUTTER_MAJORMINOR@.pc
%-@CLUTTER_MAJORMINOR@.pc: %.pc %-@CLUTTER_MAJORMINOR@.pc: %.pc

View File

@ -137,7 +137,7 @@ libclutter_@CLUTTER_MAJORMINOR@_la_LIBADD = \
@CLUTTER_LIBS@ $(top_srcdir)/clutter/pango/libpangoclutter.la @CLUTTER_LIBS@ $(top_srcdir)/clutter/pango/libpangoclutter.la
libclutter_@CLUTTER_MAJORMINOR@_la_LDFLAGS = @CLUTTER_LT_LDFLAGS@ libclutter_@CLUTTER_MAJORMINOR@_la_LDFLAGS = @CLUTTER_LT_LDFLAGS@
libclutter_@CLUTTER_MAJORMINOR@_la_DEPENDENCIES = \ libclutter_@CLUTTER_MAJORMINOR@_la_DEPENDENCIES = \
$(top_srcdir)/clutter/pango/libpangoclutter.a $(top_srcdir)/clutter/pango/libpangoclutter.la
clutterheadersdir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter clutterheadersdir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter
clutterheaders_HEADERS = $(source_h) \ clutterheaders_HEADERS = $(source_h) \

View File

@ -1138,3 +1138,16 @@ clutter_stage_get_actor_at_pos (ClutterStage *stage,
return found; return found;
} }
void
clutter_stage_swap_buffers (ClutterStage *stage)
{
ClutterStagePrivate *priv;
ClutterMainContext *context;
g_return_if_fail (CLUTTER_IS_STAGE (stage));
priv = stage->priv;
context = clutter_context_get_default ();
glXSwapBuffers (context->xdpy, stage->priv->xwin);
}

View File

@ -125,6 +125,7 @@ GdkPixbuf * clutter_stage_snapshot (ClutterStage *stage,
gint width, gint width,
gint height); gint height);
const XVisualInfo * clutter_stage_get_xvisual (ClutterStage *stage); const XVisualInfo * clutter_stage_get_xvisual (ClutterStage *stage);
void clutter_stage_swap_buffers (ClutterStage *stage);
G_END_DECLS G_END_DECLS