isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fall back on XRender if initializing clutter fails.

Browse Source
This commit is contained in:
Tomas Frydrych 2008-09-17 16:39:32 +01:00
parent 438ac55cb1
commit b7bdc5ec69
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.am
View File

@ -14,6 +14,8 @@ metacity_SOURCES= \
include/boxes.h \ include/boxes.h \
compositor/compositor.c \ compositor/compositor.c \
compositor/compositor-private.h \ compositor/compositor-private.h \
compositor/compositor-xrender.c \
compositor/compositor-xrender.h \
include/compositor.h \ include/compositor.h \
core/constraints.c \ core/constraints.c \
core/constraints.h \ core/constraints.h \
@ -99,9 +101,6 @@ metacity_SOURCES= \
if WITH_CLUTTER if WITH_CLUTTER
metacity_SOURCES += compositor/compositor-clutter.c \ metacity_SOURCES += compositor/compositor-clutter.c \
compositor/compositor-clutter.h compositor/compositor-clutter.h
else
metacity_SOURCES += compositor/compositor-xrender.c \
compositor/compositor-xrender.h
endif endif
# by setting libmetacity_private_la_CFLAGS, the files shared with # by setting libmetacity_private_la_CFLAGS, the files shared with

9
src/compositor/compositor.c
View File

@ -24,6 +24,10 @@
#include "compositor-xrender.h" #include "compositor-xrender.h"
#include "compositor-clutter.h" #include "compositor-clutter.h"
#ifdef WITH_CLUTTER
int meta_compositor_can_use_clutter__ = 0;
#endif
MetaCompositor * MetaCompositor *
meta_compositor_new (MetaDisplay *display) meta_compositor_new (MetaDisplay *display)
{ {
@ -31,10 +35,11 @@ meta_compositor_new (MetaDisplay *display)
#ifdef WITH_CLUTTER #ifdef WITH_CLUTTER
/* At some point we would have a way to select between backends */ /* At some point we would have a way to select between backends */
/* return meta_compositor_xrender_new (display); */ /* return meta_compositor_xrender_new (display); */
if (meta_compositor_can_use_clutter__)
return meta_compositor_clutter_new (display); return meta_compositor_clutter_new (display);
#else else
return meta_compositor_xrender_new (display);
#endif #endif
return meta_compositor_xrender_new (display);
#else #else
return NULL; return NULL;
#endif #endif

3
src/include/compositor.h
View File

@ -28,6 +28,9 @@
#include "types.h" #include "types.h"
#include "boxes.h" #include "boxes.h"
#ifdef WITH_CLUTTER
extern int meta_compositor_can_use_clutter__;
#endif
MetaCompositor *meta_compositor_new (MetaDisplay *display); MetaCompositor *meta_compositor_new (MetaDisplay *display);
void meta_compositor_destroy (MetaCompositor *compositor); void meta_compositor_destroy (MetaCompositor *compositor);

11
src/ui/ui.c
View File

@ -39,6 +39,7 @@
#ifdef WITH_CLUTTER #ifdef WITH_CLUTTER
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <clutter/x11/clutter-x11.h> #include <clutter/x11/clutter-x11.h>
#include "compositor.h"
#endif #endif
static void meta_stock_icons_init (void); static void meta_stock_icons_init (void);
@ -67,7 +68,15 @@ meta_ui_init (int *argc, char ***argv)
*/ */
clutter_x11_set_display (gdk_display); clutter_x11_set_display (gdk_display);
clutter_x11_disable_event_retrieval (); clutter_x11_disable_event_retrieval ();
clutter_init (argc, argv); if (clutter_init (argc, argv) != CLUTTER_INIT_SUCCESS)
{
g_message ("Unable to initialize Clutter; falling back on Xrender\n");
meta_compositor_can_use_clutter__ = 0;
}
else
{
meta_compositor_can_use_clutter__ = 1;
}
#endif #endif