X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fmaze.c;h=cfd212c4f9505a6bd601767be7c1898b2d48eb29;hb=ebc241816cc8e3eec7270a594bb1a607df32bcd6;hp=d795e78e8bb83b61bd35383f26b48a57c7e300e2;hpb=ce3185de9d9705e259f2b60dd4b5509007fa17d4;p=xscreensaver diff --git a/hacks/maze.c b/hacks/maze.c index d795e78e..cfd212c4 100644 --- a/hacks/maze.c +++ b/hacks/maze.c @@ -1,6 +1,10 @@ /****************************************************************************** * [ maze ] ... * + * modified: [ 1-04-00 ] Johannes Keukelaar + * Added -ignorant option (not the default) to remove knowlege + * of the direction in which the exit lies. + * * modified: [ 6-28-98 ] Zack Weinberg * * Made the maze-solver somewhat more intelligent. There are @@ -80,7 +84,7 @@ #include "screenhack.h" #include "erase.h" -#define XROGER +#define XSCREENSAVER_LOGO static int solve_delay, pre_solve_delay, post_solve_delay; @@ -129,7 +133,7 @@ static int solve_delay, pre_solve_delay, post_solve_delay; static int logo_x, logo_y; -#ifdef XROGER +#ifdef XSCREENSAVER_LOGO # define logo_width 128 # define logo_height 128 #else @@ -159,7 +163,7 @@ static GC gc, cgc, tgc, sgc, ugc, logo_gc, erase_gc; static Pixmap logo_map; static int x = 0, y = 0, restart = 0, stop = 1, state = 1, max_length; -static int sync_p, bridge_p; +static int sync_p, bridge_p, ignorant_p; static int check_events (void) /* X event handler [ rhess ] */ @@ -201,6 +205,9 @@ check_events (void) /* X event handler [ rhess ] */ case Expose: restart = 1; break; + default: + screenhack_handle_event(dpy, &e); + break; } return(1); } @@ -1122,10 +1129,16 @@ draw_maze_border (void) /* draw the maze outline */ int x, y; unsigned int w, h, bw, d; XGetGeometry (dpy, logo_map, &r, &x, &y, &w, &h, &bw, &d); - XCopyPlane (dpy, logo_map, win, logo_gc, - 0, 0, w, h, - border_x + 3 + grid_width * logo_x, - border_y + 3 + grid_height * logo_y, 1); + if (d == 1) + XCopyPlane (dpy, logo_map, win, logo_gc, + 0, 0, w, h, + border_x + 3 + grid_width * logo_x, + border_y + 3 + grid_height * logo_y, 1); + else + XCopyArea (dpy, logo_map, win, logo_gc, + 0, 0, w, h, + border_x + 3 + grid_width * logo_x, + border_y + 3 + grid_height * logo_y); } draw_solid_square (start_x, start_y, WALL_TOP >> start_dir, tgc); draw_solid_square (end_x, end_y, WALL_TOP >> end_dir, tgc); @@ -1367,13 +1380,13 @@ find_dead_regions(void) } } } - XSync(dpy, 0); + XSync(dpy, False); } static void solve_maze (void) /* solve it with graphical feedback */ { - int i, dir, from, x, y, ways, bt; + int i, dir, from, x, y, ways, bt = 0; /* plug up the surrounding wall */ maze[end_x][end_y] |= (WALL_TOP >> end_dir); @@ -1431,44 +1444,60 @@ solve_maze (void) /* solve it with graphical feedback */ if(!ways) goto backtrack; - - x = path[i].x - start_x; - y = path[i].y - start_y; - /* choice one */ - if(abs(y) <= abs(x)) - dir = (x > 0) ? WALL_LEFT : WALL_RIGHT; - else - dir = (y > 0) ? WALL_TOP : WALL_BOTTOM; - - if(dir & ways) - goto found; - - /* choice two */ - switch(dir) - { - case WALL_LEFT: - case WALL_RIGHT: - dir = (y > 0) ? WALL_TOP : WALL_BOTTOM; break; - case WALL_TOP: - case WALL_BOTTOM: - dir = (x > 0) ? WALL_LEFT : WALL_RIGHT; - } - - if(dir & ways) - goto found; - - /* choice three */ - - dir = (dir << 2 & WALL_ANY) | (dir >> 2 & WALL_ANY); - if(dir & ways) - goto found; - - /* choice four */ - dir = ways; - if(!dir) - goto backtrack; - found: + if (!ignorant_p) + { + x = path[i].x - start_x; + y = path[i].y - start_y; + /* choice one */ + if(abs(y) <= abs(x)) + dir = (x > 0) ? WALL_LEFT : WALL_RIGHT; + else + dir = (y > 0) ? WALL_TOP : WALL_BOTTOM; + + if(dir & ways) + goto found; + + /* choice two */ + switch(dir) + { + case WALL_LEFT: + case WALL_RIGHT: + dir = (y > 0) ? WALL_TOP : WALL_BOTTOM; break; + case WALL_TOP: + case WALL_BOTTOM: + dir = (x > 0) ? WALL_LEFT : WALL_RIGHT; + } + + if(dir & ways) + goto found; + + /* choice three */ + + dir = (dir << 2 & WALL_ANY) | (dir >> 2 & WALL_ANY); + if(dir & ways) + goto found; + + /* choice four */ + dir = ways; + if(!dir) + goto backtrack; + + found: ; + } + else + { + if(ways&WALL_TOP) + dir = WALL_TOP; + else if(ways&WALL_LEFT) + dir = WALL_LEFT; + else if(ways&WALL_BOTTOM) + dir = WALL_BOTTOM; + else if(ways&WALL_RIGHT) + dir = WALL_RIGHT; + else + goto backtrack; + } bt = 0; ways &= ~dir; /* tried this one */ @@ -1495,7 +1524,7 @@ solve_maze (void) /* solve it with graphical feedback */ return; } - if(!bt) + if(!bt && !ignorant_p) find_dead_regions(); bt = 1; from = path[i-1].dir; @@ -1555,13 +1584,12 @@ char *defaults[] = { "*maxLength: 5", "*syncDraw: False", "*bridge: False", -#ifdef XROGER - "*logoColor: red3", -#endif 0 }; XrmOptionDescRec options[] = { + { "-ignorant", ".ignorant", XrmoptionNoArg, "True" }, + { "-no-ignorant", ".ignorant", XrmoptionNoArg, "False" }, { "-grid-size", ".gridSize", XrmoptionSepArg, 0 }, { "-solve-delay", ".solveDelay", XrmoptionSepArg, 0 }, { "-pre-delay", ".preDelay", XrmoptionSepArg, 0 }, @@ -1577,8 +1605,8 @@ XrmOptionDescRec options[] = { { 0, 0, 0, 0 } }; -#ifdef XROGER -extern void skull (Display *, Window, GC, GC, int, int, int, int); +#ifdef XSCREENSAVER_LOGO +extern void xscreensaver_logo (Display *,Drawable,Colormap, Bool next_frame_p); #endif void @@ -1587,7 +1615,7 @@ screenhack(Display *display, Window window) Pixmap gray; int size, root, generator, this_gen; XWindowAttributes xgwa; - unsigned long bg, fg, pfg, pbg, lfg, sfg, ufg; + unsigned long bg, fg, pfg, pbg, sfg, ufg; size = get_integer_resource ("gridSize", "Dimension"); root = get_boolean_resource("root", "Boolean"); @@ -1597,6 +1625,7 @@ screenhack(Display *display, Window window) generator = get_integer_resource("generator", "Integer"); max_length = get_integer_resource("maxLength", "Integer"); bridge_p = get_boolean_resource("bridge", "Boolean"); + ignorant_p = get_boolean_resource("ignorant", "Boolean"); if (size < 2) size = 7 + (random () % 30); grid_width = grid_height = size; @@ -1612,7 +1641,13 @@ screenhack(Display *display, Window window) set_maze_sizes (xgwa.width, xgwa.height); if (! root) - XSelectInput (dpy, win, ExposureMask|ButtonPressMask|StructureNotifyMask); + { + XWindowAttributes xgwa; + XGetWindowAttributes (dpy, window, &xgwa); + XSelectInput (dpy, win, + xgwa.your_event_mask | ExposureMask | + ButtonPressMask |StructureNotifyMask); + } gc = XCreateGC(dpy, win, 0, 0); cgc = XCreateGC(dpy, win, 0, 0); @@ -1626,17 +1661,10 @@ screenhack(Display *display, Window window) bg = get_pixel_resource ("background","Background", dpy, xgwa.colormap); fg = get_pixel_resource ("foreground","Foreground", dpy, xgwa.colormap); - lfg = get_pixel_resource ("logoColor", "Foreground", dpy, xgwa.colormap); pfg = get_pixel_resource ("liveColor", "Foreground", dpy, xgwa.colormap); pbg = get_pixel_resource ("deadColor", "Foreground", dpy, xgwa.colormap); sfg = get_pixel_resource ("skipColor", "Foreground", dpy, xgwa.colormap); ufg = get_pixel_resource ("surroundColor", "Foreground", dpy, xgwa.colormap); - if (mono_p) lfg = pfg = fg; - - if (lfg == bg) - lfg = ((bg == WhitePixel (dpy, DefaultScreen (dpy))) - ? BlackPixel (dpy, DefaultScreen (dpy)) - : WhitePixel (dpy, DefaultScreen (dpy))); XSetForeground (dpy, gc, fg); XSetBackground (dpy, gc, bg); @@ -1648,7 +1676,7 @@ screenhack(Display *display, Window window) XSetBackground (dpy, sgc, bg); XSetForeground (dpy, ugc, ufg); XSetBackground (dpy, ugc, bg); - XSetForeground (dpy, logo_gc, lfg); + XSetForeground (dpy, logo_gc, fg); XSetBackground (dpy, logo_gc, bg); XSetForeground (dpy, erase_gc, bg); XSetBackground (dpy, erase_gc, bg); @@ -1660,23 +1688,14 @@ screenhack(Display *display, Window window) XSetStipple (dpy, ugc, gray); XSetFillStyle (dpy, ugc, FillOpaqueStippled); -#ifdef XROGER +#ifdef XSCREENSAVER_LOGO { int w, h; - XGCValues gcv; - GC draw_gc, erase_gc; /* round up to grid size */ w = ((logo_width / grid_width) + 1) * grid_width; h = ((logo_height / grid_height) + 1) * grid_height; - logo_map = XCreatePixmap (dpy, win, w, h, 1); - gcv.foreground = 1L; - draw_gc = XCreateGC (dpy, logo_map, GCForeground, &gcv); - gcv.foreground = 0L; - erase_gc= XCreateGC (dpy, logo_map, GCForeground, &gcv); - XFillRectangle (dpy, logo_map, erase_gc, 0, 0, w, h); - skull (dpy, logo_map, draw_gc, erase_gc, 5, 0, w-10, h-10); - XFreeGC (dpy, draw_gc); - XFreeGC (dpy, erase_gc); + logo_map = XCreatePixmap (dpy, win, w, h, xgwa.depth); + xscreensaver_logo (dpy, logo_map, xgwa.colormap, False); } #else if (!(logo_map = XCreateBitmapFromData (dpy, win, logo_bits,