mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partially revert a bit more of ddc9047

Browse source 
...to enable re-size of nested labwc instances
This commit is contained in:
Johan Malm 2023-12-08 22:08:46 +00:00 • committed by Johan Malm
parent b05b5ba0cf
commit 8d220536e0
1 changed files with 4 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/output.c
View file

@ -29,6 +29,10 @@
static void static void
output_frame_notify(struct wl_listener *listener, void *data) output_frame_notify(struct wl_listener *listener, void *data)
{ {
/*
* This function is called every time an output is ready to display a
* frame - which is typically at 60 Hz.
*/
struct output *output = wl_container_of(listener, output, frame); struct output *output = wl_container_of(listener, output, frame);
if (!output_is_usable(output)) { if (!output_is_usable(output)) {
return; return;
@ -120,33 +124,7 @@ output_request_state_notify(struct wl_listener *listener, void *data)
/* This ensures nested backends can be resized */ /* This ensures nested backends can be resized */
struct output *output = wl_container_of(listener, output, request_state); struct output *output = wl_container_of(listener, output, request_state);
const struct wlr_output_event_request_state *event = data; const struct wlr_output_event_request_state *event = data;
struct wlr_output_state *pending = &output->wlr_output->pending;
if (!pending->committed) {
/* No pending changes, just use the supplied state as new pending */
wlr_output_state_copy(pending, event->state);
wlr_output_schedule_frame(output->wlr_output);
return;
}
if (event->state->committed == WLR_OUTPUT_STATE_MODE) {
/* Only the resolution has changed, apply to pending */
switch (event->state->mode_type) {
case WLR_OUTPUT_STATE_MODE_FIXED:
wlr_output_set_mode(output->wlr_output, event->state->mode);
break;
case WLR_OUTPUT_STATE_MODE_CUSTOM:
wlr_output_set_custom_mode(output->wlr_output,
event->state->custom_mode.width,
event->state->custom_mode.height,
event->state->custom_mode.refresh);
break;
}
wlr_output_schedule_frame(output->wlr_output);
return;
}
/* Fallback path for everything that we didn't handle above */
if (!wlr_output_commit_state(output->wlr_output, event->state)) { if (!wlr_output_commit_state(output->wlr_output, event->state)) {
wlr_log(WLR_ERROR, "Backend requested a new state that could not be applied"); wlr_log(WLR_ERROR, "Backend requested a new state that could not be applied");
} }