← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hacks/greynetic.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/greynetic.c
1
 
/* xscreensaver, Copyright (c) 1992, 1995, 1996, 1997, 1998, 2003, 2006
2
 
 *  Jamie Zawinski <jwz@jwz.org>
 
1
/* xscreensaver, Copyright (c) 1992-2008 Jamie Zawinski <jwz@jwz.org>
3
2
 *
4
3
 * Permission to use, copy, modify, distribute, and sell this software and its
5
4
 * documentation for any purpose is hereby granted without fee, provided that
100
99
  unsigned long fg, bg, pixels [512];
101
100
  int npixels;
102
101
  int xlim, ylim;
 
102
  Bool grey_p;
103
103
  Colormap cmap;
104
104
};
105
105
 
121
121
  st->ylim = xgwa.height;
122
122
  st->cmap = xgwa.colormap;
123
123
  st->npixels = 0;
 
124
  st->grey_p = get_boolean_resource(st->dpy, "grey", "Boolean");
124
125
  gcv.foreground= st->fg= get_pixel_resource(st->dpy, st->cmap, "foreground","Foreground");
125
126
  gcv.background= st->bg= get_pixel_resource(st->dpy, st->cmap, "background","Background");
126
127
 
199
200
      bgc.blue = random ();
200
201
# endif /* DO_STIPPLE */
201
202
 
 
203
      if (st->grey_p)
 
204
        {
 
205
          fgc.green = fgc.blue = fgc.red;
 
206
          bgc.green = bgc.blue = bgc.red;
 
207
        }
 
208
 
202
209
      if (! XAllocColor (st->dpy, st->cmap, &fgc))
203
210
        goto REUSE;
204
211
      st->pixels [st->npixels++] = fgc.pixel;
247
254
static const char *greynetic_defaults [] = {
248
255
  ".background: black",
249
256
  ".foreground: white",
 
257
  "*fpsSolid:   true",
250
258
  "*delay:      10000",
 
259
  "*grey:       false",
251
260
  0
252
261
};
253
262
 
254
263
static XrmOptionDescRec greynetic_options [] = {
255
264
  { "-delay",           ".delay",       XrmoptionSepArg, 0 },
 
265
  { "-grey",            ".grey",        XrmoptionNoArg, "True" },
256
266
  { 0, 0, 0, 0 }
257
267
};
258
268