mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-23 06:46:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

WLR MR 3421 change: remove scale param, always scale to dst width or height

Browse source
This commit is contained in:
Alexander Courtis 2022-01-12 14:49:45 +11:00
parent 65f27b2fbc
commit 1c9592921a
3 changed files with 38 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

79
sway/commands/mirror.c
View file

@ -34,8 +34,7 @@ bool build_src_params(struct sway_mirror_params *params, char *src_name_or_id) {
return true; return true;
} }
bool build_dst_params(struct sway_mirror_params *params, char *dst_name_or_id, bool build_dst_params(struct sway_mirror_params *params, char *dst_name_or_id) {
char *scale_str) {
struct sway_output *output_dst = all_output_by_name_or_id(dst_name_or_id); struct sway_output *output_dst = all_output_by_name_or_id(dst_name_or_id);
if (!output_dst) { if (!output_dst) {
@ -53,23 +52,8 @@ bool build_dst_params(struct sway_mirror_params *params, char *dst_name_or_id,
"dst_name '%s' not enabled.", dst_name_or_id); "dst_name '%s' not enabled.", dst_name_or_id);
return false; return false;
} }
params->wlr_params.output_dst = output_dst->wlr_output;
if (!scale_str) { params->wlr_params.output_dst = output_dst->wlr_output;
snprintf(params_failure_message, sizeof(params_failure_message),
"Invalid scale.");
return false;
} else if (strcmp(scale_str, "full") == 0) {
params->wlr_params.scale = WLR_MIRROR_SCALE_FULL;
} else if (strcmp(scale_str, "aspect") == 0) {
params->wlr_params.scale = WLR_MIRROR_SCALE_ASPECT;
} else if (strcmp(scale_str, "center") == 0) {
params->wlr_params.scale = WLR_MIRROR_SCALE_CENTER;
} else {
snprintf(params_failure_message, sizeof(params_failure_message),
"Invalid scale '%s', expected <full|aspect|center>.", scale_str);
return false;
}
return true; return true;
} }
@ -108,20 +92,20 @@ bool build_con_id_params(struct sway_mirror_params *params, char *str) {
struct cmd_results *cmd_mirror_start_entire(int argc, char **argv) { struct cmd_results *cmd_mirror_start_entire(int argc, char **argv) {
const char usage[] = "Expected 'mirror start entire " const char usage[] = "Expected 'mirror start entire "
"<dst_name> <full|aspect|center> <src_name> [show_cursor]'"; "<dst_name> <src_name> [show_cursor]'";
if (argc < 3 || argc > 4) { if (argc < 2 || argc > 3) {
return cmd_results_new(CMD_INVALID, usage); return cmd_results_new(CMD_INVALID, usage);
} }
struct sway_mirror_params params = { 0 }; struct sway_mirror_params params = { 0 };
params.flavour = SWAY_MIRROR_FLAVOUR_ENTIRE; params.flavour = SWAY_MIRROR_FLAVOUR_ENTIRE;
if (!build_dst_params(&params, argv[0], argv[1])) { if (!build_dst_params(&params, argv[0])) {
return cmd_results_new(CMD_FAILURE, params_failure_message); return cmd_results_new(CMD_FAILURE, params_failure_message);
} }
if (!build_src_params(&params, argv[2])) { if (!build_src_params(&params, argv[1])) {
return cmd_results_new(CMD_FAILURE, params_failure_message); return cmd_results_new(CMD_FAILURE, params_failure_message);
} }
@ -129,8 +113,8 @@ struct cmd_results *cmd_mirror_start_entire(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, "src and dst must be different"); return cmd_results_new(CMD_FAILURE, "src and dst must be different");
} }
if (argc == 4) { if (argc == 3) {
if (strcmp(argv[3], "show_cursor") != 0) { if (strcmp(argv[2], "show_cursor") != 0) {
return cmd_results_new(CMD_FAILURE, usage); return cmd_results_new(CMD_FAILURE, usage);
} }
params.wlr_params.overlay_cursor = true; params.wlr_params.overlay_cursor = true;
@ -145,36 +129,35 @@ struct cmd_results *cmd_mirror_start_entire(int argc, char **argv) {
struct cmd_results *cmd_mirror_start_box(int argc, char **argv) { struct cmd_results *cmd_mirror_start_box(int argc, char **argv) {
const char usage[] = "Expected 'mirror start box " const char usage[] = "Expected 'mirror start box "
"<dst_name> <full|aspect|center> " "<dst_name> <x> <y> <width> <height> [show_cursor]'";
"<x> <y> <width> <height> [show_cursor]'";
if (argc < 6 || argc > 7) { if (argc < 5 || argc > 6) {
return cmd_results_new(CMD_INVALID, usage); return cmd_results_new(CMD_INVALID, usage);
} }
struct sway_mirror_params params = { 0 }; struct sway_mirror_params params = { 0 };
params.flavour = SWAY_MIRROR_FLAVOUR_BOX; params.flavour = SWAY_MIRROR_FLAVOUR_BOX;
if (!build_dst_params(&params, argv[0], argv[1])) { if (!build_dst_params(&params, argv[0])) {
return cmd_results_new(CMD_FAILURE, params_failure_message); return cmd_results_new(CMD_FAILURE, params_failure_message);
} }
char *end; char *end;
params.box.x = strtol(argv[2], &end, 10); params.box.x = strtol(argv[1], &end, 10);
if (end[0] != '\0' || params.box.x < 0) { if (end[0] != '\0' || params.box.x < 0) {
return cmd_results_new(CMD_FAILURE, "Invalid x '%s'.", argv[2]); return cmd_results_new(CMD_FAILURE, "Invalid x '%s'.", argv[1]);
} }
params.box.y = strtol(argv[3], &end, 10); params.box.y = strtol(argv[2], &end, 10);
if (end[0] != '\0' || params.box.y < 0) { if (end[0] != '\0' || params.box.y < 0) {
return cmd_results_new(CMD_FAILURE, "Invalid y '%s'.", argv[3]); return cmd_results_new(CMD_FAILURE, "Invalid y '%s'.", argv[2]);
} }
params.box.width = strtol(argv[4], &end, 10); params.box.width = strtol(argv[3], &end, 10);
if (end[0] != '\0' || params.box.width < 1) { if (end[0] != '\0' || params.box.width < 1) {
return cmd_results_new(CMD_FAILURE, "Invalid width '%s'.", argv[4]); return cmd_results_new(CMD_FAILURE, "Invalid width '%s'.", argv[3]);
} }
params.box.height = strtol(argv[5], &end, 10); params.box.height = strtol(argv[4], &end, 10);
if (end[0] != '\0' || params.box.height < 1) { if (end[0] != '\0' || params.box.height < 1) {
return cmd_results_new(CMD_FAILURE, "Invalid height '%s'.", argv[5]); return cmd_results_new(CMD_FAILURE, "Invalid height '%s'.", argv[4]);
} }
// find the output for the origin of the box // find the output for the origin of the box
@ -194,8 +177,8 @@ struct cmd_results *cmd_mirror_start_box(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, "Box covers multiple outputs."); return cmd_results_new(CMD_FAILURE, "Box covers multiple outputs.");
} }
if (argc == 7) { if (argc == 6) {
if (strcmp(argv[6], "show_cursor") != 0) { if (strcmp(argv[5], "show_cursor") != 0) {
return cmd_results_new(CMD_FAILURE, usage); return cmd_results_new(CMD_FAILURE, usage);
} }
params.wlr_params.overlay_cursor = true; params.wlr_params.overlay_cursor = true;
@ -210,40 +193,40 @@ struct cmd_results *cmd_mirror_start_box(int argc, char **argv) {
struct cmd_results *cmd_mirror_start_container(int argc, char **argv) { struct cmd_results *cmd_mirror_start_container(int argc, char **argv) {
const char usage[] = "Expected 'mirror start container " const char usage[] = "Expected 'mirror start container "
"<dst_name> <full|aspect|center> [con_id] [show_cursor]'"; "<dst_name> [con_id] [show_cursor]'";
if (argc < 2 || argc > 4) { if (argc < 1 || argc > 3) {
return cmd_results_new(CMD_INVALID, usage); return cmd_results_new(CMD_INVALID, usage);
} }
struct sway_mirror_params params = { 0 }; struct sway_mirror_params params = { 0 };
params.flavour = SWAY_MIRROR_FLAVOUR_CONTAINER; params.flavour = SWAY_MIRROR_FLAVOUR_CONTAINER;
if (!build_dst_params(&params, argv[0], argv[1])) { if (!build_dst_params(&params, argv[0])) {
return cmd_results_new(CMD_FAILURE, params_failure_message); return cmd_results_new(CMD_FAILURE, params_failure_message);
} }
switch(argc) { switch(argc) {
case 2: case 1:
if (!build_focussed_params(&params)) { if (!build_focussed_params(&params)) {
return cmd_results_new(CMD_FAILURE, params_failure_message); return cmd_results_new(CMD_FAILURE, params_failure_message);
} }
break; break;
case 3: case 2:
if (strcmp(argv[2], "show_cursor") == 0) { if (strcmp(argv[1], "show_cursor") == 0) {
params.wlr_params.overlay_cursor = true; params.wlr_params.overlay_cursor = true;
if (!build_focussed_params(&params)) { if (!build_focussed_params(&params)) {
return cmd_results_new(CMD_FAILURE, params_failure_message); return cmd_results_new(CMD_FAILURE, params_failure_message);
} }
} else if (!build_con_id_params(&params, argv[2])) { } else if (!build_con_id_params(&params, argv[1])) {
return cmd_results_new(CMD_FAILURE, params_failure_message); return cmd_results_new(CMD_FAILURE, params_failure_message);
} }
break; break;
case 4: case 3:
if (!build_con_id_params(&params, argv[2])) { if (!build_con_id_params(&params, argv[1])) {
return cmd_results_new(CMD_FAILURE, params_failure_message); return cmd_results_new(CMD_FAILURE, params_failure_message);
} }
if (strcmp(argv[3], "show_cursor") != 0) { if (strcmp(argv[2], "show_cursor") != 0) {
return cmd_results_new(CMD_FAILURE, usage); return cmd_results_new(CMD_FAILURE, usage);
} }
params.wlr_params.overlay_cursor = true; params.wlr_params.overlay_cursor = true;

2
sway/desktop/mirror.c
View file

@ -249,7 +249,7 @@ void mirror_destroy_all() {
} }
bool mirror_output_is_mirror_dst(struct sway_output *output) { bool mirror_output_is_mirror_dst(struct sway_output *output) {
return output && output->wlr_output && output->wlr_output->mirror_dst; return wlr_mirror_v1_output_is_dst(output->wlr_output);
} }
bool mirror_layout_box_within_output(struct wlr_box *box, struct wlr_output *output) { bool mirror_layout_box_within_output(struct wlr_box *box, struct wlr_output *output) {

18
sway/sway.5.scd
View file

@ -209,24 +209,18 @@ set|plus|minus|toggle <amount>
effect on the output the window is currently on. See *sway-output*(5) for effect on the output the window is currently on. See *sway-output*(5) for
further details. further details.
*mirror* start <entire|container|box> <dst_name> <full|aspect|center> ... *mirror* start <entire|container|box> <dst_name> ...
Begins a mirror session. Multiple sessions may run concurrently. Begins a mirror session. Multiple sessions may run concurrently.
The destination (_dst_) output will be vacated by sway and the mirrored The destination (_dst_) output will be vacated by sway and the mirrored
content displayed there. content displayed there.
Content will be scaled to fit the width or height of _dst_.
See *sway-output*(5) for details on specifying the output name. See *sway-output*(5) for details on specifying the output name.
_full_: content will be stretched to fill _dst_, possibly distorting. *mirror* start _entire_ <dst_name> <src_name> [show_cursor]
_aspect_: content will be stretched to fit to the width or height of
_dst_ without distortion.
_center_: content will be displayed at the center of _dst_ at a 1:1 ratio.
*mirror* start _entire_ <dst_name> <full|aspect|center> <src_name> [show_cursor]
Mirrors the whole of the source (_src_) output on _dst_. The cursor on Mirrors the whole of the source (_src_) output on _dst_. The cursor on
_src_ is optionally shown. _src_ is optionally shown.
*mirror* start _box_ <dst_name> <full|aspect|center> <x> <y> <width> <height> [show_cursor] *mirror* start _box_ <dst_name> <x> <y> <width> <height> [show_cursor]
Mirrors a fixed area (_box_) on the _dst_ output. The _box_ must be entirely Mirrors a fixed area (_box_) on the _dst_ output. The _box_ must be entirely
within a single output. _box_ is specified in the global coordinate space; within a single output. _box_ is specified in the global coordinate space;
see *sway-output*(5) for further details. The cursor within the _box_ is see *sway-output*(5) for further details. The cursor within the _box_ is
@ -234,9 +228,9 @@ set|plus|minus|toggle <amount>
A selection tool such as *slurp*(1) may facilitate easier _box_ selection A selection tool such as *slurp*(1) may facilitate easier _box_ selection
e.g.: e.g.:
mirror start box eDP-1 aspect $(slurp -f "%x %y %w %h") mirror start box eDP-1 $(slurp -f "%x %y %w %h")
*mirror* start _container_ <dst_name> <full|aspect|center> [con_id] [show_cursor] *mirror* start _container_ <dst_name> [con_id] [show_cursor]
Mirrors a single sway container on _dst_. The cursor within the container Mirrors a single sway container on _dst_. The cursor within the container
is optionally shown. The currently focussed container will be used if is optionally shown. The currently focussed container will be used if
_con_id_ is not specified; see *CRITERIA* for details on _con_id_. _con_id_ is not specified; see *CRITERIA* for details on _con_id_.