aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-04-15 14:36:12 (GMT)
committerfluxgen <fluxgen>2003-04-15 14:36:12 (GMT)
commit86f3dc3b8cb7bb1130343456b35db05c8ac0f4a0 (patch)
tree0d06ef831c4e8d084ed642ca162dcdc9717c187f
parente0d61ab4f5d43abda220ab9ee7069f897bc713c4 (diff)
downloadfluxbox_paul-86f3dc3b8cb7bb1130343456b35db05c8ac0f4a0.zip
fluxbox_paul-86f3dc3b8cb7bb1130343456b35db05c8ac0f4a0.tar.bz2
make sure we only use button actions for titlebar
-rw-r--r--src/FbWinFrame.cc19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index a803680..eaa3b9f 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWinFrame.cc,v 1.18 2003/04/14 23:40:41 fluxgen Exp $ 22// $Id: FbWinFrame.cc,v 1.19 2003/04/15 14:36:12 fluxgen Exp $
23 23
24#include "FbWinFrame.hh" 24#include "FbWinFrame.hh"
25#include "ImageControl.hh" 25#include "ImageControl.hh"
@@ -405,7 +405,12 @@ void FbWinFrame::buttonPressEvent(XButtonEvent &event) {
405 break; 405 break;
406 } 406 }
407 } 407 }
408 408 if (event.window == m_grip_right.window() ||
409 event.window == m_grip_left.window() ||
410 event.window == m_clientarea.window() ||
411 event.window == m_handle.window() ||
412 event.window == m_window.window())
413 return;
409 if (event.button > 5 || event.button < 1) 414 if (event.button > 5 || event.button < 1)
410 return; 415 return;
411 416
@@ -425,8 +430,14 @@ void FbWinFrame::buttonReleaseEvent(XButtonEvent &event) {
425 } 430 }
426 } 431 }
427 432
428 if (event.button < 1 || event.button > 5 || 433 if (event.window == m_grip_right.window() ||
429 event.window == m_clientarea.window()) 434 event.window == m_grip_left.window() ||
435 event.window == m_clientarea.window() ||
436 event.window == m_handle.window() ||
437 event.window == m_window.window())
438 return;
439
440 if (event.button < 1 || event.button > 5)
430 return; 441 return;
431 442
432 static int last_release_time = 0; 443 static int last_release_time = 0;