aboutsummaryrefslogtreecommitdiff
path: root/src/WinClient.hh
diff options
context:
space:
mode:
authormarkt <markt>2007-11-05 17:05:58 (GMT)
committermarkt <markt>2007-11-05 17:05:58 (GMT)
commit97f7c3e1b59b9a94e36a78d97c141f6a05f43e20 (patch)
tree982ba8f35083fb54e5058f564ec8e301d8a229dc /src/WinClient.hh
parent2c4e1f9a024433396f17ea5f3ef3fda46e0d8edd (diff)
downloadfluxbox_pavel-97f7c3e1b59b9a94e36a78d97c141f6a05f43e20.zip
fluxbox_pavel-97f7c3e1b59b9a94e36a78d97c141f6a05f43e20.tar.bz2
various refactoring and minor changes
Diffstat (limited to 'src/WinClient.hh')
-rw-r--r--src/WinClient.hh18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/WinClient.hh b/src/WinClient.hh
index 4a5cf27..035ece5 100644
--- a/src/WinClient.hh
+++ b/src/WinClient.hh
@@ -64,9 +64,7 @@ public:
64 64
65 // override the title with this 65 // override the title with this
66 void setTitle(FbTk::FbString &title); 66 void setTitle(FbTk::FbString &title);
67 void setIconTitle(FbTk::FbString &icon_title);
68 void updateTitle(); 67 void updateTitle();
69 void updateIconTitle();
70 /// updates transient window information 68 /// updates transient window information
71 void updateTransientInfo(); 69 void updateTransientInfo();
72 70
@@ -80,7 +78,7 @@ public:
80 bool focus(); // calls Window->setCurrentClient to give focus to this client 78 bool focus(); // calls Window->setCurrentClient to give focus to this client
81 bool isFocused() const; 79 bool isFocused() const;
82 void setAttentionState(bool value); 80 void setAttentionState(bool value);
83 const std::string &title() const; 81 const std::string &title() const { return m_title; }
84 82
85 /** 83 /**
86 * Changes width and height to the nearest (lower) value 84 * Changes width and height to the nearest (lower) value
@@ -110,6 +108,8 @@ public:
110 bool getWMName(XTextProperty &textprop) const; 108 bool getWMName(XTextProperty &textprop) const;
111 bool getWMIconName(XTextProperty &textprop) const; 109 bool getWMIconName(XTextProperty &textprop) const;
112 std::string getWMRole() const; 110 std::string getWMRole() const;
111 Focusable::WindowType getWindowType() const { return m_window_type; }
112 void setWindowType(Focusable::WindowType type) { m_window_type = type; }
113 113
114 inline WinClient *transientFor() { return transient_for; } 114 inline WinClient *transientFor() { return transient_for; }
115 inline const WinClient *transientFor() const { return transient_for; } 115 inline const WinClient *transientFor() const { return transient_for; }
@@ -127,7 +127,6 @@ public:
127 // grouping is tracked by remembering the window to the left in the group 127 // grouping is tracked by remembering the window to the left in the group
128 Window getGroupLeftWindow() const; 128 Window getGroupLeftWindow() const;
129 129
130 inline int getFocusMode() const { return m_focus_mode; }
131 inline const MwmHints *getMwmHint() const { return m_mwm_hint; } 130 inline const MwmHints *getMwmHint() const { return m_mwm_hint; }
132 131
133 inline unsigned int maxWidth() const { return max_width; } 132 inline unsigned int maxWidth() const { return max_width; }
@@ -152,9 +151,6 @@ public:
152 base_width, base_height; 151 base_width, base_height;
153 unsigned long initial_state, normal_hint_flags, wm_hint_flags; 152 unsigned long initial_state, normal_hint_flags, wm_hint_flags;
154 153
155
156 enum FocusMode { F_NOINPUT = 0, F_PASSIVE, F_LOCALLYACTIVE, F_GLOBALLYACTIVE };
157
158private: 154private:
159 /// removes client from any waiting list and clears empty waiting lists 155 /// removes client from any waiting list and clears empty waiting lists
160 void removeTransientFromWaitingList(); 156 void removeTransientFromWaitingList();
@@ -167,17 +163,15 @@ private:
167 // number of transients which we are modal for 163 // number of transients which we are modal for
168 int m_modal_count; 164 int m_modal_count;
169 bool m_modal; 165 bool m_modal;
170 bool send_focus_message, send_close_message; 166 bool accepts_input, send_focus_message, send_close_message;
171 167
172 int m_win_gravity; 168 int m_win_gravity;
173 169
174 std::string m_icon_title; 170 bool m_title_override;
175 bool m_title_override, m_icon_title_override;
176 171
172 Focusable::WindowType m_window_type;
177 MwmHints *m_mwm_hint; 173 MwmHints *m_mwm_hint;
178 174
179 int m_focus_mode;
180
181 Strut *m_strut; 175 Strut *m_strut;
182 // map transient_for X window to winclient transient 176 // map transient_for X window to winclient transient
183 // (used if transient_for FbWindow was created after transient) 177 // (used if transient_for FbWindow was created after transient)