[PATCH weston 5/6] compositor-wayland: Add a --scale option

[Pekka Paalanen]

On Thu,  7 Nov 2013 20:13:32 -0600
Jason Ekstrand <jason at jlekstrand.net> wrote:

> Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
> ---
>  src/compositor-wayland.c | 16 ++++++++++++----
>  src/compositor.c         |  1 +
>  2 files changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
> index e5c6726..e688820 100644
> --- a/src/compositor-wayland.c
> +++ b/src/compositor-wayland.c
...
> @@ -1401,13 +1404,14 @@ backend_init(struct wl_display *display, int *argc, char *argv[],
>  	struct wayland_compositor *c;
>  	struct wayland_output *output;
>  	struct weston_config_section *section;
> -	int x, count, width, height, use_pixman;
> +	int x, count, width, height, scale, use_pixman;
>  	const char *section_name, *display_name;
>  	char *name;
>  
>  	const struct weston_option wayland_options[] = {
>  		{ WESTON_OPTION_INTEGER, "width", 0, &width },
>  		{ WESTON_OPTION_INTEGER, "height", 0, &height },
> +		{ WESTON_OPTION_INTEGER, "scale", 0, &scale },
>  		{ WESTON_OPTION_STRING, "display", 0, &display_name },
>  		{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &use_pixman },
>  		{ WESTON_OPTION_INTEGER, "output-count", 0, &count },
...
> diff --git a/src/compositor.c b/src/compositor.c
> index 2126742..d77d565 100644
> --- a/src/compositor.c
> +++ b/src/compositor.c
> @@ -3699,6 +3699,7 @@ usage(int error_code)
>  		"Options for wayland-backend.so:\n\n"
>  		"  --width=WIDTH\t\tWidth of Wayland surface\n"
>  		"  --height=HEIGHT\tHeight of Wayland surface\n"
> + 		"  --scale=SCALE\tScale factor of ouput\n"
>  		"  --use-pixman\t\tUse the pixman (CPU) renderer\n"
>  		"  --output-count=COUNT\tCreate multiple outputs\n"
>  		"  --display=DISPLAY\tWayland display to connect to\n\n");

Hi Jason,

could you also update the man pages with the new command line options?


Thanks,
pq