diff options
Diffstat (limited to 'src/WinClient.cc')
-rw-r--r-- | src/WinClient.cc | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/WinClient.cc b/src/WinClient.cc index a9d5865..d75d6eb 100644 --- a/src/WinClient.cc +++ b/src/WinClient.cc | |||
@@ -84,12 +84,10 @@ WinClient::WinClient(Window win, BScreen &screen, FluxboxWindow *fbwin): | |||
84 | m_win_gravity(0), | 84 | m_win_gravity(0), |
85 | m_title_override(false), | 85 | m_title_override(false), |
86 | m_icon_title_override(false), | 86 | m_icon_title_override(false), |
87 | m_blackbox_hint(0), | ||
88 | m_mwm_hint(0), | 87 | m_mwm_hint(0), |
89 | m_focus_mode(F_PASSIVE), | 88 | m_focus_mode(F_PASSIVE), |
90 | m_strut(0) { | 89 | m_strut(0) { |
91 | updateWMProtocols(); | 90 | updateWMProtocols(); |
92 | updateBlackboxHints(); | ||
93 | updateMWMHints(); | 91 | updateMWMHints(); |
94 | updateWMHints(); | 92 | updateWMHints(); |
95 | updateWMNormalHints(); | 93 | updateWMNormalHints(); |
@@ -156,8 +154,6 @@ WinClient::~WinClient() { | |||
156 | s_transient_wait.erase(window()); | 154 | s_transient_wait.erase(window()); |
157 | 155 | ||
158 | 156 | ||
159 | screen().removeNetizen(window()); | ||
160 | |||
161 | if (window_group != 0) { | 157 | if (window_group != 0) { |
162 | fluxbox->removeGroupSearch(window_group); | 158 | fluxbox->removeGroupSearch(window_group); |
163 | window_group = 0; | 159 | window_group = 0; |
@@ -166,9 +162,6 @@ WinClient::~WinClient() { | |||
166 | if (m_mwm_hint != 0) | 162 | if (m_mwm_hint != 0) |
167 | XFree(m_mwm_hint); | 163 | XFree(m_mwm_hint); |
168 | 164 | ||
169 | if (m_blackbox_hint != 0) | ||
170 | XFree(m_blackbox_hint); | ||
171 | |||
172 | if (window()) | 165 | if (window()) |
173 | fluxbox->removeWindowSearch(window()); | 166 | fluxbox->removeWindowSearch(window()); |
174 | } | 167 | } |
@@ -431,31 +424,6 @@ void WinClient::setFluxboxWindow(FluxboxWindow *win) { | |||
431 | m_fbwin = win; | 424 | m_fbwin = win; |
432 | } | 425 | } |
433 | 426 | ||
434 | void WinClient::updateBlackboxHints() { | ||
435 | int format; | ||
436 | Atom atom_return; | ||
437 | unsigned long num, len; | ||
438 | FbAtoms *atoms = FbAtoms::instance(); | ||
439 | |||
440 | if (m_blackbox_hint) { | ||
441 | XFree(m_blackbox_hint); | ||
442 | m_blackbox_hint = 0; | ||
443 | } | ||
444 | |||
445 | if (property(atoms->getFluxboxHintsAtom(), 0, | ||
446 | PropBlackboxHintsElements, False, | ||
447 | atoms->getFluxboxHintsAtom(), &atom_return, | ||
448 | &format, &num, &len, | ||
449 | (unsigned char **) &m_blackbox_hint) && | ||
450 | m_blackbox_hint) { | ||
451 | |||
452 | if (num != (unsigned)PropBlackboxHintsElements) { | ||
453 | XFree(m_blackbox_hint); | ||
454 | m_blackbox_hint = 0; | ||
455 | } | ||
456 | } | ||
457 | } | ||
458 | |||
459 | void WinClient::updateMWMHints() { | 427 | void WinClient::updateMWMHints() { |
460 | int format; | 428 | int format; |
461 | Atom atom_return; | 429 | Atom atom_return; |
@@ -752,14 +720,11 @@ void WinClient::updateWMProtocols() { | |||
752 | // defaults | 720 | // defaults |
753 | send_focus_message = false; | 721 | send_focus_message = false; |
754 | send_close_message = false; | 722 | send_close_message = false; |
755 | // could be added to netizens twice... | ||
756 | for (int i = 0; i < num_return; ++i) { | 723 | for (int i = 0; i < num_return; ++i) { |
757 | if (proto[i] == fbatoms->getWMDeleteAtom()) | 724 | if (proto[i] == fbatoms->getWMDeleteAtom()) |
758 | send_close_message = true; | 725 | send_close_message = true; |
759 | else if (proto[i] == fbatoms->getWMTakeFocusAtom()) | 726 | else if (proto[i] == fbatoms->getWMTakeFocusAtom()) |
760 | send_focus_message = true; | 727 | send_focus_message = true; |
761 | else if (proto[i] == fbatoms->getFluxboxStructureMessagesAtom()) | ||
762 | screen().addNetizen(window()); | ||
763 | } | 728 | } |
764 | 729 | ||
765 | XFree(proto); | 730 | XFree(proto); |