merged changes from pre-devel

1 files changed, 1 insertions, 40 deletions

diff --git a/src/FbAtoms.hh b/src/FbAtoms.hh
index 5e8e75f..0f2e147 100644
--- a/src/FbAtoms.hh
+++ b/src/FbAtoms.hh
@@ -40,57 +40,18 @@ public:
     inline Atom getWMProtocolsAtom() const { return xa_wm_protocols; }
     inline Atom getWMTakeFocusAtom() const { return xa_wm_take_focus; }
 
-    // this atom is for normal app->WM hints about decorations, stacking,
-    // starting workspace etc...
-    inline Atom getFluxboxHintsAtom() const { return blackbox_hints;}
     inline Atom getMWMHintsAtom() const { return motif_wm_hints; }
 
     // these atoms are for normal app->WM interaction beyond the scope of the
     // ICCCM...
     inline Atom getFluxboxAttributesAtom() const { return blackbox_attributes; }
-    inline Atom getFluxboxChangeAttributesAtom() const { return blackbox_change_attributes; }
-
-    // these atoms are for window->WM interaction, with more control and
-    // information on window "structure"... common examples are
-    // notifying apps when windows are raised/lowered... when the user changes
-    // workspaces... i.e. "pager talk"
-    inline Atom getFluxboxStructureMessagesAtom() const{ return blackbox_structure_messages; }
-
-    // *Notify* portions of the NETStructureMessages protocol
-    inline Atom getFluxboxNotifyStartupAtom() const { return blackbox_notify_startup; }
-    inline Atom getFluxboxNotifyWindowAddAtom() const { return blackbox_notify_window_add; }
-    inline Atom getFluxboxNotifyWindowDelAtom() const { return blackbox_notify_window_del; }
-    inline Atom getFluxboxNotifyWindowFocusAtom() const { return blackbox_notify_window_focus; }
-    inline Atom getFluxboxNotifyCurrentWorkspaceAtom() const { return blackbox_notify_current_workspace; }
-    inline Atom getFluxboxNotifyWorkspaceCountAtom() const { return blackbox_notify_workspace_count; }
-    inline Atom getFluxboxNotifyWindowRaiseAtom() const { return blackbox_notify_window_raise; }
-    inline Atom getFluxboxNotifyWindowLowerAtom() const { return blackbox_notify_window_lower; }
-
-    // atoms to change that request changes to the desktop environment during
-    // runtime... these messages can be sent by any client... as the sending
-    // client window id is not included in the ClientMessage event...
-    inline Atom getFluxboxChangeWorkspaceAtom() const { return blackbox_change_workspace; }
-    inline Atom getFluxboxChangeWindowFocusAtom() const { return blackbox_change_window_focus; }
-    inline Atom getFluxboxCycleWindowFocusAtom() const { return blackbox_cycle_window_focus; }
 
 private:
     void initAtoms();
 // NETAttributes
-    Atom blackbox_attributes, blackbox_change_attributes, blackbox_hints;
-
+    Atom blackbox_attributes;
     Atom motif_wm_hints;
 
-    // NETStructureMessages
-    Atom blackbox_structure_messages, blackbox_notify_startup,
-        blackbox_notify_window_add, blackbox_notify_window_del,
-        blackbox_notify_window_focus, blackbox_notify_current_workspace,
-        blackbox_notify_workspace_count, blackbox_notify_window_raise,
-        blackbox_notify_window_lower;
-
-    // message_types for client -> wm messages
-    Atom blackbox_change_workspace, blackbox_change_window_focus,
-        blackbox_cycle_window_focus;
-
     Atom xa_wm_protocols, xa_wm_state,
         xa_wm_delete_window, xa_wm_take_focus, xa_wm_change_state;