← Back to branch summary

~ubuntu-branches/ubuntu/quantal/xscreensaver/quantal

« back to all changes in this revision

Viewing changes to hacks/speedmine.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2008-08-28 16:15:25 UTC
  • mfrom: (1.1.6 upstream) (2.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20080828161525-mxga521aoezxjq8h
Tags: 5.07-0ubuntu1
* Upgrade upstream version
* debian/control: Remove suggest xdaliclock as it is no longer
  included
* Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged
  upstream.
* Add 24_hacks_xsublim_enable.patch as it seems that xsublim was dropped
  from the build files.  There is nothing in the Changelog about it
  so I believe it was accidental.
* Updating the .desktop files from the XML files using gnome-screensaver's
  utility to do so.  Lots of text updates.  Also:
    * Added: abstractile.desktop
    * Added: cwaves.desktop
    * Added: m6502.desktop
    * Added: skytentacles.desktop
    * Removed: xteevee.desktop
* xscreensaver-gl-extra.files: Added skytentacles
* xscreensaver-data-extra.files: Added abstractile, cwaves and m6502
* xscreensaver-data.files: Remove partial abstractile, m6502 and cwaves

Show diffs side-by-side

added added

removed removed

Lines of Context:
hacks/speedmine.c
881
881
                }
882
882
                if (st->be_wormy && st->psychedelic_flag) index += st->ncolors/4;
883
883
 
 
884
        if (st->ncolors > MAX_COLORS) abort();
884
885
                index = MIN (index, st->ncolors-1);
885
886
                index = MAX (index, 0);
886
887
 
1266
1267
        flags = GCForeground;
1267
1268
        for (i=0; i < *ncolors; i++) {
1268
1269
                gcv.foreground = colors[i].pixel;
 
1270
        if (gcs[i]) XFreeGC (st->dpy, gcs[i]);
1269
1271
                gcs[i] = XCreateGC (st->dpy, st->dbuf, flags, &gcv);
1270
1272
        }
1271
1273
 
1287
1289
                free_colors (st->dpy, st->cmap, st->bonus_colors, st->nr_bonus_colors);
1288
1290
                free_colors (st->dpy, st->cmap, st->wall_colors, st->nr_wall_colors);
1289
1291
                free_colors (st->dpy, st->cmap, st->ground_colors, st->nr_ground_colors);
 
1292
                s1 = 0.4; s2 = 0.9;
 
1293
 
1290
1294
                st->ncolors = MAX_COLORS;
1291
 
 
1292
 
                s1 = 0.4; s2 = 0.9;
1293
 
 
1294
1295
                speedmine_color_ramp (st, st->ground_gcs, st->ground_colors,
1295
1296
                                                          &st->ncolors, 0.0, 0.8, 0.0, 0.9);
1296
1297
                st->nr_ground_colors = st->ncolors;
1302
1303
                s1 = 0.0; s2 = 0.6;
1303
1304
        }
1304
1305
 
 
1306
    st->ncolors = MAX_COLORS;
1305
1307
    speedmine_color_ramp (st, st->wall_gcs, st->wall_colors, &st->ncolors,
1306
1308
                                                  s1, s2, 0.0, 0.9);
1307
1309
    st->nr_wall_colors = st->ncolors;
1308
1310
 
 
1311
    st->ncolors = MAX_COLORS;
1309
1312
    speedmine_color_ramp (st, st->bonus_gcs, st->bonus_colors, &st->ncolors,
1310
1313
                                                  0.6, 0.9, 0.4, 1.0);
1311
1314
        st->nr_bonus_colors = st->ncolors;
1325
1328
  st->tunnelend_gc = XCreateGC (st->dpy, st->window, GCForeground, &gcv);
1326
1329
 
1327
1330
  st->ncolors = MAX_COLORS;
1328
 
 
1329
1331
  speedmine_color_ramp (st, st->ground_gcs, st->ground_colors, &st->ncolors,
1330
1332
                                                0.0, 0.8, 0.0, 0.9);
1331
1333
  st->nr_ground_colors = st->ncolors;
1332
1334
 
 
1335
  st->ncolors = MAX_COLORS;
1333
1336
  speedmine_color_ramp (st, st->wall_gcs, st->wall_colors, &st->ncolors,
1334
1337
                                                0.0, 0.6, 0.0, 0.9);
1335
1338
  st->nr_wall_colors = st->ncolors;
1336
1339
 
 
1340
  st->ncolors = MAX_COLORS;
1337
1341
  speedmine_color_ramp (st, st->bonus_gcs, st->bonus_colors, &st->ncolors,
1338
1342
                                                0.6, 0.9, 0.4, 1.0);
1339
1343
  st->nr_bonus_colors = st->ncolors;
1377
1381
        st->ground_gcs[i] = XCreateGC (st->dpy, st->dbuf, flags, &gcv);
1378
1382
  }
1379
1383
 
 
1384
  st->ncolors = MAX_COLORS;
1380
1385
  speedmine_color_ramp (st, st->wall_gcs, st->wall_colors, &st->ncolors,
1381
1386
                                                0.0, 0.6, 0.0, 0.9);
1382
1387
  st->nr_wall_colors = st->ncolors;
1383
1388
 
 
1389
  st->ncolors = MAX_COLORS;
1384
1390
  speedmine_color_ramp (st, st->bonus_gcs, st->bonus_colors, &st->ncolors,
1385
1391
                                                0.6, 0.9, 0.4, 1.0);
1386
1392
  st->nr_bonus_colors = st->ncolors;
1622
1628
};
1623
1629
 
1624
1630
 
1625
 
XSCREENSAVER_MODULE ("Speedmine", speedmine)
 
1631
XSCREENSAVER_MODULE ("SpeedMine", speedmine)
1626
1632
 
1627
1633
/* vim: ts=4
1628
1634
 */