From 9b5811dffcebc61121ef6d3d9746817aabdabc4e Mon Sep 17 00:00:00 2001 From: Egor Date: Tue, 1 Oct 2019 21:18:47 -0700 Subject: Imgui Linux impl: implemented xcb event handling --- Imgui/interface/ImGuiImplLinux.h | 51 ------------------------------ Imgui/interface/ImGuiImplLinuxXCB.h | 62 +++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 51 deletions(-) delete mode 100644 Imgui/interface/ImGuiImplLinux.h create mode 100644 Imgui/interface/ImGuiImplLinuxXCB.h (limited to 'Imgui/interface') diff --git a/Imgui/interface/ImGuiImplLinux.h b/Imgui/interface/ImGuiImplLinux.h deleted file mode 100644 index fee4a9a..0000000 --- a/Imgui/interface/ImGuiImplLinux.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright 2019 Diligent Graphics LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#pragma once - -#include -#include "ImGuiImplDiligent.h" - -namespace Diligent -{ - -class ImGuiImplLinux final : public ImGuiImplDiligent -{ -public: - ImGuiImplLinux(//HWND hWnd, - IRenderDevice* pDevice, - TEXTURE_FORMAT BackBufferFmt, - TEXTURE_FORMAT DepthBufferFmt, - Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, - Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); - ~ImGuiImplLinux(); - - ImGuiImplLinux (const ImGuiImplLinux&) = delete; - ImGuiImplLinux ( ImGuiImplLinux&&) = delete; - ImGuiImplLinux& operator = (const ImGuiImplLinux&) = delete; - ImGuiImplLinux& operator = ( ImGuiImplLinux&&) = delete; - - virtual void NewFrame()override final; -}; - -} diff --git a/Imgui/interface/ImGuiImplLinuxXCB.h b/Imgui/interface/ImGuiImplLinuxXCB.h new file mode 100644 index 0000000..bef1035 --- /dev/null +++ b/Imgui/interface/ImGuiImplLinuxXCB.h @@ -0,0 +1,62 @@ +/* Copyright 2019 Diligent Graphics LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +#include + +#include "ImGuiImplDiligent.h" + +struct _XCBKeySymbols; + +namespace Diligent +{ + +class ImGuiImplLinuxXCB final : public ImGuiImplDiligent +{ +public: + ImGuiImplLinuxXCB(xcb_connection_t* connection, + IRenderDevice* pDevice, + TEXTURE_FORMAT BackBufferFmt, + TEXTURE_FORMAT DepthBufferFmt, + Uint32 DisplayWidht, + Uint32 DisplayHeight, + Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, + Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); + ~ImGuiImplLinuxXCB(); + + ImGuiImplLinuxXCB (const ImGuiImplLinuxXCB&) = delete; + ImGuiImplLinuxXCB ( ImGuiImplLinuxXCB&&) = delete; + ImGuiImplLinuxXCB& operator = (const ImGuiImplLinuxXCB&) = delete; + ImGuiImplLinuxXCB& operator = ( ImGuiImplLinuxXCB&&) = delete; + + bool HandleXCBEvent(xcb_generic_event_t* event); + virtual void NewFrame()override final; + +private: + void HandleKeyEvent(xcb_key_release_event_t* event); + + _XCBKeySymbols* m_syms = nullptr; +}; + +} -- cgit v1.2.3