mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-10 14:14:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of the no longer needed viewporter protocol

Browse Source
This commit is contained in:
Kovid Goyal
2021-03-26 23:44:27 +05:30
parent aeb82e7fb0
commit e7931b0121
4 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
glfw/wl_client_side_decorations.c vendored
View File

@@ -86,8 +86,8 @@ static bool
create_shm_buffers_for_edges(_GLFWwindow* window) {
free_edge_resources(window);
const size_t vertical_width = window->wl.decorations.metrics.width, vertical_height = window->wl.height;
const size_t horizontal_height = window->wl.decorations.metrics.width, horizontal_width = window->wl.width;
const size_t vertical_width = decs.metrics.width, vertical_height = window->wl.height + decs.metrics.top;
const size_t horizontal_height = decs.metrics.width, horizontal_width = window->wl.width + 2 * decs.metrics.width;
const size_t mapping_sz = 4 * (2 * vertical_width * vertical_height + horizontal_height * horizontal_width);
int fd = createAnonymousFile(mapping_sz);
@@ -124,22 +124,19 @@ free_csd_surfaces(_GLFWwindow *window) {
#define d(which) {\
if (decs.subsurfaces.which) wl_subsurface_destroy(decs.subsurfaces.which); decs.subsurfaces.which = NULL; \
if (decs.surfaces.which) wl_surface_destroy(decs.surfaces.which); decs.surfaces.which = NULL; \
if (decs.viewports.which) wp_viewport_destroy(decs.viewports.which); \
}
d(left); d(top); d(right); d(bottom);
#undef d
}
#define position_decoration_surfaces(which, x, y, width, height) { \
#define position_decoration_surfaces(which, x, y) { \
wl_subsurface_set_position(decs.subsurfaces.which, x, y); \
wp_viewport_set_destination(decs.viewports.which, width, height); \
wl_surface_commit(decs.surfaces.which); \
}
#define create_decoration_surfaces(which, buffer) { \
decs.surfaces.which = wl_compositor_create_surface(_glfw.wl.compositor); \
decs.subsurfaces.which = wl_subcompositor_get_subsurface(_glfw.wl.subcompositor, decs.surfaces.which, window->wl.surface); \
decs.viewports.which = wp_viewporter_get_viewport(_glfw.wl.viewporter, decs.surfaces.which); \
wl_surface_attach(decs.surfaces.which, buffer, 0, 0); \
}
@@ -160,26 +157,23 @@ ensure_csd_resources(_GLFWwindow *window) {
if (!decs.title_bar.front_buffer) {
if (!create_shm_buffers_for_title_bar(window)) return false;
}
int x, y, width, height;
int x, y;
x = 0; y = -decs.metrics.top;
width = window->wl.width; height = decs.metrics.top;
if (!decs.surfaces.top) create_decoration_surfaces(top, decs.title_bar.front_buffer);
position_decoration_surfaces(top, x, y, width, height);
position_decoration_surfaces(top, x, y);
x = -decs.metrics.width; y = -decs.metrics.top;
width = decs.metrics.width; height = decs.metrics.top + window->wl.height;
if (!decs.surfaces.left) create_decoration_surfaces(left, decs.edges.left);
position_decoration_surfaces(left, x, y, width, height);
position_decoration_surfaces(left, x, y);
x = window->wl.width; y = -decs.metrics.top;
if (!decs.surfaces.right) create_decoration_surfaces(right, decs.edges.right);
position_decoration_surfaces(right, x, y, width, height);
position_decoration_surfaces(right, x, y);
x = -decs.metrics.width; y = window->wl.height;
width = decs.metrics.horizontal + window->wl.width; height = decs.metrics.width;
if (!decs.surfaces.bottom) create_decoration_surfaces(bottom, decs.edges.bottom);
position_decoration_surfaces(bottom, x, y, width, height);
position_decoration_surfaces(bottom, x, y);
decs.for_window_size.width = window->wl.width;
decs.for_window_size.height = window->wl.height;

7
glfw/wl_init.c vendored
View File

@@ -585,11 +585,6 @@ static void registryHandleGlobal(void* data UNUSED,
wl_registry_bind(registry, name,
&zxdg_decoration_manager_v1_interface, 1);
}
else if (strcmp(interface, "wp_viewporter") == 0)
{
_glfw.wl.viewporter =
wl_registry_bind(registry, name, &wp_viewporter_interface, 1);
}
else if (strcmp(interface, "zwp_relative_pointer_manager_v1") == 0)
{
_glfw.wl.relativePointerManager =
@@ -824,8 +819,6 @@ void _glfwPlatformTerminate(void)
wl_compositor_destroy(_glfw.wl.compositor);
if (_glfw.wl.shm)
wl_shm_destroy(_glfw.wl.shm);
if (_glfw.wl.viewporter)
wp_viewporter_destroy(_glfw.wl.viewporter);
if (_glfw.wl.decorationManager)
zxdg_decoration_manager_v1_destroy(_glfw.wl.decorationManager);
if (_glfw.wl.wmBase)

6
glfw/wl_platform.h vendored
View File

@@ -53,7 +53,6 @@ typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR
#include "wl_cursors.h"
#include "wayland-xdg-shell-client-protocol.h"
#include "wayland-viewporter-client-protocol.h"
#include "wayland-xdg-decoration-unstable-v1-client-protocol.h"
#include "wayland-relative-pointer-unstable-v1-client-protocol.h"
#include "wayland-pointer-constraints-unstable-v1-client-protocol.h"
@@ -153,10 +152,6 @@ typedef struct _GLFWwindowWayland
struct wl_subsurface *top, *left, *right, *bottom;
} subsurfaces;
struct {
struct wp_viewport *top, *left, *right, *bottom;
} viewports;
struct {
struct wl_buffer *front_buffer, *back_buffer;
uint8_t *data;
@@ -223,7 +218,6 @@ typedef struct _GLFWlibraryWayland
struct wl_data_device* dataDevice;
struct xdg_wm_base* wmBase;
struct zxdg_decoration_manager_v1* decorationManager;
struct wp_viewporter* viewporter;
struct zwp_relative_pointer_manager_v1* relativePointerManager;
struct zwp_pointer_constraints_v1* pointerConstraints;
struct zwp_idle_inhibit_manager_v1* idleInhibitManager;

2
glfw/wl_window.c vendored
View File

@@ -259,7 +259,7 @@ static void dispatchChangesAfterConfigure(_GLFWwindow *window, int32_t width, in
static void
createDecorations(_GLFWwindow* window) {
if (!_glfw.wl.viewporter || !window->decorated || window->wl.decorations.serverSide) return;
if (!window->decorated || window->wl.decorations.serverSide) return;
ensure_csd_resources(window);
}