nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

still fixing bug with session.ignoreBorder

Browse source
This commit is contained in:
markt 2007-02-11 22:03:27 +00:00
parent 62b233264d
commit f42d39cc35
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/Window.cc
View file

@ -2687,24 +2687,39 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
|| frame().label() == me.window || frame().label() == me.window
|| frame().tabcontainer() == me.window || frame().tabcontainer() == me.window
|| frame().handle() == me.window || frame().handle() == me.window
|| frame().window() == me.window || frame().window() == me.window);
&& !Fluxbox::instance()->getIgnoreBorder());
if (Fluxbox::instance()->getIgnoreBorder() if (Fluxbox::instance()->getIgnoreBorder()
&& !(me.state & Fluxbox::instance()->getModKey()) // really should check for exact matches && !(me.state & Fluxbox::instance()->getModKey()) // really should check for exact matches
&& !(isMoving() || isResizing() || m_attaching_tab != 0)) { && !(isMoving() || isResizing() || m_attaching_tab != 0)) {
int borderw = frame().window().borderWidth(); int borderw = frame().window().borderWidth();
//!! TODO(tabs): the below test ought to be in FbWinFrame //!! TODO(tabs): the below test ought to be in FbWinFrame
// if mouse is currently on the window border, ignore it
if ((me.x_root < (frame().x() + borderw) || if ((me.x_root < (frame().x() + borderw) ||
me.y_root < (frame().y() + borderw) || me.y_root < (frame().y() + borderw) ||
me.x_root > (frame().x() + (int)frame().width() + borderw) || me.x_root >= (frame().x() + (int)frame().width() + borderw) ||
me.y_root > (frame().y() + (int)frame().height() + borderw)) && me.y_root >= (frame().y() + (int)frame().height() + borderw))
( !frame().externalTabMode() || && (!frame().externalTabMode() ||
(me.x_root < (frame().tabcontainer().x() + borderw) || (me.x_root < (frame().tabcontainer().x() + borderw) ||
me.y_root < (frame().tabcontainer().y() + borderw) || me.y_root < (frame().tabcontainer().y() + borderw) ||
me.x_root > (frame().tabcontainer().x() + (int)frame().tabcontainer().width() + borderw) || me.x_root >= (frame().tabcontainer().x() +
me.y_root > (frame().tabcontainer().y() + (int)frame().tabcontainer().height() + borderw) (int)frame().tabcontainer().width() + borderw) ||
))) me.y_root >= (frame().tabcontainer().y() +
(int)frame().tabcontainer().height() + borderw)))
// or if mouse was on border when it was last clicked
|| (m_last_button_x < (frame().x() + borderw) ||
m_last_button_y < (frame().y() + borderw) ||
m_last_button_x >= (frame().x() +
(int)frame().width() + borderw) ||
m_last_button_y >= (frame().y() +
(int)frame().height() + borderw))
&& (!frame().externalTabMode() ||
(m_last_button_x < (frame().tabcontainer().x() + borderw) ||
m_last_button_y < (frame().tabcontainer().y() + borderw) ||
m_last_button_x >= (frame().tabcontainer().x() +
(int)frame().tabcontainer().width() + borderw) ||
m_last_button_y >= (frame().tabcontainer().y() +
(int)frame().tabcontainer().height() + borderw))))
return; return;
} }