aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-08-12 19:25:35 (GMT)
committerfluxgen <fluxgen>2002-08-12 19:25:35 (GMT)
commit7b02be7b19fbd696c2ca804d77bd28532956eac4 (patch)
treed73805ce49b4eb3d58cbf502ae506a08fb543944
parent25eb6056070ce7680186e17ec5529fc863fd3c19 (diff)
downloadfluxbox-7b02be7b19fbd696c2ca804d77bd28532956eac4.zip
fluxbox-7b02be7b19fbd696c2ca804d77bd28532956eac4.tar.bz2
minor cleaning
-rw-r--r--src/FbAtoms.hh115
1 files changed, 58 insertions, 57 deletions
diff --git a/src/FbAtoms.hh b/src/FbAtoms.hh
index 8fa6676..63882e2 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.4 2002/08/04 15:55:13 fluxgen Exp $ 22// $Id: FbAtoms.hh,v 1.5 2002/08/12 19:25:35 fluxgen Exp $
23#ifndef FBATOMS_HH 23#ifndef FBATOMS_HH
24#define FBATOMS_HH 24#define FBATOMS_HH
25 25
@@ -34,92 +34,93 @@ public:
34 explicit FbAtoms(Display *display); 34 explicit FbAtoms(Display *display);
35 virtual ~FbAtoms(); 35 virtual ~FbAtoms();
36 void initAtoms(Display *display); 36 void initAtoms(Display *display);
37
37#ifdef GNOME 38#ifdef GNOME
38 inline const Atom &getGnomeProtAtom() const { return gnome_wm_prot; } 39 inline Atom getGnomeProtAtom() const { return gnome_wm_prot; }
39 inline const Atom &getGnomeClientListAtom() const { return gnome_wm_win_client_list; } 40 inline Atom getGnomeClientListAtom() const { return gnome_wm_win_client_list; }
40 inline const Atom &getGnomeSupportingWMCheckAtom() const { return gnome_wm_supporting_wm_check; } 41 inline Atom getGnomeSupportingWMCheckAtom() const { return gnome_wm_supporting_wm_check; }
41 inline const Atom &getGnomeWorkspaceAtom() const { return gnome_wm_win_workspace; } 42 inline Atom getGnomeWorkspaceAtom() const { return gnome_wm_win_workspace; }
42 inline const Atom &getGnomeWorkspaceCountAtom() const { return gnome_wm_win_workspace_count; } 43 inline Atom getGnomeWorkspaceCountAtom() const { return gnome_wm_win_workspace_count; }
43 inline const Atom &getGnomeWorkspaceNamesAtom() const { return gnome_wm_win_workspace_names; } 44 inline Atom getGnomeWorkspaceNamesAtom() const { return gnome_wm_win_workspace_names; }
44 inline const Atom &getGnomeStateAtom() const { return gnome_wm_win_state; } 45 inline Atom getGnomeStateAtom() const { return gnome_wm_win_state; }
45 inline const Atom &getGnomeHintsAtom() const { return gnome_wm_win_hints; } 46 inline Atom getGnomeHintsAtom() const { return gnome_wm_win_hints; }
46 inline const Atom &getGnomeLayerAtom() const { return gnome_wm_win_layer; } 47 inline Atom getGnomeLayerAtom() const { return gnome_wm_win_layer; }
47#endif //GNOME 48#endif //GNOME
48 49
49 inline const Atom &getWMChangeStateAtom() const { return xa_wm_change_state; } 50 inline Atom getWMChangeStateAtom() const { return xa_wm_change_state; }
50 inline const Atom &getWMStateAtom() const { return xa_wm_state; } 51 inline Atom getWMStateAtom() const { return xa_wm_state; }
51 inline const Atom &getWMDeleteAtom() const { return xa_wm_delete_window; } 52 inline Atom getWMDeleteAtom() const { return xa_wm_delete_window; }
52 inline const Atom &getWMProtocolsAtom() const { return xa_wm_protocols; } 53 inline Atom getWMProtocolsAtom() const { return xa_wm_protocols; }
53 inline const Atom &getWMTakeFocusAtom() const { return xa_wm_take_focus; } 54 inline Atom getWMTakeFocusAtom() const { return xa_wm_take_focus; }
54 inline const Atom &getWMColormapAtom() const { return xa_wm_colormap_windows; } 55 inline Atom getWMColormapAtom() const { return xa_wm_colormap_windows; }
55 inline const Atom &getMotifWMHintsAtom() const { return motif_wm_hints; } 56 inline Atom getMotifWMHintsAtom() const { return motif_wm_hints; }
56 57
57 // this atom is for normal app->WM hints about decorations, stacking, 58 // this atom is for normal app->WM hints about decorations, stacking,
58 // starting workspace etc... 59 // starting workspace etc...
59 inline const Atom &getFluxboxHintsAtom() const { return blackbox_hints;} 60 inline Atom getFluxboxHintsAtom() const { return blackbox_hints;}
60 61
61 // these atoms are for normal app->WM interaction beyond the scope of the 62 // these atoms are for normal app->WM interaction beyond the scope of the
62 // ICCCM... 63 // ICCCM...
63 inline const Atom &getFluxboxAttributesAtom() const { return blackbox_attributes; } 64 inline Atom getFluxboxAttributesAtom() const { return blackbox_attributes; }
64 inline const Atom &getFluxboxChangeAttributesAtom() const { return blackbox_change_attributes; } 65 inline Atom getFluxboxChangeAttributesAtom() const { return blackbox_change_attributes; }
65 66
66 // these atoms are for window->WM interaction, with more control and 67 // these atoms are for window->WM interaction, with more control and
67 // information on window "structure"... common examples are 68 // information on window "structure"... common examples are
68 // notifying apps when windows are raised/lowered... when the user changes 69 // notifying apps when windows are raised/lowered... when the user changes
69 // workspaces... i.e. "pager talk" 70 // workspaces... i.e. "pager talk"
70 inline const Atom &getFluxboxStructureMessagesAtom() const{ return blackbox_structure_messages; } 71 inline Atom getFluxboxStructureMessagesAtom() const{ return blackbox_structure_messages; }
71 72
72 // *Notify* portions of the NETStructureMessages protocol 73 // *Notify* portions of the NETStructureMessages protocol
73 inline const Atom &getFluxboxNotifyStartupAtom() const { return blackbox_notify_startup; } 74 inline Atom getFluxboxNotifyStartupAtom() const { return blackbox_notify_startup; }
74 inline const Atom &getFluxboxNotifyWindowAddAtom() const { return blackbox_notify_window_add; } 75 inline Atom getFluxboxNotifyWindowAddAtom() const { return blackbox_notify_window_add; }
75 inline const Atom &getFluxboxNotifyWindowDelAtom() const { return blackbox_notify_window_del; } 76 inline Atom getFluxboxNotifyWindowDelAtom() const { return blackbox_notify_window_del; }
76 inline const Atom &getFluxboxNotifyWindowFocusAtom() const { return blackbox_notify_window_focus; } 77 inline Atom getFluxboxNotifyWindowFocusAtom() const { return blackbox_notify_window_focus; }
77 inline const Atom &getFluxboxNotifyCurrentWorkspaceAtom() const { return blackbox_notify_current_workspace; } 78 inline Atom getFluxboxNotifyCurrentWorkspaceAtom() const { return blackbox_notify_current_workspace; }
78 inline const Atom &getFluxboxNotifyWorkspaceCountAtom() const { return blackbox_notify_workspace_count; } 79 inline Atom getFluxboxNotifyWorkspaceCountAtom() const { return blackbox_notify_workspace_count; }
79 inline const Atom &getFluxboxNotifyWindowRaiseAtom() const { return blackbox_notify_window_raise; } 80 inline Atom getFluxboxNotifyWindowRaiseAtom() const { return blackbox_notify_window_raise; }
80 inline const Atom &getFluxboxNotifyWindowLowerAtom() const { return blackbox_notify_window_lower; } 81 inline Atom getFluxboxNotifyWindowLowerAtom() const { return blackbox_notify_window_lower; }
81 82
82 // atoms to change that request changes to the desktop environment during 83 // atoms to change that request changes to the desktop environment during
83 // runtime... these messages can be sent by any client... as the sending 84 // runtime... these messages can be sent by any client... as the sending
84 // client window id is not included in the ClientMessage event... 85 // client window id is not included in the ClientMessage event...
85 inline const Atom &getFluxboxChangeWorkspaceAtom() const { return blackbox_change_workspace; } 86 inline Atom getFluxboxChangeWorkspaceAtom() const { return blackbox_change_workspace; }
86 inline const Atom &getFluxboxChangeWindowFocusAtom() const { return blackbox_change_window_focus; } 87 inline Atom getFluxboxChangeWindowFocusAtom() const { return blackbox_change_window_focus; }
87 inline const Atom &getFluxboxCycleWindowFocusAtom() const { return blackbox_cycle_window_focus; } 88 inline Atom getFluxboxCycleWindowFocusAtom() const { return blackbox_cycle_window_focus; }
88 89
89#ifdef NEWWMSPEC 90#ifdef NEWWMSPEC
90 91
91 // root window properties 92 // root window properties
92 inline const Atom &getNETSupportedAtom() const { return net_supported; } 93 inline Atom getNETSupportedAtom() const { return net_supported; }
93 inline const Atom &getNETClientListAtom() const { return net_client_list; } 94 inline Atom getNETClientListAtom() const { return net_client_list; }
94 inline const Atom &getNETClientListStackingAtom() const { return net_client_list_stacking; } 95 inline Atom getNETClientListStackingAtom() const { return net_client_list_stacking; }
95 inline const Atom &getNETNumberOfDesktopsAtom() const { return net_number_of_desktops; } 96 inline Atom getNETNumberOfDesktopsAtom() const { return net_number_of_desktops; }
96 inline const Atom &getNETDesktopGeometryAtom() const { return net_desktop_geometry; } 97 inline Atom getNETDesktopGeometryAtom() const { return net_desktop_geometry; }
97 inline const Atom &getNETDesktopViewportAtom() const { return net_desktop_viewport; } 98 inline Atom getNETDesktopViewportAtom() const { return net_desktop_viewport; }
98 inline const Atom &getNETCurrentDesktopAtom() const { return net_current_desktop; } 99 inline Atom getNETCurrentDesktopAtom() const { return net_current_desktop; }
99 inline const Atom &getNETDesktopNamesAtom() const { return net_desktop_names; } 100 inline Atom getNETDesktopNamesAtom() const { return net_desktop_names; }
100 inline const Atom &getNETActiveWindowAtom() const { return net_active_window; } 101 inline Atom getNETActiveWindowAtom() const { return net_active_window; }
101 inline const Atom &getNETWorkareaAtom() const { return net_workarea; } 102 inline Atom getNETWorkareaAtom() const { return net_workarea; }
102 inline const Atom &getNETSupportingWMCheckAtom() const { return net_supporting_wm_check; } 103 inline Atom getNETSupportingWMCheckAtom() const { return net_supporting_wm_check; }
103 inline const Atom &getNETVirtualRootsAtom() const { return net_virtual_roots; } 104 inline Atom getNETVirtualRootsAtom() const { return net_virtual_roots; }
104 105
105 // root window messages 106 // root window messages
106 inline const Atom &getNETCloseWindowAtom() const { return net_close_window; } 107 inline Atom getNETCloseWindowAtom() const { return net_close_window; }
107 inline const Atom &getNETWMMoveResizeAtom() const { return net_wm_moveresize; } 108 inline Atom getNETWMMoveResizeAtom() const { return net_wm_moveresize; }
108 109
109 // application window properties 110 // application window properties
110 inline const Atom &getNETPropertiesAtom() const { return net_properties; } 111 inline Atom getNETPropertiesAtom() const { return net_properties; }
111 inline const Atom &getNETWMNameAtom() const { return net_wm_name; } 112 inline Atom getNETWMNameAtom() const { return net_wm_name; }
112 inline const Atom &getNETWMDesktopAtom() const { return net_wm_desktop; } 113 inline Atom getNETWMDesktopAtom() const { return net_wm_desktop; }
113 inline const Atom &getNETWMWindowTypeAtom() const { return net_wm_window_type; } 114 inline Atom getNETWMWindowTypeAtom() const { return net_wm_window_type; }
114 inline const Atom &getNETWMStateAtom() const { return net_wm_state; } 115 inline Atom getNETWMStateAtom() const { return net_wm_state; }
115 inline const Atom &getNETWMStrutAtom() const { return net_wm_strut; } 116 inline Atom getNETWMStrutAtom() const { return net_wm_strut; }
116 inline const Atom &getNETWMIconGeometryAtom() const { return net_wm_icon_geometry; } 117 inline Atom getNETWMIconGeometryAtom() const { return net_wm_icon_geometry; }
117 inline const Atom &getNETWMIconAtom() const { return net_wm_icon; } 118 inline Atom getNETWMIconAtom() const { return net_wm_icon; }
118 inline const Atom &getNETWMPidAtom() const { return net_wm_pid; } 119 inline Atom getNETWMPidAtom() const { return net_wm_pid; }
119 inline const Atom &getNETWMHandledIconsAtom() const { return net_wm_handled_icons; } 120 inline Atom getNETWMHandledIconsAtom() const { return net_wm_handled_icons; }
120 121
121 // application protocols 122 // application protocols
122 inline const Atom &getNETWMPingAtom() const { return net_wm_ping; } 123 inline Atom getNETWMPingAtom() const { return net_wm_ping; }
123 124
124#endif // NEWWMSPEC 125#endif // NEWWMSPEC
125 126