@ -107,6 +107,8 @@ compositor_setup_defaults_(struct compositor_setup *setup,
. xwayland = false ,
. xwayland = false ,
. width = 320 ,
. width = 320 ,
. height = 240 ,
. height = 240 ,
. scale = 1 ,
. transform = WL_OUTPUT_TRANSFORM_NORMAL ,
. config_file = NULL ,
. config_file = NULL ,
. extra_module = NULL ,
. extra_module = NULL ,
. logging_scopes = NULL ,
. logging_scopes = NULL ,
@ -163,6 +165,24 @@ shell_to_str(enum shell_type t)
return names [ t ] ;
return names [ t ] ;
}
}
static const char *
transform_to_str ( enum wl_output_transform t )
{
static const char * const names [ ] = {
[ WL_OUTPUT_TRANSFORM_NORMAL ] = " normal " ,
[ WL_OUTPUT_TRANSFORM_90 ] = " rotate-90 " ,
[ WL_OUTPUT_TRANSFORM_180 ] = " rotate-180 " ,
[ WL_OUTPUT_TRANSFORM_270 ] = " rotate-270 " ,
[ WL_OUTPUT_TRANSFORM_FLIPPED ] = " flipped " ,
[ WL_OUTPUT_TRANSFORM_FLIPPED_90 ] = " flipped-rotate-90 " ,
[ WL_OUTPUT_TRANSFORM_FLIPPED_180 ] = " flipped-rotate-180 " ,
[ WL_OUTPUT_TRANSFORM_FLIPPED_270 ] = " flipped-rotate-270 " ,
} ;
assert ( t < ARRAY_LENGTH ( names ) & & names [ t ] ) ;
return names [ t ] ;
}
/** Execute compositor
/** Execute compositor
*
*
* Manufactures the compositor command line and calls wet_main ( ) .
* Manufactures the compositor command line and calls wet_main ( ) .
@ -259,6 +279,17 @@ execute_compositor(const struct compositor_setup *setup,
asprintf ( & tmp , " --height=%d " , setup - > height ) ;
asprintf ( & tmp , " --height=%d " , setup - > height ) ;
prog_args_take ( & args , tmp ) ;
prog_args_take ( & args , tmp ) ;
if ( setup - > scale ! = 1 ) {
asprintf ( & tmp , " --scale=%d " , setup - > scale ) ;
prog_args_take ( & args , tmp ) ;
}
if ( setup - > transform ! = WL_OUTPUT_TRANSFORM_NORMAL ) {
asprintf ( & tmp , " --transform=%s " ,
transform_to_str ( setup - > transform ) ) ;
prog_args_take ( & args , tmp ) ;
}
if ( setup - > config_file ) {
if ( setup - > config_file ) {
asprintf ( & tmp , " --config=%s " , setup - > config_file ) ;
asprintf ( & tmp , " --config=%s " , setup - > config_file ) ;
prog_args_take ( & args , tmp ) ;
prog_args_take ( & args , tmp ) ;