mirror of
https://github.com/hyprwm/Hypr.git
synced 2024-11-22 05:25:58 +01:00
made windowmanager a class
This commit is contained in:
vaxerski
parent
da91fa3c98
commit
6d2c030439
6 changed files with 112 additions and 97 deletions
|
|
@ -43,14 +43,14 @@ unsigned int KeybindManager::modToMask(MODS mod) {
|
|||
}
|
||||
|
||||
xcb_keysym_t KeybindManager::getKeysymFromKeycode(xcb_keycode_t keycode) {
|
||||
const auto KEYSYMS = xcb_key_symbols_alloc(WindowManager::DisplayConnection);
|
||||
const auto KEYSYMS = xcb_key_symbols_alloc(g_pWindowManager->DisplayConnection);
|
||||
const auto KEYSYM = (!(KEYSYMS) ? 0 : xcb_key_symbols_get_keysym(KEYSYMS, keycode, 0));
|
||||
xcb_key_symbols_free(KEYSYMS);
|
||||
return KEYSYM;
|
||||
}
|
||||
|
||||
xcb_keycode_t KeybindManager::getKeycodeFromKeysym(xcb_keysym_t keysym) {
|
||||
const auto KEYSYMS = xcb_key_symbols_alloc(WindowManager::DisplayConnection);
|
||||
const auto KEYSYMS = xcb_key_symbols_alloc(g_pWindowManager->DisplayConnection);
|
||||
const auto KEYCODE = (!(KEYSYMS) ? NULL : xcb_key_symbols_get_keycode(KEYSYMS, keysym));
|
||||
xcb_key_symbols_free(KEYSYMS);
|
||||
return KEYCODE ? *KEYCODE : 0;
|
||||
|
|
@ -60,7 +60,7 @@ xcb_keycode_t KeybindManager::getKeycodeFromKeysym(xcb_keysym_t keysym) {
|
|||
|
||||
void KeybindManager::killactive(std::string args) {
|
||||
// args unused
|
||||
xcb_kill_client(WindowManager::DisplayConnection, WindowManager::LastWindow);
|
||||
xcb_kill_client(g_pWindowManager->DisplayConnection, g_pWindowManager->LastWindow);
|
||||
}
|
||||
|
||||
void KeybindManager::call(std::string args) {
|
||||
|
|
@ -104,5 +104,5 @@ void KeybindManager::call(std::string args) {
|
|||
}
|
||||
|
||||
void KeybindManager::movewindow(std::string arg) {
|
||||
WindowManager::moveActiveWindowTo(arg[0]);
|
||||
g_pWindowManager->moveActiveWindowTo(arg[0]);
|
||||
}
|
||||
|
|
@ -5,6 +5,7 @@
|
|||
#include <xcb/xcb_keysyms.h>
|
||||
|
||||
#include <string>
|
||||
#include <memory>
|
||||
|
||||
#include "./helpers/Vector.hpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ void Events::eventEnter(xcb_generic_event_t* event) {
|
|||
const auto E = reinterpret_cast<xcb_enter_notify_event_t*>(event);
|
||||
|
||||
// Just focus it and update.
|
||||
WindowManager::setFocusedWindow(E->event);
|
||||
g_pWindowManager->setFocusedWindow(E->event);
|
||||
|
||||
// vvv insallah no segfaults
|
||||
WindowManager::getWindowFromDrawable(E->event)->setDirty(true);
|
||||
g_pWindowManager->getWindowFromDrawable(E->event)->setDirty(true);
|
||||
}
|
||||
|
||||
void Events::eventLeave(xcb_generic_event_t* event) {
|
||||
|
|
@ -18,15 +18,15 @@ void Events::eventLeave(xcb_generic_event_t* event) {
|
|||
|
||||
void Events::eventDestroy(xcb_generic_event_t* event) {
|
||||
const auto E = reinterpret_cast<xcb_destroy_notify_event_t*>(event);
|
||||
xcb_kill_client(WindowManager::DisplayConnection, E->window);
|
||||
xcb_kill_client(g_pWindowManager->DisplayConnection, E->window);
|
||||
|
||||
// fix last window
|
||||
const auto CLOSEDWINDOW = WindowManager::getWindowFromDrawable(E->window);
|
||||
const auto CLOSEDWINDOW = g_pWindowManager->getWindowFromDrawable(E->window);
|
||||
if (CLOSEDWINDOW) {
|
||||
WindowManager::fixWindowOnClose(CLOSEDWINDOW);
|
||||
g_pWindowManager->fixWindowOnClose(CLOSEDWINDOW);
|
||||
|
||||
// delete off of the arr
|
||||
WindowManager::removeWindowFromVectorSafe(E->window);
|
||||
g_pWindowManager->removeWindowFromVectorSafe(E->window);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ void Events::eventMapWindow(xcb_generic_event_t* event) {
|
|||
const auto E = reinterpret_cast<xcb_map_request_event_t*>(event);
|
||||
|
||||
// Map the window
|
||||
xcb_map_window(WindowManager::DisplayConnection, E->window);
|
||||
xcb_map_window(g_pWindowManager->DisplayConnection, E->window);
|
||||
|
||||
// Do the setup of the window's params and stuf
|
||||
CWindow window;
|
||||
|
|
@ -43,22 +43,22 @@ void Events::eventMapWindow(xcb_generic_event_t* event) {
|
|||
window.setDirty(true);
|
||||
|
||||
// Also sets the old one
|
||||
WindowManager::calculateNewWindowParams(&window);
|
||||
g_pWindowManager->calculateNewWindowParams(&window);
|
||||
|
||||
// Focus
|
||||
WindowManager::setFocusedWindow(E->window);
|
||||
g_pWindowManager->setFocusedWindow(E->window);
|
||||
|
||||
// Add to arr
|
||||
WindowManager::addWindowToVectorSafe(window);
|
||||
g_pWindowManager->addWindowToVectorSafe(window);
|
||||
|
||||
Debug::log(LOG, "Created a new window! X: " + std::to_string(window.getPosition().x) + ", Y: " + std::to_string(window.getPosition().y) + ", W: "
|
||||
+ std::to_string(window.getSize().x) + ", H:" + std::to_string(window.getSize().y) + " ID: " + std::to_string(E->window));
|
||||
|
||||
// Set map values
|
||||
WindowManager::Values[0] = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE;
|
||||
xcb_change_window_attributes_checked(WindowManager::DisplayConnection, E->window, XCB_CW_EVENT_MASK, WindowManager::Values);
|
||||
g_pWindowManager->Values[0] = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE;
|
||||
xcb_change_window_attributes_checked(g_pWindowManager->DisplayConnection, E->window, XCB_CW_EVENT_MASK, g_pWindowManager->Values);
|
||||
|
||||
WindowManager::setFocusedWindow(E->window);
|
||||
g_pWindowManager->setFocusedWindow(E->window);
|
||||
}
|
||||
|
||||
void Events::eventKeyPress(xcb_generic_event_t* event) {
|
||||
|
|
|
|||
10
src/main.cpp
10
src/main.cpp
|
|
@ -10,19 +10,19 @@ Started by Vaxry on 2021 / 11 / 17
|
|||
int main(int argc, char** argv) {
|
||||
Debug::log(LOG, "Hypr debug log. Built on " + std::string(__DATE__) + " at " + std::string(__TIME__));
|
||||
|
||||
WindowManager::DisplayConnection = xcb_connect(NULL, NULL);
|
||||
if (const auto RET = xcb_connection_has_error(WindowManager::DisplayConnection); RET != 0) {
|
||||
g_pWindowManager->DisplayConnection = xcb_connect(NULL, NULL);
|
||||
if (const auto RET = xcb_connection_has_error(g_pWindowManager->DisplayConnection); RET != 0) {
|
||||
Debug::log(CRIT, "Connection Failed! Return: " + std::to_string(RET));
|
||||
return RET;
|
||||
}
|
||||
|
||||
WindowManager::Screen = xcb_setup_roots_iterator(xcb_get_setup(WindowManager::DisplayConnection)).data;
|
||||
g_pWindowManager->Screen = xcb_setup_roots_iterator(xcb_get_setup(g_pWindowManager->DisplayConnection)).data;
|
||||
|
||||
WindowManager::setupManager();
|
||||
g_pWindowManager->setupManager();
|
||||
|
||||
Debug::log(LOG, "Hypr Started!");
|
||||
|
||||
while (WindowManager::handleEvent()) {
|
||||
while (g_pWindowManager->handleEvent()) {
|
||||
;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,40 +1,40 @@
|
|||
#include "windowManager.hpp"
|
||||
#include "./events/events.hpp"
|
||||
|
||||
void WindowManager::setupManager() {
|
||||
void CWindowManager::setupManager() {
|
||||
KeybindManager::reloadAllKeybinds();
|
||||
|
||||
WindowManager::Values[0] = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY | XCB_EVENT_MASK_PROPERTY_CHANGE;
|
||||
xcb_change_window_attributes_checked(WindowManager::DisplayConnection, WindowManager::Screen->root,
|
||||
XCB_CW_EVENT_MASK, WindowManager::Values);
|
||||
xcb_ungrab_key(WindowManager::DisplayConnection, XCB_GRAB_ANY, WindowManager::Screen->root, XCB_MOD_MASK_ANY);
|
||||
Values[0] = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY | XCB_EVENT_MASK_PROPERTY_CHANGE;
|
||||
xcb_change_window_attributes_checked(DisplayConnection, Screen->root,
|
||||
XCB_CW_EVENT_MASK, Values);
|
||||
xcb_ungrab_key(DisplayConnection, XCB_GRAB_ANY, Screen->root, XCB_MOD_MASK_ANY);
|
||||
|
||||
for (auto& keybind : KeybindManager::keybinds) {
|
||||
xcb_grab_key(WindowManager::DisplayConnection, 1, WindowManager::Screen->root,
|
||||
xcb_grab_key(DisplayConnection, 1, Screen->root,
|
||||
KeybindManager::modToMask(keybind.getMod()), KeybindManager::getKeycodeFromKeysym(keybind.getKeysym()),
|
||||
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
|
||||
}
|
||||
|
||||
xcb_flush(WindowManager::DisplayConnection);
|
||||
xcb_flush(DisplayConnection);
|
||||
|
||||
xcb_grab_button(WindowManager::DisplayConnection, 0,
|
||||
WindowManager::Screen->root, XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE,
|
||||
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, WindowManager::Screen->root, XCB_NONE,
|
||||
xcb_grab_button(DisplayConnection, 0,
|
||||
Screen->root, XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE,
|
||||
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, Screen->root, XCB_NONE,
|
||||
1, KeybindManager::modToMask(MOD_SUPER));
|
||||
|
||||
xcb_grab_button(WindowManager::DisplayConnection, 0,
|
||||
WindowManager::Screen->root, XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE,
|
||||
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, WindowManager::Screen->root, XCB_NONE,
|
||||
xcb_grab_button(DisplayConnection, 0,
|
||||
Screen->root, XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE,
|
||||
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, Screen->root, XCB_NONE,
|
||||
3, KeybindManager::modToMask(MOD_SUPER));
|
||||
|
||||
xcb_flush(WindowManager::DisplayConnection);
|
||||
xcb_flush(DisplayConnection);
|
||||
}
|
||||
|
||||
bool WindowManager::handleEvent() {
|
||||
if (xcb_connection_has_error(WindowManager::DisplayConnection))
|
||||
bool CWindowManager::handleEvent() {
|
||||
if (xcb_connection_has_error(DisplayConnection))
|
||||
return false;
|
||||
|
||||
const auto ev = xcb_wait_for_event(WindowManager::DisplayConnection);
|
||||
const auto ev = xcb_wait_for_event(DisplayConnection);
|
||||
if (ev != NULL) {
|
||||
switch (ev->response_type & ~0x80) {
|
||||
case XCB_ENTER_NOTIFY:
|
||||
|
|
@ -68,45 +68,45 @@ bool WindowManager::handleEvent() {
|
|||
}
|
||||
|
||||
// refresh and apply the parameters of all dirty windows.
|
||||
WindowManager::refreshDirtyWindows();
|
||||
refreshDirtyWindows();
|
||||
|
||||
xcb_flush(WindowManager::DisplayConnection);
|
||||
xcb_flush(DisplayConnection);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void WindowManager::refreshDirtyWindows() {
|
||||
void CWindowManager::refreshDirtyWindows() {
|
||||
for(auto& window : windows) {
|
||||
if (window.getDirty()) {
|
||||
|
||||
|
||||
Values[0] = (int)window.getEffectiveSize().x;
|
||||
Values[1] = (int)window.getEffectiveSize().y;
|
||||
xcb_configure_window(WindowManager::DisplayConnection, window.getDrawable(), XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, Values);
|
||||
xcb_configure_window(DisplayConnection, window.getDrawable(), XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, Values);
|
||||
|
||||
Values[0] = (int)window.getEffectivePosition().x;
|
||||
Values[1] = (int)window.getEffectivePosition().y;
|
||||
xcb_configure_window(WindowManager::DisplayConnection, window.getDrawable(), XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, Values);
|
||||
xcb_configure_window(DisplayConnection, window.getDrawable(), XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, Values);
|
||||
|
||||
// Focused special border.
|
||||
if (window.getDrawable() == WindowManager::LastWindow) {
|
||||
if (window.getDrawable() == LastWindow) {
|
||||
Values[0] = (int)BORDERSIZE;
|
||||
xcb_configure_window(WindowManager::DisplayConnection, window.getDrawable(), XCB_CONFIG_WINDOW_BORDER_WIDTH, Values);
|
||||
xcb_configure_window(DisplayConnection, window.getDrawable(), XCB_CONFIG_WINDOW_BORDER_WIDTH, Values);
|
||||
|
||||
// Update the position because the border makes the window jump
|
||||
// I have added the bordersize vec2d before in the setEffectiveSizePosUsingConfig function.
|
||||
Values[0] = (int)window.getEffectivePosition().x - BORDERSIZE;
|
||||
Values[1] = (int)window.getEffectivePosition().y - BORDERSIZE;
|
||||
xcb_configure_window(WindowManager::DisplayConnection, window.getDrawable(), XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, Values);
|
||||
xcb_configure_window(DisplayConnection, window.getDrawable(), XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, Values);
|
||||
|
||||
Values[0] = 0xFF3333; // RED :)
|
||||
xcb_change_window_attributes(WindowManager::DisplayConnection, window.getDrawable(), XCB_CW_BORDER_PIXEL, Values);
|
||||
xcb_change_window_attributes(DisplayConnection, window.getDrawable(), XCB_CW_BORDER_PIXEL, Values);
|
||||
} else {
|
||||
Values[0] = 0;
|
||||
xcb_configure_window(WindowManager::DisplayConnection, window.getDrawable(), XCB_CONFIG_WINDOW_BORDER_WIDTH, Values);
|
||||
xcb_configure_window(DisplayConnection, window.getDrawable(), XCB_CONFIG_WINDOW_BORDER_WIDTH, Values);
|
||||
|
||||
Values[0] = 0x555555; // GRAY :)
|
||||
xcb_change_window_attributes(WindowManager::DisplayConnection, window.getDrawable(), XCB_CW_BORDER_PIXEL, Values);
|
||||
xcb_change_window_attributes(DisplayConnection, window.getDrawable(), XCB_CW_BORDER_PIXEL, Values);
|
||||
}
|
||||
|
||||
window.setDirty(false);
|
||||
|
|
@ -116,20 +116,20 @@ void WindowManager::refreshDirtyWindows() {
|
|||
}
|
||||
}
|
||||
|
||||
void WindowManager::setFocusedWindow(xcb_drawable_t window) {
|
||||
if (window && window != WindowManager::Screen->root) {
|
||||
xcb_set_input_focus(WindowManager::DisplayConnection, XCB_INPUT_FOCUS_POINTER_ROOT, window, XCB_CURRENT_TIME);
|
||||
void CWindowManager::setFocusedWindow(xcb_drawable_t window) {
|
||||
if (window && window != Screen->root) {
|
||||
xcb_set_input_focus(DisplayConnection, XCB_INPUT_FOCUS_POINTER_ROOT, window, XCB_CURRENT_TIME);
|
||||
|
||||
// Fix border from the old window that was in focus.
|
||||
if (const auto PLASTWINDOW = WindowManager::getWindowFromDrawable(WindowManager::LastWindow); PLASTWINDOW)
|
||||
if (const auto PLASTWINDOW = getWindowFromDrawable(LastWindow); PLASTWINDOW)
|
||||
PLASTWINDOW->setDirty(true);
|
||||
|
||||
WindowManager::LastWindow = window;
|
||||
LastWindow = window;
|
||||
}
|
||||
}
|
||||
|
||||
CWindow* WindowManager::getWindowFromDrawable(xcb_drawable_t window) {
|
||||
for(auto& w : WindowManager::windows) {
|
||||
CWindow* CWindowManager::getWindowFromDrawable(xcb_drawable_t window) {
|
||||
for(auto& w : windows) {
|
||||
if (w.getDrawable() == window) {
|
||||
return &w;
|
||||
}
|
||||
|
|
@ -137,41 +137,41 @@ CWindow* WindowManager::getWindowFromDrawable(xcb_drawable_t window) {
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
void WindowManager::addWindowToVectorSafe(CWindow window) {
|
||||
for (auto& w : WindowManager::windows) {
|
||||
void CWindowManager::addWindowToVectorSafe(CWindow window) {
|
||||
for (auto& w : windows) {
|
||||
if (w.getDrawable() == window.getDrawable())
|
||||
return; // Do not add if already present.
|
||||
}
|
||||
WindowManager::windows.push_back(window);
|
||||
windows.push_back(window);
|
||||
}
|
||||
|
||||
void WindowManager::removeWindowFromVectorSafe(xcb_drawable_t window) {
|
||||
void CWindowManager::removeWindowFromVectorSafe(xcb_drawable_t window) {
|
||||
|
||||
if (!window)
|
||||
return;
|
||||
|
||||
std::vector<CWindow> temp = WindowManager::windows;
|
||||
std::vector<CWindow> temp = windows;
|
||||
|
||||
WindowManager::windows.clear();
|
||||
windows.clear();
|
||||
|
||||
for(auto p : temp) {
|
||||
if (p.getDrawable() != window) {
|
||||
WindowManager::windows.push_back(p);
|
||||
windows.push_back(p);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void setEffectiveSizePosUsingConfig(CWindow* pWindow) {
|
||||
void CWindowManager::setEffectiveSizePosUsingConfig(CWindow* pWindow) {
|
||||
|
||||
if (!pWindow)
|
||||
return;
|
||||
|
||||
// set some flags.
|
||||
const bool DISPLAYLEFT = pWindow->getPosition().x == 0;
|
||||
const bool DISPLAYRIGHT = pWindow->getPosition().x + pWindow->getSize().x == WindowManager::Screen->width_in_pixels;
|
||||
const bool DISPLAYRIGHT = pWindow->getPosition().x + pWindow->getSize().x == Screen->width_in_pixels;
|
||||
const bool DISPLAYTOP = pWindow->getPosition().y == 0;
|
||||
const bool DISPLAYBOTTOM = pWindow->getPosition().y + pWindow->getSize().y == WindowManager::Screen->height_in_pixels;
|
||||
const bool DISPLAYBOTTOM = pWindow->getPosition().y + pWindow->getSize().y == Screen->height_in_pixels;
|
||||
|
||||
pWindow->setEffectivePosition(pWindow->getPosition() + Vector2D(BORDERSIZE, BORDERSIZE));
|
||||
pWindow->setEffectiveSize(pWindow->getSize() - (Vector2D(BORDERSIZE, BORDERSIZE) * 2));
|
||||
|
|
@ -184,8 +184,8 @@ void setEffectiveSizePosUsingConfig(CWindow* pWindow) {
|
|||
pWindow->setEffectiveSize(pWindow->getEffectiveSize() - Vector2D(DISPLAYRIGHT ? GAPS_OUT : GAPS_IN, DISPLAYBOTTOM ? GAPS_OUT : GAPS_IN));
|
||||
}
|
||||
|
||||
void calculateNewTileSetOldTile(CWindow* pWindow) {
|
||||
const auto PLASTWINDOW = WindowManager::getWindowFromDrawable(WindowManager::LastWindow);
|
||||
void CWindowManager::calculateNewTileSetOldTile(CWindow* pWindow) {
|
||||
const auto PLASTWINDOW = getWindowFromDrawable(LastWindow);
|
||||
if (PLASTWINDOW) {
|
||||
const auto PLASTSIZE = PLASTWINDOW->getSize();
|
||||
const auto PLASTPOS = PLASTWINDOW->getPosition();
|
||||
|
|
@ -203,7 +203,7 @@ void calculateNewTileSetOldTile(CWindow* pWindow) {
|
|||
PLASTWINDOW->setDirty(true);
|
||||
} else {
|
||||
// Open a fullscreen window
|
||||
pWindow->setSize(Vector2D(WindowManager::Screen->width_in_pixels, WindowManager::Screen->height_in_pixels));
|
||||
pWindow->setSize(Vector2D(Screen->width_in_pixels, Screen->height_in_pixels));
|
||||
pWindow->setPosition(Vector2D(0, 0));
|
||||
}
|
||||
|
||||
|
|
@ -211,7 +211,7 @@ void calculateNewTileSetOldTile(CWindow* pWindow) {
|
|||
setEffectiveSizePosUsingConfig(PLASTWINDOW);
|
||||
}
|
||||
|
||||
void WindowManager::calculateNewWindowParams(CWindow* pWindow) {
|
||||
void CWindowManager::calculateNewWindowParams(CWindow* pWindow) {
|
||||
// And set old one's if needed.
|
||||
if (!pWindow)
|
||||
return;
|
||||
|
|
@ -223,7 +223,7 @@ void WindowManager::calculateNewWindowParams(CWindow* pWindow) {
|
|||
pWindow->setDirty(true);
|
||||
}
|
||||
|
||||
bool isNeighbor(CWindow* a, CWindow* b) {
|
||||
bool CWindowManager::isNeighbor(CWindow* a, CWindow* b) {
|
||||
const auto POSA = a->getPosition();
|
||||
const auto POSB = b->getPosition();
|
||||
const auto SIZEA = a->getSize();
|
||||
|
|
@ -254,7 +254,7 @@ bool isNeighbor(CWindow* a, CWindow* b) {
|
|||
return false;
|
||||
}
|
||||
|
||||
bool canEatWindow(CWindow* a, CWindow* toEat) {
|
||||
bool CWindowManager::canEatWindow(CWindow* a, CWindow* toEat) {
|
||||
// Pos is min of both.
|
||||
const auto POSAFTEREAT = Vector2D(std::min(a->getPosition().x, toEat->getPosition().x), std::min(a->getPosition().y, toEat->getPosition().y));
|
||||
|
||||
|
|
@ -273,7 +273,7 @@ bool canEatWindow(CWindow* a, CWindow* toEat) {
|
|||
return !(LEFT1.x >= RIGHT2.x || LEFT2.x >= RIGHT1.x || LEFT1.y >= RIGHT2.y || LEFT2.y >= RIGHT1.y);
|
||||
};
|
||||
|
||||
for (auto& w : WindowManager::windows) {
|
||||
for (auto& w : windows) {
|
||||
if (w.getDrawable() == a->getDrawable() || w.getDrawable() == toEat->getDrawable())
|
||||
continue;
|
||||
|
||||
|
|
@ -284,7 +284,7 @@ bool canEatWindow(CWindow* a, CWindow* toEat) {
|
|||
return true;
|
||||
}
|
||||
|
||||
void eatWindow(CWindow* a, CWindow* toEat) {
|
||||
void CWindowManager::eatWindow(CWindow* a, CWindow* toEat) {
|
||||
|
||||
// Size is pos + size max - pos
|
||||
const auto OPPCORNERA = a->getPosition() + a->getSize();
|
||||
|
|
@ -296,13 +296,13 @@ void eatWindow(CWindow* a, CWindow* toEat) {
|
|||
a->setSize(Vector2D(std::max(OPPCORNERA.x, OPPCORNERB.x), std::max(OPPCORNERA.y, OPPCORNERB.y)) - a->getPosition());
|
||||
}
|
||||
|
||||
void WindowManager::fixWindowOnClose(CWindow* pClosedWindow) {
|
||||
void CWindowManager::fixWindowOnClose(CWindow* pClosedWindow) {
|
||||
if (!pClosedWindow)
|
||||
return;
|
||||
|
||||
// get the first neighboring window
|
||||
CWindow* neighbor = nullptr;
|
||||
for(auto& w : WindowManager::windows) {
|
||||
for(auto& w : windows) {
|
||||
if (w.getDrawable() == pClosedWindow->getDrawable())
|
||||
continue;
|
||||
|
||||
|
|
@ -319,14 +319,14 @@ void WindowManager::fixWindowOnClose(CWindow* pClosedWindow) {
|
|||
eatWindow(neighbor, pClosedWindow);
|
||||
|
||||
neighbor->setDirty(true);
|
||||
WindowManager::setFocusedWindow(neighbor->getDrawable()); // Set focus. :)
|
||||
setFocusedWindow(neighbor->getDrawable()); // Set focus. :)
|
||||
|
||||
setEffectiveSizePosUsingConfig(neighbor);
|
||||
}
|
||||
|
||||
CWindow* getNeighborInDir(char dir) {
|
||||
CWindow* CWindowManager::getNeighborInDir(char dir) {
|
||||
|
||||
const auto CURRENTWINDOW = WindowManager::getWindowFromDrawable(WindowManager::LastWindow);
|
||||
const auto CURRENTWINDOW = getWindowFromDrawable(LastWindow);
|
||||
|
||||
if (!CURRENTWINDOW)
|
||||
return nullptr;
|
||||
|
|
@ -334,7 +334,7 @@ CWindow* getNeighborInDir(char dir) {
|
|||
const auto POSA = CURRENTWINDOW->getPosition();
|
||||
const auto SIZEA = CURRENTWINDOW->getSize();
|
||||
|
||||
for (auto& w : WindowManager::windows) {
|
||||
for (auto& w : windows) {
|
||||
if (w.getDrawable() == CURRENTWINDOW->getDrawable())
|
||||
continue;
|
||||
|
||||
|
|
@ -367,22 +367,21 @@ CWindow* getNeighborInDir(char dir) {
|
|||
// I don't know if this works, it might be an issue with my nested Xorg session I am using rn to test this.
|
||||
// Will check later.
|
||||
// TODO:
|
||||
void WindowManager::warpCursorTo(Vector2D to) {
|
||||
const auto POINTERCOOKIE = xcb_query_pointer(WindowManager::DisplayConnection, WindowManager::Screen->root);
|
||||
void CWindowManager::warpCursorTo(Vector2D to) {
|
||||
const auto POINTERCOOKIE = xcb_query_pointer(DisplayConnection, Screen->root);
|
||||
|
||||
xcb_query_pointer_reply_t* pointerreply = xcb_query_pointer_reply(WindowManager::DisplayConnection, POINTERCOOKIE, NULL);
|
||||
xcb_query_pointer_reply_t* pointerreply = xcb_query_pointer_reply(DisplayConnection, POINTERCOOKIE, NULL);
|
||||
if (!pointerreply) {
|
||||
Debug::log(ERR, "Couldn't query pointer.");
|
||||
return;
|
||||
}
|
||||
|
||||
xcb_warp_pointer(WindowManager::DisplayConnection, XCB_NONE, WindowManager::Screen->root, 0, 0, 0, 0, (int)to.x, (int)to.y);
|
||||
xcb_warp_pointer(DisplayConnection, XCB_NONE, Screen->root, 0, 0, 0, 0, (int)to.x, (int)to.y);
|
||||
free(pointerreply);
|
||||
}
|
||||
|
||||
void WindowManager::moveActiveWindowTo(char dir) {
|
||||
|
||||
const auto CURRENTWINDOW = WindowManager::getWindowFromDrawable(WindowManager::LastWindow);
|
||||
void CWindowManager::moveActiveWindowTo(char dir) {
|
||||
const auto CURRENTWINDOW = getWindowFromDrawable(LastWindow);
|
||||
|
||||
if (!CURRENTWINDOW)
|
||||
return;
|
||||
|
|
@ -409,5 +408,5 @@ void WindowManager::moveActiveWindowTo(char dir) {
|
|||
setEffectiveSizePosUsingConfig(CURRENTWINDOW);
|
||||
|
||||
// finish by moving the cursor to the current window
|
||||
WindowManager::warpCursorTo(CURRENTWINDOW->getPosition() + CURRENTWINDOW->getSize() / 2.f);
|
||||
warpCursorTo(CURRENTWINDOW->getPosition() + CURRENTWINDOW->getSize() / 2.f);
|
||||
}
|
||||
|
|
@ -13,14 +13,15 @@
|
|||
#define GAPS_IN 5
|
||||
#define GAPS_OUT 20
|
||||
|
||||
namespace WindowManager {
|
||||
inline xcb_connection_t* DisplayConnection;
|
||||
inline xcb_screen_t* Screen;
|
||||
inline xcb_drawable_t Drawable;
|
||||
inline uint32_t Values[3];
|
||||
class CWindowManager {
|
||||
public:
|
||||
xcb_connection_t* DisplayConnection;
|
||||
xcb_screen_t* Screen;
|
||||
xcb_drawable_t Drawable;
|
||||
uint32_t Values[3];
|
||||
|
||||
inline std::vector<CWindow> windows; // windows never left. It has always been hiding amongst us.
|
||||
inline xcb_drawable_t LastWindow = -1;
|
||||
std::vector<CWindow> windows; // windows never left. It has always been hiding amongst us.
|
||||
xcb_drawable_t LastWindow = -1;
|
||||
|
||||
CWindow* getWindowFromDrawable(xcb_drawable_t);
|
||||
void addWindowToVectorSafe(CWindow);
|
||||
|
|
@ -37,4 +38,18 @@ namespace WindowManager {
|
|||
|
||||
void moveActiveWindowTo(char);
|
||||
void warpCursorTo(Vector2D);
|
||||
};
|
||||
|
||||
private:
|
||||
|
||||
// Internal WM functions that don't have to be exposed
|
||||
|
||||
CWindow* getNeighborInDir(char dir);
|
||||
void eatWindow(CWindow* a, CWindow* toEat);
|
||||
bool canEatWindow(CWindow* a, CWindow* toEat);
|
||||
bool isNeighbor(CWindow* a, CWindow* b);
|
||||
void calculateNewTileSetOldTile(CWindow* pWindow);
|
||||
void setEffectiveSizePosUsingConfig(CWindow* pWindow);
|
||||
|
||||
};
|
||||
|
||||
inline std::unique_ptr<CWindowManager> g_pWindowManager = std::make_unique<CWindowManager>();
|
||||
Loading…
Reference in a new issue