[PATCH weston 2/2] simple-egl: Only set alpha_size=0 when -o is passed.

[Kristian Høgsberg]

On Thu, Aug 30, 2012 at 02:44:16PM -0600, Scott Moreau wrote:
> When starting simple-egl with -f for fullscreen and toggling to 'windowed' mode with F11,
> the surface is opaque instead of semi-trnasparent as it is when starting without -f. We
> only want to create the surface with alpha_size=0 when the user explicitly passes -o
> because otherwise it will never have the ability to use alpha.

Ok, yup, makes sense.  Committed this one and 1/2.

Kristian

> ---
>  clients/simple-egl.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/clients/simple-egl.c b/clients/simple-egl.c
> index 5b77b9d..a331571 100644
> --- a/clients/simple-egl.c
> +++ b/clients/simple-egl.c
> @@ -278,10 +278,12 @@ toggle_fullscreen(struct window *window, int fullscreen)
>  	window->configured = 0;
>  
>  	if (fullscreen) {
> +		window->opaque = 1;
>  		wl_shell_surface_set_fullscreen(window->shell_surface,
>  						WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
>  						0, NULL);
>  	} else {
> +		window->opaque = 0;
>  		wl_shell_surface_set_toplevel(window->shell_surface);
>  		handle_configure(window, window->shell_surface, 0,
>  				 window->window_size.width,
> @@ -587,7 +589,7 @@ main(int argc, char **argv)
>  	struct sigaction sigint;
>  	struct display display = { 0 };
>  	struct window  window  = { 0 };
> -	int i;
> +	int i, opaque = 0;
>  
>  	window.display = &display;
>  	display.window = &window;
> @@ -598,7 +600,7 @@ main(int argc, char **argv)
>  		if (strcmp("-f", argv[i]) == 0)
>  			window.fullscreen = 1;
>  		else if (strcmp("-o", argv[i]) == 0)
> -			window.opaque = 1;
> +			opaque = 1;
>  		else if (strcmp("-h", argv[i]) == 0)
>  			usage(EXIT_SUCCESS);
>  		else
> @@ -617,7 +619,7 @@ main(int argc, char **argv)
>  	if (window.fullscreen)
>  		window.opaque = 1;
>  
> -	init_egl(&display, window.opaque);
> +	init_egl(&display, opaque);
>  	create_surface(&window);
>  	init_gl(&window);
>  
> -- 
> 1.7.11.4
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel