From 5b8305130b68a457fc9657722e0d84ba783e1588 Mon Sep 17 00:00:00 2001 From: TempleOS-bot Date: Thu, 26 Jan 2017 00:27:26 -0500 Subject: [PATCH] Nightly update (ISO SHA-1 0c4684d) --- TempleOSCD/0000Boot/0000Kernel.BIN.C | Bin 192080 -> 192080 bytes TempleOSCD/Adam/ABlkDev/DskChk.HC | 2 +- TempleOSCD/Adam/ABlkDev/FileMgr.HC | 6 +- TempleOSCD/Adam/AExts.HC | 2 +- TempleOSCD/Adam/DolDoc/DocClipBoard.HC | 32 ++++----- TempleOSCD/Adam/DolDoc/DocCodeTools.HC | 8 +-- TempleOSCD/Adam/DolDoc/DocFind.HC | 6 +- TempleOSCD/Adam/DolDoc/DocLink.HC | 2 +- TempleOSCD/Adam/DolDoc/DocPutKey.HC | 24 +++---- TempleOSCD/Adam/God/GodBible.HC | 6 +- TempleOSCD/Adam/Gr/GrEnd.HC | 14 ++-- TempleOSCD/Adam/Gr/SpriteBitMap.HC | 48 ++++++------- TempleOSCD/Adam/Gr/SpriteEd.HC | 18 ++--- TempleOSCD/Adam/Gr/SpriteMesh.HC | 66 +++++++++--------- TempleOSCD/Adam/Opt/Utils/MemRep.HC | 4 +- TempleOSCD/Apps/Psalmody/Help.DD | 4 +- TempleOSCD/Apps/Psalmody/JukeBox.HC | 4 +- TempleOSCD/Apps/Psalmody/Psalmody.HC | 2 +- TempleOSCD/Apps/Psalmody/PsalmodyFile.HC | 18 ++--- TempleOSCD/Apps/Psalmody/PsalmodyMain.HC | 16 ++--- TempleOSCD/Compiler/Compiler.BIN | Bin 192920 -> 192920 bytes TempleOSCD/Demo/AcctExample/HomeKeyPlugIns.HC | 14 ++-- TempleOSCD/Demo/AcctExample/PersonalNotes.DD | 2 +- TempleOSCD/Demo/AcctExample/Registry.HC | 2 +- .../Demo/AcctExample/TOS/TOSHolySpirit.HC | 4 +- TempleOSCD/Demo/AcctExample/TOS/TOSIns.HC | 2 +- TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC | 2 +- TempleOSCD/Demo/DolDoc/CallBack.HC | 2 +- TempleOSCD/Demo/Dsk/UnusedSpaceRep.HC | 2 +- TempleOSCD/Demo/RevFileDemo/Rev.HC | 4 +- TempleOSCD/Doc/ChgLog.DD | 4 +- TempleOSCD/Doc/DolDocOverview.DD | 2 +- TempleOSCD/Doc/FileMgr.DD | 4 +- TempleOSCD/Doc/Glossary.DD | 1 + TempleOSCD/Doc/Sprite.DD | 2 +- TempleOSCD/Doc/SpriteBitMap.DD | 2 +- TempleOSCD/Doc/SpriteEd.DD | 2 +- TempleOSCD/Doc/Tips.DD | 2 +- TempleOSCD/HomeKeyPlugIns.HC | 14 ++-- TempleOSCD/Kernel/KGlbls.HC | 2 +- TempleOSCD/Kernel/Kernel.MAP | 4 +- TempleOSCD/Kernel/KernelA.HH | 2 +- TempleOSCD/Kernel/KernelC.HH | 5 +- 43 files changed, 183 insertions(+), 179 deletions(-) diff --git a/TempleOSCD/0000Boot/0000Kernel.BIN.C b/TempleOSCD/0000Boot/0000Kernel.BIN.C index 8dedea2c38f50f4d1e3c37925bfbfefecb03fa9a..2f87ab525c4910be91bb68d64035e3e49a457262 100644 GIT binary patch delta 362 zcmca`hx@`E?g=LB+;6uUoww!QypZK0^JX5FmvM|Oo4+N6Dzi*_=*l=?PW^T5b&^LU?{FEj!(|XEQn9ZPu_m=DN{QK#AE=>t%ZpI delta 353 zcmca`hx@`E?g=LBlHPn;=WV$+FJ!sMyqSmPWgO$w&EJwjm04CibY+~bP{1fYIj!v? zW9np!_Sr0Le_RIzj!eJ|NnpUyc?X%j0-ofxIIObDL-$s-A7(VCQa+fzMtMPGEBDl zY|9)H6uG(Pvw;F*$@aCvjQ{l*w`^bQ#5kXy@&0t*AjW#eE!)oqG2Z59)SKMUBD#HF z5~CbD)7Otzl66hxWcI6#r*dO$M(~5O!KT6v$khNF)a~gwA{{Lz*MBo vD6ze1Hq%8#Q4c!?hT_WN_~e|-f~5S!qLlcQ{N(L{dzq3owjX=S)XD(>03D1! diff --git a/TempleOSCD/Adam/ABlkDev/DskChk.HC b/TempleOSCD/Adam/ABlkDev/DskChk.HC index 0410c1d..93d7265 100644 --- a/TempleOSCD/Adam/ABlkDev/DskChk.HC +++ b/TempleOSCD/Adam/ABlkDev/DskChk.HC @@ -421,7 +421,7 @@ I64 FAT32UnusedDrvSpace(U8 drv_let=0) DrvUnlock(dv); return res*BLK_SIZE*dv->spc; } -public I64 UnusedDrvSpace(U8 drv_let=0) +public I64 DrvUnused(U8 drv_let=0) {//Returns unused size in bytes. CDrv *dv=Let2Drv(drv_let),*old_dv=Fs->cur_dv; U8 *old_dir=StrNew(Fs->cur_dir); diff --git a/TempleOSCD/Adam/ABlkDev/FileMgr.HC b/TempleOSCD/Adam/ABlkDev/FileMgr.HC index dd7f812..715b419 100644 --- a/TempleOSCD/Adam/ABlkDev/FileMgr.HC +++ b/TempleOSCD/Adam/ABlkDev/FileMgr.HC @@ -145,7 +145,7 @@ U0 FMRebuildDoc(CDoc **_doc,CDirEntry **_head,I64 mode) { CDrv *dv; I64 i; - CDoc *doc=*_doc,*doc2=sys_clipboard_doc,*parent_doc; + CDoc *doc=*_doc,*doc2=sys_clip_doc,*parent_doc; CFMUncollapsedLst *tmpc=NULL; U8 *cur_entry=NULL,*next_entry=NULL; CDocEntry *doc_ce; @@ -439,7 +439,7 @@ U0 FMBurnISO(CDoc *doc) U0 FMCopy(CDoc *doc) { - CDoc *doc2=sys_clipboard_doc; + CDoc *doc2=sys_clip_doc; U8 *st; CDocEntry *doc_ce=doc->cur_entry,*doc_e; CDirEntry *tmpde,*tmpde1=NULL,*tmpde2; @@ -511,7 +511,7 @@ I64 PopUpFMRight(U8 *header=NULL,U8 *footer=NULL) "$$CM+LX,29,0$$$$BT,\"RENAME \",LE=FMR_RENAME$$" "$$CM+LX,1,3 $$$$BT,\"MAKE DIRECTORY \",LE=FMR_MKDIR$$" "$$CM+LX,29,0$$$$BT,\"PLAIN-TEXT EDIT \",LE=FMR_PLAIN$$" - "$$CM+LX,1,3 $$$$BT,\"PASTE CLIPBOARD FILES \",LE=FMR_PASTE$$" + "$$CM+LX,1,3 $$$$BT,\"PASTE CLIP FILES \",LE=FMR_PASTE$$" "$$CM+LX,29,0$$$$BT,\"CHANGE DISK(MOUNT IT) \",LE=FMR_CHG_DSK$$" "$$CM+LX,1,3 $$$$BT,\"FORMAT \",LE=FMR_FORMAT$$" "$$CM+LX,1,3 $$$$BT,\"MOUNT ISO.C FILE \"," diff --git a/TempleOSCD/Adam/AExts.HC b/TempleOSCD/Adam/AExts.HC index d1728a2..c3307cf 100644 --- a/TempleOSCD/Adam/AExts.HC +++ b/TempleOSCD/Adam/AExts.HC @@ -7,7 +7,7 @@ extern U0 ACMisspelledFind(CDoc *doc); 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 ClipboardDel(); +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); diff --git a/TempleOSCD/Adam/DolDoc/DocClipBoard.HC b/TempleOSCD/Adam/DolDoc/DocClipBoard.HC index 352e75b..a824c93 100644 --- a/TempleOSCD/Adam/DolDoc/DocClipBoard.HC +++ b/TempleOSCD/Adam/DolDoc/DocClipBoard.HC @@ -1,19 +1,19 @@ -#help_index "DolDoc/Clipboard" +#help_index "DolDoc/Clip" -sys_clipboard_doc=DocNew; +sys_clip_doc=DocNew; -public U0 ClipboardDel() -{//Delete everything on clipboard. - DocRst(sys_clipboard_doc,TRUE); +public U0 ClipDel() +{//Delete everything on clip. + DocRst(sys_clip_doc,TRUE); } -public U0 EdCopyToClipboard(CDoc *doc) -{//Copy $LK,"DOCET_SEL",A="MN:DOCET_SEL"$ flagged entries to clipboard. - CDoc *doc2=sys_clipboard_doc; +public U0 ClipCopy(CDoc *doc) +{//Copy $LK,"DOCET_SEL",A="MN:DOCET_SEL"$ flagged entries to clip. + CDoc *doc2=sys_clip_doc; Bool unlock_doc=DocLock(doc), unlock_doc2=DocLock(doc2); CDocEntry *doc_e=doc->head.next,*doc_ne; - ClipboardDel; + ClipDel; while (doc_e!=doc) { if (doc_e->type & DOCET_SEL) { doc_e->type&=~DOCET_SEL; @@ -30,13 +30,13 @@ public U0 EdCopyToClipboard(CDoc *doc) DocUnlock(doc); } -public U0 EdCutToClipboard(CDoc *doc) -{//Remove sel entries and place on clipboard. - CDoc *doc2=sys_clipboard_doc; +public U0 ClipCut(CDoc *doc) +{//Remove sel entries and place on clip. + CDoc *doc2=sys_clip_doc; Bool unlock_doc=DocLock(doc), unlock_doc2=DocLock(doc2); CDocEntry *doc_e=doc->head.next,*doc_e1,*doc_ne,*doc_e2=NULL; - ClipboardDel; + ClipDel; while (doc_e!=doc) { doc_e1=doc_e->next; if (doc_e->type & DOCET_SEL) { @@ -62,9 +62,9 @@ public U0 EdCutToClipboard(CDoc *doc) DocUnlock(doc); } -public U0 EdPasteClipboard(CDoc *doc) -{//Insert copy of clipboard at insert pt, cur_entry. - CDoc *doc2=sys_clipboard_doc; +public U0 ClipPaste(CDoc *doc) +{//Insert copy of clip at insert pt, cur_entry. + CDoc *doc2=sys_clip_doc; Bool unlock_doc=DocLock(doc), unlock_doc2=DocLock(doc2); CDocEntry *doc_ce=doc->cur_entry,*doc_e; diff --git a/TempleOSCD/Adam/DolDoc/DocCodeTools.HC b/TempleOSCD/Adam/DolDoc/DocCodeTools.HC index 8aa27b3..fb3c238 100644 --- a/TempleOSCD/Adam/DolDoc/DocCodeTools.HC +++ b/TempleOSCD/Adam/DolDoc/DocCodeTools.HC @@ -504,7 +504,7 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action,Bool beep=TRUE) case EF_REINDENT: start_y=doc->cur_entry->y; EdReplaceTroubleAll(doc,TRUE,FALSE); - DocLineNumGoTo(doc,start_y+1); + DocGoToLine(doc,start_y+1); if (EdGoToFun(doc,FALSE,FALSE)) { start_y=doc->cur_entry->y; indent=EdRICode(doc); @@ -516,7 +516,7 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action,Bool beep=TRUE) } DocLock(doc); EdRemFunLeadingSpace(doc); - DocLineNumGoTo(doc,start_y+1); + DocGoToLine(doc,start_y+1); doc_e=doc->cur_entry; end_y=start_y+indent->total_cnt; while (start_y<=doc_e->ycur_entry->y; EdReplaceTroubleAll(doc,FALSE,FALSE); - DocLineNumGoTo(doc,start_y+1); + DocGoToLine(doc,start_y+1); break; case EF_RENUM_ASM: if (EdGoToFun(doc,FALSE,TRUE)) { @@ -588,7 +588,7 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action,Bool beep=TRUE) } DocRecalc(doc); - DocLineNumGoTo(doc,goto_line_num); + DocGoToLine(doc,goto_line_num); DocUnlock(doc); if (!unlock) diff --git a/TempleOSCD/Adam/DolDoc/DocFind.HC b/TempleOSCD/Adam/DolDoc/DocFind.HC index 5a3628b..8a0ccbc 100644 --- a/TempleOSCD/Adam/DolDoc/DocFind.HC +++ b/TempleOSCD/Adam/DolDoc/DocFind.HC @@ -1,6 +1,6 @@ #help_index "DolDoc/Editor" -public Bool DocLineNumGoTo(CDoc *doc,I64 line_num) //one based +public Bool DocGoToLine(CDoc *doc,I64 line_num) //one based {//Nearest to specified line num. Move cur_entry & center. Bool res=FALSE,unlock; if (doc) { @@ -30,7 +30,7 @@ U8 *needle,I64 match=1) res=TRUE; doc_e=haystack_doc->head.next; } else { - res=DocLineNumGoTo(haystack_doc,start_line_num); + res=DocGoToLine(haystack_doc,start_line_num); doc_e=haystack_doc->cur_entry; } if (res) { @@ -580,5 +580,5 @@ U0 EdGoToLine(CDoc *doc) CEdLineGoTo gtl; gtl.line=1; if (DocForm(>l)) - DocLineNumGoTo(doc,gtl.line); + DocGoToLine(doc,gtl.line); } diff --git a/TempleOSCD/Adam/DolDoc/DocLink.HC b/TempleOSCD/Adam/DolDoc/DocLink.HC index b8d4887..a4a2f57 100644 --- a/TempleOSCD/Adam/DolDoc/DocLink.HC +++ b/TempleOSCD/Adam/DolDoc/DocLink.HC @@ -127,7 +127,7 @@ Bool DocFileEd(I64 _type,U8 *filename, if (res || other_found) switch (type) { case LK_FILE_LINE: - res=DocLineNumGoTo(doc,*_num); + res=DocGoToLine(doc,*_num); break; case LK_FILE_ANCHOR: res=DocAnchorFind(doc,needle_str); diff --git a/TempleOSCD/Adam/DolDoc/DocPutKey.HC b/TempleOSCD/Adam/DolDoc/DocPutKey.HC index cfed943..c5a7a4f 100644 --- a/TempleOSCD/Adam/DolDoc/DocPutKey.HC +++ b/TempleOSCD/Adam/DolDoc/DocPutKey.HC @@ -182,12 +182,12 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0) if (!(sc&SCF_CTRL)) { if (sc&SCF_KEY_DESC) { if (sc&SCF_SHIFT) - KeyDescSet("Edit/Cut To Clipboard"); + KeyDescSet("Edit/Cut To Clip"); else KeyDescSet("Char /Delete"); } else { if (sc&SCF_SHIFT) - EdCutToClipboard(doc); + ClipCut(doc); else EdCharDel(doc); } @@ -197,16 +197,16 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0) if (sc&(SCF_SHIFT|SCF_CTRL)!=(SCF_SHIFT|SCF_CTRL)) { if (sc&SCF_KEY_DESC) { if (sc&SCF_SHIFT) - KeyDescSet("Edit/Paste Clipboard"); + KeyDescSet("Edit/Paste Clip"); else if (sc&SCF_CTRL) - KeyDescSet("Edit/Copy to Clipboard"); + KeyDescSet("Edit/Copy to Clip"); else KeyDescSet("Edit/Toggle Overstrike"); } else { if (sc&SCF_SHIFT) - EdPasteClipboard(doc); + ClipPaste(doc); else if (sc&SCF_CTRL) - EdCopyToClipboard(doc); + ClipCopy(doc); else doc->flags^=DOCF_OVERSTRIKE; } @@ -383,9 +383,9 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0) case CH_CTRLC: if (!(sc&SCF_SHIFT)) { if (sc&SCF_KEY_DESC) - KeyDescSet("Edit/Copy to Clipboard"); + KeyDescSet("Edit/Copy to Clip"); else - EdCopyToClipboard(doc); + ClipCopy(doc); } break; case CH_CTRLD: @@ -616,9 +616,9 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0) case CH_CTRLV: if (!(sc&SCF_SHIFT)) { if (sc&SCF_KEY_DESC) - KeyDescSet("Edit/Paste Clipboard"); + KeyDescSet("Edit/Paste Clip"); else - EdPasteClipboard(doc); + ClipPaste(doc); } break; case CH_CTRLW: @@ -637,9 +637,9 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0) case CH_CTRLX: if (!(sc&SCF_SHIFT)) { if (sc&SCF_KEY_DESC) - KeyDescSet("Edit/Cut To Clipboard"); + KeyDescSet("Edit/Cut To Clip"); else - EdCutToClipboard(doc); + ClipCut(doc); } break; case CH_CTRLY: diff --git a/TempleOSCD/Adam/God/GodBible.HC b/TempleOSCD/Adam/God/GodBible.HC index 7af696a..8a462ba 100644 --- a/TempleOSCD/Adam/God/GodBible.HC +++ b/TempleOSCD/Adam/God/GodBible.HC @@ -158,7 +158,7 @@ public U8 *BibleLine2Verse(I64 line,I64 separate_ch=CH_SPACE) } if (0<=--icur_entry; while (doc_e!=doc && (doc_e->type_u8!=DOCT_TEXT || !*doc_e->tag)) doc_e=doc_e->next; @@ -222,7 +222,7 @@ public U0 BookLines(CDoc *doc_out=NULL,I64 start,I64 lines, if (!doc_out) doc_out=DocPut; if (doc_out && FileFind(book_filename)) { doc_in=DocRead(book_filename,DOCF_PLAIN_TEXT|DOCF_NO_CURSOR); - DocLineNumGoTo(doc_in,start); //one based + DocGoToLine(doc_in,start); //one based doc_e=doc_in->cur_entry; while (lines>0 && doc_e!=doc_in) { if (doc_e->type_u8==DOCT_TEXT) @@ -255,7 +255,7 @@ public U0 BibleVerse(CDoc *doc_out=NULL,U8 *verse,I64 lines) if (i>=0) { i=Str2I64(DefineSub(i,"ST_BIBLE_BOOK_LINES")); doc_in=DocRead(BIBLE_FILENAME,DOCF_PLAIN_TEXT|DOCF_NO_CURSOR); - DocLineNumGoTo(doc_in,i); //one based + DocGoToLine(doc_in,i); //one based if (*st2) { StrCpy(doc_in->find_replace->find_text,st2); EdFindNext(doc_in); diff --git a/TempleOSCD/Adam/Gr/GrEnd.HC b/TempleOSCD/Adam/Gr/GrEnd.HC index 1cbfe83..891faf3 100644 --- a/TempleOSCD/Adam/Gr/GrEnd.HC +++ b/TempleOSCD/Adam/Gr/GrEnd.HC @@ -10,20 +10,20 @@ U0 CtrlAltZ(I64 sc) CtrlAltCBSet('Z',&CtrlAltZ,"Cmd /Zoom In", "Cmd /Zoom Out"); -U0 Scrn2Clipboard(I64) +U0 Scrn2Clip(I64) { CDC *dc=DCScrnCapture; U8 *elems=DC2Sprite(dc); - Bool unlock_doc=DocLock(sys_clipboard_doc); - ClipboardDel; - DocSprite(sys_clipboard_doc,elems); + Bool unlock_doc=DocLock(sys_clip_doc); + ClipDel; + DocSprite(sys_clip_doc,elems); if (unlock_doc) - DocUnlock(sys_clipboard_doc); + DocUnlock(sys_clip_doc); Free(elems); DCDel(dc); } U0 CtrlAltS(I64) { - Spawn(&Scrn2Clipboard); + Spawn(&Scrn2Clip); } -CtrlAltCBSet('S',&CtrlAltS,"Cmd /Scrn Shot to Clipboard"); +CtrlAltCBSet('S',&CtrlAltS,"Cmd /Scrn Shot to Clip"); diff --git a/TempleOSCD/Adam/Gr/SpriteBitMap.HC b/TempleOSCD/Adam/Gr/SpriteBitMap.HC index 76bacd6..6fa4a74 100644 --- a/TempleOSCD/Adam/Gr/SpriteBitMap.HC +++ b/TempleOSCD/Adam/Gr/SpriteBitMap.HC @@ -75,10 +75,10 @@ I64 PopUpSpriteBitMap(CColorROPU32 color,I64 width) "$$MU-UL,\"Flood Fill Not Color\",LE=SPBM_FLOOD_FILL_NOT$$\n" "$$MU-UL,\"PolyLine\",LE=SPBM_POLYLINE$$\n" "$$MU-UL,\"PolyPoint\",LE=SPBM_POLYPT$$\n" - "\n$$MU-UL,\"Copy to Clipboard\",LE=SPBM_COPY$$\n" - "$$MU-UL,\"Delete to Clipboard\",LE=SPBM_DELETE$$\n" - "$$MU-UL,\"Paste Clipboard\",LE=SPBM_PASTE$$\n" - "$$MU-UL,\"Paste Transparent Clipboard\",LE=SPBM_PASTE_TRANSPARENT$$\n" + "\n$$MU-UL,\"Copy to Clip\",LE=SPBM_COPY$$\n" + "$$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,\"Undo\",LE=SPBM_UNDO$$\n" @@ -208,7 +208,7 @@ I64 SpriteBitMapEd(CDoc *,CDocEntry *doc_e,CDC *dc,I64 *_xx1,I64 *_yy1, U8 *st=NULL; CEdFileName filename; CDC *img=*_img, - *clipboard=NULL,*undo=NULL,*dc2; + *clip=NULL,*undo=NULL,*dc2; SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$ doc_e->de_flags|=DOCEF_DONT_DRAW; @@ -390,14 +390,14 @@ bm_menu: break; case SPBM_PASTE: case SPBM_PASTE_TRANSPARENT: - if (clipboard) { + if (clip) { GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img); if (mode==SPBM_PASTE) { - clipboard->flags|=DCF_NO_TRANSPARENTS; - GrBlot(dc,arg1,arg2,clipboard); - clipboard->flags&=~DCF_NO_TRANSPARENTS; + clip->flags|=DCF_NO_TRANSPARENTS; + GrBlot(dc,arg1,arg2,clip); + clip->flags&=~DCF_NO_TRANSPARENTS; } else { - dc2=DCCopy(clipboard); + dc2=DCCopy(clip); DCColorChg(dc2,bkcolor); GrBlot(dc,arg1,arg2,dc2); DCDel(dc2); @@ -517,14 +517,14 @@ bm_menu: break; case SPBM_PASTE: case SPBM_PASTE_TRANSPARENT: - if (clipboard) { + if (clip) { GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img); if (mode==SPBM_PASTE) { - clipboard->flags|=DCF_NO_TRANSPARENTS; - GrBlot(dc,arg1,arg2,clipboard); - clipboard->flags&=~DCF_NO_TRANSPARENTS; + clip->flags|=DCF_NO_TRANSPARENTS; + GrBlot(dc,arg1,arg2,clip); + clip->flags&=~DCF_NO_TRANSPARENTS; } else { - dc2=DCCopy(clipboard); + dc2=DCCopy(clip); DCColorChg(dc2,bkcolor); GrBlot(dc,arg1,arg2,dc2); DCDel(dc2); @@ -611,9 +611,9 @@ bm_menu: y11=arg2; y22=y1; } - DCDel(clipboard); - clipboard=DCExt(img,x11-xx1,y11-yy1,x22-xx1,y22-yy1); - clipboard->bkcolor=bkcolor; + DCDel(clip); + clip=DCExt(img,x11-xx1,y11-yy1,x22-xx1,y22-yy1); + clip->bkcolor=bkcolor; if (mode==SPBM_DELETE) { img->color=bkcolor; GrRect(img,x11-xx1,y11-yy1,x22-x11+1,y22-y11+1); @@ -629,14 +629,14 @@ bm_menu: break; case SPBM_PASTE: case SPBM_PASTE_TRANSPARENT: - if (clipboard) { + if (clip) { GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img); if (mode==SPBM_PASTE) { - clipboard->flags|=DCF_NO_TRANSPARENTS; - GrBlot(img,arg1-xx1,arg2-yy1,clipboard); - clipboard->flags&=~DCF_NO_TRANSPARENTS; + clip->flags|=DCF_NO_TRANSPARENTS; + GrBlot(img,arg1-xx1,arg2-yy1,clip); + clip->flags&=~DCF_NO_TRANSPARENTS; } else { - dc2=DCCopy(clipboard); + dc2=DCCopy(clip); DCColorChg(dc2,bkcolor); GrBlot(img,arg1-xx1,arg2-yy1,dc2); DCDel(dc2); @@ -665,7 +665,7 @@ bm_menu: bm_key_up_done: GetMsg(,,1<head.next; - while (doc_e2!=sys_clipboard_doc) { + unlock=DocLock(sys_clip_doc); + doc_e2=sys_clip_doc->head.next; + while (doc_e2!=sys_clip_doc) { if (doc_e2->type_u8==DOCT_SPRITE) { head2=Sprite2SpriteQue(doc_e2->bin_data->data); if (head2->next!=head2) { @@ -1249,7 +1249,7 @@ I64 SpriteEd(CDoc *doc,CDocEntry *doc_ce,I64 x,I64 y, doc_e2=doc_e2->next; } if (unlock) - DocUnlock(sys_clipboard_doc); + DocUnlock(sys_clip_doc); SpriteEdUpdate(doc,doc_ce,*_head); break; case SPED_TEXT_ED: diff --git a/TempleOSCD/Adam/Gr/SpriteMesh.HC b/TempleOSCD/Adam/Gr/SpriteMesh.HC index 641eed8..8780594 100644 --- a/TempleOSCD/Adam/Gr/SpriteMesh.HC +++ b/TempleOSCD/Adam/Gr/SpriteMesh.HC @@ -588,33 +588,33 @@ U0 MeshCursorW(CMeshFrame *e,CTask *task,I64 *_x,I64 *_y,I64 *_z) *_x=x; *_y=y; *_z=z; } -CMeshEdVertex sys_clipboard_vertex_head; -CMeshEdTri sys_clipboard_tri_head; +CMeshEdVertex sys_clip_vertex_head; +CMeshEdTri sys_clip_tri_head; -U0 MeshClipboardInit() +U0 MeshClipInit() { - QueInit(&sys_clipboard_vertex_head); - QueInit(&sys_clipboard_tri_head); + QueInit(&sys_clip_vertex_head); + QueInit(&sys_clip_tri_head); } -U0 MeshClipboardRst() +U0 MeshClipRst() { - QueDel(&sys_clipboard_vertex_head,TRUE); - QueDel(&sys_clipboard_tri_head,TRUE); - MeshClipboardInit; + QueDel(&sys_clip_vertex_head,TRUE); + QueDel(&sys_clip_tri_head,TRUE); + MeshClipInit; } -U0 MeshClipboardCopy(CMeshFrame *e) +U0 MeshClipCopy(CMeshFrame *e) { CMeshEdVertex *tmpv=e->vertex_head.next,*tmpv2; CMeshEdTri *tmpt=e->tri_head.next,*tmpt2; - MeshClipboardRst; + MeshClipRst; while (tmpv!=&e->vertex_head) { if (tmpv->flags&VF_SEL) { tmpv->copy=tmpv2=ACAlloc(sizeof(CMeshEdVertex)); MemCpy(&tmpv2->p,&tmpv->p,sizeof(CD3I32)); - QueIns(tmpv2,sys_clipboard_vertex_head.last); + QueIns(tmpv2,sys_clip_vertex_head.last); tmpv->flags|=VF_COPIED; tmpv->flags&=~VF_SEL; } else { @@ -631,7 +631,7 @@ U0 MeshClipboardCopy(CMeshFrame *e) tmpt2->t[1]=tmpt->t[1]->copy; tmpt2->t[2]=tmpt->t[2]->copy; tmpt2->mt.color=tmpt->mt.color; - QueIns(tmpt2,sys_clipboard_tri_head.last); + QueIns(tmpt2,sys_clip_tri_head.last); tmpt->flags|=TF_COPIED; tmpt->flags&=~TF_SEL; } else @@ -640,11 +640,11 @@ U0 MeshClipboardCopy(CMeshFrame *e) } } -U0 MeshClipboardCut(CMeshFrame *e) +U0 MeshClipCut(CMeshFrame *e) { CMeshEdVertex *tmpv=e->vertex_head.next,*tmpv1; CMeshEdTri *tmpt=e->tri_head.next,*tmpt1; - MeshClipboardCopy(e); + MeshClipCopy(e); while (tmpt!=&e->tri_head) { tmpt1=tmpt->next; if (tmpt->flags&TF_COPIED) @@ -659,8 +659,8 @@ U0 MeshClipboardCut(CMeshFrame *e) } } -U0 MeshClipboardDel(CMeshFrame *e) -{//Technically not clipboard +U0 MeshClipDel(CMeshFrame *e) +{//Technically not clip CMeshEdVertex *tmpv=e->vertex_head.next,*tmpv1; CMeshEdTri *tmpt=e->tri_head.next,*tmpt1; while (tmpt!=&e->tri_head) { @@ -677,14 +677,14 @@ U0 MeshClipboardDel(CMeshFrame *e) } } -U0 MeshClipboardPaste(CMeshFrame *e) +U0 MeshClipPaste(CMeshFrame *e) { - CMeshEdVertex *tmpv2=sys_clipboard_vertex_head.next,*tmpv; - CMeshEdTri *tmpt2=sys_clipboard_tri_head.next,*tmpt; + CMeshEdVertex *tmpv2=sys_clip_vertex_head.next,*tmpv; + CMeshEdTri *tmpt2=sys_clip_tri_head.next,*tmpt; MeshVertexSelAll(e,FALSE); MeshTriSelAll(e,FALSE); - while (tmpv2!=&sys_clipboard_vertex_head) { + while (tmpv2!=&sys_clip_vertex_head) { tmpv2->copy=tmpv=CAlloc(sizeof(CMeshEdVertex)); MemCpy(&tmpv->p,&tmpv2->p,sizeof(CD3I32)); QueIns(tmpv,e->vertex_head.last); @@ -692,7 +692,7 @@ U0 MeshClipboardPaste(CMeshFrame *e) tmpv2=tmpv2->next; } - while (tmpt2!=&sys_clipboard_tri_head) { + while (tmpt2!=&sys_clip_tri_head) { tmpt=MeshTriNew(e,tmpt2->mt.color,tmpt2->t[0]->copy, tmpt2->t[1]->copy,tmpt2->t[2]->copy); tmpt->flags|=TF_SEL; @@ -700,7 +700,7 @@ U0 MeshClipboardPaste(CMeshFrame *e) } } -MeshClipboardInit; +MeshClipInit; U0 DrawIt(CTask *task,CDC *dc) { @@ -1088,10 +1088,10 @@ me_restart: switch (arg2.u8[0]) { case SC_DELETE: if (arg2&SCF_SHIFT) - goto me_clipboard_cut; + goto me_clip_cut; else { if (MeshSelCnt(&e)) - MeshClipboardDel(&e); + MeshClipDel(&e); else if (e.ed_mode!='t') MeshVertexDel(&e,MeshVertexFindScrPt(&e, ms.presnap.x-Fs->pix_left-Fs->scroll_x, @@ -1103,9 +1103,9 @@ me_restart: break; case SC_INS: if (arg2&SCF_CTRL) - goto me_clipboard_copy; + goto me_clip_copy; else if (arg2&SCF_SHIFT) - goto me_clipboard_paste; + goto me_clip_paste; } break; case CH_BACKSPACE: @@ -1209,27 +1209,27 @@ me_chain: WinBorder(Bt(&Fs->display_flags,DISPLAYf_NO_BORDER)); break; case CH_CTRLC: -me_clipboard_copy: +me_clip_copy: if (e.ed_mode=='t') { Beep;Beep; } else - MeshClipboardCopy(&e); + MeshClipCopy(&e); break; case CH_CTRLV: -me_clipboard_paste: +me_clip_paste: if (e.ed_mode=='t') { Beep;Beep; } else { - MeshClipboardPaste(&e); + MeshClipPaste(&e); e.ed_mode='m'; } break; case CH_CTRLX: -me_clipboard_cut: +me_clip_cut: if (e.ed_mode=='t') { Beep;Beep; } else - MeshClipboardCut(&e); + MeshClipCut(&e); break; case CH_SHIFT_ESC: save_and_exit=FALSE; diff --git a/TempleOSCD/Adam/Opt/Utils/MemRep.HC b/TempleOSCD/Adam/Opt/Utils/MemRep.HC index 77f16ef..47f2beb 100644 --- a/TempleOSCD/Adam/Opt/Utils/MemRep.HC +++ b/TempleOSCD/Adam/Opt/Utils/MemRep.HC @@ -71,7 +71,7 @@ I64 BlkDevsSize() j=(bd->max_blk+1)<type==BDT_RAM) "RAMDsk %C\t:%010X/%010X\n", - bd->first_drv_let,j-UnusedDrvSpace(bd->first_drv_let),j; + bd->first_drv_let,j-DrvUnused(bd->first_drv_let),j; res+=MSize2(bd->dev_id_record); } } @@ -172,7 +172,7 @@ Bool MemRepTask(CTask *task,Bool override_validate=FALSE) "DskCache\t:%010X\n", MSize2(blkdev.cache_base)+MSize2(blkdev.cache_hash_table)+ MSize2(blkdev.cache_ctrl); - "Clipboard\t:%010X\n",DocSize(sys_clipboard_doc); + "Clip\t:%010X\n",DocSize(sys_clip_doc); "AutoComplete:%010X\n",CallExtStr("AutoCompleteSize"); "gr.to_8_bits\t:%010X\n",MSize2(gr.to_8_bits); "gr.to_8_colors\t:%010X\n",MSize2(gr.to_8_colors); diff --git a/TempleOSCD/Apps/Psalmody/Help.DD b/TempleOSCD/Apps/Psalmody/Help.DD index c396431..9e90edb 100644 --- a/TempleOSCD/Apps/Psalmody/Help.DD +++ b/TempleOSCD/Apps/Psalmody/Help.DD @@ -2,13 +2,13 @@ $WW,1$$FG,5$$TX+CX,"Psalmody Help"$$FG$ * The keyboard can be used as an organ by typing letter keys or clicking the mouse on the keyboard diagram$FG$. You can "record" notes by pressing the red bttn and typing letters. They will appear on the musical staff. You can edit and save them. -* The clipboard can be used to cut and paste. +* The clip can be used to cut and paste. * $FG,2$Psalmody$FG$ uses $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$ files as the song format! See $LK,"::/Apps/Psalmody/Examples/prosper.HC"$. The $FG,2$Psalmody$FG$ program does not fully parse the songs when loading them back in, so changes made outside $FG,2$Psalmody$FG$ will be lost, like if you add graphics. * The first line of the $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$ song files is a comment with a category recognized by $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$(). The categories are $FG,2$"no nothing"$FG$, $FG,2$"has words"$FG$, $FG,2$"has graphics"$FG$, or $FG,2$"special"$FG$. The third character in the song comment is a digit rating number, shown in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$(). You can set the song rating in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$() by pressing $FG,2$0$FG$-$FG,2$9$FG$. You can request your reward from God by pressing $FG,2$r$FG$. You can press $FG,2$$FG$ to delete songs. -* 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$$FG$, but you should do it after pressing $FG,2$$FG$ because the clipboard-insert in $FG,2$$FG$ is screwy. See this $SO,"",A="4qG5EC4BeGG5qCeFD4sB5G4B5G4qG5EC4BeGG5qCeFD4sB5G4B5GqEeEFqE4BeG5FetC4A5GqFCEeEFqE4BeG5FetC4A5GqFC"$ after pressing $FG,2$$FG$, now. +* 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$$FG$, but you should do it after pressing $FG,2$$FG$ because the clip-insert in $FG,2$$FG$ is screwy. See this $SO,"",A="4qG5EC4BeGG5qCeFD4sB5G4B5G4qG5EC4BeGG5qCeFD4sB5G4B5GqEeEFqE4BeG5FetC4A5GqFCEeEFqE4BeG5FetC4A5GqFC"$ after pressing $FG,2$$FG$, now. * You can call $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$("~/Psalmody"); to play your songs. diff --git a/TempleOSCD/Apps/Psalmody/JukeBox.HC b/TempleOSCD/Apps/Psalmody/JukeBox.HC index 05c35d5..e631bfc 100644 --- a/TempleOSCD/Apps/Psalmody/JukeBox.HC +++ b/TempleOSCD/Apps/Psalmody/JukeBox.HC @@ -62,7 +62,7 @@ Bool JBPutKey(CDoc *doc,U8 *,I64 ch,I64 sc) if (StrLen(doc_ce->tag)>1) doc_ce->tag[0]=ch; doc2=DocRead(tmpde->full_name); - DocLineNumGoTo(doc2,1); + DocGoToLine(doc2,1); doc_e=doc2->cur_entry; if (doc_e!=doc2 && doc_e->type_u8==DOCT_TEXT && StrLen(doc_e->tag)>=3) { doc_e->tag[2]=ch; @@ -73,7 +73,7 @@ Bool JBPutKey(CDoc *doc,U8 *,I64 ch,I64 sc) } else if (ch=='r') { if (!DocTreeFFind(tmpde->full_name,"Reward1")) { doc2=DocRead(tmpde->full_name); - DocLineNumGoTo(doc2,2); + DocGoToLine(doc2,2); DocPrint(doc2, "\n$$TR,\"Reward1\"$$\n" "$$ID,2$$CallExtStr(\"JukeReward\",\"\"\n" diff --git a/TempleOSCD/Apps/Psalmody/Psalmody.HC b/TempleOSCD/Apps/Psalmody/Psalmody.HC index 591e10e..569a802 100644 --- a/TempleOSCD/Apps/Psalmody/Psalmody.HC +++ b/TempleOSCD/Apps/Psalmody/Psalmody.HC @@ -50,7 +50,7 @@ class PsmNote class PsmCtrl { PsmNote head; - PsmNote clipboard; + PsmNote clip; CMenuEntry *incomplete_entry,*record_entry; I64 scrn_x,tool; PsmNote *cur_note; diff --git a/TempleOSCD/Apps/Psalmody/PsalmodyFile.HC b/TempleOSCD/Apps/Psalmody/PsalmodyFile.HC index 3d1ac12..7cc8463 100644 --- a/TempleOSCD/Apps/Psalmody/PsalmodyFile.HC +++ b/TempleOSCD/Apps/Psalmody/PsalmodyFile.HC @@ -26,10 +26,10 @@ U0 PsmSongDel(PsmNote *head) QueInit(head); } -U0 PsmCutToClipboard() +U0 PsmCutToClip() { PsmNote *tmpn,*tmpn1; - PsmSongDel(&psm.clipboard); + PsmSongDel(&psm.clip); tmpn=psm.head.next; while (tmpn!=&psm.head) { tmpn1=tmpn->next; @@ -38,33 +38,33 @@ U0 PsmCutToClipboard() psm.cur_note=tmpn->next; QueRem(tmpn); tmpn->flags&=~PSMF_SEL; - QueIns(tmpn,psm.clipboard.last); + QueIns(tmpn,psm.clip.last); } tmpn=tmpn1; } } -U0 PsmPasteClipboard() +U0 PsmPasteClip() { PsmNote *tmpn,*tmpn1; - tmpn=psm.clipboard.next; - while (tmpn!=&psm.clipboard) { + tmpn=psm.clip.next; + while (tmpn!=&psm.clip) { tmpn1=PsmNoteCopy(tmpn); QueIns(tmpn1,psm.cur_note->last); tmpn=tmpn->next; } } -U0 PsmCopyToClipboard() +U0 PsmCopyToClip() { PsmNote *tmpn,*tmpn1; - PsmSongDel(&psm.clipboard); + PsmSongDel(&psm.clip); tmpn=psm.head.next; while (tmpn!=&psm.head) { if (tmpn->flags&PSMF_SEL) { tmpn->flags&=~PSMF_SEL; tmpn1=PsmNoteCopy(tmpn); - QueIns(tmpn1,psm.clipboard.last); + QueIns(tmpn1,psm.clip.last); } tmpn=tmpn->next; } diff --git a/TempleOSCD/Apps/Psalmody/PsalmodyMain.HC b/TempleOSCD/Apps/Psalmody/PsalmodyMain.HC index e9ea601..cbd0ae6 100644 --- a/TempleOSCD/Apps/Psalmody/PsalmodyMain.HC +++ b/TempleOSCD/Apps/Psalmody/PsalmodyMain.HC @@ -369,7 +369,7 @@ U0 Psalmody(U8 *dirname="~/Psalmody") MemSet(&psm,0,sizeof(PsmCtrl)); psm.scrn_x=0; psm.head.next=psm.head.last=&psm.head; - psm.clipboard.next=psm.clipboard.last=&psm.clipboard; + psm.clip.next=psm.clip.last=&psm.clip; psm.cur_note=&psm.head; psm.dc2=DCAlias; @@ -543,7 +543,7 @@ mo_got_msg: break; case SC_DELETE: if (arg2&SCF_SHIFT) - PsmCutToClipboard; + PsmCutToClip; else { tmpn=psm.cur_note; psm.cur_note=tmpn->next; @@ -555,9 +555,9 @@ mo_got_msg: break; case SC_INS: if (arg2&SCF_SHIFT) - PsmPasteClipboard; + PsmPasteClip; else if (arg2&SCF_CTRL) - PsmCopyToClipboard; + PsmCopyToClip; break; case SC_F1: PsmPopMode; @@ -609,13 +609,13 @@ mo_got_msg: PsmPushMode(psm_octave); break; case CH_CTRLC: - PsmCopyToClipboard; + PsmCopyToClip; break; case CH_CTRLV: - PsmPasteClipboard; + PsmPasteClip; break; case CH_CTRLX: - PsmCutToClipboard; + PsmCutToClip; break; case '.': PsmMenu(psm_octave); @@ -786,7 +786,7 @@ mo_done: PutExcept; PsmPopMode; PsmSongDel(&psm.head); - PsmSongDel(&psm.clipboard); + PsmSongDel(&psm.clip); TempoDel(c); DCFill; DCDel(psm.dc2); diff --git a/TempleOSCD/Compiler/Compiler.BIN b/TempleOSCD/Compiler/Compiler.BIN index 2ade2609d254dea1e967520c565187cad9be87b6..599623d0e695ccc8a0644a2ac8c8d2443d84dd19 100644 GIT binary patch delta 117 zcmbR7n0v-!?hVErj6XJ;blhfQWY{dw?GeeiaC797`HZY7nfVMloBuvtp2oWCk1Hd? zfilename.name); if (!StrCmp(st1,st2)) { Free(st1); st1=BibleLine2Verse(DocPut->cur_entry->y+1,','); - DocPrint(sys_clipboard_doc,"$$LK,\"BF:%s\"$$",st1); + DocPrint(sys_clip_doc,"$$LK,\"BF:%s\"$$",st1); } else - DocPrint(sys_clipboard_doc,"$$LK,\"FL:%s,%d\"$$", + DocPrint(sys_clip_doc,"$$LK,\"FL:%s,%d\"$$", st2,DocPut->cur_entry->y+1); Free(st1); Free(st2); @@ -237,11 +237,11 @@ Bool MyPutKey(I64 ch,I64 sc) return TRUE; case 'L': if (sc&SCF_KEY_DESC) - KeyDescSet("Edit/Place Anchor, Put Link to Clipboard"); + KeyDescSet("Edit/Place Anchor, Put Link to Clip"); else { i=RandU32; - ClipboardDel; - DocPrint(sys_clipboard_doc,"$$LK,\"\",A=\"FA:%s,ANC%d\"$$", + ClipDel; + DocPrint(sys_clip_doc,"$$LK,\"\",A=\"FA:%s,ANC%d\"$$", DocPut->filename.name,i); "$$AN,\"\",A=\"ANC%d\"$$",i; } diff --git a/TempleOSCD/Demo/AcctExample/PersonalNotes.DD b/TempleOSCD/Demo/AcctExample/PersonalNotes.DD index a2c9823..1332359 100644 --- a/TempleOSCD/Demo/AcctExample/PersonalNotes.DD +++ b/TempleOSCD/Demo/AcctExample/PersonalNotes.DD @@ -29,7 +29,7 @@ $WW,1$$FG,5$$TX+CX,"TODO"$$FG$ * Cannot include ':' in $LK,"Document Links",A="FF:::/Adam/DolDoc/DocLink.HC,AD"$ search string. * $$DA fixed width string: or permanently shortens. -* 11/19/16 editor took long time after copying old testament onto clipboard and exiting. +* 11/19/16 editor took long time after copying old testament onto clip and exiting. * Nestled switch() start/end? diff --git a/TempleOSCD/Demo/AcctExample/Registry.HC b/TempleOSCD/Demo/AcctExample/Registry.HC index 3e3287a..6cd59d7 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=189.347; +progress3_tf=0.000;progress4_tf=196.256; $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 de8c49e..c5b9fee 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC @@ -178,7 +178,7 @@ U8 *FileDblRead(U8 *filename,I64 line) {//FileDbl's are DolDoc files with 2-line entries. U8 *res=NULL; CDoc *doc=DocRead(filename,DOCF_PLAIN_TEXT_TABS|DOCF_NO_CURSOR); - if (DocLineNumGoTo(doc,line-1) && doc->cur_entry->type_u8==DOCT_TEXT) + if (DocGoToLine(doc,line-1) && doc->cur_entry->type_u8==DOCT_TEXT) res=StrNew(doc->cur_entry->tag); DocDel(doc); return res; @@ -188,7 +188,7 @@ U8 *FileDblWrite(U8 *filename,I64 line,U8 *st) {//FileDbl's are DolDoc files with 2-line entries. U8 *res=NULL; CDoc *doc=DocRead(filename,DOCF_PLAIN_TEXT_TABS|DOCF_NO_CURSOR); - if (DocLineNumGoTo(doc,line-1)) { + if (DocGoToLine(doc,line-1)) { if (doc->cur_entry->type_u8==DOCT_TEXT) { Free(doc->cur_entry->tag); doc->cur_entry->tag=StrNew(st); diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSIns.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSIns.HC index 3582589..f48a341 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSIns.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSIns.HC @@ -9,7 +9,7 @@ U8 *YouTubeGet(U8 *filename="~/Sup1/Sup1Blog/YouTube.DD.Z",U8 *needle) while (DocFind(doc,line,needle)) { if (!(doc->cur_entry->y&1)) { title=doc->cur_entry->tag; - DocLineNumGoTo(doc,doc->cur_entry->y+2); + DocGoToLine(doc,doc->cur_entry->y+2); if (doc->cur_entry->type_u8==DOCT_TEXT) { code=doc->cur_entry->tag; DocPrint(doc2,"$$MU-UL,\"%s\",LE=0x%X$$\n",title,code); diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC index e9eefe6..2f43202 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC @@ -48,7 +48,7 @@ I64 CopyVideo() DelTree("D:/Tmp/ScrnShots"); if (fg_mode==FG_RAM_DRV) { res=CopyTree("B:/Tmp/ScrnShots","D:/Tmp/ScrnShots"); - "Unused Space: %12.6fMeg\n",UnusedDrvSpace('B')/1024.0/1024.0; + "Unused Space: %12.6fMeg\n",DrvUnused('B')/1024.0/1024.0; } else res=CopyTree("::/Tmp/ScrnShots","D:/Tmp/ScrnShots"); "$$BK,1$$Files Copied:%d$$BK,0$$ Time:%8.3fm\n", diff --git a/TempleOSCD/Demo/DolDoc/CallBack.HC b/TempleOSCD/Demo/DolDoc/CallBack.HC index ecb61f5..d580917 100644 --- a/TempleOSCD/Demo/DolDoc/CallBack.HC +++ b/TempleOSCD/Demo/DolDoc/CallBack.HC @@ -39,7 +39,7 @@ U0 DoIt() //$BK,1$WARNING:$BK,0$ If you use the put_doc you //run the risk of the user pressing - // or using the clipboard, both + // or using the clip, both //of which will crash. So, you might want //to use the border_doc. diff --git a/TempleOSCD/Demo/Dsk/UnusedSpaceRep.HC b/TempleOSCD/Demo/Dsk/UnusedSpaceRep.HC index 2fee158..97bc58c 100644 --- a/TempleOSCD/Demo/Dsk/UnusedSpaceRep.HC +++ b/TempleOSCD/Demo/Dsk/UnusedSpaceRep.HC @@ -6,7 +6,7 @@ U0 UnusedSpaceRep() if ((dv=Let2Drv(i+'A',FALSE)) && (dv->fs_type==FSt_FAT32 || dv->fs_type==FSt_REDSEA)) "%C: %7.3f%% Free\n", - Drv2Let(dv),UnusedDrvSpace(Drv2Let(dv))*100.0/(dv->size*BLK_SIZE); + Drv2Let(dv),DrvUnused(Drv2Let(dv))*100.0/(dv->size*BLK_SIZE); } UnusedSpaceRep; diff --git a/TempleOSCD/Demo/RevFileDemo/Rev.HC b/TempleOSCD/Demo/RevFileDemo/Rev.HC index 3d31fe3..49f045a 100644 --- a/TempleOSCD/Demo/RevFileDemo/Rev.HC +++ b/TempleOSCD/Demo/RevFileDemo/Rev.HC @@ -12,9 +12,9 @@ U0 Rev(U8 *in_name,U8 *out_name) DocTop(doc_in); while (doc_in->head.next!=doc_in) { EdLineDown(doc_in,SC_CURSOR_DOWN|SCF_SHIFT); - EdCutToClipboard(doc_in); + ClipCut(doc_in); DocTop(doc_out); - EdPasteClipboard(doc_out); + ClipPaste(doc_out); } DocWrite(doc_out); } diff --git a/TempleOSCD/Doc/ChgLog.DD b/TempleOSCD/Doc/ChgLog.DD index 72adb3c..b26c8d9 100644 --- a/TempleOSCD/Doc/ChgLog.DD +++ b/TempleOSCD/Doc/ChgLog.DD @@ -2,7 +2,9 @@ $WW,1$$FG,5$$TX+CX,"Change Log"$$FG$ Use $LK,"R",A="MN:R"$() to rename if I change a label. -$IV,1$----01/25/17 19:55:36----$IV,0$ +$IV,1$----01/25/17 20:44:17----$IV,0$ +* $LK,"R",A="MN:R"$("DocLineNumGoto","DocGoToLine"); +* $LK,"R",A="MN:R"$("Clipboard","Clip"); * $LK,"R",A="MN:R"$("AutoMountIDE","MountIDEAuto"); * $LK,"R",A="MN:R"$("ChgExt","ExtChg"); * $LK,"R",A="MN:R"$("DftExt","ExtDft"); diff --git a/TempleOSCD/Doc/DolDocOverview.DD b/TempleOSCD/Doc/DolDocOverview.DD index 60ef706..26d0981 100644 --- a/TempleOSCD/Doc/DolDocOverview.DD +++ b/TempleOSCD/Doc/DolDocOverview.DD @@ -165,7 +165,7 @@ You might want to use $LK,"DocPrintAtomic",A="MN:DocPrintAtomic"$(). See $LK,"::/Demo/DolDoc/TreeDemo.HC"$. $ID,-2$$TR,"SP Sprite"$ -$ID,2$Insert a sprite into text with $FG,2$$FG$. The cursor location at the time you press $FG,2$$FG$ is critical because the sprite will be offset from that location. This is important when adding images to programs. Numbers for sprites are automatically chosen because copying to and from the clipboard requires this. You can insert another sprite with the same image by hitting $FG,2$$FG$ and manually adding a $FG,2$$$SP...$$$FG$ entry with the same $FG,2$BI=$FG$ num. +$ID,2$Insert a sprite into text with $FG,2$$FG$. The cursor location at the time you press $FG,2$$FG$ is critical because the sprite will be offset from that location. This is important when adding images to programs. Numbers for sprites are automatically chosen because copying to and from the clip requires this. You can insert another sprite with the same image by hitting $FG,2$$FG$ and manually adding a $FG,2$$$SP...$$$FG$ entry with the same $FG,2$BI=$FG$ num. You can add a text tag to the $FG,2$$$SP...$$$FG$ cmd by manually adding text into the $FG,2$$$SP...$$$FG$ cmd, as in $FG,2$$$SP,"pic 2",BI=2$$$FG$. If you enter a tag of the form $FG,2$"<1>"$FG$ then the number in the tag will be updated to match the $FG,2$BI=$FG$ number. $ID,-2$$TR,"IB Insert Binary"$ diff --git a/TempleOSCD/Doc/FileMgr.DD b/TempleOSCD/Doc/FileMgr.DD index dd9a19d..2ba1706 100644 --- a/TempleOSCD/Doc/FileMgr.DD +++ b/TempleOSCD/Doc/FileMgr.DD @@ -7,10 +7,10 @@ $FG,2$ or $FG$ $ID,2$Delete file or tree. $ID,-2$ $FG,2$ or $FG$ -$ID,2$Copy select files to clipboard. +$ID,2$Copy select files to clip. $ID,-2$ $FG,2$ or $FG$ -$ID,2$Paste clipboard. +$ID,2$Paste clip. $ID,-2$ $FG,2$LEFT-CLICK,drag-drop$FG$ $ID,2$Move a file or tree to a dir. diff --git a/TempleOSCD/Doc/Glossary.DD b/TempleOSCD/Doc/Glossary.DD index 22de6f6..3f41765 100644 --- a/TempleOSCD/Doc/Glossary.DD +++ b/TempleOSCD/Doc/Glossary.DD @@ -25,6 +25,7 @@ $FG,2$CB$FG$ Call-Back, Code Block $FG,2$Cfg$FG$ Config $FG,2$Chg$FG$ Change $FG,2$Chk$FG$ Check +$FG,2$Clip$FG$ Clipboard $FG,2$Clus$FG$ Cluster $FG,2$Cmd$FG$ Command $FG,2$Cmp$FG$ Compiler diff --git a/TempleOSCD/Doc/Sprite.DD b/TempleOSCD/Doc/Sprite.DD index 3318cb9..692f0fa 100644 --- a/TempleOSCD/Doc/Sprite.DD +++ b/TempleOSCD/Doc/Sprite.DD @@ -2,6 +2,6 @@ $WW,1$A $LK,"CSprite",A="MN:CSprite"$ is an ordered list of $LK,"these",A="MN:SP See $LK,"::/Demo/Graphics/SpritePlot.HC"$, $LK,"::/Demo/Graphics/SpritePlot3D.HC"$, $LK,"::/Demo/Graphics/SpritePut.HC"$, $LK,"::/Demo/Graphics/SpriteRaw.HC"$ and $LK,"SpriteMeshEd",A="MN:SpriteMeshEd"$(). -Be aware that copying $FG,2$SP$FG$, $FG,2$IB$FG$, or $FG,2$IS$FG$ entries with the clipboard results in duplicate entries with different nums. You can manually remove dups by editing with $FG,2$$FG$ and setting to the original num. +Be aware that copying $FG,2$SP$FG$, $FG,2$IB$FG$, or $FG,2$IS$FG$ entries with the clip results in duplicate entries with different nums. You can manually remove dups by editing with $FG,2$$FG$ and setting to the original num. See $LK,"::/Adam/Gr/GrSpritePlot.HC",A="FL:::/Adam/Gr/GrSpritePlot.HC,1"$ for how CSprite are stored.$FG$ diff --git a/TempleOSCD/Doc/SpriteBitMap.DD b/TempleOSCD/Doc/SpriteBitMap.DD index 393d158..4f1e582 100644 --- a/TempleOSCD/Doc/SpriteBitMap.DD +++ b/TempleOSCD/Doc/SpriteBitMap.DD @@ -1,5 +1,5 @@ $WW,1$$FG,5$$TX+CX,"Sprite BitMap Menu Help"$$FG$ -BitMaps have a background color. If you delete to the clipboard, what's left will be background colored. +BitMaps have a background color. If you delete to the clip, what's left will be background colored. While drawing, you can usually press $FG,2$'c'$FG$ to eye-dropper the color under the mouse. Press $FG,2$'t'$FG$ for transparent. diff --git a/TempleOSCD/Doc/SpriteEd.DD b/TempleOSCD/Doc/SpriteEd.DD index ef40776..8a962f0 100644 --- a/TempleOSCD/Doc/SpriteEd.DD +++ b/TempleOSCD/Doc/SpriteEd.DD @@ -4,4 +4,4 @@ Order of elements matters. They are executed in the order they appear in the si You can set the current insert point element by clicking the element in the side-bar and making it RED. -$FG,2$Insert Shift Suborigin$FG$ is an element which shifts subsequent elements. Perhaps, you inserted a sprite's elements from the clipboard and want to shift it around? This command is also useful if you call $LK,"SpriteInterpolate",A="MN:SpriteInterpolate"$() in programs. +$FG,2$Insert Shift Suborigin$FG$ is an element which shifts subsequent elements. Perhaps, you inserted a sprite's elements from the clip and want to shift it around? This command is also useful if you call $LK,"SpriteInterpolate",A="MN:SpriteInterpolate"$() in programs. diff --git a/TempleOSCD/Doc/Tips.DD b/TempleOSCD/Doc/Tips.DD index 1b00462..7200f11 100644 --- a/TempleOSCD/Doc/Tips.DD +++ b/TempleOSCD/Doc/Tips.DD @@ -71,7 +71,7 @@ $FG,2$Merge(\"C:/*\",\"D:/*\",\"+r+d\");$FG$ to check my changes. * Use $FG,2$$FG$ to toggle between $LK,"Std Font",A="FI:::/Kernel/FontStd.HC"$ and $LK,"Cyrillic Font",A="FI:::/Kernel/FontCyrillic.HC"$. -* Use $FG,2$$FG$ will capture the scrn as a sprite on the clipboard. You can save the cmd line doc as text with $FG,2$$FG$. +* Use $FG,2$$FG$ will capture the scrn as a sprite on the clip. You can save the cmd line doc as text with $FG,2$$FG$. * You can save a sprite as a $FG,2$.BMP$FG$ file in $FG,2$$FG$ on the Sprite BitMap Menu. diff --git a/TempleOSCD/HomeKeyPlugIns.HC b/TempleOSCD/HomeKeyPlugIns.HC index 6f09e2a..dc7fa10 100644 --- a/TempleOSCD/HomeKeyPlugIns.HC +++ b/TempleOSCD/HomeKeyPlugIns.HC @@ -124,17 +124,17 @@ Bool MyPutKey(I64 ch,I64 sc) return TRUE; case 'l': if (sc&SCF_KEY_DESC) - KeyDescSet("Edit/Put Link to Cur Pos on Clipboard"); + KeyDescSet("Edit/Put Link to Cur Pos on Clip"); else { - ClipboardDel; + ClipDel; st1=FileNameAbs(BIBLE_FILENAME); st2=FileNameAbs(DocPut->filename.name); if (!StrCmp(st1,st2)) { Free(st1); st1=BibleLine2Verse(DocPut->cur_entry->y+1,','); - DocPrint(sys_clipboard_doc,"$$LK,\"BF:%s\"$$",st1); + DocPrint(sys_clip_doc,"$$LK,\"BF:%s\"$$",st1); } else - DocPrint(sys_clipboard_doc,"$$LK,\"FL:%s,%d\"$$", + DocPrint(sys_clip_doc,"$$LK,\"FL:%s,%d\"$$", st2,DocPut->cur_entry->y+1); Free(st1); Free(st2); @@ -142,11 +142,11 @@ Bool MyPutKey(I64 ch,I64 sc) return TRUE; case 'L': if (sc&SCF_KEY_DESC) - KeyDescSet("Edit/Place Anchor, Put Link to Clipboard"); + KeyDescSet("Edit/Place Anchor, Put Link to Clip"); else { i=RandU32; - ClipboardDel; - DocPrint(sys_clipboard_doc,"$$LK,\"\",A=\"FA:%s,ANC%d\"$$", + ClipDel; + DocPrint(sys_clip_doc,"$$LK,\"\",A=\"FA:%s,ANC%d\"$$", DocPut->filename.name,i); "$$AN,\"\",A=\"ANC%d\"$$",i; } diff --git a/TempleOSCD/Kernel/KGlbls.HC b/TempleOSCD/Kernel/KGlbls.HC index ca7209e..d31b1c6 100644 --- a/TempleOSCD/Kernel/KGlbls.HC +++ b/TempleOSCD/Kernel/KGlbls.HC @@ -3,7 +3,7 @@ CJob sys_macro_head; CTask *sys_macro_task; -CDoc *sys_clipboard_doc; +CDoc *sys_clip_doc; CTask *adam_task; I64 sys_num_spawned_tasks; diff --git a/TempleOSCD/Kernel/Kernel.MAP b/TempleOSCD/Kernel/Kernel.MAP index e58af40..3a2a42b 100644 --- a/TempleOSCD/Kernel/Kernel.MAP +++ b/TempleOSCD/Kernel/Kernel.MAP @@ -333,7 +333,6 @@ $LK,"CDoc",A="FL:::/Kernel/KernelA.HH,1353"$ $LK,"MemSetU8",A="FL:::/Kernel/KernelB.HH,178"$ $LK,"_FCLEX",A="FL:::/Kernel/KMathA.HC.Z,646"$ $LK,"_D3_DOT",A="FL:::/Kernel/KMathA.HC.Z,113"$ -$LK,"ARf_CSPRITE_INS_CLIPBOARD",A="FL:::/Kernel/KernelA.HH,3868"$ $LK,"CH_CTRLZ",A="FL:::/Kernel/KernelA.HH,3480"$ $LK,"CHashGeneric",A="FL:::/Kernel/KernelA.HH,725"$ $LK,"SYS_FIND_PCIBIOS_SERVICE_DIR",A="FL:::/Kernel/PCIBIOS.HC.Z,8"$ @@ -690,7 +689,6 @@ $LK,"_LXCHG_I64",A="FL:::/Kernel/KUtils.HC.Z,217"$ $LK,"MDG_DISP_SIB_RIP",A="FL:::/Kernel/KernelA.HH,1585"$ $LK,"DOCEt_BLINK",A="FL:::/Kernel/KernelA.HH,945"$ $LK,"DOCET_BLINK",A="FL:::/Kernel/KernelA.HH,939"$ -$LK,"sys_clipboard_doc",A="FL:::/Kernel/KGlbls.HC.Z,6"$ $LK,"JOBf_DONE",A="FL:::/Kernel/KernelA.HH,3165"$ $LK,"CCF_NO_DEFINES",A="FL:::/Kernel/KernelA.HH,2128"$ $LK,"DOCEf_SKIP_IN_FORM",A="FL:::/Kernel/KernelA.HH,1098"$ @@ -1611,6 +1609,7 @@ $LK,"CDATE_YEAR_DAYS",A="FL:::/Kernel/KernelA.HH,183"$ $LK,"RFLAGf_OVERFLOW",A="FL:::/Kernel/KernelA.HH,316"$ $LK,"SYS_POW",A="FL:::/Kernel/KMathA.HC.Z,462"$ $LK,"StrNICmp",A="FL:::/Kernel/StrA.HC.Z,315"$ +$LK,"ARf_CSPRITE_INS_CLIP",A="FL:::/Kernel/KernelA.HH,3868"$ $LK,"DOCf_NULL_GRAB_SCROLL",A="FL:::/Kernel/KernelA.HH,1311"$ $LK,"DOCEf_RIGHT_X",A="FL:::/Kernel/KernelA.HH,1069"$ $LK,"DOCEF_RIGHT_X",A="FL:::/Kernel/KernelA.HH,981"$ @@ -2455,6 +2454,7 @@ $LK,"HTt_CLASS",A="FL:::/Kernel/KernelA.HH,648"$ $LK,"Cd2DirEntry",A="FL:::/Kernel/BlkDev/DskStrA.HC.Z,221",BI=528$ $LK,"IET_IMM_U0",A="FL:::/Kernel/KernelA.HH,395"$ $LK,"FifoU8Rem",A="FL:::/Kernel/KDataTypes.HC.Z,190",BI=529$ +$LK,"sys_clip_doc",A="FL:::/Kernel/KGlbls.HC.Z,6"$ $LK,"StrLastRem",A="FL:::/Kernel/StrA.HC.Z,604",BI=530$ $LK,"BlkDevAdd",A="FL:::/Kernel/BlkDev/DskAddDev.HC.Z,27",BI=531$ $LK,"REGG_CLOBBERED",A="FL:::/Kernel/KernelA.HH,1787"$ diff --git a/TempleOSCD/Kernel/KernelA.HH b/TempleOSCD/Kernel/KernelA.HH index 7f277b2..e237c21 100644 --- a/TempleOSCD/Kernel/KernelA.HH +++ b/TempleOSCD/Kernel/KernelA.HH @@ -3865,7 +3865,7 @@ public class CDbgGlbls #help_index "Registry" //Registry sys_msg_flags. $LK,"RegOneTimePopUp",A="MN:RegOneTimePopUp"$() #define ARf_FLOODFILL 0 -#define ARf_CSPRITE_INS_CLIPBOARD 1 +#define ARf_CSPRITE_INS_CLIP 1 #define ARf_PLANAR_SYMMETRY 2 #define ARf_PSALMODY_JUKEBOX 3 #define ARf_MESH_ED 4 diff --git a/TempleOSCD/Kernel/KernelC.HH b/TempleOSCD/Kernel/KernelC.HH index 5a3d62a..c880176 100644 --- a/TempleOSCD/Kernel/KernelC.HH +++ b/TempleOSCD/Kernel/KernelC.HH @@ -248,8 +248,8 @@ public extern U8 *Mem64DevAlloc(I64 *_pages1Gig); public extern U0 Mem64DevFree(U8 *base,I64 pages1Gig); public extern CDevGlbls dev; -#help_index "DolDoc/Clipboard" -public extern CDoc *sys_clipboard_doc; +#help_index "DolDoc/Clip" +public extern CDoc *sys_clip_doc; #help_index "DolDoc/Task;StdOut/Task" #help_file "::/Doc/StdOutTask" @@ -488,6 +488,7 @@ public extern U0 XTalk(CTask *task,U8 *fmt,...); public extern U0 XTalkStr(CTask *task,U8 *fmt,...); public extern U0 XTalkStrWait(CTask *task,U8 *fmt,...); public extern U0 XTalkWait(CTask *task,U8 *fmt,...); + #help_index "Job/Text & Msgs;Task/Job/Text & Msgs;Messages" public extern U0 Msg(I64 msg_code,I64 arg1,I64 arg2,I64 flags=0); public extern U0 PostMsg(CTask *task,