pnx/spectre
1
0
Fork 0
Code Releases 2 Activity

Platform/Unix/X11SharedDisplay: pass a pointer to the display to XReleaseDisplay() just to be sure client code has a valid pointer

Browse source
This commit is contained in:
Henrik Hautakoski 2020-10-17 14:18:41 +02:00
parent 782f116d7c
commit 10e1a9071e
8 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/Platform/Unix/GLXContext.cpp
View file

@ -160,7 +160,7 @@ void GLXContext::destroy()
} }
if (m_disp) { if (m_disp) {
XReleaseDisplay(); XReleaseDisplay(m_disp);
m_disp = NULL; m_disp = NULL;
} }

4
source/Platform/Unix/UnixMisc.cpp
View file

@ -60,7 +60,7 @@ void PlatformMisc::GetDisplayModes(std::vector<DisplayMode>& modes)
Log::error("Failed to use XRandR extension while trying to get display modes."); Log::error("Failed to use XRandR extension while trying to get display modes.");
} }
XReleaseDisplay(); XReleaseDisplay(disp);
} else { } else {
Log::error("Failed to connect to the X server while trying to get display modes."); Log::error("Failed to connect to the X server while trying to get display modes.");
} }
@ -104,7 +104,7 @@ DisplayMode PlatformMisc::GetDesktopMode()
Log::error("Failed to use XRandR extension while trying to get desktop display mode."); Log::error("Failed to use XRandR extension while trying to get desktop display mode.");
} }
XReleaseDisplay(); XReleaseDisplay(disp);
} else { } else {
Log::error("Failed to connect to the X server while trying to get desktop display mode."); Log::error("Failed to connect to the X server while trying to get desktop display mode.");
} }

2
source/Platform/Unix/X11Display.cpp
View file

@ -75,7 +75,7 @@ void X11Display::destroy()
} }
if (m_disp) { if (m_disp) {
XReleaseDisplay(); XReleaseDisplay(m_disp);
m_disp = NULL; m_disp = NULL;
} }
} }

2
source/Platform/Unix/X11EventQueue.cpp
View file

@ -16,7 +16,7 @@ X11EventQueue::X11EventQueue()
X11EventQueue::~X11EventQueue() X11EventQueue::~X11EventQueue()
{ {
if (m_disp) { if (m_disp) {
XReleaseDisplay(); XReleaseDisplay(m_disp);
} }
} }

2
source/Platform/Unix/X11Keyboard.cpp
View file

@ -210,7 +210,7 @@ m_disp(NULL)
X11Keyboard::~X11Keyboard() X11Keyboard::~X11Keyboard()
{ {
if (m_disp) { if (m_disp) {
XReleaseDisplay(); XReleaseDisplay(m_disp);
} }
} }

2
source/Platform/Unix/X11Mouse.cpp
View file

@ -16,7 +16,7 @@ m_btn_state(0)
X11Mouse::~X11Mouse() X11Mouse::~X11Mouse()
{ {
if (m_disp) { if (m_disp) {
XReleaseDisplay(); XReleaseDisplay(m_disp);
} }
} }

5
source/Platform/Unix/X11SharedDisplay.cpp
View file

@ -1,4 +1,5 @@
#include <assert.h>
#include "X11SharedDisplay.h" #include "X11SharedDisplay.h"
namespace sp { namespace sp {
@ -18,7 +19,9 @@ unsigned int refcount = 0;
return sharedDisplay; return sharedDisplay;
} }
void XReleaseDisplay() { void XReleaseDisplay(::Display* disp) {
assert(disp == sharedDisplay);
if (refcount < 1) { if (refcount < 1) {
return; return;

2
source/Platform/Unix/X11SharedDisplay.h
View file

@ -9,7 +9,7 @@ namespace sp {
::Display* XGetDisplay(); ::Display* XGetDisplay();
void XReleaseDisplay(); void XReleaseDisplay(::Display* disp);
Atom getAtom(const std::string& name, bool onlyIfExists = false); Atom getAtom(const std::string& name, bool onlyIfExists = false);