← Back to branch summary

~ubuntu-branches/ubuntu/hardy/compiz-fusion-plugins-main/hardy-security

« back to all changes in this revision

Viewing changes to src/expo/expo.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2007-09-06 18:15:36 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070906181536-stghh44xl9nwft2o
Tags: 0.5.2+git20070906-0ubuntu1
new git snapshot

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/expo/expo.c
428
428
                        es->clickTime   = 0;
429
429
                        es->doubleClick = FALSE;
430
430
                        
431
 
                        action = expoGetExpoKey (d);
 
431
                        action = expoGetExpo (d);
432
432
                        expoTermExpo (d, action, 0, NULL, 0);
433
433
                        es->anyClick = TRUE;
434
434
                    }
910
910
 
911
911
    EXPO_SCREEN (s);
912
912
 
913
 
    if (es->expoCam > 0.0 && es->expoActive &&
914
 
        (es->expoCam < 1.0 || (w->wmType & CompWindowTypeDockMask)))
915
 
        mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
 
913
    if (es->expoActive)
 
914
    {
 
915
        float opacity = 1.0;
 
916
        Bool  hideDocks;
 
917
 
 
918
        ExpoExpoAnimationEnum expoAnimation;
 
919
 
 
920
        expoAnimation = expoGetExpoAnimation (s->display);
 
921
 
 
922
        hideDocks = expoGetHideDocks (s->display);
 
923
 
 
924
        if (es->expoCam > 0.0 && es->expoCam < 1.0 &&
 
925
            expoAnimation != ExpoAnimationZoom)
 
926
            mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
 
927
 
 
928
        if (es->expoCam > 0.0 && hideDocks &&
 
929
            w->wmType & CompWindowTypeDockMask)
 
930
            mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
 
931
        
 
932
        if (expoAnimation != ExpoAnimationZoom)
 
933
            opacity = attrib->opacity * es->expoCam;
 
934
 
 
935
        if (w->wmType & CompWindowTypeDockMask &&
 
936
                expoGetHideDocks (s->display))
 
937
        {
 
938
            if (expoAnimation == ExpoAnimationZoom &&
 
939
                (s->x == es->selectedVX && s->y == es->selectedVY))
 
940
            {
 
941
                opacity = attrib->opacity *
 
942
                          (1 - sigmoidProgress (es->expoCam));
 
943
            }
 
944
            else
 
945
                opacity = 0;
 
946
 
 
947
            if (opacity <= 0)
 
948
                mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
 
949
        }
 
950
    }
916
951
 
917
952
    UNWRAP (es, s, paintWindow);
918
953
    status = (*s->paintWindow) (w, attrib, transform, region, mask);