projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.ksu.edu.tw/FTP/FreeBSD/distfiles/xscreensaver-4.20.tar.gz
[xscreensaver]
/
hacks
/
glx
/
bouncingcow.c
diff --git
a/hacks/glx/bouncingcow.c
b/hacks/glx/bouncingcow.c
index 667dd1e8486ca8a473ea5cf14f94fe3ad8161554..71bb56cbf6fcd190e449a3500661a2918652a1ba 100644
(file)
--- a/
hacks/glx/bouncingcow.c
+++ b/
hacks/glx/bouncingcow.c
@@
-1,4
+1,4
@@
-/* bouncingcow, Copyright (c) 2003 Jamie Zawinski <jwz@jwz.org>
+/* bouncingcow, Copyright (c) 2003
, 2004
Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-23,7
+23,7
@@
extern XtAppContext app;
#define EVENT_MASK PointerMotionMask
#define sws_opts xlockmore_opts
#define EVENT_MASK PointerMotionMask
#define sws_opts xlockmore_opts
-#define DEF_SPEED "
1.0
"
+#define DEF_SPEED "
0.7
"
#define DEF_TEXTURE "(none)"
#define DEFAULTS "*delay: 30000 \n" \
#define DEF_TEXTURE "(none)"
#define DEFAULTS "*delay: 30000 \n" \
@@
-100,12
+100,12
@@
static const char *do_texture;
static XrmOptionDescRec opts[] = {
{ "-speed", ".speed", XrmoptionSepArg, 0 },
{"-texture", ".texture", XrmoptionSepArg, 0 },
static XrmOptionDescRec opts[] = {
{ "-speed", ".speed", XrmoptionSepArg, 0 },
{"-texture", ".texture", XrmoptionSepArg, 0 },
- {"+texture", ".texture", XrmoptionNoArg,
(caddr_t)
"(none)" },
+ {"+texture", ".texture", XrmoptionNoArg, "(none)" },
};
static argtype vars[] = {
};
static argtype vars[] = {
- {
(caddr_t *)
&speed, "speed", "Speed", DEF_SPEED, t_Float},
- {
(caddr_t *)
&do_texture, "texture", "Texture", DEF_TEXTURE, t_String},
+ {&speed, "speed", "Speed", DEF_SPEED, t_Float},
+ {&do_texture, "texture", "Texture", DEF_TEXTURE, t_String},
};
ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL};
};
ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL};
@@
-196,7
+196,7
@@
cow_handle_event (ModeInfo *mi, XEvent *event)
cow_configuration *bp = &bps[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
cow_configuration *bp = &bps[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
- event->xbutton.button
&
Button1)
+ event->xbutton.button
==
Button1)
{
bp->button_down_p = True;
gltrackball_start (bp->trackball,
{
bp->button_down_p = True;
gltrackball_start (bp->trackball,
@@
-205,11
+205,19
@@
cow_handle_event (ModeInfo *mi, XEvent *event)
return True;
}
else if (event->xany.type == ButtonRelease &&
return True;
}
else if (event->xany.type == ButtonRelease &&
- event->xbutton.button
&
Button1)
+ event->xbutton.button
==
Button1)
{
bp->button_down_p = False;
return True;
}
{
bp->button_down_p = False;
return True;
}
+ else if (event->xany.type == ButtonPress &&
+ (event->xbutton.button == Button4 ||
+ event->xbutton.button == Button5))
+ {
+ gltrackball_mousewheel (bp->trackball, event->xbutton.button, 10,
+ !event->xbutton.state);
+ return True;
+ }
else if (event->xany.type == MotionNotify &&
bp->button_down_p)
{
else if (event->xany.type == MotionNotify &&
bp->button_down_p)
{