luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GeoDisjoint() unify return type of callback to bool 

GeoDisjoint() handles this as 'bool' type internally so make all
consumer call-sites consistent with this type.
This commit is contained in:
Darryl L. Miles 2024-10-12 13:58:41 +01:00 committed by Tim Edwards
parent fd6c30a380
commit a224c7e21a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
windows/windDisp.c
View File

@ -273,7 +273,7 @@ WindAreaChanged(w, area)
*/ */
{ {
Rect biggerArea; Rect biggerArea;
int windChangedFunc(); /* Forward declaration. */ bool windChangedFunc(); /* Forward declaration. */
if (w == NULL) { if (w == NULL) {
if (windSomeSeparateRedisplay) { if (windSomeSeparateRedisplay) {
@ -345,7 +345,7 @@ WindAreaChanged(w, area)
} }
} }
int bool
windChangedFunc(area, next) windChangedFunc(area, next)
Rect *area; /* Area that is still unobscured. */ Rect *area; /* Area that is still unobscured. */
LinkedRect *next; /* Next obscuring area. */ LinkedRect *next; /* Next obscuring area. */
@ -360,7 +360,7 @@ windChangedFunc(area, next)
DBStdPaintTbl(TT_ERROR_P, PL_DRC_ERROR), (PaintUndoInfo *) NULL); DBStdPaintTbl(TT_ERROR_P, PL_DRC_ERROR), (PaintUndoInfo *) NULL);
else (void) GeoDisjoint(area, &next->r_r, windChangedFunc, else (void) GeoDisjoint(area, &next->r_r, windChangedFunc,
(ClientData) next->r_next); (ClientData) next->r_next);
return 0; return FALSE;
} }

8
windows/windMove.c
View File

@ -556,7 +556,7 @@ WindOver(w)
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
int bool
windFindUnobscured(area, okArea) windFindUnobscured(area, okArea)
Rect *area; /* Area that may be obscured. */ Rect *area; /* Area that may be obscured. */
Rect *okArea; /* Modified to contain one of the Rect *okArea; /* Modified to contain one of the
@ -609,7 +609,7 @@ WindReframe(w, r, inside, move)
* not have to be redisplayed. * not have to be redisplayed.
*/ */
int xmove, ymove; /* Distance window is moving. */ int xmove, ymove; /* Distance window is moving. */
extern int windReframeFunc(); /* Forward declaration. */ extern bool windReframeFunc(); /* Forward declaration. */
clientRec *cr; clientRec *cr;
cr = (clientRec *) w->w_client; cr = (clientRec *) w->w_client;
@ -720,14 +720,14 @@ WindReframe(w, r, inside, move)
(*(cr->w_reposition))(w, &newFrameArea, TRUE); (*(cr->w_reposition))(w, &newFrameArea, TRUE);
} }
int bool
windReframeFunc(area, w) windReframeFunc(area, w)
Rect *area; /* Area to redisplay. */ Rect *area; /* Area to redisplay. */
MagWindow *w; /* Window in which to redisplay. */ MagWindow *w; /* Window in which to redisplay. */
{ {
WindAreaChanged(w, area); WindAreaChanged(w, area);
return 0; return FALSE;
} }
/* /*