diff --git a/include/labwc.h b/include/labwc.h index 38bebc40..8eb48858 100644 --- a/include/labwc.h +++ b/include/labwc.h @@ -483,19 +483,12 @@ void interactive_begin(struct view *view, enum input_mode mode, void interactive_end(struct view *view); void output_init(struct server *server); -void output_damage_surface(struct output *output, struct wlr_surface *surface, - double lx, double ly, bool whole); -void scale_box(struct wlr_box *box, float scale); void output_manager_init(struct server *server); struct output *output_from_wlr_output(struct server *server, struct wlr_output *wlr_output); struct wlr_box output_usable_area_in_layout_coords(struct output *output); struct wlr_box output_usable_area_from_cursor_coords(struct server *server); -void damage_all_outputs(struct server *server); -void damage_view_whole(struct view *view); -void damage_view_part(struct view *view); - void server_init(struct server *server); void server_start(struct server *server); void server_finish(struct server *server); diff --git a/src/action.c b/src/action.c index e196a351..4a283cca 100644 --- a/src/action.c +++ b/src/action.c @@ -211,7 +211,6 @@ actions_run(struct view *activator, struct server *server, view = desktop_view_at_cursor(server); if (view) { desktop_focus_and_activate_view(&server->seat, view); - damage_all_outputs(server); } break; case ACTION_TYPE_ICONIFY: @@ -228,7 +227,6 @@ actions_run(struct view *activator, struct server *server, case ACTION_TYPE_RAISE: if (view) { desktop_move_to_front(view); - damage_all_outputs(server); } break; case ACTION_TYPE_RESIZE: diff --git a/src/cursor.c b/src/cursor.c index 5203a56c..f6716cb7 100644 --- a/src/cursor.c +++ b/src/cursor.c @@ -113,7 +113,6 @@ request_start_drag_notify(struct wl_listener *listener, void *data) static void process_cursor_move(struct server *server, uint32_t time) { - damage_all_outputs(server); double dx = server->seat.cursor->x - server->grab_x; double dy = server->seat.cursor->y - server->grab_y; struct view *view = server->grabbed_view; @@ -128,7 +127,6 @@ process_cursor_move(struct server *server, uint32_t time) static void process_cursor_resize(struct server *server, uint32_t time) { - damage_all_outputs(server); double dx = server->seat.cursor->x - server->grab_x; double dy = server->seat.cursor->y - server->grab_y; diff --git a/src/damage.c b/src/damage.c deleted file mode 100644 index 983ff428..00000000 --- a/src/damage.c +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -#include "labwc.h" - -void -damage_all_outputs(struct server *server) -{ -} - -void -damage_view_part(struct view *view) -{ -} - -void -damage_view_whole(struct view *view) -{ -} diff --git a/src/desktop.c b/src/desktop.c index 5f8a7609..c1745f81 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -199,7 +199,6 @@ desktop_cycle_view(struct server *server, struct view *current, view = wl_container_of(view->link.prev, view, link); } while (&view->link == &server->views || !isfocusable(view)); } - damage_all_outputs(server); return view; } diff --git a/src/keyboard.c b/src/keyboard.c index 7776c3e7..5f44ce21 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -42,7 +42,6 @@ keyboard_modifiers_notify(struct wl_listener *listener, void *data) if (server->cycle_view) { struct wlr_event_keyboard_key *event = data; struct wlr_keyboard *keyboard = &seat->keyboard_group->keyboard; - damage_all_outputs(server); if ((event->state == WL_KEYBOARD_KEY_STATE_RELEASED) && !any_modifiers_pressed(keyboard)) { /* end cycle */ @@ -138,7 +137,6 @@ handle_compositor_keybindings(struct wl_listener *listener, } if (server->cycle_view) { - damage_all_outputs(server); if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { for (int i = 0; i < nsyms; i++) { if (syms[i] == XKB_KEY_Escape) { diff --git a/src/meson.build b/src/meson.build index d690a63e..38d4803d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -2,7 +2,6 @@ labwc_sources = files( 'action.c', 'buffer.c', 'cursor.c', - 'damage.c', 'debug.c', 'desktop.c', 'foreign.c', diff --git a/src/output.c b/src/output.c index 07700c58..61dcc286 100644 --- a/src/output.c +++ b/src/output.c @@ -186,9 +186,6 @@ output_update_for_layout_change(struct server *server) wlr_cursor_move(server->seat.cursor, NULL, 0, 0); wlr_xcursor_manager_set_cursor_image(server->seat.xcursor_manager, XCURSOR_DEFAULT, server->seat.cursor); - - /* Redraw everything */ - damage_all_outputs(server); } static void diff --git a/src/seat.c b/src/seat.c index 1f3d5d2a..45e40bf4 100644 --- a/src/seat.c +++ b/src/seat.c @@ -310,7 +310,6 @@ seat_set_focus_layer(struct seat *seat, struct wlr_layer_surface_v1 *layer) if (!layer) { seat->focused_layer = NULL; desktop_focus_topmost_mapped_view(seat->server); - damage_all_outputs(seat->server); return; } seat_focus_surface(seat, layer->surface); diff --git a/src/server.c b/src/server.c index 808e3b35..f23d9055 100644 --- a/src/server.c +++ b/src/server.c @@ -46,7 +46,6 @@ reload_config_and_theme(void) menu_reconfigure(g_server); seat_reconfigure(g_server); - damage_all_outputs(g_server); } static int diff --git a/src/view-impl.c b/src/view-impl.c index d10dd2a4..ff8f9e3f 100644 --- a/src/view-impl.c +++ b/src/view-impl.c @@ -12,6 +12,4 @@ view_impl_map(struct view *view) view_update_title(view); view_update_app_id(view); - - damage_all_outputs(view->server); } diff --git a/src/view.c b/src/view.c index 740ed63f..53065948 100644 --- a/src/view.c +++ b/src/view.c @@ -607,7 +607,6 @@ view_update_title(struct view *view) } ssd_update_title(view); wlr_foreign_toplevel_handle_v1_set_title(view->toplevel_handle, title); - damage_all_outputs(view->server); } void diff --git a/src/xdg.c b/src/xdg.c index 7b433c4a..ddf60bda 100644 --- a/src/xdg.c +++ b/src/xdg.c @@ -62,7 +62,6 @@ handle_commit(struct wl_listener *listener, void *data) view->x, view->y); } ssd_update_geometry(view); - damage_view_part(view); } static void @@ -191,7 +190,6 @@ xdg_toplevel_view_configure(struct view *view, struct wlr_box geo) view->x = geo.x; view->y = geo.y; ssd_update_geometry(view); - //damage_all_outputs(view->server); } } #undef MAX diff --git a/src/xwayland-unmanaged.c b/src/xwayland-unmanaged.c index 02c2fdd6..3c37dfd2 100644 --- a/src/xwayland-unmanaged.c +++ b/src/xwayland-unmanaged.c @@ -20,7 +20,6 @@ unmanaged_handle_commit(struct wl_listener *listener, void *data) struct wlr_xwayland_surface *xsurface = unmanaged->xwayland_surface; unmanaged->lx = xsurface->x; unmanaged->ly = xsurface->y; - damage_all_outputs(unmanaged->server); } static struct view * @@ -54,7 +53,6 @@ unmanaged_handle_map(struct wl_listener *listener, void *data) unmanaged->lx = xsurface->x; unmanaged->ly = xsurface->y; - damage_all_outputs(unmanaged->server); if (wlr_xwayland_or_surface_wants_focus(xsurface)) { seat_focus_surface(&unmanaged->server->seat, xsurface->surface); } @@ -81,7 +79,6 @@ unmanaged_handle_unmap(struct wl_listener *listener, void *data) struct xwayland_unmanaged *unmanaged = wl_container_of(listener, unmanaged, unmap); struct wlr_xwayland_surface *xsurface = unmanaged->xwayland_surface; - damage_all_outputs(unmanaged->server); wl_list_remove(&unmanaged->link); wl_list_remove(&unmanaged->commit.link); diff --git a/src/xwayland.c b/src/xwayland.c index f6756e4d..4777b7e6 100644 --- a/src/xwayland.c +++ b/src/xwayland.c @@ -128,7 +128,6 @@ handle_request_configure(struct wl_listener *listener, void *data) wlr_xwayland_surface_configure(view->xwayland_surface, event->x, event->y, MAX(event->width, min_width), MAX(event->height, min_height)); - damage_all_outputs(view->server); } #undef MAX @@ -194,7 +193,6 @@ configure(struct view *view, struct wlr_box geo) wlr_xwayland_surface_configure(view->xwayland_surface, (int16_t)geo.x, (int16_t)geo.y, (uint16_t)geo.width, (uint16_t)geo.height); - damage_all_outputs(view->server); } static void @@ -211,7 +209,6 @@ static void _close(struct view *view) { wlr_xwayland_surface_close(view->xwayland_surface); - damage_all_outputs(view->server); } static const char *