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

SnapToRegion: Wire up output and handle usable_area changes

Browse source
This commit is contained in:
Consolatis 2022-07-06 16:57:25 +02:00
parent 43fe138385
commit 67952cd749
3 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/labwc.h
View file

@ -309,6 +309,8 @@ struct output {
struct wlr_scene_buffer *workspace_osd; struct wlr_scene_buffer *workspace_osd;
struct wlr_box usable_area; struct wlr_box usable_area;
struct wl_list regions; /* struct region.link */
struct lab_data_buffer *osd_buffer; struct lab_data_buffer *osd_buffer;
struct wl_listener destroy; struct wl_listener destroy;

12
src/output.c
View file

@ -19,6 +19,7 @@
#include "labwc.h" #include "labwc.h"
#include "layers.h" #include "layers.h"
#include "node.h" #include "node.h"
#include "regions.h"
#include "view.h" #include "view.h"
static void static void
@ -40,6 +41,7 @@ static void
output_destroy_notify(struct wl_listener *listener, void *data) output_destroy_notify(struct wl_listener *listener, void *data)
{ {
struct output *output = wl_container_of(listener, output, destroy); struct output *output = wl_container_of(listener, output, destroy);
regions_destroy(&output->regions);
wl_list_remove(&output->link); wl_list_remove(&output->link);
wl_list_remove(&output->frame.link); wl_list_remove(&output->frame.link);
wl_list_remove(&output->destroy.link); wl_list_remove(&output->destroy.link);
@ -148,6 +150,8 @@ new_output_notify(struct wl_listener *listener, void *data)
output->frame.notify = output_frame_notify; output->frame.notify = output_frame_notify;
wl_signal_add(&wlr_output->events.frame, &output->frame); wl_signal_add(&wlr_output->events.frame, &output->frame);
wl_list_init(&output->regions);
/* /*
* Create layer-trees (background, bottom, top and overlay) and * Create layer-trees (background, bottom, top and overlay) and
* a layer-popup-tree. * a layer-popup-tree.
@ -446,6 +450,7 @@ void
output_update_usable_area(struct output *output) output_update_usable_area(struct output *output)
{ {
if (update_usable_area(output)) { if (update_usable_area(output)) {
regions_update(output);
desktop_arrange_all_views(output->server); desktop_arrange_all_views(output->server);
} }
} }
@ -457,7 +462,12 @@ output_update_all_usable_areas(struct server *server, bool layout_changed)
struct output *output; struct output *output;
wl_list_for_each(output, &server->outputs, link) { wl_list_for_each(output, &server->outputs, link) {
usable_area_changed |= update_usable_area(output); if (update_usable_area(output)) {
usable_area_changed = true;
regions_update(output);
} else if (layout_changed) {
regions_update(output);
}
} }
if (usable_area_changed || layout_changed) { if (usable_area_changed || layout_changed) {
desktop_arrange_all_views(server); desktop_arrange_all_views(server);

30
src/regions.c
View file

@ -8,6 +8,7 @@
#include <wlr/util/box.h> #include <wlr/util/box.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "common/graphic-helpers.h" #include "common/graphic-helpers.h"
#include "common/list.h"
#include "common/mem.h" #include "common/mem.h"
#include "labwc.h" #include "labwc.h"
#include "regions.h" #include "regions.h"
@ -27,7 +28,34 @@ regions_init(struct server *server, struct seat *seat)
void void
regions_update(struct output *output) regions_update(struct output *output)
{ {
/* To be filled later */ assert(output);
struct region *region;
struct wlr_box usable = output_usable_area_in_layout_coords(output);
/* Initialize regions */
if (wl_list_empty(&output->regions)) {
wl_list_for_each(region, &rc.regions, link) {
struct region *region_new = znew(*region_new);
/* Create a copy */
region_new->name = xstrdup(region->name);
region_new->percentage = region->percentage;
wl_list_append(&output->regions, &region_new->link);
}
}
/* Update regions */
struct wlr_box *perc, *geo;
wl_list_for_each(region, &output->regions, link) {
geo = &region->geo;
perc = &region->percentage;
geo->x = usable.x + usable.width * perc->x / 100;
geo->y = usable.y + usable.height * perc->y / 100;
geo->width = usable.width * perc->width / 100;
geo->height = usable.height * perc->height / 100;
region->center.x = geo->x + geo->width / 2;
region->center.y = geo->y + geo->height / 2;
}
} }
void void