aboutsummaryrefslogtreecommitdiff
path: root/src/Ewmh.cc
diff options
context:
space:
mode:
authorsimonb <simonb>2006-04-24 14:29:21 (GMT)
committersimonb <simonb>2006-04-24 14:29:21 (GMT)
commitacf4326f3cc3451aaf874b0b0777d69be5834e57 (patch)
tree8abf3c4158ece9c97c3764d7eb4eb9e1aa53bf84 /src/Ewmh.cc
parentf6a072430d4de159e229d6172adc5ba5ae985512 (diff)
downloadfluxbox-acf4326f3cc3451aaf874b0b0777d69be5834e57.zip
fluxbox-acf4326f3cc3451aaf874b0b0777d69be5834e57.tar.bz2
Use -Wall when --enable-debug and some warning fixes
+ thanks Jonas Koelker
Diffstat (limited to 'src/Ewmh.cc')
-rw-r--r--src/Ewmh.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 96722d1..6bcd3e6 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -267,8 +267,8 @@ void Ewmh::setupFrame(FluxboxWindow &win) {
267 if (win.winClient().property(m_net_wm_desktop, 0, 1, False, XA_CARDINAL, 267 if (win.winClient().property(m_net_wm_desktop, 0, 1, False, XA_CARDINAL,
268 &ret_type, &fmt, &nitems, &bytes_after, 268 &ret_type, &fmt, &nitems, &bytes_after,
269 (unsigned char **) &data) && data) { 269 (unsigned char **) &data) && data) {
270 unsigned int desktop = static_cast<unsigned int>(*data); 270 unsigned int desktop = static_cast<long>(*data);
271 if (desktop == 0xFFFFFFFF && !win.isStuck()) 271 if (desktop == -1 && !win.isStuck())
272 win.stick(); 272 win.stick();
273 else 273 else
274 win.setWorkspace(desktop); 274 win.setWorkspace(desktop);
@@ -634,7 +634,7 @@ void Ewmh::updateWorkspace(FluxboxWindow &win) {
634 long workspace = win.isInitialized() ? win.workspaceNumber() : win.screen().currentWorkspaceID(); 634 long workspace = win.isInitialized() ? win.workspaceNumber() : win.screen().currentWorkspaceID();
635 635
636 if (win.isStuck()) 636 if (win.isStuck())
637 workspace = 0xFFFFFFFF; // appear on all desktops/workspaces 637 workspace = -1; // appear on all desktops/workspaces
638 638
639 FluxboxWindow::ClientList::iterator it = win.clientList().begin(); 639 FluxboxWindow::ClientList::iterator it = win.clientList().begin();
640 FluxboxWindow::ClientList::iterator it_end = win.clientList().end(); 640 FluxboxWindow::ClientList::iterator it_end = win.clientList().end();
@@ -661,7 +661,7 @@ bool Ewmh::checkClientMessage(const XClientMessageEvent &ce,
661 661
662 // if it's stick, make sure it is stuck. 662 // if it's stick, make sure it is stuck.
663 // otherwise, make sure it isn't stuck 663 // otherwise, make sure it isn't stuck
664 if (ce.data.l[0] == 0xFFFFFFFF) { 664 if (ce.data.l[0] == -1) {
665 if (!fbwin->isStuck()) 665 if (!fbwin->isStuck())
666 fbwin->stick(); 666 fbwin->stick();
667 return true; 667 return true;