kovidgoyal/kitty
1
1
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2024-09-11 14:45:31 +03:00
Code Issues Projects Releases Wiki Activity

Initialize temp wayland buffer with background color

Browse Source
This commit is contained in:
Kovid Goyal 2024-03-26 19:31:27 +05:30
parent f8dda12024
commit dd879c413a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
6 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glfw/glfw3.h vendored
View File

@ -1049,6 +1049,7 @@ typedef enum {
#define GLFW_X11_INSTANCE_NAME 0x00024002
#define GLFW_WAYLAND_APP_ID 0x00025001
#define GLFW_WAYLAND_BGCOLOR 0x00025002
/*! @} */
#define GLFW_NO_API 0

1
glfw/internal.h vendored
View File

@ -322,6 +322,7 @@ struct _GLFWwndconfig
} x11;
struct {
char appId[256];
uint32_t bgcolor;
} wl;
};

4
glfw/window.c vendored
View File

@ -468,8 +468,10 @@ GLFWAPI void glfwWindowHint(int hint, int value)
case GLFW_REFRESH_RATE:
_glfw.hints.refreshRate = value;
return;
case GLFW_WAYLAND_BGCOLOR:
_glfw.hints.window.wl.bgcolor = value;
return;
}
_glfwInputError(GLFW_INVALID_ENUM, "Invalid window hint 0x%08X", hint);
}

28
glfw/wl_window.c vendored
View File

@ -760,17 +760,37 @@ attach_temp_buffer_during_window_creation(_GLFWwindow *window) {
const size_t size = 4 * width * height;
int fd = createAnonymousFile(size);
if (fd < 0) {
_glfwInputError(GLFW_PLATFORM_ERROR, "Wayland: failed to create anonymouse file");
_glfwInputError(GLFW_PLATFORM_ERROR, "Wayland: failed to create anonymous file");
return false;
}
uint32_t *shm_data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
union {
struct {
uint8_t blue, green, red, alpha;
};
uint32_t value;
} color;
color.value = _glfw.hints.window.wl.bgcolor;
int shm_format = WL_SHM_FORMAT_ARGB8888;
if (!window->wl.transparent) { color.alpha = 0xff; shm_format = WL_SHM_FORMAT_XRGB8888; }
else if (color.alpha == 0) color.value = 0; // fully transparent blends best with black and we can use memset
// convert to pre-multiplied alpha
float alpha = color.alpha / 255.f; color.red = (uint8_t)(alpha * color.red); color.green = (uint8_t)(alpha * color.green); color.blue = (uint8_t)(alpha * color.blue);
if (color.value) for (size_t i = 0; i < size/4; i++) shm_data[i] = color.value;
else memset(shm_data, 0, size);
if (!shm_data) {
close(fd);
_glfwInputError(GLFW_PLATFORM_ERROR, "Wayland: failed to mmap anonymouse file");
return false;
}
struct wl_shm_pool *pool = wl_shm_create_pool(_glfw.wl.shm, fd, size);
if (!pool) {
close(fd);
close(fd); munmap(shm_data, size);
_glfwInputError(GLFW_PLATFORM_ERROR, "Wayland: failed to create wl_shm_pool of size: %zu", size);
return false;
}
struct wl_buffer *buffer = wl_shm_pool_create_buffer(pool, 0, width, height, width * 4, WL_SHM_FORMAT_ARGB8888);
wl_shm_pool_destroy(pool); close(fd);
struct wl_buffer *buffer = wl_shm_pool_create_buffer(pool, 0, width, height, width * 4, shm_format);
wl_shm_pool_destroy(pool); munmap(shm_data, size); close(fd);
if (!buffer) {
_glfwInputError(GLFW_PLATFORM_ERROR, "Wayland: failed to create wl_buffer of size: %zu", size);
return false;

1
kitty/glfw-wrapper.h generated
View File

@ -787,6 +787,7 @@ typedef enum {
#define GLFW_X11_INSTANCE_NAME 0x00024002
#define GLFW_WAYLAND_APP_ID 0x00025001
#define GLFW_WAYLAND_BGCOLOR 0x00025002
/*! @} */
#define GLFW_NO_API 0

3
kitty/glfw.c
View File

@ -1173,6 +1173,9 @@ create_os_window(PyObject UNUSED *self, PyObject *args, PyObject *kw) {
}
bool want_semi_transparent = (1.0 - OPT(background_opacity) >= 0.01) || OPT(dynamic_background_opacity);
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, want_semi_transparent);
uint32_t bgcolor = OPT(background);
uint32_t bgalpha = (uint32_t)((MAX(0.f, MIN((OPT(background_opacity) * 255), 255.f))));
glfwWindowHint(GLFW_WAYLAND_BGCOLOR, ((bgalpha & 0xff) << 24) | bgcolor);
// We use a temp window to avoid the need to set the window size after
// creation, which causes a resize event and all the associated processing.
// The temp window is used to get the DPI.