diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-08-16 11:36:08 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-08-16 11:36:08 (GMT) |
commit | 06837ba8642b8a126de92f60ae05d5f84bba8bfe (patch) | |
tree | 3b23523e74c651225c3f12ff943fd92527668ea9 /src | |
parent | fe412dbeef7af324a376cba338bff8c24e032d2e (diff) | |
download | fluxbox_paul-06837ba8642b8a126de92f60ae05d5f84bba8bfe.zip fluxbox_paul-06837ba8642b8a126de92f60ae05d5f84bba8bfe.tar.bz2 |
cosmetic changes
Diffstat (limited to 'src')
-rw-r--r-- | src/CommandDialog.cc | 5 | ||||
-rw-r--r-- | src/fluxbox.cc | 22 |
2 files changed, 9 insertions, 18 deletions
diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc index 3746b98..8534dcd 100644 --- a/src/CommandDialog.cc +++ b/src/CommandDialog.cc | |||
@@ -93,11 +93,6 @@ void CommandDialog::show() { | |||
93 | void CommandDialog::hide() { | 93 | void CommandDialog::hide() { |
94 | FbTk::FbWindow::hide(); | 94 | FbTk::FbWindow::hide(); |
95 | Fluxbox::instance()->setShowingDialog(false); | 95 | Fluxbox::instance()->setShowingDialog(false); |
96 | |||
97 | // return focus to fluxbox window | ||
98 | if (FocusControl::focusedFbWindow()) | ||
99 | FocusControl::focusedFbWindow()->focus(); | ||
100 | |||
101 | } | 96 | } |
102 | 97 | ||
103 | void CommandDialog::exposeEvent(XExposeEvent &event) { | 98 | void CommandDialog::exposeEvent(XExposeEvent &event) { |
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index db337ad..1c3b783 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -884,23 +884,19 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) { | |||
884 | return; | 884 | return; |
885 | } | 885 | } |
886 | 886 | ||
887 | WinClient *winclient = 0; | 887 | WinClient *winclient = searchWindow(ue.window); |
888 | 888 | ||
889 | if ((winclient = searchWindow(ue.window)) != 0) { | 889 | if (winclient != 0) { |
890 | |||
891 | if (winclient != 0) { | ||
892 | FluxboxWindow *win = winclient->fbwindow(); | ||
893 | |||
894 | if (!win) { | ||
895 | delete winclient; | ||
896 | return; | ||
897 | } | ||
898 | |||
899 | // this should delete client and adjust m_focused_window if necessary | ||
900 | win->unmapNotifyEvent(ue); | ||
901 | 890 | ||
891 | FluxboxWindow *win = winclient->fbwindow(); | ||
892 | if (!win) { | ||
893 | delete winclient; | ||
894 | return; | ||
902 | } | 895 | } |
903 | 896 | ||
897 | // this should delete client and adjust m_focused_window if necessary | ||
898 | win->unmapNotifyEvent(ue); | ||
899 | |||
904 | // according to http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.4 | 900 | // according to http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.4 |
905 | // a XWithdrawWindow is | 901 | // a XWithdrawWindow is |
906 | // 1) unmapping the window (which leads to the upper branch | 902 | // 1) unmapping the window (which leads to the upper branch |