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

Corrected a few errors from the previous commit (support for 

logging commands without any pointer or screen coordinate
references).
This commit is contained in:
Tim Edwards 2023-07-08 21:58:12 -04:00
parent 7a4a867d6e
commit c3ec56725b
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
commands/CmdCD.c
View File

@ -3863,6 +3863,13 @@ CmdDown(w, cmd)
(void) WindSearch(DBWclientID, (ClientData) NULL, (void) WindSearch(DBWclientID, (ClientData) NULL,
(Rect *) NULL, cmdEditRedisplayFunc, (ClientData) &area); (Rect *) NULL, cmdEditRedisplayFunc, (ClientData) &area);
DBWloadWindow(w, EditCellUse->cu_def->cd_name, DBW_LOAD_IGNORE_TECH); DBWloadWindow(w, EditCellUse->cu_def->cd_name, DBW_LOAD_IGNORE_TECH);
if ((cmd->tx_argc == 1) && cmdFoundNewDown)
{
/* Recast the command with the instance name for logging */
sprintf(cmd->tx_argstring, "down %s", EditCellUse->cu_id);
TxRebuildCommand(cmd);
}
} }
/* Search function to find the new edit cell: look for a cell use /* Search function to find the new edit cell: look for a cell use

8
commands/CmdE.c
View File

@ -179,6 +179,14 @@ CmdEdit(w, cmd)
GeoTransRect(&EditToRootTransform, &(EditCellUse->cu_def->cd_bbox), &area); GeoTransRect(&EditToRootTransform, &(EditCellUse->cu_def->cd_bbox), &area);
(void) WindSearch(DBWclientID, (ClientData) NULL, (void) WindSearch(DBWclientID, (ClientData) NULL,
(Rect *) NULL, cmdEditRedisplayFunc, (ClientData) &area); (Rect *) NULL, cmdEditRedisplayFunc, (ClientData) &area);
if ((cmd->tx_argc == 1) && cmdFoundNewEdit)
{
/* Recast the command with the instance name for logging */
sprintf(cmd->tx_argstring, "edit %s", EditCellUse->cu_id);
TxRebuildCommand(cmd);
}
} }
/* Search function to handle redisplays for CmdEdit: it checks to /* Search function to handle redisplays for CmdEdit: it checks to

15
commands/CmdRS.c
View File

@ -1551,7 +1551,9 @@ Okay:
return; return;
} }
if (cmd->tx_argc > 3) goto usageError; if (cmd->tx_argc > 3)
if (strcmp(cmd->tx_argv[cmd->tx_argc - 3], "at"))
goto usageError;
/* If an explicit cell use id is provided, look for that cell /* If an explicit cell use id is provided, look for that cell
* and select it. In this case, defeat all of the "multiple * and select it. In this case, defeat all of the "multiple
@ -3215,6 +3217,17 @@ CmdStretch(w, cmd)
GeoTransTranslate(xdelta, ydelta, &GeoIdentityTransform, &t); GeoTransTranslate(xdelta, ydelta, &GeoIdentityTransform, &t);
GeoTransRect(&t, &rootBox, &newBox); GeoTransRect(&t, &rootBox, &newBox);
DBWSetBox(rootDef, &newBox); DBWSetBox(rootDef, &newBox);
/* Recast the command in the usual 3-argument form for logging */
if (ydelta > 0)
sprintf(cmd->tx_argstring, "stretch n %di", ydelta);
else if (ydelta < 0)
sprintf(cmd->tx_argstring, "stretch s %di", -ydelta);
else if (xdelta > 0)
sprintf(cmd->tx_argstring, "stretch e %di", xdelta);
else
sprintf(cmd->tx_argstring, "stretch w %di", -xdelta);
TxRebuildCommand(cmd);
} }
SelectStretch(xdelta, ydelta); SelectStretch(xdelta, ydelta);