brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2008-06-11 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/sdl/clutter-stage-sdl.c: Update the SDL backend to
	use the new size negotiation API.
This commit is contained in:
Emmanuele Bassi 2008-06-11 10:12:44 +00:00
parent df86cb1ae3
commit bae4bd0796
2 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-11 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/sdl/clutter-stage-sdl.c: Update the SDL backend to
use the new size negotiation API.
2008-06-11 Emmanuele Bassi <ebassi@openedhand.com> 2008-06-11 Emmanuele Bassi <ebassi@openedhand.com>
Bug #961 - Fails to build on OSX Bug #961 - Fails to build on OSX

51
clutter/sdl/clutter-stage-sdl.c
View File

@ -98,24 +98,45 @@ clutter_stage_sdl_realize (ClutterActor *actor)
} }
static void static void
clutter_stage_sdl_query_coords (ClutterActor *self, clutter_stage_sdl_get_preferred_width (ClutterActor *self,
ClutterActorBox *box) ClutterUnit for_height,
ClutterUnit *min_width_p,
ClutterUnit *natural_width_p)
{ {
ClutterStageSDL *stage_sdl = CLUTTER_STAGE_SDL (self); ClutterStageSDL *stage_sdl = CLUTTER_STAGE_SDL (self);
box->x1 = box->y1 = 0; if (min_width_p)
box->x2 = box->x1 + CLUTTER_UNITS_FROM_INT (stage_sdl->win_width); *min_width_p = CLUTTER_UNITS_FROM_DEVICE (stage_sdl->win_width);
box->y2 = box->y1 + CLUTTER_UNITS_FROM_INT (stage_sdl->win_height);
if (natural_width_p)
*natural_width_p = CLUTTER_UNITS_FROM_DEVICE (stage_sdl->win_width);
} }
static void static void
clutter_stage_sdl_request_coords (ClutterActor *self, clutter_stage_sdl_get_preferred_height (ClutterActor *self,
ClutterActorBox *box) ClutterUnit for_width,
ClutterUnit *min_height_p,
ClutterUnit *natural_height_p)
{
ClutterStageSDL *stage_sdl = CLUTTER_STAGE_SDL (self);
if (min_height_p)
*min_height_p = CLUTTER_UNITS_FROM_DEVICE (stage_sdl->win_height);
if (natural_height_p)
*natural_height_p = CLUTTER_UNITS_FROM_DEVICE (stage_sdl->win_height);
}
static void
clutter_stage_sdl_allocate (ClutterActor *self,
const ClutterActorBox *box,
gboolean origin_changed)
{ {
ClutterStageSDL *stage_sdl = CLUTTER_STAGE_SDL (self); ClutterStageSDL *stage_sdl = CLUTTER_STAGE_SDL (self);
gint new_width, new_height; gint new_width, new_height;
ClutterActorClass *parent_class;
/* FIXME: some how have X configure_notfiys call this ? */ /* FIXME: some how have X configure_notfiy call this ? */
new_width = ABS (CLUTTER_UNITS_TO_INT (box->x2 - box->x1)); new_width = ABS (CLUTTER_UNITS_TO_INT (box->x2 - box->x1));
new_height = ABS (CLUTTER_UNITS_TO_INT (box->y2 - box->y1)); new_height = ABS (CLUTTER_UNITS_TO_INT (box->y2 - box->y1));
@ -126,9 +147,6 @@ clutter_stage_sdl_request_coords (ClutterActor *self,
new_height, new_height,
0, SDL_OPENGL) == NULL) 0, SDL_OPENGL) == NULL)
{ {
box->x2 = box->x1 + stage_sdl->win_width;
box->y2 = box->y1 + stage_sdl->win_height;
/* Failed */ /* Failed */
return; return;
} }
@ -139,8 +157,8 @@ clutter_stage_sdl_request_coords (ClutterActor *self,
CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_ACTOR_SYNC_MATRICES); CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_ACTOR_SYNC_MATRICES);
} }
CLUTTER_ACTOR_CLASS (clutter_stage_sdl_parent_class)->request_coords (self, parent_class = CLUTTER_ACTOR_CLASS (clutter_stage_sdl_parent_class);
box); parent_class->allocate (self, box, origin_changed);
} }
static void static void
@ -153,7 +171,7 @@ clutter_stage_sdl_set_fullscreen (ClutterStageWindow *stage_window,
if (fullscreen) if (fullscreen)
flags |= SDL_FULLSCREEN; flags |= SDL_FULLSCREEN;
SDL_SetVideoMode(stage_sdl->win_width, SDL_SetVideoMode (stage_sdl->win_width,
stage_sdl->win_height, stage_sdl->win_height,
0, flags); 0, flags);
} }
@ -194,8 +212,9 @@ clutter_stage_sdl_class_init (ClutterStageSDLClass *klass)
actor_class->hide = clutter_stage_sdl_hide; actor_class->hide = clutter_stage_sdl_hide;
actor_class->realize = clutter_stage_sdl_realize; actor_class->realize = clutter_stage_sdl_realize;
actor_class->unrealize = clutter_stage_sdl_unrealize; actor_class->unrealize = clutter_stage_sdl_unrealize;
actor_class->request_coords = clutter_stage_sdl_request_coords; actor_class->get_preferred_width = clutter_stage_sdl_get_preferred_width;
actor_class->query_coords = clutter_stage_sdl_query_coords; actor_class->get_preferred_height = clutter_stage_sdl_get_preferred_height;
actor_class->allocate = clutter_stage_sdl_allocate;
} }
static void static void