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.37.tar.gz
[xscreensaver]
/
hacks
/
glx
/
queens.c
diff --git
a/hacks/glx/queens.c
b/hacks/glx/queens.c
index 71535c118c27944154a671095d81fb86fc0f1a70..cd3867cf9af87498d8367146ff71aeb490aafef3 100644
(file)
--- a/
hacks/glx/queens.c
+++ b/
hacks/glx/queens.c
@@
-29,7
+29,7
@@
# include "xlock.h"
#endif
# include "xlock.h"
#endif
-#ifdef HAVE_
COCOA
+#ifdef HAVE_
JWXYZ
# include "jwxyz.h"
#else
# include <X11/Xlib.h>
# include "jwxyz.h"
#else
# include <X11/Xlib.h>
@@
-67,7
+67,7
@@
ENTRYPOINT ModeSpecOpt queens_opts = {countof(opts), opts, countof(vars), vars,
#ifdef USE_MODULES
ModStruct queens_description =
#ifdef USE_MODULES
ModStruct queens_description =
-{"queens", "init_queens", "draw_queens",
"release_queens"
,
+{"queens", "init_queens", "draw_queens",
NULL
,
"draw_queens", "init_queens", NULL, &queens_opts,
1000, 1, 2, 1, 4, 1.0, "",
"Queens", 0, NULL};
"draw_queens", "init_queens", NULL, &queens_opts,
1000, 1, 2, 1, 4, 1.0, "",
"Queens", 0, NULL};
@@
-412,7
+412,7
@@
static int drawBoard(Queenscreen *qs)
return polys;
}
return polys;
}
-static int display(Queenscreen *qs)
+static int display(
ModeInfo *mi,
Queenscreen *qs)
{
int max = 1024;
int polys = 0;
{
int max = 1024;
int polys = 0;
@@
-537,9
+537,7
@@
ENTRYPOINT void init_queens(ModeInfo *mi)
wire = 0;
# endif
wire = 0;
# endif
- if(!qss &&
- !(qss = (Queenscreen *) calloc(MI_NUM_SCREENS(mi), sizeof(Queenscreen))))
- return;
+ MI_INIT (mi, qss, NULL);
qs = &qss[screen];
qs->window = MI_WINDOW(mi);
qs = &qss[screen];
qs->window = MI_WINDOW(mi);
@@
-591,7
+589,7
@@
ENTRYPOINT void draw_queens(ModeInfo *mi)
else
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
else
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
- mi->polygon_count = display(qs);
+ mi->polygon_count = display(
mi,
qs);
mi->recursion_depth = qs->BOARDSIZE;
if(mi->fps_p) do_fps(mi);
mi->recursion_depth = qs->BOARDSIZE;
if(mi->fps_p) do_fps(mi);