mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-01-31 21:55:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2324 from 2.6.x

Browse Source 
Backmerge
This commit is contained in:
Lukas Dürrenberger 2022-12-30 17:50:45 +01:00 committed by GitHub
commit bf9f59d3e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9639 additions and 9470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15659
extlibs/headers/stb_image/stb_image.h vendored
View File

File diff suppressed because it is too large Load Diff

3414
extlibs/headers/stb_image/stb_image_write.h vendored
View File

File diff suppressed because it is too large Load Diff

12
include/SFML/Graphics/Image.hpp
View File

@ -75,8 +75,8 @@ public:
/// \brief Load the image from a file on disk /// \brief Load the image from a file on disk
/// ///
/// The supported image formats are bmp, png, tga, jpg, gif, /// The supported image formats are bmp, png, tga, jpg, gif,
/// psd, hdr and pic. Some format options are not supported, /// psd, hdr, pic and pnm. Some format options are not supported,
/// like progressive jpeg. /// like jpeg with arithmetic coding or ASCII pnm.
/// If this function fails, the image is left unchanged. /// If this function fails, the image is left unchanged.
/// ///
/// \param filename Path of the image file to load /// \param filename Path of the image file to load
@ -92,8 +92,8 @@ public:
/// \brief Load the image from a file in memory /// \brief Load the image from a file in memory
/// ///
/// The supported image formats are bmp, png, tga, jpg, gif, /// The supported image formats are bmp, png, tga, jpg, gif,
/// psd, hdr and pic. Some format options are not supported, /// psd, hdr, pic and pnm. Some format options are not supported,
/// like progressive jpeg. /// like jpeg with arithmetic coding or ASCII pnm.
/// If this function fails, the image is left unchanged. /// If this function fails, the image is left unchanged.
/// ///
/// \param data Pointer to the file data in memory /// \param data Pointer to the file data in memory
@ -110,8 +110,8 @@ public:
/// \brief Load the image from a custom stream /// \brief Load the image from a custom stream
/// ///
/// The supported image formats are bmp, png, tga, jpg, gif, /// The supported image formats are bmp, png, tga, jpg, gif,
/// psd, hdr and pic. Some format options are not supported, /// psd, hdr, pic and pnm. Some format options are not supported,
/// like progressive jpeg. /// like jpeg with arithmetic coding or ASCII pnm.
/// If this function fails, the image is left unchanged. /// If this function fails, the image is left unchanged.
/// ///
/// \param stream Source stream to read from /// \param stream Source stream to read from

22
src/SFML/Window/DRM/InputImplUDev.cpp
View File

@ -421,7 +421,7 @@ bool eventProcess(sf::Event& event)
event.key.shift = shiftDown(); event.key.shift = shiftDown();
event.key.system = systemDown(); event.key.system = systemDown();
keyMap[kb] = inputEvent.value; keyMap[static_cast<std::size_t>(kb)] = inputEvent.value;
if (special && inputEvent.value) if (special && inputEvent.value)
doDeferredText = special; doDeferredText = special;
@ -501,7 +501,7 @@ bool eventProcess(sf::Event& event)
// //
// We only clear the ICANON flag for the time of reading // We only clear the ICANON flag for the time of reading
newTerminalConfig.c_lflag &= ~(tcflag_t)ICANON; newTerminalConfig.c_lflag &= ~static_cast<tcflag_t>(ICANON);
tcsetattr(STDIN_FILENO, TCSANOW, &newTerminalConfig); tcsetattr(STDIN_FILENO, TCSANOW, &newTerminalConfig);
timeval timeout; timeval timeout;
@ -572,7 +572,7 @@ bool InputImpl::isKeyPressed(Keyboard::Key key)
return false; return false;
update(); update();
return keyMap[key]; return keyMap[static_cast<std::size_t>(key)];
} }
@ -698,14 +698,14 @@ void InputImpl::setTerminalConfig()
std::scoped_lock lock(inputMutex); std::scoped_lock lock(inputMutex);
initFileDescriptors(); initFileDescriptors();
tcgetattr(STDIN_FILENO, &newTerminalConfig); // get current terminal config tcgetattr(STDIN_FILENO, &newTerminalConfig); // get current terminal config
oldTerminalConfig = newTerminalConfig; // create a backup oldTerminalConfig = newTerminalConfig; // create a backup
newTerminalConfig.c_lflag &= ~(tcflag_t)ECHO; // disable console feedback newTerminalConfig.c_lflag &= ~static_cast<tcflag_t>(ECHO); // disable console feedback
newTerminalConfig.c_lflag &= ~(tcflag_t)ISIG; // disable signals newTerminalConfig.c_lflag &= ~static_cast<tcflag_t>(ISIG); // disable signals
newTerminalConfig.c_lflag |= ICANON; // disable noncanonical mode newTerminalConfig.c_lflag |= ICANON; // disable noncanonical mode
newTerminalConfig.c_iflag |= IGNCR; // ignore carriage return newTerminalConfig.c_iflag |= IGNCR; // ignore carriage return
tcsetattr(STDIN_FILENO, TCSANOW, &newTerminalConfig); // set our new config tcsetattr(STDIN_FILENO, TCSANOW, &newTerminalConfig); // set our new config
tcflush(STDIN_FILENO, TCIFLUSH); // flush the buffer tcflush(STDIN_FILENO, TCIFLUSH); // flush the buffer
} }

2
src/SFML/Window/Unix/CursorImpl.cpp
View File

@ -175,7 +175,7 @@ bool CursorImpl::loadFromSystem(Cursor::Type type)
case Cursor::Arrow: shape = XC_arrow; break; case Cursor::Arrow: shape = XC_arrow; break;
case Cursor::Wait: shape = XC_watch; break; case Cursor::Wait: shape = XC_watch; break;
case Cursor::Text: shape = XC_xterm; break; case Cursor::Text: shape = XC_xterm; break;
case Cursor::Hand: shape = XC_hand1; break; case Cursor::Hand: shape = XC_hand2; break;
case Cursor::SizeHorizontal: shape = XC_sb_h_double_arrow; break; case Cursor::SizeHorizontal: shape = XC_sb_h_double_arrow; break;
case Cursor::SizeVertical: shape = XC_sb_v_double_arrow; break; case Cursor::SizeVertical: shape = XC_sb_v_double_arrow; break;
case Cursor::SizeLeft: shape = XC_left_side; break; case Cursor::SizeLeft: shape = XC_left_side; break;