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

test-pixmap: Implement the --disable-x11 option

Browse Source 
test-pixmap has long had a --disable-x11 option that didn't do
anything. This patch adds the neccessary if (disable_x11) to disable
adding the ClutterX11TexturePixmap actor when the option is given.
This commit is contained in:
Neil Roberts 2010-05-28 17:32:21 +01:00
parent 6ca13e54d8
commit f7dfc8caa4
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/interactive/test-pixmap.c
View File

@ -196,7 +196,7 @@ test_pixmap_main (int argc, char **argv)
Display *xdpy; Display *xdpy;
int screen; int screen;
Window rootwin; Window rootwin;
ClutterActor *group, *label, *stage, *tex; ClutterActor *group = NULL, *label, *stage, *tex;
Pixmap pixmap; Pixmap pixmap;
const ClutterColor gry = { 0x99, 0x99, 0x99, 0xFF }; const ClutterColor gry = { 0x99, 0x99, 0x99, 0xFF };
Window win_remote; Window win_remote;
@ -241,9 +241,12 @@ test_pixmap_main (int argc, char **argv)
alpha = clutter_alpha_new_full (timeline, CLUTTER_LINEAR); alpha = clutter_alpha_new_full (timeline, CLUTTER_LINEAR);
depth_behavior = clutter_behaviour_depth_new (alpha, -2500, 400); depth_behavior = clutter_behaviour_depth_new (alpha, -2500, 400);
if (!disable_x11)
{
group = clutter_group_new (); group = clutter_group_new ();
clutter_container_add_actor (CLUTTER_CONTAINER (stage), group); clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
label = clutter_text_new_with_text ("fixed", "ClutterX11Texture (Window)"); label = clutter_text_new_with_text ("fixed",
"ClutterX11Texture (Window)");
clutter_container_add_actor (CLUTTER_CONTAINER (group), label); clutter_container_add_actor (CLUTTER_CONTAINER (group), label);
tex = clutter_x11_texture_pixmap_new_with_window (win_remote); tex = clutter_x11_texture_pixmap_new_with_window (win_remote);
clutter_container_add_actor (CLUTTER_CONTAINER (group), tex); clutter_container_add_actor (CLUTTER_CONTAINER (group), tex);
@ -254,6 +257,7 @@ test_pixmap_main (int argc, char **argv)
CLUTTER_TEXTURE_QUALITY_HIGH); CLUTTER_TEXTURE_QUALITY_HIGH);
clutter_actor_set_position (group, 0, 0); clutter_actor_set_position (group, 0, 0);
clutter_behaviour_apply (depth_behavior, group); clutter_behaviour_apply (depth_behavior, group);
}
#ifdef HAVE_CLUTTER_GLX #ifdef HAVE_CLUTTER_GLX
/* a window with glx */ /* a window with glx */
@ -283,7 +287,10 @@ test_pixmap_main (int argc, char **argv)
} }
#endif /* HAVE_CLUTTER_GLX */ #endif /* HAVE_CLUTTER_GLX */
if (group)
row_height = clutter_actor_get_height (group); row_height = clutter_actor_get_height (group);
else
row_height = 0;
/* NB: We only draw on the window after being redirected, so we dont /* NB: We only draw on the window after being redirected, so we dont
* have to worry about handling expose events... */ * have to worry about handling expose events... */