mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-12 08:21:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move magnfier size into XML

Browse source
This commit is contained in:
Simon Long 2024-05-02 18:08:24 +01:00
parent fe67087cf6
commit 165b955cd9
3 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/config/rcxml.h
View file

@ -60,9 +60,6 @@ struct rcxml {
bool focus_follow_mouse_requires_movement; bool focus_follow_mouse_requires_movement;
bool raise_on_focus; bool raise_on_focus;
bool magnify;
int magnification;
/* theme */ /* theme */
char *theme_name; char *theme_name;
int corner_radius; int corner_radius;
@ -140,6 +137,11 @@ struct rcxml {
} window_switcher; } window_switcher;
struct wl_list window_rules; /* struct window_rule.link */ struct wl_list window_rules; /* struct window_rule.link */
/* magnifier */
bool magnify;
int mag_scale;
int mag_size;
}; };
extern struct rcxml rc; extern struct rcxml rc;

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

@ -43,7 +43,6 @@ lab_wlr_scene_get_prev_node(struct wlr_scene_node *node)
/* TODO: move to rc. (or theme?) settings */ /* TODO: move to rc. (or theme?) settings */
#define magnifier_border 1 /* in pixels */ #define magnifier_border 1 /* in pixels */
#define magnifier_crop_size 200 /* how many pixels in each direction of the cursor */
static void static void
magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box *damage) magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box *damage)
@ -77,10 +76,10 @@ magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box
oy *= output->wlr_output->scale; oy *= output->wlr_output->scale;
/* TODO: refactor, to use rc. settings */ /* TODO: refactor, to use rc. settings */
int width = magnifier_crop_size * 2 + 1; int width = rc.mag_size + 1;
int height = width; int height = width;
double x = ox - magnifier_crop_size; double x = ox - (rc.mag_size / 2.0);
double y = oy - magnifier_crop_size; double y = oy - (rc.mag_size / 2.0);
double cropped_width = width; double cropped_width = width;
double cropped_height = height; double cropped_height = height;
double dst_x = 0; double dst_x = 0;
@ -172,10 +171,10 @@ magnify(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box
opts = (struct wlr_render_texture_options) { opts = (struct wlr_render_texture_options) {
.texture = tmp_texture, .texture = tmp_texture,
.src_box = (struct wlr_fbox) { .src_box = (struct wlr_fbox) {
.x = width * (rc.magnification - 1) / (2 * rc.magnification), .x = width * (rc.mag_scale - 1) / (2 * rc.mag_scale),
.y = height * (rc.magnification - 1) / (2 * rc.magnification), .y = height * (rc.mag_scale - 1) / (2 * rc.mag_scale),
.width = width / rc.magnification, .width = width / rc.mag_scale,
.height = height / rc.magnification, .height = height / rc.mag_scale,
}, },
.dst_box = (struct wlr_box) { .dst_box = (struct wlr_box) {
.x = ox - (width / 2), .x = ox - (width / 2),
@ -243,14 +242,14 @@ void magnify_set_scale (enum magnify_dir dir)
{ {
if (dir == MAGNIFY_INCREASE) { if (dir == MAGNIFY_INCREASE) {
if (rc.magnify) { if (rc.magnify) {
rc.magnification++; rc.mag_scale++;
} else { } else {
rc.magnify = true; rc.magnify = true;
rc.magnification = 2; rc.mag_scale = 2;
} }
} else { } else {
if (rc.magnify && rc.magnification > 2) { if (rc.magnify && rc.mag_scale > 2) {
rc.magnification--; rc.mag_scale--;
} else { } else {
rc.magnify = false; rc.magnify = false;
} }
@ -274,12 +273,12 @@ lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output)
if (!wlr_output->needs_frame && !pixman_region32_not_empty( if (!wlr_output->needs_frame && !pixman_region32_not_empty(
&scene_output->damage_ring.current) && !wants_magnification &scene_output->damage_ring.current) && !wants_magnification
&& last_mag != rc.magnify && last_scale != rc.magnification) { && last_mag != rc.magnify && last_scale != rc.mag_scale) {
return false; return false;
} }
last_mag = rc.magnify; last_mag = rc.magnify;
last_scale = rc.magnification; last_scale = rc.mag_scale;
if (!wlr_scene_output_build_state(scene_output, state, NULL)) { if (!wlr_scene_output_build_state(scene_output, state, NULL)) {
wlr_log(WLR_ERROR, "Failed to build output state for %s", wlr_log(WLR_ERROR, "Failed to build output state for %s",

6
src/config/rcxml.c
View file

@ -1204,8 +1204,6 @@ rcxml_init(void)
rc.focus_follow_mouse = false; rc.focus_follow_mouse = false;
rc.focus_follow_mouse_requires_movement = true; rc.focus_follow_mouse_requires_movement = true;
rc.raise_on_focus = false; rc.raise_on_focus = false;
rc.magnify = false;
rc.magnification = 2;
rc.doubleclick_time = 500; rc.doubleclick_time = 500;
rc.scroll_factor = 1.0; rc.scroll_factor = 1.0;
@ -1240,6 +1238,10 @@ rcxml_init(void)
rc.workspace_config.popuptime = INT_MIN; rc.workspace_config.popuptime = INT_MIN;
rc.workspace_config.min_nr_workspaces = 1; rc.workspace_config.min_nr_workspaces = 1;
rc.magnify = false;
rc.mag_scale = 2;
rc.mag_size = 400;
} }
static void static void