aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc
index bf100e2..a4a3c0e 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2361,7 +2361,7 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
2361 2361
2362void FluxboxWindow::buttonReleaseEvent(XButtonEvent &re) { 2362void FluxboxWindow::buttonReleaseEvent(XButtonEvent &re) {
2363 2363
2364 if (m_last_pressed_button == re.button) { 2364 if (m_last_pressed_button == static_cast<int>(re.button)) {
2365 m_last_pressed_button = 0; 2365 m_last_pressed_button = 0;
2366 } 2366 }
2367 2367
@@ -2401,15 +2401,22 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
2401 inside_border = 2401 inside_border =
2402 2402
2403 // if mouse is currently on the window border, ignore it 2403 // if mouse is currently on the window border, ignore it
2404 ! insideBorder(frame(), me.x_root, me.y_root, borderw) && 2404 (
2405 ( !frame().externalTabMode() || 2405 ! insideBorder(frame(), me.x_root, me.y_root, borderw)
2406 ! insideBorder(frame().tabcontainer(), me.x_root, me.y_root, borderw) ) 2406 && ( !frame().externalTabMode()
2407 || ! insideBorder(frame().tabcontainer(), me.x_root, me.y_root, borderw) )
2408
2409 )
2407 2410
2408 || // or if mouse was on border when it was last clicked 2411 || // or if mouse was on border when it was last clicked
2409 2412
2410 ! insideBorder(frame(), m_last_button_x, m_last_button_y, borderw) && 2413 (
2411 ( ! frame().externalTabMode() || 2414 ! insideBorder(frame(), m_last_button_x, m_last_button_y, borderw)
2412 ! insideBorder(frame().tabcontainer(), m_last_button_x, m_last_button_y, borderw ) ); 2415 &&
2416 ( ! frame().externalTabMode()
2417 || ! insideBorder(frame().tabcontainer(), m_last_button_x, m_last_button_y, borderw )
2418 )
2419 );
2413 } 2420 }
2414 2421
2415 if (Fluxbox::instance()->getIgnoreBorder() && m_attaching_tab == 0 2422 if (Fluxbox::instance()->getIgnoreBorder() && m_attaching_tab == 0