From 0b6943fb5aa731df098a7fa02d9e1d2669c74908 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 24 Mar 2024 14:07:35 +0530 Subject: [PATCH] ... --- glfw/wl_window.c | 1 + kittens/panel/main.py | 2 +- kitty/types.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/glfw/wl_window.c b/glfw/wl_window.c index 1f277b5f3..1f51f2cd3 100644 --- a/glfw/wl_window.c +++ b/glfw/wl_window.c @@ -2543,5 +2543,6 @@ GLFWAPI void glfwWaylandRedrawCSDWindowTitle(GLFWwindow *handle) { GLFWAPI void glfwWaylandSetupLayerShellForNextWindow(GLFWLayerShellConfig c) { if (layer_shell_config_for_next_window.output_name) free((void*)layer_shell_config_for_next_window.output_name); layer_shell_config_for_next_window = c; + if (layer_shell_config_for_next_window.output_name && !layer_shell_config_for_next_window.output_name[0]) layer_shell_config_for_next_window.output_name = NULL; if (layer_shell_config_for_next_window.output_name) layer_shell_config_for_next_window.output_name = strdup(layer_shell_config_for_next_window.output_name); } diff --git a/kittens/panel/main.py b/kittens/panel/main.py index 018d35417..1a4a89cb2 100644 --- a/kittens/panel/main.py +++ b/kittens/panel/main.py @@ -146,7 +146,7 @@ def initial_window_size(cell_width: int, cell_height: int, dpi_x: float, dpi_y: def layer_shell_config(opts: PanelCLIOptions) -> LayerShellConfig: ltype = GLFW_LAYER_SHELL_BACKGROUND if opts.edge == 'background' else GLFW_LAYER_SHELL_PANEL edge = {'top': GLFW_EDGE_TOP, 'bottom': GLFW_EDGE_BOTTOM, 'left': GLFW_EDGE_LEFT, 'right': GLFW_EDGE_RIGHT}.get(opts.edge, GLFW_EDGE_TOP) - return LayerShellConfig(type=ltype, edge=edge, size_in_cells=max(1, opts.lines), output_name=opts.output_name or None) + return LayerShellConfig(type=ltype, edge=edge, size_in_cells=max(1, opts.lines), output_name=opts.output_name or '') def main(sys_args: List[str]) -> None: diff --git a/kitty/types.py b/kitty/types.py index 38aa0271d..77f421e6c 100644 --- a/kitty/types.py +++ b/kitty/types.py @@ -70,7 +70,7 @@ class LayerShellConfig(NamedTuple): type: int = 0 edge: int = 0 focus_policy: int = 0 - output_name: Optional[str] = None + output_name: str = '' size_in_cells: int = 0