yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backends/x11: Drop X11WindowedBackend::window()

Browse source
This commit is contained in:
Vlad Zahorodnii 2022-12-09 17:33:29 +02:00
parent a10193ab4d
commit 555c208b87
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/backends/x11/windowed/x11_windowed_backend.cpp
View file

@ -415,17 +415,18 @@ void X11WindowedBackend::grabKeyboard(xcb_timestamp_t time)
xcb_ungrab_pointer(m_connection, time); xcb_ungrab_pointer(m_connection, time);
m_keyboardGrabbed = false; m_keyboardGrabbed = false;
} else { } else {
const auto c = xcb_grab_keyboard_unchecked(m_connection, false, window(), time, const X11WindowedOutput *output = static_cast<X11WindowedOutput *>(m_outputs[0]);
const auto c = xcb_grab_keyboard_unchecked(m_connection, false, output->window(), time,
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC); XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
UniqueCPtr<xcb_grab_keyboard_reply_t> grab(xcb_grab_keyboard_reply(m_connection, c, nullptr)); UniqueCPtr<xcb_grab_keyboard_reply_t> grab(xcb_grab_keyboard_reply(m_connection, c, nullptr));
if (!grab) { if (!grab) {
return; return;
} }
if (grab->status == XCB_GRAB_STATUS_SUCCESS) { if (grab->status == XCB_GRAB_STATUS_SUCCESS) {
const auto c = xcb_grab_pointer_unchecked(m_connection, false, window(), const auto c = xcb_grab_pointer_unchecked(m_connection, false, output->window(),
XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION | XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_LEAVE_WINDOW, XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION | XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_LEAVE_WINDOW,
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
window(), XCB_CURSOR_NONE, time); output->window(), XCB_CURSOR_NONE, time);
UniqueCPtr<xcb_grab_pointer_reply_t> grab(xcb_grab_pointer_reply(m_connection, c, nullptr)); UniqueCPtr<xcb_grab_pointer_reply_t> grab(xcb_grab_pointer_reply(m_connection, c, nullptr));
if (!grab || grab->status != XCB_GRAB_STATUS_SUCCESS) { if (!grab || grab->status != XCB_GRAB_STATUS_SUCCESS) {
xcb_ungrab_keyboard(m_connection, time); xcb_ungrab_keyboard(m_connection, time);
@ -625,11 +626,6 @@ QVector<CompositingType> X11WindowedBackend::supportedCompositors() const
return QVector<CompositingType>{OpenGLCompositing, QPainterCompositing}; return QVector<CompositingType>{OpenGLCompositing, QPainterCompositing};
} }
xcb_window_t X11WindowedBackend::window() const
{
return m_outputs.first()->window();
}
Outputs X11WindowedBackend::outputs() const Outputs X11WindowedBackend::outputs() const
{ {
return m_outputs; return m_outputs;

1
src/backends/x11/windowed/x11_windowed_backend.h
View file

@ -103,7 +103,6 @@ public:
int screenNumer() const; int screenNumer() const;
xcb_window_t rootWindow() const; xcb_window_t rootWindow() const;
xcb_window_t window() const;
bool hasXInput() const; bool hasXInput() const;
bool initialize() override; bool initialize() override;