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

Update output containers on output layout change

Browse source
This commit is contained in:
emersion 2017-12-13 15:52:18 +01:00
parent d293c42942
commit a4619e98c4
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
4 changed files with 23 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/sway/output.h
View file

@ -13,15 +13,7 @@ struct sway_output {
struct sway_server *server; struct sway_server *server;
struct timespec last_frame; struct timespec last_frame;
struct {
struct wl_signal scale;
struct wl_signal transform;
} events;
struct wl_listener frame; struct wl_listener frame;
struct wl_listener resolution;
struct wl_listener scale;
struct wl_listener transform;
}; };
#endif #endif

5
sway/config/output.c
View file

@ -113,13 +113,10 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
if (oc && oc->scale > 0) { if (oc && oc->scale > 0) {
sway_log(L_DEBUG, "Set %s scale to %d", oc->name, oc->scale); sway_log(L_DEBUG, "Set %s scale to %d", oc->name, oc->scale);
wlr_output_set_scale(wlr_output, oc->scale); wlr_output_set_scale(wlr_output, oc->scale);
wl_signal_emit(&output->sway_output->events.scale, output->sway_output);
} }
if (oc && oc->transform >= 0) { if (oc && oc->transform >= 0) {
sway_log(L_DEBUG, "Set %s transform to %d", oc->name, oc->transform); sway_log(L_DEBUG, "Set %s transform to %d", oc->name, oc->transform);
wlr_output_transform(wlr_output, oc->transform); wlr_output_set_transform(wlr_output, oc->transform);
wl_signal_emit(&output->sway_output->events.transform,
output->sway_output);
} }
// Find position for it // Find position for it

47
sway/desktop/output.c
View file

@ -91,32 +91,6 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
soutput->last_frame = now; soutput->last_frame = now;
} }
static void output_update_size(struct sway_output *output) {
struct wlr_box *output_layout_box = wlr_output_layout_get_box(
root_container.sway_root->output_layout, output->wlr_output);
output->swayc->x = output_layout_box->x;
output->swayc->y = output_layout_box->y;
output->swayc->width = output_layout_box->width;
output->swayc->height = output_layout_box->height;
arrange_windows(output->swayc, -1, -1);
}
static void output_resolution_notify(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, resolution);
output_update_size(output);
}
static void output_scale_notify(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, scale);
output_update_size(output);
}
static void output_transform_notify(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, transform);
output_update_size(output);
}
void output_add_notify(struct wl_listener *listener, void *data) { void output_add_notify(struct wl_listener *listener, void *data) {
struct sway_server *server = wl_container_of(listener, server, output_add); struct sway_server *server = wl_container_of(listener, server, output_add);
struct wlr_output *wlr_output = data; struct wlr_output *wlr_output = data;
@ -129,8 +103,11 @@ void output_add_notify(struct wl_listener *listener, void *data) {
output->wlr_output = wlr_output; output->wlr_output = wlr_output;
output->server = server; output->server = server;
wl_signal_init(&output->events.scale); if (!wl_list_empty(&wlr_output->modes)) {
wl_signal_init(&output->events.transform); struct wlr_output_mode *mode =
wl_container_of(wlr_output->modes.prev, mode, link);
wlr_output_set_mode(wlr_output, mode);
}
output->swayc = new_output(output); output->swayc = new_output(output);
if (!output->swayc) { if (!output->swayc) {
@ -138,22 +115,8 @@ void output_add_notify(struct wl_listener *listener, void *data) {
return; return;
} }
if (!wl_list_empty(&wlr_output->modes)) {
struct wlr_output_mode *mode = NULL;
mode = wl_container_of((&wlr_output->modes)->prev, mode, link);
wlr_output_set_mode(wlr_output, mode);
}
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);
output->resolution.notify = output_resolution_notify;
wl_signal_add(&wlr_output->events.resolution, &output->resolution);
output->scale.notify = output_scale_notify;
wl_signal_add(&output->events.scale, &output->scale);
output->transform.notify = output_transform_notify;
wl_signal_add(&output->events.transform, &output->transform);
arrange_windows(output->swayc, -1, -1);
} }
void output_remove_notify(struct wl_listener *listener, void *data) { void output_remove_notify(struct wl_listener *listener, void *data) {

20
sway/tree/layout.c
View file

@ -16,10 +16,24 @@
swayc_t root_container; swayc_t root_container;
static void output_layout_change_notify(struct wl_listener *listener, void *data) { static void output_layout_change_notify(struct wl_listener *listener, void *data) {
struct wlr_box *box = wlr_output_layout_get_box( struct wlr_box *layout_box = wlr_output_layout_get_box(
root_container.sway_root->output_layout, NULL); root_container.sway_root->output_layout, NULL);
root_container.width = box->width; root_container.width = layout_box->width;
root_container.height = box->height; root_container.height = layout_box->height;
for (int i = 0 ; i < root_container.children->length; ++i) {
swayc_t *output_container = root_container.children->items[i];
struct sway_output *output = output_container->sway_output;
struct wlr_box *output_box = wlr_output_layout_get_box(
root_container.sway_root->output_layout, output->wlr_output);
output_container->x = output_box->x;
output_container->y = output_box->y;
output_container->width = output_box->width;
output_container->height = output_box->height;
}
arrange_windows(&root_container, -1, -1);
} }
void init_layout(void) { void init_layout(void) {