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

Wayland: Fix specifying the output name for the panel kitten not working

Browse Source 
Fixes #7573
This commit is contained in:
Kovid Goyal
2024-06-25 12:53:37 +05:30
parent a8daf06737
commit 190566be8e
8 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/glfw-wrapper.h generated
View File

@@ -1047,7 +1047,7 @@ typedef enum { GLFW_FOCUS_NOT_ALLOWED, GLFW_FOCUS_EXCLUSIVE, GLFW_FOCUS_ON_DEMAN
typedef struct GLFWLayerShellConfig {
GLFWLayerShellType type;
GLFWEdge edge;
const char *output_name;
char output_name[64];
GLFWFocusPolicy focus_policy;
unsigned size_in_cells;
void (*size_callback)(GLFWwindow *window, const struct GLFWLayerShellConfig *config, unsigned monitor_width, unsigned monitor_height, uint32_t *width, uint32_t *height);
@@ -2320,7 +2320,7 @@ typedef void (*glfwWaylandRedrawCSDWindowTitle_func)(GLFWwindow*);
GFW_EXTERN glfwWaylandRedrawCSDWindowTitle_func glfwWaylandRedrawCSDWindowTitle_impl;
#define glfwWaylandRedrawCSDWindowTitle glfwWaylandRedrawCSDWindowTitle_impl
typedef void (*glfwWaylandSetupLayerShellForNextWindow_func)(GLFWLayerShellConfig);
typedef void (*glfwWaylandSetupLayerShellForNextWindow_func)(const GLFWLayerShellConfig*);
GFW_EXTERN glfwWaylandSetupLayerShellForNextWindow_func glfwWaylandSetupLayerShellForNextWindow_impl;
#define glfwWaylandSetupLayerShellForNextWindow glfwWaylandSetupLayerShellForNextWindow_impl

27
kitty/glfw.c
View File

@@ -1090,17 +1090,26 @@ calculate_layer_shell_window_size(
}
}
static GLFWLayerShellConfig
translate_layer_shell_config(PyObject *p) {
GLFWLayerShellConfig ans = {.size_callback=calculate_layer_shell_window_size};
#define A(attr, type_check, convert) RAII_PyObject(attr, PyObject_GetAttrString(p, #attr)); if (attr == NULL) return ans; if (!type_check(attr)) { PyErr_SetString(PyExc_TypeError, #attr " not of the correct type"); return ans; }; ans.attr = convert(attr);
A(output_name, PyUnicode_Check, PyUnicode_AsUTF8);
static bool
translate_layer_shell_config(PyObject *p, GLFWLayerShellConfig *ans) {
memset(ans, 0, sizeof(GLFWLayerShellConfig));
ans->size_callback = calculate_layer_shell_window_size;
#define A(attr, type_check, convert) RAII_PyObject(attr, PyObject_GetAttrString(p, #attr)); if (attr == NULL) return false; if (!type_check(attr)) { PyErr_SetString(PyExc_TypeError, #attr " not of the correct type"); return false; }; ans->attr = convert(attr);
A(type, PyLong_Check, PyLong_AsLong);
A(edge, PyLong_Check, PyLong_AsLong);
A(focus_policy, PyLong_Check, PyLong_AsLong);
A(size_in_cells, PyLong_Check, PyLong_AsLong);
#undef A
return ans;
#define A(attr) { \
RAII_PyObject(attr, PyObject_GetAttrString(p, #attr)); if (attr == NULL) return false; \
if (!PyUnicode_Check(attr)) { PyErr_SetString(PyExc_TypeError, #attr " not a string"); return false; };\
Py_ssize_t sz; const char *t = PyUnicode_AsUTF8AndSize(attr, &sz); \
if (sz > (ssize_t)sizeof(ans->attr)-1) { PyErr_Format(PyExc_ValueError, "%s: %s is too long", #attr, t); return false; } \
memcpy(ans->attr, t, sz); }
A(output_name);
return true;
#undef A
}
static PyObject*
@@ -1204,7 +1213,11 @@ create_os_window(PyObject UNUSED *self, PyObject *args, PyObject *kw) {
if (ret == NULL) return NULL;
int width = PyLong_AsLong(PyTuple_GET_ITEM(ret, 0)), height = PyLong_AsLong(PyTuple_GET_ITEM(ret, 1));
Py_CLEAR(ret);
if (is_layer_shell) glfwWaylandSetupLayerShellForNextWindow(translate_layer_shell_config(layer_shell_config));
if (is_layer_shell) {
GLFWLayerShellConfig lsc = {0};
if (!translate_layer_shell_config(layer_shell_config, &lsc)) return NULL;
glfwWaylandSetupLayerShellForNextWindow(&lsc);
}
GLFWwindow *glfw_window = glfwCreateWindow(width, height, title, NULL, temp_window ? temp_window : common_context);
if (temp_window) { glfwDestroyWindow(temp_window); temp_window = NULL; }
if (glfw_window == NULL) { PyErr_SetString(PyExc_ValueError, "Failed to create GLFWwindow"); return NULL; }