projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.35.tar.gz
[xscreensaver]
/
hacks
/
xanalogtv.c
diff --git
a/hacks/xanalogtv.c
b/hacks/xanalogtv.c
index 9a2e5717f9f2418dd641b05dcd8cd37a83338941..1565c8927581b6c3f82319f4adc26b9ca099429e 100644
(file)
--- a/
hacks/xanalogtv.c
+++ b/
hacks/xanalogtv.c
@@
-34,7
+34,7
@@
# include <unistd.h>
#endif
# include <unistd.h>
#endif
-#ifndef HAVE_
COCOA
+#ifndef HAVE_
JWXYZ
# include <X11/Intrinsic.h> /* for XtDatabase in hack_resources() */
#endif
# include <X11/Intrinsic.h> /* for XtDatabase in hack_resources() */
#endif
@@
-238,8
+238,8
@@
static const char *xanalogtv_defaults [] = {
".background: black",
".foreground: white",
"*delay: 5",
".background: black",
".foreground: white",
"*delay: 5",
- "*grabDesktopImages: False", /* HAVE_
COCOA
*/
- "*chooseRandomImages: True", /* HAVE_
COCOA
*/
+ "*grabDesktopImages: False", /* HAVE_
JWXYZ
*/
+ "*chooseRandomImages: True", /* HAVE_
JWXYZ
*/
ANALOGTV_DEFAULTS
0,
};
ANALOGTV_DEFAULTS
0,
};
@@
-281,7
+281,7
@@
getticks(struct state *st)
static void
hack_resources (Display *dpy)
{
static void
hack_resources (Display *dpy)
{
-#ifndef HAVE_
COCOA
+#ifndef HAVE_
JWXYZ
static int count = -1;
count++;
static int count = -1;
count++;
@@
-301,7
+301,7
@@
hack_resources (Display *dpy)
value.size = strlen(buf2);
XrmPutResource (&db, buf1, "String", &value);
}
value.size = strlen(buf2);
XrmPutResource (&db, buf1, "String", &value);
}
-#endif /* HAVE_
COCOA
*/
+#endif /* HAVE_
JWXYZ
*/
}
}
@@
-573,7
+573,7
@@
xanalogtv_draw (Display *dpy, Window window, void *closure)
}
analogtv_draw(st->tv, st->cs->noise_level, recs, rec_count);
}
analogtv_draw(st->tv, st->cs->noise_level, recs, rec_count);
-#ifdef
USE_IPHON
E
+#ifdef
HAVE_MOBIL
E
return 0;
#else
return 5000;
return 0;
#else
return 5000;
@@
-616,6
+616,14
@@
xanalogtv_event (Display *dpy, Window window, void *closure, XEvent *event)
st->change_now = -1;
return True;
}
st->change_now = -1;
return True;
}
+ else if (screenhack_event_helper (dpy, window, event))
+ goto DEF;
+ }
+ else if (screenhack_event_helper (dpy, window, event))
+ {
+ DEF:
+ st->change_now = ((random() & 1) ? 1 : -1);
+ return True;
}
return False;
}
return False;