From a1a01de8f92098ec1cc23f46188a4c4c9b752200 Mon Sep 17 00:00:00 2001 From: fluxgen Date: Wed, 23 Oct 2002 17:32:30 +0000 Subject: removed obsolete NEWWMSPEC --- src/Screen.cc | 15 ++++----------- src/Window.cc | 27 ++------------------------- src/fluxbox.hh | 7 +------ 3 files changed, 7 insertions(+), 42 deletions(-) diff --git a/src/Screen.cc b/src/Screen.cc index 4159141..23d92a1 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Screen.cc,v 1.74 2002/10/15 17:12:23 fluxgen Exp $ +// $Id: Screen.cc,v 1.75 2002/10/23 17:30:12 fluxgen Exp $ //use GNU extensions #ifndef _GNU_SOURCE @@ -457,7 +457,7 @@ resource(rm, screenname, altscreenname) XFree(children); XFlush(getBaseDisplay()->getXDisplay()); - + theme->reconfigure(*resource.antialias); } namespace { @@ -721,7 +721,8 @@ int BScreen::addWorkspace() { } - +/// removes last workspace +/// @return number of desktops left int BScreen::removeLastWorkspace() { if (workspacesList.size() > 1) { Workspace *wkspc = workspacesList.back(); @@ -886,14 +887,6 @@ void BScreen::removeNetizen(Window w) { void BScreen::updateNetizenCurrentWorkspace() { -#ifdef NEWWMSPEC - //update _NET_WM_CURRENT_DESKTOP - int workspace = getCurrentWorkspaceID(); - XChangeProperty(getBaseDisplay()->getXDisplay(), getRootWindow(), - getBaseDisplay()->getNETCurrentDesktopAtom(), XA_CARDINAL, 32, PropModeReplace, - (unsigned char *)&workspace, 1); -#endif // NEWWMSPEC - m_currentworkspace_sig.notify(); Netizens::iterator it = netizenList.begin(); diff --git a/src/Window.cc b/src/Window.cc index 7cbc253..7401358 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Window.cc,v 1.92 2002/10/22 14:39:21 fluxgen Exp $ +// $Id: Window.cc,v 1.93 2002/10/23 17:31:23 fluxgen Exp $ #include "Window.hh" @@ -757,22 +757,6 @@ void FluxboxWindow::createButton(int type, ButtonEventProc pressed, ButtonEventP buttonlist.push_back(b); } -#ifdef NEWWMSPEC -//TODO!! - -void FluxboxWindow::updateNETWMAtoms() { - -} - -int FluxboxWindow::getNETWMWindowState() { - -} - -void FluxboxWindow::loadNETWMWorkspaceAtom() { - -} - -#endif //!NEWWMSPEC Window FluxboxWindow::findTitleButton(int type) { for (unsigned int i=0; ireconfigure(); } - } else { - -#ifdef NEWWMSPEC - bool val = false; - if (!val) - handleNETWMPropertyNotify(atom); -#endif // NEWWMSPEC - } + } break; } diff --git a/src/fluxbox.hh b/src/fluxbox.hh index b7852f1..e0973c3 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: fluxbox.hh,v 1.31 2002/10/19 14:15:07 fluxgen Exp $ +// $Id: fluxbox.hh,v 1.32 2002/10/23 17:32:30 fluxgen Exp $ #ifndef FLUXBOX_HH #define FLUXBOX_HH @@ -222,11 +222,6 @@ private: void handleKeyEvent(XKeyEvent &ke); void doWindowAction(Keys::KeyAction action, const int param); - #ifdef NEWWMSPEC - bool checkNETWMAtoms(XClientMessageEvent &ce); - #endif - - ResourceManager m_resourcemanager, m_screen_rm; //--- Resources -- cgit v0.11.2