← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1

« back to all changes in this revision

Viewing changes to lib/unity/unityPlatformX11Window.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2009-12-06 07:45:05 UTC
  • mfrom: (1.1.8 upstream) (2.4.10 sid)
  • Revision ID: james.westby@ubuntu.com-20091206074505-43rp7oejjgp0y2re
Tags: 2009.11.16-210370-1
http://bugs.debian.org/545222
http://bugs.debian.org/549044
http://bugs.debian.org/551626
* Merging upstream version 2009.11.16-210370.
* Moving vmusr plugins from open-vm-tools to open-vm-toolbox (Closes:
  #539282, #557215).
* Correcting plugin location (Closes: #545222, #549044).
* Dropping la files (Closes: #551626).
* Adding open-vm-toolbox lintian overrides.
* Removing test plugin.
* Removing unused plugin symlinks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/unity/unityPlatformX11Window.c
444
444
 
445
445
   wasRelevant = upw->isRelevant;
446
446
 
 
447
   Debug("%s: %#lx::%#lx -> %#lx::%#lx\n", __func__, upw->toplevelWindow,
 
448
         upw->clientWindow, toplevelWindow, clientWindow);
447
449
   UPWindowSetRelevance(up, upw, FALSE);
448
450
   if (upw->toplevelWindow) {
449
451
      XSelectInput(up->display, upw->toplevelWindow, 0);
1010
1012
   } else {
1011
1013
      Debug("Removing window %#lx from tracker\n", upw->toplevelWindow);
1012
1014
      UnityWindowTracker_RemoveWindow(up->tracker, upw->toplevelWindow);
 
1015
      UnityPlatformDoUpdate(up, TRUE);
1013
1016
   }
1014
1017
 
1015
1018
   up->stackingChanged = TRUE;
1234
1237
 
1235
1238
      if (winAttr.class == InputOnly) {
1236
1239
         isInvisible = TRUE;
1237
 
      } else if (!upw->isViewable
1238
 
                 && (!upw->wasViewable
1239
 
                     || upw->isOverrideRedirect)
1240
 
                 && onCurrentDesktop) {
 
1240
      } else if (!upw->isViewable && onCurrentDesktop) {
1241
1241
         isInvisible = TRUE;
1242
1242
      } else if (winAttr.width <= 1 && winAttr.height <= 1) {
1243
1243
         isInvisible = TRUE;
1333
1333
      }
1334
1334
   }
1335
1335
 
1336
 
  out:
 
1336
out:
1337
1337
   ASSERT(shouldBeRelevant >= 0);
1338
1338
 
1339
 
   if (shouldBeRelevant) {
1340
 
      Debug("Relevance for (%p) %#lx/%#lx/%#lx is %d (window type %d)\n",
1341
 
            upw, upw->toplevelWindow, upw->clientWindow, upw->rootWindow,
1342
 
            shouldBeRelevant, upw->windowType);
1343
 
   }
 
1339
   Debug("Relevance for (%p) %#lx/%#lx/%#lx is %d (window type %d)\n",
 
1340
         upw, upw->toplevelWindow, upw->clientWindow, upw->rootWindow,
 
1341
         shouldBeRelevant, upw->windowType);
1344
1342
 
1345
1343
   UPWindowSetRelevance(up, upw, shouldBeRelevant ? TRUE : FALSE);
1346
1344
}