aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/FbAtoms.cc51
-rw-r--r--src/FbAtoms.hh86
2 files changed, 3 insertions, 134 deletions
diff --git a/src/FbAtoms.cc b/src/FbAtoms.cc
index 4e2c7f5..e3dba23 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.3 2002/08/14 21:53:07 fluxgen Exp $ 22// $Id: FbAtoms.cc,v 1.4 2002/09/07 20:12:47 fluxgen Exp $
23 23
24#include "FbAtoms.hh" 24#include "FbAtoms.hh"
25 25
@@ -90,53 +90,4 @@ void FbAtoms::initAtoms(Display *display) {
90 blackbox_cycle_window_focus = 90 blackbox_cycle_window_focus =
91 XInternAtom(display, "_BLACKBOX_CYCLE_WINDOW_FOCUS", False); 91 XInternAtom(display, "_BLACKBOX_CYCLE_WINDOW_FOCUS", False);
92 92
93#ifdef NEWWMSPEC
94
95 net_supported = XInternAtom(display, "_NET_SUPPORTED", False);
96 net_client_list = XInternAtom(display, "_NET_CLIENT_LIST", False);
97 net_client_list_stacking = XInternAtom(display, "_NET_CLIENT_LIST_STACKING", False);
98 net_number_of_desktops = XInternAtom(display, "_NET_NUMBER_OF_DESKTOPS", False);
99 net_desktop_geometry = XInternAtom(display, "_NET_DESKTOP_GEOMETRY", False);
100 net_desktop_viewport = XInternAtom(display, "_NET_DESKTOP_VIEWPORT", False);
101 net_current_desktop = XInternAtom(display, "_NET_CURRENT_DESKTOP", False);
102 net_desktop_names = XInternAtom(display, "_NET_DESKTOP_NAMES", False);
103 net_active_window = XInternAtom(display, "_NET_ACTIVE_WINDOW", False);
104 net_workarea = XInternAtom(display, "_NET_WORKAREA", False);
105 net_supporting_wm_check = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False);
106 net_virtual_roots = XInternAtom(display, "_NET_VIRTUAL_ROOTS", False);
107
108 net_close_window = XInternAtom(display, "_NET_CLOSE_WINDOW", False);
109 net_wm_moveresize = XInternAtom(display, "_NET_WM_MOVERESIZE", False);
110
111 net_properties = XInternAtom(display, "_NET_PROPERTIES", False);
112 net_wm_name = XInternAtom(display, "_NET_WM_NAME", False);
113 net_wm_desktop = XInternAtom(display, "_NET_WM_DESKTOP", False);
114 net_wm_window_type = XInternAtom(display, "_NET_WM_WINDOW_TYPE", False);
115 net_wm_state = XInternAtom(display, "_NET_WM_STATE", False);
116 net_wm_strut = XInternAtom(display, "_NET_WM_STRUT", False);
117 net_wm_icon_geometry = XInternAtom(display, "_NET_WM_ICON_GEOMETRY", False);
118 net_wm_icon = XInternAtom(display, "_NET_WM_ICON", False);
119 net_wm_pid = XInternAtom(display, "_NET_WM_PID", False);
120 net_wm_handled_icons = XInternAtom(display, "_NET_WM_HANDLED_ICONS", False);
121
122 net_wm_ping = XInternAtom(display, "_NET_WM_PING", False);
123
124#endif // NEWWMSPEC
125
126#ifdef GNOME
127
128 gnome_wm_win_layer = XInternAtom(display, "_WIN_LAYER", False);
129 gnome_wm_win_state = XInternAtom(display, "_WIN_STATE", False);
130 gnome_wm_win_hints = XInternAtom(display, "_WIN_HINTS", False);
131 gnome_wm_win_app_state = XInternAtom(display, "_WIN_APP_STATE", False);
132 gnome_wm_win_expanded_size = XInternAtom(display, "_WIN_EXPANDED_SIZE", False);
133 gnome_wm_win_icons = XInternAtom(display, "_WIN_ICONS", False);
134 gnome_wm_win_workspace = XInternAtom(display, "_WIN_WORKSPACE", False);
135 gnome_wm_win_workspace_count = XInternAtom(display, "_WIN_WORKSPACE_COUNT", False);
136 gnome_wm_win_workspace_names = XInternAtom(display, "_WIN_WORKSPACE_NAMES", False);
137 gnome_wm_win_client_list = XInternAtom(display, "_WIN_CLIENT_LIST", False);
138 gnome_wm_prot = XInternAtom(display, "_WIN_PROTOCOLS", False);
139 gnome_wm_supporting_wm_check = XInternAtom(display, "_WIN_SUPPORTING_WM_CHECK", False);
140
141#endif // GNOME
142} 93}
diff --git a/src/FbAtoms.hh b/src/FbAtoms.hh
index 3fb8b2b..80844e2 100644
--- a/src/FbAtoms.hh
+++ b/src/FbAtoms.hh
@@ -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.hh,v 1.6 2002/08/14 21:53:07 fluxgen Exp $ 22// $Id: FbAtoms.hh,v 1.7 2002/09/07 20:10:54 fluxgen Exp $
23#ifndef FBATOMS_HH 23#ifndef FBATOMS_HH
24#define FBATOMS_HH 24#define FBATOMS_HH
25 25
@@ -27,7 +27,7 @@
27#include <X11/Xatom.h> 27#include <X11/Xatom.h>
28 28
29/** 29/**
30 atom handler, should probably be a singleton 30 atom handler for base atoms
31*/ 31*/
32class FbAtoms { 32class FbAtoms {
33public: 33public:
@@ -35,17 +35,6 @@ public:
35 virtual ~FbAtoms(); 35 virtual ~FbAtoms();
36 static FbAtoms *instance(); 36 static FbAtoms *instance();
37 37
38#ifdef GNOME
39 inline Atom getGnomeProtAtom() const { return gnome_wm_prot; }
40 inline Atom getGnomeClientListAtom() const { return gnome_wm_win_client_list; }
41 inline Atom getGnomeSupportingWMCheckAtom() const { return gnome_wm_supporting_wm_check; }
42 inline Atom getGnomeWorkspaceAtom() const { return gnome_wm_win_workspace; }
43 inline Atom getGnomeWorkspaceCountAtom() const { return gnome_wm_win_workspace_count; }
44 inline Atom getGnomeWorkspaceNamesAtom() const { return gnome_wm_win_workspace_names; }
45 inline Atom getGnomeStateAtom() const { return gnome_wm_win_state; }
46 inline Atom getGnomeHintsAtom() const { return gnome_wm_win_hints; }
47 inline Atom getGnomeLayerAtom() const { return gnome_wm_win_layer; }
48#endif //GNOME
49 38
50 inline Atom getWMChangeStateAtom() const { return xa_wm_change_state; } 39 inline Atom getWMChangeStateAtom() const { return xa_wm_change_state; }
51 inline Atom getWMStateAtom() const { return xa_wm_state; } 40 inline Atom getWMStateAtom() const { return xa_wm_state; }
@@ -87,43 +76,6 @@ public:
87 inline Atom getFluxboxChangeWindowFocusAtom() const { return blackbox_change_window_focus; } 76 inline Atom getFluxboxChangeWindowFocusAtom() const { return blackbox_change_window_focus; }
88 inline Atom getFluxboxCycleWindowFocusAtom() const { return blackbox_cycle_window_focus; } 77 inline Atom getFluxboxCycleWindowFocusAtom() const { return blackbox_cycle_window_focus; }
89 78
90#ifdef NEWWMSPEC
91
92 // root window properties
93 inline Atom getNETSupportedAtom() const { return net_supported; }
94 inline Atom getNETClientListAtom() const { return net_client_list; }
95 inline Atom getNETClientListStackingAtom() const { return net_client_list_stacking; }
96 inline Atom getNETNumberOfDesktopsAtom() const { return net_number_of_desktops; }
97 inline Atom getNETDesktopGeometryAtom() const { return net_desktop_geometry; }
98 inline Atom getNETDesktopViewportAtom() const { return net_desktop_viewport; }
99 inline Atom getNETCurrentDesktopAtom() const { return net_current_desktop; }
100 inline Atom getNETDesktopNamesAtom() const { return net_desktop_names; }
101 inline Atom getNETActiveWindowAtom() const { return net_active_window; }
102 inline Atom getNETWorkareaAtom() const { return net_workarea; }
103 inline Atom getNETSupportingWMCheckAtom() const { return net_supporting_wm_check; }
104 inline Atom getNETVirtualRootsAtom() const { return net_virtual_roots; }
105
106 // root window messages
107 inline Atom getNETCloseWindowAtom() const { return net_close_window; }
108 inline Atom getNETWMMoveResizeAtom() const { return net_wm_moveresize; }
109
110 // application window properties
111 inline Atom getNETPropertiesAtom() const { return net_properties; }
112 inline Atom getNETWMNameAtom() const { return net_wm_name; }
113 inline Atom getNETWMDesktopAtom() const { return net_wm_desktop; }
114 inline Atom getNETWMWindowTypeAtom() const { return net_wm_window_type; }
115 inline Atom getNETWMStateAtom() const { return net_wm_state; }
116 inline Atom getNETWMStrutAtom() const { return net_wm_strut; }
117 inline Atom getNETWMIconGeometryAtom() const { return net_wm_icon_geometry; }
118 inline Atom getNETWMIconAtom() const { return net_wm_icon; }
119 inline Atom getNETWMPidAtom() const { return net_wm_pid; }
120 inline Atom getNETWMHandledIconsAtom() const { return net_wm_handled_icons; }
121
122 // application protocols
123 inline Atom getNETWMPingAtom() const { return net_wm_ping; }
124
125#endif // NEWWMSPEC
126
127private: 79private:
128 void initAtoms(Display *disp); 80 void initAtoms(Display *disp);
129// NETAttributes 81// NETAttributes
@@ -140,40 +92,6 @@ private:
140 Atom blackbox_change_workspace, blackbox_change_window_focus, 92 Atom blackbox_change_workspace, blackbox_change_window_focus,
141 blackbox_cycle_window_focus; 93 blackbox_cycle_window_focus;
142 94
143#ifdef NEWWMSPEC
144
145 // root window properties
146 Atom net_supported, net_client_list, net_client_list_stacking,
147 net_number_of_desktops, net_desktop_geometry, net_desktop_viewport,
148 net_current_desktop, net_desktop_names, net_active_window, net_workarea,
149 net_supporting_wm_check, net_virtual_roots;
150
151 // root window messages
152 Atom net_close_window, net_wm_moveresize;
153
154 // application window properties
155 Atom net_properties, net_wm_name, net_wm_desktop, net_wm_window_type,
156 net_wm_state, net_wm_strut, net_wm_icon_geometry, net_wm_icon, net_wm_pid,
157 net_wm_handled_icons;
158
159
160 // application protocols
161 Atom net_wm_ping;
162
163#endif // NEWWMSPEC
164
165#ifdef GNOME
166// union {
167 Atom gnome_wm_win_layer, gnome_wm_win_state, gnome_wm_win_hints,
168 gnome_wm_win_app_state, gnome_wm_win_expanded_size,
169 gnome_wm_win_icons, gnome_wm_win_workspace,
170 gnome_wm_win_workspace_count, gnome_wm_win_workspace_names,
171 gnome_wm_win_client_list;
172// Atom gnome_atom_list[10];
173// };
174 Atom gnome_wm_prot;
175 Atom gnome_wm_supporting_wm_check;
176#endif // GNOME
177 Atom xa_wm_colormap_windows, xa_wm_protocols, xa_wm_state, 95 Atom xa_wm_colormap_windows, xa_wm_protocols, xa_wm_state,
178 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,
179 motif_wm_hints; 97 motif_wm_hints;