TempleOS V5.03 Nightly (ISO SHA-1 aed1efc)
This commit is contained in:
1 parent
bbd014d8e9
commit
da84afbaf7
123 files changed
+3404
-3358
No files matched your search
Binary file not shown.
@@ -226,7 +226,7 @@ U0 TouchFile(U8 *filename,U8 *attr,CDate cdt=I64_MIN)
|
||||
DirNew(dv,cur_dir,&de,FALSE);
|
||||
}
|
||||
} else
|
||||
PrintErr("File not found.\n");
|
||||
PrintErr("File not found: \"%s\".\n",filename);
|
||||
Free(cur_dir);
|
||||
}
|
||||
public U0 Touch(U8 *files_find_mask="*",U8 *attr="+?",
|
||||
|
||||
+13
-31
@@ -141,6 +141,9 @@ CDirEntry *FMRebuildDocDrv(U8 drv_let,CDoc *doc,CDirEntry **_head,Bool init)
|
||||
return tmpde;
|
||||
}
|
||||
|
||||
#define DEF2_PROCESSED 1
|
||||
#define DEF2_NOT_INITIALIZED 2
|
||||
|
||||
U0 FMRebuildDoc(CDoc **_doc,CDirEntry **_head,I64 mode)
|
||||
{
|
||||
CDrv *dv;
|
||||
@@ -222,7 +225,7 @@ U0 FMRebuildDoc(CDoc **_doc,CDirEntry **_head,I64 mode)
|
||||
tmpde=FMRebuildDocDrv(Drv2Let(dv),doc,_head,TRUE);
|
||||
else {
|
||||
tmpde=FMRebuildDocDrv(Drv2Let(dv),doc,_head,FALSE);
|
||||
tmpde->flags|=DEF_NOT_INITIALIZED;
|
||||
tmpde->user_data2|=DEF2_NOT_INITIALIZED;
|
||||
}
|
||||
} else if (dv->fs_type==FSt_REDSEA || dv->fs_type==FSt_FAT32)
|
||||
FMRebuildDocDrv(Drv2Let(dv),doc,_head,TRUE);
|
||||
@@ -388,11 +391,10 @@ U0 FMFmtDrv(CDoc *doc)
|
||||
Free(st);
|
||||
}
|
||||
|
||||
U0 FMMakeISO(CDoc *doc,I64 type)
|
||||
U0 FMMakeISO(CDoc *doc)
|
||||
{
|
||||
CDocEntry *doc_ce=doc->cur_entry;
|
||||
CDirEntry *tmpde;
|
||||
U8 *st;
|
||||
if (doc_ce->type_u8==DOCT_TREE || doc_ce->type_u8==DOCT_MENU_VAL)
|
||||
tmpde=doc_ce->user_data;
|
||||
else
|
||||
@@ -402,19 +404,7 @@ U0 FMMakeISO(CDoc *doc,I64 type)
|
||||
tmpde=tmpde->parent;
|
||||
if (tmpde && *tmpde->full_name) {
|
||||
Silent;
|
||||
switch (type) {
|
||||
case FSt_REDSEA:
|
||||
RedSeaISO(,tmpde->full_name);
|
||||
break;
|
||||
case FSt_ISO9660:
|
||||
if (tmpde->full_name[StrLen(tmpde->full_name)-1]=='/')
|
||||
st=MStrPrint("%s*",tmpde->full_name);
|
||||
else
|
||||
st=MStrPrint("%s/*",tmpde->full_name);
|
||||
ISO9660ISO(,st);
|
||||
Free(st);
|
||||
break;
|
||||
}
|
||||
Silent(OFF);
|
||||
}
|
||||
}
|
||||
@@ -455,18 +445,18 @@ U0 FMCopy(CDoc *doc)
|
||||
while (doc_e!=doc2) {
|
||||
if (doc_e->type_u8==DOCT_MENU_VAL) {
|
||||
tmpde=doc_e->user_data;
|
||||
tmpde->flags|=DEF_PROCESSED;
|
||||
tmpde->user_data2|=DEF2_PROCESSED;
|
||||
tmpde2=tmpde->parent;
|
||||
if (!tmpde2 || !(tmpde2->flags&DEF_PROCESSED)) {
|
||||
if (!tmpde2 || !(tmpde2->user_data2&DEF2_PROCESSED)) {
|
||||
Silent;
|
||||
Copy(tmpde->full_name,tmpde1->full_name);
|
||||
Silent(OFF);
|
||||
}
|
||||
} else if (doc_e->type_u8==DOCT_TREE) {
|
||||
tmpde=doc_e->user_data;
|
||||
tmpde->flags|=DEF_PROCESSED;
|
||||
tmpde->user_data2|=DEF2_PROCESSED;
|
||||
tmpde2=tmpde->parent;
|
||||
if (!tmpde2 || !(tmpde2->flags&DEF_PROCESSED)) {
|
||||
if (!tmpde2 || !(tmpde2->user_data2&DEF2_PROCESSED)) {
|
||||
Silent;
|
||||
if (*tmpde1->name)
|
||||
st=MStrPrint("%s/%s",tmpde1->full_name,tmpde->name);
|
||||
@@ -496,9 +486,8 @@ U0 FMCopy(CDoc *doc)
|
||||
#define FMR_MOUNT_REDSEA_ISO_C 9
|
||||
#define FMR_UNMOUNT 10
|
||||
#define FMR_MAKE_REDSEA_ISO_C 11
|
||||
#define FMR_MAKE_ISO9660 12
|
||||
#define FMR_BURN_ISO 13
|
||||
#define FMR_HELP 14
|
||||
#define FMR_BURN_ISO 12
|
||||
#define FMR_HELP 13
|
||||
|
||||
I64 PopUpFMRight(U8 *header=NULL,U8 *footer=NULL)
|
||||
{
|
||||
@@ -518,8 +507,7 @@ I64 PopUpFMRight(U8 *header=NULL,U8 *footer=NULL)
|
||||
"LE=FMR_MOUNT_REDSEA_ISO_C$$"
|
||||
"$$CM+LX,29,0$$$$BT,\"UNMOUNT \",LE=FMR_UNMOUNT$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"MAKE ISO.C (CD/DVD) FILE\",LE=FMR_MAKE_REDSEA_ISO_C$$"
|
||||
"$$CM+LX,29,0$$$$BT,\"MAKE ISO (CD/DVD) FILE \",LE=FMR_MAKE_ISO9660$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"BURN ISO (CD/DVD) FILE \",LE=FMR_BURN_ISO$$"
|
||||
"$$CM+LX,29,0$$$$BT,\"BURN ISO (CD/DVD) FILE \",LE=FMR_BURN_ISO$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"HELP \",LE=FMR_HELP$$"
|
||||
"$$CM+LX,29,0$$$$BT,\"CANCEL \",LE=DOCM_CANCEL$$\n");
|
||||
if (footer) DocPrint(doc,"%s",footer);
|
||||
@@ -567,9 +555,6 @@ U0 FMRightClick()
|
||||
case FMR_MAKE_REDSEA_ISO_C:
|
||||
Msg(MSG_KEY_DOWN,'m',0);
|
||||
break;
|
||||
case FMR_MAKE_ISO9660:
|
||||
Msg(MSG_KEY_DOWN,'M',0);
|
||||
break;
|
||||
case FMR_BURN_ISO:
|
||||
Msg(MSG_KEY_DOWN,'B',0);
|
||||
break;
|
||||
@@ -724,11 +709,8 @@ public U8 *FileMgr(I64 mode=FM_NORMAL,CTask *mem_task=NULL)
|
||||
case 'u':
|
||||
FMUnmount(doc);
|
||||
break;
|
||||
case 'M':
|
||||
FMMakeISO(doc,FSt_ISO9660);
|
||||
break;
|
||||
case 'm':
|
||||
FMMakeISO(doc,FSt_REDSEA);
|
||||
FMMakeISO(doc);
|
||||
break;
|
||||
case 'B':
|
||||
FMBurnISO(doc);
|
||||
|
||||
+3
-7
@@ -8,19 +8,15 @@ U0 LoadDocDefines()
|
||||
DefinePrint("DD_TEMPLEOS_AGE","%0.1f",
|
||||
(Now-Str2Date("8/1/2003"))/ToF64(1<<32)/CDATE_YEAR_DAYS);
|
||||
|
||||
//This is cut and replaced when I generate a distro.
|
||||
//See $LK,"DD_TEMPLEOS_LOC",A="FF:::/Demo/AcctExample/TOS/TOSDistro.HC,DD_TEMPLEOS_LOC"$.
|
||||
|
||||
DefinePrint("DD_KERNEL","%08X",bfh);
|
||||
bfh(I64)+=bfh->file_size-1;
|
||||
DefinePrint("DD_KERNEL_END","%08X",bfh);
|
||||
|
||||
//$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/Adam/Opt/Boot/BootDVD.HC,DD_BOOT_HIGH_LOC_DVD"$
|
||||
|
||||
$TR-C,"LineRep"$
|
||||
$ID,4$DefinePrint("DD_TEMPLEOS_LOC","120,860");
|
||||
DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","82,136");
|
||||
$ID,-4$
|
||||
$TR,"LineRep"$
|
||||
$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,800");
|
||||
$ID,-2$
|
||||
DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR);
|
||||
DefinePrint("DD_MP_VECT_END","%08X",
|
||||
MP_VECT_ADDR+COREAP_16BIT_INIT_END-COREAP_16BIT_INIT-1);
|
||||
|
||||
@@ -5,13 +5,10 @@ extern U0 ACFillIn(I64 n);
|
||||
extern U0 ACMan(I64 n,CTask *parent_task=NULL);
|
||||
extern I64 AdamFile(U8 *filename,Bool warn_ext=TRUE);
|
||||
extern Bool AutoComplete(Bool val=OFF);
|
||||
extern I64 BMPWrite(U8 *filename,CDC *dc,I64 bits=4);
|
||||
extern U0 ClipDel();
|
||||
extern CCtrl *CtrlFindUnique(CTask *haystack_task,I64 needle_type);
|
||||
extern Bool CtrlInside(CCtrl *c,I64 x,I64 y);
|
||||
extern U8 *DC2Sprite(CDC *tmpb);
|
||||
extern U0 DocBMP(CDoc *doc=NULL,U8 *filename,
|
||||
Bool dither_probability=FALSE,Bool use_ms_paint_palette=FALSE);
|
||||
extern U0 DocBinDel(CDoc *doc,CDocBin *b);
|
||||
extern U0 DocBinsValidate(CDoc *doc);
|
||||
extern U0 DocBottom(CDoc *doc=NULL);
|
||||
@@ -51,8 +48,6 @@ extern I64 ExeDoc(CDoc *doc,I64 ccf_flags=0);
|
||||
extern I64 FindWiz();
|
||||
extern I64 GetI64(U8 *msg=NULL,I64 dft=0,I64 lo=I64_MIN,I64 hi=I64_MAX);
|
||||
extern Bool GrPlot0(CDC *dc,I64 x,I64 y);
|
||||
extern I64 ISO9660ISO(U8 *_filename=NULL,U8 *src_files_find_mask,
|
||||
U8 *fu_flags=NULL,U8 *_stage2_filename=NULL);
|
||||
extern CMenuEntry *MenuEntryFind(CMenu *haystack_menu,U8 *needle_full_name);
|
||||
extern CMenu *MenuFilePush(U8 *filename);
|
||||
extern U0 MenuPop();
|
||||
|
||||
+7
-4
@@ -272,14 +272,17 @@ per second. It defaults to
|
||||
}
|
||||
ona=Note2Ona(note,octave);
|
||||
} else
|
||||
ona=0;
|
||||
ona=ONA_REST;
|
||||
if (words && (word=LstSub(i++,words)) && StrCmp(word," "))
|
||||
"%s",word;
|
||||
|
||||
d=JIFFY_FREQ*music.note_len/music.tempo;
|
||||
if (tie) {
|
||||
on_jiffies =d;
|
||||
off_jiffies =0;
|
||||
} else {
|
||||
on_jiffies =d*music.stacatto_factor;
|
||||
off_jiffies =d*(1.0-music.stacatto_factor);
|
||||
|
||||
}
|
||||
timeout_val+=on_jiffies;
|
||||
timeout_val2=timeout_val+off_jiffies;
|
||||
|
||||
@@ -288,7 +291,7 @@ per second. It defaults to
|
||||
SleepUntil(timeout_val);
|
||||
music.tM_correction+=on_jiffies-ToI64(on_jiffies);
|
||||
|
||||
if (!music.mute && !tie)
|
||||
if (!music.mute)
|
||||
Snd;
|
||||
SleepUntil(timeout_val2);
|
||||
music.tM_correction+=off_jiffies-ToI64(off_jiffies);
|
||||
|
||||
@@ -258,13 +258,13 @@ U0 ACTask(I64)
|
||||
|
||||
public Bool AutoComplete(Bool val=OFF)
|
||||
{//Turn AutoComplete OFF or ON.
|
||||
Bool old_autocomplete=FALSE;
|
||||
Bool old_val=FALSE;
|
||||
while (Bt(&ac.flags,ACf_INIT_IN_PROGRESS))
|
||||
Sleep(10);
|
||||
if (val) {
|
||||
if (Bt(&sys_run_level,RLf_AUTO_COMPLETE)) {
|
||||
if (TaskValidate(ac.task))
|
||||
old_autocomplete=TRUE;
|
||||
old_val=TRUE;
|
||||
else {
|
||||
ac.task=Spawn(&ACTask,NULL,"AutoComplete");
|
||||
TaskWait(ac.task);
|
||||
@@ -274,10 +274,10 @@ public Bool AutoComplete(Bool val=OFF)
|
||||
} else {
|
||||
if (TaskValidate(ac.task)) {
|
||||
if (Bt(&sys_run_level,RLf_AUTO_COMPLETE))
|
||||
old_autocomplete=TRUE;
|
||||
old_val=TRUE;
|
||||
Kill(ac.task);
|
||||
DeathWait(&ac.task);
|
||||
}
|
||||
}
|
||||
return old_autocomplete;
|
||||
return old_val;
|
||||
}
|
||||
+3
-10
@@ -264,9 +264,9 @@ Bool DocCaptureUndo(CDoc *doc,Bool force=FALSE)
|
||||
doc->undo_cnt++;
|
||||
u->doc_flags=doc->flags;
|
||||
res=TRUE;
|
||||
}
|
||||
if (doc->flags&DOCF_AUTO_SAVE)
|
||||
DocWrite(doc);
|
||||
}
|
||||
if (unlock)
|
||||
DocUnlock(doc);
|
||||
}
|
||||
@@ -296,8 +296,7 @@ U0 DocUndoRestore(CDoc *doc)
|
||||
DocUnlock(doc);
|
||||
}
|
||||
|
||||
#help_index "Graphics/Windows BMP Files;Graphics/GR Files;"\
|
||||
"DolDoc/Output;StdOut/DolDoc"
|
||||
#help_index "Graphics/GR Files;DolDoc/Output;StdOut/DolDoc"
|
||||
public Bool DocType(CDoc *doc=NULL,U8 *filename,I64 trailing_new_lines=1)
|
||||
{//Output txt or graphic file to document.
|
||||
Bool res=FALSE;
|
||||
@@ -311,12 +310,6 @@ public Bool DocType(CDoc *doc=NULL,U8 *filename,I64 trailing_new_lines=1)
|
||||
DocDump(doc2,100000);
|
||||
DocDel(doc2);
|
||||
res=TRUE;
|
||||
} else if (FilesFindMatch(filename,"*.BMP.Z")) {
|
||||
DocBMP(doc,filename,,FALSE);
|
||||
res=TRUE;
|
||||
} else if (FilesFindMatch(filename,"*.BMP;*.bmp")) {
|
||||
DocBMP(doc,filename,,TRUE);
|
||||
res=TRUE;
|
||||
} else if (FilesFindMatch(filename,"*.GR*")) {
|
||||
DocGR(doc,filename);
|
||||
res=TRUE;
|
||||
@@ -326,7 +319,7 @@ public Bool DocType(CDoc *doc=NULL,U8 *filename,I64 trailing_new_lines=1)
|
||||
return res;
|
||||
}
|
||||
|
||||
#help_index "Graphics/Windows BMP Files;Graphics/GR Files;"\
|
||||
#help_index "Graphics/GR Files;"\
|
||||
"File/Cmd Line (Typically);DolDoc/Cmd Line (Typically);"\
|
||||
"StdOut;Cmd Line (Typically)"
|
||||
public Bool Type(U8 *filename,I64 trailing_new_lines=1)
|
||||
|
||||
@@ -572,7 +572,7 @@ Bool sel=TRUE,Bool match_case=TRUE,Bool whole_labels=FALSE)
|
||||
|
||||
class CEdLineGoTo
|
||||
{
|
||||
I64 line fmtstr "$$DA,A=\"Go to Line:%d\"$$";
|
||||
I64 line format "$$DA,A=\"Go to Line:%d\"$$";
|
||||
};
|
||||
|
||||
U0 EdGoToLine(CDoc *doc)
|
||||
|
||||
@@ -208,11 +208,11 @@ U0 DocDataScan(CDoc *doc,CDocEntry *doc_e)
|
||||
#help_index "DolDoc/Input;StdIn/DolDoc"
|
||||
public Bool DocForm(U8 *_d,U8 *class_name=lastclass,
|
||||
I64 dof_flags=0,U8 *header=NULL,U8 *footer=NULL)
|
||||
{//User input. Supply a class name that has fmtstr definitions.
|
||||
{//User input. Supply a class name that has format definitions.
|
||||
//See $LK,"::/Demo/DolDoc/Form.HC"$ and $LK,"::/Demo/LastClass.HC"$.
|
||||
CMemberLst *ml;
|
||||
CDocEntry *doc_e;
|
||||
U8 *fmtstr;
|
||||
U8 *format;
|
||||
CHashClass *tmpc,*tmpc2;
|
||||
CDoc *doc;
|
||||
Bool res=FALSE;
|
||||
@@ -227,8 +227,8 @@ public Bool DocForm(U8 *_d,U8 *class_name=lastclass,
|
||||
doc->flags|=DOCF_SIZE_MIN;
|
||||
ml=tmpc->member_lst_and_root;
|
||||
while (ml) {
|
||||
if ((fmtstr=MemberMetaData("fmtstr",ml)) &&
|
||||
(doc_e=DocPrint(doc,"%s",fmtstr))) {
|
||||
if ((format=MemberMetaData("format",ml)) &&
|
||||
(doc_e=DocPrint(doc,"%s",format))) {
|
||||
tmpc2=ml->member_class;
|
||||
if ((doc_e->type_u8==DOCT_DATA || doc_e->type_u8==DOCT_LST ||
|
||||
doc_e->type_u8==DOCT_CHECK_BOX) && !tmpc2->ptr_stars_cnt) {
|
||||
@@ -254,7 +254,7 @@ public Bool DocForm(U8 *_d,U8 *class_name=lastclass,
|
||||
doc_e->data=*doc_e->user_data(U8 **);
|
||||
} else
|
||||
doc_e->data=_d+ml->offset;
|
||||
doc_e->my_fmt_data=MemberMetaData("fmtdata",ml);
|
||||
doc_e->my_fmt_data=MemberMetaData("data",ml);
|
||||
DocDataFmt(doc,doc_e);
|
||||
}
|
||||
ml=ml->next;
|
||||
|
||||
@@ -53,16 +53,16 @@ public I64 PopUpColorLighting(U8 *header=NULL)
|
||||
|
||||
class CTransformForm
|
||||
{
|
||||
F64 x_scale fmtstr "$$DA-TRM,A=\"X Scale :%12.6f\"$$\n";
|
||||
F64 y_scale fmtstr "$$DA-TRM,A=\"Y Scale :%12.6f\"$$\n";
|
||||
F64 z_scale fmtstr "$$DA-TRM,A=\"Z Scale :%12.6f\"$$\n";
|
||||
F64 é_z fmtstr "\nAngles are in degrees\n"
|
||||
F64 x_scale format "$$DA-TRM,A=\"X Scale :%12.6f\"$$\n";
|
||||
F64 y_scale format "$$DA-TRM,A=\"Y Scale :%12.6f\"$$\n";
|
||||
F64 z_scale format "$$DA-TRM,A=\"Z Scale :%12.6f\"$$\n";
|
||||
F64 é_z format "\nAngles are in degrees\n"
|
||||
"$$DA-TRM,A=\"Z-Axis :%12.6f\"$$\n";
|
||||
F64 é_y fmtstr "$$DA-TRM,A=\"Y-Axis :%12.6f\"$$\n";
|
||||
F64 é_x fmtstr "$$DA-TRM,A=\"X-Axis :%12.6f\"$$\n";
|
||||
F64 x_offset fmtstr "\n$$DA-TRM,A=\"X Offset:%12.6f\"$$\n";
|
||||
F64 y_offset fmtstr "$$DA-TRM,A=\"Y Offset:%12.6f\"$$\n";
|
||||
F64 z_offset fmtstr "$$DA-TRM,A=\"Z Offset:%12.6f\"$$\n";
|
||||
F64 é_y format "$$DA-TRM,A=\"Y-Axis :%12.6f\"$$\n";
|
||||
F64 é_x format "$$DA-TRM,A=\"X-Axis :%12.6f\"$$\n";
|
||||
F64 x_offset format "\n$$DA-TRM,A=\"X Offset:%12.6f\"$$\n";
|
||||
F64 y_offset format "$$DA-TRM,A=\"Y Offset:%12.6f\"$$\n";
|
||||
F64 z_offset format "$$DA-TRM,A=\"Z Offset:%12.6f\"$$\n";
|
||||
};
|
||||
|
||||
#help_index "Graphics/Input;Graphics/Math/3D Transformation"
|
||||
|
||||
+11
-11
@@ -70,17 +70,17 @@ I64 PopUpTermRight(U8 *header)
|
||||
if (header) DocPrint(doc,"%s",header);
|
||||
DocPrint(doc,"\n\n"
|
||||
"TXT=%s\nDD =%s\nJIT=%s\nGR =%s"
|
||||
"$$CM+LX,1,3 $$$$BT,\"INCLUDE JIT\",LE=RIGHT_INCLUDE$$"
|
||||
"$$CM+LX,25,0$$$$BT,\"ADAM_INCLUDE JIT\",LE=RIGHT_AINCLUDE$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"COPY \",LE=RIGHT_COPY$$"
|
||||
"$$CM+LX,25,0$$$$BT,\"MOVE OR RENAME \",LE=RIGHT_MOVE$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"DELETE \",LE=RIGHT_DELETE$$"
|
||||
"$$CM+LX,25,0$$$$BT,\"TYPE TXT;GR\",LE=RIGHT_TYPE$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"DOLDOC EDIT DD\",LE=RIGHT_ED$$"
|
||||
"$$CM+LX,25,0$$$$BT,\"MOUNT ISO.C\",LE=RIGHT_MOUNT$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"PLAIN TEXT EDIT TXT\",LE=RIGHT_PLAIN$$"
|
||||
"$$CM+LX,25,0$$$$BT,\"INFILE IN\",LE=RIGHT_INFILE$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"CANCEL \",LE=DOCM_CANCEL$$\n",
|
||||
"$$CM+LX,1,3 $$$$BT,\"Include JIT\",LE=RIGHT_INCLUDE$$"
|
||||
"$$CM+LX,25,0$$$$BT,\"Adam Include JIT\",LE=RIGHT_AINCLUDE$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"Copy \",LE=RIGHT_COPY$$"
|
||||
"$$CM+LX,25,0$$$$BT,\"Move or Rename \",LE=RIGHT_MOVE$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"Delete \",LE=RIGHT_DELETE$$"
|
||||
"$$CM+LX,25,0$$$$BT,\"Type TXT;GR\",LE=RIGHT_TYPE$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"DolDoc Edit DD\",LE=RIGHT_ED$$"
|
||||
"$$CM+LX,25,0$$$$BT,\"Mount ISO.C\",LE=RIGHT_MOUNT$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"Plain Text Edit TXT\",LE=RIGHT_PLAIN$$"
|
||||
"$$CM+LX,25,0$$$$BT,\"Infile IN\",LE=RIGHT_INFILE$$"
|
||||
"$$CM+LX,1,3 $$$$BT,\"Cancel \",LE=DOCM_CANCEL$$\n",
|
||||
FILEMASK_TXT,FILEMASK_DD,FILEMASK_JIT,FILEMASK_GR);
|
||||
i=PopUpMenu(doc);
|
||||
DocDel(doc);
|
||||
|
||||
+153
-153
@@ -31,132 +31,132 @@ I64 PopUpLinkType(Bool include_anchor)
|
||||
|
||||
class CEdFileLink
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512] fmtstr "$$DA-P,A=\"File :%s\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512] format "$$DA-P,A=\"File :%s\"$$\n";
|
||||
I64 book;
|
||||
U8 aux[512];
|
||||
I64 num;
|
||||
U8 html_link[512] fmtstr "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
quote fmtstr "$$CB,\"Quote\"$$\n",
|
||||
U8 html_link[512] format "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up format "$$CB,\"PopUp\"$$\n",
|
||||
quote format "$$CB,\"Quote\"$$\n",
|
||||
hide;
|
||||
};
|
||||
|
||||
class CEdFileAnchorLink
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512] fmtstr "$$DA-P,A=\"File :%s\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512] format "$$DA-P,A=\"File :%s\"$$\n";
|
||||
I64 book;
|
||||
U8 aux[512] fmtstr "$$DA-P,A=\"Anchor Label :%s\"$$\n";
|
||||
U8 aux[512] format "$$DA-P,A=\"Anchor Label :%s\"$$\n";
|
||||
I64 num;
|
||||
U8 html_link[512] fmtstr "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
quote fmtstr "$$CB,\"Quote\"$$\n",
|
||||
U8 html_link[512] format "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up format "$$CB,\"PopUp\"$$\n",
|
||||
quote format "$$CB,\"Quote\"$$\n",
|
||||
hide;
|
||||
};
|
||||
|
||||
class CEdFileFindLink
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512] fmtstr "$$DA-P,A=\"File :%s\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512] format "$$DA-P,A=\"File :%s\"$$\n";
|
||||
I64 book;
|
||||
U8 aux[512] fmtstr "$$DA-P,A=\"Str :%s\"$$\n";
|
||||
I64 num fmtstr "$$DA-TRM,A=\"Occurrence Num:%04d\"$$\n";
|
||||
U8 html_link[512] fmtstr "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
quote fmtstr "$$CB,\"Quote\"$$\n",
|
||||
U8 aux[512] format "$$DA-P,A=\"Str :%s\"$$\n";
|
||||
I64 num format "$$DA-TRM,A=\"Occurrence Num:%04d\"$$\n";
|
||||
U8 html_link[512] format "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up format "$$CB,\"PopUp\"$$\n",
|
||||
quote format "$$CB,\"Quote\"$$\n",
|
||||
hide;
|
||||
};
|
||||
|
||||
class CEdFileLineLink
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512] fmtstr "$$DA-P,A=\"File :%s\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512] format "$$DA-P,A=\"File :%s\"$$\n";
|
||||
I64 book;
|
||||
U8 aux[512];
|
||||
I64 num fmtstr "$$DA-TRM,A=\"Line Num :%04d\"$$\n";
|
||||
U8 html_link[512] fmtstr "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
quote fmtstr "$$CB,\"Quote\"$$\n",
|
||||
I64 num format "$$DA-TRM,A=\"Line Num :%04d\"$$\n";
|
||||
U8 html_link[512] format "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up format "$$CB,\"PopUp\"$$\n",
|
||||
quote format "$$CB,\"Quote\"$$\n",
|
||||
hide;
|
||||
};
|
||||
|
||||
class CEdManPageLink
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512];
|
||||
I64 book;
|
||||
U8 aux[512] fmtstr "$$DA-P,A=\"Label :%s\"$$\n";
|
||||
U8 aux[512] format "$$DA-P,A=\"Label :%s\"$$\n";
|
||||
I64 num;
|
||||
U8 html_link[512] fmtstr "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
quote fmtstr "$$CB,\"Quote\"$$\n",
|
||||
U8 html_link[512] format "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up format "$$CB,\"PopUp\"$$\n",
|
||||
quote format "$$CB,\"Quote\"$$\n",
|
||||
hide;
|
||||
};
|
||||
|
||||
class CEdAddrLink
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512];
|
||||
I64 book;
|
||||
U8 aux[512] fmtstr "$$DA-P,A=\"Addr Exp :%s\"$$\n";
|
||||
I64 num fmtstr "$$DA-TRM,A=\"Bin Size :%04d\"$$\n";
|
||||
U8 html_link[512] fmtstr "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
quote fmtstr "$$CB,\"Quote\"$$\n",
|
||||
U8 aux[512] format "$$DA-P,A=\"Addr Exp :%s\"$$\n";
|
||||
I64 num format "$$DA-TRM,A=\"Bin Size :%04d\"$$\n";
|
||||
U8 html_link[512] format "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up format "$$CB,\"PopUp\"$$\n",
|
||||
quote format "$$CB,\"Quote\"$$\n",
|
||||
hide;
|
||||
};
|
||||
|
||||
class CEdPlaceAnchor
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512];
|
||||
I64 book;
|
||||
U8 aux[512] fmtstr "$$DA-P,A=\"Anchor Label :%s\"$$\n";
|
||||
U8 aux[512] format "$$DA-P,A=\"Anchor Label :%s\"$$\n";
|
||||
I64 num;
|
||||
U8 html_link[512] fmtstr "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
U8 html_link[512] format "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up,
|
||||
quote fmtstr "$$CB,\"Quote\"$$\n",
|
||||
hide fmtstr "$$CB,\"Hide\"$$\n";
|
||||
quote format "$$CB,\"Quote\"$$\n",
|
||||
hide format "$$CB,\"Hide\"$$\n";
|
||||
};
|
||||
|
||||
class CEdBibleLink
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512];
|
||||
I64 book fmtstr "$$LS,D=\"ST_BIBLE_BOOKS\"$$\n";
|
||||
U8 aux[512] fmtstr "$$DA-P,A=\"Chapter Verse :%s\"$$\n";
|
||||
I64 book format "$$LS,D=\"ST_BIBLE_BOOKS\"$$\n";
|
||||
U8 aux[512] format "$$DA-P,A=\"Chapter Verse :%s\"$$\n";
|
||||
I64 num;
|
||||
|
||||
U8 html_link[512] fmtstr "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
quote fmtstr "$$CB,\"Quote\"$$\n",
|
||||
U8 html_link[512] format "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up format "$$CB,\"PopUp\"$$\n",
|
||||
quote format "$$CB,\"Quote\"$$\n",
|
||||
hide;
|
||||
};
|
||||
|
||||
class CEdDefLink
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512];
|
||||
I64 book;
|
||||
U8 aux[512] fmtstr "$$DA-P,A=\"Word :%s\"$$\n";
|
||||
I64 num fmtstr "$$DA-TRM,A=\"Def Num :%4d\"$$\n";
|
||||
U8 html_link[512] fmtstr "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
quote fmtstr "$$CB,\"Quote\"$$\n",
|
||||
U8 aux[512] format "$$DA-P,A=\"Word :%s\"$$\n";
|
||||
I64 num format "$$DA-TRM,A=\"Def Num :%4d\"$$\n";
|
||||
U8 html_link[512] format "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up format "$$CB,\"PopUp\"$$\n",
|
||||
quote format "$$CB,\"Quote\"$$\n",
|
||||
hide;
|
||||
};
|
||||
|
||||
class CEdProject
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512] fmtstr "$$DA-P,A=\"File :%s\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
file[512] format "$$DA-P,A=\"File :%s\"$$\n";
|
||||
I64 book;
|
||||
U8 aux[512];
|
||||
I64 num;
|
||||
U8 html_link[512] fmtstr "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
quote fmtstr "$$CB,\"Quote\"$$\n",
|
||||
U8 html_link[512] format "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
Bool pop_up format "$$CB,\"PopUp\"$$\n",
|
||||
quote format "$$CB,\"Quote\"$$\n",
|
||||
hide;
|
||||
};
|
||||
|
||||
@@ -434,14 +434,14 @@ U0 EdInsColor()
|
||||
|
||||
class CEdPageSetting1
|
||||
{
|
||||
U8 val[512] fmtstr "$$DA-P,A=\"Setting Val:%s\"$$\n";
|
||||
U8 val[512] format "$$DA-P,A=\"Setting Val:%s\"$$\n";
|
||||
Bool winrel;
|
||||
};
|
||||
|
||||
class CEdPageSetting2
|
||||
{
|
||||
U8 val[512] fmtstr "$$DA-P,A=\"Setting Val:%s\"$$\n";
|
||||
Bool winrel fmtstr "$$CB,\"Win Relative\"$$\n";
|
||||
U8 val[512] format "$$DA-P,A=\"Setting Val:%s\"$$\n";
|
||||
Bool winrel format "$$CB,\"Win Relative\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsPageSetting()
|
||||
@@ -508,21 +508,21 @@ I64 PopUpWidgetType()
|
||||
|
||||
class CEdText
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n";
|
||||
Bool left_x fmtstr "$$CB,\"Left X\"$$\n",
|
||||
center_x fmtstr "$$CB,\"Center X\"$$\n",
|
||||
right_x fmtstr "$$CB,\"Right X\"$$\n",
|
||||
margin_rel fmtstr "$$CB,\"Margin Rel X\"$$\n",
|
||||
blink fmtstr "$$CB,\"Blink\"$$\n",
|
||||
invert fmtstr "$$CB,\"Invert\"$$\n",
|
||||
underline fmtstr "$$CB,\"Underline\"$$\n",
|
||||
tree fmtstr "$$CB,\"Tree\"$$\n",
|
||||
collapsed fmtstr "$$CB,\"Collapsed\"$$\n";
|
||||
U8 scroll_x [512] fmtstr "$$DA-P,A=\"Scroll X Length Expression:%s\"$$\n",
|
||||
shift_x [512] fmtstr "$$DA-P,A=\"X Offset Expression :%s\"$$\n",
|
||||
shift_y [512] fmtstr "$$DA-P,A=\"Y Offset Expression :%s\"$$\n",
|
||||
define_str[512] fmtstr "$$DA-P,A=\"Define Str :%s\"$$\n",
|
||||
html_link[512] fmtstr "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n";
|
||||
Bool left_x format "$$CB,\"Left X\"$$\n",
|
||||
center_x format "$$CB,\"Center X\"$$\n",
|
||||
right_x format "$$CB,\"Right X\"$$\n",
|
||||
margin_rel format "$$CB,\"Margin Rel X\"$$\n",
|
||||
blink format "$$CB,\"Blink\"$$\n",
|
||||
invert format "$$CB,\"Invert\"$$\n",
|
||||
underline format "$$CB,\"Underline\"$$\n",
|
||||
tree format "$$CB,\"Tree\"$$\n",
|
||||
collapsed format "$$CB,\"Collapsed\"$$\n";
|
||||
U8 scroll_x [512] format "$$DA-P,A=\"Scroll X Length Expression:%s\"$$\n",
|
||||
shift_x [512] format "$$DA-P,A=\"X Offset Expression :%s\"$$\n",
|
||||
shift_y [512] format "$$DA-P,A=\"Y Offset Expression :%s\"$$\n",
|
||||
define_str[512] format "$$DA-P,A=\"Define Str :%s\"$$\n",
|
||||
html_link[512] format "$$DA-P,A=\"Html Link :%s\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsText()
|
||||
@@ -566,8 +566,8 @@ U0 EdInsText()
|
||||
|
||||
class CEdSong
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
song[512] fmtstr "$$DA-P,A=\"Song :%s\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
song[512] format "$$DA-P,A=\"Song :%s\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsSong()
|
||||
@@ -580,7 +580,7 @@ U0 EdInsSong()
|
||||
|
||||
class CEdHtmlCode
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Html Code:%s\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Html Code:%s\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsHtml()
|
||||
@@ -593,22 +593,22 @@ U0 EdInsHtml()
|
||||
|
||||
class CEdMacroMenu
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
left_macro[512] fmtstr "$$DA-P,A=\"Left Click Macro :%s\"$$\n",
|
||||
left_exp[512] fmtstr "$$DA-P,A=\"Left Click Expression :%s\"$$\n";
|
||||
Bool popup fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
left_is_in_str fmtstr "$$CB,\"Left is InStr\"$$\n",
|
||||
left_x fmtstr "$$CB,\"Left X \"$$\n",
|
||||
center_x fmtstr "$$CB,\"Center X \"$$\n",
|
||||
right_x fmtstr "$$CB,\"Right X \"$$\n",
|
||||
margin_rel fmtstr "$$CB,\"Margin Rel X\"$$\n",
|
||||
blink fmtstr "$$CB,\"Blink\"$$\n",
|
||||
invert fmtstr "$$CB,\"Invert\"$$\n",
|
||||
underline fmtstr "$$CB,\"Underline\"$$\n",
|
||||
escape fmtstr "$$CB,\"Escape\"$$\n";
|
||||
U8 scroll_x[512] fmtstr "$$DA-P,A=\"Scroll X Length Expression:%s\"$$\n",
|
||||
shift_x[512] fmtstr "$$DA-P,A=\"X Offset Expression :%s\"$$\n",
|
||||
shift_y[512] fmtstr "$$DA-P,A=\"Y Offset Expression :%s\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
left_macro[512] format "$$DA-P,A=\"Left Click Macro :%s\"$$\n",
|
||||
left_exp[512] format "$$DA-P,A=\"Left Click Expression :%s\"$$\n";
|
||||
Bool popup format "$$CB,\"PopUp\"$$\n",
|
||||
left_is_in_str format "$$CB,\"Left is InStr\"$$\n",
|
||||
left_x format "$$CB,\"Left X \"$$\n",
|
||||
center_x format "$$CB,\"Center X \"$$\n",
|
||||
right_x format "$$CB,\"Right X \"$$\n",
|
||||
margin_rel format "$$CB,\"Margin Rel X\"$$\n",
|
||||
blink format "$$CB,\"Blink\"$$\n",
|
||||
invert format "$$CB,\"Invert\"$$\n",
|
||||
underline format "$$CB,\"Underline\"$$\n",
|
||||
escape format "$$CB,\"Escape\"$$\n";
|
||||
U8 scroll_x[512] format "$$DA-P,A=\"Scroll X Length Expression:%s\"$$\n",
|
||||
shift_x[512] format "$$DA-P,A=\"X Offset Expression :%s\"$$\n",
|
||||
shift_y[512] format "$$DA-P,A=\"Y Offset Expression :%s\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsMacroMenu(Bool is_macro)
|
||||
@@ -663,17 +663,17 @@ U0 EdInsMacroMenu(Bool is_macro)
|
||||
|
||||
class CEdBttn
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n";
|
||||
Bool popup fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
left_x fmtstr "$$CB,\"Left X \"$$\n",
|
||||
center_x fmtstr "$$CB,\"Center X \"$$\n",
|
||||
right_x fmtstr "$$CB,\"Right X \"$$\n",
|
||||
margin_rel fmtstr "$$CB,\"Margin Rel X\"$$\n",
|
||||
escape fmtstr "$$CB,\"Escape\"$$\n";
|
||||
U8 left_macro[512] fmtstr "$$DA-P,A=\"Left Click Macro:%s\"$$\n";
|
||||
Bool left_is_in_str fmtstr "$$CB,\"Left is InStr\"$$\n";
|
||||
U8 left_exp[512] fmtstr "$$DA-P,A=\"Left Click Expression:%s\"$$\n";
|
||||
Bool quote fmtstr "$$CB,\"Quote\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n";
|
||||
Bool popup format "$$CB,\"PopUp\"$$\n",
|
||||
left_x format "$$CB,\"Left X \"$$\n",
|
||||
center_x format "$$CB,\"Center X \"$$\n",
|
||||
right_x format "$$CB,\"Right X \"$$\n",
|
||||
margin_rel format "$$CB,\"Margin Rel X\"$$\n",
|
||||
escape format "$$CB,\"Escape\"$$\n";
|
||||
U8 left_macro[512] format "$$DA-P,A=\"Left Click Macro:%s\"$$\n";
|
||||
Bool left_is_in_str format "$$CB,\"Left is InStr\"$$\n";
|
||||
U8 left_exp[512] format "$$DA-P,A=\"Left Click Expression:%s\"$$\n";
|
||||
Bool quote format "$$CB,\"Quote\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsBttn()
|
||||
@@ -723,17 +723,17 @@ U0 EdInsBttn()
|
||||
|
||||
class CEdCursorMovement
|
||||
{
|
||||
U8 left_exp[512] fmtstr "$$DA-P,A=\"X Expression (LE):%s\"$$\n",
|
||||
right_exp[512] fmtstr "$$DA-P,A=\"Y Expression (RE):%s\"$$\n";
|
||||
Bool left_x fmtstr "$$CB,\"Left X \"$$\n",
|
||||
center_x fmtstr "$$CB,\"Center X \"$$\n",
|
||||
right_x fmtstr "$$CB,\"Right X \"$$\n",
|
||||
margin_rel fmtstr "$$CB,\"Margin Rel X\"$$\n",
|
||||
top_y fmtstr "$$CB,\"Top Y \"$$\n",
|
||||
center_y fmtstr "$$CB,\"Center Y \"$$\n",
|
||||
bottom_y fmtstr "$$CB,\"Bottom Y \"$$\n",
|
||||
page_rel fmtstr "$$CB,\"Page Rel Y\"$$\n",
|
||||
quote fmtstr "$$CB,\"Quote\"$$\n";
|
||||
U8 left_exp[512] format "$$DA-P,A=\"X Expression (LE):%s\"$$\n",
|
||||
right_exp[512] format "$$DA-P,A=\"Y Expression (RE):%s\"$$\n";
|
||||
Bool left_x format "$$CB,\"Left X \"$$\n",
|
||||
center_x format "$$CB,\"Center X \"$$\n",
|
||||
right_x format "$$CB,\"Right X \"$$\n",
|
||||
margin_rel format "$$CB,\"Margin Rel X\"$$\n",
|
||||
top_y format "$$CB,\"Top Y \"$$\n",
|
||||
center_y format "$$CB,\"Center Y \"$$\n",
|
||||
bottom_y format "$$CB,\"Bottom Y \"$$\n",
|
||||
page_rel format "$$CB,\"Page Rel Y\"$$\n",
|
||||
quote format "$$CB,\"Quote\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsCursorMovement()
|
||||
@@ -768,22 +768,22 @@ U0 EdInsCursorMovement()
|
||||
|
||||
class CEdDataNum
|
||||
{
|
||||
U8 fmt_str[512] fmtstr "$$DA-P,A=\"Format Str:%s\"$$\n";
|
||||
U8 fmt_str[512] format "$$DA-P,A=\"Format Str:%s\"$$\n";
|
||||
I64 len;
|
||||
Bool term fmtstr "$$CB,\"Form Field Terminator\"$$\n",
|
||||
Bool term format "$$CB,\"Form Field Terminator\"$$\n",
|
||||
remalloc,
|
||||
refresh fmtstr "$$CB,\"Refresh Data\"$$\n",
|
||||
update fmtstr "$$CB,\"Update Data\"$$\n";
|
||||
refresh format "$$CB,\"Refresh Data\"$$\n",
|
||||
update format "$$CB,\"Update Data\"$$\n";
|
||||
};
|
||||
|
||||
class CEdDataStr
|
||||
{
|
||||
U8 fmt_str[512] fmtstr "$$DA-P,A=\"Format Str:%s\"$$\n";
|
||||
I64 len fmtstr "$$DA,A=\"Length:%d\"$$\n";
|
||||
Bool term fmtstr "$$CB,\"Zero Terminator\"$$\n",
|
||||
remalloc fmtstr "$$CB,\"Remalloc for Unlimited Length\"$$\n",
|
||||
refresh fmtstr "$$CB,\"Refresh Data\"$$\n",
|
||||
update fmtstr "$$CB,\"Update Data\"$$\n";
|
||||
U8 fmt_str[512] format "$$DA-P,A=\"Format Str:%s\"$$\n";
|
||||
I64 len format "$$DA,A=\"Length:%d\"$$\n";
|
||||
Bool term format "$$CB,\"Zero Terminator\"$$\n",
|
||||
remalloc format "$$CB,\"Remalloc for Unlimited Length\"$$\n",
|
||||
refresh format "$$CB,\"Refresh Data\"$$\n",
|
||||
update format "$$CB,\"Update Data\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsData()
|
||||
@@ -834,9 +834,9 @@ U0 EdInsData()
|
||||
|
||||
class CEdCheckBox
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n";
|
||||
Bool refresh fmtstr "$$CB,\"Refresh Data\"$$\n";
|
||||
I64 type fmtstr "$$LS,D=\"ST_INT_SIZE_TYPES\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n";
|
||||
Bool refresh format "$$CB,\"Refresh Data\"$$\n";
|
||||
I64 type format "$$LS,D=\"ST_INT_SIZE_TYPES\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsCheckBox()
|
||||
@@ -861,10 +861,10 @@ U0 EdInsCheckBox()
|
||||
|
||||
class CEdLst
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Dft Sel :%s\"$$\n",
|
||||
define_str[512] fmtstr "$$DA-P,A=\"Define Str :%s\"$$\n";
|
||||
Bool refresh fmtstr "$$CB,\"Refresh Data\"$$\n";
|
||||
I64 type fmtstr "$$LS,D=\"ST_INT_SIZE_TYPES\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Dft Sel :%s\"$$\n",
|
||||
define_str[512] format "$$DA-P,A=\"Define Str :%s\"$$\n";
|
||||
Bool refresh format "$$CB,\"Refresh Data\"$$\n";
|
||||
I64 type format "$$LS,D=\"ST_INT_SIZE_TYPES\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsLst()
|
||||
@@ -897,10 +897,10 @@ U0 EdInsLst()
|
||||
|
||||
class CEdHexEd
|
||||
{
|
||||
I64 cnt fmtstr "$$DA,A=\"Count:%d\"$$\n",
|
||||
cols fmtstr "$$DA,A=\"Columns:%d\"$$\n";
|
||||
Bool zero fmtstr "$$CB,\"Zero Based\"$$\n",
|
||||
refresh fmtstr "$$CB,\"Refresh Data\"$$\n";
|
||||
I64 cnt format "$$DA,A=\"Count:%d\"$$\n",
|
||||
cols format "$$DA,A=\"Columns:%d\"$$\n";
|
||||
Bool zero format "$$CB,\"Zero Based\"$$\n",
|
||||
refresh format "$$CB,\"Refresh Data\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsHexEd()
|
||||
@@ -921,11 +921,11 @@ U0 EdInsHexEd()
|
||||
|
||||
class CEdBin
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n";
|
||||
I64 bin_num fmtstr "$$DA,A=\"Bin Num:%d\"$$\n";
|
||||
U8 bin_ptr_link_file[512] fmtstr "$$DA-P,A=\"File:%s\"$$\n";
|
||||
I64 bin_ptr_link_bin_num fmtstr "$$DA,A=\"File Bin Num:%d\"$$\n";
|
||||
U8 bin_ptr_link_tag[512] fmtstr "$$DA-P,A=\"File Bin Tag:%s\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n";
|
||||
I64 bin_num format "$$DA,A=\"Bin Num:%d\"$$\n";
|
||||
U8 bin_ptr_link_file[512] format "$$DA-P,A=\"File:%s\"$$\n";
|
||||
I64 bin_ptr_link_bin_num format "$$DA,A=\"File Bin Num:%d\"$$\n";
|
||||
U8 bin_ptr_link_tag[512] format "$$DA-P,A=\"File Bin Tag:%s\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsBin(I64 bin_num,I64 type)
|
||||
@@ -958,9 +958,9 @@ U0 EdInsBin(I64 bin_num,I64 type)
|
||||
|
||||
class CEdTree
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n";
|
||||
I64 indent fmtstr "$$DA,A=\"Indention:%d\"$$\n";
|
||||
Bool collapsed fmtstr "$$CB,\"Collapsed\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n";
|
||||
I64 indent format "$$DA,A=\"Indention:%d\"$$\n";
|
||||
Bool collapsed format "$$CB,\"Collapsed\"$$\n";
|
||||
};
|
||||
|
||||
U0 EdInsTree()
|
||||
@@ -1075,18 +1075,18 @@ I64 PopUpSpriteType()
|
||||
|
||||
class CEdMacroSprite
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
exp[512] fmtstr "$$DA-P,A=\"Macro :%s\"$$\n";
|
||||
Bool escape fmtstr "$$CB,\"Escape\"$$\n",
|
||||
popup fmtstr "$$CB,\"PopUp\"$$\n",
|
||||
is_in_str fmtstr "$$CB,\"InStr\"$$\n";
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
exp[512] format "$$DA-P,A=\"Macro :%s\"$$\n";
|
||||
Bool escape format "$$CB,\"Escape\"$$\n",
|
||||
popup format "$$CB,\"PopUp\"$$\n",
|
||||
is_in_str format "$$CB,\"InStr\"$$\n";
|
||||
};
|
||||
|
||||
class CEdMenuSprite
|
||||
{
|
||||
U8 tag[512] fmtstr "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
exp[512] fmtstr "$$DA-P,A=\"Expression :%s\"$$\n";
|
||||
Bool escape fmtstr "$$CB,\"Escape\"$$\n",
|
||||
U8 tag[512] format "$$DA-P,A=\"Tag Text :%s\"$$\n",
|
||||
exp[512] format "$$DA-P,A=\"Expression :%s\"$$\n";
|
||||
Bool escape format "$$CB,\"Escape\"$$\n",
|
||||
popup,
|
||||
is_in_str;
|
||||
};
|
||||
|
||||
+4
-4
@@ -4,10 +4,10 @@ DefineLstLoad("ST_RHYTHM_COMPLEXITY","Simple\0Normal\0Complex\0");
|
||||
|
||||
class CMakeSongSettings
|
||||
{
|
||||
I64 complexity fmtstr "$$LS,D=\"ST_RHYTHM_COMPLEXITY\"$$\n";
|
||||
Bool rests fmtstr "$$CB,\"Rests\"$$\n";
|
||||
Bool six_eight fmtstr "$$CB,\"Six Eight\"$$\n";
|
||||
I64 octave fmtstr "$$DA-TRM,A=\"Octave:%d\"$$\n";
|
||||
I64 complexity format "$$LS,D=\"ST_RHYTHM_COMPLEXITY\"$$\n";
|
||||
Bool rests format "$$CB,\"Rests\"$$\n";
|
||||
Bool six_eight format "$$CB,\"Six Eight\"$$\n";
|
||||
I64 octave format "$$DA-TRM,A=\"Octave:%d\"$$\n";
|
||||
I64 octave_state;
|
||||
};
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ There's something obviously different about people in the Bible compared to peop
|
||||
|
||||
You can't tell if God's talking unless you have a context of conversation, but, more importantly, you are commanded to do an offering of love, like communion preparation. $LK,"1 Corinthians,11:27",A="BF:1 Corinthians,11:27"$ When you pick a greeting card for someone, that is love effort. If you expect God to put effort toward you, you must put effort toward Him. God said, "honest measures" applies between your offering of love and His response, like a fair barter. You get out of prayer what you put into it. God wants praise, hymns, or whatever you think He might want. Try and see, like Cain and Abel. $LK,"Genesis,4:1-10",A="BF:Genesis,4:1-10"$, $LK,"Ephesians,5:10",A="BF:Ephesians,5:10"$ God told Cain his offering was not good and told him to try again. Cain really loved God! Can you imagine being so heart-broken?
|
||||
|
||||
Do a text search for "new song" in the Bible. It's mentioned nine times. When I hear a NEW awesome rock song, it is ecstasy for the first five times I hear it. Soon, it brings little-to-no pleasure. I did $MA-X+PU,"hymns",HTML="http://www.templeos.org/Wb/Home/Web/HymnVideos.html",LM="#include \"::/Apps/Psalmody/Load\";JukeBox(\"::/Apps/Psalmody/Examples\");"$ for God. I also did Moses comics for God. When you get to the gates of Heaven, St. Peter will ask how many times you gave blood. That shows you loved neighbor. You better also be able to count the ways you loved God with all heart, mind and soul. I praised God for sand castles, popcorn, snowmen, bubbles... You try putting effort into praise! $LK,"Matthew,11:25",A="BF:Matthew,11:25"$, $LK,"Matthew,6:28-29",A="BF:Matthew,6:28-29"$ Solomon wrote a thousand songs. $LK,"1 Kings,4:30-32",A="BF:1 Kings,4:30-32"$
|
||||
Do a text search for "new song" in the Bible. It's mentioned nine times. When I hear a NEW awesome rock song, it is ecstasy for the first five times I hear it. Soon, it brings little-to-no pleasure. I did $MA-X+PU,"hymns",LM="#include \"::/Apps/Psalmody/Load\";JukeBox(\"::/Apps/Psalmody/Examples\");"$ for God. I also did Moses comics for God. When you get to the gates of Heaven, St. Peter will ask how many times you gave blood. That shows you loved neighbor. You better also be able to count the ways you loved God with all heart, mind and soul. I praised God for sand castles, popcorn, snowmen, bubbles... You try putting effort into praise! $LK,"Matthew,11:25",A="BF:Matthew,11:25"$, $LK,"Matthew,6:28-29",A="BF:Matthew,6:28-29"$ Solomon wrote a thousand songs. $LK,"1 Kings,4:30-32",A="BF:1 Kings,4:30-32"$
|
||||
|
||||
This is funny -- $LK,"Acts,2:1-13",A="BF:Acts,2:1-13"$ -- they didn't bother to record anything the Holy Spirit said. The Holy Spirit is supposed to be a really good gift. $LK,"Luke,11:11-13",A="BF:Luke,11:11-13"$ Just remember, "Boys are made of snakes and snails and puppy-dog tails."
|
||||
|
||||
|
||||
@@ -634,6 +634,60 @@ public CDC *DCExt(CDC *dc=gr.dc,I64 x1,I64 y1,I64 x2,I64 y2,
|
||||
return res;
|
||||
}
|
||||
|
||||
public CDC *DCDiff(CDC *base,CDC *update)
|
||||
{//Trim to win of what has chged.
|
||||
I64 i,x1=0,y1=0,x2=update->width-1,y2=update->height-1; //inclusive
|
||||
U32 *ptr_base,*ptr_update;
|
||||
CDC *res;
|
||||
ptr_base =base->body;
|
||||
ptr_update=update->body;
|
||||
while (y1<=y2) {
|
||||
i=update->width>>2;
|
||||
while (i--)
|
||||
if (*ptr_base++!=*ptr_update++)
|
||||
goto df_y2;
|
||||
i=update->width&3;
|
||||
while (i--)
|
||||
if (*ptr_base(U8 *)++!=*ptr_update(U8 *)++)
|
||||
goto df_y2;
|
||||
y1++;
|
||||
}
|
||||
return NULL;
|
||||
df_y2:
|
||||
ptr_base =base->body +base->width_internal *base->height;
|
||||
ptr_update=update->body+update->width_internal*update->height;
|
||||
while (y1<y2) {
|
||||
i=update->width>>2;
|
||||
while (i--)
|
||||
if (*--ptr_base!=*--ptr_update)
|
||||
goto df_x1;
|
||||
i=update->width&3;
|
||||
while (i--)
|
||||
if (*--ptr_base(U8 *)!=*--ptr_update(U8 *))
|
||||
goto df_x1;
|
||||
y2--;
|
||||
}
|
||||
df_x1:
|
||||
while (x1<x2) {
|
||||
for (i=y1;i<=y2;i++)
|
||||
if (GrPeek0(base,x1,i)!=GrPeek0(update,x1,i))
|
||||
goto df_x2;
|
||||
x1++;
|
||||
}
|
||||
df_x2:
|
||||
while (x1<x2) {
|
||||
for (i=y1;i<=y2;i++)
|
||||
if (GrPeek0(base,x2,i)!=GrPeek0(update,x2,i))
|
||||
goto df_done;
|
||||
x2--;
|
||||
}
|
||||
df_done:
|
||||
res=DCExt(update,x1,y1,x2,y2);
|
||||
res->x0=x1;
|
||||
res->y0=y1;
|
||||
return res;
|
||||
}
|
||||
|
||||
#help_index "Graphics/Char;Char/Graphics"
|
||||
|
||||
public I64 GrPutChar(CDC *dc=gr.dc,I64 x,I64 y,U8 ch)
|
||||
|
||||
+5
-1
@@ -376,6 +376,10 @@ public CDC *DCLoad(U8 *src,I64 *_size=NULL,CTask *task=NULL)
|
||||
#help_index "Graphics/GR Files"
|
||||
#help_file "::/Doc/GRFiles"
|
||||
#help_index "Graphics/Device Contexts;Graphics/GR Files"
|
||||
|
||||
#define GR_FILE_MAX (offset(CDC.end)-offset(CDC.start)+\
|
||||
COLORS_NUM*sizeof(CBGR48)+sizeof(CArcCtrl)+GR_WIDTH*GR_HEIGHT)
|
||||
|
||||
public I64 GRWrite(U8 *filename,CDC *dc,I64 dcsf_flags=DCSF_COMPRESSED)
|
||||
{//TempleOS GR File.
|
||||
I64 size;
|
||||
@@ -414,7 +418,7 @@ public CDC *DCScrnCapture(Bool include_zoom=TRUE,CTask *task=NULL)
|
||||
{//Capture scrn to a device context.
|
||||
CDC *dc;
|
||||
U8 *dst;
|
||||
Refresh(2,TRUE);
|
||||
Refresh(0,FALSE);
|
||||
if (include_zoom)
|
||||
dc=DCCopy(gr.scrn_image,task);
|
||||
else
|
||||
|
||||
@@ -14,6 +14,7 @@ Cd(__DIR__);;
|
||||
#include "GrBitMap"
|
||||
#include "GrPrimatives"
|
||||
#include "GrComposites"
|
||||
#include "GrMV"
|
||||
|
||||
#define SPE_ABORT (-1)
|
||||
#define SPE_EXIT 0
|
||||
|
||||
+4
-11
@@ -26,8 +26,7 @@
|
||||
#define SPBM_ADD_OUTLINE 23
|
||||
#define SPBM_ETCH 24
|
||||
#define SPBM_UNDO 25
|
||||
#define SPBM_SAVE_BMP 26
|
||||
#define SPBM_SAVE_GRA 27
|
||||
#define SPBM_SAVE_GR 26
|
||||
|
||||
U0 GrInit4()
|
||||
{
|
||||
@@ -36,7 +35,7 @@ U0 GrInit4()
|
||||
"Rect\0Circle\0Text\0Text Box\0Text Diamond\0Flood Fill\0"
|
||||
"Flood Fill Not Color\0PolyLine\0PolyPoint\0Copy\0Delete\0Paste\0"
|
||||
"Paste Transparent\0Find and Replace\0Trim to Extents\0Add Outline\0"
|
||||
"Etch\0Undo\0Save BMP\0Save GR\0");
|
||||
"Etch\0Undo\0Save GR\0");
|
||||
}
|
||||
GrInit4;
|
||||
|
||||
@@ -79,8 +78,7 @@ I64 PopUpSpriteBitMap(CColorROPU32 color,I64 width)
|
||||
"$$MU-UL,\"Delete to Clip\",LE=SPBM_DELETE$$\n"
|
||||
"$$MU-UL,\"Paste Clip\",LE=SPBM_PASTE$$\n"
|
||||
"$$MU-UL,\"Paste Transparent Clip\",LE=SPBM_PASTE_TRANSPARENT$$\n"
|
||||
"\n$$MU-UL,\"Save BMP File\",LE=SPBM_SAVE_BMP$$\n"
|
||||
"$$MU-UL,\"Save GR File\",LE=SPBM_SAVE_GRA$$\n"
|
||||
"\n$$MU-UL,\"Save GR File\",LE=SPBM_SAVE_GR$$\n"
|
||||
"\n$$MU-UL,\"Undo\",LE=SPBM_UNDO$$\n"
|
||||
"\n$$PURPLE$$$$MU-UL,\"+] Sprite Main Menu\",LE=SPBM_MAIN_MENU$$$$LTBLUE$$\n"
|
||||
"$$MU-UL,\"Exit Sprite\",LE=SPBM_EXIT$$\n"
|
||||
@@ -293,12 +291,7 @@ bm_menu:
|
||||
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
|
||||
}
|
||||
goto bm_menu;
|
||||
case SPBM_SAVE_BMP:
|
||||
*filename.name=0;
|
||||
if (DocForm(&filename) && *filename.name)
|
||||
BMPWrite(filename.name,img);
|
||||
goto bm_menu;
|
||||
case SPBM_SAVE_GRA:
|
||||
case SPBM_SAVE_GR:
|
||||
*filename.name=0;
|
||||
if (DocForm(&filename) && *filename.name)
|
||||
GRWrite(filename.name,img,DCSF_COMPRESSED|DCSF_PALETTE_GET);
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ Cd(__DIR__);;
|
||||
#include "TaskRep"
|
||||
#include "AMathODE"
|
||||
#include "Gr/MakeGr"
|
||||
#include "Snd/MakeSnd"
|
||||
#include "ASnd"
|
||||
#include "ABlkDev/MakeABlkDev"
|
||||
#include "Menu"
|
||||
#include "Win"
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
//See $LK,"Install Documentation",A="FI:::/Doc/Install.DD"$ or $LK,"Upgrading Documentation",A="FI:::/Doc/Upgrade.DD"$.
|
||||
//See $LK,"Install Documentation",A="FI:::/Doc/Install.DD"$.
|
||||
//Study my account examples: $LK,"Cfg Strs",A="FL:::/Demo/AcctExample/TOS/TOSCfg.HC,1"$, $LK,"Update Funs",A="FL:::/Demo/AcctExample/TOS/TOSDistro.HC,1"$
|
||||
|
||||
#include "BootDVD"
|
||||
#include "DskISORedSea"
|
||||
#include "DskISO9660"
|
||||
|
||||
#help_index "Install"
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
//See $LK,"Install Documentation",A="FI:::/Doc/Install.DD"$ or $LK,"Upgrading Documentation",A="FI:::/Doc/Upgrade.DD"$.
|
||||
//See $LK,"Install Documentation",A="FI:::/Doc/Install.DD"$.
|
||||
//Study my account examples: $LK,"Cfg Strs",A="FL:::/Demo/AcctExample/TOS/TOSCfg.HC,1"$, $LK,"Update Funs",A="FL:::/Demo/AcctExample/TOS/TOSDistro.HC,1"$
|
||||
|
||||
#include "BootHD"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
//See $LK,"Install Documentation",A="FI:::/Doc/Install.DD"$ or $LK,"Upgrading Documentation",A="FI:::/Doc/Upgrade.DD"$.
|
||||
//See $LK,"Install Documentation",A="FI:::/Doc/Install.DD"$.
|
||||
//Study my account examples: $LK,"Cfg Strs",A="FL:::/Demo/AcctExample/TOS/TOSCfg.HC,1"$, $LK,"Update Funs",A="FL:::/Demo/AcctExample/TOS/TOSDistro.HC,1"$
|
||||
|
||||
#include "BootMHD"
|
||||
|
||||
@@ -48,7 +48,7 @@ U0 RedSeaISO9660Stage1(U8 *iso_filename,U8 *stage2_filename)
|
||||
U0 RedSeaISO9660(U8 *iso_filename,U8 drv_let)
|
||||
{
|
||||
CDrv *dv=Let2Drv(drv_let);
|
||||
CISO1PriDesc *iso_pri=CAlloc(DVD_BLK_SIZE),
|
||||
CISOPriDesc *iso_pri=CAlloc(DVD_BLK_SIZE),
|
||||
*iso_boot=CAlloc(DVD_BLK_SIZE),
|
||||
*iso_sup=CAlloc(DVD_BLK_SIZE),
|
||||
*iso_term=CAlloc(DVD_BLK_SIZE);
|
||||
@@ -63,7 +63,7 @@ U0 RedSeaISO9660(U8 *iso_filename,U8 drv_let)
|
||||
for (i=0;i<dv->bd->drv_offset;i+=4)
|
||||
FBlkWrite(out_file,zero_buf,i,4);
|
||||
|
||||
iso_pri->type=ISO1T_PRI_VOL_DESC;
|
||||
iso_pri->type=ISOT_PRI_VOL_DESC;
|
||||
StrCpy(iso_pri->id,"CD001");
|
||||
iso_pri->version=1;
|
||||
FillU16Palindrome(&iso_pri->vol_set_size,1);
|
||||
@@ -75,15 +75,15 @@ U0 RedSeaISO9660(U8 *iso_filename,U8 drv_let)
|
||||
StrCpy(iso_pri->publisher_id,"TempleOS RedSea");
|
||||
|
||||
MemCpy(iso_sup,iso_pri,DVD_BLK_SIZE);
|
||||
iso_sup->type=ISO1T_SUPPLEMENTARY_DESC;
|
||||
iso_sup->type=ISOT_SUPPLEMENTARY_DESC;
|
||||
|
||||
iso_boot->type=ISO1T_BOOT_RECORD;
|
||||
iso_boot->type=ISOT_BOOT_RECORD;
|
||||
StrCpy(iso_boot->id,"CD001");
|
||||
iso_boot->version=1;
|
||||
StrCpy(iso_boot(U8 *)+7,"EL TORITO SPECIFICATION");
|
||||
|
||||
FBlkWrite(out_file,iso_pri,16<<2,4);
|
||||
iso_term->type=ISO1T_TERMINATOR;
|
||||
iso_term->type=ISOT_TERMINATOR;
|
||||
StrCpy(iso_term->id,"CD001");
|
||||
iso_term->version=1;
|
||||
|
||||
|
||||
@@ -35,13 +35,13 @@ public CFileBMP *BMP4To(CDC *dc)
|
||||
CFileBMP *bmp =CAlloc(size);
|
||||
bmp->type ='BM';
|
||||
bmp->planes =1;
|
||||
bmp->file_size =size;
|
||||
bmp->file_size=size;
|
||||
bmp->data_offset=sizeof(CFileBMP);
|
||||
bmp->header_size=offset(CFileBMP.end)-offset(CFileBMP.header_size);
|
||||
bmp->width =dc->width;
|
||||
bmp->height =dc->height;
|
||||
bmp->bit_cnt =4;
|
||||
bmp->image_size =dc->width*dc->height>>1;
|
||||
bmp->image_size=dc->width*dc->height>>1;
|
||||
GrPaletteGet(palette);
|
||||
#assert COLORS_NUM==BMP_COLORS_NUM
|
||||
for (i=0;i<BMP_COLORS_NUM;i++) {
|
||||
@@ -128,13 +128,13 @@ public CFileBMP *BMP24To(CDC *dc)
|
||||
CFileBMP *bmp =CAlloc(size);
|
||||
bmp->type ='BM';
|
||||
bmp->planes =1;
|
||||
bmp->file_size =size;
|
||||
bmp->file_size=size;
|
||||
bmp->data_offset=offset(CFileBMP.end);
|
||||
bmp->header_size=offset(CFileBMP.end)-offset(CFileBMP.header_size);
|
||||
bmp->width =dc->width;
|
||||
bmp->height =dc->height;
|
||||
bmp->bit_cnt =32;
|
||||
bmp->image_size =dc->width*dc->height<<2;
|
||||
bmp->image_size=dc->width*dc->height<<2;
|
||||
|
||||
bgr=bmp(U8 *)+bmp->data_offset;
|
||||
for (y=dc->height-1;y>=0;y--) {
|
||||
@@ -341,3 +341,46 @@ public I64 BMPScrnCapture(U8 *filename,I64 bits=4,Bool include_zoom=TRUE)
|
||||
DCDel(dc);
|
||||
return size;
|
||||
}
|
||||
|
||||
public I64 GR2BMPLst(U8 *files_find_mask,U8 *fu_flags=NULL,
|
||||
U8 *out_print_fmt="~:/Tmp/VID%05d.BMP.Z",F64 fps=30000.0/1001)
|
||||
{/*Cvt movie from GR lst to BMP lst
|
||||
"+d" will delete GRLst files.
|
||||
*/
|
||||
I64 res=0,fuf_flags=0;
|
||||
CDirEntry *tmpde,*tmpde1;
|
||||
CDC *dc,*base=DCNew(GR_WIDTH,GR_HEIGHT);
|
||||
U8 *st,*last_st;
|
||||
CDate cdt=I64_MIN;
|
||||
Bool old_silent;
|
||||
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+f+F");
|
||||
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
|
||||
tmpde=tmpde1=FilesFind(files_find_mask,fuf_flags&FUG_FILES_FIND);
|
||||
last_st=MStrPrint(out_print_fmt,0);
|
||||
progress1_max=LinkedLstCnt(tmpde);
|
||||
while (tmpde) {
|
||||
dc=GRRead(tmpde->full_name);
|
||||
GrBlot(base,dc->x0,dc->y0,dc);
|
||||
if (cdt==I64_MIN)
|
||||
cdt=dc->cdt;
|
||||
while (cdt<=dc->cdt) {
|
||||
st=MStrPrint(out_print_fmt,res++);
|
||||
BMPWrite(st,base);
|
||||
Free(st);
|
||||
cdt+=CDATE_FREQ/fps;
|
||||
}
|
||||
if (fuf_flags&FUF_DEL) {
|
||||
old_silent=Silent;
|
||||
Del(tmpde->full_name);
|
||||
Silent(old_silent);
|
||||
}
|
||||
DCDel(dc);
|
||||
progress1++;
|
||||
tmpde=tmpde->next;
|
||||
}
|
||||
progress1=progress1_max=0;
|
||||
DirTreeDel(tmpde1);
|
||||
Free(last_st);
|
||||
DCDel(base);
|
||||
return res;
|
||||
}
|
||||
@@ -197,15 +197,15 @@ public I64 FileOcc(U8 *needle_str,
|
||||
|
||||
class CFind
|
||||
{
|
||||
U8 find_text[STR_LEN] fmtstr "$$DA-P,"
|
||||
U8 find_text[STR_LEN] format "$$DA-P,"
|
||||
"A=\"FIND :%s\"$$\n";
|
||||
U8 replace_text[STR_LEN] fmtstr "$$DA-P,"
|
||||
U8 replace_text[STR_LEN] format "$$DA-P,"
|
||||
"A=\"REPLACE :%s\"$$\n";
|
||||
Bool replace fmtstr "$$CB,\"REPLACE\"$$\n";
|
||||
Bool match_case fmtstr "$$CB,\"MATCH CASE\"$$\n";
|
||||
Bool whole_labels fmtstr "$$CB,\"WHOLE LABELS\"$$\n";
|
||||
U8 filemask[STR_LEN] fmtstr "$$DA-P,A=\"FILE MASK :%s\"$$\n";
|
||||
Bool recurse fmtstr "$$CB,\"RECURSE\"$$\n";
|
||||
Bool replace format "$$CB,\"REPLACE\"$$\n";
|
||||
Bool match_case format "$$CB,\"MATCH CASE\"$$\n";
|
||||
Bool whole_labels format "$$CB,\"WHOLE LABELS\"$$\n";
|
||||
U8 filemask[STR_LEN] format "$$DA-P,A=\"FILE MASK :%s\"$$\n";
|
||||
Bool recurse format "$$CB,\"RECURSE\"$$\n";
|
||||
};
|
||||
|
||||
I64 FindWiz()
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
Cd(__DIR__);;
|
||||
#include "Diff"
|
||||
#include "FileBMP"
|
||||
#include "Find"
|
||||
#include "HeapLog"
|
||||
#include "LineRep"
|
||||
|
||||
@@ -136,6 +136,10 @@ Bool MemRepTask(CTask *task,Bool override_validate=FALSE)
|
||||
if (task==sys_winmgr_task) {
|
||||
"gr.pen_brushes\t:%010X\n",PenBrushesSize;
|
||||
"gr.scrn_zoom_tbles\t:%010X\n",ScrnZoomTablesSize;
|
||||
"winmgr.scrn_cast_dc\t:%010X\n",
|
||||
DCSize(winmgr.scrn_cast_dc);
|
||||
"winmgr.dc2_alias\t:%010X\n",
|
||||
DCSize(winmgr.dc2_alias);
|
||||
} else if (task==adam_task) {
|
||||
j=0;k=0;m=0;n=0;
|
||||
for (i=0;i<mp_cnt;i++) {
|
||||
|
||||
@@ -182,7 +182,7 @@ U0 SUFile(U8 *filename,I64 suf_flags,F64 indent_scale_factor)
|
||||
}
|
||||
public U0 SU(U8 *files_find_mask,I64 suf_flags,U8 *fu_flags=NULL,
|
||||
F64 indent_scale_factor=0)
|
||||
{//Apply $LK,"StrUtil",A="MN:StrUtil"$() on files
|
||||
{//Apply $LK,"StrUtil",A="MN:StrUtil"$() on files.
|
||||
//You can convert spaces to tabs, for example,
|
||||
//or removing trailing spaces on lines.
|
||||
//See $LK,"SUF Flags",A="MN:SUF_SINGLE_SPACE"$.
|
||||
|
||||
+10
-26
@@ -1,30 +1,24 @@
|
||||
#help_index "Misc/TOS"
|
||||
|
||||
U0 TOSStaffIns()
|
||||
{//Completes TOS install from TempleOSStaff.ISO
|
||||
{//Completes TOS install from TOS_Staff.ISO
|
||||
SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
|
||||
AutoComplete;
|
||||
WinBorder;
|
||||
WinMax;
|
||||
DocClear;
|
||||
"$$PURPLE$$$$TX+CX,\"Complete TOS install from TempleOSStaff.ISO\"$$$$FG$$\n\n\n\n";
|
||||
"$$PURPLE$$$$TX+CX,\"Complete TOS install from TOS_Staff.ISO\"$$$$FG$$\n\n\n\n";
|
||||
InsRereg;
|
||||
|
||||
"\nDownload TempleOSSup1.ISO.C\tfrom http://www.templeos.org AppStore.\n"
|
||||
"Download TempleOSBooks1.ISO.C\tfrom http://www.templeos.org AppStore.\n"
|
||||
"Download TempleOSBooks2.ISO.C\tfrom http://www.templeos.org AppStore.\n\n";
|
||||
"\nDownload TOS_Supplemental1.ISO.C\tfrom http://www.templeos.org\n";
|
||||
|
||||
if (PressAKey!=CH_SHIFT_ESC) {
|
||||
if (HostChgDsk("/home/tad/TempleOSSup1.ISO.C"))
|
||||
if (HostChgDsk("/home/tad/TOS_Supplemental1.ISO.C"))
|
||||
CopyTree("T:/","~/Sup1");
|
||||
if (HostChgDsk("/home/tad/TempleOSBooks1.ISO.C"))
|
||||
CopyTree("T:/","~/Books1");
|
||||
if (HostChgDsk("/home/tad/TempleOSBooks2.ISO.C"))
|
||||
CopyTree("T:/","~/Books2");
|
||||
|
||||
Once("TOSBootHDIns;");
|
||||
"\nDo you wish to run >$FG,2$TOSRegen;$FG$ to generate\n the "
|
||||
"distro ISO's and the website image, $FG,2$D:/Wb$FG$ ";
|
||||
"distro ISO's ";
|
||||
if (YorN) {
|
||||
Once("TOSRegen;");
|
||||
BootRAM("C:/" KERNEL_BIN_C); //Boot so TOSRegen cmd is available.
|
||||
@@ -38,35 +32,25 @@ U0 TOSStaffIns()
|
||||
}
|
||||
|
||||
public U0 TOSStdIns()
|
||||
{//Completes TOS install from TempleOSCD.ISO
|
||||
{//Completes TOS install from TOS_Distro.ISO
|
||||
SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
|
||||
AutoComplete;
|
||||
WinBorder;
|
||||
WinMax;
|
||||
DocClear;
|
||||
"$$PURPLE$$$$TX+CX,\"Complete TOS install from TempleOSCD.ISO\"$$$$FG$$\n\n\n\n";
|
||||
"$$PURPLE$$$$TX+CX,\"Complete TOS install from TOS_Distro.ISO\"$$$$FG$$\n\n\n\n";
|
||||
InsRereg;
|
||||
|
||||
"\nDownload TempleOSSup1.ISO.C\tfrom http://www.templeos.org AppStore.\n"
|
||||
"Download TempleOSWeb.ISO.C\tfrom http://www.templeos.org AppStore.\n"
|
||||
"Download TempleOSBooks1.ISO.C\tfrom http://www.templeos.org AppStore.\n"
|
||||
"Download TempleOSBooks2.ISO.C\tfrom http://www.templeos.org AppStore.\n\n";
|
||||
"\nDownload TOS_Supplemental1.ISO.C\tfrom http://www.templeos.org\n";
|
||||
|
||||
if (PressAKey!=CH_SHIFT_ESC) {
|
||||
if (FileFind("/Demo/AcctExample"))
|
||||
CopyTree("::/Demo/AcctExample","~");
|
||||
if (HostChgDsk("/home/tad/Downloads/TempleOSSup1.ISO.C"))
|
||||
if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental1.ISO.C"))
|
||||
CopyTree("T:/","~/Sup1");
|
||||
if (HostChgDsk("/home/tad/Downloads/TempleOSWeb.ISO.C"))
|
||||
CopyTree("T:/","~/Web");
|
||||
if (HostChgDsk("/home/tad/Downloads/TempleOSBooks1.ISO.C"))
|
||||
CopyTree("T:/","~/Books1");
|
||||
if (HostChgDsk("/home/tad/Downloads/TempleOSBooks2.ISO.C"))
|
||||
CopyTree("T:/","~/Books2");
|
||||
|
||||
Once("TOSBootHDIns;");
|
||||
"\nDo you wish to run >$FG,2$TOSRegen;$FG$ to generate\n the "
|
||||
"distro ISO's and the website image, $FG,2$D:/Wb$FG$ ";
|
||||
"\nDo you wish to run >$FG,2$TOSRegen;$FG$ to generate\n the distro ISO's ";
|
||||
if (YorN) {
|
||||
Once("TOSRegen;");
|
||||
BootRAM("C:/" KERNEL_BIN_C); //Boot so TOSRegen cmd is available.
|
||||
|
||||
+8
-5
@@ -23,7 +23,7 @@ public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,
|
||||
//Averaging should be a num from 0.0 to 0.999.
|
||||
//Vol should be from 0.0 to 1.0.
|
||||
//Set reverb_delay to like 0.3 sec and reverb_intensity to like 0.4.
|
||||
I64 i,k,cnt,cnt2,level,file_num;
|
||||
I64 i,i1,k,cnt,cnt2,level,file_num;
|
||||
F64 avg,dt;
|
||||
CFileSND *s;
|
||||
CSndWaveCtrl *swc=SndWaveCtrlNew(SNDFILE_SAMPLE_RATE,16,1);
|
||||
@@ -63,13 +63,16 @@ public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,
|
||||
|
||||
d=snd.record_head.next;
|
||||
k=0;
|
||||
i=d->time*SNDFILE_SAMPLE_RATE;
|
||||
while (d->next!=&snd.record_head) {
|
||||
d1=d->next;
|
||||
dt=d1->time-d->time;
|
||||
cnt2=dt*SNDFILE_SAMPLE_RATE;
|
||||
SndWaveAddBuf(swc,&s->body[k],cnt2,
|
||||
i1=d1->time*SNDFILE_SAMPLE_RATE;
|
||||
if (i1-i) {
|
||||
SndWaveAddBuf(swc,&s->body[k],i1-i,
|
||||
Ona2Freq(d->ona),waveform,normalized_vol);
|
||||
k+=cnt2;
|
||||
k+=i1-i;
|
||||
i=i1;
|
||||
}
|
||||
QueRem(d);
|
||||
Free(d);
|
||||
d=d1;
|
||||
|
||||
@@ -127,7 +127,7 @@ per second. It defaults to
|
||||
2.5 and gets faster when bigger.
|
||||
*/
|
||||
U8 *word,*last_st;
|
||||
I64 note,i=0,ona,timeout_val,timeout_val2;
|
||||
I64 note,octave,i=0,ona,timeout_val,timeout_val2;
|
||||
Bool tie;
|
||||
F64 d,on_jiffies,off_jiffies;
|
||||
music.play_note_num=0;
|
||||
@@ -151,14 +151,19 @@ per second. It defaults to
|
||||
note=*st++-'A';
|
||||
if (note<7) {
|
||||
note=music.note_map[note];
|
||||
octave=music.octave;
|
||||
if (*st=='b') {
|
||||
note--;
|
||||
if (note==2)
|
||||
octave--;
|
||||
st++;
|
||||
} else if (*st=='#') {
|
||||
note++;
|
||||
if (note==3)
|
||||
octave++;
|
||||
st++;
|
||||
}
|
||||
ona=Note2Ona(note,music.octave);
|
||||
ona=Note2Ona(note,octave);
|
||||
} else
|
||||
ona=ONA_REST;
|
||||
if (words && (word=LstSub(i++,words)) && StrCmp(word," "))
|
||||
|
||||
+2
-1
@@ -6,7 +6,8 @@ CMsStateGlbls old_ms={{-1000,-1000,0},{-1000,-1000,0},{-1000,-1000,0},
|
||||
FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
|
||||
};
|
||||
|
||||
public CWinMgrGlbls winmgr={0,0,0,WINMGR_FPS,tS,NULL,FALSE,FALSE,FALSE};
|
||||
public CWinMgrGlbls winmgr={0,0,0,WINMGR_FPS,tS,tS,NULL,
|
||||
Now,tS,NULL,NULL,NULL,FALSE,FALSE,FALSE,FALSE};
|
||||
winmgr.t=CAlloc(sizeof(CWinMgrTimingGlbls));
|
||||
winmgr.t->last_calc_idle_time=tS;
|
||||
|
||||
|
||||
+51
-4
@@ -2,7 +2,7 @@
|
||||
|
||||
public U0 Refresh(I64 cnt=1,Bool force=FALSE)
|
||||
{//Wait for 30fps WinMgr to start & finish scrn refresh.
|
||||
//0,FALSE Cnt Sync to WinMgr. (not used)
|
||||
//0,FALSE Cnt Sync to WinMgr.
|
||||
//0,TRUE Pump Msgs.
|
||||
//1 Cnt Wait and Pump Msgs.
|
||||
//2 Cnt Make Sure to do a Full Refresh
|
||||
@@ -31,6 +31,24 @@ public U0 Refresh(I64 cnt=1,Bool force=FALSE)
|
||||
LBEqu(&Fs->task_flags,TASKf_IDLE,old_idle);
|
||||
}
|
||||
|
||||
#help_index "Windows;Cmd Line (Typically)"
|
||||
|
||||
public Bool ScrnCast(Bool val=ON,U8 *print_fmt="B:/Tmp/%X.GR")
|
||||
{//WinMgr saves GR files to a dir.
|
||||
Bool old_val;
|
||||
if (val) {
|
||||
if (!(old_val=LBtr(&winmgr.scrn_cast,0))) {
|
||||
Free(winmgr.scrn_cast_print_fmt);
|
||||
winmgr.scrn_cast_print_fmt=AStrNew(print_fmt);
|
||||
winmgr.scrn_cast_now=Now;
|
||||
winmgr.scrn_cast_tS=tS;
|
||||
LBts(&winmgr.scrn_cast,0);
|
||||
}
|
||||
} else
|
||||
old_val=LBtr(&winmgr.scrn_cast,0);
|
||||
return old_val;
|
||||
}
|
||||
|
||||
#help_index "Windows"
|
||||
|
||||
I64 WinQueIPMsgs(Bool que)
|
||||
@@ -223,8 +241,11 @@ I64 WinMgrSleep(Bool flush_msgs=FALSE)
|
||||
CCtrl *c;
|
||||
Bool que;
|
||||
F64 t,t_delta;
|
||||
U8 *st;
|
||||
CDC *diff;
|
||||
CDate cdt;
|
||||
|
||||
TimeStampFreqCal;
|
||||
TimeCal;
|
||||
if ((t_delta=(t=tS)-winmgr.last_refresh_tS)>0.01)
|
||||
winmgr.fps=Max(1.0/t_delta,1);
|
||||
else
|
||||
@@ -260,11 +281,36 @@ I64 WinMgrSleep(Bool flush_msgs=FALSE)
|
||||
WinMsUpdate;
|
||||
|
||||
if (!LBtr(&sys_semas[SEMA_JUST_PUMP_MSGS],0)) {
|
||||
timeout_val=cnts.jiffies+JIFFY_FREQ/WINMGR_FPS;
|
||||
t=tS+WINMGR_PERIOD/8;
|
||||
while (winmgr.ideal_refresh_tS<t)
|
||||
winmgr.ideal_refresh_tS+=WINMGR_PERIOD;
|
||||
timeout_val=cnts.jiffies+(winmgr.ideal_refresh_tS-tS)*JIFFY_FREQ;
|
||||
LBts(&sys_semas[SEMA_REFRESH_IN_PROGRESS],0);
|
||||
GrUpdateScrn;
|
||||
LBtr(&sys_semas[SEMA_REFRESH_IN_PROGRESS],0);
|
||||
|
||||
if (winmgr.scrn_cast) {
|
||||
cdt=winmgr.scrn_cast_now+ToI64(CDATE_FREQ*(tS-winmgr.scrn_cast_tS));
|
||||
if (!winmgr.scrn_cast_dc) {
|
||||
winmgr.scrn_cast_dc=DCCopy(winmgr.dc2_alias);
|
||||
winmgr.scrn_cast_dc->cdt=cdt;
|
||||
st=MStrPrint(winmgr.scrn_cast_print_fmt,cdt);
|
||||
GRWrite(st,winmgr.scrn_cast_dc);
|
||||
Free(st);
|
||||
} else if (MemCmp(winmgr.scrn_cast_dc->body,
|
||||
winmgr.dc2_alias->body,MSize(winmgr.dc2_alias->body))) {
|
||||
diff=DCDiff(winmgr.scrn_cast_dc,winmgr.dc2_alias);
|
||||
diff->cdt=cdt;
|
||||
st=MStrPrint(winmgr.scrn_cast_print_fmt,cdt);
|
||||
GRWrite(st,diff);
|
||||
Free(st);
|
||||
DCDel(diff);
|
||||
Free(winmgr.scrn_cast_dc->body);
|
||||
winmgr.scrn_cast_dc->body=MAllocIdent(winmgr.dc2_alias->body);
|
||||
}
|
||||
} else if (winmgr.scrn_cast_dc) {
|
||||
DCDel(winmgr.scrn_cast_dc); //TODO: $LK,"MemRep",A="MN:MemRep"$ can crash.
|
||||
winmgr.scrn_cast_dc=NULL;
|
||||
}
|
||||
if (sys_focus_task && !Bt(&sys_focus_task->task_flags,TASKf_HAS_SONG)) {
|
||||
Free(music.cur_song);
|
||||
music.cur_song=NULL;
|
||||
@@ -404,6 +450,7 @@ U0 WinMgrTask(I64)
|
||||
gr.dc->win_task=Fs;
|
||||
Fs->win_inhibit&=~WIF_SELF_CTRLS;
|
||||
GrSetUpTables;
|
||||
winmgr.dc2_alias=DCAlias(gr.dc2);
|
||||
WinZBufUpdate;
|
||||
LBts(&sys_run_level,RLf_WINMGR);
|
||||
while (TRUE) {
|
||||
|
||||
@@ -35,11 +35,11 @@ U0 BgtIns(CBgtEntry *tmpb)
|
||||
|
||||
class CBgtEntryForm
|
||||
{
|
||||
U8 date[512] fmtstr "$$DA-P,A=\"Date :%s\"$$\n";
|
||||
F64 amount fmtstr "Amount $$$$$$DA,A=\"%10.2f\"$$\n";
|
||||
U8 credit[512] fmtstr "$$DA-P,A=\"Credit (from) Acct:%s\"$$\n";
|
||||
U8 debit [512] fmtstr "$$DA-P,A=\"Debit (to) Acct:%s\"$$\n";
|
||||
U8 desc [512] fmtstr "$$DA-P,A=\"Desc :%s\"$$\n";
|
||||
U8 date[512] format "$$DA-P,A=\"Date :%s\"$$\n";
|
||||
F64 amount format "Amount $$$$$$DA,A=\"%10.2f\"$$\n";
|
||||
U8 credit[512] format "$$DA-P,A=\"Credit (from) Acct:%s\"$$\n";
|
||||
U8 debit [512] format "$$DA-P,A=\"Debit (to) Acct:%s\"$$\n";
|
||||
U8 desc [512] format "$$DA-P,A=\"Desc :%s\"$$\n";
|
||||
};
|
||||
|
||||
CBgtEntry *BgtEntryPmt(CBgtEntry *dft=NULL)
|
||||
|
||||
@@ -42,11 +42,11 @@ class CBgtTemplate
|
||||
CBgtTemplate *next,*last;
|
||||
|
||||
U0 start;
|
||||
U16 type fmtstr "$$LS,D=\"ST_BGT_TEMPLATE_TYPES\"$$\n";
|
||||
U16 type format "$$LS,D=\"ST_BGT_TEMPLATE_TYPES\"$$\n";
|
||||
U16 flags;
|
||||
U8 start_date[16] fmtstr "$$DA-P,A=\"Start Date:%s\"$$\n";
|
||||
U8 end_date[16] fmtstr "$$DA-P,A=\"End Date :%s\"$$\n";
|
||||
F64 period fmtstr "$$DA,A=\"Period :%8.2f\"$$\n";
|
||||
U8 start_date[16] format "$$DA-P,A=\"Start Date:%s\"$$\n";
|
||||
U8 end_date[16] format "$$DA-P,A=\"End Date :%s\"$$\n";
|
||||
F64 period format "$$DA,A=\"Period :%8.2f\"$$\n";
|
||||
U0 end;
|
||||
|
||||
CBgtEntry b;
|
||||
|
||||
@@ -13,9 +13,9 @@ class Ball
|
||||
|
||||
class BallDefineStruct
|
||||
{
|
||||
F64 radius fmtstr "$$DA-TRM,A=\"Radius :%8.3f\"$$\n";
|
||||
I64 n_longitude fmtstr "$$DA-TRM,A=\"Longitude Faces:%5d\"$$\n";
|
||||
I64 n_lattitude fmtstr "$$DA-TRM,A=\"Lattitude Rings:%5d\"$$\n";
|
||||
F64 radius format "$$DA-TRM,A=\"Radius :%8.3f\"$$\n";
|
||||
I64 n_longitude format "$$DA-TRM,A=\"Longitude Faces:%5d\"$$\n";
|
||||
I64 n_lattitude format "$$DA-TRM,A=\"Lattitude Rings:%5d\"$$\n";
|
||||
};
|
||||
|
||||
U0 BDInit(BallDefineStruct *bd)
|
||||
|
||||
+28
-28
@@ -13,66 +13,66 @@ class Man
|
||||
|
||||
class ManDefineStruct
|
||||
{
|
||||
F64 head_rad fmtstr
|
||||
F64 head_rad format
|
||||
"$$DA-TRM,A=\"Head Radius :%8.3f\"$$\n";
|
||||
|
||||
F64 torso_len fmtstr
|
||||
F64 torso_len format
|
||||
"$$DA-TRM,A=\"Torso Length :%8.3f\"$$\n";
|
||||
F64 arm_len fmtstr
|
||||
F64 arm_len format
|
||||
"$$DA-TRM,A=\"Arm Length :%8.3f\"$$\n";
|
||||
F64 hand_len fmtstr
|
||||
F64 hand_len format
|
||||
"$$DA-TRM,A=\"Hand Length :%8.3f\"$$\n";
|
||||
F64 leg_len fmtstr
|
||||
F64 leg_len format
|
||||
"$$DA-TRM,A=\"Leg Length :%8.3f\"$$\n";
|
||||
F64 foot_len fmtstr
|
||||
F64 foot_len format
|
||||
"$$DA-TRM,A=\"Foot Length :%8.3f\"$$\n";
|
||||
F64 torso_width fmtstr
|
||||
F64 torso_width format
|
||||
"$$DA-TRM,A=\"Torso Width :%8.3f\"$$\n";
|
||||
F64 torso_depth fmtstr
|
||||
F64 torso_depth format
|
||||
"$$DA-TRM,A=\"Torso Depth :%8.3f\"$$\n";
|
||||
F64 arm_rad fmtstr
|
||||
F64 arm_rad format
|
||||
"$$DA-TRM,A=\"Arm Radius :%8.3f\"$$\n";
|
||||
F64 hand_rad fmtstr
|
||||
F64 hand_rad format
|
||||
"$$DA-TRM,A=\"Hand Radius :%8.3f\"$$\n";
|
||||
F64 leg_rad fmtstr
|
||||
F64 leg_rad format
|
||||
"$$DA-TRM,A=\"Leg Radius :%8.3f\"$$\n";
|
||||
F64 foot_rad fmtstr
|
||||
F64 foot_rad format
|
||||
"$$DA-TRM,A=\"Foot Radius :%8.3f\"$$\n\n";
|
||||
|
||||
F64 r_shoulder_a1 fmtstr
|
||||
F64 r_shoulder_a1 format
|
||||
"$$DA-TRM,A=\"R.Shoulder Front/Back Angle:%8.3f\"$$\n";
|
||||
F64 l_shoulder_a1 fmtstr
|
||||
F64 l_shoulder_a1 format
|
||||
"$$DA-TRM,A=\"L.Shoulder Front/Back Angle:%8.3f\"$$\n";
|
||||
F64 r_hip_a1 fmtstr
|
||||
F64 r_hip_a1 format
|
||||
"$$DA-TRM,A=\"R.Hip Front/Back Angle :%8.3f\"$$\n";
|
||||
F64 l_hip_a1 fmtstr
|
||||
F64 l_hip_a1 format
|
||||
"$$DA-TRM,A=\"L.Hip Front/Back Angle :%8.3f\"$$\n";
|
||||
|
||||
F64 r_shoulder_a2 fmtstr
|
||||
F64 r_shoulder_a2 format
|
||||
"$$DA-TRM,A=\"R.Shoulder Side Angle :%8.3f\"$$\n";
|
||||
F64 l_shoulder_a2 fmtstr
|
||||
F64 l_shoulder_a2 format
|
||||
"$$DA-TRM,A=\"L.Shoulder Side Angle :%8.3f\"$$\n";
|
||||
F64 r_hip_a2 fmtstr
|
||||
F64 r_hip_a2 format
|
||||
"$$DA-TRM,A=\"R.Hip Side Angle :%8.3f\"$$\n";
|
||||
F64 l_hip_a2 fmtstr
|
||||
F64 l_hip_a2 format
|
||||
"$$DA-TRM,A=\"L.Hip Side Angle :%8.3f\"$$\n";
|
||||
|
||||
F64 r_elbow_a fmtstr
|
||||
F64 r_elbow_a format
|
||||
"$$DA-TRM,A=\"R.Elbow Angle :%8.3f\"$$\n";
|
||||
F64 l_elbow_a fmtstr
|
||||
F64 l_elbow_a format
|
||||
"$$DA-TRM,A=\"L.Elbow Angle :%8.3f\"$$\n";
|
||||
F64 r_knee_a fmtstr
|
||||
F64 r_knee_a format
|
||||
"$$DA-TRM,A=\"R.Knee Angle :%8.3f\"$$\n";
|
||||
F64 l_knee_a fmtstr
|
||||
F64 l_knee_a format
|
||||
"$$DA-TRM,A=\"L.Knee Angle :%8.3f\"$$\n";
|
||||
|
||||
F64 r_wrist_a fmtstr
|
||||
F64 r_wrist_a format
|
||||
"$$DA-TRM,A=\"R.Wrist Angle :%8.3f\"$$\n";
|
||||
F64 l_wrist_a fmtstr
|
||||
F64 l_wrist_a format
|
||||
"$$DA-TRM,A=\"L.Wrist Angle :%8.3f\"$$\n";
|
||||
F64 r_ankle_a fmtstr
|
||||
F64 r_ankle_a format
|
||||
"$$DA-TRM,A=\"R.Ankle Angle :%8.3f\"$$\n";
|
||||
F64 l_ankle_a fmtstr
|
||||
F64 l_ankle_a format
|
||||
"$$DA-TRM,A=\"L.Ankle Angle :%8.3f\"$$\n";
|
||||
|
||||
};
|
||||
|
||||
@@ -11,14 +11,3 @@ $WW,1$$FG,5$$TX+CX,"Psalmody Help"$$FG$
|
||||
* You can take the $LK,"Play",A="MN:Play"$() stmts out of a song file and place them in your programs. You can also add a song to a document with $FG,2$<CTRL-l>$FG$, but you should do it after pressing $FG,2$<CTRL-t>$FG$ because the clip-insert in $FG,2$<CTRL-l>$FG$ is screwy. See this $SO,"<Song>",A="4qG5EC4BeGG5qCeFD4sB5G4B5G4qG5EC4BeGG5qCeFD4sB5G4B5GqEeEFqE4BeG5FetC4A5GqFCEeEFqE4BeG5FetC4A5GqFC"$ after pressing $FG,2$<CTRL-t>$FG$, now.
|
||||
|
||||
* You can call $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$("~/Psalmody"); to play your songs.
|
||||
|
||||
* To create a $FG,2$.SND$FG$ file which can be exported and played under Windows, set the $FG,2$Bool$FG$ $LK,"snd.record",A="MN:CSndGlbls"$ to $FG,2$TRUE$FG$, play music, and set it to $FG,2$FALSE$FG$. Then, call $LK,"SndFileCreate",A="MN:SndFileCreate"$(). You might wish to make a $FG,2$<CTRL-ALT-key>$FG$ to toggle this system level recording feat. See $LK,"Snd",A="MN:Snd"$(). Add this code to your $LK,"~/HomeKeyPlugIns.HC"$ file.
|
||||
|
||||
$FG,5$U0 CtrlAltR(I64)
|
||||
{
|
||||
snd.record=!snd.record;
|
||||
}
|
||||
CtrlAltCBSet('R',&CtrlAltR,"Cmd /Toggle snd.record");$FG$
|
||||
|
||||
* When calling $LK,"SndFileCreate",A="MN:SndFileCreate"$() you can set a waveform. The PC speaker is $LK,"WF_SQUARE",A="MN:WF_SQUARE"$. You can sel reverb and averaging, also.
|
||||
|
||||
+3
-3
@@ -945,14 +945,14 @@ U0 PrsAsmBlk(CCmpCtrl *cc,I64 cmp_flags)
|
||||
LexExcept(cc,"Missing ';' at");
|
||||
Lex(cc); //skip ';';
|
||||
break;
|
||||
case AKW_MODULE_ORG:
|
||||
case AKW_ORG:
|
||||
if (cc->htc.local_var_lst)
|
||||
LexExcept(cc,"ORG not allowed in fun asm blk ");
|
||||
if (aotc->module_org!=INVALID_PTR)
|
||||
if (aotc->org!=INVALID_PTR)
|
||||
LexExcept(cc,"Just one org allowed ");
|
||||
if (aotc->rip)
|
||||
LexExcept(cc,"ORG must be at beginning ");
|
||||
aotc->module_org=AsmLexExpression(cc);
|
||||
aotc->org=AsmLexExpression(cc);
|
||||
break;
|
||||
case AKW_ALIGN:
|
||||
if (cc->htc.local_var_lst)
|
||||
|
||||
+5
-5
@@ -55,7 +55,7 @@ CAOT *CmpJoin(CCmpCtrl *cc,I64 cmp_flags,U8 *map_name=NULL,U8 mapfile_drv_let=0)
|
||||
|
||||
aotc->bin=CAlloc(sizeof(CAOTBinBlk));
|
||||
aotc->max_align_bits=0;
|
||||
aotc->module_org=INVALID_PTR;
|
||||
aotc->org=INVALID_PTR;
|
||||
|
||||
MemCpy(htc,&cc->htc,sizeof(CLexHashTableContext));
|
||||
if (cc->htc.fun)
|
||||
@@ -120,10 +120,10 @@ CAOT *CmpJoin(CCmpCtrl *cc,I64 cmp_flags,U8 *map_name=NULL,U8 mapfile_drv_let=0)
|
||||
if (cc->flags&CCF_AOT_COMPILE)
|
||||
res->buf=MAlloc(aotc->num_bin_U8s);
|
||||
else {
|
||||
if (aotc->module_org==INVALID_PTR)
|
||||
if (aotc->org==INVALID_PTR)
|
||||
res->buf=MAlloc(aotc->num_bin_U8s,Fs->code_heap);
|
||||
else
|
||||
res->buf=aotc->module_org;
|
||||
res->buf=aotc->org;
|
||||
}
|
||||
res->aot_U8s=aotc->num_bin_U8s;
|
||||
tmpbin=aotc->bin;
|
||||
@@ -143,7 +143,7 @@ CAOT *CmpJoin(CCmpCtrl *cc,I64 cmp_flags,U8 *map_name=NULL,U8 mapfile_drv_let=0)
|
||||
res->abss=aotc->abss;
|
||||
res->heap_glbls=aotc->heap_glbls;
|
||||
res->max_align_bits=aotc->max_align_bits;
|
||||
res->module_org=aotc->module_org;
|
||||
res->org=aotc->org;
|
||||
}
|
||||
cc->aot=parent;
|
||||
MemCpy(&cc->htc,htc,sizeof(CLexHashTableContext));
|
||||
@@ -541,7 +541,7 @@ I64 Cmp(U8 *filename,U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0)
|
||||
#assert sizeof(CBinFile)-2<=I8_MAX
|
||||
bfh->reserved=0;
|
||||
bfh->bin_signature=BIN_SIGNATURE_VAL;
|
||||
bfh->module_org=tmpaot->module_org;
|
||||
bfh->org=tmpaot->org;
|
||||
bfh->module_align_bits=tmpaot->max_align_bits;
|
||||
bfh->patch_table_offset=sizeof(CBinFile)+aot_U8s;
|
||||
bfh->file_size=size;
|
||||
|
||||
@@ -129,10 +129,15 @@ U8 *CmdLinePmt()
|
||||
I64 i;
|
||||
U8 *res,*st;
|
||||
if (Fs->new_answer) {
|
||||
if (Fs->answer_type&~1!=RT_I0) {
|
||||
if (Fs->answer_type==RT_F64)
|
||||
"%8.6fs ansf=%15.7g\n",Fs->answer_time,Fs->answer;
|
||||
else
|
||||
"%8.6fs ans=0x%08X=%d\n",Fs->answer_time,Fs->answer,Fs->answer;
|
||||
} else {
|
||||
"%8.6fs\n",Fs->answer_time;
|
||||
Fs->answer=0;
|
||||
}
|
||||
Fs->new_answer=FALSE;
|
||||
}
|
||||
if (st=DirCur) {
|
||||
|
||||
Binary file not shown.
+77
-78
@@ -49,7 +49,7 @@ $LK,"AOTStoreCodeU64",A="FL:::/Compiler/AsmLib.HC.Z,68",BI=39$
|
||||
$LK,"LexPopNoRestore",A="FL:::/Compiler/LexLib.HC.Z,38",BI=40$
|
||||
$LK,"ExePrint",A="FL:::/Compiler/CMain.HC.Z,605",BI=41$
|
||||
$LK,"SLASH_OP_NEG",A="FL:::/Compiler/BackLib.HC.Z,261"$
|
||||
$LK,"PrsVarLst",A="FL:::/Compiler/PrsVar.HC.Z,416",BI=42$
|
||||
$LK,"PrsVarLst",A="FL:::/Compiler/PrsVar.HC.Z,408",BI=42$
|
||||
$LK,"PrsAsmDefine",A="FL:::/Compiler/Asm.HC.Z,814",BI=43$
|
||||
$LK,"PrsAddOp",A="FL:::/Compiler/PrsExp.HC.Z,15",BI=44$
|
||||
$LK,"LexWarn",A="FL:::/Compiler/CExcept.HC.Z,65",BI=45$
|
||||
@@ -287,7 +287,7 @@ $LK,"ICCopyTemplate",A="FL:::/Compiler/BackFA.HC.Z,77",BI=225$
|
||||
$LK,"PrsStmt",A="FL:::/Compiler/PrsStmt.HC.Z,904",BI=226$
|
||||
$LK,"PrsFun",A="FL:::/Compiler/PrsStmt.HC.Z,140",BI=227$
|
||||
$LK,"LexIncludeStr",A="FL:::/Compiler/Lex.HC.Z,293",BI=228$
|
||||
$LK,"PrsType",A="FL:::/Compiler/PrsVar.HC.Z,287",BI=229$
|
||||
$LK,"PrsType",A="FL:::/Compiler/PrsVar.HC.Z,285",BI=229$
|
||||
$LK,"CmpCtrlNew",A="FL:::/Compiler/Lex.HC.Z,28",BI=230$
|
||||
$LK,"MODR_SIB_D8_INDIRECT_REG",A="FL:::/Compiler/BackLib.HC.Z,131"$
|
||||
$LK,"cmp_type_flags_src_code",A="FL:::/Compiler/Lex.HC.Z,322"$
|
||||
@@ -340,84 +340,83 @@ $LK,"PrsStreamBlk",A="FL:::/Compiler/PrsStmt.HC.Z,805",BI=264$
|
||||
$LK,"MODR_RIP_REL_IMM_U32",A="FL:::/Compiler/BackLib.HC.Z,134"$
|
||||
$LK,"cmp_templates_dont_push2",A="FL:::/Compiler/CExts.HC.Z,44"$
|
||||
$LK,"InstEntryFind",A="FL:::/Compiler/UAsm.HC.Z,66",BI=265$
|
||||
$LK,"PrsDotDotDot",A="FL:::/Compiler/PrsVar.HC.Z,381",BI=266$
|
||||
$LK,"PrsDotDotDot",A="FL:::/Compiler/PrsVar.HC.Z,373",BI=266$
|
||||
$LK,"ICMulEqu",A="FL:::/Compiler/BackA.HC.Z,285",BI=267$
|
||||
$LK,"AsmPrsInsFlags",A="FL:::/Compiler/AsmInit.HC.Z,1",BI=268$
|
||||
$LK,"PrsNoWarn",A="FL:::/Compiler/PrsStmt.HC.Z,791",BI=269$
|
||||
| ||||