mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

magnifier: scale/transform the magnifier

Browse source 
Before this commit, the magnifier wasn't scaled, and caused visual
artifacts when the output is transformed.
This commit is contained in:
tokyo4j 2025-03-15 12:35:07 +09:00 • committed by Johan Malm
parent 9f53d7ed25
commit 6dc8e279ec
2 changed files with 47 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/common/scene-helpers.c
View file

@ -143,6 +143,13 @@ lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output,
pixman_region32_init_rect(&region, pixman_region32_init_rect(&region,
additional_damage.x, additional_damage.y, additional_damage.x, additional_damage.y,
additional_damage.width, additional_damage.height); additional_damage.width, additional_damage.height);
/*
* Region passed to scene_output_damage() should have the same
* scale as the output buffer but have a different transform.
*/
wlr_region_transform(&region, &region, wlr_output->transform,
wlr_output->width, wlr_output->height);
scene_output_damage(scene_output, &region); scene_output_damage(scene_output, &region);
pixman_region32_fini(&region); pixman_region32_fini(&region);
} }

56
src/magnifier.c
View file

@ -3,8 +3,8 @@
#include <assert.h> #include <assert.h>
#include <wlr/render/swapchain.h> #include <wlr/render/swapchain.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/util/transform.h>
#include "common/box.h" #include "common/box.h"
#include "common/macros.h"
#include "labwc.h" #include "labwc.h"
#include "magnifier.h" #include "magnifier.h"
#include "theme.h" #include "theme.h"
@ -16,6 +16,23 @@ static double mag_scale = 0.0;
static struct wlr_buffer *tmp_buffer = NULL; static struct wlr_buffer *tmp_buffer = NULL;
static struct wlr_texture *tmp_texture = NULL; static struct wlr_texture *tmp_texture = NULL;
static void
box_logical_to_physical(struct wlr_box *box, struct wlr_output *output)
{
box->x *= output->scale;
box->y *= output->scale;
box->width *= output->scale;
box->height *= output->scale;
int output_w = output->width;
int output_h = output->height;
wlr_output_transform_coords(output->transform,
&output_w, &output_h);
wlr_box_transform(box, box,
wlr_output_transform_invert(output->transform),
output_w, output_h);
}
void void
magnifier_draw(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box *damage) magnifier_draw(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box *damage)
{ {
@ -28,16 +45,20 @@ magnifier_draw(struct output *output, struct wlr_buffer *output_buffer, struct w
.height = output_buffer->height, .height = output_buffer->height,
}; };
/* Cursor position in physical output coordinate */ /* Cursor position in per-output logical coordinate */
double cursor_x = server->seat.cursor->x; double cursor_logical_x = server->seat.cursor->x;
double cursor_y = server->seat.cursor->y; double cursor_logical_y = server->seat.cursor->y;
wlr_output_layout_output_coords(server->output_layout, wlr_output_layout_output_coords(server->output_layout,
output->wlr_output, &cursor_x, &cursor_y); output->wlr_output, &cursor_logical_x, &cursor_logical_y);
cursor_x *= output->wlr_output->scale; /* Cursor position in per-output physical coordinate */
cursor_y *= output->wlr_output->scale; struct wlr_box cursor_pos = {
.x = cursor_logical_x,
.y = cursor_logical_y,
};
box_logical_to_physical(&cursor_pos, output->wlr_output);
bool cursor_in_output = wlr_box_contains_point(&output_box, bool cursor_in_output = wlr_box_contains_point(&output_box,
cursor_x, cursor_y); cursor_pos.x, cursor_pos.y);
if (fullscreen && !cursor_in_output) { if (fullscreen && !cursor_in_output) {
return; return;
} }
@ -52,10 +73,11 @@ magnifier_draw(struct output *output, struct wlr_buffer *output_buffer, struct w
if (fullscreen) { if (fullscreen) {
mag_box = output_box; mag_box = output_box;
} else { } else {
mag_box.x = cursor_x - (rc.mag_width / 2.0); mag_box.x = cursor_logical_x - (rc.mag_width / 2.0);
mag_box.y = cursor_y - (rc.mag_height / 2.0); mag_box.y = cursor_logical_y - (rc.mag_height / 2.0);
mag_box.width = rc.mag_width; mag_box.width = rc.mag_width;
mag_box.height = rc.mag_height; mag_box.height = rc.mag_height;
box_logical_to_physical(&mag_box, output->wlr_output);
} }
/* (Re)create the temporary buffer if required */ /* (Re)create the temporary buffer if required */
@ -136,11 +158,13 @@ magnifier_draw(struct output *output, struct wlr_buffer *output_buffer, struct w
damage_box = output_box; damage_box = output_box;
} else { } else {
/* Draw borders */ /* Draw borders */
int border_width =
theme->mag_border_width * output->wlr_output->scale;
struct wlr_box border_box = { struct wlr_box border_box = {
.x = mag_box.x - theme->mag_border_width, .x = mag_box.x - border_width,
.y = mag_box.y - theme->mag_border_width, .y = mag_box.y - border_width,
.width = mag_box.width + theme->mag_border_width * 2, .width = mag_box.width + border_width * 2,
.height = mag_box.height + theme->mag_border_width * 2, .height = mag_box.height + border_width * 2,
}; };
struct wlr_render_rect_options bg_opts = { struct wlr_render_rect_options bg_opts = {
.box = border_box, .box = border_box,
@ -162,8 +186,8 @@ magnifier_draw(struct output *output, struct wlr_buffer *output_buffer, struct w
}; };
if (fullscreen) { if (fullscreen) {
src_box_for_paste.x = cursor_x - (cursor_x / mag_scale); src_box_for_paste.x = cursor_pos.x - (cursor_pos.x / mag_scale);
src_box_for_paste.y = cursor_y - (cursor_y / mag_scale); src_box_for_paste.y = cursor_pos.y - (cursor_pos.y / mag_scale);
} else { } else {
src_box_for_paste.x = src_box_for_paste.x =
mag_box.width * (mag_scale - 1.0) / (2.0 * mag_scale); mag_box.width * (mag_scale - 1.0) / (2.0 * mag_scale);