mirror of
https://github.com/brl/mutter.git
synced 2024-11-30 03:50:47 -05:00
101a3cac4e
Rework the stage wrapper/implementation relation: remove duplicated code and all the bookkeeping from the backends into ClutterStage whenever possible, to reduce the amount of work a backend must do (and possibly get wrong). Thanks to Tommi Komulainen. * clutter/clutter-main.c: (clutter_init_with_args), (clutter_init): Realize the default stage after creation. The default stage is special, because we use it in the initialization sequence. This removes the burden from the backends and reduces the things a backend can get wrong. * clutter/clutter-stage.c: (clutter_stage_show): Make sure to realize the implementation if it hasn't been realized yet. (clutter_stage_realize): Set the REALIZED flag and call clutter_stage_ensure_current() if the implementation was successfully realized. (clutter_stage_unrealized): Call clutter_stage_ensure_current() on unrealize. * clutter/glx/clutter-backend-glx.c: (clutter_backend_glx_create_stage): Do not realize the stage anymore when creating it, and let the normal realization sequence take place. (clutter_backend_glx_ensure_context): Trap for X11 errors. * clutter/glx/clutter-stage-glx.c: (clutter_stage_glx_realize): Chain up to the X11 implementation so that we can set up the window state (title, cursor visibility) when we actually have a X window. Also, do not call clutter_stage_ensure_current(), and rely on the wrapper to do it for us. This means we can drop setting the REALIZED flag on the wrapper. (clutter_stage_glx_unrealize): Do not call clutter_stage_ensure_current() ourselves, and rely on the wrapper to do it for us. * clutter/x11/clutter-stage-x11.c: (set_wm_title), (set_cursor_visible): Move the WM title and cursor visibility code inside their own functions. (clutter_stage_x11_realize): Set the window title and whether the cursor is visible or not after realizing the stage. (clutter_stage_x11_set_cursor_visible), (clutter_stage_x11_set_title): Call set_wm_title() and set_cursor_visible(). (clutter_stage_x11_finalize): Free the title string. * clutter/x11/clutter-stage-x11.h: Save more of the stage state, so that we can set it even when the stage hasn't been realized yet. * clutter/eglnative/clutter-backend-egl.c: (clutter_backend_egl_create_stage): * clutter/eglnative/clutter-stage-egl.c: (clutter_stage_egl_unrealize), (clutter_stage_egl_realize): Update the eglnative backend. * clutter/eglx/clutter-backend-egl.c: (clutter_backend_egl_ensure_context), (clutter_backend_egl_create_stage): * clutter/eglx/clutter-stage-egl.c: (clutter_stage_egl_unrealize), (clutter_stage_egl_realize): Update the eglx backend. * clutter/sdl/clutter-backend-sdl.c: (clutter_backend_sdl_create_stage): * clutter/sdl/clutter-stage-sdl.c: (clutter_stage_sdl_realize): Update the sdl backend. * clutter/fruity/clutter-backend-fruity.c: (clutter_backend_fruity_create_stage): * clutter/sdl/clutter-stage-fruity.c: (clutter_stage_fruity_realize): Update the fruity backend. * tests/test-multistage.c (on_button_press): Bail out if clutter_stage_new() returns NULL. * HACKING.backends: Update backend writing documentation.
216 lines
5.8 KiB
C
216 lines
5.8 KiB
C
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "clutter-stage-sdl.h"
|
|
#include "clutter-sdl.h"
|
|
|
|
#include "../clutter-main.h"
|
|
#include "../clutter-feature.h"
|
|
#include "../clutter-color.h"
|
|
#include "../clutter-util.h"
|
|
#include "../clutter-event.h"
|
|
#include "../clutter-enum-types.h"
|
|
#include "../clutter-private.h"
|
|
#include "../clutter-debug.h"
|
|
#include "../clutter-units.h"
|
|
#include "../clutter-stage-window.h"
|
|
|
|
#include "cogl/cogl.h"
|
|
|
|
static void clutter_stage_window_iface_init (ClutterStageWindowIface *iface);
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (ClutterStageSDL,
|
|
clutter_stage_sdl,
|
|
CLUTTER_TYPE_ACTOR,
|
|
G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_STAGE_WINDOW,
|
|
clutter_stage_window_iface_init));
|
|
|
|
static void
|
|
clutter_stage_sdl_show (ClutterActor *actor)
|
|
{
|
|
CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_MAPPED);
|
|
|
|
CLUTTER_ACTOR_CLASS (clutter_stage_sdl_parent_class)->show (actor);
|
|
}
|
|
|
|
static void
|
|
clutter_stage_sdl_hide (ClutterActor *actor)
|
|
{
|
|
/* No way to easily unmap SDL window ? */
|
|
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_MAPPED);
|
|
|
|
CLUTTER_ACTOR_CLASS (clutter_stage_sdl_parent_class)->hide (actor);
|
|
}
|
|
|
|
static void
|
|
clutter_stage_sdl_unrealize (ClutterActor *actor)
|
|
{
|
|
;
|
|
}
|
|
|
|
static void
|
|
clutter_stage_sdl_realize (ClutterActor *actor)
|
|
{
|
|
ClutterStageSDL *stage_sdl = CLUTTER_STAGE_SDL (actor);
|
|
gboolean is_offscreen, is_fullscreen;
|
|
|
|
CLUTTER_NOTE (BACKEND, "Realizing main stage");
|
|
|
|
is_offscreen = is_fullscreen = FALSE;
|
|
g_object_get (stage_sdl->wrapper,
|
|
"offscreen", &is_offscreen,
|
|
"fullscreen", &is_fullscreen,
|
|
NULL);
|
|
|
|
if (G_LIKELY (!is_offscreen))
|
|
{
|
|
gint flags = SDL_OPENGL;
|
|
|
|
if (is_fullscreen)
|
|
flags |= SDL_FULLSCREEN;
|
|
|
|
SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
|
|
SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
|
|
SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
|
|
SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
|
|
|
|
if (SDL_SetVideoMode (stage_sdl->win_width,
|
|
stage_sdl->win_height,
|
|
0, flags) == NULL)
|
|
{
|
|
CLUTTER_NOTE (BACKEND, "SDL appears not to handle this mode - %s",
|
|
SDL_GetError ());
|
|
|
|
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
|
|
return;
|
|
}
|
|
else
|
|
CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
|
|
}
|
|
else
|
|
{
|
|
/* FIXME */
|
|
g_critical ("SDL Backend does not yet support offscreen rendering");
|
|
|
|
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REALIZED);
|
|
}
|
|
}
|
|
|
|
static void
|
|
clutter_stage_sdl_query_coords (ClutterActor *self,
|
|
ClutterActorBox *box)
|
|
{
|
|
ClutterStageSDL *stage_sdl = CLUTTER_STAGE_SDL (self);
|
|
|
|
box->x1 = box->y1 = 0;
|
|
box->x2 = box->x1 + CLUTTER_UNITS_FROM_INT (stage_sdl->win_width);
|
|
box->y2 = box->y1 + CLUTTER_UNITS_FROM_INT (stage_sdl->win_height);
|
|
}
|
|
|
|
static void
|
|
clutter_stage_sdl_request_coords (ClutterActor *self,
|
|
ClutterActorBox *box)
|
|
{
|
|
ClutterStageSDL *stage_sdl = CLUTTER_STAGE_SDL (self);
|
|
gint new_width, new_height;
|
|
|
|
/* FIXME: some how have X configure_notfiys call this ? */
|
|
new_width = ABS (CLUTTER_UNITS_TO_INT (box->x2 - box->x1));
|
|
new_height = ABS (CLUTTER_UNITS_TO_INT (box->y2 - box->y1));
|
|
|
|
if (new_width != stage_sdl->win_width ||
|
|
new_height != stage_sdl->win_height)
|
|
{
|
|
if (SDL_SetVideoMode(new_width,
|
|
new_height,
|
|
0, SDL_OPENGL) == NULL)
|
|
{
|
|
box->x2 = box->x1 + stage_sdl->win_width;
|
|
box->y2 = box->y1 + stage_sdl->win_height;
|
|
|
|
/* Failed */
|
|
return;
|
|
}
|
|
|
|
stage_sdl->win_width = new_width;
|
|
stage_sdl->win_height = new_height;
|
|
|
|
CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_ACTOR_SYNC_MATRICES);
|
|
}
|
|
|
|
CLUTTER_ACTOR_CLASS (clutter_stage_sdl_parent_class)->request_coords (self,
|
|
box);
|
|
}
|
|
|
|
static void
|
|
clutter_stage_sdl_set_fullscreen (ClutterStageWindow *stage_window,
|
|
gboolean fullscreen)
|
|
{
|
|
ClutterStageSDL *stage_sdl = CLUTTER_STAGE_SDL (stage_window);
|
|
int flags = SDL_OPENGL;
|
|
|
|
if (fullscreen)
|
|
flags |= SDL_FULLSCREEN;
|
|
|
|
SDL_SetVideoMode(stage_sdl->win_width,
|
|
stage_sdl->win_height,
|
|
0, flags);
|
|
}
|
|
|
|
static void
|
|
clutter_stage_sdl_set_cursor_visible (ClutterStageWindow *stage_window,
|
|
gboolean show_cursor)
|
|
{
|
|
SDL_ShowCursor (show_cursor);
|
|
}
|
|
|
|
static void
|
|
clutter_stage_sdl_set_title (ClutterStageWindow *stage_window,
|
|
const gchar *title)
|
|
{
|
|
SDL_WM_SetCaption (title, NULL);
|
|
}
|
|
|
|
static void
|
|
clutter_stage_sdl_dispose (GObject *gobject)
|
|
{
|
|
ClutterStageSDL *stage_sdl = CLUTTER_STAGE_SDL (gobject);
|
|
|
|
clutter_actor_unrealize (CLUTTER_ACTOR (stage_sdl));
|
|
|
|
G_OBJECT_CLASS (clutter_stage_sdl_parent_class)->dispose (gobject);
|
|
}
|
|
|
|
static void
|
|
clutter_stage_sdl_class_init (ClutterStageSDLClass *klass)
|
|
{
|
|
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
|
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
|
|
|
|
gobject_class->dispose = clutter_stage_sdl_dispose;
|
|
|
|
actor_class->show = clutter_stage_sdl_show;
|
|
actor_class->hide = clutter_stage_sdl_hide;
|
|
actor_class->realize = clutter_stage_sdl_realize;
|
|
actor_class->unrealize = clutter_stage_sdl_unrealize;
|
|
actor_class->request_coords = clutter_stage_sdl_request_coords;
|
|
actor_class->query_coords = clutter_stage_sdl_query_coords;
|
|
}
|
|
|
|
static void
|
|
clutter_stage_window_iface_init (ClutterStageWindowIface *iface)
|
|
{
|
|
iface->set_fullscreen = clutter_stage_sdl_set_fullscreen;
|
|
iface->set_cursor_visible = clutter_stage_sdl_set_cursor_visible;
|
|
iface->set_title = clutter_stage_sdl_set_title;
|
|
}
|
|
|
|
static void
|
|
clutter_stage_sdl_init (ClutterStageSDL *stage)
|
|
{
|
|
stage->win_width = 640;
|
|
stage->win_height = 480;
|
|
}
|
|
|