aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-10-23 17:32:30 (GMT)
committerfluxgen <fluxgen>2002-10-23 17:32:30 (GMT)
commita1a01de8f92098ec1cc23f46188a4c4c9b752200 (patch)
treecce3084243d7f423a2250e539fb6a87bc974d4f0
parentac00b050de43727a0e1f7d94eed0e17e72830590 (diff)
downloadfluxbox_pavel-a1a01de8f92098ec1cc23f46188a4c4c9b752200.zip
fluxbox_pavel-a1a01de8f92098ec1cc23f46188a4c4c9b752200.tar.bz2
removed obsolete NEWWMSPEC
-rw-r--r--src/Screen.cc15
-rw-r--r--src/Window.cc27
-rw-r--r--src/fluxbox.hh7
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 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.74 2002/10/15 17:12:23 fluxgen Exp $ 25// $Id: Screen.cc,v 1.75 2002/10/23 17:30:12 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -457,7 +457,7 @@ resource(rm, screenname, altscreenname)
457 457
458 XFree(children); 458 XFree(children);
459 XFlush(getBaseDisplay()->getXDisplay()); 459 XFlush(getBaseDisplay()->getXDisplay());
460 460 theme->reconfigure(*resource.antialias);
461} 461}
462 462
463namespace { 463namespace {
@@ -721,7 +721,8 @@ int BScreen::addWorkspace() {
721 721
722} 722}
723 723
724 724/// removes last workspace
725/// @return number of desktops left
725int BScreen::removeLastWorkspace() { 726int BScreen::removeLastWorkspace() {
726 if (workspacesList.size() > 1) { 727 if (workspacesList.size() > 1) {
727 Workspace *wkspc = workspacesList.back(); 728 Workspace *wkspc = workspacesList.back();
@@ -886,14 +887,6 @@ void BScreen::removeNetizen(Window w) {
886 887
887 888
888void BScreen::updateNetizenCurrentWorkspace() { 889void BScreen::updateNetizenCurrentWorkspace() {
889#ifdef NEWWMSPEC
890 //update _NET_WM_CURRENT_DESKTOP
891 int workspace = getCurrentWorkspaceID();
892 XChangeProperty(getBaseDisplay()->getXDisplay(), getRootWindow(),
893 getBaseDisplay()->getNETCurrentDesktopAtom(), XA_CARDINAL, 32, PropModeReplace,
894 (unsigned char *)&workspace, 1);
895#endif // NEWWMSPEC
896
897 m_currentworkspace_sig.notify(); 890 m_currentworkspace_sig.notify();
898 891
899 Netizens::iterator it = netizenList.begin(); 892 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 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.92 2002/10/22 14:39:21 fluxgen Exp $ 25// $Id: Window.cc,v 1.93 2002/10/23 17:31:23 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -757,22 +757,6 @@ void FluxboxWindow::createButton(int type, ButtonEventProc pressed, ButtonEventP
757 buttonlist.push_back(b); 757 buttonlist.push_back(b);
758} 758}
759 759
760#ifdef NEWWMSPEC
761//TODO!!
762
763void FluxboxWindow::updateNETWMAtoms() {
764
765}
766
767int FluxboxWindow::getNETWMWindowState() {
768
769}
770
771void FluxboxWindow::loadNETWMWorkspaceAtom() {
772
773}
774
775#endif //!NEWWMSPEC
776 760
777Window FluxboxWindow::findTitleButton(int type) { 761Window FluxboxWindow::findTitleButton(int type) {
778 for (unsigned int i=0; i<buttonlist.size(); i++) { 762 for (unsigned int i=0; i<buttonlist.size(); i++) {
@@ -2705,14 +2689,7 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) {
2705 if (m_windowmenu.get()) 2689 if (m_windowmenu.get())
2706 m_windowmenu->reconfigure(); 2690 m_windowmenu->reconfigure();
2707 } 2691 }
2708 } else { 2692 }
2709
2710#ifdef NEWWMSPEC
2711 bool val = false;
2712 if (!val)
2713 handleNETWMPropertyNotify(atom);
2714#endif // NEWWMSPEC
2715 }
2716 break; 2693 break;
2717 } 2694 }
2718 2695
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 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.hh,v 1.31 2002/10/19 14:15:07 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.32 2002/10/23 17:32:30 fluxgen Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -222,11 +222,6 @@ private:
222 void handleKeyEvent(XKeyEvent &ke); 222 void handleKeyEvent(XKeyEvent &ke);
223 void doWindowAction(Keys::KeyAction action, const int param); 223 void doWindowAction(Keys::KeyAction action, const int param);
224 224
225 #ifdef NEWWMSPEC
226 bool checkNETWMAtoms(XClientMessageEvent &ce);
227 #endif
228
229
230 ResourceManager m_resourcemanager, m_screen_rm; 225 ResourceManager m_resourcemanager, m_screen_rm;
231 226
232 //--- Resources 227 //--- Resources