← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hacks/glx/starwars.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/glx/starwars.c
1
 
/*
2
 
 * starwars, Copyright (c) 1998-2007 Jamie Zawinski <jwz@jwz.org> and
 
1
/* starwars, Copyright (c) 1998-2008 Jamie Zawinski <jwz@jwz.org> and
3
2
 * Claudio Matsuoka <claudio@helllabs.org>
4
3
 *
5
4
 * Permission to use, copy, modify, distribute, and sell this software and its
73
72
#define DEF_LINES      "125"
74
73
#define DEF_STEPS      "35"
75
74
#define DEF_SPIN       "0.03"
76
 
#define DEF_FONT_SIZE  "-1"
 
75
#define DEF_SIZE       "-1"
77
76
#define DEF_COLUMNS    "-1"
78
 
#define DEF_WRAP       "True"
79
 
#define DEF_ALIGN      "Center"
 
77
#define DEF_LINE_WRAP  "True"
 
78
#define DEF_ALIGNMENT  "Center"
80
79
#define DEF_SMOOTH     "True"
81
80
#define DEF_THICK      "True"
82
81
#define DEF_FADE       "True"
158
157
  {"-lines",       ".lines",     XrmoptionSepArg, 0 },
159
158
  {"-steps",       ".steps",     XrmoptionSepArg, 0 },
160
159
  {"-spin",        ".spin",      XrmoptionSepArg, 0 },
161
 
  {"-size",        ".fontSize",  XrmoptionSepArg, 0 },
 
160
  {"-size",        ".size",      XrmoptionSepArg, 0 },
162
161
  {"-columns",     ".columns",   XrmoptionSepArg, 0 },
163
162
/*{"-font",        ".font",      XrmoptionSepArg, 0 },*/
164
163
  {"-fade",        ".fade",      XrmoptionNoArg,  "True"   },
184
183
  {&max_lines,      "lines",     "Integer",    DEF_LINES,     t_Int},
185
184
  {&scroll_steps,   "steps",     "Integer",    DEF_STEPS,     t_Int},
186
185
  {&star_spin,      "spin",      "Float",      DEF_SPIN,      t_Float},
187
 
  {&font_size,      "fontSize",  "Float",      DEF_FONT_SIZE, t_Float},
 
186
  {&font_size,      "size",      "Float",      DEF_SIZE,      t_Float},
188
187
  {&target_columns, "columns",   "Integer",    DEF_COLUMNS,   t_Int},
189
 
  {&wrap_p,         "lineWrap",  "Boolean",    DEF_WRAP,      t_Bool},
190
 
  {&alignment_str,  "alignment", "Alignment",  DEF_ALIGN,     t_String},
 
188
  {&wrap_p,         "lineWrap",  "Boolean",    DEF_LINE_WRAP, t_Bool},
 
189
  {&alignment_str,  "alignment", "Alignment",  DEF_ALIGNMENT, t_String},
191
190
  {&smooth_p,       "smooth",    "Boolean",    DEF_SMOOTH,    t_Bool},
192
191
  {&thick_p,        "thick",     "Boolean",    DEF_THICK,     t_Bool},
193
192
  {&fade_p,         "fade",      "Boolean",    DEF_FADE,      t_Bool},