← Back to branch summary

~ubuntu-branches/ubuntu/karmic/xscreensaver/karmic

« back to all changes in this revision

Viewing changes to hacks/glx/crackberg.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/crackberg.c
1
1
/***************************
2
2
 ** crackberg; Matus Telgarsky [ catachresis@cmu.edu ] 2005 
3
3
 ** */
4
 
#define XK_MISCELLANY
5
 
#include <X11/keysymdef.h>
 
4
#ifndef HAVE_COCOA
 
5
# define XK_MISCELLANY
 
6
# include <X11/keysymdef.h>
 
7
#endif
6
8
 
7
9
#define DEFAULTS    "*delay:        20000       \n" \
8
10
                    "*showFPS:      False       \n" \
20
22
#define DEF_CRACK      "True"
21
23
#define DEF_WATER      "True"
22
24
#define DEF_FLAT       "True"
23
 
#define DEF_COLOR      "plain"
 
25
#define DEF_COLOR      "random"
24
26
#define DEF_LIT        "True"
25
27
#define DEF_VISIBILITY "0.6"
26
28
#define DEF_LETTERBOX  "False"
1247
1249
 
1248
1250
    if (ev->xany.type == KeyPress) {
1249
1251
        switch (XKeycodeToKeysym(mi->dpy, ev->xkey.keycode, 0)) {
 
1252
# ifndef HAVE_COCOA
1250
1253
            case XK_Left:   cberg->motion_state |= MOTION_LROT;  break;
1251
1254
            case XK_Right:  cberg->motion_state |= MOTION_RROT;  break;
 
1255
# endif
1252
1256
            case '1':       cberg->motion_state |= MOTION_DEC;   break; 
1253
1257
            case '2':       cberg->motion_state |= MOTION_INC;   break;
1254
1258
            case 'a':       cberg->motion_state |= MOTION_LEFT;  break;
1273
1277
#endif
1274
1278
 
1275
1279
        switch (XKeycodeToKeysym(mi->dpy, ev->xkey.keycode, 0)) {
 
1280
# ifndef HAVE_COCOA
1276
1281
            case XK_Left:   cberg->motion_state &= ~MOTION_LROT;  break;
1277
1282
            case XK_Right:  cberg->motion_state &= ~MOTION_RROT;  break;
 
1283
# endif
1278
1284
            case '1':       cberg->motion_state &= ~MOTION_DEC;   break; 
1279
1285
            case '2':       cberg->motion_state &= ~MOTION_INC;   break;
1280
1286
            case 'a':       cberg->motion_state &= ~MOTION_LEFT;  break;