summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-02-14 12:15:35 (GMT)
committerfluxgen <fluxgen>2004-02-14 12:15:35 (GMT)
commit00831fd9e9eb468fe4e7c77325e1c5548d742536 (patch)
treef9a4fdb2ec67bedfb57b865032f1d698707f5559
parent1616e9d168c739246eb9af39e7830e95f2c715f9 (diff)
downloadfluxbox_lack-00831fd9e9eb468fe4e7c77325e1c5548d742536.zip
fluxbox_lack-00831fd9e9eb468fe4e7c77325e1c5548d742536.tar.bz2
fixed pointer check
-rw-r--r--src/Ewmh.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 81443a8..014976a 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.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: Ewmh.cc,v 1.42 2004/01/21 15:52:21 fluxgen Exp $ 22// $Id: Ewmh.cc,v 1.43 2004/02/14 12:15:35 fluxgen Exp $
23 23
24#include "Ewmh.hh" 24#include "Ewmh.hh"
25 25
@@ -93,7 +93,7 @@ void Ewmh::initForScreen(BScreen &screen) {
93 m_net_current_desktop, 93 m_net_current_desktop,
94 m_net_active_window, 94 m_net_active_window,
95 m_net_close_window, 95 m_net_close_window,
96 m_net_moveresize_window, 96 m_net_moveresize_window,
97 m_net_workarea, 97 m_net_workarea,
98 98
99 // desktop properties 99 // desktop properties
@@ -494,7 +494,8 @@ void Ewmh::updateWorkspace(FluxboxWindow &win) {
494 494
495 495
496// return true if we did handle the atom here 496// return true if we did handle the atom here
497bool Ewmh::checkClientMessage(const XClientMessageEvent &ce, BScreen * screen, WinClient * const winclient) { 497bool Ewmh::checkClientMessage(const XClientMessageEvent &ce,
498 BScreen * screen, WinClient * const winclient) {
498 if (ce.message_type == m_net_wm_desktop) { 499 if (ce.message_type == m_net_wm_desktop) {
499 if (screen == 0) 500 if (screen == 0)
500 return true; 501 return true;
@@ -577,11 +578,12 @@ bool Ewmh::checkClientMessage(const XClientMessageEvent &ce, BScreen * screen, W
577 } else if (ce.message_type == m_net_close_window) { 578 } else if (ce.message_type == m_net_close_window) {
578 if (winclient == 0) 579 if (winclient == 0)
579 return true; 580 return true;
581 cerr<<"We got _NET_CLOSE_WINDOW!"<<endl;
580 // ce.window = window to close (which in this case is the win argument) 582 // ce.window = window to close (which in this case is the win argument)
581 winclient->sendClose(); 583 winclient->sendClose();
582 return true; 584 return true;
583 } else if (ce.message_type == m_net_moveresize_window) { 585 } else if (ce.message_type == m_net_moveresize_window) {
584 if (winclient == 0 && winclient->fbwindow()) 586 if (winclient == 0 || winclient->fbwindow() == 0)
585 return true; 587 return true;
586 // ce.data.l[0] = gravity and flags 588 // ce.data.l[0] = gravity and flags
587 // ce.data.l[1] = x 589 // ce.data.l[1] = x