← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/compiz/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/02_fix_autofocus_minimize_window.patch

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2011-10-04 08:29:38 UTC
  • Revision ID: package-import@ubuntu.com-20111004082938-sy427ni6to2x581u
Tags: 1:0.9.6+bzr20110929-0ubuntu2
https://launchpad.net/bugs/862719
https://launchpad.net/bugs/861909
* debian/patches/02_fix_autofocus_minimize_window.patch:
  - closing a window gives focus to last minimized window (LP: #862719)
* debian/patches/03_fix_configureframe.patch:
  - compiz crashed with SIGSEGV in PrivateWindow::configureFrame()
    (LP: #861909)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_fix_autofocus_minimize_window.patch
 
1
=== modified file 'src/window.cpp'
 
2
Index: compiz-0.9.6+bzr20110929/src/window.cpp
 
3
===================================================================
 
4
--- compiz-0.9.6+bzr20110929.orig/src/window.cpp        2011-10-03 22:42:50.182475550 +0800
 
5
+++ compiz-0.9.6+bzr20110929/src/window.cpp     2011-10-03 22:43:09.642572039 +0800
 
6
@@ -2515,7 +2515,12 @@
 
7
     if (modalTransient)
 
8
        return modalTransient->moveInputFocusTo ();
 
9
 
 
10
-    if (priv->state & CompWindowStateHiddenMask)
 
11
+    /* If the window is still hidden but not shaded
 
12
+     * it probably meant that a plugin overloaded
 
13
+     * CompWindow::focus to allow the focus to go
 
14
+     * to this window, so only move the input focus
 
15
+     * to the frame if the window is shaded */
 
16
+    if (shaded ())
 
17
     {
 
18
        XSetInputFocus (s->dpy (), priv->serverFrame,
 
19
                        RevertToPointerRoot, CurrentTime);