~ubuntu-branches/ubuntu/gutsy/compiz-fusion-plugins-main/gutsy

« back to all changes in this revision

Viewing changes to src/wall/wall.c

Committer: Bazaar Package Importer
Author(s): Michael Vogt
Date: 2007-06-25 14:53:30 UTC
mfrom: (1.1.1 upstream)
Revision ID: james.westby@ubuntu.com-20070625145330-279imp4j31n39ybp

Tags: 0.0.0+git20070625-0ubuntu1

new git snapshot (fixes animation plugin breakage)

files added:
debian/patches

debian/patches/01-animation-defaults.patch

src/animation/animation-internal.h

src/expo/expo_options.c

src/expo/expo_options.h

src/jpeg/imgjpeg_options.c

src/jpeg/imgjpeg_options.h

src/neg/neg_options.c

src/neg/neg_options.h

src/opacify/opacify_options.c

src/opacify/opacify_options.h

src/put/put_options.c

src/put/put_options.h

src/resizeinfo/resizeinfo_options.c

src/resizeinfo/resizeinfo_options.h

src/ring/ring_options.c

src/ring/ring_options.h

src/scaleaddon/scaleaddon_options.c

src/scaleaddon/scaleaddon_options.h

src/snap/snap_options.c

src/snap/snap_options.h

src/thumbnail/thumbnail_options.c

src/thumbnail/thumbnail_options.h

src/vpswitch/vpswitch_options.c

src/vpswitch/vpswitch_options.h

src/wall/wall_options.c

src/wall/wall_options.h

files removed:
autogen.sh

include/animation.h

po/Makefile.in.in

src/animation/beamup.h

src/animation/burn.h

src/animation/curvedfold.h

src/animation/dodge.h

src/animation/domino.h

src/animation/dream.h

src/animation/explode3d.h

src/animation/fade.h

src/animation/focusfade.h

src/animation/glide.h

src/animation/horizontalfold.h

src/animation/leafspread.h

src/animation/magiclamp.h

src/animation/rollup.h

src/animation/wave.h

src/animation/zoomside.h

files modified:
aclocal.m4

configure

debian/changelog

metadata/expo.xml

src/animation/Makefile.am

src/animation/Makefile.in

src/animation/animation.c

src/animation/beamup.c

src/animation/burn.c

src/animation/curvedfold.c

src/animation/dodge.c

src/animation/domino.c

src/animation/dream.c

src/animation/explode3d.c

src/animation/fade.c

src/animation/focusfade.c

src/animation/glide.c

src/animation/horizontalfold.c

src/animation/leafspread.c

src/animation/magiclamp.c

src/animation/particle.c

src/animation/polygon.c

src/animation/rollup.c

src/animation/wave.c

src/animation/zoomside.c

src/expo/expo.c

src/resizeinfo/resizeinfo.c

src/vpswitch/vpswitch.c

src/wall/wall.c

Show diffs side-by-side

added added

removed removed

src/wall/wall.c

556

ws->boxTimeout = 0;

557

558

if (otherScreenGrabExist(s, "move", "scale", "group-drag", "wall", 0))

559

{

560

ws->boxTimeout = 0;

559

561

ws->moving = FALSE;

562

}

560

563

}

561

564

562

565

damageScreen(s);

862

865

}

863

866

864

867

865

static void wallDrawCairoTextureOnScreen(CompScreen *s, CompOutput *output,

866

Region region)

868

static void wallDrawCairoTextureOnScreen(CompScreen *s)

867

869

{

868

870

WALL_SCREEN(s);

869

871

870

glPushMatrix();

871

prepareXCoords(s, output, -DEFAULT_Z_CAMERA);

872

glDisableClientState(GL_TEXTURE_COORD_ARRAY);

873

glEnable(GL_BLEND);

874

1138

1139

glDisable(GL_BLEND);

1140

glEnableClientState(GL_TEXTURE_COORD_ARRAY);

1141

glPopMatrix();

1142

1141

screenTexEnvMode (s, GL_REPLACE);

1143

1142

glColor4usv(defaultColor);

1144

1145

1143

}

1146

1144

1147

1145

static void wallPaintScreen(CompScreen * s,

1186

1184

if ((ws->moving || ws->boxTimeout) && wallGetShowSwitcher(s->display) &&

1187

1185

(output->id == ws->boxOutputDevice || output == &s->fullscreenOutput))

1188

1186

{

1189

wallDrawCairoTextureOnScreen(s, output, region);

1187

CompTransform sTransform = *transform;

1188

1189

transformToScreenSpace (s, output, -DEFAULT_Z_CAMERA, &sTransform);

1190

1191

glPushMatrix ();

1192

glLoadMatrixf (sTransform.m);

1193

1194

wallDrawCairoTextureOnScreen(s);

1195

1196

glPopMatrix ();

1190

1197

1191

1198

if (wallGetMiniscreen(s->display))

1192

1199

{

1238

1245

moveScreenViewport(s, -origVX, -origVY, FALSE);

1239

1246

}

1240

1247

}

1248

1241

1249

return status;

1242

1250

}

1243

1251

Older »