mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Xlib crashing in sf::Window:setIcon because it expects the element data type passed to XChangeProperty to be unsigned long (architecture dependent 32-bit or 64-bit) instead of sf::Uint32 (architecture independent 32-bit) (#1168). Also adjusted other occurrences of wrong types passed to XChangeProperty with format set to 32.

Browse Source
This commit is contained in:
binary1248 2016-11-26 15:51:24 +01:00 committed by Lukas Dürrenberger
parent 2857207cae
commit 7fe96d1ba3
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/SFML/Window/Unix/WindowImplX11.cpp
View File

@ -777,10 +777,10 @@ void WindowImplX11::setIcon(unsigned int width, unsigned int height, const Uint8
Uint8* iconPixels = static_cast<Uint8*>(std::malloc(width * height * 4)); Uint8* iconPixels = static_cast<Uint8*>(std::malloc(width * height * 4));
for (std::size_t i = 0; i < width * height; ++i) for (std::size_t i = 0; i < width * height; ++i)
{ {
iconPixels[8 + i * 4 + 0] = pixels[i * 4 + 2]; iconPixels[i * 4 + 0] = pixels[i * 4 + 2];
iconPixels[8 + i * 4 + 1] = pixels[i * 4 + 1]; iconPixels[i * 4 + 1] = pixels[i * 4 + 1];
iconPixels[8 + i * 4 + 2] = pixels[i * 4 + 0]; iconPixels[i * 4 + 2] = pixels[i * 4 + 0];
iconPixels[8 + i * 4 + 3] = pixels[i * 4 + 3]; iconPixels[i * 4 + 3] = pixels[i * 4 + 3];
} }
// Create the icon pixmap // Create the icon pixmap
@ -835,18 +835,20 @@ void WindowImplX11::setIcon(unsigned int width, unsigned int height, const Uint8
// ICCCM wants BGRA pixels: swap red and blue channels // ICCCM wants BGRA pixels: swap red and blue channels
// ICCCM also wants the first 2 unsigned 32-bit values to be width and height // ICCCM also wants the first 2 unsigned 32-bit values to be width and height
std::vector<Uint8> icccmIconPixels(8 + width * height * 4, 0); std::vector<unsigned long> icccmIconPixels(2 + width * height, 0);
unsigned long* ptr = &icccmIconPixels[0];
*ptr++ = width;
*ptr++ = height;
for (std::size_t i = 0; i < width * height; ++i) for (std::size_t i = 0; i < width * height; ++i)
{ {
icccmIconPixels[8 + i * 4 + 0] = pixels[i * 4 + 2]; *ptr++ = (pixels[i * 4 + 2] << 0 ) |
icccmIconPixels[8 + i * 4 + 1] = pixels[i * 4 + 1]; (pixels[i * 4 + 1] << 8 ) |
icccmIconPixels[8 + i * 4 + 2] = pixels[i * 4 + 0]; (pixels[i * 4 + 0] << 16) |
icccmIconPixels[8 + i * 4 + 3] = pixels[i * 4 + 3]; (pixels[i * 4 + 3] << 24);
} }
reinterpret_cast<Uint32*>(&icccmIconPixels[0])[0] = width;
reinterpret_cast<Uint32*>(&icccmIconPixels[0])[1] = height;
Atom netWmIcon = getAtom("_NET_WM_ICON"); Atom netWmIcon = getAtom("_NET_WM_ICON");
XChangeProperty(m_display, XChangeProperty(m_display,
@ -1147,7 +1149,7 @@ void WindowImplX11::switchToFullscreen()
if (netWmBypassCompositor) if (netWmBypassCompositor)
{ {
static const Uint32 bypassCompositor = 1; static const unsigned long bypassCompositor = 1;
XChangeProperty(m_display, XChangeProperty(m_display,
m_window, m_window,
@ -1226,7 +1228,7 @@ void WindowImplX11::setProtocols()
if (netWmPing && netWmPid) if (netWmPing && netWmPid)
{ {
uint32_t pid = getpid(); const long pid = getpid();
XChangeProperty(m_display, XChangeProperty(m_display,
m_window, m_window,