CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-09-06 17:58:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Treat empty display server envvars as unset

Browse source 
This makes the DISPLAY, WAYLAND_DISPLAY, WAYLAND_SOCKET, and
KITTY_DISABLE_WAYLAND envvars be treated as unset if they are the empty
string.  Therefore, users can simply do "WAYLAND_DISPLAY= kitty" as
opposed to the full incantation "env -u WAYLAND_DISPLAY kitty" (in this
case setting KITTY_DISABLE_WAYLAND would also work, but that wouldn't
propagate to any clients launched through kitty).  This matches the
behavior of many other programs.
This commit is contained in:
MithicSpirit 2026-08-30 04:24:37 -04:00
parent 33a2685550
commit 04930efa44
No known key found for this signature in database
GPG key ID: 6DB9DBD1A1CA0F79
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
glfw/ibus_glfw.c vendored
View file

@ -286,7 +286,7 @@ get_ibus_address_file_name(void) {
const char *host = "unix";
// See https://github.com/ibus/ibus/commit/8ce25208c3f4adfd290a032c6aa739d2b7580eb1 for why we need this dance.
const char *de = getenv("WAYLAND_DISPLAY");
if (de) {
if (de && de[0]) {
disp_num = de;
} else {
const char *de = getenv("DISPLAY");

2
glfw/x11_init.c vendored
View file

@ -708,7 +708,7 @@ _glfwPlatformInit(bool *supports_window_occlusion) {
_glfw.x11.display = XOpenDisplay(NULL);
if (!_glfw.x11.display) {
const char *display = getenv("DISPLAY");
if (display) {
if (display && display[0]) {
_glfwInputError(GLFW_PLATFORM_ERROR, "X11: Failed to open display %s", display);
} else {
_glfwInputError(GLFW_PLATFORM_ERROR, "X11: The DISPLAY environment variable is missing");

4
kitty/constants.py
View file

@ -220,9 +220,9 @@ def glfw_path(module: str) -> str:
def detect_if_wayland_ok() -> bool:
if 'WAYLAND_DISPLAY' not in os.environ and 'WAYLAND_SOCKET' not in os.environ:
if not os.environ.get('WAYLAND_DISPLAY') and not os.environ.get('WAYLAND_SOCKET'):
return False
if 'KITTY_DISABLE_WAYLAND' in os.environ:
if os.environ.get('KITTY_DISABLE_WAYLAND'):
return False
wayland = glfw_path('wayland')
if not os.path.exists(wayland):