nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed obsolete NEWWMSPEC

Browse source
This commit is contained in:
fluxgen 2002-10-23 17:32:30 +00:00
parent ac00b050de
commit a1a01de8f9
3 changed files with 7 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // 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 //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -457,7 +457,7 @@ resource(rm, screenname, altscreenname)
XFree(children); XFree(children);
XFlush(getBaseDisplay()->getXDisplay()); XFlush(getBaseDisplay()->getXDisplay());
theme->reconfigure(*resource.antialias);
} }
namespace { namespace {
@ -721,7 +721,8 @@ int BScreen::addWorkspace() {
} }
/// removes last workspace
/// @return number of desktops left
int BScreen::removeLastWorkspace() { int BScreen::removeLastWorkspace() {
if (workspacesList.size() > 1) { if (workspacesList.size() > 1) {
Workspace *wkspc = workspacesList.back(); Workspace *wkspc = workspacesList.back();
@ -886,14 +887,6 @@ void BScreen::removeNetizen(Window w) {
void BScreen::updateNetizenCurrentWorkspace() { 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(); m_currentworkspace_sig.notify();
Netizens::iterator it = netizenList.begin(); Netizens::iterator it = netizenList.begin();

27
src/Window.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // 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" #include "Window.hh"
@ -757,22 +757,6 @@ void FluxboxWindow::createButton(int type, ButtonEventProc pressed, ButtonEventP
buttonlist.push_back(b); buttonlist.push_back(b);
} }
#ifdef NEWWMSPEC
//TODO!!
void FluxboxWindow::updateNETWMAtoms() {
}
int FluxboxWindow::getNETWMWindowState() {
}
void FluxboxWindow::loadNETWMWorkspaceAtom() {
}
#endif //!NEWWMSPEC
Window FluxboxWindow::findTitleButton(int type) { Window FluxboxWindow::findTitleButton(int type) {
for (unsigned int i=0; i<buttonlist.size(); i++) { for (unsigned int i=0; i<buttonlist.size(); i++) {
@ -2705,14 +2689,7 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) {
if (m_windowmenu.get()) if (m_windowmenu.get())
m_windowmenu->reconfigure(); m_windowmenu->reconfigure();
} }
} else { }
#ifdef NEWWMSPEC
bool val = false;
if (!val)
handleNETWMPropertyNotify(atom);
#endif // NEWWMSPEC
}
break; break;
} }

7
src/fluxbox.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // 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 #ifndef FLUXBOX_HH
#define FLUXBOX_HH #define FLUXBOX_HH
@ -222,11 +222,6 @@ private:
void handleKeyEvent(XKeyEvent &ke); void handleKeyEvent(XKeyEvent &ke);
void doWindowAction(Keys::KeyAction action, const int param); void doWindowAction(Keys::KeyAction action, const int param);
#ifdef NEWWMSPEC
bool checkNETWMAtoms(XClientMessageEvent &ce);
#endif
ResourceManager m_resourcemanager, m_screen_rm; ResourceManager m_resourcemanager, m_screen_rm;
//--- Resources //--- Resources