diff options
Diffstat (limited to 'sway/desktop')
26 files changed, 1165 insertions, 2636 deletions
diff --git a/sway/desktop/fx_renderer/fx_framebuffer.c b/sway/desktop/fx_renderer/fx_framebuffer.c deleted file mode 100644 index dd8c27b1..00000000 --- a/sway/desktop/fx_renderer/fx_framebuffer.c +++ /dev/null @@ -1,89 +0,0 @@ -#include "log.h" -#include "sway/desktop/fx_renderer/fx_framebuffer.h" -#include "sway/desktop/fx_renderer/fx_stencilbuffer.h" -#include "sway/desktop/fx_renderer/fx_texture.h" - -struct fx_framebuffer fx_framebuffer_create() { - return (struct fx_framebuffer) { - .fb = -1, - .stencil_buffer = fx_stencilbuffer_create(), - .texture = fx_texture_create(), - }; -} - -void fx_framebuffer_bind(struct fx_framebuffer *buffer) { - glBindFramebuffer(GL_FRAMEBUFFER, buffer->fb); -} - -void fx_framebuffer_update(struct fx_framebuffer *buffer, int width, int height) { - bool first_alloc = false; - - if (buffer->fb == (uint32_t) -1) { - glGenFramebuffers(1, &buffer->fb); - first_alloc = true; - } - - if (buffer->texture.id == 0) { - first_alloc = true; - glGenTextures(1, &buffer->texture.id); - glBindTexture(GL_TEXTURE_2D, buffer->texture.id); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - } - - if (first_alloc || buffer->texture.width != width || buffer->texture.height != height) { - glBindTexture(GL_TEXTURE_2D, buffer->texture.id); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0); - - glBindFramebuffer(GL_FRAMEBUFFER, buffer->fb); - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, - buffer->texture.id, 0); - buffer->texture.target = GL_TEXTURE_2D; - buffer->texture.has_alpha = false; - buffer->texture.width = width; - buffer->texture.height = height; - - GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); - if (status != GL_FRAMEBUFFER_COMPLETE) { - sway_log(SWAY_ERROR, "Framebuffer incomplete, couldn't create! (FB status: %i)", status); - return; - } - sway_log(SWAY_DEBUG, "Framebuffer created, status %i", status); - } - - glBindTexture(GL_TEXTURE_2D, 0); -} - -void fx_framebuffer_add_stencil_buffer(struct fx_framebuffer *buffer, int width, int height) { - bool first_alloc = false; - - if (buffer->stencil_buffer.rb == (uint32_t) -1) { - glGenRenderbuffers(1, &buffer->stencil_buffer.rb); - first_alloc = true; - } - - if (first_alloc || buffer->stencil_buffer.width != width || buffer->stencil_buffer.height != height) { - glBindRenderbuffer(GL_RENDERBUFFER, buffer->stencil_buffer.rb); - glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, width, height); - buffer->stencil_buffer.width = width; - buffer->stencil_buffer.height = height; - } - - glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, buffer->stencil_buffer.rb); -} - -void fx_framebuffer_release(struct fx_framebuffer *buffer) { - // Release the framebuffer - if (buffer->fb != (uint32_t) -1 && buffer->fb) { - glDeleteFramebuffers(1, &buffer->fb); - } - buffer->fb = -1; - - // Release the stencil buffer - fx_stencilbuffer_release(&buffer->stencil_buffer); - - // Release the texture - fx_texture_release(&buffer->texture); -} diff --git a/sway/desktop/fx_renderer/fx_renderer.c b/sway/desktop/fx_renderer/fx_renderer.c deleted file mode 100644 index f06d93b5..00000000 --- a/sway/desktop/fx_renderer/fx_renderer.c +++ /dev/null @@ -1,961 +0,0 @@ -/* - The original wlr_renderer was heavily referenced in making this project - https://gitlab.freedesktop.org/wlroots/wlroots/-/tree/master/render/gles2 -*/ - -#include <assert.h> -#include <GLES2/gl2.h> -#include <stdlib.h> -#include <wlr/backend.h> -#include <wlr/render/egl.h> -#include <wlr/render/gles2.h> -#include <wlr/types/wlr_matrix.h> -#include <wlr/util/box.h> - -#include "log.h" -#include "sway/desktop/fx_renderer/fx_framebuffer.h" -#include "sway/desktop/fx_renderer/fx_renderer.h" -#include "sway/desktop/fx_renderer/fx_stencilbuffer.h" -#include "sway/desktop/fx_renderer/fx_texture.h" -#include "sway/desktop/fx_renderer/matrix.h" -#include "sway/server.h" - -// shaders -#include "blur1_frag_src.h" -#include "blur2_frag_src.h" -#include "blur_effects_frag_src.h" -#include "box_shadow_frag_src.h" -#include "common_vert_src.h" -#include "corner_frag_src.h" -#include "quad_frag_src.h" -#include "quad_round_frag_src.h" -#include "stencil_mask_frag_src.h" -#include "tex_frag_src.h" - -static const GLfloat verts[] = { - 1, 0, // top right - 0, 0, // top left - 1, 1, // bottom right - 0, 1, // bottom left -}; - -static GLuint compile_shader(GLuint type, const GLchar *src) { - GLuint shader = glCreateShader(type); - glShaderSource(shader, 1, &src, NULL); - glCompileShader(shader); - - GLint ok; - glGetShaderiv(shader, GL_COMPILE_STATUS, &ok); - if (ok == GL_FALSE) { - sway_log(SWAY_ERROR, "Failed to compile shader"); - glDeleteShader(shader); - shader = 0; - } - - return shader; -} - -static GLuint link_program(const GLchar *frag_src) { - const GLchar *vert_src = common_vert_src; - GLuint vert = compile_shader(GL_VERTEX_SHADER, vert_src); - if (!vert) { - goto error; - } - - GLuint frag = compile_shader(GL_FRAGMENT_SHADER, frag_src); - if (!frag) { - glDeleteShader(vert); - goto error; - } - - GLuint prog = glCreateProgram(); - glAttachShader(prog, vert); - glAttachShader(prog, frag); - glLinkProgram(prog); - - glDetachShader(prog, vert); - glDetachShader(prog, frag); - glDeleteShader(vert); - glDeleteShader(frag); - - GLint ok; - glGetProgramiv(prog, GL_LINK_STATUS, &ok); - if (ok == GL_FALSE) { - sway_log(SWAY_ERROR, "Failed to link shader"); - glDeleteProgram(prog); - goto error; - } - - return prog; - -error: - return 0; -} - -static bool link_blur_program(struct blur_shader *shader, const char *shader_program) { - GLuint prog; - shader->program = prog = link_program(shader_program); - if (!shader->program) { - return false; - } - shader->proj = glGetUniformLocation(prog, "proj"); - shader->tex = glGetUniformLocation(prog, "tex"); - shader->pos_attrib = glGetAttribLocation(prog, "pos"); - shader->tex_attrib = glGetAttribLocation(prog, "texcoord"); - shader->radius = glGetUniformLocation(prog, "radius"); - shader->halfpixel = glGetUniformLocation(prog, "halfpixel"); - - return true; -} - -static bool link_blur_effects_program(struct effects_shader *shader, const char *shader_program) { - GLuint prog; - shader->program = prog = link_program(shader_program); - if (!shader->program) { - return false; - } - shader->proj = glGetUniformLocation(prog, "proj"); - shader->tex = glGetUniformLocation(prog, "tex"); - shader->pos_attrib = glGetAttribLocation(prog, "pos"); - shader->tex_attrib = glGetAttribLocation(prog, "texcoord"); - shader->noise = glGetUniformLocation(prog, "noise"); - shader->brightness = glGetUniformLocation(prog, "brightness"); - shader->contrast = glGetUniformLocation(prog, "contrast"); - shader->saturation = glGetUniformLocation(prog, "saturation"); - - return true; - -} - -static bool link_box_shadow_program(struct box_shadow_shader *shader) { - GLuint prog; - shader->program = prog = link_program(box_shadow_frag_src); - if (!shader->program) { - return false; - } - shader->proj = glGetUniformLocation(prog, "proj"); - shader->color = glGetUniformLocation(prog, "color"); - shader->pos_attrib = glGetAttribLocation(prog, "pos"); - shader->position = glGetUniformLocation(prog, "position"); - shader->size = glGetUniformLocation(prog, "size"); - shader->blur_sigma = glGetUniformLocation(prog, "blur_sigma"); - shader->corner_radius = glGetUniformLocation(prog, "corner_radius"); - - return true; -} - -static bool link_corner_program(struct corner_shader *shader) { - GLuint prog; - shader->program = prog = link_program(corner_frag_src); - if (!shader->program) { - return false; - } - shader->proj = glGetUniformLocation(prog, "proj"); - shader->color = glGetUniformLocation(prog, "color"); - shader->pos_attrib = glGetAttribLocation(prog, "pos"); - shader->position = glGetUniformLocation(prog, "position"); - shader->half_size = glGetUniformLocation(prog, "half_size"); - shader->half_thickness = glGetUniformLocation(prog, "half_thickness"); - shader->radius = glGetUniformLocation(prog, "radius"); - shader->is_top_left = glGetUniformLocation(prog, "is_top_left"); - shader->is_top_right = glGetUniformLocation(prog, "is_top_right"); - shader->is_bottom_left = glGetUniformLocation(prog, "is_bottom_left"); - shader->is_bottom_right = glGetUniformLocation(prog, "is_bottom_right"); - - return true; -} - -static bool link_quad_program(struct quad_shader *shader) { - GLuint prog; - shader->program = prog = link_program(quad_frag_src); - if (!shader->program) { - return false; - } - - shader->proj = glGetUniformLocation(prog, "proj"); - shader->color = glGetUniformLocation(prog, "color"); - shader->pos_attrib = glGetAttribLocation(prog, "pos"); - - return true; -} - -static bool link_rounded_quad_program(struct rounded_quad_shader *shader, - enum fx_rounded_quad_shader_source source) { - GLchar quad_src[2048]; - snprintf(quad_src, sizeof(quad_src), - "#define SOURCE %d\n%s", source, quad_round_frag_src); - - GLuint prog; - shader->program = prog = link_program(quad_src); - if (!shader->program) { - return false; - } - - shader->proj = glGetUniformLocation(prog, "proj"); - shader->color = glGetUniformLocation(prog, "color"); - shader->pos_attrib = glGetAttribLocation(prog, "pos"); - shader->size = glGetUniformLocation(prog, "size"); - shader->position = glGetUniformLocation(prog, "position"); - shader->radius = glGetUniformLocation(prog, "radius"); - - return true; -} - -static bool link_stencil_mask_program(struct stencil_mask_shader *shader) { - GLuint prog; - shader->program = prog = link_program(stencil_mask_frag_src); - if (!shader->program) { - return false; - } - - shader->proj = glGetUniformLocation(prog, "proj"); - shader->color = glGetUniformLocation(prog, "color"); - shader->pos_attrib = glGetAttribLocation(prog, "pos"); - shader->position = glGetUniformLocation(prog, "position"); - shader->half_size = glGetUniformLocation(prog, "half_size"); - shader->radius = glGetUniformLocation(prog, "radius"); - - return true; -} - -static bool link_tex_program(struct tex_shader *shader, - enum fx_tex_shader_source source) { - GLchar frag_src[2048]; - snprintf(frag_src, sizeof(frag_src), - "#define SOURCE %d\n%s", source, tex_frag_src); - - GLuint prog; - shader->program = prog = link_program(frag_src); - if (!shader->program) { - return false; - } - - shader->proj = glGetUniformLocation(prog, "proj"); - shader->tex = glGetUniformLocation(prog, "tex"); - shader->alpha = glGetUniformLocation(prog, "alpha"); - shader->dim = glGetUniformLocation(prog, "dim"); - shader->dim_color = glGetUniformLocation(prog, "dim_color"); - shader->pos_attrib = glGetAttribLocation(prog, "pos"); - shader->tex_attrib = glGetAttribLocation(prog, "texcoord"); - shader->size = glGetUniformLocation(prog, "size"); - shader->position = glGetUniformLocation(prog, "position"); - shader->radius = glGetUniformLocation(prog, "radius"); - shader->saturation = glGetUniformLocation(prog, "saturation"); - shader->has_titlebar = glGetUniformLocation(prog, "has_titlebar"); - shader->discard_transparent = glGetUniformLocation(prog, "discard_transparent"); - - return true; -} - -static bool check_gl_ext(const char *exts, const char *ext) { - size_t extlen = strlen(ext); - const char *end = exts + strlen(exts); - - while (exts < end) { - if (exts[0] == ' ') { - exts++; - continue; - } - size_t n = strcspn(exts, " "); - if (n == extlen && strncmp(ext, exts, n) == 0) { - return true; - } - exts += n; - } - return false; -} - -static void load_gl_proc(void *proc_ptr, const char *name) { - void *proc = (void *)eglGetProcAddress(name); - if (proc == NULL) { - sway_log(SWAY_ERROR, "GLES2 RENDERER: eglGetProcAddress(%s) failed", name); - abort(); - } - *(void **)proc_ptr = proc; -} - -struct fx_renderer *fx_renderer_create(struct wlr_egl *egl, struct wlr_output *wlr_output) { - struct fx_renderer *renderer = calloc(1, sizeof(struct fx_renderer)); - if (renderer == NULL) { - return NULL; - } - - renderer->wlr_output = wlr_output; - - // TODO: wlr_egl_make_current or eglMakeCurrent? - // TODO: assert instead of conditional statement? - if (!eglMakeCurrent(wlr_egl_get_display(egl), EGL_NO_SURFACE, EGL_NO_SURFACE, - wlr_egl_get_context(egl))) { - sway_log(SWAY_ERROR, "GLES2 RENDERER: Could not make EGL current"); - return NULL; - } - - renderer->wlr_buffer = fx_framebuffer_create(); - renderer->blur_buffer = fx_framebuffer_create(); - renderer->blur_saved_pixels_buffer = fx_framebuffer_create(); - renderer->effects_buffer = fx_framebuffer_create(); - renderer->effects_buffer_swapped = fx_framebuffer_create(); - - renderer->blur_buffer_dirty = true; - - // get extensions - const char *exts_str = (const char *)glGetString(GL_EXTENSIONS); - if (exts_str == NULL) { - sway_log(SWAY_ERROR, "GLES2 RENDERER: Failed to get GL_EXTENSIONS"); - return NULL; - } - - sway_log(SWAY_INFO, "Creating swayfx GLES2 renderer"); - sway_log(SWAY_INFO, "Using %s", glGetString(GL_VERSION)); - sway_log(SWAY_INFO, "GL vendor: %s", glGetString(GL_VENDOR)); - sway_log(SWAY_INFO, "GL renderer: %s", glGetString(GL_RENDERER)); - sway_log(SWAY_INFO, "Supported GLES2 extensions: %s", exts_str); - - // TODO: the rest of the gl checks - if (check_gl_ext(exts_str, "GL_OES_EGL_image_external")) { - renderer->exts.OES_egl_image_external = true; - load_gl_proc(&renderer->procs.glEGLImageTargetTexture2DOES, - "glEGLImageTargetTexture2DOES"); - } - - // blur shaders - if (!link_blur_program(&renderer->shaders.blur1, blur1_frag_src)) { - goto error; - } - if (!link_blur_program(&renderer->shaders.blur2, blur2_frag_src)) { - goto error; - } - // effects shader - if (!link_blur_effects_program(&renderer->shaders.blur_effects, blur_effects_frag_src)) { - goto error; - } - // box shadow shader - if (!link_box_shadow_program(&renderer->shaders.box_shadow)) { - goto error; - } - // corner border shader - if (!link_corner_program(&renderer->shaders.corner)) { - goto error; - } - // quad fragment shader - if (!link_quad_program(&renderer->shaders.quad)) { - goto error; - } - // rounded quad fragment shaders - if (!link_rounded_quad_program(&renderer->shaders.rounded_quad, - SHADER_SOURCE_QUAD_ROUND)) { - goto error; - } - if (!link_rounded_quad_program(&renderer->shaders.rounded_tl_quad, - SHADER_SOURCE_QUAD_ROUND_TOP_LEFT)) { - goto error; - } - if (!link_rounded_quad_program(&renderer->shaders.rounded_tr_quad, - SHADER_SOURCE_QUAD_ROUND_TOP_RIGHT)) { - goto error; - } - if (!link_rounded_quad_program(&renderer->shaders.rounded_bl_quad, - SHADER_SOURCE_QUAD_ROUND_BOTTOM_LEFT)) { - goto error; - } - if (!link_rounded_quad_program(&renderer->shaders.rounded_br_quad, - SHADER_SOURCE_QUAD_ROUND_BOTTOM_RIGHT)) { - goto error; - } - // stencil mask shader - if (!link_stencil_mask_program(&renderer->shaders.stencil_mask)) { - goto error; - } - // fragment shaders - if (!link_tex_program(&renderer->shaders.tex_rgba, SHADER_SOURCE_TEXTURE_RGBA)) { - goto error; - } - if (!link_tex_program(&renderer->shaders.tex_rgbx, SHADER_SOURCE_TEXTURE_RGBX)) { - goto error; - } - if (!link_tex_program(&renderer->shaders.tex_ext, SHADER_SOURCE_TEXTURE_EXTERNAL)) { - goto error; - } - - if (!eglMakeCurrent(wlr_egl_get_display(egl), - EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT)) { - sway_log(SWAY_ERROR, "GLES2 RENDERER: Could not unset current EGL"); - goto error; - } - - sway_log(SWAY_INFO, "GLES2 RENDERER: Shaders Initialized Successfully"); - return renderer; - -error: - glDeleteProgram(renderer->shaders.blur1.program); - glDeleteProgram(renderer->shaders.blur2.program); - glDeleteProgram(renderer->shaders.blur_effects.program); - glDeleteProgram(renderer->shaders.box_shadow.program); - glDeleteProgram(renderer->shaders.corner.program); - glDeleteProgram(renderer->shaders.quad.program); - glDeleteProgram(renderer->shaders.rounded_quad.program); - glDeleteProgram(renderer->shaders.rounded_bl_quad.program); - glDeleteProgram(renderer->shaders.rounded_br_quad.program); - glDeleteProgram(renderer->shaders.rounded_tl_quad.program); - glDeleteProgram(renderer->shaders.rounded_tr_quad.program); - glDeleteProgram(renderer->shaders.stencil_mask.program); - glDeleteProgram(renderer->shaders.tex_rgba.program); - glDeleteProgram(renderer->shaders.tex_rgbx.program); - glDeleteProgram(renderer->shaders.tex_ext.program); - - if (!eglMakeCurrent(wlr_egl_get_display(egl), - EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT)) { - sway_log(SWAY_ERROR, "GLES2 RENDERER: Could not unset current EGL"); - } - - // TODO: more freeing? - free(renderer); - - sway_log(SWAY_ERROR, "GLES2 RENDERER: Error Initializing Shaders"); - return NULL; -} - -void fx_renderer_fini(struct fx_renderer *renderer) { - fx_framebuffer_release(&renderer->blur_buffer); - fx_framebuffer_release(&renderer->blur_saved_pixels_buffer); - fx_framebuffer_release(&renderer->effects_buffer); - fx_framebuffer_release(&renderer->effects_buffer_swapped); -} - -void fx_renderer_begin(struct fx_renderer *renderer, int width, int height) { - glViewport(0, 0, width, height); - renderer->viewport_width = width; - renderer->viewport_height = height; - - // Store the wlr FBO - renderer->wlr_buffer.fb = - wlr_gles2_renderer_get_current_fbo(renderer->wlr_output->renderer); - // Get the fx_texture - struct wlr_texture *wlr_texture = wlr_texture_from_buffer( - renderer->wlr_output->renderer, renderer->wlr_output->back_buffer); - renderer->wlr_buffer.texture = fx_texture_from_wlr_texture(wlr_texture); - wlr_texture_destroy(wlr_texture); - // Add the stencil to the wlr fbo - fx_framebuffer_add_stencil_buffer(&renderer->wlr_buffer, width, height); - - // Create the framebuffers - fx_framebuffer_update(&renderer->blur_saved_pixels_buffer, width, height); - fx_framebuffer_update(&renderer->effects_buffer, width, height); - fx_framebuffer_update(&renderer->effects_buffer_swapped, width, height); - - // Add a stencil buffer to the main buffer & bind the main buffer - fx_framebuffer_bind(&renderer->wlr_buffer); - - pixman_region32_init(&renderer->blur_padding_region); - - // refresh projection matrix - matrix_projection(renderer->projection, width, height, - WL_OUTPUT_TRANSFORM_FLIPPED_180); - - glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); -} - -void fx_renderer_end(struct fx_renderer *renderer) { - pixman_region32_fini(&renderer->blur_padding_region); -} - -void fx_renderer_clear(const float color[static 4]) { - glClearColor(color[0], color[1], color[2], color[3]); - glClearStencil(0); - glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); -} - -void fx_renderer_scissor(struct wlr_box *box) { - if (box) { - glScissor(box->x, box->y, box->width, box->height); - glEnable(GL_SCISSOR_TEST); - } else { - glDisable(GL_SCISSOR_TEST); - } -} - -void fx_renderer_stencil_mask_init() { - glClearStencil(0); - glClear(GL_STENCIL_BUFFER_BIT); - glEnable(GL_STENCIL_TEST); - - glStencilFunc(GL_ALWAYS, 1, 0xFF); - glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE); - // Disable writing to color buffer - glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); -} - -void fx_renderer_stencil_mask_close(bool draw_inside_mask) { - // Reenable writing to color buffer - glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - if (draw_inside_mask) { - glStencilFunc(GL_EQUAL, 1, 0xFF); - glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE); - return; - } - glStencilFunc(GL_NOTEQUAL, 1, 0xFF); - glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); -} - -void fx_renderer_stencil_mask_fini() { - glClearStencil(0); - glClear(GL_STENCIL_BUFFER_BIT); - glDisable(GL_STENCIL_TEST); -} - -bool fx_render_subtexture_with_matrix(struct fx_renderer *renderer, struct fx_texture *fx_texture, - const struct wlr_fbox *src_box, const struct wlr_box *dst_box, const float matrix[static 9], - struct decoration_data deco_data) { - // Fixes corner radii not being "round" when the radii is larger than - // the height/width - int min_size = MIN(dst_box->height, dst_box->width) * 0.5; - if (deco_data.corner_radius > min_size) { - deco_data.corner_radius = min_size; - } - - struct tex_shader *shader = NULL; - - switch (fx_texture->target) { - case GL_TEXTURE_2D: - if (fx_texture->has_alpha) { - shader = &renderer->shaders.tex_rgba; - } else { - shader = &renderer->shaders.tex_rgbx; - } - break; - case GL_TEXTURE_EXTERNAL_OES: - shader = &renderer->shaders.tex_ext; - - if (!renderer->exts.OES_egl_image_external) { - sway_log(SWAY_ERROR, "Failed to render texture: " - "GL_TEXTURE_EXTERNAL_OES not supported"); - return false; - } - break; - default: - sway_log(SWAY_ERROR, "Aborting render"); - abort(); - } - - float gl_matrix[9]; - wlr_matrix_multiply(gl_matrix, renderer->projection, matrix); - - // OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set - // to GL_FALSE - wlr_matrix_transpose(gl_matrix, gl_matrix); - - // if there's no opacity or rounded corners we don't need to blend - if (!fx_texture->has_alpha && deco_data.alpha == 1.0 && !deco_data.corner_radius) { - glDisable(GL_BLEND); - } else { - glEnable(GL_BLEND); - } - - glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - - glActiveTexture(GL_TEXTURE0); - glBindTexture(fx_texture->target, fx_texture->id); - - glTexParameteri(fx_texture->target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - - glUseProgram(shader->program); - - float* dim_color = deco_data.dim_color; - - glUniformMatrix3fv(shader->proj, 1, GL_FALSE, gl_matrix); - glUniform1i(shader->tex, 0); - glUniform2f(shader->size, dst_box->width, dst_box->height); - glUniform2f(shader->position, dst_box->x, dst_box->y); - glUniform1f(shader->alpha, deco_data.alpha); - glUniform1f(shader->dim, deco_data.dim); - glUniform4f(shader->dim_color, dim_color[0], dim_color[1], dim_color[2], dim_color[3]); - glUniform1f(shader->has_titlebar, deco_data.has_titlebar); - glUniform1f(shader->discard_transparent, deco_data.discard_transparent); - glUniform1f(shader->saturation, deco_data.saturation); - glUniform1f(shader->radius, deco_data.corner_radius); - - const GLfloat x1 = src_box->x / fx_texture->width; - const GLfloat y1 = src_box->y / fx_texture->height; - const GLfloat x2 = (src_box->x + src_box->width) / fx_texture->width; - const GLfloat y2 = (src_box->y + src_box->height) / fx_texture->height; - const GLfloat texcoord[] = { - x2, y1, // top right - x1, y1, // top left - x2, y2, // bottom right - x1, y2, // bottom left - }; - - glVertexAttribPointer(shader->pos_attrib, 2, GL_FLOAT, GL_FALSE, 0, verts); - glVertexAttribPointer(shader->tex_attrib, 2, GL_FLOAT, GL_FALSE, 0, texcoord); - - glEnableVertexAttribArray(shader->pos_attrib); - glEnableVertexAttribArray(shader->tex_attrib); - - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - glDisableVertexAttribArray(shader->pos_attrib); - glDisableVertexAttribArray(shader->tex_attrib); - - glBindTexture(fx_texture->target, 0); - - return true; -} - -bool fx_render_texture_with_matrix(struct fx_renderer *renderer, struct fx_texture *texture, - const struct wlr_box *dst_box, const float matrix[static 9], - struct decoration_data deco_data) { - struct wlr_fbox src_box = { - .x = 0, - .y = 0, - .width = texture->width, - .height = texture->height, - }; - return fx_render_subtexture_with_matrix(renderer, texture, &src_box, - dst_box, matrix, deco_data); -} - -void fx_render_rect(struct fx_renderer *renderer, const struct wlr_box *box, - const float color[static 4], const float projection[static 9]) { - if (box->width == 0 || box->height == 0) { - return; - } - assert(box->width > 0 && box->height > 0); - float matrix[9]; - wlr_matrix_project_box(matrix, box, WL_OUTPUT_TRANSFORM_NORMAL, 0, projection); - - float gl_matrix[9]; - wlr_matrix_multiply(gl_matrix, renderer->projection, matrix); - - // TODO: investigate why matrix is flipped prior to this cmd - // wlr_matrix_multiply(gl_matrix, flip_180, gl_matrix); - - wlr_matrix_transpose(gl_matrix, gl_matrix); - - if (color[3] == 1.0) { - glDisable(GL_BLEND); - } else { - glEnable(GL_BLEND); - } - - struct quad_shader shader = renderer->shaders.quad; - glUseProgram(shader.program); - - glUniformMatrix3fv(shader.proj, 1, GL_FALSE, gl_matrix); - glUniform4f(shader.color, color[0], color[1], color[2], color[3]); - - glVertexAttribPointer(shader.pos_attrib, 2, GL_FLOAT, GL_FALSE, - 0, verts); - - glEnableVertexAttribArray(shader.pos_attrib); - - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - glDisableVertexAttribArray(shader.pos_attrib); -} - -void fx_render_rounded_rect(struct fx_renderer *renderer, const struct wlr_box *box, - const float color[static 4], const float matrix[static 9], int radius, - enum corner_location corner_location) { - if (box->width == 0 || box->height == 0) { - return; - } - assert(box->width > 0 && box->height > 0); - - // Fixes corner radii not being "round" when the radii is larger than - // the height/width - int min_size = MIN(box->height, box->width) * 0.5; - if (radius > min_size) { - radius = min_size; - } - - struct rounded_quad_shader *shader = NULL; - - switch (corner_location) { - case ALL: - shader = &renderer->shaders.rounded_quad; - break; - case TOP_LEFT: - shader = &renderer->shaders.rounded_tl_quad; - break; - case TOP_RIGHT: - shader = &renderer->shaders.rounded_tr_quad; - break; - case BOTTOM_LEFT: - shader = &renderer->shaders.rounded_bl_quad; - break; - case BOTTOM_RIGHT: - shader = &renderer->shaders.rounded_br_quad; - break; - default: - sway_log(SWAY_ERROR, "Invalid Corner Location. Aborting render"); - abort(); - } - - float gl_matrix[9]; - wlr_matrix_multiply(gl_matrix, renderer->projection, matrix); - - // TODO: investigate why matrix is flipped prior to this cmd - // wlr_matrix_multiply(gl_matrix, flip_180, gl_matrix); - - wlr_matrix_transpose(gl_matrix, gl_matrix); - - glEnable(GL_BLEND); - - glUseProgram(shader->program); - - glUniformMatrix3fv(shader->proj, 1, GL_FALSE, gl_matrix); - glUniform4f(shader->color, color[0], color[1], color[2], color[3]); - - // rounded corners - glUniform2f(shader->size, box->width, box->height); - glUniform2f(shader->position, box->x, box->y); - glUniform1f(shader->radius, radius); - - glVertexAttribPointer(shader->pos_attrib, 2, GL_FLOAT, GL_FALSE, - 0, verts); - - glEnableVertexAttribArray(shader->pos_attrib); - - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - glDisableVertexAttribArray(shader->pos_attrib); -} - -void fx_render_border_corner(struct fx_renderer *renderer, const struct wlr_box *box, - const float color[static 4], const float matrix[static 9], - enum corner_location corner_location, int radius, int border_thickness) { - if (border_thickness == 0 || box->width == 0 || box->height == 0) { - return; - } - assert(box->width > 0 && box->height > 0); - - // Fixes corner radii not being "round" when the radii is larger than - // the height/width - int min_size = MIN(box->height, box->width) * 0.5; - if (radius > min_size) { - radius = min_size; - } - - float gl_matrix[9]; - wlr_matrix_multiply(gl_matrix, renderer->projection, matrix); - - // TODO: investigate why matrix is flipped prior to this cmd - // wlr_matrix_multiply(gl_matrix, flip_180, gl_matrix); - - wlr_matrix_transpose(gl_matrix, gl_matrix); - - if (color[3] == 1.0 && !radius) { - glDisable(GL_BLEND); - } else { - glEnable(GL_BLEND); - } - - struct corner_shader shader = renderer->shaders.corner; - - glUseProgram(shader.program); - - glUniformMatrix3fv(shader.proj, 1, GL_FALSE, gl_matrix); - glUniform4f(shader.color, color[0], color[1], color[2], color[3]); - - glUniform1f(shader.is_top_left, corner_location == TOP_LEFT); - glUniform1f(shader.is_top_right, corner_location == TOP_RIGHT); - glUniform1f(shader.is_bottom_left, corner_location == BOTTOM_LEFT); - glUniform1f(shader.is_bottom_right, corner_location == BOTTOM_RIGHT); - - glUniform2f(shader.position, box->x, box->y); - glUniform1f(shader.radius, radius); - glUniform2f(shader.half_size, box->width / 2.0, box->height / 2.0); - glUniform1f(shader.half_thickness, border_thickness / 2.0); - - glVertexAttribPointer(shader.pos_attrib, 2, GL_FLOAT, GL_FALSE, - 0, verts); - - glEnableVertexAttribArray(shader.pos_attrib); - - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - glDisableVertexAttribArray(shader.pos_attrib); -} - -void fx_render_stencil_mask(struct fx_renderer *renderer, const struct wlr_box *box, - const float matrix[static 9], int corner_radius) { - if (box->width == 0 || box->height == 0) { - return; - } - assert(box->width > 0 && box->height > 0); - - // Fixes corner radii not being "round" when the radii is larger than - // the height/width - int min_size = MIN(box->height, box->width) * 0.5; - if (corner_radius > min_size) { - corner_radius = min_size; - } - - // TODO: just pass gl_matrix? - float gl_matrix[9]; - wlr_matrix_multiply(gl_matrix, renderer->projection, matrix); - - // TODO: investigate why matrix is flipped prior to this cmd - // wlr_matrix_multiply(gl_matrix, flip_180, gl_matrix); - - wlr_matrix_transpose(gl_matrix, gl_matrix); - - glEnable(GL_BLEND); - - struct stencil_mask_shader shader = renderer->shaders.stencil_mask; - - glUseProgram(shader.program); - - glUniformMatrix3fv(shader.proj, 1, GL_FALSE, gl_matrix); - - glUniform2f(shader.half_size, box->width * 0.5, box->height * 0.5); - glUniform2f(shader.position, box->x, box->y); - glUniform1f(shader.radius, corner_radius); - - glVertexAttribPointer(shader.pos_attrib, 2, GL_FLOAT, GL_FALSE, - 0, verts); - - glEnableVertexAttribArray(shader.pos_attrib); - - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - glDisableVertexAttribArray(shader.pos_attrib); -} - -// TODO: alpha input arg? -void fx_render_box_shadow(struct fx_renderer *renderer, const struct wlr_box *box, - const struct wlr_box *inner_box, const float color[static 4], - const float matrix[static 9], int corner_radius, float blur_sigma) { - if (box->width == 0 || box->height == 0) { - return; - } - assert(box->width > 0 && box->height > 0); - - // Fixes corner radii not being "round" when the radii is larger than - // the height/width - int min_size = MIN(box->height, box->width) * 0.5; - if (corner_radius > min_size) { - corner_radius = min_size; - } - - float gl_matrix[9]; - wlr_matrix_multiply(gl_matrix, renderer->projection, matrix); - - // TODO: investigate why matrix is flipped prior to this cmd - // wlr_matrix_multiply(gl_matrix, flip_180, gl_matrix); - - wlr_matrix_transpose(gl_matrix, gl_matrix); - - fx_renderer_stencil_mask_init(); - // Draw the rounded rect as a mask - fx_render_stencil_mask(renderer, inner_box, matrix, corner_radius); - fx_renderer_stencil_mask_close(false); - - // blending will practically always be needed (unless we have a madman - // who uses opaque shadows with zero sigma), so just enable it - glEnable(GL_BLEND); - - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - struct box_shadow_shader shader = renderer->shaders.box_shadow; - - glUseProgram(shader.program); - - glUniformMatrix3fv(shader.proj, 1, GL_FALSE, gl_matrix); - glUniform4f(shader.color, color[0], color[1], color[2], color[3]); - glUniform1f(shader.blur_sigma, blur_sigma); - glUniform1f(shader.corner_radius, corner_radius); - - glUniform2f(shader.size, box->width, box->height); - glUniform2f(shader.position, box->x, box->y); - - glVertexAttribPointer(shader.pos_attrib, 2, GL_FLOAT, GL_FALSE, - 0, verts); - - glEnableVertexAttribArray(shader.pos_attrib); - - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - glDisableVertexAttribArray(shader.pos_attrib); - - glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - - fx_renderer_stencil_mask_fini(); -} - -void fx_render_blur(struct fx_renderer *renderer, const float matrix[static 9], - struct fx_framebuffer **buffer, struct blur_shader *shader, - const struct wlr_box *box, int blur_radius) { - glDisable(GL_BLEND); - glDisable(GL_STENCIL_TEST); - - glActiveTexture(GL_TEXTURE0); - - glBindTexture((*buffer)->texture.target, (*buffer)->texture.id); - - glTexParameteri((*buffer)->texture.target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - - glUseProgram(shader->program); - - // OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set - // to GL_FALSE - float gl_matrix[9]; - wlr_matrix_transpose(gl_matrix, matrix); - glUniformMatrix3fv(shader->proj, 1, GL_FALSE, gl_matrix); - - glUniform1i(shader->tex, 0); - glUniform1f(shader->radius, blur_radius); - - if (shader == &renderer->shaders.blur1) { - glUniform2f(shader->halfpixel, 0.5f / (renderer->viewport_width / 2.0f), 0.5f / (renderer->viewport_height / 2.0f)); - } else { - glUniform2f(shader->halfpixel, 0.5f / (renderer->viewport_width * 2.0f), 0.5f / (renderer->viewport_height * 2.0f)); - } - - glVertexAttribPointer(shader->pos_attrib, 2, GL_FLOAT, GL_FALSE, 0, verts); - glVertexAttribPointer(shader->tex_attrib, 2, GL_FLOAT, GL_FALSE, 0, verts); - - glEnableVertexAttribArray(shader->pos_attrib); - glEnableVertexAttribArray(shader->tex_attrib); - - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - glDisableVertexAttribArray(shader->pos_attrib); - glDisableVertexAttribArray(shader->tex_attrib); - -} - -void fx_render_blur_effects(struct fx_renderer *renderer, const float matrix[static 9], - struct fx_framebuffer **buffer, float blur_noise, float blur_brightness, - float blur_contrast, float blur_saturation) { - struct effects_shader shader = renderer->shaders.blur_effects; - - glActiveTexture(GL_TEXTURE0); - glBindTexture((*buffer)->texture.target, (*buffer)->texture.id); - glTexParameteri((*buffer)->texture.target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - - glUseProgram(shader.program); - - // OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set - // to GL_FALSE - float gl_matrix[9]; - wlr_matrix_transpose(gl_matrix, matrix); - glUniformMatrix3fv(shader.proj, 1, GL_FALSE, gl_matrix); - - glUniform1i(shader.tex, 0); - glUniform1f(shader.noise, blur_noise); - glUniform1f(shader.brightness, blur_brightness); - glUniform1f(shader.contrast, blur_contrast); - glUniform1f(shader.saturation, blur_saturation); - - glVertexAttribPointer(shader.pos_attrib, 2, GL_FLOAT, GL_FALSE, 0, verts); - glVertexAttribPointer(shader.tex_attrib, 2, GL_FLOAT, GL_FALSE, 0, verts); - - glEnableVertexAttribArray(shader.pos_attrib); - glEnableVertexAttribArray(shader.tex_attrib); - - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - glDisableVertexAttribArray(shader.pos_attrib); - glDisableVertexAttribArray(shader.tex_attrib); -} diff --git a/sway/desktop/fx_renderer/fx_stencilbuffer.c b/sway/desktop/fx_renderer/fx_stencilbuffer.c deleted file mode 100644 index 5b99ff79..00000000 --- a/sway/desktop/fx_renderer/fx_stencilbuffer.c +++ /dev/null @@ -1,21 +0,0 @@ -#include <assert.h> -#include <wlr/render/gles2.h> - -#include "sway/desktop/fx_renderer/fx_stencilbuffer.h" - -struct fx_stencilbuffer fx_stencilbuffer_create() { - return (struct fx_stencilbuffer) { - .rb = -1, - .width = -1, - .height = -1, - }; -} - -void fx_stencilbuffer_release(struct fx_stencilbuffer *stencil_buffer) { - if (stencil_buffer->rb != (uint32_t) -1 && stencil_buffer->rb) { - glDeleteRenderbuffers(1, &stencil_buffer->rb); - } - stencil_buffer->rb = -1; - stencil_buffer->width = -1; - stencil_buffer->height = -1; -} diff --git a/sway/desktop/fx_renderer/fx_texture.c b/sway/desktop/fx_renderer/fx_texture.c deleted file mode 100644 index cc5d14c8..00000000 --- a/sway/desktop/fx_renderer/fx_texture.c +++ /dev/null @@ -1,37 +0,0 @@ -#include <assert.h> -#include <wlr/render/gles2.h> - -#include "sway/desktop/fx_renderer/fx_texture.h" - -struct fx_texture fx_texture_create() { - return (struct fx_texture) { - .id = 0, - .target = 0, - .width = -1, - .height = -1, - }; -} - -struct fx_texture fx_texture_from_wlr_texture(struct wlr_texture *texture) { - assert(wlr_texture_is_gles2(texture)); - - struct wlr_gles2_texture_attribs texture_attrs; - wlr_gles2_texture_get_attribs(texture, &texture_attrs); - - return (struct fx_texture) { - .target = texture_attrs.target, - .id = texture_attrs.tex, - .has_alpha = texture_attrs.has_alpha, - .width = texture->width, - .height = texture->height, - }; -} - -void fx_texture_release(struct fx_texture *texture) { - if (texture->id) { - glDeleteTextures(1, &texture->id); - } - texture->id = 0; - texture->width = -1; - texture->height = -1; -} diff --git a/sway/desktop/fx_renderer/matrix.c b/sway/desktop/fx_renderer/matrix.c deleted file mode 100644 index 9c9dabec..00000000 --- a/sway/desktop/fx_renderer/matrix.c +++ /dev/null @@ -1,70 +0,0 @@ -#include <math.h> -#include <string.h> -#include <wlr/types/wlr_output.h> - -#include "sway/desktop/fx_renderer/matrix.h" - -static const float transforms[][9] = { - [WL_OUTPUT_TRANSFORM_NORMAL] = { - 1.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 1.0f, - }, - [WL_OUTPUT_TRANSFORM_90] = { - 0.0f, 1.0f, 0.0f, - -1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, - }, - [WL_OUTPUT_TRANSFORM_180] = { - -1.0f, 0.0f, 0.0f, - 0.0f, -1.0f, 0.0f, - 0.0f, 0.0f, 1.0f, - }, - [WL_OUTPUT_TRANSFORM_270] = { - 0.0f, -1.0f, 0.0f, - 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, - }, - [WL_OUTPUT_TRANSFORM_FLIPPED] = { - -1.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 1.0f, - }, - [WL_OUTPUT_TRANSFORM_FLIPPED_90] = { - 0.0f, 1.0f, 0.0f, - 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, - }, - [WL_OUTPUT_TRANSFORM_FLIPPED_180] = { - 1.0f, 0.0f, 0.0f, - 0.0f, -1.0f, 0.0f, - 0.0f, 0.0f, 1.0f, - }, - [WL_OUTPUT_TRANSFORM_FLIPPED_270] = { - 0.0f, -1.0f, 0.0f, - -1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, - }, -}; - -void matrix_projection(float mat[static 9], int width, int height, - enum wl_output_transform transform) { - memset(mat, 0, sizeof(*mat) * 9); - - const float *t = transforms[transform]; - float x = 2.0f / width; - float y = 2.0f / height; - - // Rotation + reflection - mat[0] = x * t[0]; - mat[1] = x * t[1]; - mat[3] = y * -t[3]; - mat[4] = y * -t[4]; - - // Translation - mat[2] = -copysign(1.0f, mat[0] + mat[1]); - mat[5] = -copysign(1.0f, mat[3] + mat[4]); - - // Identity - mat[8] = 1.0f; -} diff --git a/sway/desktop/fx_renderer/shaders/blur1.frag b/sway/desktop/fx_renderer/shaders/blur1.frag deleted file mode 100644 index e7cb1be8..00000000 --- a/sway/desktop/fx_renderer/shaders/blur1.frag +++ /dev/null @@ -1,18 +0,0 @@ -precision mediump float; -varying mediump vec2 v_texcoord; -uniform sampler2D tex; - -uniform float radius; -uniform vec2 halfpixel; - -void main() { - vec2 uv = v_texcoord * 2.0; - - vec4 sum = texture2D(tex, uv) * 4.0; - sum += texture2D(tex, uv - halfpixel.xy * radius); - sum += texture2D(tex, uv + halfpixel.xy * radius); - sum += texture2D(tex, uv + vec2(halfpixel.x, -halfpixel.y) * radius); - sum += texture2D(tex, uv - vec2(halfpixel.x, -halfpixel.y) * radius); - - gl_FragColor = sum / 8.0; -} diff --git a/sway/desktop/fx_renderer/shaders/blur2.frag b/sway/desktop/fx_renderer/shaders/blur2.frag deleted file mode 100644 index 3755a294..00000000 --- a/sway/desktop/fx_renderer/shaders/blur2.frag +++ /dev/null @@ -1,22 +0,0 @@ -precision mediump float; -varying mediump vec2 v_texcoord; -uniform sampler2D tex; - -uniform float radius; -uniform vec2 halfpixel; - -void main() { - vec2 uv = v_texcoord / 2.0; - - vec4 sum = texture2D(tex, uv + vec2(-halfpixel.x * 2.0, 0.0) * radius); - - sum += texture2D(tex, uv + vec2(-halfpixel.x, halfpixel.y) * radius) * 2.0; - sum += texture2D(tex, uv + vec2(0.0, halfpixel.y * 2.0) * radius); - sum += texture2D(tex, uv + vec2(halfpixel.x, halfpixel.y) * radius) * 2.0; - sum += texture2D(tex, uv + vec2(halfpixel.x * 2.0, 0.0) * radius); - sum += texture2D(tex, uv + vec2(halfpixel.x, -halfpixel.y) * radius) * 2.0; - sum += texture2D(tex, uv + vec2(0.0, -halfpixel.y * 2.0) * radius); - sum += texture2D(tex, uv + vec2(-halfpixel.x, -halfpixel.y) * radius) * 2.0; - - gl_FragColor = sum / 12.0; -} diff --git a/sway/desktop/fx_renderer/shaders/blur_effects.frag b/sway/desktop/fx_renderer/shaders/blur_effects.frag deleted file mode 100644 index 2fc16c15..00000000 --- a/sway/desktop/fx_renderer/shaders/blur_effects.frag +++ /dev/null @@ -1,54 +0,0 @@ -precision mediump float; -varying vec2 v_texcoord; -uniform sampler2D tex; - -uniform float noise; -uniform float brightness; -uniform float contrast; -uniform float saturation; - -mat4 brightnessMatrix() { - float b = brightness - 1.0; - return mat4(1, 0, 0, 0, - 0, 1, 0, 0, - 0, 0, 1, 0, - b, b, b, 1); -} - -mat4 contrastMatrix() { - float t = (1.0 - contrast) / 2.0; - return mat4(contrast, 0, 0, 0, - 0, contrast, 0, 0, - 0, 0, contrast, 0, - t, t, t, 1); -} - -mat4 saturationMatrix() { - vec3 luminance = vec3(0.3086, 0.6094, 0.0820); - float oneMinusSat = 1.0 - saturation; - vec3 red = vec3(luminance.x * oneMinusSat); - red+= vec3(saturation, 0, 0); - vec3 green = vec3(luminance.y * oneMinusSat); - green += vec3(0, saturation, 0); - vec3 blue = vec3(luminance.z * oneMinusSat); - blue += vec3(0, 0, saturation); - return mat4(red, 0, - green, 0, - blue, 0, - 0, 0, 0, 1); -} - -// Fast generative noise function -float hash(vec2 p) { - return fract(sin(dot(p, vec2(12.9898, 78.233))) * 43758.5453); -} - -void main() { - vec4 color = texture2D(tex, v_texcoord); - color *= brightnessMatrix() * contrastMatrix() * saturationMatrix(); - float noiseHash = hash(v_texcoord); - float noiseAmount = (mod(noiseHash, 1.0) - 0.5); - color.rgb += noiseAmount * noise; - - gl_FragColor = color; -} diff --git a/sway/desktop/fx_renderer/shaders/box_shadow.frag b/sway/desktop/fx_renderer/shaders/box_shadow.frag deleted file mode 100644 index c9b2b91f..00000000 --- a/sway/desktop/fx_renderer/shaders/box_shadow.frag +++ /dev/null @@ -1,74 +0,0 @@ -// Writeup: https://madebyevan.com/shaders/fast-rounded-rectangle-shadows/ - -precision mediump float; -varying vec4 v_color; -varying vec2 v_texcoord; - -uniform vec2 position; -uniform vec2 size; -uniform float blur_sigma; -uniform float corner_radius; - -float gaussian(float x, float sigma) { - const float pi = 3.141592653589793; - return exp(-(x * x) / (2.0 * sigma * sigma)) / (sqrt(2.0 * pi) * sigma); -} - -// approximates the error function, needed for the gaussian integral -vec2 erf(vec2 x) { - vec2 s = sign(x), a = abs(x); - x = 1.0 + (0.278393 + (0.230389 + 0.078108 * (a * a)) * a) * a; - x *= x; - return s - s / (x * x); -} - -// return the blurred mask along the x dimension -float roundedBoxShadowX(float x, float y, float sigma, float corner, vec2 halfSize) { - float delta = min(halfSize.y - corner - abs(y), 0.0); - float curved = halfSize.x - corner + sqrt(max(0.0, corner * corner - delta * delta)); - vec2 integral = 0.5 + 0.5 * erf((x + vec2(-curved, curved)) * (sqrt(0.5) / sigma)); - return integral.y - integral.x; -} - -// return the mask for the shadow of a box from lower to upper -float roundedBoxShadow(vec2 lower, vec2 upper, vec2 point, float sigma, float corner_radius) { - // Center everything to make the math easier - vec2 center = (lower + upper) * 0.5; - vec2 halfSize = (upper - lower) * 0.5; - point -= center; - - // The signal is only non-zero in a limited range, so don't waste samples - float low = point.y - halfSize.y; - float high = point.y + halfSize.y; - float start = clamp(-3.0 * sigma, low, high); - float end = clamp(3.0 * sigma, low, high); - - // Accumulate samples (we can get away with surprisingly few samples) - float step = (end - start) / 4.0; - float y = start + step * 0.5; - float value = 0.0; - for (int i = 0; i < 4; i++) { - value += roundedBoxShadowX(point.x, point.y - y, sigma, corner_radius, halfSize) * gaussian(y, sigma) * step; - y += step; - } - - return value; -} - -// per-pixel "random" number between 0 and 1 -float random() { - return fract(sin(dot(vec2(12.9898, 78.233), gl_FragCoord.xy)) * 43758.5453); -} - -void main() { - float frag_alpha = v_color.a * roundedBoxShadow( - position + blur_sigma, - position + size - blur_sigma, - gl_FragCoord.xy, blur_sigma * 0.5, - corner_radius); - - // dither the alpha to break up color bands - frag_alpha += (random() - 0.5) / 128.0; - - gl_FragColor = vec4(v_color.rgb, frag_alpha); -} diff --git a/sway/desktop/fx_renderer/shaders/common.vert b/sway/desktop/fx_renderer/shaders/common.vert deleted file mode 100644 index 811e0f2d..00000000 --- a/sway/desktop/fx_renderer/shaders/common.vert +++ /dev/null @@ -1,12 +0,0 @@ -uniform mat3 proj; -uniform vec4 color; -attribute vec2 pos; -attribute vec2 texcoord; -varying vec4 v_color; -varying vec2 v_texcoord; - -void main() { - gl_Position = vec4(proj * vec3(pos, 1.0), 1.0); - v_color = color; - v_texcoord = texcoord; -} diff --git a/sway/desktop/fx_renderer/shaders/corner.frag b/sway/desktop/fx_renderer/shaders/corner.frag deleted file mode 100644 index 7699299a..00000000 --- a/sway/desktop/fx_renderer/shaders/corner.frag +++ /dev/null @@ -1,36 +0,0 @@ -precision mediump float; -varying vec4 v_color; -varying vec2 v_texcoord; - -uniform bool is_top_left; -uniform bool is_top_right; -uniform bool is_bottom_left; -uniform bool is_bottom_right; - -uniform vec2 position; -uniform float radius; -uniform vec2 half_size; -uniform float half_thickness; - -float roundedBoxSDF(vec2 center, vec2 size, float radius) { - return length(max(abs(center) - size + radius, 0.0)) - radius; -} - -void main() { - vec2 center = gl_FragCoord.xy - position - half_size; - float distance = roundedBoxSDF(center, half_size - half_thickness, radius + half_thickness); - float smoothedAlphaOuter = 1.0 - smoothstep(-1.0, 1.0, distance - half_thickness); - // Create an inner circle that isn't as anti-aliased as the outer ring - float smoothedAlphaInner = 1.0 - smoothstep(-1.0, 0.5, distance + half_thickness); - gl_FragColor = mix(vec4(0), v_color, smoothedAlphaOuter - smoothedAlphaInner); - - if (is_top_left && (center.y > 0.0 || center.x > 0.0)) { - discard; - } else if (is_top_right && (center.y > 0.0 || center.x < 0.0)) { - discard; - } else if (is_bottom_left && (center.y < 0.0 || center.x > 0.0)) { - discard; - } else if (is_bottom_right && (center.y < 0.0 || center.x < 0.0)) { - discard; - } -} diff --git a/sway/desktop/fx_renderer/shaders/embed.sh b/sway/desktop/fx_renderer/shaders/embed.sh deleted file mode 100644 index 47f07892..00000000 --- a/sway/desktop/fx_renderer/shaders/embed.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -eu - -var=${1:-data} -hex="$(od -A n -t x1 -v)" - -echo "static const char $var[] = {" -for byte in $hex; do - echo " 0x$byte," -done -echo " 0x00," -echo "};" diff --git a/sway/desktop/fx_renderer/shaders/meson.build b/sway/desktop/fx_renderer/shaders/meson.build deleted file mode 100644 index 19f76dc2..00000000 --- a/sway/desktop/fx_renderer/shaders/meson.build +++ /dev/null @@ -1,27 +0,0 @@ -embed = find_program('./embed.sh', native: true) - -shaders = [ - 'blur1.frag', - 'blur2.frag', - 'blur_effects.frag', - 'box_shadow.frag', - 'common.vert', - 'corner.frag', - 'quad.frag', - 'quad_round.frag', - 'stencil_mask.frag', - 'tex.frag', -] - -foreach name : shaders - output = name.underscorify() + '_src.h' - var = name.underscorify() + '_src' - sway_sources += custom_target( - output, - command: [embed, var], - input: name, - output: output, - feed: true, - capture: true, - ) -endforeach diff --git a/sway/desktop/fx_renderer/shaders/quad.frag b/sway/desktop/fx_renderer/shaders/quad.frag deleted file mode 100644 index 7c763272..00000000 --- a/sway/desktop/fx_renderer/shaders/quad.frag +++ /dev/null @@ -1,7 +0,0 @@ -precision mediump float; -varying vec4 v_color; -varying vec2 v_texcoord; - -void main() { - gl_FragColor = v_color; -} diff --git a/sway/desktop/fx_renderer/shaders/quad_round.frag b/sway/desktop/fx_renderer/shaders/quad_round.frag deleted file mode 100644 index 02e99028..00000000 --- a/sway/desktop/fx_renderer/shaders/quad_round.frag +++ /dev/null @@ -1,39 +0,0 @@ -#define SOURCE_QUAD_ROUND 1 -#define SOURCE_QUAD_ROUND_TOP_LEFT 2 -#define SOURCE_QUAD_ROUND_TOP_RIGHT 3 -#define SOURCE_QUAD_ROUND_BOTTOM_RIGHT 4 -#define SOURCE_QUAD_ROUND_BOTTOM_LEFT 5 - -#if !defined(SOURCE) -#error "Missing shader preamble" -#endif - -precision mediump float; -varying vec4 v_color; -varying vec2 v_texcoord; - -uniform vec2 size; -uniform vec2 position; -uniform float radius; - -vec2 getCornerDist() { -#if SOURCE == SOURCE_QUAD_ROUND - vec2 half_size = size * 0.5; - return abs(gl_FragCoord.xy - position - half_size) - half_size + radius; -#elif SOURCE == SOURCE_QUAD_ROUND_TOP_LEFT - return abs(gl_FragCoord.xy - position - size) - size + radius; -#elif SOURCE == SOURCE_QUAD_ROUND_TOP_RIGHT - return abs(gl_FragCoord.xy - position - vec2(0, size.y)) - size + radius; -#elif SOURCE == SOURCE_QUAD_ROUND_BOTTOM_RIGHT - return abs(gl_FragCoord.xy - position) - size + radius; -#elif SOURCE == SOURCE_QUAD_ROUND_BOTTOM_LEFT - return abs(gl_FragCoord.xy - position - vec2(size.x, 0)) - size + radius; -#endif -} - -void main() { - vec2 q = getCornerDist(); - float dist = min(max(q.x,q.y), 0.0) + length(max(q, 0.0)) - radius; - float smoothedAlpha = 1.0 - smoothstep(-1.0, 0.5, dist); - gl_FragColor = mix(vec4(0), v_color, smoothedAlpha); -} diff --git a/sway/desktop/fx_renderer/shaders/stencil_mask.frag b/sway/desktop/fx_renderer/shaders/stencil_mask.frag deleted file mode 100644 index ee033070..00000000 --- a/sway/desktop/fx_renderer/shaders/stencil_mask.frag +++ /dev/null @@ -1,17 +0,0 @@ -precision mediump float; -varying vec2 v_texcoord; - -uniform vec2 half_size; -uniform vec2 position; -uniform float radius; - -void main() { - vec2 q = abs(gl_FragCoord.xy - position - half_size) - half_size + radius; - float dist = min(max(q.x,q.y), 0.0) + length(max(q, 0.0)) - radius; - float smoothedAlpha = 1.0 - smoothstep(-1.0, 0.5, dist); - gl_FragColor = mix(vec4(0.0), vec4(1.0), smoothedAlpha); - - if (gl_FragColor.a < 1.0) { - discard; - } -} diff --git a/sway/desktop/fx_renderer/shaders/tex.frag b/sway/desktop/fx_renderer/shaders/tex.frag deleted file mode 100644 index 77501887..00000000 --- a/sway/desktop/fx_renderer/shaders/tex.frag +++ /dev/null @@ -1,67 +0,0 @@ -#define SOURCE_TEXTURE_RGBA 1 -#define SOURCE_TEXTURE_RGBX 2 -#define SOURCE_TEXTURE_EXTERNAL 3 - -#if !defined(SOURCE) -#error "Missing shader preamble" -#endif - -#if SOURCE == SOURCE_TEXTURE_EXTERNAL -#extension GL_OES_EGL_image_external : require -#endif - -precision mediump float; - -varying vec2 v_texcoord; - -#if SOURCE == SOURCE_TEXTURE_EXTERNAL -uniform samplerExternalOES tex; -#elif SOURCE == SOURCE_TEXTURE_RGBA || SOURCE == SOURCE_TEXTURE_RGBX -uniform sampler2D tex; -#endif - -uniform float alpha; -uniform float dim; -uniform vec4 dim_color; -uniform vec2 size; -uniform vec2 position; -uniform float radius; -uniform float saturation; -uniform bool has_titlebar; -uniform bool discard_transparent; - -const vec3 saturation_weight = vec3(0.2125, 0.7154, 0.0721); - -vec4 sample_texture() { -#if SOURCE == SOURCE_TEXTURE_RGBA || SOURCE == SOURCE_TEXTURE_EXTERNAL - return texture2D(tex, v_texcoord); -#elif SOURCE == SOURCE_TEXTURE_RGBX - return vec4(texture2D(tex, v_texcoord).rgb, 1.0); -#endif -} - -void main() { - vec4 color = sample_texture(); - // Saturation - if (saturation != 1.0) { - vec4 pixColor = texture2D(tex, v_texcoord); - vec3 irgb = pixColor.rgb; - vec3 target = vec3(dot(irgb, saturation_weight)); - color = vec4(mix(target, irgb, saturation), pixColor.a); - } - // Dimming - gl_FragColor = mix(color, dim_color, dim) * alpha; - - if (!has_titlebar || gl_FragCoord.y - position.y > radius) { - vec2 corner_distance = min(gl_FragCoord.xy - position, size + position - gl_FragCoord.xy); - if (max(corner_distance.x, corner_distance.y) < radius) { - float d = radius - distance(corner_distance, vec2(radius)); - float smooth = smoothstep(-1.0, 0.5, d); - gl_FragColor = mix(vec4(0), gl_FragColor, smooth); - } - } - - if (discard_transparent && gl_FragColor.a == 0.0) { - discard; - } -} diff --git a/sway/desktop/idle_inhibit_v1.c b/sway/desktop/idle_inhibit_v1.c index 3a4d0b87..f3af7aa1 100644 --- a/sway/desktop/idle_inhibit_v1.c +++ b/sway/desktop/idle_inhibit_v1.c @@ -1,5 +1,4 @@ #include <stdlib.h> -#include <wlr/types/wlr_idle.h> #include <wlr/types/wlr_idle_notify_v1.h> #include "log.h" #include "sway/desktop/idle_inhibit_v1.h" @@ -12,7 +11,7 @@ static void destroy_inhibitor(struct sway_idle_inhibitor_v1 *inhibitor) { wl_list_remove(&inhibitor->link); wl_list_remove(&inhibitor->destroy.link); - sway_idle_inhibit_v1_check_active(inhibitor->manager); + sway_idle_inhibit_v1_check_active(); free(inhibitor); } @@ -35,7 +34,6 @@ void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data) { return; } - inhibitor->manager = manager; inhibitor->mode = INHIBIT_IDLE_APPLICATION; inhibitor->wlr_inhibitor = wlr_inhibitor; wl_list_insert(&manager->inhibitors, &inhibitor->link); @@ -43,33 +41,34 @@ void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data) { inhibitor->destroy.notify = handle_destroy; wl_signal_add(&wlr_inhibitor->events.destroy, &inhibitor->destroy); - sway_idle_inhibit_v1_check_active(manager); + sway_idle_inhibit_v1_check_active(); } void sway_idle_inhibit_v1_user_inhibitor_register(struct sway_view *view, enum sway_idle_inhibit_mode mode) { + struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1; + struct sway_idle_inhibitor_v1 *inhibitor = calloc(1, sizeof(struct sway_idle_inhibitor_v1)); if (!inhibitor) { return; } - inhibitor->manager = server.idle_inhibit_manager_v1; inhibitor->mode = mode; inhibitor->view = view; - wl_list_insert(&inhibitor->manager->inhibitors, &inhibitor->link); + wl_list_insert(&manager->inhibitors, &inhibitor->link); inhibitor->destroy.notify = handle_destroy; wl_signal_add(&view->events.unmap, &inhibitor->destroy); - sway_idle_inhibit_v1_check_active(inhibitor->manager); + sway_idle_inhibit_v1_check_active(); } struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_user_inhibitor_for_view( struct sway_view *view) { + struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1; struct sway_idle_inhibitor_v1 *inhibitor; - wl_list_for_each(inhibitor, &server.idle_inhibit_manager_v1->inhibitors, - link) { + wl_list_for_each(inhibitor, &manager->inhibitors, link) { if (inhibitor->mode != INHIBIT_IDLE_APPLICATION && inhibitor->view == view) { return inhibitor; @@ -80,9 +79,9 @@ struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_user_inhibitor_for_view( struct sway_idle_inhibitor_v1 *sway_idle_inhibit_v1_application_inhibitor_for_view( struct sway_view *view) { + struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1; struct sway_idle_inhibitor_v1 *inhibitor; - wl_list_for_each(inhibitor, &server.idle_inhibit_manager_v1->inhibitors, - link) { + wl_list_for_each(inhibitor, &manager->inhibitors, link) { if (inhibitor->mode == INHIBIT_IDLE_APPLICATION && view_from_wlr_surface(inhibitor->wlr_inhibitor->surface) == view) { return inhibitor; @@ -131,8 +130,8 @@ bool sway_idle_inhibit_v1_is_active(struct sway_idle_inhibitor_v1 *inhibitor) { return false; } -void sway_idle_inhibit_v1_check_active( - struct sway_idle_inhibit_manager_v1 *manager) { +void sway_idle_inhibit_v1_check_active(void) { + struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1; struct sway_idle_inhibitor_v1 *inhibitor; bool inhibited = false; wl_list_for_each(inhibitor, &manager->inhibitors, link) { @@ -140,28 +139,21 @@ void sway_idle_inhibit_v1_check_active( break; } } - wlr_idle_set_enabled(manager->idle, NULL, !inhibited); wlr_idle_notifier_v1_set_inhibited(server.idle_notifier_v1, inhibited); } -struct sway_idle_inhibit_manager_v1 *sway_idle_inhibit_manager_v1_create( - struct wl_display *wl_display, struct wlr_idle *idle) { - struct sway_idle_inhibit_manager_v1 *manager = - calloc(1, sizeof(struct sway_idle_inhibit_manager_v1)); - if (!manager) { - return NULL; - } +bool sway_idle_inhibit_manager_v1_init(void) { + struct sway_idle_inhibit_manager_v1 *manager = &server.idle_inhibit_manager_v1; - manager->wlr_manager = wlr_idle_inhibit_v1_create(wl_display); + manager->wlr_manager = wlr_idle_inhibit_v1_create(server.wl_display); if (!manager->wlr_manager) { - free(manager); - return NULL; + return false; } - manager->idle = idle; + wl_signal_add(&manager->wlr_manager->events.new_inhibitor, &manager->new_idle_inhibitor_v1); manager->new_idle_inhibitor_v1.notify = handle_idle_inhibitor_v1; wl_list_init(&manager->inhibitors); - return manager; + return true; } diff --git a/sway/desktop/launcher.c b/sway/desktop/launcher.c index 48e5d24c..0c02b997 100644 --- a/sway/desktop/launcher.c +++ b/sway/desktop/launcher.c @@ -67,9 +67,12 @@ void launcher_ctx_destroy(struct launcher_ctx *ctx) { } wl_list_remove(&ctx->node_destroy.link); wl_list_remove(&ctx->token_destroy.link); + if (ctx->seat) { + wl_list_remove(&ctx->seat_destroy.link); + } wl_list_remove(&ctx->link); wlr_xdg_activation_token_v1_destroy(ctx->token); - free(ctx->name); + free(ctx->fallback_name); free(ctx); } @@ -114,22 +117,22 @@ struct sway_workspace *launcher_ctx_get_workspace( break; case N_OUTPUT: output = ctx->node->sway_output; - ws = workspace_by_name(ctx->name); + ws = workspace_by_name(ctx->fallback_name); if (!ws) { sway_log(SWAY_DEBUG, "Creating workspace %s for pid %d because it disappeared", - ctx->name, ctx->pid); + ctx->fallback_name, ctx->pid); if (!output->enabled) { sway_log(SWAY_DEBUG, "Workspace output %s is disabled, trying another one", output->wlr_output->name); output = NULL; } - ws = workspace_create(output, ctx->name); + ws = workspace_create(output, ctx->fallback_name); } break; case N_ROOT: - ws = workspace_create(NULL, ctx->name); + ws = workspace_create(NULL, ctx->fallback_name); break; } @@ -148,8 +151,8 @@ static void ctx_handle_node_destroy(struct wl_listener *listener, void *data) { wl_list_init(&ctx->node_destroy.link); // We want to save this ws name to recreate later, hopefully on the // same output - free(ctx->name); - ctx->name = strdup(ws->name); + free(ctx->fallback_name); + ctx->fallback_name = strdup(ws->name); if (!ws->output || ws->output->node.destroying) { // If the output is being destroyed it would be pointless to track // If the output is being disabled, we'll find out if it's still @@ -178,21 +181,43 @@ static void token_handle_destroy(struct wl_listener *listener, void *data) { launcher_ctx_destroy(ctx); } -struct launcher_ctx *launcher_ctx_create() { - struct sway_seat *seat = input_manager_current_seat(); - struct sway_workspace *ws = seat_get_focused_workspace(seat); - if (!ws) { - sway_log(SWAY_DEBUG, "Failed to create launch context. No workspace."); +struct launcher_ctx *launcher_ctx_create(struct wlr_xdg_activation_token_v1 *token, + struct sway_node *node) { + struct launcher_ctx *ctx = calloc(1, sizeof(struct launcher_ctx)); + + const char *fallback_name = NULL; + struct sway_workspace *ws = NULL; + switch (node->type) { + case N_CONTAINER: + // Unimplemented + free(ctx); + return NULL; + case N_WORKSPACE: + ws = node->sway_workspace; + fallback_name = ws->name; + break; + case N_OUTPUT:; + struct sway_output *output = node->sway_output; + ws = output_get_active_workspace(output); + fallback_name = ws ? ws->name : NULL; + break; + case N_ROOT: + // Unimplemented + free(ctx); return NULL; } - struct launcher_ctx *ctx = calloc(1, sizeof(struct launcher_ctx)); - struct wlr_xdg_activation_token_v1 *token = - wlr_xdg_activation_token_v1_create(server.xdg_activation_v1); - token->data = ctx; - ctx->name = strdup(ws->name); + if (!fallback_name) { + // TODO: implement a better fallback. + free(ctx); + return NULL; + } + + ctx->fallback_name = strdup(fallback_name); ctx->token = token; - ctx->node = &ws->node; + ctx->node = node; + // Having surface set means that the focus check in wlroots has passed + ctx->had_focused_surface = token->surface != NULL; ctx->node_destroy.notify = ctx_handle_node_destroy; wl_signal_add(&ctx->node->events.destroy, &ctx->node_destroy); @@ -202,6 +227,38 @@ struct launcher_ctx *launcher_ctx_create() { wl_list_init(&ctx->link); wl_list_insert(&server.pending_launcher_ctxs, &ctx->link); + + token->data = ctx; + return ctx; +} + +static void launch_ctx_handle_seat_destroy(struct wl_listener *listener, void *data) { + struct launcher_ctx *ctx = wl_container_of(listener, ctx, seat_destroy); + ctx->seat = NULL; + wl_list_remove(&ctx->seat_destroy.link); +} + +// Creates a context with a new token for the internal launcher +struct launcher_ctx *launcher_ctx_create_internal(void) { + struct sway_seat *seat = input_manager_current_seat(); + struct sway_workspace *ws = seat_get_focused_workspace(seat); + if (!ws) { + sway_log(SWAY_DEBUG, "Failed to create launch context. No workspace."); + return NULL; + } + + struct wlr_xdg_activation_token_v1 *token = + wlr_xdg_activation_token_v1_create(server.xdg_activation_v1); + + struct launcher_ctx *ctx = launcher_ctx_create(token, &ws->node); + if (!ctx) { + wlr_xdg_activation_token_v1_destroy(token); + return NULL; + } + ctx->seat = seat; + ctx->seat_destroy.notify = launch_ctx_handle_seat_destroy; + wl_signal_add(&seat->wlr_seat->events.destroy, &ctx->seat_destroy); + return ctx; } diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index d0d56755..81429053 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -1,3 +1,4 @@ +#include <scenefx/render/fx_renderer/fx_effect_framebuffers.h> #include <stdbool.h> #include <stdlib.h> #include <string.h> @@ -14,10 +15,44 @@ #include "sway/layers.h" #include "sway/output.h" #include "sway/server.h" +#include "sway/surface.h" #include "sway/tree/arrange.h" #include "sway/tree/workspace.h" #include "wlr-layer-shell-unstable-v1-protocol.h" +struct wlr_layer_surface_v1 *toplevel_layer_surface_from_surface( + struct wlr_surface *surface) { + struct wlr_layer_surface_v1 *layer; + do { + if (!surface) { + return NULL; + } + // Topmost layer surface + if ((layer = wlr_layer_surface_v1_try_from_wlr_surface(surface))) { + return layer; + } + // Layer subsurface + if (wlr_subsurface_try_from_wlr_surface(surface)) { + surface = wlr_surface_get_root_surface(surface); + continue; + } + + // Layer surface popup + struct wlr_xdg_surface *xdg_surface = NULL; + if ((xdg_surface = wlr_xdg_surface_try_from_wlr_surface(surface)) && + xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP && xdg_surface->popup != NULL) { + if (!xdg_surface->popup->parent) { + return NULL; + } + surface = wlr_surface_get_root_surface(xdg_surface->popup->parent); + continue; + } + + // Return early if the surface is not a layer/xdg_popup/sub surface + return NULL; + } while (true); +} + static void layer_parse_criteria(struct sway_layer_surface *sway_layer) { enum zwlr_layer_shell_v1_layer layer = sway_layer->layer; if (layer == ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND) { @@ -233,8 +268,9 @@ void arrange_layers(struct sway_output *output) { for (size_t i = 0; i < nlayers; ++i) { wl_list_for_each_reverse(layer, &output->layers[layers_above_shell[i]], link) { - if (layer->layer_surface->current.keyboard_interactive && - layer->layer_surface->mapped) { + if (layer->layer_surface->current.keyboard_interactive + == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE && + layer->layer_surface->surface->mapped) { topmost = layer; break; } @@ -246,10 +282,12 @@ void arrange_layers(struct sway_output *output) { struct sway_seat *seat; wl_list_for_each(seat, &server.input->seats, link) { + seat->has_exclusive_layer = false; if (topmost != NULL) { seat_set_focus_layer(seat, topmost->layer_surface); } else if (seat->focused_layer && - !seat->focused_layer->current.keyboard_interactive) { + seat->focused_layer->current.keyboard_interactive + != ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE) { seat_set_focus_layer(seat, NULL); } } @@ -268,7 +306,7 @@ static struct sway_layer_surface *find_mapped_layer_by_client( &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], link) { struct wl_resource *resource = lsurface->layer_surface->resource; if (wl_resource_get_client(resource) == client - && lsurface->layer_surface->mapped) { + && lsurface->layer_surface->surface->mapped) { return lsurface; } } @@ -309,13 +347,15 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) { // Rerender the static blur on change if (layer->layer == ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND || layer->layer == ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM) { - output->renderer->blur_buffer_dirty = true; + struct fx_effect_framebuffers *effect_fbos = + fx_effect_framebuffers_try_get(output->wlr_output); + effect_fbos->blur_buffer_dirty = true; } bool layer_changed = false; if (layer_surface->current.committed != 0 - || layer->mapped != layer_surface->mapped) { - layer->mapped = layer_surface->mapped; + || layer->mapped != layer_surface->surface->mapped) { + layer->mapped = layer_surface->surface->mapped; layer_changed = layer->layer != layer_surface->current.layer; if (layer_changed) { wl_list_remove(&layer->link); @@ -376,7 +416,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_container_of(listener, sway_layer, destroy); sway_log(SWAY_DEBUG, "Layer surface destroyed (%s)", sway_layer->layer_surface->namespace); - if (sway_layer->layer_surface->mapped) { + if (sway_layer->layer_surface->surface->mapped) { unmap(sway_layer); } @@ -400,7 +440,9 @@ static void handle_destroy(struct wl_listener *listener, void *data) { // Rerender the static blur if (sway_layer->layer == ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND || sway_layer->layer == ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM) { - output->renderer->blur_buffer_dirty = true; + struct fx_effect_framebuffers *effect_fbos = + fx_effect_framebuffers_try_get(output->wlr_output); + effect_fbos->blur_buffer_dirty = true; } arrange_layers(output); @@ -420,8 +462,6 @@ static void handle_map(struct wl_listener *listener, void *data) { layer_parse_criteria(sway_layer); output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y, sway_layer->layer_surface->surface, true); - wlr_surface_send_enter(sway_layer->layer_surface->surface, - sway_layer->layer_surface->output); cursor_rebase_all(); } @@ -491,9 +531,9 @@ static struct sway_layer_subsurface *create_subsurface( wl_list_insert(&layer_surface->subsurfaces, &subsurface->link); subsurface->map.notify = subsurface_handle_map; - wl_signal_add(&wlr_subsurface->events.map, &subsurface->map); + wl_signal_add(&wlr_subsurface->surface->events.map, &subsurface->map); subsurface->unmap.notify = subsurface_handle_unmap; - wl_signal_add(&wlr_subsurface->events.unmap, &subsurface->unmap); + wl_signal_add(&wlr_subsurface->surface->events.unmap, &subsurface->unmap); subsurface->destroy.notify = subsurface_handle_destroy; wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy); subsurface->commit.notify = subsurface_handle_commit; @@ -548,7 +588,7 @@ static void popup_handle_map(struct wl_listener *listener, void *data) { struct sway_layer_surface *layer = popup_get_layer(popup); struct wlr_output *wlr_output = layer->layer_surface->output; sway_assert(wlr_output, "wlr_layer_surface_v1 has null output"); - wlr_surface_send_enter(popup->wlr_popup->base->surface, wlr_output); + surface_enter_output(popup->wlr_popup->base->surface, wlr_output->data); popup_damage(popup, true); } @@ -608,9 +648,9 @@ static struct sway_layer_popup *create_popup(struct wlr_xdg_popup *wlr_popup, popup->parent_layer = parent; popup->map.notify = popup_handle_map; - wl_signal_add(&wlr_popup->base->events.map, &popup->map); + wl_signal_add(&wlr_popup->base->surface->events.map, &popup->map); popup->unmap.notify = popup_handle_unmap; - wl_signal_add(&wlr_popup->base->events.unmap, &popup->unmap); + wl_signal_add(&wlr_popup->base->surface->events.unmap, &popup->unmap); popup->destroy.notify = popup_handle_destroy; wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy); popup->commit.notify = popup_handle_commit; @@ -698,9 +738,9 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) { sway_layer->destroy.notify = handle_destroy; wl_signal_add(&layer_surface->events.destroy, &sway_layer->destroy); sway_layer->map.notify = handle_map; - wl_signal_add(&layer_surface->events.map, &sway_layer->map); + wl_signal_add(&layer_surface->surface->events.map, &sway_layer->map); sway_layer->unmap.notify = handle_unmap; - wl_signal_add(&layer_surface->events.unmap, &sway_layer->unmap); + wl_signal_add(&layer_surface->surface->events.unmap, &sway_layer->unmap); sway_layer->new_popup.notify = handle_new_popup; wl_signal_add(&layer_surface->events.new_popup, &sway_layer->new_popup); sway_layer->new_subsurface.notify = handle_new_subsurface; @@ -722,6 +762,8 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) { wl_list_insert(&output->layers[layer_surface->pending.layer], &sway_layer->link); + surface_enter_output(layer_surface->surface, output); + // Temporarily set the layer's current state to pending // So that we can easily arrange it struct wlr_layer_surface_v1_state old_state = layer_surface->current; diff --git a/sway/desktop/output.c b/sway/desktop/output.c index ca883144..2ccb28f2 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -1,15 +1,18 @@ #define _POSIX_C_SOURCE 200809L #include <assert.h> +#include <scenefx/render/pass.h> +#include <scenefx/render/fx_renderer/fx_effect_framebuffers.h> #include <stdlib.h> #include <strings.h> #include <time.h> #include <wayland-server-core.h> -#include <wlr/backend/drm.h> +#include <wlr/config.h> #include <wlr/backend/headless.h> +#include <wlr/render/swapchain.h> #include <wlr/render/gles2.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_buffer.h> -#include <wlr/types/wlr_drm_lease_v1.h> +#include <wlr/types/wlr_gamma_control_v1.h> #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output.h> @@ -18,10 +21,12 @@ #include <wlr/util/region.h> #include "config.h" #include "log.h" +#include "scenefx/render/pass.h" #include "sway/config.h" #include "sway/desktop/transaction.h" #include "sway/input/input-manager.h" #include "sway/input/seat.h" +#include "sway/ipc-server.h" #include "sway/layers.h" #include "sway/output.h" #include "sway/server.h" @@ -32,13 +37,27 @@ #include "sway/tree/view.h" #include "sway/tree/workspace.h" +#if WLR_HAS_DRM_BACKEND +#include <wlr/backend/drm.h> +#include <wlr/types/wlr_drm_lease_v1.h> +#endif + +bool output_match_name_or_id(struct sway_output *output, + const char *name_or_id) { + if (strcmp(name_or_id, "*") == 0) { + return true; + } + + char identifier[128]; + output_get_identifier(identifier, sizeof(identifier), output); + return strcasecmp(identifier, name_or_id) == 0 + || strcasecmp(output->wlr_output->name, name_or_id) == 0; +} + struct sway_output *output_by_name_or_id(const char *name_or_id) { for (int i = 0; i < root->outputs->length; ++i) { struct sway_output *output = root->outputs->items[i]; - char identifier[128]; - output_get_identifier(identifier, sizeof(identifier), output); - if (strcasecmp(identifier, name_or_id) == 0 - || strcasecmp(output->wlr_output->name, name_or_id) == 0) { + if (output_match_name_or_id(output, name_or_id)) { return output; } } @@ -48,10 +67,7 @@ struct sway_output *output_by_name_or_id(const char *name_or_id) { struct sway_output *all_output_by_name_or_id(const char *name_or_id) { struct sway_output *output; wl_list_for_each(output, &root->all_outputs, link) { - char identifier[128]; - output_get_identifier(identifier, sizeof(identifier), output); - if (strcasecmp(identifier, name_or_id) == 0 - || strcasecmp(output->wlr_output->name, name_or_id) == 0) { + if (output_match_name_or_id(output, name_or_id)) { return output; } } @@ -262,7 +278,7 @@ void output_drag_icons_for_each_surface(struct sway_output *output, double ox = drag_icon->x - output->lx; double oy = drag_icon->y - output->ly; - if (drag_icon->wlr_drag_icon->mapped) { + if (drag_icon->wlr_drag_icon->surface->mapped) { output_surface_for_each_surface(output, drag_icon->wlr_drag_icon->surface, ox, oy, iterator, user_data); @@ -292,7 +308,7 @@ static void output_for_each_surface(struct sway_output *output, if (lock_surface->output != output->wlr_output) { continue; } - if (!lock_surface->mapped) { + if (!lock_surface->surface->mapped) { continue; } @@ -369,14 +385,14 @@ overlay: } static int scale_length(int length, int offset, float scale) { - return round((offset + length) * scale) - round(offset * scale); + return roundf((offset + length) * scale) - roundf(offset * scale); } void scale_box(struct wlr_box *box, float scale) { box->width = scale_length(box->width, box->x, scale); box->height = scale_length(box->height, box->y, scale); - box->x = round(box->x * scale); - box->y = round(box->y * scale); + box->x = roundf(box->x * scale); + box->y = roundf(box->y * scale); } struct sway_workspace *output_get_active_workspace(struct sway_output *output) { @@ -454,7 +470,7 @@ static void count_surface_iterator(struct sway_output *output, } static bool scan_out_fullscreen_view(struct sway_output *output, - struct sway_view *view) { + struct wlr_output_state *pending, struct sway_view *view) { struct wlr_output *wlr_output = output->wlr_output; struct sway_workspace *workspace = output->current.active_workspace; if (!sway_assert(workspace, "Expected an active workspace")) { @@ -500,6 +516,12 @@ static bool scan_out_fullscreen_view(struct sway_output *output, if (n_surfaces != 1) { return false; } + size_t n_popups = 0; + output_view_for_each_popup_surface(output, view, + count_surface_iterator, &n_popups); + if (n_popups > 0) { + return false; + } if (surface->buffer == NULL) { return false; @@ -510,24 +532,56 @@ static bool scan_out_fullscreen_view(struct sway_output *output, return false; } - wlr_output_attach_buffer(wlr_output, &surface->buffer->base); - if (!wlr_output_test(wlr_output)) { + if (!wlr_output_is_direct_scanout_allowed(wlr_output)) { return false; } - wlr_presentation_surface_sampled_on_output(server.presentation, surface, + wlr_output_state_set_buffer(pending, &surface->buffer->base); + + if (!wlr_output_test_state(wlr_output, pending)) { + return false; + } + + wlr_presentation_surface_scanned_out_on_output(server.presentation, surface, wlr_output); - return wlr_output_commit(wlr_output); + return wlr_output_commit_state(wlr_output, pending); +} + +static void get_frame_damage(struct sway_output *output, + pixman_region32_t *frame_damage) { + struct wlr_output *wlr_output = output->wlr_output; + + int width, height; + wlr_output_transformed_resolution(wlr_output, &width, &height); + + pixman_region32_init(frame_damage); + + enum wl_output_transform transform = + wlr_output_transform_invert(wlr_output->transform); + wlr_region_transform(frame_damage, &output->damage_ring.current, + transform, width, height); + + if (debug.damage != DAMAGE_DEFAULT) { + pixman_region32_union_rect(frame_damage, frame_damage, + 0, 0, wlr_output->width, wlr_output->height); + } } static int output_repaint_timer_handler(void *data) { struct sway_output *output = data; - if (output->wlr_output == NULL) { + struct wlr_output *wlr_output = output->wlr_output; + if (wlr_output == NULL) { return 0; } - output->wlr_output->frame_pending = false; + wlr_output->frame_pending = false; + + if (!wlr_output->needs_frame && + !output->gamma_lut_changed && + !pixman_region32_not_empty(&output->damage_ring.current)) { + return 0; + } struct sway_workspace *workspace = output->current.active_workspace; if (workspace == NULL) { @@ -539,13 +593,33 @@ static int output_repaint_timer_handler(void *data) { fullscreen_con = workspace->current.fullscreen; } + struct wlr_output_state pending = {0}; + + if (output->gamma_lut_changed) { + output->gamma_lut_changed = false; + struct wlr_gamma_control_v1 *gamma_control = + wlr_gamma_control_manager_v1_get_control( + server.gamma_control_manager_v1, wlr_output); + if (!wlr_gamma_control_v1_apply(gamma_control, &pending)) { + goto out; + } + if (!wlr_output_test_state(wlr_output, &pending)) { + wlr_output_state_finish(&pending); + pending = (struct wlr_output_state){0}; + wlr_gamma_control_v1_send_failed_and_destroy(gamma_control); + } + } + + pending.committed |= WLR_OUTPUT_STATE_DAMAGE; + get_frame_damage(output, &pending.damage); + if (fullscreen_con && fullscreen_con->view && !debug.noscanout // Only output to monitor without compositing when saturation is changed && fullscreen_con->saturation == 1.0f) { // Try to scan-out the fullscreen view static bool last_scanned_out = false; bool scanned_out = - scan_out_fullscreen_view(output, fullscreen_con->view); + scan_out_fullscreen_view(output, &pending, fullscreen_con->view); if (scanned_out && !last_scanned_out) { sway_log(SWAY_DEBUG, "Scanning out fullscreen view on %s", @@ -559,32 +633,72 @@ static int output_repaint_timer_handler(void *data) { last_scanned_out = scanned_out; if (scanned_out) { - return 0; + goto out; } } + if (!wlr_output_configure_primary_swapchain(wlr_output, &pending, &wlr_output->swapchain)) { + goto out; + } + int buffer_age; - if (!wlr_output_attach_render(output->wlr_output, &buffer_age)) { - return 0; + struct wlr_buffer *buffer = wlr_swapchain_acquire(wlr_output->swapchain, &buffer_age); + if (buffer == NULL) { + goto out; + } + + struct fx_gles_render_pass *render_pass = fx_renderer_begin_buffer_pass( + wlr_output->renderer, buffer, wlr_output, + &(struct wlr_buffer_pass_options) { + .timer = NULL, + } + ); + if (render_pass == NULL) { + wlr_buffer_unlock(buffer); + goto out; } pixman_region32_t damage; pixman_region32_init(&damage); wlr_damage_ring_get_buffer_damage(&output->damage_ring, buffer_age, &damage); - if (!output->wlr_output->needs_frame && - !pixman_region32_not_empty(&output->damage_ring.current)) { - pixman_region32_fini(&damage); - wlr_output_rollback(output->wlr_output); - return 0; + + if (debug.damage == DAMAGE_RERENDER) { + int width, height; + wlr_output_transformed_resolution(wlr_output, &width, &height); + pixman_region32_union_rect(&damage, &damage, 0, 0, width, height); } + struct fx_render_context ctx = { + .output_damage = &damage, + .renderer = wlr_output->renderer, + .output = output, + .pass = render_pass, + }; + struct timespec now; clock_gettime(CLOCK_MONOTONIC, &now); - output_render(output, &now, &damage); + output_render(&ctx); pixman_region32_fini(&damage); + if (!wlr_render_pass_submit(&render_pass->base)) { + wlr_buffer_unlock(buffer); + goto out; + } + + wlr_output_state_set_buffer(&pending, buffer); + wlr_buffer_unlock(buffer); + + if (!wlr_output_commit_state(wlr_output, &pending)) { + goto out; + } + + wlr_damage_ring_rotate(&output->damage_ring); + output->last_frame = now; + +out: + wlr_output_state_finish(&pending); return 0; } @@ -610,9 +724,7 @@ static void handle_frame(struct wl_listener *listener, void *user_data) { if (output->max_render_time != 0) { struct timespec now; - clockid_t presentation_clock - = wlr_backend_get_presentation_clock(server.backend); - clock_gettime(presentation_clock, &now); + clock_gettime(CLOCK_MONOTONIC, &now); const long NSEC_IN_SECONDS = 1000000000; struct timespec predicted_refresh = output->last_presentation; @@ -690,14 +802,13 @@ static void damage_surface_iterator(struct sway_output *output, pixman_region32_init(&damage); wlr_surface_get_effective_damage(surface, &damage); wlr_region_scale(&damage, &damage, output->wlr_output->scale); - if (ceil(output->wlr_output->scale) > surface->current.scale) { + if (ceilf(output->wlr_output->scale) > surface->current.scale) { // When scaling up a surface, it'll become blurry so we need to // expand the damage region wlr_region_expand(&damage, &damage, - ceil(output->wlr_output->scale) - surface->current.scale); + ceilf(output->wlr_output->scale) - surface->current.scale); } pixman_region32_translate(&damage, box.x, box.y); - if (wlr_damage_ring_add(&output->damage_ring, &damage)) { wlr_output_schedule_frame(output->wlr_output); } @@ -754,19 +865,33 @@ static void damage_child_views_iterator(struct sway_container *con, void output_damage_whole_container(struct sway_output *output, struct sway_container *con) { - int shadow_sigma = con->shadow_enabled ? config->shadow_blur_sigma : 0; - // Pad the box by 1px, because the width is a double and might be a fraction struct wlr_box box = { - .x = con->current.x - output->lx - 1 - shadow_sigma + config->shadow_offset_x, - .y = con->current.y - output->ly - 1 - shadow_sigma + config->shadow_offset_y, - .width = con->current.width + 2 + shadow_sigma * 2, - .height = con->current.height + 2 + shadow_sigma * 2, + .x = con->current.x - output->lx - 1, + .y = con->current.y - output->ly - 1, + .width = con->current.width + 2, + .height = con->current.height + 2, }; scale_box(&box, output->wlr_output->scale); if (wlr_damage_ring_add_box(&output->damage_ring, &box)) { wlr_output_schedule_frame(output->wlr_output); } + + // Shadow damage + if (con->shadow_enabled && config_should_parameters_shadow()) { + const int shadow_sigma = config->shadow_blur_sigma; + struct wlr_box shadow_box = { + .x = con->current.x - output->lx - 1 - shadow_sigma + config->shadow_offset_x, + .y = con->current.y - output->ly - 1 - shadow_sigma + config->shadow_offset_y, + .width = con->current.width + 2 + (shadow_sigma * 2), + .height = con->current.height + 2 + (shadow_sigma * 2), + }; + scale_box(&shadow_box, output->wlr_output->scale); + if (wlr_damage_ring_add_box(&output->damage_ring, &shadow_box)) { + wlr_output_schedule_frame(output->wlr_output); + } + } + // Damage subsurfaces as well, which may extend outside the box if (con->view) { damage_child_views_iterator(con, output); @@ -790,38 +915,35 @@ static void update_output_manager_config(struct sway_server *server) { wlr_output_layout_get_box(root->output_layout, output->wlr_output, &output_box); // We mark the output enabled when it's switched off but not disabled - config_head->state.enabled = output->current_mode != NULL && output->enabled; - config_head->state.mode = output->current_mode; - if (!wlr_box_empty(&output_box)) { - config_head->state.x = output_box.x; - config_head->state.y = output_box.y; - } + config_head->state.enabled = !wlr_box_empty(&output_box); + config_head->state.x = output_box.x; + config_head->state.y = output_box.y; } wlr_output_manager_v1_set_configuration(server->output_manager_v1, config); + + ipc_event_output(); } -static void handle_destroy(struct wl_listener *listener, void *data) { - struct sway_output *output = wl_container_of(listener, output, destroy); +static void begin_destroy(struct sway_output *output) { struct sway_server *server = output->server; if (output->enabled) { output_disable(output); } - fx_renderer_fini(output->renderer); - output_begin_destroy(output); wl_list_remove(&output->link); + wl_list_remove(&output->layout_destroy.link); wl_list_remove(&output->destroy.link); wl_list_remove(&output->commit.link); - wl_list_remove(&output->mode.link); wl_list_remove(&output->present.link); wl_list_remove(&output->damage.link); wl_list_remove(&output->frame.link); wl_list_remove(&output->needs_frame.link); + wl_list_remove(&output->request_state.link); wlr_damage_ring_finish(&output->damage_ring); @@ -833,35 +955,14 @@ static void handle_destroy(struct wl_listener *listener, void *data) { update_output_manager_config(server); } -static void handle_mode(struct wl_listener *listener, void *data) { - struct sway_output *output = wl_container_of(listener, output, mode); - if (!output->enabled && !output->enabling) { - struct output_config *oc = find_output_config(output); - if (output->wlr_output->current_mode != NULL && - (!oc || oc->enabled)) { - // We want to enable this output, but it didn't work last time, - // possibly because we hadn't enough CRTCs. Try again now that the - // output has a mode. - sway_log(SWAY_DEBUG, "Output %s has gained a CRTC, " - "trying to enable it", output->wlr_output->name); - apply_output_config(oc, output); - } - return; - } - if (!output->enabled) { - return; - } - - arrange_layers(output); - arrange_output(output); - transaction_commit_dirty(); - - int width, height; - wlr_output_transformed_resolution(output->wlr_output, &width, &height); - wlr_damage_ring_set_bounds(&output->damage_ring, width, height); - wlr_output_schedule_frame(output->wlr_output); +static void handle_destroy(struct wl_listener *listener, void *data) { + struct sway_output *output = wl_container_of(listener, output, destroy); + begin_destroy(output); +} - update_output_manager_config(output->server); +static void handle_layout_destroy(struct wl_listener *listener, void *data) { + struct sway_output *output = wl_container_of(listener, output, layout_destroy); + begin_destroy(output); } static void update_textures(struct sway_container *con, void *data) { @@ -869,6 +970,12 @@ static void update_textures(struct sway_container *con, void *data) { container_update_marks_textures(con); } +static void update_output_scale_iterator(struct sway_output *output, + struct sway_view *view, struct wlr_surface *surface, + struct wlr_box *box, void *user_data) { + surface_update_outputs(surface); +} + static void handle_commit(struct wl_listener *listener, void *data) { struct sway_output *output = wl_container_of(listener, output, commit); struct wlr_output_event_commit *event = data; @@ -877,11 +984,20 @@ static void handle_commit(struct wl_listener *listener, void *data) { return; } - if (event->committed & WLR_OUTPUT_STATE_SCALE) { + if (event->state->committed & WLR_OUTPUT_STATE_SCALE) { output_for_each_container(output, update_textures, NULL); + output_for_each_surface(output, update_output_scale_iterator, NULL); } - if (event->committed & (WLR_OUTPUT_STATE_TRANSFORM | WLR_OUTPUT_STATE_SCALE)) { + if (event->state->committed & ( + WLR_OUTPUT_STATE_MODE | + WLR_OUTPUT_STATE_TRANSFORM | + WLR_OUTPUT_STATE_SCALE)) { + // Mark optimized blur as dirty + struct fx_effect_framebuffers *effect_fbos = + fx_effect_framebuffers_try_get(output->wlr_output); + effect_fbos->blur_buffer_dirty = true; + arrange_layers(output); arrange_output(output); transaction_commit_dirty(); @@ -889,12 +1005,19 @@ static void handle_commit(struct wl_listener *listener, void *data) { update_output_manager_config(output->server); } - if (event->committed & (WLR_OUTPUT_STATE_MODE | WLR_OUTPUT_STATE_TRANSFORM)) { + if (event->state->committed & ( + WLR_OUTPUT_STATE_MODE | + WLR_OUTPUT_STATE_TRANSFORM)) { int width, height; wlr_output_transformed_resolution(output->wlr_output, &width, &height); wlr_damage_ring_set_bounds(&output->damage_ring, width, height); wlr_output_schedule_frame(output->wlr_output); } + + // Next time the output is enabled, try to re-apply the gamma LUT + if ((event->state->committed & WLR_OUTPUT_STATE_ENABLED) && !output->wlr_output->enabled) { + output->gamma_lut_changed = true; + } } static void handle_present(struct wl_listener *listener, void *data) { @@ -909,6 +1032,13 @@ static void handle_present(struct wl_listener *listener, void *data) { output->refresh_nsec = output_event->refresh; } +static void handle_request_state(struct wl_listener *listener, void *data) { + struct sway_output *output = + wl_container_of(listener, output, request_state); + const struct wlr_output_event_request_state *event = data; + wlr_output_commit_state(output->wlr_output, event->state); +} + static unsigned int last_headless_num = 0; void handle_new_output(struct wl_listener *listener, void *data) { @@ -931,16 +1061,18 @@ void handle_new_output(struct wl_listener *listener, void *data) { if (wlr_output->non_desktop) { sway_log(SWAY_DEBUG, "Not configuring non-desktop output"); struct sway_output_non_desktop *non_desktop = output_non_desktop_create(wlr_output); +#if WLR_HAS_DRM_BACKEND if (server->drm_lease_manager) { wlr_drm_lease_v1_manager_offer_output(server->drm_lease_manager, wlr_output); } +#endif list_add(root->non_desktop_outputs, non_desktop); return; } if (!wlr_output_init_render(wlr_output, server->allocator, - server->wlr_renderer)) { + server->renderer)) { sway_log(SWAY_ERROR, "Failed to init output render"); return; } @@ -952,20 +1084,12 @@ void handle_new_output(struct wl_listener *listener, void *data) { output->server = server; wlr_damage_ring_init(&output->damage_ring); - // Init FX Renderer - struct wlr_egl *egl = wlr_gles2_renderer_get_egl(server->wlr_renderer); - output->renderer = fx_renderer_create(egl, wlr_output); - if (!output->renderer) { - sway_log(SWAY_ERROR, "Failed to create fx_renderer"); - abort(); - } - + wl_signal_add(&root->output_layout->events.destroy, &output->layout_destroy); + output->layout_destroy.notify = handle_layout_destroy; wl_signal_add(&wlr_output->events.destroy, &output->destroy); output->destroy.notify = handle_destroy; wl_signal_add(&wlr_output->events.commit, &output->commit); output->commit.notify = handle_commit; - wl_signal_add(&wlr_output->events.mode, &output->mode); - output->mode.notify = handle_mode; wl_signal_add(&wlr_output->events.present, &output->present); output->present.notify = handle_present; wl_signal_add(&wlr_output->events.damage, &output->damage); @@ -974,6 +1098,8 @@ void handle_new_output(struct wl_listener *listener, void *data) { output->frame.notify = handle_frame; wl_signal_add(&wlr_output->events.needs_frame, &output->needs_frame); output->needs_frame.notify = handle_needs_frame; + wl_signal_add(&wlr_output->events.request_state, &output->request_state); + output->request_state.notify = handle_request_state; output->repaint_timer = wl_event_loop_add_timer(server->wl_event_loop, output_repaint_timer_handler, output); @@ -997,6 +1123,21 @@ void handle_output_layout_change(struct wl_listener *listener, update_output_manager_config(server); } +void handle_gamma_control_set_gamma(struct wl_listener *listener, void *data) { + struct sway_server *server = + wl_container_of(listener, server, gamma_control_set_gamma); + const struct wlr_gamma_control_manager_v1_set_gamma_event *event = data; + + struct sway_output *output = event->output->data; + + if(!output) { + return; + } + + output->gamma_lut_changed = true; + wlr_output_schedule_frame(output->wlr_output); +} + static void output_manager_apply(struct sway_server *server, struct wlr_output_configuration_v1 *config, bool test_only) { // TODO: perform atomic tests on the whole backend atomically diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 429924c2..cbf99177 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -1,28 +1,25 @@ -#include <stdio.h> -#include <assert.h> -#include <GLES2/gl2.h> +#define _POSIX_C_SOURCE 200809L +#include <scenefx/render/fx_renderer/fx_effect_framebuffers.h> +#include <scenefx/render/fx_renderer/fx_renderer.h> +#include <scenefx/render/pass.h> #include <stdlib.h> #include <strings.h> #include <time.h> #include <wayland-server-core.h> -#include <wlr/render/gles2.h> +#include <wlr/config.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_buffer.h> -#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_damage_ring.h> #include <wlr/types/wlr_matrix.h> -#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output_layout.h> -#include <wlr/util/box.h> +#include <wlr/types/wlr_output.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/util/region.h> - #include "config.h" -#include "log.h" #include "sway/config.h" -#include "sway/desktop/fx_renderer/fx_framebuffer.h" -#include "sway/desktop/fx_renderer/fx_renderer.h" #include "sway/input/input-manager.h" #include "sway/input/seat.h" +#include "sway/layers.h" #include "sway/output.h" #include "sway/server.h" #include "sway/tree/arrange.h" @@ -31,45 +28,68 @@ #include "sway/tree/view.h" #include "sway/tree/workspace.h" -struct decoration_data get_undecorated_decoration_data() { - return (struct decoration_data) { - .alpha = 1.0f, - .dim = 0.0f, - .dim_color = config->dim_inactive_colors.unfocused, - .corner_radius = 0, - .saturation = 1.0f, - .has_titlebar = false, - .blur = false, - .discard_transparent = false, - .shadow = false, - }; +static void transform_output_damage(pixman_region32_t *damage, struct wlr_output *output) { + int ow, oh; + wlr_output_transformed_resolution(output, &ow, &oh); + enum wl_output_transform transform = + wlr_output_transform_invert(output->transform); + wlr_region_transform(damage, damage, transform, ow, oh); +} + +static void transform_output_box(struct wlr_box *box, struct wlr_output *output) { + int ow, oh; + wlr_output_transformed_resolution(output, &ow, &oh); + enum wl_output_transform transform = + wlr_output_transform_invert(output->transform); + wlr_box_transform(box, box, transform, ow, oh); } // TODO: Remove this ugly abomination with a complete border rework... -enum corner_location get_rotated_corner(enum corner_location corner_location, - enum wl_output_transform transform) { - if (corner_location == ALL || corner_location == NONE) { - return corner_location; +static void transform_corner_location(enum corner_location *corner_location, struct wlr_output *output) { + if (*corner_location == ALL) { + return; } - switch (transform) { + switch (wlr_output_transform_invert(output->transform)) { case WL_OUTPUT_TRANSFORM_NORMAL: - return corner_location; + return; case WL_OUTPUT_TRANSFORM_90: - return (corner_location + 1) % 4; + *corner_location = (*corner_location + 1) % 4; + return; case WL_OUTPUT_TRANSFORM_180: - return (corner_location + 2) % 4; + *corner_location = (*corner_location + 2) % 4; + return; case WL_OUTPUT_TRANSFORM_270: - return (corner_location + 3) % 4; + *corner_location = (*corner_location + 3) % 4; + return; case WL_OUTPUT_TRANSFORM_FLIPPED: - return (corner_location + (1 - 2 * (corner_location % 2))) % 4; + *corner_location = (*corner_location + (1 - 2 * (*corner_location % 2))) % 4; + return; case WL_OUTPUT_TRANSFORM_FLIPPED_90: - return (corner_location + (4 - 2 * (corner_location % 2))) % 4; + *corner_location = (*corner_location + (4 - 2 * (*corner_location % 2))) % 4; + return; case WL_OUTPUT_TRANSFORM_FLIPPED_180: - return (corner_location + (3 - 2 * (corner_location % 2))) % 4; + *corner_location = (*corner_location + (3 - 2 * (*corner_location % 2))) % 4; + return; case WL_OUTPUT_TRANSFORM_FLIPPED_270: - return (corner_location + (2 - 2 * (corner_location % 2))) % 4; + *corner_location = (*corner_location + (2 - 2 * (*corner_location % 2))) % 4; + return; + default: + return; } - return corner_location; +} + +struct decoration_data get_undecorated_decoration_data() { + return (struct decoration_data) { + .alpha = 1.0f, + .dim = 0.0f, + .dim_color = config->dim_inactive_colors.unfocused, + .corner_radius = 0, + .saturation = 1.0f, + .has_titlebar = false, + .blur = false, + .discard_transparent = false, + .shadow = false, + }; } /** @@ -85,380 +105,260 @@ enum corner_location get_rotated_corner(enum corner_location corner_location, * scaled to 2px. */ static int scale_length(int length, int offset, float scale) { - return round((offset + length) * scale) - round(offset * scale); + return roundf((offset + length) * scale) - roundf(offset * scale); } -static void scissor_output(struct wlr_output *wlr_output, - pixman_box32_t *rect) { - struct sway_output *output = wlr_output->data; - struct fx_renderer *renderer = output->renderer; - assert(renderer); - - struct wlr_box box = { - .x = rect->x1, - .y = rect->y1, - .width = rect->x2 - rect->x1, - .height = rect->y2 - rect->y1, - }; - - int ow, oh; - wlr_output_transformed_resolution(wlr_output, &ow, &oh); - - enum wl_output_transform transform = wlr_output_transform_invert(wlr_output->transform); - wlr_box_transform(&box, &box, transform, ow, oh); - - fx_renderer_scissor(&box); -} - -static void set_scale_filter(struct wlr_output *wlr_output, - struct fx_texture *texture, enum scale_filter_mode scale_filter) { - glBindTexture(texture->target, texture->id); - - switch (scale_filter) { +static enum wlr_scale_filter_mode get_scale_filter(struct sway_output *output) { + switch (output->scale_filter) { case SCALE_FILTER_LINEAR: - glTexParameteri(texture->target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - break; + return WLR_SCALE_FILTER_BILINEAR; case SCALE_FILTER_NEAREST: - glTexParameteri(texture->target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - break; - case SCALE_FILTER_DEFAULT: - case SCALE_FILTER_SMART: - assert(false); // unreachable + return WLR_SCALE_FILTER_NEAREST; + default: + abort(); // unreachable } } -pixman_region32_t create_damage(const struct wlr_box damage_box, pixman_region32_t *output_damage) { +static void render_texture(struct fx_render_context *ctx, struct wlr_texture *texture, + const struct wlr_fbox *_src_box, const struct wlr_box *dst_box, + const struct wlr_box *_clip_box, enum wl_output_transform transform, + struct decoration_data deco_data) { + struct sway_output *output = ctx->output; + + struct wlr_box proj_box = *dst_box; + + struct wlr_fbox src_box = {0}; + if (_src_box) { + src_box = *_src_box; + } + pixman_region32_t damage; - pixman_region32_init(&damage); - pixman_region32_union_rect(&damage, &damage, damage_box.x, damage_box.y, - damage_box.width, damage_box.height); - pixman_region32_intersect(&damage, &damage, output_damage); - return damage; -} + pixman_region32_init_rect(&damage, proj_box.x, proj_box.y, + proj_box.width, proj_box.height); + pixman_region32_intersect(&damage, &damage, ctx->output_damage); -struct wlr_box get_monitor_box(struct wlr_output *output) { - int width, height; - wlr_output_transformed_resolution(output, &width, &height); - struct wlr_box monitor_box = { 0, 0, width, height }; - return monitor_box; -} + struct wlr_box clip_box = {0}; + if (_clip_box) { + pixman_region32_intersect_rect(&damage, &damage, + _clip_box->x, _clip_box->y, _clip_box->width, _clip_box->height); -static void render_texture(struct wlr_output *wlr_output, - pixman_region32_t *output_damage, struct fx_texture *texture, - const struct wlr_fbox *src_box, const struct wlr_box *dst_box, - const float matrix[static 9], struct decoration_data deco_data) { - struct sway_output *output = wlr_output->data; - struct fx_renderer *renderer = output->renderer; + clip_box = *_clip_box; + } - pixman_region32_t damage = create_damage(*dst_box, output_damage); bool damaged = pixman_region32_not_empty(&damage); if (!damaged) { goto damage_finish; } - // ensure the box is updated as per the output orientation - struct wlr_box transformed_box; - int width, height; - wlr_output_transformed_resolution(wlr_output, &width, &height); - wlr_box_transform(&transformed_box, dst_box, - wlr_output_transform_invert(wlr_output->transform), width, height); - - int nrects; - pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects); - for (int i = 0; i < nrects; ++i) { - scissor_output(wlr_output, &rects[i]); - set_scale_filter(wlr_output, texture, output->scale_filter); - if (src_box != NULL) { - fx_render_subtexture_with_matrix(renderer, texture, src_box, &transformed_box, - matrix, deco_data); - } else { - fx_render_texture_with_matrix(renderer, texture, &transformed_box, matrix, deco_data); + transform_output_box(&proj_box, output->wlr_output); + transform_output_box(&clip_box, output->wlr_output); + transform_output_damage(&damage, output->wlr_output); + transform = wlr_output_transform_compose(transform, output->wlr_output->transform); + + fx_render_pass_add_texture(ctx->pass, &(struct fx_render_texture_options) { + .base = { + .texture = texture, + .src_box = src_box, + .dst_box = proj_box, + .transform = transform, + .alpha = &deco_data.alpha, + .clip = &damage, + .filter_mode = get_scale_filter(output), + }, + .clip_box = &clip_box, + .corner_radius = deco_data.corner_radius, + .has_titlebar = deco_data.has_titlebar, + .dim = deco_data.dim, + .dim_color = { + .r = deco_data.dim_color[0], + .g = deco_data.dim_color[1], + .b = deco_data.dim_color[2], + .a = deco_data.dim_color[3], } - } + }); damage_finish: pixman_region32_fini(&damage); } -/* Renders the blur for each damaged rect and swaps the buffer */ -void render_blur_segments(struct fx_renderer *renderer, - const float matrix[static 9], pixman_region32_t* damage, - struct fx_framebuffer **buffer, struct blur_shader* shader, - const struct wlr_box *box, int blur_radius) { - if (*buffer == &renderer->effects_buffer) { - fx_framebuffer_bind(&renderer->effects_buffer_swapped); - } else { - fx_framebuffer_bind(&renderer->effects_buffer); - } - - if (pixman_region32_not_empty(damage)) { - int nrects; - pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects); - for (int i = 0; i < nrects; ++i) { - const pixman_box32_t box = rects[i]; - struct wlr_box new_box = { box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1 }; - fx_renderer_scissor(&new_box); - fx_render_blur(renderer, matrix, buffer, shader, &new_box, blur_radius); - } - } - - if (*buffer != &renderer->effects_buffer) { - *buffer = &renderer->effects_buffer; - } else { - *buffer = &renderer->effects_buffer_swapped; - } -} - -// Blurs the main_buffer content and returns the blurred framebuffer -struct fx_framebuffer *get_main_buffer_blur(struct fx_renderer *renderer, struct sway_output *output, - pixman_region32_t *original_damage, const struct wlr_box *box) { - struct wlr_output *wlr_output = output->wlr_output; - struct wlr_box monitor_box = get_monitor_box(wlr_output); - - const enum wl_output_transform transform = wlr_output_transform_invert(wlr_output->transform); - float matrix[9]; - wlr_matrix_project_box(matrix, &monitor_box, transform, 0, wlr_output->transform_matrix); +void render_blur(struct fx_render_context *ctx, struct wlr_texture *texture, + const struct wlr_fbox *src_box, const struct wlr_box *dst_box, + bool optimized_blur, pixman_region32_t *opaque_region, + struct decoration_data deco_data) { + struct sway_output *output = ctx->output; - float gl_matrix[9]; - wlr_matrix_multiply(gl_matrix, renderer->projection, matrix); + struct wlr_box proj_box = *dst_box; pixman_region32_t damage; - pixman_region32_init(&damage); - pixman_region32_copy(&damage, original_damage); - wlr_region_transform(&damage, &damage, transform, monitor_box.width, monitor_box.height); + pixman_region32_init_rect(&damage, proj_box.x, proj_box.y, + proj_box.width, proj_box.height); + pixman_region32_intersect(&damage, &damage, ctx->output_damage); - wlr_region_expand(&damage, &damage, config_get_blur_size()); - - // Initially blur main_buffer content into the effects_buffers - struct fx_framebuffer *current_buffer = &renderer->wlr_buffer; - - // Bind to blur framebuffer - fx_framebuffer_bind(&renderer->effects_buffer); - glBindTexture(renderer->wlr_buffer.texture.target, renderer->wlr_buffer.texture.id); - - // damage region will be scaled, make a temp - pixman_region32_t tempDamage; - pixman_region32_init(&tempDamage); - - int blur_radius = config->blur_params.radius; - int blur_passes = config->blur_params.num_passes; - - // Downscale - for (int i = 0; i < blur_passes; ++i) { - wlr_region_scale(&tempDamage, &damage, 1.0f / (1 << (i + 1))); - render_blur_segments(renderer, gl_matrix, &tempDamage, ¤t_buffer, - &renderer->shaders.blur1, box, blur_radius); - } - - // Upscale - for (int i = blur_passes - 1; i >= 0; --i) { - // when upsampling we make the region twice as big - wlr_region_scale(&tempDamage, &damage, 1.0f / (1 << i)); - render_blur_segments(renderer, gl_matrix, &tempDamage, ¤t_buffer, - &renderer->shaders.blur2, box, blur_radius); + if (!pixman_region32_not_empty(&damage)) { + goto damage_finish; } - float blur_noise = config->blur_params.noise; - float blur_brightness = config->blur_params.brightness; - float blur_contrast = config->blur_params.contrast; - float blur_saturation = config->blur_params.saturation; - - // Render additional blur effects like saturation, noise, contrast, etc... - if (config_should_parameters_blur_effects() && pixman_region32_not_empty(&damage)) { - if (current_buffer == &renderer->effects_buffer) { - fx_framebuffer_bind(&renderer->effects_buffer_swapped); - } else { - fx_framebuffer_bind(&renderer->effects_buffer); - } - int nrects; - pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects); - for (int i = 0; i < nrects; ++i) { - const pixman_box32_t box = rects[i]; - struct wlr_box new_box = { box.x1, box.y1, box.x2 - box.x1, box.y2 - box.y1 }; - fx_renderer_scissor(&new_box); - fx_render_blur_effects(renderer, gl_matrix, ¤t_buffer, blur_noise, - blur_brightness, blur_contrast, blur_saturation); - } - if (current_buffer != &renderer->effects_buffer) { - current_buffer = &renderer->effects_buffer; - } else { - current_buffer = &renderer->effects_buffer_swapped; - } - } + transform_output_box(&proj_box, output->wlr_output); + transform_output_damage(&damage, output->wlr_output); + + struct fx_render_blur_pass_options blur_options = { + .tex_options = { + .base = { + .texture = texture, + .src_box = *src_box, + .dst_box = proj_box, + .transform = WL_OUTPUT_TRANSFORM_NORMAL, + .alpha = &deco_data.alpha, + .clip = &damage, + .filter_mode = WLR_SCALE_FILTER_BILINEAR, + }, + .clip_box = &proj_box, + .corner_radius = deco_data.corner_radius, + .discard_transparent = false, + }, + .opaque_region = opaque_region, + .use_optimized_blur = optimized_blur, + .blur_data = &config->blur_params, + .ignore_transparent = deco_data.discard_transparent, + }; + // Render the actual blur behind the surface + fx_render_pass_add_blur(ctx->pass, &blur_options); - pixman_region32_fini(&tempDamage); +damage_finish: pixman_region32_fini(&damage); - - // Bind back to the default buffer - fx_framebuffer_bind(&renderer->wlr_buffer); - - return current_buffer; } -void render_blur(bool optimized, struct sway_output *output, - pixman_region32_t *output_damage, const struct wlr_box *dst_box, - pixman_region32_t *opaque_region, struct decoration_data *deco_data, - struct blur_stencil_data *stencil_data) { - struct wlr_output *wlr_output = output->wlr_output; - struct fx_renderer *renderer = output->renderer; +// _box.x and .y are expected to be layout-local +// _box.width and .height are expected to be output-buffer-local +void render_box_shadow(struct fx_render_context *ctx, const struct wlr_box *_box, + const float color[static 4], float blur_sigma, float corner_radius, + float offset_x, float offset_y) { + struct wlr_output *wlr_output = ctx->output->wlr_output; - // Check if damage is inside of box rect - pixman_region32_t damage = create_damage(*dst_box, output_damage); + struct wlr_box box; + memcpy(&box, _box, sizeof(struct wlr_box)); - pixman_region32_t translucent_region; - pixman_region32_init(&translucent_region); + // Extend the size of the box while also considering the shadow offset + struct wlr_box shadow_box; + memcpy(&shadow_box, _box, sizeof(struct wlr_box)); + shadow_box.x -= blur_sigma - offset_x; + shadow_box.y -= blur_sigma - offset_y; + shadow_box.width += blur_sigma * 2; + shadow_box.height += blur_sigma * 2; + pixman_region32_t damage; + pixman_region32_init_rect(&damage, shadow_box.x, shadow_box.y, + shadow_box.width, shadow_box.height); + pixman_region32_intersect(&damage, &damage, ctx->output_damage); if (!pixman_region32_not_empty(&damage)) { goto damage_finish; } - // Gets the translucent region - pixman_box32_t surface_box = { 0, 0, dst_box->width, dst_box->height }; - pixman_region32_copy(&translucent_region, opaque_region); - pixman_region32_inverse(&translucent_region, &translucent_region, &surface_box); - if (!pixman_region32_not_empty(&translucent_region)) { - goto damage_finish; - } - - struct fx_framebuffer *buffer = &renderer->blur_buffer; - if (!buffer->texture.id || !optimized) { - pixman_region32_translate(&translucent_region, dst_box->x, dst_box->y); - pixman_region32_intersect(&translucent_region, &translucent_region, &damage); - - // Render the blur into its own buffer - buffer = get_main_buffer_blur(renderer, output, &translucent_region, dst_box); - } - - // Get a stencil of the window ignoring transparent regions - if (deco_data->discard_transparent && stencil_data) { - fx_renderer_scissor(NULL); - fx_renderer_stencil_mask_init(); - - render_texture(wlr_output, output_damage, stencil_data->stencil_texture, stencil_data->stencil_src_box, - dst_box, stencil_data->stencil_matrix, *deco_data); - - fx_renderer_stencil_mask_close(true); - } - - // Draw the blurred texture - struct wlr_box monitor_box = get_monitor_box(wlr_output); - enum wl_output_transform transform = wlr_output_transform_invert(wlr_output->transform); - float matrix[9]; - wlr_matrix_project_box(matrix, &monitor_box, transform, 0.0, wlr_output->transform_matrix); - - struct decoration_data blur_deco_data = get_undecorated_decoration_data(); - blur_deco_data.corner_radius = deco_data->corner_radius; - blur_deco_data.has_titlebar = deco_data->has_titlebar; - render_texture(wlr_output, &damage, &buffer->texture, NULL, dst_box, matrix, blur_deco_data); + transform_output_damage(&damage, wlr_output); + transform_output_box(&box, wlr_output); + transform_output_box(&shadow_box, wlr_output); - // Finish stenciling - if (deco_data->discard_transparent && stencil_data) { - fx_renderer_stencil_mask_fini(); - } + struct shadow_data shadow_data = { + .enabled = true, + .offset_x = offset_x, + .offset_y = offset_y, + .color = { + .r = color[0], + .g = color[1], + .b = color[2], + .a = color[3], + }, + .blur_sigma = blur_sigma, + }; + struct fx_render_box_shadow_options shadow_options = { + .shadow_box = shadow_box, + .clip_box = box, + .clip = &damage, + .shadow_data = &shadow_data, + .corner_radius = corner_radius, + }; + fx_render_pass_add_box_shadow(ctx->pass, &shadow_options); damage_finish: pixman_region32_fini(&damage); - pixman_region32_fini(&translucent_region); } // _box.x and .y are expected to be layout-local // _box.width and .height are expected to be output-buffer-local -void render_box_shadow(struct sway_output *output, pixman_region32_t *output_damage, - const struct wlr_box *_box, const float color[static 4], float blur_sigma, - float corner_radius, float offset_x, float offset_y) { - struct wlr_output *wlr_output = output->wlr_output; - struct fx_renderer *renderer = output->renderer; +void render_rounded_border_corner(struct fx_render_context *ctx, const struct wlr_box *_box, + const float color[static 4], int corner_radius, int border_thickness, + enum corner_location location) { + struct wlr_output *wlr_output = ctx->output->wlr_output; + + struct wlr_box box = *_box; + const int size = MAX(box.width, box.height); + box.width = size; + box.height = size; + box.x -= ctx->output->lx * wlr_output->scale; + box.y -= ctx->output->ly * wlr_output->scale; - struct wlr_box box; - memcpy(&box, _box, sizeof(struct wlr_box)); - box.x -= blur_sigma - offset_x; - box.y -= blur_sigma - offset_y; - box.width += 2 * blur_sigma; - box.height += 2 * blur_sigma; - - pixman_region32_t damage = create_damage(box, output_damage); - - // don't damage area behind window since we dont render it anyway - struct wlr_box inner_box; - memcpy(&inner_box, _box, sizeof(struct wlr_box)); - inner_box.x += corner_radius; - inner_box.y += corner_radius; - inner_box.width -= 2 * corner_radius; - inner_box.height -= 2 * corner_radius; - pixman_region32_t inner_damage = create_damage(inner_box, output_damage); - pixman_region32_subtract(&damage, &damage, &inner_damage); - pixman_region32_fini(&inner_damage); - - bool damaged = pixman_region32_not_empty(&damage); - if (!damaged) { + pixman_region32_t damage; + pixman_region32_init_rect(&damage, box.x, box.y, box.width, box.height); + pixman_region32_intersect(&damage, &damage, ctx->output_damage); + if (!pixman_region32_not_empty(&damage)) { goto damage_finish; } - float matrix[9]; - wlr_matrix_project_box(matrix, &box, WL_OUTPUT_TRANSFORM_NORMAL, 0, - wlr_output->transform_matrix); - - int width, height; - wlr_output_transformed_resolution(wlr_output, &width, &height); - enum wl_output_transform transform = wlr_output_transform_invert(wlr_output->transform); - // ensure the shadow_box is updated as per the output orientation - struct wlr_box transformed_shadow_box; - wlr_box_transform(&transformed_shadow_box, &box, transform, width, height); - // ensure the box is updated as per the output orientation - struct wlr_box transformed_box; - wlr_box_transform(&transformed_box, _box, transform, width, height); - - int nrects; - pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects); - for (int i = 0; i < nrects; ++i) { - scissor_output(wlr_output, &rects[i]); - - fx_render_box_shadow(renderer, &transformed_shadow_box, &transformed_box, - color, matrix, corner_radius, blur_sigma); - } + transform_output_damage(&damage, wlr_output); + transform_output_box(&box, wlr_output); + transform_corner_location(&location, wlr_output); + + struct fx_render_rounded_border_corner_options border_corner_options = { + .base = { + .box = box, + .color = { + .r = color[0], + .g = color[1], + .b = color[2], + .a = color[3], + }, + .clip = &damage, // Render with the original extended clip region + }, + .corner_radius = corner_radius, + .border_thickness = border_thickness, + .corner_location = location + }; + fx_render_pass_add_rounded_border_corner(ctx->pass, &border_corner_options); damage_finish: pixman_region32_fini(&damage); } static void render_surface_iterator(struct sway_output *output, - struct sway_view *view, struct wlr_surface *surface, + struct sway_view *_view, struct wlr_surface *surface, struct wlr_box *_box, void *_data) { struct render_data *data = _data; struct wlr_output *wlr_output = output->wlr_output; - pixman_region32_t *output_damage = data->damage; struct wlr_texture *texture = wlr_surface_get_texture(surface); if (!texture) { return; } - struct wlr_box proj_box = *_box; - - scale_box(&proj_box, wlr_output->scale); - - float matrix[9]; - enum wl_output_transform transform = wlr_output_transform_invert(surface->current.transform); - wlr_matrix_project_box(matrix, &proj_box, transform, 0.0, wlr_output->transform_matrix); + struct wlr_fbox src_box; + wlr_surface_get_buffer_source_box(surface, &src_box); struct wlr_box dst_box = *_box; - struct wlr_box *clip_box = data->clip_box; - if (clip_box != NULL) { - dst_box.width = fmin(dst_box.width, clip_box->width); - dst_box.height = fmin(dst_box.height, clip_box->height); - dst_box.x = fmax(dst_box.x, clip_box->x); - dst_box.y = fmax(dst_box.y, clip_box->y); - } + struct wlr_box clip_box = *_box; + if (data->clip_box != NULL) { + clip_box.width = fmin(dst_box.width, data->clip_box->width); + clip_box.height = fmin(dst_box.height, data->clip_box->height); + clip_box.x = fmax(dst_box.x, data->clip_box->x); + clip_box.y = fmax(dst_box.y, data->clip_box->y); + } scale_box(&dst_box, wlr_output->scale); + scale_box(&clip_box, wlr_output->scale); struct decoration_data deco_data = data->deco_data; deco_data.corner_radius *= wlr_output->scale; - struct wlr_fbox src_box; - wlr_surface_get_buffer_source_box(surface, &src_box); - struct fx_texture fx_texture = fx_texture_from_wlr_texture(texture); - // render blur + struct sway_view *view = data->view; bool is_subsurface = view ? view->surface != surface : false; if (deco_data.blur && config_should_parameters_blur() && !is_subsurface) { pixman_region32_t opaque_region; @@ -474,13 +374,11 @@ static void render_surface_iterator(struct sway_output *output, } if (has_alpha) { - struct wlr_box monitor_box = get_monitor_box(wlr_output); - wlr_box_transform(&monitor_box, &monitor_box, - wlr_output_transform_invert(wlr_output->transform), monitor_box.width, monitor_box.height); - struct blur_stencil_data stencil_data = { &fx_texture, &src_box, matrix }; - bool should_optimize_blur = view ? !container_is_floating_or_child(view->container) || config->blur_xray : false; - render_blur(should_optimize_blur, output, output_damage, &dst_box, - &opaque_region, &deco_data, &stencil_data); + bool should_optimize_blur = view ? + !container_is_floating_or_child(view->container) || config->blur_xray + : false; + render_blur(data->ctx, texture, &src_box, &clip_box, + should_optimize_blur, &opaque_region, deco_data); } pixman_region32_fini(&opaque_region); @@ -488,11 +386,10 @@ static void render_surface_iterator(struct sway_output *output, deco_data.discard_transparent = false; - // Render surface texture - render_texture(wlr_output, output_damage, &fx_texture, &src_box, &dst_box, - matrix, deco_data); + render_texture(data->ctx, texture, + &src_box, &dst_box, &clip_box, surface->current.transform, deco_data); - wlr_presentation_surface_sampled_on_output(server.presentation, surface, + wlr_presentation_surface_textured_on_output(server.presentation, surface, wlr_output); } @@ -500,225 +397,144 @@ static void render_surface_iterator(struct sway_output *output, static void render_layer_iterator(struct sway_output *output, struct sway_view *view, struct wlr_surface *surface, struct wlr_box *_box, void *_data) { + // render the layer's surface + render_surface_iterator(output, view, surface, _box, _data); + struct render_data *data = _data; struct decoration_data deco_data = data->deco_data; // Ignore effects if this is a subsurface - if (!wlr_surface_is_layer_surface(surface)) { + if (!wlr_layer_surface_v1_try_from_wlr_surface(surface)) { deco_data = get_undecorated_decoration_data(); } - // render the layer's surface - render_surface_iterator(output, view, surface, _box, _data); - // render shadow if (deco_data.shadow && config_should_parameters_shadow()) { - int corner_radius = deco_data.corner_radius *= output->wlr_output->scale; - int offset_x = config->shadow_offset_x * output->wlr_output->scale; - int offset_y = config->shadow_offset_y * output->wlr_output->scale; - scale_box(_box, output->wlr_output->scale); - render_box_shadow(output, data->damage, _box, config->shadow_color, - config->shadow_blur_sigma, corner_radius, offset_x, offset_y); + float output_scale = output->wlr_output->scale; + struct wlr_box box = *_box; + scale_box(&box, output_scale); + render_box_shadow(data->ctx, &box, config->shadow_color, config->shadow_blur_sigma * output_scale, + deco_data.corner_radius * output_scale, config->shadow_offset_x * output_scale, config->shadow_offset_y * output_scale); } } -static void render_layer_toplevel(struct sway_output *output, - pixman_region32_t *damage, struct wl_list *layer_surfaces) { +static void render_layer_toplevel(struct fx_render_context *ctx, struct wl_list *layer_surfaces) { struct render_data data = { - .damage = damage, .deco_data = get_undecorated_decoration_data(), + .ctx = ctx, }; - output_layer_for_each_toplevel_surface(output, layer_surfaces, + output_layer_for_each_toplevel_surface(ctx->output, layer_surfaces, render_layer_iterator, &data); } -static void render_layer_popups(struct sway_output *output, - pixman_region32_t *damage, struct wl_list *layer_surfaces) { + static void render_layer_popups(struct fx_render_context *ctx, struct wl_list *layer_surfaces) { struct render_data data = { - .damage = damage, .deco_data = get_undecorated_decoration_data(), + .ctx = ctx, }; - output_layer_for_each_popup_surface(output, layer_surfaces, + output_layer_for_each_popup_surface(ctx->output, layer_surfaces, render_layer_iterator, &data); } #if HAVE_XWAYLAND -static void render_unmanaged(struct sway_output *output, - pixman_region32_t *damage, struct wl_list *unmanaged) { +static void render_unmanaged(struct fx_render_context *ctx, struct wl_list *unmanaged) { struct render_data data = { - .damage = damage, .deco_data = get_undecorated_decoration_data(), + .ctx = ctx, }; - output_unmanaged_for_each_surface(output, unmanaged, + output_unmanaged_for_each_surface(ctx->output, unmanaged, render_surface_iterator, &data); } #endif -static void render_drag_icons(struct sway_output *output, - pixman_region32_t *damage, struct wl_list *drag_icons) { +static void render_drag_icons(struct fx_render_context *ctx, struct wl_list *drag_icons) { struct render_data data = { - .damage = damage, .deco_data = get_undecorated_decoration_data(), + .ctx = ctx, }; - output_drag_icons_for_each_surface(output, drag_icons, + output_drag_icons_for_each_surface(ctx->output, drag_icons, render_surface_iterator, &data); } -void render_whole_output(struct fx_renderer *renderer, struct wlr_output *wlr_output, - pixman_region32_t *output_damage, struct fx_texture *texture) { - struct wlr_box monitor_box = get_monitor_box(wlr_output); - enum wl_output_transform transform = wlr_output_transform_invert(wlr_output->transform); - float matrix[9]; - wlr_matrix_project_box(matrix, &monitor_box, transform, 0.0, wlr_output->transform_matrix); - - render_texture(wlr_output, output_damage, texture, NULL, &monitor_box, matrix, get_undecorated_decoration_data()); -} - -void render_output_blur(struct sway_output *output, pixman_region32_t *damage) { - struct wlr_output *wlr_output = output->wlr_output; - struct fx_renderer *renderer = output->renderer; - - struct wlr_box monitor_box = get_monitor_box(wlr_output); - pixman_region32_t fake_damage; - pixman_region32_init_rect(&fake_damage, 0, 0, monitor_box.width, monitor_box.height); - - // Render the blur - struct fx_framebuffer *buffer = get_main_buffer_blur(renderer, output, &fake_damage, &monitor_box); - - // Render the newly blurred content into the blur_buffer - fx_framebuffer_update(&renderer->blur_buffer, - output->renderer->viewport_width, output->renderer->viewport_height); - fx_framebuffer_bind(&renderer->blur_buffer); - - // Clear the damaged region of the blur_buffer - float clear_color[] = { 0, 0, 0, 0 }; - int nrects; - pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects); - for (int i = 0; i < nrects; ++i) { - scissor_output(wlr_output, &rects[i]); - fx_renderer_clear(clear_color); - } - render_whole_output(renderer, wlr_output, &fake_damage, &buffer->texture); - fx_framebuffer_bind(&renderer->wlr_buffer); - - pixman_region32_fini(&fake_damage); - - renderer->blur_buffer_dirty = false; -} - // _box.x and .y are expected to be layout-local // _box.width and .height are expected to be output-buffer-local -void render_rect(struct sway_output *output, - pixman_region32_t *output_damage, const struct wlr_box *_box, +void render_rect(struct fx_render_context *ctx, const struct wlr_box *_box, float color[static 4]) { - struct wlr_output *wlr_output = output->wlr_output; - struct fx_renderer *renderer = output->renderer; + struct wlr_output *wlr_output = ctx->output->wlr_output; - struct wlr_box box; - memcpy(&box, _box, sizeof(struct wlr_box)); - box.x -= output->lx * wlr_output->scale; - box.y -= output->ly * wlr_output->scale; + struct wlr_box box = *_box; + box.x -= ctx->output->lx * wlr_output->scale; + box.y -= ctx->output->ly * wlr_output->scale; - pixman_region32_t damage = create_damage(box, output_damage); + pixman_region32_t damage; + pixman_region32_init_rect(&damage, box.x, box.y, + box.width, box.height); + pixman_region32_intersect(&damage, &damage, ctx->output_damage); bool damaged = pixman_region32_not_empty(&damage); if (!damaged) { goto damage_finish; } - int nrects; - pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects); - for (int i = 0; i < nrects; ++i) { - scissor_output(wlr_output, &rects[i]); - fx_render_rect(renderer, &box, color, wlr_output->transform_matrix); - } + transform_output_damage(&damage, wlr_output); + transform_output_box(&box, wlr_output); + + fx_render_pass_add_rect(ctx->pass, &(struct fx_render_rect_options){ + .base = { + .box = box, + .color = { + .r = color[0], + .g = color[1], + .b = color[2], + .a = color[3], + }, + .clip = &damage, + }, + }); damage_finish: pixman_region32_fini(&damage); } -void render_rounded_rect(struct sway_output *output, pixman_region32_t *output_damage, - const struct wlr_box *_box, float color[static 4], int corner_radius, - enum corner_location corner_location) { - struct wlr_output *wlr_output = output->wlr_output; - struct fx_renderer *renderer = output->renderer; - - struct wlr_box box; - memcpy(&box, _box, sizeof(struct wlr_box)); - box.x -= output->lx * wlr_output->scale; - box.y -= output->ly * wlr_output->scale; - - pixman_region32_t damage = create_damage(box, output_damage); - bool damaged = pixman_region32_not_empty(&damage); - if (!damaged) { - goto damage_finish; - } - - float matrix[9]; - wlr_matrix_project_box(matrix, &box, WL_OUTPUT_TRANSFORM_NORMAL, 0, - wlr_output->transform_matrix); - - enum wl_output_transform transform = wlr_output_transform_invert(wlr_output->transform); - - // ensure the box is updated as per the output orientation - struct wlr_box transformed_box; - int width, height; - wlr_output_transformed_resolution(wlr_output, &width, &height); - wlr_box_transform(&transformed_box, &box, transform, width, height); - - corner_location = get_rotated_corner(corner_location, transform); - - int nrects; - pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects); - for (int i = 0; i < nrects; ++i) { - scissor_output(wlr_output, &rects[i]); - fx_render_rounded_rect(renderer, &transformed_box, color, matrix, - corner_radius, corner_location); +void render_rounded_rect(struct fx_render_context *ctx, const struct wlr_box *_box, + float color[static 4], int corner_radius, enum corner_location corner_location) { + if (!corner_radius) { + render_rect(ctx, _box, color); + return; } -damage_finish: - pixman_region32_fini(&damage); -} - -// _box.x and .y are expected to be layout-local -// _box.width and .height are expected to be output-buffer-local -void render_border_corner(struct sway_output *output, pixman_region32_t *output_damage, - const struct wlr_box *_box, const float color[static 4], int corner_radius, - int border_thickness, enum corner_location corner_location) { - struct wlr_output *wlr_output = output->wlr_output; - struct fx_renderer *renderer = output->renderer; + struct wlr_output *wlr_output = ctx->output->wlr_output; - struct wlr_box box; - memcpy(&box, _box, sizeof(struct wlr_box)); - box.x -= output->lx * wlr_output->scale; - box.y -= output->ly * wlr_output->scale; + struct wlr_box box = *_box; + box.x -= ctx->output->lx * wlr_output->scale; + box.y -= ctx->output->ly * wlr_output->scale; - pixman_region32_t damage = create_damage(box, output_damage); + pixman_region32_t damage; + pixman_region32_init_rect(&damage, box.x, box.y, + box.width, box.height); + pixman_region32_intersect(&damage, &damage, ctx->output_damage); bool damaged = pixman_region32_not_empty(&damage); if (!damaged) { goto damage_finish; } - float matrix[9]; - wlr_matrix_project_box(matrix, &box, WL_OUTPUT_TRANSFORM_NORMAL, 0, - wlr_output->transform_matrix); - - enum wl_output_transform transform = wlr_output_transform_invert(wlr_output->transform); - - // ensure the box is updated as per the output orientation - struct wlr_box transformed_box; - int width, height; - wlr_output_transformed_resolution(wlr_output, &width, &height); - wlr_box_transform(&transformed_box, &box, transform, width, height); - - corner_location = get_rotated_corner(corner_location, transform); - - int nrects; - pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects); - for (int i = 0; i < nrects; ++i) { - scissor_output(wlr_output, &rects[i]); - fx_render_border_corner(renderer, &transformed_box, color, matrix, - corner_location, corner_radius, border_thickness); - } + transform_output_damage(&damage, wlr_output); + transform_output_box(&box, wlr_output); + transform_corner_location(&corner_location, wlr_output); + + fx_render_pass_add_rounded_rect(ctx->pass, &(struct fx_render_rounded_rect_options){ + .base = { + .box = box, + .color = { + .r = color[0], + .g = color[1], + .b = color[2], + .a = color[3], + }, + .clip = &damage, + }, + .corner_radius = corner_radius, + .corner_location = corner_location + }); damage_finish: pixman_region32_fini(&damage); @@ -731,17 +547,18 @@ void premultiply_alpha(float color[4], float opacity) { color[2] *= color[3]; } -static void render_view_toplevels(struct sway_view *view, struct sway_output *output, - pixman_region32_t *damage, struct decoration_data deco_data) { +static void render_view_toplevels(struct fx_render_context *ctx, + struct sway_view *view, struct decoration_data deco_data) { struct render_data data = { - .damage = damage, .deco_data = deco_data, + .view = view, + .ctx = ctx, }; // Clip the window to its view size, ignoring CSD struct wlr_box clip_box; struct sway_container_state state = view->container->current; - clip_box.x = state.x - output->lx; - clip_box.y = state.y - output->ly; + clip_box.x = floor(state.x) - ctx->output->lx; + clip_box.y = floor(state.y) - ctx->output->ly; clip_box.width = state.width; clip_box.height = state.height; @@ -768,27 +585,36 @@ static void render_view_toplevels(struct sway_view *view, struct sway_output *ou } data.clip_box = &clip_box; - output_view_for_each_surface(output, view, render_surface_iterator, &data); + // Render all toplevels without descending into popups + double ox = view->container->surface_x - + ctx->output->lx - view->geometry.x; + double oy = view->container->surface_y - + ctx->output->ly - view->geometry.y; + output_surface_for_each_surface(ctx->output, view->surface, ox, oy, + render_surface_iterator, &data); } -static void render_view_popups(struct sway_view *view, struct sway_output *output, - pixman_region32_t *damage, struct decoration_data deco_data) { +static void render_view_popups(struct fx_render_context *ctx, struct sway_view *view, + struct decoration_data deco_data) { struct render_data data = { - .damage = damage, .deco_data = deco_data, + .view = view, + .ctx = ctx, }; - output_view_for_each_popup_surface(output, view, + output_view_for_each_popup_surface(ctx->output, view, render_surface_iterator, &data); } -static void render_saved_view(struct sway_view *view, struct sway_output *output, - pixman_region32_t *damage, struct decoration_data deco_data) { +static void render_saved_view(struct fx_render_context *ctx, struct sway_view *view, struct decoration_data deco_data) { + struct sway_output *output = ctx->output; struct wlr_output *wlr_output = output->wlr_output; if (wl_list_empty(&view->saved_buffers)) { return; } + deco_data.corner_radius *= wlr_output->scale; + struct sway_saved_buffer *saved_buf; wl_list_for_each(saved_buf, &view->saved_buffers, link) { if (!saved_buf->buffer->texture) { @@ -814,55 +640,46 @@ static void render_saved_view(struct sway_view *view, struct sway_output *output } struct wlr_box dst_box = proj_box; - scale_box(&proj_box, wlr_output->scale); - - float matrix[9]; - enum wl_output_transform transform = wlr_output_transform_invert(saved_buf->transform); - wlr_matrix_project_box(matrix, &proj_box, transform, 0, wlr_output->transform_matrix); + struct wlr_box clip_box = proj_box; + // Clip to actual geometry, clipping the CSD struct sway_container_state state = view->container->current; - dst_box.x = state.x - output->lx; - dst_box.y = state.y - output->ly; - dst_box.width = state.width; - dst_box.height = state.height; + clip_box.x = state.x - output->lx; + clip_box.y = state.y - output->ly; + clip_box.width = state.width; + clip_box.height = state.height; if (state.border == B_PIXEL || state.border == B_NORMAL) { - dst_box.x += state.border_thickness; - dst_box.width -= state.border_thickness * 2; + clip_box.x += state.border_thickness; + clip_box.width -= state.border_thickness * 2; if (deco_data.has_titlebar) { // Shift the box downward to compensate for the titlebar int titlebar_thickness = container_titlebar_height(); - dst_box.y += titlebar_thickness; - dst_box.height -= state.border_thickness + titlebar_thickness; + clip_box.y += titlebar_thickness; + clip_box.height -= state.border_thickness + titlebar_thickness; } else { // Regular border - dst_box.y += state.border_thickness; - dst_box.height -= state.border_thickness * 2; + clip_box.y += state.border_thickness; + clip_box.height -= state.border_thickness * 2; } } - scale_box(&dst_box, wlr_output->scale); - - deco_data.corner_radius *= wlr_output->scale; - struct fx_texture fx_texture = fx_texture_from_wlr_texture(saved_buf->buffer->texture); + scale_box(&dst_box, wlr_output->scale); + scale_box(&clip_box, wlr_output->scale); // render blur if (deco_data.blur && config_should_parameters_blur()) { - struct wlr_gles2_texture_attribs attribs; - wlr_gles2_texture_get_attribs(saved_buf->buffer->texture, &attribs); - + struct fx_texture_attribs attribs; + fx_texture_get_attribs(saved_buf->buffer->texture, &attribs); if (deco_data.alpha < 1.0 || attribs.has_alpha) { pixman_region32_t opaque_region; pixman_region32_init(&opaque_region); pixman_region32_union_rect(&opaque_region, &opaque_region, 0, 0, 0, 0); - struct wlr_box monitor_box = get_monitor_box(wlr_output); - wlr_box_transform(&monitor_box, &monitor_box, - wlr_output_transform_invert(wlr_output->transform), monitor_box.width, monitor_box.height); - struct blur_stencil_data stencil_data = { &fx_texture, &saved_buf->source_box, matrix }; bool should_optimize_blur = !container_is_floating_or_child(view->container) || config->blur_xray; - render_blur(should_optimize_blur, output, damage, &dst_box, &opaque_region, - &deco_data, &stencil_data); + render_blur(ctx, saved_buf->buffer->texture, + &saved_buf->source_box, &clip_box, should_optimize_blur, + &opaque_region, deco_data); pixman_region32_fini(&opaque_region); } @@ -870,54 +687,52 @@ static void render_saved_view(struct sway_view *view, struct sway_output *output deco_data.discard_transparent = false; - // Render saved surface texture - render_texture(wlr_output, damage, &fx_texture, - &saved_buf->source_box, &dst_box, matrix, deco_data); - } + render_texture(ctx, saved_buf->buffer->texture, + &saved_buf->source_box, &dst_box, &clip_box, saved_buf->transform, deco_data); - // FIXME: we should set the surface that this saved buffer originates from - // as sampled here. - // https://github.com/swaywm/sway/pull/4465#discussion_r321082059 + // FIXME: we should set the surface that this saved buffer originates from + // as sampled here. + // https://github.com/swaywm/sway/pull/4465#discussion_r321082059 + } } /** * Render a view's surface, shadow, and left/bottom/right borders. */ -static void render_view(struct sway_output *output, pixman_region32_t *damage, - struct sway_container *con, struct border_colors *colors, - struct decoration_data deco_data) { +static void render_view(struct fx_render_context *ctx, struct sway_container *con, + struct border_colors *colors, struct decoration_data deco_data) { struct sway_view *view = con->view; - struct sway_container_state *state = &con->current; - // render view if (!wl_list_empty(&view->saved_buffers)) { - render_saved_view(view, output, damage, deco_data); + render_saved_view(ctx, view, deco_data); } else if (view->surface) { - render_view_toplevels(view, output, damage, deco_data); + render_view_toplevels(ctx, view, deco_data); } + struct sway_container_state *state = &con->current; + if (state->border == B_CSD && !config->shadows_on_csd_enabled) { return; } - float output_scale = output->wlr_output->scale; struct wlr_box box; + int corner_radius = deco_data.corner_radius; + float output_scale = ctx->output->wlr_output->scale; // render shadow - if (con->shadow_enabled && config->shadow_blur_sigma > 0 && config->shadow_color[3] > 0.0) { - box.x = floor(state->x) - output->lx; - box.y = floor(state->y) - output->ly; + if (con->shadow_enabled && config_should_parameters_shadow()) { + box.x = floor(state->x) - ctx->output->lx; + box.y = floor(state->y) - ctx->output->ly; box.width = state->width; box.height = state->height; scale_box(&box, output_scale); - int scaled_corner_radius = deco_data.corner_radius == 0 ? - 0 : (deco_data.corner_radius + state->border_thickness) * output_scale; + int shadow_corner_radius = corner_radius == 0 ? 0 : corner_radius + state->border_thickness; float* shadow_color = view_is_urgent(view) || state->focused ? - config->shadow_color : config->shadow_inactive_color; - int offset_x = config->shadow_offset_x * output->wlr_output->scale; - int offset_y = config->shadow_offset_y * output->wlr_output->scale; - render_box_shadow(output, damage, &box, shadow_color, config->shadow_blur_sigma, - scaled_corner_radius, offset_x, offset_y); + config->shadow_color : config->shadow_inactive_color; + + render_box_shadow(ctx, &box, shadow_color, config->shadow_blur_sigma * output_scale, + shadow_corner_radius * output_scale, config->shadow_offset_x * output_scale, + config->shadow_offset_y * output_scale); } if (state->border == B_NONE || state->border == B_CSD) { @@ -928,22 +743,17 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, if (state->border_left) { memcpy(&color, colors->child_border, sizeof(float) * 4); - premultiply_alpha(color, deco_data.alpha); + premultiply_alpha(color, con->alpha); box.x = floor(state->x); box.y = floor(state->content_y); box.width = state->border_thickness; - box.height = state->content_height; - // adjust sizing for rounded border corners - if (deco_data.corner_radius) { - if (!deco_data.has_titlebar) { - box.y += deco_data.corner_radius; - box.height -= 2 * deco_data.corner_radius; - } else { - box.height -= deco_data.corner_radius; - } + box.height = state->content_height - corner_radius; + if (corner_radius && !deco_data.has_titlebar) { + box.y += corner_radius; + box.height -= corner_radius; } scale_box(&box, output_scale); - render_rect(output, damage, &box, color); + render_rect(ctx, &box, color); } list_t *siblings = container_get_current_siblings(con); @@ -956,22 +766,17 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, } else { memcpy(&color, colors->child_border, sizeof(float) * 4); } - premultiply_alpha(color, deco_data.alpha); + premultiply_alpha(color, con->alpha); box.x = floor(state->content_x + state->content_width); box.y = floor(state->content_y); box.width = state->border_thickness; - box.height = state->content_height; - // adjust sizing for rounded border corners - if (deco_data.corner_radius) { - if (!deco_data.has_titlebar) { - box.y += deco_data.corner_radius; - box.height -= 2 * deco_data.corner_radius; - } else { - box.height -= deco_data.corner_radius; - } + box.height = state->content_height - corner_radius; + if (corner_radius && !deco_data.has_titlebar) { + box.y += corner_radius; + box.height -= corner_radius; } scale_box(&box, output_scale); - render_rect(output, damage, &box, color); + render_rect(ctx, &box, color); } if (state->border_bottom) { @@ -980,42 +785,40 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, } else { memcpy(&color, colors->child_border, sizeof(float) * 4); } - premultiply_alpha(color, deco_data.alpha); + premultiply_alpha(color, con->alpha); box.x = floor(state->x); box.y = floor(state->content_y + state->content_height); box.width = state->width; box.height = state->border_thickness; - // adjust sizing for rounded border corners if (deco_data.corner_radius) { - box.x += deco_data.corner_radius + state->border_thickness; - box.width -= 2 * (deco_data.corner_radius + state->border_thickness); + box.x += corner_radius + state->border_thickness; + box.width -= 2 * (corner_radius + state->border_thickness); } scale_box(&box, output_scale); - render_rect(output, damage, &box, color); + render_rect(ctx, &box, color); - // rounded bottom left & bottom right border corners - if (deco_data.corner_radius) { - int size = 2 * (deco_data.corner_radius + state->border_thickness); - int scaled_thickness = state->border_thickness * output_scale; - int scaled_corner_radius = deco_data.corner_radius * output_scale; + if (corner_radius && state->border_thickness > 0) { + int size = 2 * (corner_radius + state->border_thickness); + int scaled_corner_radius = corner_radius * output_scale; + int scaled_border_thickness = state->border_thickness * output_scale; if (state->border_left) { - box.width = size; - box.height = size; box.x = floor(state->x); box.y = floor(state->y + state->height - size); + box.width = size; + box.height = size; scale_box(&box, output_scale); - render_border_corner(output, damage, &box, color, - scaled_corner_radius, scaled_thickness, BOTTOM_LEFT); + render_rounded_border_corner(ctx, &box, color, scaled_corner_radius, + scaled_border_thickness, BOTTOM_LEFT); } if (state->border_right) { - box.width = size; - box.height = size; box.x = floor(state->x + state->width - size); box.y = floor(state->y + state->height - size); + box.width = size; + box.height = size; scale_box(&box, output_scale); - render_border_corner(output, damage, &box, color, - scaled_corner_radius, scaled_thickness, BOTTOM_RIGHT); + render_rounded_border_corner(ctx, &box, color, scaled_corner_radius, + scaled_border_thickness, BOTTOM_RIGHT); } } } @@ -1030,13 +833,13 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, * The height is: 1px border, 3px padding, font height, 3px padding, 1px border * The left side is: 1px border, 2px padding, title */ -static void render_titlebar(struct sway_output *output, - pixman_region32_t *output_damage, struct sway_container *con, int x, int y, - int width, struct border_colors *colors, float alpha, int corner_radius, +static void render_titlebar(struct fx_render_context *ctx, struct sway_container *con, + int x, int y, int width, struct border_colors *colors, int corner_radius, enum corner_location corner_location, struct wlr_texture *title_texture, struct wlr_texture *marks_texture) { struct wlr_box box; float color[4]; + struct sway_output *output = ctx->output; float output_scale = output->wlr_output->scale; double output_x = output->lx; double output_y = output->ly; @@ -1046,17 +849,15 @@ static void render_titlebar(struct sway_output *output, enum alignment title_align = config->title_align; // value by which all heights should be adjusted to counteract removed bottom border int bottom_border_compensation = config->titlebar_separator ? 0 : titlebar_border_thickness; - - if (corner_location == NONE) { - corner_radius = 0; - } + corner_radius *= output_scale; // Single pixel bar above title memcpy(&color, colors->border, sizeof(float) * 4); - premultiply_alpha(color, alpha); + premultiply_alpha(color, con->alpha); box.x = x; box.y = y; box.width = width; + box.height = titlebar_border_thickness; if (corner_radius) { if (corner_location != TOP_RIGHT) { box.x += corner_radius; @@ -1066,47 +867,43 @@ static void render_titlebar(struct sway_output *output, } else { box.width -= corner_radius; } - } else { - box.x += titlebar_border_thickness; - box.width -= titlebar_border_thickness * 2; } - box.height = titlebar_border_thickness; scale_box(&box, output_scale); - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); // Single pixel bar below title - if (config->titlebar_separator) { + if (!bottom_border_compensation) { box.x = x; box.y = y + container_titlebar_height() - titlebar_border_thickness; box.width = width; box.height = titlebar_border_thickness; scale_box(&box, output_scale); - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); } - // Single pixel bar left edge + // Single pixel left edge box.x = x; box.y = y; box.width = titlebar_border_thickness; - box.height = container_titlebar_height() + bottom_border_compensation; + box.height = container_titlebar_height() - titlebar_border_thickness + bottom_border_compensation; if (corner_radius && corner_location != TOP_RIGHT) { box.height -= corner_radius; box.y += corner_radius; } scale_box(&box, output_scale); - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); - // Single pixel bar right edge + // Single pixel right edge box.x = x + width - titlebar_border_thickness; box.y = y; box.width = titlebar_border_thickness; - box.height = container_titlebar_height() + bottom_border_compensation; + box.height = container_titlebar_height() - titlebar_border_thickness + bottom_border_compensation; if (corner_radius && corner_location != TOP_LEFT) { box.height -= corner_radius; box.y += corner_radius; } scale_box(&box, output_scale); - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); // if corner_radius: single pixel corners if (corner_radius) { @@ -1117,8 +914,8 @@ static void render_titlebar(struct sway_output *output, box.width = corner_radius * 2; box.height = corner_radius * 2; scale_box(&box, output_scale); - render_border_corner(output, output_damage, &box, color, - corner_radius, titlebar_border_thickness, TOP_LEFT); + render_rounded_border_corner(ctx, &box, color, corner_radius, + titlebar_border_thickness * output_scale, TOP_LEFT); } // right corner @@ -1128,8 +925,8 @@ static void render_titlebar(struct sway_output *output, box.width = corner_radius * 2; box.height = corner_radius * 2; scale_box(&box, output_scale); - render_border_corner(output, output_damage, &box, color, - corner_radius, titlebar_border_thickness, TOP_RIGHT); + render_rounded_border_corner(ctx, &box, color, corner_radius, + titlebar_border_thickness * output_scale, TOP_RIGHT); } } @@ -1138,7 +935,7 @@ static void render_titlebar(struct sway_output *output, size_t inner_width = width - titlebar_h_padding * 2; // output-buffer local - int ob_inner_x = round(inner_x * output_scale); + int ob_inner_x = roundf(inner_x * output_scale); int ob_inner_width = scale_length(inner_width, inner_x, output_scale); int ob_bg_height = scale_length( (titlebar_v_padding - titlebar_border_thickness) * 2 + @@ -1146,7 +943,7 @@ static void render_titlebar(struct sway_output *output, // title marks textures should have no eyecandy struct decoration_data deco_data = get_undecorated_decoration_data(); - deco_data.alpha = alpha; + deco_data.alpha = con->alpha; // Marks int ob_marks_x = 0; // output-buffer-local @@ -1176,31 +973,26 @@ static void render_titlebar(struct sway_output *output, texture_box.y = round((bg_y - output_y) * output_scale) + ob_padding_above; - float matrix[9]; - wlr_matrix_project_box(matrix, &texture_box, - WL_OUTPUT_TRANSFORM_NORMAL, - 0.0, output->wlr_output->transform_matrix); - - if (ob_inner_width < texture_box.width) { - texture_box.width = ob_inner_width; + struct wlr_box clip_box = texture_box; + if (ob_inner_width < clip_box.width) { + clip_box.width = ob_inner_width; } - struct fx_texture fx_texture = fx_texture_from_wlr_texture(marks_texture); - render_texture(output->wlr_output, output_damage, &fx_texture, - NULL, &texture_box, matrix, deco_data); + render_texture(ctx, marks_texture, + NULL, &texture_box, &clip_box, WL_OUTPUT_TRANSFORM_NORMAL, deco_data); // Padding above memcpy(&color, colors->background, sizeof(float) * 4); - premultiply_alpha(color, alpha); - box.x = texture_box.x + round(output_x * output_scale); - box.y = round((y + titlebar_border_thickness) * output_scale); - box.width = texture_box.width; + premultiply_alpha(color, con->alpha); + box.x = clip_box.x + round(output_x * output_scale); + box.y = roundf((y + titlebar_border_thickness) * output_scale); + box.width = clip_box.width; box.height = ob_padding_above; - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); // Padding below - box.y += ob_padding_above + texture_box.height; + box.y += ob_padding_above + clip_box.height; box.height = ob_padding_below + bottom_border_compensation; - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); } // Title text @@ -1223,7 +1015,7 @@ static void render_titlebar(struct sway_output *output, // The title texture might be shorter than the config->font_height, // in which case we need to pad it above and below. - int ob_padding_above = round((titlebar_v_padding - + int ob_padding_above = roundf((titlebar_v_padding - titlebar_border_thickness) * output_scale); int ob_padding_below = ob_bg_height - ob_padding_above - texture_box.height; @@ -1252,32 +1044,27 @@ static void render_titlebar(struct sway_output *output, texture_box.y = round((bg_y - output_y) * output_scale) + ob_padding_above; - float matrix[9]; - wlr_matrix_project_box(matrix, &texture_box, - WL_OUTPUT_TRANSFORM_NORMAL, - 0.0, output->wlr_output->transform_matrix); - - if (ob_inner_width - ob_marks_width < texture_box.width) { - texture_box.width = ob_inner_width - ob_marks_width; + struct wlr_box clip_box = texture_box; + if (ob_inner_width - ob_marks_width < clip_box.width) { + clip_box.width = ob_inner_width - ob_marks_width; } - struct fx_texture fx_texture = fx_texture_from_wlr_texture(title_texture); - render_texture(output->wlr_output, output_damage, &fx_texture, - NULL, &texture_box, matrix, deco_data); + render_texture(ctx, title_texture, + NULL, &texture_box, &clip_box, WL_OUTPUT_TRANSFORM_NORMAL, deco_data); // Padding above memcpy(&color, colors->background, sizeof(float) * 4); - premultiply_alpha(color, alpha); - box.x = texture_box.x + round(output_x * output_scale); - box.y = round((y + titlebar_border_thickness) * output_scale); - box.width = texture_box.width; + premultiply_alpha(color, con->alpha); + box.x = clip_box.x + round(output_x * output_scale); + box.y = roundf((y + titlebar_border_thickness) * output_scale); + box.width = clip_box.width; box.height = ob_padding_above; - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); // Padding below - box.y += ob_padding_above + texture_box.height; + box.y += ob_padding_above + clip_box.height; box.height = ob_padding_below + bottom_border_compensation; - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); } // Determine the left + right extends of the textures (output-buffer local) @@ -1309,9 +1096,9 @@ static void render_titlebar(struct sway_output *output, box.width = ob_right_x - ob_left_x - ob_left_width; if (box.width > 0) { box.x = ob_left_x + ob_left_width + round(output_x * output_scale); - box.y = round(bg_y * output_scale); + box.y = roundf(bg_y * output_scale); box.height = ob_bg_height + bottom_border_compensation; - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); } // Padding on left side @@ -1325,10 +1112,10 @@ static void render_titlebar(struct sway_output *output, if (box.x + box.width < left_x) { box.width += left_x - box.x - box.width; } - if (corner_radius && corner_location != TOP_RIGHT) { - render_rounded_rect(output, output_damage, &box, color, corner_radius, TOP_LEFT); + if (corner_radius && (corner_location == TOP_LEFT || corner_location == ALL)) { + render_rounded_rect(ctx, &box, color, corner_radius, TOP_LEFT); } else { - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); } // Padding on right side @@ -1343,67 +1130,57 @@ static void render_titlebar(struct sway_output *output, box.width += box.x - right_rx; box.x = right_rx; } - if (corner_radius && corner_location != TOP_LEFT) { - render_rounded_rect(output, output_damage, &box, color, corner_radius, TOP_RIGHT); + if (corner_radius && (corner_location == TOP_RIGHT || corner_location == ALL)) { + render_rounded_rect(ctx, &box, color, corner_radius, TOP_RIGHT); } else { - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); } } /** * Render the top border line for a view using "border pixel". */ -static void render_top_border(struct sway_output *output, - pixman_region32_t *output_damage, struct sway_container_state *state, - struct border_colors *colors, float alpha, int corner_radius) { +static void render_top_border(struct fx_render_context *ctx, struct sway_container *con, + struct border_colors *colors, int corner_radius) { + struct sway_container_state *state = &con->current; if (!state->border_top) { return; } struct wlr_box box; float color[4]; - float output_scale = output->wlr_output->scale; + float output_scale = ctx->output->wlr_output->scale; // Child border - top edge memcpy(&color, colors->child_border, sizeof(float) * 4); - premultiply_alpha(color, alpha); - box.x = floor(state->x); + premultiply_alpha(color, con->alpha); + box.x = floor(state->x) + corner_radius; box.y = floor(state->y); - box.width = state->width; + box.width = state->width - (2 * corner_radius); box.height = state->border_thickness; - - // adjust sizing for rounded border corners - if (corner_radius) { - box.x += corner_radius + state->border_thickness; - box.width -= 2 * (corner_radius + state->border_thickness); - } scale_box(&box, output_scale); - render_rect(output, output_damage, &box, color); + render_rect(ctx, &box, color); - // render rounded top corner borders if corner_radius is set > 0 - if (corner_radius) { + if (corner_radius && state->border_thickness > 0) { int size = 2 * (corner_radius + state->border_thickness); - int scaled_thickness = state->border_thickness * output_scale; int scaled_corner_radius = corner_radius * output_scale; - - // top left + int scaled_border_thickness = state->border_thickness * output_scale; if (state->border_left) { - box.width = size; - box.height = size; box.x = floor(state->x); box.y = floor(state->y); + box.width = size; + box.height = size; scale_box(&box, output_scale); - render_border_corner(output, output_damage, &box, color, - scaled_corner_radius, scaled_thickness, TOP_LEFT); + render_rounded_border_corner(ctx, &box, color, scaled_corner_radius, + scaled_border_thickness, TOP_LEFT); } - // top right if (state->border_right) { - box.width = size; - box.height = size; box.x = floor(state->x + state->width - size); box.y = floor(state->y); + box.width = size; + box.height = size; scale_box(&box, output_scale); - render_border_corner(output, output_damage, &box, color, - scaled_corner_radius, scaled_thickness, TOP_RIGHT); + render_rounded_border_corner(ctx, &box, color, scaled_corner_radius, + scaled_border_thickness, TOP_RIGHT); } } } @@ -1416,17 +1193,17 @@ struct parent_data { struct sway_container *active_child; }; -static void render_container(struct sway_output *output, - pixman_region32_t *damage, struct sway_container *con, bool parent_focused); +static void render_container(struct fx_render_context *ctx, + struct sway_container *con, bool parent_focused); +// TODO: no rounding top corners when rendering with titlebar /** * Render a container's children using a L_HORIZ or L_VERT layout. * * Wrap child views in borders and leave child containers borderless because * they'll apply their own borders to their children. */ -static void render_containers_linear(struct sway_output *output, - pixman_region32_t *damage, struct parent_data *parent) { +static void render_containers_linear(struct fx_render_context *ctx, struct parent_data *parent) { for (int i = 0; i < parent->children->length; ++i) { struct sway_container *child = parent->children->items[i]; @@ -1469,7 +1246,7 @@ static void render_containers_linear(struct sway_output *output, .dim = child->current.focused || parent->focused ? 0.0f : child->dim, // no corner radius if no gaps (allows smart_gaps to work as expected) .corner_radius = config->smart_corner_radius && - output->current.active_workspace->current_gaps.top == 0 + ctx->output->current.active_workspace->current_gaps.top == 0 ? 0 : child->corner_radius, .saturation = child->saturation, .has_titlebar = has_titlebar, @@ -1477,16 +1254,16 @@ static void render_containers_linear(struct sway_output *output, .discard_transparent = false, .shadow = child->shadow_enabled, }; - render_view(output, damage, child, colors, deco_data); + render_view(ctx, child, colors, deco_data); if (has_titlebar) { - render_titlebar(output, damage, child, floor(state->x), floor(state->y), - state->width, colors, deco_data.alpha, deco_data.corner_radius, + render_titlebar(ctx, child, floor(state->x), floor(state->y), + state->width, colors, deco_data.corner_radius, ALL, title_texture, marks_texture); } else if (state->border == B_PIXEL) { - render_top_border(output, damage, state, colors, deco_data.alpha, deco_data.corner_radius); + render_top_border(ctx, child, colors, deco_data.corner_radius); } } else { - render_container(output, damage, child, + render_container(ctx, child, parent->focused || child->current.focused); } } @@ -1503,8 +1280,7 @@ static bool container_has_focused_child(struct sway_container *con) { /** * Render a container's children using the L_TABBED layout. */ -static void render_containers_tabbed(struct sway_output *output, - pixman_region32_t *damage, struct parent_data *parent) { +static void render_containers_tabbed(struct fx_render_context *ctx, struct parent_data *parent) { if (!parent->children->length) { return; } @@ -1520,7 +1296,7 @@ static void render_containers_tabbed(struct sway_output *output, .dim = current->current.focused || parent->focused ? 0.0f : current->dim, // no corner radius if no gaps (allows smart_gaps to work as expected) .corner_radius = config->smart_corner_radius && - output->current.active_workspace->current_gaps.top == 0 + ctx->output->current.active_workspace->current_gaps.top == 0 ? 0 : current->corner_radius, .saturation = current->saturation, .has_titlebar = true, @@ -1570,19 +1346,20 @@ static void render_containers_tabbed(struct sway_output *output, } // only round outer corners - enum corner_location corner_location = NONE; - if (i == 0) { - if (i == parent->children->length - 1) { - corner_location = ALL; - } else { + int corner_radius = deco_data.corner_radius; + enum corner_location corner_location = ALL; + if (parent->children->length > 1) { + if (i == 0) { corner_location = TOP_LEFT; + } else if (i == parent->children->length - 1) { + corner_location = TOP_RIGHT; + } else { + corner_radius = 0; } - } else if (i == parent->children->length - 1) { - corner_location = TOP_RIGHT; } - render_titlebar(output, damage, child, x, parent->box.y, tab_width, colors, - deco_data.alpha, deco_data.corner_radius, corner_location, title_texture, marks_texture); + render_titlebar(ctx, child, x, parent->box.y, tab_width, colors, + corner_radius, corner_location, title_texture, marks_texture); if (child == current) { current_colors = colors; @@ -1591,9 +1368,9 @@ static void render_containers_tabbed(struct sway_output *output, // Render surface and left/right/bottom borders if (current->view) { - render_view(output, damage, current, current_colors, deco_data); + render_view(ctx, current, current_colors, deco_data); } else { - render_container(output, damage, current, + render_container(ctx, current, parent->focused || current->current.focused); } } @@ -1601,8 +1378,7 @@ static void render_containers_tabbed(struct sway_output *output, /** * Render a container's children using the L_STACKED layout. */ -static void render_containers_stacked(struct sway_output *output, - pixman_region32_t *damage, struct parent_data *parent) { +static void render_containers_stacked(struct fx_render_context *ctx, struct parent_data *parent) { if (!parent->children->length) { return; } @@ -1618,7 +1394,7 @@ static void render_containers_stacked(struct sway_output *output, .dim = current->current.focused || parent->focused ? 0.0f : current->dim, .saturation = current->saturation, .corner_radius = config->smart_corner_radius && - output->current.active_workspace->current_gaps.top == 0 + ctx->output->current.active_workspace->current_gaps.top == 0 ? 0 : current->corner_radius, .has_titlebar = true, .blur = current->blur_enabled, @@ -1661,8 +1437,8 @@ static void render_containers_stacked(struct sway_output *output, int y = parent->box.y + titlebar_height * i; int corner_radius = i != 0 ? 0 : deco_data.corner_radius; - render_titlebar(output, damage, child, parent->box.x, y, parent->box.width, - colors, deco_data.alpha, corner_radius, ALL, title_texture, marks_texture); + render_titlebar(ctx, child, parent->box.x, y, parent->box.width, colors, + corner_radius, ALL, title_texture, marks_texture); if (child == current) { current_colors = colors; @@ -1671,19 +1447,18 @@ static void render_containers_stacked(struct sway_output *output, // Render surface and left/right/bottom borders if (current->view) { - render_view(output, damage, current, current_colors, deco_data); + render_view(ctx, current, current_colors, deco_data); } else { - render_container(output, damage, current, + render_container(ctx, current, parent->focused || current->current.focused); } } -static void render_containers(struct sway_output *output, - pixman_region32_t *damage, struct parent_data *parent) { +static void render_containers(struct fx_render_context *ctx, struct parent_data *parent) { if (config->hide_lone_tab && parent->children->length == 1) { struct sway_container *child = parent->children->items[0]; if (child->view) { - render_containers_linear(output,damage, parent); + render_containers_linear(ctx, parent); return; } } @@ -1692,19 +1467,19 @@ static void render_containers(struct sway_output *output, case L_NONE: case L_HORIZ: case L_VERT: - render_containers_linear(output, damage, parent); + render_containers_linear(ctx, parent); break; case L_STACKED: - render_containers_stacked(output, damage, parent); + render_containers_stacked(ctx, parent); break; case L_TABBED: - render_containers_tabbed(output, damage, parent); + render_containers_tabbed(ctx, parent); break; } } -static void render_container(struct sway_output *output, - pixman_region32_t *damage, struct sway_container *con, bool focused) { +static void render_container(struct fx_render_context *ctx, + struct sway_container *con, bool focused) { struct parent_data data = { .layout = con->current.layout, .box = { @@ -1717,11 +1492,11 @@ static void render_container(struct sway_output *output, .focused = focused, .active_child = con->current.focused_inactive_child, }; - render_containers(output, damage, &data); + render_containers(ctx, &data); } -static void render_workspace(struct sway_output *output, - pixman_region32_t *damage, struct sway_workspace *ws, bool focused) { +static void render_workspace(struct fx_render_context *ctx, + struct sway_workspace *ws, bool focused) { struct parent_data data = { .layout = ws->current.layout, .box = { @@ -1734,11 +1509,11 @@ static void render_workspace(struct sway_output *output, .focused = focused, .active_child = ws->current.focused_inactive_child, }; - render_containers(output, damage, &data); + render_containers(ctx, &data); } -static void render_floating_container(struct sway_output *soutput, - pixman_region32_t *damage, struct sway_container *con) { +static void render_floating_container(struct fx_render_context *ctx, + struct sway_container *con) { struct sway_container_state *state = &con->current; if (con->view) { struct sway_view *view = con->view; @@ -1774,21 +1549,19 @@ static void render_floating_container(struct sway_output *soutput, .discard_transparent = false, .shadow = con->shadow_enabled, }; - render_view(soutput, damage, con, colors, deco_data); + render_view(ctx, con, colors, deco_data); if (has_titlebar) { - render_titlebar(soutput, damage, con, floor(state->x), floor(state->y), - state->width, colors, deco_data.alpha, deco_data.corner_radius, - ALL, title_texture, marks_texture); + render_titlebar(ctx, con, floor(con->current.x), floor(con->current.y), con->current.width, + colors, deco_data.corner_radius, ALL, title_texture, marks_texture); } else if (state->border == B_PIXEL) { - render_top_border(soutput, damage, state, colors, deco_data.alpha, deco_data.corner_radius); + render_top_border(ctx, con, colors, deco_data.corner_radius); } } else { - render_container(soutput, damage, con, state->focused); + render_container(ctx, con, state->focused); } } -static void render_floating(struct sway_output *soutput, - pixman_region32_t *damage) { +static void render_floating(struct fx_render_context *ctx) { for (int i = 0; i < root->outputs->length; ++i) { struct sway_output *output = root->outputs->items[i]; for (int j = 0; j < output->current.workspaces->length; ++j) { @@ -1801,24 +1574,26 @@ static void render_floating(struct sway_output *soutput, if (floater->current.fullscreen_mode != FULLSCREEN_NONE) { continue; } - render_floating_container(soutput, damage, floater); + render_floating_container(ctx, floater); } } } } -static void render_seatops(struct sway_output *output, - pixman_region32_t *damage) { +static void render_seatops(struct fx_render_context *ctx) { struct sway_seat *seat; wl_list_for_each(seat, &server.input->seats, link) { - seatop_render(seat, output, damage); + seatop_render(seat, ctx); } } -void output_render(struct sway_output *output, struct timespec *when, - pixman_region32_t *damage) { - struct wlr_output *wlr_output = output->wlr_output; - struct fx_renderer *renderer = output->renderer; +void output_render(struct fx_render_context *ctx) { + struct wlr_output *wlr_output = ctx->output->wlr_output; + struct sway_output *output = ctx->output; + pixman_region32_t *damage = ctx->output_damage; + + struct fx_effect_framebuffers *effect_fbos = ctx->pass->fx_effect_framebuffers; + struct fx_renderer *renderer = fx_get_renderer(ctx->renderer); struct sway_workspace *workspace = output->current.active_workspace; if (workspace == NULL) { @@ -1830,47 +1605,45 @@ void output_render(struct sway_output *output, struct timespec *when, fullscreen_con = workspace->current.fullscreen; } - // TODO: generate the monitor box in fx_renderer (since it already has a wlr_output) - struct wlr_box monitor_box = get_monitor_box(wlr_output); - wlr_box_transform(&monitor_box, &monitor_box, - wlr_output_transform_invert(wlr_output->transform), - monitor_box.width, monitor_box.height); - - fx_renderer_begin(renderer, monitor_box.width, monitor_box.height); - - int output_width, output_height; - wlr_output_transformed_resolution(wlr_output, &output_width, &output_height); - - if (debug.damage == DAMAGE_RERENDER) { - pixman_region32_union_rect(damage, damage, 0, 0, output_width, output_height); - } - if (!pixman_region32_not_empty(damage)) { // Output isn't damaged but needs buffer swap goto renderer_end; } if (debug.damage == DAMAGE_HIGHLIGHT) { - fx_renderer_clear((float[]){1, 1, 0, 1}); - } + fx_render_pass_add_rect(ctx->pass, &(struct fx_render_rect_options){ + .base = { + .box = { .width = wlr_output->width, .height = wlr_output->height }, + .color = { .r = 1, .g = 1, .b = 0, .a = 1 }, + }, + }); + } + pixman_region32_t transformed_damage; + pixman_region32_init(&transformed_damage); + pixman_region32_copy(&transformed_damage, damage); + transform_output_damage(&transformed_damage, wlr_output); if (server.session_lock.locked) { - float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f}; + struct wlr_render_color clear_color = { + .a = 1.0f + }; if (server.session_lock.lock == NULL) { // abandoned lock -> red BG - clear_color[0] = 1.f; - } - int nrects; - pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects); - for (int i = 0; i < nrects; ++i) { - scissor_output(wlr_output, &rects[i]); - fx_renderer_clear(clear_color); + clear_color.r = 1.f; } + fx_render_pass_add_rect(ctx->pass, &(struct fx_render_rect_options){ + .base = { + .box = { .width = wlr_output->width, .height = wlr_output->height }, + .color = clear_color, + .clip = &transformed_damage, + }, + }); + if (server.session_lock.lock != NULL) { struct render_data data = { - .damage = damage, .deco_data = get_undecorated_decoration_data(), + .ctx = ctx, }; struct wlr_session_lock_surface_v1 *lock_surface; @@ -1878,7 +1651,7 @@ void output_render(struct sway_output *output, struct timespec *when, if (lock_surface->output != wlr_output) { continue; } - if (!lock_surface->mapped) { + if (!lock_surface->surface->mapped) { continue; } @@ -1894,46 +1667,47 @@ void output_render(struct sway_output *output, struct timespec *when, } if (fullscreen_con) { - float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f}; - - int nrects; - pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects); - for (int i = 0; i < nrects; ++i) { - scissor_output(wlr_output, &rects[i]); - fx_renderer_clear(clear_color); - } + fx_render_pass_add_rect(ctx->pass, &(struct fx_render_rect_options){ + .base = { + .box = { .width = wlr_output->width, .height = wlr_output->height }, + .color = { .r = 0, .g = 0, .b = 0, .a = 1 }, + .clip = &transformed_damage, + }, + }); if (fullscreen_con->view) { struct decoration_data deco_data = get_undecorated_decoration_data(); deco_data.saturation = fullscreen_con->saturation; if (!wl_list_empty(&fullscreen_con->view->saved_buffers)) { - render_saved_view(fullscreen_con->view, output, damage, deco_data); + render_saved_view(ctx, fullscreen_con->view, deco_data); } else if (fullscreen_con->view->surface) { - render_view_toplevels(fullscreen_con->view, output, damage, deco_data); + render_view_toplevels(ctx, fullscreen_con->view, deco_data); } } else { - render_container(output, damage, fullscreen_con, - fullscreen_con->current.focused); + render_container(ctx, fullscreen_con, fullscreen_con->current.focused); } for (int i = 0; i < workspace->current.floating->length; ++i) { struct sway_container *floater = workspace->current.floating->items[i]; if (container_is_transient_for(floater, fullscreen_con)) { - render_floating_container(output, damage, floater); + render_floating_container(ctx, floater); } } #if HAVE_XWAYLAND - render_unmanaged(output, damage, &root->xwayland_unmanaged); + render_unmanaged(ctx, &root->xwayland_unmanaged); #endif } else { + int output_width, output_height; + wlr_output_transformed_resolution(wlr_output, &output_width, &output_height); + pixman_region32_t blur_region; pixman_region32_init(&blur_region); bool workspace_has_blur = workspace_get_blur_info(workspace, &blur_region); // Expand the damage to compensate for blur if (workspace_has_blur) { // Skip the blur artifact prevention if damaging the whole viewport - if (renderer->blur_buffer_dirty) { + if (effect_fbos->blur_buffer_dirty) { // Needs to be extended before clearing pixman_region32_union_rect(damage, damage, 0, 0, output_width, output_height); @@ -1970,51 +1744,62 @@ void output_render(struct sway_output *output, struct timespec *when, pixman_region32_fini(&extended_damage); // Capture the padding pixels before blur for later use - fx_framebuffer_bind(&renderer->blur_saved_pixels_buffer); - // TODO: Investigate blitting instead - render_whole_output(renderer, wlr_output, - &renderer->blur_padding_region, &renderer->wlr_buffer.texture); - fx_framebuffer_bind(&renderer->wlr_buffer); + fx_renderer_read_to_buffer(ctx->pass, &renderer->blur_padding_region, + ctx->pass->fx_effect_framebuffers->blur_saved_pixels_buffer, + ctx->pass->buffer, true); } } pixman_region32_fini(&blur_region); - float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f}; + fx_render_pass_add_rect(ctx->pass, &(struct fx_render_rect_options){ + .base = { + .box = { .width = wlr_output->width, .height = wlr_output->height }, + .color = { .r = 0.25f, .g = 0.25f, .b = 0.25f, .a = 1 }, + .clip = &transformed_damage, + }, + }); - int nrects; - pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects); - for (int i = 0; i < nrects; ++i) { - scissor_output(wlr_output, &rects[i]); - fx_renderer_clear(clear_color); - } - - render_layer_toplevel(output, damage, + render_layer_toplevel(ctx, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]); - render_layer_toplevel(output, damage, + render_layer_toplevel(ctx, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]); - // check if the background needs to be blurred - if (workspace_has_blur && renderer->blur_buffer_dirty) { - render_output_blur(output, damage); + // Check if the background needs to be blurred. + // Render optimized/x-ray blur + if (workspace_has_blur && effect_fbos->blur_buffer_dirty) { + const float opacity = 1.0f; + struct fx_render_blur_pass_options blur_options = { + .tex_options = { + .base = { + .transform = WL_OUTPUT_TRANSFORM_NORMAL, + .alpha = &opacity, + .blend_mode = WLR_RENDER_BLEND_MODE_NONE, + }, + .corner_radius = 0, + .discard_transparent = false, + }, + .blur_data = &config->blur_params, + }; + fx_render_pass_add_optimized_blur(ctx->pass, &blur_options); } - render_workspace(output, damage, workspace, workspace->current.focused); - render_floating(output, damage); + render_workspace(ctx, workspace, workspace->current.focused); + render_floating(ctx); #if HAVE_XWAYLAND - render_unmanaged(output, damage, &root->xwayland_unmanaged); + render_unmanaged(ctx, &root->xwayland_unmanaged); #endif - render_layer_toplevel(output, damage, + render_layer_toplevel(ctx, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]); - render_layer_popups(output, damage, + render_layer_popups(ctx, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]); - render_layer_popups(output, damage, + render_layer_popups(ctx, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]); - render_layer_popups(output, damage, + render_layer_popups(ctx, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]); } - render_seatops(output, damage); + render_seatops(ctx); struct sway_seat *seat = input_manager_current_seat(); struct sway_container *focus = seat_get_focused_container(seat); @@ -2032,51 +1817,25 @@ void output_render(struct sway_output *output, struct timespec *when, .discard_transparent = false, .shadow = false, }; - render_view_popups(focus->view, output, damage, deco_data); + render_view_popups(ctx, focus->view, deco_data); } render_overlay: - render_layer_toplevel(output, damage, + render_layer_toplevel(ctx, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]); - render_layer_popups(output, damage, + render_layer_popups(ctx, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]); - render_drag_icons(output, damage, &root->drag_icons); + render_drag_icons(ctx, &root->drag_icons); renderer_end: // Not needed if we damaged the whole viewport - if (!renderer->blur_buffer_dirty) { + if (!effect_fbos->blur_buffer_dirty) { // Render the saved pixels over the blur artifacts - // TODO: Investigate blitting instead - render_whole_output(renderer, wlr_output, &renderer->blur_padding_region, - &renderer->blur_saved_pixels_buffer.texture); - } - - fx_renderer_end(output->renderer); - fx_renderer_scissor(NULL); - - // Draw the software cursors - wlr_renderer_begin(output->server->wlr_renderer, wlr_output->width, wlr_output->height); - wlr_output_render_software_cursors(wlr_output, damage); - wlr_renderer_end(output->server->wlr_renderer); - - pixman_region32_t frame_damage; - pixman_region32_init(&frame_damage); - - enum wl_output_transform transform = wlr_output_transform_invert(wlr_output->transform); - wlr_region_transform(&frame_damage, damage, transform, output_width, output_height); - - if (debug.damage != DAMAGE_DEFAULT) { - pixman_region32_union_rect(&frame_damage, &frame_damage, - 0, 0, wlr_output->width, wlr_output->height); - } - - wlr_output_set_damage(wlr_output, &frame_damage); - pixman_region32_fini(&frame_damage); - - if (!wlr_output_commit(wlr_output)) { - return; + fx_renderer_read_to_buffer(ctx->pass, &renderer->blur_padding_region, + ctx->pass->buffer, + ctx->pass->fx_effect_framebuffers->blur_saved_pixels_buffer, true); } - wlr_damage_ring_rotate(&output->damage_ring); - output->last_frame = *when; + pixman_region32_fini(&transformed_damage); + wlr_output_add_software_cursors_to_render_pass(wlr_output, &ctx->pass->base, damage); } diff --git a/sway/desktop/surface.c b/sway/desktop/surface.c index 1d7b536d..5932eaa2 100644 --- a/sway/desktop/surface.c +++ b/sway/desktop/surface.c @@ -2,8 +2,10 @@ #include <stdlib.h> #include <time.h> #include <wlr/types/wlr_compositor.h> +#include <wlr/types/wlr_fractional_scale_v1.h> #include "sway/server.h" #include "sway/surface.h" +#include "sway/output.h" static void handle_destroy(struct wl_listener *listener, void *data) { struct sway_surface *surface = wl_container_of(listener, surface, destroy); @@ -44,3 +46,27 @@ void handle_compositor_new_surface(struct wl_listener *listener, void *data) { wl_resource_post_no_memory(wlr_surface->resource); } } + +void surface_update_outputs(struct wlr_surface *surface) { + float scale = 1; + struct wlr_surface_output *surface_output; + wl_list_for_each(surface_output, &surface->current_outputs, link) { + if (surface_output->output->scale > scale) { + scale = surface_output->output->scale; + } + } + wlr_fractional_scale_v1_notify_scale(surface, scale); + wlr_surface_set_preferred_buffer_scale(surface, ceil(scale)); +} + +void surface_enter_output(struct wlr_surface *surface, + struct sway_output *output) { + wlr_surface_send_enter(surface, output->wlr_output); + surface_update_outputs(surface); +} + +void surface_leave_output(struct wlr_surface *surface, + struct sway_output *output) { + wlr_surface_send_leave(surface, output->wlr_output); + surface_update_outputs(surface); +} diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index f5a3a053..6947e138 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c @@ -344,7 +344,7 @@ static void transaction_progress(void) { server.queued_transaction = NULL; if (!server.pending_transaction) { - sway_idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1); + sway_idle_inhibit_v1_check_active(); return; } diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 2d79727d..6dde98bd 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -67,7 +67,13 @@ static void popup_unconstrain(struct sway_xdg_popup *popup) { struct sway_view *view = popup->child.view; struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_popup; - struct sway_output *output = view->container->pending.workspace->output; + struct sway_workspace *workspace = view->container->pending.workspace; + if (!workspace) { + // is null if in the scratchpad + return; + } + + struct sway_output *output = workspace->output; // the output box expressed in the coordinate system of the toplevel parent // of the popup @@ -98,8 +104,8 @@ static struct sway_xdg_popup *popup_create( wl_signal_add(&xdg_surface->events.destroy, &popup->destroy); popup->destroy.notify = popup_handle_destroy; - wl_signal_add(&xdg_surface->events.map, &popup->child.surface_map); - wl_signal_add(&xdg_surface->events.unmap, &popup->child.surface_unmap); + wl_signal_add(&xdg_surface->surface->events.map, &popup->child.surface_map); + wl_signal_add(&xdg_surface->surface->events.unmap, &popup->child.surface_unmap); popup_unconstrain(popup); @@ -163,12 +169,19 @@ static void set_tiled(struct sway_view *view, bool tiled) { if (xdg_shell_view_from_view(view) == NULL) { return; } - enum wlr_edges edges = WLR_EDGE_NONE; - if (tiled) { - edges = WLR_EDGE_LEFT | WLR_EDGE_RIGHT | WLR_EDGE_TOP | - WLR_EDGE_BOTTOM; + if (wl_resource_get_version(view->wlr_xdg_toplevel->resource) >= + XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION) { + enum wlr_edges edges = WLR_EDGE_NONE; + if (tiled) { + edges = WLR_EDGE_LEFT | WLR_EDGE_RIGHT | WLR_EDGE_TOP | + WLR_EDGE_BOTTOM; + } + wlr_xdg_toplevel_set_tiled(view->wlr_xdg_toplevel, edges); + } else { + // The version is too low for the tiled state; configure as maximized instead + // to stop the client from drawing decorations outside of the toplevel geometry. + wlr_xdg_toplevel_set_maximized(view->wlr_xdg_toplevel, tiled); } - wlr_xdg_toplevel_set_tiled(view->wlr_xdg_toplevel, edges); } static void set_fullscreen(struct sway_view *view, bool fullscreen) { @@ -288,6 +301,11 @@ static void handle_commit(struct wl_listener *listener, void *data) { memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box)); if (container_is_floating(view->container)) { view_update_size(view); + // Only set the toplevel size the current container actually has a size. + if (view->container->current.width) { + wlr_xdg_toplevel_set_size(view->wlr_xdg_toplevel, view->geometry.width, + view->geometry.height); + } transaction_commit_dirty_client(); } else { view_center_surface(view); @@ -356,7 +374,7 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) struct wlr_xdg_toplevel *toplevel = xdg_shell_view->view.wlr_xdg_toplevel; struct sway_view *view = &xdg_shell_view->view; - if (!toplevel->base->mapped) { + if (!toplevel->base->surface->mapped) { return; } @@ -550,10 +568,10 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) { xdg_shell_view->view.wlr_xdg_toplevel = xdg_surface->toplevel; xdg_shell_view->map.notify = handle_map; - wl_signal_add(&xdg_surface->events.map, &xdg_shell_view->map); + wl_signal_add(&xdg_surface->surface->events.map, &xdg_shell_view->map); xdg_shell_view->unmap.notify = handle_unmap; - wl_signal_add(&xdg_surface->events.unmap, &xdg_shell_view->unmap); + wl_signal_add(&xdg_surface->surface->events.unmap, &xdg_shell_view->unmap); xdg_shell_view->destroy.notify = handle_destroy; wl_signal_add(&xdg_surface->events.destroy, &xdg_shell_view->destroy); diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 55a14c0b..709795e8 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -125,8 +125,10 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) { } static void unmanaged_handle_request_activate(struct wl_listener *listener, void *data) { - struct wlr_xwayland_surface *xsurface = data; - if (!xsurface->mapped) { + struct sway_xwayland_unmanaged *surface = + wl_container_of(listener, surface, request_activate); + struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface; + if (xsurface->surface == NULL || !xsurface->surface->mapped) { return; } struct sway_seat *seat = input_manager_current_seat(); @@ -138,12 +140,29 @@ static void unmanaged_handle_request_activate(struct wl_listener *listener, void seat_set_focus_surface(seat, xsurface->surface, false); } +static void unmanaged_handle_associate(struct wl_listener *listener, void *data) { + struct sway_xwayland_unmanaged *surface = + wl_container_of(listener, surface, associate); + struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface; + wl_signal_add(&xsurface->surface->events.map, &surface->map); + surface->map.notify = unmanaged_handle_map; + wl_signal_add(&xsurface->surface->events.unmap, &surface->unmap); + surface->unmap.notify = unmanaged_handle_unmap; +} + +static void unmanaged_handle_dissociate(struct wl_listener *listener, void *data) { + struct sway_xwayland_unmanaged *surface = + wl_container_of(listener, surface, dissociate); + wl_list_remove(&surface->map.link); + wl_list_remove(&surface->unmap.link); +} + static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) { struct sway_xwayland_unmanaged *surface = wl_container_of(listener, surface, destroy); wl_list_remove(&surface->request_configure.link); - wl_list_remove(&surface->map.link); - wl_list_remove(&surface->unmap.link); + wl_list_remove(&surface->associate.link); + wl_list_remove(&surface->dissociate.link); wl_list_remove(&surface->destroy.link); wl_list_remove(&surface->override_redirect.link); wl_list_remove(&surface->request_activate.link); @@ -151,6 +170,7 @@ static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) { } static void handle_map(struct wl_listener *listener, void *data); +static void handle_associate(struct wl_listener *listener, void *data); struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsurface); @@ -159,14 +179,22 @@ static void unmanaged_handle_override_redirect(struct wl_listener *listener, voi wl_container_of(listener, surface, override_redirect); struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface; - bool mapped = xsurface->mapped; + bool associated = xsurface->surface != NULL; + bool mapped = associated && xsurface->surface->mapped; if (mapped) { unmanaged_handle_unmap(&surface->unmap, NULL); } + if (associated) { + unmanaged_handle_dissociate(&surface->dissociate, NULL); + } unmanaged_handle_destroy(&surface->destroy, NULL); xsurface->data = NULL; + struct sway_xwayland_view *xwayland_view = create_xwayland_view(xsurface); + if (associated) { + handle_associate(&xwayland_view->associate, NULL); + } if (mapped) { handle_map(&xwayland_view->map, xsurface); } @@ -186,10 +214,10 @@ static struct sway_xwayland_unmanaged *create_unmanaged( wl_signal_add(&xsurface->events.request_configure, &surface->request_configure); surface->request_configure.notify = unmanaged_handle_request_configure; - wl_signal_add(&xsurface->events.map, &surface->map); - surface->map.notify = unmanaged_handle_map; - wl_signal_add(&xsurface->events.unmap, &surface->unmap); - surface->unmap.notify = unmanaged_handle_unmap; + wl_signal_add(&xsurface->events.associate, &surface->associate); + surface->associate.notify = unmanaged_handle_associate; + wl_signal_add(&xsurface->events.dissociate, &surface->dissociate); + surface->dissociate.notify = unmanaged_handle_dissociate; wl_signal_add(&xsurface->events.destroy, &surface->destroy); surface->destroy.notify = unmanaged_handle_destroy; wl_signal_add(&xsurface->events.set_override_redirect, &surface->override_redirect); @@ -472,8 +500,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&xwayland_view->set_window_type.link); wl_list_remove(&xwayland_view->set_hints.link); wl_list_remove(&xwayland_view->set_decorations.link); - wl_list_remove(&xwayland_view->map.link); - wl_list_remove(&xwayland_view->unmap.link); + wl_list_remove(&xwayland_view->associate.link); + wl_list_remove(&xwayland_view->dissociate.link); wl_list_remove(&xwayland_view->override_redirect.link); view_begin_destroy(&xwayland_view->view); } @@ -495,8 +523,8 @@ static void handle_unmap(struct wl_listener *listener, void *data) { static void handle_map(struct wl_listener *listener, void *data) { struct sway_xwayland_view *xwayland_view = wl_container_of(listener, xwayland_view, map); - struct wlr_xwayland_surface *xsurface = data; struct sway_view *view = &xwayland_view->view; + struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; view->natural_width = xsurface->width; view->natural_height = xsurface->height; @@ -512,20 +540,30 @@ static void handle_map(struct wl_listener *listener, void *data) { transaction_commit_dirty(); } +static void handle_dissociate(struct wl_listener *listener, void *data); + static void handle_override_redirect(struct wl_listener *listener, void *data) { struct sway_xwayland_view *xwayland_view = wl_container_of(listener, xwayland_view, override_redirect); - struct wlr_xwayland_surface *xsurface = data; struct sway_view *view = &xwayland_view->view; + struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - bool mapped = xsurface->mapped; + bool associated = xsurface->surface != NULL; + bool mapped = associated && xsurface->surface->mapped; if (mapped) { handle_unmap(&xwayland_view->unmap, NULL); } + if (associated) { + handle_dissociate(&xwayland_view->dissociate, NULL); + } handle_destroy(&xwayland_view->destroy, view); xsurface->data = NULL; + struct sway_xwayland_unmanaged *unmanaged = create_unmanaged(xsurface); + if (associated) { + unmanaged_handle_associate(&unmanaged->associate, NULL); + } if (mapped) { unmanaged_handle_map(&unmanaged->map, xsurface); } @@ -537,7 +575,7 @@ static void handle_request_configure(struct wl_listener *listener, void *data) { struct wlr_xwayland_surface_configure_event *ev = data; struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - if (!xsurface->mapped) { + if (xsurface->surface == NULL || !xsurface->surface->mapped) { wlr_xwayland_surface_configure(xsurface, ev->x, ev->y, ev->width, ev->height); return; @@ -566,7 +604,7 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) wl_container_of(listener, xwayland_view, request_fullscreen); struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - if (!xsurface->mapped) { + if (xsurface->surface == NULL || !xsurface->surface->mapped) { return; } container_set_fullscreen(view->container, xsurface->fullscreen); @@ -581,7 +619,7 @@ static void handle_request_minimize(struct wl_listener *listener, void *data) { wl_container_of(listener, xwayland_view, request_minimize); struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - if (!xsurface->mapped) { + if (xsurface->surface == NULL || !xsurface->surface->mapped) { return; } @@ -617,7 +655,7 @@ static void handle_request_move(struct wl_listener *listener, void *data) { wl_container_of(listener, xwayland_view, request_move); struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - if (!xsurface->mapped) { + if (xsurface->surface == NULL || !xsurface->surface->mapped) { return; } if (!container_is_floating(view->container) || @@ -633,7 +671,7 @@ static void handle_request_resize(struct wl_listener *listener, void *data) { wl_container_of(listener, xwayland_view, request_resize); struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - if (!xsurface->mapped) { + if (xsurface->surface == NULL || !xsurface->surface->mapped) { return; } if (!container_is_floating(view->container)) { @@ -649,10 +687,10 @@ static void handle_request_activate(struct wl_listener *listener, void *data) { wl_container_of(listener, xwayland_view, request_activate); struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - if (!xsurface->mapped) { + if (xsurface->surface == NULL || !xsurface->surface->mapped) { return; } - view_request_activate(view); + view_request_activate(view, NULL); transaction_commit_dirty(); } @@ -662,7 +700,7 @@ static void handle_set_title(struct wl_listener *listener, void *data) { wl_container_of(listener, xwayland_view, set_title); struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - if (!xsurface->mapped) { + if (xsurface->surface == NULL || !xsurface->surface->mapped) { return; } view_update_title(view, false); @@ -674,7 +712,7 @@ static void handle_set_class(struct wl_listener *listener, void *data) { wl_container_of(listener, xwayland_view, set_class); struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - if (!xsurface->mapped) { + if (xsurface->surface == NULL || !xsurface->surface->mapped) { return; } view_execute_criteria(view); @@ -685,7 +723,7 @@ static void handle_set_role(struct wl_listener *listener, void *data) { wl_container_of(listener, xwayland_view, set_role); struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - if (!xsurface->mapped) { + if (xsurface->surface == NULL || !xsurface->surface->mapped) { return; } view_execute_criteria(view); @@ -721,7 +759,7 @@ static void handle_set_window_type(struct wl_listener *listener, void *data) { wl_container_of(listener, xwayland_view, set_window_type); struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - if (!xsurface->mapped) { + if (xsurface->surface == NULL || !xsurface->surface->mapped) { return; } view_execute_criteria(view); @@ -732,7 +770,7 @@ static void handle_set_hints(struct wl_listener *listener, void *data) { wl_container_of(listener, xwayland_view, set_hints); struct sway_view *view = &xwayland_view->view; struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface; - if (!xsurface->mapped) { + if (xsurface->surface == NULL || !xsurface->surface->mapped) { return; } const bool hints_urgency = xcb_icccm_wm_hints_get_urgency(xsurface->hints); @@ -747,6 +785,24 @@ static void handle_set_hints(struct wl_listener *listener, void *data) { } } +static void handle_associate(struct wl_listener *listener, void *data) { + struct sway_xwayland_view *xwayland_view = + wl_container_of(listener, xwayland_view, associate); + struct wlr_xwayland_surface *xsurface = + xwayland_view->view.wlr_xwayland_surface; + wl_signal_add(&xsurface->surface->events.unmap, &xwayland_view->unmap); + xwayland_view->unmap.notify = handle_unmap; + wl_signal_add(&xsurface->surface->events.map, &xwayland_view->map); + xwayland_view->map.notify = handle_map; +} + +static void handle_dissociate(struct wl_listener *listener, void *data) { + struct sway_xwayland_view *xwayland_view = + wl_container_of(listener, xwayland_view, dissociate); + wl_list_remove(&xwayland_view->map.link); + wl_list_remove(&xwayland_view->unmap.link); +} + struct sway_view *view_from_wlr_xwayland_surface( struct wlr_xwayland_surface *xsurface) { return xsurface->data; @@ -816,11 +872,11 @@ struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsu &xwayland_view->set_decorations); xwayland_view->set_decorations.notify = handle_set_decorations; - wl_signal_add(&xsurface->events.unmap, &xwayland_view->unmap); - xwayland_view->unmap.notify = handle_unmap; + wl_signal_add(&xsurface->events.associate, &xwayland_view->associate); + xwayland_view->associate.notify = handle_associate; - wl_signal_add(&xsurface->events.map, &xwayland_view->map); - xwayland_view->map.notify = handle_map; + wl_signal_add(&xsurface->events.dissociate, &xwayland_view->dissociate); + xwayland_view->dissociate.notify = handle_dissociate; wl_signal_add(&xsurface->events.set_override_redirect, &xwayland_view->override_redirect); |