projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.jwz.org/xscreensaver/xscreensaver-5.12.tar.gz
[xscreensaver]
/
hacks
/
glx
/
pinion.c
diff --git
a/hacks/glx/pinion.c
b/hacks/glx/pinion.c
index b18eb73cc5c1658fce1b1a24b9e70d4a1af0abd8..8ba2ee0ee4d7c37f0edf80a5e9295293cf322f43 100644
(file)
--- a/
hacks/glx/pinion.c
+++ b/
hacks/glx/pinion.c
@@
-1,4
+1,4
@@
-/* pinion, Copyright (c) 2004-200
6
Jamie Zawinski <jwz@jwz.org>
+/* pinion, Copyright (c) 2004-200
8
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
@@
-12,9
+12,9
@@
#define DEFAULTS "*delay: 15000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
#define DEFAULTS "*delay: 15000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
- "*titleFont: -*-
times-bold
-r-normal-*-180-*\n" \
- "*titleFont2: -*-
times-bold
-r-normal-*-120-*\n" \
- "*titleFont3: -*-
times-bold
-r-normal-*-80-*\n" \
+ "*titleFont: -*-
helvetica-medium
-r-normal-*-180-*\n" \
+ "*titleFont2: -*-
helvetica-medium
-r-normal-*-120-*\n" \
+ "*titleFont3: -*-
helvetica-medium
-r-normal-*-80-*\n" \
# define refresh_pinion 0
# define release_pinion 0
# define refresh_pinion 0
# define release_pinion 0
@@
-165,7
+165,7
@@
new_label (ModeInfo *mi)
print_gl_string (mi->dpy, f, fl,
mi->xgwa.width, mi->xgwa.height,
10, mi->xgwa.height - 10,
print_gl_string (mi->dpy, f, fl,
mi->xgwa.width, mi->xgwa.height,
10, mi->xgwa.height - 10,
- label);
+ label
, False
);
}
glEndList ();
}
}
glEndList ();
}
@@
-883,6
+883,7
@@
push_gear (ModeInfo *mi)
if (g->coax_p)
{
if (g->coax_p)
{
+ if (!parent) abort();
if (g->x != parent->x) abort();
if (g->y != parent->y) abort();
if (g->z == parent->z) abort();
if (g->x != parent->x) abort();
if (g->y != parent->y) abort();
if (g->z == parent->z) abort();
@@
-1295,7
+1296,9
@@
pinion_handle_event (ModeInfo *mi, XEvent *event)
}
else if (event->xany.type == ButtonPress &&
(event->xbutton.button == Button4 ||
}
else if (event->xany.type == ButtonPress &&
(event->xbutton.button == Button4 ||
- event->xbutton.button == Button5))
+ event->xbutton.button == Button5 ||
+ event->xbutton.button == Button6 ||
+ event->xbutton.button == Button7))
{
gltrackball_mousewheel (pp->trackball, event->xbutton.button, 5,
!!event->xbutton.state);
{
gltrackball_mousewheel (pp->trackball, event->xbutton.button, 5,
!!event->xbutton.state);
@@
-1338,8
+1341,6
@@
init_pinion (ModeInfo *mi)
fprintf(stderr, "%s: out of memory\n", progname);
exit(1);
}
fprintf(stderr, "%s: out of memory\n", progname);
exit(1);
}
-
- pp = &pps[MI_SCREEN(mi)];
}
pp = &pps[MI_SCREEN(mi)];
}
pp = &pps[MI_SCREEN(mi)];