From f440ca4e37f681c44f49e0cd63d78d6b768d9cd7 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Sun, 21 Nov 2021 15:25:57 +0100 Subject: [PATCH] todo moving floating --- src/events/events.cpp | 8 +++++++- src/events/events.hpp | 4 ++-- src/windowManager.cpp | 8 ++++++-- src/windowManager.hpp | 2 ++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/events/events.cpp b/src/events/events.cpp index d572803..49e14e2 100644 --- a/src/events/events.cpp +++ b/src/events/events.cpp @@ -88,7 +88,7 @@ void Events::eventMapWindow(xcb_generic_event_t* event) { g_pWindowManager->setFocusedWindow(E->window); } -void Events::eventKeyPress(xcb_generic_event_t* event) { +void Events::eventButtonPress(xcb_generic_event_t* event) { const auto E = reinterpret_cast(event); const auto KEYSYM = KeybindManager::getKeysymFromKeycode(E->detail); @@ -100,6 +100,12 @@ void Events::eventKeyPress(xcb_generic_event_t* event) { } } +void Events::eventKeyPress(xcb_generic_event_t* event) { + const auto E = reinterpret_cast(event); + + // todo: super resize and move floating +} + void Events::eventExpose(xcb_generic_event_t* event) { const auto E = reinterpret_cast(event); diff --git a/src/events/events.hpp b/src/events/events.hpp index d78922a..80bf0a2 100644 --- a/src/events/events.hpp +++ b/src/events/events.hpp @@ -9,9 +9,9 @@ namespace Events { EVENT(Leave); EVENT(Destroy); EVENT(MapWindow); - EVENT(KeyPress); + EVENT(ButtonPress); EVENT(Expose); - + EVENT(KeyPress); // A thread to notify xcb to redraw our shiz void redraw(); diff --git a/src/windowManager.cpp b/src/windowManager.cpp index 2675c7d..a5ca197 100644 --- a/src/windowManager.cpp +++ b/src/windowManager.cpp @@ -92,13 +92,17 @@ bool CWindowManager::handleEvent() { break; case XCB_KEY_PRESS: case XCB_BUTTON_PRESS: - Events::eventKeyPress(ev); - Debug::log(LOG, "Event dispatched KEYPRESS"); + Events::eventButtonPress(ev); + Debug::log(LOG, "Event dispatched BUTTON_PRESS"); break; case XCB_EXPOSE: Events::eventExpose(ev); Debug::log(LOG, "Event dispatched EXPOSE"); break; + case XCB_KEY_PRESS: + + Debug::log(LOG, "Event dispatched KEY_PRESS"); + break; default: //Debug::log(WARN, "Unknown event: " + std::to_string(ev->response_type & ~0x80)); diff --git a/src/windowManager.hpp b/src/windowManager.hpp index f2a43d8..883bba7 100644 --- a/src/windowManager.hpp +++ b/src/windowManager.hpp @@ -19,6 +19,8 @@ public: xcb_drawable_t Drawable; uint32_t Values[3]; + bool modKeyDown = false; + uint8_t Depth = 32; xcb_visualtype_t* VisualType;