summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/Window.cc7
-rw-r--r--src/fluxbox.cc5
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index dec350c..e743849 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.6: 2Changes for 0.9.6:
3*03/09/12: 3*03/09/12:
4 * Fix a couple of issues related to windows reparenting themselves
5 to escape the WM. Hopefully fixes mplayer/vncviewer fullscreen
6 problems. (Simon)
7 fluxbox.cc Window.cc
4 * Fix window gravity handling (Simon) 8 * Fix window gravity handling (Simon)
5 - should fix some offset fullscreen issues 9 - should fix some offset fullscreen issues
6 FbWinFrame.hh/cc WinClient.hh/cc Window.cc 10 FbWinFrame.hh/cc WinClient.hh/cc Window.cc
diff --git a/src/Window.cc b/src/Window.cc
index 763fd52..cd97f16 100644
--- a/src/Window.cc
+++ b/src/Window.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: Window.cc,v 1.224 2003/09/11 19:55:27 rathnor Exp $ 25// $Id: Window.cc,v 1.225 2003/09/11 21:30:20 rathnor Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -2963,7 +2963,10 @@ void FluxboxWindow::restore(WinClient *client, bool remap) {
2963 int wx = frame().x(), wy = frame().y(); // not actually used here 2963 int wx = frame().x(), wy = frame().y(); // not actually used here
2964 frame().gravityTranslate(wx, wy, -client->gravity(), true); // negative to invert 2964 frame().gravityTranslate(wx, wy, -client->gravity(), true); // negative to invert
2965 2965
2966 client->hide(); 2966 // Why was this hide done? It broke vncviewer (and mplayer?),
2967 // since it would reparent when going fullscreen.
2968 // is it needed for anything? Reparent should imply unmap
2969 //client->hide();
2967 2970
2968 // restore old border width 2971 // restore old border width
2969 client->setBorderWidth(client->old_bw); 2972 client->setBorderWidth(client->old_bw);
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 94da4cb..16c4204 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.188 2003/09/10 09:51:58 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.189 2003/09/11 21:30:20 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -873,7 +873,8 @@ void Fluxbox::handleEvent(XEvent * const e) {
873#endif // DEBUG 873#endif // DEBUG
874 874
875 } else { 875 } else {
876 876 if (winclient == m_focused_window)
877 setFocusedWindow(0);
877 } 878 }
878 } 879 }
879 break; 880 break;