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

Reimplement the clutter_glx_set_stage_foreign() function, used to

Browse Source 
set an existing X window as the window for the main stage.
This commit is contained in:
Emmanuele Bassi 2007-03-27 09:38:50 +00:00
parent 123dfb7886
commit 219e97bda3
3 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-03-27 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/glx/clutter-glx.h:
* clutter/glx/clutter-stage-glx.c: (Re-)Implement the foreign
window setting function for the stage in the GLX backend.
2007-03-27 Emmanuele Bassi <ebassi@openedhand.com> 2007-03-27 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-stage.h: Declare the clutter_perspective_get_type() * clutter/clutter-stage.h: Declare the clutter_perspective_get_type()

4
clutter/glx/clutter-glx.h
View File

@ -43,8 +43,8 @@ Window clutter_glx_get_root_window (void);
Window clutter_glx_get_stage_window (ClutterStage *stage); Window clutter_glx_get_stage_window (ClutterStage *stage);
XVisualInfo *clutter_glx_get_stage_visual (ClutterStage *stage); XVisualInfo *clutter_glx_get_stage_visual (ClutterStage *stage);
void clutter_glx_set_stage_foreign (ClutterStage *stage, gboolean clutter_glx_set_stage_foreign (ClutterStage *stage,
Window window); Window xwindow);
G_END_DECLS G_END_DECLS

62
clutter/glx/clutter-stage-glx.c
View File

@ -636,11 +636,65 @@ clutter_glx_get_stage_visual (ClutterStage *stage)
return CLUTTER_STAGE_GLX (stage)->xvisinfo; return CLUTTER_STAGE_GLX (stage)->xvisinfo;
} }
void /**
* clutter_glx_set_stage_foreign:
* @stage: a #ClutterStage
* @xwindow: an existing X Window id
*
* Target the #ClutterStage to use an existing external X Window
*
* Return value: %TRUE if foreign window is valid
*
* Since: 0.4
*/
gboolean
clutter_glx_set_stage_foreign (ClutterStage *stage, clutter_glx_set_stage_foreign (ClutterStage *stage,
Window window) Window xwindow)
{ {
g_return_if_fail (CLUTTER_IS_STAGE_GLX (stage)); ClutterStageGlx *stage_glx;
ClutterActor *actor;
gint x, y;
guint width, height, border, depth;
Window root_return;
Status status;
ClutterGeometry geom;
/* FIXME */ g_return_val_if_fail (CLUTTER_IS_STAGE_GLX (stage), FALSE);
g_return_val_if_fail (xwindow != None, FALSE);
stage_glx = CLUTTER_STAGE_GLX (stage);
actor = CLUTTER_ACTOR (stage);
clutter_glx_trap_x_errors ();
status = XGetGeometry (stage_glx->xdpy,
xwindow,
&root_return,
&x, &y,
&width, &height,
&border,
&depth);
if (clutter_glx_untrap_x_errors () ||
!status ||
width == 0 || height == 0 ||
depth != stage_glx->xvisinfo->depth)
{
return FALSE;
}
clutter_actor_unrealize (actor);
stage_glx->xwin = xwindow;
stage_glx->is_foreign_xwin = TRUE;
geom.x = x;
geom.y = y;
geom.width = stage_glx->xwin_width = width;
geom.height = stage_glx->xwin_height = height;
clutter_actor_set_geometry (actor, &geom);
clutter_actor_realize (actor);
return TRUE;
} }