diff options
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/commands.c | 6 | ||||
| -rw-r--r-- | sway/config.c | 3 | ||||
| -rw-r--r-- | sway/container.c | 7 | ||||
| -rw-r--r-- | sway/handlers.c | 3 | ||||
| -rw-r--r-- | sway/layout.c | 28 |
5 files changed, 33 insertions, 14 deletions
diff --git a/sway/commands.c b/sway/commands.c index d572afa0..89d4337c 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -1585,6 +1585,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) { output->x = output->y = output->width = output->height = -1; output->name = strdup(name); output->enabled = -1; + output->scale = 1; // TODO: atoi doesn't handle invalid numbers @@ -1642,6 +1643,11 @@ static struct cmd_results *cmd_output(int argc, char **argv) { } output->x = x; output->y = y; + } else if (strcasecmp(command, "scale") == 0) { + if (++i >= argc) { + return cmd_results_new(CMD_INVALID, "output", "Missing scale parameter."); + } + output->scale = atoi(argv[i]); } else if (strcasecmp(command, "background") == 0 || strcasecmp(command, "bg") == 0) { wordexp_t p; if (++i >= argc) { diff --git a/sway/config.c b/sway/config.c index 5e1887a6..83129524 100644 --- a/sway/config.c +++ b/sway/config.c @@ -867,6 +867,9 @@ void apply_output_config(struct output_config *oc, swayc_t *output) { struct wlc_size new_size = { .w = oc->width, .h = oc->height }; wlc_output_set_resolution(output->handle, &new_size); } + if (oc && oc->scale != 1) { + wlc_output_set_scale(output->handle, (int32_t)oc->scale); + } // Find position for it if (oc && oc->x != -1 && oc->y != -1) { diff --git a/sway/container.c b/sway/container.c index 67aa6851..df9ce724 100644 --- a/sway/container.c +++ b/sway/container.c @@ -102,7 +102,8 @@ static void update_root_geometry() { // New containers swayc_t *new_output(wlc_handle handle) { - const struct wlc_size *size = wlc_output_get_resolution(handle); + struct wlc_size size; + wlc_output_get_scaled_size(handle, &size); const char *name = wlc_output_get_name(handle); // Find current outputs to see if this already exists { @@ -148,8 +149,8 @@ swayc_t *new_output(wlc_handle handle) { swayc_t *output = new_swayc(C_OUTPUT); output->handle = handle; output->name = name ? strdup(name) : NULL; - output->width = size->w; - output->height = size->h; + output->width = size.w; + output->height = size.h; output->unmanaged = create_list(); output->bg_pid = 0; diff --git a/sway/handlers.c b/sway/handlers.c index 05da5700..ad035e38 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -56,7 +56,8 @@ static struct background_config *if_background_find_config(struct wl_client *cli } static struct wlc_geometry compute_panel_geometry(struct panel_config *config) { - const struct wlc_size resolution = *wlc_output_get_resolution(config->output); + struct wlc_size resolution; + wlc_output_get_scaled_size(config->output, &resolution); const struct wlc_geometry *old = wlc_view_get_geometry(config->handle); struct wlc_geometry new; diff --git a/sway/layout.c b/sway/layout.c index fc7a31b4..2037955e 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -406,20 +406,21 @@ static void update_border_geometry_floating(swayc_t *c, struct wlc_geometry *geo c->actual_geometry = g; swayc_t *output = swayc_parent_by_type(c, C_OUTPUT); - const struct wlc_size *res = wlc_output_get_resolution(output->handle); + struct wlc_size res; + wlc_output_get_scaled_size(output->handle, &res); switch (c->border_type) { case B_NONE: break; case B_PIXEL: - adjust_border_geometry(c, &g, res, c->border_thickness, + adjust_border_geometry(c, &g, &res, c->border_thickness, c->border_thickness, c->border_thickness, c->border_thickness); break; case B_NORMAL: { int title_bar_height = config->font_height + 4; // borders + padding - adjust_border_geometry(c, &g, res, c->border_thickness, + adjust_border_geometry(c, &g, &res, c->border_thickness, c->border_thickness, title_bar_height, c->border_thickness); struct wlc_geometry title_bar = { @@ -545,13 +546,15 @@ void update_geometry(swayc_t *container) { gap = update_gap_geometry(container, &geometry); } + swayc_t *output = swayc_parent_by_type(container, C_OUTPUT); + struct wlc_size size; + wlc_output_get_scaled_size(output->handle, &size); + if (swayc_is_fullscreen(container)) { - swayc_t *output = swayc_parent_by_type(container, C_OUTPUT); - const struct wlc_size *size = wlc_output_get_resolution(output->handle); geometry.origin.x = 0; geometry.origin.y = 0; - geometry.size.w = size->w; - geometry.size.h = size->h; + geometry.size.w = size.w; + geometry.size.h = size.h; if (op->focused == workspace) { wlc_view_bring_to_front(container->handle); } @@ -576,7 +579,9 @@ void update_geometry(swayc_t *container) { border_left = 0; } - if (geometry.origin.x + geometry.size.w == workspace->x + workspace->width) { + if (geometry.origin.x + geometry.size.w == size.w || + geometry.size.w == container->x + container->width) { + // should work for swaybar at right border_right = 0; } } @@ -586,7 +591,9 @@ void update_geometry(swayc_t *container) { border_top = 0; } - if (geometry.origin.y + geometry.size.h == workspace->y + workspace->height) { + if (geometry.origin.y + geometry.size.h == size.h || + geometry.size.h == container->y + container->height) { + // this works for swaybar at bottom border_bottom = 0; } } @@ -721,7 +728,8 @@ static void arrange_windows_r(swayc_t *container, double width, double height) { return; case C_OUTPUT: { - struct wlc_size resolution = *wlc_output_get_resolution(container->handle); + struct wlc_size resolution; + wlc_output_get_scaled_size(container->handle, &resolution); width = resolution.w; height = resolution.h; // output must have correct size due to e.g. seamless mouse, // but a workspace might be smaller depending on panels. |