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

Added an option to "findlabel", a 3rd argument which is the 

occurrence of the label to place the box on.  This can be used with
"findlabel -glob <name>" to get a list of labels and determine the
length of the list, and then iterate through each occurrance of the
label in the edit cell.
This commit is contained in:
Tim Edwards 2020-11-20 10:10:32 -05:00
parent 960be0e9b0
commit 0608784a18
2 changed files with 67 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.85
8.3.86

88
commands/CmdFI.c
View File

@ -726,6 +726,45 @@ usage:
TxError("Usage: findbox [zoom]\n");
}
/*
* ----------------------------------------------------------------------------
*
* cmdFindLabelFunc --
*
* Callback function from CmdFindLabel. Return 1 to stop the search on the
* Nth instance of the label named "label", where N is passed through the
* client data as lsr_occur.
*
* The client data record lsr_rect is left pointing to the label location
* when the Nth label instance is found.
*
* ----------------------------------------------------------------------------
*/
typedef struct _labsearchrec
{
Rect lsr_rect;
int lsr_occur;
} LabSearchRec;
int cmdFindLabelFunc(rect, name, label, cdarg)
Rect *rect;
char *name;
Label *label;
LabSearchRec *cdarg;
{
if (cdarg->lsr_occur == 0)
{
cdarg->lsr_rect = *rect;
return 1;
}
else
cdarg->lsr_occur--;
return 0;
}
/*
* ----------------------------------------------------------------------------
*
@ -747,16 +786,6 @@ usage:
* ----------------------------------------------------------------------------
*/
int cmdFindLabelFunc(rect, name, label, cdarg)
Rect *rect;
char *name;
Label *label;
Rect *cdarg;
{
*cdarg = *rect;
return 1;
}
void
CmdFindLabel(w, cmd)
MagWindow *w;
@ -764,17 +793,30 @@ CmdFindLabel(w, cmd)
{
CellDef *boxDef;
CellUse *labUse;
Rect box, cmdFindLabelRect;
Rect box;
char *labname;
int found;
int found, occur, plainargs;
bool doglob = FALSE; /* csh-style glob matching (see utils/match.c) */
LabSearchRec lsr;
int dbListLabels(); /* forward declaration */
if ((cmd->tx_argc == 3) && !strncmp(cmd->tx_argv[1], "-glob", 5))
plainargs = cmd->tx_argc;
if ((plainargs > 2) && !strncmp(cmd->tx_argv[1], "-glob", 5))
{
plainargs--;
doglob = TRUE;
else if (cmd->tx_argc != 2)
}
if ((plainargs != 2) && (plainargs != 3))
goto usage;
occur = 0;
if (plainargs == 3)
{
char *occurstr = cmd->tx_argv[plainargs - 1];
if (StrIsInt(occurstr))
occur = atoi(occurstr);
}
if (w == NULL)
{
TxError("Point to a window first.\n");
@ -794,7 +836,7 @@ CmdFindLabel(w, cmd)
return;
};
labname = (cmd->tx_argc == 3) ? cmd->tx_argv[2] : cmd->tx_argv[1];
labname = cmd->tx_argv[1 + (doglob) ? 1 : 0];
labUse = EditCellUse;
if (labUse == NULL) labUse = (CellUse *)w->w_surfaceID;
@ -815,15 +857,17 @@ CmdFindLabel(w, cmd)
{
/* Exact-match label search (corrected by Nishit, 10/14/04) */
lsr.lsr_occur = occur;
found = DBSrLabelLoc(labUse, labname, cmdFindLabelFunc,
(ClientData) &cmdFindLabelRect);
(ClientData) &lsr);
if (found) {
if (cmdFindLabelRect.r_xbot == cmdFindLabelRect.r_xtop)
cmdFindLabelRect.r_xtop++;
if (cmdFindLabelRect.r_ybot == cmdFindLabelRect.r_ytop)
cmdFindLabelRect.r_ytop++;
ToolMoveBox(TOOL_BL,&cmdFindLabelRect.r_ll,FALSE,labUse->cu_def);
ToolMoveCorner(TOOL_TR,&cmdFindLabelRect.r_ur,FALSE,labUse->cu_def);
if (lsr.lsr_rect.r_xbot == lsr.lsr_rect.r_xtop)
lsr.lsr_rect.r_xtop++;
if (lsr.lsr_rect.r_ybot == lsr.lsr_rect.r_ytop)
lsr.lsr_rect.r_ytop++;
ToolMoveBox(TOOL_BL, &lsr.lsr_rect.r_ll, FALSE, labUse->cu_def);
ToolMoveCorner(TOOL_TR, &lsr.lsr_rect.r_ur, FALSE, labUse->cu_def);
} else {
TxError("Couldn't find label %s\n", labname);
}