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
/
xlyap.c
diff --git
a/hacks/xlyap.c
b/hacks/xlyap.c
index 2d36cb9dde02a4b0fde963cc452c4e0648694660..cbd493794c194c607ba172dcaa13cfef1f684b1d 100644
(file)
--- a/
hacks/xlyap.c
+++ b/
hacks/xlyap.c
@@
-43,7
+43,7
@@
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
-#ifndef HAVE_
COCOA
+#ifndef HAVE_
JWXYZ
# include <X11/cursorfont.h>
#endif
# include <X11/cursorfont.h>
#endif
@@
-78,7
+78,7
@@
static const char *xlyap_defaults [] = {
"*delay: 10000",
"*linger: 5",
"*colors: 200",
"*delay: 10000",
"*linger: 5",
"*colors: 200",
-#ifdef
USE_IPHON
E
+#ifdef
HAVE_MOBIL
E
"*ignoreRotation: True",
#endif
0
"*ignoreRotation: True",
#endif
0
@@
-161,7
+161,7
@@
typedef struct {
#endif
typedef struct {
#endif
typedef struct {
-# ifndef HAVE_
COCOA
+# ifndef HAVE_
JWXYZ
Cursor band_cursor;
# endif
double p_min, p_max, q_min, q_max;
Cursor band_cursor;
# endif
double p_min, p_max, q_min, q_max;
@@
-827,7
+827,7
@@
Getkey(struct state *st, XKeyEvent *event)
unsigned char key;
int i;
if (XLookupString(event, (char *)&key, sizeof(key), (KeySym *)0,
unsigned char key;
int i;
if (XLookupString(event, (char *)&key, sizeof(key), (KeySym *)0,
- (XComposeStatus *) 0) > 0)
+ (XComposeStatus *) 0) > 0)
{
if (st->reset_countdown)
st->reset_countdown = st->linger;
if (st->reset_countdown)
st->reset_countdown = st->linger;
@@
-956,6
+956,7
@@
Getkey(struct state *st, XKeyEvent *event)
case 'H': print_help(st); return True;
default: return False;
}
case 'H': print_help(st); return True;
default: return False;
}
+ }
return False;
}
return False;
}