aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-04-26 18:56:02 (GMT)
committerfluxgen <fluxgen>2003-04-26 18:56:02 (GMT)
commita01e77133e66e7affaff475f67d8b50975543968 (patch)
tree44f97219be70fd555a6692e92a76883bef4f512d
parent6e460803e4429db5a230417fcbb67214217b58fb (diff)
downloadfluxbox-a01e77133e66e7affaff475f67d8b50975543968.zip
fluxbox-a01e77133e66e7affaff475f67d8b50975543968.tar.bz2
removed colormap atom
-rw-r--r--src/FbAtoms.cc4
-rw-r--r--src/FbAtoms.hh11
2 files changed, 5 insertions, 10 deletions
diff --git a/src/FbAtoms.cc b/src/FbAtoms.cc
index 5a75f2b..8a7034d 100644
--- a/src/FbAtoms.cc
+++ b/src/FbAtoms.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbAtoms.cc,v 1.6 2003/04/15 11:59:02 fluxgen Exp $ 22// $Id: FbAtoms.cc,v 1.7 2003/04/26 18:56:02 fluxgen Exp $
23 23
24#include "FbAtoms.hh" 24#include "FbAtoms.hh"
25#include "App.hh" 25#include "App.hh"
@@ -53,8 +53,6 @@ FbAtoms *FbAtoms::instance() {
53void FbAtoms::initAtoms() { 53void FbAtoms::initAtoms() {
54 Display *display = FbTk::App::instance()->display(); 54 Display *display = FbTk::App::instance()->display();
55 55
56 xa_wm_colormap_windows =
57 XInternAtom(display, "WM_COLORMAP_WINDOWS", False);
58 xa_wm_protocols = XInternAtom(display, "WM_PROTOCOLS", False); 56 xa_wm_protocols = XInternAtom(display, "WM_PROTOCOLS", False);
59 xa_wm_state = XInternAtom(display, "WM_STATE", False); 57 xa_wm_state = XInternAtom(display, "WM_STATE", False);
60 xa_wm_change_state = XInternAtom(display, "WM_CHANGE_STATE", False); 58 xa_wm_change_state = XInternAtom(display, "WM_CHANGE_STATE", False);
diff --git a/src/FbAtoms.hh b/src/FbAtoms.hh
index 39bd380..2b4898c 100644
--- a/src/FbAtoms.hh
+++ b/src/FbAtoms.hh
@@ -19,16 +19,14 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbAtoms.hh,v 1.9 2003/04/15 11:57:34 fluxgen Exp $ 22// $Id: FbAtoms.hh,v 1.10 2003/04/26 18:56:02 fluxgen Exp $
23#ifndef FBATOMS_HH 23#ifndef FBATOMS_HH
24#define FBATOMS_HH 24#define FBATOMS_HH
25 25
26#include <X11/Xlib.h> 26#include <X11/Xlib.h>
27#include <X11/Xatom.h> 27#include <X11/Xatom.h>
28 28
29/** 29/// atom handler for basic X atoms
30 atom handler for base atoms
31*/
32class FbAtoms { 30class FbAtoms {
33public: 31public:
34 FbAtoms(); 32 FbAtoms();
@@ -42,7 +40,6 @@ public:
42 inline Atom getWMDeleteAtom() const { return xa_wm_delete_window; } 40 inline Atom getWMDeleteAtom() const { return xa_wm_delete_window; }
43 inline Atom getWMProtocolsAtom() const { return xa_wm_protocols; } 41 inline Atom getWMProtocolsAtom() const { return xa_wm_protocols; }
44 inline Atom getWMTakeFocusAtom() const { return xa_wm_take_focus; } 42 inline Atom getWMTakeFocusAtom() const { return xa_wm_take_focus; }
45 inline Atom getWMColormapAtom() const { return xa_wm_colormap_windows; }
46 43
47 // this atom is for normal app->WM hints about decorations, stacking, 44 // this atom is for normal app->WM hints about decorations, stacking,
48 // starting workspace etc... 45 // starting workspace etc...
@@ -50,7 +47,7 @@ public:
50 47
51 // these atoms are for normal app->WM interaction beyond the scope of the 48 // these atoms are for normal app->WM interaction beyond the scope of the
52 // ICCCM... 49 // ICCCM...
53 inline Atom getFluxboxAttributesAtom() const { return blackbox_attributes; } 50 inline Atom getFluxboxAttributesAtom() const { return blackbox_attributes; }
54 inline Atom getFluxboxChangeAttributesAtom() const { return blackbox_change_attributes; } 51 inline Atom getFluxboxChangeAttributesAtom() const { return blackbox_change_attributes; }
55 52
56 // these atoms are for window->WM interaction, with more control and 53 // these atoms are for window->WM interaction, with more control and
@@ -92,7 +89,7 @@ private:
92 Atom blackbox_change_workspace, blackbox_change_window_focus, 89 Atom blackbox_change_workspace, blackbox_change_window_focus,
93 blackbox_cycle_window_focus; 90 blackbox_cycle_window_focus;
94 91
95 Atom xa_wm_colormap_windows, xa_wm_protocols, xa_wm_state, 92 Atom xa_wm_protocols, xa_wm_state,
96 xa_wm_delete_window, xa_wm_take_focus, xa_wm_change_state; 93 xa_wm_delete_window, xa_wm_take_focus, xa_wm_change_state;
97 94
98 bool m_init; 95 bool m_init;