aboutsummaryrefslogtreecommitdiff
path: root/src/FbAtoms.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-04-15 11:59:02 (GMT)
committerfluxgen <fluxgen>2003-04-15 11:59:02 (GMT)
commit78d4f8f6105e07d289c8d5a63f46ab5a35bcfc33 (patch)
treed8075c7e955939a9119e674556ed24aa0462d0e4 /src/FbAtoms.hh
parentf679d372d3355cc69145ccbd74f64293b16ca688 (diff)
downloadfluxbox_pavel-78d4f8f6105e07d289c8d5a63f46ab5a35bcfc33.zip
fluxbox_pavel-78d4f8f6105e07d289c8d5a63f46ab5a35bcfc33.tar.bz2
fixed license, construtor and moved motif_wm_hints atom to getWMHints in FluxboxWindow instead
Diffstat (limited to 'src/FbAtoms.hh')
-rw-r--r--src/FbAtoms.hh18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/FbAtoms.hh b/src/FbAtoms.hh
index 327e26e..39bd380 100644
--- a/src/FbAtoms.hh
+++ b/src/FbAtoms.hh
@@ -1,5 +1,5 @@
1// FbAtom.hh 1// FbAtom.hh
2// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org) 2// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen(at)fluxbox.org)
3// 3//
4// Permission is hereby granted, free of charge, to any person obtaining a 4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"), 5// copy of this software and associated documentation files (the "Software"),
@@ -13,13 +13,13 @@
13// 13//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
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.8 2002/12/01 13:41:56 rathnor Exp $ 22// $Id: FbAtoms.hh,v 1.9 2003/04/15 11:57:34 fluxgen Exp $
23#ifndef FBATOMS_HH 23#ifndef FBATOMS_HH
24#define FBATOMS_HH 24#define FBATOMS_HH
25 25
@@ -31,8 +31,9 @@
31*/ 31*/
32class FbAtoms { 32class FbAtoms {
33public: 33public:
34 explicit FbAtoms(Display *display); 34 FbAtoms();
35 virtual ~FbAtoms(); 35 ~FbAtoms();
36
36 static FbAtoms *instance(); 37 static FbAtoms *instance();
37 38
38 39
@@ -42,7 +43,6 @@ public:
42 inline Atom getWMProtocolsAtom() const { return xa_wm_protocols; } 43 inline Atom getWMProtocolsAtom() const { return xa_wm_protocols; }
43 inline Atom getWMTakeFocusAtom() const { return xa_wm_take_focus; } 44 inline Atom getWMTakeFocusAtom() const { return xa_wm_take_focus; }
44 inline Atom getWMColormapAtom() const { return xa_wm_colormap_windows; } 45 inline Atom getWMColormapAtom() const { return xa_wm_colormap_windows; }
45 inline Atom getMotifWMHintsAtom() const { return motif_wm_hints; }
46 46
47 // this atom is for normal app->WM hints about decorations, stacking, 47 // this atom is for normal app->WM hints about decorations, stacking,
48 // starting workspace etc... 48 // starting workspace etc...
@@ -77,7 +77,7 @@ public:
77 inline Atom getFluxboxCycleWindowFocusAtom() const { return blackbox_cycle_window_focus; } 77 inline Atom getFluxboxCycleWindowFocusAtom() const { return blackbox_cycle_window_focus; }
78 78
79private: 79private:
80 void initAtoms(Display *disp); 80 void initAtoms();
81// NETAttributes 81// NETAttributes
82 Atom blackbox_attributes, blackbox_change_attributes, blackbox_hints; 82 Atom blackbox_attributes, blackbox_change_attributes, blackbox_hints;
83 83
@@ -93,8 +93,8 @@ private:
93 blackbox_cycle_window_focus; 93 blackbox_cycle_window_focus;
94 94
95 Atom xa_wm_colormap_windows, xa_wm_protocols, xa_wm_state, 95 Atom xa_wm_colormap_windows, xa_wm_protocols, xa_wm_state,
96 xa_wm_delete_window, xa_wm_take_focus, xa_wm_change_state, 96 xa_wm_delete_window, xa_wm_take_focus, xa_wm_change_state;
97 motif_wm_hints; 97
98 bool m_init; 98 bool m_init;
99 static FbAtoms *s_singleton; 99 static FbAtoms *s_singleton;
100}; 100};