M src/Screen.cc → src/Screen.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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 @@ RevertToParent, CurrentTime);
 
 	XFree(children);
 	XFlush(getBaseDisplay()->getXDisplay());
-
+	theme->reconfigure(*resource.antialias);
 }
 
 namespace {
@@ -721,7 +721,8 @@ return workspacesList.size();
 	
 }
 
-
+/// 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::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();

M src/Window.cc → src/Window.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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 @@ b.released = released;
 	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; i<buttonlist.size(); i++) {
@@ -2705,14 +2689,7 @@ positionButtons(true);
 				if (m_windowmenu.get())
 					m_windowmenu->reconfigure();
 			}
-		} else {
-
-#ifdef NEWWMSPEC
-			bool val = false;
-			if (!val)
-				handleNETWMPropertyNotify(atom);
-#endif // NEWWMSPEC
-		}
+		} 
 		break;
 	}
 

M src/fluxbox.hh → src/fluxbox.hh

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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 @@ void handleClientMessage(XClientMessageEvent &ce);
 	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