mirror of
https://github.com/hyprwm/Hypr.git
synced 2024-11-02 06:45:58 +01:00
added moving focus and no hover focus
This commit is contained in:
parent
6fbbcd2a1c
commit
f83d3ccea7
7 changed files with 52 additions and 8 deletions
|
@ -9,6 +9,7 @@ gaps_out=20
|
||||||
rounding=0
|
rounding=0
|
||||||
max_fps=60 # max fps for updates of config & animations
|
max_fps=60 # max fps for updates of config & animations
|
||||||
layout=0 # 0 - dwindle (default), 1 - master
|
layout=0 # 0 - dwindle (default), 1 - master
|
||||||
|
focus_when_hover=1 # 0 - do not switch the focus when hover (only for tiling)
|
||||||
|
|
||||||
|
|
||||||
# Execs
|
# Execs
|
||||||
|
@ -58,6 +59,11 @@ bind=SUPER,RIGHT,movewindow,r
|
||||||
bind=SUPER,UP,movewindow,u
|
bind=SUPER,UP,movewindow,u
|
||||||
bind=SUPER,DOWN,movewindow,d
|
bind=SUPER,DOWN,movewindow,d
|
||||||
|
|
||||||
|
bind=SUPER,LEFT,movefocus,l
|
||||||
|
bind=SUPER,RIGHT,movefocus,r
|
||||||
|
bind=SUPER,UP,movefocus,u
|
||||||
|
bind=SUPER,DOWN,movefocus,d
|
||||||
|
|
||||||
bind=SUPER,F,fullscreen,
|
bind=SUPER,F,fullscreen,
|
||||||
|
|
||||||
bind=SUPER,1,workspace,1
|
bind=SUPER,1,workspace,1
|
||||||
|
|
|
@ -128,6 +128,10 @@ void KeybindManager::movewindow(std::string arg) {
|
||||||
g_pWindowManager->moveActiveWindowTo(arg[0]);
|
g_pWindowManager->moveActiveWindowTo(arg[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void KeybindManager::movefocus(std::string arg) {
|
||||||
|
g_pWindowManager->moveActiveFocusTo(arg[0]);
|
||||||
|
}
|
||||||
|
|
||||||
void KeybindManager::movetoworkspace(std::string arg) {
|
void KeybindManager::movetoworkspace(std::string arg) {
|
||||||
try {
|
try {
|
||||||
g_pWindowManager->moveActiveWindowToWorkspace(stoi(arg));
|
g_pWindowManager->moveActiveWindowToWorkspace(stoi(arg));
|
||||||
|
|
|
@ -21,6 +21,7 @@ namespace KeybindManager {
|
||||||
void call(std::string args);
|
void call(std::string args);
|
||||||
void killactive(std::string args);
|
void killactive(std::string args);
|
||||||
void movewindow(std::string args);
|
void movewindow(std::string args);
|
||||||
|
void movefocus(std::string args);
|
||||||
void changeworkspace(std::string args);
|
void changeworkspace(std::string args);
|
||||||
void toggleActiveWindowFullscreen(std::string args);
|
void toggleActiveWindowFullscreen(std::string args);
|
||||||
void toggleActiveWindowFloating(std::string args);
|
void toggleActiveWindowFloating(std::string args);
|
||||||
|
|
|
@ -15,6 +15,8 @@ void ConfigManager::init() {
|
||||||
configValues["gaps_out"].intValue = 20;
|
configValues["gaps_out"].intValue = 20;
|
||||||
configValues["rounding"].intValue = 5;
|
configValues["rounding"].intValue = 5;
|
||||||
|
|
||||||
|
configValues["focus_when_hover"].intValue = 1;
|
||||||
|
|
||||||
configValues["layout"].intValue = LAYOUT_DWINDLE;
|
configValues["layout"].intValue = LAYOUT_DWINDLE;
|
||||||
|
|
||||||
configValues["max_fps"].intValue = 60;
|
configValues["max_fps"].intValue = 60;
|
||||||
|
@ -109,6 +111,7 @@ void handleBind(const std::string& command, const std::string& value) {
|
||||||
if (HANDLER == "killactive") dispatcher = KeybindManager::killactive;
|
if (HANDLER == "killactive") dispatcher = KeybindManager::killactive;
|
||||||
if (HANDLER == "fullscreen") dispatcher = KeybindManager::toggleActiveWindowFullscreen;
|
if (HANDLER == "fullscreen") dispatcher = KeybindManager::toggleActiveWindowFullscreen;
|
||||||
if (HANDLER == "movewindow") dispatcher = KeybindManager::movewindow;
|
if (HANDLER == "movewindow") dispatcher = KeybindManager::movewindow;
|
||||||
|
if (HANDLER == "movefocus") dispatcher = KeybindManager::movefocus;
|
||||||
if (HANDLER == "movetoworkspace") dispatcher = KeybindManager::movetoworkspace;
|
if (HANDLER == "movetoworkspace") dispatcher = KeybindManager::movetoworkspace;
|
||||||
if (HANDLER == "workspace") dispatcher = KeybindManager::changeworkspace;
|
if (HANDLER == "workspace") dispatcher = KeybindManager::changeworkspace;
|
||||||
if (HANDLER == "togglefloating") dispatcher = KeybindManager::toggleActiveWindowFloating;
|
if (HANDLER == "togglefloating") dispatcher = KeybindManager::toggleActiveWindowFloating;
|
||||||
|
|
|
@ -61,13 +61,20 @@ void Events::setThread() {
|
||||||
void Events::eventEnter(xcb_generic_event_t* event) {
|
void Events::eventEnter(xcb_generic_event_t* event) {
|
||||||
const auto E = reinterpret_cast<xcb_enter_notify_event_t*>(event);
|
const auto E = reinterpret_cast<xcb_enter_notify_event_t*>(event);
|
||||||
|
|
||||||
// Just focus it and update.
|
|
||||||
|
const auto PENTERWINDOW = g_pWindowManager->getWindowFromDrawable(E->event);
|
||||||
|
|
||||||
|
if (!PENTERWINDOW)
|
||||||
|
return; // wut
|
||||||
|
|
||||||
|
// Only when focus_when_hover OR floating OR last window floating
|
||||||
|
if (ConfigManager::getInt("focus_when_hover") == 1
|
||||||
|
|| PENTERWINDOW->getIsFloating()
|
||||||
|
|| (g_pWindowManager->getWindowFromDrawable(g_pWindowManager->LastWindow) && g_pWindowManager->getWindowFromDrawable(g_pWindowManager->LastWindow)->getIsFloating()))
|
||||||
g_pWindowManager->setFocusedWindow(E->event);
|
g_pWindowManager->setFocusedWindow(E->event);
|
||||||
|
|
||||||
if(const auto PENTERWINDOW = g_pWindowManager->getWindowFromDrawable(E->event)) {
|
|
||||||
PENTERWINDOW->setDirty(true);
|
PENTERWINDOW->setDirty(true);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
void Events::eventLeave(xcb_generic_event_t* event) {
|
void Events::eventLeave(xcb_generic_event_t* event) {
|
||||||
const auto E = reinterpret_cast<xcb_leave_notify_event_t*>(event);
|
const auto E = reinterpret_cast<xcb_leave_notify_event_t*>(event);
|
||||||
|
|
|
@ -403,8 +403,6 @@ void CWindowManager::refreshDirtyWindows() {
|
||||||
|
|
||||||
void CWindowManager::setFocusedWindow(xcb_drawable_t window) {
|
void CWindowManager::setFocusedWindow(xcb_drawable_t window) {
|
||||||
if (window && window != Screen->root) {
|
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.
|
// Fix border from the old window that was in focus.
|
||||||
Values[0] = ConfigManager::getInt("col.inactive_border");
|
Values[0] = ConfigManager::getInt("col.inactive_border");
|
||||||
xcb_change_window_attributes(DisplayConnection, LastWindow, XCB_CW_BORDER_PIXEL, Values);
|
xcb_change_window_attributes(DisplayConnection, LastWindow, XCB_CW_BORDER_PIXEL, Values);
|
||||||
|
@ -425,6 +423,9 @@ void CWindowManager::setFocusedWindow(xcb_drawable_t window) {
|
||||||
LastWindow = window;
|
LastWindow = window;
|
||||||
|
|
||||||
applyRoundedCornersToWindow(g_pWindowManager->getWindowFromDrawable(window));
|
applyRoundedCornersToWindow(g_pWindowManager->getWindowFromDrawable(window));
|
||||||
|
|
||||||
|
// set focus in X11
|
||||||
|
xcb_set_input_focus(DisplayConnection, XCB_INPUT_FOCUS_POINTER_ROOT, window, XCB_CURRENT_TIME);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1152,10 +1153,12 @@ CWindow* CWindowManager::getNeighborInDir(char dir) {
|
||||||
return &w;
|
return &w;
|
||||||
break;
|
break;
|
||||||
case 't':
|
case 't':
|
||||||
|
case 'u':
|
||||||
if (STICKS(POSA.y, POSB.y + SIZEB.y))
|
if (STICKS(POSA.y, POSB.y + SIZEB.y))
|
||||||
return &w;
|
return &w;
|
||||||
break;
|
break;
|
||||||
case 'b':
|
case 'b':
|
||||||
|
case 'd':
|
||||||
if (STICKS(POSA.y + SIZEA.y, POSB.y))
|
if (STICKS(POSA.y + SIZEA.y, POSB.y))
|
||||||
return &w;
|
return &w;
|
||||||
break;
|
break;
|
||||||
|
@ -1259,6 +1262,24 @@ void CWindowManager::moveActiveWindowTo(char dir) {
|
||||||
warpCursorTo(CURRENTWINDOW->getPosition() + CURRENTWINDOW->getSize() / 2.f);
|
warpCursorTo(CURRENTWINDOW->getPosition() + CURRENTWINDOW->getSize() / 2.f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CWindowManager::moveActiveFocusTo(char dir) {
|
||||||
|
const auto CURRENTWINDOW = getWindowFromDrawable(LastWindow);
|
||||||
|
|
||||||
|
if (!CURRENTWINDOW)
|
||||||
|
return;
|
||||||
|
|
||||||
|
const auto neighbor = getNeighborInDir(dir);
|
||||||
|
|
||||||
|
if (!neighbor)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// move the focus
|
||||||
|
setFocusedWindow(neighbor->getDrawable());
|
||||||
|
|
||||||
|
// finish by moving the cursor to the current window
|
||||||
|
warpCursorTo(CURRENTWINDOW->getPosition() + CURRENTWINDOW->getSize() / 2.f);
|
||||||
|
}
|
||||||
|
|
||||||
void CWindowManager::changeWorkspaceByID(int ID) {
|
void CWindowManager::changeWorkspaceByID(int ID) {
|
||||||
|
|
||||||
const auto MONITOR = getMonitorFromCursor();
|
const auto MONITOR = getMonitorFromCursor();
|
||||||
|
@ -1606,7 +1627,8 @@ void CWindowManager::getICCCMWMProtocols(CWindow* pWindow) {
|
||||||
void CWindowManager::refocusWindowOnClosed() {
|
void CWindowManager::refocusWindowOnClosed() {
|
||||||
const auto PWINDOW = findWindowAtCursor();
|
const auto PWINDOW = findWindowAtCursor();
|
||||||
|
|
||||||
if (!PWINDOW)
|
// No window or last window valid
|
||||||
|
if (!PWINDOW || getWindowFromDrawable(LastWindow))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
LastWindow = PWINDOW->getDrawable();
|
LastWindow = PWINDOW->getDrawable();
|
||||||
|
|
|
@ -74,6 +74,7 @@ public:
|
||||||
void closeWindowAllChecks(int64_t);
|
void closeWindowAllChecks(int64_t);
|
||||||
|
|
||||||
void moveActiveWindowTo(char);
|
void moveActiveWindowTo(char);
|
||||||
|
void moveActiveFocusTo(char);
|
||||||
void moveActiveWindowToWorkspace(int);
|
void moveActiveWindowToWorkspace(int);
|
||||||
void warpCursorTo(Vector2D);
|
void warpCursorTo(Vector2D);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue