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

Add damage tracking for xwayland unmanaged surfaces

Browse source
This commit is contained in:
emersion 2018-04-05 17:37:24 -04:00
parent 07f3bb3ad1
commit 1c91d0c10f
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
6 changed files with 50 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/sway/desktop.h Normal file
View file

@ -0,0 +1,7 @@
#include <wlr/types/wlr_surface.h>
void desktop_damage_whole_surface(struct wlr_surface *surface, double lx,
double ly);
void desktop_damage_from_surface(struct wlr_surface *surface, double lx,
double ly);

3
include/sway/output.h
View file

@ -37,6 +37,9 @@ void output_damage_whole(struct sway_output *output);
void output_damage_whole_view(struct sway_output *output, void output_damage_whole_view(struct sway_output *output,
struct sway_view *view); struct sway_view *view);
void output_damage_whole_surface(struct sway_output *output,
struct wlr_surface *surface, double ox, double oy);
struct sway_container *output_by_name(const char *name); struct sway_container *output_by_name(const char *name);
#endif #endif

20
sway/desktop/desktop.c Normal file
View file

@ -0,0 +1,20 @@
#include "sway/tree/container.h"
#include "sway/desktop.h"
#include "sway/output.h"
void desktop_damage_whole_surface(struct wlr_surface *surface, double lx,
double ly) {
for (int i = 0; i < root_container.children->length; ++i) {
struct sway_container *cont = root_container.children->items[i];
if (cont->type == C_OUTPUT) {
output_damage_whole_surface(cont->sway_output, surface,
lx - cont->x, ly - cont->y);
}
}
}
void desktop_damage_from_surface(struct wlr_surface *surface, double lx,
double ly) {
// TODO
desktop_damage_whole_surface(surface, lx, ly);
}

6
sway/desktop/output.c
View file

@ -341,6 +341,12 @@ void output_damage_whole_view(struct sway_output *output,
output_damage_whole(output); output_damage_whole(output);
} }
void output_damage_whole_surface(struct sway_output *output,
struct wlr_surface *surface, double ox, double oy) {
// TODO
output_damage_whole(output);
}
static void damage_handle_destroy(struct wl_listener *listener, void *data) { static void damage_handle_destroy(struct wl_listener *listener, void *data) {
struct sway_output *output = struct sway_output *output =
wl_container_of(listener, output, damage_destroy); wl_container_of(listener, output, damage_destroy);

22
sway/desktop/xwayland.c
View file

@ -2,17 +2,18 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/xwayland.h>
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/xwayland.h>
#include "log.h"
#include "sway/desktop.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/output.h"
#include "sway/server.h"
#include "sway/tree/container.h" #include "sway/tree/container.h"
#include "sway/tree/layout.h" #include "sway/tree/layout.h"
#include "sway/server.h"
#include "sway/tree/view.h" #include "sway/tree/view.h"
#include "sway/output.h"
#include "sway/input/seat.h"
#include "sway/input/input-manager.h"
#include "log.h"
static void unmanaged_handle_request_configure(struct wl_listener *listener, static void unmanaged_handle_request_configure(struct wl_listener *listener,
void *data) { void *data) {
@ -27,7 +28,9 @@ static void unmanaged_handle_request_configure(struct wl_listener *listener,
static void unmanaged_handle_commit(struct wl_listener *listener, void *data) { static void unmanaged_handle_commit(struct wl_listener *listener, void *data) {
struct sway_xwayland_unmanaged *surface = struct sway_xwayland_unmanaged *surface =
wl_container_of(listener, surface, commit); wl_container_of(listener, surface, commit);
// TODO: damage tracking struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
desktop_damage_from_surface(xsurface->surface, xsurface->x, xsurface->y);
// TODO: handle window motion
} }
static void unmanaged_handle_map(struct wl_listener *listener, void *data) { static void unmanaged_handle_map(struct wl_listener *listener, void *data) {
@ -38,15 +41,16 @@ static void unmanaged_handle_map(struct wl_listener *listener, void *data) {
&surface->link); &surface->link);
wl_signal_add(&xsurface->surface->events.commit, &surface->commit); wl_signal_add(&xsurface->surface->events.commit, &surface->commit);
surface->commit.notify = unmanaged_handle_commit; surface->commit.notify = unmanaged_handle_commit;
// TODO: damage tracking desktop_damage_whole_surface(xsurface->surface, xsurface->x, xsurface->y);
} }
static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) { static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
struct sway_xwayland_unmanaged *surface = struct sway_xwayland_unmanaged *surface =
wl_container_of(listener, surface, unmap); wl_container_of(listener, surface, unmap);
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
desktop_damage_whole_surface(xsurface->surface, xsurface->x, xsurface->y);
wl_list_remove(&surface->link); wl_list_remove(&surface->link);
wl_list_remove(&surface->commit.link); wl_list_remove(&surface->commit.link);
// TODO: damage tracking
} }
static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) { static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {

1
sway/meson.build
View file

@ -8,6 +8,7 @@ sway_sources = files(
'ipc-server.c', 'ipc-server.c',
'security.c', 'security.c',
'desktop/desktop.c',
'desktop/output.c', 'desktop/output.c',
'desktop/layer_shell.c', 'desktop/layer_shell.c',
'desktop/wl_shell.c', 'desktop/wl_shell.c',