pnx/spectre
1
0
Fork 0
Code Releases 2 Activity

Platform/Unix: Rename X11SharedDisplay to Xlib, and remove Display member variable from all classes.

Browse source 
We now initialize/destroy the display in Xlib::init/shutdown that is called in UnixApplication::init/shutdown and
therefore is valid through the whole lifetime. So no need for classes to keep references.
This commit is contained in:
Henrik Hautakoski 2020-12-25 17:17:51 +01:00
parent 60dd9bacb0
commit 090646b61a
17 changed files with 137 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,29 +1,19 @@
#include <Spectre/System/Event.h>
#include <Spectre/System/Log.h>
#include "Xlib.h"
#include "X11Display.h"
#include "X11Mouse.h"
#include "X11SharedDisplay.h"
namespace sp {
X11Mouse::X11Mouse() :
m_disp(NULL),
m_btn_state(0)
{
}
X11Mouse::~X11Mouse()
{
if (m_disp) {
XReleaseDisplay(m_disp);
}
}
void X11Mouse::init()
{
m_disp = XGetDisplay();
updateFocusedWindow();
}
@ -62,14 +52,15 @@ bool X11Mouse::isButtonDown(Mouse::Button button) const
void X11Mouse::update(InputModule *input)
{
::Display* disp = Xlib::getDisplay();
::Window root, child;
int rx, ry, x = 0, y = 0;
updateFocusedWindow();
// Query position and button state.
XQueryPointer(m_disp,
m_win ? m_win : ::XDefaultRootWindow(m_disp),
XQueryPointer(disp,
m_win ? m_win : ::XDefaultRootWindow(disp),
&root, &child,
&rx, &ry,
&x, &y, &m_btn_state);