Skip to content

Commit 0bcf060

Browse files
committed
Revert "vdisp/gl,sdl3: disable libdecor for Wayland"
This reverts commit c338e7b.
1 parent 4f6a6e4 commit 0bcf060

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

src/video_display/gl.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
#include <cmath>
5858
#include <condition_variable>
5959
#include <cstdint>
60-
#include <cstdlib> // for getenv
6160
#include <fstream>
6261
#include <iostream>
6362
#include <mutex>
@@ -947,16 +946,6 @@ static void * display_gl_init(struct module *parent, const char *fmt, unsigned i
947946
keycontrol_register_key(&s->mod, i.first, msg, i.second.data());
948947
}
949948

950-
#ifdef GLFW_WAYLAND_DISABLE_LIBDECOR
951-
if (getenv("WAYLAND_DISPLAY") &&
952-
s->init_hints.find(GLFW_WAYLAND_LIBDECOR) ==
953-
s->init_hints.end()) {
954-
s->init_hints[GLFW_WAYLAND_LIBDECOR] =
955-
GLFW_WAYLAND_DISABLE_LIBDECOR;
956-
MSG(INFO, "Disabling libdecor.\n");
957-
}
958-
#endif
959-
960949
#if GLFW_VERSION_MAJOR < 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR < 3)
961950
if(!s->init_hints.empty()){
962951
log_msg(LOG_LEVEL_WARNING, "GLFW version < 3.3 doesn't support init hints. Ignoring them.\n");

src/video_display/sdl3.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @author Martin Pulec <pulec@cesnet.cz>
66
*/
77
/*
8-
* Copyright (c) 2018-2026 CESNET, zájmové sdružení právnických osob
8+
* Copyright (c) 2018-2025 CESNET
99
* All rights reserved.
1010
*
1111
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
6060
#include <stdbool.h> // for true, bool, false
6161
#include <stdint.h> // for int64_t, uint32_t
6262
#include <stdio.h> // for printf, sscanf, snprintf
63-
#include <stdlib.h> // for atoi, calloc, free, getenv
63+
#include <stdlib.h> // for atoi, free, calloc
6464
#include <string.h> // for NULL, strlen, strcmp, strstr, strchr
6565
#include <time.h> // for timespec_get, TIME_UTC, timespec
6666

@@ -1083,11 +1083,6 @@ display_sdl3_init(struct module *parent, const char *fmt, unsigned int flags)
10831083
if (driver != NULL) {
10841084
SDL_CHECK(SDL_SetHint(SDL_HINT_VIDEO_DRIVER, driver));
10851085
}
1086-
if (getenv("WAYLAND_DISPLAY")) {
1087-
SDL_CHECK(
1088-
SDL_SetHint("SDL_VIDEO_WAYLAND_PREFER_LIBDECOR", "0"));
1089-
MSG(INFO, "Disabling libdecor.\n");
1090-
}
10911086
if (!SDL_InitSubSystem(SDL_INIT_VIDEO)) {
10921087
MSG(ERROR, "Unable to initialize SDL3 video: %s\n",
10931088
SDL_GetError());

0 commit comments

Comments
 (0)