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

I broke the CI again for the "wasm" build by adding a Tk routine 

to the code (Tk_RestrictEvents()) without an "#ifndef MAGIC_NO_TK"
around it.  This commit fixes that error.
This commit is contained in:
R. Timothy Edwards 2026-06-24 09:20:06 -04:00
parent 3b272cc8d2
commit 338b3899bf
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.666
8.3.667

4
cif/CIFhier.c
View File

@ -722,6 +722,7 @@ CIFGenSubcells(
bool longTime = FALSE;
#ifdef MAGIC_WRAPPER
#ifndef MAGIC_NO_TK
/* This routine may be long-running and events to refresh the
* console will be periodically run to allow the progress status
* to be displayed. Force a restriction on event processing to
@ -733,6 +734,7 @@ CIFGenSubcells(
if (SigInterruptOnSigIO != -1) /* Check for batch mode */
oldProc = Tk_RestrictEvents(RestrictInputProc, (ClientData)NULL, &oldArg);
#endif /* MAGIC_NO_TK */
#endif /* MAGIC_WRAPPER */
UndoDisable();
@ -884,9 +886,11 @@ CIFGenSubcells(
if (longTime) TxPrintf("Completed 100%%\n");
#ifdef MAGIC_WRAPPER
#ifndef MAGIC_NO_TK
/* Restore full event access */
if (SigInterruptOnSigIO != -1) /* Check for batch mode */
Tk_RestrictEvents(oldProc, oldArg, &oldArg);
#endif /* MAGIC_NO_TK */
#endif /* MAGIC_WRAPPER */
UndoEnable();

4
extract/ExtSubtree.c
View File

@ -180,6 +180,7 @@ extSubtree(parentUse, reg, f)
bool longTime = FALSE;
#ifdef MAGIC_WRAPPER
#ifndef MAGIC_NO_TK
/* This routine may be long-running and events to refresh the
* console will be periodically run to allow the progress status
* to be displayed. Force a restriction on event processing to
@ -191,6 +192,7 @@ extSubtree(parentUse, reg, f)
if (SigInterruptOnSigIO != -1) /* Check for batch mode */
oldProc = Tk_RestrictEvents(RestrictInputProc, (ClientData)NULL, &oldArg);
#endif /* MAGIC_NO_TK */
#endif /* MAGIC_WRAPPER */
/* Use the display timer to force a 5-second progress check */
@ -385,9 +387,11 @@ done:
}
#ifdef MAGIC_WRAPPER
#ifndef MAGIC_NO_TK
/* Restore full event access */
if (SigInterruptOnSigIO != -1) /* Check for batch mode */
Tk_RestrictEvents(oldProc, oldArg, &oldArg);
#endif /* MAGIC_NO_TK */
#endif /* MAGIC_WRAPPER */
}

6
lef/defRead.c
View File

@ -2500,8 +2500,10 @@ DefRead(
};
#ifdef MAGIC_WRAPPER
#ifndef MAGIC_NO_TK
Tk_RestrictProc *oldProc;
ClientData oldArg;
#endif /* MAGIC_NO_TK */
#endif /* MAGIC_WRAPPER */
/* "annotate" implies "dolabels" whether set or not */
@ -2526,6 +2528,7 @@ DefRead(
}
#ifdef MAGIC_WRAPPER
#ifndef MAGIC_NO_TK
/* This routine may be long-running and events to refresh the
* console will be periodically run to allow the progress status
* to be displayed. Force a restriction on event processing to
@ -2535,6 +2538,7 @@ DefRead(
if (SigInterruptOnSigIO != -1) /* Check for batch mode */
oldProc = Tk_RestrictEvents(RestrictInputProc, (ClientData)NULL, &oldArg);
#endif /* MAGIC_NO_TK */
#endif /* MAGIC_WRAPPER */
/* Initialize */
@ -2759,9 +2763,11 @@ DefRead(
UndoEnable();
#ifdef MAGIC_WRAPPER
#ifndef MAGIC_NO_TK
/* Restore full event access */
if (SigInterruptOnSigIO != -1) /* Check for batch mode */
Tk_RestrictEvents(oldProc, oldArg, &oldArg);
#endif /* MAGIC_NO_TK */
#endif /* MAGIC_WRAPPER */
return rootDef;

3
tcltk/tclmagic.h
View File

@ -34,8 +34,9 @@ extern const char *Tclmagic_InitStubsVersion;
extern void TclmagicRegisterCommands(Tcl_Interp *interp);
#ifndef MAGIC_NO_TK
extern Tk_RestrictAction RestrictInputProc(ClientData, XEvent *);
#endif
#endif /* MAGIC_WRAPPER */
#endif /* _MAGIC__TCLTK__TCLMAGIC_H */