aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-10-14 16:23:16 (GMT)
committerrathnor <rathnor>2003-10-14 16:23:16 (GMT)
commitf89532c0cb3c8a5cc1a78bc11f1c6445edc2d826 (patch)
treeb2b28146930af8749882d814b3e7b95d68881064 /src/fluxbox.cc
parentc583251e18003d4ea2886cf227b96d351d7d32c5 (diff)
downloadfluxbox_pavel-f89532c0cb3c8a5cc1a78bc11f1c6445edc2d826.zip
fluxbox_pavel-f89532c0cb3c8a5cc1a78bc11f1c6445edc2d826.tar.bz2
fix identification of event targets in event manager
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 7b089a5..50cb292 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.199 2003/10/13 19:31:04 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.200 2003/10/14 16:23:15 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -1091,8 +1091,15 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
1091 */ 1091 */
1092void Fluxbox::handleClientMessage(XClientMessageEvent &ce) { 1092void Fluxbox::handleClientMessage(XClientMessageEvent &ce) {
1093#ifdef DEBUG 1093#ifdef DEBUG
1094 const char * atom = "nothing";
1095 if (ce.message_type)
1096 atom = XGetAtomName(FbTk::App::instance()->display(), ce.message_type);
1097
1094 cerr<<__FILE__<<"("<<__LINE__<<"): ClientMessage. data.l[0]=0x"<<hex<<ce.data.l[0]<< 1098 cerr<<__FILE__<<"("<<__LINE__<<"): ClientMessage. data.l[0]=0x"<<hex<<ce.data.l[0]<<
1095 " message_type=0x"<<ce.message_type<<dec<<endl; 1099 " message_type=0x"<<ce.message_type<<dec<<" = \""<<atom<<"\""<<endl;
1100
1101 if (ce.message_type && atom) XFree((char *) atom);
1102
1096#endif // DEBUG 1103#endif // DEBUG
1097 1104
1098 if (ce.format != 32) 1105 if (ce.format != 32)
@@ -1366,7 +1373,6 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1366 if (m_focused_window == &client) 1373 if (m_focused_window == &client)
1367 revertFocus(screen); 1374 revertFocus(screen);
1368 1375
1369 removeWindowSearch(client.window());
1370 // failed to revert focus? 1376 // failed to revert focus?
1371 if (m_focused_window == &client) 1377 if (m_focused_window == &client)
1372 m_focused_window = 0; 1378 m_focused_window = 0;
@@ -1423,9 +1429,9 @@ void Fluxbox::removeAtomHandler(AtomHandler *atomh) {
1423 1429
1424WinClient *Fluxbox::searchWindow(Window window) { 1430WinClient *Fluxbox::searchWindow(Window window) {
1425 std::map<Window, WinClient *>::iterator it = m_window_search.find(window); 1431 std::map<Window, WinClient *>::iterator it = m_window_search.find(window);
1426 if (it != m_window_search.end()) 1432 if (it != m_window_search.end())
1427 return it->second; 1433 return it->second;
1428 1434
1429 std::map<Window, FluxboxWindow *>::iterator git = m_window_search_group.find(window); 1435 std::map<Window, FluxboxWindow *>::iterator git = m_window_search_group.find(window);
1430 return git == m_window_search_group.end() ? 0 : &git->second->winClient(); 1436 return git == m_window_search_group.end() ? 0 : &git->second->winClient();
1431} 1437}