aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-08-16 12:54:07 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-08-16 12:54:07 (GMT)
commit38654bae459716409ad2ee7975671fc2f131c869 (patch)
tree6f2f3c662f8317f47a422db02d17bff378266817 /src/Window.cc
parent06837ba8642b8a126de92f60ae05d5f84bba8bfe (diff)
downloadfluxbox_pavel-38654bae459716409ad2ee7975671fc2f131c869.zip
fluxbox_pavel-38654bae459716409ad2ee7975671fc2f131c869.tar.bz2
some cleanup
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 43dc311..269665e 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1277,9 +1277,9 @@ void FluxboxWindow::getMaxSize(unsigned int* width, unsigned int* height) const
1277 for (; it != it_end; ++it) { 1277 for (; it != it_end; ++it) {
1278 // special case for max height/width == 0 1278 // special case for max height/width == 0
1279 // 0 indicates unlimited size, so we skip them 1279 // 0 indicates unlimited size, so we skip them
1280 if (h || (*it)->maxHeight() && h > (*it)->maxHeight()) 1280 if (!h || ((*it)->maxHeight() && h > (*it)->maxHeight()))
1281 h = (*it)->maxHeight(); 1281 h = (*it)->maxHeight();
1282 if (!w || (*it)->maxWidth() && w > (*it)->maxWidth()) 1282 if (!w || ((*it)->maxWidth() && w > (*it)->maxWidth()))
1283 w = (*it)->maxWidth(); 1283 w = (*it)->maxWidth();
1284 } 1284 }
1285 1285
@@ -1876,7 +1876,7 @@ void FluxboxWindow::moveToLayer(int layernum, bool force) {
1876 if (!m_initialized) 1876 if (!m_initialized)
1877 m_layernum = layernum; 1877 m_layernum = layernum;
1878 1878
1879 if (m_layernum == layernum && !force || !m_client) 1879 if ((m_layernum == layernum && !force) || !m_client)
1880 return; 1880 return;
1881 1881
1882 // get root window 1882 // get root window
@@ -2475,9 +2475,9 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) {
2475 } 2475 }
2476 2476
2477 // don't allow moving/resizing fullscreen or maximized windows 2477 // don't allow moving/resizing fullscreen or maximized windows
2478 if (isFullscreen() || isMaximizedHorz() && screen().getMaxIgnoreIncrement()) 2478 if (isFullscreen() || (isMaximizedHorz() && screen().getMaxIgnoreIncrement()))
2479 cr.value_mask = cr.value_mask & ~(CWWidth | CWX); 2479 cr.value_mask = cr.value_mask & ~(CWWidth | CWX);
2480 if (isFullscreen() || isMaximizedVert() && screen().getMaxIgnoreIncrement()) 2480 if (isFullscreen() || (isMaximizedVert() && screen().getMaxIgnoreIncrement()))
2481 cr.value_mask = cr.value_mask & ~(CWHeight | CWY); 2481 cr.value_mask = cr.value_mask & ~(CWHeight | CWY);
2482 2482
2483#ifdef REMEMBER 2483#ifdef REMEMBER
@@ -2545,7 +2545,7 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) {
2545 case Above: 2545 case Above:
2546 case TopIf: 2546 case TopIf:
2547 default: 2547 default:
2548 if (isFocused() && focusRequestFromClient(*client) || 2548 if ((isFocused() && focusRequestFromClient(*client)) ||
2549 !FocusControl::focusedWindow()) { 2549 !FocusControl::focusedWindow()) {
2550 setCurrentClient(*client, true); 2550 setCurrentClient(*client, true);
2551 raise(); 2551 raise();
@@ -2618,8 +2618,8 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
2618 2618
2619 // check keys file first 2619 // check keys file first
2620 Keys *k = Fluxbox::instance()->keys(); 2620 Keys *k = Fluxbox::instance()->keys();
2621 if (onTitlebar && k->doAction(be.type, be.state, be.button, 2621 if ((onTitlebar && k->doAction(be.type, be.state, be.button,
2622 Keys::ON_TITLEBAR, m_client, be.time) || 2622 Keys::ON_TITLEBAR, m_client, be.time)) ||
2623 k->doAction(be.type, be.state, be.button, Keys::ON_WINDOW, m_client, 2623 k->doAction(be.type, be.state, be.button, Keys::ON_WINDOW, m_client,
2624 be.time)) { 2624 be.time)) {
2625 return; 2625 return;
@@ -2706,8 +2706,8 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
2706 return; 2706 return;
2707 } 2707 }
2708 2708
2709 if (moving || (me.state & Button1Mask) && functions.move && 2709 if (moving || ((me.state & Button1Mask) && functions.move &&
2710 inside_titlebar && !isResizing() && m_attaching_tab == 0) { 2710 inside_titlebar && !isResizing() && m_attaching_tab == 0)) {
2711 2711
2712 if (! isMoving()) { 2712 if (! isMoving()) {
2713 startMoving(me.x_root, me.y_root); 2713 startMoving(me.x_root, me.y_root);
@@ -2781,11 +2781,11 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
2781 2781
2782 screen().showPosition(dx, dy); 2782 screen().showPosition(dx, dy);
2783 } // end if moving 2783 } // end if moving
2784 } else if (resizing || m_attaching_tab == 0 && functions.resize && 2784 } else if (resizing || (m_attaching_tab == 0 && functions.resize &&
2785 (((me.state & Button1Mask) && 2785 (((me.state & Button1Mask) &&
2786 (me.window == frame().gripRight() || 2786 (me.window == frame().gripRight() ||
2787 me.window == frame().gripLeft())) || 2787 me.window == frame().gripLeft())) ||
2788 me.window == frame().window())) { 2788 me.window == frame().window()))) {
2789 2789
2790 if (! resizing) { 2790 if (! resizing) {
2791 2791