← Back to branch summary

~hypodermia/ubuntu/oneiric/compiz/fix-for-bug-301174

« back to all changes in this revision

Viewing changes to plugins/switcher/src/switcher.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2011-02-24 17:31:29 UTC
  • mfrom: (0.167.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110224173129-hsczyk7yw7s21flf
Tags: 1:0.9.4-0ubuntu1
https://launchpad.net/bugs/703755
https://launchpad.net/bugs/691561
https://launchpad.net/bugs/290835
* New upstream release:
  - Fix no windows receiving the focus if someone got the focus then was
    destroyed
  - Fix crash when resizing using keybindings
  - Fix unresponsive inactive decorations (LP: #703755) 
  - Fix the long awaited gconf crash (LP: #691561)
  - gtk-window-decorator doesn't respect special decoration styles
    (LP: #290835)
* debian/compiz-core.links,
  debian/source_compiz.py,
  debian/compiz-core.install:
  - install again a richer apport hook to redirect nux/libunity/unityshell
    crash. It also asks the user to redirect unity issues against unity (still
    incuding xorg info when needed)
* Removed a bunch of patches either cherry-picked or pushed upstream. With the
  other fixes, the gconf workaround is hopefully not needed anymore.
* refresh existing patches to still apply
* debian/control:
  - rename dep on compiz-fusion* to compiz*
* debian/patches/085_add_grid_plugin.patch:
  - refresh the grid plugin from new release
* debian/patches/086_new_grid_defaults.patch
  - separate tweaking the default settings to only have the effect that were
    specified:
    top -> maximize, left (top or bottom left) -> window half left of the
    screen, right (top or bottom right) -> window half right of the screen,
    bottom -> do nothing

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/switcher/src/switcher.cpp
254
254
        attr.border_pixel     = 0;
255
255
        attr.colormap         = XCreateColormap (dpy, screen->root (), visual,
256
256
                                                 AllocNone);
 
257
        attr.override_redirect = true;
257
258
 
258
259
        popupWindow =
259
260
            XCreateWindow (dpy, screen->root (),
261
262
                           screen->height () / 2 - xsh.height / 2,
262
263
                           (unsigned) xsh.width, (unsigned) xsh.height, 0,
263
264
                           32, InputOutput, visual,
264
 
                           CWBackPixel | CWBorderPixel | CWColormap, &attr);
 
265
                           CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect, &attr);
265
266
 
266
267
        XSetWMProperties (dpy, popupWindow, NULL, NULL,
267
268
                          programArgv, programArgc,
302
303
 
303
304
            if (popupWindow && showPopup)
304
305
            {
305
 
                CompWindow *w;
306
 
 
307
 
                w = screen->findWindow (popupWindow);
308
 
                if (w && (w->state () & CompWindowStateHiddenMask))
309
 
                    w->show ();
310
 
                else
311
 
                    XMapWindow (screen->dpy (), popupWindow);
 
306
                XMapWindow (screen->dpy (), popupWindow);
312
307
 
313
308
                setSelectedWindowHint ();
314
309
            }
356
351
 
357
352
    SWITCH_SCREEN (screen);
358
353
 
359
 
 
360
354
    if (ss->grabIndex)
361
355
    {
362
 
        CompWindow *w;
363
 
 
364
356
        if (ss->popupWindow)
365
357
        {
366
 
            w = screen->findWindow (ss->popupWindow);
367
 
            if (w && w->managed () && w->mapNum ())
368
 
            {
369
 
                w->hide ();
370
 
            }
371
 
            else
372
 
            {
373
 
                XUnmapWindow (screen->dpy (), ss->popupWindow);
374
 
            }
 
358
            XUnmapWindow (screen->dpy (), ss->popupWindow);
375
359
        }
376
360
 
377
361
        ss->switching = false;