KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename buffer -> edge_buffer

Browse Source
This commit is contained in:
Kovid Goyal 2021-03-25 15:19:11 +05:30
parent 5dbbed3dcc
commit 0510cd47f4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glfw/wl_platform.h vendored
View File

@ -151,7 +151,7 @@ typedef struct _GLFWwindowWayland
struct { struct {
bool serverSide; bool serverSide;
struct wl_buffer* buffer; struct wl_buffer* edge_buffer;
_GLFWdecorationWayland top, left, right, bottom; _GLFWdecorationWayland top, left, right, bottom;
int focus; int focus;
} decorations; } decorations;

20
glfw/wl_window.c vendored
View File

@ -387,25 +387,25 @@ static void createDecorations(_GLFWwindow* window)
if (!_glfw.wl.viewporter || !window->decorated || window->wl.decorations.serverSide) if (!_glfw.wl.viewporter || !window->decorated || window->wl.decorations.serverSide)
return; return;
if (!window->wl.decorations.buffer) if (!window->wl.decorations.edge_buffer)
window->wl.decorations.buffer = createShmBuffer(&image); window->wl.decorations.edge_buffer = createShmBuffer(&image);
if (!window->wl.decorations.buffer) if (!window->wl.decorations.edge_buffer)
return; return;
createDecoration(&window->wl.decorations.top, window->wl.surface, createDecoration(&window->wl.decorations.top, window->wl.surface,
window->wl.decorations.buffer, opaque, window->wl.decorations.edge_buffer, opaque,
0, -window->wl.decoration_metrics.top, 0, -window->wl.decoration_metrics.top,
window->wl.width, window->wl.decoration_metrics.top); window->wl.width, window->wl.decoration_metrics.top);
createDecoration(&window->wl.decorations.left, window->wl.surface, createDecoration(&window->wl.decorations.left, window->wl.surface,
window->wl.decorations.buffer, opaque, window->wl.decorations.edge_buffer, opaque,
-window->wl.decoration_metrics.width, -window->wl.decoration_metrics.top, -window->wl.decoration_metrics.width, -window->wl.decoration_metrics.top,
window->wl.decoration_metrics.width, window->wl.height + window->wl.decoration_metrics.top); window->wl.decoration_metrics.width, window->wl.height + window->wl.decoration_metrics.top);
createDecoration(&window->wl.decorations.right, window->wl.surface, createDecoration(&window->wl.decorations.right, window->wl.surface,
window->wl.decorations.buffer, opaque, window->wl.decorations.edge_buffer, opaque,
window->wl.width, -window->wl.decoration_metrics.top, window->wl.width, -window->wl.decoration_metrics.top,
window->wl.decoration_metrics.width, window->wl.height + window->wl.decoration_metrics.top); window->wl.decoration_metrics.width, window->wl.height + window->wl.decoration_metrics.top);
createDecoration(&window->wl.decorations.bottom, window->wl.surface, createDecoration(&window->wl.decorations.bottom, window->wl.surface,
window->wl.decorations.buffer, opaque, window->wl.decorations.edge_buffer, opaque,
-window->wl.decoration_metrics.width, window->wl.height, -window->wl.decoration_metrics.width, window->wl.height,
window->wl.width + window->wl.decoration_metrics.horizontal, window->wl.decoration_metrics.width); window->wl.width + window->wl.decoration_metrics.horizontal, window->wl.decoration_metrics.width);
} }
@ -621,7 +621,7 @@ static void xdgToplevelHandleConfigure(void* data,
} }
window->wl.fullscreened = fullscreen; window->wl.fullscreened = fullscreen;
if (!fullscreen) { if (!fullscreen) {
if (window->decorated && !window->wl.decorations.serverSide && window->wl.decorations.buffer) { if (window->decorated && !window->wl.decorations.serverSide && window->wl.decorations.edge_buffer) {
width -= window->wl.decoration_metrics.horizontal; width -= window->wl.decoration_metrics.horizontal;
height -= window->wl.decoration_metrics.vertical; height -= window->wl.decoration_metrics.vertical;
} }
@ -964,8 +964,8 @@ void _glfwPlatformDestroyWindow(_GLFWwindow* window)
if (window->wl.xdg.decoration) if (window->wl.xdg.decoration)
zxdg_toplevel_decoration_v1_destroy(window->wl.xdg.decoration); zxdg_toplevel_decoration_v1_destroy(window->wl.xdg.decoration);
if (window->wl.decorations.buffer) if (window->wl.decorations.edge_buffer)
wl_buffer_destroy(window->wl.decorations.buffer); wl_buffer_destroy(window->wl.decorations.edge_buffer);
if (window->wl.native) if (window->wl.native)
wl_egl_window_destroy(window->wl.native); wl_egl_window_destroy(window->wl.native);