diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2010-08-23 08:54:49 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2010-08-23 08:54:49 (GMT) |
commit | e23c2c4d1b777fffd4090b4120119027efb30b5e (patch) | |
tree | 43003b5022cf9c7bbee6b7efbed907d72804cc2b | |
parent | 33dea858fbcb75d243ea17cb557de441fe82c2b0 (diff) | |
download | fluxbox-e23c2c4d1b777fffd4090b4120119027efb30b5e.zip fluxbox-e23c2c4d1b777fffd4090b4120119027efb30b5e.tar.bz2 |
reenable clickRaise(), but on any button press if no key-action was found
-rw-r--r-- | src/Window.cc | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/Window.cc b/src/Window.cc index a4a3c0e..b30a849 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -2355,8 +2355,24 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) { | |||
2355 | return; | 2355 | return; |
2356 | } | 2356 | } |
2357 | 2357 | ||
2358 | // if nothing was bound via keys-file then | ||
2359 | // - raise() if clickRaise is enabled | ||
2360 | // - hide open menues | ||
2361 | // - focus on clickFocus | ||
2362 | // - refeed the event into the queue so the app gets it | ||
2363 | if (frame().window().window() == be.window) { | ||
2364 | if (screen().clickRaises()) | ||
2365 | raise(); | ||
2366 | |||
2367 | XAllowEvents(display, ReplayPointer, be.time); | ||
2368 | |||
2369 | m_button_grab_x = be.x_root - frame().x() - frame().window().borderWidth(); | ||
2370 | m_button_grab_y = be.y_root - frame().y() - frame().window().borderWidth(); | ||
2371 | } | ||
2372 | FbTk::Menu::hideShownMenu(); | ||
2373 | if (!m_focused && acceptsFocus() && m_click_focus) | ||
2374 | focus(); | ||
2358 | 2375 | ||
2359 | XAllowEvents(display, ReplayPointer, be.time); | ||
2360 | } | 2376 | } |
2361 | 2377 | ||
2362 | void FluxboxWindow::buttonReleaseEvent(XButtonEvent &re) { | 2378 | void FluxboxWindow::buttonReleaseEvent(XButtonEvent &re) { |