diff --git a/TempleOSCD/0000Boot/0000Kernel.BIN.C b/TempleOSCD/0000Boot/0000Kernel.BIN.C index 2f0b1c9..b6fa565 100644 Binary files a/TempleOSCD/0000Boot/0000Kernel.BIN.C and b/TempleOSCD/0000Boot/0000Kernel.BIN.C differ diff --git a/TempleOSCD/Adam/ADefine.HC b/TempleOSCD/Adam/ADefine.HC index 36afc4c..1564d57 100644 --- a/TempleOSCD/Adam/ADefine.HC +++ b/TempleOSCD/Adam/ADefine.HC @@ -18,8 +18,8 @@ U0 LoadDocDefines() //$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","119,909"); -DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","82,011"); +$ID,4$DefinePrint("DD_TEMPLEOS_LOC","120,042"); +DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","82,012"); $ID,-4$ DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR); DefinePrint("DD_MP_VECT_END","%08X", diff --git a/TempleOSCD/Compiler/Compiler.BIN b/TempleOSCD/Compiler/Compiler.BIN index bf85642..a381266 100644 Binary files a/TempleOSCD/Compiler/Compiler.BIN and b/TempleOSCD/Compiler/Compiler.BIN differ diff --git a/TempleOSCD/Compiler/CompilerB.HH b/TempleOSCD/Compiler/CompilerB.HH index 667f88f..76544c0 100644 --- a/TempleOSCD/Compiler/CompilerB.HH +++ b/TempleOSCD/Compiler/CompilerB.HH @@ -11,6 +11,7 @@ public _extern _LAST_FUN I64 LastFun(I64 argc,I64 *argv); public extern I64 RunFile(U8 *name,I64 ccf_flags=0,...); public extern I64 RunFile2(U8 *name,I64 ccf_flags=0,...); public extern CCmpGlbls cmp; + #help_index "Compiler/Directive" #help_file "::/Doc/Directives" public extern Bool Echo(Bool val); @@ -64,7 +65,6 @@ public extern I64 PrsKeyWord(CCmpCtrl *cc); #help_index "Compiler;Cmd Line (Typically)" extern I64 Cmp(U8 *filename, U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0); - #help_index "Debugging/Unassemble" public extern U8 *U(U8 *rip,I64 cnt=20,I64 seg_size=64); public extern U0 Ui(U8 *buf,U8 **_rip,I64 seg_size=64, diff --git a/TempleOSCD/Demo/AcctExample/LightTable.HC b/TempleOSCD/Demo/AcctExample/LightTable.HC new file mode 100644 index 0000000..9a4a08f --- /dev/null +++ b/TempleOSCD/Demo/AcctExample/LightTable.HC @@ -0,0 +1,90 @@ +#define PTS_NUM 1024 + +U0 LightTable() +{ + I64 msg_code,i,x1,y1,x2,y2,arg1,arg2; + CDC *dc=DCAlias; + CD3I32 *c=MAlloc(PTS_NUM*sizeof(CD3I32)); + + MenuPush( + "File {" + " Restart(,'\n');" + " Abort(,CH_SHIFT_ESC);" + " Exit(,CH_ESC);" + "}" + "Edit {" + " Fill(,CH_SPACE);" + "}" + ); + SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$ + Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS- + WIF_SELF_BORDER-WIF_FOCUS_TASK_MENU; + Fs->text_attr=BLACK<<4+WHITE; //Current $LK,"CTask",A="MN:CTask"$ is Fs segment register. + AutoComplete; + WinBorder; + WinMax; + DocCursor; + DocClear; + try { + while (TRUE) { + msg_code=GetMsg(&arg1,&arg2, + 1<color=ROP_XOR+LTRED^TRANSPARENT; + do { + GrLine3(dc,x1,y1,0,x2,y2,0); + msg_code=GetMsg(&arg1,&arg2,1<color=ROP_XOR+WHITE^TRANSPARENT; + do { + c[i].x=arg1; c[i].y=arg2; c[i].z=0; + Gr2BSpline(dc,c,i+1); + msg_code=GetMsg(&arg1,&arg2, + 1<pix_left,ms.pos.y-Fs->pix_top); + break; + case '\n': + DCFill; + break; + case CH_ESC: + case CH_SHIFT_ESC: + goto lt_done; + } + break; + } + } +lt_done: + GetMsg(,,1<depth_buf=NULL in various graphics routines. @@ -437,7 +439,7 @@ $FG,5$$TX+CX,"Misc Notes"$$FG$ Erik van der Karbargenbok: $LK,"TempleBot",A="PI:~/Sup1/Sup1Bin/TempleBot"$. Intel CEO's name: Brian Krzanich >$FG,2$lspci -v$FG$ -Size:$TX,"17378KB",D="DD_TEMPLEOSCD_K_SIZE"$ +Size:$TX,"17380KB",D="DD_TEMPLEOSCD_K_SIZE"$ $FG,5$$TX+CX,"My Web Bookmarks"$$FG$$WW,0$ $TX,"My FireFox Bookmarks",HTML="http://www.templeos.org/Wb/Home/Sup1/Sup1Blog/Bookmarks"$ diff --git a/TempleOSCD/Demo/AcctExample/Registry.HC b/TempleOSCD/Demo/AcctExample/Registry.HC index 80d38dd..bdfbafe 100644 --- a/TempleOSCD/Demo/AcctExample/Registry.HC +++ b/TempleOSCD/Demo/AcctExample/Registry.HC @@ -62,7 +62,7 @@ $ID,-2$$TR,"Titanium"$ $ID,2$I64 best_score=16469; $ID,-2$$TR,"TOSRegen"$ $ID,2$progress1_tf=0.000;progress2_tf=0.000; -progress3_tf=0.000;progress4_tf=199.452; +progress3_tf=0.000;progress4_tf=193.633; $ID,-2$$ID,-2$$TR,"Once"$ $ID,2$$TR,"Adam"$ $ID,2$$ID,-2$$TR,"User"$ diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC index 588d6ab..4d0732a 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC @@ -278,6 +278,7 @@ U0 GodWordBatch(CHexWordForm *gm,I64 radix,I64 digits) {//Insert batch of words from rand hex. I64 i=0,j,k,min; CDirEntry *tmpde,*tmpde1; + U8 *filename; FifoU8Flush(god.fifo); GodHexIns(gm->rnd0); @@ -302,7 +303,11 @@ U0 GodWordBatch(CHexWordForm *gm,I64 radix,I64 digits) } DirTreeDel(tmpde1); } else { - PutFileLink("::/Home/Sup1/Sup1Blog/NumWords1000.TXT"); + if (digits==3) + filename="::/Home/Sup1/Sup1Blog/NumWords1000.TXT"; + else + filename="::/Home/Sup1/Sup1Blog/NumWords10k.TXT"; + PutFileLink(filename); '\n'; } @@ -353,7 +358,7 @@ U0 GodWordBatch(CHexWordForm *gm,I64 radix,I64 digits) if (k<=9) { j=j*10+k; if (!--i) { - "%s\n",DocLineRead("::/Home/Sup1/Sup1Blog/NumWords1000.TXT",j+1); + "%s\n",DocLineRead(filename,j+1); break; } } @@ -514,7 +519,7 @@ public U0 GodIns() GodHeaderIns; "$$TX,\"%$$Q\",HTML=\"%$$Q\"$$\n",tag,tag; switch (PopUpPickLst("ExtDec5Bible\0LinuxWords\0HappyWords\0" - "Words1000\0Hex5Bible\0Hex8Books\0Doodle\0Movie100\0" + "Words1000\0Words10k\0Hex5Bible\0Hex8Books\0Doodle\0Movie100\0" "Painting100\0Painting1000\0Metallica\0")) { case: if (DocForm(gm(CRandExtDec5Form *))) @@ -537,6 +542,10 @@ public U0 GodIns() if (DocForm(gm(CHexWordForm *))) GodWordBatch(gm,10,3); break; + case: + if (DocForm(gm(CHexWordForm *))) + GodWordBatch(gm,10,4); + break; case: if (DocForm(gm(CRandHex5Form *))) { "$$TX,\"How this random Bible passage was chosen.\"," diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC index aa658fe..15c89b0 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC @@ -48,13 +48,14 @@ U0 NISTBeaconURL(I64 timestamp) U0 NISTGodIns1() { tos_type=PopUpPickLst("ExtDec5Bible\0LinuxWords\0HappyWords\0Words1000\0" - "Hex5Bible\0Hex8Books\0Doodle\0Movie100\0Painting100\0Painting1000\0" - "Metallica\0"); + "Words10k\0Hex5Bible\0Hex8Books\0Doodle\0Movie100\0Painting100\0" + "Painting1000\0Metallica\0"); switch (tos_type) { case: tos_timestamp=GodHeaderIns("Bible"); break; case: tos_timestamp=GodHeaderIns("LinuxWords"); break; case: tos_timestamp=GodHeaderIns("HappyWords"); break; case: tos_timestamp=GodHeaderIns("Words1000"); break; + case: tos_timestamp=GodHeaderIns("Words10k"); break; case: tos_timestamp=GodHeaderIns("Bible"); break; case: tos_timestamp=GodHeaderIns("BookPick"); break; case: tos_timestamp=GodHeaderIns("Doodle"); break; @@ -100,6 +101,12 @@ U0 NISTGodIns2() GodWordBatch(gm,10,3); } break; + case: + if (DocForm(gm(CHexWordForm *))) { + NISTBeaconURL(gm->timestamp); + GodWordBatch(gm,10,4); + } + break; case: if (DocForm(gm(CRandHex5Form *))) { "$$TX,\"How this random Bible passage was chosen.\"," diff --git a/TempleOSCD/Demo/Graphics/Doodle.HC b/TempleOSCD/Demo/Graphics/Doodle.HC index c31c629..ea2d38b 100644 --- a/TempleOSCD/Demo/Graphics/Doodle.HC +++ b/TempleOSCD/Demo/Graphics/Doodle.HC @@ -26,13 +26,12 @@ U0 Doodle() x2=arg1; y2=arg2; dc->color=ROP_XOR+color^TRANSPARENT; dc->pen_width=7; - while (msg_code!=MSG_MS_L_UP) { + do { GrLine3(dc,x1,y1,0,x2,y2,0); - msg_code=GetMsg(&arg1,&arg2, - 1<