remove getXcbWindow and getXcbConnection

Signed-off-by: Michael Pollind <mpollind@gmail.com>

Author: pollend

include/nbl/ui/CWindowXCB.h

@@ -23,17 +23,10 @@ class NBL_API2 CWindowXCB final : public IWindowXCB
 	CWindowXCB(core::smart_refctd_ptr<CWindowManagerXCB>&& winManager, SCreationParams&& params);
 	~CWindowXCB();
 
-
 	const native_handle_t* getNativeHandle() const override  {
 		return &m_handle;
 	}
 
-	// Display* getDisplay() const override { return m_dpy; }
-	xcb_window_t getXcbWindow() const override { return m_handle.m_window; }
-	xcb_connection_t* getXcbConnection() const override {
-		return m_connection->getRawConnection();
-	}
-
 	virtual IClipboardManager* getClipboardManager() override;
 	virtual ICursorControl* getCursorControl() override;
 	virtual IWindowManager* getManager() const override;

include/nbl/ui/IWindowXCB.h

@@ -29,9 +29,6 @@ class NBL_API2 IWindowXCB : public IWindow
 
         virtual const native_handle_t* getNativeHandle() const = 0;
 
-        virtual xcb_window_t getXcbWindow() const = 0;
-        virtual xcb_connection_t* getXcbConnection() const = 0;
-
         virtual bool setWindowSize_impl(uint32_t width, uint32_t height) = 0;
         virtual bool setWindowPosition_impl(int32_t x, int32_t y) = 0;
         virtual bool setWindowRotation_impl(bool landscape) = 0;

src/nbl/ui/CClipboardManagerXCB.cpp

@@ -30,17 +30,16 @@ namespace nbl::ui
 
     void CClipboardManagerXCB::process(const IWindowXCB* window, xcb_generic_event_t* event) {
         const auto& xcb = m_connection->getXcbFunctionTable();
-        
+        auto* windowHandle = window->getNativeHandle();
+		assert(windowHandle && windowHandle->m_window != XCB_WINDOW_NONE && windowHandle->m_connection != nullptr);
         auto TARGETS = m_connection->resolveAtom(m_TARGETS);
 
-        const auto& native_handle = window->getNativeHandle();
-
         switch(event->response_type & ~0x80) {
             // XCB_ATOM
             // Somone is requesting the clipboard data
             case XCB_SELECTION_REQUEST: {
                 auto* sne = reinterpret_cast<xcb_selection_request_event_t*>(event);
-                if(sne->requestor == window->getXcbWindow()) {
+                if(sne->requestor == windowHandle->m_window) {
                     if(sne->target == TARGETS) {
                             std::vector<xcb_atom_t> targets;
                             {
@@ -113,7 +112,7 @@ namespace nbl::ui
             // we've requested the clipboard data, and this is the reply
             case XCB_SELECTION_NOTIFY: {
                 auto* sne = reinterpret_cast<xcb_selection_notify_event_t*>(event);
-                if(sne->requestor == window->getXcbWindow()){
+                if(sne->requestor == windowHandle->m_window){
                     // xcb.pxcb_get_a
                     xcb_atom_t fieldType = XCB_ATOM;
                     if(sne->target != TARGETS) {

src/nbl/ui/CCursorControlXCB.cpp

@@ -26,9 +26,10 @@ namespace nbl::ui
     void CCursorControlXCB::setRelativePosition(IWindow* window, SRelativePosition position) {
         auto* windowXcb = static_cast<IWindowXCB*>(window);
         auto& xcb = m_connection->getXcbFunctionTable();
-        auto xcbWindow = windowXcb->getXcbWindow();
-
-        xcb.pxcb_warp_pointer(m_connection->getRawConnection(), XCB_NONE, xcbWindow, 0, 0, 0, 0, position.x, position.y);
+        auto* handle = windowXcb->getNativeHandle();
+        assert(handle && handle->m_window != XCB_WINDOW_NONE);
+        
+        xcb.pxcb_warp_pointer(m_connection->getRawConnection(), XCB_NONE, handle->m_window, 0, 0, 0, 0, position.x, position.y);
         xcb.pxcb_flush(m_connection->getRawConnection());
     }
 

src/nbl/ui/CWindowXCB.cpp

@@ -34,6 +34,8 @@ void CWindowXCB::CDispatchThread::work(lock_t& lock){
     }
     auto& xcb = m_window.m_windowManager->getXcbFunctionTable();
     auto& connection = m_window.m_connection;
+    auto& windowHandle = m_window.m_handle;
+    
 
     auto MW_DELETE_WINDOW = connection->resolveAtom(m_window.m_WM_DELETE_WINDOW);
     auto NET_WM_PING = connection->resolveAtom(m_window.m_NET_WM_PING);
@@ -62,7 +64,7 @@ void CWindowXCB::CDispatchThread::work(lock_t& lock){
             }
             case XCB_DESTROY_WINDOW: {
                 xcb_destroy_window_request_t* dwr = reinterpret_cast<xcb_destroy_window_request_t*>(event);
-                if(dwr->window == m_window.m_handle.m_window) {
+                if(dwr->window == windowHandle.m_window) {
                     m_quit = true;
                     eventCallback->onWindowClosed(&m_window);
                 }
@@ -71,19 +73,19 @@ void CWindowXCB::CDispatchThread::work(lock_t& lock){
             case XCB_CLIENT_MESSAGE: {
                 xcb_client_message_event_t* cme = reinterpret_cast<xcb_client_message_event_t*>(event);
                 if(cme->data.data32[0] == MW_DELETE_WINDOW) {
-                    xcb.pxcb_unmap_window(m_window.getXcbConnection(), m_window.m_handle.m_window);
-                    xcb.pxcb_destroy_window(m_window.getXcbConnection(), m_window.m_handle.m_window);
-                    xcb.pxcb_flush(m_window.getXcbConnection());
-                    m_window.m_handle.m_window = 0;
+                    xcb.pxcb_unmap_window(windowHandle.m_connection, windowHandle.m_window);
+                    xcb.pxcb_destroy_window(windowHandle.m_connection, windowHandle.m_window);
+                    xcb.pxcb_flush(windowHandle.m_connection);
+                    windowHandle.m_window = 0;
                     m_quit = true; // we need to quit the dispatch thread
                     eventCallback->onWindowClosed(&m_window);
                 } else if(cme->data.data32[0] == NET_WM_PING && cme->window != connection->primaryScreen()->root) {
                     xcb_client_message_event_t ev = *cme;
                     ev.response_type = XCB_CLIENT_MESSAGE;
                     ev.window = m_window.m_handle.m_window;
                     ev.type = NET_WM_PING;
-                    xcb.pxcb_send_event(m_window.getXcbConnection(), 0, m_window.m_handle.m_window, XCB_EVENT_MASK_NO_EVENT, reinterpret_cast<const char*>(&ev));
-                    xcb.pxcb_flush(m_window.getXcbConnection());
+                    xcb.pxcb_send_event(windowHandle.m_connection, 0, m_window.m_handle.m_window, XCB_EVENT_MASK_NO_EVENT, reinterpret_cast<const char*>(&ev));
+                    xcb.pxcb_flush(windowHandle.m_connection);
                 }
                 break;
             }

src/nbl/video/CSurfaceVulkan.cpp

@@ -151,11 +151,13 @@ namespace nbl::video
 		if(!api || !window)
 			return nullptr;
 
+		auto* handle = window->getNativeHandle();
+		assert(handle && handle->m_window != XCB_WINDOW_NONE && handle->m_connection != nullptr);
 		VkXcbSurfaceCreateInfoKHR createInfo { VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR};
 		createInfo.pNext = nullptr;
 		createInfo.flags = 0;
-		createInfo.connection = window->getXcbConnection();
-		createInfo.window = window->getXcbWindow();
+		createInfo.connection = handle->m_connection;
+		createInfo.window = handle->m_window;
 		VkSurfaceKHR vk_surface;
 		if (vkCreateXcbSurfaceKHR(api->getInternalObject(), &createInfo, nullptr, &vk_surface) == VK_SUCCESS)
 		{