← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/compiz/jaunty-proposed

« back to all changes in this revision

Viewing changes to plugins/cube.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2009-02-10 10:39:03 UTC
  • mfrom: (0.101.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090210103903-lbxs9kycjwydh5s8
Tags: 1:0.7.9+git20090211-0ubuntu1
https://launchpad.net/bugs/274407
https://launchpad.net/bugs/327793
* build from the 0.8 git branch
  - fixes focus problem (LP: #274407)
  - fixes problem with latest libmetacity decoration (LP: #327793)
  - enable new gnomecompat plugin by default
* debian/patches:
 - updated 013-add-cursor-theme-support.patch
 - updated 018_use_metacity_settings.patch
 - updated 029_default_options
 - updated 035_ignore_workspaces
 - updated 037_fullscreen_stacking_fixes.patch (mostly merged upstream
   just the move plugin changes remain)
 - dropped 027_default_to_gnome_terminal
 - dropped 040_resolve-animation-fade-conflict_from_upstream.patch
 - dropped 047_no_display_compiz_desktop.patch
 - dropped 048_from_git_fix_placement.patch
 - dropped 050-scale-keybinding-toggle.patch
 - dropped 051-new-kde4-plasma-api.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/cube.c
783
783
    if (cs->desktopOpacity != cs->toOpacity ||
784
784
        (progress > 0.0 && progress < 1.0))
785
785
    {
786
 
        cs->desktopOpacity = 
787
 
            (cs->opt[CUBE_SCREEN_OPTION_INACTIVE_OPACITY].value.f - 
 
786
        cs->desktopOpacity =
 
787
            (cs->opt[CUBE_SCREEN_OPTION_INACTIVE_OPACITY].value.f -
788
788
            ((cs->opt[CUBE_SCREEN_OPTION_INACTIVE_OPACITY].value.f -
789
789
            cs->opt[cs->lastOpacityIndex].value.f) * progress))
790
790
            / 100.0f * OPAQUE;
792
792
    }
793
793
 
794
794
    cs->paintAllViewports = (cs->desktopOpacity != OPAQUE);
795
 
 
 
795
 
796
796
    UNWRAP (cs, s, preparePaintScreen);
797
797
    (*s->preparePaintScreen) (s, msSinceLastPaint);
798
798
    WRAP (cs, s, preparePaintScreen, cubePreparePaintScreen);
989
989
 
990
990
        setWindowPaintOffset (s, -dView * s->width, 0);
991
991
        (*cs->paintViewport) (s, sAttrib, transform,
992
 
                              &s->outputDev[output].region, 
 
992
                              &s->outputDev[output].region,
993
993
                              &s->outputDev[output], mask);
994
994
        setWindowPaintOffset (s, 0, 0);
995
995
    }
1277
1277
}
1278
1278
 
1279
1279
static void
1280
 
cubeEnableOutputClipping (CompScreen          *s,
 
1280
cubeEnableOutputClipping (CompScreen          *s,
1281
1281
                          const CompTransform *transform,
1282
1282
                          Region              region,
1283
 
                          CompOutput          *output)
 
1283
                          CompOutput          *output)
1284
1284
{
1285
1285
    CUBE_SCREEN (s);
1286
1286
 
2158
2158
        (GetPluginObjectOptionsProc) cubeGetScreenOptions
2159
2159
    };
2160
2160
 
 
2161
    *count = 0;
2161
2162
    RETURN_DISPATCH (object, dispTab, ARRAY_SIZE (dispTab),
2162
 
                     (void *) (*count = 0), (plugin, object, count));
 
2163
                     (void *) count, (plugin, object, count));
2163
2164
}
2164
2165
 
2165
2166
static CompBool