FreeBSD Bugzilla – Attachment 190595 Details for
Bug 225867
[PATCH][ADOPT] games/xroach: fix reason for being BROKEN and new maintainer
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
new version
xroach-4.4_2.diff (text/plain), 36.61 KB, created by
Philipp Engel
on 2018-02-13 21:01:47 UTC
(
hide
)
Description:
new version
Filename:
MIME Type:
Creator:
Philipp Engel
Created:
2018-02-13 21:01:47 UTC
Size:
36.61 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 448602) >+++ Makefile (working copy) >@@ -5,23 +5,29 @@ > PORTVERSION= 4.4 > PORTREVISION= 2 > CATEGORIES= games >-MASTER_SITES= http://www.skysmurf.nl/comp/FreeBSD/distfiles/ >+MASTER_SITES= https://cyber.dabamos.de/pub/distfiles/ > DISTNAME= ${PORTNAME} >+MAN6= xroach.6 > >-MAINTAINER= ports@FreeBSD.org >-COMMENT= Cockroaches hide under your windows >+DPADD+= ${LOCALBASE}/lib/libX11.a ${LIBM} >+CFLAGS+= -I${LOCALBASE}/include >+LDADD+= -L${LOCALBASE}/lib -lX11 -lm > >-BROKEN= unfetchable (apparently abandoned upstream) >-DEPRECATED= Broken for more than 6 months >-EXPIRATION_DATE= 2017-08-23 >+MANDIR=${LOCALBASE}/man/man > >-USE_XORG= x11 >-PLIST_FILES= bin/xroach man/man6/xroach.6.gz >+BINOWN= bin >+BINDIR= ${LOCALBASE}/bin >+BINMODE= 755 > >-WRKSRC= ${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xroach >+MAINTAINER= kidon@posteo.de >+COMMENT= Cockroaches hide under your windows > >+USES= imake >+USE_XORG= x11 xext >+PLIST_FILES=bin/xroach man/man6/xroach.6.gz >+ > do-install: > ${INSTALL_PROGRAM} -s ${WRKSRC}/xroach ${STAGEDIR}${PREFIX}/bin >- ${INSTALL_MAN} ${WRKSRC}/xroach.6 ${STAGEDIR}${MAN6PREFIX}/man/man6 >+ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${MAN6PREFIX}/man/man6/${PORTNAME}.6 > > .include <bsd.port.mk> >Index: distinfo >=================================================================== >--- distinfo (revision 448602) >+++ distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (xroach.tar.gz) = 88a4e436b7d93d34b062e548366af1eda62a1402518793b14339e9f5fde4b0da >-SIZE (xroach.tar.gz) = 15404 >+SHA256 (xroach.tar.gz) = 819ee19f8c333d9adaa4ab58829445112e1865b85a6ca82296d66399af344e07 >+SIZE (xroach.tar.gz) = 21694 >Index: files/patch-Makefile >=================================================================== >--- files/patch-Makefile (revision 448602) >+++ files/patch-Makefile (nonexistent) >@@ -1,24 +0,0 @@ >---- Makefile.orig Tue Jun 8 19:12:04 1993 >-+++ Makefile Sun Sep 8 03:45:39 2002 >-@@ -1,9 +1,16 @@ >--# @(#)Makefile 8.1 (Berkeley) 6/8/93 >-+# @(#)Makefile 8.1 (Berkeley) 5/31/93 >- >- PROG= xroach >--MAN6= xroach.0 >--CFLAGS+= -I${.CURDIR}/bitmaps >--DPADD= ${LIBX} ${LIBM} >--LDADD= -lX11/X11 -lm >-+MAN6= xroach.6 >-+ >-+DPADD+= ${LOCALBASE}/lib/libX11.a ${LIBM} >-+CFLAGS+= -I${LOCALBASE}/include -I${.CURDIR}/bitmaps >-+LDADD+= -L${LOCALBASE}/lib -lX11 -lm >-+ >-+MANDIR= ${LOCALBASE}/man/man >-+ >-+BINOWN= bin >-+BINDIR= ${LOCALBASE}/bin >-+BINMODE= 755 >- >- .include <bsd.prog.mk> > >Property changes on: files/patch-Makefile >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-xroach.c >=================================================================== >--- files/patch-xroach.c (revision 448602) >+++ files/patch-xroach.c (working copy) >@@ -1,58 +1,1310 @@ >---- xroach.c.orig 1993-06-04 21:47:09.000000000 +0200 >-+++ xroach.c 2011-12-20 19:03:53.816175581 +0100 >-@@ -77,7 +77,7 @@ >+--- xroach.c.orig 1991-06-06 14:12:07.000000000 +0200 >++++ xroach.c 2018-02-13 16:23:28.812243000 +0100 >+@@ -1,23 +1,31 @@ >+ /* >+ Xroach - A game of skill. Try to find the roaches under your windows. >+- >++ >+ Copyright 1991 by J.T. Anderson >+ >+ jta@locus.com >+- >++ >+ This program may be freely distributed provided that all >+ copyright notices are retained. >+ >+ To build: >+- cc -o xroach roach.c -lX11 [-lsocketorwhatever] [-lm] [-l...] >++ cc -o xroach -lX11 -lm -I/usr/local/include/ -L/usr/local/lib xroach.c >++ >++ To run: >++ ./xroach -speed 2 -squish -rc brown -rgc yellowgreen >++ >++ Dedicated to Greg McFarlane (gregm@otc.otca.oz.au). >++ >++ Squish option contributed by Rick Petkiewizc (rick@locus.com). >+ >+- Dedicated to Greg McFarlane. (gregm@otc.otca.oz.au) >+- >+- Squish option contributed by Rick Petkiewizc (rick@locus.com) >+- >+ Virtual root code adapted from patch sent by Colin Rafferty who >+- borrowed it from Tom LaStrange. Several other folks sent similar >++ borrowed it from Tom LaStrange. Several other folks sent similar >+ fixes. >++ >++ Some glitches removed by patch from Guus Sliepen (guus@sliepen.warande.net) >++ in 2001 (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=102668#5). >++ >++ Last update: 2018-JAN-22 >+ */ >+ >+ /* @(#)xroach.c 1.5 4/2/91 11:53:31 */ >+@@ -28,17 +36,9 @@ >+ #include <X11/Xatom.h> >+ >+ #include <stdio.h> >+-#include <math.h> >+-#include <malloc.h> >+-#include <signal.h> >+- >+-#if __STDC__ >+ #include <stdlib.h> >+-#else >+-long strtol(); >+-double strtod(); >+-char *getenv(); >+-#endif >++#include <signal.h> >++#include <math.h> >+ >+ char Copyright[] = "Xroach\nCopyright 1991 J.T. Anderson"; >+ >+@@ -47,30 +47,31 @@ >+ typedef unsigned long Pixel; >+ typedef int ErrorHandler(); >+ >+-#define SCAMPER_EVENT (LASTEvent + 1) >++#define SCAMPER_EVENT (LASTEvent + 1) >+ >+ #if !defined(GRAB_SERVER) >+-#define GRAB_SERVER 0 >++#define GRAB_SERVER 0 >+ #endif >+ >++char *display_name = NULL; >+ Display *display; >+-int screen; >+-Window rootWin; >+-unsigned int display_width, display_height; >+-int center_x, center_y; >+ GC gc; >+ GC gutsGC; >+-char *display_name = NULL; >+-Pixel black, white; >++int screen; >++Pixel black; >++unsigned int display_height; >++unsigned int display_width; >++Window rootWin; >+ >++Bool squishRoach = False; >++Bool squishWinUp = False; >+ int done = 0; >+-int eventBlock = 0; >+ int errorVal = 0; >+-Bool squishRoach = False; >++int eventBlock = 0; >+ Pixmap squishMap; >+-Bool squishWinUp = False; >+ >+-typedef struct Roach { >++typedef struct Roach >++{ >+ RoachMap *rp; >+ int index; >+ float x; >+@@ -86,69 +87,72 @@ >+ int maxRoaches = 10; >+ int curRoaches = 0; >+ float roachSpeed = 20.0; >++float turnSpeed = 10.0; >+ >+ Region rootVisible = NULL; >+ >+ void Usage(); >+ void SigHandler(); >++Window FindRootWindow(); >++int RandInt(int maxVal); >++int RoachInRect(Roach *roach, int rx, int ry, int x, int y, unsigned int width, unsigned int height); >++int RoachOverRect(Roach *roach, int rx, int ry, int x, int y, unsigned int width, unsigned int height); >+ void AddRoach(); >+-void MoveRoach(); >++void TurnRoach(Roach *roach); >++void MoveRoach(int rx); >+ void DrawRoaches(); >+ void CoverRoot(); >++int RoachErrors(XErrorEvent *err); >+ int CalcRootVisible(); > int MarkHiddenRoaches(); >- Pixel AllocNamedColor(); >+-Pixel AllocNamedColor(); >+-Window FindRootWindow(); >++Pixel AllocNamedColor(char *colorName, Pixel dfltPix); >++void checkSquish(XButtonEvent *buttonEvent); > > -void >-+int >- main(ac, av) >- int ac; >- char *av[]; >-@@ -96,19 +96,23 @@ >+-main(ac, av) >+-int ac; >+-char *av[]; >++int main(int ac, char *av[]) >+ { >+- XGCValues xgcv; >+- int ax; >+ char *arg; >+- RoachMap *rp; >+- int rx; >+- float angle; >+- XEvent ev; >+- char *roachColor = "black"; >+ char *gutsColor = NULL; >+- int nVis; >++ char *roachColor = "black"; >++ float angle; >+ int needCalc; >++ int nVis; >++ RoachMap *rp; >+ Window squishWin; >++ XEvent ev; >++ XGCValues xgcv; >+ XSetWindowAttributes xswa; >+- >++ > /* > Process command line options. > */ > - for (ax=1; ax<ac; ax++) { > - arg = av[ax]; >-+ for (ax=1; ax<ac; ) { >-+ arg = av[ax++]; >-+ >-+ if (ax >= ac) >-+ Usage(); >-+ >- if (strcmp(arg, "-display") == 0) { >+- if (strcmp(arg, "-display") == 0) { > - display_name = av[++ax]; >-+ display_name = av[ax++]; >- } >- else if (strcmp(arg, "-rc") == 0) { >+- } >+- else if (strcmp(arg, "-rc") == 0) { > - roachColor = av[++ax]; >-+ roachColor = av[ax++]; >- } >- else if (strcmp(arg, "-speed") == 0) { >-- roachSpeed = atof(av[++ax]); >-+ roachSpeed = atof(av[ax++]); >- } >- else if (strcmp(arg, "-roaches") == 0) { >+- } >+- else if (strcmp(arg, "-speed") == 0) { >+- roachSpeed = strtod(av[++ax], (char **)NULL); >+- } >+- else if (strcmp(arg, "-roaches") == 0) { > - maxRoaches = strtol(av[++ax], (char **)NULL, 0); >-+ maxRoaches = strtol(av[ax++], (char **)NULL, 0); >- } >- else { >- Usage(); >-@@ -212,6 +216,7 @@ >+- } >+- else if (strcmp(arg, "-squish") == 0) { >+- squishRoach = True; >+- } >+- else if (strcmp(arg, "-rgc") == 0) { >+- gutsColor = av[++ax]; >+- } >+- else { >+- Usage(); >+- } >++ for (int ax = 1; ax < ac; ax++) >++ { >++ arg = av[ax]; >++ >++ if (strcmp(arg, "-display") == 0) >++ display_name = av[++ax]; >++ else if (strcmp(arg, "-rc") == 0) >++ roachColor = av[++ax]; >++ else if (strcmp(arg, "-speed") == 0) >++ roachSpeed = (float) strtod(av[++ax], (char **) NULL); >++ else if (strcmp(arg, "-roaches") == 0) >++ maxRoaches = (int) strtol(av[++ax], (char **) NULL, 0); >++ else if (strcmp(arg, "-squish") == 0) >++ squishRoach = True; >++ else if (strcmp(arg, "-rgc") == 0) >++ gutsColor = av[++ax]; >++ else >++ Usage(); >+ } >+ >+- srand((int)time((long *)NULL)); >+- >++ /* Compensate rate of turning for speed of movement. */ >++ turnSpeed = 200 / roachSpeed; >++ >++ if (turnSpeed < 1) >++ turnSpeed = 1; >++ >++ srand((unsigned int) time((time_t *) NULL)); >++ >+ /* >+ Catch some signals so we can erase any visible roaches. >+ */ >+@@ -158,144 +162,180 @@ >+ signal(SIGHUP, SigHandler); >+ >+ display = XOpenDisplay(display_name); >+- if (display == NULL) { >+- if (display_name == NULL) display_name = getenv("DISPLAY"); >+- (void) fprintf(stderr, "%s: cannot connect to X server %s\n", av[0], >+- display_name ? display_name : "(default)"); >+- exit(1); >++ >++ if (display == NULL) >++ { >++ if (display_name == NULL) >++ display_name = getenv("DISPLAY"); >++ >++ fprintf(stderr, >++ "%s: cannot connect to X server %s\n", >++ av[0], >++ display_name ? display_name : "(default)"); >++ exit(1); >+ } >+ >+ screen = DefaultScreen(display); >+ rootWin = FindRootWindow(); >+ black = BlackPixel(display, screen); >+- white = WhitePixel(display, screen); >+ >+- display_width = DisplayWidth(display, screen); >+- display_height = DisplayHeight(display, screen); >+- center_x = display_width / 2; >+- center_y = display_height / 2; >+- >++ display_width = (unsigned int) DisplayWidth(display, screen); >++ display_height = (unsigned int) DisplayHeight(display, screen); >++ >+ /* >+ Create roach pixmaps at several orientations. >+ */ >+- for (ax=0; ax<360; ax+=ROACH_ANGLE) { >+- rx = ax / ROACH_ANGLE; >+- angle = rx * 0.261799387799; >+- rp = &roachPix[rx]; >+- rp->pixmap = XCreateBitmapFromData(display, rootWin, >+- rp->roachBits, rp->width, rp->height); >+- rp->sine = sin(angle); >+- rp->cosine = cos(angle); >++ for (int ax = 0; ax < 360; ax += ROACH_ANGLE) >++ { >++ int rx = ax / ROACH_ANGLE; >++ angle = (float) (rx * 0.261799387799); >++ rp = &roachPix[rx]; >++ rp->pixmap = XCreateBitmapFromData(display, >++ rootWin, >++ rp->roachBits, >++ (unsigned int) rp->width, >++ (unsigned int) rp->height); >++ rp->sine = (float) sin(angle); >++ rp->cosine = (float) cos(angle); >+ } >+ >+ /* >+ Create the squished pixmap >+ */ >+- if (squishRoach) { >+- squishMap = XCreateBitmapFromData(display, rootWin, >+- squish_bits, squish_width, squish_height); >+- } >++ if (squishRoach) >++ squishMap = XCreateBitmapFromData(display, >++ rootWin, >++ squish_bits, >++ squish_width, >++ squish_height); >+ >+- roaches = (Roach *)malloc(sizeof(Roach) * maxRoaches); >++ roaches = (Roach *) malloc(sizeof(Roach) * maxRoaches); >+ >+ gc = XCreateGC(display, rootWin, 0L, &xgcv); >+ XSetForeground(display, gc, AllocNamedColor(roachColor, black)); >+ XSetFillStyle(display, gc, FillStippled); >+ >+- if (squishRoach && gutsColor != NULL) { >++ if (squishRoach && gutsColor != NULL) >++ { >+ gutsGC = XCreateGC(display, rootWin, 0L, &xgcv); >+ XSetForeground(display, gutsGC, AllocNamedColor(gutsColor, black)); >+ XSetFillStyle(display, gutsGC, FillStippled); >+ } >+ else >+- gutsGC = gc; >+- >++ { >++ gutsGC = gc; >++ } >++ >+ while (curRoaches < maxRoaches) >+- AddRoach(); >+- >++ AddRoach(); >++ >+ XSelectInput(display, rootWin, ExposureMask | SubstructureNotifyMask); >+ >+- if (squishRoach) { >+- xswa.event_mask = ButtonPressMask; >+- xswa.override_redirect = True; >+- squishWin = XCreateWindow(display, rootWin, 0, 0, >+- display_width, display_height, 0, >+- CopyFromParent, InputOnly, CopyFromParent, >+- CWOverrideRedirect | CWEventMask, &xswa); >+- XLowerWindow(display, squishWin); >++ if (squishRoach) >++ { >++ xswa.event_mask = ButtonPressMask; >++ xswa.override_redirect = True; >++ squishWin = XCreateWindow(display, >++ rootWin, >++ 0, 0, >++ display_width, display_height, >++ 0, >++ CopyFromParent, InputOnly, CopyFromParent, >++ CWOverrideRedirect | CWEventMask, >++ &xswa); >++ XLowerWindow(display, squishWin); >+ } >+- >++ >+ needCalc = 1; >+- while (!done) { >+- if (XPending(display)) { >+- XNextEvent(display, &ev); >+- } >+- else { >+- if (needCalc) { >+- needCalc = CalcRootVisible(); >+- } >+- if (needCalc) >+- nVis = 0; >+- else >+- nVis = MarkHiddenRoaches(); >+- if (nVis) { >+- ev.type = SCAMPER_EVENT; >+- if (!squishWinUp && squishRoach) { >+- XMapWindow(display, squishWin); >+- squishWinUp = True; >+- } >+- } >+- else { >+- if (squishWinUp && squishRoach) { >+- XUnmapWindow(display, squishWin); >+- squishWinUp = False; >+- } >+- if (needCalc == 0) >+- DrawRoaches(); >+- eventBlock = 1; >+- XNextEvent(display, &ev); >+- eventBlock = 0; >+- } >+- } >+- >+- switch (ev.type) { >+- >+- case SCAMPER_EVENT: >+- for (rx=0; rx<curRoaches; rx++) { >+- if (!roaches[rx].hidden) >+- MoveRoach(rx); >+- } >+- DrawRoaches(); >+- XSync(display, False); >+- break; >+- >+- case UnmapNotify: >+- if (ev.xunmap.window != squishWin) >+- needCalc = 1; >+- break; >+- >+- case MapNotify: >+- case Expose: >+- case ConfigureNotify: >+- needCalc = 1; >+- break; >+- >+- case ButtonPress: >+- checkSquish(&ev); >+- break; >+- >+- } >++ >++ while (!done) >++ { >++ if (XPending(display)) >++ { >++ XNextEvent(display, &ev); >++ } >++ else >++ { >++ if (needCalc) >++ needCalc = CalcRootVisible(); >++ >++ if (needCalc) >++ nVis = 0; >++ else >++ nVis = MarkHiddenRoaches(); >++ >++ ev.type = SCAMPER_EVENT; >++ >++ if (nVis) >++ { >++ if (!squishWinUp && squishRoach) >++ { >++ XMapWindow(display, squishWin); >++ squishWinUp = True; >++ } >++ } >++ else >++ { >++ if (squishWinUp && squishRoach) >++ { >++ XUnmapWindow(display, squishWin); >++ squishWinUp = False; >++ } >++ >++ /* >++ if (needCalc == 0) >++ DrawRoaches(); >++ >++ eventBlock = 1; >++ XNextEvent(display, &ev); >++ eventBlock = 0; >++ */ >++ } >++ } >++ >++ switch (ev.type) >++ { >++ case SCAMPER_EVENT: >++ for (int rx = 0; rx < curRoaches; rx++) >++ if (!roaches[rx].hidden) >++ MoveRoach(rx); >++ >++ DrawRoaches(); >++ XFlush(display); >++ usleep(20000); >++ XSync(display, False); >++ break; >++ >++ case UnmapNotify: >++ if (ev.xunmap.window != squishWin) >++ needCalc = 1; >++ break; >++ >++ case MapNotify: >++ case Expose: >++ case ConfigureNotify: >++ needCalc = 1; >++ break; >++ >++ case ButtonPress: >++ checkSquish(&ev); >++ done = !curRoaches; /* Stop program if there are no more roaches */ >++ break; >++ >++ default: >++ break; >++ } >+ } >+- >++ > CoverRoot(); >- >+- > XCloseDisplay(display); >-+ return(0); >++ free(roaches); >++ return 0; > } > > #define USEPRT(msg) fprintf(stderr, msg) >-@@ -465,7 +470,7 @@ >+ >+-void >+-Usage() >++void Usage() >+ { >+ USEPRT("Usage: xroach [options]\n\n"); >+ USEPRT("Options:\n"); >+@@ -305,314 +345,345 @@ >+ USEPRT(" -speed roachspeed\n"); >+ USEPRT(" -squish\n"); >+ USEPRT(" -rgc roachgutscolor\n"); >+- >++ >+ exit(1); >+ } >+ >+-void >+-SigHandler() >++void SigHandler() >+ { >+- >+ /* >+ If we are blocked, no roaches are visible and we can just bail >+ out. If we are not blocked, then let the main procedure clean >+ up the root window. >+ */ >+- if (eventBlock) { >+- XCloseDisplay(display); >+- exit(0); >++ if (eventBlock) >++ { >++ XCloseDisplay(display); >++ exit(0); >+ } >+- else { >+- done = 1; >++ else >++ { >++ done = 1; >+ } >+ } >+ >+ /* >+ Find the root or virtual root window. >+ */ >+-Window >+-FindRootWindow() >++Window FindRootWindow() >+ { >+- Window rootWin; >+- Window realRoot; >++ Atom actualType; >+ Atom swmVroot; >+- Window rootReturn, parentReturn, *children; >++ int actualFormat; >++ unsigned char *newRoot; >+ unsigned int numChildren; >+- int cx; >+- Atom actualType; >+- Atom actualFormat; >+- unsigned long nItems; >+ unsigned long bytesAfter; >+- Window *newRoot; >+- >++ unsigned long nItems; >++ Window *children; >++ Window parentReturn; >++ Window realRoot; >++ Window rootReturn; >++ Window rootWin; >++ >+ /* >+ Get real root window. >+ */ >+ realRoot = rootWin = RootWindow(display, screen); >+- >++ >+ /* >+ Get atom for virtual root property. If the atom doesn't >+ exist, we can assume the corresponding property does not >+ exist. >+ */ >+ swmVroot = XInternAtom(display, "__SWM_VROOT", True); >+- >++ >+ if (swmVroot == None) >+- return rootWin; >+- >++ return rootWin; >++ >+ /* >+ Run children of root, looking for a virtual root. >+ */ >+- XQueryTree(display, rootWin, &rootReturn, &parentReturn, >+- &children, &numChildren); >+- for (cx=0; cx<numChildren; cx++) { >+- newRoot = NULL; >+- nItems = 0; >+- if (XGetWindowProperty(display, children[cx], swmVroot, 0L, 1L, False, >+- XA_WINDOW, &actualType, &actualFormat, &nItems, >+- &bytesAfter, &newRoot) == Success && actualFormat != None) { >+- if (nItems >= 1) { >+- rootWin = *newRoot; >+- } >+- if (newRoot) { >+- XFree(newRoot); >+- } >+- } >+- if (rootWin != realRoot) break; >++ XQueryTree(display, >++ rootWin, >++ &rootReturn, >++ &parentReturn, >++ &children, >++ &numChildren); >++ >++ for (int cx = 0; cx < numChildren; cx++) >++ { >++ newRoot = NULL; >++ nItems = 0; >++ >++ if (XGetWindowProperty(display, >++ children[cx], >++ swmVroot, >++ 0, >++ 1, >++ False, >++ XA_WINDOW, >++ &actualType, >++ &actualFormat, >++ &nItems, >++ &bytesAfter, >++ &newRoot) == Success && actualFormat != None) >++ { >++ if (nItems >= 1) >++ rootWin = *newRoot; >++ >++ if (newRoot) >++ XFree(newRoot); >++ } >++ >++ if (rootWin != realRoot) >++ break; >+ } >++ >+ XFree(children); >+- >++ >+ return rootWin; >+ } >+ >+ /* >+ Generate random integer between 0 and maxVal-1. >+ */ >+-int >+-RandInt(maxVal) >+-int maxVal; >++int RandInt(int maxVal) >+ { >+- return rand() % maxVal; >++ return rand() % maxVal; >+ } >+ >+ /* >+ Check for roach completely in specified rectangle. >+ */ >+-int >+-RoachInRect(roach, rx, ry, x, y, width, height) >+-Roach *roach; >+-int rx; >+-int ry; >+-int x; >+-int y; >+-unsigned int width; >+-unsigned int height; >+-{ >+- if (rx < x) return 0; >+- if ((rx + roach->rp->width) > (x + width)) return 0; >+- if (ry < y) return 0; >+- if ((ry + roach->rp->height) > (y + height)) return 0; >+- >++int RoachInRect(Roach *roach, int rx, int ry, int x, int y, unsigned int width, unsigned int height) >++{ >++ if (rx < x) >++ return 0; >++ >++ if ((rx + roach->rp->width) > (x + width)) >++ return 0; >++ >++ if (ry < y) >++ return 0; >++ >++ if ((ry + roach->rp->height) > (y + height)) >++ return 0; >++ >+ return 1; >+ } >+ >+ /* >+ Check for roach overlapping specified rectangle. >+ */ >+-int >+-RoachOverRect(roach, rx, ry, x, y, width, height) >+-Roach *roach; >+-int rx; >+-int ry; >+-int x; >+-int y; >+-unsigned int width; >+-unsigned int height; >+-{ >+- if (rx >= (x + width)) return 0; >+- if ((rx + roach->rp->width) <= x) return 0; >+- if (ry >= (y + height)) return 0; >+- if ((ry + roach->rp->height) <= y) return 0; >+- >++int RoachOverRect(Roach *roach, int rx, int ry, int x, int y, unsigned int width, unsigned int height) >++{ >++ if (rx >= (x + width)) >++ return 0; >++ >++ if ((rx + roach->rp->width) <= x) >++ return 0; >++ >++ if (ry >= (y + height)) >++ return 0; >++ >++ if ((ry + roach->rp->height) <= y) >++ return 0; >++ >+ return 1; >+ } >+ >+ /* >+ Give birth to a roach. >+ */ >+-void >+-AddRoach() >++void AddRoach() >+ { >+ Roach *r; >+- >+- if (curRoaches < maxRoaches) { >+- r = &roaches[curRoaches++]; >+- r->index = RandInt(ROACH_HEADINGS); >+- r->rp = &roachPix[r->index]; >+- r->x = RandInt(display_width - r->rp->width); >+- r->y = RandInt(display_height - r->rp->height); >+- r->intX = -1; >+- r->intY = -1; >+- r->hidden = 0; >+- r->steps = RandInt(200); >+- r->turnLeft = RandInt(100) >= 50; >++ >++ if (curRoaches < maxRoaches) >++ { >++ r = &roaches[curRoaches++]; >++ r->index = RandInt(ROACH_HEADINGS); >++ r->rp = &roachPix[r->index]; >++ r->x = RandInt(display_width - r->rp->width); >++ r->y = RandInt(display_height - r->rp->height); >++ r->intX = -1; >++ r->intY = -1; >++ r->hidden = 0; >++ r->steps = RandInt((int) turnSpeed); >++ r->turnLeft = RandInt(100) >= 50; >+ } >+ } >+ >+ /* >+ Turn a roach. >+ */ >+-void >+-TurnRoach(roach) >+-Roach *roach; >+-{ >+- if (roach->index != (roach->rp - roachPix)) return; >+- >+- if (roach->turnLeft) { >+- roach->index += (RandInt(30) / 10) + 1; >+- if (roach->index >= ROACH_HEADINGS) >+- roach->index -= ROACH_HEADINGS; >+- } >+- else { >+- roach->index -= (RandInt(30) / 10) + 1; >+- if (roach->index < 0) >+- roach->index += ROACH_HEADINGS; >++void TurnRoach(Roach *roach) >++{ >++ if (roach->index != (roach->rp - roachPix)) >++ return; >++ >++ if (roach->turnLeft) >++ { >++ roach->index += (RandInt(30) / 10) + 1; >++ >++ if (roach->index >= ROACH_HEADINGS) >++ roach->index -= ROACH_HEADINGS; >++ } else >++ { >++ roach->index -= (RandInt(30) / 10) + 1; >++ >++ if (roach->index < 0) >++ roach->index += ROACH_HEADINGS; >+ } >+ } >+ >+ /* >+ Move a roach. >+ */ >+-void >+-MoveRoach(rx) >+-int rx; >++void MoveRoach(int rx) >+ { >+- Roach *roach; >+- Roach *r2; >+ float newX; >+ float newY; >+- int ii; >+- >++ Roach *roach; >++ >+ roach = &roaches[rx]; >+ newX = roach->x + (roachSpeed * roach->rp->cosine); >+ newY = roach->y - (roachSpeed * roach->rp->sine); >+- >+- if (RoachInRect(roach, (int)newX, (int)newY, >+- 0, 0, display_width, display_height)) { >+- >+- roach->x = newX; >+- roach->y = newY; >+- >+- if (roach->steps-- <= 0) { >+- TurnRoach(roach); >+- roach->steps = RandInt(200); >+- } >+- >+- for (ii=rx+1; ii<curRoaches; ii++) { >+- r2 = &roaches[ii]; >+- if (RoachOverRect(roach, (int)newX, (int)newY, >+- r2->intX, r2->intY, r2->rp->width, r2->rp->height)) { >+- >+- TurnRoach(roach); >+- } >+- } >++ >++ if (RoachInRect(roach, >++ (int) newX, (int) newY, >++ 0, 0, >++ display_width, display_height)) >++ { >++ roach->x = newX; >++ roach->y = newY; >++ >++ if (roach->steps-- <= 0) >++ { >++ TurnRoach(roach); >++ roach->steps = RandInt((int) turnSpeed); >++ >++ /* >++ Previously, roaches would just go around in circles. >++ This makes their movement more interesting (and disgusting too!). >++ */ >++ if (RandInt(100) >= 80) >++ roach->turnLeft ^= 1; >++ } >++ >++ /* This is a kind of anti-collision algorithm which doesn't do what it is supposed to do, >++ it eats CPU time and sometimes makes roaches spin around very crazy. Therefore it is >++ commented out. >++ >++ for (int ii = rx + 2; ii < curRoaches; ii++) { >++ r2 = &roaches[ii]; >++ >++ if (RoachOverRect(roach, >++ (int) newX, (int) newY, >++ r2->intX, r2->intY, >++ (unsigned int) r2->rp->width, (unsigned int) r2->rp->height)) >++ TurnRoach(roach); >++ >++ } >++ */ >+ } >+- else { >+- TurnRoach(roach); >++ else >++ { >++ TurnRoach(roach); >+ } >+ } >+- >++ >+ /* >+ Draw all roaches. >+ */ >+-void >+-DrawRoaches() >++void DrawRoaches() >+ { >+ Roach *roach; >+- int rx; >+- >+- for (rx=0; rx<curRoaches; rx++) { >+- roach = &roaches[rx]; >+- >+- if (roach->intX >= 0 && roach->rp != NULL) { >+- XClearArea(display, rootWin, roach->intX, roach->intY, >+- roach->rp->width, roach->rp->height, False); >+- } >+- } >+- >+- for (rx=0; rx<curRoaches; rx++) { >+- roach = &roaches[rx]; >+- >+- if (!roach->hidden) { >+- roach->intX = roach->x; >+- roach->intY = roach->y; >+- roach->rp = &roachPix[roach->index]; >+- >+- XSetStipple(display, gc, roach->rp->pixmap); >+- XSetTSOrigin(display, gc, roach->intX, roach->intY); >+- XFillRectangle(display, rootWin, gc, >+- roach->intX, roach->intY, roach->rp->width, roach->rp->height); >+- } >+- else { >+- roach->intX = -1; >+- } >++ >++ for (int rx = 0; rx < curRoaches; rx++) >++ { >++ roach = &roaches[rx]; >++ >++ if (!roach->hidden) >++ { >++ XClearArea(display, >++ rootWin, >++ roach->intX, >++ roach->intY, >++ (unsigned int) roach->rp->width, >++ (unsigned int) roach->rp->height, >++ False); >++ >++ roach->intX = (int) roach->x; >++ roach->intY = (int) roach->y; >++ roach->rp = &roachPix[roach->index]; >++ >++ XSetStipple(display, gc, roach->rp->pixmap); >++ XSetTSOrigin(display, gc, roach->intX, roach->intY); >++ XFillRectangle(display, >++ rootWin, >++ gc, >++ roach->intX, >++ roach->intY, >++ (unsigned int) roach->rp->width, >++ (unsigned int) roach->rp->height); >++ } >++ else >++ { >++ roach->intX = -1; >++ } >+ } >+ } >+ >+ /* >+ Cover root window to erase roaches. >+ */ >+-void >+-CoverRoot() >++void CoverRoot() >+ { >+- XSetWindowAttributes xswa; >+ long wamask; >+ Window roachWin; >+- >++ XSetWindowAttributes xswa; >++ >+ xswa.background_pixmap = ParentRelative; >+ xswa.override_redirect = True; >+ wamask = CWBackPixmap | CWOverrideRedirect; >+- roachWin = XCreateWindow(display, rootWin, 0, 0, >+- display_width, display_height, 0, CopyFromParent, >+- InputOutput, CopyFromParent, wamask, &xswa); >++ roachWin = XCreateWindow(display, rootWin, >++ 0, 0, >++ display_width, display_height, >++ 0, >++ CopyFromParent, InputOutput, CopyFromParent, >++ (unsigned long) wamask, &xswa); >+ XLowerWindow(display, roachWin); >+ XMapWindow(display, roachWin); >+ XFlush(display); >+-} >++} >+ >+ #if !GRAB_SERVER >+- >+-int >+-RoachErrors(dpy, err) >+-Display *dpy; >+-XErrorEvent *err; >++int RoachErrors(XErrorEvent *err) >+ { >+ errorVal = err->error_code; >+- >++ >+ return 0; >+ } >+- >+ #endif /* GRAB_SERVER */ >+ >+ /* >+- Calculate Visible region of root window. >++ Calculate visible region of root window. >+ */ >+-int >+-CalcRootVisible() >++int CalcRootVisible() >+ { >++ int winX, winY; > Region covered; > Region visible; >++ unsigned int borderWidth; >++ unsigned int depth; >++ unsigned int nChildren; >++ unsigned int winHeight, winWidth; > Window *children; > - int nChildren; >-+ unsigned int nChildren; > Window dummy; >- XWindowAttributes wa; >- int wx; >+- XWindowAttributes wa; >+- int wx; >+ XRectangle rect; >+- int winX, winY; >+- unsigned int winHeight, winWidth; >+- unsigned int borderWidth; >+- unsigned int depth; >+- >++ XWindowAttributes wa; >++ >+ /* >+ If we don't grab the server, the XGetWindowAttribute or XGetGeometry >+ calls can abort us. On the other hand, the server grabs can make for >+@@ -628,64 +699,83 @@ >+ Get children of root. >+ */ >+ XQueryTree(display, rootWin, &dummy, &dummy, &children, &nChildren); >+- >++ >+ /* >+ For each mapped child, add the window rectangle to the covered >+ region. >+ */ >+ covered = XCreateRegion(); >+- for (wx=0; wx<nChildren; wx++) { >+- if (XEventsQueued(display, QueuedAlready)) { >+- XDestroyRegion(covered); >+- return 1; >+- } >+- errorVal = 0; >+- XGetWindowAttributes(display, children[wx], &wa); >+- if (errorVal) continue; >+- if (wa.class == InputOutput && wa.map_state == IsViewable) { >+- XGetGeometry(display, children[wx], &dummy, &winX, &winY, >+- &winWidth, &winHeight, &borderWidth, &depth); >+- if (errorVal) continue; >+- rect.x = winX; >+- rect.y = winY; >+- rect.width = winWidth + (borderWidth * 2); >+- rect.height = winHeight + (borderWidth * 2); >+- XUnionRectWithRegion(&rect, covered, covered); >+- } >++ >++ for (int wx = 0; wx < nChildren; wx++) >++ { >++ if (XEventsQueued(display, QueuedAlready)) >++ { >++ XDestroyRegion(covered); >++ return 1; >++ } >++ >++ errorVal = 0; >++ XGetWindowAttributes(display, children[wx], &wa); >++ >++ if (errorVal) >++ continue; >++ >++ if (wa.class == InputOutput && wa.map_state == IsViewable) >++ { >++ XGetGeometry(display, children[wx], &dummy, >++ &winX, &winY, >++ &winWidth, &winHeight, >++ &borderWidth, &depth); >++ >++ if (errorVal) >++ continue; >++ >++ rect.x = (short) winX; >++ rect.y = (short) winY; >++ >++ rect.width = (unsigned short) (winWidth + (borderWidth * 2)); >++ rect.height = (unsigned short) (winHeight + (borderWidth * 2)); >++ >++ XUnionRectWithRegion(&rect, covered, covered); >++ } >+ } >++ >+ XFree(children); >+ >+ #if GRAB_SERVER >+ XUngrabServer(display); >+ #else >+- XSetErrorHandler((ErrorHandler *)NULL); >++ XSetErrorHandler((ErrorHandler *) NULL); >+ #endif >+- >++ >+ /* >+ Subtract the covered region from the root window region. >+ */ >+ visible = XCreateRegion(); >++ >+ rect.x = 0; >+ rect.y = 0; >+- rect.width = display_width; >+- rect.height = display_height; >++ >++ rect.width = (unsigned short) display_width; >++ rect.height = (unsigned short) display_height; >++ >+ XUnionRectWithRegion(&rect, visible, visible); >+ XSubtractRegion(visible, covered, visible); >+ XDestroyRegion(covered); >+- >++ >+ /* >+ Save visible region globally. >+ */ >+ if (rootVisible) >+- XDestroyRegion(rootVisible); >++ XDestroyRegion(rootVisible); >++ >+ rootVisible = visible; >+- >+- >++ >+ /* >+ Mark all roaches visible. >+ */ >+- for (wx=0; wx<curRoaches; wx++) >+- roaches[wx].hidden = 0; >++ for (int wx = 0; wx < curRoaches; wx++) >++ roaches[wx].hidden = 0; >+ >+ return 0; >+ } >+@@ -693,91 +783,92 @@ >+ /* >+ Mark hidden roaches. >+ */ >+-int >+-MarkHiddenRoaches() >++int MarkHiddenRoaches() >+ { >+- int rx; >+- Roach *r; >+ int nVisible; >+- >++ Roach *r; >++ >+ nVisible = 0; >+- for (rx=0; rx<curRoaches; rx++) { >+- r = &roaches[rx]; >+- >+- if (!r->hidden) { >+- if (r->intX > 0 && XRectInRegion(rootVisible, r->intX, r->intY, >+- r->rp->width, r->rp->height) == RectangleOut) { >+- r->hidden = 1; >+- } >+- else { >+- nVisible++; >+- } >+- } >++ >++ for (int rx = 0; rx < curRoaches; rx++) >++ { >++ r = &roaches[rx]; >++ >++ if (!r->hidden) >++ { >++ if (r->intX > 0 && XRectInRegion(rootVisible, >++ r->intX, >++ r->intY, >++ (unsigned int) r->rp->width, >++ (unsigned int) r->rp->height) == RectangleOut) >++ r->hidden = 1; >++ else >++ nVisible++; >++ } >+ } >+- >++ >+ return nVisible; >+ } >+ >+ /* >+ Allocate a color by name. >+ */ >+-Pixel >+-AllocNamedColor(colorName, dfltPix) >+-char *colorName; >+-Pixel dfltPix; >++Pixel AllocNamedColor(char *colorName, Pixel dfltPix) >+ { >+- Pixel pix; >+- XColor scrncolor; >+- XColor exactcolor; >+- >+- if (XAllocNamedColor(display, DefaultColormap(display, screen), >+- colorName, &scrncolor, &exactcolor)) { >+- pix = scrncolor.pixel; >+- } >+- else { >+- pix = dfltPix; >+- } >++ Pixel pix; >++ XColor exactcolor; >++ XColor scrncolor; >++ >++ if (XAllocNamedColor(display, >++ DefaultColormap(display, screen), >++ colorName, >++ &scrncolor, >++ &exactcolor)) >++ pix = scrncolor.pixel; >++ else >++ pix = dfltPix; >+ >+- return pix; >++ return pix; >+ } >+ >+ /* >+- * squishCheck - Check to see if we have to squish any roaches. >++ * Check to see if we have to squish any roaches. >+ */ >+-checkSquish(buttonEvent) >+-XButtonEvent *buttonEvent; >++void checkSquish(XButtonEvent *buttonEvent) >+ { >+- int x, y; >+- int i; >+- int rx; >++ int x; >++ int y; >+ Roach *r; >+-/* */ >++ >+ x = buttonEvent->x; >+ y = buttonEvent->y; >+ >+- for (rx=0; rx<curRoaches; rx++) { >+- r = &roaches[rx]; >+- if (r->rp == NULL) continue; >+- >+- if (x > r->intX && >+- x < (r->intX + r->rp->width) && >+- y > r->intY && >+- y < (r->intY + r->rp->height)) { >+- XSetStipple(display, gutsGC, squishMap); >+- XSetTSOrigin(display, gutsGC, r->intX, r->intY); >+- XFillRectangle(display, rootWin, gutsGC, >+- r->intX, r->intY, squish_width, squish_height); >+- >+- /* >+- * Delete the roach >+- */ >+- for (i = rx; i < curRoaches - 1; i++) >+- roaches[i] = roaches[i + 1]; >+- >+- curRoaches--; >+- rx--; >+- } >++ for (int rx = 0; rx < curRoaches; rx++) >++ { >++ r = &roaches[rx]; >++ >++ if (r->rp == NULL) >++ continue; >++ >++ if (x > r->intX && x < (r->intX + r->rp->width) && y > r->intY && y < (r->intY + r->rp->height)) >++ { >++ XSetStipple(display, gutsGC, squishMap); >++ XSetTSOrigin(display, gutsGC, r->intX, r->intY); >++ XFillRectangle(display, >++ rootWin, >++ gutsGC, >++ r->intX, >++ r->intY, >++ squish_width, >++ squish_height); >++ /* >++ * Delete the roach >++ */ >++ for (int i = rx; i < curRoaches - 1; i++) >++ roaches[i] = roaches[i + 1]; >++ >++ curRoaches--; >++ rx--; >++ } >+ } >+- >+- return; >+-} >++} >+\ No newline at end of file
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=190595">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 225867
:
190583
|
190584
|
190586
|
190594
| 190595