godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92208 from Calinou/linuxbsd-use-nanosleep 

Use `OS::delay_usec()` to avoid using deprecated `usleep()` on Linux
This commit is contained in:
Rémi Verschelde 2024-05-30 11:47:51 +02:00
parent 62f134bd7e a008896f70
commit 1dab521f2d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/linuxbsd/freedesktop_portal_desktop.cpp
View File

@ -591,7 +591,7 @@ void FreeDesktopPortalDesktop::_thread_monitor(void *p_ud) {
dbus_connection_read_write(portal->monitor_connection, 0);
}
usleep(50000);
OS::get_singleton()->delay_usec(50'000);
}
}

6
platform/linuxbsd/joypad_linux.cpp
View File

@ -225,7 +225,7 @@ void JoypadLinux::monitor_joypads(udev *p_udev) {
udev_device_unref(dev);
}
}
usleep(50000);
OS::get_singleton()->delay_usec(50'000);
}
udev_monitor_unref(mon);
}
@ -250,7 +250,7 @@ void JoypadLinux::monitor_joypads() {
}
}
closedir(input_directory);
usleep(1000000); // 1s
OS::get_singleton()->delay_usec(1'000'000);
}
}
@ -508,7 +508,7 @@ void JoypadLinux::joypad_events_thread_run() {
}
}
if (no_events) {
usleep(10000); // 10ms
OS::get_singleton()->delay_usec(10'000);
}
}
}

4
platform/linuxbsd/x11/display_server_x11.cpp
View File

@ -2269,7 +2269,7 @@ void DisplayServerX11::window_set_size(const Size2i p_size, WindowID p_window) {
break;
}
usleep(10000);
OS::get_singleton()->delay_usec(10'000);
}
// Keep rendering context window size in sync
@ -2544,7 +2544,7 @@ void DisplayServerX11::_set_wm_maximized(WindowID p_window, bool p_enabled) {
// Give up after 0.5s, it's not going to happen on this WM.
// https://github.com/godotengine/godot/issues/19978
for (int attempt = 0; window_get_mode(p_window) != WINDOW_MODE_MAXIMIZED && attempt < 50; attempt++) {
usleep(10000);
OS::get_singleton()->delay_usec(10'000);
}
}
wd.maximized = p_enabled;