mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 01:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

tearing: remove trailing whitespace

Browse source 
(cherry picked from commit 3e956b9229)
This commit is contained in:
Kirill Primak 2024-08-07 15:26:49 +03:00 committed by Simon Ser
parent 01f5c50438
commit fa4912b1f9
5 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/config/output.c
View file

@ -578,9 +578,9 @@ static bool finalize_output_config(struct output_config *oc, struct sway_output
wlr_color_transform_unref(output->color_transform); wlr_color_transform_unref(output->color_transform);
output->color_transform = oc->color_transform; output->color_transform = oc->color_transform;
} }
if (oc && oc->allow_tearing >= 0) { if (oc && oc->allow_tearing >= 0) {
sway_log(SWAY_DEBUG, "Set %s allow tearing to %d", sway_log(SWAY_DEBUG, "Set %s allow tearing to %d",
oc->name, oc->allow_tearing); oc->name, oc->allow_tearing);
output->allow_tearing = oc->allow_tearing; output->allow_tearing = oc->allow_tearing;
} }

5
sway/desktop/output.c
View file

@ -292,14 +292,13 @@ static int output_repaint_timer_handler(void *data) {
wlr_output_state_set_gamma_lut(&pending, 0, NULL, NULL, NULL); wlr_output_state_set_gamma_lut(&pending, 0, NULL, NULL, NULL);
} }
} }
if (output_can_tear(output)) { if (output_can_tear(output)) {
pending.tearing_page_flip = true; pending.tearing_page_flip = true;
if (!wlr_output_test_state(output->wlr_output, &pending)) { if (!wlr_output_test_state(output->wlr_output, &pending)) {
sway_log(SWAY_DEBUG, "Output test failed on '%s', retrying without tearing page-flip", sway_log(SWAY_DEBUG, "Output test failed on '%s', retrying without tearing page-flip",
output->wlr_output->name); output->wlr_output->name);
pending.tearing_page_flip = false; pending.tearing_page_flip = false;
} }
} }

16
sway/desktop/tearing.c
View file

@ -17,7 +17,7 @@ static void handle_tearing_controller_set_hint(struct wl_listener *listener,
void *data) { void *data) {
struct sway_tearing_controller *controller = struct sway_tearing_controller *controller =
wl_container_of(listener, controller, set_hint); wl_container_of(listener, controller, set_hint);
struct sway_view *view = view_from_wlr_surface( struct sway_view *view = view_from_wlr_surface(
controller->tearing_control->surface); controller->tearing_control->surface);
if (view) { if (view) {
@ -25,27 +25,27 @@ static void handle_tearing_controller_set_hint(struct wl_listener *listener,
} }
} }
static void handle_tearing_controller_destroy(struct wl_listener *listener, static void handle_tearing_controller_destroy(struct wl_listener *listener,
void *data) { void *data) {
struct sway_tearing_controller *controller = struct sway_tearing_controller *controller =
wl_container_of(listener, controller, destroy); wl_container_of(listener, controller, destroy);
wl_list_remove(&controller->link); wl_list_remove(&controller->link);
free(controller); free(controller);
} }
void handle_new_tearing_hint(struct wl_listener *listener, void handle_new_tearing_hint(struct wl_listener *listener,
void *data) { void *data) {
struct sway_server *server = struct sway_server *server =
wl_container_of(listener, server, tearing_control_new_object); wl_container_of(listener, server, tearing_control_new_object);
struct wlr_tearing_control_v1 *tearing_control = data; struct wlr_tearing_control_v1 *tearing_control = data;
enum wp_tearing_control_v1_presentation_hint hint = enum wp_tearing_control_v1_presentation_hint hint =
wlr_tearing_control_manager_v1_surface_hint_from_surface( wlr_tearing_control_manager_v1_surface_hint_from_surface(
server->tearing_control_v1, tearing_control->surface); server->tearing_control_v1, tearing_control->surface);
sway_log(SWAY_DEBUG, "New presentation hint %d received for surface %p", sway_log(SWAY_DEBUG, "New presentation hint %d received for surface %p",
hint, tearing_control->surface); hint, tearing_control->surface);
struct sway_tearing_controller *controller = struct sway_tearing_controller *controller =
calloc(1, sizeof(struct sway_tearing_controller)); calloc(1, sizeof(struct sway_tearing_controller));
if (!controller) { if (!controller) {
return; return;

4
sway/server.c
View file

@ -371,8 +371,8 @@ bool server_init(struct sway_server *server) {
server->content_type_manager_v1 = server->content_type_manager_v1 =
wlr_content_type_manager_v1_create(server->wl_display, 1); wlr_content_type_manager_v1_create(server->wl_display, 1);
wlr_fractional_scale_manager_v1_create(server->wl_display, 1); wlr_fractional_scale_manager_v1_create(server->wl_display, 1);
server->tearing_control_v1 = server->tearing_control_v1 =
wlr_tearing_control_manager_v1_create(server->wl_display, 1); wlr_tearing_control_manager_v1_create(server->wl_display, 1);
server->tearing_control_new_object.notify = handle_new_tearing_hint; server->tearing_control_new_object.notify = handle_new_tearing_hint;
wl_signal_add(&server->tearing_control_v1->events.new_object, wl_signal_add(&server->tearing_control_v1->events.new_object,

2
sway/tree/view.c
View file

@ -1268,7 +1268,7 @@ bool view_can_tear(struct sway_view *view) {
case TEARING_OVERRIDE_TRUE: case TEARING_OVERRIDE_TRUE:
return true; return true;
case TEARING_WINDOW_HINT: case TEARING_WINDOW_HINT:
return view->tearing_hint == return view->tearing_hint ==
WP_TEARING_CONTROL_V1_PRESENTATION_HINT_ASYNC; WP_TEARING_CONTROL_V1_PRESENTATION_HINT_ASYNC;
} }
return false; return false;