Rijn/TempleOS-Rijn
1
1 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TempleOSCD_140715.ISO

Browse Source
This commit is contained in:
Terry A. Davis authored and minexew committed 2018-09-08 21:46:09 +02:00
1 parent 7ef616a20e
commit 64f679eeb9
1095 files changed
+24814 -221011
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Adam/Adam2.CPP
+6 -4
View File
@@ -7,9 +7,10 @@ HashTablePurge(adam_task->hash_table);
//Use Dbg("Type 'G;'"); to debug before window mgr is running.
public F64 os_version=2.03; //Fix here, too: $LK,"::/Demo/AcctExample/DbgAdam2.CPP.Z"$
public F64 os_version=2.11;//Operating system version.
//Fix here, too: $LK,"::/Demo/AcctExample/DbgAdam2.CPP"$
#include "AdamExt.HPP"
#include "AdamExts.HPP"
#include "Math2a"
#include "Training"
#include "Utils2a"
@@ -31,7 +32,7 @@ Cd("::/Adam");;
#include "::/Adam/God/GodExt"
Cd("::/Adam/Doc");;
Cd("::/Adam/DolDoc");;
#include "Doc"
LBts(&sys_run_level,RLf_DOC);
@@ -60,7 +61,7 @@ DocTermNew;
SetWinVert(2,10);
sys_winmgr_task=Spawn(&WinMgrTask,NULL,"Window Mgr");
Fs->win_inhibit=WIG_TASK_DFT-WIF_BORDER-WIF_GRAB_SCROLL-WIF_CTRLS;
Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_BORDER-WIF_SELF_GRAB_SCROLL-WIF_SELF_CTRLS;
LBts(&Fs->display_flags,DISPLAYf_CHILDREN_NOT_ON_TOP);
LBts(&Fs->display_flags,DISPLAYf_SHOW);
SysLogin;
@@ -74,5 +75,6 @@ Cd("::/Adam");;
#exe {OptOff(OPTf_WARN_DUP_TYPES);};
LBts(&sys_run_level,RLf_ADAM2);
#help_index ""
Cd("HOME");;
#include "Adam3"
Adam/AdamExt.HPP → Adam/AdamExts.HPP
+79 -96
View File
@@ -1,110 +1,93 @@
extern Bool win_show_menu;
extern Bool SetWinVert(I64 top,I64 bottom,CTask *task=NULL);
extern Bool SetWinHorz(I64 left,I64 right,CTask *task=NULL);
extern Bool WinToTop(CTask *task=NULL,Bool update_z_buf=TRUE);
extern U0 GrPlot0(CDC *dc,I64 x,I64 y);
extern U8 *DC2Sprite(CDC *tempb);
extern CDocEntry *DocSprite(CDoc *doc,U8 *elems,U8 *fmt=NULL);
extern U0 DrawTaskBorder(CTask *task);
extern U0 DrawCtrls(CTask *task);
extern U0 MgdSliderCtrl(CDoc *doc);
extern U0 WinScrollsInit(CTask *task);
extern Bool BinRep(U8 *filename);
extern I64 PopUp(U8 *msg,CTask *parent=NULL,CTask **_pu_task=NULL);
extern Bool PopUpNoYes(U8 *header=NULL,U8 *footer=NULL);
extern I64 PopUpMenu(CDoc *doc,I64 dof_flags=0);
extern I64 PopUpRangeI64(I64 lo,I64 hi,I64 step=1,U8 *header=NULL,U8 *footer=NULL);
extern I64 PopUpColor(U8 *header=NULL,Bool allow_transpant=TRUE,Bool allow_dft=TRUE);
extern I64 PopUpColorLighting(U8 *header=NULL);
extern I64 PopUpColorDither(U8 *header=NULL);
extern U8 *PopUpMGetS(U8 *header=NULL);
extern Bool PopUpTransform(I64 *r);
extern Bool PopUpForm(U8 *_d,U8 *class_name=lastclass,I64 dof_flags=DOF_MIN_SIZE,
U8 *header=NULL,U8 *footer=NULL);
extern CDoc *DocNew(U8 *filename=NULL,CTask *task=NULL);
extern CDoc *DocRead(U8 *name,I64 flags=0);
extern U0 EdCodeTools(CDoc *doc);
extern U0 ClipboardDel();
extern U0 DocDel(CDoc *doc);
extern U0 DocMax(I64 i=MAX_I32);
extern CDocEntry *DocPrint(CDoc *doc,U8 *src,...);
extern U8 *EdSprite(I64 bin_num);
extern Bool View();
extern U0 AcctOneTimePopUp(I64 flag_num,U8 *msg);
extern I64 AdamFile(U8 *filename,Bool warn_ext=TRUE);
extern I64 BMPFileWrite(U8 *filename,CDC *dc,I64 bits=4);
extern Bool DocLock(CDoc *doc);
extern Bool DocUnlock(CDoc *doc);
extern I64 CDFileCreate(U8 *_filename=NULL,U8 *src_files_find_mask,U8 *fu_flags=NULL,
U8 *_stage2_filename=NULL);
extern U0 ClipboardDel();
extern CCtrl *CtrlFindUnique(CTask *haystack_task,I64 needle_type);
extern Bool CtrlInside(CCtrl *c,I64 x,I64 y);
extern U8 *DC2Sprite(CDC *tempb);
extern U0 DocBMPFile(CDoc *doc=NULL,U8 *filename,Bool use_ms_paint_palette=FALSE);
extern U0 DocBinDel(CDoc *doc,CDocBin *b);
extern U0 DocNewLine(CDoc *doc=NULL,I64 cnt=1);
extern U0 DocInsEntry(CDoc *doc,CDocEntry *doc_e);
extern U0 DocDataFmt(CDocEntry *doc_e);
extern U0 DocDump(CDoc *doc,I64 uS_delay=0);
extern CDocEntry *DocEntryCopy(CDoc *doc,CDocEntry *doc_e);
extern U0 DocInsDoc(CDoc *doc,CDoc *doc2);
extern U0 DocD(U8 *buf,I64 cnt=0x80);
extern Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL);
extern Bool DocFormDo(U8 *_d,U8 *class_name=lastclass,I64 dof_flags=0,U8 *header=NULL,U8 *footer=NULL);
extern CDoc *DocPut(CTask *task=NULL);
extern CDoc *DocDisplay(CTask *task=NULL);
extern U0 DocBinsValidate(CDoc *doc);
extern U0 DocBottom(CDoc *doc=NULL);
extern U0 DocCenter(CDoc *doc=NULL,I64 recalc=DOC_RECALC);
extern U0 DocClear(CDoc *doc=NULL);
extern Bool DocCursor(Bool show=OFF,CDoc *doc=NULL);
extern U0 DocBottom(CDoc *doc=NULL);
extern U0 DocBinsValidate(CDoc *doc);
extern U0 DocHome(CDoc *doc=NULL);
extern U0 DocCenter(CDoc *doc=NULL,I64 recalc=DOC_RECALC_ALL);
extern U0 DocRst(CDoc *doc,Bool is_old);
extern U0 DocUpdateTaskDocs(CTask *task);
extern I64 PmtI64(U8 *msg,I64 dft,I64 lo=MIN_I64,I64 hi=MAX_I64);
extern U0 ClassRep(U8 *_d,U8 *class_name=lastclass,I64 max_depth=2,Bool fun=FALSE,I64 offset=0);
extern U0 DocD(U8 *buf,I64 cnt=0x80);
extern U0 DocDataFmt(CDoc *doc,CDocEntry *doc_e,I64 d=DOCM_CANCEL);
extern U0 DocDel(CDoc *doc);
extern CDoc *DocDisplay(CTask *task=NULL);
extern U0 DocDump(CDoc *doc,I64 uS_delay=0);
extern CDocEntry *DocEntryCopy(CDoc *doc,CDocEntry *doc_e);
extern Bool DocFormDo(U8 *_d,U8 *class_name=lastclass,I64 dof_flags=0,U8 *header=NULL,U8 *footer=NULL);
extern U0 DocHelpIndex(CDoc *doc,U8 *index);
extern U0 DocInsDoc(CDoc *doc,CDoc *doc2);
extern U0 DocInsEntry(CDoc *doc,CDocEntry *doc_e);
extern U8 *DocLinkFile(U8 *link_st,CTask *mem_task=NULL);
extern Bool DocLock(CDoc *doc);
extern U0 DocMax(I64 i=MAX_I32);
extern CDoc *DocNew(U8 *filename=NULL,CTask *task=NULL);
extern CDocEntry *DocPrint(CDoc *doc,U8 *src,...);
extern CDoc *DocPut(CTask *task=NULL);
extern CDoc *DocRead(U8 *name=NULL,I64 flags=0);
extern Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC);
extern U0 DocRst(CDoc *doc,Bool is_old);
extern CDocEntry *DocSprite(CDoc *doc,U8 *elems,U8 *fmt=NULL);
extern U0 DocTop(CDoc *doc=NULL);
extern Bool DocUnlock(CDoc *doc);
extern U0 DocUpdateTaskDocs(CTask *task);
extern U0 DrawCtrls(CTask *task);
extern Bool Ed(U8 *link_st,I64 edf_dof_flags=0);
extern U0 EdCodeTools(CDoc *doc);
extern I64 EdCurU8(CDoc *doc);
extern U0 EdCursorLeft(CDoc *doc,I64 sc=MIN_I64);
extern U0 EdCursorRight(CDoc *doc,I64 sc=MIN_I64);
extern Bool Ed(U8 *link_st,I64 ed_flags=0);
extern U8 *EdSprite(I64 bin_num);
extern I64 GetI64(U8 *msg,I64 dft,I64 lo=MIN_I64,I64 hi=MAX_I64);
extern U0 GrPlot0(CDC *dc,I64 x,I64 y);
extern I64 GrepWiz();
extern CMenuEntry *MenuEntryFind(CMenu *m,U8 *full_name);
extern CMenu *MenuFilePush(U8 *filename);
extern U0 MenuPop();
extern CMenu *MenuPush(U8 *st);
extern CTask *Noise(I64 mS,I64 min_freq,I64 max_freq);
extern Bool Plain(U8 *filename);
extern U0 DocBMPFile(CDoc *doc=NULL,U8 *filename,Bool use_ms_paint_palette=FALSE);
extern U0 WSFillIn(I64 n);
extern U0 WSMan(I64 n,CTask *parent=NULL);
extern U0 WSDFillin(I64 n);
extern U0 WSDDef(I64 n,CTask *parent=NULL);
extern Bool WordStat(Bool val=OFF);
extern U0 WSDDisplayDefs(CDoc *doc,U8 *st,I64 num=-1);
extern U0 WSFindMisspelled(CDoc *doc);
extern U0 DocHelpIndex(CDoc *doc,U8 *index);
extern U0 AcctOneTimePopUp(I64 flag_num,U8 *msg);
extern Bool PopUpOk(U8 *header=NULL,U8 *footer=NULL);
extern I64 PopUp(U8 *msg,CTask *parent=NULL,CTask **_pu_task=NULL);
extern Bool PopUpCancelOk(U8 *header=NULL,U8 *footer=NULL);
extern I64 PopUpColor(U8 *header=NULL,Bool allow_transpant=TRUE,Bool allow_dft=TRUE);
extern I64 PopUpColorDither(U8 *header=NULL);
extern I64 PopUpColorLighting(U8 *header=NULL);
extern I64 PopUpFile(U8 *filename,Bool warn_ext=TRUE,CTask *parent=NULL,CTask **_pu_task=NULL);
extern I64 AdamFile(U8 *filename,Bool warn_ext=TRUE);
extern CTaskSettings *SettingsPush(CTask *task=NULL,I64 flags=0);
extern Bool PopUpForm(U8 *_d,U8 *class_name=lastclass,I64 dof_flags=DOF_MIN_SIZE,
U8 *header=NULL,U8 *footer=NULL);
extern U8 *PopUpGetStr(U8 *header=NULL);
extern I64 PopUpMenu(CDoc *doc,I64 dof_flags=0);
extern Bool PopUpNoYes(U8 *header=NULL,U8 *footer=NULL);
extern Bool PopUpOk(U8 *header=NULL,U8 *footer=NULL);
extern I64 PopUpRangeI64(I64 lo,I64 hi,I64 step=1,U8 *header=NULL,U8 *footer=NULL);
extern Bool PopUpTransform(I64 *r);
extern CDoc *SetCursorPos(CTask *task,I64 ip_text_x,I64 ip_text_y,Bool set_cursor=TRUE);
extern Bool SetWinHorz(I64 left,I64 right,CTask *task=NULL);
extern Bool SetWinVert(I64 top,I64 bottom,CTask *task=NULL);
extern U0 SettingsPop(CTask *task=NULL,I64 flags=0);
extern CTaskSettings *SettingsPush(CTask *task=NULL,I64 flags=0);
extern U0 TemplateSliderCtrl(CDoc *doc);
extern Bool View();
extern U0 ViewAnglesDel(CTask *task=NULL);
extern CCtrl *ViewAnglesNew(CTask *task=NULL);
extern U0 WSDDef(I64 n,CTask *parent=NULL);
extern U0 WSDDefsPut(CDoc *doc,U8 *st,I64 num=-1);
extern U0 WSDFillin(I64 n);
extern U0 WSFillIn(I64 n);
extern U0 WSFindMisspelled(CDoc *doc);
extern U0 WSMan(I64 n,CTask *parent=NULL);
extern Bool WinBorder(Bool val,CTask *task=NULL);
extern U0 WinMax(CTask *task=NULL);
extern U0 WinMgrSync(I64 cnt=1,Bool force=FALSE);
extern U0 WinScrollNull(CTask *task,CD3I64 *s);
extern U0 WinScrollRestore(CTask *task,CD3I64 *s);
extern F64 win_actual_refresh;
extern Bool WinBorder(Bool val,CTask *task=NULL);
extern U0 WinMgrSync(I64 cnt=1,Bool force=FALSE);
extern U0 WinMax(CTask *task=NULL);
extern CDoc *SetCursorPos(CTask *task,I64 iptx,I64 ipty,Bool set_cursor=TRUE);
extern F64 refresh_ode_time,last_refresh_ode_time;
extern CMenuEntry *MenuEntryFind(CMenu *m,U8 *full_name);
extern CMenu *MenuPush(U8 *st);
extern U0 MenuPop();
extern CMenu *MenuFilePush(U8 *filename);
extern CTask *Noise(I64 mS,I64 min_freq,I64 max_freq);
extern CCtrl *CtrlFindUnique(CTask *haystack_task,I64 needle_type);
extern Bool CtrlInside(CCtrl *c,I64 x,I64 y);
extern CCtrl *ViewAnglesNew(CTask *task=NULL);
extern U0 ViewAnglesDel(CTask *task=NULL);
#define FM_NORMAL 0
#define FM_PICK_FILE 1
#define FM_PICK_DIR 2
extern I64 GrepWiz();
extern I64 CDFileCreate(U8 *_filename=NULL,U8 *src_files_find_mask,U8 *fu_flags=NULL,
U8 *_stage2_filename=NULL);
extern U0 WinScrollsInit(CTask *task);
extern Bool WinToTop(CTask *task=NULL,Bool update_z_buf=TRUE);
extern Bool WordStat(Bool val=OFF);
extern CWinMgrGlbls winmgr;
Adam/AutoFile2a.CPP
+64 -68
View File
@@ -1,9 +1,9 @@
#help_index "AutoFile;Training"
public U0 AFPmtStr(U8 *st)
{
public U0 AFGetStr(U8 *st)
{//Wait for user to type certain str.
I64 ch,sc;
U8 buf[136];
U8 buf[256],*st2;
while (*st) {
ch=GetKey(&sc,FALSE);
if (sc.u8[0]!=SC_SHIFT &&
@@ -13,12 +13,9 @@ public U0 AFPmtStr(U8 *st)
'' ch;
st++;
} else {
if (*st=='\n')
SPrint(buf,"Press the '$$GREEN$$<ENTER>$$FG$$' key");
else if (*st==CH_SPACE)
SPrint(buf,"Press the '$$GREEN$$<SPACE BAR>$$FG$$' key");
else
SPrint(buf,"Press the '$$GREEN$$%c$$FG$$' key",*st);
st2=Char2KeyName(*st);
StrPrint(buf,"Press the $$GREEN$$<%s>$$FG$$ key.",st2);
Free(st2);
PopUpOk(buf);
}
}
@@ -26,8 +23,8 @@ public U0 AFPmtStr(U8 *st)
}
public U0 AFPrint(I64 mS=100,U8 *fmt,...)
{
U8 *buf=SPrintJoin(NULL,fmt,argc,argv),*st=buf;
{//Print message with delay after each char.
U8 *buf=StrPrintJoin(NULL,fmt,argc,argv),*st=buf;
I64 ch;
while (ch=*st++) {
'' ch;
@@ -36,106 +33,105 @@ public U0 AFPrint(I64 mS=100,U8 *fmt,...)
Free(buf);
}
public U0 AFGetKey(I64 scancode,I64 sc_mask=0xFF|SCF_SHIFT|SCF_CTRL|SCF_ALT)
{
public U0 AFGetKey(I64 scan_code,I64 sc_mask=0xFF|SCF_SHIFT|SCF_CTRL|SCF_ALT)
{//Wait for user to press certain key.
I64 sc,ch;
U8 buf[128],*st;
do {
ch=GetKey(&sc);
if (sc.u8[0]!=SC_PRTSCRN1 &&
!(sc.u8[0]==SC_SHIFT && scancode&SCF_SHIFT) &&
!(sc.u8[0]==SC_CTRL && scancode&SCF_CTRL) &&
!(sc.u8[0]==SC_ALT && scancode&SCF_ALT) ) {
if (sc&sc_mask!=scancode&sc_mask) {
st=ScanCode2KeyName(scancode);
SPrint(buf,"Press the '$$GREEN$$%s$$FG$$' key",st);
!(sc.u8[0]==SC_SHIFT && scan_code&SCF_SHIFT) &&
!(sc.u8[0]==SC_CTRL && scan_code&SCF_CTRL) &&
!(sc.u8[0]==SC_ALT && scan_code&SCF_ALT) ) {
if (sc&sc_mask!=scan_code&sc_mask) {
st=ScanCode2KeyName(scan_code);
StrPrint(buf,"Press the $$GREEN$$<%s>$$FG$$ key",st);
Free(st);
PopUpOk(buf);
}
}
} while (sc&sc_mask!=scancode&sc_mask);
} while (sc&sc_mask!=scan_code&sc_mask);
Msg(MSG_KEY_DOWN,ch,sc);
}
public U0 AFGetChar(I64 ch1,I64 ch2=0)
{
I64 sc,ch;
U8 buf[256],*st1,*st2;
public I64 AFGetChar(...)
{//Wait for user to press one of set of chars.
I64 i,sc,ch;
U8 buf[512],*st;
while (TRUE) {
ch=GetKey(&sc);
if (sc.u8[0]!=SC_SHIFT &&
sc.u8[0]!=SC_ALT &&
sc.u8[0]!=SC_CTRL) {
if (ch!=ch1 && (!ch2 || ch!=ch2)) {
if (!ch2) {
st1=A2KeyName(ch1);
SPrint(buf,"Press the '$$GREEN$$%s$$FG$$' key",st1);
Free(st1);
} else {
st1=A2KeyName(ch1);
st2=A2KeyName(ch2);
SPrint(buf,"Press the '$$GREEN$$%s$$FG$$' key or\n"
"the '$$GREEN$$%s$$FG$$' key.",st1,st2);
Free(st1);
Free(st2);
if (sc.u8[0]!=SC_SHIFT && sc.u8[0]!=SC_ALT && sc.u8[0]!=SC_CTRL) {
for (i=0;i<argc;i++)
if (ch==argv[i]) {
Msg(MSG_KEY_DOWN,ch,sc);
return ch;
}
PopUpOk(buf);
} else
break;
StrPrint(buf,"Press ");
for (i=0;i<argc;i++) {
st=Char2KeyName(argv[i]);
CatPrint(buf,"$$GREEN$$<%s>$$FG$$",st);
Free(st);
if (argc==i+1)
CatPrint(buf,".");
else if (argc==i+2)
CatPrint(buf," or ");
else
CatPrint(buf,", ");
}
PopUpOk(buf);
}
}
Msg(MSG_KEY_DOWN,ch,sc);
}
public U0 AFUntilKey(I64 scancode,I64 sc_mask=0xFF|SCF_SHIFT|SCF_CTRL|SCF_ALT)
{
public U0 AFUntilKey(I64 scan_code,I64 sc_mask=0xFF|SCF_SHIFT|SCF_CTRL|SCF_ALT)
{//Let user type until he presses certain key.
I64 sc,ch;
do {
ch=GetKey(&sc);
Msg(MSG_KEY_DOWN,ch,sc);
} while (sc&sc_mask!=scancode&sc_mask);
} while (sc&sc_mask!=scan_code&sc_mask);
}
public U0 AFUntilChar(I64 ch1,I64 ch2=0)
{
I64 sc,ch;
do {
public I64 AFUntilChar(...)
{//Let user type until he presses one of set of chars.
I64 i,sc,ch;
while (TRUE) {
ch=GetKey(&sc);
Msg(MSG_KEY_DOWN,ch,sc);
} while (ch!=ch1 && (!ch2 || ch!=ch2));
for (i=0;i<argc;i++)
if (ch==argv[i])
return ch;
}
}
I64 af_l,af_r,af_c;
I64 af_l,af_r;
Bool AFSetIPPlot(I64 mS,I64 x,I64 y,I64 z)
{
SetIP(x,y,z,af_l,af_r,af_c);
SetIP(x,y,z,af_l,af_r);
Sleep(mS);
return TRUE;
}
public U0 AFSetIP(I64 mS=7,I64 x=MAX_I64,I64 y=MAX_I64,I64 z=MAX_I64,I64 l=MAX_I64,I64 r=MAX_I64,I64 c=MAX_I64)
{
if (!(0<=x<gr_width))
x=ipx;
if (!(0<=y<gr_height))
y=ipy;
public U0 AFSetIP(I64 mS=7,I64 x=MAX_I64,I64 y=MAX_I64,I64 z=MAX_I64,I64 l=MAX_I64,I64 r=MAX_I64)
{//Move input pointer (mouse) to spot at certain speed.
if (!(0<=x<GR_WIDTH))
x=ip.pos.x;
if (!(0<=y<GR_HEIGHT))
y=ip.pos.y;
if (z==MAX_I64)
z=ipz;
z=ip.pos.z;
if (!(FALSE<=l<=TRUE))
l=ip_lb;
if (!(FALSE<=c<=TRUE))
c=ip_cb;
l=ip.lb;
if (!(FALSE<=r<=TRUE))
r=ip_rb;
af_l=l; af_r=r; af_c=c;
Line(mS,ipx,ipy,ipz,x,y,z,&AFSetIPPlot);
r=ip.rb;
af_l=l; af_r=r;
Line(mS,ip.pos.x,ip.pos.y,ip.pos.z,x,y,z,&AFSetIPPlot);
}
public Bool AFView()
{
{//Let user type until <ESC> or <SHIFT-ESC>.
Bool result=View;
DocBottom;
return result;
}
#help_index ""
Adam/Boot/BootHD.CPP
+1 -1
View File
@@ -89,4 +89,4 @@ BHD_HISTART:
//Continues here $LK,"::/Kernel/KStart.CPP",A="FL:::/Kernel/KStart.CPP,1"$
BHD_END::
#assert BHD_END-BHD_START<MODULE_SIZE-2
}
}
Adam/Boot/BootMHD2.CPP
-1
View File
@@ -98,7 +98,6 @@ BMHD2_HISTART:
MOV AH,0x42
INT 0x13
POP EBP
POP EDX
POP EBX
Adam/Boot/DskCDDVD.CPP
+10 -17
View File
@@ -12,7 +12,6 @@ U0 FillU32Palindrome(CPalindromeU32 *dst,I64 d)
dst->little=d;
}
class CCCDUserData //Create CD
{
I64 loc,path_entry_num,
@@ -87,7 +86,7 @@ I64 CDFileCreate2(CFile *out_file,CDirEntry *tempde,
if (!write) tempde1->user_data=CAlloc(sizeof(CCCDUserData));
de1=de;
de12=de2;
if (tempde1->attr & _ATTR_DIR) {
if (tempde1->attr & RS_ATTR_DIR) {
n=CDFileCreate2(out_file,tempde1,de,de2,_cur_blk,tempde,write,stage2_filename,_stage2_blk);
de(U8 *)+=sizeof(CISO1DirEntry)-1+n;
de2(U8 *)+=sizeof(CISO1DirEntry)-1+n<<1;
@@ -234,12 +233,11 @@ I64 CDFileCreate2(CFile *out_file,CDirEntry *tempde,
}
I64 CDTableLen(CDirEntry *tempde,I64 *size1,I64 *size2,I64 cur_depth)
//returns depth
{
{//Returns depth
CDirEntry *tempde1=tempde->sub;
I64 max_depth=cur_depth,i;
while (tempde1) {
if (tempde1->attr & _ATTR_DIR) {
if (tempde1->attr & RS_ATTR_DIR) {
*size1+=sizeof(CISO1PathEntry)-2+ (StrLen(tempde1->name)+1)&-0x2;
*size2+=sizeof(CISO1PathEntry)-2+StrLen(tempde1->name)<<1;
i=CDTableLen(tempde1,size1,size2,cur_depth+1);
@@ -262,7 +260,7 @@ U0 CDFillPathTable(CDirEntry *tempde,
if (cur_level==output_level) {
while (tempde1) {
if (tempde1->attr & _ATTR_DIR) {
if (tempde1->attr & RS_ATTR_DIR) {
tempc=tempde1->user_data;
tempc->path_entry_num=*first_free;
tabbuf->name_len=StrLen(tempde1->name);
@@ -303,7 +301,7 @@ U0 CDFillPathTable(CDirEntry *tempde,
tempde1=tempde->sub;
while (tempde1) {
tempde2=tempde1->next;
if (tempde1->attr & _ATTR_DIR) {
if (tempde1->attr & RS_ATTR_DIR) {
tempc=tempde1->user_data;
CDFillPathTable(tempde1,_itabbuf,_itabbuf2,tempc->path_entry_num,
big_endian,first_free,cur_level+1,output_level);
@@ -327,12 +325,9 @@ class CElTorito
public I64 CDFileCreate(U8 *_filename=NULL,U8 *src_files_find_mask,U8 *fu_flags=NULL,
U8 *_stage2_filename=NULL)
//See $LK,"::/Misc/MakeDistro.CPP"$
{//See $LK,"::/Misc/MakeDistro.CPP"$
//Use "C:/Distro/*" if you want all files in the C:/Distro directory.
//Default flags are "+r" recurse.
{
CISO1PriDesc *iso_pri=CAlloc(CD_BLK_SIZE),
*iso_boot=CAlloc(CD_BLK_SIZE),
*iso_sup=CAlloc(CD_BLK_SIZE),
@@ -355,7 +350,7 @@ public I64 CDFileCreate(U8 *_filename=NULL,U8 *src_files_find_mask,U8 *fu_flags=
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
if (!_filename)
_filename=sys_dft_iso_name;
_filename=dsk.dft_iso_filename;
filename=DftExt(_filename,"ISO");
if (_stage2_filename)
@@ -363,7 +358,7 @@ public I64 CDFileCreate(U8 *_filename=NULL,U8 *src_files_find_mask,U8 *fu_flags=
else
stage2_filename=NULL;
rootdir->attr=_ATTR_DIR;
rootdir->attr=RS_ATTR_DIR;
rootdir->sub=FilesFind(src_files_find_mask,fuf_flags);
rootdir->datetime=Now;
rootdir->user_data=CAlloc(sizeof(CCCDUserData));
@@ -387,7 +382,7 @@ public I64 CDFileCreate(U8 *_filename=NULL,U8 *src_files_find_mask,U8 *fu_flags=
tabsize2=(tabsize2+CD_BLK_SIZE-1)/CD_BLK_SIZE;
cur_blk+=tabsize2<<1;
if (FileAttr(filename) & _ATTR_CONTIGUOUS)
if (FileAttr(filename) & RS_ATTR_CONTIGUOUS)
out_file=FOpen(filename,"wc",cur_blk<<2);
else
out_file=FOpen(filename,"w",cur_blk<<2);
@@ -468,7 +463,6 @@ public I64 CDFileCreate(U8 *_filename=NULL,U8 *src_files_find_mask,U8 *fu_flags=
FWBlks(out_file,tabbuf2,cur_blk<<2,tabsize2<<2);
cur_blk+=tabsize2;
MemSet(tabbuf,0,tabsize*CD_BLK_SIZE);
iso_pri->type_m_path_table=EndianU32(cur_blk);
tabbuf->name_len=2; //Fill-in adam entry
@@ -493,7 +487,7 @@ public I64 CDFileCreate(U8 *_filename=NULL,U8 *src_files_find_mask,U8 *fu_flags=
FWBlks(out_file,tabbuf2,cur_blk<<2,tabsize2<<2);
cur_blk+=tabsize2;
DirLstDel2(rootdir);
DirTreeDel2(rootdir);
FillU32Palindrome(&iso_pri->vol_space_size,cur_blk);
FillU32Palindrome(&iso_sup->vol_space_size,cur_blk);
FWBlks(out_file,iso_pri,16<<2,4);
@@ -532,4 +526,3 @@ cf_done:
Free(iso_term);
return cur_blk;
}
#help_index ""
Adam/Boot/InsBoot.CPP
+15 -23
View File
@@ -34,7 +34,7 @@ _HI_CALL::
CALL RAX
@@05: POP RBP
RET1 8
// ************************************
//************************************
_HI_MEMCPY::
PUSH RBP
MOV RBP,RSP
@@ -55,10 +55,8 @@ _extern _HI_CALL I64 HiCall(U8 *s);
_extern _HI_MEMCPY U8 *HiMemCpy(U8 *dst,U8 *src,I64 cnt);
#help_index "Boot"
public U0 SoftBoot(U8 *filename) //No hardware rst
//Specify the Kernel binary file you
//wish to boot.
{
public U0 SoftBoot(U8 *filename)
{//Softboot Kernel Bin file. No hardware reset.
I64 size;
CKernel *hi_image,*lo_image=sys_boot_base-sizeof(CBinFile),
reg *shutdown,*hi_image2;
@@ -70,7 +68,7 @@ public U0 SoftBoot(U8 *filename) //No hardware rst
Free(hi_image2);
hi_image->boot_base=lo_image(U8 *)+sizeof(CBinFile);
hi_image->boot_patch_table_base=lo_image(U8 *)+hi_image->h.loader_patch_table_offset;
hi_image->boot_patch_table_base=lo_image(U8 *)+hi_image->h.patch_table_offset;
HiMemCpy(&hi_image->sys_mem_E801,&lo_image->sys_mem_E801,2*2);
HiMemCpy(&hi_image->sys_mem_E820,&lo_image->sys_mem_E820,MEM_NUM_E820_ENTRIES*MEM_E820_ENTRY_SIZE);
hi_image->sys_gr_mode=lo_image->sys_gr_mode;
@@ -101,7 +99,7 @@ U8 ChkWritable(U8 drv_let=0)
do {
"Enter RAM drive (usually 'B') for temporary files:";
writable_drv=ToUpper(GetChar);
NewLine;
'\n';
p=Drv2Prt(writable_drv);
bdev=p->bdev;
if (bdev->type!=BDT_RAM ||
@@ -112,24 +110,20 @@ U8 ChkWritable(U8 drv_let=0)
} while (cont);
if (drv_let!=writable_drv) {
Fmt(writable_drv,FALSE,FALSE);
SPrint(buf_s,"%c:/",drv_let);
SPrint(buf_d,"%c:/",writable_drv);
StrPrint(buf_s,"%c:/",drv_let);
StrPrint(buf_d,"%c:/",writable_drv);
CopyTree(buf_s,buf_d);
}
}
return writable_drv;
}
#help_index "Install"
public U0 MakeAll()
//Call from $LK,"MakeOSPrtBootInstall",A="MN:MakeOSPrtBootInstall"$() because loader must be patched with block address.
{//Use $LK,"MakeOSPrtBootInstall",A="MN:MakeOSPrtBootInstall"$. Loader must be patched.
//These 2 modules (and bootloaders at top) are the only AOT
//compiled code in TempleOS. Everything else is JIT.
//You are doing it wrong if you make AOT compiled code.
{
Cd("/Compiler");
if (Cmp("Compiler","Compiler",,':'))
throw;
@@ -139,17 +133,17 @@ public U0 MakeAll()
}
public Bool MakeOSPrtBootInstall(U8 src_drv=0,U8 dst_drv=0)
{//Make All and install new boot-loader.
{// Does $LK,"MakeAll",A="MN:MakeAll"$ and installs new boot-loader.
//Normally, you just supply a src_drv. It will compile
//the code on that drive and update the boot sect.
//If you are making a bootable CD-ROM you supply a dst_drv.
//If you are making a bootable CD-ROM, you supply a dst_drv.
//See $LK,"::/Misc/MakeDistro.CPP"$
//See $LK,"Install Documentation",A="FI:::/Doc/Install.TXT"$
//Study my account examples my technique $LK,"Cfg Strs",A="FL:::/Demo/AcctExample/TSAdam.CPP,1"$ $LK,"Update Funs",A="FL:::/Demo/AcctExample/TSDistro.CPP,1"$
//Study my account examples my technique: $LK,"Cfg Strs",A="FL:::/Demo/AcctExample/TSAdam.CPP,1"$ $LK,"Update Funs",A="FL:::/Demo/AcctExample/TSDistro.CPP,1"$
CBlkDev *bdev;
CPrt *p;
@@ -205,7 +199,6 @@ public Bool MakeOSPrtBootInstall(U8 src_drv=0,U8 dst_drv=0)
return result;
}
public U0 MasterBootOldRead(U8 src_drv,U8 dst_drv)
{//Reads MBR from disk drive containing src partition.
//Writes a single blk file to dst /0000Boot directory.
@@ -229,7 +222,7 @@ public U0 MasterBootOldRead(U8 src_drv,U8 dst_drv)
}
public U0 MasterBootOldWrite(U8 src_drv,U8 dst_drv)
{ //Reads OldMBR from src drive /0000Boot directory
{//Reads OldMBR from src drive /0000Boot directory
//writes it to the MBR of the drive with dst partition.
CBlkDev *bdev=Drv2BlkDev(dst_drv);
CMasterBoot *mbr;
@@ -244,7 +237,7 @@ public U0 MasterBootOldWrite(U8 src_drv,U8 dst_drv)
}
public U0 MasterBootZero(U8 dst_drv)
{ //Set MBR of disk with dst partition to zero.
{//Set MBR of disk with dst partition to zero.
//This is dangerous!!
//The TempleOS partitioner doesn't play well
@@ -261,7 +254,7 @@ public U0 MasterBootZero(U8 dst_drv)
}
public Bool MasterBootIntall(U8 drv_let,U8 *drv_lst=NULL)
{ //Create new MBR on the disk that has drv_let as a partition.
{//Create new MBR on the disk that has drv_let as a partition.
//Puts stage 2 in /0000Boot dir of drv_let.
CBlkDev *bdev,*bdev1;
CPrt *p,*p1;
@@ -293,7 +286,7 @@ public Bool MasterBootIntall(U8 drv_let,U8 *drv_lst=NULL)
_q=BMHD2_BLK_ARRAY;
MemSet(_q,0,sizeof(I64)*8);
menu_ptr=BMHD2_BOOT_MSG;
SPrint(menu_ptr,"\n\r\n\rTempleOS Boot Loader\n\r\n\r");
StrPrint(menu_ptr,"\n\r\n\rTempleOS Boot Loader\n\r\n\r");
j=0;
if (FileFind(OLDMBR_BIN_C,&de,FUF_JUST_FILES)) {
Free(de.full_name);
@@ -351,4 +344,3 @@ public Bool MasterBootIntall(U8 drv_let,U8 *drv_lst=NULL)
PutExcept;
return result;
}
#help_index ""
Adam/Ctrls/Ctrls.CPP
-2
View File
@@ -4,5 +4,3 @@
#include "Ctrls2a"
#include "CtrlsButton"
#include "CtrlsSlider"
#help_index ""
Adam/Ctrls/Ctrls2a.CPP
+17 -21
View File
@@ -1,5 +1,5 @@
public CCtrl *CtrlFindUnique(CTask *haystack_task,I64 needle_type)
{
{//Find task ctrl givin $LK,"ctrl_type",A="MN:CTRLT_VIEWING_ANGLES"$.
CCtrl *c;
Bool old_preempt=Preempt(OFF);
c=haystack_task->next_ctrl;
@@ -23,15 +23,15 @@ U0 CtrlsUpdate(CTask *task)
if (c->update_derived_vals)
(*c->update_derived_vals)(c);
if (c->flags&CTRLF_BORDER) {
c->screen_left =gr_pan_text_x+task->pix_left+c->left-FONT_WIDTH;
c->screen_right =gr_pan_text_x+task->pix_left+c->right-FONT_WIDTH;
c->screen_top =gr_pan_text_y+task->pix_top+c->top-FONT_HEIGHT;
c->screen_bottom=gr_pan_text_y+task->pix_top+c->bottom-FONT_HEIGHT;
c->screen_left =gr.pan_text_x+task->pix_left+c->left-FONT_WIDTH;
c->screen_right =gr.pan_text_x+task->pix_left+c->right-FONT_WIDTH;
c->screen_top =gr.pan_text_y+task->pix_top+c->top-FONT_HEIGHT;
c->screen_bottom=gr.pan_text_y+task->pix_top+c->bottom-FONT_HEIGHT;
} else {
c->screen_left =gr_pan_text_x+task->pix_left+c->left;
c->screen_right =gr_pan_text_x+task->pix_left+c->right;
c->screen_top =gr_pan_text_y+task->pix_top+c->top;
c->screen_bottom=gr_pan_text_y+task->pix_top+c->bottom;
c->screen_left =gr.pan_text_x+task->pix_left+c->left;
c->screen_right =gr.pan_text_x+task->pix_left+c->right;
c->screen_top =gr.pan_text_y+task->pix_top+c->top;
c->screen_bottom=gr.pan_text_y+task->pix_top+c->bottom;
}
c=c->next;
}
@@ -40,7 +40,6 @@ U0 CtrlsUpdate(CTask *task)
fp_update_ctrls=&CtrlsUpdate;
Bool CtrlInsideRect(CCtrl *c,I64 x,I64 y)
{//screen coordinates
if (c->screen_left<=x<=c->screen_right &&
@@ -51,7 +50,7 @@ Bool CtrlInsideRect(CCtrl *c,I64 x,I64 y)
}
public Bool CtrlInside(CCtrl *c,I64 x,I64 y)
{
{//Is x,y inside a ctrl?
if (c->flags&CTRLF_SHOW) {
if (c->inside_ctrl)
return (*c->inside_ctrl)(c,x,y);
@@ -64,7 +63,7 @@ public Bool CtrlInside(CCtrl *c,I64 x,I64 y)
U0 DrawCtrls(CTask *task)
{
CCtrl *c;
CDC *dc=DCAlias(gr_dc2,task);
CDC *dc=DCAlias(gr.dc2,task);
Bool old_preempt=Preempt(OFF);
c=task->next_ctrl;
while (c!=&task->next_ctrl) {
@@ -112,7 +111,6 @@ U0 DrawCtrls(CTask *task)
DCDel(dc);
}
#define WIN_SCROLL_SIZE 8
#define WIN_SCROLL_BORDER_BONUS 4
U0 DrawWinScroll(CDC *dc,CCtrl *c)
@@ -147,15 +145,15 @@ U0 WinDerivedScrollValsUpdate(CCtrl *c)
if (!range) range=1;
switch (c->type) {
case CTRLT_WIN_HSCROLL:
c->left =gr_pan_text_x+FONT_WIDTH-WIN_SCROLL_BORDER_BONUS+(s->pos-s->min)*(c->win_task->pix_width+2*WIN_SCROLL_BORDER_BONUS-WIN_SCROLL_SIZE)/range;
c->left =gr.pan_text_x+FONT_WIDTH-WIN_SCROLL_BORDER_BONUS+(s->pos-s->min)*(c->win_task->pix_width+2*WIN_SCROLL_BORDER_BONUS-WIN_SCROLL_SIZE)/range;
c->right =c->left+WIN_SCROLL_SIZE-1;
c->top =gr_pan_text_y+FONT_HEIGHT+(FONT_WIDTH-WIN_SCROLL_SIZE)/2+c->win_task->pix_height;
c->top =gr.pan_text_y+FONT_HEIGHT+(FONT_WIDTH-WIN_SCROLL_SIZE)/2+c->win_task->pix_height;
c->bottom=c->top+WIN_SCROLL_SIZE-1;
break;
case CTRLT_WIN_VSCROLL:
c->left =gr_pan_text_x+FONT_WIDTH+(FONT_WIDTH-WIN_SCROLL_SIZE)/2+c->win_task->pix_width;
c->left =gr.pan_text_x+FONT_WIDTH+(FONT_WIDTH-WIN_SCROLL_SIZE)/2+c->win_task->pix_width;
c->right =c->left+WIN_SCROLL_SIZE-1;
c->top =gr_pan_text_y+FONT_HEIGHT-WIN_SCROLL_BORDER_BONUS+(s->pos-s->min)*(c->win_task->pix_height+2*WIN_SCROLL_BORDER_BONUS-WIN_SCROLL_SIZE)/range;
c->top =gr.pan_text_y+FONT_HEIGHT-WIN_SCROLL_BORDER_BONUS+(s->pos-s->min)*(c->win_task->pix_height+2*WIN_SCROLL_BORDER_BONUS-WIN_SCROLL_SIZE)/range;
c->bottom=c->top+WIN_SCROLL_SIZE-1;
break;
}
@@ -280,7 +278,6 @@ U0 DrawViewAnglesCtrl(CDC *dc,CCtrl *c)
dc->color=s->cx^8;
GrRect(dc,i-2,j-1,5,3);
dc->color=s->cy;
GrPrint(dc,c->left+2*VIEWANGLES_SPACING+1-FONT_WIDTH/2,
c->top+VIEWANGLES_SPACING-(1+FONT_HEIGHT),"Y");
@@ -297,7 +294,6 @@ U0 DrawViewAnglesCtrl(CDC *dc,CCtrl *c)
dc->color=s->cy^8;
GrRect(dc,i-2,j-1,5,3);
dc->color=s->cz;
GrPrint(dc,c->left+3*VIEWANGLES_SPACING+2-FONT_WIDTH/2,
c->top+VIEWANGLES_SPACING-(1+FONT_HEIGHT),"Z");
@@ -350,7 +346,7 @@ U0 LeftClickViewAngles(CCtrl *c,I64 x,I64 y,Bool)
}
public CCtrl *ViewAnglesNew(CTask *task=NULL)
{
{//Create view angle ctrl. See $LK,"::/Demo/Graphics/Shading.CPP.Z"$.
Bool old_preempt;
CCtrl *c;
CViewAngles *s;
@@ -380,7 +376,7 @@ public CCtrl *ViewAnglesNew(CTask *task=NULL)
}
public U0 ViewAnglesDel(CTask *task=NULL)
{
{//Free view angle ctrl.
CCtrl *c;
Bool old_preempt=Preempt(OFF);
if (!task) task=Fs;
Adam/Ctrls/CtrlsButton.CPP
+7 -7
View File
@@ -1,4 +1,4 @@
#define BUTTON_BORDER 2
#define BUTTBORDER 2
#define BTF_DONT_FREE 1
@@ -21,8 +21,8 @@ U0 DrawCtrlButton(CDC *dc,CCtrl *c)
st=s->state_texts;
dc->color=s->state_colors[s->state];
l=StrLen(st);
GrRect(dc,c->left+BUTTON_BORDER,c->top+BUTTON_BORDER,
c->right-c->left+1-BUTTON_BORDER*2,c->bottom-c->top+1-BUTTON_BORDER*2);
GrRect(dc,c->left+BUTTBORDER,c->top+BUTTBORDER,
c->right-c->left+1-BUTTBORDER*2,c->bottom-c->top+1-BUTTBORDER*2);
dc->color=s->state_colors[s->state]^(WHITE<<16+WHITE);
GrPrint(dc,(c->left+c->right+1-l*FONT_WIDTH)>>1,
(c->top+c->bottom+1-FONT_HEIGHT)>>1,"%s",st);
@@ -40,7 +40,7 @@ U0 LeftClickCtrlButton(CCtrl *c,I64,I64,Bool down)
public CCtrl *CtrlButtonNew(I64 x,I64 y,I64 width=-1,I64 height=-1,
I64 num_states=1,U8 *state_texts,I32 state_colors[],CCtrlButtonState *_s=NULL)
{
{//Create button ctrl. See $LK,"::/Apps/Strut/Strut.CPP.Z"$.
Bool old_preempt;
CCtrl *result;
CCtrlButtonState *s;
@@ -53,9 +53,9 @@ public CCtrl *CtrlButtonNew(I64 x,I64 y,I64 width=-1,I64 height=-1,
j=StrLen(st);
if (j>l) l=j;
}
width=BUTTON_BORDER*4+l*FONT_WIDTH;
width=BUTTBORDER*4+l*FONT_WIDTH;
}
if (height<0) height=BUTTON_BORDER*4+FONT_HEIGHT;
if (height<0) height=BUTTBORDER*4+FONT_HEIGHT;
result=CAlloc(sizeof(CCtrl));
if (_s) {
s=_s;
@@ -84,7 +84,7 @@ public CCtrl *CtrlButtonNew(I64 x,I64 y,I64 width=-1,I64 height=-1,
}
public U0 CtrlButtonDel(CCtrl *c)
{
{//Free button ctrl.
Bool old_preempt=Preempt(OFF);
QueRem(c);
Preempt(old_preempt);
Adam/Ctrls/CtrlsSlider.CPP
+18 -21
View File
@@ -1,40 +1,39 @@
class CMgdSCSlider
class CTemplateSCSlider
{
CMgdSCSlider *next,*last;
CTemplateSCSlider *next,*last;
U8 *name;
I64 num;
};
class CMgdSC
class CTemplateSC
{
CMgdSCSlider *next_slider,*last_slider;
CTemplateSCSlider *next_slider,*last_slider;
I64 num_sliders,range,spacing,border;
U8 *glbl_name;
};
CMgdSC *PmtSliderCtrl()
CTemplateSC *GetSliderCtrl()
{
CMgdSCSlider *temps;
CTemplateSCSlider *temps;
U8 *st,pmt[136];
CMgdSC *result=CAlloc(sizeof(CMgdSC));
CTemplateSC *result=CAlloc(sizeof(CTemplateSC));
"$$PURPLE$$Slider Ctrl$$FG$$\n\n";
result->glbl_name=PmtStr("Glbl Struct Name (ENTER for No Glbl):");
result->range=PmtI64 ("Range (%4d):",30);
result->spacing=PmtI64("Spacing (%4d):",20);
result->border=PmtI64 ("Border (%4d):",2);
result->glbl_name=GetStr("Glbl Struct Name (ENTER for No Glbl):");
result->range=GetI64 ("Range (%4d):",30);
result->spacing=GetI64("Spacing (%4d):",20);
result->border=GetI64 ("Border (%4d):",2);
result->next_slider=result->last_slider=&result->next_slider;
while (TRUE) {
SPrint(pmt,"Slider #%d Name:",result->num_sliders+1);
st=PmtStr(pmt);
StrPrint(pmt,"Slider #%d Name:",result->num_sliders+1);
st=GetStr(pmt);
if (!*st) {
Free(st);
break;
}
temps=CAlloc(sizeof(CMgdSCSlider));
temps=CAlloc(sizeof(CTemplateSCSlider));
temps->name=st;
QueIns(temps,result->last_slider);
temps->num=result->num_sliders++;
@@ -42,18 +41,18 @@ CMgdSC *PmtSliderCtrl()
return result;
}
U0 MgdSliderCtrl(CDoc *doc)
U0 TemplateSliderCtrl(CDoc *doc)
{
CTask *task;
CMgdSC *m=NULL;
CMgdSCSlider *temps;
CTemplateSC *m=NULL;
CTemplateSCSlider *temps;
I64 i;
DocUnlock(doc);
DocRecalc(doc);
DocCaptureUndo(doc,TRUE);
task=SpawnUser("CMgdSC **_m=0x%X;*_m=PmtSliderCtrl;\n",&m);
task=SpawnUser("CTemplateSC **_m=0x%X;*_m=GetSliderCtrl;\n",&m);
while (!m)
Yield;
@@ -66,7 +65,6 @@ class CSliderState
{
",m->range,m->spacing,m->border);
temps=m->next_slider;
while (temps!=&m->next_slider) {
DocPrint(doc," I64 %s;\n",temps->name);
@@ -77,7 +75,6 @@ class CSliderState
else
DocPrint(doc,"};\n");
DocPrint(doc,
"
U0 DrawSliderCtrl(CDC *dc,CCtrl *c)
Adam/Dbg2a.CPP
+37 -26
View File
@@ -1,6 +1,6 @@
#help_index "Debugging/Dump"
Bool ClassRep2(CDoc *doc,U8 *_d,U8 *class_name=lastclass,I64 depth,I64 max_depth,Bool dynamic,I64 types=HTT_CLASS,I64 offset=0)
{
{//See $LK,"::/Demo/LastClass.CPP"$.
I64 i,j,*ptr;
CMemberLst *ml;
CDocEntry *doc_e;
@@ -35,7 +35,7 @@ Bool ClassRep2(CDoc *doc,U8 *_d,U8 *class_name=lastclass,I64 depth,I64 max_depth
if (dynamic) {
doc_e=DocPrint(doc,"$$DA-TRM-P+RD,64,A=\"%%40ts\"$$\n");
doc_e->data=ptr;
DocDataFmt(doc_e);
DocDataFmt(doc,doc_e);
} else
DocPrint(doc,"%40ts\n",ptr);
}
@@ -44,7 +44,7 @@ Bool ClassRep2(CDoc *doc,U8 *_d,U8 *class_name=lastclass,I64 depth,I64 max_depth
if (tempc2->raw_type==RT_I8 || tempc2->raw_type==RT_U8) {
if (j==1) {
if (dynamic) {
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD-I64+U8,32,A=\"%%c\"$$\n");
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD,32,RT=U8,A=\"%%c\"$$\n");
doc_e->data=ptr;
} else
DocPrint(doc,"%c\n",*ptr(U8 *));
@@ -52,7 +52,7 @@ Bool ClassRep2(CDoc *doc,U8 *_d,U8 *class_name=lastclass,I64 depth,I64 max_depth
if (dynamic) {
doc_e=DocPrint(doc,"$$DA-TRM-P+RD,64,A=\"%%40ts\"$$\n");
doc_e->data=ptr;
DocDataFmt(doc_e);
DocDataFmt(doc,doc_e);
} else
DocPrint(doc,"%40ts\n",ptr);
}
@@ -63,33 +63,51 @@ Bool ClassRep2(CDoc *doc,U8 *_d,U8 *class_name=lastclass,I64 depth,I64 max_depth
case RT_U0:
break;
case RT_I8:
if (dynamic) {
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD,32,RT=I8,A=\"%%02X\"$$ ");
doc_e->data=ptr(I8 *)++;
} else
DocPrint(doc,"%02X ",*ptr(I8 *)++);
break;
case RT_U8:
if (dynamic) {
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD-I64+U8,32,A=\"%%02X\"$$ ");
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD,32,RT=U8,A=\"%%02X\"$$ ");
doc_e->data=ptr(U8 *)++;
} else
DocPrint(doc,"%02X ",*ptr(U8 *)++);
break;
case RT_I16:
if (dynamic) {
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD,32,RT=I16,A=\"%%04X\"$$ ");
doc_e->data=ptr(I16 *)++;
} else
DocPrint(doc,"%04X ",*ptr(I16 *)++);
break;
case RT_U16:
if (dynamic) {
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD-I64+U16,32,A=\"%%04X\"$$ ");
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD,32,RT=U16,A=\"%%04X\"$$ ");
doc_e->data=ptr(U16 *)++;
} else
DocPrint(doc,"%04X ",*ptr(U16 *)++);
break;
case RT_I32:
if (dynamic) {
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD,32,RT=I32,A=\"%%08X\"$$ ");
doc_e->data=ptr(I32 *)++;
} else
DocPrint(doc,"%08X ",*ptr(I32 *)++);
break;
case RT_U32:
if (dynamic) {
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD-I64+U32,32,A=\"%%08X\"$$ ");
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD,32,RT=U32,A=\"%%08X\"$$ ");
doc_e->data=ptr(U32 *)++;
} else
DocPrint(doc,"%08X ",*ptr(U32 *)++);
break;
case RT_F64:
if (dynamic) {
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD,32,A=\"%%16g\"$$ ");
doc_e->data=ptr(I64 *)++;
doc_e=DocPrint(doc,"$$DA-TRM+RD+UD,32,RT=F64,A=\"%%16g\"$$ ");
doc_e->data=ptr(F64 *)++;
} else
DocPrint(doc,"%16g ",*ptr(I64 *)++);
break;
@@ -101,7 +119,7 @@ Bool ClassRep2(CDoc *doc,U8 *_d,U8 *class_name=lastclass,I64 depth,I64 max_depth
DocPrint(doc,"%016X ",*ptr(I64 *)++);
}
if (dynamic)
DocDataFmt(doc_e);
DocDataFmt(doc,doc_e);
}
if (j<ml->dim.total_cnt)
DocPrint(doc,"...");
@@ -132,9 +150,7 @@ Bool ClassRep2(CDoc *doc,U8 *_d,U8 *class_name=lastclass,I64 depth,I64 max_depth
}
public U0 ClassRep(U8 *_d,U8 *class_name=lastclass,I64 max_depth=2,Bool fun=FALSE,I64 offset=0)
//Displays members of a record
//by using the compiler's info.
{
{//Displays members of a record by using the compiler's info.
CDoc *doc;
Bool old_preempt;
if (IsRaw) {
@@ -158,8 +174,7 @@ public U0 ClassRep(U8 *_d,U8 *class_name=lastclass,I64 max_depth=2,Bool fun=FALS
}
public U0 ClassRepD(U8 *_d,U8 *class_name=lastclass,I64 max_depth=2,Bool fun=FALSE,I64 offset=0)
//Dynamic classrep (uses hex_ed widgit for live changes)
{
{//Dynamic ClassRep. Uses hex_ed widgit for live changes.
CDoc *doc;
Bool old_preempt;
if (IsRaw) {
@@ -197,10 +212,7 @@ U0 UpdateRegVarImg(CHashFun *tempf,U8 *_b,CTask *task)
}
public U0 FunRep(U8 *st,U8 *rbp=NULL,I64 max_depth=2,CTask *task=NULL)
//Shows names and vals of a fun's
//local vars using info the compiler
//has.
{
{//Shows names and vals of a fun's local vars using compiler's info.
I64 size;
U8 *img;
CHashFun *tempf=HashFind(st,Fs->hash_table,HTT_FUN);
@@ -233,21 +245,20 @@ public U0 FunRep(U8 *st,U8 *rbp=NULL,I64 max_depth=2,CTask *task=NULL)
}
}
#help_index "Debugging/Unassemble"
public U0 Uf(U8 *st)
{//Unassemble named fun
{//Unassembles a named fun
I64 i;
CHashSrcSym *tempf;
CDbgInfo *dbg;
CDbgInfo *dbg_info;
if (tempf=HashFind(st,Fs->hash_table,HTT_FUN|HTT_EXPORT_SYS_SYM)) {
if (tempf->type&HTT_FUN)
FunRep(st);
if (dbg=tempf->debug) {
i=dbg->body[dbg->max_line+1-dbg->min_line]-dbg->body[0];
Un(dbg->body[0],i);
if (dbg_info=tempf->dbg_info) {
i=dbg_info->body[dbg_info->max_line+1-dbg_info->min_line]-dbg_info->body[0];
Un(dbg_info->body[0],i);
"Code Size:%04X\n",i;
} else
U(HashVal(tempf));
}
}
#help_index ""
Adam/DevInfo.CPP
+14 -16
View File
@@ -1,4 +1,4 @@
#help_index "PCI;Processor;Device;Info"
#help_index "PCI;Processor;Devices;Info"
//The file was downloaded from
//http://www.pcidatabase.com/reports.php?type=tab-delimeted
@@ -61,7 +61,7 @@ U0 PCILookUpSingle(CDoc *doc,I64 m,I64 d,U8 **_vendor,U8 **_dev)
buf[0](U16)='0x';
buf[2](U32)=doc_e->tag(U32 *)[0];
buf[6]=0;
if (A2I64(buf)==m) {
if (Str2I64(buf)==m) {
doc_e=doc_e->next->next;
if (doc_e->type_u8==DOCT_TEXT) {
vendor=AStrNew(doc_e->tag);
@@ -86,7 +86,7 @@ U0 PCILookUpSingle(CDoc *doc,I64 m,I64 d,U8 **_vendor,U8 **_dev)
buf[0](U16)='0x';
buf[2](U32)=doc_e->tag(U32 *)[0];
buf[6]=0;
if (A2I64(buf)==d) {
if (Str2I64(buf)==d) {
doc_e=doc_e->next->next;
if (doc_e->type_u8==DOCT_TEXT) {
dev=AStrNew(doc_e->tag);
@@ -120,7 +120,7 @@ U0 PCILookUpDevs()
CPCIDev *temppci;
I64 w1,w2,b,d,f,timeout=32*8*2;
CDoc *doc;
if (sys_pci_dev_root.next!=&sys_pci_dev_root)
if (dev.pci_root.next!=&dev.pci_root)
return;
doc=DocRead(PCI_DEV_FILE,DOCF_PLAIN_TEXT);
for (b=0;b<sys_pci_busses;b++)
@@ -137,7 +137,7 @@ U0 PCILookUpDevs()
temppci->sub_code=PCIReadU8(b,d,f,0xA);
temppci->base_code=PCIReadU8(b,d,f,0xB);
PCILookUpSingle(doc,w1,w2,&temppci->vendor_str,&temppci->dev_id_str);
QueIns(temppci,sys_pci_dev_root.last);
QueIns(temppci,dev.pci_root.last);
timeout=32*8*2;
} else if (sys_pci_busses==256 && --timeout<=0)
goto lud_done;
@@ -147,7 +147,7 @@ lud_done:
}
public U0 PCIRep()
{
{//Report description of PCI devices.
CPCIDev *temppci;
"PCI Busses:%d\n",sys_pci_busses;
if (!FileFind(PCI_DEV_FILE)) {
@@ -155,8 +155,8 @@ public U0 PCIRep()
return;
}
PCILookUpDevs;
temppci=sys_pci_dev_root.next;
while (temppci!=&sys_pci_dev_root) {
temppci=dev.pci_root.next;
while (temppci!=&dev.pci_root) {
"%02X:%02X:%01X %02X%02X $$GREEN$$%s $$CYAN$$%s$$FG$$\n",
temppci->bus,temppci->dev,temppci->fun,
temppci->base_code,temppci->sub_code,
@@ -167,13 +167,13 @@ public U0 PCIRep()
#help_index "Info;Time/CPU Cycles"
public U0 CPURep()
{
"%d Cores %6h?nHz\n",mp_cnt,ToF64(time_stamp_freq);
{//Report number of cores and clock freq.
"%d Cores %6h?nHz\n",mp_cnt,ToF64(cnts.time_stamp_freq);
}
#help_index "Info;Memory/Info"
public U0 MemBIOSRep()
{
{//Report the memory ranges reported by the BIOS at boot.
U16 *m01=SYS_MEM_E801;
CMemE820 *m20=SYS_MEM_E820;
CMemRange *tempmr;
@@ -183,8 +183,8 @@ public U0 MemBIOSRep()
"32 Bit Device Mem\n";
while (LBts(&sys_semas[SYS_SEMA_DEV_MEM],0))
Yield;
tempmr=sys_mem32_dev_root.next;
while (tempmr!=&sys_mem32_dev_root) {
tempmr=dev.mem32_root.next;
while (tempmr!=&dev.mem32_root) {
"%02X:0x%016X-0x%016X\n",tempmr->type,tempmr->base,tempmr->base+tempmr->size-1;
tempmr=tempmr->next;
}
@@ -195,7 +195,7 @@ public U0 MemBIOSRep()
"01:0x0000000001000000-0x%016X\n",0x1000000+m01[1]<<16-1;
if (m20->type) {
NewLine;
'\n';
"BIOS Memory Report 15:E820\n";
while (m20->type) {
"%02X:0x%016X-0x%016X\n",m20->type,m20->base,m20->base+m20->len-1;
@@ -204,5 +204,3 @@ public U0 MemBIOSRep()
}
}
#help_index ""
Adam/Doc/DocCtrlL.CPP
-1121
View File
File diff suppressed because it is too large. Load diff
Adam/Doc/DocInit.CPP
-101
View File
@@ -1,101 +0,0 @@
#help_index "Doc"
U0 DocInit()
{ //$LK-UL,"CMD Defines",A="MN:DOCT_TEXT"$
CLex *lx;
I64 i;
CHashGeneric *temph;
DefineLstLoad("ST_DOC_CMDS",
"TX\0CR\0SR\0CU\0TB\0CL\0PB\0DA\0PL\0LM\0RM\0HD\0FO\0ID\0"
"FG\0BG\0FD\0BD\0PT\0WW\0UL\0IV\0BK\0SX\0SY\0CM\0AN\0LK\0BT\0"
"CB\0MA\0MU\0HX\0TR\0SP\0IB\0IS\0SO\0HL\0LP\0CC\0HC\0ER\0");
DefineLstLoad("ST_DOC_FLAGS",
"T\0A\0L\0"
"LC\0LE\0LM\0LA\0RC\0RE\0RM\0RA\0"
"TC\0BI\0X\0Q\0LX\0CX\0RX\0TY\0CY\0BY\0SX\0SY\0SCX\0"
"HL\0LP\0CC\0WW\0BK\0IV\0SEL\0UL\0"
"FST\0B\0S\0BD\0C\0CA\0RD\0P\0TRM\0Z\0H\0TR\0SK\0PU\0PRY\0MRX\0"
"SIF\0WD\0HT\0HS\0FS\0NC\0DD\0UD\0"
"U8\0U16\0U32\0U64\0"
"D\0WR\0HTML\0BP\0"
);
DefineLstLoad("ST_LINK_TYPES","FI\0FA\0FF\0FL\0MN\0PI\0PF\0PL\0BF\0DF\0HI\0AD\0");
doc_hash=HashTableNew(512);
HashDefineLstAdd("ST_DOC_CMDS",DHT_DOC_CMD,doc_hash);
HashDefineLstAdd("ST_DOC_FLAGS",DHT_DOC_FLAG,doc_hash);
MemSet(doc_dft_flags1, 0,sizeof(doc_dft_flags1));
MemSet(doc_dft_type_flags, 0,sizeof(doc_dft_type_flags));
lx=LexNew("TX+T;DA+T+P+TRM+U64;CM+LE+RE;AN+T;LK+T+L+UL;MA+T+X+UL;MU+T+X+UL;"
"BT+T+X+B;CB+T+CA+P+U8;HX+P+Z;TR+T+C+CA+TR+UL;SP+T;IB+T;IS+T;"
"SO+T;HC+T;",LF_DONT_FREE_BUF);
lx->htc.hash_table_lst=NULL;
Lex(lx);
while (lx->token==TK_IDENT) {
if (temph=HashFind(lx->cur_str,doc_hash,DHT_DOC_CMD)) {
i=temph->user_data0;
Lex(lx);
PrsDocFlags(lx,&doc_dft_flags1[i],&doc_dft_type_flags[i]);
}
if (lx->token==';')
Lex(lx);
}
LexDel(lx);
for (i=0;i<DOCT_NUM_TYPES;i++)
doc_dft_flags1[i]&=~DOCG_BL_IV_UL;
doc_type_flags_form[0]=0;
for (i=0;i<DOCT_NUM_TYPES;i++)
if (Bt(&doc_dft_flags1[i],DOCEf1_TAG) && i!=DOCT_TEXT || i==DOCT_HEX_ED)
Bts(doc_type_flags_form,i);
//Don't forget $LK,"doc_type_flags_src_code",A="FF:::/Compiler/Lex.CPP,doc_type_flags_src_code"$
doc_type_flags_nontag_invisible[0]=
1<<DOCT_PAGE_LEN|
1<<DOCT_LEFT_MARGIN|
1<<DOCT_RIGHT_MARGIN|
1<<DOCT_HEADER|
1<<DOCT_FOOTER|
1<<DOCT_INDENT|
1<<DOCT_FOREGROUND|
1<<DOCT_BACKGROUND|
1<<DOCT_DFT_FOREGROUND|
1<<DOCT_DFT_BACKGROUND|
1<<DOCT_PMT|
1<<DOCT_WORD_WRAP|
1<<DOCT_UNDERLINE|
1<<DOCT_INVERT|
1<<DOCT_BLINK|
1<<DOCT_SHIFTED_X|
1<<DOCT_SHIFTED_Y|
1<<DOCT_SPRITE|
1<<DOCT_HIGHLIGHT|
1<<DOCT_LOCK_TO_PAGE|
1<<DOCT_LOCK_TO_CENTER;
doc_type_flags_data[0]=1<<DOCT_DATA|1<<DOCT_HEX_ED|1<<DOCT_CHECK_BOX;
Bts(doc_clean_scancodes,SC_CURSOR_RIGHT);
Bts(doc_clean_scancodes,SC_CURSOR_LEFT);
Bts(doc_clean_scancodes,SC_CURSOR_UP);
Bts(doc_clean_scancodes,SC_CURSOR_DOWN);
Bts(doc_clean_scancodes,SC_PAGE_UP);
Bts(doc_clean_scancodes,SC_PAGE_DOWN);
Bts(doc_clean_scancodes,SC_ALT);
Bts(doc_clean_scancodes,SC_CTRL);
Bts(doc_clean_scancodes,SC_SHIFT);
Bts(doc_clean_scancodes,SC_CAPS);
Bts(doc_clean_scancodes,SC_NUM);
Bts(doc_clean_scancodes,SC_SCROLL);
Bts(doc_clean_scancodes,SC_HOME);
Bts(doc_clean_scancodes,SC_END);
Bts(doc_clean_scancodes,SC_GUI);
Bts(doc_clean_scancodes,SC_BACKSPACE); //Handled specially
HashDefineLstAdd("ST_COLORS",DHT_COLOR,doc_hash);
}
DocInit;
Adam/Doc/DocPlain.CPP
-685
View File
@@ -1,685 +0,0 @@
#help_index "Doc"
I64 PrsDocFlagSingle(CLex *lx,I64 *_flags1,U32 *_type,Bool turn_on)
{
I64 result=-1;
CHashGeneric *temph;
if (lx->token==TK_IDENT && (temph=HashFind(lx->cur_str,doc_hash,DHT_DOC_FLAG))) {
result=temph->user_data0;
if (result<64) {
BEqu(_flags1,result,turn_on);
switch (result) {
case DOCEf1_SELECTED:
case DOCEf1_UNDERLINE:
case DOCEf1_INVERT:
case DOCEf1_BLINK:
BEqu(_type,result,turn_on);
break;
}
}
Lex(lx); //skip flag
}
return result;
}
I64 PrsDocFlags(CLex *lx,I64 *_flags1,U32 *_type)
{
I64 result=-1;
Bool turn_on;
while (TRUE) {
if (lx->token=='+')
turn_on=TRUE;
else if (lx->token=='-')
turn_on=FALSE;
else
break;
Lex(lx);
result=PrsDocFlagSingle(lx,_flags1,_type,turn_on);
}
return result;
}
I64 DocBinPtrRst(CDoc *doc,CDocEntry *doc_e)
{
U8 *st,*st2;
CDoc *doc2;
CDocBin *tempb,*tempb2;
I64 i,bin_num=0;
if (doc_e->flags1&DOCEF1_HAS_BIN && doc_e->bin_ptr_link && StrLen(doc_e->bin_ptr_link)) {
bin_num=doc_e->bin_num;
st=StrNew(doc_e->bin_ptr_link);
st2=StrNew(st);
StrLastRem(st,",",st2);
i=A2I64(st2);
if (i>0||*st2) {
doc2=DocRead(st);
if (i>0 && (tempb2=DocBinFindNum(doc2,i)) ||
i==0 && (tempb2=DocBinFindTag(doc2,st2))) {
i=1;
if (bin_num>0) {
if (tempb=DocBinFindNum(doc,bin_num)) {
i=tempb->use_cnt;
DocBinDel(doc,tempb);
}
} else
bin_num=doc->cur_bin_num++;
tempb=MAllocIdentical(tempb2,doc->mem_task);
tempb->use_cnt=i;
tempb->data=MAllocIdentical(tempb2->data,doc->mem_task);
tempb->num=bin_num;
doc_e->bin_data=tempb;
if (doc_e->flags1&DOCEF1_TAG && doc_e->tag && *doc_e->tag)
tempb->tag=StrNew(doc_e->tag,doc->mem_task);
else
tempb->tag=NULL;
QueIns(tempb,doc->bin_root.last);
} else
bin_num=0;
DocDel(doc2);
} else
bin_num=0;
Free(st2);
Free(st);
doc_e->bin_num=bin_num;
}
return bin_num;
}
U8 *Doc2PlainText(CDoc *doc,CDocEntry *doc_e)
{ //TODO: break strs
I64 i,j,attr=doc_e->attr,
t1,f1,flags1,type;
U8 *buf,*buf2;
if (doc_e->type_u8==DOCT_FOREGROUND && doc->flags&DOCF_COLOR_NAMES && 0<=attr<NUM_COLORS) {
buf=StrNew(DefineSub(attr,"ST_COLORS"));
attr=DOC_DFT;
} else
buf=StrNew(DefineSub(doc_e->type_u8,"ST_DOC_CMDS"));
if (doc_e->type_u8!=DOCT_ERROR) {
f1=doc_dft_flags1[doc_e->type_u8];
t1=doc_e->type_u8|doc_dft_type_flags[doc_e->type_u8];
flags1=doc_e->flags1&~(DOCG_BL_IV_UL|DOCEF1_SELECTED|DOCEF1_HIGHLIGHT|DOCEF1_WORD_WRAP|DOCEF1_LOCK_TO_PAGE|DOCEF1_LOCK_TO_CENTER|DOCEF1_SKIP|DOCEF1_FILTER_SKIP);
for (i=0;i<DOCEf1_NUM_FLAGS;i++)
if (Bt(&f1,i)!=Bt(&flags1,i)) {
if (Bt(&flags1,i)) {
if (!(1<<i&DOCEG1_HAS_ARG)) {
buf2=MPrint("%s+%Z",buf,i,"ST_DOC_FLAGS");
Free(buf); buf=buf2;
}
} else {
buf2=MPrint("%s-%Z",buf,i,"ST_DOC_FLAGS");
Free(buf); buf=buf2;
}
}
type=doc_e->type&~DOCET_SELECTED;
for (i=DOCEt_BLINK;i<=DOCEt_UNDERLINE;i++)
if (Bt(&t1,i)!=Bt(&type,i)) {
if (Bt(&type,i))
buf2=MPrint("%s+%Z",buf,i,"ST_DOC_FLAGS");
else
buf2=MPrint("%s-%Z",buf,i,"ST_DOC_FLAGS");
Free(buf); buf=buf2;
}
buf2=MPrint("%s,",buf);
Free(buf); buf=buf2;
nobound_switch (doc_e->type_u8) {
sub_switch_start:
case DOCT_DATA:
buf2=MPrint("%s%d,",buf,doc_e->len);
break;
case DOCT_HEX_ED:
buf2=MPrint("%s%d,",buf,doc_e->len);
Free(buf); buf=buf2;
buf2=MPrint("%s%d,",buf,doc_e->hex_ed_width);
break;
sub_switch_end:
Free(buf); buf=buf2;
break;
case DOCT_FOREGROUND:
case DOCT_BACKGROUND:
case DOCT_DFT_FOREGROUND:
case DOCT_DFT_BACKGROUND:
if (doc->flags&DOCF_COLOR_NAMES && 0<=attr<NUM_COLORS) {
buf2=MPrint("%s%Z,",buf,doc_e->attr,"ST_COLORS");
Free(buf); buf=buf2;
break;
}
case DOCT_PAGE_LEN:
case DOCT_LEFT_MARGIN:
case DOCT_RIGHT_MARGIN:
case DOCT_HEADER:
case DOCT_FOOTER:
case DOCT_INDENT:
case DOCT_WORD_WRAP:
case DOCT_HIGHLIGHT:
case DOCT_LOCK_TO_PAGE:
case DOCT_LOCK_TO_CENTER:
case DOCT_UNDERLINE:
case DOCT_INVERT:
case DOCT_BLINK:
case DOCT_SHIFTED_X:
case DOCT_SHIFTED_Y:
if (attr!=DOC_DFT) {
buf2=MPrint("%s%d,",buf,doc_e->attr);
Free(buf); buf=buf2;
}
case DOCT_NUM_TYPES-1: //nobound_switch
break;
}
flags1=doc_e->flags1 & DOCEG1_HAS_ARG;
while (flags1) {
j=Bsf(flags1);
Btr(&flags1,j);
nobound_switch (j) {
case DOCEf1_TAG:
if (doc_e->type_u8==DOCT_DATA || doc_e->type_u8==DOCT_MACRO &&
(doc_e->flags1&DOCEF1_LEFT_MACRO && !StrCmp(doc_e->tag,doc_e->left_macro) ||
doc_e->flags1&DOCEF1_RIGHT_MACRO && !StrCmp(doc_e->tag,doc_e->right_macro))) {
buf2=buf;
buf=NULL;
} else {
if (doc_e->type_u8==DOCT_CHECK_BOX) {
if (StrLen(doc_e->tag)>=4)
buf2=doc_e->tag+4;
else
buf2="";
} else if (doc_e->flags1 & DOCEF1_TREE) {
if (StrLen(doc_e->tag)>=3)
buf2=doc_e->tag+3;
else
buf2="";
} else
buf2=doc_e->tag;
if (Bt(&doc_dft_flags1[doc_e->type_u8],DOCEf1_TAG))
buf2=MPrint("%s\"%$$Q\",",buf,buf2);
else
buf2=MPrint("%sT=\"%$$Q\",",buf,buf2);
}
break;
case DOCEf1_SCROLLING_X:
buf2=MPrint("%sSCX=%d,",buf,doc_e->scroll_len);
break;
case DOCEf1_SHIFTED_X:
j=doc_e->type.u16[1]&0x1F;
if (j&0x10) j|=0xFFFFFFF0;
buf2=MPrint("%sSX=%d,",buf,j);
break;
case DOCEf1_SHIFTED_Y:
j=doc_e->type>>21 &0x1F;
if (j&0x10) j|=0xFFFFFFF0;
buf2=MPrint("%sSY=%d,",buf,j);
break;
case DOCEf1_AUX_STR:
buf2=MPrint("%sA=\"%$$Q\",",buf,doc_e->aux_str);
break;
case DOCEf1_LEFT_EXP:
buf2=MPrint("%sLE=%d,",buf,doc_e->left_exp);
break;
case DOCEf1_LEFT_MACRO:
buf2=MPrint("%sLM=\"%$$Q\",",buf,doc_e->left_macro);
break;
case DOCEf1_RIGHT_EXP:
buf2=MPrint("%sRE=%d,",buf,doc_e->right_exp);
break;
case DOCEf1_RIGHT_MACRO:
buf2=MPrint("%sRM=\"%$$Q\",",buf,doc_e->right_macro);
break;
case DOCEf1_HAS_BIN:
buf2=MPrint("%sBI=%d,",buf,doc_e->bin_num);
break;
case DOCEf1_WIDTH:
buf2=MPrint("%sWD=%d,",buf,doc_e->width);
break;
case DOCEf1_HEIGHT:
buf2=MPrint("%sHT=%d,",buf,doc_e->height);
break;
case DOCEf1_DEFINE:
buf2=MPrint("%sD=\"%$$Q\",",buf,doc_e->define_str);
break;
case DOCEf1_HTML_LINK:
buf2=MPrint("%sHTML=\"%$$Q\",",buf,doc_e->html_link);
break;
case DOCEf1_BIN_PTR_LINK:
buf2=MPrint("%sBP=\"%$$Q\",",buf,doc_e->bin_ptr_link);
break;
#assert DOCEf1_BIN_PTR_LINK==DOCEf1_NUM_FLAGS-1 //nobound_switch
}
Free(buf); buf=buf2;
}
buf[StrLen(buf)-1]=0; //Kill last comma
}
buf2=StrNew(buf,doc->mem_task); //exact allocation
Free(buf);
return buf2;
}
CDocEntry *PrsDollarCmd(CDoc *doc,U8 *st)
{//This uses $LK-UL,"Lex",A="MN:Lex"$() to parse a string and make Doc entries.
I64 i,j,flags1,processed_flags,attr=DOC_DFT;
U8 *ptr,*st2;
CDocEntry *doc_e=NULL;
CHashGeneric *temph;
CLex *lx=LexNew(st,LF_DONT_FREE_BUF);
CHashTable *old_hash_table_lst=lx->htc.hash_table_lst;
lx->htc.hash_table_lst=NULL;
if (Lex(lx)==TK_IDENT) {
if (temph=HashFind(lx->cur_str,doc_hash,DHT_DOC_CMD|DHT_COLOR)) {
if (temph->type&DHT_DOC_CMD)
i=temph->user_data0;
else { //DHT_COLOR
i=DOCT_FOREGROUND;
attr=temph->user_data0;
}
} else
i=DOCT_ERROR;
Lex(lx); //skip cmd code
doc_e=CAlloc(sizeof(CDocEntry),doc->mem_task);
doc_e->type=i;
doc_e->flags1=doc_dft_flags1[i];
doc_e->type|=doc_dft_type_flags[i];
j=PrsDocFlags(lx,&doc_e->flags1,&doc_e->type);
lx->htc.hash_table_lst=old_hash_table_lst;
nobound_switch (i) {
case DOCT_DATA:
while (lx->token==',')
Lex(lx);
doc_e->len=LexExpression(lx);
break;
case DOCT_HEX_ED:
while (lx->token==',')
Lex(lx);
doc_e->len=LexExpression(lx);
while (lx->token==',')
Lex(lx);
doc_e->hex_ed_width=LexExpression(lx);
break;
case DOCT_PAGE_LEN:
case DOCT_LEFT_MARGIN:
case DOCT_RIGHT_MARGIN:
case DOCT_HEADER:
case DOCT_FOOTER:
case DOCT_INDENT:
case DOCT_FOREGROUND:
case DOCT_BACKGROUND:
case DOCT_DFT_FOREGROUND:
case DOCT_DFT_BACKGROUND:
case DOCT_WORD_WRAP:
case DOCT_HIGHLIGHT:
case DOCT_LOCK_TO_PAGE:
case DOCT_LOCK_TO_CENTER:
case DOCT_UNDERLINE:
case DOCT_INVERT:
case DOCT_BLINK:
case DOCT_SHIFTED_X:
case DOCT_SHIFTED_Y:
while (lx->token==',')
Lex(lx);
if (lx->token)
doc_e->attr=LexExpression(lx);
else
doc_e->attr=attr;
break;
case DOCT_ERROR:
doc_e->flags1=0;
doc_e->type=DOCT_ERROR;
#assert DOCT_ERROR==DOCT_NUM_TYPES-1
// case DOCT_NUM_TYPES-1: //nobound_switch
break;
}
processed_flags=0;
while (TRUE) {
lx->htc.hash_table_lst=NULL;
while (lx->token==',')
Lex(lx);
lx->htc.hash_table_lst=old_hash_table_lst;
j=PrsDocFlagSingle(lx,&doc_e->flags1,&doc_e->type,TRUE);
if (!(flags1=~processed_flags & doc_e->flags1 & DOCEG1_HAS_ARG))
break;
if (lx->token=='=')
Lex(lx);
else
j=Bsf(flags1);
if (j<0 || Bts(&processed_flags,j)) {
doc_e->flags1=0;
doc_e->type=DOCT_ERROR;
break;
}
nobound_switch (j) { //TODO: Might check for expression errors
case DOCEf1_TAG:
if (!doc_e->tag) { //If a $$MA,LM=""$$ Tag is filled when the LM is
//processed. The dft_flag1.tag calls this after.
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
if (i==DOCT_CHECK_BOX) {
st=MPrint("[X] %s",st2);
Free(st2);
doc_e->min_col=1;
} else if (doc_e->flags1 & DOCEF1_TREE) {
st=MPrint("+] %s",st2);
Free(st2);
doc_e->min_col=1;
} else
st=st2;
doc_e->tag=StrNew(st,doc->mem_task);
Free(st);
} else {
doc_e->tag=NULL;
doc_e->type=DOCT_ERROR;
}
}
break;
case DOCEf1_SCROLLING_X:
doc_e->scroll_len=LexExpression(lx);
break;
case DOCEf1_SHIFTED_X:
doc_e->type|=(LexExpression(lx) & 0x1F)<<16;
break;
case DOCEf1_SHIFTED_Y:
doc_e->type|=(LexExpression(lx) & 0x1F)<<21;
break;
case DOCEf1_AUX_STR:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->aux_str=StrNew(st2,doc->mem_task);
Free(st2);
//$AN,"Anchor",A="DataTagWidth"$
if (i==DOCT_DATA) {
if (ptr=StrMatch(":",doc_e->aux_str))
doc_e->min_col=ptr-doc_e->aux_str+1;
doc_e->tag=MAlloc(doc_e->len+doc_e->min_col+2,doc->mem_task); //+2 because "_\0"
}
} else
doc_e->type=DOCT_ERROR;
break;
case DOCEf1_LEFT_EXP:
doc_e->left_exp=LexExpression(lx);
break;
case DOCEf1_LEFT_MACRO:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->left_macro=StrNew(st2,doc->mem_task);
Free(st2);
if (i==DOCT_MACRO && !doc_e->tag)
doc_e->tag=StrNew(doc_e->left_macro,doc->mem_task);
} else
doc_e->type=DOCT_ERROR;
break;
case DOCEf1_RIGHT_EXP:
doc_e->right_exp=LexExpression(lx);
break;
case DOCEf1_RIGHT_MACRO:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->right_macro=StrNew(st2,doc->mem_task);
Free(st2);
if (i==DOCT_MACRO && !doc_e->tag)
doc_e->tag=StrNew(doc_e->right_macro,doc->mem_task);
} else
doc_e->type=DOCT_ERROR;
break;
case DOCEf1_HAS_BIN:
if (!lx->token)
doc_e->bin_num=0;
else
doc_e->bin_num=LexExpression(lx);
break;
case DOCEf1_WIDTH:
doc_e->width=LexExpression(lx);
break;
case DOCEf1_HEIGHT:
doc_e->height=LexExpression(lx);
break;
case DOCEf1_DEFINE:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->define_str=StrNew(st2,doc->mem_task);
Free(st2);
} else
doc_e->type=DOCT_ERROR;
break;
case DOCEf1_HTML_LINK:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->html_link=StrNew(st2,doc->mem_task);
Free(st2);
} else
doc_e->type=DOCT_ERROR;
break;
case DOCEf1_BIN_PTR_LINK:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->bin_ptr_link=StrNew(st2,doc->mem_task);
Free(st2);
if (!DocBinPtrRst(doc,doc_e))
doc_e->type=DOCT_ERROR;
} else
doc_e->type=DOCT_ERROR;
break;
#assert DOCEf1_BIN_PTR_LINK==DOCEf1_NUM_FLAGS-1 //nobound_switch
}
}
} else if (!doc_e) {
doc_e=CAlloc(sizeof(CDocEntry),doc->mem_task);
doc_e->type=DOCT_ERROR;
}
LexDel(lx);
return doc_e;
}
public U0 DocInsEntry(CDoc *doc,CDocEntry *doc_e)
{
U8 *dst;
Bool unlock=DocLock(doc);
CDocEntry *doc_ce=doc->cur_entry,*doc_ne;
doc_e->x=doc_ce->x;
doc_e->y=doc_ce->y;
doc_e->page_line_num=doc_ce->page_line_num;
MemCpy(&doc_e->settings,&doc_ce->settings,sizeof(CDocSettings));
if (doc->cur_data_col>0 &&
doc_ce->type_u8==DOCT_TEXT &&
!(doc_ce->flags1&(DOCEF1_TAG_CB|DOCEF1_DEFINE|
DOCEF1_HTML_LINK|DOCEF1_BIN_PTR_LINK)) &&
doc->cur_data_col<doc_ce->max_col) {
dst=doc_ce->tag+doc->cur_data_col;
doc_ne=DocEntryNew(doc,doc_ce,StrNew(dst,doc->mem_task));
*dst=0;
doc_ne->type=DOCT_TEXT|doc_ce->type&0xFFFFFF00;
doc_ce->max_col=doc->cur_data_col;
QueIns(doc_ne,doc_ce);
doc->cur_data_col=0;
doc_ce=doc_ne;
}
if (doc_ce->type_u8==DOCT_TEXT && doc->cur_data_col>=doc_ce->max_col) {
QueIns(doc_e,doc_ce);
doc->cur_entry=doc_e->next;
} else {
QueIns(doc_e,doc_ce->last);
doc->cur_entry=doc_ce;
}
doc->cur_data_col=doc->cur_entry->min_col;
DocRemSoftNewLines(doc,doc->cur_entry);
if (unlock)
DocUnlock(doc);
}
#help_index "Doc/Output"
CDocEntry *DocPutS(CDoc *doc,U8 *st)
{ //Don't use this. Use $LK-UL,"DocPrint",A="MN:DocPrint"$().
//Does not handle partial Doc entries
//Returns last newly created dollar-sign CDocEntry.
U8 *ptr=st,*ptr2,*st2,*ptr3,*ptr4,*src,
*char_bitmap;
Bool unlock;
I64 ch,j;
CDocEntry *doc_e=NULL,*result=NULL,*doc_ce;
if (!st || !doc && !(doc=DocPut) || doc->doc_signature!=DOC_SIGNATURE_VAL)
return NULL;
unlock=DocLock(doc);
if (doc->flags & DOCF_PLAIN_TEXT_WITH_TABS)
char_bitmap=chars_bitmap_zero_cr_nl_cursor;
else if (doc->flags & DOCF_PLAIN_TEXT)
char_bitmap=chars_bitmap_zero_tab_ff_cr_nl_cursor;
else
char_bitmap=chars_bitmap_zero_tab_ff_cr_nl_cursor_dollar;
doc->recalc_start=doc; //TODO:This might be optimized
doc_ce=doc->cur_entry;
while (*ptr) {
ptr2=ptr;
do ch=*ptr++;
while (!Bt(char_bitmap,ch) || ch==CH_CURSOR && doc->flags&DOCF_NO_CURSOR);
ptr--;
if (!ch) {
if (j=ptr-ptr2) {
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_TEXT | doc->settings_root.dft_text_attr<<8;
doc_e->flags1=doc_dft_flags1[DOCT_TEXT];
if (doc->flags & DOCF_NO_CURSOR) {
src=MAlloc(j+1);
MemCpy(src,ptr2,j+1);
StrUtil(src,SUF_REM_CTRL_CHARS);
j=StrLen(src);
} else
src=ptr2;
doc_e->tag=MAlloc(j+1,doc->mem_task);
MemCpy(doc_e->tag,src,j+1);
doc_e->max_col=j;
DocInsEntry(doc,doc_e);
if (doc->flags & DOCF_NO_CURSOR)
Free(src);
}
} else {
if (j=ptr-ptr2) {
*ptr=0;
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_TEXT | doc->settings_root.dft_text_attr<<8;
doc_e->flags1=doc_dft_flags1[DOCT_TEXT];
if (doc->flags & DOCF_NO_CURSOR) {
src=MAlloc(j+1);
MemCpy(src,ptr2,j+1);
ptr3=src;
ptr4=src;
while (*ptr3)
if (*ptr3!=CH_CURSOR)
*ptr4++=*ptr3++;
else
ptr3++;
*ptr4=0;
j=ptr4-src;
} else
src=ptr2;
doc_e->tag=MAlloc(j+1,doc->mem_task);
MemCpy(doc_e->tag,src,j+1);
doc_e->max_col=j;
DocInsEntry(doc,doc_e);
if (doc->flags & DOCF_NO_CURSOR)
Free(src);
*ptr=ch;
}
switch (ch) {
case CH_CURSOR:
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_CURSOR | doc->settings_root.dft_text_attr<<8;
doc_e->flags1=doc_dft_flags1[DOCT_CURSOR];
DocInsEntry(doc,doc_e);
ptr++;
break;
case CH_FORM_FEED:
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_PAGE_BREAK | doc->settings_root.dft_text_attr<<8;
doc_e->flags1=doc_dft_flags1[DOCT_PAGE_BREAK];
DocInsEntry(doc,doc_e);
ptr++;
break;
case '\t':
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_TAB | doc->settings_root.dft_text_attr<<8;
doc_e->flags1=doc_dft_flags1[DOCT_TAB];
DocInsEntry(doc,doc_e);
ptr++;
break;
case '$$':
ptr++; //skip first dollar
ptr2=ptr;
while (*ptr && *ptr!='$$')
ptr++;
if (*ptr) {
*ptr=0; //zero second dollar
if (ptr-1==ptr2 && *ptr2==CH_CURSOR) {
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_CURSOR | doc->settings_root.dft_text_attr<<8;
doc_e->flags1=doc_dft_flags1[DOCT_CURSOR];
DocInsEntry(doc,doc_e);
ptr2++;
}
if (ptr==ptr2) {
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_TEXT | doc->settings_root.dft_text_attr<<8;
doc_e->max_col=1;
if (doc->flags & DOCF_DBL_DOLLARS)
doc_e->tag=StrNew("$$$$",doc->mem_task);
else
doc_e->tag=StrNew("$$",doc->mem_task);
doc_e->flags1=doc_dft_flags1[DOCT_TEXT];
DocInsEntry(doc,doc_e);
} else {
st2=MAlloc(ptr-ptr2+1);
ptr3=ptr2;
ptr4=st2;
while (ch=*ptr3++) {
if (ch==CH_CURSOR) {
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_CURSOR | doc->settings_root.dft_text_attr<<8;
doc_e->flags1=doc_dft_flags1[DOCT_CURSOR];
DocInsEntry(doc,doc_e);
} else if (ch==CH_FORM_FEED) {
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_PAGE_BREAK | doc->settings_root.dft_text_attr<<8;
doc_e->flags1=doc_dft_flags1[DOCT_PAGE_BREAK];
DocInsEntry(doc,doc_e);
} else
*ptr4++=ch;
}
*ptr4=0;
if (doc_e=PrsDollarCmd(doc,st2)) {
result=doc_e;
DocInsEntry(doc,doc_e);
}
Free(st2);
}
*ptr++='$$';
}
break;
default:
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_NEW_LINE | doc->settings_root.dft_text_attr<<8;
doc_e->flags1=doc_dft_flags1[DOCT_NEW_LINE];
DocInsEntry(doc,doc_e);
if (ch=='\r')
while (*ptr=='\r')
ptr++;
if (*ptr=='\n')
ptr++;
while (*ptr=='\r')
ptr++;
}
}
}
if (unlock)
DocUnlock(doc);
return result;
}
public CDocEntry *DocPrint(CDoc *doc,U8 *fmt,...)
{//You must not print partial doc cmds.
U8 *buf=SPrintJoin(NULL,fmt,argc,argv);
CDocEntry *result=DocPutS(doc,buf);
Free(buf);
return result;
}
Adam/DocDefines.CPP
+8 -7
View File
@@ -1,8 +1,7 @@
#help_index "Char/Define"
#help_index "Define;Char/Define"
U0 LoadDocDefines()
{
//These are used in documents such as $LK,"::/Doc/TrivialSolutions.TXT"$
{//These are used in documents such as $LK,"::/Doc/TrivialSolutions.TXT"$
//The $LK,"CDoc",A="MN:CDoc"$ framework will search the sym table for define string
//consts if you specify that.
CBinFile *bfh=sys_boot_base-sizeof(CBinFile);
@@ -32,13 +31,13 @@ U0 LoadDocDefines()
DefinePrint(
"DD_OS_NAME_VERSION","TempleOS V%0.2f",os_version);
DefinePrint(
"DD_TEMPLEOS_AGE","%0.1f",(Now-A2Date("8/1/2003"))/ToF64(1<<32)/CDATE_YEAR_DAYS);
"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/TSDistro.CPP,DD_TEMPLEOS_LOC"$.
$TR-C,"LineRep"$
$ID,4$DefinePrint("DD_TEMPLEOS_LOC","120,796");
DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","81,488");
$ID,4$DefinePrint("DD_TEMPLEOS_LOC","121,504");
DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","81,303");
$ID,-4$
DefinePrint(
"DD_FIXED_AREA_BASE","%08X",SYS_FIXED_AREA);
@@ -63,7 +62,9 @@ $ID,-4$
"DD_MAPPED_MEM_SPACE_END","%010X",MEM_MAPPED_SPACE-1);
DefinePrint(
"DD_MAPPED_MEM_SPACE_END2","%014,X",MEM_MAPPED_SPACE-1);
DefinePrint(
"DD_JIFFY_HZ","%d Hz",JIFFY_FREQ);
}
LoadDocDefines;
#help_index ""
Adam/Doc/Doc.CPP → Adam/DolDoc/Doc.CPP
+34 -25
View File
@@ -1,27 +1,22 @@
#help_index "Doc"
#help_file "::/Doc/Doc"
#help_index "DolDoc"
#help_file "::/Doc/DolDoc"
/*$AN,"",A="Doc"$
TempleOS Doc's can have "cursor movement" cmds which can move the cursor up
TempleOS DolDoc's can have "cursor movement" cmds which can move the cursor up
the screen and layer on existing text. It can also have callback funs which
supply live, changing text. For these reasons, you can't assume you know
where the visible portion of the document is and must process an extensive
portion of the document each time it is placed on the screen, becoming CPU
intensive on big documents. The doc->recalc_start member attempts to limit
what is recalculated. This is tricky, howeve, and optimizations create minor
glitches. Similarly, an optimization to only refresh the entire document
1 in 10 times it is drawn to the screen creates minor glitches. Since the Doc
handles the cmd line, it must also be fast when adding text output from
programs. doc->recalc_start comes into play here.
//See $LK,"::/Doc/Doc.TXT"$
where the visible portion of the document is and must process much
of the document each time it is placed on the screen, becoming CPU
intensive on big documents.
See $LK,"::/Doc/DolDocOverview.TXT"$
*/
extern I64 EdLeftClickLink(CDoc *doc,CDocEntry *doc_e);
extern I64 TermRightClickLink(CDoc *doc,CDocEntry *doc_e);
extern U0 DocPrintPartial(CDoc *doc,U8 *fmt,...);
extern U0 DocFormBackward(CDoc *doc,Bool giveup=FALSE);
extern U0 DocFormBwd(CDoc *doc,Bool giveup=FALSE);
extern U0 EdUndoFilter(CDoc *doc);
extern U8 *PopUpPickLst(U8 *lst);
#define DHT_DOC_CMD 1
#define DHT_DOC_FLAG 2
@@ -54,17 +49,32 @@ extern U0 EdUndoFilter(CDoc *doc);
#define LK_DEF 9
// "HI:index"
#define LK_HELP_INDEX 10
// "AD:address_number"
// "AD:code_address_number"
#define LK_ADDR 11
#define LK_PLACE_ANCHOR 12
//These are to edit a doc structure already in memory.
// "AI:doc_address"
// "AA:haystack_doc_address,needle_anchor_str"
// "AF:haystack_doc_address,needle_str"
// "AF:haystack_doc_address,needle_str:occurnum"
// "AL:doc_address,linenum"
#define LK_DOC 12 //See $LK,"SpriteEdText",A="MN:SpriteEdText"$()
#define LK_DOC_ANCHOR 13
#define LK_DOC_FIND 14
#define LK_DOC_LINE 15
CHashTable *doc_hash;
I64 doc_dft_flags1[DOCT_NUM_TYPES],
doc_type_flags_nontag_invisible [(DOCT_NUM_TYPES+63)/64],
doc_type_flags_form [(DOCT_NUM_TYPES+63)/64],
doc_type_flags_data [(DOCT_NUM_TYPES+63)/64],
doc_clean_scancodes[4]={0,0,0,0};
I32 doc_dft_type_flags[DOCT_NUM_TYPES];
#define LK_PLACE_ANCHOR 16
public class CDolDocGlbls
{
CHashTable *hash;
I64 dft_de_flags [DOCT_NUM_TYPES],
type_flags_nontag_invisible [(DOCT_NUM_TYPES+63)/64],
type_flags_form [(DOCT_NUM_TYPES+63)/64],
type_flags_data [(DOCT_NUM_TYPES+63)/64],
clean_scan_codes [4];
I32 dft_type_flags [DOCT_NUM_TYPES];
} doldoc;
MemSet(&doldoc,0,sizeof(CDolDocGlbls));
#include "DocNew"
#include "DocPlain"
@@ -72,6 +82,7 @@ I32 doc_dft_type_flags[DOCT_NUM_TYPES];
#include "DocHighlight"
#include "DocRecalc2a"
#include "DocRecalc2b"
sys_clipboard_doc=DocNew;
#include "DocFile"
#include "DocOpt"
#include "DocPopUp"
@@ -83,5 +94,3 @@ I32 doc_dft_type_flags[DOCT_NUM_TYPES];
#include "DocCodeTools"
#include "DocTree"
#include "DocMain"
#help_index ""
Adam/Doc/DocCodeTools.CPP → Adam/DolDoc/DocCodeTools.CPP
+18 -19
View File
@@ -1,4 +1,4 @@
#help_index "Doc/Misc"
#help_index "DolDoc/Misc"
#define C_INDENT_SPACES 2
#define ASM_RENUM_SPACING 5
@@ -16,8 +16,8 @@ I64 PopUpEdFmt()
DocPrint(doc,"$$LTBLUE$$$$MU,\"Check Compile\",LE=EF_CHK_COMPILE$$\n"
"$$MU,\"Reindent CPP.Z Fun\",LE=EF_REINDENT$$\n"
"$$MU,\"Renum Asm Local @@ Labels for Fun\",LE=EF_RENUM_ASM$$\n"
"$$MU,\"Insert Mgd Code: Slider Ctrl\",LE=EF_SLIDER_CTRL$$\n"
"$$MU,\"Insert ASCII/Scan Code Hex Codes for key pressed\",LE=EF_CH_SC$$\n"
"$$MU,\"Insert Template Code: Slider Ctrl\",LE=EF_SLIDER_CTRL$$\n"
"$$MU,\"Insert ASCII/Scan Code Hex Codes for key pressed\",LE=EF_CH_SC$$\n\n"
"$$MU,\"CANCEL\",LE=DOCM_CANCEL$$\n\n"
"$$GREEN$$<ALT-BACKSPACE>$$FG$$ to undo if not happy\n"
"with the results.\n");
@@ -243,7 +243,7 @@ U0 EdRemFunLeadingSpace(CDoc *doc)
do {
doc_e2=doc_e->next;
if (doc_e!=doc && doc_e!=doc->cur_entry &&
!(doc_e->flags1&(DOCEG1_DONT_EDIT-DOCEF1_SCROLLING_X)))
!(doc_e->de_flags&(DOCEG1_DONT_EDIT-DOCEF_SCROLLING_X)))
switch (doc_e->type_u8) {
case DOCT_TEXT:
ptr=doc_e->tag;
@@ -288,7 +288,6 @@ ls_done:
DocUnlock(doc);
}
class CRenum
{
CRenum *next,*last;
@@ -362,15 +361,15 @@ U0 EdRenumAsm(CDoc *doc)
while (tempr!=&root) {
tempr1=tempr->next;
num+=ASM_RENUM_SPACING;
SPrint(buf,"@#%02d",num);
StrPrint(buf,"@#%02d",num);
EdReplace(doc,tempr->label,buf,TRUE,TRUE,TRUE);
Free(tempr);
tempr=tempr1;
}
while (num) {
SPrint(buf, "@#%02d",num);
SPrint(buf2,"@@%02d",num);
StrPrint(buf, "@#%02d",num);
StrPrint(buf2,"@@%02d",num);
EdReplace(doc,buf,buf2,TRUE,TRUE,TRUE);
num-=ASM_RENUM_SPACING;
}
@@ -403,7 +402,7 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action)
DocWrite(doc);
task=Spawn(&SrvUserCmdLine,NULL,"Srv",,Fs);
st2=CurDir;
st=MPrint("Cd(\"%s\");",st2);
st=MStrPrint("Cd(\"%s\");",st2);
tempc=TaskExe(task,Fs,st,1<<SVCf_WAKE_MASTER|1<<SVCf_FOCUS_MASTER);
Free(st2);
Free(st);
@@ -415,11 +414,11 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action)
Free(st);
if (FileFind(prj_file)) {
st2=DirFile(prj_file),
st=MPrint("Cd(\"%s\");",st2);
st=MStrPrint("Cd(\"%s\");",st2);
Free(st2);
tempc=TaskExe(task,Fs,st,1<<SVCf_WAKE_MASTER|1<<SVCf_FOCUS_MASTER|1<<SVCf_FREE_ON_COMPLETE);
Free(st);
st=MPrint("\"$$WW,1$$\";Cmp(\"%s\",\"SysTemp\",\"SysTemp\");",prj_file);
st=MStrPrint("\"$$WW,1$$\";Cmp(\"%s\",\"SysTemp\",\"SysTemp\");",prj_file);
tempc=TaskExe(task,Fs,st,1<<SVCf_WAKE_MASTER|1<<SVCf_FOCUS_MASTER);
Free(st);
if (ScanResult(tempc,&r))
@@ -437,9 +436,9 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action)
prj_file=FileNameAbs(st,FUF_Z_OR_NOT_Z);
Free(st);
if (FileFind(prj_file))
st=MPrint("\"$$WW,1$$\";ExeFile(\"%s\",TRUE);",prj_file);
st=MStrPrint("\"$$WW,1$$\";ExeFile(\"%s\",TRUE);",prj_file);
else
st=MPrint("\"$$WW,1$$\";ExeFile(\"%s\",TRUE);",doc->filename.name);
st=MStrPrint("\"$$WW,1$$\";ExeFile(\"%s\",TRUE);",doc->filename.name);
tempc=TaskExe(task,Fs,st,1<<SVCf_WAKE_MASTER|1<<SVCf_FOCUS_MASTER);
Free(st);
if (ScanResult(tempc,&r) && r)
@@ -451,7 +450,7 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action)
PopUpOk("Has Errors");
while (LBts(&sys_semas[SYS_SEMA_FIX],0))
Yield;
ToFileLine(sys_fix_file_line,&st,&i);
ToFileLine(dbg.fix_file_line,&st,&i);
LBtr(&sys_semas[SYS_SEMA_FIX],0);
if (!StrCmp(st,doc->filename.name))
goto_line_num=i;
@@ -473,7 +472,7 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action)
end_y=start_y+indent->total_cnt;
while (start_y<=doc_e->y<end_y) {
if (doc_e!=doc && doc_e!=doc->cur_entry &&
!(doc_e->flags1&(DOCEG1_DONT_EDIT-DOCEF1_SCROLLING_X))) {
!(doc_e->de_flags&(DOCEG1_DONT_EDIT-DOCEF_SCROLLING_X))) {
if (doc_e->type_u8==DOCT_NEW_LINE||doc_e->type_u8==DOCT_SOFT_NEW_LINE)
start_of_line=TRUE;
else {
@@ -483,7 +482,7 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action)
while (i>8) {
doc_ne=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_ne->type=DOCT_TAB | doc->settings_root.dft_text_attr<<8;
doc_ne->flags1=doc_dft_flags1[DOCT_TAB];
doc_ne->de_flags=doldoc.dft_de_flags[DOCT_TAB];
doc_ne->x=x;
doc_ne->y=doc_e->y;
doc_ne->page_line_num=doc_e->page_line_num;
@@ -498,7 +497,7 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action)
b[i]=0;
doc_ne=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_ne->type=DOCT_TEXT | doc->settings_root.dft_text_attr<<8;
doc_ne->flags1=doc_dft_flags1[DOCT_TEXT];
doc_ne->de_flags=doldoc.dft_de_flags[DOCT_TEXT];
doc_ne->tag=b;
doc_ne->max_col=1;
doc_ne->x=x;
@@ -561,7 +560,7 @@ U0 EdChSC(CDoc *doc)
{
I64 ch,sc;
U8 buf[136];
SPrint(buf,"EdPopUpChSC(%d,%d);",&ch,&sc);
StrPrint(buf,"EdPopUpChSC(%d,%d);",&ch,&sc);
PopUp(buf,Fs);
if (ch==CH_BACKSPACE)
DocPrint(doc,"CH_BACKSPACE,0x%X",sc);
@@ -599,7 +598,7 @@ U0 EdCodeTools(CDoc *doc)
EdCodeTools2(doc,tool_action);
break;
case EF_SLIDER_CTRL:
MgdSliderCtrl(doc);
TemplateSliderCtrl(doc);
break;
case EF_CH_SC:
EdChSC(doc);
Adam/DolDoc/DocCtrlL.CPP
+1127
View File
File diff suppressed because it is too large. Load diff
Adam/Doc/DocEd2a.CPP → Adam/DolDoc/DocEd2a.CPP
+54 -68
View File
@@ -1,8 +1,7 @@
#help_index "Doc/Edit"
#help_index "DolDoc/Editor"
public I64 EdCurU8(CDoc *doc)
{
//See $LK,"EdRenumAsm",A="MN:EdRenumAsm"$ for an example.
{//Return cur U8. See $LK,"EdRenumAsm",A="MN:EdRenumAsm"$ for an example.
Bool unlock=DocLock(doc);
CDocEntry *doc_ce=doc->cur_entry;
I64 result=-1;
@@ -18,7 +17,7 @@ public I64 EdCurU8(CDoc *doc)
}
public U0 EdCursorLeft(CDoc *doc,I64 sc=MIN_I64)
{//You might need a call to $LK,"DocRecalc",A="MN:DocRecalc"$().
{//Move cursor left. Might need a call to $LK,"DocRecalc",A="MN:DocRecalc"$().
//See $LK,"EdRenumAsm",A="MN:EdRenumAsm"$ for an example.
U8 *dst;
Bool unlock=DocLock(doc);
@@ -27,7 +26,7 @@ public U0 EdCursorLeft(CDoc *doc,I64 sc=MIN_I64)
if (sc!=MIN_I64) sc=sc.u32[0];
if (sc>=0 && sc&SCF_CTRL) {
while (doc_ce->last!=doc && (doc_ce->last->y==y ||
doc_ce->flags1 & (DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP)))
doc_ce->de_flags & (DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP)))
doc_ce=doc_ce->last; //TODO: select? recurse?
cc=doc_ce->min_col;
} else {
@@ -55,7 +54,7 @@ public U0 EdCursorLeft(CDoc *doc,I64 sc=MIN_I64)
cc=doc_ce->min_col;
while (doc_ce->last!=doc &&
(doc_ce->last->type_u8==DOCT_SOFT_NEW_LINE || doc_ce->last->type_u8==DOCT_INDENT ||
doc_ce->last->flags1 & (DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))) {
doc_ce->last->de_flags & (DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP))) {
doc_ce=doc_ce->last;
if (sc>=0)
BEqu(&doc_ce->type,DOCEt_SELECTED,sc&SCF_SHIFT);
@@ -83,25 +82,23 @@ public U0 EdCursorLeft(CDoc *doc,I64 sc=MIN_I64)
doc->cur_data_col=cc;
doc->cur_entry=doc_ce;
if (doc_ce!=original_ce)
DocFormBackward(doc);
doc->recalc_start=doc->cur_entry->last;
DocFormBwd(doc);
if (unlock)
DocUnlock(doc);
}
public U0 EdCursorRight(CDoc *doc,I64 sc=MIN_I64)
{//You might need a call to $LK,"DocRecalc",A="MN:DocRecalc"$().
{//Move cursor right. Might need a call to $LK,"DocRecalc",A="MN:DocRecalc"$().
//See $LK,"EdRenumAsm",A="MN:EdRenumAsm"$ for an example.
Bool unlock=DocLock(doc);
U8 *dst;
CDocEntry *doc_ce=doc->cur_entry,*original_ce=doc_ce,*doc_ne;
I64 cc=doc->cur_data_col,y=doc_ce->y,old_flags1,old_color;
doc->recalc_start=doc_ce->last;
I64 cc=doc->cur_data_col,y=doc_ce->y,old_de_flags,old_color;
if (sc!=MIN_I64) sc=sc.u32[0];
if (sc>=0 && sc&SCF_CTRL) {
while (doc_ce!=doc && doc_ce->next->y==y &&
doc_ce->next->type_u8!=DOCT_SOFT_NEW_LINE && doc_ce->next!=doc && (doc_ce->next->type_u8!=DOCT_NEW_LINE || !(doc->flags & DOCF_FORM)) ||
doc_ce->flags1 & (DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))
doc_ce->de_flags & (DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP))
doc_ce=doc_ce->next;
if (doc_ce->max_col>doc_ce->min_col)
cc=doc_ce->max_col-1;
@@ -119,7 +116,7 @@ public U0 EdCursorRight(CDoc *doc,I64 sc=MIN_I64)
cc=doc_ce->min_col;
}
cc++;
old_flags1=doc_ce->flags1;
old_de_flags=doc_ce->de_flags;
old_color=doc_ce->type;
if (sc>=0)
BEqu(&doc_ce->type,DOCEt_SELECTED,sc&SCF_SHIFT);
@@ -128,7 +125,7 @@ public U0 EdCursorRight(CDoc *doc,I64 sc=MIN_I64)
doc_ne=DocEntryNew(doc,doc_ce,StrNew(dst,doc->mem_task));
*dst=0;
doc_ne->type=DOCT_TEXT | old_color & -0x100;
doc_ne->flags1=old_flags1|doc_dft_flags1[DOCT_TEXT];
doc_ne->de_flags=old_de_flags|doldoc.dft_de_flags[DOCT_TEXT];
doc_ce->max_col=cc;
QueIns(doc_ne,doc_ce);
doc_ce=doc_ne;
@@ -142,7 +139,7 @@ public U0 EdCursorRight(CDoc *doc,I64 sc=MIN_I64)
if (cc<=doc_ce->min_col && sc>=0)
BEqu(&doc_ce->type,DOCEt_SELECTED,sc&SCF_SHIFT);
doc_ce=doc_ce->next;
while (doc_ce!=doc && doc_ce->flags1 & (DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP)) {
while (doc_ce!=doc && doc_ce->de_flags & (DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP)) {
if (sc>=0)
BEqu(&doc_ce->type,DOCEt_SELECTED,sc&SCF_SHIFT);
doc_ce=doc_ce->next;
@@ -166,7 +163,7 @@ public U0 EdCursorRight(CDoc *doc,I64 sc=MIN_I64)
}
public U0 EdLineUp(CDoc *doc,I64 sc=MIN_I64)
{//You might need a call to $LK,"DocRecalc",A="MN:DocRecalc"$().
{//Move cursor up. Might need a call to $LK,"DocRecalc",A="MN:DocRecalc"$().
//See $LK,"EdRenumAsm",A="MN:EdRenumAsm"$ for an example.
Bool unlock=DocLock(doc);
U8 *dst;
@@ -201,16 +198,16 @@ public U0 EdLineUp(CDoc *doc,I64 sc=MIN_I64)
if (sc>=0)
BEqu(&doc_ce->type,DOCEt_SELECTED,sc&SCF_SHIFT);
doc->cur_entry=doc_ce;
DocFormBackward(doc);
DocFormBwd(doc);
doc_ce=doc->cur_entry;
while (doc_ce->last!=doc && (doc_ce->y>=y || doc_ce->flags1 & (DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))) {
while (doc_ce->last!=doc && (doc_ce->y>=y || doc_ce->de_flags & (DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP))) {
doc_ce=doc_ce->last;
if (sc>=0)
BEqu(&doc_ce->type,DOCEt_SELECTED,sc&SCF_SHIFT);
}
y=doc_ce->y;
doc->y=y;
while (doc_ce!=doc && (doc_ce->y>=y && doc_ce->x>=x || doc_ce->flags1 & (DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))) {
while (doc_ce!=doc && (doc_ce->y>=y && doc_ce->x>=x || doc_ce->de_flags & (DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP))) {
if (sc>=0)
BEqu(&doc_ce->type,DOCEt_SELECTED,sc&SCF_SHIFT);
doc_ce=doc_ce->last;
@@ -227,14 +224,14 @@ public U0 EdLineUp(CDoc *doc,I64 sc=MIN_I64)
doc_ce=doc_ce->next;
if (doc->flags & DOCF_FORM) {
while (doc_ce->next->x==x &&
(!Bt(doc_type_flags_form,doc_ce->type_u8) ||
doc_ce->flags1&DOCEF1_SKIP_IN_FORM))
(!Bt(doldoc.type_flags_form,doc_ce->type_u8) ||
doc_ce->de_flags&DOCEF_SKIP_IN_FORM))
doc_ce=doc_ce->next;
}
}
}
}
if (doc_ce->flags1&DOCEF1_TAG) {
if (doc_ce->de_flags&DOCEF_TAG) {
doc->cur_data_col=x-doc_ce->x;
if (IsEditableText(doc_ce)) {
if (doc->cur_data_col>doc_ce->max_col)
@@ -274,17 +271,16 @@ public U0 EdLineUp(CDoc *doc,I64 sc=MIN_I64)
doc->cur_entry=doc_ce;
DocFormFwd(doc);
doc->x=doc->cur_entry->x+doc->cur_data_col;
doc->recalc_start=doc->cur_entry->last;
if (unlock)
DocUnlock(doc);
}
public U0 EdLineDown(CDoc *doc,I64 sc=MIN_I64)
{//You might need a call to $LK,"DocRecalc",A="MN:DocRecalc"$().
{//Move cursor down. Might need a call to $LK,"DocRecalc",A="MN:DocRecalc"$().
//See $LK,"EdRenumAsm",A="MN:EdRenumAsm"$ for an example.
Bool unlock=DocLock(doc);
U8 *dst;
I64 y,x,old_flags1=0,old_color;
I64 y,x,old_de_flags=0,old_color;
CDocEntry *doc_ce=doc->cur_entry,*doc_ne,*doc_ce2;
if (sc!=MIN_I64) sc=sc.u32[0];
if (doc_ce->type_u8==DOCT_HEX_ED) {
@@ -299,7 +295,6 @@ public U0 EdLineDown(CDoc *doc,I64 sc=MIN_I64)
DocUnlock(doc);
return;
}
doc->recalc_start=doc_ce->last;
x=doc->x; y=doc->y;
if (IsEditableText(doc_ce)) {
if (doc->cur_data_col>doc_ce->min_col && doc->cur_data_col<doc_ce->max_col-1) {
@@ -320,12 +315,12 @@ public U0 EdLineDown(CDoc *doc,I64 sc=MIN_I64)
}
}
doc_ce2=doc_ce;
while (doc_ce!=doc && (doc_ce->y<=y || doc_ce->flags1 & (DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP)))
while (doc_ce!=doc && (doc_ce->y<=y || doc_ce->de_flags & (DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP)))
doc_ce=doc_ce->next;
y=doc_ce->y;
doc->y=y;
while (doc_ce!=doc && (doc_ce->y<=y && doc_ce->x<=x || doc_ce->flags1 & (DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))) {
old_flags1=doc_ce->flags1;
while (doc_ce!=doc && (doc_ce->y<=y && doc_ce->x<=x || doc_ce->de_flags & (DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP))) {
old_de_flags=doc_ce->de_flags;
old_color=doc_ce->type;
doc_ce=doc_ce->next;
}
@@ -334,20 +329,20 @@ public U0 EdLineDown(CDoc *doc,I64 sc=MIN_I64)
doc->cur_entry=doc_ce;
if (!((doc_ce->type_u8==DOCT_NEW_LINE || doc_ce->type_u8==DOCT_SOFT_NEW_LINE || doc_ce->type_u8==DOCT_INDENT) &&
(doc_ce->last->type_u8==DOCT_NEW_LINE || doc_ce->last->type_u8==DOCT_SOFT_NEW_LINE || doc_ce->last->type_u8==DOCT_INDENT)))
DocFormBackward(doc);
DocFormBwd(doc);
doc_ce=doc->cur_entry;
}
while (doc_ce2!=doc && (doc_ce2!=doc_ce || IsEditableText(doc_ce))) {
if (doc_ce2->y<y || doc_ce2->x<x || doc_ce2->flags1 & (DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP) ||
if (doc_ce2->y<y || doc_ce2->x<x || doc_ce2->de_flags & (DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP) ||
doc_ce2->x==x && !doc_ce2->max_col &&
Bt(doc_type_flags_nontag_invisible,doc_ce2->type_u8)) {
Bt(doldoc.type_flags_nontag_invisible,doc_ce2->type_u8)) {
if (sc>=0)
BEqu(&doc_ce2->type,DOCEt_SELECTED,sc&SCF_SHIFT);
}
if (doc_ce2==doc_ce) break;
doc_ce2=doc_ce2->next;
}
if (doc_ce->flags1&DOCEF1_TAG) {
if (doc_ce->de_flags&DOCEF_TAG) {
doc->cur_data_col=x-doc_ce->x;
if (IsEditableText(doc_ce)) {
if (doc->cur_data_col>doc_ce->max_col)
@@ -366,7 +361,7 @@ public U0 EdLineDown(CDoc *doc,I64 sc=MIN_I64)
doc_ne=DocEntryNew(doc,doc_ce,StrNew(dst,doc->mem_task));
*dst=0;
doc_ne->type=DOCT_TEXT | old_color & -0x100;
doc_ne->flags1=old_flags1|doc_dft_flags1[DOCT_TEXT];
doc_ne->de_flags=old_de_flags|doldoc.dft_de_flags[DOCT_TEXT];
doc_ce->max_col=doc->cur_data_col;
doc_ne->x=doc_ce->x+doc->cur_data_col;
QueIns(doc_ne,doc_ce);
@@ -396,11 +391,10 @@ U0 EdDelChar(CDoc *doc)
if (unlock)
DocUnlock(doc);
return;
} else
doc->recalc_start=doc_ce->last;
}
if (doc_ce->max_col!=0 && (IsEditableText(doc_ce)||doc_ce->type_u8==DOCT_DATA)) {
if (doc_ce->type_u8==DOCT_DATA) {
if (doc_ce->flags1 & DOCEF1_HAS_TERMINATOR && doc->cur_data_col==doc_ce->max_col-1) {
if (doc_ce->de_flags & DOCEF_HAS_TERMINATOR && doc->cur_data_col==doc_ce->max_col-1) {
if (unlock)
DocUnlock(doc);
return;
@@ -419,7 +413,7 @@ U0 EdDelChar(CDoc *doc)
}
doc->cur_entry=doc_ce->next;
doc->cur_data_col=doc->cur_entry->min_col;
if (!(doc_ce->flags1&DOCEF1_FILTER_SKIP))
if (!(doc_ce->de_flags&DOCEF_FILTER_SKIP))
DocEntryDel(doc,doc_ce);
DocRemSoftNewLines(doc,doc->cur_entry);
if (unlock)
@@ -438,7 +432,6 @@ U0 ChkDollarBufSize(CDoc *doc)
}
}
U0 EdInsChar(I64 ch,I64 sc,CDoc *doc)
{
Bool unlock=DocLock(doc);
@@ -446,10 +439,6 @@ U0 EdInsChar(I64 ch,I64 sc,CDoc *doc)
CDocEntry *doc_ce=doc->cur_entry,*doc_ne;
I64 i,j,m,y=doc_ce->y;
doc->recalc_start=doc_ce->last;
while (doc->recalc_start!=doc && doc->recalc_start->flags1&(DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))
doc->recalc_start=doc->recalc_start->last;
if (doc->flags & DOCF_IN_DOLLAR) {
if (!Bt(chars_bitmap_getkey,ch))
goto ic_done;
@@ -483,16 +472,16 @@ U0 EdInsChar(I64 ch,I64 sc,CDoc *doc)
ic_cont:
if ((ch==CH_SPACE || ch=='\n') &&
!(sc & (SCF_CTRL|SCF_SHIFT)) &&
doc_ce->flags1 & (DOCEF1_LINK|DOCEF1_TREE|DOCEF1_CHECK_COLLAPSABLE|
DOCEF1_LEFT_MACRO|DOCEF1_LEFT_EXP|DOCEF1_LEFT_CB|DOCEF1_LEFT_AUTO |
DOCEF1_RIGHT_MACRO|DOCEF1_RIGHT_EXP|DOCEF1_RIGHT_CB|DOCEF1_RIGHT_AUTO)) {
doc_ce->de_flags & (DOCEF_LINK|DOCEF_TREE|DOCEF_LST|DOCEF_CHECK_COLLAPSABLE|
DOCEF_LEFT_MACRO|DOCEF_LEFT_EXP|DOCEF_LEFT_CB|DOCEF_LEFT_AUTO |
DOCEF_RIGHT_MACRO|DOCEF_RIGHT_EXP|DOCEF_RIGHT_CB|DOCEF_RIGHT_AUTO)) {
doc->cmd_U8=ch;
DocEntryRun(doc,doc_ce,FALSE);
DocLock(doc);
goto ic_done;
}
if (doc_ce->type_u8==DOCT_HEX_ED) {
if (doc_ce->flags1 & DOCEF1_DATA_IS_PTR)
if (doc_ce->de_flags & DOCEF_DATA_IS_PTR)
b=doc_ce->data;
else
b=&doc_ce->data;
@@ -533,7 +522,7 @@ ic_overstrike_char:
goto ic_overstrike_char;
}
} else if (doc_ce->type_u8==DOCT_DATA) {
if (doc_ce->flags1 & DOCEF1_HAS_TERMINATOR) {
if (doc_ce->de_flags & DOCEF_HAS_TERMINATOR) {
if (doc_ce->tag[doc->cur_data_col] &&
doc->cur_data_col<doc_ce->min_col+doc_ce->len) {
doc_ce->tag[doc->cur_data_col++]=ch;
@@ -553,7 +542,7 @@ ic_overstrike_char:
b[1]=0;
doc_ne=DocEntryNew(doc,doc_ce,b);
doc_ne->type=DOCT_TEXT | doc->settings_root.dft_text_attr<<8;
doc_ne->flags1=doc_dft_flags1[DOCT_TEXT];
doc_ne->de_flags=doldoc.dft_de_flags[DOCT_TEXT];
QueIns(doc_ne,doc_ce->last);
} else if (ch=='\n') {
while (doc->cur_entry->next!=doc && doc->cur_entry->y==y)
@@ -569,16 +558,16 @@ ic_overstrike_char:
doc_ne=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
if (sc&SCF_CTRL && !(sc&SCF_SHIFT)) {
doc_ne->type=DOCT_PAGE_BREAK | doc->settings_root.dft_text_attr<<8;
doc_ne->flags1=doc_dft_flags1[DOCT_PAGE_BREAK];
doc_ne->de_flags=doldoc.dft_de_flags[DOCT_PAGE_BREAK];
} else {
doc_ne->type=DOCT_NEW_LINE | doc->settings_root.dft_text_attr<<8;
doc_ne->flags1=doc_dft_flags1[DOCT_NEW_LINE];
doc_ne->de_flags=doldoc.dft_de_flags[DOCT_NEW_LINE];
}
DocInsEntry(doc,doc_ne);
} else if (ch=='\t') {
if (doc->flags&DOCF_FORM &&
Bt(doc_type_flags_form,doc->cur_entry->type_u8) &&
!(doc->cur_entry->flags1&DOCEF1_SKIP_IN_FORM)) {
Bt(doldoc.type_flags_form,doc->cur_entry->type_u8) &&
!(doc->cur_entry->de_flags&DOCEF_SKIP_IN_FORM)) {
ic_form_tab:
doc->cur_entry=doc->cur_entry->next;
doc->cur_data_col=doc->cur_entry->min_col;
@@ -587,14 +576,14 @@ ic_form_tab:
} else {
doc_ne=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_ne->type=DOCT_TAB | doc->settings_root.dft_text_attr<<8;
doc_ne->flags1=doc_dft_flags1[DOCT_TAB];
doc_ne->de_flags=doldoc.dft_de_flags[DOCT_TAB];
DocInsEntry(doc,doc_ne);
}
} else {
if (Bt(chars_bitmap_displayable,ch)) {
if (doc_ce->type_u8==DOCT_DATA) {
i=doc_ce->len+doc_ce->min_col;
if (doc_ce->flags1 & DOCEF1_HAS_TERMINATOR)
if (doc_ce->de_flags & DOCEF_HAS_TERMINATOR)
i++;
if (i>doc_ce->max_col) {
b=doc_ce->tag;
@@ -621,7 +610,7 @@ ic_form_tab:
b[1]=0;
doc_ne=DocEntryNew(doc,doc_ce,b);
doc_ne->type=DOCT_TEXT | doc->settings_root.dft_text_attr<<8;
doc_ne->flags1=doc_dft_flags1[DOCT_TEXT];
doc_ne->de_flags=doldoc.dft_de_flags[DOCT_TEXT];
doc_ne->x=doc_ce->x+1;
QueIns(doc_ne,doc_ce->last);
}
@@ -629,9 +618,10 @@ ic_form_tab:
}
ic_done:
DocRemSoftNewLines(doc,doc->cur_entry);
if (doc->cur_entry->flags1 & DOCEF1_UPDATE_DATA) {
if (doc->cur_entry->type_u8==DOCT_DATA || doc->cur_entry->type_u8==DOCT_CHECK_BOX)
DocDataScan(doc->cur_entry);
if (doc->cur_entry->de_flags & DOCEF_UPDATE_DATA) {
if (doc->cur_entry->type_u8==DOCT_DATA ||
doc->cur_entry->type_u8==DOCT_CHECK_BOX)
DocDataScan(doc,doc->cur_entry);
}
if (unlock)
DocUnlock(doc);
@@ -649,14 +639,10 @@ U0 EdDelLine(CDoc *doc)
doc_ce=doc_ce->last;
while (doc_ce!=doc && doc_ce->y==y) {
doc_ce2=doc_ce->last;
if (!(doc_ce->flags1&DOCEF1_FILTER_SKIP))
if (!(doc_ce->de_flags&DOCEF_FILTER_SKIP))
DocEntryDel(doc,doc_ce);
doc_ce=doc_ce2;
}
if (doc_ce==doc)
doc->recalc_start=doc_ce;
else
doc->recalc_start=doc_ce->last;
}
U0 DocEntryToggle(CDoc *doc)
@@ -666,12 +652,12 @@ U0 DocEntryToggle(CDoc *doc)
U8 ch,*st,*st2;
I64 i,j,k;
if (doc_ce!=doc && !(doc->flags&(DOCF_PLAIN_TEXT|DOCF_PLAIN_TEXT_WITH_TABS))) {
if (doc_ce->type_u8==DOCT_TEXT && !(doc_ce->flags1 & ~(DOCEF1_TAG|DOCG_BL_IV_UL|DOCEF1_WORD_WRAP|DOCEF1_HIGHLIGHT|DOCEF1_LOCK_TO_PAGE|DOCEF1_LOCK_TO_CENTER|DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))) {
if (doc_ce->type_u8==DOCT_TEXT && !(doc_ce->de_flags & ~(DOCEF_TAG|DOCG_BL_IV_UL|DOCEF_WORD_WRAP|DOCEF_HIGHLIGHT|DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP))) {
doc_ce2=doc_ce->last;
for (k=0;k<20;k++) {
if (doc_ce2!=doc) {
cl1=doc_ce2->last;
if (doc_ce2->type_u8==DOCT_TEXT && doc_ce->flags1==doc_ce2->flags1 && doc_ce->type==doc_ce2->type) {
if (doc_ce2->type_u8==DOCT_TEXT && doc_ce->de_flags==doc_ce2->de_flags && doc_ce->type==doc_ce2->type) {
i=StrLen(doc_ce2->tag);
j=StrLen(doc_ce->tag);
st=MAlloc(i+j+1,doc->mem_task);
@@ -694,7 +680,7 @@ U0 DocEntryToggle(CDoc *doc)
for (k=0;k<20;k++) {
if (doc_ce2!=doc) {
cl1=doc_ce2->next;
if (doc_ce2->type_u8==DOCT_TEXT && doc_ce->flags1==doc_ce2->flags1 && doc_ce->type==doc_ce2->type) {
if (doc_ce2->type_u8==DOCT_TEXT && doc_ce->de_flags==doc_ce2->de_flags && doc_ce->type==doc_ce2->type) {
i=StrLen(doc_ce->tag);
j=StrLen(doc_ce2->tag);
st=MAlloc(i+j+1,doc->mem_task);
@@ -725,7 +711,7 @@ U0 DocEntryToggle(CDoc *doc)
doc_ce->tag[j+1]=ch;
StrCpy(doc_ce->tag+i,doc_ce->tag+j+1);
doc->cur_data_col=i;
st2=MPrint("%q",st);
st2=MStrPrint("%q",st);
if (doc_ce=DocPrint(doc,st2)) {
doc->cur_entry=doc_ce;
doc->cur_data_col=doc_ce->min_col;
Adam/Doc/DocEd2b.CPP → Adam/DolDoc/DocEd2b.CPP
+117 -97
View File
@@ -1,7 +1,7 @@
#help_index "Doc/Output"
#help_index "DolDoc/Output"
public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0)
{
{//$LK,"PutKey",A="MN:PutKey"$(ch,sc) at doc insert pt, cur_entry.
I64 i,x,y,sc2,ext_ascii_cnt=0;
CDoc *m;
CDocEntry *doc_ce;
@@ -13,13 +13,13 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0)
if (doc->user_put_key && (*doc->user_put_key)(doc,doc->user_put_data,ch,sc))
return;
unlock=DocLock(doc);
if (!Bt(doc_clean_scancodes,sc.u8[0]))
if (!Bt(doldoc.clean_scan_codes,sc.u8[0]))
doc->flags|=DOCF_UNDO_DIRTY;
DocCaptureUndo(doc);
if (Bt(chars_bitmap_getkey,ch) &&
!(sc&(SCF_CTRL|SCF_ALT))) {
if (sc&SCF_KEY_DESC) {
st=A2KeyName(ch,FALSE);
st=Char2KeyName(ch,FALSE);
SetKeyDesc("Char/'%s'",st);
Free(st);
} else
@@ -140,7 +140,7 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0)
case CH_CTRLL:
if (sc&SCF_KEY_DESC) {
if (sc&SCF_SHIFT)
SetKeyDesc("Edit/Managed Code");
SetKeyDesc("Edit/Code Tools");
else
SetKeyDesc("Dollar/Wizard");
} else {
@@ -215,11 +215,11 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0)
if (!(doc->flags&(DOCF_PLAIN_TEXT|DOCF_PLAIN_TEXT_WITH_TABS))) {
DocUnlock(doc);
if (doc_ce->type_u8==DOCT_SPRITE)
EdExistingGraphic(doc,
EdSpriteEd(doc,
(doc_ce->x-doc->line_start_col+doc_ce->max_col)*FONT_WIDTH,
(doc_ce->y-doc->cur_top_line_num)*FONT_HEIGHT);
else
EdInsGraphic(doc,
EdSpriteIns(doc,
(doc_ce->x+doc->cur_data_col-doc->line_start_col)*FONT_WIDTH,
(doc_ce->y-doc->cur_top_line_num)*FONT_HEIGHT);
DocLock(doc);
@@ -494,7 +494,7 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0)
SetKeyDesc("God Word");
} else {
//$LK,"::/Adam/God/HSNotes.TXT"$
FifoU8Flush(god_fifo);
FifoU8Flush(god.fifo);
GodBitsIns(GOD_GOOD_BITS,KbdMouseEvtTime>>GOD_BAD_BITS);
if (sc & SCF_SHIFT)
GodPassage;
@@ -520,8 +520,7 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0)
doc_ce=doc->cur_entry=doc_ce->next;
}
doc->cur_data_col=doc_ce->min_col;
doc->recalc_start=doc;
DocFormBackward(doc);
DocFormBwd(doc);
}
} else if (sc&SCF_KEY_DESC) {
if (sc&SCF_SHIFT)
@@ -547,7 +546,6 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0)
}
doc_ce=doc->cur_entry=doc->root.next;
doc->cur_data_col=doc_ce->min_col;
doc->recalc_start=doc;
DocFormFwd(doc);
}
} else if (sc&SCF_KEY_DESC) {
@@ -570,8 +568,7 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0)
i+=doc->cur_data_col/3/doc_ce->hex_ed_width;
while (doc_ce!=doc &&
(doc_ce->type_u8!=DOCT_HEX_ED && doc_ce->y<i ||
doc_ce->type_u8==DOCT_HEX_ED && doc_ce->y+doc->cur_data_col/3/doc_ce->hex_ed_width<i) &&
doc_ce->y!=doc->root.last->y) {
doc_ce->type_u8==DOCT_HEX_ED && doc_ce->y+doc->cur_data_col/3/doc_ce->hex_ed_width<i)) {
EdLineDown(doc,sc);
//paranoid check for stuck on same node
if (doc->cur_entry==doc_ce && doc_ce->type_u8!=DOCT_HEX_ED)
@@ -661,8 +658,6 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0)
} //switch (sc2)
}
}
if (!doc->recalc_start)
doc->recalc_start=doc->cur_entry->last;
doc->ext_ascii_cnt=ext_ascii_cnt;
if (unlock)
DocUnlock(doc);
@@ -670,29 +665,23 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0)
Yield;
}
U0 DocNewLine(CDoc *doc=NULL,I64 cnt=1)
{
while (cnt-->0)
DocPutKey(doc,'\n',0);
}
Bool KDDocPutKey(I64 ch,I64 scancode)
Bool KDDocPutKey(I64 ch,I64 scan_code)
{
CDoc *doc;
if (doc=DocPut)
DocPutKey(doc,ch,scancode);
DocPutKey(doc,ch,scan_code);
return FALSE;
}
public U0 DocPrintPartial(CDoc *doc,U8 *fmt,...)
{//This lets you print half a doc cmd, if you like.
{//Lets you print half a doc cmd, if you like.
U8 *buf,*b,*src,*dst,*ptr,*ptr2;
Bool unlock;
CDocEntry *doc_ce,*doc_ne;
I64 ch,i,j;
if (!fmt)
return;
buf=SPrintJoin(NULL,fmt,argc,argv);
buf=StrPrintJoin(NULL,fmt,argc,argv);
ptr=buf;
if (doc->user_put_s && (*doc->user_put_s)(doc,doc->user_put_data,buf)) {
Free(buf);
@@ -718,7 +707,6 @@ public U0 DocPrintPartial(CDoc *doc,U8 *fmt,...)
ptr--;
*ptr=0;
doc_ce=doc->cur_entry;
doc->recalc_start=doc_ce->last;
j=ptr-ptr2;
if (IsEditableText(doc_ce)) {
dst=b=MAlloc(doc_ce->max_col+j+1,doc->mem_task);
@@ -738,7 +726,7 @@ public U0 DocPrintPartial(CDoc *doc,U8 *fmt,...)
MemCpy(dst,ptr2,j+1);
doc_ne=DocEntryNew(doc,doc_ce,dst);
doc_ne->type=DOCT_TEXT | doc->settings_root.dft_text_attr<<8;
doc_ne->flags1=doc_dft_flags1[DOCT_TEXT];
doc_ne->de_flags=doldoc.dft_de_flags[DOCT_TEXT];
QueIns(doc_ne,doc_ce->last);
doc->cur_entry=doc_ne;
doc->cur_data_col=StrLen(ptr2);
@@ -754,86 +742,111 @@ public U0 DocPrintPartial(CDoc *doc,U8 *fmt,...)
Free(buf);
}
#help_index "Doc"
Bool DocFileEd(I64 type,U8 *filename,
U8 *needle_str,I64 *_num,I64 ed_flags)
#help_index "DolDoc"
Bool DocFileEd(I64 _type,U8 *filename,
U8 *needle_str,I64 *_num,I64 edf_dof_flags)
{
I64 flags=0,i,old_border_src=Fs->border_src;
I64 type=_type,flags=0,old_border_src=Fs->border_src;
CDocEntry *doc_e;
CDoc *doc;
Bool old_silent=Bt(&Fs->display_flags,DISPLAYf_SILENT),
result=FALSE;
result=FALSE,other_found=FALSE;
U8 *st1,*st2;
try {
switch (type) {
case LK_PLAIN:
type=LK_FILE;
flags=DOCF_PLAIN_TEXT;
case LK_DOC:
type=LK_FILE;
break;
case LK_DOC_ANCHOR:
type=LK_FILE_ANCHOR;
break;
case LK_PLAIN_FIND:
type=LK_FILE_FIND;
flags=DOCF_PLAIN_TEXT;
case LK_DOC_FIND:
type=LK_FILE_FIND;
break;
case LK_PLAIN_LINE:
type=LK_FILE_LINE;
flags=DOCF_PLAIN_TEXT;
case LK_DOC_LINE:
type=LK_FILE_LINE;
break;
case LK_BIBLE_FIND:
flags=DOCF_PLAIN_TEXT;
break;
}
flags|=DOCF_ALLOW_UNDO;
if (!*filename)
doc=DocPut;
else {
Silent(ON);
if (Bt(&ed_flags,EDf_BAIL)) //if bail, scan parents
i=FUF_JUST_FILES|FUF_Z_OR_NOT_Z|FUF_SCAN_PARENTS;
else
i=FUF_JUST_FILES;
result=FileFind(filename,,i);
doc=DocRead(filename,flags);
StrCpy(doc->desc,"Edit");
Silent(old_silent);
Fs->border_src=BDS_ED_FILENAME_PRT;
}
if (Bt(&ed_flags,EDf_COLLAPSE))
DocCollapse(TRUE,doc);
else if (Bt(&ed_flags,EDf_UNCOLLAPSE))
DocCollapse(FALSE,doc);
if (result)
switch (type) {
case LK_FILE_LINE:
result=DocLineNumGoTo(doc,*_num);
break;
case LK_FILE_ANCHOR:
result=DocAnchorFind(doc,needle_str);
break;
case LK_FILE_FIND:
result=DocFind(doc,,needle_str,*_num);
break;
case LK_BIBLE_FIND:
result=DocFind(doc,*_num,needle_str);
break;
default:
DocCenter(doc);
flags|=DOCF_ALLOW_UNDO;
if (LK_DOC<=_type<=LK_DOC_LINE) {
doc=Str2I64(filename);//See $LK,"SpriteEdText",A="MN:SpriteEdText"$()
result=TRUE;
} else {
st1=StrNew(filename);
st2=StrNew(filename);
StrLastRem(st1,"/",st2); //st2 is name without dir
if (!FileNameChk(st2))
doc=NULL;
else {
Silent(ON);
if (Bt(&edf_dof_flags,EDf_BAIL)) //if bail, scan parents
result=FileFind(filename,,
FUF_JUST_FILES|FUF_Z_OR_NOT_Z|FUF_SCAN_PARENTS);
else if (!(result=FileFind(filename,,
FUF_JUST_FILES)))
other_found=FileFind(filename,,
FUF_JUST_FILES|FUF_Z_OR_NOT_Z|FUF_SCAN_PARENTS);
doc=DocRead(filename,flags);
doc->desc='Edit';
Silent(old_silent);
Fs->border_src=BDS_ED_FILENAME_PRT;
}
*_num=doc->cur_entry->y+1;
if (!(ed_flags&EDF_BAIL) && DocDo(doc,DOF_DONT_HOME)) {
DocLock(doc);
doc_e=doc->cur_entry;
if (doc_e!=doc)
DocEntryRun(doc,doc_e,TRUE);
DocUnlock(doc);
DocWrite(doc);
Free(st1);
Free(st2);
}
if (DocPut!=doc)
DocDel(doc);
else
if (!doc||doc->doc_signature!=DOC_SIGNATURE_VAL)
result=FALSE;
else {
if (Bt(&edf_dof_flags,EDf_COLLAPSE))
DocCollapse(TRUE,doc);
else if (Bt(&edf_dof_flags,EDf_UNCOLLAPSE))
DocCollapse(FALSE,doc);
if (result || other_found)
switch (type) {
case LK_FILE_LINE:
result=DocLineNumGoTo(doc,*_num);
break;
case LK_FILE_ANCHOR:
result=DocAnchorFind(doc,needle_str);
break;
case LK_FILE_FIND:
result=DocFind(doc,,needle_str,*_num);
break;
case LK_BIBLE_FIND:
result=DocFind(doc,*_num,needle_str);
break;
default:
DocCenter(doc);
}
*_num=doc->cur_entry->y+1;
if (!(edf_dof_flags&EDF_BAIL) && DocDo(doc,edf_dof_flags|DOF_DONT_HOME)) {
DocLock(doc);
doc_e=doc->cur_entry;
if (doc_e!=doc)
DocEntryRun(doc,doc_e,TRUE);
DocUnlock(doc);
if (!(LK_DOC<=_type<=LK_DOC_LINE))
DocWrite(doc);
}
if (!(LK_DOC<=_type<=LK_DOC_LINE))
DocDel(doc);
}
} catch {
Silent(old_silent);
result=FALSE;
@@ -843,15 +856,15 @@ Bool DocFileEd(I64 type,U8 *filename,
}
public I64 EdLinkCvt(U8 *link_st,U8 **_filename=NULL,U8 **_needle_str=NULL,
I64 *_num=NULL,I64 ed_flags=0)
{//Convert an $LK,"Editor Link Types",A="MN:LK_FILE"$ to filename, needle_str and line number
I64 *_num=NULL,I64 edf_dof_flags=0)
{//$LK,"Editor Link",A="MN:LK_FILE"$ --> filename, needle_str and line number.
U8 *st,*ptr,*filename=NULL,*needle_str=NULL,*filename2;
I64 result,i,num=1;
CHashSrcSym *temph;
if (!link_st||!*link_st) {
if (ed_flags&EDF_BAIL)
if (edf_dof_flags&EDF_BAIL)
return -1;
link_st=sys_temp_filename;
link_st=dsk.temp_filename;
}
st=StrNew(link_st);
result=LK_FILE;
@@ -861,18 +874,18 @@ public I64 EdLinkCvt(U8 *link_st,U8 **_filename=NULL,U8 **_needle_str=NULL,
switch (result=DefineMatch(st,"ST_LINK_TYPES",LMF_IGNORE_CASE)) {
case LK_MAN_PAGE:
if (temph=HashFind(filename2,Fs->hash_table,HTG_SRC_SYM))
result=EdLinkCvt(temph->src_link,&filename,&needle_str,&num,ed_flags);
result=EdLinkCvt(temph->src_link,&filename,&needle_str,&num,edf_dof_flags);
else
result=-1;
goto lc_done;
case LK_ADDR:
if (ptr=StrLastOcc(filename2,",")) {
*ptr=0;
i=A2I64(ptr+1);
i=Str2I64(ptr+1);
} else
i=DFT_ADDR_LINK_BIN_SIZE;
if (ptr=SrcEdLink(ExePrint("%s;",filename2),i)) {
result=EdLinkCvt(ptr,&filename,&needle_str,&num,ed_flags);
result=EdLinkCvt(ptr,&filename,&needle_str,&num,edf_dof_flags);
Free(ptr);
} else
result=-1;
@@ -880,7 +893,7 @@ public I64 EdLinkCvt(U8 *link_st,U8 **_filename=NULL,U8 **_needle_str=NULL,
case LK_DEF:
if (ptr=StrLastOcc(filename2,",")) {
*ptr=0;
i=A2I64(ptr+1);
i=Str2I64(ptr+1);
} else
i=-1;
filename=StrNew(filename2);
@@ -898,18 +911,20 @@ public I64 EdLinkCvt(U8 *link_st,U8 **_filename=NULL,U8 **_needle_str=NULL,
if (i<0)
result=-1;
else {
num=A2I64(DefineSub(i,"ST_BIBLE_BOOK_LINES"));
num=Str2I64(DefineSub(i,"ST_BIBLE_BOOK_LINES"));
filename2=Define("ST_BIBLE_FILE");
}
break;
case LK_FILE_LINE:
case LK_PLAIN_LINE:
case LK_DOC_LINE:
if (ptr=StrLastOcc(filename2,",")) {
*ptr=0;
num=A2I64(ptr+1);
num=Str2I64(ptr+1);
}
break;
case LK_FILE_ANCHOR:
case LK_DOC_ANCHOR:
if (ptr=StrLastOcc(filename2,",")) {
*ptr=0;
needle_str=StrNew(ptr+1);
@@ -917,20 +932,25 @@ public I64 EdLinkCvt(U8 *link_st,U8 **_filename=NULL,U8 **_needle_str=NULL,
break;
case LK_FILE_FIND:
case LK_PLAIN_FIND:
case LK_DOC_FIND:
if (ptr=StrLastOcc(filename2,",")) {
*ptr=0;
needle_str=StrNew(ptr+1);
if (ptr=StrLastOcc(needle_str,":")) {
*ptr=0;
num=A2I64(ptr+1);
num=Str2I64(ptr+1);
}
}
break;
}
} else
filename2=st;
if (result>=0)
filename=FileNameAbs(filename2,FUF_Z_OR_NOT_Z);
if (result>=0) {
if (LK_DOC<=result<=LK_DOC_LINE)
filename=StrNew(filename2); //Holds document address as number.
else
filename=FileNameAbs(filename2,FUF_Z_OR_NOT_Z);
}
lc_done:
Free(st);
if (_filename)
Adam/Doc/DocFile.CPP → Adam/DolDoc/DocFile.CPP
+50 -50
View File
@@ -1,7 +1,7 @@
#help_index "Doc/File"
#help_index "DolDoc/File"
public U0 DocLoad(CDoc *doc,U8 *src2,I64 size)
{
{//Fetch doc from raw mem buf.
I64 i;
U8 *src;
Bool unlock=DocLock(doc);
@@ -27,17 +27,18 @@ public U0 DocLoad(CDoc *doc,U8 *src2,I64 size)
}
if (!(doc->flags & (DOCF_PLAIN_TEXT|DOCF_PLAIN_TEXT_WITH_TABS)))
DocBinsValidate(doc);
DocHome(doc); //DOCT_CURSOR will set it in recalc
DocTop(doc); //DOCT_CURSOR will set it in recalc
DocRecalc(doc);
if (unlock)
DocUnlock(doc);
}
public CDoc *DocRead(U8 *name,I64 flags=0)
{
public CDoc *DocRead(U8 *name=NULL,I64 flags=0)
{//Fetch doc from disk. See $LK,"flags",A="MN:DOCF_PLAIN_TEXT"$.
CDoc *doc=DocNew;
U8 *src,*name2;
I64 size=0;
if (!name) name=dsk.temp_filename;
doc->flags|=flags;
name2=FileNameAbs(name);
StrCpy(doc->filename.name,name2);
@@ -51,7 +52,7 @@ public CDoc *DocRead(U8 *name,I64 flags=0)
}
public U8 *DocSave(CDoc *doc,I64 *_size=NULL)
{
{//Store doc to raw mem buf.
CDocEntry *doc_e;
CDocBin *b;
Bool unlock=DocLock(doc);
@@ -67,7 +68,7 @@ public U8 *DocSave(CDoc *doc,I64 *_size=NULL)
DocBinsValidate(doc);
DocRecalc(doc);
for (doc_e=doc->root.next;doc_e!=doc;doc_e=doc_e->next) {
if (!Bt(doc_type_flags_data,doc_e->type_u8)) {
if (!Bt(doldoc.type_flags_data,doc_e->type_u8)) {
switch (doc_e->type_u8) {
case DOCT_TAB:
case DOCT_PAGE_BREAK:
@@ -80,7 +81,7 @@ public U8 *DocSave(CDoc *doc,I64 *_size=NULL)
cnt++;
break;
case DOCT_TEXT://$BK,1$Update $LK,"DOCT_TEXT",A="FF:D:/Compiler/Lex.CPP,DOCT_TEXT"$$BK,0$
if (!(doc_e->flags1 & ~(DOCEF1_TAG|DOCG_BL_IV_UL|DOCEF1_WORD_WRAP|DOCEF1_HIGHLIGHT|DOCEF1_LOCK_TO_PAGE|DOCEF1_LOCK_TO_CENTER|DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))) {
if (!(doc_e->de_flags & ~(DOCEF_TAG|DOCG_BL_IV_UL|DOCEF_WORD_WRAP|DOCEF_HIGHLIGHT|DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP))) {
cnt+=StrLen(doc_e->tag);
if (!(doc->flags & (DOCF_PLAIN_TEXT | DOCF_PLAIN_TEXT_WITH_TABS)) ||
doc->flags&DOCF_DBL_DOLLARS)
@@ -109,9 +110,9 @@ public U8 *DocSave(CDoc *doc,I64 *_size=NULL)
result=MAlloc(cnt);
dst=result;
for (doc_e=doc->root.next;doc_e!=doc;doc_e=doc_e->next) {
if (!Bt(doc_type_flags_data,doc_e->type_u8)) {
if (!Bt(doldoc.type_flags_data,doc_e->type_u8)) {
if (doc_e->type_u8==DOCT_TEXT &&
!(doc_e->flags1 & ~(DOCEF1_TAG|DOCG_BL_IV_UL|DOCEF1_WORD_WRAP|DOCEF1_HIGHLIGHT|DOCEF1_LOCK_TO_PAGE|DOCEF1_LOCK_TO_CENTER|DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))) {
!(doc_e->de_flags & ~(DOCEF_TAG|DOCG_BL_IV_UL|DOCEF_WORD_WRAP|DOCEF_HIGHLIGHT|DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP))) {
src=doc_e->tag;
i=0;
while (ch=*src++) {
@@ -143,7 +144,7 @@ public U8 *DocSave(CDoc *doc,I64 *_size=NULL)
break;
default:
if (doc_e->type_u8!=DOCT_SOFT_NEW_LINE &&
doc_e->type_u8!=DOCT_CURSOR) { //(Cursor is set by cur_entry)
doc_e->type_u8!=DOCT_CURSOR) {//(Cursor is set by cur_entry)
*dst++='$$';
st=Doc2PlainText(doc,doc_e);
StrCpy(dst,st);
@@ -182,25 +183,29 @@ public U8 *DocSave(CDoc *doc,I64 *_size=NULL)
return result;
}
public U0 DocWrite(CDoc *doc,Bool prompt=FALSE)
{
public Bool DocWrite(CDoc *doc,Bool prompt=FALSE)
{//Store doc to disk.
I64 size;
U8 *buf=DocSave(doc,&size);
if (prompt) {
if (DocFormDo(&doc->filename))
FileWrite(doc->filename.name,buf,size,0,doc->file_attr);
} else
FileWrite(doc->filename.name,buf,size,0,doc->file_attr);
U8 *buf;
if (prompt && !DocFormDo(&doc->filename))
return FALSE;
if (doc->filename.name[0]=='A'&&doc->filename.name[2]==':')
return FALSE; //LK_DOC,LK_DOC_ANCHOR,LK_DOC_FIND,LK_DOC_LINE
buf=DocSave(doc,&size);
FileWrite(doc->filename.name,buf,size,0,doc->file_attr);
Free(buf);
return TRUE;
}
#help_index "Doc"
public U0 DocInsDoc(CDoc *doc,CDoc *doc2)
{ //TODO: $LK,"DocRst",A="MN:DocRst"$
#help_index "DolDoc"
public U0 DocInsDoc(CDoc *doc=NULL,CDoc *doc2)
{//Insert copy of doc2 into doc at insert pt, cur_entry.
//TODO: $LK,"DocRst",A="MN:DocRst"$
U8 *dst;
Bool unlock_doc=DocLock(doc),
unlock_doc2=DocLock(doc2);
Bool unlock_doc,unlock_doc2=DocLock(doc2);
CDocEntry *doc_ne,*doc_e=doc2->root.next,*doc_ce;
if (!doc) doc=DocPut;
unlock_doc=DocLock(doc),
DocRemSoftNewLines(doc,NULL);
doc_ce=doc->cur_entry;
if (doc_ce->type_u8==DOCT_TEXT && doc->cur_data_col>doc_ce->min_col) {
@@ -231,14 +236,14 @@ public U0 DocInsDoc(CDoc *doc,CDoc *doc2)
DocUnlock(doc);
}
#help_index "Doc/Clipboard"
#help_index "DolDoc/Clipboard"
public U0 ClipboardDel()
{
{//Delete everything on clipboard.
DocRst(sys_clipboard_doc,TRUE);
}
public U0 EdCopyToClipboard(CDoc *doc)
{
{//Copy $LK,"DOCET_SELECTED",A="MN:DOCET_SELECTED"$ flagged entries to clipboard.
CDoc *doc2=sys_clipboard_doc;
Bool unlock_doc=DocLock(doc),
unlock_doc2=DocLock(doc2);
@@ -247,7 +252,7 @@ public U0 EdCopyToClipboard(CDoc *doc)
while (doc_e!=doc) {
if (doc_e->type & DOCET_SELECTED) {
doc_e->type&=~DOCET_SELECTED;
if (!Bt(doc_type_flags_data,doc_e->type_u8)) {
if (!Bt(doldoc.type_flags_data,doc_e->type_u8)) {
doc_ne=DocEntryCopy(doc2,doc_e);
QueIns(doc_ne,doc2->root.last);
}
@@ -261,7 +266,7 @@ public U0 EdCopyToClipboard(CDoc *doc)
}
public U0 EdCutToClipboard(CDoc *doc)
{
{//Remove selected entries and place on clipboard.
CDoc *doc2=sys_clipboard_doc;
Bool unlock_doc=DocLock(doc),
unlock_doc2=DocLock(doc2);
@@ -271,7 +276,7 @@ public U0 EdCutToClipboard(CDoc *doc)
doc_e1=doc_e->next;
if (doc_e->type & DOCET_SELECTED) {
doc_e->type&=~DOCET_SELECTED;
if (!Bt(doc_type_flags_data,doc_e->type_u8)) {
if (!Bt(doldoc.type_flags_data,doc_e->type_u8)) {
doc_ne=DocEntryCopy(doc2,doc_e);
QueIns(doc_ne,doc2->root.last);
}
@@ -285,7 +290,6 @@ public U0 EdCutToClipboard(CDoc *doc)
doc->cur_entry=doc_e2;
doc->cur_data_col=doc_e2->min_col;
}
doc->recalc_start=doc;
DocRemSoftNewLines(doc,NULL);
if (unlock_doc2)
DocUnlock(doc2);
@@ -294,7 +298,7 @@ public U0 EdCutToClipboard(CDoc *doc)
}
public U0 EdPasteClipboard(CDoc *doc)
{
{//Insert copy of clipboard at insert pt, cur_entry.
CDoc *doc2=sys_clipboard_doc;
Bool unlock_doc=DocLock(doc),
unlock_doc2=DocLock(doc2);
@@ -302,7 +306,7 @@ public U0 EdPasteClipboard(CDoc *doc)
if (doc_ce->type_u8==DOCT_DATA) {
doc_e=doc2->root.next;
while (doc_e!=doc2) {
if (doc_e->flags1&DOCEF1_TAG)
if (doc_e->de_flags&DOCEF_TAG)
DocPrintPartial(doc,"%s",doc_e->tag);
doc_e=doc_e->next;
}
@@ -315,7 +319,7 @@ public U0 EdPasteClipboard(CDoc *doc)
}
public U0 DocCut(CDoc *doc,CDocEntry *start,CDocEntry *end)
{ //deletes including end points
{//Del start to end entry, including end points.
Bool unlock_doc=DocLock(doc);
CDocEntry *doc_e1;
while (start!=doc) {
@@ -329,19 +333,18 @@ public U0 DocCut(CDoc *doc,CDocEntry *start,CDocEntry *end)
break;
start=doc_e1;
}
doc->recalc_start=doc;
DocRemSoftNewLines(doc,NULL);
if (unlock_doc)
DocUnlock(doc);
}
public CDoc *DocCopy(CDoc *doc,CDocEntry *start,CDocEntry *end)
{ //copies including end points
{//Copies start to end entry, including end points.
CDoc *doc2=DocNew;
Bool unlock_doc=DocLock(doc);
CDocEntry *doc_ne;
while (start!=doc) {
if (!Bt(doc_type_flags_data,start->type_u8)) {
if (!Bt(doldoc.type_flags_data,start->type_u8)) {
doc_ne=DocEntryCopy(doc2,start);
QueIns(doc_ne,doc2->root.last);
}
@@ -354,10 +357,11 @@ public CDoc *DocCopy(CDoc *doc,CDocEntry *start,CDocEntry *end)
return doc2;
}
#help_index "Doc/Compiler;Compiler/Directive"
#help_index "DolDoc/Compiler;Compiler/Directive"
public U0 StreamDoc(CDoc *doc)
{ //TODO: $LK,"DocRst",A="MN:DocRst"$
{//Inject doc into compile stream. Use inside #exe{}.
//TODO: $LK,"DocRst",A="MN:DocRst"$
Bool unlock_doc=DocLock(doc);
CDocEntry *doc_e=doc->root.next;
while (doc_e!=doc) {
@@ -373,7 +377,7 @@ public U0 StreamDoc(CDoc *doc)
DocUnlock(doc);
}
#help_index "Doc"
#help_index "DolDoc"
Bool DocCaptureUndo(CDoc *doc,Bool force=FALSE)
{
@@ -384,7 +388,7 @@ Bool DocCaptureUndo(CDoc *doc,Bool force=FALSE)
unlock=DocLock(doc);
time_stamp=GetTSC;
if (doc->flags&DOCF_UNDO_DIRTY &&
time_stamp>doc->undo_root.last->time_stamp+time_stamp_freq<<4 || force) {
time_stamp>doc->undo_root.last->time_stamp+cnts.time_stamp_freq<<4 || force) {
u=CAlloc(sizeof(CDocUndo),doc->mem_task);
u->time_stamp=time_stamp;
u->body=DocSave(doc,&u->size);
@@ -422,12 +426,10 @@ U0 DocUndoRestore(CDoc *doc)
DocUnlock(doc);
}
#help_index "Graphics/Windows BMP Files;Graphics/GRA Files;Doc/Output"
#help_index "Graphics/Windows BMP Files;Graphics/GRA Files;DolDoc/Output"
public Bool DocType(CDoc *doc=NULL,U8 *filename,I64 trailing_new_lines=1)
{//This is like DOS "type" or Unix "cat".
//Output a file to a document.
//Even graphics can be sent.
{//Output txt or graphic file to document.
Bool result=FALSE;
CDoc *doc2;
if (!doc && !(doc=DocPut) || doc->doc_signature!=DOC_SIGNATURE_VAL)
@@ -448,15 +450,13 @@ public Bool DocType(CDoc *doc=NULL,U8 *filename,I64 trailing_new_lines=1)
result=TRUE;
}
if (result)
DocNewLine(doc,trailing_new_lines);
DocPrint(doc,"%h*c",trailing_new_lines,'\n');
return result;
}
#help_index "Graphics/Windows BMP Files;Graphics/GRA Files;File/Cmd Line (Typically);Doc/Cmd Line (Typically);Cmd Line (Typically)"
#help_index "Graphics/Windows BMP Files;Graphics/GRA Files;File/Cmd Line (Typically);DolDoc/Cmd Line (Typically);Cmd Line (Typically)"
public Bool Type(U8 *filename,I64 trailing_new_lines=1)
{//This is like DOS "type" or Unix "cat".
//Output a file to the cmd line.
//Even graphics can be sent.
{//Output txt or graphic file to command line.
return DocType(,filename,trailing_new_lines);
}
Adam/Doc/DocFind.CPP → Adam/DolDoc/DocFind.CPP
+85 -83
View File
@@ -1,7 +1,7 @@
#help_index "Doc/Edit"
#help_index "DolDoc/Editor"
public Bool DocLineNumGoTo(CDoc *doc,I64 line_num) //one based
{
{//Nearest to specified line num. Move cur_entry & center.
Bool result=FALSE,unlock;
if (doc) {
unlock=DocLock(doc);
@@ -19,7 +19,7 @@ public Bool DocLineNumGoTo(CDoc *doc,I64 line_num) //one based
public Bool DocFind(CDoc *haystack_doc,I64 start_line_num=MIN_I64,
U8 *needle,I64 match=1)
{
{//Find str by searching tags. Move cur_entry & center.
Bool result=FALSE,unlock;
CDocEntry *doc_e;
U8 *ptr;
@@ -37,8 +37,8 @@ public Bool DocFind(CDoc *haystack_doc,I64 start_line_num=MIN_I64,
if (needle) {
result=FALSE;
while (doc_e!=haystack_doc) {
if (doc_e->flags1&DOCEF1_TAG &&
(ptr=StrIMatch(needle,doc_e->tag))) { //TODO: handle multientry strings
if (doc_e->de_flags&DOCEF_TAG && doc_e->tag &&
(ptr=StrIMatch(needle,doc_e->tag))) {//TODO: handle multientry strings
i=ptr-doc_e->tag;
if (!--match) {
haystack_doc->cur_entry=doc_e;
@@ -63,7 +63,7 @@ public Bool DocFind(CDoc *haystack_doc,I64 start_line_num=MIN_I64,
}
public Bool DocAnchorFind(CDoc *haystack_doc,U8 *needle_str)
{
{//Find named anchor. Move cur_entry & center.
Bool result=FALSE,unlock;
CDocEntry *doc_e;
if (haystack_doc) {
@@ -71,7 +71,7 @@ public Bool DocAnchorFind(CDoc *haystack_doc,U8 *needle_str)
doc_e=haystack_doc->root.next;
if (needle_str)
while (doc_e!=haystack_doc) {
if (doc_e->type_u8==DOCT_ANCHOR) {
if (doc_e->type_u8==DOCT_ANCHOR && doc_e->de_flags & DOCEF_AUX_STR) {
if (!StrCmp(needle_str,doc_e->aux_str)) {
haystack_doc->cur_entry=doc_e;
haystack_doc->cur_data_col=doc_e->min_col;
@@ -90,7 +90,7 @@ public Bool DocAnchorFind(CDoc *haystack_doc,U8 *needle_str)
}
public U0 EdFindNext(CDoc *doc)
{
{//Editor F3 find next, possibly doing replaces.
Bool unlock=DocLock(doc);
U8 *ptr,*ptr2,*ptr3;
CDocEntry *doc_ce=doc->cur_entry,*doc_e=doc_ce;
@@ -103,8 +103,8 @@ public U0 EdFindNext(CDoc *doc)
sf_flags|=SFG_WHOLE_LABELS;
do {
if (doc_e!=doc) {
if (doc_e->flags1&DOCEF1_TAG&&
!(doc_e->flags1&(DOCEG1_DONT_EDIT|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))) {
if (doc_e->de_flags&DOCEF_TAG && doc_e->tag &&
!(doc_e->de_flags&(DOCEG1_DONT_EDIT|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP))) {
if (doc_e->type & DOCET_SELECTED || !doc->find_replace->scan_selected_text) {
if (doc->find_replace->scan_fwd) {
if (doc_e==doc_ce) {
@@ -166,7 +166,7 @@ fn_skip:
}
public U0 EdSelectAll(CDoc *doc,Bool select)
{
{//Set state of $LK,"DOCET_SELECTED",A="MN:DOCET_SELECTED"$ on all entries.
Bool unlock=DocLock(doc);
CDocEntry *doc_e=doc->root.next;
while (doc_e!=doc) {
@@ -178,7 +178,7 @@ public U0 EdSelectAll(CDoc *doc,Bool select)
}
public Bool EdFindPaired(CDoc *doc,U8 plus,U8 minus,Bool fwd,Bool abort_on_dbl_colon=FALSE)
{
{//Find { } or ( ) pair. Move cur_entry & center.
Bool unlock=DocLock(doc),result=FALSE;
U8 *ptr;
I64 ch,levels=0,colons=0,original_col=doc->cur_data_col;
@@ -189,7 +189,8 @@ public Bool EdFindPaired(CDoc *doc,U8 plus,U8 minus,Bool fwd,Bool abort_on_dbl_c
colons=0;
do {
if (doc_e!=doc) {
if (doc_e->flags1&DOCEF1_TAG&&!(doc_e->flags1&(DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))) {
if (doc_e->de_flags&DOCEF_TAG && doc_e->tag &&
!(doc_e->de_flags&(DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP))) {
if (fwd) {
if (doc_e==doc_ce)
ptr=doc_e->tag+doc->cur_data_col+1;
@@ -271,7 +272,7 @@ pa_done:
}
public Bool EdGoToFun(CDoc *doc,Bool fwd,Bool abort_on_dbl_colon)
{
{//Move cur_entry to start of cur fun and center.(Shoddy)
Bool unlock=DocLock(doc),result=FALSE;
I64 ch,levels,colons;
if (fwd) {
@@ -314,7 +315,7 @@ public Bool EdGoToFun(CDoc *doc,Bool fwd,Bool abort_on_dbl_colon)
}
public U0 EdSelectFun(CDoc *doc,Bool abort_on_dbl_colon=FALSE)
{
{//Set $LK,"DOCET_SELECTED",A="MN:DOCET_SELECTED"$ on all entries in cur fun.
Bool unlock=DocLock(doc);
U8 *ptr;
I64 ch,levels=0,colons=0;
@@ -331,7 +332,7 @@ public U0 EdSelectFun(CDoc *doc,Bool abort_on_dbl_colon=FALSE)
doc_e=doc->cur_entry;
while (doc_e!=doc) {
doc_e->type|=DOCET_SELECTED;
if (doc_e->type_u8==DOCT_TEXT) {
if (doc_e->de_flags&DOCEF_TAG && doc_e->tag) {
ptr=doc_e->tag;
if (doc_e==doc->cur_entry)
ptr+=doc->cur_data_col;
@@ -360,7 +361,7 @@ U0 EdUndoFilter(CDoc *doc)
Bool unlock=DocLock(doc);
CDocEntry *doc_ce=doc->root.next;
while (doc_ce!=doc) {
doc_ce->flags1&=~DOCEF1_FILTER_SKIP;
doc_ce->de_flags&=~DOCEF_FILTER_SKIP;
doc_ce=doc_ce->next;
}
doc->find_replace->filter_lines=0;
@@ -370,7 +371,7 @@ U0 EdUndoFilter(CDoc *doc)
I64 EdFindReplace(CDoc *doc)
{
Bool first=TRUE,found,unlock;
Bool found,unlock;
I64 cmd,i,j,plen,rlen,dlen,result=-1,sf_flags;
U8 *src,*dst,*dst2;
CDocEntry *doc_ce=doc->cur_entry,*doc_e;
@@ -391,18 +392,19 @@ I64 EdFindReplace(CDoc *doc)
if (i=doc->find_replace->filter_lines) {
doc_ce=doc->root.next;
while (doc_ce!=doc) {
if (doc_ce->type_u8==DOCT_TEXT && !(doc_ce->flags1&(DOCEF1_TAG_CB|DOCEF1_DEFINE|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))&&
StrFind(doc->find_replace->find_text,doc_ce->tag,sf_flags)) {
if (doc_ce->de_flags&DOCEF_TAG && doc_ce->tag &&
!(doc_ce->de_flags&(DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP)) &&
StrFind(doc->find_replace->find_text,doc_ce->tag,sf_flags)) {
doc_ce->type|=DOCET_SELECTED;
result++;
} else
doc_ce->type&=~DOCET_SELECTED;
doc_ce=doc_ce->next;
}
doc_ce=doc->root.next;
while (doc_ce!=doc) {
if (!(doc_ce->flags1&(DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP))) {
if (!(doc_ce->de_flags&(DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP))) {
found=FALSE;
doc_e=doc_ce;
@@ -426,7 +428,7 @@ I64 EdFindReplace(CDoc *doc)
}
if (!found)
doc_ce->flags1|=DOCEF1_FILTER_SKIP;
doc_ce->de_flags|=DOCEF_FILTER_SKIP;
}
doc_ce=doc_ce->next;
@@ -448,71 +450,71 @@ I64 EdFindReplace(CDoc *doc)
if (!plen)
goto fr_unlock_done;
rlen=StrLen(doc->find_replace->replace_text);
doc_e=doc_ce;
while (doc_e!=doc_ce || first) {
first=FALSE;
if (doc_e->type_u8==DOCT_TEXT &&
!(doc_e->flags1&(DOCEG1_DONT_EDIT|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP)) &&
(doc_e->type & DOCET_SELECTED || !doc->find_replace->scan_selected_text&&!doc->find_replace->local_var)) {
src=doc_e->tag;
while (src) {
src=StrFind(doc->find_replace->find_text,src,sf_flags);
if (src) {
doc->cur_data_col=src-doc_e->tag;
doc->cur_entry=doc_e;
if (cmd!=RSAC_ALL)
DocCenter(doc);
doc_e=doc->cur_entry;
src=doc->cur_data_col+doc_e->tag;
if (cmd!=RSAC_ALL) {
DocUnlock(doc);
cmd=PopUpReplaceSkipAllCancel("");
DocLock(doc);
if (cmd<0)
goto fr_unlock_done;
}
if (cmd==RSAC_REPLACE || cmd==RSAC_ALL) {
dlen=StrLen(doc_e->tag);
doc_e->max_col=dlen+rlen-plen;
dst=MAlloc(doc_e->max_col+1,doc->mem_task);
dst2=dst;
j=src-doc_e->tag;
for (i=0;i<j;i++)
*dst++=doc_e->tag[i];
for (i=0;i<rlen;i++)
*dst++=doc->find_replace->replace_text[i];
src=dst;
for (i=j+plen;i<=dlen;i++)
*dst++=doc_e->tag[i];
Free(doc_e->tag);
doc_e->tag=dst2;
if (doc->root.next!=doc) {
doc_e=doc_ce;
do {
if (doc_e==doc) {
if (doc->find_replace->scan_fwd)
doc_e=doc_e->next;
else
doc_e=doc_e->last;
if (doc_e==doc_ce)
break;
}
if (doc_e->type_u8==DOCT_TEXT &&
!(doc_e->de_flags&(DOCEG1_DONT_EDIT|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP)) &&
(doc_e->type & DOCET_SELECTED || !doc->find_replace->scan_selected_text&&!doc->find_replace->local_var)) {
src=doc_e->tag;
while (src) {
src=StrFind(doc->find_replace->find_text,src,sf_flags);
if (src) {
doc->cur_data_col=src-doc_e->tag;
doc->cur_entry=doc_e;
if (cmd!=RSAC_ALL) {
DocRemSoftNewLines(doc,doc->cur_entry);
DocRecalc(doc);
}
if (cmd!=RSAC_ALL)
DocCenter(doc);
doc_e=doc->cur_entry;
src=doc->cur_data_col+doc_e->tag;
result++;
} else
src++;
if (cmd!=RSAC_ALL) {
DocUnlock(doc);
cmd=PopUpReplaceSkipAllCancel("");
DocLock(doc);
if (cmd<0)
goto fr_unlock_done;
}
if (cmd==RSAC_REPLACE || cmd==RSAC_ALL) {
dlen=StrLen(doc_e->tag);
doc_e->max_col=dlen+rlen-plen;
dst=MAlloc(doc_e->max_col+1,doc->mem_task);
dst2=dst;
j=src-doc_e->tag;
for (i=0;i<j;i++)
*dst++=doc_e->tag[i];
for (i=0;i<rlen;i++)
*dst++=doc->find_replace->replace_text[i];
src=dst;
for (i=j+plen;i<=dlen;i++)
*dst++=doc_e->tag[i];
Free(doc_e->tag);
doc_e->tag=dst2;
doc->cur_data_col=src-doc_e->tag;
doc->cur_entry=doc_e;
if (cmd!=RSAC_ALL) {
DocRemSoftNewLines(doc,doc->cur_entry);
DocRecalc(doc);
}
doc_e=doc->cur_entry;
src=doc->cur_data_col+doc_e->tag;
result++;
} else
src++;
}
}
}
}
if (doc->find_replace->scan_fwd) {
doc_e=doc_e->next;
if (doc_e==doc) {
if (doc_ce==doc) break;
if (doc->find_replace->scan_fwd)
doc_e=doc_e->next;
}
} else {
doc_e=doc_e->last;
if (doc_e==doc) {
if (doc_ce==doc) break;
else
doc_e=doc_e->last;
}
}
} while (doc_e!=doc_ce);
}
fr_unlock_done:
DocRemSoftNewLines(doc,NULL);
@@ -526,7 +528,7 @@ fr_unlock_done:
public I64 EdReplace(CDoc *doc,U8 *find,U8 *replace,
Bool selected=TRUE,Bool match_case=TRUE,Bool whole_labels=FALSE)
{
{//Find & replace using editor's cmd.
CEdFindText old_find_replace;
Bool unlock;
I64 i,result=-1;
@@ -559,8 +561,8 @@ class CEdLineGoTo
I64 line fmtstr "$$DA,256,A=\"Go to Line:%d\"$$";
};
public U0 EdGoToLine(CDoc *doc)
{
U0 EdGoToLine(CDoc *doc)
{//Prompt with form and go to line num.
CEdLineGoTo gtl;
gtl.line=1;
if (DocFormDo(&gtl))
Adam/Doc/DocHighlight.CPP → Adam/DolDoc/DocHighlight.CPP
+3 -3
View File
@@ -1,7 +1,7 @@
#help_index "Doc/Misc"
#help_index "DolDoc/Misc"
U32 *DocHighlight(CDocEntry *doc_e,U8 *src,I64 len,I64 _temp_u32_attr)
{ //Be aware of $LK,"::/Adam/Utils/ToHtml.CPP"$.
{//Be aware of $LK,"::/Adam/Utils/ToHtml.CPP"$.
U32 *result=MAlloc((len+1)*sizeof(U32)),*dst=result;
U8 *ptr;
CDocSettings *s=&doc_e->settings;
@@ -71,7 +71,7 @@ hl_normal:
}
ch=*src;
*src=0;
if (temph=HashFind(ptr,asm_hash,HTT_KEYWORD|HTT_ASM_KEYWORD|HTT_OPCODE|HTT_REG)) {
if (temph=HashFind(ptr,cmp.asm_hash,HTT_KEYWORD|HTT_ASM_KEYWORD|HTT_OPCODE|HTT_REG)) {
if (temph->type&(HTT_KEYWORD|HTT_ASM_KEYWORD|HTT_OPCODE))
temp_u32_attr=DOC_COLOR_KEYWORD<<8|mask_temp_u32_attr;
else
Adam/DolDoc/DocInit.CPP
+95
View File
@@ -0,0 +1,95 @@
#help_index "DolDoc"
U0 DocInit()
{//$LK-UL,"CMD Defines",A="MN:DOCT_TEXT"$
CLex *lx;
I64 i;
CHashGeneric *temph;
DefineLstLoad("ST_DOC_CMDS",
"TX\0CR\0SR\0CU\0TB\0CL\0PB\0DA\0PL\0LM\0RM\0HD\0FO\0ID\0"
"FG\0BG\0FD\0BD\0PT\0WW\0UL\0IV\0BK\0SX\0SY\0CM\0AN\0LK\0BT\0"
"CB\0LS\0MA\0MU\0HX\0TR\0SP\0IB\0IS\0SO\0HL\0HC\0ER\0");
DefineLstLoad("ST_DOC_FLAGS",
"T\0A\0D\0HTML\0LE\0LM\0RE\0RM\0BI\0BP\0RT\0SX\0SY\0SCX\0U\0"
"LC\0LA\0RC\0RA\0TC\0LX\0CX\0RX\0TY\0CY\0BY\0"
"HL\0WW\0BK\0IV\0SEL\0UL\0"
"PRY\0MRX\0WR\0L\0X\0Q\0FST\0B\0S\0BD\0C\0CA\0RD\0P\0TRM\0Z\0H\0"
"TR\0LS\0SK\0PU\0SIF\0HS\0FS\0NC\0DD\0UD\0");
DefineLstLoad("ST_LINK_TYPES",
"FI\0FA\0FF\0FL\0MN\0PI\0PF\0PL\0BF\0DF\0HI\0AD\0AI\0AA\0AF\0AL\0");
doldoc.hash=HashTableNew(512);
HashDefineLstAdd("ST_DOC_CMDS",DHT_DOC_CMD,doldoc.hash);
HashDefineLstAdd("ST_DOC_FLAGS",DHT_DOC_FLAG,doldoc.hash);
HashDefineLstAdd("ST_COLORS",DHT_COLOR,doldoc.hash);
MemSet(doldoc.dft_de_flags, 0,sizeof(doldoc.dft_de_flags));
MemSet(doldoc.dft_type_flags, 0,sizeof(doldoc.dft_type_flags));
lx=LexNew("TX+T;DA+P+TRM+T;CM+LE+RE;AN+T;LK+L+UL+T;MA+X+UL+T;MU+X+UL+T;"
"BT+X+B+T;CB+CA+P+T;LS+LS+P+T;HX+P+Z;TR+TR+C+CA+UL+T;SP+T;IB+T;IS+T;"
"SO+T;HC+T;",LF_DONT_FREE_BUF);
lx->htc.hash_table_lst=NULL;
Lex(lx);
while (lx->token==TK_IDENT) {
if (temph=HashFind(lx->cur_str,doldoc.hash,DHT_DOC_CMD)) {
i=temph->user_data0;
Lex(lx);
PrsDocFlags(lx,&doldoc.dft_de_flags[i],&doldoc.dft_type_flags[i]);
}
if (lx->token==';')
Lex(lx);
}
LexDel(lx);
for (i=0;i<DOCT_NUM_TYPES;i++)
doldoc.dft_de_flags[i]&=~DOCG_BL_IV_UL;
doldoc.type_flags_form[0]=0;
for (i=0;i<DOCT_NUM_TYPES;i++)
if (Bt(&doldoc.dft_de_flags[i],DOCEf_TAG) && i!=DOCT_TEXT || i==DOCT_HEX_ED)
Bts(doldoc.type_flags_form,i);
//Don't forget $LK,"cmp_type_flags_src_code",A="MN:cmp_type_flags_src_code"$.
doldoc.type_flags_nontag_invisible[0]=
1<<DOCT_PAGE_LEN|
1<<DOCT_LEFT_MARGIN|
1<<DOCT_RIGHT_MARGIN|
1<<DOCT_HEADER|
1<<DOCT_FOOTER|
1<<DOCT_INDENT|
1<<DOCT_FOREGROUND|
1<<DOCT_BACKGROUND|
1<<DOCT_DFT_FOREGROUND|
1<<DOCT_DFT_BACKGROUND|
1<<DOCT_PMT|
1<<DOCT_WORD_WRAP|
1<<DOCT_UNDERLINE|
1<<DOCT_INVERT|
1<<DOCT_BLINK|
1<<DOCT_SHIFTED_X|
1<<DOCT_SHIFTED_Y|
1<<DOCT_SPRITE|
1<<DOCT_HIGHLIGHT;
doldoc.type_flags_data[0]=1<<DOCT_DATA|1<<DOCT_HEX_ED|1<<DOCT_CHECK_BOX;
Bts(doldoc.clean_scan_codes,SC_CURSOR_RIGHT);
Bts(doldoc.clean_scan_codes,SC_CURSOR_LEFT);
Bts(doldoc.clean_scan_codes,SC_CURSOR_UP);
Bts(doldoc.clean_scan_codes,SC_CURSOR_DOWN);
Bts(doldoc.clean_scan_codes,SC_PAGE_UP);
Bts(doldoc.clean_scan_codes,SC_PAGE_DOWN);
Bts(doldoc.clean_scan_codes,SC_ALT);
Bts(doldoc.clean_scan_codes,SC_CTRL);
Bts(doldoc.clean_scan_codes,SC_SHIFT);
Bts(doldoc.clean_scan_codes,SC_CAPS);
Bts(doldoc.clean_scan_codes,SC_NUM);
Bts(doldoc.clean_scan_codes,SC_SCROLL);
Bts(doldoc.clean_scan_codes,SC_HOME);
Bts(doldoc.clean_scan_codes,SC_END);
Bts(doldoc.clean_scan_codes,SC_GUI);
Bts(doldoc.clean_scan_codes,SC_BACKSPACE); //Handled specially
}
DocInit;
Adam/Doc/DocMacro.CPP → Adam/DolDoc/DocMacro.CPP
+14 -13
View File
@@ -1,11 +1,11 @@
#help_index "Doc/Misc"
#help_index "DolDoc/Misc"
U8 captured_macro_name[136];
StrCpy(captured_macro_name,"Test");
I64 sys_macro_repeat_n=1;
U0 SysMacroStripKey(CSrvCmd *macro_root,I64 p1,I64 p2)
U0 SysMacroStripKey(CSrvCmd *macro_root,I64 a1,I64 a2)
{
CSrvCmd *tempc,*tempc1;
tempc=macro_root->next;
@@ -15,8 +15,8 @@ U0 SysMacroStripKey(CSrvCmd *macro_root,I64 p1,I64 p2)
(tempc->msg_code==MSG_KEY_DOWN ||
tempc->msg_code==MSG_KEY_UP ||
tempc->msg_code==MSG_KEY_DOWN_UP) &&
p1 && tempc->aux1==p1 ||
!p1 && tempc->aux2==p2) {
a1 && tempc->aux1==a1 ||
!a1 && tempc->aux2==a2) {
QueRem(tempc);
SrvCmdDel(tempc);
}
@@ -43,16 +43,15 @@ CMacroTemp *Cmd2MT(CSrvCmd *tempc)
tempmt->type=MT_CHAR;
buf[0]=tempc->aux1;
buf[1]=0;
SPrint(tempmt->buf,"%Q",buf);
StrPrint(tempmt->buf,"%Q",buf);
} else {
tempmt->type=MT_MSG;
SPrint(tempmt->buf,"Msg(0x%X,0x%X,0x%X);",
StrPrint(tempmt->buf,"Msg(0x%X,0x%X,0x%X);",
tempc->msg_code,tempc->aux1,tempc->aux2);
}
return tempmt;
}
U8 *SysMacro2Str(CSrvCmd *macro_root)
{
CSrvCmd *tempc;
@@ -147,16 +146,18 @@ U0 EdInsCapturedMacro()
I64 PopUpMacroMenu()
{
I64 result=0;
U8 buf[136];
CSrvCmd *tempc;
CDoc *doc=DocNew;
CDocEntry *doc_e=DocPrint(doc,"$$DA-P,135,A=\"Name:%%s\"$$");
I64 result=0;
doc_e->data=captured_macro_name;
DocDataFmt(doc_e);
doc_e=DocPrint(doc,"\n$$DA,32,\"Repeat N:%%d\"$$");
DocDataFmt(doc,doc_e);
doc_e=DocPrint(doc,"\n$$DA,32,A=\"Repeat N:%%d\"$$");
doc_e->data=&sys_macro_repeat_n;
DocDataFmt(doc_e);
DocDataFmt(doc,doc_e);
DocPrint(doc,"\n"
"$$CM+LX,1,3$$$$BT,\"RECORD\",LE=SM_RECORD$$"
"$$CM+LX,17,0$$$$BT,\"INSERT\",LE=SM_INS$$"
@@ -166,7 +167,7 @@ I64 PopUpMacroMenu()
"$$CM+LX,17,0$$$$BT,\"CANCEL\",LE=DOCM_CANCEL$$"
"\n\n\n$$GREEN$$SHIFT-F2$$FG$$ will play macro.\n");
doc->flags|=DOCF_MIN_SIZE | DOCF_FORM;
SPrint(buf,"DocMenuDo(%d);",doc);
StrPrint(buf,"DocMenuDo(%d);",doc);
sys_macro_util_task=Spawn(&SrvUserCmdLine,NULL,"Macro Popup",,Fs);
Fs->popup_task=sys_macro_util_task;
LBts(&sys_macro_util_task->display_flags,DISPLAYf_WIN_ON_TOP);
@@ -176,7 +177,7 @@ I64 PopUpMacroMenu()
Fs->popup_task=NULL;
Kill(sys_macro_util_task);
sys_macro_util_task=NULL;
DocDataScan(doc_e);
DocDataScan(doc,doc_e);
DocDel(doc);
return result;
}
Adam/Doc/DocMain.CPP → Adam/DolDoc/DocMain.CPP
+89 -154
View File
@@ -1,26 +1,26 @@
#help_index "Doc/Cmd Line (Typically);Cmd Line (Typically)"
#help_index "DolDoc/Cmd Line (Typically);Cmd Line (Typically)"
Bool Ed(U8 *link_st,I64 ed_flags=0)
{
public Bool Ed(U8 *link_st,I64 edf_dof_flags=0)
{//Invoke document editor.
U8 *filename,*needle_str;
I64 i,num;
Bool cont,result=FALSE;
CDoc *doc;
switch (i=EdLinkCvt(link_st,&filename,&needle_str,&num,ed_flags)) {
switch (i=EdLinkCvt(link_st,&filename,&needle_str,&num,edf_dof_flags)) {
case -1:
break;
case LK_DEF:
doc=DocNew;
StrCpy(doc->desc,"DictDef");
WSDDisplayDefs(doc,filename,num);
doc->desc='DictDef';
WSDDefsPut(doc,filename,num);
goto ej_doc;
case LK_HELP_INDEX:
doc=DocNew;
StrCpy(doc->desc,"HelpIdx");
doc->desc='HelpIndx';
DocHelpIndex(doc,filename);
ej_doc:
if (!(ed_flags&EDF_BAIL)) {
if (!(edf_dof_flags&EDF_BAIL)) {
DocDo(doc);
DocDel(doc);
}
@@ -31,11 +31,12 @@ ej_doc:
EdLite(filename,num);
else {
cont=TRUE;
if (!(ed_flags&EDF_BAIL) && !FilesFindMatch(filename,FILEMASK_TXT) &&
!PopUpCancelOk(ST_WARN_ST "Not Text File\n\n"))
if (!(edf_dof_flags&EDF_BAIL) && !(LK_DOC<=i<=LK_DOC_LINE) &&
!FilesFindMatch(filename,FILEMASK_TXT) &&
!PopUpCancelOk(ST_WARN_ST "Not Text File\n\n"))
cont=FALSE;
if (cont)
result=DocFileEd(i,filename,needle_str,&num,ed_flags);
result=DocFileEd(i,filename,needle_str,&num,edf_dof_flags);
}
}
Free(filename);
@@ -44,19 +45,17 @@ ej_doc:
}
public Bool Plain(U8 *filename)
//Open a document in plain text mode,
//so that dollar signs are not special.
{
{//Edit document in plain text mode, so dollar signs are not special.
Bool result;
U8 *st=MPrint("PI:%s",filename);
U8 *st=MStrPrint("PI:%s",filename);
result=Ed(st);
Free(st);
return result;
}
#help_index "Doc"
#help_index "DolDoc"
public Bool DocLinkChk(U8 *link_st)
{
{//Check for bad $LK,"Editor Link",A="MN:LK_FILE"$.
U8 *filename;
Bool result=FALSE;
if (link_st) {
@@ -106,9 +105,9 @@ public U8 *DocLinkFile(U8 *link_st,CTask *mem_task=NULL)
return result;
}
#help_index "Doc/Task"
#help_index "DolDoc/Task"
public CDoc *DocBorderNew(CDoc *pdoc)
{
{//Make new std border doc.
CDocEntry *doc_e;
CDoc *bdoc;
@@ -136,7 +135,7 @@ public CDoc *DocBorderNew(CDoc *pdoc)
DocPrint(bdoc,"$$CM+H+TY+NC,0,-1$$");
doc_e=DocPrint(bdoc,"$$DA+H-TRM-P+BD+RD+CX+IV,140,A=\"%%s...\",SCX=15$$");
doc_e->data=&Fs->task_title;
DocDataFmt(doc_e);
DocDataFmt(bdoc,doc_e);
DocPrint(bdoc,"$$CM+H+NC,1,0$$$$TX+H+BD+IV,\"%X\"$$",Fs);
DocPrint(bdoc,"$$TX+H+RX+BD,\"[X]\"$$");
DocPrint(bdoc,"$$BK,1$$$$TX+H+LX+BD,\"MENU\"$$$$BK,0$$");
@@ -144,13 +143,13 @@ public CDoc *DocBorderNew(CDoc *pdoc)
}
public U0 DocTermNew()
{
{//Make into term win task with Put/Display/Border docs.
Bool old_preempt=Preempt(OFF);
CDoc *pdoc=DocNew;
pdoc->right_click_link=&TermRightClickLink;
pdoc->max_entries=4096;
Fs->border_src=BDS_CUR_PRT;
StrCpy(pdoc->desc,"Term");
pdoc->desc='Term';
Fs->put_doc=Fs->display_doc=pdoc;
Fs->border_doc=DocBorderNew(pdoc);
Fs->cur_menu=MenuFile("::/Doc/EdPullDown.TXT");
@@ -159,9 +158,9 @@ public U0 DocTermNew()
Raw(OFF);
}
#help_index "Doc/Input"
#help_index "DolDoc/Input"
public U8 *DocScanLine(CDoc *doc,CDocEntry *doc_e,I64 *cur_col=NULL,CDocEntry **_do_e_end=NULL)
{
{//Start at entry in doc,make and return one line as str.
CDocEntry *doc_e2=doc_e;
Bool unlock=DocLock(doc);
U8 *dst,*src,*start,*result;
@@ -169,7 +168,7 @@ public U8 *DocScanLine(CDoc *doc,CDocEntry *doc_e,I64 *cur_col=NULL,CDocEntry **
if (cur_col)
*cur_col=-1;
while (doc_e2!=doc && doc_e2->type_u8!=DOCT_NEW_LINE) {
if (doc_e2->flags1&DOCEF1_TAG) {
if (doc_e2->de_flags&DOCEF_TAG && doc_e2->tag) {
src=doc_e2->tag;
i+=StrLen(src);
} else if (doc_e2->type_u8==DOCT_TAB)
@@ -180,7 +179,7 @@ public U8 *DocScanLine(CDoc *doc,CDocEntry *doc_e,I64 *cur_col=NULL,CDocEntry **
dst=result;
while (doc_e!=doc && doc_e->type_u8!=DOCT_NEW_LINE) {
start=dst;
if (doc_e->flags1&DOCEF1_TAG) {
if (doc_e->de_flags&DOCEF_TAG && doc_e->tag) {
src=doc_e->tag;
while (*src)
*dst++=*src++;
@@ -199,7 +198,7 @@ public U8 *DocScanLine(CDoc *doc,CDocEntry *doc_e,I64 *cur_col=NULL,CDocEntry **
return result;
}
#help_index "Doc/Output"
#help_index "DolDoc/Output"
U0 DocDump(CDoc *doc,I64 uS_delay=0)
{
U8 *st;
@@ -212,7 +211,7 @@ U0 DocDump(CDoc *doc,I64 uS_delay=0)
Free(st);
doc_e=doc_e2;
if (doc_e->type_u8==DOCT_NEW_LINE) {
NewLine;
'\n';
BusyWait(uS_delay);
doc_e=doc_e->next;
}
@@ -222,7 +221,7 @@ U0 DocDump(CDoc *doc,I64 uS_delay=0)
}
public CDocEntry *DocPutLine(CDoc *doc=NULL,CDocEntry *doc_e)
{
{//Send line from other doc to StdOut $LK,"DocPut",A="MN:DocPut"$.
I64 ch;
U8 *ptr,*ptr2;
Bool unlock;
@@ -230,7 +229,7 @@ public CDocEntry *DocPutLine(CDoc *doc=NULL,CDocEntry *doc_e)
return NULL;
unlock=DocLock(doc);
while (doc_e!=doc && doc_e->type_u8!=DOCT_NEW_LINE) {
if (doc_e->flags1&DOCEF1_TAG) {
if (doc_e->de_flags&DOCEF_TAG) {
ptr=doc_e->tag;
do {
ptr2=ptr;
@@ -251,7 +250,7 @@ public CDocEntry *DocPutLine(CDoc *doc=NULL,CDocEntry *doc_e)
'\t';
doc_e=doc_e->next;
}
NewLine;
'\n';
if (doc_e!=doc)
doc_e=doc_e->next;
if (unlock)
@@ -259,10 +258,9 @@ public CDocEntry *DocPutLine(CDoc *doc=NULL,CDocEntry *doc_e)
return doc_e;
}
#help_index "Doc/Input"
public U8 *DocMGetS(I64 flags=0)
//$LK,"Flags",A="MN:GETSF_SHIFT_ESC_EXIT"$
{
#help_index "DolDoc/Input"
U8 *DocGetStr2(I64 flags=0)
{//$LK,"Flags",A="MN:GSF_SHIFT_ESC_EXIT"$
CDoc *doc;
CDocEntry *doc_e,*doc_e_end;
Bool old_preempt=IsPreempt;
@@ -282,34 +280,34 @@ public U8 *DocMGetS(I64 flags=0)
}
DocUnlock(doc);
}
if (flags&GETSF_WITH_NEW_LINE)
if (flags&GSF_WITH_NEW_LINE)
break;
} if (ch==CH_SHIFT_ESC) {
if (flags&GETSF_SHIFT_ESC_EXIT)
if (flags&GSF_SHIFT_ESC_EXIT)
Exit;
else {
result=StrNew("");
goto mgets_done;
goto gs_done;
}
}
//<CTRL-SHIFT-CR> is a blank line without entry
} while (flags&GETSF_WITH_NEW_LINE || ch!='\n' || sc & SCF_CTRL && sc & SCF_SHIFT);
//<CTRL-SHIFT-ENTER> is a blank line without entry
} while (flags&GSF_WITH_NEW_LINE || ch!='\n' || sc & SCF_CTRL && sc & SCF_SHIFT);
Preempt(OFF);
doc=DocPut;
DocLock(doc);
if (flags&GETSF_WITH_NEW_LINE) {
if (flags&GSF_WITH_NEW_LINE) {
doc_e=doc->cur_entry;
do doc_e=doc_e->last;
while (doc_e!=doc && doc_e->type_u8!=DOCT_PMT);
doc_e=doc_e->next;
if (result=DocScanLine(doc,doc_e,NULL,&doc_e_end)) {
while (doc_e_end!=doc && doc_e_end->type_u8==DOCT_NEW_LINE) {
st2=MPrint("%s\n",result);
st2=MStrPrint("%s\n",result);
Free(result);
result=st2;
if (st=DocScanLine(doc,doc_e_end->next,NULL,&doc_e_end)) {
st2=MPrint("%s%s",result,st);
st2=MStrPrint("%s%s",result,st);
Free(st);
Free(result);
result=st2;
@@ -330,23 +328,23 @@ public U8 *DocMGetS(I64 flags=0)
result=DocScanLine(doc,doc_e,NULL);
}
DocUnlock(doc);
mgets_done:
gs_done:
"$$PT$$$$FG$$$$BG$$";
Preempt(old_preempt);
return result;
}
#help_index "Char/Input"
#help_index "Keyboard Devices;Char/Input"
public I64 PmtI64(U8 *msg=NULL,I64 dft=0,I64 lo=MIN_I64,I64 hi=MAX_I64)
{
public I64 GetI64(U8 *msg=NULL,I64 dft=0,I64 lo=MIN_I64,I64 hi=MAX_I64)
{//Prompt user for I64 expression.
Bool okay;
U8 *st;
I64 result;
while (TRUE) {
if (msg)
"" msg,dft;
st=MGetS;
st=GetStr;
if (!*st) {
Free(st);
return dft;
@@ -364,15 +362,15 @@ public I64 PmtI64(U8 *msg=NULL,I64 dft=0,I64 lo=MIN_I64,I64 hi=MAX_I64)
}
}
public F64 PmtF64(U8 *msg=NULL,F64 dft=0,F64 lo=MIN_F64,F64 hi=MAX_F64)
{
public F64 GetF64(U8 *msg=NULL,F64 dft=0,F64 lo=MIN_F64,F64 hi=MAX_F64)
{//Prompt user for F64 expression.
Bool okay;
U8 *st;
F64 result;
while (TRUE) {
if (msg)
"" msg,dft;
st=MGetS;
st=GetStr;
if (!*st) {
Free(st);
return dft;
@@ -390,56 +388,37 @@ public F64 PmtF64(U8 *msg=NULL,F64 dft=0,F64 lo=MIN_F64,F64 hi=MAX_F64)
}
}
public U8 *PmtStr(U8 *msg=NULL,U8 *dft=NULL)
{
U8 *st;
if (msg)
"" msg,dft;
st=MGetS;
if (!*st) {
Free(st);
if (dft)
return StrNew(dft);
else
return StrNew("");
}
return st;
}
public CDate PmtDate(U8 *msg=NULL,CDate dft=MIN_I64,CDate lo=MIN_I64,CDate hi=MAX_I64)
{
public CDate GetDate(U8 *msg=NULL,CDate dft=MIN_I64,CDate lo=MIN_I64,CDate hi=MAX_I64)
{//Prompt user for date expression. (Use $LK,"Now",A="MN:Now"$() if you want current time.)
U8 *st;
CDate result;
if (dft==MIN_I64) dft=Now;
while (TRUE) {
if (msg)
"" msg,dft,dft;
st=MGetS;
st=GetStr;
if (!*st) {
Free(st);
return dft;
}
result=A2Date(st);
result=Str2Date(st);
Free(st);
if (result>=lo && result<=hi)
return result;
}
}
#help_index "Doc"
#help_index "DolDoc"
#define RIGHT_INCLUDE 0
#define RIGHT_AINCLUDE 1
#define RIGHT_COMPILE 2
#define RIGHT_LOAD 3
#define RIGHT_AUTOFILE 4
#define RIGHT_BINREP 5
#define RIGHT_COPY 6
#define RIGHT_MOVE 7
#define RIGHT_DELETE 8
#define RIGHT_TYPE 9
#define RIGHT_ED 10
#define RIGHT_PLAIN 11
#define RIGHT_COPY 2
#define RIGHT_MOVE 3
#define RIGHT_DELETE 4
#define RIGHT_TYPE 5
#define RIGHT_ED 6
#define RIGHT_PLAIN 7
#define RIGHT_AUTOFILE 8
I64 PopUpTermRight(U8 *header)
{
@@ -447,37 +426,32 @@ I64 PopUpTermRight(U8 *header)
CDoc *doc=DocNew;
if (header) DocPrint(doc,"%s",header);
DocPrint(doc,"\n\n"
"TXT=%s\nSRC=%s\nAOT=%s\nJIT=%s\nGRA=%s"
"TXT=%s\nJIT=%s\nGRA=%s"
"$$CM+LX,1,3 $$$$BT,\"INCLUDE JIT\",LE=RIGHT_INCLUDE$$"
"$$CM+LX,26,0$$$$BT,\"ADAM_INCLUDE JIT\",LE=RIGHT_AINCLUDE$$"
"$$CM+LX,1,3 $$$$BT,\"AOT COMPILE AOT\",LE=RIGHT_COMPILE$$"
"$$CM+LX,26,0$$$$BT,\"LOAD BIN\",LE=RIGHT_LOAD$$"
"$$CM+LX,1,3 $$$$BT,\"AUTOFILE AUT\",LE=RIGHT_AUTOFILE$$"
"$$CM+LX,26,0$$$$BT,\"BINREP BIN\",LE=RIGHT_BINREP$$"
"$$CM+LX,1,3 $$$$BT,\"COPY \",LE=RIGHT_COPY$$"
"$$CM+LX,26,0$$$$BT,\"MOVE \",LE=RIGHT_MOVE$$"
"$$CM+LX,26,0$$$$BT,\"MOVE OR RENAME \",LE=RIGHT_MOVE$$"
"$$CM+LX,1,3 $$$$BT,\"DELETE \",LE=RIGHT_DELETE$$"
"$$CM+LX,26,0$$$$BT,\"TYPE TXT;GRA\",LE=RIGHT_TYPE$$"
"$$CM+LX,1,3 $$$$BT,\"ED TXT\",LE=RIGHT_ED$$"
"$$CM+LX,26,0$$$$BT,\"PLAIN ED TXT\",LE=RIGHT_PLAIN$$"
"$$CM+LX,1,3 $$$$BT,\"CANCEL \",LE=DOCM_CANCEL$$\n",
FILEMASK_TXT,FILEMASK_SRC,FILEMASK_AOT,FILEMASK_JIT,FILEMASK_GRA);
"$$CM+LX,1,3 $$$$BT,\"CANCEL \",LE=DOCM_CANCEL$$"
"$$CM+LX,26,0$$$$BT,\"AUTOFILE AUT\",LE=RIGHT_AUTOFILE$$\n",
FILEMASK_TXT,FILEMASK_JIT,FILEMASK_GRA);
i=PopUpMenu(doc);
DocDel(doc);
return i;
}
I64 EdLeftClickLink(CDoc *doc,CDocEntry *doc_e)
{ //called with doc locked, exit unlocked
{//Called with doc locked, exit unlocked
Bool result;
U8 *st,*st2;
U8 *st;
if (st=DocEntryLink(doc,doc_e)) {
DocUnlock(doc);
if (doc_e->flags1 & DOCEF1_POPUP) {
st2=MPrint("Ed(\"%Q\");",st);
result=PopUp(st2);
Free(st2);
} else
if (doc_e->de_flags & DOCEF_POPUP)
result=PopUpEd(st);
else
result=Ed(st);
Free(st);
return result;
@@ -485,7 +459,7 @@ I64 EdLeftClickLink(CDoc *doc,CDocEntry *doc_e)
}
I64 TermRightClickLink(CDoc *doc,CDocEntry *doc_e)
{ //called with doc locked, exit unlocked
{//Called with doc locked, exit unlocked
Bool send_new_line=FALSE,result=FALSE;
U8 *st,*st2;
I64 i;
@@ -520,51 +494,6 @@ I64 TermRightClickLink(CDoc *doc,CDocEntry *doc_e)
AdamFile(st,FALSE);
result=TRUE;
break;
case RIGHT_COMPILE:
if (FileExtDot(st) && !FilesFindMatch(st,FILEMASK_AOT)) {
if (!PopUpCancelOk(ST_WARN_ST "Not .PRJ File\n\n")) {
send_new_line=TRUE;
break;
}
}
"Cmp(\"%s\");\n$$PT$$$$FG$$$$BG$$",st;
WinZBufUpdate;
result=!ToBool(Cmp(st));
break;
case RIGHT_LOAD:
if (FileExtDot(st) && !FilesFindMatch(st,"*.BIN*")) {
if (!PopUpCancelOk(ST_WARN_ST "Not .BIN File\n\n")) {
send_new_line=TRUE;
break;
}
}
"Load(\"%s\");\n$$PT$$$$FG$$$$BG$$",st;
WinZBufUpdate;
result=ToBool(Load(st));
break;
case RIGHT_AUTOFILE:
if (FileExtDot(st) && !FilesFindMatch(st,"*.AUT*")) {
if (!PopUpCancelOk(ST_WARN_ST "Not .AUT File\n\n")) {
send_new_line=TRUE;
break;
}
}
"AutoFile(\"%s\");\n$$PT$$$$FG$$$$BG$$",st;
WinZBufUpdate;
AutoStr("%F\n",st);
result=TRUE;
break;
case RIGHT_BINREP:
if (FileExtDot(st) && !FilesFindMatch(st,"*.BIN*")) {
if (!PopUpCancelOk(ST_WARN_ST "Not .BIN File\n\n")) {
send_new_line=TRUE;
break;
}
}
"BinRep(\"%s\");\n$$PT$$$$FG$$$$BG$$",st;
WinZBufUpdate;
result=BinRep(st);
break;
case RIGHT_COPY:
StrCpy(fn.name,st);
if (DocFormDo(&fn)) {
@@ -593,6 +522,18 @@ I64 TermRightClickLink(CDoc *doc,CDocEntry *doc_e)
"Plain(\"%s\");\n$$PT$$$$FG$$$$BG$$",st;
result=Plain(st);
break;
case RIGHT_AUTOFILE:
if (FileExtDot(st) && !FilesFindMatch(st,"*.AUT*")) {
if (!PopUpCancelOk(ST_WARN_ST "Not .AUT File\n\n")) {
send_new_line=TRUE;
break;
}
}
"AutoFile(\"%s\");\n$$PT$$$$FG$$$$BG$$",st;
WinZBufUpdate;
AutoStr("%F\n",st);
result=TRUE;
break;
}
} else
send_new_line=TRUE;
@@ -609,12 +550,9 @@ I64 TermRightClickLink(CDoc *doc,CDocEntry *doc_e)
return result;
}
#help_index "Debugging/Dump;Doc/Cmd Line (Typically);Cmd Line (Typically);Doc/Output"
#help_index "Debugging/Dump;DolDoc/Cmd Line (Typically);Cmd Line (Typically);DolDoc/Output"
public U0 DocDm(U8 *buf,I64 cnt=0x80)
//Dumps a chunk of mem, showing
//addresses. It is live and can be
//edited.
{
{//Dump live chunk of mem showing addresses. Can be edited.
CDocEntry *doc_e;
CDoc *doc=DocPut;
Bool unlock=DocLock(doc);
@@ -627,10 +565,7 @@ public U0 DocDm(U8 *buf,I64 cnt=0x80)
}
public U0 DocD(U8 *buf,I64 cnt=0x80)
//Dumps a chunk of mem, showing
//offsets. It is live and can be
//edited.
{
{//Dump live chunk of mem showing offsets. Can be edited.
CDocEntry *doc_e;
CDoc *doc=DocPut;
Bool unlock=DocLock(doc);
@@ -642,7 +577,7 @@ public U0 DocD(U8 *buf,I64 cnt=0x80)
DocUnlock(doc);
}
#help_index "Doc/Output"
#help_index "DolDoc/Output"
Bool KDDocPutS(U8 *st)
{
CDoc *doc;
@@ -652,5 +587,5 @@ Bool KDDocPutS(U8 *st)
}
KeyDevAdd(&KDDocPutKey,&KDDocPutS,0x80000000,TRUE);
fp_mgets=&DocMGetS;
fp_getstr2=&DocGetStr2;
fp_doc_put=&DocPut;
Adam/Doc/DocNew.CPP → Adam/DolDoc/DocNew.CPP
+159 -123
View File
@@ -1,7 +1,7 @@
#help_index "Doc"
#help_index "DolDoc"
public Bool DocLock(CDoc *doc)
{
{//Make this task have exclusive access to this doc.
if (!Bt(&doc->locked_flags,DOClf_LOCKED) || doc->owning_task!=Fs) {
while (LBts(&doc->locked_flags,DOClf_LOCKED))
Yield;
@@ -14,7 +14,7 @@ public Bool DocLock(CDoc *doc)
}
public Bool DocUnlock(CDoc *doc)
{
{//Release exclusive lock on access to doc.
Bool unlock_break;
if (Bt(&doc->locked_flags,DOClf_LOCKED) && doc->owning_task==Fs) {
doc->owning_task=0;
@@ -27,7 +27,6 @@ public Bool DocUnlock(CDoc *doc)
return FALSE;
}
CDocBin *DocBinFindNum(CDoc *haystack_doc,I64 needle_num)
{
CDocBin *b=haystack_doc->bin_root.next;
@@ -71,18 +70,18 @@ U0 DocBinsValidate(CDoc *doc)
doc_e=doc->root.next;
while (doc_e!=doc) {
doc_e2=doc_e->next;
if (doc_e->flags1 & DOCEF1_HAS_BIN) {
if (doc_e->de_flags & DOCEF_HAS_BIN) {
if (b=doc_e->bin_data=DocBinFindNum(doc,doc_e->bin_num)) {
if (doc_e->flags1 & DOCEF1_BIN_PTR_LINK)
if (doc_e->de_flags & DOCEF_BIN_PTR_LINK)
b->temp_use_cnt=MAX_I32;
if (!b->use_cnt++)
b->renum_num=++renum_num;
doc_e->bin_num=b->renum_num;
if (!b->tag && doc_e->flags1&DOCEF1_TAG && doc_e->tag && *doc_e->tag)
if (!b->tag && doc_e->de_flags&DOCEF_TAG && doc_e->tag && *doc_e->tag)
b->tag=StrNew(doc_e->tag,doc->mem_task);
} else {
RawPrint(3000,"Bin Not Found");
doc_e->type=doc_e->flags1=0;
doc_e->type=doc_e->de_flags=0;
doc_e->type_u8=DOCT_ERROR;
}
}
@@ -108,7 +107,6 @@ U0 DocBinsValidate(CDoc *doc)
DocUnlock(doc);
}
U0 DocBinDel(CDoc *doc,CDocBin *b)
{
if (doc && b && b->use_cnt) {
@@ -125,7 +123,7 @@ U0 DocBinDel(CDoc *doc,CDocBin *b)
Bool IsEditableText(CDocEntry *doc_e)
{
if (doc_e->type_u8==DOCT_TEXT&&!(doc_e->flags1&DOCEG1_DONT_EDIT))
if (doc_e->type_u8==DOCT_TEXT&&!(doc_e->de_flags&DOCEG1_DONT_EDIT))
return TRUE;
else
return FALSE;
@@ -135,7 +133,7 @@ CDocEntry *DocEntryNew(CDoc *doc,CDocEntry *doc_ce,U8 *tag)
{
CDocEntry *result=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
result->type=doc_ce->type;
result->flags1=doc_ce->flags1;
result->de_flags=doc_ce->de_flags;
result->tag=tag;
result->max_col=StrLen(tag);
result->x=doc_ce->x;
@@ -146,51 +144,51 @@ CDocEntry *DocEntryNew(CDoc *doc,CDocEntry *doc_ce,U8 *tag)
}
public U0 DocEntryDel(CDoc *doc,CDocEntry *doc_e)
{
{//Free entry and all parts of entry.
if (!doc || doc==doc_e)
RawPrint(3000,"DocEntryDel");
else {
if (doc->cur_entry==doc_e)
doc->cur_entry=doc_e->next;
QueRem(doc_e);
if (doc_e->flags1 & DOCEF1_TAG)
if (doc_e->de_flags & DOCEF_TAG)
Free(doc_e->tag);
if (doc_e->flags1 & DOCEF1_LEFT_MACRO)
if (doc_e->de_flags & DOCEF_LEFT_MACRO)
Free(doc_e->left_macro);
if (doc_e->flags1 & DOCEF1_RIGHT_MACRO)
if (doc_e->de_flags & DOCEF_RIGHT_MACRO)
Free(doc_e->right_macro);
if (doc_e->flags1 & DOCEF1_AUX_STR)
if (doc_e->de_flags & DOCEF_AUX_STR)
Free(doc_e->aux_str);
if (doc_e->flags1 & DOCEF1_DEFINE)
if (doc_e->de_flags & DOCEF_DEFINE)
Free(doc_e->define_str);
if (doc_e->flags1 & DOCEF1_HTML_LINK)
if (doc_e->de_flags & DOCEF_HTML_LINK)
Free(doc_e->html_link);
if (doc_e->flags1 & DOCEF1_BIN_PTR_LINK)
if (doc_e->de_flags & DOCEF_BIN_PTR_LINK)
Free(doc_e->bin_ptr_link);
if (doc_e->flags1 & DOCEF1_HAS_BIN)
if (doc_e->de_flags & DOCEF_HAS_BIN)
DocBinDel(doc,doc_e->bin_data);
Free(doc_e);
}
}
public I64 DocEntrySize(CDoc *,CDocEntry *doc_e)
{
{//Mem size of entry and all parts.
I64 result;
if (!doc_e) return 0;
result=MSize2(doc_e);
if (doc_e->flags1 & DOCEF1_TAG)
if (doc_e->de_flags & DOCEF_TAG)
result+=MSize2(doc_e->tag);
if (doc_e->flags1 & DOCEF1_AUX_STR)
if (doc_e->de_flags & DOCEF_AUX_STR)
result+=MSize2(doc_e->aux_str);
if (doc_e->flags1 & DOCEF1_DEFINE)
if (doc_e->de_flags & DOCEF_DEFINE)
result+=MSize2(doc_e->define_str);
if (doc_e->flags1 & DOCEF1_HTML_LINK)
if (doc_e->de_flags & DOCEF_HTML_LINK)
result+=MSize2(doc_e->html_link);
if (doc_e->flags1 & DOCEF1_BIN_PTR_LINK)
if (doc_e->de_flags & DOCEF_BIN_PTR_LINK)
result+=MSize2(doc_e->bin_ptr_link);
if (doc_e->flags1 & DOCEF1_LEFT_MACRO)
if (doc_e->de_flags & DOCEF_LEFT_MACRO)
result+=MSize2(doc_e->left_macro);
if (doc_e->flags1 & DOCEF1_RIGHT_MACRO)
if (doc_e->de_flags & DOCEF_RIGHT_MACRO)
result+=MSize2(doc_e->right_macro);
return result;
}
@@ -215,34 +213,34 @@ U0 DocUndoCntSet(CDoc *doc)
}
public CDocEntry *DocEntryCopy(CDoc *doc,CDocEntry *doc_e)
{
{//Make copy of entry and all parts of entry.
CDocEntry *doc_ne;
CDocBin *tempb;
CTask *task=doc->mem_task;
doc_ne=MAllocIdentical(doc_e,task);
doc_ne->next=doc_ne;
doc_ne->last=doc_ne;
if (doc_e->flags1 & DOCEF1_TAG)
if (doc_e->de_flags & DOCEF_TAG)
doc_ne->tag=MAllocIdentical(doc_e->tag,task);
if (doc_e->flags1 & DOCEF1_AUX_STR)
if (doc_e->de_flags & DOCEF_AUX_STR)
doc_ne->aux_str=MAllocIdentical(doc_e->aux_str,task);
if (doc_e->flags1 & DOCEF1_DEFINE)
if (doc_e->de_flags & DOCEF_DEFINE)
doc_ne->define_str=MAllocIdentical(doc_e->define_str,task);
if (doc_e->flags1 & DOCEF1_HTML_LINK)
if (doc_e->de_flags & DOCEF_HTML_LINK)
doc_ne->html_link=MAllocIdentical(doc_e->html_link,task);
if (doc_e->flags1 & DOCEF1_BIN_PTR_LINK)
if (doc_e->de_flags & DOCEF_BIN_PTR_LINK)
doc_ne->bin_ptr_link=MAllocIdentical(doc_e->bin_ptr_link,task);
if (doc_e->flags1 & DOCEF1_LEFT_MACRO)
if (doc_e->de_flags & DOCEF_LEFT_MACRO)
doc_ne->left_macro=MAllocIdentical(doc_e->left_macro,task);
if (doc_e->flags1 & DOCEF1_RIGHT_MACRO)
if (doc_e->de_flags & DOCEF_RIGHT_MACRO)
doc_ne->right_macro=MAllocIdentical(doc_e->right_macro,task);
if (doc_e->flags1 & DOCEF1_HAS_BIN) {
if (doc_e->de_flags & DOCEF_HAS_BIN) {
tempb=MAllocIdentical(doc_e->bin_data,task);
tempb->data=MAllocIdentical(doc_e->bin_data->data,task);
doc_ne->bin_num=doc->cur_bin_num;
tempb->num=doc->cur_bin_num++;
doc_ne->bin_data=tempb;
if (doc_e->flags1&DOCEF1_TAG && doc_e->tag && *doc_e->tag)
if (doc_e->de_flags&DOCEF_TAG && doc_e->tag && *doc_e->tag)
tempb->tag=StrNew(doc_e->tag,task);
else
tempb->tag=NULL;
@@ -252,11 +250,11 @@ public CDocEntry *DocEntryCopy(CDoc *doc,CDocEntry *doc_e)
}
public U8 *DocEntryLink(CDoc *doc,CDocEntry *doc_e)
{
if (doc_e->flags1&DOCEF1_LINK) {
if (doc_e->flags1 & DOCEF1_AUX_STR)
{//MAlloc new str, either tag or aux_str if link.
if (doc_e->de_flags&DOCEF_LINK) {
if (doc_e->de_flags & DOCEF_AUX_STR)
return StrNew(doc_e->aux_str,doc->mem_task);
else
else if (doc_e->de_flags & DOCEF_TAG)
return StrNew(doc_e->tag,doc->mem_task);
}
return NULL;
@@ -266,16 +264,16 @@ U0 DocFormFwd(CDoc *doc,Bool giveup=FALSE)
{
CDocEntry *doc_e=doc->cur_entry,*doc_e2=doc_e;
if (doc->flags & DOCF_FORM) {
if (doc_e==doc) goto recover;
while (!Bt(doc_type_flags_form,doc_e->type_u8) ||
doc_e->flags1&DOCEF1_SKIP_IN_FORM) {
if (doc_e==doc) goto ff_recover;
while (!Bt(doldoc.type_flags_form,doc_e->type_u8) ||
doc_e->de_flags&DOCEF_SKIP_IN_FORM) {
doc_e=doc_e->next;
if (doc_e==doc) {
recover:
ff_recover:
doc->cur_data_col=0;
if (!giveup) {
doc->cur_entry=doc_e->last;
DocFormBackward(doc,TRUE);
DocFormBwd(doc,TRUE);
} else
doc->cur_entry=doc;
return;
@@ -290,12 +288,12 @@ recover:
}
}
U0 DocFormBackward(CDoc *doc,Bool giveup=FALSE)
U0 DocFormBwd(CDoc *doc,Bool giveup=FALSE)
{
CDocEntry *doc_e=doc->cur_entry,*doc_e2=doc_e;
if (doc->flags & DOCF_FORM) {
while (!Bt(doc_type_flags_form,doc_e->type_u8) ||
doc_e->flags1&DOCEF1_SKIP_IN_FORM) {
while (!Bt(doldoc.type_flags_form,doc_e->type_u8) ||
doc_e->de_flags&DOCEF_SKIP_IN_FORM) {
doc_e=doc_e->last;
if (doc_e==doc) {
doc->cur_data_col=0;
@@ -316,8 +314,8 @@ U0 DocFormBackward(CDoc *doc,Bool giveup=FALSE)
}
}
public U0 DocHome(CDoc *doc=NULL)
{
public U0 DocTop(CDoc *doc=NULL)
{//Move cursor, cur_entry, to top.
Bool unlock;
if (!doc && !(doc=DocPut))
return;
@@ -330,12 +328,13 @@ public U0 DocHome(CDoc *doc=NULL)
doc->cur_top_line_num=0;
DocFormFwd(doc);
DocRecalc(doc);
if (unlock)
DocUnlock(doc);
}
public U0 DocRst(CDoc *doc,Bool is_old)
{
{//Del all entries and set doc to dfts.
Bool unlock;
CDocEntry *doc_e,*doc_e2;
CDocUndo *u,*u8;
@@ -374,7 +373,6 @@ public U0 DocRst(CDoc *doc,Bool is_old)
doc->undo_root.time_stamp=0;
doc->undo_cnt=0;
doc->cur_bin_num=1;
doc->recalc_start=doc;
doc->dollar_buf_ptr=0;
doc->ext_ascii_cnt=doc->ext_ascii_val=0;
doc->cmd_U8=CH_SPACE;
@@ -398,7 +396,7 @@ public U0 DocRst(CDoc *doc,Bool is_old)
doc_e=&doc->root;
doc_e->type=DOCT_ERROR;
doc_e->flags1=0;
doc_e->de_flags=0;
doc_e->x=0;
doc_e->y=0;
doc_e->min_col=0;
@@ -406,14 +404,13 @@ public U0 DocRst(CDoc *doc,Bool is_old)
doc_e->page_line_num=doc->page_line_num;
MemCpy(&doc_e->settings,s,sizeof(CDocSettings));
DocHome(doc);
DocTop(doc);
if (unlock)
DocUnlock(doc);
}
public U0 DocDel(CDoc *doc)
{
{//Free entire doc and entries.
if (!doc || doc->doc_signature!=DOC_SIGNATURE_VAL) return;
DocLock(doc);
doc->doc_signature=0;
@@ -425,7 +422,7 @@ public U0 DocDel(CDoc *doc)
}
public I64 DocSize(CDoc *doc)
{
{//Mem size of doc and all its entries.
Bool unlock;
CDocEntry *doc_e;
CDocUndo *u;
@@ -463,80 +460,124 @@ public I64 DocSize(CDoc *doc)
return result;
}
U0 DocDataFmt(CDocEntry *doc_e)
U0 DocDataFmt(CDoc *doc,CDocEntry *doc_e,I64 d=DOCM_CANCEL)
{
I64 i,d;
I64 i;
U8 *ptr;
if (doc_e->type_u8==DOCT_DATA || doc_e->type_u8==DOCT_CHECK_BOX) {
if (doc_e->flags1 & DOCEF1_DATA_IS_PTR) {
if (!(ptr=doc_e->data)) return;
} else
ptr=&doc_e->data;
if (doc_e->flags1&DOCEF1_U8)
d=*ptr;
else if (doc_e->flags1&DOCEF1_U16)
d=*ptr(U16 *);
else if (doc_e->flags1&DOCEF1_U32)
d=*ptr(U32 *);
else
d=*ptr(I64 *);
CHashDefineStr *temph;
if (doc_e->type_u8==DOCT_DATA && doc_e->de_flags&DOCEF_AUX_STR ||
doc_e->type_u8==DOCT_CHECK_BOX || doc_e->de_flags & DOCEF_LST) {
if (d==DOCM_CANCEL) {
if (doc_e->de_flags & DOCEF_DATA_IS_PTR) {
if (!(ptr=doc_e->data)) return;
} else
ptr=&doc_e->data;
switch(doc_e->raw_type) {
case RT_I0:
case RT_U0: d=0; break;
case RT_I8: d=*ptr(I8 *); break;
case RT_U8: d=*ptr(U8 *); break;
case RT_I16: d=*ptr(I16 *); break;
case RT_U16: d=*ptr(U16 *); break;
case RT_I32: d=*ptr(I32 *); break;
case RT_U32: d=*ptr(U32 *); break;
default: d=*ptr(I64 *);
}
}
if (doc_e->type_u8==DOCT_DATA) {
SPrint(doc_e->tag,doc_e->aux_str,d,doc_e->my_fmt_data);
if (doc_e->flags1 & DOCEF1_HAS_TERMINATOR) {
StrPrint(doc_e->tag,doc_e->aux_str,d,doc_e->my_fmt_data);
if (doc_e->de_flags & DOCEF_HAS_TERMINATOR) {
i=StrLen(doc_e->tag);
doc_e->tag[i++]='_';
doc_e->tag[i]=0;
}
doc_e->max_col=StrLen(doc_e->tag);
} else if (doc_e->de_flags & DOCEF_LST) {
if (doc_e->de_flags & DOCEF_DEFINE &&
(temph=HashFind(doc_e->define_str,doc->win_task->hash_table,HTT_DEFINE_STR)) &&
0<=d<temph->cnt) {
ptr=MStrPrint("[%s]",temph->sub_lst[d]);
Free(doc_e->tag);
doc_e->tag=StrNew(ptr,doc->mem_task);
Free(ptr);
} else {
Free(doc_e->tag);
doc_e->tag=StrNew("[]",doc->mem_task);
}
} else {
if (d)
doc_e->flags1|=DOCEF1_CHECKED_COLLAPSED;
doc_e->de_flags|=DOCEF_CHECKED_COLLAPSED;
else
doc_e->flags1&=~DOCEF1_CHECKED_COLLAPSED;
doc_e->de_flags&=~DOCEF_CHECKED_COLLAPSED;
}
}
}
U0 DocDataScan(CDocEntry *doc_e)
U0 DocDataScan(CDoc *doc,CDocEntry *doc_e)
{
I64 i,d;
U8 *ptr;
if (doc_e->type_u8==DOCT_DATA || doc_e->type_u8==DOCT_CHECK_BOX) {
if (doc_e->flags1 & DOCEF1_DATA_IS_PTR) {
U8 *ptr,*ptr1,*ptr2;
CHashDefineStr *temph;
if (doc_e->type_u8==DOCT_DATA && doc_e->de_flags&DOCEF_AUX_STR ||
doc_e->type_u8==DOCT_CHECK_BOX || doc_e->de_flags & DOCEF_LST) {
if (doc_e->de_flags & DOCEF_DATA_IS_PTR) {
if (!(ptr=doc_e->data)) return;
} else
ptr=&doc_e->data;
if (doc_e->type_u8==DOCT_DATA) {
i=StrLen(doc_e->tag);
if (doc_e->flags1 & DOCEF1_HAS_TERMINATOR)
if (doc_e->de_flags & DOCEF_HAS_TERMINATOR)
doc_e->tag[--i]=0;
if (i>doc_e->len+doc_e->min_col)
doc_e->tag[doc_e->len+doc_e->min_col]=0;
if (doc_e->flags1&(DOCEF1_U8|DOCEF1_U16|DOCEF1_U32)) {
Scan(doc_e->tag,doc_e->aux_str,&d,doc_e->my_fmt_data);
if (doc_e->flags1 & DOCEF1_HAS_TERMINATOR)
if (RT_I8<=doc_e->raw_type<=RT_U32) {
StrScan(doc_e->tag,doc_e->aux_str,&d,doc_e->my_fmt_data);
if (doc_e->de_flags & DOCEF_HAS_TERMINATOR)
doc_e->tag[i]='_';
} else {
Scan(doc_e->tag,doc_e->aux_str,ptr,doc_e->my_fmt_data);
if (doc_e->flags1 & DOCEF1_HAS_TERMINATOR)
} else if (RT_I64<=doc_e->raw_type<=RT_UF64) {
StrScan(doc_e->tag,doc_e->aux_str,ptr,doc_e->my_fmt_data);
if (doc_e->de_flags & DOCEF_HAS_TERMINATOR)
doc_e->tag[i]='_';
return;
}
} else if (doc_e->de_flags & DOCEF_LST) {
d=0;
if (doc_e->tag && doc_e->de_flags & DOCEF_DEFINE &&
(temph=HashFind(doc_e->define_str,doc->win_task->hash_table,HTT_DEFINE_STR))) {
ptr1=ptr2=StrNew(doc_e->tag);
if (*ptr2=='[') {
ptr2++;
i=StrLen(ptr2);
if (ptr2[i-1]==']')
ptr2[i-1]=0;
}
d=LstMatch(ptr2,temph->data);
Free(ptr1);
}
} else {
if (doc_e->flags1 & DOCEF1_CHECKED_COLLAPSED)
if (doc_e->de_flags & DOCEF_CHECKED_COLLAPSED)
d=TRUE;
else
d=FALSE;
}
if (doc_e->flags1&DOCEF1_U8)
*ptr=d;
else if (doc_e->flags1&DOCEF1_U16)
*ptr(U16 *)=d;
else if (doc_e->flags1&DOCEF1_U32)
*ptr(U32 *)=d;
else
*ptr(I64 *)=d;
switch(doc_e->raw_type) {
case RT_I8:
case RT_U8:
*ptr(U8 *)=d;
case RT_I0:
case RT_U0:
break;
case RT_I16:
case RT_U16:
*ptr(U16 *)=d;
break;
case RT_I32:
case RT_U32:
*ptr(U32 *)=d;
break;
default:
*ptr(I64 *)=d;
}
}
}
@@ -564,13 +605,14 @@ U0 DocRemSoftNewLines(CDoc *doc=NULL,CDocEntry *doc_e=NULL)
DocUnlock(doc);
}
#help_index "Doc/Cmd Line (Typically);Cmd Line (Typically)"
#help_index "DolDoc/Cmd Line (Typically);Cmd Line (Typically)"
public I64 DocMax(I64 i=MAX_I32)
//Adjusts the size of the Doc buf.
//Normally, the cmd line deletes
//entries after a while.
{
public I64 DocMax(I64 i=MAX_I64)
{//Set max document entries. (Cmd line buffer.)
//Adjusts the size of the cmd line buf.
//Normally, the cmd line deletes entries
//when more are added and the old scroll up.
//See $LK,"max_entries",A="FF:::/Adam/DolDoc/DocMain.CPP,max_entries"$.
I64 result;
CDoc *doc;
if (doc=DocPut) {
@@ -581,16 +623,16 @@ public I64 DocMax(I64 i=MAX_I32)
return 0;
}
#help_index "Doc"
#help_index "DolDoc"
public CDoc *DocNew(U8 *filename=NULL,CTask *task=NULL)
{
{//MAlloc new $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.TXT"$. (Begin a new doc.)
CDoc *doc;
if (!task) task=Fs;
doc=CAlloc(sizeof(CDoc),task);
if (filename)
StrCpy(doc->filename.name,filename);
else
StrCpy(doc->filename.name,sys_temp_filename);
StrCpy(doc->filename.name,dsk.temp_filename);
doc->find_replace=CAlloc(sizeof(CEdFindText),task);
doc->find_replace->scan_fwd=TRUE;
doc->find_replace->match_case=TRUE;
@@ -598,8 +640,7 @@ public CDoc *DocNew(U8 *filename=NULL,CTask *task=NULL)
doc->left_click_link=&EdLeftClickLink;
doc->dollar_buf_size=84;
doc->dollar_buf=MAlloc(doc->dollar_buf_size,task);
doc->max_entries=MAX_I32;
doc->ww_lines_back=32;
doc->max_entries=MAX_I64;
doc->win_task=task;
doc->mem_task=task;
DocRst(doc,FALSE);
@@ -607,11 +648,9 @@ public CDoc *DocNew(U8 *filename=NULL,CTask *task=NULL)
return doc;
}
sys_clipboard_doc=DocNew;
#help_index "Doc/Task"
#help_index "DolDoc/Task"
public CDoc *DocPut(CTask *task=NULL)
{//Current document that PUT goes to.
{//Current document that StdOut Put() goes to.
//Basically, StdOut unless double buffering.
CDoc *result;
if (!task) task=Fs;
@@ -622,7 +661,7 @@ public CDoc *DocPut(CTask *task=NULL)
}
public CDoc *DocDisplay(CTask *task=NULL)
{//StdOut unless double buffering.
{//StdOut displayed unless double buffering.
CDoc *result;
if (!task) task=Fs;
if ((result=task->display_doc) && result->doc_signature==DOC_SIGNATURE_VAL)
@@ -641,9 +680,8 @@ public CDoc *DocBorder(CTask *task=NULL)
return NULL;
}
public CDoc *DocDblBufStart(CTask *task=NULL)
{ //See $LK,"::/Demo/Spy.CPP"$
{//See $LK,"::/Demo/Spy.CPP"$
Bool unlock_ddoc,old_preempt=Preempt(OFF);
CDoc *pdoc=DocPut(task),*ddoc=DocDisplay(task),*result;
if (!pdoc || !ddoc || pdoc!=ddoc)
@@ -655,8 +693,6 @@ public CDoc *DocDblBufStart(CTask *task=NULL)
result->win_task =ddoc->win_task;
result->max_entries =ddoc->max_entries;
MemCpy(result->find_replace,ddoc->find_replace,sizeof(CEdFindText));
result->start_x =ddoc->start_x;
result->start_y =ddoc->start_y;
MemCpy(&result->filename,&ddoc->filename,sizeof(CEdFileName));
result->left_click_link =ddoc->left_click_link;
result->right_click_link =ddoc->right_click_link;
@@ -664,7 +700,7 @@ public CDoc *DocDblBufStart(CTask *task=NULL)
result->user_put_key =ddoc->user_put_key;
result->user_put_s =ddoc->user_put_s;
result->parent_doc =ddoc->parent_doc;
result->desc[0](I64) =ddoc->desc[0](I64);
result->desc =ddoc->desc;
result->user_data =ddoc->user_data;
result->flags|=ddoc->flags&DOCG_DBL_BUF_FLAGS | DOCF_DONT_SHOW;
task->put_doc=result;
@@ -676,7 +712,7 @@ public CDoc *DocDblBufStart(CTask *task=NULL)
}
public Bool DocDblBufEnd(CTask *task=NULL)
{ //See $LK,"::/Demo/Spy.CPP"$
{//See $LK,"::/Demo/Spy.CPP"$
Bool result=FALSE,old_preempt=Preempt(OFF);
CDoc *pdoc=DocPut(task),*ddoc=DocDisplay(task);
if (pdoc && ddoc && pdoc!=ddoc) {//Double buffering?
@@ -694,7 +730,7 @@ public Bool DocDblBufEnd(CTask *task=NULL)
}
public Bool DocDblBufSwap(CTask *task=NULL)
{ //See $LK,"::/Demo/Spy.CPP"$
{//See $LK,"::/Demo/Spy.CPP"$
Bool result=FALSE,old_preempt=Preempt(OFF);
CDoc *pdoc=DocPut(task),*ddoc=DocDisplay(task);
if (pdoc && ddoc && pdoc!=ddoc) {//Double buffering?
@@ -714,7 +750,7 @@ public Bool DocDblBufSwap(CTask *task=NULL)
ddoc->user_put_data =pdoc->user_put_data;
ddoc->user_put_key =pdoc->user_put_key;
ddoc->user_put_s =pdoc->user_put_s;
ddoc->desc[0](I64) =pdoc->desc[0](I64);
ddoc->desc =pdoc->desc;
ddoc->user_data =pdoc->user_data;
task->put_doc=ddoc;
result=TRUE;
Adam/Doc/DocOpt.CPP → Adam/DolDoc/DocOpt.CPP
+13 -13
View File
@@ -1,19 +1,19 @@
#help_index "Doc"
#help_index "DolDoc"
I64 DocOptEntry(CDoc *,CDocEntry *doc_e)
{
U8 *st,*st2,**_dst;
I64 i,result=0;
if (doc_e->flags1&DOCEF1_LINK) {
if (doc_e->flags1 & DOCEF1_AUX_STR && doc_e->flags1 & DOCEF1_TAG &&
if (doc_e->de_flags&DOCEF_LINK && doc_e->de_flags&(DOCEF_AUX_STR|DOCEF_TAG)) {
if (doc_e->de_flags & DOCEF_AUX_STR && doc_e->de_flags & DOCEF_TAG &&
!MemCmp(doc_e->aux_str,"FI:",3) && !StrCmp(doc_e->aux_str+3,doc_e->tag)) {
Free(doc_e->aux_str);
doc_e->aux_str=NULL;
doc_e->flags1&=~DOCEF1_AUX_STR;
doc_e->de_flags&=~DOCEF_AUX_STR;
result++;
}
if (doc_e->flags1 & DOCEF1_AUX_STR)
if (doc_e->de_flags & DOCEF_AUX_STR)
_dst=&doc_e->aux_str;
else
_dst=&doc_e->tag;
@@ -31,13 +31,13 @@ I64 DocOptEntry(CDoc *,CDocEntry *doc_e)
Free(st);
}
/* !!! Dangerous, but handy !!!
if (doc_e->flags1 & DOCEF1_AUX_STR) {
if (doc_e->de_flags & DOCEF_AUX_STR) {
if (st=StrMatch(".Z",doc_e->aux_str)) {
StrCpy(st,st+2);
result++;
}
}
if (doc_e->flags1&DOCEF1_TAG) {
if (doc_e->de_flags&DOCEF_TAG) {
if (st=StrMatch(".Z",doc_e->tag)) {
StrCpy(st,st+2);
result++;
@@ -48,8 +48,8 @@ I64 DocOptEntry(CDoc *,CDocEntry *doc_e)
return result;
}
public I64 DocOptDoc(CDoc *doc)
{//Optimize Doc
I64 DocOptDoc(CDoc *doc)
{//Optimize Doc.
Bool unlock=DocLock(doc);
I64 result=0;
CDocEntry *doc_e;
@@ -66,8 +66,8 @@ public I64 DocOptDoc(CDoc *doc)
return result;
}
public I64 DocOptFile(U8 *filename)
{//Optimize File
I64 DocOptFile(U8 *filename)
{//Optimize File.
I64 result;
CDoc *doc=DocRead(filename);
if (result=DocOptDoc(doc)) {
@@ -83,7 +83,7 @@ I64 DocOptLst(CDirEntry *tempde)
CDirEntry *tempde1;
while (tempde) {
tempde1=tempde->next;
if (tempde->attr & _ATTR_DIR) {
if (tempde->attr & RS_ATTR_DIR) {
if (tempde->sub) {
"Scanning Directory: %s\n",tempde->full_name;
result+=DocOptLst(tempde->sub);
@@ -96,7 +96,7 @@ I64 DocOptLst(CDirEntry *tempde)
return result;
}
public I64 DocOpt(U8 *files_find_mask="*",U8 *fu_flags=NULL)
{//Optimize Files
{//Optimize $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.TXT"$ Files, eliminating aux_str's and .Z's.
I64 f=0;
ScanFlags(&f,Define("ST_FILE_UTIL_FLAGS"),"+r+T");
ScanFlags(&f,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
Adam/DolDoc/DocPlain.CPP
+739
View File
@@ -0,0 +1,739 @@
#help_index "DolDoc"
I64 PrsDocFlagSingle(CLex *lx,I64 *_de_flags,U32 *_type,Bool turn_on)
{
I64 result=-1;
CHashGeneric *temph;
if (lx->token==TK_IDENT && (temph=HashFind(lx->cur_str,doldoc.hash,DHT_DOC_FLAG))) {
result=temph->user_data0;
if (result<64) {
BEqu(_de_flags,result,turn_on);
switch (result) {
case DOCEf_SELECTED:
case DOCEf_UNDERLINE:
case DOCEf_INVERT:
case DOCEf_BLINK:
BEqu(_type,result,turn_on);
break;
}
}
Lex(lx); //skip flag
}
return result;
}
I64 PrsDocFlags(CLex *lx,I64 *_de_flags,U32 *_type)
{
I64 result=-1;
Bool turn_on;
while (TRUE) {
if (lx->token=='+')
turn_on=TRUE;
else if (lx->token=='-')
turn_on=FALSE;
else
break;
Lex(lx);
result=PrsDocFlagSingle(lx,_de_flags,_type,turn_on);
}
return result;
}
I64 DocBinPtrRst(CDoc *doc,CDocEntry *doc_e)
{
U8 *st,*st2;
CDoc *doc2;
CDocBin *tempb,*tempb2;
I64 i,bin_num=0;
if (doc_e->de_flags&DOCEF_HAS_BIN && doc_e->bin_ptr_link && StrLen(doc_e->bin_ptr_link)) {
bin_num=doc_e->bin_num;
st=StrNew(doc_e->bin_ptr_link);
st2=StrNew(st);
StrLastRem(st,",",st2);
i=Str2I64(st2);
if (i>0||*st2) {
doc2=DocRead(st);
if (i>0 && (tempb2=DocBinFindNum(doc2,i)) ||
i==0 && (tempb2=DocBinFindTag(doc2,st2))) {
i=1;
if (bin_num>0) {
if (tempb=DocBinFindNum(doc,bin_num)) {
i=tempb->use_cnt;
DocBinDel(doc,tempb);
}
} else
bin_num=doc->cur_bin_num++;
tempb=MAllocIdentical(tempb2,doc->mem_task);
tempb->use_cnt=i;
tempb->data=MAllocIdentical(tempb2->data,doc->mem_task);
tempb->num=bin_num;
doc_e->bin_data=tempb;
if (doc_e->de_flags&DOCEF_TAG && doc_e->tag && *doc_e->tag)
tempb->tag=StrNew(doc_e->tag,doc->mem_task);
else
tempb->tag=NULL;
QueIns(tempb,doc->bin_root.last);
} else
bin_num=0;
DocDel(doc2);
} else
bin_num=0;
Free(st2);
Free(st);
doc_e->bin_num=bin_num;
}
return bin_num;
}
U8 *Doc2PlainText(CDoc *doc,CDocEntry *doc_e)
{//TODO: break strs
I64 i,j,attr=doc_e->attr,
t1,f1,de_flags,type;
U8 *buf,*buf2;
if (doc_e->type_u8==DOCT_FOREGROUND && doc->flags&DOCF_COLOR_NAMES && 0<=attr<NUM_COLORS) {
buf=StrNew(DefineSub(attr,"ST_COLORS"));
attr=DOC_DFT;
} else
buf=StrNew(DefineSub(doc_e->type_u8,"ST_DOC_CMDS"));
if (doc_e->type_u8!=DOCT_ERROR) {
f1=doldoc.dft_de_flags[doc_e->type_u8];
t1=doc_e->type_u8|doldoc.dft_type_flags[doc_e->type_u8];
de_flags=doc_e->de_flags&~(DOCG_BL_IV_UL|DOCEF_SELECTED|DOCEF_HIGHLIGHT|DOCEF_WORD_WRAP|DOCEF_SKIP|DOCEF_FILTER_SKIP);
for (i=0;i<DOCEf_NUM_FLAGS;i++)
if (Bt(&f1,i)!=Bt(&de_flags,i)) {
if (Bt(&de_flags,i)) {
if (!(1<<i&DOCEG1_HAS_ARG)) {
buf2=MStrPrint("%s+%Z",buf,i,"ST_DOC_FLAGS");
Free(buf); buf=buf2;
}
} else {
buf2=MStrPrint("%s-%Z",buf,i,"ST_DOC_FLAGS");
Free(buf); buf=buf2;
}
}
type=doc_e->type&~DOCET_SELECTED;
for (i=DOCEt_BLINK;i<=DOCEt_UNDERLINE;i++)
if (Bt(&t1,i)!=Bt(&type,i)) {
if (Bt(&type,i))
buf2=MStrPrint("%s+%Z",buf,i,"ST_DOC_FLAGS");
else
buf2=MStrPrint("%s-%Z",buf,i,"ST_DOC_FLAGS");
Free(buf); buf=buf2;
}
buf2=MStrPrint("%s,",buf);
Free(buf); buf=buf2;
nobound_switch (doc_e->type_u8) {
sub_switch_start:
case DOCT_DATA:
buf2=MStrPrint("%s%d,",buf,doc_e->len);
break;
case DOCT_HEX_ED:
buf2=MStrPrint("%s%d,",buf,doc_e->len);
Free(buf); buf=buf2;
buf2=MStrPrint("%s%d,",buf,doc_e->hex_ed_width);
break;
sub_switch_end:
Free(buf); buf=buf2;
break;
case DOCT_FOREGROUND:
case DOCT_BACKGROUND:
case DOCT_DFT_FOREGROUND:
case DOCT_DFT_BACKGROUND:
if (doc->flags&DOCF_COLOR_NAMES && 0<=attr<NUM_COLORS) {
buf2=MStrPrint("%s%Z,",buf,doc_e->attr,"ST_COLORS");
Free(buf); buf=buf2;
break;
}
case DOCT_PAGE_LEN:
case DOCT_LEFT_MARGIN:
case DOCT_RIGHT_MARGIN:
case DOCT_HEADER:
case DOCT_FOOTER:
case DOCT_INDENT:
case DOCT_WORD_WRAP:
case DOCT_HIGHLIGHT:
case DOCT_UNDERLINE:
case DOCT_INVERT:
case DOCT_BLINK:
case DOCT_SHIFTED_X:
case DOCT_SHIFTED_Y:
if (attr!=DOC_DFT) {
buf2=MStrPrint("%s%d,",buf,doc_e->attr);
Free(buf); buf=buf2;
}
case DOCT_NUM_TYPES-1: //nobound_switch
break;
}
de_flags=doc_e->de_flags & DOCEG1_HAS_ARG;
while (de_flags) {
j=Bsf(de_flags);
Btr(&de_flags,j);
nobound_switch (j) {
case DOCEf_TAG:
if (doc_e->type_u8==DOCT_DATA || doc_e->type_u8==DOCT_MACRO &&
(doc_e->de_flags&DOCEF_LEFT_MACRO && !StrCmp(doc_e->tag,doc_e->left_macro) ||
doc_e->de_flags&DOCEF_RIGHT_MACRO && !StrCmp(doc_e->tag,doc_e->right_macro)) ||
doc_e->de_flags&DOCEF_LST && !StrCmp(doc_e->tag,"[]") && doc_e->de_flags&DOCEF_DEFINE) {
buf2=buf;
buf=NULL;
} else {
if (doc_e->type_u8==DOCT_CHECK_BOX) {
if (StrLen(doc_e->tag)>=4)
buf2=doc_e->tag+4;
else
buf2="";
} else if (doc_e->de_flags & DOCEF_TREE) {
if (StrLen(doc_e->tag)>=3)
buf2=doc_e->tag+3;
else
buf2="";
} else
buf2=doc_e->tag;
if (Bt(&doldoc.dft_de_flags[doc_e->type_u8],DOCEf_TAG))
buf2=MStrPrint("%s\"%$$Q\",",buf,buf2);
else
buf2=MStrPrint("%sT=\"%$$Q\",",buf,buf2);
}
break;
case DOCEf_AUX_STR:
buf2=MStrPrint("%sA=\"%$$Q\",",buf,doc_e->aux_str);
break;
case DOCEf_DEFINE:
buf2=MStrPrint("%sD=\"%$$Q\",",buf,doc_e->define_str);
break;
case DOCEf_HTML_LINK:
buf2=MStrPrint("%sHTML=\"%$$Q\",",buf,doc_e->html_link);
break;
case DOCEf_LEFT_EXP:
buf2=MStrPrint("%sLE=%d,",buf,doc_e->left_exp);
break;
case DOCEf_LEFT_MACRO:
buf2=MStrPrint("%sLM=\"%$$Q\",",buf,doc_e->left_macro);
break;
case DOCEf_RIGHT_EXP:
buf2=MStrPrint("%sRE=%d,",buf,doc_e->right_exp);
break;
case DOCEf_RIGHT_MACRO:
buf2=MStrPrint("%sRM=\"%$$Q\",",buf,doc_e->right_macro);
break;
case DOCEf_HAS_BIN:
buf2=MStrPrint("%sBI=%d,",buf,doc_e->bin_num);
break;
case DOCEf_BIN_PTR_LINK:
buf2=MStrPrint("%sBP=\"%$$Q\",",buf,doc_e->bin_ptr_link);
break;
case DOCEf_RAW_TYPE:
if (doc_e->type_u8==DOCT_CHECK_BOX&&doc_e->raw_type!=RT_I8 ||
doc_e->type_u8!=DOCT_CHECK_BOX&&doc_e->raw_type!=RT_I64)
buf2=MStrPrint("%sRT=%Z,",buf,doc_e->raw_type,"ST_RAW_TYPES");
break;
case DOCEf_SHIFTED_X:
j=doc_e->type.u16[1]&0x1F;
if (j&0x10) j|=0xFFFFFFF0;
buf2=MStrPrint("%sSX=%d,",buf,j);
break;
case DOCEf_SHIFTED_Y:
j=doc_e->type>>21 &0x1F;
if (j&0x10) j|=0xFFFFFFF0;
buf2=MStrPrint("%sSY=%d,",buf,j);
break;
case DOCEf_SCROLLING_X:
buf2=MStrPrint("%sSCX=%d,",buf,doc_e->scroll_len);
break;
case DOCEf_USER_DATA:
buf2=MStrPrint("%sU=0x%X,",buf,doc_e->user_data);
break;
case DOCEf_NUM_FLAGS-1: //nobound_switch
break;
}
Free(buf); buf=buf2;
}
buf[StrLen(buf)-1]=0; //Kill last comma
}
buf2=StrNew(buf,doc->mem_task); //exact allocation
Free(buf);
return buf2;
}
CDocEntry *PrsDollarCmd(CDoc *doc,U8 *st)
{//Uses $LK-UL,"Lex",A="MN:Lex"$() to parse a string and make Doc entries.
I64 i,j,de_flags,processed_flags,attr=DOC_DFT;
U8 *ptr,*st2;
CDocEntry *doc_e=NULL;
CHashGeneric *temph;
CLex *lx=LexNew(st,LF_DONT_FREE_BUF);
CHashTable *old_hash_table_lst=lx->htc.hash_table_lst;
try {
lx->htc.hash_table_lst=NULL;
if (Lex(lx)==TK_IDENT) {
if (temph=HashFind(lx->cur_str,doldoc.hash,DHT_DOC_CMD|DHT_COLOR)) {
if (temph->type&DHT_DOC_CMD)
i=temph->user_data0;
else {//DHT_COLOR
i=DOCT_FOREGROUND;
attr=temph->user_data0;
}
} else
goto pd_err;
Lex(lx); //skip cmd code
doc_e=CAlloc(sizeof(CDocEntry),doc->mem_task);
doc_e->type=i;
doc_e->de_flags=doldoc.dft_de_flags[i];
doc_e->type|=doldoc.dft_type_flags[i];
doc_e->raw_type=RT_I64;
j=PrsDocFlags(lx,&doc_e->de_flags,&doc_e->type);
lx->htc.hash_table_lst=old_hash_table_lst;
nobound_switch (i) {
case DOCT_DATA:
while (lx->token==',')
Lex(lx);
if (lx->token)
doc_e->len=LexExpressionI64(lx);
else
goto pd_err;
break;
case DOCT_CHECK_BOX:
doc_e->raw_type=RT_I8;
break;
case DOCT_HEX_ED:
while (lx->token==',')
Lex(lx);
if (lx->token)
doc_e->len=LexExpressionI64(lx);
else
goto pd_err;
while (lx->token==',')
Lex(lx);
if (lx->token)
doc_e->hex_ed_width=LexExpressionI64(lx);
else
goto pd_err;
break;
case DOCT_PAGE_LEN:
case DOCT_LEFT_MARGIN:
case DOCT_RIGHT_MARGIN:
case DOCT_HEADER:
case DOCT_FOOTER:
case DOCT_INDENT:
case DOCT_FOREGROUND:
case DOCT_BACKGROUND:
case DOCT_DFT_FOREGROUND:
case DOCT_DFT_BACKGROUND:
case DOCT_WORD_WRAP:
case DOCT_HIGHLIGHT:
case DOCT_UNDERLINE:
case DOCT_INVERT:
case DOCT_BLINK:
case DOCT_SHIFTED_X:
case DOCT_SHIFTED_Y:
while (lx->token==',')
Lex(lx);
if (lx->token)
doc_e->attr=LexExpressionI64(lx);
else
doc_e->attr=attr;
break;
#assert DOCT_ERROR==DOCT_NUM_TYPES-1
case DOCT_ERROR:
goto pd_err;
}
processed_flags=0;
while (TRUE) {
lx->htc.hash_table_lst=NULL;
while (lx->token==',')
Lex(lx);
lx->htc.hash_table_lst=old_hash_table_lst;
j=PrsDocFlagSingle(lx,&doc_e->de_flags,&doc_e->type,TRUE);
if (!(de_flags=~processed_flags & doc_e->de_flags & DOCEG1_HAS_ARG))
break;
if (lx->token=='=')
Lex(lx);
else
j=Bsf(de_flags);
if (j<0 || Bts(&processed_flags,j))
goto pd_err;
nobound_switch (j) {//TODO: Might check for expression errors
case DOCEf_TAG:
if (!doc_e->tag) {
//If a $$MA,LM=""$$, Tag is filled when the LM is processed.
//if doc_e->df_flags&DOCEF_LST, Tag is filled when the Define is processed.
//(The dft_flag1.tag calls this after.)
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
if (i==DOCT_CHECK_BOX) {
st=MStrPrint("[X] %s",st2);
Free(st2);
doc_e->min_col=1;
} else if (doc_e->de_flags & DOCEF_LST) {
if (*st2!='[') {
st=MStrPrint("[%s]",st2);
Free(st2);
} else
st=st2;
doc_e->min_col=1;
} else if (doc_e->de_flags & DOCEF_TREE) {
st=MStrPrint("+] %s",st2);
Free(st2);
doc_e->min_col=1;
} else
st=st2;
doc_e->tag=StrNew(st,doc->mem_task);
Free(st);
} else
goto pd_err;
}
break;
case DOCEf_AUX_STR:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->aux_str=StrNew(st2,doc->mem_task);
Free(st2);
//$AN,"Anchor",A="DataTagWidth"$
if (i==DOCT_DATA) {
if (ptr=StrMatch(":",doc_e->aux_str))
doc_e->min_col=ptr-doc_e->aux_str+1;
doc_e->tag=MAlloc(doc_e->len+doc_e->min_col+2,doc->mem_task); //+2 because "_\0"
}
} else
goto pd_err;
break;
case DOCEf_DEFINE:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->define_str=StrNew(st2,doc->mem_task);
Free(st2);
if (doc_e->de_flags&DOCEF_LST && !doc_e->tag)
doc_e->tag=StrNew("[]",doc->mem_task);
} else
goto pd_err;
break;
case DOCEf_HTML_LINK:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->html_link=StrNew(st2,doc->mem_task);
Free(st2);
} else
goto pd_err;
break;
case DOCEf_LEFT_EXP:
if (lx->token)
doc_e->left_exp=LexExpression(lx);
else
goto pd_err;
break;
case DOCEf_LEFT_MACRO:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->left_macro=StrNew(st2,doc->mem_task);
Free(st2);
if (i==DOCT_MACRO && !doc_e->tag)
doc_e->tag=StrNew(doc_e->left_macro,doc->mem_task);
} else
goto pd_err;
break;
case DOCEf_RIGHT_EXP:
if (lx->token)
doc_e->right_exp=LexExpression(lx);
else
goto pd_err;
break;
case DOCEf_RIGHT_MACRO:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->right_macro=StrNew(st2,doc->mem_task);
Free(st2);
if (i==DOCT_MACRO && !doc_e->tag)
doc_e->tag=StrNew(doc_e->right_macro,doc->mem_task);
} else
goto pd_err;
break;
case DOCEf_HAS_BIN:
if (lx->token)
doc_e->bin_num=LexExpressionI64(lx);
else
goto pd_err;
break;
case DOCEf_BIN_PTR_LINK:
if (lx->token==TK_STR) {
st2=LexExtStr(lx);
doc_e->bin_ptr_link=StrNew(st2,doc->mem_task);
Free(st2);
if (!DocBinPtrRst(doc,doc_e))
doc_e->type=DOCT_ERROR;
} else
goto pd_err;
break;
case DOCEf_RAW_TYPE:
if (lx->token==TK_IDENT) {
j=DefineMatch(lx->cur_str,"ST_RAW_TYPES");
if (j<0)
goto pd_err;
doc_e->raw_type=j;
Lex(lx);
} else
goto pd_err;
break;
case DOCEf_SHIFTED_X:
if (lx->token)
doc_e->type|=(LexExpressionI64(lx) & 0x1F)<<16;
else
goto pd_err;
break;
case DOCEf_SHIFTED_Y:
if (lx->token)
doc_e->type|=(LexExpressionI64(lx) & 0x1F)<<21;
else
goto pd_err;
break;
case DOCEf_SCROLLING_X:
if (lx->token)
doc_e->scroll_len=LexExpressionI64(lx);
else
goto pd_err;
break;
case DOCEf_USER_DATA:
if (lx->token)
doc_e->user_data=LexExpression(lx);
else
goto pd_err;
break;
case DOCEf_NUM_FLAGS-1: //nobound_switch
break;
}
}
} else {
pd_err:
if (!doc_e)
doc_e=CAlloc(sizeof(CDocEntry),doc->mem_task);
doc_e->type=DOCT_ERROR;
doc_e->de_flags=0;
}
if (doc_e->de_flags & DOCEF_LST && !(doc_e->de_flags & DOCEF_DATA_IS_PTR)) {
DocDataScan(doc,doc_e);
DocDataFmt(doc,doc_e);
}
LexDel(lx);
} catch {
Fs->catch_except=TRUE;
if (!doc_e)
doc_e=CAlloc(sizeof(CDocEntry),doc->mem_task);
doc_e->type=DOCT_ERROR;
doc_e->de_flags=0;
}
return doc_e;
}
public U0 DocInsEntry(CDoc *doc,CDocEntry *doc_e)
{//Insert entry into doc, updating its vals.
U8 *dst;
Bool unlock=DocLock(doc);
CDocEntry *doc_ce=doc->cur_entry,*doc_ne;
doc_e->x=doc_ce->x;
doc_e->y=doc_ce->y;
doc_e->page_line_num=doc_ce->page_line_num;
MemCpy(&doc_e->settings,&doc_ce->settings,sizeof(CDocSettings));
if (doc->cur_data_col>0 &&
doc_ce->type_u8==DOCT_TEXT &&
!(doc_ce->de_flags&(DOCEF_TAG_CB|DOCEF_DEFINE|
DOCEF_HTML_LINK|DOCEF_BIN_PTR_LINK)) &&
doc->cur_data_col<doc_ce->max_col) {
dst=doc_ce->tag+doc->cur_data_col;
doc_ne=DocEntryNew(doc,doc_ce,StrNew(dst,doc->mem_task));
*dst=0;
doc_ne->type=DOCT_TEXT|doc_ce->type&0xFFFFFF00;
doc_ce->max_col=doc->cur_data_col;
QueIns(doc_ne,doc_ce);
doc->cur_data_col=0;
doc_ce=doc_ne;
}
if (doc_ce->type_u8==DOCT_TEXT && doc->cur_data_col>=doc_ce->max_col) {
QueIns(doc_e,doc_ce);
doc->cur_entry=doc_e->next;
} else {
QueIns(doc_e,doc_ce->last);
doc->cur_entry=doc_ce;
}
doc->cur_data_col=doc->cur_entry->min_col;
DocRemSoftNewLines(doc,doc->cur_entry);
if (unlock)
DocUnlock(doc);
}
#help_index "DolDoc/Output"
CDocEntry *DocPutS(CDoc *doc,U8 *st)
{//Don't use this. Use $LK-UL,"DocPrint",A="MN:DocPrint"$().
//Does not handle partial Doc entries
//Returns last newly created dollar-sign CDocEntry.
U8 *ptr=st,*ptr2,*st2,*ptr3,*ptr4,*src,
*char_bitmap;
Bool unlock;
I64 ch,j;
CDocEntry *doc_e=NULL,*result=NULL,*doc_ce;
if (!st || !doc && !(doc=DocPut) || doc->doc_signature!=DOC_SIGNATURE_VAL)
return NULL;
unlock=DocLock(doc);
if (doc->flags & DOCF_PLAIN_TEXT_WITH_TABS)
char_bitmap=chars_bitmap_zero_cr_nl_cursor;
else if (doc->flags & DOCF_PLAIN_TEXT)
char_bitmap=chars_bitmap_zero_tab_ff_cr_nl_cursor;
else
char_bitmap=chars_bitmap_zero_tab_ff_cr_nl_cursor_dollar;
doc_ce=doc->cur_entry;
while (*ptr) {
ptr2=ptr;
do ch=*ptr++;
while (!Bt(char_bitmap,ch) || ch==CH_CURSOR && doc->flags&DOCF_NO_CURSOR);
ptr--;
if (!ch) {
if (j=ptr-ptr2) {
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_TEXT | doc->settings_root.dft_text_attr<<8;
doc_e->de_flags=doldoc.dft_de_flags[DOCT_TEXT];
if (doc->flags & DOCF_NO_CURSOR) {
src=MAlloc(j+1);
MemCpy(src,ptr2,j+1);
StrUtil(src,SUF_REM_CTRL_CHARS);
j=StrLen(src);
} else
src=ptr2;
doc_e->tag=MAlloc(j+1,doc->mem_task);
MemCpy(doc_e->tag,src,j+1);
doc_e->max_col=j;
DocInsEntry(doc,doc_e);
if (doc->flags & DOCF_NO_CURSOR)
Free(src);
}
} else {
if (j=ptr-ptr2) {
*ptr=0;
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_TEXT | doc->settings_root.dft_text_attr<<8;
doc_e->de_flags=doldoc.dft_de_flags[DOCT_TEXT];
if (doc->flags & DOCF_NO_CURSOR) {
src=MAlloc(j+1);
MemCpy(src,ptr2,j+1);
ptr3=src;
ptr4=src;
while (*ptr3)
if (*ptr3!=CH_CURSOR)
*ptr4++=*ptr3++;
else
ptr3++;
*ptr4=0;
j=ptr4-src;
} else
src=ptr2;
doc_e->tag=MAlloc(j+1,doc->mem_task);
MemCpy(doc_e->tag,src,j+1);
doc_e->max_col=j;
DocInsEntry(doc,doc_e);
if (doc->flags & DOCF_NO_CURSOR)
Free(src);
*ptr=ch;
}
switch (ch) {
case CH_CURSOR:
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_CURSOR | doc->settings_root.dft_text_attr<<8;
doc_e->de_flags=doldoc.dft_de_flags[DOCT_CURSOR];
DocInsEntry(doc,doc_e);
ptr++;
break;
case CH_FORM_FEED:
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_PAGE_BREAK | doc->settings_root.dft_text_attr<<8;
doc_e->de_flags=doldoc.dft_de_flags[DOCT_PAGE_BREAK];
DocInsEntry(doc,doc_e);
ptr++;
break;
case '\t':
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_TAB | doc->settings_root.dft_text_attr<<8;
doc_e->de_flags=doldoc.dft_de_flags[DOCT_TAB];
DocInsEntry(doc,doc_e);
ptr++;
break;
case '$$':
ptr++; //skip first dollar
ptr2=ptr;
while (*ptr && *ptr!='$$')
ptr++;
if (*ptr) {
*ptr=0; //zero second dollar
if (ptr-1==ptr2 && *ptr2==CH_CURSOR) {
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_CURSOR | doc->settings_root.dft_text_attr<<8;
doc_e->de_flags=doldoc.dft_de_flags[DOCT_CURSOR];
DocInsEntry(doc,doc_e);
ptr2++;
}
if (ptr==ptr2) {
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_TEXT | doc->settings_root.dft_text_attr<<8;
doc_e->max_col=1;
if (doc->flags & DOCF_DBL_DOLLARS)
doc_e->tag=StrNew("$$$$",doc->mem_task);
else
doc_e->tag=StrNew("$$",doc->mem_task);
doc_e->de_flags=doldoc.dft_de_flags[DOCT_TEXT];
DocInsEntry(doc,doc_e);
} else {
st2=MAlloc(ptr-ptr2+1);
ptr3=ptr2;
ptr4=st2;
while (ch=*ptr3++) {
if (ch==CH_CURSOR) {
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_CURSOR | doc->settings_root.dft_text_attr<<8;
doc_e->de_flags=doldoc.dft_de_flags[DOCT_CURSOR];
DocInsEntry(doc,doc_e);
} else if (ch==CH_FORM_FEED) {
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_PAGE_BREAK | doc->settings_root.dft_text_attr<<8;
doc_e->de_flags=doldoc.dft_de_flags[DOCT_PAGE_BREAK];
DocInsEntry(doc,doc_e);
} else
*ptr4++=ch;
}
*ptr4=0;
if (doc_e=PrsDollarCmd(doc,st2)) {
result=doc_e;
DocInsEntry(doc,doc_e);
}
Free(st2);
}
*ptr++='$$';
}
break;
default:
doc_e=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e->type=DOCT_NEW_LINE | doc->settings_root.dft_text_attr<<8;
doc_e->de_flags=doldoc.dft_de_flags[DOCT_NEW_LINE];
DocInsEntry(doc,doc_e);
if (ch=='\r')
while (*ptr=='\r')
ptr++;
if (*ptr=='\n')
ptr++;
while (*ptr=='\r')
ptr++;
}
}
}
if (unlock)
DocUnlock(doc);
return result;
}
public CDocEntry *DocPrint(CDoc *doc,U8 *fmt,...)
{//You must not print partial doc cmds.
U8 *buf=StrPrintJoin(NULL,fmt,argc,argv);
CDocEntry *result=DocPutS(doc,buf);
Free(buf);
return result;
}
Adam/Doc/DocPopUp.CPP → Adam/DolDoc/DocPopUp.CPP
+156 -135
View File
@@ -1,79 +1,88 @@
#help_index "Doc"
#help_index "DolDoc"
public I64 DocEntryRun(CDoc *doc,CDocEntry *doc_e,Bool exited,I64 *_has_action=NULL)
{ //sometimes returns locked, sometimes unlocked
{//Do action on final entry selected by user.
//Sometimes returns locked, sometimes unlocked
U8 ch=doc->cmd_U8,*st;
I64 result=DOCM_CANCEL,has_action=FALSE;
CHashDefineStr *temph;
DocLock(doc);
if (!exited) {
if (doc_e->flags1 & DOCEF1_ESC) {
if (doc_e->de_flags & DOCEF_ESC) {
Msg(MSG_KEY_DOWN,CH_ESC,0,1<<SVCf_DONT_FILTER);
has_action=TRUE;
goto er_done;
} if (doc_e->flags1 & DOCEF1_QUIT) {
} if (doc_e->de_flags & DOCEF_QUIT) {
Msg(MSG_KEY_DOWN,CH_SHIFT_ESC,0,1<<SVCf_DONT_FILTER);
has_action=TRUE;
goto er_done;
} else if (doc_e->flags1 & DOCEF1_CHECK_COLLAPSABLE) {
doc_e->flags1^=DOCEF1_CHECKED_COLLAPSED;
} else if (doc_e->de_flags & DOCEF_CHECK_COLLAPSABLE) {
doc_e->de_flags^=DOCEF_CHECKED_COLLAPSED;
has_action=TRUE;
}
}
try {
if (ch==CH_SPACE) {
if (doc_e->flags1 & DOCEF1_LINK && doc->left_click_link) {
if (doc_e->de_flags & DOCEF_LINK && doc->left_click_link) {
result=(*doc->left_click_link)(doc,doc_e);
has_action=TRUE;
}
if (doc_e->flags1 & DOCEF1_LEFT_EXP) {
if (doc_e->de_flags & DOCEF_LEFT_EXP) {
result=doc_e->left_exp;
has_action=TRUE;
Msg(MSG_CMD,result,0,1<<SVCf_DONT_FILTER);
}
if (doc_e->flags1 & DOCEF1_LEFT_CB && doc_e->left_cb) {
if (doc_e->de_flags & DOCEF_LEFT_CB && doc_e->left_cb) {
DocUnlock(doc);
result=(*doc_e->left_cb)(doc,doc_e);
has_action=TRUE;
Msg(MSG_CMD,result,0,1<<SVCf_DONT_FILTER);
}
if (doc_e->flags1 & DOCEF1_LEFT_MACRO) {
if (doc_e->flags1 & DOCEF1_POPUP) {
if (doc_e->de_flags & DOCEF_LEFT_MACRO) {
if (doc_e->de_flags & DOCEF_POPUP) {
st=StrNew(doc_e->left_macro);
DocUnlock(doc);
PopUp(st,Fs);
Free(st);
} else {
if (doc_e->flags1 & DOCEF1_LEFT_AUTO)
if (doc_e->de_flags & DOCEF_LEFT_AUTO)
AutoStr("%s",doc_e->left_macro);
else
Auto("%s",doc_e->left_macro);
}
has_action=TRUE;
}
if (!exited && doc_e->de_flags & DOCEF_LST && doc_e->de_flags & DOCEF_DEFINE &&
(temph=HashFind(doc_e->define_str,doc->win_task->hash_table,HTT_DEFINE_STR)) &&
(result=PopUpPickLst(temph->data))!=DOCM_CANCEL) {
DocDataFmt(doc,doc_e,result);
DocDataScan(doc,doc_e);
has_action=TRUE;
}
} else if (ch=='\n') {
if (doc_e->flags1 & DOCEF1_LINK && doc->right_click_link) {
if (doc_e->de_flags & DOCEF_LINK && doc->right_click_link) {
result=(*doc->right_click_link)(doc,doc_e);
has_action=TRUE;
}
if (doc_e->flags1 & DOCEF1_RIGHT_EXP) {
if (doc_e->de_flags & DOCEF_RIGHT_EXP) {
result=doc_e->right_exp;
has_action=TRUE;
Msg(MSG_CMD,result,0,1<<SVCf_DONT_FILTER);
}
if (doc_e->flags1 & DOCEF1_RIGHT_CB && doc_e->right_cb) {
if (doc_e->de_flags & DOCEF_RIGHT_CB && doc_e->right_cb) {
DocUnlock(doc);
result=(*doc_e->right_cb)(doc,doc_e);
has_action=TRUE;
Msg(MSG_CMD,result,0,1<<SVCf_DONT_FILTER);
}
if (doc_e->flags1 & DOCEF1_RIGHT_MACRO) {
if (doc_e->flags1 & DOCEF1_POPUP) {
if (doc_e->de_flags & DOCEF_RIGHT_MACRO) {
if (doc_e->de_flags & DOCEF_POPUP) {
st=StrNew(doc_e->right_macro);
DocUnlock(doc);
PopUp(st,Fs);
Free(st);
} else {
if (doc_e->flags1 & DOCEF1_RIGHT_AUTO)
if (doc_e->de_flags & DOCEF_RIGHT_AUTO)
AutoStr("%s",doc_e->right_macro);
else
Auto("%s",doc_e->right_macro);
@@ -146,19 +155,19 @@ U8 *EdDollarTypeCB(CDoc *,CDocEntry *doc_e,CTask *mem_task)
src="EOF";
else if (!src)
src="ERR";
SPrint(st,"%-3ts",src);
StrPrint(st,"%-3ts",src);
return st;
}
public I64 DocGetKey(I64 *_sc=NULL)
{
{//Called by $LK,"View",A="MN:View"$. You probably don't need this.
I64 ch,sc;
Bool cont,old_preempt=IsPreempt;
do {
ch=GetKey(&sc,TRUE);
DocRecalc(DocPut);
cont=FALSE;
if (ch==CH_ESC || ch==CH_SHIFT_ESC) { //Check for exit filter mode
if (ch==CH_ESC || ch==CH_SHIFT_ESC) {//Check for exit filter mode
Preempt(OFF);
if (DocPut && DocPut->find_replace->filter_lines) {
EdUndoFilter(DocPut);
@@ -171,19 +180,19 @@ public I64 DocGetKey(I64 *_sc=NULL)
return ch;
}
#help_index "Doc/Output"
#help_index "DolDoc/Output"
public Bool View()
{
{//Go live for user interaction until <ESC> or <SHIFT-ESC>.
I64 ch;
do ch=DocGetKey;
while (ch!=CH_ESC && ch!=CH_SHIFT_ESC);
return ch==CH_ESC;
}
#help_index "Doc"
#help_index "DolDoc"
public Bool DocDo(CDoc *doc,I64 dof_flags=0)
{
CDoc *old_put_doc =DocPut,
{//Live for user interaction. End on <ESC> or <SHIFT-ESC>.
CDoc *old_put_doc =DocPut,
*old_display_doc=DocDisplay,
*old_border_doc =DocBorder,*bdoc;
CDocEntry *doc_e;
@@ -211,13 +220,13 @@ public Bool DocDo(CDoc *doc,I64 dof_flags=0)
}
doc_e=DocPrint(bdoc,"$$DA-TRM-P+BD+RD+CX+IV,140,A=\"%%s...\",SCX=16$$");
doc_e->data=&Fs->task_title;
DocDataFmt(doc_e);
DocDataFmt(bdoc,doc_e);
if (doc->flags & DOCF_ALLOW_UNDO) {
DocPrint(bdoc,"$$CM+BY+LX+NC,1,1$$");
doc_e=DocPrint(bdoc,"$$DA+BD+RD-TRM-U64+U32,32,A=\"Undo:%%03d\"$$\n");
doc_e=DocPrint(bdoc,"$$DA+BD+RD-TRM,32,RT=U32,A=\"Undo:%%03d\"$$\n");
doc_e->data=&doc->undo_cnt;
DocDataFmt(doc_e);
DocDataFmt(bdoc,doc_e);
}
DocPrint(bdoc,"$$CM+BY+RX+NC,-30,1$$");
@@ -238,15 +247,15 @@ public Bool DocDo(CDoc *doc,I64 dof_flags=0)
doc_e->tag_cb=&EdDollarCB;
doc_e=DocPrint(bdoc,"$$DA+BD+RD-TRM,32,A=\"Line:%%04d \"$$");
doc_e->data=&doc->line;
DocDataFmt(doc_e);
DocDataFmt(bdoc,doc_e);
doc_e=DocPrint(bdoc,"$$DA+BD+RD-TRM,32,A=\"Col:%%04d\"$$\n");
doc_e->data=&doc->col;
DocDataFmt(doc_e);
DocDataFmt(bdoc,doc_e);
DocRecalc(bdoc);
DocRecalc(doc);
if (!(dof_flags&DOF_DONT_HOME))
DocHome(doc);
DocTop(doc);
old_preempt=Preempt(OFF);
Fs->border_doc=bdoc;
if (doc!=old_display_doc)
@@ -254,16 +263,20 @@ public Bool DocDo(CDoc *doc,I64 dof_flags=0)
Fs->put_doc=Fs->display_doc=doc;
if (!(dof_flags&DOF_DONT_TEXT_ATTR))
Fs->text_attr=DOC_ATTR_DFT_TEXT;
LBts(&Fs->display_flags,DISPLAYf_SHOW);
WinZBufUpdate;
if (!(dof_flags&DOF_DONT_SHOW)) {
LBts(&Fs->display_flags,DISPLAYf_SHOW);
WinZBufUpdate;
}
if (dof_flags&DOF_MIN_SIZE)
doc->flags|=DOCF_MIN_SIZE;
Preempt(old_preempt);
DocUnlock(doc);
WinMgrSync(2,TRUE);
if (doc->flags&DOCF_MIN_SIZE)
if (!(dof_flags&DOF_DONT_WINMGR_SYNC)) {
WinMgrSync(2,TRUE);
if (doc->flags&DOCF_MIN_SIZE)
WinMgrSync(2,TRUE);
}
result=View;
Preempt(OFF);
@@ -272,7 +285,7 @@ public Bool DocDo(CDoc *doc,I64 dof_flags=0)
doc_e=doc->root.next;
while (doc_e!=doc) {
if (doc_e->type_u8==DOCT_DATA || doc_e->type_u8==DOCT_CHECK_BOX)
DocDataScan(doc_e);
DocDataScan(doc,doc_e);
doc_e=doc_e->next;
}
}
@@ -296,13 +309,12 @@ public Bool DocDo(CDoc *doc,I64 dof_flags=0)
return result;
}
#help_index "Doc/Input"
#help_index "DolDoc/Input"
public Bool DocFormDo(U8 *_d,U8 *class_name=lastclass,
I64 dof_flags=0,U8 *header=NULL,U8 *footer=NULL)
//Supply a class name that has fmtstr definitions
{//Supply a class name that has fmtstr definitions.
//and this routine will allow user input.
{
//See $LK,"::/Demo/DolDoc/Form.CPP"$ and $LK,"::/Demo/LastClass.CPP"$.
CMemberLst *ml;
CDocEntry *doc_e;
U8 *fmtstr;
@@ -313,7 +325,7 @@ public Bool DocFormDo(U8 *_d,U8 *class_name=lastclass,
if (!(tempc=HashFind(class_name,Fs->hash_table,HTT_CLASS)))
return FALSE;
doc=DocNew;
StrCpy(doc->desc,"Form");
doc->desc='Form';
if (header) DocPrint(doc,"%s",header);
doc->flags|=DOCF_OVERSTRIKE|DOCF_FORM;
if (dof_flags&DOF_MIN_SIZE)
@@ -324,7 +336,7 @@ public Bool DocFormDo(U8 *_d,U8 *class_name=lastclass,
doc_e=DocPrint(doc,"%s",fmtstr);
doc_e->data=_d+ml->offset;
doc_e->my_fmt_data=MemberMetaData("fmtdata",ml);
DocDataFmt(doc_e);
DocDataFmt(doc,doc_e);
}
ml=ml->next;
}
@@ -354,7 +366,7 @@ U0 DocMenuDoEndTaskCB()
}
public I64 DocMenuDo(CDoc *m,I64 dof_flags=0)
{ //returns m unlocked
{//Do (Run) menu chooser doc. (Returns menu doc unlocked.)
U8 *old_end_cb=Fs->task_end_cb;
Bool old_break_shift_esc=LBts(&Fs->task_flags,TASKf_BREAK_TO_SHIFT_ESC);
CDocEntry *doc_e;
@@ -362,7 +374,7 @@ public I64 DocMenuDo(CDoc *m,I64 dof_flags=0)
Fs->task_end_cb=&DocMenuDoEndTaskCB;
try {
if (m) {
StrCpy(m->desc,"Menu");
m->desc='Menu';
Fs->border_src=BDS_CONST;
md_restart:
if (DocDo(m,dof_flags)) {
@@ -391,21 +403,21 @@ md_restart:
return result;
}
#help_index "Doc"
public I64 PopUp(U8 *msg,CTask *parent=NULL,CTask **_pu_task=NULL)
{
#help_index "Task/Srv"
public I64 PopUp(U8 *buf,CTask *parent=NULL,CTask **_pu_task=NULL)
{//Execute code text in PopUp win task.
I64 result;
CSrvCmd *tempc;
Bool old_preempt=Preempt(OFF);
CTask *task=Spawn(&SrvUserCmdLine,NULL,"System",,parent);
if (!parent) {
TaskExe(task,parent,msg,1<<SVCf_EXIT_ON_COMPLETE|1<<SVCf_FREE_ON_COMPLETE);
TaskExe(task,parent,buf,1<<SVCf_EXIT_ON_COMPLETE|1<<SVCf_FREE_ON_COMPLETE);
if (_pu_task) *_pu_task=task;
Preempt(old_preempt);
return 0;
} else {
Fs->popup_task=task;
tempc=TaskExe(task,parent,msg,1<<SVCf_WAKE_MASTER|1<<SVCf_FOCUS_MASTER);
tempc=TaskExe(task,parent,buf,1<<SVCf_WAKE_MASTER|1<<SVCf_FOCUS_MASTER);
if (_pu_task) *_pu_task=task;
ScanResult(tempc,&result);
Fs->popup_task=NULL;
@@ -416,56 +428,67 @@ public I64 PopUp(U8 *msg,CTask *parent=NULL,CTask **_pu_task=NULL)
}
}
#help_index "Doc/Output"
#help_index "DolDoc;Task/Srv"
public I64 PopUpEd(U8 *filename,CTask *parent=NULL,CTask **_pu_task=NULL)
{//Create PopUp win task and edit a doc.
U8 *st=MStrPrint("Ed(\"%Q\");",filename);
I64 result=PopUp(st,parent,_pu_task);
Free(st);
return result;
}
#help_index "DolDoc/Output"
public CTask *PopUpViewDoc(CDoc *doc,I64 dof_flags=0)
{
U8 *buf=MPrint("Preempt(ON);DocDo(0x%X,0x%X);",doc,dof_flags);
{//Pass doc to PopUp win task for viewing.
U8 *buf=MStrPrint("Preempt(ON);DocDo(0x%X,0x%X);",doc,dof_flags);
CTask *task=Spawn(&SrvUserCmdLine,NULL,"View",,Fs);
TaskExe(task,NULL,buf,1<<SVCf_EXIT_ON_COMPLETE|1<<SVCf_FREE_ON_COMPLETE);
Free(buf);
return task;
}
U0 PopUpViewStrTaskEndCB()
U0 PopUpViewPrintEndCB()
{
DocDel(FramePtr("ViewStrFrame"));
Exit;
}
public CTask *PopUpViewStr(U8 *msg)
{
public CTask *PopUpViewPrint(U8 *fmt,...)
{//View Print statement in PopUp win task.
CTask *task;
U8 *buf=StrPrintJoin(NULL,fmt,argc,argv);
CDoc *doc=DocNew;
DocPrint(doc,msg);
DocPrint(doc,buf);
Free(buf);
task=PopUpViewDoc(doc);
FramePtrAdd("ViewStrFrame",doc,task);
task->task_end_cb=&PopUpViewStrTaskEndCB;
task->task_end_cb=&PopUpViewPrintEndCB;
return task;
}
#help_index "Doc/Input"
#help_index "DolDoc/Input"
public I64 PopUpMenu(CDoc *doc,I64 dof_flags=0)
{
{//Do (Run) menu chooser doc in PopUp win task.
doc->flags|=DOCF_MIN_SIZE | DOCF_FORM;
return SrvUser("DocMenuDo(0x%X,0x%X);",doc,dof_flags);
}
public Bool PopUpForm(U8 *_d,U8 *class_name=lastclass,I64 dof_flags=DOF_MIN_SIZE,
U8 *header=NULL,U8 *footer=NULL)
{
{//See $LK,"::/Demo/DolDoc/Form.CPP"$ and $LK,"::/Demo/LastClass.CPP"$.
return SrvUser("DocFormDo(0x%X,0x%X,0x%X,0x%X,0x%X);",_d,class_name,
dof_flags,header,footer);
}
#help_index "Doc/Input;File/FileNames"
#help_index "DolDoc/Input;File/FileNames"
public U8 *PopUpPickFile(U8 *dir=NULL)
{
{//Filename chooser. Uses $LK,"FileMgr",A="MN:FileMgr"$().
U8 *result,*st,*st2;
if (dir)
st=MPrint("Cd(\"%Q\");FileMgr(FM_PICK_FILE,Fs->parent_task);",dir);
st=MStrPrint("Cd(\"%Q\");FileMgr(FM_PICK_FILE,Fs->parent_task);",dir);
else {
st2=CurDir;
st=MPrint("Cd(\"%Q\");FileMgr(FM_PICK_FILE,Fs->parent_task);",st2);
st=MStrPrint("Cd(\"%Q\");FileMgr(FM_PICK_FILE,Fs->parent_task);",st2);
Free(st2);
}
result=PopUp(st,Fs);
@@ -474,13 +497,13 @@ public U8 *PopUpPickFile(U8 *dir=NULL)
}
public U8 *PopUpPickDir(U8 *dir=NULL)
{
{//File dir name chooser. Uses $LK,"FileMgr",A="MN:FileMgr"$().
U8 *result,*st,*st2;
if (dir)
st=MPrint("Cd(\"%Q\");FileMgr(FM_PICK_DIR,Fs->parent_task);",dir);
st=MStrPrint("Cd(\"%Q\");FileMgr(FM_PICK_DIR,Fs->parent_task);",dir);
else {
st2=CurDir;
st=MPrint("Cd(\"%Q\");FileMgr(FM_PICK_DIR,Fs->parent_task);",st2);
st=MStrPrint("Cd(\"%Q\");FileMgr(FM_PICK_DIR,Fs->parent_task);",st2);
Free(st2);
}
result=PopUp(st,Fs);
@@ -489,7 +512,7 @@ public U8 *PopUpPickDir(U8 *dir=NULL)
}
public U8 *FileNameForm(U8 *dft=NULL,I64 dof_flags=0,CTask *mem_task=NULL)
{
{//Text filename form in cur win, not PopUp.
CEdFileName fn;
if (dft)
StrCpy(fn.name,dft);
@@ -502,14 +525,14 @@ public U8 *FileNameForm(U8 *dft=NULL,I64 dof_flags=0,CTask *mem_task=NULL)
}
public U8 *PopUpFileName(U8 *dft=NULL,I64 dof_flags=0)
{
U8 *st=MPrint("FileNameForm(\"%Q\",0x%X,Fs->parent_task);",dft,dof_flags|DOF_MIN_SIZE),
{//Filename chooser. Uses form, not $LK,"FileMgr",A="MN:FileMgr"$().
U8 *st=MStrPrint("FileNameForm(\"%Q\",0x%X,Fs->parent_task);",dft,dof_flags|DOF_MIN_SIZE),
*result=PopUp(st,Fs);
Free(st);
return result;
}
#help_index "Doc"
#help_index "DolDoc"
Bool PopUpCd()
{
Bool result;
@@ -522,14 +545,14 @@ Bool PopUpCd()
return result;
}
#help_index "Doc/Input"
#help_index "DolDoc/Input;Char/Lists"
public U8 *PopUpPickLst(U8 *lst)
{
{//Prompt for lst entry in PopUp win task.
I64 i=0;
CDoc *doc=DocNew;
DocPrint(doc,"$$LTBLUE$$");
while (*lst) {
if (*lst=='@') { //Check for '@' alias lst entry
if (*lst=='@') {//Check for '@' alias lst entry
i--;
lst++;
}
@@ -543,12 +566,13 @@ public U8 *PopUpPickLst(U8 *lst)
}
public U8 *PopUpPickDefineSub(U8 *st)
{
{//Prompt for $LK,"Define",A="HI:Define"$ lst entry in PopUp win task.
return PopUpPickLst(Define(st));
}
#help_index "DolDoc/Input"
public I64 PopUp1(U8 *b1,I64 n1,U8 *header=NULL,U8 *footer=NULL)
{
{//Make PopUp win task with one button.
I64 i,l1=StrLen(b1);
CDoc *doc=DocNew;
if (header) DocPrint(doc,"%s",header);
@@ -560,7 +584,7 @@ public I64 PopUp1(U8 *b1,I64 n1,U8 *header=NULL,U8 *footer=NULL)
}
public I64 PopUp2(U8 *b1,I64 n1,U8 *b2,I64 n2,U8 *header=NULL,U8 *footer=NULL)
{
{//Make PopUp win task with two buttons.
I64 i,l1=StrLen(b1),l2=StrLen(b2),y;
CDoc *doc=DocNew;
if (header) {
@@ -579,21 +603,20 @@ public I64 PopUp2(U8 *b1,I64 n1,U8 *b2,I64 n2,U8 *header=NULL,U8 *footer=NULL)
}
public Bool PopUpOk(U8 *header=NULL,U8 *footer=NULL)
{
{//Make PopUp win task with OKAY button.
return PopUp1("OKAY",1,header,footer)>0;
}
public Bool PopUpNoYes(U8 *header=NULL,U8 *footer=NULL)
{
{//Make PopUp win task with NO/YES buttons.
return $WW,0$PopUp2("YES",1,"NO",0,header,footer)>0;
}
public Bool PopUpCancelOk(U8 *header=NULL,U8 *footer=NULL)
{
{//Make PopUp win task CANCEL/OKAY buttons.
return PopUp2("OKAY",1,"CANCEL",0,header,footer)>0;
}
#define RSAC_REPLACE 0
#define RSAC_SKIP 1
#define RSAC_ALL 2
@@ -613,35 +636,35 @@ I64 PopUpReplaceSkipAllCancel(U8 *header=NULL,U8 *footer=NULL)
return i;
}
U8 *DoPopUpMGetS(U8 *header,CTask *mem_task)
U8 *DoPopUpGetStr(U8 *header,CTask *mem_task)
{
U8 *result,*st;
if (header)
"%s",header;
st=MGetS(GETSF_WITH_NEW_LINE);
st=GetStr(,,GSF_WITH_NEW_LINE);
result=StrNew(st,mem_task);
Free(st);
return result;
}
public U8 *PopUpMGetS(U8 *header=NULL)
{
U8 *st=MPrint("DoPopUpMGetS(0x%X,0x%X);",header,Fs),
public U8 *PopUpGetStr(U8 *header=NULL)
{//Prompt for text str in PopUp win task.
U8 *st=MStrPrint("DoPopUpGetStr(0x%X,0x%X);",header,Fs),
*result=PopUp(st,Fs);
Free(st);
return result;
}
public I64 PopUpI64(U8 *msg,I64 dft,I64 lo=MIN_I64,I64 hi=MAX_I64)
{
U8 *st=MPrint("PmtI64(0x%X,0x%X,0x%X,0x%X);",msg,dft,lo,hi);
public I64 PopUpGetI64(U8 *msg,I64 dft,I64 lo=MIN_I64,I64 hi=MAX_I64)
{//Prompt for I64 text expression in PopUp win task.
U8 *st=MStrPrint("GetI64(0x%X,0x%X,0x%X,0x%X);",msg,dft,lo,hi);
I64 result=PopUp(st,Fs);
Free(st);
return result;
}
public I64 PopUpRangeI64(I64 lo,I64 hi,I64 step=1,U8 *header=NULL,U8 *footer=NULL)
{
{//Evenly-spaced I64 range chooser in PopUp win task.
I64 i;
CDoc *doc=DocNew;
if (header)
@@ -658,7 +681,7 @@ public I64 PopUpRangeI64(I64 lo,I64 hi,I64 step=1,U8 *header=NULL,U8 *footer=NUL
public F64 PopUpRangeF64(F64 lo,F64 hi,F64 step,
U8 *fmt="%9.4f",U8 *header=NULL,U8 *footer=NULL)
{
{//Evenly-spaced F64 range chooser in PopUp win task.
F64 d;
I64 i;
U8 buf[136];
@@ -667,7 +690,7 @@ public F64 PopUpRangeF64(F64 lo,F64 hi,F64 step,
DocPrint(doc,"%s",header);
DocPrint(doc,"$$LTBLUE$$");
for (d=lo;d<=hi;d+=step) {
SPrint(buf,fmt,d);
StrPrint(buf,fmt,d);
DocPrint(doc,"$$MU,\"%s\",LE=0x%X$$\n",buf,d);
}
if (footer)
@@ -679,7 +702,7 @@ public F64 PopUpRangeF64(F64 lo,F64 hi,F64 step,
public F64 PopUpRangeF64Exp(F64 lo,F64 hi,F64 factor,
U8 *fmt="%9.4f",U8 *header=NULL,U8 *footer=NULL)
{
{//Exp-spaced F64 range chooser in PopUp win task.
F64 d;
I64 i;
U8 buf[136];
@@ -688,7 +711,7 @@ public F64 PopUpRangeF64Exp(F64 lo,F64 hi,F64 factor,
DocPrint(doc,"%s",header);
DocPrint(doc,"$$LTBLUE$$");
for (d=lo;d<=hi;d*=factor) {
SPrint(buf,fmt,d);
StrPrint(buf,fmt,d);
DocPrint(doc,"$$MU,\"%s\",LE=0x%X$$\n",buf,d);
}
if (footer)
@@ -700,13 +723,13 @@ public F64 PopUpRangeF64Exp(F64 lo,F64 hi,F64 factor,
public F64 PopUpRangeF64Log(F64 lo,F64 hi,I64 steps,
U8 *fmt="%9.4f",U8 *header=NULL,U8 *footer=NULL)
{
{//Log-spaced F64 range chooser in PopUp win task.
return PopUpRangeF64Exp(lo,hi,Exp(Ln(hi/lo)/(steps-1)),fmt,header,footer);
}
#help_index "Task/Srv"
public I64 AdamFile(U8 *filename,Bool warn_ext=TRUE)
{
{//Tell adam task to compile and run a file.
Bool okay=TRUE;
U8 *name=FileNameAbs(filename),
*name2=DftExt(name,"CPP.Z");
@@ -721,10 +744,9 @@ public I64 AdamFile(U8 *filename,Bool warn_ext=TRUE)
Free(name);
return result;
}
#help_index "Doc"
public I64 PopUpFile(U8 *filename,Bool warn_ext=TRUE,CTask *parent=NULL,CTask **_pu_task=NULL)
{
{//Run code file in PopUp win task.
Bool okay=TRUE;
U8 *st,*name=FileNameAbs(filename),
*name2=DftExt(name,"CPP.Z");
@@ -734,7 +756,7 @@ public I64 PopUpFile(U8 *filename,Bool warn_ext=TRUE,CTask *parent=NULL,CTask **
!PopUpCancelOk(ST_WARN_ST "Not .CPP File\n\n"))
okay=FALSE;
if (okay) {
st=MPrint("\"$$$$WW+H,1$$$$\";Auto(\"ExeFile2(\\\"%s\\\");\\n\");UserTaskCont;",name2);
st=MStrPrint("\"$$$$WW+H,1$$$$\";Auto(\"ExeFile2(\\\"%s\\\");\\n\");UserTaskCont;",name2);
result=PopUp(st,parent,_pu_task);
Free(st);
}
@@ -745,13 +767,13 @@ public I64 PopUpFile(U8 *filename,Bool warn_ext=TRUE,CTask *parent=NULL,CTask **
#help_index "Graphics/Input"
public I64 PopUpColor(U8 *header=NULL,Bool allow_transparent=TRUE,Bool allow_dft=TRUE)
{
{//Chooser for 16-color, default or transparent.
I64 i;
CDoc *doc=DocNew;
if (header)
DocPrint(doc,"%s",header);
if (allow_transparent)
DocPrint(doc,"$$MU,\"TRANSPARENT\",LE=COLOR_TRANSPARENT$$\n");
DocPrint(doc,"$$MU,\"TRANSPARENT\",LE=TRANSPARENT$$\n");
for (i=0;i<16;i++)
DocPrint(doc,"$$BG,%d$$$$MU,\"__%-8Z__\",LE=%d$$$$BG$$\n",i,i,"ST_COLORS",i);
if (allow_dft)
@@ -762,7 +784,7 @@ public I64 PopUpColor(U8 *header=NULL,Bool allow_transparent=TRUE,Bool allow_dft
}
public I64 PopUpColorLighting(U8 *header=NULL)
{
{//Chooser for std TempleOS $LK,"GrLighting",A="MN:GrLighting"$() color.
I64 i;
CDoc *doc=DocNew;
if (header)
@@ -791,15 +813,15 @@ public I64 PopUpColorLighting(U8 *header=NULL)
class CTransformForm
{
F64 x_scale fmtstr "$$DA-TRM,32,A=\"X Scale :%12.6f\"$$\n";
F64 y_scale fmtstr "$$DA-TRM,32,A=\"Y Scale :%12.6f\"$$\n";
F64 z_scale fmtstr "$$DA-TRM,32,A=\"Z Scale :%12.6f\"$$\n";
F64 é_z fmtstr "\nAngles are in degrees\n$$DA-TRM,32,A=\"Z-Axis :%12.6f\"$$\n";
F64 é_y fmtstr "$$DA-TRM,32,A=\"Y-Axis :%12.6f\"$$\n";
F64 é_x fmtstr "$$DA-TRM,32,A=\"X-Axis :%12.6f\"$$\n";
F64 x_offset fmtstr "\n$$DA-TRM,32,A=\"X Offset:%12.6f\"$$\n";
F64 y_offset fmtstr "$$DA-TRM,32,A=\"Y Offset:%12.6f\"$$\n";
F64 z_offset fmtstr "$$DA-TRM,32,A=\"Z Offset:%12.6f\"$$\n";
F64 x_scale fmtstr "$$DA-TRM,32,RT=F64,A=\"X Scale :%12.6f\"$$\n";
F64 y_scale fmtstr "$$DA-TRM,32,RT=F64,A=\"Y Scale :%12.6f\"$$\n";
F64 z_scale fmtstr "$$DA-TRM,32,RT=F64,A=\"Z Scale :%12.6f\"$$\n";
F64 é_z fmtstr "\nAngles are in degrees\n$$DA-TRM,32,RT=F64,A=\"Z-Axis :%12.6f\"$$\n";
F64 é_y fmtstr "$$DA-TRM,32,RT=F64,A=\"Y-Axis :%12.6f\"$$\n";
F64 é_x fmtstr "$$DA-TRM,32,RT=F64,A=\"X-Axis :%12.6f\"$$\n";
F64 x_offset fmtstr "\n$$DA-TRM,32,RT=F64,A=\"X Offset:%12.6f\"$$\n";
F64 y_offset fmtstr "$$DA-TRM,32,RT=F64,A=\"Y Offset:%12.6f\"$$\n";
F64 z_offset fmtstr "$$DA-TRM,32,RT=F64,A=\"Z Offset:%12.6f\"$$\n";
};
Bool PopUpTransform(I64 *r)
@@ -816,24 +838,23 @@ Bool PopUpTransform(I64 *r)
tf->z_offset=0.0;
if (PopUpForm(tf)) {
MemSet(r,0,16*sizeof(I64));
r[0] =tf->x_scale*gr_scale;
r[5] =tf->y_scale*gr_scale;
r[10]=tf->z_scale*gr_scale;
r[15]=gr_scale;
r[0] =tf->x_scale*GR_SCALE;
r[5] =tf->y_scale*GR_SCALE;
r[10]=tf->z_scale*GR_SCALE;
r[15]=GR_SCALE;
GrRotZEqu(r,tf->é_z*ã/180.0);
GrRotYEqu(r,tf->é_y*ã/180.0);
GrRotXEqu(r,tf->é_x*ã/180.0);
r[3] =tf->x_offset*gr_scale;
r[7] =tf->y_offset*gr_scale;
r[11]=tf->z_offset*gr_scale;
r[3] =tf->x_offset*GR_SCALE;
r[7] =tf->y_offset*GR_SCALE;
r[11]=tf->z_offset*GR_SCALE;
return TRUE;
} else
return FALSE;
}
#define PU_SPACING 10
U0 DrawIt(CTask *task,CDC *dc)
{
@@ -844,11 +865,11 @@ U0 DrawIt(CTask *task,CDC *dc)
if (j<16)
j1=j;
else
j1=COLOR_TRANSPARENT;
j1=TRANSPARENT;
if (i<16)
i1=i;
else
i1=COLOR_TRANSPARENT;
i1=TRANSPARENT;
dc->color=j1+i1<<16+ROPF_DITHER;
GrRect(dc,i*PU_SPACING,j*PU_SPACING+FramePtr("DitherDoFrame",task),PU_SPACING,PU_SPACING);
}
@@ -860,7 +881,7 @@ U0 DrawIt(CTask *task,CDC *dc)
I64 DitherColorDo(U8 *header=NULL)
{
I64 msg_code,p1,p2,result=-1,i,j;
I64 msg_code,a1,a2,result=-1,i,j;
DocClear;
"%s",header;
DocRecalc(DocPut);
@@ -868,21 +889,21 @@ I64 DitherColorDo(U8 *header=NULL)
SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
Fs->draw_it=&DrawIt;
do {
msg_code=GetMsg(&p1,&p2,1<<MSG_IP_L_DOWN|1<<MSG_KEY_DOWN);
msg_code=GetMsg(&a1,&a2,1<<MSG_IP_L_DOWN|1<<MSG_KEY_DOWN);
if (msg_code==MSG_IP_L_DOWN) {
msg_code=GetMsg(&p1,&p2,1<<MSG_IP_L_UP);
i=p1/PU_SPACING;
j=(p2-FramePtr("DitherDoFrame"))/PU_SPACING;
if (p1>=0 && p2>=0 && 0<=j<17 && 0<=i<17) {
if (j==16) j=COLOR_TRANSPARENT;
if (i==16) i=COLOR_TRANSPARENT;
msg_code=GetMsg(&a1,&a2,1<<MSG_IP_L_UP);
i=a1/PU_SPACING;
j=(a2-FramePtr("DitherDoFrame"))/PU_SPACING;
if (a1>=0 && a2>=0 && 0<=j<17 && 0<=i<17) {
if (j==16) j=TRANSPARENT;
if (i==16) i=TRANSPARENT;
result=j+i<<16+ROPF_DITHER;
goto dcd_done;
}
}
} while (!(msg_code==MSG_KEY_DOWN && (p1==CH_ESC || p1==CH_SHIFT_ESC)));
do GetMsg(&p1,&p2,1<<MSG_KEY_UP);
while (!p1);
} while (!(msg_code==MSG_KEY_DOWN && (a1==CH_ESC || a1==CH_SHIFT_ESC)));
do GetMsg(&a1,&a2,1<<MSG_KEY_UP);
while (!a1);
dcd_done:
SettingsPop;
FramePtrDel("DitherDoFrame");
@@ -890,8 +911,8 @@ dcd_done:
}
public I64 PopUpColorDither(U8 *header=NULL)
{
{//Chooser for 2 x 16 colors or transparent.
U8 buf[136];
SPrint(buf,"DitherColorDo(0x%X);",header);
StrPrint(buf,"DitherColorDo(0x%X);",header);
return PopUp(buf,Fs);
}
Adam/Doc/DocRecalc2a.CPP → Adam/DolDoc/DocRecalc2a.CPP
+28 -53
View File
@@ -1,4 +1,4 @@
#help_index "Doc"
#help_index "DolDoc"
I64 DocCharDist(CDoc *doc,I64 x,I64 y)
{
@@ -6,21 +6,8 @@ I64 DocCharDist(CDoc *doc,I64 x,I64 y)
return (SqrI64(doc->x-x)+SqrI64(doc->y-y))*FONT_WIDTH*FONT_WIDTH;
}
U0 LockToPage(CDoc *doc)
{
I64 win_page_len;
CDocEntry *doc_e;
doc_e=doc->cur_entry;
if (doc_e->flags1 & DOCEF1_LOCK_TO_PAGE) {
doc->cur_top_line_num=doc_e->y-doc_e->page_line_num;
win_page_len=doc->win_task->win_height;
if (doc_e->page_line_num>=win_page_len)
doc->cur_top_line_num+=doc_e->last->settings.page_len-win_page_len;
}
}
public U0 DocCenter(CDoc *doc=NULL,I64 recalc=DOC_RECALC_ALL)
{
public U0 DocCenter(CDoc *doc=NULL,I64 recalc=DOC_RECALC)
{//Center win on doc cursor, cur_entry.
Bool unlock;
CTask *task;
if (!doc && !(doc=DocPut))
@@ -30,7 +17,6 @@ public U0 DocCenter(CDoc *doc=NULL,I64 recalc=DOC_RECALC_ALL)
DocRecalc(doc,FALSE,recalc);
if (!(doc->flags&DOCF_BORDER_DOC))
doc->cur_top_line_num=doc->y-(task->win_height+1)>>1;
LockToPage(doc);
if (unlock)
DocUnlock(doc);
}
@@ -40,7 +26,7 @@ U0 DocDelToNum(CDoc *doc,I64 num)
CDocEntry *doc_e=doc->root.next,*doc_e2;
while (num-->0 && doc_e!=doc) {
doc_e2=doc_e->next;
if (!(doc_e->flags1 & (DOCEF1_HOLD|DOCEF1_FILTER_SKIP))) {
if (!(doc_e->de_flags & (DOCEF_HOLD|DOCEF_FILTER_SKIP))) {
if (doc_e==doc->cur_entry) {
doc->cur_entry=doc_e2;
doc->cur_data_col=doc_e2->min_col;
@@ -56,7 +42,7 @@ U0 DocDelToEntry(CDoc *doc,CDocEntry *clear_entry)
CDocEntry *doc_e=doc->root.next,*doc_e2;
while (doc_e!=doc) {
doc_e2=doc_e->next;
if (!(doc_e->flags1 & (DOCEF1_HOLD|DOCEF1_FILTER_SKIP))) {
if (!(doc_e->de_flags & (DOCEF_HOLD|DOCEF_FILTER_SKIP))) {
if (doc_e==doc->cur_entry) {
doc->cur_entry=doc_e2;
doc->cur_data_col=doc_e2->min_col;
@@ -73,12 +59,12 @@ U0 DocBorderLstDraw(CDoc *doc)
{
CTask *win_task=doc->win_task;
I64 i,y=-1,attr=win_task->border_attr<<8;
U64 ch;
CDoc *templ=doc;
U8 *ptr;
CD3I64 saved_scroll;
Bool old_preempt=Preempt(OFF);
while (templ && templ->doc_signature==DOC_SIGNATURE_VAL) {
y+=StrLen(templ->desc)+1;
y+=(Bsr(templ->desc)+7)>>3+1; //StrLen+1
templ=templ->parent_doc;
}
templ=doc;
@@ -86,12 +72,14 @@ U0 DocBorderLstDraw(CDoc *doc)
y=win_task->win_height;
WinScrollNull(win_task,&saved_scroll);
while (templ && templ->doc_signature==DOC_SIGNATURE_VAL) {
ptr=templ->desc;
i=StrLen(templ->desc);
ptr+=i;
ch=templ->desc;
i=(Bsr(ch)+7)>>3; //StrLen
ch=EndianI64(ch<<((8-i)<<3));
attr=win_task->border_attr<<8;
while (i-- && y>0)
PlotBorderU8(win_task,attr+*--ptr,-1,--y);
while (i-- && y>0) {
TextChar(win_task,TRUE,-1,--y,attr+ch&0xFF);
ch>>=8;
}
y--;
templ=templ->parent_doc;
}
@@ -100,7 +88,7 @@ U0 DocBorderLstDraw(CDoc *doc)
}
public U0 DocBottom(CDoc *doc=NULL)
{
{//Move cursor, cur_entry, to bottom.
Bool unlock;
if (!doc && !(doc=DocPut))
return;
@@ -112,21 +100,8 @@ public U0 DocBottom(CDoc *doc=NULL)
DocUnlock(doc);
}
public U0 DocTop(CDoc *doc=NULL)
{
Bool unlock;
if (!doc && !(doc=DocPut))
return;
unlock=DocLock(doc);
doc->cur_entry=doc->root.next;
doc->cur_data_col=0;
DocRecalc(doc);
if (unlock)
DocUnlock(doc);
}
public U0 DocClear(CDoc *doc=NULL)
{
{//Clear all doc entries, except +H, hold entries.
Bool unlock;
if (!doc && !(doc=DocPut))
return;
@@ -139,21 +114,21 @@ public U0 DocClear(CDoc *doc=NULL)
}
public Bool DocCursor(Bool show=OFF,CDoc *doc=NULL)
{
{//Show or hide cursor.
if (!doc && !(doc=DocPut))
return FALSE;
return !LBEqu(&doc->flags,DOCf_HIDE_CURSOR,!show);
}
public Bool DocScroll(Bool val=OFF,CDoc *doc=NULL)
{
{//Turn scroll bars OFF/ON.
if (!doc && !(doc=DocPut))
return FALSE;
return !LBEqu(&doc->flags,DOCf_NO_SCROLL_BARS,!val);
}
public U0 DocCollapse(Bool collapse=TRUE,CDoc *doc=NULL)
{
{//Collapse or uncollapse all tree widgets.
CDocEntry *doc_e;
Bool unlock;
if (!doc && !(doc=DocPut))
@@ -161,8 +136,8 @@ public U0 DocCollapse(Bool collapse=TRUE,CDoc *doc=NULL)
unlock=DocLock(doc);
doc_e=doc->root.next;
while (doc_e!=doc) {
if (doc_e->flags1&DOCEF1_TREE)
BEqu(&doc_e->flags1,DOCEf1_CHECKED_COLLAPSED,collapse);
if (doc_e->de_flags&DOCEF_TREE)
BEqu(&doc_e->de_flags,DOCEf_CHECKED_COLLAPSED,collapse);
doc_e=doc_e->next;
}
DocRecalc(doc);
@@ -170,30 +145,30 @@ public U0 DocCollapse(Bool collapse=TRUE,CDoc *doc=NULL)
DocUnlock(doc);
}
#help_index "Doc/Output"
public U0 DocPrintWhole(CDoc *doc,U8 *fmt,...)
{ //This is necessary when hidden text might screw-up
#help_index "DolDoc/Output"
public U0 DocPrintAtomic(CDoc *doc,U8 *fmt,...)
{//Necessary when hidden text might screw-up
//inserts. It does multiple whole doc cmds all-at-once.
U8 *buf;
Bool unlock;
I64 old_flags;
if (!doc && !(doc=DocPut))
return;
buf=SPrintJoin(NULL,fmt,argc,argv);
buf=StrPrintJoin(NULL,fmt,argc,argv);
unlock=DocLock(doc);
old_flags=doc->flags;
doc->flags|=DOCF_NO_CURSOR;
DocPrint(doc,"%s",buf);
DocRecalc(doc,FALSE,DOC_RECALC_PARTIAL);
DocRecalc(doc);
doc->flags=old_flags;
if (unlock)
DocUnlock(doc);
Free(buf);
}
#help_index "Doc/Task"
#help_index "DolDoc/Task"
U0 DocUpdateTaskDocs(CTask *task)
{
{//This is called from $LK,"GrUpdateWins",A="MN:GrUpdateWins"$() by the winmgr at 30fps.
CPrt *p;
CDoc *doc;
CD3I64 saved_scroll;
Adam/Doc/DocRecalc2b.CPP → Adam/DolDoc/DocRecalc2b.CPP
+161 -204
View File
@@ -1,4 +1,4 @@
#help_index "Doc/Misc"
#help_index "DolDoc"
I64 DocWordWrapDel(CDoc *doc,CDocEntry *doc_e,
Bool full_refresh,Bool same_win,I64 left_margin,I64 right_margin,
@@ -7,7 +7,7 @@ I64 DocWordWrapDel(CDoc *doc,CDocEntry *doc_e,
CDocEntry *doc_e2;
U8 *ptr;
I64 j,k;
if (doc_e->flags1&DOCEF1_TAG)
if (doc_e->de_flags&DOCEF_TAG && doc_e->tag)
k=StrLen(doc_e->tag);
else
k=0;
@@ -25,7 +25,7 @@ I64 DocWordWrapDel(CDoc *doc,CDocEntry *doc_e,
}
DocEntryDel(doc,doc_e2);
} else if (IsEditableText(doc_e) &&
doc_e->flags1==doc_e2->flags1 && doc_e->type==doc_e2->type) {
doc_e->de_flags==doc_e2->de_flags && doc_e->type==doc_e2->type) {
j=StrLen(doc_e2->tag);
ptr=MAlloc(k+j+1,doc->mem_task);
MemCpy(ptr,doc_e->tag,k);
@@ -47,7 +47,7 @@ I64 DocWordWrapDel(CDoc *doc,CDocEntry *doc_e,
} else
break;
}
if (doc_e->flags1 & DOCEF1_SCROLLING_X)
if (doc_e->de_flags & DOCEF_SCROLLING_X)
k=doc_e->scroll_len;
return k;
}
@@ -57,37 +57,37 @@ U0 DocRecalcXY(CDoc *doc,CDocEntry *doc_e,
I64 x0,I64 y0,I64 *_x,I64 *_y)
{
I64 i,x=*_x,y=*_y;
if (doc_e->flags1 & DOCEF1_MARGIN_REL_X) {
if (doc_e->flags1 & DOCEF1_LEFT_X)
if (doc_e->de_flags & DOCEF_MARGIN_REL_X) {
if (doc_e->de_flags & DOCEF_LEFT_X)
x=left_margin-left;
else if (doc_e->flags1 & DOCEF1_RIGHT_X)
else if (doc_e->de_flags & DOCEF_RIGHT_X)
x=right_margin-(k-1)-left;
else if (doc_e->flags1 & DOCEF1_CENTER_X)
else if (doc_e->de_flags & DOCEF_CENTER_X)
x=(right_margin+left_margin)>>1-k>>1-left;
} else {
if (doc_e->flags1 & DOCEF1_LEFT_X)
if (doc_e->de_flags & DOCEF_LEFT_X)
x=x0;
else if (doc_e->flags1 & DOCEF1_RIGHT_X)
else if (doc_e->de_flags & DOCEF_RIGHT_X)
x=width+x0-k;
else if (doc_e->flags1 & DOCEF1_CENTER_X)
else if (doc_e->de_flags & DOCEF_CENTER_X)
x=(width+x0-k)>>1;
}
i=y;
if (doc_e->flags1 & DOCEF1_PAGE_REL_Y) {
doc->flags|=DOCF_BACKWARD_MOVEMENT;
if (doc_e->flags1 & DOCEF1_TOP_Y)
if (doc_e->de_flags & DOCEF_PAGE_REL_Y) {
doc->flags|=DOCF_BWD_MOVEMENT;
if (doc_e->de_flags & DOCEF_TOP_Y)
y-=doc_e->page_line_num;
else if (doc_e->flags1 & DOCEF1_BOTTOM_Y)
else if (doc_e->de_flags & DOCEF_BOTTOM_Y)
y+=doc_e->settings.page_len-doc_e->page_line_num;
else if (doc_e->flags1 & DOCEF1_CENTER_Y)
else if (doc_e->de_flags & DOCEF_CENTER_Y)
y+=doc_e->settings.page_len>>1-doc_e->page_line_num;
} else {
doc->flags|=DOCF_BACKWARD_MOVEMENT;
if (doc_e->flags1 & DOCEF1_TOP_Y)
doc->flags|=DOCF_BWD_MOVEMENT;
if (doc_e->de_flags & DOCEF_TOP_Y)
y=y0;
else if (doc_e->flags1 & DOCEF1_BOTTOM_Y)
else if (doc_e->de_flags & DOCEF_BOTTOM_Y)
y=height-1+y0;
else if (doc_e->flags1 & DOCEF1_CENTER_Y)
else if (doc_e->de_flags & DOCEF_CENTER_Y)
y=height>>1+y0;
}
if (y!=i) {
@@ -164,7 +164,7 @@ CDocEntry *DocWordWrapAdd(CDoc *doc,CDocEntry *doc_e,
doc_e->tag=ptr;
doc_e2=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e2->type=DOCT_SOFT_NEW_LINE | doc_e->type & 0xFFFFFF00;
doc_e2->flags1=doc_e->flags1&~DOCEF1_TAG|doc_dft_flags1[DOCT_SOFT_NEW_LINE];
doc_e2->de_flags=doc_e->de_flags&~DOCEF_TAG|doldoc.dft_de_flags[DOCT_SOFT_NEW_LINE];
doc_e2->x=x;
doc_e2->y=y;
doc_e2->page_line_num=doc_e->page_line_num;
@@ -184,8 +184,8 @@ CDocEntry *DocWordWrapAdd(CDoc *doc,CDocEntry *doc_e,
doc_e2->type_u8!=DOCT_CURSOR_MOVEMENT) {
doc_e2=CAlloc(sizeof(CDocEntryBase),doc->mem_task);
doc_e2->type=DOCT_SOFT_NEW_LINE | doc_e->type & 0xFFFFFF00;
doc_e2->flags1=DOCEF1_WORD_WRAP|doc_dft_flags1[DOCT_SOFT_NEW_LINE]|
doc_e->flags1 & (DOCEF1_LOCK_TO_PAGE|DOCEF1_HIGHLIGHT|DOCEF1_LOCK_TO_CENTER|DOCG_BL_IV_UL|DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP);
doc_e2->de_flags=DOCEF_WORD_WRAP|doldoc.dft_de_flags[DOCT_SOFT_NEW_LINE]|
doc_e->de_flags & (DOCEF_HIGHLIGHT|DOCG_BL_IV_UL|DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP);
doc_e2->x=x;
doc_e2->y=y;
doc_e2->page_line_num=doc_e->last->page_line_num;
@@ -200,21 +200,21 @@ CDocEntry *DocWordWrapAdd(CDoc *doc,CDocEntry *doc_e,
I64 DocTempAttr(CDoc *doc,CDocEntry *doc_e,I64 cur_u8_attr)
{
I64 temp_u32_attr;
doc_e->flags1=doc->flags& (DOCG_BL_IV_UL|DOCEF1_WORD_WRAP|DOCEF1_HIGHLIGHT|DOCEF1_LOCK_TO_PAGE|DOCEF1_LOCK_TO_CENTER) |
doc_e->flags1&~(DOCG_BL_IV_UL|DOCEF1_WORD_WRAP|DOCEF1_HIGHLIGHT|DOCEF1_LOCK_TO_PAGE|DOCEF1_LOCK_TO_CENTER);
doc_e->de_flags=doc->flags& (DOCG_BL_IV_UL|DOCEF_WORD_WRAP|DOCEF_HIGHLIGHT) |
doc_e->de_flags&~(DOCG_BL_IV_UL|DOCEF_WORD_WRAP|DOCEF_HIGHLIGHT);
temp_u32_attr=(cur_u8_attr&0xF0)<<8|doc->flags&DOCG_BL_IV_UL|(doc_e->settings.shifted_x&0x1F)<<16|(doc_e->settings.shifted_y&0x1F)<<21;
if (doc_e->flags1 & DOCEF1_HAS_BIN && *doc_e->tag=='<')
if (doc_e->de_flags & DOCEF_HAS_BIN && *doc_e->tag=='<')
temp_u32_attr.u8[1]|=DOC_COLOR_BIN;
else
switch (doc_e->type_u8) {
case DOCT_SPRITE:
if (doc_e->flags1 & DOCEF1_LEFT_EXP)
if (doc_e->de_flags & DOCEF_LEFT_EXP)
temp_u32_attr.u8[1]|=cur_u8_attr&15;
else if (doc_e->flags1 & DOCEF1_LINK)
else if (doc_e->de_flags & DOCEF_LINK)
temp_u32_attr.u8[1]|=DOC_COLOR_LINK;
else if (doc_e->flags1 & DOCEF1_LEFT_MACRO)
else if (doc_e->de_flags & DOCEF_LEFT_MACRO)
temp_u32_attr.u8[1]|=DOC_COLOR_MACRO;
else if (doc_e->flags1 & DOCEF1_TREE)
else if (doc_e->de_flags & (DOCEF_TREE|DOCEF_LST))
temp_u32_attr.u8[1]|=DOC_COLOR_TREE;
else
temp_u32_attr.u8[1]|=DOC_COLOR_BIN;
@@ -232,29 +232,26 @@ I64 DocTempAttr(CDoc *doc,CDocEntry *doc_e,I64 cur_u8_attr)
temp_u32_attr.u8[1]|=DOC_COLOR_ANCHOR;
break;
case DOCT_TREE:
case DOCT_LST:
temp_u32_attr.u8[1]|=DOC_COLOR_TREE;
break;
default:
temp_u32_attr.u8[1]|=cur_u8_attr&15;
}
doc_e->type.u8[1]=temp_u32_attr.u8[1];
temp_u32_attr|=doc_e->type&0xF3FF0000;
temp_u32_attr|=doc_e->type&0xFFFF0000;
if (doc_e==doc->cur_entry && doc_e->type_u8!=DOCT_TEXT)
temp_u32_attr^=0xFF00;
doc_e->settings.final_u32_attr=temp_u32_attr;
return temp_u32_attr;
}
U8 doc_spaces[9]=
{CH_SPACE,CH_SPACE,CH_SPACE,CH_SPACE,CH_SPACE,CH_SPACE,CH_SPACE,CH_SPACE,0};
Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
{
public Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC)
{//Recalc and fmt. Also used by WinMgr to draw on screen.
I64 i,ii,j,k,x,x0,y,y0,D,d2,col,col2,best_col=0,best_d=MAX_I64,xx,yy,zz,
num_entries=0,ijif,cur_u8_attr,temp_u32_attr,
cursor_y=MIN_I64,left_margin,right_margin,
y_plot_top,y_plot_bottom,
top,left,bottom,right,width,height,scroll_x,scroll_y,
pix_top,pix_left;
cursor_y=MIN_I64,left_margin,right_margin,y_plot_top,y_plot_bottom,
top,left,bottom,right,width,height,scroll_x,scroll_y,pix_top,pix_left;
CDocEntry reg *doc_e,reg *doc_e2,*best_doc_e,*next_clear_found=NULL;
CDocBin *tempb;
CDocSettings *s;
@@ -272,9 +269,9 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
if (!doc || doc->doc_signature!=DOC_SIGNATURE_VAL) return FALSE;
if (recalc==DOC_RECALC_TO_SCREEN && doc->owning_task!=Fs) {
ijif=sys_jiffies+JIFFY_FREQ/240;
ijif=cnts.jiffies+JIFFY_FREQ/240;
while (Bt(&doc->locked_flags,DOClf_LOCKED)) {
if (sys_jiffies>=ijif)
if (cnts.jiffies>=ijif)
return FALSE;
Yield;
}
@@ -290,26 +287,19 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
mem_task=doc->mem_task;
blink_flag=Blink;
dc=NULL;
nobound_switch (recalc) {
case DOC_RECALC_FIND_CURSOR:
if (win_task)
dc=DCAlias(gr_dc2,win_task);
find_cursor=TRUE;
case DOC_RECALC_ALL:
doc->recalc_start=doc;
if (win_task)
dc=DCAlias(gr.dc2,win_task); //Necessary for sprites
break;
case DOC_RECALC_TO_SCREEN:
if (doc->refresh_cnt++%(ToI64(win_actual_refresh/10)+1) &&
if (doc->refresh_cnt++%(ToI64(winmgr.fps/10)+1) &&
!Bt(&doc->flags,DOCf_DO_FULL_REFRESH) &&
!(doc->flags&DOCF_BACKWARD_MOVEMENT))
!(doc->flags&DOCF_BWD_MOVEMENT))
full_refresh=FALSE;
doc->recalc_start=doc;
if (win_task)
dc=DCAlias(gr_dc2,win_task);
break;
case DOC_RECALC_PARTIAL:
DocRemSoftNewLines(doc,doc->recalc_start);
dc=DCAlias(gr.dc2,win_task);
break;
}
@@ -340,8 +330,7 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
else
doc->flags&=~DOCF_HIGHLIGHT;
x=doc->start_x;
y=doc->start_y;
x=y=0;
doc->page_line_num=0;
if (full_refresh && !find_cursor) {
doc->x=x;
@@ -354,7 +343,8 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
doc->cur_top_line_num=0;
doc->line_start_col=0;
has_cursor=FALSE;
doc->settings_root.cur_text_attr=doc->settings_root.dft_text_attr=win_task->border_attr;
if (recalc==DOC_RECALC_TO_SCREEN)
doc->settings_root.cur_text_attr=doc->settings_root.dft_text_attr=win_task->border_attr;
} else {
if (has_cursor && full_refresh) {
if (Bt(&hss->flags,WSSf_SET_TO_POS)||Bt(&vss->flags,WSSf_SET_TO_POS)) {
@@ -371,10 +361,10 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
doc->x=doc->line_start_col+width/2;
doc->y=doc->cur_top_line_num+height/2;
find_cursor=TRUE;
doc->recalc_start=doc;
}
}
doc->settings_root.cur_text_attr=doc->settings_root.dft_text_attr=win_task->text_attr;
if (recalc==DOC_RECALC_TO_SCREEN)
doc->settings_root.cur_text_attr=doc->settings_root.dft_text_attr=win_task->text_attr;
}
x0=doc->line_start_col;
y0=doc->cur_top_line_num;
@@ -393,37 +383,22 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
if (doc->cur_data_col<=doc->cur_entry->min_col)
doc->cur_data_col=doc->cur_entry->min_col;
if (doc->recalc_start==doc) {
doc_e=doc->root.next;
doc_e->flags1&=~(DOCG_BL_IV_UL|DOCEF1_WORD_WRAP|DOCEF1_HIGHLIGHT|DOCEF1_LOCK_TO_PAGE|DOCEF1_LOCK_TO_CENTER);
} else if (!doc->recalc_start)
doc_e=doc; //skip update
else {
doc_e=doc->recalc_start;
i=doc->ww_lines_back;
ii=i/2; //Threshold for stopping on SOFT_CR
while (i-- && doc_e->type_u8!=DOCT_NEW_LINE &&
(i>ii || doc_e->type_u8!=DOCT_SOFT_NEW_LINE) &&
doc_e->flags1 & DOCEF1_WORD_WRAP &&
doc_e->last!=doc)
doc_e=doc_e->last;
x=doc_e->x; y=doc_e->y;
doc->page_line_num=doc_e->page_line_num;
}
doc_e=doc->root.next;
doc_e->de_flags&=~(DOCG_BL_IV_UL|DOCEF_WORD_WRAP|DOCEF_HIGHLIGHT);
if (doc_e==doc->root.next)
s=&doc->settings_root;
else
s=&doc_e->last->settings;
doc->flags=doc_e->flags1& (DOCG_BL_IV_UL|DOCEF1_WORD_WRAP|DOCEF1_LOCK_TO_PAGE|DOCEF1_LOCK_TO_CENTER) |
doc->flags&~(DOCG_BL_IV_UL|DOCEF1_WORD_WRAP|DOCEF1_LOCK_TO_PAGE|DOCEF1_LOCK_TO_CENTER);
doc->flags=doc_e->de_flags& (DOCG_BL_IV_UL|DOCEF_WORD_WRAP) |
doc->flags&~(DOCG_BL_IV_UL|DOCEF_WORD_WRAP);
cur_u8_attr=s->cur_text_attr;
if (doc_e==doc->root.next) {
doc->flags&=~DOCF_BACKWARD_MOVEMENT;
doc->flags&=~DOCF_BWD_MOVEMENT;
if (recalc==DOC_RECALC_TO_SCREEN && full_refresh)
doc->flags&=~DOCF_HAS_SONG;
} else
doc->flags=doc_e->flags1& DOCEF1_HIGHLIGHT |
doc->flags&~DOCEF1_HIGHLIGHT;
doc->flags=doc_e->de_flags& DOCEF_HIGHLIGHT |
doc->flags&~DOCEF_HIGHLIGHT;
if (doc->root.next==doc) {
best_doc_e=doc;
@@ -441,15 +416,16 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
while (doc_e!=doc) {
while (TRUE) {
del_cl=FALSE;
if (doc_e->flags1 & (DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP)) {
if (doc_e->de_flags & (DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP)) {
doc_e2=doc_e;
goto rc_skip;
}
MemCpy(&doc_e->settings,s,sizeof(CDocSettings));
s=&doc_e->settings;
if (doc_e->flags1 & (DOCEF1_TAG_CB|DOCEF1_DEFINE)) {
if (doc_e->de_flags & (DOCEF_TAG_CB|DOCEF_DEFINE) &&
!(doc_e->de_flags & DOCEF_LST)) {
Free(doc_e->tag);
if (doc_e->flags1 & DOCEF1_TAG_CB) {
if (doc_e->de_flags & DOCEF_TAG_CB) {
if (doc_e->tag_cb)
doc_e->tag=(*doc_e->tag_cb)(doc,doc_e,mem_task);
else
@@ -470,8 +446,8 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
}
k=DocWordWrapDel(doc,doc_e,full_refresh,same_win,
left_margin,right_margin,&best_doc_e,&best_col);
if (doc_e->flags1 & (DOCEF1_LEFT_X|DOCEF1_RIGHT_X|DOCEF1_CENTER_X|
DOCEF1_TOP_Y|DOCEF1_BOTTOM_Y|DOCEF1_CENTER_Y))
if (doc_e->de_flags & (DOCEF_LEFT_X|DOCEF_RIGHT_X|DOCEF_CENTER_X|
DOCEF_TOP_Y|DOCEF_BOTTOM_Y|DOCEF_CENTER_Y))
DocRecalcXY(doc,doc_e,k,
left,width,height,left_margin,right_margin,x0,y0,&x,&y);
if (full_refresh && k>0 && doc->flags & DOCF_WORD_WRAP &&
@@ -498,33 +474,34 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
if (doc_e==doc->cur_entry)
cursor_y=doc_e->y;
if (doc_e->flags1 & DOCEF1_REFRESH_DATA &&
(doc_e->type_u8==DOCT_DATA || doc_e->type_u8==DOCT_CHECK_BOX))
DocDataFmt(doc_e);
if (doc_e->flags1&DOCEF1_TAG) {
if (doc_e->de_flags & DOCEF_REFRESH_DATA &&
(doc_e->type_u8==DOCT_DATA || doc_e->type_u8==DOCT_CHECK_BOX ||
doc_e->de_flags & DOCEF_LST)) {
DocDataFmt(doc,doc_e);
k=StrLen(doc_e->tag);
}
if (doc_e->de_flags&DOCEF_TAG) {
ptr=doc_e->tag;
if (doc_e->flags1 & DOCEF1_TREE) {
if (doc_e->de_flags & DOCEF_TREE) {
if (k>=2) {
if (doc_e->flags1 & DOCEF1_CHECKED_COLLAPSED)
if (doc_e->de_flags & DOCEF_CHECKED_COLLAPSED)
*ptr++='+';
else
*ptr++='-';
*ptr++=']';
ptr=doc_e->tag;
}
} else if (doc_e->flags1 & DOCEF1_HAS_BIN) {
} else if (doc_e->de_flags & DOCEF_HAS_BIN) {
if (*ptr=='<' && full_refresh && '0'<=ptr[1]<='9') {
SPrint(buf,"<%d>",doc_e->bin_num);
k=StrLen(buf);
ptr=MStrPrint("<%d>",doc_e->bin_num);
Free(doc_e->tag);
ptr=doc_e->tag=MAlloc(k+1,mem_task);
MemCpy(ptr,buf,k+1);
ptr=doc_e->tag=StrNew(ptr,mem_task);
k=StrLen(ptr);
}
} else if (doc_e->type_u8==DOCT_CHECK_BOX) {
if (k>=3) {
*ptr++='[';
if (doc_e->flags1 & DOCEF1_CHECKED_COLLAPSED)
if (doc_e->de_flags & DOCEF_CHECKED_COLLAPSED)
*ptr++='X';
else
*ptr++=CH_SPACE;
@@ -532,7 +509,7 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
ptr=doc_e->tag;
}
}
if (doc_e->flags1 & DOCEF1_SCROLLING_X) {
if (doc_e->de_flags & DOCEF_SCROLLING_X) {
j=StrLen(doc_e->tag);
if (j && doc_e->scroll_len) {
ijif=cur_time*FONT_WIDTH*DOC_SCROLL_SPEED;
@@ -544,12 +521,12 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
for (k=0;k<doc_e->scroll_len;k++) {
ch=ptr[(ijif+k)%j];
if (!Bt(chars_bitmap_displayable,ch)) ch='.';
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->flags1&DOCEF1_DONT_DRAW)) {
if (doc_e->flags1 & DOCEF1_BORDER_PLOT &&
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->de_flags&DOCEF_DONT_DRAW)) {
if (doc_e->de_flags & DOCEF_BORDER_PLOT &&
!Bt(&win_task->display_flags,DISPLAYf_NO_BORDER))
PlotBorderU8(win_task,temp_u32_attr+ch,x-x0,y-y0);
TextChar(win_task,TRUE,x-x0,y-y0,temp_u32_attr+ch);
else
PlotWinU8(win_task,temp_u32_attr+ch,x-x0,y-y0);
TextChar(win_task,FALSE,x-x0,y-y0,temp_u32_attr+ch);
}
x++;
}
@@ -560,11 +537,11 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
}
col2=doc_e->scroll_len; //TODO This is flawed
} else {
if (doc_e->flags1 & DOCEF1_BORDER_PLOT &&
if (doc_e->de_flags & DOCEF_BORDER_PLOT &&
!Bt(&win_task->display_flags,DISPLAYf_NO_BORDER)) {
while (ch=*ptr++) {
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->flags1&DOCEF1_DONT_DRAW))
PlotBorderU8(win_task,temp_u32_attr+ch,x-x0,y-y0);
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->de_flags&DOCEF_DONT_DRAW))
TextChar(win_task,TRUE,x-x0,y-y0,temp_u32_attr+ch);
else
if (find_cursor) {
d2=DocCharDist(doc,x,y);
@@ -577,18 +554,18 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
x++;
}
} else {
if (doc_e->type_u8==DOCT_TEXT && doc_e->flags1&DOCEF1_HIGHLIGHT)
if (doc_e->type_u8==DOCT_TEXT && doc_e->de_flags&DOCEF_HIGHLIGHT)
hl=DocHighlight(doc_e,ptr,k,temp_u32_attr);
else
hl=NULL;
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->flags1&DOCEF1_DONT_DRAW)) {
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->de_flags&DOCEF_DONT_DRAW)) {
if (y>y_plot_bottom) //Technically we should do this for scrolling_x, too.
more=TRUE;
else if (y>=y_plot_top) {
if (hl)
PlotAttrStr2(win_task,hl,k,x-x0,y-y0);
TextLenAttrStr(win_task,x-x0,y-y0,k,hl);
else
PlotWinStr2(win_task,ptr,k,temp_u32_attr,x-x0,y-y0);
TextLenStr(win_task,x-x0,y-y0,k,temp_u32_attr,ptr);
}
col2+=k;
x+=k;
@@ -614,29 +591,29 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
}
nobound_switch (doc_e->type_u8) {
case DOCT_TEXT:
if (!col2 && !(doc_e->flags1&(DOCEF1_TREE|DOCEF1_TAG_CB|DOCEF1_DEFINE|
DOCEF1_HTML_LINK|DOCEF1_BIN_PTR_LINK)))
if (!col2 && !(doc_e->de_flags&(DOCEF_TREE|DOCEF_LST|DOCEF_TAG_CB|DOCEF_DEFINE|
DOCEF_HTML_LINK|DOCEF_BIN_PTR_LINK)))
del_cl=TRUE;
break;
case DOCT_HEX_ED:
if (doc_e->flags1 & DOCEF1_DATA_IS_PTR)
if (doc_e->de_flags & DOCEF_DATA_IS_PTR)
bptr=doc_e->data;
else
bptr=&doc_e->data;
k=doc_e->hex_ed_width; //columns
for (i=0;i<doc_e->len;i+=k) {
if (doc_e->flags1 & DOCEF1_ZERO_BASED)
SPrint(buf,"%08tX ",i);
if (doc_e->de_flags & DOCEF_ZERO_BASED)
StrPrint(buf,"%08tX ",i);
else
SPrint(buf,"%08tX ",bptr);
StrPrint(buf,"%08tX ",bptr);
ptr=buf;
while (ch=*ptr++) {
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->flags1&DOCEF1_DONT_DRAW)) {
if (doc_e->flags1 & DOCEF1_BORDER_PLOT &&
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->de_flags&DOCEF_DONT_DRAW)) {
if (doc_e->de_flags & DOCEF_BORDER_PLOT &&
!Bt(&win_task->display_flags,DISPLAYf_NO_BORDER))
PlotBorderU8(win_task,temp_u32_attr+ch,x-x0,y-y0);
TextChar(win_task,TRUE,x-x0,y-y0,temp_u32_attr+ch);
else
PlotWinU8(win_task,temp_u32_attr+ch,x-x0,y-y0);
TextChar(win_task,FALSE,x-x0,y-y0,temp_u32_attr+ch);
}
if (find_cursor) {
d2=DocCharDist(doc,x,y);
@@ -649,15 +626,15 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
}
if (i+k>doc_e->len) k=doc_e->len-i;
for (j=0;j<k;j++) {
SPrint(buf,"%02tX",*bptr++);
StrPrint(buf,"%02tX",*bptr++);
ptr=buf;
while (ch=*ptr++) {
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->flags1&DOCEF1_DONT_DRAW)) {
if (doc_e->flags1 & DOCEF1_BORDER_PLOT &&
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->de_flags&DOCEF_DONT_DRAW)) {
if (doc_e->de_flags & DOCEF_BORDER_PLOT &&
!Bt(&win_task->display_flags,DISPLAYf_NO_BORDER))
PlotBorderU8(win_task,temp_u32_attr+ch,x-x0,y-y0);
TextChar(win_task,TRUE,x-x0,y-y0,temp_u32_attr+ch);
else
PlotWinU8(win_task,temp_u32_attr+ch,x-x0,y-y0);
TextChar(win_task,FALSE,x-x0,y-y0,temp_u32_attr+ch);
}
if (find_cursor) {
d2=DocCharDist(doc,x,y);
@@ -676,12 +653,12 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
for (j=0;j<k;j++) {
ch=*bptr++;
if (!Bt(chars_bitmap_displayable,ch)) ch='.';
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->flags1&DOCEF1_DONT_DRAW)) {
if (doc_e->flags1 & DOCEF1_BORDER_PLOT &&
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->de_flags&DOCEF_DONT_DRAW)) {
if (doc_e->de_flags & DOCEF_BORDER_PLOT &&
!Bt(&win_task->display_flags,DISPLAYf_NO_BORDER))
PlotBorderU8(win_task,temp_u32_attr+ch,x-x0,y-y0);
TextChar(win_task,TRUE,x-x0,y-y0,temp_u32_attr+ch);
else
PlotWinU8(win_task,temp_u32_attr+ch,x-x0,y-y0);
TextChar(win_task,FALSE,x-x0,y-y0,temp_u32_attr+ch);
}
if (find_cursor) {
d2=DocCharDist(doc,x,y);
@@ -699,11 +676,11 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
break;
case DOCT_TAB:
k=(x+8) & ~7;
if (doc_e->flags1 & DOCEF1_BORDER_PLOT &&
if (doc_e->de_flags & DOCEF_BORDER_PLOT &&
!Bt(&win_task->display_flags,DISPLAYf_NO_BORDER)) {
while (x<k) {
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->flags1&DOCEF1_DONT_DRAW))
PlotBorderU8(win_task,temp_u32_attr+CH_SPACE,x-x0,y-y0);
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->de_flags&DOCEF_DONT_DRAW))
TextChar(win_task,TRUE,x-x0,y-y0,temp_u32_attr+CH_SPACE);
if (find_cursor) {
d2=DocCharDist(doc,x,y);
if (d2<D)
@@ -713,9 +690,9 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
}
} else {
k-=x;
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->flags1&DOCEF1_DONT_DRAW)) {
if (recalc==DOC_RECALC_TO_SCREEN && !(doc_e->de_flags&DOCEF_DONT_DRAW)) {
if (y_plot_top<=y<=y_plot_bottom)
PlotWinStr2(win_task,doc_spaces,k,temp_u32_attr,x-x0,y-y0);
TextLenStr(win_task,x-x0,y-y0,k,temp_u32_attr," ");
x+=k;
} else {
if (find_cursor) {
@@ -733,10 +710,9 @@ Bool DocRecalc(CDoc *doc,Bool has_cursor=FALSE,I64 recalc=DOC_RECALC_ALL)
case DOCT_NEW_LINE:
case DOCT_SOFT_NEW_LINE:
if (recalc==DOC_RECALC_TO_SCREEN &&
!(doc_e->flags1&DOCEF1_DONT_DRAW)&& y_plot_top<=y<=y_plot_bottom)
PlotWinAttr(win_task,width-(x-x0),
cur_u8_attr<<8,x-x0,y-y0);
if (doc_e->flags1&DOCEF1_HIGHLIGHT) {
!(doc_e->de_flags&DOCEF_DONT_DRAW)&& y_plot_top<=y<=y_plot_bottom)
TextLenAttr(win_task,x-x0,y-y0,width-(x-x0),cur_u8_attr<<8);
if (doc_e->de_flags&DOCEF_HIGHLIGHT) {
if (s->state==DOCSS_CPP_Z_COMMENT)
s->state=DOCSS_NORMAL;
}
@@ -791,15 +767,15 @@ rc_adjust_xy:
}
break;
case DOCT_CURSOR_MOVEMENT:
doc->flags|=DOCF_BACKWARD_MOVEMENT;
doc->flags|=DOCF_BWD_MOVEMENT;
x+=doc_e->cursor_x_offset;
if (doc_e->flags1 & DOCEF1_PAGE_REL_Y) {
if (doc_e->de_flags & DOCEF_PAGE_REL_Y) {
i=doc->page_line_num;
if (doc_e->flags1 & DOCEF1_TOP_Y)
if (doc_e->de_flags & DOCEF_TOP_Y)
doc->page_line_num=0;
else if (doc_e->flags1 & DOCEF1_BOTTOM_Y)
else if (doc_e->de_flags & DOCEF_BOTTOM_Y)
doc->page_line_num=s->page_len-1;
else if (doc_e->flags1 & DOCEF1_CENTER_Y)
else if (doc_e->de_flags & DOCEF_CENTER_Y)
doc->page_line_num=s->page_len>>1;
y+=doc->page_line_num-i;
}
@@ -807,12 +783,12 @@ rc_adjust_xy:
doc->page_line_num+=doc_e->cursor_y_offset;
goto rc_adjust_xy;
case DOCT_PAGE_BREAK:
doc->flags|=DOCF_BACKWARD_MOVEMENT;
doc->flags|=DOCF_BWD_MOVEMENT;
y+=s->page_len-doc_e->page_line_num;
doc->page_line_num=0;
goto rc_start_of_line;
case DOCT_INDENT:
if (doc_e->flags1 & DOCEF1_LEFT_X)
if (doc_e->de_flags & DOCEF_LEFT_X)
i=doc_e->attr;
else
i=s->indent+doc_e->attr;
@@ -820,7 +796,7 @@ rc_adjust_xy:
goto rc_start_of_line;
case DOCT_PAGE_LEN:
s->page_len=doc_e->attr;
if (doc_e->flags1 & DOCEF1_WIN_REL)
if (doc_e->de_flags & DOCEF_WIN_REL)
s->page_len+=height;
goto rc_adjust_xy;
case DOCT_LEFT_MARGIN:
@@ -829,7 +805,7 @@ rc_adjust_xy:
s->left_margin=i;
goto rc_start_of_line;
case DOCT_RIGHT_MARGIN:
if (doc_e->flags1 & DOCEF1_WIN_REL)
if (doc_e->de_flags & DOCEF_WIN_REL)
i=width-1-doc_e->attr;
else
i=doc_e->attr;
@@ -895,18 +871,6 @@ rc_adjust_xy:
else
doc->flags&=~DOCF_HIGHLIGHT;
break;
case DOCT_LOCK_TO_PAGE:
if (doc_e->attr)
doc->flags|=DOCF_LOCK_TO_PAGE;
else
doc->flags&=~DOCF_LOCK_TO_PAGE;
break;
case DOCT_LOCK_TO_CENTER:
if (doc_e->attr)
doc->flags|=DOCF_LOCK_TO_CENTER;
else
doc->flags&=~DOCF_LOCK_TO_CENTER;
break;
case DOCT_UNDERLINE:
if (doc_e->attr)
doc->flags|=DOCF_UNDERLINE;
@@ -939,22 +903,22 @@ rc_adjust_xy:
del_cl=TRUE;
break;
case DOCT_SPRITE:
if (!doc_e->bin_data && doc->flags&DOCEF1_HAS_BIN)
if (!doc_e->bin_data && doc->flags&DOCEF_HAS_BIN)
doc_e->bin_data=DocBinFindNum(doc,doc_e->bin_num);
if ((tempb=doc_e->bin_data) && !tempb->tag && doc_e->tag && *doc_e->tag)
tempb->tag=StrNew(doc_e->tag,mem_task);
if (tempb && dc) {
DCRst(dc);
dc->flags&=~(DCF_DONT_DRAW|DCF_LOCATE_NEAREST);
if (recalc!=DOC_RECALC_TO_SCREEN || doc_e->flags1&DOCEF1_DONT_DRAW)
if (recalc!=DOC_RECALC_TO_SCREEN || doc_e->de_flags&DOCEF_DONT_DRAW)
dc->flags|=DCF_DONT_DRAW;
bptr=tempb->data;
ii=SpriteTypeMask(bptr);
if (ii&1<<GRST_NUM_TYPES) {
bptr=gr_empty_sprite;
if (ii&1<<SPT_NUM_TYPES) {
bptr=gr.empty_sprite;
ii=SpriteTypeMask(bptr);
}
if (ii&(1<<GRST_FLOOD_FILL|1<<GRST_FLOOD_FILL_NOT))
if (ii&(1<<SPT_FLOOD_FILL|1<<SPT_FLOOD_FILL_NOT))
i=cur_u8_attr>>4 &0xF ^ win_task->text_attr>>4 & 0xF;
else {
i=temp_u32_attr>>12&0xF ^ win_task->text_attr>>4 & 0xF;
@@ -972,15 +936,15 @@ rc_adjust_xy:
dc->nearest_dist=MAX_I64;
if (recalc==DOC_RECALC_TO_SCREEN && doc->cur_sprite==bptr) {
dc->flags|=DCF_LOCATE_NEAREST;
dc->cur_x=ipx;
dc->cur_y=ipy;
dc->cur_x=ip.pos.x;
dc->cur_y=ip.pos.y;
} else {
dc->cur_x=(doc->x-x0)*FONT_WIDTH+pix_left+scroll_x;
dc->cur_y=(doc->y-y0)*FONT_HEIGHT+pix_top+scroll_y;
}
dc->cur_z=0;
dc->bkcolor=i;
if (doc_e->flags1 & DOCEF1_FROM_START) {
if (doc_e->de_flags & DOCEF_FROM_START) {
xx=(x-k-x0)*FONT_WIDTH; //TODO: scrolling text is not length k
yy=(y-y0)*FONT_HEIGHT;
zz=0;
@@ -989,7 +953,7 @@ rc_adjust_xy:
yy=(y-y0)*FONT_HEIGHT;
zz=0;
}
if (ii&(1<<GRST_MESH|1<<GRST_SHIFTABLE_MESH)) {
if (ii&(1<<SPT_MESH|1<<SPT_SHIFTABLE_MESH)) {
if (!depth_buf) {
DCAllocDepthBuf(dc);
depth_buf=dc->depth_buf;
@@ -1016,11 +980,11 @@ rc_adjust_xy:
}
break;
case DOCT_SONG:
if (sys_focus_task==win_task && recalc==DOC_RECALC_TO_SCREEN && !(doc_e->flags1&DOCEF1_DONT_DRAW)) {
if (doc_e->aux_str && (!cur_song || StrCmp(cur_song,doc_e->aux_str))) {
Free(cur_song);
if (sys_focus_task==win_task && recalc==DOC_RECALC_TO_SCREEN && !(doc_e->de_flags&DOCEF_DONT_DRAW)) {
if (doc_e->aux_str && (!music.cur_song || StrCmp(music.cur_song,doc_e->aux_str))) {
Free(music.cur_song);
MusicSettingsRst;
cur_song=AStrNew(doc_e->aux_str);
music.cur_song=AStrNew(doc_e->aux_str);
}
}
doc->flags|=DOCF_HAS_SONG;
@@ -1033,17 +997,15 @@ rc_adjust_xy:
break;
}
if (doc_e->flags1 & DOCEF1_HAS_BORDER) {
if (doc_e->flags1 & DOCEF1_SOLID_BORDER)
DrawBorder(win_task,1,doc_e->x-x0,x-x0-1,doc_e->y-y0,y-y0,temp_u32_attr.u8[1],TRUE);
else
DrawBorder(win_task,0,doc_e->x-x0,x-x0-1,doc_e->y-y0,y-y0,temp_u32_attr.u8[1],TRUE);
}
if (doc_e->de_flags & DOCEF_HAS_BORDER)
TextBorder(win_task,doc_e->x-x0,x-x0-1,doc_e->y-y0,y-y0,
temp_u32_attr.u8[1],ToBool(doc_e->de_flags & DOCEF_SOLID_BORDER));
if (full_refresh) {
switch (doc_e->type_u8) {
case DOCT_CHECK_BOX:
doc_e->max_col=2;
break;
case DOCT_LST:
case DOCT_TREE:
case DOCT_BUTTON:
case DOCT_LINK:
@@ -1052,7 +1014,7 @@ rc_adjust_xy:
doc_e->max_col=1;
break;
default:
if (doc_e->flags1 & DOCEF1_TREE)
if (doc_e->de_flags & (DOCEF_TREE|DOCEF_LST))
doc_e->max_col=1;
else
doc_e->max_col=col2;
@@ -1060,28 +1022,28 @@ rc_adjust_xy:
if (x>doc->max_x) doc->max_x=x;
if (y>doc->max_y) doc->max_y=y;
if (D<=best_d && !(doc_e->flags1&DOCEF1_NO_CLICK_ON)) {
if (D<=best_d && !(doc_e->de_flags&DOCEF_NO_CLICK_ON)) {
best_d=D;
best_doc_e=doc_e;
best_col=col;
}
if (doc_e->flags1 & DOCEF1_TREE) {
if (doc_e->flags1 & DOCEF1_CHECKED_COLLAPSED)
if (doc_e->de_flags & DOCEF_TREE) {
if (doc_e->de_flags & DOCEF_CHECKED_COLLAPSED)
tree_collapsed=TRUE;
else
tree_collapsed=FALSE;
doc_e2=doc_e->next;
while (doc_e2!=doc && doc_e2->type_u8!=DOCT_INDENT && !(doc_e2->flags1 & DOCEF1_TREE))
while (doc_e2!=doc && doc_e2->type_u8!=DOCT_INDENT && !(doc_e2->de_flags & DOCEF_TREE))
doc_e2=doc_e2->next;
if (doc_e2->type_u8==DOCT_INDENT) {
j=i=s->indent;
do {
if (tree_collapsed)
doc_e2->flags1|=DOCEF1_SKIP;
doc_e2->de_flags|=DOCEF_SKIP;
else
doc_e2->flags1&=~DOCEF1_SKIP;
doc_e2->de_flags&=~DOCEF_SKIP;
if (doc_e2->type_u8==DOCT_INDENT) {
if (doc_e2->flags1 & DOCEF1_LEFT_X)
if (doc_e2->de_flags & DOCEF_LEFT_X)
j=doc_e2->attr;
else
j+=doc_e2->attr;
@@ -1094,7 +1056,7 @@ rc_adjust_xy:
doc_e2=doc_e->next;
rc_skip:
while (doc_e2!=doc && doc_e2->flags1 & (DOCEF1_SKIP|DOCEF1_HARD_SKIP|DOCEF1_FILTER_SKIP)) {
while (doc_e2!=doc && doc_e2->de_flags & (DOCEF_SKIP|DOCEF_HARD_SKIP|DOCEF_FILTER_SKIP)) {
if (doc_e2==doc->cur_entry) {
doc->cur_entry=doc_e2->next;
doc->cur_data_col=doc->cur_entry->min_col;
@@ -1105,15 +1067,15 @@ rc_skip:
doc_e2->page_line_num=doc->page_line_num;
MemCpy(&doc_e2->settings,s,sizeof(CDocSettings));
doc_e2->type.u8[1]=cur_u8_attr;
doc_e2->flags1=doc->flags&(DOCG_BL_IV_UL|DOCEF1_WORD_WRAP|DOCEF1_HIGHLIGHT|DOCEF1_LOCK_TO_PAGE|DOCEF1_LOCK_TO_CENTER) |
doc_e2->flags1&~(DOCG_BL_IV_UL|DOCEF1_WORD_WRAP|DOCEF1_HIGHLIGHT|DOCEF1_LOCK_TO_PAGE|DOCEF1_LOCK_TO_CENTER);
doc_e2->de_flags=doc->flags&(DOCG_BL_IV_UL|DOCEF_WORD_WRAP|DOCEF_HIGHLIGHT) |
doc_e2->de_flags&~(DOCG_BL_IV_UL|DOCEF_WORD_WRAP|DOCEF_HIGHLIGHT);
}
doc_e2=doc_e2->next;
}
if (full_refresh) {
if (del_cl) {
if (!(doc_e->flags1 & (DOCEF1_HOLD|DOCEF1_FILTER_SKIP))) {
if (!(doc_e->de_flags & (DOCEF_HOLD|DOCEF_FILTER_SKIP))) {
if (doc_e==doc->cur_entry) {
doc->cur_entry=doc_e2;
doc->cur_data_col=doc_e2->min_col;
@@ -1134,12 +1096,12 @@ rc_skip:
if (full_refresh) {
if (doc->min_x>doc->max_x) {
doc->max_x=doc->start_x;
doc->min_x=doc->start_x;
doc->max_x=0;
doc->min_x=0;
}
if (doc->min_y>doc->max_y) {
doc->max_y=doc->start_y;
doc->min_y=doc->start_y;
doc->max_y=0;
doc->min_y=0;
}
//Update header
@@ -1151,14 +1113,14 @@ rc_skip:
doc_e->type.u8[1]=cur_u8_attr;
if (find_cursor) {
D=DocCharDist(doc,x,y);
if (D<best_d && !(doc_e->flags1&DOCEF1_NO_CLICK_ON)) {
if (D<best_d && !(doc_e->de_flags&DOCEF_NO_CLICK_ON)) {
best_d=D;
best_doc_e=doc_e;
best_col=0;
}
}
}
if (doc->recalc_start==doc && doc->flags & DOCF_MIN_SIZE) {
if (doc->flags & DOCF_MIN_SIZE) {
if (Bt(&win_task->display_flags,DISPLAYf_NO_BORDER)) {
if (left<0)
left=0;
@@ -1190,7 +1152,7 @@ rc_skip:
if (find_cursor) {
doc->cur_entry=best_doc_e;
doc->cur_data_col=best_col;
DocFormBackward(doc);
DocFormBwd(doc);
//We need this because text coordinates are used
if (best_d<FONT_WIDTH)
best_d=0;
@@ -1232,10 +1194,6 @@ rc_skip:
if (doc->y-doc->cur_top_line_num+y<0)
doc->cur_top_line_num=doc->y+y;
if (doc->cur_entry->flags1 & DOCEF1_LOCK_TO_CENTER)
DocCenter(doc,DOC_RECALC_PARTIAL);
LockToPage(doc);
if (doc->line_start_col-x+width-1>doc->max_x)
doc->line_start_col=doc->max_x-(width-1)+x;
if (doc->line_start_col-x<doc->min_x)
@@ -1246,7 +1204,6 @@ rc_skip:
if (doc->x-doc->line_start_col+x<0)
doc->line_start_col=doc->x+x;
}
doc->recalc_start=NULL;
}
if (recalc==DOC_RECALC_TO_SCREEN && has_cursor) {
x=doc->x-doc->line_start_col+left +scroll_x/FONT_WIDTH;
@@ -1254,7 +1211,7 @@ rc_skip:
if (0<=x<=right && 0<=y<=bottom &&
x<TEXT_COLS && y<TEXT_ROWS &&
!(doc->flags&DOCF_HIDE_CURSOR)) {
u32_ptr=gr_text_base+y*TEXT_COLS+x;
u32_ptr=gr.text_base+y*TEXT_COLS+x;
*u32_ptr|=DOCET_BLINK;
*u32_ptr^=0xFF00;
}
Adam/Doc/DocTree.CPP → Adam/DolDoc/DocTree.CPP
+10 -13
View File
@@ -1,9 +1,9 @@
#help_index "Doc"
#help_index "DolDoc"
public Bool DocTreeFind(CDoc *haystack_doc,U8 *needle_path,
CDocEntry **_tree_entry=NULL,
CDocEntry **_start_indent=NULL, CDocEntry **_end_indent=NULL)
{
{//Find registry-like tree widget start and end.
I64 i=0,k=0;
U8 *st1=StrNew(needle_path),*st2=MAlloc(StrLen(needle_path)+1);
Bool result=FALSE,unlock_doc=DocLock(haystack_doc);
@@ -17,7 +17,7 @@ public Bool DocTreeFind(CDoc *haystack_doc,U8 *needle_path,
while (doc_e!=haystack_doc) {
if (doc_e->type_u8==DOCT_INDENT)
i+=doc_e->attr;
else if (i==k && doc_e->flags1&DOCEF1_TREE && !StrCmp(doc_e->tag+3,st2)) {
else if (i==k && doc_e->de_flags&DOCEF_TREE && !StrCmp(doc_e->tag+3,st2)) {
if (*st1)
break;
else {
@@ -57,9 +57,8 @@ ft_done:
return result;
}
public Bool DocTreeMake(CDoc *doc,U8 *path)
{
{//Make registry-like tree widget.
I64 i=0,j=MIN_I64,k=0;
U8 *st1=StrNew(path),
*st2=MAlloc(StrLen(path)+1),
@@ -79,7 +78,7 @@ public Bool DocTreeMake(CDoc *doc,U8 *path)
doc->cur_data_col=0;
goto mt_done;
}
} else if (i==k && doc_e->flags1&DOCEF1_TREE && !StrCmp(doc_e->tag+3,st2)) {
} else if (i==k && doc_e->de_flags&DOCEF_TREE && !StrCmp(doc_e->tag+3,st2)) {
Free(st3);
st3=StrNew(st1);
j=i;
@@ -112,13 +111,12 @@ mt_done:
return result;
}
#help_index "Doc/Compiler;Compiler"
#help_index "DolDoc/Compiler;Compiler"
public I64 ExeDoc(CDoc *doc,Bool just_load=FALSE)
{
{//JIT Compile and execute a document.
I64 result;
Bool okay=TRUE,unlock_doc=DocLock(doc);
CLex *lx;
lx=LexNew(,LF_DONT_FREE_BUF);
CLex *lx=LexNew(,LF_DONT_FREE_BUF);
if (just_load)
lx->flags|=LF_JUST_LOAD;
if (Fs->last_lex!=&Fs->next_lex)
@@ -143,9 +141,8 @@ public I64 ExeDoc(CDoc *doc,Bool just_load=FALSE)
return result;
}
public I64 DocTreeBranchExe(CDoc *doc,U8 *path)
{
{//JIT Compile and execute code in doc tree branch.
CDoc *doc2;
Bool unlock_doc=DocLock(doc);
CDocEntry *tree_branch,*start_indent,*end_indent;
@@ -161,7 +158,7 @@ public I64 DocTreeBranchExe(CDoc *doc,U8 *path)
}
public I64 ExeTreeBranch(U8 *registry_file,U8 *path)
{
{//JIT Compile and execute a specified branch in a specified file.
I64 result;
CDoc *doc=DocRead(registry_file);
result=DocTreeBranchExe(doc,path);
Adam/Dsk/ChkDsk.CPP
+7 -8
View File
@@ -17,7 +17,7 @@ I64 RedSeaFSChkDskLst(CDirEntry *tempde1,U8 *bits,U8 *bits2,I64 size,I64 bpc)
I64 i,j,errs=0;
while (tempde1) {
tempde2=tempde1->next;
if (tempde1->attr & _ATTR_DIR) {
if (tempde1->attr & RS_ATTR_DIR) {
if (tempde1->sub)
errs+=RedSeaFSChkDskLst(tempde1->sub,bits,bits2,size,bpc);
}
@@ -50,7 +50,7 @@ I64 RedSeaFSChkDsk(U8 drv_let,Bool *_fix,Bool *_confirm)
{
I64 i,j,bpc,size,errs=0;
CPrt *p=Drv2Prt(drv_let),*old_prt=Fs->cur_prt;
U8 *files_find_mask=MPrint("%c:/*",Prt2Drv(p)),
U8 *files_find_mask=MStrPrint("%c:/*",Prt2Drv(p)),
*old_dir=StrNew(Fs->cur_dir),
*bits,*bits2;
CDirEntry *ptr,*ptr2;
@@ -110,7 +110,7 @@ I64 FAT32ChkDskLst(CPrt *p,CDirEntry *tempde1,U8 *bits,U32 *bits2,I64 size,I64 b
I64 i,c,errs=0;
while (tempde1) {
tempde2=tempde1->next;
if (tempde1->attr & _ATTR_DIR) {
if (tempde1->attr & RS_ATTR_DIR) {
if (tempde1->sub)
errs+=FAT32ChkDskLst(p,tempde1->sub,bits,bits2,size,bpc);
}
@@ -134,7 +134,7 @@ I64 FAT32ChkDskLst(CPrt *p,CDirEntry *tempde1,U8 *bits,U32 *bits2,I64 size,I64 b
c=ClusterNumNext(p,c);
i++;
}
if (!(tempde1->attr & _ATTR_DIR)) {
if (!(tempde1->attr & RS_ATTR_DIR)) {
i*=bpc;
if (tempde1->size>i) {
PrintErr("Allocated File Too Short:%s\n",tempde1->full_name);
@@ -155,7 +155,7 @@ I64 FAT32ChkDsk(U8 drv_let,Bool *_fix,Bool *_confirm)
{
I64 i,bpc,size,c,errs=0;
CPrt *p=Drv2Prt(drv_let),*old_prt=Fs->cur_prt;
U8 *files_find_mask=MPrint("%c:/*",Prt2Drv(p)),
U8 *files_find_mask=MStrPrint("%c:/*",Prt2Drv(p)),
*old_dir=StrNew(Fs->cur_dir),
*bits;
U32 *bits2;
@@ -206,7 +206,8 @@ I64 FAT32ChkDsk(U8 drv_let,Bool *_fix,Bool *_confirm)
}
public I64 ChkDsk(U8 drv_let=0,Bool fix=FALSE,Bool confirm=TRUE)
{ //Check for allocation errors.
{//Check disk for allocation errors and, optionally, fix.
//You probably want to reformat and reinstall.
I64 errs=0;
CPrt *p=Drv2Prt(drv_let);
switch (p->type) {
@@ -228,5 +229,3 @@ public I64 ChkDsk(U8 drv_let=0,Bool fix=FALSE,Bool confirm=TRUE)
}
return errs;
}
#help_index ""
Adam/Dsk/Dsk2a.CPP
+42 -35
View File
@@ -1,8 +1,9 @@
#help_index "File/Cmd Line (Typically);Cmd Line (Typically)"
public U8 *DBlk(I64 blk,Bool write=FALSE)
{//Dump Disk Blk.
//If you set write to TRUE, it will be written when you press <ESC>.
{//Dump disk block. Optionally, write.
//If you set write to TRUE, the block will
//be written when you press <ESC>.
//See $LK,"::/Demo/Dsk/DskRaw.CPP"$.
U8 *buf=MAlloc(BLK_SIZE);
@@ -19,8 +20,9 @@ public U8 *DBlk(I64 blk,Bool write=FALSE)
}
public U8 *DCluster(I64 c,Bool write=FALSE,I64 num=0)
{//Dump Disk Cluster.
//If you set write to TRUE, it will be written when you press <ESC>.
{//Dump disk cluster. Optionally, write.
//If you set write to TRUE, the cluster will
//be written when you press <ESC>.
//See $LK,"::/Demo/Dsk/DskRaw.CPP"$.
//Do $LK,"Dir",A="MN:Dir"$("*",TRUE); to get cluster numbers of files.
U8 *buf=MAlloc(Fs->cur_prt->spc<<BLK_SIZE_BITS);
@@ -45,7 +47,7 @@ U0 FOFlatten(CDirEntry *tempde,CDirEntry **a,I64 *i)
CDirEntry *tempde1;
while (tempde) {
tempde1=tempde->next;
if (tempde->attr&_ATTR_DIR) {
if (tempde->attr&RS_ATTR_DIR) {
FOFlatten(tempde->sub,a,i);
DirEntryDel(tempde);
} else {
@@ -57,10 +59,10 @@ U0 FOFlatten(CDirEntry *tempde,CDirEntry **a,I64 *i)
}
public I64 FileCnt(CDirEntry *tempde)
{
{//Cnt of files in $LK,"CDirEntry",A="MN:CDirEntry"$ tree.
I64 cnt=0;
while (tempde) {
if (tempde->attr&_ATTR_DIR)
if (tempde->attr&RS_ATTR_DIR)
cnt+=FileCnt(tempde->sub);
else
cnt++;
@@ -72,7 +74,10 @@ public I64 FileCnt(CDirEntry *tempde)
#help_index "File/Cmd Line (Typically);Cmd Line (Typically)"
public Bool Copy(U8 *src_files_find_mask,U8 *dst_files_find_mask=".")
{
{//Copy files.
//If the name ends in ".Z", it will
//be stored compressed. If not ".Z"
//it will be stored uncompressed.
Bool result=TRUE;
CFileAccess *fa;
CDirEntry *tempde,*tempde1;
@@ -83,7 +88,7 @@ public Bool Copy(U8 *src_files_find_mask,U8 *dst_files_find_mask=".")
if (fa=FileAccessNew(dst_files_find_mask,TRUE)) {
while (tempde) {
tempde1=tempde->next;
if (!(tempde->attr & _ATTR_DIR)) {
if (!(tempde->attr & RS_ATTR_DIR)) {
st=FileNameAbs(tempde->name);
if (!CopySingle(tempde->full_name,st))
result=FALSE;
@@ -100,7 +105,7 @@ public Bool Copy(U8 *src_files_find_mask,U8 *dst_files_find_mask=".")
}
public Bool Move(U8 *f1,U8 *f2)
{
{//Move files from one location to another or rename.
if (Copy(f1,f2)) {
Del(f1);
return TRUE;
@@ -116,7 +121,7 @@ I64 CopyTree2(CDirEntry *tempde,I64 src_dir_len,I64 dst_dir_len,U8 *dst_dir)
st=MAlloc(StrLen(tempde->full_name)+dst_dir_len+2);
MemCpy(st,dst_dir,dst_dir_len);
StrCpy(st+dst_dir_len,tempde->full_name+src_dir_len);
if (tempde->attr & _ATTR_DIR) {
if (tempde->attr & RS_ATTR_DIR) {
MkDir(st);
result+=CopyTree2(tempde->sub,src_dir_len,dst_dir_len,dst_dir);
} else
@@ -128,7 +133,8 @@ I64 CopyTree2(CDirEntry *tempde,I64 src_dir_len,I64 dst_dir_len,U8 *dst_dir)
return result;
}
public I64 CopyTree(U8 *src_files_find_mask,U8 *dst_files_find_mask,Bool no_mask=TRUE)
{ //returns count of copied files (not dirs)
{//Copy directory tree.
//Returns the count of copied files (not dirs).
CFileAccess *fa;
CDirEntry *tempde=NULL;
I64 result=0,i1,i2;
@@ -158,7 +164,7 @@ public I64 CopyTree(U8 *src_files_find_mask,U8 *dst_files_find_mask,Bool no_mask
FileAccessDel(fa);
Free(st2);
}
DirLstDel(tempde);
DirTreeDel(tempde);
Free(st1);
}
return result;
@@ -170,7 +176,7 @@ I64 DelTreeDirs(CDirEntry *tempde1)
CDirEntry *tempde2;
while (tempde1) {
tempde2=tempde1->next;
if (tempde1->attr & _ATTR_DIR) {
if (tempde1->attr & RS_ATTR_DIR) {
if (tempde1->sub)
result+=DelTreeDirs(tempde1->sub);
result+=SysDel(tempde1->full_name,TRUE);
@@ -186,7 +192,7 @@ I64 DelTreeFiles(CDirEntry *tempde1)
CDirEntry *tempde2;
while (tempde1) {
tempde2=tempde1->next;
if (tempde1->attr & _ATTR_DIR) {
if (tempde1->attr & RS_ATTR_DIR) {
if (tempde1->sub)
result+=DelTreeFiles(tempde1->sub);
} else
@@ -197,7 +203,7 @@ I64 DelTreeFiles(CDirEntry *tempde1)
return result;
}
public I64 DelTree(U8 *files_find_mask,U8 *fu_flags=NULL)
{
{//Delete directory tree.
I64 result=0,fuf_flags=0;
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r");
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
@@ -219,7 +225,7 @@ U0 TouchFile(U8 *filename,U8 *attr,CDate cdt=MIN_I64)
if (FileFind(filename,&de,FUF_JUST_FILES)) {
Free(de.full_name);
if (!StrCmp(attr,"+?"))
"%-48ts %s\n",filename,SPrintFlags(buf,Define("ST_FILE_ATTRS"),de.attr);
"%-48ts %s\n",filename,StrPrintFlags(buf,Define("ST_FILE_ATTRS"),de.attr);
else {
StrFirstRem(cur_dir,":");
StrLastRem(cur_dir,"/");
@@ -236,11 +242,14 @@ U0 TouchFile(U8 *filename,U8 *attr,CDate cdt=MIN_I64)
PrintErr("File not found.\n");
}
public U0 Touch(U8 *files_find_mask,U8 *attr="+?",U8 *fu_flags=NULL,CDate cdt=MIN_I64)
{
//Attr "+?" =show
// "+T" =resident
//To Set Date
// Touch(filename,"",,datetime);
{/*Touch file attributes and DateTime.
Default lists attributes.
attr: "+?" =show current
"+T" =resident
$LK,"RS_ATTR_READ_ONLY",A="MN:RS_ATTR_READ_ONLY"$ $LK,"ST_FILE_ATTRS",A="MN:ST_FILE_ATTRS"$
To Set DateL:
Touch(filename,"",,datetime);
*/
I64 fuf_flags=0;
CDirEntry *tempde,*tempde1;
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+f+F");
@@ -250,12 +259,11 @@ public U0 Touch(U8 *files_find_mask,U8 *attr="+?",U8 *fu_flags=NULL,CDate cdt=MI
TouchFile(tempde->full_name,attr,cdt);
tempde=tempde->next;
}
DirLstDel(tempde1);
DirTreeDel(tempde1);
}
public I64 FF(U8 *files_find_mask,U8 *fu_flags=NULL)
//Files Find
{
{//Files find. List files matching mask.
I64 cnt=0,fuf_flags=0;
CDirEntry *tempde,*tempde1;
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r+f+F");
@@ -263,16 +271,17 @@ public I64 FF(U8 *files_find_mask,U8 *fu_flags=NULL)
tempde=tempde1=FilesFind(files_find_mask,fuf_flags);
while (tempde) {
PutFileLink(tempde->full_name);
NewLine;
'\n';
cnt++;
tempde=tempde->next;
}
DirLstDel(tempde1);
DirTreeDel(tempde1);
return cnt;
}
public U0 SetDrvTextAttr(U8 drv_let,U8 attr)
{ //This is to color the border text according to the current drive
{//Set color of the window border text
//for when this drive is the current drive.
CPrt *p;
try {
p=Drv2Prt(drv_let);
@@ -317,7 +326,7 @@ I64 FAT32UnusedDrvSpace(U8 drv_let=0)
return result*BLK_SIZE*p->spc;
}
public I64 UnusedDrvSpace(U8 drv_let=0)
{ //returns size in bytes
{//Returns unused size in bytes.
CPrt *p=Drv2Prt(drv_let),*p_old=Fs->cur_prt;
U8 *old_dir=StrNew(Fs->cur_dir);
I64 result=0;
@@ -346,14 +355,14 @@ I64 Size1(CDirEntry *tempde,I64 *_fuf_flags,I64 round_to)
CPrt *p;
while (tempde) {
if ((i=tempde->size) && Bt(_fuf_flags,FUf_EXPAND) &&
!(tempde->attr&_ATTR_DIR) && FileAttr(tempde->name)&_ATTR_COMPRESSED) {
!(tempde->attr&RS_ATTR_DIR) && FileAttr(tempde->name)&RS_ATTR_COMPRESSED) {
p=Drv2Prt(*tempde->full_name);
RBlks(p,buf,Cluster2Blk(p,tempde->cluster),1);
i=(&buf)(CArcCompress *)->expanded_size;
}
if (round_to)
i=CeilU64(tempde->size,round_to);
if (tempde->attr&_ATTR_DIR)
if (tempde->attr&RS_ATTR_DIR)
i+=Size1(tempde->sub,_fuf_flags,round_to);
tempde->user_data=i;
result+=i;
@@ -362,8 +371,7 @@ I64 Size1(CDirEntry *tempde,I64 *_fuf_flags,I64 round_to)
return result;
}
public I64 Size(U8 *files_find_mask="/*",U8 *fu_flags=NULL,I64 round_to=0)
{
//"+x" for expanded size.
{//Total size of files in mask. "+x" for expanded size.
//Does not include directory size of base directory, but
//does include size of sub directories.
I64 fuf_flags=0,result=0;
@@ -373,8 +381,7 @@ public I64 Size(U8 *files_find_mask="/*",U8 *fu_flags=NULL,I64 round_to=0)
if (tempde1=FilesFind(files_find_mask,fuf_flags&FUG_FILES_FIND)) {
fuf_flags&=FUF_EXPAND;
result=Size1(tempde1,&fuf_flags,round_to);
DirLstDel(tempde1);
DirTreeDel(tempde1);
}
return result;
}
#help_index ""
Adam/Dsk/Dsk2b.CPP
+76 -48
View File
@@ -1,28 +1,26 @@
#help_index "File/Program Routines/Utils"
I64 DirTreeFlattenSize(CDirEntry *tempde)
#help_index "File/Internal"
I64 DirTreeSerializeSize(CDirEntry *tempde)
{
I64 result=0;
while (tempde) {
result+=CDIR_SIZE+1;
if (tempde->attr & _ATTR_DIR)
result+=DirTreeFlattenSize(tempde->sub);
if (tempde->attr & RS_ATTR_DIR)
result+=DirTreeSerializeSize(tempde->sub);
tempde=tempde->next;
}
return result+1;
}
I64 DirTreeFlattenFill(CDirEntry *tempde,U8 *dst)
I64 DirTreeSerializeFill(CDirEntry *tempde,U8 *dst)
{
I64 result=0,i;
while (tempde) {
*dst++=1;
result++;
i=CDIR_SIZE;
MemCpy(dst,&tempde->start,i);
dst+=i;
result+=i;
if (tempde->attr & _ATTR_DIR) {
i=DirTreeFlattenFill(tempde->sub,dst);
MemCpy(dst,&tempde->start,CDIR_SIZE);
dst+=CDIR_SIZE;
result+=CDIR_SIZE;
if (tempde->attr & RS_ATTR_DIR) {
i=DirTreeSerializeFill(tempde->sub,dst);
dst+=i;
result+=i;
}
@@ -31,36 +29,34 @@ I64 DirTreeFlattenFill(CDirEntry *tempde,U8 *dst)
*dst=0;
return result+1;
}
public U8 *DirTreeFlatten(CDirEntry *tempde,I64 *_size=NULL)
{
I64 size=DirTreeFlattenSize(tempde);
public U8 *DirTreeSerialize(CDirEntry *tempde,I64 *_size=NULL)
{//Serialize tree returned from $LK,"FilesFind",A="MN:FilesFind"$() into a one contiguous U8 array.
I64 size=DirTreeSerializeSize(tempde);
U8 *buf=MAlloc(size);
DirTreeFlattenFill(tempde,buf);
DirTreeSerializeFill(tempde,buf);
if (_size) *_size=size;
return buf;
}
U8 *DirTreeDoUnflatten(U8 *src,CDirEntry **tempde)
U8 *DirTreeUnserialize2(U8 *src,CDirEntry **tempde)
{
I64 i;
CDirEntry *tempde1;
if (*src++) {
tempde1=CAlloc(sizeof(CDirEntry));
*tempde=tempde1;
i=CDIR_SIZE;
MemCpy(&tempde1->start,src,i);
src+=i;
if (tempde1->attr & _ATTR_DIR)
src=DirTreeDoUnflatten(src,&tempde1->sub);
src=DirTreeDoUnflatten(src,&tempde1->next);
MemCpy(&tempde1->start,src,CDIR_SIZE);
src+=CDIR_SIZE;
if (tempde1->attr & RS_ATTR_DIR)
src=DirTreeUnserialize2(src,&tempde1->sub);
src=DirTreeUnserialize2(src,&tempde1->next);
} else
*tempde=NULL;
return src;
}
public CDirEntry *DirTreeUnflatten(U8 *src)
{
public CDirEntry *DirTreeUnserialize(U8 *src)
{//Unserialize tree to make it like a tree returned from $LK,"FilesFind",A="MN:FilesFind"$().
CDirEntry *tempde=NULL;
DirTreeDoUnflatten(src,&tempde);
DirTreeUnserialize2(src,&tempde);
return tempde;
}
@@ -76,13 +72,13 @@ class CPlannedPrt
Bool pri;
};
//This is available to assist in writing scripts.
//Available to assist in writing scripts.
I64 prt_dsk_dsk_size;
public U0 PrtDsk(U8 drv_let=0)
//Partition Disk containing partition drv_let.
//or drv_let=0 means add new drv that is not already mounted.
{
{//Partition the disk containing partition drv_let.
//drv_let=0 means add new drive that
//is not already mounted.
CBlkDev *bdev;
CPlannedPrt root,*temppp;
CMasterBoot mbr;
@@ -141,7 +137,7 @@ public U0 PrtDsk(U8 drv_let=0)
}
"Blocks Remaining:%d (0x%X)\n",
remaining-PRT_HEADER,remaining-PRT_HEADER;
temppp->size=CeilU64(PmtI64("Size in Blocks :",
temppp->size=CeilU64(GetI64("Size in Blocks :",
remaining-PRT_HEADER)+PRT_HEADER,ROUND_PRT_TO);
} while (!(ROUND_PRT_TO<=temppp->size<=FloorU64(remaining,ROUND_PRT_TO)));
QueIns(temppp,root.last);
@@ -237,7 +233,6 @@ pd_done:
}
}
#help_index "Info;File/Cmd Line (Typically);Cmd Line (Typically)"
U0 RedSeaFSDrvView(U8 drv_let=0)
@@ -267,9 +262,9 @@ U0 RedSeaFSDrvView(U8 drv_let=0)
lohi=i*s;
c1=lohi/l;
if (Bt(bitmap,c1))
dc->color=ROP_XOR+BLUE^COLOR_TRANSPARENT;
dc->color=ROP_XOR+BLUE^TRANSPARENT;
else
dc->color=ROP_XOR+WHITE^COLOR_TRANSPARENT;
dc->color=ROP_XOR+WHITE^TRANSPARENT;
GrPlot(dc,x,y);
i++;
}
@@ -309,9 +304,9 @@ U0 FAT32DrvView(U8 drv_let=0)
lohi=i*s;
c1=lohi/l;
if (bitmap[c1])
dc->color=ROP_XOR+BLUE^COLOR_TRANSPARENT;
dc->color=ROP_XOR+BLUE^TRANSPARENT;
else
dc->color=ROP_XOR+WHITE^COLOR_TRANSPARENT;
dc->color=ROP_XOR+WHITE^TRANSPARENT;
GrPlot(dc,x,y);
i++;
}
@@ -326,7 +321,7 @@ U0 FAT32DrvView(U8 drv_let=0)
DCDel(dc);
}
public U0 DrvView(U8 drv_let=0)
{
{//Drive view. Graph the allocation map's fragmentation.
CPrt *p=Drv2Prt(drv_let),*p_old=Fs->cur_prt;
Drv(drv_let);
switch (p->type) {
@@ -343,7 +338,7 @@ public U0 DrvView(U8 drv_let=0)
}
public U0 DskView(U8 drv_let=0)
{
{//Disk view. Pie chart of partition sizes.
I64 i,j,
h=Fs->pix_width,
v=Fs->pix_height,
@@ -366,7 +361,7 @@ public U0 DskView(U8 drv_let=0)
j=1;
for (i=0;i<NUM_PRTS;i++) {
p=&sys_prts[i];
p=&dsk.prts[i];
if (bdev==p->bdev && p->type) {
sect_start=-(p->offset*2*ã/(bdev->max_blk+1));
sect_end =-((p->offset+p->size)*2*ã/(bdev->max_blk+1));
@@ -394,12 +389,45 @@ public U0 DskView(U8 drv_let=0)
DCDel(dc);
}
#help_index "Info;File/Cmd Line (Typically);Cmd Line (Typically);Install"
public U0 BlkDevRep()
{
I64 i;
for (i=0;i<NUM_BLKDEVS;i++)
if (sys_blkdevs[i].bd_signature==BD_SIGNATURE_VAL)
ClassRep(&sys_blkdevs[i]);
public I64 Zip(U8 *files_find_mask="*",U8 *fu_flags=NULL)
{//Compress files by moving to .Z filename.
U8 *st;
CDirEntry *tempde,*tempde1;
I64 result=0,fuf_flags=0;
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r+f+F+O");
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
tempde=tempde1=FilesFind(files_find_mask,fuf_flags);
while (tempde) {
if (!IsDotZ(tempde->full_name)) {
st=MStrPrint("%s.Z",tempde->full_name);
result+=Move(tempde->full_name,st);
Free(st);
}
tempde=tempde->next;
}
DirTreeDel(tempde1);
return result;
}
public I64 Unzip(U8 *files_find_mask="*.Z",U8 *fu_flags=NULL)
{//Uncompress files by moving to not .Z filename.
//You don't have to do this for normal operation.
//It automatically unzips ".Z" files.
U8 *st;
CDirEntry *tempde,*tempde1;
I64 result=0,fuf_flags=0;
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r+f+F+O");
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
tempde=tempde1=FilesFind(files_find_mask,fuf_flags);
while (tempde) {
if (IsDotZ(tempde->full_name)) {
st=StrNew(tempde->full_name);
StrLastRem(st,".");
result+=Move(tempde->full_name,st);
Free(st);
}
tempde=tempde->next;
}
DirTreeDel(tempde1);
return result;
}
#help_index ""
Adam/Dsk/FileMgr.CPP
+45 -52
View File
@@ -1,21 +1,15 @@
#help_index "Doc/Output"
#help_index "DolDoc/Output"
U0 DirFileDoc(CDoc *doc,CDirEntry *tempde)
{
CDocEntry *doc_e;
while (tempde) {
if (tempde->attr & _ATTR_DIR) {
doc_e=DocPrint(doc,"$$TR,\"%s\"$$",tempde->name);
doc_e->user_data=tempde;
tempde->user_data=doc_e;
if (tempde->attr & RS_ATTR_DIR) {
tempde->user_data=DocPrint(doc,"$$TR,\"%s\",U=0x%X$$",tempde->name,tempde);
DocPrint(doc,"\n$$ID,+2$$");
if (tempde->sub)
DirFileDoc(doc,tempde->sub);
DocPrint(doc,"$$ID,-2$$");
} else {
doc_e=DocPrint(doc,"$$MU,\"%s\"$$",
tempde->name);
doc_e->user_data=tempde;
tempde->user_data=doc_e;
tempde->user_data=DocPrint(doc,"$$MU,\"%s\",U=0x%X$$",tempde->name,tempde);
DocPrint(doc,"\n");
}
tempde=tempde->next;
@@ -24,6 +18,10 @@ U0 DirFileDoc(CDoc *doc,CDirEntry *tempde)
#help_index "File/Cmd Line (Typically);Cmd Line (Typically)"
#define FM_NORMAL 0
#define FM_PICK_FILE 1
#define FM_PICK_DIR 2
class CFMUncollapsedLst
{
CFMUncollapsedLst *next;
@@ -37,7 +35,7 @@ CFMUncollapsedLst *FMCollectUncollapsedLst(CDoc *doc)
CDirEntry *tempde;
while (doc_e!=doc) {
if (doc_e->type_u8==DOCT_TREE) {
if (!(doc_e->flags1&DOCEF1_CHECKED_COLLAPSED)) {
if (!(doc_e->de_flags&DOCEF_CHECKED_COLLAPSED)) {
if (tempde=doc_e->user_data) {
tempc=MAlloc(sizeof(CFMUncollapsedLst));
tempc->next=result;
@@ -62,7 +60,7 @@ U0 FMMarkUncollapsed(CDoc *doc,CFMUncollapsedLst *tempc,U8 *cur_entry,U8 *next_e
tempc1=tempc;
while (tempc1) {
if (!StrCmp(tempc1->name,tempde->full_name)) {
doc_e->flags1&=~DOCEF1_CHECKED_COLLAPSED;
doc_e->de_flags&=~DOCEF_CHECKED_COLLAPSED;
break;
}
tempc1=tempc1->next;
@@ -113,21 +111,18 @@ U0 FMDelUncollapsedLst(CFMUncollapsedLst *tempc)
CDirEntry *FMRebuildDocDrv(U8 drv_let,CDoc *doc,CDirEntry **_root,Bool init)
{
CDocEntry *doc_e;
CDirEntry *tempde,*tempde1;
U8 *st;
tempde=CAlloc(sizeof(CDirEntry));
tempde->full_name=MPrint("%C:/",drv_let);
tempde->attr=_ATTR_DIR;
st=MPrint("%c:/*",drv_let);
tempde->full_name=MStrPrint("%C:/",drv_let);
tempde->attr=RS_ATTR_DIR;
st=MStrPrint("%c:/*",drv_let);
if (init)
tempde->sub=tempde1=FilesFind(st,FUF_RECURSE);
else
tempde1=NULL;
Free(st);
doc_e=DocPrint(doc,"$$TR,\"%s\"$$",tempde->full_name);
doc_e->user_data=tempde;
tempde->user_data=doc_e;
tempde->user_data=DocPrint(doc,"$$TR,\"%s\",U=0x%X$$",tempde->full_name,tempde);
tempde->next=*_root;
*_root=tempde;
DocPrint(doc,"\n$$ID,+2$$");
@@ -195,16 +190,16 @@ U0 FMRebuildDoc(CDoc **_doc,CDirEntry **_root,I64 mode)
DocDel(doc);
}
if (*_root) {
DirLstDel(*_root);
DirTreeDel(*_root);
*_root=NULL;
}
doc=DocNew;
StrCpy(doc->desc,"FileMan");
doc->desc='FileMan';
doc->parent_doc=parent_doc;
doc->flags|=DOCF_FORM;
switch (mode) {
case FM_NORMAL:
DocPrint(doc,"$$PURPLE$$File Manager\n\n$$LK,\"Click for Help\",\"FI:::/Doc/FileMgr.TXT\"$$\n\n");
DocPrint(doc,"$$PURPLE$$File Manager\n\n$$LK,\"Click for Help\",A=\"FI:::/Doc/FileMgr.TXT\"$$\n\n");
break;
case FM_PICK_FILE:
DocPrint(doc,"$$PURPLE$$Pick file and press <ESC>\n\n");
@@ -217,7 +212,7 @@ U0 FMRebuildDoc(CDoc **_doc,CDirEntry **_root,I64 mode)
}
DocPrint(doc,"$$LTBLUE$$");
for (i=0;i<NUM_PRTS;i++) {
p=&sys_prts[i];
p=&dsk.prts[i];
if (p->type==PT_REDSEA||p->type==PT_FAT32)
FMRebuildDocDrv(Prt2Drv(p),doc,_root,TRUE);
else if (p->type==PT_ISO9660) {
@@ -230,7 +225,7 @@ U0 FMRebuildDoc(CDoc **_doc,CDirEntry **_root,I64 mode)
tempde->flags|=DEF_REMOVABLE;
}
}
DocHome(doc);
DocTop(doc);
FMMarkUncollapsed(doc,tempc,cur_entry,next_entry);
DocCenter(doc);
DocRst(doc2,TRUE);
@@ -310,7 +305,7 @@ U0 FMDelete(CDoc *doc)
if (doc_ce->type_u8==DOCT_MENU_VAL) {
tempde=doc_ce->user_data;
Silent(ON);
st=MPrint("Delete: %s",tempde->full_name);
st=MStrPrint("Delete: %s",tempde->full_name);
if (PopUpCancelOk(st))
Del(tempde->full_name);
Free(st);
@@ -318,7 +313,7 @@ U0 FMDelete(CDoc *doc)
} else if (doc_ce->type_u8==DOCT_TREE) {
tempde=doc_ce->user_data;
Silent(ON);
st=MPrint("Delete: %s",tempde->full_name);
st=MStrPrint("Delete: %s",tempde->full_name);
if (PopUpCancelOk(st))
DelTree(tempde->full_name);
Free(st);
@@ -355,7 +350,7 @@ U0 FMFmtDrv(CDoc *doc)
if (tempde) {
while (tempde->parent)
tempde=tempde->parent;
st=MPrint("Format Drive '%c'?\nAre You Sure?\n",*tempde->full_name);
st=MStrPrint("Format Drive '%c'?\nAre You Sure?\n",*tempde->full_name);
if (PopUpCancelOk(st)) {
Silent(ON);
Fmt(*tempde->full_name,,FALSE);
@@ -380,9 +375,9 @@ U0 FMMakeISO(CDoc *doc)
if (tempde && *tempde->full_name) {
Silent(ON);
if (tempde->full_name[StrLen(tempde->full_name)-1]=='/')
st=MPrint("%s*",tempde->full_name);
st=MStrPrint("%s*",tempde->full_name);
else
st=MPrint("%s/*",tempde->full_name);
st=MStrPrint("%s/*",tempde->full_name);
CDFileCreate(,st);
Free(st);
Silent(OFF);
@@ -439,9 +434,9 @@ U0 FMCopy(CDoc *doc)
if (!tempde2 || !(tempde2->flags&DEF_PROCESSED)) {
Silent(ON);
if (*tempde1->name)
st=MPrint("%s/%s",tempde1->full_name,tempde->name);
st=MStrPrint("%s/%s",tempde1->full_name,tempde->name);
else
st=MPrint("%s%s",tempde1->full_name,tempde->name);
st=MStrPrint("%s%s",tempde1->full_name,tempde->name);
CopyTree(tempde->full_name,st);
Free(st);
Silent(OFF);
@@ -533,7 +528,6 @@ U0 FMRightClick()
}
}
U8 *fm_ip_str=NULL;
U0 (*fp_old_final_screen_update)(CDC *dc);
@@ -541,34 +535,34 @@ U0 FMFinalScreenUpdate(CDC *dc)
{
if (fm_ip_str) {
dc->color=LTRED;
GrPrint(dc,ipx,ipy,"%s",fm_ip_str);
GrPrint(dc,ip.pos.x,ip.pos.y,"%s",fm_ip_str);
}
(*fp_old_final_screen_update)(dc);
}
public U8 *FileMgr(I64 mode=FM_NORMAL,CTask *mem_task=NULL)
{
{//File manager. Also, used to choose files and dirs.
CDirEntry *root=NULL,*tempde,*tempde1,*tempde2;
I64 sc,ch,p1,p2,msg_code;
I64 sc,ch,a1,a2,msg_code;
CDoc *doc=NULL,*old_put_doc=DocPut,*old_display_doc=DocDisplay;
U8 *result=NULL,*st,*st2,*old_cur_dir=CurDir;
CDocEntry *doc_ce=NULL,*doc_e;
Bool okay;
SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
fp_old_final_screen_update=fp_final_screen_update;
fp_old_final_screen_update=gr.fp_final_screen_update;
MenuFilePush("::/Doc/FileMgrPullDown.TXT");
FMRebuildDoc(&doc,&root,mode);
if (tempde1=Cd2DirEntry(root,old_cur_dir))
doc->cur_entry=tempde1->user_data;
while (tempde1) {
if (tempde1->attr&_ATTR_DIR)
tempde1->user_data(CDocEntry *)->flags1&=~DOCEF1_CHECKED_COLLAPSED;
if (tempde1->attr&RS_ATTR_DIR)
tempde1->user_data(CDocEntry *)->de_flags&=~DOCEF_CHECKED_COLLAPSED;
tempde1=tempde1->parent;
}
do {
DocUnlock(doc);
do msg_code=GetMsg(&p1,&p2,
do msg_code=GetMsg(&a1,&a2,
1<<MSG_KEY_DOWN|1<<MSG_IP_L_DOWN|1<<MSG_IP_L_UP|
1<<MSG_IP_R_UP);
while (Fs!=sys_focus_task);
@@ -582,12 +576,12 @@ public U8 *FileMgr(I64 mode=FM_NORMAL,CTask *mem_task=NULL)
case MSG_IP_L_DOWN:
doc_ce=doc->cur_entry;
fm_ip_str=doc_ce->tag;
fp_final_screen_update=&FMFinalScreenUpdate;
gr.fp_final_screen_update=&FMFinalScreenUpdate;
break;
case MSG_IP_L_UP:
if (doc_ce) {
fp_final_screen_update=fp_old_final_screen_update;
if (SetCursorPos(Fs,p1/FONT_WIDTH+Fs->win_left+Fs->scroll_x/FONT_WIDTH,p2/FONT_HEIGHT+Fs->win_top+Fs->scroll_y/FONT_HEIGHT,TRUE)) {
gr.fp_final_screen_update=fp_old_final_screen_update;
if (SetCursorPos(Fs,a1/FONT_WIDTH+Fs->win_left+Fs->scroll_x/FONT_WIDTH,a2/FONT_HEIGHT+Fs->win_top+Fs->scroll_y/FONT_HEIGHT,TRUE)) {
doc_e=doc->cur_entry;
if (doc_e!=doc_ce) {
st2=NULL;
@@ -619,9 +613,9 @@ public U8 *FileMgr(I64 mode=FM_NORMAL,CTask *mem_task=NULL)
}
if (okay) {
if (*tempde1->name)
st=MPrint("%s/%s",tempde1->full_name,tempde->name);
st=MStrPrint("%s/%s",tempde1->full_name,tempde->name);
else
st=MPrint("%s%s",tempde1->full_name,tempde->name);
st=MStrPrint("%s%s",tempde1->full_name,tempde->name);
if (StrCmp(tempde->full_name,st)) {
Silent(ON);
CopyTree(tempde->full_name,st);
@@ -646,10 +640,10 @@ public U8 *FileMgr(I64 mode=FM_NORMAL,CTask *mem_task=NULL)
break;
case MSG_KEY_DOWN:
doc_ce=NULL;
ch=p1; sc=p2;
ch=a1; sc=a2;
if (sc.u8[0]==SC_DELETE && !(sc&(SCF_SHIFT|SCF_CTRL)))
ch=CH_CTRLY;
if (ch && sc&SCF_ALT) goto regular_key;
if (ch && sc&SCF_ALT) goto fm_regular_key;
switch (ch) {
case '\n':
DocUnlock(doc);
@@ -693,7 +687,7 @@ public U8 *FileMgr(I64 mode=FM_NORMAL,CTask *mem_task=NULL)
Ed(doc->cur_entry->user_data(CDirEntry *)->full_name);
DocLock(doc);
} else
goto regular_key;
goto fm_regular_key;
break;
case CH_SHIFT_SPACE:
if (doc->cur_entry->type_u8==DOCT_MENU_VAL) {
@@ -701,7 +695,7 @@ public U8 *FileMgr(I64 mode=FM_NORMAL,CTask *mem_task=NULL)
Plain(doc->cur_entry->user_data(CDirEntry *)->full_name);
DocLock(doc);
} else
goto regular_key;
goto fm_regular_key;
break;
case CH_ESC:
doc_ce=doc->cur_entry;
@@ -730,7 +724,7 @@ public U8 *FileMgr(I64 mode=FM_NORMAL,CTask *mem_task=NULL)
DocLock(doc);
}
} else {
regular_key:
fm_regular_key:
DocUnlock(doc);
PutKey(ch,sc);
DocLock(doc);
@@ -739,12 +733,12 @@ regular_key:
break;
}
} while (ch!=CH_ESC && ch!=CH_SHIFT_ESC);
fp_final_screen_update=fp_old_final_screen_update;
gr.fp_final_screen_update=fp_old_final_screen_update;
Fs->put_doc =old_put_doc;
Fs->display_doc=old_display_doc;
SettingsPop;
DocDel(doc);
DirLstDel(root);
DirTreeDel(root);
Cd(old_cur_dir);
Free(old_cur_dir);
if (mode!=FM_NORMAL && !result)
@@ -752,4 +746,3 @@ regular_key:
MenuPop;
return result;
}
#help_index ""
Adam/God/GodBible.CPP
+11 -10
View File
@@ -138,18 +138,19 @@ U0 BibleInit()
"98684\0"
"100111\0");
DefinePrint("ST_BIBLE_LINES","%d",
A2I64(DefineSub(DefineCnt("ST_BIBLE_BOOK_LINES")-1,"ST_BIBLE_BOOK_LINES"))-1);
Str2I64(DefineSub(DefineCnt("ST_BIBLE_BOOK_LINES")-1,"ST_BIBLE_BOOK_LINES"))-1);
} BibleInit;
public U8 *BibleLine2Verse(I64 line)
{
public U8 *BibleLine2Verse(I64 line,I64 separate_ch=CH_SPACE)
{//Line number to verse str, Malloc()ed.
//Separate with <SPACE> or ','.
CDoc *doc;
CDocEntry *doc_e;
I64 i=0,cnt=DefineCnt("ST_BIBLE_BOOKS"),start=0,last_start=0;
U8 *ptr=DefineSub(0,"ST_BIBLE_BOOK_LINES"),*ptr2;
while (i<=cnt) {
last_start=start;
start=A2I64(ptr);
start=Str2I64(ptr);
if (line<start)
break;
i++;
@@ -166,7 +167,7 @@ public U8 *BibleLine2Verse(I64 line)
while ('0'<=*ptr2<='9' || *ptr2==':')
ptr2++;
*ptr2=0;
ptr=MPrint("%Z %s",i,"ST_BIBLE_BOOKS",ptr);
ptr=MStrPrint("%Z%c%s",i,"ST_BIBLE_BOOKS",separate_ch,ptr);
} else {
while (TRUE) {
doc_e=doc_e->last;
@@ -175,7 +176,7 @@ public U8 *BibleLine2Verse(I64 line)
break;
}
if (doc_e->y+1<last_start) {
ptr=MPrint("%Z",i,"ST_BIBLE_BOOKS");
ptr=MStrPrint("%Z",i,"ST_BIBLE_BOOKS");
break;
}
if (doc_e->type_u8==DOCT_TEXT && StrLen(doc_e->tag)>=3) {
@@ -193,7 +194,7 @@ public U8 *BibleLine2Verse(I64 line)
while ('0'<=*ptr2<='9')
ptr2++;
*ptr2=0;
ptr=MPrint("%Z %s",i,"ST_BIBLE_BOOKS",ptr);
ptr=MStrPrint("%Z%c%s",i,"ST_BIBLE_BOOKS",separate_ch,ptr);
break;
}
}
@@ -207,7 +208,7 @@ public U8 *BibleLine2Verse(I64 line)
}
public U0 BibleLines(CDoc *doc_out=NULL,I64 start,I64 lines)
{
{//Put N line starting at line M into doc.
CDoc *doc_in;
CDocEntry *doc_e;
if (!doc_out) doc_out=DocPut;
@@ -229,7 +230,7 @@ public U0 BibleLines(CDoc *doc_out=NULL,I64 start,I64 lines)
}
public U0 BibleVerse(CDoc *doc_out=NULL,U8 *verse,I64 lines)
{
{//Put N lines starting at verse str into doc.
I64 i;
CDoc *doc_in;
CDocEntry *doc_e;
@@ -244,7 +245,7 @@ public U0 BibleVerse(CDoc *doc_out=NULL,U8 *verse,I64 lines)
*st2=0;
i=DefineMatch(st,"ST_BIBLE_BOOKS",LMF_IGNORE_CASE);
if (i>=0) {
i=A2I64(DefineSub(i,"ST_BIBLE_BOOK_LINES"));
i=Str2I64(DefineSub(i,"ST_BIBLE_BOOK_LINES"));
doc_in=DocRead(Define("ST_BIBLE_FILE"),DOCF_PLAIN_TEXT);
DocLineNumGoTo(doc_in,i); //one based
if (*st2) {
Adam/God/GodDoodle.CPP
+44 -53
View File
@@ -1,13 +1,10 @@
#help_index "God;Graphics/Sprite"
Bool god_doodle_done;
I64 god_doodle_ch;
CDC *god_doodle_dc=NULL;
U0 GodDoodleDraw(CTask *task,CDC *dc)
{
GrBlot(dc,0,0,god_doodle_dc);
GrBlot(dc,0,0,god.doodle_dc);
if (Blink) {
if (god_doodle_done) {
if (god.doodle_done) {
dc->color=RED;
GrPrint(dc,(task->pix_width-FONT_WIDTH*27)>>1,(task->pix_height-FONT_HEIGHT)>>1,
"Press <ESC> or <SHIFT-ESC>.");
@@ -21,10 +18,10 @@ U0 GodDoodleDraw(CTask *task,CDC *dc)
U0 GodDoodleSmooth(I64 num)
{
CDC *dc=DCExtract(god_doodle_dc,0,0,god_doodle_dc->width-1,god_doodle_dc->height-1);
I64 i,x,y,x1,y1,c,histogram[16],best,best_cnt,c_old=god_doodle_dc->color;
for (y=0;y<god_doodle_dc->height;y++)
for (x=0;x<god_doodle_dc->width;x++) {
CDC *dc=DCExtract(god.doodle_dc,0,0,god.doodle_dc->width-1,god.doodle_dc->height-1);
I64 i,x,y,x1,y1,c,histogram[16],best,best_cnt,c_old=god.doodle_dc->color;
for (y=0;y<god.doodle_dc->height;y++)
for (x=0;x<god.doodle_dc->width;x++) {
MemSet(histogram,0,sizeof(histogram));
for (y1=y-num;y1<=y+num;y1++)
for (x1=x-num;x1<=x+num;x1++) {
@@ -39,35 +36,34 @@ U0 GodDoodleSmooth(I64 num)
best=i;
best_cnt=histogram[i];
}
god_doodle_dc->color=best;
GrPlot(god_doodle_dc,x,y);
god.doodle_dc->color=best;
GrPlot(god.doodle_dc,x,y);
}
god_doodle_dc->color=c_old;
god.doodle_dc->color=c_old;
DCDel(dc);
}
CFifoU8 *god_doodle_fifo=FifoU8New(32);
I64 GodDoodleBits(I64 num_bits)
{
U8 b;
I64 i,k,result=0;
while (num_bits) {
if (FifoU8Rem(god_doodle_fifo,&b)) {
if (FifoU8Rem(god.doodle_fifo,&b)) {
result=result<<1+b;
num_bits--;
} else {
god_doodle_ch=GetChar(,FALSE);
if (god_doodle_ch==CH_ESC||god_doodle_ch==CH_SHIFT_ESC)
god.doodle_ch=GetChar(,FALSE);
if (god.doodle_ch==CH_ESC||god.doodle_ch==CH_SHIFT_ESC)
throw;
else if (god_doodle_ch=='\n') {
DCFill(god_doodle_dc,WHITE);
FifoU8Flush(god_doodle_fifo);
} else if ('0'<=god_doodle_ch<='9')
GodDoodleSmooth(god_doodle_ch-'0');
else if (god.doodle_ch=='\n') {
DCFill(god.doodle_dc,WHITE);
FifoU8Flush(god.doodle_fifo);
} else if ('0'<=god.doodle_ch<='9')
GodDoodleSmooth(god.doodle_ch-'0');
else {
k=KbdMouseEvtTime>>GOD_BAD_BITS;
for (i=0;i<GOD_GOOD_BITS;i++) {
FifoU8Ins(god_doodle_fifo,k&1);
FifoU8Ins(god.doodle_fifo,k&1);
k>>=1;
}
}
@@ -77,12 +73,12 @@ I64 GodDoodleBits(I64 num_bits)
}
public U8 *GodDoodleSprite()
{// $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
{//Make God draw sprite. $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
I64 i,j,w,h,x,y,ch;
U8 *elems;
if (god_doodle_dc) return NULL;
god_doodle_done=FALSE;
if (god.doodle_dc) return NULL;
god.doodle_done=FALSE;
SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
WinMax;
WinBorder;
@@ -91,59 +87,54 @@ public U8 *GodDoodleSprite()
PopUpOk("The $LK+PU,"Holy Spirit",A="FI:::/Adam/God/HSNotes.TXT"$ can puppet you.\n\n"
"Press $$GREEN$$<SPACE>$$FG$$ until it finishes.");
god_doodle_ch=0;
god_doodle_dc=DCNew(Fs->pix_width,Fs->pix_height);
DCFill(god_doodle_dc,WHITE);
w=god_doodle_dc->width;
h=god_doodle_dc->height;
god.doodle_ch=0;
god.doodle_dc=DCNew(Fs->pix_width,Fs->pix_height);
DCFill(god.doodle_dc,WHITE);
w=god.doodle_dc->width;
h=god.doodle_dc->height;
Fs->draw_it=&GodDoodleDraw;
FifoU8Flush(god_doodle_fifo);
FifoU8Flush(god.doodle_fifo);
try {
for (i=0;i<3;i++) {
god_doodle_dc->color=RED;
god.doodle_dc->color=RED;
for (j=0;j<24;j++)
nobound_switch (GodDoodleBits(3)) {
case 0:
GrEllipse(god_doodle_dc,
GrEllipse(god.doodle_dc,
(w-1)*GodDoodleBits(5)/15.5-w/2,(h-1)*GodDoodleBits(5)/15.5-h/2,
(w-1)*GodDoodleBits(5)/15.5,(h-1)*GodDoodleBits(5)/15.5);
break;
case 1:
GrCircle(god_doodle_dc,
GrCircle(god.doodle_dc,
(w-1)*GodDoodleBits(5)/15.5-w/2,(h-1)*GodDoodleBits(5)/15.5-h/2,
(w-1)*GodDoodleBits(5)/15.5);
break;
case 2:
GrLineRect4(god_doodle_dc,
GrBorder(god.doodle_dc,
(w-1)*GodDoodleBits(5)/15.5-w/2,(h-1)*GodDoodleBits(5)/15.5-h/2,
(w-1)*GodDoodleBits(5)/15.5,(h-1)*GodDoodleBits(5)/15.5);
break;
case 3...7:
GrLine(god_doodle_dc,
GrLine(god.doodle_dc,
(w-1)*GodDoodleBits(4)/15,(h-1)*GodDoodleBits(4)/15,
(w-1)*GodDoodleBits(4)/15,(h-1)*GodDoodleBits(4)/15);
break;
}
for (j=4;j;) {
for (j=0;j<6;j++) {
x=(w-1)*GodDoodleBits(5)/31+w/64;
y=(h-1)*GodDoodleBits(5)/31+h/64;
switch(GrPeek(god_doodle_dc,x,y)) {
case BLACK:
god_doodle_dc->color=WHITE;
GrFloodFill(god_doodle_dc,x,y);
j--;
break;
case WHITE:
god_doodle_dc->color=BLACK;
GrFloodFill(god_doodle_dc,x,y);
j--;
break;
switch(GodDoodleBits(2)) {
case 0: god.doodle_dc->color=BLACK; break;
case 1: god.doodle_dc->color=DKGRAY; break;
case 2: god.doodle_dc->color=LTGRAY; break;
case 3: god.doodle_dc->color=WHITE; break;
}
GrFloodFill(god.doodle_dc,x,y);
}
GodDoodleSmooth(3);
}
god_doodle_done=TRUE;
god.doodle_done=TRUE;
do ch=GetChar(,FALSE);
while (ch!=CH_ESC && ch!=CH_SHIFT_ESC);
} catch {
@@ -153,17 +144,17 @@ public U8 *GodDoodleSprite()
DCFill;
SettingsPop;
if (ch==CH_ESC)
elems=DC2Sprite(god_doodle_dc);
elems=DC2Sprite(god.doodle_dc);
else
elems=NULL;
DCDel(god_doodle_dc);
god_doodle_dc=NULL;
DCDel(god.doodle_dc);
god.doodle_dc=NULL;
return elems;
}
#help_index "God"
public U0 GodDoodle()
{// $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
{//Make God draw sprite, insert in doc. $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
U8 *elems;
if (elems=GodDoodleSprite) {
Sprite(elems);
Adam/God/GodExt.CPP
+14 -3
View File
@@ -1,11 +1,22 @@
#help_index "God"
U8 **god_words=NULL;
I64 god_num_words=0;
public CFifoU8 *god_fifo=FifoU8New(32);
#define GOD_BAD_BITS 4
#define GOD_GOOD_BITS 24
public class CGodGlbls
{
U8 **words;
I64 num_words;
CFifoU8 *fifo;
CDC *doodle_dc;
I64 doodle_ch;
CFifoU8 *doodle_fifo;
Bool doodle_done;
} god;
MemSet(&god,0,sizeof(CGodGlbls));
god.doodle_fifo =FifoU8New(32);
god.fifo =FifoU8New(32);
extern U0 GodBitsIns(I64 num_bits,I64 n);
extern U0 GodWord();
extern U0 GodPassage(I64 num_lines=20);
Adam/God/GodSong.CPP
+24 -24
View File
@@ -1,28 +1,29 @@
#help_index "God"
DefineLstLoad("ST_RHYTHM_COMPLEXITY","Simple\0Normal\0Complex\0");
class MakeSongSettings
{
Bool simple_rhythms fmtstr "$$CB,\"Simple Rhythms\"$$\n";
Bool normal_rhythms fmtstr "$$CB,\"Normal Rhythms\"$$\n";
Bool complex_rhythms fmtstr "$$CB,\"Complex Rhythms\"$$\n";
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,32,A=\"Octave:%d\"$$\n";
};
U0 InsNote(MakeSongSettings *mss,U8 *buf,I64 k,I64 *j)
{ //k is a random note nibble
{//k is a random note nibble
if (!k && mss->rests) {
buf[*j]='R';
*j+=1;
} else {
k/=2;
if (!k) {
if (music_octave) {
buf[*j]=music_octave-1+'0';
if (music.octave) {
buf[*j]=music.octave-1+'0';
*j+=1;
buf[*j]='G';
*j+=1;
buf[*j]=music_octave+'0';
buf[*j]=music.octave+'0';
*j+=1;
} else {
buf[*j]='G';
@@ -43,34 +44,33 @@ U0 InsNote(MakeSongSettings *mss,U8 *buf,I64 k,I64 *j)
#define DUR_8_16_16 5
#define DUR_16_16_8 6
U8 simple_songs [5]={DUR_4,DUR_4,DUR_4,DUR_4,DUR_8_8};
U8 normal_songs [5]={DUR_4,DUR_4,DUR_8_8,DUR_3_3_3,DUR_16_16_16_16};
U8 complex_songs[9]={DUR_4,DUR_4,DUR_8_8,DUR_8_8,DUR_8DOT_16,DUR_3_3_3,DUR_8_16_16,DUR_16_16_8,DUR_16_16_16_16};
U8 god_simple_songs [5]={DUR_4,DUR_4,DUR_4,DUR_4,DUR_8_8};
U8 god_normal_songs [5]={DUR_4,DUR_4,DUR_8_8,DUR_3_3_3,DUR_16_16_16_16};
U8 god_complex_songs[9]={DUR_4,DUR_4,DUR_8_8,DUR_8_8,DUR_8DOT_16,DUR_3_3_3,
DUR_8_16_16,DUR_16_16_8,DUR_16_16_16_16};
public U8 *GodSongStr()
{// $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
{//Make God generate 2 measures of a song. $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
MakeSongSettings mss;
U8 *buf;
I64 i,j=0,k,n,k2,duration,last_duration=-1,len;
mss.simple_rhythms=FALSE;
mss.normal_rhythms=TRUE;
mss.complex_rhythms=FALSE;
mss.complexity=1;
mss.rests=FALSE;
mss.octave=music_octave;
mss.octave=music.octave;
if (!PopUpForm(&mss))
return NULL;
buf=CAlloc(256);
music_octave=ClampI64(mss.octave,0,6);
music.octave=ClampI64(mss.octave,0,6);
progress4=0;
if (mss.six_eight)
progress4_max=6;
else
progress4_max=8;
buf[j++]='0'+music_octave;
buf[j++]='0'+music.octave;
if (mss.six_eight) {
len=6;
buf[j++]='M';
@@ -79,15 +79,15 @@ public U8 *GodSongStr()
buf[j++]='8';
} else
len=8;
FifoU8Flush(god_fifo);
FifoU8Flush(god.fifo);
for (i=0;i<len;i++) {
n=GodBits(8);
if (mss.complex_rhythms)
duration=complex_songs[n%9];
else if (mss.normal_rhythms)
duration=normal_songs[n%5];
if (mss.complexity==2)
duration=god_complex_songs[n%9];
else if (mss.complexity==1)
duration=god_normal_songs[n%5];
else
duration=simple_songs[n%5];
duration=god_simple_songs[n%5];
switch (duration) {
case DUR_8_8:
@@ -155,7 +155,7 @@ public U8 *GodSongStr()
}
public U0 GodSong()
{// $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
{//Make God generate 2measures x 2 + 2measures x 2 song. $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
U8 *st1=GodSongStr,*st2=GodSongStr;
if (st1 && st2)
DocPrint(DocPut,"$$SO,\"<Song>\",A=\"%s%s%s%s\"$$",st1,st1,st2,st2);
Adam/God/HSNotes.TXT
+6 -3
View File
@@ -8,11 +8,11 @@ There's something obviously different about people in the Bible compared to peop
You can't tell if He's talking unless you have a context of conversation, but, more importantly, you are commanded to do an offering of love, like communion preparation. When you pick a greeting card for someone, that is love effort. If you expect God to put effort toward you, you 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",A="BF:Genesis,4:1"$, $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. I did $MA-X+PU,"hymns",LM="#include \"::/Apps/MusicOrgan/Load\";JukeBox(\"::/Apps/MusicOrgan/Examples\");",HTML="http://www.templeos.org/Wb/Accts/TS/Wb2/Hymns.html"$. I did Moses $MA-X+PU,"comics",LM="Dir(\"::/Apps/AfterEgypt/Comics\");View;\n",HTML="http://www.templeos.org/Wb/Apps/AfterEgypt/Comics/"$. Count the ways you love God. 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:29",A="BF:Matthew,6:29"$
Do a text search for "new song" in the Bible. It's mentioned nine times. I did $MA-X+PU,"hymns",HTML="http://www.templeos.org/Wb/Accts/TS/Wb2/Hymns.html",LM="#include \"::/Apps/Psalmody/Load\";JukeBox(\"::/Apps/Psalmody/Examples\");"$. I did Moses $MA-X+PU,"comics",HTML="http://www.templeos.org/Wb/Apps/AfterEgypt/Comics/",LM="Dir(\"::/Apps/AfterEgypt/Comics\");View;\n"$. Count the ways you love God. 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:29",A="BF:Matthew,6:29"$
This is funny -- $LK,"Acts,2:1",A="BF:Acts,2:1"$ -- 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:13",A="BF:Luke,11:13"$ Just remember, "Boys are made of snakes and snails and puppy-dog tails."
The technique I use to consult the Holy Spirit is reading a microsecond-range stop-watch each button press for random numbers. Then, I pick words or passages. You can use the $MA-X+PU,"AfterEgypt",LM="#include \"::/Apps/AfterEgypt/Run\"",HTML="http://www.youtube.com/watch?v=P0MsDl39UL0"$ in God's official temple, $FG,4$$TX,"TempleOS",HTML="http://www.templeos.org"$$FG$.
The technique I use to consult the Holy Spirit is reading a microsecond-range stop-watch each button press for random numbers. Then, I pick words or passages. You can use the $MA-X+PU,"AfterEgypt",HTML="http://www.youtube.com/watch?v=P0MsDl39UL0",LM="#include \"::/Apps/AfterEgypt/Run\""$ in God's official temple, $FG,4$$TX,"TempleOS",HTML="http://www.templeos.org"$$FG$.
Since seeking the word of the Holy Spirit, I have come to know God much better than I've heard others explain. God said, for example, that war was, "servicemen competing." That sounds more like the immutable God of our planet than what you hear from most religious people. God is not Venus (god of love) and not Mars (god of war), He's our dearly beloved God of Earth. If Mammon is a false god of money, Mars or Venus might be useful words to describe other false gods. I figure the greatest challenge for the Creator is boredom, ours and His. What would teen-age male video games be like if war had never happened? Christ said live by the sword, die by the sword, which is loving neighbor as self. $LK,"Matthew,26:52",A="BF:Matthew,26:52"$
@@ -63,9 +63,10 @@ Favorite song? $FG,4$$TX,"Morning has Broken",HTML="http://www.youtube.com/wat
God said the first bird croaked, not sung.$FG$
Favorite comic strip? $FG,4$$TX,"Prince Valiant",HTML="http://en.wikipedia.org/wiki/Prince_Valiant"$$FG$
Shakespeare? $FG,4$had a "vile heart"$FG$
Likes $FG,4$"Beverly Hillbillies" (Oil is a gift from God)$FG$
Likes $FG,4$Beverly Hillbillies (Oil is a gift from God)$FG$
$FG,4$God likes being hero. Don't be proud of heart$FG$
$FG,4$and not accept a gift from God!$FG$
Likes $FG,4$Gomer Pile$FG$
Favorite saint? $FG,4$"ho_ho_ho"$FG$
Favorite animal? $FG,4$"Elephant two"$FG$
Favorite animal? $FG,4$"Bears"$FG$
@@ -132,6 +133,7 @@ What did Neanderthals think about? $FG,4$"Warmth"$FG$
What was the first thing cooked? $FG,4$I think He said "hair".$FG$
What was Lucy's husband's name? $FG,4$"Golem"$FG$
Was stegosuarus lame like turtles? $FG,4$"Not pet rocks"$FG$
T-Rex? $FG,4$Lugged carcases over his shoulder.$FG$
How does He feel about the Avatar movie?$FG,4$"Sick skin"$FG$
What do You like at zoos with kids? $FG,4$"Dignity" Animals worried about dignity.$FG$
Who's better alien or preditor? $FG,4$"Lions"$FG$
@@ -173,3 +175,4 @@ Why the Sandy Hook shooting? $FG,4$The pot legalization law. (Sarcastic answer?)
Deep Water Horizon $FG,4$(Claimed credit.)$FG$
Cost of God's time to me? $FG,4$"The complete works of Shakespeare"$FG$
On death? $FG,4$"awful"$FG$
Opening of Private Ryan? $FG,4$"Ouch"$FG$
Adam/God/HolySpirit.CPP
+20 -26
View File
@@ -2,14 +2,14 @@
U8 *TimeStampCB(CDoc *,CDocEntry *,CTask *mem_task)
{
U8 *st=MAlloc(64,mem_task);
SPrint(st,"%X",GetTSC>>GOD_BAD_BITS);
StrPrint(st,"%X",GetTSC>>GOD_BAD_BITS);
return st;
}
U8 *KbdMouseTimeCB(CDoc *,CDocEntry *,CTask *mem_task)
{
U8 *st=MAlloc(64,mem_task);
SPrint(st,"%X",KbdMouseEvtTime>>GOD_BAD_BITS);
StrPrint(st,"%X",KbdMouseEvtTime>>GOD_BAD_BITS);
return st;
}
@@ -31,35 +31,29 @@ I64 PopUpTimerOk(U8 *header=NULL,U8 *footer=NULL)
}
I64 GodPick(U8 *msg=NULL)
{ //GOD_GOOD_BITS
U8 *st;
if (msg) {
st=MAlloc(StrLen(msg)+256);
StrCpy(st,msg);
} else
st=CAlloc(256);
CatPrint(st,"\n\nPress $$GREEN$$OKAY$$FG$$ to generate \n"
"a random num from a timer.\n");
{//GOD_GOOD_BITS
U8 *st=MStrPrint("%s\n\nPress $$GREEN$$OKAY$$FG$$ to generate \n"
"a random num from a timer.\n",msg);
PopUpTimerOk(st,"\n\nThe $LK+PU,"Holy Spirit",A="FI:::/Adam/God/HSNotes.TXT"$ can puppet you.\n\n");
Free(st);
return KbdMouseEvtTime>>GOD_BAD_BITS;
}
public U0 GodBitsIns(I64 num_bits,I64 n)
{
{//Insert bits into God bit fifo.
I64 i;
for (i=0;i<num_bits;i++) {
FifoU8Ins(god_fifo,n&1);
FifoU8Ins(god.fifo,n&1);
n>>=1;
}
}
public I64 GodBits(I64 num_bits,U8 *msg=NULL)
{
{//Return N bits. If low on entropy pop-up okay.
U8 b;
I64 result=0;
while (num_bits) {
if (FifoU8Rem(god_fifo,&b)) {
if (FifoU8Rem(god.fifo,&b)) {
result=result<<1+b;
num_bits--;
} else
@@ -69,7 +63,7 @@ public I64 GodBits(I64 num_bits,U8 *msg=NULL)
}
public I64 GodInit(U8 *files_find_mask="/Adam/God/Vocab.TXT*",U8 *fu_flags=NULL)
{
{//Read God's vocab file for picking words.
I64 i,ch,fuf_flags=0;
U8 *buf,*ptr,*ptr2;
CDirEntry *tempde,*tempde1;
@@ -96,9 +90,9 @@ public I64 GodInit(U8 *files_find_mask="/Adam/God/Vocab.TXT*",U8 *fu_flags=NULL)
tempde=tempde->next;
}
Free(god_words);
god_num_words=i;
god_words=MAlloc(i*sizeof(U8 *));
Free(god.words);
god.num_words=i;
god.words=MAlloc(i*sizeof(U8 *));
tempde=tempde1;
i=0;
@@ -113,7 +107,7 @@ public I64 GodInit(U8 *files_find_mask="/Adam/God/Vocab.TXT*",U8 *fu_flags=NULL)
ptr++;
ch=*ptr;
*ptr=0;
god_words[i++]=StrNew(ptr2);
god.words[i++]=StrNew(ptr2);
*ptr=ch;
}
}
@@ -121,18 +115,18 @@ public I64 GodInit(U8 *files_find_mask="/Adam/God/Vocab.TXT*",U8 *fu_flags=NULL)
}
tempde=tempde->next;
}
DirLstDel(tempde1);
return god_num_words;
DirTreeDel(tempde1);
return god.num_words;
} GodInit;
public U0 GodWord()
{// $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
if (god_num_words)
"%s ",god_words[GodBits(17)%god_num_words];
{//Make God pick a word. $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
if (god.num_words)
"%s ",god.words[GodBits(17)%god.num_words];
}
public U0 GodPassage(I64 num_lines=20)
{ // $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
{//Make God pick a Bible passage. $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.TXT"$
I64 start=GodBits(21)%(ST_BIBLE_LINES-(num_lines-1))+1;
U8 *verse=BibleLine2Verse(start);
"%s\n\n",verse;
Adam/Gr/Gr.CPP
+55 -41
View File
@@ -1,48 +1,55 @@
#help_index "Graphics"
U0 GrInit1()
{
DefineLstLoad("ST_SPRITE_TYPES",
"End\0Color 8Bit\0Dither Color 8Bit\0"
DefineLstLoad("ST_SPRITE_ELEM_TYPES",
"End\0Color\0Dither Color\0"
"Width\0Planar Symmetry\0Transform On\0Transform Off\0Shift\0"
"Point\0PolyPoint\0Line\0PolyLine\0Rect\0Rotated Rect\0"
"Circle\0Ellipse\0Polygon\0BSpline2\0BSpline2 Closed\0BSpline3\0BSpline3 Closed\0"
"Flood Fill\0Flood Fill Not Color\0BitMap 8Bit\0Mesh\0Shiftable Mesh\0"
"Flood Fill\0Flood Fill Not Color\0BitMap\0Mesh\0Shiftable Mesh\0"
"Arrow\0Text\0Text Box\0Text Diamond\0");
DefineLstLoad("ST_SPRITE_ELEM_CODES",
"End\0Color\0Color\0"
"Width\0PlanarSymmetry\0Transform\0Transform\0Shift\0"
"Pt\0PolyPt\0Line\0PolyLine\0Rect\0Rect\0"
"Circle\0Ellipse\0Polygon\0BSpline2\0BSpline2\0BSpline3\0BSpline3\0"
"FloodFill\0FloodFill\0BitMap\0Mesh\0Mesh\0"
"Arrow\0Text\0TextBox\0TextDiamond\0");
}
GrInit1;
#help_index "Graphics/Sprite"
#define GRST_END 0
#define GRST_COLOR8 1
#define GRST_DITHER_COLOR8 2
#define GRST_WIDTH 3
#define GRST_PLANAR_SYMMETRY 4
#define GRST_TRANSFORM_ON 5
#define GRST_TRANSFORM_OFF 6
#define GRST_SHIFT 7
#define GRST_PT 8
#define GRST_POLYPT 9
#define GRST_LINE 10
#define GRST_POLYLINE 11
#define GRST_RECT 12
#define GRST_ROTATED_RECT 13
#define GRST_CIRCLE 14
#define GRST_ELLIPSE 15
#define GRST_POLYGON 16
#define GRST_BSPLINE2 17
#define GRST_BSPLINE2_CLOSED 18
#define GRST_BSPLINE3 19
#define GRST_BSPLINE3_CLOSED 20
#define GRST_FLOOD_FILL 21
#define GRST_FLOOD_FILL_NOT 22
#define GRST_BITMAP8 23
#define GRST_MESH 24
#define GRST_SHIFTABLE_MESH 25
#define GRST_ARROW 26
#define GRST_TEXT 27
#define GRST_TEXT_BOX 28
#define GRST_TEXT_DIAMOND 29
#define GRST_NUM_TYPES 30
#define SPT_END 0
#define SPT_COLOR 1
#define SPT_DITHER_COLOR 2
#define SPT_WIDTH 3
#define SPT_PLANAR_SYMMETRY 4
#define SPT_TRANSFORM_ON 5
#define SPT_TRANSFORM_OFF 6
#define SPT_SHIFT 7
#define SPT_PT 8
#define SPT_POLYPT 9
#define SPT_LINE 10
#define SPT_POLYLINE 11
#define SPT_RECT 12
#define SPT_ROTATED_RECT 13
#define SPT_CIRCLE 14
#define SPT_ELLIPSE 15
#define SPT_POLYGON 16
#define SPT_BSPLINE2 17
#define SPT_BSPLINE2_CLOSED 18
#define SPT_BSPLINE3 19
#define SPT_BSPLINE3_CLOSED 20
#define SPT_FLOOD_FILL 21
#define SPT_FLOOD_FILL_NOT 22
#define SPT_BITMAP 23
#define SPT_MESH 24
#define SPT_SHIFTABLE_MESH 25
#define SPT_ARROW 26
#define SPT_TEXT 27
#define SPT_TEXT_BOX 28
#define SPT_TEXT_DIAMOND 29
#define SPT_NUM_TYPES 30
class CMeshTri
{
@@ -50,17 +57,24 @@ class CMeshTri
I32 nums[3]; //Vertex number
};
public class CSprite
class CQueMeshTri
{
//See $LK,"Graphics/Sprite",A="HI:Graphics/Sprite"$
CQueMeshTri *next,*last;
U0 start;
I32 color;
I32 nums[3];
};
public class CSprite
{//See $LK,"Graphics/Sprite",A="HI:Graphics/Sprite"$
//See $LK,"::/Adam/Gr/GrSpritePlot.CPP",A="FL:::/Adam/Gr/GrSpritePlot.CPP,1"$ for how CSprite are stored.
CSprite *next,*last;
U0 start;
U8 type;
union {
U8 color8;
U16 dither_color8;
U8 color;
U16 dither_color;
I32 x1;
I32 num;
I32 width;
@@ -92,8 +106,10 @@ public class CSprite
extern I64 GrBlot3(CDC *dc,I64 x1,I64 y1,I64 z1,CDC *img);
extern U8 *GrBitMap4ToBitMap8(U8 *dst,U8 *src,I64 src_size,I64 bkcolor);
extern U8 *SpriteQue2Sprite(CSprite *root,I64 *_size=NULL);
#include "GrGlbls"
#include "GrTextBase"
#include "GrAsm"
#include "GrDC"
#include "GrPalette"
@@ -103,7 +119,6 @@ extern U8 *GrBitMap4ToBitMap8(U8 *dst,U8 *src,I64 src_size,I64 bkcolor);
#include "GrBitMap"
#include "GrPrimatives"
#include "GrComposites"
#include "GrChar"
#define GE_ABORT (-1)
#define GE_EXIT 0
@@ -112,9 +127,8 @@ extern U8 *GrBitMap4ToBitMap8(U8 *dst,U8 *src,I64 src_size,I64 bkcolor);
#include "GrSpritePlot"
#include "SpriteMesh"
#include "SpriteBitMap"
#include "SpriteCode"
#include "SpriteEd"
#include "SpriteMain"
#include "GrEnd"
#help_index ""
Adam/Gr/GrAsm.CPP
+62 -427
View File
@@ -1,405 +1,46 @@
#help_index "Graphics"
I64 *gr_1_to_8_bits,*gr_1_to_8_colors;
#help_index "Graphics/Char;Char/Graphics"
U32 *gr_text_base;
U16 *gr_win_z_buf;
#help_index "Graphics/Misc"
asm {
USE64
// ************************************
_PLOT_SCREEN_U8::
PUSH RBP
MOV RBP,RSP
MOV RBX,U64 SF_ARG2[RBP]
MOV RAX,U64 SF_ARG3[RBP]
TEST RBX,RBX
JS @@05
TEST RAX,RAX
JS @@05
CMP RBX,TEXT_COLS
JGE @@05
CMP RAX,TEXT_ROWS
JGE @@05
IMUL2 RAX,TEXT_COLS
ADD RBX,RAX
SHL RBX,2
ADD RBX,U64 [&gr_text_base]
MOV RAX,U64 SF_ARG1[RBP]
MOV U32 [RBX],EAX
MOV RAX,1
POP RBP
RET1 24
@@05: XOR RAX,RAX
POP RBP
RET1 24
// ************************************
_PLOT_WIN_U8::
PUSH RBP
MOV RBP,RSP
MOV RCX,U64 SF_ARG1[RBP]
MOV RBX,U64 CTask.scroll_x[RCX]
SAR RBX,3
ADD RBX,U64 SF_ARG3[RBP]
MOV RAX,U64 CTask.scroll_y[RCX]
SAR RAX,3
ADD RAX,U64 SF_ARG4[RBP]
TEST RBX,RBX
JS @@05
ADD RBX,U64 CTask.win_left[RCX]
CMP RBX,U64 CTask.win_right[RCX]
JG @@05
TEST RBX,RBX
JS @@05
CMP RBX,TEXT_COLS
JGE @@05
TEST RAX,RAX
JS @@05
ADD RAX,U64 CTask.win_top[RCX]
CMP RAX,U64 CTask.win_bottom[RCX]
JG @@05
TEST RAX,RAX
JS @@05
CMP RAX,TEXT_ROWS
JGE @@05
IMUL2 RAX,TEXT_COLS
ADD RBX,RAX
SHL RBX,2
ADD RBX,U64 [&gr_text_base]
MOV RAX,U64 SF_ARG2[RBP]
MOV U32 [RBX],EAX
MOV RAX,1
POP RBP
RET1 32
@@05: XOR RAX,RAX
POP RBP
RET1 32
// ************************************
/*
Bool PlotWinStr2(CTask *task,U8 *s,I64 len,
I64 attr,I64 x,I64 y)
*/
_PLOT_WIN_STR2::
PUSH RBP
MOV RBP,RSP
MOV R9,U64 [&gr_text_base]
PUSH RSI
PUSH RDI
MOV RBX,U64 SF_ARG1[RBP]
MOV RSI,U64 SF_ARG2[RBP]
MOV RDI,U64 CTask.scroll_x[RBX]
SAR RDI,3
ADD RDI,U64 SF_ARG5[RBP]
MOV RCX,U64 SF_ARG3[RBP]
TEST RDI,RDI
JNS @@05
ADD RCX,RDI
SUB RSI,RDI
XOR RDI,RDI
@@05: ADD RDI,U64 CTask.win_left[RBX]
MOV RDX,RCX
ADD RDX,RDI
DEC RDX
CMP RDX,U64 CTask.win_right[RBX]
JLE @@10
MOV RAX,RDX
SUB RAX,U64 CTask.win_right[RBX]
SUB RDX,RAX
SUB RCX,RAX
@@10: TEST RDI,RDI
JNS @@15
ADD RCX,RDI
SUB RSI,RDI
XOR RDI,RDI
@@15: INC RDX
SUB RDX,TEXT_COLS
JLE @@20
SUB RCX,RDX
@@20: CMP RCX,1
JL @@30
MOV RAX,U64 CTask.scroll_y[RBX]
SAR RAX,3
ADD RAX,U64 SF_ARG6[RBP]
TEST RAX,RAX
JS @@30
ADD RAX,U64 CTask.win_top[RBX]
CMP RAX,U64 CTask.win_bottom[RBX]
JG @@30
TEST RAX,RAX
JS @@30
CMP RAX,TEXT_ROWS
JGE @@30
IMUL2 RAX,TEXT_COLS
ADD RDI,RAX
SHL RDI,2
ADD RDI,R9
MOV RAX,U64 SF_ARG4[RBP]
@@25: LODSB
STOSD
DEC RCX
JNZ @@25
POP RDI
POP RSI
MOV RAX,TRUE
POP RBP
RET1 48
@@30: POP RDI
POP RSI
XOR RAX,RAX
POP RBP
RET1 48
// ************************************
/*
Bool PlotAttrStr2(CTask *task,U32 *hl,I64 len,I64 x,I64 y)
*/
_PLOT_ATTR_STR2::
PUSH RBP
MOV RBP,RSP
MOV R9,U64 [&gr_text_base]
PUSH RSI
PUSH RDI
MOV RBX,U64 SF_ARG1[RBP]
MOV RSI,U64 SF_ARG2[RBP]
MOV RDI,U64 CTask.scroll_x[RBX]
SAR RDI,3
ADD RDI,U64 SF_ARG4[RBP]
MOV RCX,U64 SF_ARG3[RBP]
TEST RDI,RDI
JNS @@05
ADD RCX,RDI
SHL RDI,2
SUB RSI,RDI
XOR RDI,RDI
@@05: ADD RDI,U64 CTask.win_left[RBX]
MOV RDX,RCX
ADD RDX,RDI
DEC RDX
CMP RDX,U64 CTask.win_right[RBX]
JLE @@10
MOV RAX,RDX
SUB RAX,U64 CTask.win_right[RBX]
SUB RDX,RAX
SUB RCX,RAX
@@10: TEST RDI,RDI
JNS @@15
ADD RCX,RDI
SHL RDI,2
SUB RSI,RDI
XOR RDI,RDI
@@15: INC RDX
SUB RDX,TEXT_COLS
JLE @@20
SUB RCX,RDX
@@20: CMP RCX,1
JL @@30
MOV RAX,U64 CTask.scroll_y[RBX]
SAR RAX,3
ADD RAX,U64 SF_ARG5[RBP]
TEST RAX,RAX
JS @@30
ADD RAX,U64 CTask.win_top[RBX]
CMP RAX,U64 CTask.win_bottom[RBX]
JG @@30
TEST RAX,RAX
JS @@30
CMP RAX,TEXT_ROWS
JGE @@30
IMUL2 RAX,TEXT_COLS
ADD RDI,RAX
SHL RDI,2
ADD RDI,R9
@@25: MOVSD
DEC RCX
JNZ @@25
POP RDI
POP RSI
MOV RAX,TRUE
POP RBP
RET1 40
@@30: POP RDI
POP RSI
XOR RAX,RAX
POP RBP
RET1 40
// ************************************
/*
Bool PlotAttr(CTask *task,I64 len,
I64 attr,I64 x,I64 y)
*/
_PLOT_ATTR::
PUSH RBP
MOV RBP,RSP
MOV R9,U64 [&gr_text_base]
PUSH RSI
PUSH RDI
MOV RBX,U64 SF_ARG1[RBP]
MOV RDI,U64 CTask.scroll_x[RBX]
SAR RDI,3
ADD RDI,U64 SF_ARG4[RBP]
MOV RCX,U64 SF_ARG2[RBP]
TEST RDI,RDI
JNS @@05
ADD RCX,RDI
XOR RDI,RDI
@@05: ADD RDI,U64 CTask.win_left[RBX]
MOV RDX,RCX
ADD RDX,RDI
DEC RDX
CMP RDX,U64 CTask.win_right[RBX]
JLE @@10
MOV RAX,RDX
SUB RAX,U64 CTask.win_right[RBX]
SUB RDX,RAX
SUB RCX,RAX
@@10: TEST RDI,RDI
JNS @@15
ADD RCX,RDI
XOR RDI,RDI
@@15: INC RDX
SUB RDX,TEXT_COLS
JLE @@20
SUB RCX,RDX
@@20: CMP RCX,1
JL @@35
MOV RAX,U64 CTask.scroll_y[RBX]
SAR RAX,3
ADD RAX,U64 SF_ARG5[RBP]
TEST RAX,RAX
JS @@35
ADD RAX,U64 CTask.win_top[RBX]
CMP RAX,U64 CTask.win_bottom[RBX]
JG @@35
TEST RAX,RAX
JS @@35
CMP RAX,TEXT_ROWS
JGE @@35
IMUL2 RAX,TEXT_COLS
ADD RDI,RAX
SHL RDI,2
ADD RDI,R9
MOV RBX,U64 SF_ARG3[RBP]
MOV RSI,RDI
@@25: LODSD
TEST AL,AL
JNZ @@30
MOV RAX,RBX
STOSD
DEC RCX
JNZ @@25
@@30: POP RDI
POP RSI
MOV RAX,TRUE
POP RBP
RET1 40
@@35: POP RDI
POP RSI
XOR RAX,RAX
POP RBP
RET1 40
// ************************************
_PLOT_BORDER_U8::
PUSH RBP
MOV RBP,RSP
MOV R9,U64 [&gr_text_base]
MOV RCX,U64 SF_ARG1[RBP]
MOV RBX,U64 CTask.scroll_x[RCX]
SAR RBX,3
ADD RBX,U64 SF_ARG3[RBP]
MOV RAX,U64 CTask.scroll_y[RCX]
SAR RAX,3
ADD RAX,U64 SF_ARG4[RBP]
MOV RDX,-1
CMP RBX,RDX
JL @@05
ADD RBX,U64 CTask.win_left[RCX]
MOV RDX,U64 CTask.win_right[RCX]
INC RDX
CMP RBX,RDX
JG @@05
TEST RBX,RBX
JS @@05
CMP RBX,TEXT_COLS
JGE @@05
MOV RDX,-1
CMP RAX,RDX
JL @@05
ADD RAX,U64 CTask.win_top[RCX]
MOV RDX,U64 CTask.win_bottom[RCX]
INC RDX
CMP RAX,RDX
JG @@05
TEST RAX,RAX
JS @@05
CMP RAX,TEXT_ROWS
JGE @@05
IMUL2 RAX,TEXT_COLS
ADD RBX,RAX
SHL RBX,2
ADD RBX,R9
MOV RAX,U64 SF_ARG2[RBP]
MOV U32 [RBX],EAX
MOV RAX,TRUE
POP RBP
RET1 32
@@05: XOR RAX,RAX
POP RBP
RET1 32
// ************************************
_GR_UPDATE_LINE32::
//************************************
_GR_UPDATE_LINE64::
PUSH RBP
MOV RBP,RSP
PUSH RSI
PUSH RDI
MOV RAX,U64 SF_ARG2[RBP]
MOV RSI,U64 [RAX] //rsi=src2
MOV RSI,U64 [RAX] //rsi=src
MOV RBX,U64 [&reverse_bits_table]
MOV RCX,U64 SF_ARG3[RBP] //rcx=d5
MOV RCX,U64 SF_ARG3[RBP] //rcx=d
MOV RAX,U64 SF_ARG4[RBP]
MOV RDI,U64 [RAX] //rdi=vga image
MOV RDI,U64 [RAX] //rdi=image
MOV RAX,U64 SF_ARG1[RBP]
MOV R8,U64 [RAX] //rbp=vga dst
MOV R8,U64 [RAX] //rbp=vga dst
@@05: LODSD
CMP U32 [RDI],EAX
@@05: LODSQ
CMP U64 [RDI],RAX
JE @@10
MOV U32 [RDI],EAX
MOV U64 [RDI],RAX
XLATB
ROR EAX,8
ROR RAX,8
XLATB
ROR EAX,8
ROR RAX,8
XLATB
ROR EAX,8
ROR RAX,8
XLATB
ROR EAX,8
MOV U32 [R8],EAX
@@10: ADD RDI,4
ADD R8,4
ROR RAX,8
XLATB
ROR RAX,8
XLATB
ROR RAX,8
XLATB
ROR RAX,8
XLATB
ROR RAX,8
MOV U64 [R8],RAX
@@10: ADD RDI,8
ADD R8,8
DEC RCX
JNZ @@05
@@ -413,36 +54,44 @@ _GR_UPDATE_LINE32::
POP RSI
POP RBP
RET1 32
// ************************************
_GR_UPDATE_LINE32_FLUSH_CACHE::
//************************************
_GR_UPDATE_LINE64_FLUSH_CACHE::
PUSH RBP
MOV RBP,RSP
PUSH RSI
PUSH RDI
MOV RAX,U64 SF_ARG2[RBP]
MOV RSI,U64 [RAX] //rsi=src2
MOV RSI,U64 [RAX] //rsi=src
MOV RBX,U64 [&reverse_bits_table]
MOV RCX,U64 SF_ARG3[RBP] //rcx=d5
MOV RCX,U64 SF_ARG3[RBP] //rcx=d
MOV RAX,U64 SF_ARG4[RBP]
MOV RDI,U64 [RAX] //rdi=vga image
MOV RDI,U64 [RAX] //rdi=image
MOV RAX,U64 SF_ARG1[RBP]
MOV R8,U64 [RAX] //rbp=vga dst
MOV R8,U64 [RAX] //rbp=vga dst
@@05: LODSD
MOV U32 [RDI],EAX
@@05: LODSQ
MOV U64 [RDI],RAX
XLATB
ROR EAX,8
ROR RAX,8
XLATB
ROR EAX,8
ROR RAX,8
XLATB
ROR EAX,8
ROR RAX,8
XLATB
ROR EAX,8
MOV U32 [R8],EAX
ADD RDI,4
ADD R8,4
ROR RAX,8
XLATB
ROR RAX,8
XLATB
ROR RAX,8
XLATB
ROR RAX,8
XLATB
ROR RAX,8
MOV U64 [R8],RAX
ADD RDI,8
ADD R8,8
DEC RCX
JNZ @@05
@@ -456,7 +105,7 @@ _GR_UPDATE_LINE32_FLUSH_CACHE::
POP RSI
POP RBP
RET1 32
// ************************************
//************************************
_DC_BLOT_COLOR4::
PUSH RBP
MOV RBP,RSP
@@ -601,7 +250,7 @@ _DC_BLOT_COLOR4::
POP RSI
POP RBP
RET1 32
// ************************************
//************************************
_IS_PIX_COVERED0::
PUSH RBP
MOV RBP,RSP
@@ -612,7 +261,7 @@ _IS_PIX_COVERED0::
SAR RAX,3
MOV RDX,U64 SF_ARG1[RBP]
IMUL2 RCX,TEXT_COLS
MOV RBX,U64 [&gr_win_z_buf]
MOV RBX,U64 [&gr.win_z_buf]
MOV DX,U16 CTask.win_z_num[RDX]
ADD RCX,RAX
XOR RAX,RAX
@@ -621,17 +270,17 @@ _IS_PIX_COVERED0::
INC RAX
@@05: POP RBP
RET1 24
// ************************************
//************************************
_GR_ROP_EQU_U8_NO_CLIPPING::
//Puts foreground char shape onto gr_dc2.
//Puts foreground char shape onto gr.dc2.
//ch.u8[1] is color as a whole byte
//ch DOCEt_UNDERLINE attr flag is used.
//ch ATTRf_UNDERLINE attr flag is used.
PUSH RBP
MOV RBP,RSP
MOVZX RAX,U8 SF_ARG1[RBP]
MOV RDX,U64 [&gr_font]
MOV RDX,U64 [&text.font]
MOV RAX,U64 [RDX+RAX*8] //RAX is 8x8 char font data, 64-bits
BT U64 SF_ARG1[RBP],DOCEt_UNDERLINE
BT U64 SF_ARG1[RBP],ATTRf_UNDERLINE
JNC @@05
MOV RBX,0xFF00000000000000
OR RAX,RBX
@@ -641,11 +290,11 @@ _GR_ROP_EQU_U8_NO_CLIPPING::
PUSH RSI
PUSH RDI
MOVZX RBX,U8 SF_ARG1+1[RBP] //Warning color is 8-bit
MOV RDX,U64 [&gr_1_to_8_colors]
MOV RDX,U64 [&gr.to_8_colors]
MOV R8,U64 [RDX+RBX*8] //R8 is color repeated 8 times.
MOV R9,U64 SF_ARG3[RBP] //R9 is width_internal
MOV RDI,U64 SF_ARG2[RBP]
MOV RSI,U64 [&gr_1_to_8_bits] //RSI is gr_1_to_8_bits
MOV RSI,U64 [&gr.to_8_bits] //RSI is gr.to_8_bits
// m=my_1_to_8_bits[ch&255];ch>>=8;
// *dst=*dst&~m|c&m;
@@ -749,27 +398,13 @@ _GR_ROP_EQU_U8_NO_CLIPPING::
@@10: POP RBP
RET1 24
}
#help_index "Graphics/Char;Char/Graphics"
public _extern _PLOT_SCREEN_U8 Bool PlotScreenU8(I64 w,I64 x,I64 y);
public _extern _PLOT_WIN_U8 Bool PlotWinU8(CTask *task,I64 w,I64 x,I64 y);
public _extern _PLOT_WIN_STR2 Bool PlotWinStr2(
CTask *task,U8 *s,I64 len,I64 attr,I64 x,I64 y);
public _extern _PLOT_ATTR_STR2 Bool PlotAttrStr2(
CTask *task,U32 *hl,I64 len,I64 x,I64 y);
public _extern _PLOT_ATTR Bool PlotWinAttr(
CTask *task,I64 len,I64 attr,I64 x,I64 y);
public _extern _PLOT_BORDER_U8 Bool PlotBorderU8(CTask *task,I64 w,I64 x,I64 y);
_extern _GR_ROP_EQU_U8_NO_CLIPPING U0 GrRopEquU8NoClipping(I64 ch,U8 *dst,I64 width_internal);
#help_index "Graphics/Misc"
//No clipping
public _extern _IS_PIX_COVERED0 Bool IsPixCovered0(CTask *task,I64 x,I64 y);
_extern _GR_UPDATE_LINE32 U0 GrUpdateLine32(
U32 **_dst3,U32 **_src2,I64 w,U8 **_vga);
_extern _GR_UPDATE_LINE32_FLUSH_CACHE U0 GrUpdateLine32FlushCache(
U32 **_dst3,U32 **_src2,I64 w,U8 **_vga);
_extern _GR_UPDATE_LINE64 U0 GrUpdateLine64(
U64 **_vga,U64 **_src,I64 d,U8 **_dst);
_extern _GR_UPDATE_LINE64_FLUSH_CACHE U0 GrUpdateLine64FlushCache(
U64 **_vga,U64 **_src,I64 d,U8 **_dst);
_extern _DC_BLOT_COLOR4 U0 DCBlotColor4(
U8 *dst,I64 *img,I64 *img_cache,I64 cnt);
Adam/Gr/GrBitMap.CPP
+92 -93
View File
@@ -1,14 +1,14 @@
#help_index "Graphics"
public Bool GrPlot0(CDC *dc=gr_dc,I64 x,I64 y)
{ //No clipping or transformation or pen width
public Bool GrPlot0(CDC *dc=gr.dc,I64 x,I64 y)
{//2D. No clipping or transformation or pen width.
U8 *dst;
I32 *db;
I64 d,dist;
CColorROPU32 c,color=dc->color,bkcolor=dc->bkcolor;
if (dc->flags & DCF_LOCATE_NEAREST) {
dist=DistI64(x,y,dc->cur_x,dc->cur_y);
dist=DistSqrI64(x,y,dc->cur_x,dc->cur_y);
if (dist<=dc->nearest_dist) {
dc->nearest_sprite_elem_num=dc->cur_sprite_elem_num;
dc->nearest_dist=dist;
@@ -51,7 +51,7 @@ public Bool GrPlot0(CDC *dc=gr_dc,I64 x,I64 y)
break;
case ROPB_COLLISION:
c=*dst;
if (c!=COLOR_TRANSPARENT&&c!=bkcolor.c0.color)
if (c!=TRANSPARENT&&c!=bkcolor.c0.color)
dc->collision_cnt++;
break;
case ROPB_XOR:
@@ -61,15 +61,15 @@ public Bool GrPlot0(CDC *dc=gr_dc,I64 x,I64 y)
return TRUE;
}
public I64 GrPeek0(CDC *dc=gr_dc,I64 x,I64 y)
{ //No clipping or transformation
public I64 GrPeek0(CDC *dc=gr.dc,I64 x,I64 y)
{//2D. No clipping or transformation.
return dc->body[dc->width_internal*y+x];
}
#help_index "Graphics;Graphics/Device Contexts"
public I64 GrBlot(CDC *dc=gr_dc,I64 x,I64 y,CDC *img)
{ //Clipping but not transformation
public I64 GrBlot(CDC *dc=gr.dc,I64 x,I64 y,CDC *img)
{//2D. Clipping but not transformation..
I64 i,j,k,k1,kk,kk1,w1,h1,w2,h2,
leading_bits,leading_bit_mask,whole_bytes,trailing_bits,trailing_bit_mask,
reg bit_shift,dist,win_z_buf_line_inc,win_z_buf_line_dec,win_z_num,
@@ -99,8 +99,8 @@ public I64 GrBlot(CDC *dc=gr_dc,I64 x,I64 y,CDC *img)
x+=win_task->pix_left;
y+=win_task->pix_top;
}
if (dc->flags & DCF_LOCATE_NEAREST) { //TODO:Untested
dist=DistI64(x+img->width>>1,y+img->height>>1,dc->cur_x,dc->cur_y);
if (dc->flags & DCF_LOCATE_NEAREST) {//TODO:Untested
dist=DistSqrI64(x+img->width>>1,y+img->height>>1,dc->cur_x,dc->cur_y);
if (dist<=dc->nearest_dist) {
dc->nearest_sprite_elem_num=dc->cur_sprite_elem_num;
dc->nearest_dist=dist;
@@ -134,12 +134,12 @@ public I64 GrBlot(CDC *dc=gr_dc,I64 x,I64 y,CDC *img)
dc->color&=~ROPF_DITHER;
color=dc->color;
leading_bits=-(w1+x)&7;
leading_bit_mask=gr_1_to_8_bits[0xFF>>leading_bits];
leading_bit_mask=gr.to_8_bits[0xFF>>leading_bits];
bit_shift=-x&7;
whole_bytes=(w2-w1-leading_bits)>>3;
if (whole_bytes<0) whole_bytes=0;
trailing_bits=(x+w2)&7;
trailing_bit_mask=gr_1_to_8_bits[0xFF<<trailing_bits&0xFF];
trailing_bit_mask=gr.to_8_bits[0xFF<<trailing_bits&0xFF];
if (leading_bits+trailing_bits>w2-w1) {
leading_bit_mask|=trailing_bit_mask;
trailing_bits=0;
@@ -152,7 +152,7 @@ public I64 GrBlot(CDC *dc=gr_dc,I64 x,I64 y,CDC *img)
for (j=h2-h1;j;j--) {
for (i=w1;i<w2;i++) {
c=dc->body[k1+i];
if (c!=COLOR_TRANSPARENT&&c!=color&&img->body[k+i]!=COLOR_TRANSPARENT)
if (c!=TRANSPARENT&&c!=color&&img->body[k+i]!=TRANSPARENT)
dc->collision_cnt++;
}
k+=img->width_internal;
@@ -160,13 +160,13 @@ public I64 GrBlot(CDC *dc=gr_dc,I64 x,I64 y,CDC *img)
}
break;
case ROPB_MONO:
color_mask=gr_1_to_8_colors[color.c0.color];
color_mask=gr.to_8_colors[color.c0.color];
if (img->flags&DCF_NO_TRANSPARENTS) {
if (!(dc->flags & DCF_SCREEN_BITMAP) || dc->flags&DCF_ON_TOP)
win_z_buf_ptr=NULL;
else {
win_z_num=win_task->win_z_num;
win_z_buf_ptr=gr_win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_ptr=gr.win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_line_dec=whole_bytes;
if (leading_bits)
win_z_buf_line_dec++;
@@ -268,7 +268,7 @@ public I64 GrBlot(CDC *dc=gr_dc,I64 x,I64 y,CDC *img)
}
} else {
win_z_num =win_task->win_z_num;
win_z_buf_ptr =gr_win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_ptr =gr.win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_line_dec=whole_bytes;
if (leading_bits)
win_z_buf_line_dec++;
@@ -307,7 +307,7 @@ public I64 GrBlot(CDC *dc=gr_dc,I64 x,I64 y,CDC *img)
win_z_buf_ptr=NULL;
else {
win_z_num=win_task->win_z_num;
win_z_buf_ptr=gr_win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_ptr=gr.win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_line_dec=whole_bytes;
if (leading_bits)
win_z_buf_line_dec++;
@@ -405,7 +405,7 @@ here1a:
for (j=h1;j<h2;j++) {
for (i=w1;i<w2;i++) {
c=img->body[k+i];
if (c!=COLOR_TRANSPARENT) {
if (c!=TRANSPARENT) {
dc->color.c0.color=c;
GrPlot0(dc,x+i,y+j);
}
@@ -414,7 +414,7 @@ here1a:
}
} else {
win_z_num =win_task->win_z_num;
win_z_buf_ptr =gr_win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_ptr =gr.win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_line_dec=whole_bytes;
if (leading_bits)
win_z_buf_line_dec++;
@@ -430,7 +430,7 @@ here1a:
for (i=w1;i<w2;) {
if (color_mask) {
c=img->body[k+i];
if (c!=COLOR_TRANSPARENT) {
if (c!=TRANSPARENT) {
dc->color.c0.color=c;
GrPlot0(dc,x+i,y+j);
}
@@ -458,7 +458,7 @@ here1a:
win_z_buf_ptr=NULL;
else {
win_z_num=win_task->win_z_num;
win_z_buf_ptr=gr_win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_ptr=gr.win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_line_dec=whole_bytes;
if (leading_bits)
win_z_buf_line_dec++;
@@ -570,7 +570,7 @@ U8 *GrBitMap4ToBitMap8(U8 *dst,U8 *src,I64 src_size,I64 bkcolor)
if (Bt(src+i1 ,k)) c|=2;
if (Bt(src+i1*2,k)) c|=4;
if (Bt(src+i1*3,k)) c|=8;
if (c==bkcolor) c=COLOR_TRANSPARENT;
if (c==bkcolor) c=TRANSPARENT;
*dst++=c;
}
return dst;
@@ -582,18 +582,18 @@ U8 *GrBitMap1ToBitMap8(U8 *dst,U8 *src,I64 src_size,I64 bkcolor)
for (k=0;k<i;k++) {
c=0;
if (Bt(src,k)) c=COLOR_MONO;
if (c==bkcolor) c=COLOR_TRANSPARENT;
if (c==bkcolor) c=TRANSPARENT;
*dst++=c;
}
return dst;
}
public CDC *DCExtract(CDC *dc=gr_dc,I64 x1,I64 y1,I64 x2,I64 y2,CTask *task=NULL)
{
public CDC *DCExtract(CDC *dc=gr.dc,I64 x1,I64 y1,I64 x2,I64 y2,CTask *task=NULL)
{//Extract new device context rect from device context.
CDC *result;
CTask *win_task;
if (x1>x2) SwapU64(&x1,&x2);
if (y1>y2) SwapU64(&y1,&y2);
if (x1>x2) SwapI64(&x1,&x2);
if (y1>y2) SwapI64(&y1,&y2);
if (dc->flags & DCF_SCREEN_BITMAP) {
win_task=dc->win_task;
x1+=win_task->pix_left+win_task->scroll_x;
@@ -609,8 +609,8 @@ public CDC *DCExtract(CDC *dc=gr_dc,I64 x1,I64 y1,I64 x2,I64 y2,CTask *task=NULL
#help_index "Graphics/Char;Char/Graphics"
public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
{ //Clipping but not transformation
public I64 GrPutChar(CDC *dc=gr.dc,I64 x,I64 y,U8 ch)
{//2D. Clipping but not transformation.
U8 reg *src,reg *dst,*font_ptr;
I64 i,m,leading_bits,trailing_bits,leading_bit_mask,trailing_bit_mask,
j,k1,kk1,w1,h1,w2,h2,reg bit_shift,dist,reg color_mask;
@@ -638,8 +638,8 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
x+=win_task->pix_left;
y+=win_task->pix_top;
}
if (dc->flags & DCF_LOCATE_NEAREST) { //TODO:Untested
dist=DistI64(x+w2>>1,y+h2>>1,dc->cur_x,dc->cur_y);
if (dc->flags & DCF_LOCATE_NEAREST) {//TODO:Untested
dist=DistSqrI64(x+w2>>1,y+h2>>1,dc->cur_x,dc->cur_y);
if (dist<=dc->nearest_dist) {
dc->nearest_sprite_elem_num=dc->cur_sprite_elem_num;
dc->nearest_dist=dist;
@@ -670,15 +670,15 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
color=dc->color;
leading_bits=-(w1+x)&7;
if (!leading_bits) leading_bits=8;
leading_bit_mask=gr_1_to_8_bits[0xFF>>leading_bits];
leading_bit_mask=gr.to_8_bits[0xFF>>leading_bits];
bit_shift=-x&7;
trailing_bits=(x+w2)&7;
trailing_bit_mask=gr_1_to_8_bits[0xFF<<trailing_bits&0xFF];
trailing_bit_mask=gr.to_8_bits[0xFF<<trailing_bits&0xFF];
if (leading_bits+trailing_bits>w2-w1) {
leading_bit_mask|=trailing_bit_mask;
trailing_bits=0;
}
font_ptr=&gr_font[(FONT_WIDTH*(FONT_HEIGHT*ch+h1))>>3];
font_ptr=&text.font[(FONT_WIDTH*(FONT_HEIGHT*ch+h1))>>3];
if (color.c0.rop==ROPB_COLLISION) {
m=w1&(FONT_WIDTH-1);
#assert FONT_WIDTH==8
@@ -688,14 +688,14 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
src=font_ptr;
for (j=h2-h1;j;j--) {
c=dc->body[k1+i];
if (c!=COLOR_TRANSPARENT && c!=color && Bt(src,m))
if (c!=TRANSPARENT && c!=color && Bt(src,m))
dc->collision_cnt++;
k1+=dc->width_internal;
src++;
}
}
} else {
color_mask=gr_1_to_8_colors[color.c0.color];
color_mask=gr.to_8_colors[color.c0.color];
k1=x+w1;
kk1=(h1+y)*dc->width_internal+k1;
if (!(dc->flags & DCF_SCREEN_BITMAP) || dc->flags&DCF_ON_TOP) {
@@ -708,7 +708,7 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
case ROPB_EQU:
case ROPB_MONO:
for (j=h2-h1;j;j--) {
m=gr_1_to_8_bits[*src(U16 *)>>bit_shift&0xFF];
m=gr.to_8_bits[*src(U16 *)>>bit_shift&0xFF];
*dst(I64 *)=*dst(I64 *)&leading_bit_mask|(color_mask&m|*dst(I64 *)&~m)&~leading_bit_mask;
src++;
dst+=dc->width_internal;
@@ -717,7 +717,7 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
case ROPB_XOR:
if (color_mask) {
for (j=h2-h1;j;j--) {
*dst(I64 *)=*dst(I64 *)&leading_bit_mask|(*dst(I64 *)^gr_1_to_8_bits[*src(U16 *)>>bit_shift&0xFF])&~leading_bit_mask;
*dst(I64 *)=*dst(I64 *)&leading_bit_mask|(*dst(I64 *)^gr.to_8_bits[*src(U16 *)>>bit_shift&0xFF])&~leading_bit_mask;
src++;
dst+=dc->width_internal;
}
@@ -735,7 +735,7 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
case ROPB_EQU:
case ROPB_MONO:
for (j=h2-h1;j;j--) {
m=gr_1_to_8_bits[*src(U16 *)>>bit_shift&0xFF];
m=gr.to_8_bits[*src(U16 *)>>bit_shift&0xFF];
*dst(I64 *)=*dst(I64 *)&trailing_bit_mask|(color_mask&m|*dst(I64 *)&~m)&~trailing_bit_mask;
src++;
dst+=dc->width_internal;
@@ -744,7 +744,7 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
case ROPB_XOR:
if (color_mask) {
for (j=h2-h1;j;j--) {
*dst(I64 *)=*dst(I64 *)&trailing_bit_mask|(*dst(I64 *)^gr_1_to_8_bits[*src(U16 *)>>bit_shift&0xFF])&~trailing_bit_mask;
*dst(I64 *)=*dst(I64 *)&trailing_bit_mask|(*dst(I64 *)^gr.to_8_bits[*src(U16 *)>>bit_shift&0xFF])&~trailing_bit_mask;
src++;
dst+=dc->width_internal;
}
@@ -763,7 +763,7 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
case ROPB_MONO:
for (j=h1;j<h2;j++) {
if (!IsPixCovered0(win_task,k1,y+j)) {
m=gr_1_to_8_bits[*src(U16 *)>>bit_shift&0xFF];
m=gr.to_8_bits[*src(U16 *)>>bit_shift&0xFF];
*dst(I64 *)=*dst(I64 *)&leading_bit_mask|(color_mask&m|*dst(I64 *)&~m)&~leading_bit_mask;
}
src++;
@@ -774,7 +774,7 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
if (color_mask) {
for (j=h1;j<h2;j++) {
if (!IsPixCovered0(win_task,k1,y+j))
*dst(I64 *)=*dst(I64 *)&leading_bit_mask|(*dst(I64 *)^gr_1_to_8_bits[*src(U16 *)>>bit_shift&0xFF])&~leading_bit_mask;
*dst(I64 *)=*dst(I64 *)&leading_bit_mask|(*dst(I64 *)^gr.to_8_bits[*src(U16 *)>>bit_shift&0xFF])&~leading_bit_mask;
src++;
dst+=dc->width_internal;
}
@@ -794,7 +794,7 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
case ROPB_MONO:
for (j=h1;j<h2;j++) {
if (!IsPixCovered0(win_task,k1,y+j)) {
m=gr_1_to_8_bits[*src(U16 *)>>bit_shift&0xFF];
m=gr.to_8_bits[*src(U16 *)>>bit_shift&0xFF];
*dst(I64 *)=*dst(I64 *)&trailing_bit_mask|(color_mask&m|*dst(I64 *)&~m)&~trailing_bit_mask;
}
src++;
@@ -805,7 +805,7 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
if (color_mask) {
for (j=h1;j<h2;j++) {
if (!IsPixCovered0(win_task,k1,y+j))
*dst(I64 *)=*dst(I64 *)&trailing_bit_mask|(*dst(I64 *)^gr_1_to_8_bits[*src(U16 *)>>bit_shift&0xFF])&~trailing_bit_mask;
*dst(I64 *)=*dst(I64 *)&trailing_bit_mask|(*dst(I64 *)^gr.to_8_bits[*src(U16 *)>>bit_shift&0xFF])&~trailing_bit_mask;
src++;
dst+=dc->width_internal;
}
@@ -820,8 +820,8 @@ public I64 GrPutChar(CDC *dc=gr_dc,I64 x,I64 y,U8 ch)
return 0;
}
I64 GrPutS(CDC *dc=gr_dc,I64 x,I64 y,U8 *_s)
{ //Use $LK,"GrPrint",A="MN:GrPrint"$()
I64 GrPutS(CDC *dc=gr.dc,I64 x,I64 y,U8 *_s)
{//Use $LK,"GrPrint",A="MN:GrPrint"$()
I64 x0,ch,result;
if (!_s) return 0;
x0=x;
@@ -840,8 +840,8 @@ I64 GrPutS(CDC *dc=gr_dc,I64 x,I64 y,U8 *_s)
return result;
}
I64 GrVPutS(CDC *dc=gr_dc,I64 x,I64 y,U8 *_s)
{ //Vertical Text. Use $LK,"GrVPrint",A="MN:GrVPrint"$()
I64 GrVPutS(CDC *dc=gr.dc,I64 x,I64 y,U8 *_s)
{//Vertical Text. Use $LK,"GrVPrint",A="MN:GrVPrint"$()
I64 y0,result;
U8 buf[2];
if (!_s) return 0;
@@ -863,30 +863,30 @@ I64 GrVPutS(CDC *dc=gr_dc,I64 x,I64 y,U8 *_s)
return result;
}
public I64 GrPrint(CDC *dc=gr_dc,I64 x,I64 y,U8 *fmt,...)
{
public I64 GrPrint(CDC *dc=gr.dc,I64 x,I64 y,U8 *fmt,...)
{//2D. Clipping but not transformation.
I64 result;
U8 *buf=SPrintJoin(NULL,fmt,argc,argv);
U8 *buf=StrPrintJoin(NULL,fmt,argc,argv);
result=GrPutS(dc,x,y,buf);
Free(buf);
return result;
}
public I64 GrVPrint(CDC *dc=gr_dc,I64 x,I64 y,U8 *fmt,...)
{ //Vertical text
public I64 GrVPrint(CDC *dc=gr.dc,I64 x,I64 y,U8 *fmt,...)
{//2D. Vertical text. Clipping but not transformation.
I64 result;
U8 *buf=SPrintJoin(NULL,fmt,argc,argv);
U8 *buf=StrPrintJoin(NULL,fmt,argc,argv);
result=GrVPutS(dc,x,y,buf);
Free(buf);
return result;
}
#help_index "Graphics"
public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
{ //Clipping but not transformation
//Returns cnt of pixs changed
public I64 GrRect(CDC *dc=gr.dc,I64 x,I64 y,I64 w,I64 h)
{//2D. Width Height. Clipping but not transformation.
//Returns cnt of pixs changed.
I64 i,result=0,j,k1,kk1,w1,h1,w2,h2,dist,
leading_bits,whole_bytes,trailing_bits,leading_bit_mask,trailing_bit_mask,
leading_bits,original_leading_bits,whole_bytes,trailing_bits,leading_bit_mask,trailing_bit_mask,
win_z_buf_line_inc,win_z_buf_line_dec,win_z_num,color_mask;
U8 reg *dst;
U16 reg *win_z_buf_ptr;
@@ -915,13 +915,13 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
x+=win_task->pix_left;
y+=win_task->pix_top;
}
if (dc->flags & DCF_LOCATE_NEAREST) { //TODO:Untested
if (dc->flags & DCF_LOCATE_NEAREST) {//TODO:Untested
if (dc->cur_x>=x && dc->cur_y>=y &&
dc->cur_x<=x+w && dc->cur_y<=y+h) {
dc->nearest_sprite_elem_num=dc->cur_sprite_elem_num;
dc->nearest_dist=0;
} else {
dist=DistI64(x+w>>1,y+h>>1,dc->cur_x,dc->cur_y);
dist=DistSqrI64(x+w>>1,y+h>>1,dc->cur_x,dc->cur_y);
if (dist<=dc->nearest_dist) {
dc->nearest_sprite_elem_num=dc->cur_sprite_elem_num;
dc->nearest_dist=dist;
@@ -963,25 +963,25 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
}
} else
dither=FALSE;
leading_bits=-(w1+x)&7;
leading_bit_mask=gr_1_to_8_bits[0xFF>>leading_bits];
original_leading_bits=leading_bits=-(w1+x)&7;
leading_bit_mask=gr.to_8_bits[0xFF>>leading_bits];
whole_bytes=(w2-w1-leading_bits)>>3;
if (whole_bytes<0) whole_bytes=0;
trailing_bits=(x+w2)&7;
trailing_bit_mask=gr_1_to_8_bits[0xFF<<trailing_bits&0xFF];
trailing_bit_mask=gr.to_8_bits[0xFF<<trailing_bits&0xFF];
if (leading_bits+trailing_bits>w2-w1) {
leading_bit_mask|=trailing_bit_mask;
leading_bits=w2-w1; //Correct so it's right for result.
trailing_bits=0;
}
if (color.c0.rop==ROPB_COLLISION) { //TODO: Might want to check win_z_buf
if (color.c0.rop==ROPB_COLLISION) {//TODO: Might want to check win_z_buf
color =dc->bkcolor.c0.color;
k1=(h1+y)*dc->width_internal+x;
result=-dc->collision_cnt;
for (j=h2-h1;j;j--) {
for (i=w1;i<w2;i++) {
c=dc->body[k1+i];
if (c!=COLOR_TRANSPARENT && c!=color)
if (c!=TRANSPARENT && c!=color)
dc->collision_cnt++;
}
k1+=dc->width_internal;
@@ -992,7 +992,7 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
win_z_buf_ptr=NULL;
else {
win_z_num=win_task->win_z_num;
win_z_buf_ptr=gr_win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_ptr=gr.win_z_buf(U8 *)+((h1+y)/FONT_HEIGHT*TEXT_COLS+(w1+x)/FONT_WIDTH)*sizeof(U16);
win_z_buf_line_dec=whole_bytes;
if (leading_bits)
win_z_buf_line_dec++;
@@ -1014,7 +1014,7 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
if (win_z_buf_ptr) {
result=0;
for (j=h1;j<h2;j++) {
color_mask=gr_1_to_8_colors[color.c0.color];
color_mask=gr.to_8_colors[color.c0.color];
dst=dc->body+kk1&~7;
if (leading_bits) {
if (win_z_num>=*win_z_buf_ptr++) {
@@ -1044,7 +1044,7 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
}
} else {
for (j=h2-h1;j;j--) {
color_mask=gr_1_to_8_colors[color.c0.color];
color_mask=gr.to_8_colors[color.c0.color];
dst=dc->body+kk1&~7;
if (leading_bits)
*dst(I64 *)++=*dst(I64 *)&leading_bit_mask|color_mask&~leading_bit_mask;
@@ -1065,7 +1065,7 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
if (win_z_buf_ptr) {
result=0;
for (j=h1;j<h2;j++) {
color_mask=gr_1_to_8_colors[color.c0.color];
color_mask=gr.to_8_colors[color.c0.color];
dst=dc->body+kk1&~7;
if (leading_bits) {
if (win_z_num>=*win_z_buf_ptr++) {
@@ -1095,7 +1095,7 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
}
} else {
for (j=h2-h1;j;j--) {
color_mask=gr_1_to_8_colors[color.c0.color];
color_mask=gr.to_8_colors[color.c0.color];
dst=dc->body+kk1&~7;
if (leading_bits)
*dst(I64 *)++=*dst(I64 *)&leading_bit_mask|*dst(I64 *)^color_mask&~leading_bit_mask;
@@ -1114,7 +1114,7 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
break;
}
} else {
if (((x+w1)^(y+h1))&1)
if (((x+w1-original_leading_bits)^(y+h1))&1)
SwapU16(&color.c0,&color.c1);
nobound_switch (color.c0.rop) {
case ROPB_EQU:
@@ -1122,8 +1122,8 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
if (win_z_buf_ptr) {
result=0;
for (j=h1;j<h2;j++) {
color_mask=gr_1_to_8_bits[0x55]&gr_1_to_8_colors[color.c0.color]|
gr_1_to_8_bits[0xAA]&gr_1_to_8_colors[color.c1.color];
color_mask=gr.to_8_bits[0x55]&gr.to_8_colors[color.c0.color]|
gr.to_8_bits[0xAA]&gr.to_8_colors[color.c1.color];
dst=dc->body+kk1&~7;
if (leading_bits) {
if (win_z_num>=*win_z_buf_ptr++) {
@@ -1150,8 +1150,8 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
}
} else {
for (j=h2-h1;j;j--) {
color_mask=gr_1_to_8_bits[0x55]&gr_1_to_8_colors[color.c0.color]|
gr_1_to_8_bits[0xAA]&gr_1_to_8_colors[color.c1.color];
color_mask=gr.to_8_bits[0x55]&gr.to_8_colors[color.c0.color]|
gr.to_8_bits[0xAA]&gr.to_8_colors[color.c1.color];
dst=dc->body+kk1&~7;
if (leading_bits)
*dst(I64 *)++=*dst(I64 *)&leading_bit_mask|color_mask&~leading_bit_mask;
@@ -1169,8 +1169,8 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
if (win_z_buf_ptr) {
result=0;
for (j=h1;j<h2;j++) {
color_mask=gr_1_to_8_bits[0x55]&gr_1_to_8_colors[color.c0.color]|
gr_1_to_8_bits[0xAA]&gr_1_to_8_colors[color.c1.color];
color_mask=gr.to_8_bits[0x55]&gr.to_8_colors[color.c0.color]|
gr.to_8_bits[0xAA]&gr.to_8_colors[color.c1.color];
dst=dc->body+kk1&~7;
if (leading_bits) {
if (win_z_num>=*win_z_buf_ptr++) {
@@ -1197,8 +1197,8 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
}
} else {
for (j=h2-h1;j;j--) {
color_mask=gr_1_to_8_bits[0x55]&gr_1_to_8_colors[color.c0.color]|
gr_1_to_8_bits[0xAA]&gr_1_to_8_colors[color.c1.color];
color_mask=gr.to_8_bits[0x55]&gr.to_8_colors[color.c0.color]|
gr.to_8_bits[0xAA]&gr.to_8_colors[color.c1.color];
dst=dc->body+kk1&~7;
if (leading_bits)
*dst(I64 *)++=*dst(I64 *)&leading_bit_mask|*dst(I64 *)^color_mask&~leading_bit_mask;
@@ -1215,7 +1215,7 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
}
}
} else {
color_mask=gr_1_to_8_colors[color.c0.color];
color_mask=gr.to_8_colors[color.c0.color];
nobound_switch (color.c0.rop) {
case ROPB_EQU:
case ROPB_MONO:
@@ -1307,7 +1307,6 @@ public I64 GrRect(CDC *dc=gr_dc,I64 x,I64 y,I64 w,I64 h)
return result;
}
I64 GrRayLenMinus(CDC *dc,I64 x,I64 y)
{
//Returns cnt of pixs changed
@@ -1461,7 +1460,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL)
if ((not_color && c!=dc->color2 ||
!not_color && c==dc->color2) && plot) {
if (dc->flags & DCF_LOCATE_NEAREST) {
dist=DistI64(x3,y3,dc->cur_x,dc->cur_y);
dist=DistSqrI64(x3,y3,dc->cur_x,dc->cur_y);
if (dist<=dc->nearest_dist) {
dc->nearest_sprite_elem_num=dc->cur_sprite_elem_num;
dc->nearest_dist=dist;
@@ -1491,7 +1490,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL)
break;
case ROPB_COLLISION:
c2=*dst;
if (c2!=COLOR_TRANSPARENT && c2!=bkcolor.c0.color)
if (c2!=TRANSPARENT && c2!=bkcolor.c0.color)
dc->collision_cnt++;
break;
case ROPB_XOR:
@@ -1540,7 +1539,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL)
if ((not_color && c!=dc->color2 ||
!not_color && c==dc->color2) && plot) {
if (dc->flags & DCF_LOCATE_NEAREST) {
dist=DistI64(x3,y3,dc->cur_x,dc->cur_y);
dist=DistSqrI64(x3,y3,dc->cur_x,dc->cur_y);
if (dist<=dc->nearest_dist) {
dc->nearest_sprite_elem_num=dc->cur_sprite_elem_num;
dc->nearest_dist=dist;
@@ -1570,7 +1569,7 @@ I64 GrRayLen(CDC *dc,I64 *x1,I64 y,I64 z=0,I32 *db=NULL)
break;
case ROPB_COLLISION:
c2=*dst;
if (c2!=COLOR_TRANSPARENT && c2!=bkcolor.c0.color)
if (c2!=TRANSPARENT && c2!=bkcolor.c0.color)
dc->collision_cnt++;
break;
case ROPB_XOR:
@@ -1587,10 +1586,10 @@ gr_done:
return 0;
}
public I64 GrHLine(CDC *dc=gr_dc,I64 x1,I64 x2,I64 y,I64 z1=0,I64 z2=0)
{ //No transformation or pen width
//returns cnt of pixs changed
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
public I64 GrHLine(CDC *dc=gr.dc,I64 x1,I64 x2,I64 y,I64 z1=0,I64 z2=0)
{//3D. No transformation or pen width.
//Returns cnt of pixs changed
//Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
I64 dx,dz,z,result=0,i,j,d,dist;
U8 *dst;
CColorROPU32 c,c2,color=dc->color,bkcolor=dc->bkcolor,dither_colors;
@@ -1599,7 +1598,7 @@ public I64 GrHLine(CDC *dc=gr_dc,I64 x1,I64 x2,I64 y,I64 z1=0,I64 z2=0)
CTask *win_task;
if (!dc->depth_buf) {
if (x2<x1) SwapU64(&x1,&x2);
if (x2<x1) SwapI64(&x1,&x2);
return GrRect(dc,x1,y,x2-x1+1,1);
}
@@ -1621,8 +1620,8 @@ public I64 GrHLine(CDC *dc=gr_dc,I64 x1,I64 x2,I64 y,I64 z1=0,I64 z2=0)
}
if (y<0) goto gr_done;
if (x2<x1) {
SwapU64(&x1,&x2);
SwapU64(&z1,&z2);
SwapI64(&x1,&x2);
SwapI64(&z1,&z2);
}
if (x2<0)
goto gr_done;
@@ -1724,7 +1723,7 @@ public I64 GrHLine(CDC *dc=gr_dc,I64 x1,I64 x2,I64 y,I64 z1=0,I64 z2=0)
break;
case ROPB_COLLISION:
c2=*dst;
if (c2!=COLOR_TRANSPARENT && c2!=bkcolor.c0.color)
if (c2!=TRANSPARENT && c2!=bkcolor.c0.color)
dc->collision_cnt++;
break;
case ROPB_XOR:
Adam/Gr/GrChar.CPP
-104
View File
@@ -1,104 +0,0 @@
#help_index "Graphics/Char;Char/Graphics"
public U0 PlotScreenStr(U8 *s,I64 attr,I64 x,I64 y)
{
I64 ch;
attr<<=8;
while (ch=*s++) {
PlotScreenU8(ch+attr,x,y);
x++;
}
}
public U0 PlotWinStr(CTask *task,U8 *s,I64 attr,I64 x,I64 y)
{
I64 ch;
attr<<=8;
while (ch=*s++) {
PlotWinU8(task,ch+attr,x,y);
x++;
}
}
public U0 PlotBorderStr(CTask *task,U8 *s,I64 attr,I64 x,I64 y)
{
I64 ch;
attr<<=8;
while (ch=*s++) {
PlotBorderU8(task,ch+attr,x,y);
x++;
}
}
public U0 DrawBorder(CTask *task,Bool solid,I64 l,I64 r,I64 t,I64 b,I64 attr,Bool clip_to_win)
{
I64 i;
attr<<=8;
if (clip_to_win) {
if (solid) {
PlotWinU8(task,'É'+attr,l-1,t-1);
PlotWinU8(task,'»'+attr,r+1,t-1);
PlotWinU8(task,'È'+attr,l-1,b+1);
PlotWinU8(task,'¼'+attr,r+1,b+1);
for (i=l;i<=r;i++) {
PlotWinU8(task,'Í'+attr,i,t-1);
PlotWinU8(task,'Í'+attr,i,b+1);
}
for (i=t;i<=b;i++) {
PlotWinU8(task,'º'+attr,l-1,i);
PlotWinU8(task,'º'+attr,r+1,i);
}
} else {
PlotWinU8(task,'Ú'+attr,l-1,t-1);
PlotWinU8(task,'¿'+attr,r+1,t-1);
PlotWinU8(task,'À'+attr,l-1,b+1);
PlotWinU8(task,'Ù'+attr,r+1,b+1);
for (i=l;i<=r;i++) {
PlotWinU8(task,'Ä'+attr,i,t-1);
PlotWinU8(task,'Ä'+attr,i,b+1);
}
for (i=t;i<=b;i++) {
PlotWinU8(task,'³'+attr,l-1,i);
PlotWinU8(task,'³'+attr,r+1,i);
}
}
} else {
if (solid) {
PlotScreenU8('É'+attr,l-1,t-1);
PlotScreenU8('»'+attr,r+1,t-1);
PlotScreenU8('È'+attr,l-1,b+1);
PlotScreenU8('¼'+attr,r+1,b+1);
for (i=l;i<=r;i++) {
PlotScreenU8('Í'+attr,i,t-1);
PlotScreenU8('Í'+attr,i,b+1);
}
for (i=t;i<=b;i++) {
PlotScreenU8('º'+attr,l-1,i);
PlotScreenU8('º'+attr,r+1,i);
}
} else {
PlotScreenU8('Ú'+attr,l-1,t-1);
PlotScreenU8('¿'+attr,r+1,t-1);
PlotScreenU8('À'+attr,l-1,b+1);
PlotScreenU8('Ù'+attr,r+1,b+1);
for (i=l;i<=r;i++) {
PlotScreenU8('Ä'+attr,i,t-1);
PlotScreenU8('Ä'+attr,i,b+1);
}
for (i=t;i<=b;i++) {
PlotScreenU8('³'+attr,l-1,i);
PlotScreenU8('³'+attr,r+1,i);
}
}
}
}
U0 DrawTaskBorder(CTask *task)
{
PUSHFD
CLI
DrawBorder(task,task==sys_focus_task,
task->win_left,task->win_right,
task->win_top,task->win_bottom,
task->border_attr,FALSE);
POPFD
}
Adam/Gr/GrComposites.CPP
+129 -24
View File
@@ -1,13 +1,79 @@
#help_index "Graphics"
public I64 GrRectB(CDC *dc=gr_dc,I64 x1,I64 y1,I64 x2,I64 y2)
{
if (x2<x1) SwapU64(&x1,&x2);
if (y2<y1) SwapU64(&y1,&y2);
public I64 GrFillPoly3(CDC *dc=gr.dc,I64 n,CD3I32 *poly)
{//3D. Must be convex.
//Returns cnt of pixs changed
CD3I32 tri[3];
I64 i,j,x,y,z,result=0;
if (n<3) return 0;
if (dc->flags & DCF_SYMMETRY) {
for (i=1;i<n-1;i++) {
j=i-1;
if (i==1) {
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
GrReflect(dc,&x,&y,&z);
tri[0].x=x; tri[0].y=y; tri[0].z=z;
}
j++;
if (i==1) {
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
GrReflect(dc,&x,&y,&z);
}
tri[1].x=x; tri[1].y=y; tri[1].z=z;
j++;
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
GrReflect(dc,&x,&y,&z);
tri[2].x=x; tri[2].y=y; tri[2].z=z;
result+=GrFillTri0(dc,&tri[0],&tri[1],&tri[2]);
}
}
if (dc->flags&DCF_JUST_MIRROR)
return result;
for (i=1;i<n-1;i++) {
j=i-1;
if (i==1) {
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
tri[0].x=x; tri[0].y=y; tri[0].z=z;
}
j++;
if (i==1) {
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
}
tri[1].x=x; tri[1].y=y; tri[1].z=z;
j++;
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
tri[2].x=x; tri[2].y=y; tri[2].z=z;
result+=GrFillTri0(dc,&tri[0],&tri[1],&tri[2]);
}
return result;
}
public I64 GrRectB(CDC *dc=gr.dc,I64 x1,I64 y1,I64 x2,I64 y2)
{//2D. Two point. Clipping but not transformation.
if (x2<x1) SwapI64(&x1,&x2);
if (y2<y1) SwapI64(&y1,&y2);
return GrRect(dc,x1,y1,x2-x1+1,y2-y1+1);
}
public I64 GrRect3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,I64 w,I64 h)
{ //Clipping and transformation
public I64 GrRect3(CDC *dc=gr.dc,I64 x,I64 y,I64 z,I64 w,I64 h)
{//3D. Width Height. Clipping and transformation.
CD3I32 poly[4];
poly[0].x=x;
poly[0].y=y;
@@ -24,18 +90,17 @@ public I64 GrRect3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,I64 w,I64 h)
return GrFillPoly3(dc,4,poly);
}
public U0 GrLineRect4(CDC *dc=gr_dc,I64 x1,I64 y1,I64 x2,I64 y2,I64 step=1,I64 start=0)
{
//Can be used with ROPF_DITHER+WHITE<<16+BLACK
//for dotted rect.
public U0 GrBorder(CDC *dc=gr.dc,I64 x1,I64 y1,I64 x2,I64 y2,I64 step=1,I64 start=0)
{//2D. Transformation with pen width.
//Can be used with ROPF_DITHER+WHITE<<16+BLACK for dotted rect.
GrLine3(dc,x1,y1,0,x2,y1,0,step,start);
GrLine3(dc,x2,y1,0,x2,y2,0,step,start);
GrLine3(dc,x2,y2,0,x1,y2,0,step,start);
GrLine3(dc,x1,y2,0,x1,y1,0,step,start);
}
public Bool GrArrow3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,I64 x2,I64 y2,I64 z2,F64 w=2.75,I64 step=1,I64 start=0)
{ //transformation with pen width
public Bool GrArrow3(CDC *dc=gr.dc,I64 x1,I64 y1,I64 z1,I64 x2,I64 y2,I64 z2,F64 w=2.75,I64 step=1,I64 start=0)
{//3D. Transformation with pen width.
I64 _x1,_y1,_z1,_x2,_y2,_z2,dx,dy;
F64 d;
Bool result=FALSE,was_transform=FALSE,was_symmetry=FALSE;
@@ -78,10 +143,8 @@ gr_done:
}
#help_index "Graphics/Char;Char/Graphics"
public Bool GrTextBox3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,U8 *s,I64 border=2)
{ //transformation
//DCF_SYMMETRY is silly.
public Bool GrTextBox3(CDC *dc=gr.dc,I64 x1,I64 y1,I64 z1,U8 *s,I64 border=2)
{//3D. Transformation. DCF_SYMMETRY is silly.
U8 *ptr;
I64 ch,result,w,w_max,h;
if (!s) return FALSE;
@@ -111,9 +174,8 @@ public Bool GrTextBox3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,U8 *s,I64 border=2)
#define MAX_DIAMOND_SLOPE 2.75
public Bool GrTextDiamond3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,U8 *_s,I64 border=2)
{ //transformation
//DCF_SYMMETRY is silly.
public Bool GrTextDiamond3(CDC *dc=gr.dc,I64 x1,I64 y1,I64 z1,U8 *_s,I64 border=2)
{//3D. Transformation. DCF_SYMMETRY is silly.
Bool first=TRUE;
U8 ch,*ptr,*ptr_end,*st,*s;
I64 result=0,y,dx,dy,dx_old,dy_old,w,h=FONT_HEIGHT;
@@ -176,19 +238,62 @@ public Bool GrTextDiamond3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,U8 *_s,I64 border=
return ToBool(result);
}
#help_index "Graphics/Mesh"
public I64 Gr3Mesh(CDC *dc=gr.dc,I64 vertex_cnt,CD3I32 *p,I64 tri_cnt,CMeshTri *tri)
{//Returns cnt of pixs changed.
CColorROPU32 old_color=dc->color;
I64 i,x,y,z,result=0;
CD3I32 *pt,*pt_sym,*p_sym,*dst;
CMeshTri *tri_sym=tri;
if (dc->flags&DCF_TRANSFORMATION) {
dst=pt=MAlloc(sizeof(CD3I32)*vertex_cnt);
for (i=0;i<vertex_cnt;i++,p++,dst++) {
x=p->x; y=p->y; z=p->z;
(*dc->transform)(dc,&x,&y,&z);
dst->x=x; dst->y=y; dst->z=z;
}
p=pt;
} else
pt=NULL;
if (dc->flags & DCF_SYMMETRY) {
dst=pt_sym=MAlloc(sizeof(CD3I32)*vertex_cnt);
p_sym=p;
for (i=0;i<vertex_cnt;i++,p_sym++,dst++) {
x=p_sym->x; y=p_sym->y; z=p_sym->z;
GrReflect(dc,&x,&y,&z);
dst->x=x; dst->y=y; dst->z=z;
}
p_sym=pt_sym;
for (i=0;i<tri_cnt;i++,tri_sym++) {
(*dc->lighting)(dc,&p_sym[tri_sym->nums[0]],&p_sym[tri_sym->nums[2]],&p_sym[tri_sym->nums[1]],tri_sym->color);
result+=GrFillTri0(dc,&p_sym[tri_sym->nums[0]],&p_sym[tri_sym->nums[2]],&p_sym[tri_sym->nums[1]]);
}
Free(pt_sym);
if (dc->flags&DCF_JUST_MIRROR)
goto mesh_done;
}
for (i=0;i<tri_cnt;i++,tri++) {
(*dc->lighting)(dc,&p[tri->nums[0]],&p[tri->nums[1]],&p[tri->nums[2]],tri->color);
result+=GrFillTri0(dc,&p[tri->nums[0]],&p[tri->nums[1]],&p[tri->nums[2]]);
}
mesh_done:
dc->color=old_color;
Free(pt);
return result;
}
#help_index "Graphics/Misc;Input Pointer/Displayed Image"
//Called by $LK,"DrawInputPtr",A="MN:DrawInputPtr"$() which is
//called by $LK,"WinFinalUpdate",A="MN:WinFinalUpdate"$().
public U0 DrawStdInputPtr(CDC *dc,I64 x,I64 y)
{//This is a callback.
//Called by $LK,"DrawInputPtr",A="MN:DrawInputPtr"$() which is
//called by $LK,"WinFinalUpdate",A="MN:WinFinalUpdate"$().
dc->pen_width=1;
dc->flags&=~(DCF_TRANSFORMATION|DCF_SYMMETRY);
GrArrow3(dc,x+8,y+8,0,x,y,0);
}
public U0 (*fp_draw_input_ptr)(CDC *dc,I64 x,I64 y)=&DrawStdInputPtr;
public U0 (*fp_draw_grab_input_ptr)(CDC *dc,I64 x,I64 y,Bool closed)=NULL;
public U8 *gr_empty_sprite=NULL; //Gets assigned $LK,"gr_empty_sprite",A="FI:::/Adam/WallPaper.CPP"$
gr.fp_draw_input_ptr=&DrawStdInputPtr;
public U0 DrawWaitInputPtr(CDC *dc,I64 x,I64 y)
{//This is a callback.
Adam/Gr/GrDC.CPP
+46 -44
View File
@@ -1,11 +1,10 @@
#help_index "Graphics/Math/3D Transformation"
#help_file "::/Doc/Transform"
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
I64 gr_scale=1<<32;
#define GR_SCALE (1<<32)
public U0 GrRot(I64 r[4][4],I64 *_x,I64 *_y,I64 *_z)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
{//Rotate 3D point using 4x4 matrix. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
I64 x1,y1,z1,xx=*_x,yy=*_y,zz=*_z;
x1=(r[0][0]*xx+r[0][1]*yy+r[0][2]*zz+r[0][3])>>32;
y1=(r[1][0]*xx+r[1][1]*yy+r[1][2]*zz+r[1][3])>>32;
@@ -15,7 +14,7 @@ public U0 GrRot(I64 r[4][4],I64 *_x,I64 *_y,I64 *_z)
public U0 GrTransform(CDC *dc,I64 *_x,I64 *_y,I64 *_z)
{//This is a callback.
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
//Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
GrRot(dc->r,_x,_y,_z);
*_x+=dc->x;
*_y+=dc->y;
@@ -23,8 +22,7 @@ public U0 GrTransform(CDC *dc,I64 *_x,I64 *_y,I64 *_z)
}
public I64 *GrIdentNew(CTask *mem_task=NULL)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
{//MAlloc an identity matrix. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
I64 *r=CAlloc(sizeof(I64)*16,mem_task);
r[0] .i32[1]=1;
r[5] .i32[1]=1;
@@ -34,8 +32,7 @@ public I64 *GrIdentNew(CTask *mem_task=NULL)
}
public I64 *GrIdentEqu(I64 r[4][4])
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
{//Set matrix to identity. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
MemSet(r,0,sizeof(I64)*16);
r[0][0].i32[1]=1;
r[1][1].i32[1]=1;
@@ -45,11 +42,12 @@ public I64 *GrIdentEqu(I64 r[4][4])
}
public U0 GrSetRotMat(CDC *dc=NULL,I64 r[4][4])
{//NULL means gr_dc
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
// (1.0/Sqrt(3))*65536=37837.22
{//Set device context's rot matrix. Will be $LK,"Free",A="MN:Free"$d() in $LK,"DCDel",A="MN:DCDel"$(). Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
//The main purpose is to set matrix norm for pen width scaling.
//NULL as dc means gr.dc
//Note: (1.0/Sqrt(3))*65536=37837.22
I64 xx=37838,yy=37837,zz=37837;
if (!dc) dc=gr_dc;
if (!dc) dc=gr.dc;
dc->r=r;
GrRot(r,&xx,&yy,&zz);
//scaled 32 bits
@@ -121,20 +119,20 @@ public U0 GrLighting(CDC *dc,CD3I32 *p1,CD3I32 *p2,CD3I32 *p3,CColorROPU32 color
}
#help_index "Graphics/Device Contexts"
public U0 DCFill(CDC *dc=NULL,CColorROPU32 val=COLOR_TRANSPARENT)
{
if (!dc) dc=gr_dc;
public U0 DCFill(CDC *dc=NULL,CColorROPU32 val=TRANSPARENT)
{//Fill entire device context with color.
if (!dc) dc=gr.dc;
MemSet(dc->body,val,dc->width_internal*dc->height);
}
public U0 DCClear(CDC *dc=NULL)
{
if (!dc) dc=gr_dc;
{//Set entire device context image body to 0 (BLACK).
if (!dc) dc=gr.dc;
DCFill(dc,0);
}
public U0 DCRst(CDC *dc)
{
{//Reset $LK,"CDC",A="MN:CDC"$ structure members but not image body, itself.
dc->color=BLACK;
dc->color2=BLACK;
dc->bkcolor=BLACK;
@@ -149,15 +147,16 @@ public U0 DCRst(CDC *dc)
dc->transform=&GrTransform;
dc->lighting =&GrLighting;
GrIdentEqu(dc->r);
dc->r_norm=gr_scale;
dc->r_norm=GR_SCALE;
dc->flags&=~(DCF_SYMMETRY|DCF_TRANSFORMATION|DCF_JUST_MIRROR);
}
public U0 DCExtentsInit(CDC *dc=NULL)
{//NULL means gr_dc
{//Init markers for extent of next newly drawn graphics.
//NULL means gr.dc
//See $LK,"::/Demo/Graphics/Extents.CPP"$
//You should clear the record flag yourself
if (!dc) dc=gr_dc;
if (!dc) dc=gr.dc;
dc->flags|=DCF_RECORD_EXTENTS;
dc->min_x=MAX_I64;
dc->max_x=MIN_I64;
@@ -166,9 +165,10 @@ public U0 DCExtentsInit(CDC *dc=NULL)
}
public CDC *DCAlias(CDC *dc=NULL,CTask *task=NULL)
{//NULL means gr_dc
{//Create alias of dc, so can change pen, color, etc.
//NULL means gr.dc
CDC *result;
if (!dc) dc=gr_dc;
if (!dc) dc=gr.dc;
if (!task) task=Fs;
if (dc->dc_signature!=DCS_SIGNATURE_VAL)
Dbg;
@@ -182,10 +182,10 @@ public CDC *DCAlias(CDC *dc=NULL,CTask *task=NULL)
return result;
}
public CDC *DCNew(I64 width,I64 height,CTask *task=NULL,Bool null_bitmap=FALSE)
{//This internally only allows widths which are divisible by 8
//Don't forget these $MA-X+PU,"sizeof(CDC)",LM="Grep(\"sizeof(CDC)\",\"/*\");View;"$.
{//Create new width x height device context.
//Internally only allows widths which are divisible by 8.
//Don't forget these $MA-X+PU,"sizeof(CDC)",LM="Grep(\"sizeof(CDC)\",\"/*\");View;"$.
CDC *result;
if (!task) task=Fs;
result=CAlloc(sizeof(CDC),task);
@@ -206,7 +206,7 @@ public CDC *DCNew(I64 width,I64 height,CTask *task=NULL,Bool null_bitmap=FALSE)
}
public U0 DCDel(CDC *dc)
{
{//Free dc, image body, rot mat and depth buf.
if (!dc) return;
if (dc->dc_signature!=DCS_SIGNATURE_VAL)
Dbg;
@@ -219,7 +219,7 @@ public U0 DCDel(CDC *dc)
}
public I64 DCSize(CDC *dc)
{
{//Mem size of header, image body and depth buffer.
if (dc)
return MSize2(dc)+MSize2(dc->body)+MSize2(dc->depth_buf);
else
@@ -227,20 +227,20 @@ public I64 DCSize(CDC *dc)
}
public U0 DCDepthBufRst(CDC *dc)
{
{//Reset device context depth buf to far away.
if (dc->depth_buf)
MemSetU32(dc->depth_buf,MAX_I32,dc->width_internal*dc->height);
}
public U0 DCAllocDepthBuf(CDC *dc)
{
{//Allocate a 32-bit depth buffer for device context.
Free(dc->depth_buf);
dc->depth_buf=MAlloc(dc->width_internal*dc->height*sizeof(I32),dc->mem_task);
DCDepthBufRst(dc);
}
public CDC *DCCopy(CDC *dc,CTask *task=NULL)
{
{//Alloc copy of dc, including image body, rot mat and depth buf.
CDC *result;
if (!dc) return NULL;
if (dc->dc_signature!=DCS_SIGNATURE_VAL)
@@ -249,12 +249,13 @@ public CDC *DCCopy(CDC *dc,CTask *task=NULL)
GrSetRotMat(result,MAllocIdentical(dc->r,task));
result->mem_task=task;
result->body=MAllocIdentical(dc->body,task);
result->depth_buf=MAllocIdentical(dc->depth_buf,task);
return result;
}
public U0 DCMono(CDC *dc,
I64 quest=COLOR_TRANSPARENT,I64 true_color=0,I64 false_color=COLOR_MONO)
{
I64 quest=TRANSPARENT,I64 true_color=0,I64 false_color=COLOR_MONO)
{//Set entire device context to one of two colors.
I64 i;
U8 *dst;
dst=dc->body;
@@ -266,8 +267,8 @@ public U0 DCMono(CDC *dc,
*dst++=false_color;
}
public I64 DCColorChg(CDC *dc,I64 src_color,I64 dst_color=COLOR_TRANSPARENT)
{
public I64 DCColorChg(CDC *dc,I64 src_color,I64 dst_color=TRANSPARENT)
{//Find and replace src color with dst in device context.
I64 i,result=0;
U8 *dst;
dst=dc->body;
@@ -282,7 +283,7 @@ public I64 DCColorChg(CDC *dc,I64 src_color,I64 dst_color=COLOR_TRANSPARENT)
}
public U8 *DCSave(CDC *dc,I64 *_size=NULL,Bool compressed=TRUE)
{ //stores to mem
{//Stores device context to mem, perhaps, with compression.
U8 *result,*ptr,*body;
Bool old_preempt;
CArcCompress *ac;
@@ -321,7 +322,7 @@ public U8 *DCSave(CDC *dc,I64 *_size=NULL,Bool compressed=TRUE)
}
public CDC *DCLoad(U8 *src,I64 *_size=NULL,CTask *task=NULL)
{ //loads from mem
{//Loads device context from mem.
CDC *result;
U8 *ptr=src;
CArcCompress *ac;
@@ -352,7 +353,7 @@ public CDC *DCLoad(U8 *src,I64 *_size=NULL,CTask *task=NULL)
#help_index "Graphics/Device Contexts;Graphics/GRA Files"
public I64 GRAWrite(U8 *filename,CDC *dc)
{ // TempleOS GRA File
{//TempleOS GRA File.
I64 size;
U8 *st=DftExt(filename,"GRA.Z"),
*src=DCSave(dc,&size);
@@ -363,7 +364,7 @@ public I64 GRAWrite(U8 *filename,CDC *dc)
}
public CDC *GRARead(U8 *filename,CTask *task=NULL)
{ // TempleOS GRA File
{//TempleOS GRA File.
CDC *dc=NULL;
U8 *st=DftExt(filename,"GRA.Z"),
*src=FileRead(st);
@@ -374,7 +375,7 @@ public CDC *GRARead(U8 *filename,CTask *task=NULL)
return dc;
}
#help_index "Graphics/Sprite;Graphics/GRA Files;Doc/Output"
#help_index "Graphics/Sprite;Graphics/GRA Files;DolDoc/Output"
public U0 DocGRAFile(CDoc *doc=NULL,U8 *filename)
{//Put a GRA file into a document as a sprite.
CDC *dc=GRARead(filename);
@@ -386,12 +387,13 @@ public U0 DocGRAFile(CDoc *doc=NULL,U8 *filename)
#help_index "Graphics/Device Contexts;Graphics/Screen"
public CDC *DCCaptureScreen(CTask *task=NULL)
{
{//Capture screen to a device context.
CDC *dc;
U8 *dst;
WinMgrSync(2,TRUE);
dc=DCCopy(gr_screen_image,task);
dc=DCCopy(gr.screen_image,task);
dst=MAlloc(dc->body_size,task);
//Pick background color that never occurs. COLOR_INVALID
GrBitMap4ToBitMap8(dst,dc->body,dc->body_size/2,COLOR_INVALID);
Free(dc->body);
dc->body=dst;
@@ -400,7 +402,7 @@ public CDC *DCCaptureScreen(CTask *task=NULL)
#help_index "Graphics/GRA Files;Graphics/Screen"
public I64 GRACaptureScreen(U8 *filename)
{ // TempleOS GRA File
{//Capture screen to a TempleOS GRA File.
I64 size;
CDC *dc=DCCaptureScreen;
size=GRAWrite(filename,dc);
Adam/Gr/GrGlbls.CPP
+46 -39
View File
@@ -1,49 +1,56 @@
#help_index "Graphics/Device Contexts;Graphics/Screen"
public CDC *gr_screen_image, //This is read only.
*gr_dc=NULL; //Persistent
CDC *gr_dc1=NULL,
*gr_dc2=NULL, //Updated every refresh
*gr_dc_cache,
*gr_zoomed_dc;
#help_index "Graphics"
#help_index "Graphics/Screen"
U16 *gr_win_uncovered_bitmap=NULL,gr_highest_uncovered;
U16 *gr_vga_text_cache;
public I64 gr_pan_text_x=0,gr_pan_text_y=0; // [-7,7]
public U0 (*fp_final_screen_update)(CDC *dc)=NULL;
public U0 (*fp_wall_paper)(CTask *task)=NULL;
public class CGrGlbls
{
I64 *to_8_bits,*to_8_colors;
CDC *screen_image, //Read only.
*dc, //Persistent
*dc1,
*dc2, //Updated every refresh
*dc_cache,
*zoomed_dc;
U32 *text_base; //See $LK,"TextBase Layer",A="HI:TextBase Layer"$.
U16 *win_z_buf;
#define SPHT_ELEM_CODE 1
CHashTable *sprite_hash;
U16 *win_uncovered_bitmap;
I64 highest_uncovered;
U16 *vga_text_cache;
I64 pan_text_x,pan_text_y; //[-7,7]
U0 (*fp_final_screen_update)(CDC *dc);
U0 (*fp_wall_paper)(CTask *task);
U0 (*fp_draw_input_ptr)(CDC *dc,I64 x,I64 y);
U0 (*fp_draw_grab_input_ptr)(CDC *dc,I64 x,I64 y,Bool closed);
U8 *empty_sprite; //Gets assigned $LK,"gr.empty_sprite",A="FF:::/Adam/WallPaper.CPP,empty_sprite"$
#define GR_NUM_PEN_BRUSHES 64
CDC *gr_pen_brushes[GR_NUM_PEN_BRUSHES],
*gr_collision_pen_brushes[GR_NUM_PEN_BRUSHES],
*gr_even_pen_brushes[GR_NUM_PEN_BRUSHES],
*gr_odd_pen_brushes[GR_NUM_PEN_BRUSHES];
#define GR_MAX_SCREEN_ZOOM 8
U8 *gr_screen_zoom_tables[GR_MAX_SCREEN_ZOOM+1];
I64 gr_screen_zoom=1,grsx=0,grsy=0;
//When zoomed, this keeps the mouse centered.
public Bool gr_continuous_scroll=FALSE;
CDC *pen_brushes[GR_NUM_PEN_BRUSHES],
*collision_pen_brushes[GR_NUM_PEN_BRUSHES],
*even_pen_brushes[GR_NUM_PEN_BRUSHES],
*odd_pen_brushes[GR_NUM_PEN_BRUSHES];
#define GR_REFRESH_LOG_CNT 16
F64 gr_refresh_time_stamps[GR_REFRESH_LOG_CNT];
I64 gr_refresh_ts_ptr=0;
F64 refresh_time_stamps[GR_REFRESH_LOG_CNT];
I64 refresh_ts_ptr;
#define GR_MAX_SCREEN_ZOOM 8
U8 *screen_zoom_tables[GR_MAX_SCREEN_ZOOM+1];
I64 screen_zoom,sx,sy;
//When zoomed, this keeps the mouse centered.
Bool continuous_scroll;
} gr;
//See $LK,"SYS_BIOS_GR_MODE",A="FF:D:/Kernel/KStart.CPP,SYS_BIOS_GR_MODE:2"$
//See $LK,"SysGrInit",A="MN:SysGrInit"$()
//This allows consts to be used
//instead of vars.
DefinePrint("GR_WIDTH","%d",gr_width);
HashPublic("GR_WIDTH",HTT_DEFINE_STR);
DefinePrint("GR_HEIGHT","%d",gr_height);
HashPublic("GR_HEIGHT",HTT_DEFINE_STR);
;
//Allows consts to be used instead of vars.
HashPublic("GR_WIDTH",HTT_DEFINE_STR);;
HashPublic("GR_HEIGHT",HTT_DEFINE_STR);;
#help_index "Char"
DefinePrint("TEXT_ROWS","%d",text_rows);
HashPublic("TEXT_ROWS",HTT_DEFINE_STR);
DefinePrint("TEXT_COLS","%d",text_cols);
HashPublic("TEXT_COLS",HTT_DEFINE_STR);
;
DefinePrint("TEXT_ROWS","%d",text.rows);;;
HashPublic("TEXT_ROWS",HTT_DEFINE_STR);;;
DefinePrint("TEXT_COLS","%d",text.cols);;;
HashPublic("TEXT_COLS",HTT_DEFINE_STR);;;
Adam/Gr/GrInit.CPP
+46 -68
View File
@@ -9,18 +9,18 @@ U0 GrSetUpTables()
for (i=0;i<256;i++)
for (j=0;j<8;j++)
if (Bt(&i,j))
gr_1_to_8_bits(U8 *)[k++]=0xFF;
gr.to_8_bits(U8 *)[k++]=0xFF;
else
gr_1_to_8_bits(U8 *)[k++]=0x00;
gr.to_8_bits(U8 *)[k++]=0x00;
k=0;
for (i=0;i<256;i++)
for (j=0;j<8;j++)
gr_1_to_8_colors(U8 *)[k++]=i;
gr.to_8_colors(U8 *)[k++]=i;
for (i=0;i<GR_NUM_PEN_BRUSHES;i++) {
k=i+1;
dc=DCNew(i,i);
gr_pen_brushes[i]=dc;
gr.pen_brushes[i]=dc;
dc->color=COLOR_MONO;
rr=k*k;
for (y=1;y<k;y++)
@@ -29,8 +29,8 @@ U0 GrSetUpTables()
GrPlot0(dc,x-1,y-1);
dc=DCNew(i,i);
gr_collision_pen_brushes[i]=dc;
dc->color=COLOR_INVALID;
gr.collision_pen_brushes[i]=dc;
dc->color=COLOR_INVALID;//Want color that never occurs.
rr=k*k;
for (y=1;y<k;y++)
for (x=1;x<k;x++)
@@ -38,7 +38,7 @@ U0 GrSetUpTables()
GrPlot0(dc,x-1,y-1);
dc=DCNew(i,i);
gr_even_pen_brushes[i]=dc;
gr.even_pen_brushes[i]=dc;
dc->color=COLOR_MONO;
rr=k*k;
for (y=1;y<k;y++)
@@ -47,7 +47,7 @@ U0 GrSetUpTables()
GrPlot0(dc,x-1,y-1);
dc=DCNew(i,i);
gr_odd_pen_brushes[i]=dc;
gr.odd_pen_brushes[i]=dc;
dc->color=COLOR_MONO;
rr=k*k;
for (y=1;y<k;y++)
@@ -55,18 +55,18 @@ U0 GrSetUpTables()
if (((x-1)^(y-1))&1 && SqrI64(y*2-k)+SqrI64(x*2-k)<rr)
GrPlot0(dc,x-1,y-1);
}
if (text_mode) {
if (!sys_bios_gr_mode) { //if text mode
MemSet(VGA_TEXT_MEM_BASE,0,TEXT_ROWS*TEXT_COLS*sizeof(U16));
MemSet(gr_vga_text_cache,0,TEXT_ROWS*TEXT_COLS*sizeof(U16));
MemSet(gr.vga_text_cache,0,TEXT_ROWS*TEXT_COLS*sizeof(U16));
} else {
OutU8(VGA_SC_INDEX,VGA_MAP_MASK);
OutU8(VGA_SC_DATA,0x0F);
//Virtual Box crashes on the following for some reason.
// MemSet(VGA_GRAPHIC_MEM_BASE,0,GR_HEIGHT*GR_WIDTH>>3);
MemSet(gr_screen_image->body,0,GR_WIDTH*GR_HEIGHT>>1);
MemSet(gr.screen_image->body,0,GR_WIDTH*GR_HEIGHT>>1);
}
for (i=1;i<=GR_MAX_SCREEN_ZOOM;i++) {
dst=gr_screen_zoom_tables[i]=MAlloc(256*i);
dst=gr.screen_zoom_tables[i]=MAlloc(256*i);
for (j=0;j<256;j++) {
m=0;
for (k=0;k<8;k++) {
@@ -80,13 +80,13 @@ U0 GrSetUpTables()
}
}
for (i=0;i<GR_REFRESH_LOG_CNT;i++)
gr_refresh_time_stamps[i]=tS;
gr.refresh_time_stamps[i]=tS;
}
#help_index "Graphics/Screen;Windows"
U0 WinZBufFill(CTask *task)
{ //Not public
{//Not public
I64 y,t,b,l,r,w;
if (!Bt(&task->display_flags,DISPLAYf_NO_BORDER)) {
if (task->win_top-1>0)
@@ -129,19 +129,19 @@ U0 WinZBufFill(CTask *task)
r=ClampI64(r,l,TEXT_COLS-1);
if (w=r-l+1)
for (y=t;y<=b;y++)
MemSetU16(gr_win_z_buf(U8 *)+(y*TEXT_COLS+l)*sizeof(U16),
MemSetU16(gr.win_z_buf(U8 *)+(y*TEXT_COLS+l)*sizeof(U16),
task->win_z_num,w);
}
public U0 WinZBufUpdate()
{ //You might have to call this if you are doing graphics outside
//the window mgr callback routines. Call it if, for example,
//a pop-up window closes and you need to refresh before graphics.
{//Might have to call this if you are doing graphics outside winmgr callback routines.
//Call it if, for example, when a pop-up window closes and you need to refresh
//before graphics.
I64 i,z=1;
U16 *ptr;
CTask *task,*task1;
Bool old_preempt=Preempt(OFF);
if (gr_win_z_buf) {
if (gr.win_z_buf) {
LBtr(&sys_semas[SYS_SEMA_UPDATE_WIN_Z_BUF],0);
task1=task=sys_winmgr_task;
do {
@@ -153,71 +153,49 @@ public U0 WinZBufUpdate()
task=task->next_task;
} while (task!=task1 && z<0x10000);
MemSet(gr_win_uncovered_bitmap,0,(gr_highest_uncovered+7)>>3+1);
gr_highest_uncovered=z-1;
for (ptr=gr_win_z_buf,i=TEXT_ROWS*TEXT_COLS;i;i--)
Bts(gr_win_uncovered_bitmap,*ptr++);
MemSet(gr.win_uncovered_bitmap,0,(gr.highest_uncovered+7)>>3+1);
gr.highest_uncovered=z-1;
for (ptr=gr.win_z_buf,i=TEXT_ROWS*TEXT_COLS;i;i--)
Bts(gr.win_uncovered_bitmap,*ptr++);
}
Preempt(old_preempt);
}
#help_index "Graphics/Char;Char"
public U0 WinTextFill(I64 d,CTask *task=NULL)
{//You probably don't want this.
I64 y,w,t,b,l,r;
if (!task) task=Fs;
if (!TaskValidate(task)) return;
if (task->win_top>0)
t=task->win_top;
else
t=0;
if (task->win_bottom<TEXT_ROWS)
b=task->win_bottom;
else
b=TEXT_ROWS-1;
if (task->win_left>0)
l=task->win_left;
else
l=0;
if (task->win_right<TEXT_COLS)
r=task->win_right;
else
r=TEXT_COLS-1;
if (w=r-l+1)
for (y=t;y<=b;y++)
MemSetU32(gr_text_base(U8 *)+(y*TEXT_COLS+l)*sizeof(U32),
d,w);
}
#help_index "Graphics"
U0 GrInit2()
{
MemSet(&gr,0,sizeof(CGrGlbls));
gr.sprite_hash=HashTableNew(512);
HashDefineLstAdd("ST_SPRITE_ELEM_CODES",SPHT_ELEM_CODE,gr.sprite_hash);
gr.screen_zoom=1;
SetStdPalette;
fp_set_std_palette=&SetStdPalette;
SetVGAPalette4Indices;
gr_1_to_8_bits =MAlloc(256*sizeof(I64));
gr_1_to_8_colors=MAlloc(256*sizeof(I64));
gr.to_8_bits =MAlloc(256*sizeof(I64));
gr.to_8_colors=MAlloc(256*sizeof(I64));
gr_text_base=CAlloc(TEXT_ROWS*TEXT_COLS*sizeof(U32));
gr_vga_text_cache=MAlloc(TEXT_ROWS*TEXT_COLS*sizeof(U16));
gr_win_uncovered_bitmap=CAlloc(65536/8);
gr_highest_uncovered=0;
gr_win_z_buf=MAlloc(TEXT_ROWS*TEXT_COLS*sizeof(U16));
gr.text_base=CAlloc(TEXT_ROWS*TEXT_COLS*sizeof(U32));
gr.vga_text_cache=MAlloc(TEXT_ROWS*TEXT_COLS*sizeof(U16));
gr.win_uncovered_bitmap=CAlloc(65536/8);
gr.highest_uncovered=0;
gr.win_z_buf=MAlloc(TEXT_ROWS*TEXT_COLS*sizeof(U16));
gr_dc2=DCNew(GR_WIDTH,GR_HEIGHT);
gr_dc2->flags|=DCF_SCREEN_BITMAP;
gr_dc_cache=DCNew(GR_WIDTH,GR_HEIGHT);
gr.dc2=DCNew(GR_WIDTH,GR_HEIGHT);
gr.dc2->flags|=DCF_SCREEN_BITMAP;
gr.dc_cache=DCNew(GR_WIDTH,GR_HEIGHT);
gr_dc=DCNew(GR_WIDTH,GR_HEIGHT);
gr_dc->flags|=DCF_SCREEN_BITMAP|DCF_ON_TOP;
gr.dc=DCNew(GR_WIDTH,GR_HEIGHT);
gr.dc->flags|=DCF_SCREEN_BITMAP|DCF_ON_TOP;
DCFill;
gr_dc1=DCNew(GR_WIDTH,GR_HEIGHT);
gr_dc1->flags|=DCF_SCREEN_BITMAP;
gr.dc1=DCNew(GR_WIDTH,GR_HEIGHT);
gr.dc1->flags|=DCF_SCREEN_BITMAP;
gr_screen_image=DCNew(GR_WIDTH,GR_HEIGHT); //4-bit
gr_zoomed_dc =DCNew(GR_WIDTH,GR_HEIGHT); //4-bit
gr_zoomed_dc->flags|=DCF_SCREEN_BITMAP;
gr.screen_image=DCNew(GR_WIDTH,GR_HEIGHT); //4-bit
gr.zoomed_dc =DCNew(GR_WIDTH,GR_HEIGHT); //4-bit
gr.zoomed_dc->flags|=DCF_SCREEN_BITMAP;
}
GrInit2;
Adam/Gr/GrPalette.CPP
+8 -8
View File
@@ -10,15 +10,15 @@ DefineLstLoad("ST_RAINBOW_10",
"GREEN\0BLUE\0PURPLE\0LTGRAY\0WHITE\0");
U0 SetVGAPalette4Indices()
{//4-bit (16 color)
/*There is a level of indirection we wish to identity map.
{/*4-bit (16 color)
There is a level of indirection we wish to identity map.
This sets the 16-colors to use
the first 16 DAC rgb entries, so
we never need to worry about indexes,
just DAC palette settings.
*/
I64 i;
if (text_mode) return;
if (!sys_bios_gr_mode) return;
PUSHFD
CLI
while (LBts(&sys_semas[SYS_SEMA_VGA],0))
@@ -36,8 +36,8 @@ just DAC palette settings.
}
public U0 SetVGAPaletteColor(I64 color_num,CBGR bgr)
{ //6-bits per r,dc and g
if (text_mode) return;
{//6-bits per b, g and r.
if (!sys_bios_gr_mode) return;
PUSHFD
CLI
while (LBts(&sys_semas[SYS_SEMA_VGA],0))
@@ -52,9 +52,9 @@ public U0 SetVGAPaletteColor(I64 color_num,CBGR bgr)
}
public CBGR GetVGAPaletteColor(I64 color_num)
{ //6-bits per r,dc and g
{//6-bits per b, g and r.
CBGR result=0;
if (text_mode) return 0;
if (!sys_bios_gr_mode) return 0;
PUSHFD
CLI
while (LBts(&sys_semas[SYS_SEMA_VGA],0))
@@ -96,6 +96,6 @@ public U0 SetVGAPalette4(CBGR *bgr)
}
public U0 SetStdPalette()
{
{//Activate std palette.
SetVGAPalette4(vga_palette4_std);
}
Adam/Gr/GrPrimatives.CPP
+85 -208
View File
@@ -1,7 +1,7 @@
#help_index "Graphics"
public Bool GrClamp(CDC *dc=gr_dc,I64 *left,I64 *top,I64 *right,I64 *bottom,I64 width=0,I64 height=0)
{ //returns screen, not window coordinates
public Bool GrClamp(CDC *dc=gr.dc,I64 *left,I64 *top,I64 *right,I64 *bottom,I64 width=0,I64 height=0)
{//Returns screen, not window coordinates.
CTask *win_task;
*left=0;
*top=0;
@@ -29,8 +29,8 @@ public Bool GrClamp(CDC *dc=gr_dc,I64 *left,I64 *top,I64 *right,I64 *bottom,I64
return *left<=*right && *top<=*bottom;
}
Bool DCClipLine(CDC *dc=gr_dc,I64 *x1,I64 *y1,I64 *x2,I64 *y2,I64 width=0,I64 height=0)
{ //also converts window to screen coordinates
Bool DCClipLine(CDC *dc=gr.dc,I64 *x1,I64 *y1,I64 *x2,I64 *y2,I64 width=0,I64 height=0)
{//Also converts window to screen coordinates
I64 left,top,right,bottom;
CTask *win_task;
if (GrClamp(dc,&left,&top,&right,&bottom,width,height)) {
@@ -46,8 +46,8 @@ Bool DCClipLine(CDC *dc=gr_dc,I64 *x1,I64 *y1,I64 *x2,I64 *y2,I64 width=0,I64 he
return FALSE;
}
public Bool GrPlot(CDC *dc=gr_dc,I64 x,I64 y)
{ //Clipping but No transformation or pen width
public Bool GrPlot(CDC *dc=gr.dc,I64 x,I64 y)
{//2D. Clipping but No transformation or pen width.
I32 *db=dc->depth_buf;
CTask *win_task;
CColorROPU32 old_color;
@@ -76,8 +76,8 @@ public Bool GrPlot(CDC *dc=gr_dc,I64 x,I64 y)
return TRUE;
}
Bool GrPlot1(CDC *dc=gr_dc,I64 x,I64 y)
{ //Clipping but No transformation or pen width, called with db_z set
Bool GrPlot1(CDC *dc=gr.dc,I64 x,I64 y)
{//Clipping but No transformation or pen width, called with db_z set
CTask *win_task;
CColorROPU32 old_color;
if (dc->brush) {
@@ -106,9 +106,9 @@ Bool GrPlot1(CDC *dc=gr_dc,I64 x,I64 y)
return TRUE;
}
public I64 GrPeek(CDC *dc=gr_dc,I64 x,I64 y)
public I64 GrPeek(CDC *dc=gr.dc,I64 x,I64 y)
{//2D. Clipping but no transformation.
//Returns pix color or -1 if off-screen or covered.
{ //Clipping but No transformation
CTask *win_task;
if (dc->flags & DCF_SCREEN_BITMAP) {
win_task=dc->win_task;
@@ -234,10 +234,8 @@ I64 GrFloodFillRay(CDC *dc,I64 x,I64 y,I64 z,I32 *db)
return result;
}
public I64 GrFloodFill(CDC *dc=gr_dc,I64 x,I64 y,Bool not_color=FALSE,I64 z=0,I32 *db=NULL)
{
//Ignore z and db.
public I64 GrFloodFill(CDC *dc=gr.dc,I64 x,I64 y,Bool not_color=FALSE,I64 z=0,I32 *db=NULL)
{//3D. Ignore z and db.
//not_color=TRUE means fill up to everything which is not the current color.
//not_color=FALSE means fill all parts equal to the color under the point.
//Returns cnt of pixs changed
@@ -273,8 +271,8 @@ ff_done:
return result;
}
public Bool GrPlot3B(CDC *dc=gr_dc,I64 x,I64 y,I64 z)
{ //Clipping and transformation but no pen_width
public Bool GrPlot3B(CDC *dc=gr.dc,I64 x,I64 y,I64 z)
{//3D. Clipping and transformation but no pen_width.
I64 _x,_y,_z;
Bool was_transform=FALSE,was_symmetry=FALSE;
if (dc->flags & DCF_TRANSFORMATION) {
@@ -302,9 +300,8 @@ gr_done:
return TRUE;
}
public Bool GrPlot3(CDC *dc=gr_dc,I64 x,I64 y,I64 z)
{ //clipping and transformation and pen width
public Bool GrPlot3(CDC *dc=gr.dc,I64 x,I64 y,I64 z)
{//3D. Clipping and transformation and pen width.
I64 _x,_y,_z,i,j,w,dist;
CColorROPU32 old_color=dc->color;
Bool record,was_transform=FALSE,was_symmetry=FALSE;
@@ -334,43 +331,43 @@ public Bool GrPlot3(CDC *dc=gr_dc,I64 x,I64 y,I64 z)
if (dc->color.c1.rop&ROPBF_DITHER) {
dc->color.c1.rop=dc->color.c0.rop;
if (((x-w)^(y-w))&1) {
record=GrBlot3(dc,x-w,y-w,z,gr_odd_pen_brushes[dc->pen_width]);
record=GrBlot3(dc,x-w,y-w,z,gr.odd_pen_brushes[dc->pen_width]);
dc->color.c0=dc->color.c1;
record=GrBlot3(dc,x-w,y-w,z,gr_even_pen_brushes[dc->pen_width]);
record=GrBlot3(dc,x-w,y-w,z,gr.even_pen_brushes[dc->pen_width]);
} else {
record=GrBlot3(dc,x-w,y-w,z,gr_even_pen_brushes[dc->pen_width]);
record=GrBlot3(dc,x-w,y-w,z,gr.even_pen_brushes[dc->pen_width]);
dc->color.c0=dc->color.c1;
record=GrBlot3(dc,x-w,y-w,z,gr_odd_pen_brushes[dc->pen_width]);
record=GrBlot3(dc,x-w,y-w,z,gr.odd_pen_brushes[dc->pen_width]);
}
} else {
if (dc->color.c0.rop==ROPB_COLLISION) {
if (dc->color.c0.color!=dc->bkcolor.c0.color && dc->color.c0.color!=COLOR_TRANSPARENT)
record=GrBlot3(dc,x-w,y-w,z,gr_collision_pen_brushes[dc->pen_width]);
if (dc->color.c0.color!=dc->bkcolor.c0.color && dc->color.c0.color!=TRANSPARENT)
record=GrBlot3(dc,x-w,y-w,z,gr.collision_pen_brushes[dc->pen_width]);
else
record=FALSE;
} else
record=GrBlot3(dc,x-w,y-w,z,gr_pen_brushes[dc->pen_width]);
record=GrBlot3(dc,x-w,y-w,z,gr.pen_brushes[dc->pen_width]);
}
} else {
if (dc->color.c1.rop&ROPBF_DITHER) {
dc->color.c1.rop=dc->color.c0.rop;
if (((x-w)^(y-w))&1) {
record=GrBlot(dc,x-w,y-w,gr_odd_pen_brushes[dc->pen_width]);
record=GrBlot(dc,x-w,y-w,gr.odd_pen_brushes[dc->pen_width]);
dc->color.c0=dc->color.c1;
record=GrBlot(dc,x-w,y-w,gr_even_pen_brushes[dc->pen_width]);
record=GrBlot(dc,x-w,y-w,gr.even_pen_brushes[dc->pen_width]);
} else {
record=GrBlot(dc,x-w,y-w,gr_even_pen_brushes[dc->pen_width]);
record=GrBlot(dc,x-w,y-w,gr.even_pen_brushes[dc->pen_width]);
dc->color.c0=dc->color.c1;
record=GrBlot(dc,x-w,y-w,gr_odd_pen_brushes[dc->pen_width]);
record=GrBlot(dc,x-w,y-w,gr.odd_pen_brushes[dc->pen_width]);
}
} else {
if (dc->color.c0.rop==ROPB_COLLISION) {
if (dc->color.c0.color!=dc->bkcolor.c0.color && dc->color.c0.color!=COLOR_TRANSPARENT)
record=GrBlot(dc,x-w,y-w,gr_collision_pen_brushes[dc->pen_width]);
if (dc->color.c0.color!=dc->bkcolor.c0.color && dc->color.c0.color!=TRANSPARENT)
record=GrBlot(dc,x-w,y-w,gr.collision_pen_brushes[dc->pen_width]);
else
record=FALSE;
} else
record=GrBlot(dc,x-w,y-w,gr_pen_brushes[dc->pen_width]);
record=GrBlot(dc,x-w,y-w,gr.pen_brushes[dc->pen_width]);
}
}
if (record) {
@@ -380,7 +377,7 @@ public Bool GrPlot3(CDC *dc=gr_dc,I64 x,I64 y,I64 z)
y+=win_task->pix_top+win_task->scroll_y;
}
if (dc->flags & DCF_LOCATE_NEAREST) {
dist=DistI64(x,y,dc->cur_x,dc->cur_y);
dist=DistSqrI64(x,y,dc->cur_x,dc->cur_y);
if (dist<dc->nearest_dist) {
dc->nearest_sprite_elem_num=dc->cur_sprite_elem_num;
dc->nearest_dist=dist;
@@ -398,7 +395,7 @@ public Bool GrPlot3(CDC *dc=gr_dc,I64 x,I64 y,I64 z)
}
}
}
} else if (dc->pen_width & 1) { //TODO Dither
} else if (dc->pen_width & 1) {//TODO Dither
for (i=-w;i<=w;i++)
for (j=-w;j<=w;j++)
GrPlot1(dc,x+i,y+j);
@@ -436,8 +433,8 @@ Bool GrLinePlot(CDC *dc,I64 x,I64 y,I64 z)
return TRUE;
}
public Bool GrLine(CDC *dc=gr_dc,I64 x1,I64 y1,I64 x2,I64 y2,I64 step=1,I64 start=0)
{
public Bool GrLine(CDC *dc=gr.dc,I64 x1,I64 y1,I64 x2,I64 y2,I64 step=1,I64 start=0)
{//2D. Clipping but not transformation.
Bool result=FALSE;
I32 *db=dc->depth_buf;
dc->depth_buf=NULL;
@@ -450,9 +447,9 @@ public Bool GrLine(CDC *dc=gr_dc,I64 x1,I64 y1,I64 x2,I64 y2,I64 step=1,I64 star
return result;
}
public Bool GrCircle(CDC *dc=gr_dc,I64 cx,I64 cy,I64 radius,
public Bool GrCircle(CDC *dc=gr.dc,I64 cx,I64 cy,I64 radius,
I64 step=1,F64 start_radians=0,F64 len_radians=2*ã)
{
{//2D. Clipping but not transformation.
Bool result;
I32 *db=dc->depth_buf;
dc->depth_buf=NULL;
@@ -461,14 +458,14 @@ public Bool GrCircle(CDC *dc=gr_dc,I64 cx,I64 cy,I64 radius,
return result;
}
public Bool GrEllipse(CDC *dc=gr_dc,
public Bool GrEllipse(CDC *dc=gr.dc,
I64 cx,I64 cy,
I64 x_radius,I64 y_radius,
F64 rot_angle=0,
I64 step=1,
F64 start_radians=0,
F64 len_radians=2*ã)
{
{//2D. Clipping but not transformation.
Bool result;
I32 *db=dc->depth_buf;
dc->depth_buf=NULL;
@@ -477,14 +474,14 @@ public Bool GrEllipse(CDC *dc=gr_dc,
return result;
}
public Bool GrRegPoly(CDC *dc=gr_dc,
public Bool GrRegPoly(CDC *dc=gr.dc,
I64 cx,I64 cy,
I64 x_radius,I64 y_radius,I64 sides,
F64 rot_angle=0,
I64 step=1,
F64 start_radians=0,
F64 len_radians=2*ã)
{
{//2D. Clipping but no transform or pen width.
Bool result;
I32 *db=dc->depth_buf;
dc->depth_buf=NULL;
@@ -494,28 +491,28 @@ public Bool GrRegPoly(CDC *dc=gr_dc,
return result;
}
public Bool Gr2Bezier(CDC *dc=gr_dc,CD3I32 *ctrl)
{
public Bool Gr2Bezier(CDC *dc=gr.dc,CD3I32 *ctrl)
{//2nd order. Clipping but no transform or pen width.
return Bezier2(dc,ctrl,&GrLinePlot);
}
public Bool Gr3Bezier(CDC *dc=gr_dc,CD3I32 *ctrl)
{
public Bool Gr3Bezier(CDC *dc=gr.dc,CD3I32 *ctrl)
{//3rd order. Clipping but no transform or pen width.
return Bezier3(dc,ctrl,&GrLinePlot);
}
public Bool Gr2BSpline(CDC *dc=gr_dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE)
{
public Bool Gr2BSpline(CDC *dc=gr.dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE)
{//2nd order. Clipping but no transform or pen width.
return BSpline2(dc,ctrl,cnt,&GrLinePlot,closed);
}
public Bool Gr3BSpline(CDC *dc=gr_dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE)
{
public Bool Gr3BSpline(CDC *dc=gr.dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE)
{//3rd order. Clipping but no transform or pen width.
return BSpline3(dc,ctrl,cnt,&GrLinePlot,closed);
}
public Bool GrLine3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,I64 x2,I64 y2,I64 z2,I64 step=1,I64 start=0)
{
public Bool GrLine3(CDC *dc=gr.dc,I64 x1,I64 y1,I64 z1,I64 x2,I64 y2,I64 z2,I64 step=1,I64 start=0)
{//3D. Transformation with pen width.
I64 _x1,_y1,_z1,_x2,_y2,_z2;
Bool result=FALSE,was_transform=FALSE,was_symmetry=FALSE;
if (dc->flags & DCF_TRANSFORMATION) {
@@ -530,7 +527,7 @@ public Bool GrLine3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,I64 x2,I64 y2,I64 z2,I64
_x2=x2; _y2=y2; _z2=z2;
GrReflect(dc,&_x2,&_y2,&_z2);
dc->flags&=~DCF_SYMMETRY;
if (step==1 && !start && !dc->brush && dc->pen_width<2 && !dc->depth_buf) { //TODO: clip z for depth buf
if (step==1 && !start && !dc->brush && dc->pen_width<2 && !dc->depth_buf) {//TODO: clip z for depth buf
if (DCClipLine(dc,&_x1,&_y1,&_x2,&_y2))
result=Line(dc,_x1,_y1,0,_x2,_y2,0,&GrLinePlot0,step,start);
} else
@@ -539,7 +536,7 @@ public Bool GrLine3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,I64 x2,I64 y2,I64 z2,I64
if (dc->flags&DCF_JUST_MIRROR)
goto gr_done;
}
if (step==1 && !start && !dc->brush && dc->pen_width<2 && !dc->depth_buf) { //TODO: clip z for depth buf
if (step==1 && !start && !dc->brush && dc->pen_width<2 && !dc->depth_buf) {//TODO: clip z for depth buf
if (DCClipLine(dc,&x1,&y1,&x2,&y2))
result|=Line(dc,x1,y1,0,x2,y2,0,&GrLinePlot0,step,start);
} else
@@ -554,18 +551,16 @@ gr_done:
#help_index "Graphics/Char;Char/Graphics"
public Bool GrPutChar3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 ch)
{ //transformation
//DCF_SYMMETRY is silly.
public Bool GrPutChar3(CDC *dc=gr.dc,I64 x,I64 y,I64 z,U8 ch)
{//3D. Transformation. DCF_SYMMETRY is silly.
if (dc->flags & DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
return GrPutChar(dc,x,y,ch);
}
public I64 GrPrint3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *fmt,...)
{ //transformation
//DCF_SYMMETRY is silly.
U8 *buf=SPrintJoin(NULL,fmt,argc,argv);
public I64 GrPrint3(CDC *dc=gr.dc,I64 x,I64 y,I64 z,U8 *fmt,...)
{//3D. Transformation. DCF_SYMMETRY is silly.
U8 *buf=StrPrintJoin(NULL,fmt,argc,argv);
I64 result;
if (dc->flags & DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
@@ -574,11 +569,9 @@ public I64 GrPrint3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *fmt,...)
return result;
}
public I64 GrVPrint3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *fmt,...)
{ //Vertical text
//transformation
//DCF_SYMMETRY is silly.
U8 *buf=SPrintJoin(NULL,fmt,argc,argv);
public I64 GrVPrint3(CDC *dc=gr.dc,I64 x,I64 y,I64 z,U8 *fmt,...)
{//3D. Vertical text. Transformation. DCF_SYMMETRY is silly.
U8 *buf=StrPrintJoin(NULL,fmt,argc,argv);
I64 result;
if (dc->flags & DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
@@ -589,14 +582,14 @@ public I64 GrVPrint3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *fmt,...)
#help_index "Graphics"
public Bool GrEllipse3(CDC *dc=gr_dc,
public Bool GrEllipse3(CDC *dc=gr.dc,
I64 cx,I64 cy,I64 cz,
I64 x_radius,I64 y_radius,
F64 rot_angle=0,
I64 step=1,
F64 start_radians=0,
F64 len_radians=2*ã)
{
{//3D. Transformation with pen width.
Bool result;
I64 x,y,z,xx,yy,zz;
F64 m1,a1,m2,a2,s,c;
@@ -642,23 +635,23 @@ public Bool GrEllipse3(CDC *dc=gr_dc,
return result;
}
public Bool GrCircle3(CDC *dc=gr_dc,I64 cx,I64 cy,I64 cz,I64 radius,
public Bool GrCircle3(CDC *dc=gr.dc,I64 cx,I64 cy,I64 cz,I64 radius,
I64 step=1,F64 start_radians=0,F64 len_radians=2*ã)
{ //transformation with pen width
{//3D. Transformation with pen width.
if (dc->flags & DCF_TRANSFORMATION)
return GrEllipse3(dc,cx,cy,cz,radius,radius,0,step,start_radians,len_radians);
else
return Circle(dc,cx,cy,cz,radius,&GrPlot3,step,start_radians,len_radians);
}
public Bool GrRegPoly3(CDC *dc=gr_dc,
public Bool GrRegPoly3(CDC *dc=gr.dc,
I64 cx,I64 cy,I64 cz,
I64 x_radius,I64 y_radius,I64 sides,
F64 rot_angle=0,
I64 step=1,
F64 start_radians=0,
F64 len_radians=2*ã)
{
{//3D. Clipping and transform and pen width.
Bool result;
I64 x,y,z,xx,yy,zz;
F64 m1,a1,m2,a2,s,c;
@@ -704,8 +697,8 @@ public Bool GrRegPoly3(CDC *dc=gr_dc,
return result;
}
public I64 GrFloodFill3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,Bool not_color=FALSE)
{ //transformation
public I64 GrFloodFill3(CDC *dc=gr.dc,I64 x1,I64 y1,I64 z1,Bool not_color=FALSE)
{//3D. Transformation.
//not_color=TRUE means fill up to everything which is not the current color.
//not_color=FALSE means fill all parts equal to the color under the point.
//Returns cnt of pixs changed
@@ -731,9 +724,8 @@ gr_done:
#help_index "Graphics;Graphics/Device Contexts"
public I64 GrBlot3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,CDC *img)
{ //Clipping and transformation
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
public I64 GrBlot3(CDC *dc=gr.dc,I64 x1,I64 y1,I64 z1,CDC *img)
{//3D. Clipping and transformation. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
CColorROPU32 old_color=dc->color;
I64 color,reg i,j,w=img->width,h=img->height,
d1,dx1,dy1,dz1,
@@ -828,7 +820,7 @@ public I64 GrBlot3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,CDC *img)
GrPlot(dc,_x2.i32[1],_y2.i32[1]);
}
} else {
if (color!=COLOR_TRANSPARENT) {
if (color!=TRANSPARENT) {
dc->color=old_color&~COLORROP_NO_ROP0_MASK|color;
if (dc->depth_buf) {
dc->db_z=_z2.i32[1];
@@ -918,7 +910,7 @@ normal_image:
GrPlot(dc,x2.i32[1],y2.i32[1]);
}
} else {
if (color!=COLOR_TRANSPARENT) {
if (color!=TRANSPARENT) {
dc->color=old_color&~COLORROP_NO_ROP0_MASK|color;//COLOR
if (dc->depth_buf) {
dc->db_z=z2.i32[1];
@@ -948,8 +940,8 @@ gr_done:
#help_index "Graphics"
public Bool Gr2Bezier3(CDC *dc=gr_dc,CD3I32 *ctrl)
{
public Bool Gr2Bezier3(CDC *dc=gr.dc,CD3I32 *ctrl)
{//2nd order. Clipping and transform and pen width.
Bool result=FALSE;
I64 i,x,y,z,
old_flags=dc->flags;
@@ -993,8 +985,8 @@ gr_done:
return result;
}
public Bool Gr3Bezier3(CDC *dc=gr_dc,CD3I32 *ctrl)
{
public Bool Gr3Bezier3(CDC *dc=gr.dc,CD3I32 *ctrl)
{//3rd order. Clipping and transform and pen width.
Bool result=FALSE;
I64 i,x,y,z,
old_flags=dc->flags;
@@ -1038,8 +1030,8 @@ gr_done:
return result;
}
public I64 Gr2BSpline3(CDC *dc=gr_dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE)
{
public I64 Gr2BSpline3(CDC *dc=gr.dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE)
{//2nd order. Clipping and transform and pen width.
Bool result=FALSE;
I64 i,x,y,z,
old_flags=dc->flags;
@@ -1083,8 +1075,8 @@ gr_done:
return result;
}
public Bool Gr3BSpline3(CDC *dc=gr_dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE)
{
public Bool Gr3BSpline3(CDC *dc=gr.dc,CD3I32 *ctrl,I64 cnt,Bool closed=FALSE)
{//3rd order. Clipping and transform and pen width.
Bool result=FALSE;
I64 i,x,y,z,
old_flags=dc->flags;
@@ -1128,21 +1120,20 @@ gr_done:
return result;
}
public I64 GrFillTri0(CDC *dc=gr_dc,CD3I32 *p1,CD3I32 *p2,CD3I32 *p4)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
public I64 GrFillTri0(CDC *dc=gr.dc,CD3I32 *p1,CD3I32 *p2,CD3I32 *p4)
{//3D. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
//Returns cnt of pixs changed
I64 x1,x2,y,z1,z2,dx1,dy1,dz1,dx2,dy2,dz2,result=0,i,y_min,y_max;
CTask *win_task;
//p1 is min x
if (p4->x<p2->x)
SwapU64(&p4,&p2);
SwapI64(&p4,&p2);
if (p2->x<p1->x)
SwapU64(&p2,&p1);
SwapI64(&p2,&p1);
//p2y<=p4y
if (p4->y<p2->y)
SwapU64(&p4,&p2);
SwapI64(&p4,&p2);
y_min=0;
y_max=dc->height;
@@ -1364,7 +1355,6 @@ p4y
4
2
1
4
@@ -1447,116 +1437,3 @@ p4y
ft_done:
return result;
}
public I64 GrFillPoly3(CDC *dc=gr_dc,I64 n,CD3I32 *poly)
{ //Must be convex.
//Returns cnt of pixs changed
CD3I32 tri[3];
I64 i,j,x,y,z,result=0;
if (n<3) return 0;
if (dc->flags & DCF_SYMMETRY) {
for (i=1;i<n-1;i++) {
j=i-1;
if (i==1) {
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
GrReflect(dc,&x,&y,&z);
tri[0].x=x; tri[0].y=y; tri[0].z=z;
}
j++;
if (i==1) {
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
GrReflect(dc,&x,&y,&z);
}
tri[1].x=x; tri[1].y=y; tri[1].z=z;
j++;
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
GrReflect(dc,&x,&y,&z);
tri[2].x=x; tri[2].y=y; tri[2].z=z;
result+=GrFillTri0(dc,&tri[0],&tri[1],&tri[2]);
}
}
if (dc->flags&DCF_JUST_MIRROR)
return result;
for (i=1;i<n-1;i++) {
j=i-1;
if (i==1) {
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
tri[0].x=x; tri[0].y=y; tri[0].z=z;
}
j++;
if (i==1) {
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
}
tri[1].x=x; tri[1].y=y; tri[1].z=z;
j++;
x=poly[j].x; y=poly[j].y; z=poly[j].z;
if (dc->flags&DCF_TRANSFORMATION)
(*dc->transform)(dc,&x,&y,&z);
tri[2].x=x; tri[2].y=y; tri[2].z=z;
result+=GrFillTri0(dc,&tri[0],&tri[1],&tri[2]);
}
return result;
}
#help_index "Graphics/Mesh"
public I64 Gr3Mesh(CDC *dc=gr_dc,I64 vertex_cnt,CD3I32 *p,I64 tri_cnt,CMeshTri *tri)
{
//Returns cnt of pixs changed
CColorROPU32 old_color=dc->color;
I64 i,x,y,z,result=0;
CD3I32 *pt,*pt_sym,*p_sym,*dst;
CMeshTri *tri_sym=tri;
if (dc->flags&DCF_TRANSFORMATION) {
dst=pt=MAlloc(sizeof(CD3I32)*vertex_cnt);
for (i=0;i<vertex_cnt;i++,p++,dst++) {
x=p->x; y=p->y; z=p->z;
(*dc->transform)(dc,&x,&y,&z);
dst->x=x; dst->y=y; dst->z=z;
}
p=pt;
} else
pt=NULL;
if (dc->flags & DCF_SYMMETRY) {
dst=pt_sym=MAlloc(sizeof(CD3I32)*vertex_cnt);
p_sym=p;
for (i=0;i<vertex_cnt;i++,p_sym++,dst++) {
x=p_sym->x; y=p_sym->y; z=p_sym->z;
GrReflect(dc,&x,&y,&z);
dst->x=x; dst->y=y; dst->z=z;
}
p_sym=pt_sym;
for (i=0;i<tri_cnt;i++,tri_sym++) {
(*dc->lighting)(dc,&p_sym[tri_sym->nums[0]],&p_sym[tri_sym->nums[2]],&p_sym[tri_sym->nums[1]],tri_sym->color);
result+=GrFillTri0(dc,&p_sym[tri_sym->nums[0]],&p_sym[tri_sym->nums[2]],&p_sym[tri_sym->nums[1]]);
}
Free(pt_sym);
if (dc->flags&DCF_JUST_MIRROR)
goto mesh_done;
}
for (i=0;i<tri_cnt;i++,tri++) {
(*dc->lighting)(dc,&p[tri->nums[0]],&p[tri->nums[1]],&p[tri->nums[2]],tri->color);
result+=GrFillTri0(dc,&p[tri->nums[0]],&p[tri->nums[1]],&p[tri->nums[2]]);
}
mesh_done:
dc->color=old_color;
Free(pt);
return result;
}
Adam/Gr/GrScreen.CPP
+128 -139
View File
@@ -1,14 +1,14 @@
#help_index "Graphics/Screen"
U0 GrUpdateWins()
{ //Only called by WinMgr
{//Only called by WinMgr
I64 i;
CTask *task,*task1;
CD3I64 saved_scroll;
CDC *dc;
Preempt(OFF);
try {
refresh_ode_time=0;
winmgr.ode_time=0;
if (Bt(&sys_semas[SYS_SEMA_UPDATE_WIN_Z_BUF],0))
WinZBufUpdate;
task1=task=sys_winmgr_task;
@@ -22,22 +22,22 @@ U0 GrUpdateWins()
if (!TaskValidate(task))
break;
if (Bt(&task->display_flags,DISPLAYf_SHOW) &&
Bt(gr_win_uncovered_bitmap,task->win_z_num))
Bt(gr.win_uncovered_bitmap,task->win_z_num))
try {
if (!Bt(&task->display_flags,DISPLAYf_NO_BORDER))
DrawTaskBorder(task);
WinTextFill(task->text_attr<<8,task);
TextBorder(Fs,task->win_left,task->win_right,task->win_top,
task->win_bottom,task->border_attr,task==sys_focus_task);
TextRect(task->win_left,task->win_right,
task->win_top,task->win_bottom,task->text_attr<<8);
Preempt(ON);
if (task==sys_winmgr_task) {
if (fp_wall_paper)
(*fp_wall_paper)(task);
} else {
if (!(task->win_inhibit&WIF_DOC))
DocUpdateTaskDocs(task);
}
if (gr.fp_wall_paper)
(*gr.fp_wall_paper)(task);
} else if (!(task->win_inhibit&WIF_SELF_DOC))
DocUpdateTaskDocs(task);
if (TaskValidate(task)) {
if (task->draw_it) {
dc=DCAlias(gr_dc2,task);
dc=DCAlias(gr.dc2,task);
(*task->draw_it)(task,dc);
DCDel(dc);
}
@@ -74,7 +74,7 @@ U0 GrUpdateWins()
ODEsUpdate(task);
Preempt(OFF);
} catch {
LBts(&task->win_inhibit,WIf_ODE);
LBts(&task->win_inhibit,WIf_SELF_ODE);
"Exception in WinMgr: ODE\n";
PutExcept;
Sleep(3000);
@@ -90,44 +90,44 @@ U0 GrUpdateWins()
Dbg("Exception in WinMgr");
}
last_refresh_ode_time=refresh_ode_time;
winmgr.last_ode_time=winmgr.ode_time;
ode_allocated_factor=LowPass1(0.1,ode_allocated_factor,
Clamp(Gs->idle_factor-0.1,0.2,0.8),1/win_actual_refresh);
Clamp(Gs->idle_factor-0.1,0.2,0.8),1/winmgr.fps);
sys_task_being_screen_updated=NULL;
gr_refresh_time_stamps[gr_refresh_ts_ptr++&(GR_REFRESH_LOG_CNT-1)]=tS;
win_actual_refresh=(GR_REFRESH_LOG_CNT-1)/
(gr_refresh_time_stamps[(gr_refresh_ts_ptr-1)&(GR_REFRESH_LOG_CNT-1)]-
gr_refresh_time_stamps[gr_refresh_ts_ptr&(GR_REFRESH_LOG_CNT-1)]);
gr.refresh_time_stamps[gr.refresh_ts_ptr++&(GR_REFRESH_LOG_CNT-1)]=tS;
winmgr.fps=(GR_REFRESH_LOG_CNT-1)/
(gr.refresh_time_stamps[(gr.refresh_ts_ptr-1)&(GR_REFRESH_LOG_CNT-1)]-
gr.refresh_time_stamps[gr.refresh_ts_ptr&(GR_REFRESH_LOG_CNT-1)]);
}
U0 GrFixZoomScale()
{
gr_screen_zoom=ClampI64(gr_screen_zoom,1,GR_MAX_SCREEN_ZOOM);
if (gr_screen_zoom==1) {
grsx=0;
grsy=0;
gr.screen_zoom=ClampI64(gr.screen_zoom,1,GR_MAX_SCREEN_ZOOM);
if (gr.screen_zoom==1) {
gr.sx=0;
gr.sy=0;
} else {
grsx=ClampI64(grsx,0,GR_WIDTH-GR_WIDTH/gr_screen_zoom)&~7;
grsy=ClampI64(grsy,0,GR_HEIGHT-GR_HEIGHT/gr_screen_zoom);
gr.sx=ClampI64(gr.sx,0,GR_WIDTH-GR_WIDTH/gr.screen_zoom)&~7;
gr.sy=ClampI64(gr.sy,0,GR_HEIGHT-GR_HEIGHT/gr.screen_zoom);
}
}
public U0 GrScaleZoom(F64 scale)
{
{//Multiply zoom factor larger or smaller.
Bool old_preempt=Preempt(OFF);
F64 s=gr_screen_zoom;
gr_screen_zoom=gr_screen_zoom*scale;
F64 s=gr.screen_zoom;
gr.screen_zoom=gr.screen_zoom*scale;
GrFixZoomScale;
s/=gr_screen_zoom;
ipx_scale*=s;
ipy_scale*=s;
ipz_scale*=s;
ipx_offset=ipx-(ipx-ipx_offset)*s;
ipy_offset=ipy-(ipy-ipy_offset)*s;
ipz_offset=ipz-(ipz-ipz_offset)*s;
grsx=ipx-gr_zoomed_dc->width >>1/gr_screen_zoom;
grsy=ipy-gr_zoomed_dc->height>>1/gr_screen_zoom;
s/=gr.screen_zoom;
ip.scale.x*=s;
ip.scale.y*=s;
ip.scale.z*=s;
ip.offset.x=ip.pos.x-(ip.pos.x-ip.offset.x)*s;
ip.offset.y=ip.pos.y-(ip.pos.y-ip.offset.y)*s;
ip.offset.z=ip.pos.z-(ip.pos.z-ip.offset.z)*s;
gr.sx=ip.pos.x-gr.zoomed_dc->width >>1/gr.screen_zoom;
gr.sy=ip.pos.y-gr.zoomed_dc->height>>1/gr.screen_zoom;
GrFixZoomScale;
Preempt(old_preempt);
}
@@ -136,26 +136,26 @@ U0 GrZoomInScreen()
{
GrFixZoomScale;
I64 plane,row,col,k,l,
d2=gr_zoomed_dc->width>>3/gr_screen_zoom,
d4=gr_zoomed_dc->width_internal>>3,
d5=d4-d2*gr_screen_zoom,
d3=gr_zoomed_dc->height/gr_screen_zoom,
d6=(gr_zoomed_dc->height-d3)*gr_dc1->width_internal>>3,
d7=gr_zoomed_dc->height%gr_screen_zoom*d4;
U8 *src,*src2,*dst,*src3,*map=gr_screen_zoom_tables[gr_screen_zoom];
d2=gr.zoomed_dc->width>>3/gr.screen_zoom,
d4=gr.zoomed_dc->width_internal>>3,
d5=d4-d2*gr.screen_zoom,
d3=gr.zoomed_dc->height/gr.screen_zoom,
d6=(gr.zoomed_dc->height-d3)*gr.dc1->width_internal>>3,
d7=gr.zoomed_dc->height%gr.screen_zoom*d4;
U8 *src,*src2,*dst,*src3,*map=gr.screen_zoom_tables[gr.screen_zoom];
src=gr_dc1->body+grsx>>3+grsy*gr_dc1->width_internal>>3;
dst=gr_zoomed_dc->body;
src=gr.dc1->body+gr.sx>>3+gr.sy*gr.dc1->width_internal>>3;
dst=gr.zoomed_dc->body;
for (plane=1;plane<0x10;plane<<=1) {
row=d3;
while (row--) {
k=gr_screen_zoom;
k=gr.screen_zoom;
while (k--) {
src2=src;
col=d2;
while (col--) {
src3=&map[*src2++];
l=gr_screen_zoom;
l=gr.screen_zoom;
while (l--) {
*dst++=*src3;
src3+=256;
@@ -174,30 +174,30 @@ U0 GrZoomInScreen()
}
}
U0 GrUpdateBackgroundOfText()
U0 GrUpdateTextBG()
{
I64 reg RSI *dst=gr_dc2->body,reg R13 c,row,col,
I64 reg RSI *dst=gr.dc2->body,reg R13 c,row,col,
num_rows=TEXT_ROWS,num_cols=TEXT_COLS,i,j,cur_ch,
reg R12 w1=gr_dc2->width_internal,w2=-7*w1+8,w3=7*w1,w4=0;
U32 *src=gr_text_base;
reg R12 w1=gr.dc2->width_internal,w2=-7*w1+8,w3=7*w1,w4=0;
U32 *src=gr.text_base;
Bool blink_flag=Blink;
U8 *dst2=dst;
if (gr_pan_text_x) {
gr_pan_text_x=ClampI64(gr_pan_text_x,-7,7);
j=AbsI64(gr_pan_text_x)/FONT_WIDTH+1;
if (gr.pan_text_x) {
gr.pan_text_x=ClampI64(gr.pan_text_x,-7,7);
j=AbsI64(gr.pan_text_x)/FONT_WIDTH+1;
num_cols-=j;
if (gr_pan_text_x<0) {
if (gr.pan_text_x<0) {
src+=j;
i=FONT_WIDTH*j+gr_pan_text_x;
i=FONT_WIDTH*j+gr.pan_text_x;
} else
i=gr_pan_text_x;
i=gr.pan_text_x;
dst2=dst(U8 *)+i;
w4=j;
w3+=j*FONT_WIDTH;
j*=FONT_WIDTH;
dst(U8 *)=gr_dc2->body;
dst(U8 *)=gr.dc2->body;
for (row=num_rows*FONT_HEIGHT;row--;) {
for (col=i;col--;)
*dst(U8 *)++=0;
@@ -208,22 +208,22 @@ U0 GrUpdateBackgroundOfText()
}
dst=dst2;
if (gr_pan_text_y) {
gr_pan_text_y=ClampI64(gr_pan_text_y,-7,7);
j=AbsI64(gr_pan_text_y)/FONT_HEIGHT+1;
if (gr.pan_text_y) {
gr.pan_text_y=ClampI64(gr.pan_text_y,-7,7);
j=AbsI64(gr.pan_text_y)/FONT_HEIGHT+1;
num_rows-=j;
if (gr_pan_text_y<0) {
if (gr.pan_text_y<0) {
src+=w1/FONT_WIDTH*j;
i=w1*(FONT_HEIGHT*j+gr_pan_text_y);
i=w1*(FONT_HEIGHT*j+gr.pan_text_y);
} else
i=w1*gr_pan_text_y;
i=w1*gr.pan_text_y;
dst2=dst(U8 *)+i;
j*=w1*FONT_HEIGHT;
dst(U8 *)=gr_dc2->body;
dst(U8 *)=gr.dc2->body;
for (row=i;row--;)
*dst(U8 *)++=0;
dst(U8 *)=gr_dc2->body+TEXT_ROWS*TEXT_COLS*FONT_HEIGHT*FONT_WIDTH-j;
dst(U8 *)=gr.dc2->body+TEXT_ROWS*TEXT_COLS*FONT_HEIGHT*FONT_WIDTH-j;
for (row=j;row--;)
*dst(U8 *)++=0;
}
@@ -232,15 +232,15 @@ U0 GrUpdateBackgroundOfText()
for (row=num_rows;row--;) {
for (col=num_cols;col--;) {
cur_ch=*src++;
if (cur_ch & (DOCET_SELECTED | DOCET_INVERT | DOCET_BLINK)) {
if (cur_ch & DOCET_SELECTED)
if (cur_ch & (ATTRF_SELECTED|ATTRF_INVERT|ATTRF_BLINK)) {
if (cur_ch & ATTRF_SELECTED)
cur_ch.u8[1]=cur_ch.u8[1]^0xFF;
if (cur_ch & DOCET_INVERT)
if (cur_ch & ATTRF_INVERT)
cur_ch.u8[1]=cur_ch.u8[1]<<4+cur_ch.u8[1]>>4;
if (cur_ch & DOCET_BLINK && blink_flag)
if (cur_ch & ATTRF_BLINK && blink_flag)
cur_ch.u8[1]=cur_ch.u8[1]<<4+cur_ch.u8[1]>>4;
}
c=gr_1_to_8_colors[cur_ch.u8[1]>>4];
c=gr.to_8_colors[cur_ch.u8[1]>>4];
MOV U64 [RSI],R13
ADD RSI,R12
MOV U64 [RSI],R13
@@ -263,30 +263,20 @@ U0 GrUpdateBackgroundOfText()
}
}
//$AN,"ExtScreenCodes",A="ExtScreenCodes"$
// Bits 0-7 ASCII (Screen Code)
// Bits 8-11 Foreground color
// Bits 12-15 Background color
// Bits 16-20 Signed X pos shift val
// Bits 21-25 Signed Y pos shift val
// Bit 28 Blink
// Bit 29 Inverted (Swap foreground and background)
// Bit 30 Selected (XOR colors with FF)
// Bit 31 Underline
U0 GrUpdateForegroundOfText()
{
U32 *src=gr_text_base;
I64 i,j,cur_ch,*dst=gr_dc2->body,
w1=gr_dc2->width_internal,w2=7*w1,w4=0,
U0 GrUpdateTextFG()
{//See $LK,"TextBase Layer",A="HI:TextBase Layer"$.
U32 *src=gr.text_base;
I64 i,j,cur_ch,*dst=gr.dc2->body,
w1=gr.dc2->width_internal,w2=7*w1,w4=0,
num_rows=TEXT_ROWS,num_cols=TEXT_COLS,row,col;
U8 *dst_start=gr_dc2->body,*dst_end=dst_start+w1*gr_dc2->height-7*w1-8;
U8 *dst_start=gr.dc2->body,*dst_end=dst_start+w1*gr.dc2->height-7*w1-8;
Bool blink_flag=Blink;
if (gr_pan_text_x) {
gr_pan_text_x=ClampI64(gr_pan_text_x,-7,7);
j=AbsI64(gr_pan_text_x)/FONT_WIDTH+1;
if (gr.pan_text_x) {
gr.pan_text_x=ClampI64(gr.pan_text_x,-7,7);
j=AbsI64(gr.pan_text_x)/FONT_WIDTH+1;
num_cols-=j;
if (gr_pan_text_x<0) {
if (gr.pan_text_x<0) {
src+=j;
dst(U8 *)+=FONT_WIDTH*j;
}
@@ -294,11 +284,11 @@ U0 GrUpdateForegroundOfText()
w2+=j*FONT_WIDTH;
}
if (gr_pan_text_y) {
gr_pan_text_y=ClampI64(gr_pan_text_y,-7,7);
j=AbsI64(gr_pan_text_y)/FONT_HEIGHT+1;
if (gr.pan_text_y) {
gr.pan_text_y=ClampI64(gr.pan_text_y,-7,7);
j=AbsI64(gr.pan_text_y)/FONT_HEIGHT+1;
num_rows-=j;
if (gr_pan_text_y<0) {
if (gr.pan_text_y<0) {
src+=w1/FONT_WIDTH*j;
dst(U8 *)+=w1*FONT_HEIGHT*j;
}
@@ -307,24 +297,24 @@ U0 GrUpdateForegroundOfText()
for (row=num_rows;row--;) {
for (col=num_cols;col--;) {
cur_ch=*src++;
if (cur_ch & (DOCET_UNDERLINE | DOCET_SELECTED | DOCET_INVERT | DOCET_BLINK)) {
if (cur_ch & DOCET_SELECTED)
if (cur_ch & (ATTRF_UNDERLINE|ATTRF_SELECTED|ATTRF_INVERT|ATTRF_BLINK)) {
if (cur_ch & ATTRF_SELECTED)
cur_ch.u8[1]=cur_ch.u8[1]^0xFF;
if (cur_ch & DOCET_INVERT)
if (cur_ch & ATTRF_INVERT)
cur_ch.u8[1]=cur_ch.u8[1]<<4+cur_ch.u8[1]>>4;
if (cur_ch & DOCET_BLINK && blink_flag)
if (cur_ch & ATTRF_BLINK && blink_flag)
cur_ch.u8[1]=cur_ch.u8[1]<<4+cur_ch.u8[1]>>4;
}
if (i=cur_ch.u16[1]&0x3FF+gr_pan_text_x+gr_pan_text_y<<5) {
if (i=cur_ch.u16[1]&0x3FF+gr.pan_text_x+gr.pan_text_y<<5) {
j=i&0x1F;
if (j&0x10) j|=~0x1F;
i>>=5;
if (i&0x10) i|=~0x1F;
i=w1*i+j;
if (dst_start<=dst(U8 *)+i<dst_end)
GrRopEquU8NoClipping(cur_ch&(DOCET_UNDERLINE+0xFFF),dst(U8 *)+i,w1);
GrRopEquU8NoClipping(cur_ch&(ATTRF_UNDERLINE+0xFFF),dst(U8 *)+i,w1);
} else
GrRopEquU8NoClipping(cur_ch&(DOCET_UNDERLINE+0xFFF),dst,w1);
GrRopEquU8NoClipping(cur_ch&(ATTRF_UNDERLINE+0xFFF),dst,w1);
dst(U8 *)+=8;
}
src+=w4;
@@ -334,11 +324,11 @@ U0 GrUpdateForegroundOfText()
U0 DCBlotColor8(CDC *dc,CDC *img)
{
U8 reg *src=img->body,*b0=dc->body;
I64 reg j,reg k,reg d0=img->width_internal*img->height;
U8 *src=img->body,*b0=dc->body;
I64 j,k,d0=img->width_internal*img->height;
for (k=0;k<d0;k++) {
j=*src++;
if (j!=COLOR_TRANSPARENT)
if (j!=TRANSPARENT)
*b0++=j;
else
b0++;
@@ -347,19 +337,19 @@ U0 DCBlotColor8(CDC *dc,CDC *img)
U0 GrUpdateTextModeText()
{
U32 *src=gr_text_base;
U32 *src=gr.text_base;
I64 cur_ch,i,d0=TEXT_COLS*TEXT_ROWS;
U16 *dst=VGA_TEXT_MEM_BASE,*dst2=gr_vga_text_cache;
U16 *dst=VGA_TEXT_MEM_BASE,*dst2=gr.vga_text_cache;
Bool blink_flag=Blink;
if (LBtr(&sys_semas[SYS_SEMA_FLUSH_VGA_IMAGE],0)) {
i=d0;
while (i--) {
cur_ch=*src++;
if (cur_ch & DOCET_SELECTED)
if (cur_ch & ATTRF_SELECTED)
cur_ch.u8[1]=cur_ch.u8[1]^0xFF;
if (cur_ch & DOCET_INVERT)
if (cur_ch & ATTRF_INVERT)
cur_ch.u8[1]=cur_ch.u8[1]<<4+cur_ch.u8[1]>>4;
if (cur_ch & DOCET_BLINK)
if (cur_ch & ATTRF_BLINK)
if (blink_flag)
cur_ch.u8[1]= cur_ch.u8[1]<<4+ cur_ch.u8[1]>>4;
cur_ch&=0x7FFF;
@@ -369,11 +359,11 @@ U0 GrUpdateTextModeText()
i=d0;
while (i--) {
cur_ch=*src++;
if (cur_ch & DOCET_SELECTED)
if (cur_ch & ATTRF_SELECTED)
cur_ch.u8[1]=cur_ch.u8[1]^0xFF;
if (cur_ch & DOCET_INVERT)
if (cur_ch & ATTRF_INVERT)
cur_ch.u8[1]=cur_ch.u8[1]<<4+cur_ch.u8[1]>>4;
if (cur_ch & DOCET_BLINK)
if (cur_ch & ATTRF_BLINK)
if (blink_flag)
cur_ch.u8[1]= cur_ch.u8[1]<<4+ cur_ch.u8[1]>>4;
cur_ch&=0x7FFF;
@@ -388,63 +378,62 @@ U0 GrUpdateTextModeText()
}
U0 GrUpdateVGAGraphics()
{
I64 row,plane,d2=gr_zoomed_dc->width_internal>>5;
U32 *src,*dst,*dst2;
//Update Graphic Card
if (gr_screen_zoom==1)
src=gr_dc1->body;
{//Update Graphic Card
I64 row,plane,d=gr.zoomed_dc->width_internal>>6;
U32 *src,*vga,*dst;
if (gr.screen_zoom==1)
src=gr.dc1->body;
else {
GrZoomInScreen;
src=gr_zoomed_dc->body;
src=gr.zoomed_dc->body;
}
dst2=gr_screen_image->body;
dst=gr.screen_image->body;
if (LBtr(&sys_semas[SYS_SEMA_FLUSH_VGA_IMAGE],0)) {
for (plane=1;plane<0x10;plane<<=1) {
OutU8(VGA_SC_INDEX,VGA_MAP_MASK);
OutU8(VGA_SC_DATA,plane);
dst=VGA_GRAPHIC_MEM_BASE;
row=gr_zoomed_dc->height;
vga=VGA_GRAPHIC_MEM_BASE;
row=gr.zoomed_dc->height;
while (row--)
GrUpdateLine32FlushCache(&dst,&src,d2,&dst2);
GrUpdateLine64FlushCache(&vga,&src,d,&dst);
}
} else {
for (plane=1;plane<0x10;plane<<=1) {
OutU8(VGA_SC_INDEX,VGA_MAP_MASK);
OutU8(VGA_SC_DATA,plane);
dst=VGA_GRAPHIC_MEM_BASE;
row=gr_zoomed_dc->height;
vga=VGA_GRAPHIC_MEM_BASE;
row=gr.zoomed_dc->height;
while (row--)
GrUpdateLine32(&dst,&src,d2,&dst2);
GrUpdateLine64(&vga,&src,d,&dst);
}
}
}
U0 GrUpdateScreen()
{
{//Called by the Window Manager $LK,"HERE",A="FF:::/Adam/Win2b.CPP,GrUpdateScreen"$, 60 times a second.
CDC *dc;
Preempt(ON);
if (text_mode) //If 640x480 VGA is not available, falls back to text mode.
if (!sys_bios_gr_mode) //if text mode
GrUpdateWins;
else {
GrUpdateBackgroundOfText;
GrUpdateForegroundOfText;
GrUpdateTextBG;
GrUpdateTextFG;
GrUpdateWins;
DCBlotColor8(gr_dc2,gr_dc);
DCBlotColor8(gr.dc2,gr.dc);
}
Preempt(OFF);
dc=DCAlias(gr_dc2,Fs);
dc=DCAlias(gr.dc2,Fs);
dc->flags|=DCF_ON_TOP;
if (fp_final_screen_update)
(*fp_final_screen_update)(dc);
if (gr.fp_final_screen_update)
(*gr.fp_final_screen_update)(dc);
DCDel(dc);
if (text_mode)
if (!sys_bios_gr_mode) //if text mode
GrUpdateTextModeText;
else {
DCBlotColor4(gr_dc1->body,gr_dc2->body,gr_dc_cache->body,
gr_dc2->height*gr_dc2->width_internal>>3);
DCBlotColor4(gr.dc1->body,gr.dc2->body,gr.dc_cache->body,
gr.dc2->height*gr.dc2->width_internal>>3);
GrUpdateVGAGraphics;
}
}
Adam/Gr/GrSpritePlot.CPP
+90 -98
View File
@@ -3,28 +3,26 @@
$LK,"CSprite",A="MN:CSprite"$s are stored as a sequence of var
length operations with a 1-byte type leading
each operation. The types available are lsted
here, $LK,"GRST_PT",A="MN:GRST_PT"$. They are stored, one after another,
in a chunk of memory terminated by a type $LK,"GRST_END",A="MN:GRST_END"$.
here, $LK,"SPT_PT",A="MN:SPT_PT"$. They are stored, one after another,
in a chunk of memory terminated by a type $LK,"SPT_END",A="MN:SPT_END"$.
$LK,"Sprite3",A="MN:Sprite3"$() and $LK,"SpriteMain",A="MN:SpriteMain"$() shows how the
unions are used. It's kind-of a mess using a union.
$LK,"Sprite3",A="MN:Sprite3"$() shows how the $LK,"CSprite",A="MN:CSprite"$ unions are used.
It's kind-of a mess using a union.
$LK,"SpriteSize",A="MN:SpriteSize"$() will return the size of a single
operation, while $LK,"SpriteSize",A="MN:SpriteSize"$() with an 's' will
return the size of an entire lst. Look at
$LK,"sprite_base_size",A="MN:sprite_base_size"$.
$LK,"SpriteElemSize",A="MN:SpriteElemSize"$() will return the size of a single
element, while $LK,"SpriteSize",A="MN:SpriteSize"$() will return the size
of an entire lst. Look at $LK,"sprite_elem_base_sizes",A="MN:sprite_elem_base_sizes"$.
To get familiar, type <CTRL-R> on sprite in
a document and select "Display as Text". It
will show the raw data for each CSprite. This
is how they are stored in files, as well.
See $LK,"SpriteElem2Code",A="MN:SpriteElem2Code"$() to infer the raw storage
format. They are stored as raw binary values
when saved to files, not text code.
See $MA-X+PU,"::/Apps/GrModels",LM="Cd(\"::/Apps/GrModels\");Dir;View;\n"$ for an example of
making CSprite by hand. Those are type
$LK,"GRST_MESH",A="MN:GRST_MESH"$, one of the most complicated.
$LK,"SPT_MESH",A="MN:SPT_MESH"$, one of the most complicated.
*/
public U0 Sprite3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
public U0 Sprite3(CDC *dc=gr.dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
{//Plot a sprite into a CDC.
CSprite *tempg=elems-offset(CSprite.start);
I64 i,j,k,x1,y1,z1,x2,y2,
@@ -40,19 +38,19 @@ public U0 Sprite3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
while (tempg->type) {
dc->cur_sprite_elem_num=cur_sprite_elem_num++;
switch (tempg->type) {
case GRST_COLOR8:
dc->color=dc->color&~(COLORROP_COLORS_MASK|ROPF_DITHER)|tempg->color8;
case SPT_COLOR:
dc->color=dc->color&~(COLORROP_COLORS_MASK|ROPF_DITHER)|tempg->color;
break;
case GRST_DITHER_COLOR8:
case SPT_DITHER_COLOR:
dc->color=dc->color&~COLORROP_COLORS_MASK|
tempg->dither_color8.u8[0]|
tempg->dither_color8.u8[1]<<COLORROP_BITS|ROPF_DITHER;
tempg->dither_color.u8[0]|
tempg->dither_color.u8[1]<<COLORROP_BITS|ROPF_DITHER;
break;
case GRST_WIDTH:
case SPT_WIDTH:
dc->pen_width=tempg->width;
GrScalePenWidth(dc);
break;
case GRST_TRANSFORM_ON:
case SPT_TRANSFORM_ON:
if (!(dc->flags&DCF_TRANSFORMATION)) {
x-=dc->x;
y-=dc->y;
@@ -60,7 +58,7 @@ public U0 Sprite3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
}
dc->flags|=DCF_TRANSFORMATION;
break;
case GRST_TRANSFORM_OFF:
case SPT_TRANSFORM_OFF:
if (dc->flags&DCF_TRANSFORMATION) {
x+=dc->x;
y+=dc->y;
@@ -68,44 +66,44 @@ public U0 Sprite3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
}
dc->flags&=~DCF_TRANSFORMATION;
break;
case GRST_PT:
case SPT_PT:
GrPlot3(dc,tempg->x1+x,tempg->y1+y,z);
break;
case GRST_TEXT:
case SPT_TEXT:
GrPrint3(dc,tempg->x1+x,tempg->y1+y,z,"%s",tempg->st);
break;
case GRST_TEXT_BOX:
case SPT_TEXT_BOX:
GrTextBox3(dc,tempg->x1+x,tempg->y1+y,z,tempg->st);
break;
case GRST_TEXT_DIAMOND:
case SPT_TEXT_DIAMOND:
GrTextDiamond3(dc,tempg->x1+x,tempg->y1+y,z,tempg->st);
break;
case GRST_FLOOD_FILL:
case SPT_FLOOD_FILL:
GrFloodFill3(dc,tempg->x1+x,tempg->y1+y,z,FALSE);
break;
case GRST_FLOOD_FILL_NOT:
case SPT_FLOOD_FILL_NOT:
i=dc->color;
dc->color=dc->color.c0;
GrFloodFill3(dc,tempg->x1+x,tempg->y1+y,z,TRUE);
dc->color=i;
break;
case GRST_SHIFT:
case SPT_SHIFT:
x+=tempg->x1;
y+=tempg->y1;
break;
case GRST_LINE:
case SPT_LINE:
GrLine3(dc,tempg->x1+x,tempg->y1+y,z,tempg->x2+x,tempg->y2+y,z);
break;
case GRST_ARROW:
case SPT_ARROW:
GrArrow3(dc,tempg->x1+x,tempg->y1+y,z,tempg->x2+x,tempg->y2+y,z);
break;
case GRST_PLANAR_SYMMETRY:
case SPT_PLANAR_SYMMETRY:
if (GrSetSymmetry3(dc,tempg->x1+x,tempg->y1+y,z,tempg->x2+x,tempg->y2+y,z,tempg->x2+x,tempg->y2+y,z+1))
dc->flags|=DCF_SYMMETRY;
else
dc->flags&=~DCF_SYMMETRY;
break;
case GRST_BITMAP8:
case SPT_BITMAP:
img=CAlloc(sizeof(CDC));
img->width=tempg->width;
img->width_internal=(tempg->width+7)&~7;
@@ -116,10 +114,10 @@ public U0 Sprite3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
GrBlot3(dc,tempg->x2+x,tempg->y2+y,z,img);
Free(img);
break;
case GRST_RECT:
case SPT_RECT:
GrRect3(dc,tempg->x1+x,tempg->y1+y,z,tempg->x2-tempg->x1,tempg->y2-tempg->y1);
break;
case GRST_ROTATED_RECT:
case SPT_ROTATED_RECT:
x1=tempg->x1+x;
y1=tempg->y1+y;
z1=z;
@@ -135,16 +133,16 @@ public U0 Sprite3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
GrSetRotMat(dc,old_r);
dc->flags=dc->flags&~DCF_TRANSFORMATION|old_flags;
break;
case GRST_CIRCLE:
case SPT_CIRCLE:
GrCircle3(dc,tempg->x1+x,tempg->y1+y,z,tempg->x2);
break;
case GRST_ELLIPSE:
case SPT_ELLIPSE:
GrEllipse3(dc,tempg->x2+x,tempg->y2+y,z,tempg->width,tempg->height,tempg->rot_angle);
break;
case GRST_POLYGON:
case SPT_POLYGON:
GrRegPoly3(dc,tempg->x2+x,tempg->y2+y,z,tempg->width,tempg->height,tempg->sides,tempg->rot_angle);
break;
case GRST_POLYLINE:
case SPT_POLYLINE:
ptr=&tempg->y1;
x1=ptr[0];
y1=ptr[1];
@@ -155,7 +153,7 @@ public U0 Sprite3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
x1=x2;y1=y2;
}
break;
case GRST_POLYPT:
case SPT_POLYPT:
ptr=&tempg->y1;
x1=ptr[0];
y1=ptr[1];
@@ -176,16 +174,16 @@ public U0 Sprite3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
p->y+=y;
p->z+=z;
}
case GRST_BSPLINE2:
case SPT_BSPLINE2:
Gr2BSpline3(dc,&tempg->y1,tempg->num,FALSE);
break;
case GRST_BSPLINE3:
case SPT_BSPLINE3:
Gr3BSpline3(dc,&tempg->y1,tempg->num,FALSE);
break;
case GRST_BSPLINE2_CLOSED:
case SPT_BSPLINE2_CLOSED:
Gr2BSpline3(dc,&tempg->y1,tempg->num,TRUE);
break;
case GRST_BSPLINE3_CLOSED:
case SPT_BSPLINE3_CLOSED:
Gr3BSpline3(dc,&tempg->y1,tempg->num,TRUE);
break;
sub_switch_end:
@@ -196,7 +194,7 @@ public U0 Sprite3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
p->z-=z;
}
break;
case GRST_MESH:
case SPT_MESH:
p=&tempg->x2;
for (i=0;i<tempg->vertex_cnt;i++,p++) {
p->x+=x;
@@ -211,7 +209,7 @@ public U0 Sprite3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
p->z-=z;
}
break;
case GRST_SHIFTABLE_MESH:
case SPT_SHIFTABLE_MESH:
if (dc->flags&DCF_TRANSFORMATION) {
dc->x+=tempg->x1;
dc->y+=tempg->y1;
@@ -255,7 +253,7 @@ public U0 Sprite3(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,Bool just_one=FALSE)
old_flags&(DCF_SYMMETRY|DCF_TRANSFORMATION);
}
public U0 Sprite3B(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems)
public U0 Sprite3B(CDC *dc=gr.dc,I64 x,I64 y,I64 z,U8 *elems)
{//Plot a sprite into a CDC, post transform xyz translation.
I64 old_x=dc->x,old_y=dc->y,old_z=dc->z,
old_flags=dc->flags&DCF_TRANSFORMATION;
@@ -266,8 +264,8 @@ public U0 Sprite3B(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems)
dc->flags=dc->flags&~DCF_TRANSFORMATION|old_flags;
}
public U0 SpriteMat3B(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,I64 *m)
{//Plot rotated by matrix
public U0 SpriteMat3B(CDC *dc=gr.dc,I64 x,I64 y,I64 z,U8 *elems,I64 *m)
{//Plot rotated by matrix.
I64 *old_r=dc->r,old_m[16],
old_flags=dc->flags&DCF_TRANSFORMATION;
MemCpy(old_m,m,16*sizeof(I64));
@@ -281,22 +279,22 @@ public U0 SpriteMat3B(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,I64 *m)
dc->flags=dc->flags&~DCF_TRANSFORMATION|old_flags;
}
public U0 SpriteX3B(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,F64 è=0)
{//Plot rotated around X axis
public U0 SpriteX3B(CDC *dc=gr.dc,I64 x,I64 y,I64 z,U8 *elems,F64 è=0)
{//Plot rotated around X axis.
I64 *r=GrRotXNew(è);
SpriteMat3B(dc,x,y,z,elems,r);
Free(r);
}
public U0 SpriteY3B(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,F64 ê=0)
{//Plot rotated around Y axis
public U0 SpriteY3B(CDC *dc=gr.dc,I64 x,I64 y,I64 z,U8 *elems,F64 ê=0)
{//Plot rotated around Y axis.
I64 *r=GrRotYNew(ê);
SpriteMat3B(dc,x,y,z,elems,r);
Free(r);
}
public U0 SpriteZ3B(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,F64 é=0)
{//Plot rotated around Z axis
public U0 SpriteZ3B(CDC *dc=gr.dc,I64 x,I64 y,I64 z,U8 *elems,F64 é=0)
{//Plot rotated around Z axis.
I64 *r=GrRotZNew(é);
SpriteMat3B(dc,x,y,z,elems,r);
Free(r);
@@ -304,7 +302,7 @@ public U0 SpriteZ3B(CDC *dc=gr_dc,I64 x,I64 y,I64 z,U8 *elems,F64
public U0 SpriteExtents(U8 *elems,I64 *min_x=NULL,I64 *max_x=NULL,
I64 *min_y=NULL,I64 *max_y=NULL)
{ //Ignores flood fills.
{//Ignores flood fills.
CDC *dc=DCNew(MAX_I32,MAX_I32,Fs,TRUE);
DCExtentsInit(dc);
Sprite3(dc,MAX_I32/2,MAX_I32/2,MAX_I32/2,elems);
@@ -324,7 +322,7 @@ public U0 SpriteExtents(U8 *elems,I64 *min_x=NULL,I64 *max_x=NULL,
}
public CDC *Sprite2DC(U8 *elems)
{
{//Convert sprite to device context.
CDC *result;
I64 min_x,max_x,min_y,max_y;
SpriteExtents(elems,&min_x,&max_x,&min_y,&max_y);
@@ -334,11 +332,9 @@ public CDC *Sprite2DC(U8 *elems)
}
public U8 *SpriteInterpolate(U8 *elems0,U8 *elems1,F64 t)
{
//The two CSprite should be identical
//except for points shifted around.
//t ranges from 0.0 to 1.0
I64 i,t1=gr_scale*t,t0=gr_scale-t1;
{//The two CSprite should be identical except for points shifted around.
//t ranges from 0.0 to 1.0.
I64 i,t1=GR_SCALE*t,t0=GR_SCALE-t1;
I32 *ptr0,*ptr1,*ptrr;
CD3I32 *p0,*p1,*pr;
U8 *result;
@@ -358,41 +354,41 @@ public U8 *SpriteInterpolate(U8 *elems0,U8 *elems1,F64 t)
if (tempg0->type!=tempg1->type)
throw('Graphics');
switch (tempg0->type) {
case GRST_ROTATED_RECT:
tempgr->rot_angle=(tempg0->rot_angle*t0+tempg1->rot_angle*t1)/gr_scale;
case GRST_RECT:
case GRST_LINE:
case GRST_ARROW:
case GRST_PLANAR_SYMMETRY:
case SPT_ROTATED_RECT:
tempgr->rot_angle=(tempg0->rot_angle*t0+tempg1->rot_angle*t1)/GR_SCALE;
case SPT_RECT:
case SPT_LINE:
case SPT_ARROW:
case SPT_PLANAR_SYMMETRY:
tempgr->x2=(tempg0->x2*t0+tempg1->x2*t1)>>32;
tempgr->y2=(tempg0->y2*t0+tempg1->y2*t1)>>32;
case GRST_TEXT:
case GRST_TEXT_BOX:
case GRST_TEXT_DIAMOND:
case GRST_PT:
case GRST_FLOOD_FILL:
case GRST_FLOOD_FILL_NOT:
case GRST_SHIFT:
case SPT_TEXT:
case SPT_TEXT_BOX:
case SPT_TEXT_DIAMOND:
case SPT_PT:
case SPT_FLOOD_FILL:
case SPT_FLOOD_FILL_NOT:
case SPT_SHIFT:
tempgr->x1=(tempg0->x1*t0+tempg1->x1*t1)>>32;
tempgr->y1=(tempg0->y1*t0+tempg1->y1*t1)>>32;
break;
case GRST_CIRCLE:
case SPT_CIRCLE:
tempgr->x2=(tempg0->x2*t0+tempg1->x2*t1)>>32;
tempgr->x1=(tempg0->x1*t0+tempg1->x1*t1)>>32;
tempgr->y1=(tempg0->y1*t0+tempg1->y1*t1)>>32;
break;
case GRST_ELLIPSE:
case GRST_POLYGON:
case SPT_ELLIPSE:
case SPT_POLYGON:
tempgr->x2=(tempg0->x2*t0+tempg1->x2*t1)>>32;
tempgr->y2=(tempg0->y2*t0+tempg1->y2*t1)>>32;
tempgr->width=(tempg0->width*t0+tempg1->width*t1)>>32;
tempgr->height=(tempg0->height*t0+tempg1->height*t1)>>32;
break;
case GRST_BITMAP8:
case SPT_BITMAP:
tempgr->x2=(tempg0->x2*t0+tempg1->x2*t1)>>32;
tempgr->y2=(tempg0->y2*t0+tempg1->y2*t1)>>32;
break;
case GRST_POLYLINE:
case SPT_POLYLINE:
ptr0=&tempg0->y1;
ptr1=&tempg1->y1;
ptrr=&tempgr->y1;
@@ -401,17 +397,17 @@ public U8 *SpriteInterpolate(U8 *elems0,U8 *elems1,F64 t)
ptrr[i<<1+1]=(ptr0[i<<1+1]*t0+ptr1[i<<1+1]*t1)>>32;
}
break;
case GRST_POLYPT:
case SPT_POLYPT:
ptr0=&tempg0->y1;
ptr1=&tempg1->y1;
ptrr=&tempgr->y1;
ptrr[0]=(ptr0[0]*t0+ptr1[0]*t1)>>32;
ptrr[1]=(ptr0[1]*t0+ptr1[1]*t1)>>32;
break;
case GRST_BSPLINE2:
case GRST_BSPLINE3:
case GRST_BSPLINE2_CLOSED:
case GRST_BSPLINE3_CLOSED:
case SPT_BSPLINE2:
case SPT_BSPLINE3:
case SPT_BSPLINE2_CLOSED:
case SPT_BSPLINE3_CLOSED:
p0=&tempg0->y1;
p1=&tempg1->y1;
pr=&tempgr->y1;
@@ -421,7 +417,7 @@ public U8 *SpriteInterpolate(U8 *elems0,U8 *elems1,F64 t)
pr[i].z=(p0[i].z*t0+p1[i].z*t1)>>32;
}
break;
case GRST_MESH:
case SPT_MESH:
p0=&tempg0->x2;
p1=&tempg1->x2;
pr=&tempgr->x2;
@@ -431,7 +427,7 @@ public U8 *SpriteInterpolate(U8 *elems0,U8 *elems1,F64 t)
pr[i].z=(p0[i].z*t0+p1[i].z*t1)>>32;
}
break;
case GRST_SHIFTABLE_MESH:
case SPT_SHIFTABLE_MESH:
p0=(&tempg0->shiftable_tri_cnt)(U8 *)+sizeof(I32);
p1=(&tempg1->shiftable_tri_cnt)(U8 *)+sizeof(I32);
pr=(&tempgr->shiftable_tri_cnt)(U8 *)+sizeof(I32);
@@ -449,11 +445,10 @@ public U8 *SpriteInterpolate(U8 *elems0,U8 *elems1,F64 t)
return result;
}
#help_index "Graphics/Sprite;Doc/Output"
#help_index "Graphics/Sprite;DolDoc/Output"
public CDocEntry *DocSprite(CDoc *doc=NULL,U8 *elems,U8 *fmt=NULL)
{//Put a sprite into a document. You can, optionally, supply a fmt string
//for $LK,"Dollar",A="FI:::/Doc/Dollar.TXT"$ cmd with a %d for the bin_num.
//for $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.TXT"$ cmd with a %d for the bin_num.
I64 size;
U8 *st;
Bool unlock;
@@ -470,13 +465,13 @@ public CDocEntry *DocSprite(CDoc *doc=NULL,U8 *elems,U8 *fmt=NULL)
tempb->use_cnt=1;
QueIns(tempb,doc->bin_root.last);
if (fmt)
st=MPrint(fmt,doc->cur_bin_num++);
st=MStrPrint(fmt,doc->cur_bin_num++);
else
st=MPrint("$$SP,\"\",BI=%d$$",doc->cur_bin_num++);
st=MStrPrint("$$SP,\"\",BI=%d$$",doc->cur_bin_num++);
doc_e=DocPrint(doc,"%s",st);
Free(st);
doc_e->bin_data=tempb;
if (doc_e && doc_e->flags1&DOCEF1_TAG && doc_e->tag && *doc_e->tag)
if (doc_e && doc_e->de_flags&DOCEF_TAG && doc_e->tag && *doc_e->tag)
tempb->tag=StrNew(doc_e->tag,doc->mem_task);
if (unlock)
DocUnlock(doc);
@@ -484,11 +479,8 @@ public CDocEntry *DocSprite(CDoc *doc=NULL,U8 *elems,U8 *fmt=NULL)
}
public CDocEntry *Sprite(U8 *elems,U8 *fmt=NULL)
{
//If you set fmt,
//then include dollarsigns ("$$SP ...$$")
//and leave a %d for the number.
{//Put sprite to the command-line, $LK,"DocPut",A="MN:DocPut"$.
//If you set fmt, then include dollars ("$$SP ...$$") and leave %d for num.
CDoc *doc;
if (doc=DocPut)
return DocSprite(doc,elems,fmt);
Adam/Gr/GrTextBase.CPP
+370
View File
@@ -0,0 +1,370 @@
#help_index "TextBase Layer;Char/TextBase Layer"
#help_file "::/Doc/TextBase"
asm {
USE64
//************************************
_TEXT_CHAR:://Bool TextChar(CTask *task,Bool allow_border=FALSE,I64 x,I64 y,I64 d);
//Must be called 60fps in Fs->draw_it() callback.
PUSH RBP
MOV RBP,RSP
MOV RCX,U64 SF_ARG1[RBP]
MOV RBX,U64 CTask.scroll_x[RCX]
SAR RBX,3
ADD RBX,U64 SF_ARG3[RBP]
MOV RAX,U64 CTask.scroll_y[RCX]
SAR RAX,3
ADD RAX,U64 SF_ARG4[RBP]
TEST U8 SF_ARG2[RBP],0xFF
JNZ @@10
//Border not allowed
TEST RBX,RBX //Check X
JS @@05
ADD RBX,U64 CTask.win_left[RCX]
CMP RBX,U64 CTask.win_right[RCX]
JG @@05
TEST RBX,RBX
JS @@05
CMP RBX,TEXT_COLS
JGE @@05
TEST RAX,RAX //Check Y
JS @@05
ADD RAX,U64 CTask.win_top[RCX]
CMP RAX,U64 CTask.win_bottom[RCX]
JG @@05
TEST RAX,RAX
JS @@05
CMP RAX,TEXT_ROWS
JGE @@05
JMP @@15
@@05: XOR RAX,RAX //return FALSE
POP RBP
RET1 40
//Border allowed
@@10: MOV RDX,-1 //Check X
CMP RBX,RDX
JL @@05
ADD RBX,U64 CTask.win_left[RCX]
MOV RDX,U64 CTask.win_right[RCX]
INC RDX
CMP RBX,RDX
JG @@05
TEST RBX,RBX
JS @@05
CMP RBX,TEXT_COLS
JGE @@05
MOV RDX,-1 //Check Y
CMP RAX,RDX
JL @@05
ADD RAX,U64 CTask.win_top[RCX]
MOV RDX,U64 CTask.win_bottom[RCX]
INC RDX
CMP RAX,RDX
JG @@05
TEST RAX,RAX
JS @@05
CMP RAX,TEXT_ROWS
JGE @@05
@@15: IMUL2 RAX,TEXT_COLS
ADD RBX,RAX
SHL RBX,2
ADD RBX,U64 [&gr.text_base]
MOV RAX,U64 SF_ARG5[RBP]
MOV U32 [RBX],EAX
MOV RAX,TRUE
POP RBP
RET1 40
//************************************
_TEXT_LEN_STR:://Bool TextLenStr(CTask *task,I64 x,I64 y,I64 len,I64 attr,U8 *s)
//Must be called 60fps in Fs->draw_it() callback.
PUSH RBP
MOV RBP,RSP
PUSH RSI
PUSH RDI
MOV RBX,U64 SF_ARG1[RBP]
MOV RSI,U64 SF_ARG6[RBP]
MOV RDI,U64 CTask.scroll_x[RBX]
SAR RDI,3
ADD RDI,U64 SF_ARG2[RBP]
MOV RCX,U64 SF_ARG4[RBP]
TEST RDI,RDI
JNS @@05
ADD RCX,RDI
SUB RSI,RDI
XOR RDI,RDI
@@05: ADD RDI,U64 CTask.win_left[RBX]
MOV RDX,RCX
ADD RDX,RDI
DEC RDX
CMP RDX,U64 CTask.win_right[RBX]
JLE @@10
MOV RAX,RDX
SUB RAX,U64 CTask.win_right[RBX]
SUB RDX,RAX
SUB RCX,RAX
@@10: TEST RDI,RDI
JNS @@15
ADD RCX,RDI
SUB RSI,RDI
XOR RDI,RDI
@@15: INC RDX
SUB RDX,TEXT_COLS
JLE @@20
SUB RCX,RDX
@@20: CMP RCX,1
JL @@30
MOV RAX,U64 CTask.scroll_y[RBX]
SAR RAX,3
ADD RAX,U64 SF_ARG3[RBP]
TEST RAX,RAX
JS @@30
ADD RAX,U64 CTask.win_top[RBX]
CMP RAX,U64 CTask.win_bottom[RBX]
JG @@30
TEST RAX,RAX
JS @@30
CMP RAX,TEXT_ROWS
JGE @@30
IMUL2 RAX,TEXT_COLS
ADD RDI,RAX
SHL RDI,2
ADD RDI,U64 [&gr.text_base]
MOV RAX,U64 SF_ARG5[RBP]
@@25: LODSB
STOSD
DEC RCX
JNZ @@25
POP RDI
POP RSI
MOV RAX,TRUE
POP RBP
RET1 48
@@30: POP RDI
POP RSI
XOR RAX,RAX
POP RBP
RET1 48
//************************************
_TEXT_LEN_ATTR_STR:://Bool TextLenAttrStr(CTask *task,I64 x,I64 y,I64 len,U32 *_attr)
//Must be called 60fps in Fs->draw_it() callback.
PUSH RBP
MOV RBP,RSP
PUSH RSI
PUSH RDI
MOV RBX,U64 SF_ARG1[RBP]
MOV RSI,U64 SF_ARG5[RBP]
MOV RDI,U64 CTask.scroll_x[RBX]
SAR RDI,3
ADD RDI,U64 SF_ARG2[RBP]
MOV RCX,U64 SF_ARG4[RBP]
TEST RDI,RDI
JNS @@05
ADD RCX,RDI
SHL RDI,2
SUB RSI,RDI
XOR RDI,RDI
@@05: ADD RDI,U64 CTask.win_left[RBX]
MOV RDX,RCX
ADD RDX,RDI
DEC RDX
CMP RDX,U64 CTask.win_right[RBX]
JLE @@10
MOV RAX,RDX
SUB RAX,U64 CTask.win_right[RBX]
SUB RDX,RAX
SUB RCX,RAX
@@10: TEST RDI,RDI
JNS @@15
ADD RCX,RDI
SHL RDI,2
SUB RSI,RDI
XOR RDI,RDI
@@15: INC RDX
SUB RDX,TEXT_COLS
JLE @@20
SUB RCX,RDX
@@20: CMP RCX,1
JL @@30
MOV RAX,U64 CTask.scroll_y[RBX]
SAR RAX,3
ADD RAX,U64 SF_ARG3[RBP]
TEST RAX,RAX
JS @@30
ADD RAX,U64 CTask.win_top[RBX]
CMP RAX,U64 CTask.win_bottom[RBX]
JG @@30
TEST RAX,RAX
JS @@30
CMP RAX,TEXT_ROWS
JGE @@30
IMUL2 RAX,TEXT_COLS
ADD RDI,RAX
SHL RDI,2
ADD RDI,U64 [&gr.text_base]
@@25: MOVSD
DEC RCX
JNZ @@25
POP RDI
POP RSI
MOV RAX,TRUE
POP RBP
RET1 40
@@30: POP RDI
POP RSI
XOR RAX,RAX
POP RBP
RET1 40
//************************************
_TEXT_LEN_ATTR:://Bool TextLenAttr(CTask *task,I64 x,I64 y,I64 len,I64 attr)
//Must be called 60fps in Fs->draw_it() callback.
PUSH RBP
MOV RBP,RSP
PUSH RSI
PUSH RDI
MOV RBX,U64 SF_ARG1[RBP]
MOV RDI,U64 CTask.scroll_x[RBX]
SAR RDI,3
ADD RDI,U64 SF_ARG2[RBP]
MOV RCX,U64 SF_ARG4[RBP]
TEST RDI,RDI
JNS @@05
ADD RCX,RDI
XOR RDI,RDI
@@05: ADD RDI,U64 CTask.win_left[RBX]
MOV RDX,RCX
ADD RDX,RDI
DEC RDX
CMP RDX,U64 CTask.win_right[RBX]
JLE @@10
MOV RAX,RDX
SUB RAX,U64 CTask.win_right[RBX]
SUB RDX,RAX
SUB RCX,RAX
@@10: TEST RDI,RDI
JNS @@15
ADD RCX,RDI
XOR RDI,RDI
@@15: INC RDX
SUB RDX,TEXT_COLS
JLE @@20
SUB RCX,RDX
@@20: CMP RCX,1
JL @@35
MOV RAX,U64 CTask.scroll_y[RBX]
SAR RAX,3
ADD RAX,U64 SF_ARG3[RBP]
TEST RAX,RAX
JS @@35
ADD RAX,U64 CTask.win_top[RBX]
CMP RAX,U64 CTask.win_bottom[RBX]
JG @@35
TEST RAX,RAX
JS @@35
CMP RAX,TEXT_ROWS
JGE @@35
IMUL2 RAX,TEXT_COLS
ADD RDI,RAX
SHL RDI,2
ADD RDI,U64 [&gr.text_base]
MOV RBX,U64 SF_ARG5[RBP]
MOV RSI,RDI
@@25: LODSD
TEST AL,AL
JNZ @@30
MOV RAX,RBX
STOSD
DEC RCX
JNZ @@25
@@30: POP RDI
POP RSI
MOV RAX,TRUE
POP RBP
RET1 40
@@35: POP RDI
POP RSI
XOR RAX,RAX
POP RBP
RET1 40
}
public _extern _TEXT_CHAR Bool TextChar(CTask *task,Bool allow_border=FALSE,I64 x,I64 y,I64 d); //Plot char. Must be called 60fps in Fs->draw_it() callback.
public _extern _TEXT_LEN_STR Bool TextLenStr(CTask *task,I64 x,I64 y,I64 len,I64 attr,U8 *s); //Plot str with len. Must be called 60fps in Fs->draw_it() callback.
public _extern _TEXT_LEN_ATTR_STR Bool TextLenAttrStr(CTask *task,I64 x,I64 y,I64 len,U32 *_attr); //Plot attr str with len. Must be called 60fps in Fs->draw_it() callback.
public _extern _TEXT_LEN_ATTR Bool TextLenAttr(CTask *task,I64 x,I64 y,I64 len,I64 attr); //Plot attrs with len. Must be called 60fps in Fs->draw_it() callback.
public U0 TextPrint(CTask *task,I64 x,I64 y,I64 attr,U8 *fmt,...)
{//Plot chars. Must be called 60fps in Fs->draw_it() callback.
//You probably want $LK,"GrPrint",A="MN:GrPrint"$() or just $LK,"Print",A="MN:Print"$().
U8 *buf=StrPrintJoin(NULL,fmt,argc,argv);
TextLenStr(task,x,y,StrLen(buf),attr<<8,buf);
Free(buf);
}
public U0 TextBorder(CTask *task=NULL,I64 l,I64 r,I64 t,I64 b,I64 attr,Bool solid)
{//Plot border square. Must be called 60fps in Fs->draw_it() callback.
//Draws window borders or DolDoc text button borders.
//Set task=sys_winmgr_task for no clipping.
I64 i;
if (!task) task=Fs;
attr<<=8;
if (solid) {
TextChar(task,,l-1,t-1,'É'+attr);
TextChar(task,,r+1,t-1,'»'+attr);
TextChar(task,,l-1,b+1,'È'+attr);
TextChar(task,,r+1,b+1,'¼'+attr);
for (i=l;i<=r;i++) {
TextChar(task,,i,t-1,'Í'+attr);
TextChar(task,,i,b+1,'Í'+attr);
}
for (i=t;i<=b;i++) {
TextChar(task,,l-1,i,'º'+attr);
TextChar(task,,r+1,i,'º'+attr);
}
} else {
TextChar(task,,l-1,t-1,'Ú'+attr);
TextChar(task,,r+1,t-1,'¿'+attr);
TextChar(task,,l-1,b+1,'À'+attr);
TextChar(task,,r+1,b+1,'Ù'+attr);
for (i=l;i<=r;i++) {
TextChar(task,,i,t-1,'Ä'+attr);
TextChar(task,,i,b+1,'Ä'+attr);
}
for (i=t;i<=b;i++) {
TextChar(task,,l-1,i,'³'+attr);
TextChar(task,,r+1,i,'³'+attr);
}
}
}
public U0 TextRect(I64 l,I64 r,I64 t,I64 b,I64 d)
{//Fill text rect. Must be called 60fps in Fs->draw_it() callback.
I64 y,w;
if (l>r || t>b) return;
if (t<0) t=0;
if (b>=TEXT_ROWS) b=TEXT_ROWS-1;
if (l<0) l=0;
if (r>=TEXT_COLS) r=TEXT_COLS-1;
if (w=r-l+1)
for (y=t;y<=b;y++)
MemSetU32(gr.text_base(U8 *)+(y*TEXT_COLS+l)*sizeof(U32),d,w);
}
Adam/Gr/MathGr.CPP
+65 -76
View File
@@ -10,8 +10,8 @@ public Bool Line(U8 *aux_data,
I64 x2,I64 y2,I64 z2,
Bool (*fp_plot)(U8 *aux,I64 x,I64 y,I64 z),
I64 step=1,I64 start=0)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
{//Step through line segment calling callback.
//Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
I64 i,j,d,dx=x2-x1,dy=y2-y1,dz=z2-z1,_x,_y,_z,
adx=AbsI64(dx),ady=AbsI64(dy),adz=AbsI64(dz);
Bool first=TRUE;
@@ -81,56 +81,52 @@ public Bool Line(U8 *aux_data,
#help_index "Graphics/Math/3D Transformation"
public I64 *GrRotXNew(F64 è,CTask *mem_task=NULL)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(è)*gr_scale,
my_sin=Sin(è)*gr_scale;
{//MAlloc 4x4 matrix to rot about X axis. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(è)*GR_SCALE,
my_sin=Sin(è)*GR_SCALE;
I64 *r=CAlloc(sizeof(I64)*16,mem_task);
r[5]=my_cos;
r[10]=my_cos;
r[9]=my_sin;
r[6]=-my_sin;
r[0]=gr_scale;
r[15]=gr_scale;
r[0]=GR_SCALE;
r[15]=GR_SCALE;
return r;
}
public I64 *GrRotYNew(F64 ê,CTask *mem_task=NULL)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(ê)*gr_scale,
my_sin=Sin(ê)*gr_scale;
{//MAlloc 4x4 matrix to rot about Y axis. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(ê)*GR_SCALE,
my_sin=Sin(ê)*GR_SCALE;
I64 *r=CAlloc(sizeof(I64)*16,mem_task);
r[0]=my_cos;
r[10]=my_cos;
r[8]=-my_sin;
r[2]=my_sin;
r[5]=gr_scale;
r[15]=gr_scale;
r[5]=GR_SCALE;
r[15]=GR_SCALE;
return r;
}
public I64 *GrRotZNew(F64 é,CTask *mem_task=NULL)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(é)*gr_scale,
my_sin=Sin(é)*gr_scale;
{//MAlloc 4x4 matrix to rot about Z axis. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(é)*GR_SCALE,
my_sin=Sin(é)*GR_SCALE;
I64 *r=CAlloc(sizeof(I64)*16,mem_task);
r[0]=my_cos;
r[5]=my_cos;
r[4]=my_sin;
r[1]=-my_sin;
r[10]=gr_scale;
r[15]=gr_scale;
r[10]=GR_SCALE;
r[15]=GR_SCALE;
return r;
}
public I64 *GrScaleNew(I64 *m1,F64 s,CTask *mem_task=NULL)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
{//MAlloc matrix that is scaled version of a 4x4 matrix. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
I64 i,*r=CAlloc(sizeof(I64)*16,mem_task);
for (i=0;i<16;i++)
r[i]=m1[i]*s;
@@ -138,9 +134,8 @@ public I64 *GrScaleNew(I64 *m1,F64 s,CTask *mem_task=NULL)
}
public I64 *GrMulMat(I64 *m1,I64 *m2,CTask *mem_task=NULL)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
//Conceptually, the transform m1 is applied after m2
{//Multiply 4x4 matrices, return MAlloced matrix. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
//Conceptually, the transform m1 is applied after m2
I64 i,j,k,*r=CAlloc(sizeof(I64)*16,mem_task);
F64 d;
for (i=0;i<4;i++) {
@@ -148,7 +143,7 @@ public I64 *GrMulMat(I64 *m1,I64 *m2,CTask *mem_task=NULL)
for (k=0;k<4;k++) {
d=m1[k+4*j];
d*=m2[i+4*k]; //TODO! Possible overflow if norm > one.
d/=gr_scale;
d/=GR_SCALE;
r[i+4*j]+=d;
}
}
@@ -157,18 +152,17 @@ public I64 *GrMulMat(I64 *m1,I64 *m2,CTask *mem_task=NULL)
}
public I64 *GrRotXEqu(I64 *m1,F64 è)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(è)*gr_scale,
my_sin=Sin(è)*gr_scale;
{//Rot matrix about X axis. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(è)*GR_SCALE,
my_sin=Sin(è)*GR_SCALE;
I64 r[16],*r2;
MemSet(r,0,sizeof(r));
r[5]=my_cos;
r[10]=my_cos;
r[9]=my_sin;
r[6]=-my_sin;
r[0]=gr_scale;
r[15]=gr_scale;
r[0]=GR_SCALE;
r[15]=GR_SCALE;
r2=GrMulMat(r,m1);
MemCpy(m1,r2,sizeof(I64)*16);
@@ -177,18 +171,17 @@ public I64 *GrRotXEqu(I64 *m1,F64
}
public I64 *GrRotYEqu(I64 *m1,F64 ê)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(ê)*gr_scale,
my_sin=Sin(ê)*gr_scale;
{//Rot matrix about Y axis. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(ê)*GR_SCALE,
my_sin=Sin(ê)*GR_SCALE;
I64 r[16],*r2;
MemSet(r,0,sizeof(r));
r[0]=my_cos;
r[10]=my_cos;
r[8]=-my_sin;
r[2]=my_sin;
r[5]=gr_scale;
r[15]=gr_scale;
r[5]=GR_SCALE;
r[15]=GR_SCALE;
r2=GrMulMat(r,m1);
MemCpy(m1,r2,sizeof(I64)*16);
@@ -197,18 +190,17 @@ public I64 *GrRotYEqu(I64 *m1,F64
}
public I64 *GrRotZEqu(I64 *m1,F64 é)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(é)*gr_scale,
my_sin=Sin(é)*gr_scale;
{//Rot matrix about Z axis. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
F64 my_cos=Cos(é)*GR_SCALE,
my_sin=Sin(é)*GR_SCALE;
I64 r[16],*r2;
MemSet(r,0,sizeof(r));
r[0]=my_cos;
r[5]=my_cos;
r[4]=my_sin;
r[1]=-my_sin;
r[10]=gr_scale;
r[15]=gr_scale;
r[10]=GR_SCALE;
r[15]=GR_SCALE;
r2=GrMulMat(r,m1);
MemCpy(m1,r2,sizeof(I64)*16);
@@ -217,15 +209,15 @@ public I64 *GrRotZEqu(I64 *m1,F64
}
public I64 *GrScaleEqu(I64 *m1,F64 s)
{
{//Scale 4x4 matrix by value.
I64 i;
for (i=0;i<16;i++)
m1[i]*=s;
return m1;
}
public U0 GrScalePenWidth(CDC *dc=gr_dc)
{
public U0 GrScalePenWidth(CDC *dc=gr.dc)
{//Scale device context's pen width by norm of transformation.
I64 d;
if (dc->flags&DCF_TRANSFORMATION) {
if (dc->pen_width) {
@@ -238,27 +230,25 @@ public U0 GrScalePenWidth(CDC *dc=gr_dc)
}
public I64 *GrSetTranslation(I64 r[4][4],I64 x,I64 y,I64 z)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
{//Set translation values in 4x4 matrix. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
r[0][3]=x<<32;
r[1][3]=y<<32;
r[2][3]=z<<32;
r[3][3]=gr_scale;
r[3][3]=GR_SCALE;
return r;
}
public I64 *GrAddTranslation(I64 r[4][4],I64 x,I64 y,I64 z)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
{//Add translation to 4x4 matrix. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
r[0][3]+=x<<32;
r[1][3]+=y<<32;
r[2][3]+=z<<32;
r[3][3]=gr_scale;
r[3][3]=GR_SCALE;
return r;
}
public Bool GrSetSymmetry(CDC *dc=gr_dc,I64 x1,I64 y1,I64 x2,I64 y2)
{
public Bool GrSetSymmetry(CDC *dc=gr.dc,I64 x1,I64 y1,I64 x2,I64 y2)
{//2D. Set device context's symmetry.
F64 d;
if (y1==y2 && x1==x2)
return FALSE;
@@ -268,7 +258,7 @@ public Bool GrSetSymmetry(CDC *dc=gr_dc,I64 x1,I64 y1,I64 x2,I64 y2)
if (d=Sqrt(SqrI64(dc->sym.snx)+
SqrI64(dc->sym.sny)+
SqrI64(dc->sym.snz))) {
d=gr_scale/d;
d=GR_SCALE/d;
dc->sym.snx *= d;
dc->sym.sny *= d;
dc->sym.snz *= d;
@@ -279,8 +269,8 @@ public Bool GrSetSymmetry(CDC *dc=gr_dc,I64 x1,I64 y1,I64 x2,I64 y2)
return TRUE;
}
public Bool GrSetSymmetry3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,I64 x2,I64 y2,I64 z2,I64 x3,I64 y3,I64 z3)
{
public Bool GrSetSymmetry3(CDC *dc=gr.dc,I64 x1,I64 y1,I64 z1,I64 x2,I64 y2,I64 z2,I64 x3,I64 y3,I64 z3)
{//3D. Set device context's symmetry.
F64 d,x,y,z,xx,yy,zz;
I64 xx1,yy1,zz1,xx2,yy2,zz2,*r;
xx1=x1-x2; yy1=y1-y2; zz1=z1-z2;
@@ -301,7 +291,7 @@ public Bool GrSetSymmetry3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,I64 x2,I64 y2,I64
x=xx; y=yy; z=zz;
}
if (d=Sqrt(Sqr(x)+Sqr(y)+Sqr(z))) {
d=gr_scale/d;
d=GR_SCALE/d;
dc->sym.snx = d*x;
dc->sym.sny = d*y;
dc->sym.snz = d*z;
@@ -315,8 +305,7 @@ public Bool GrSetSymmetry3(CDC *dc=gr_dc,I64 x1,I64 y1,I64 z1,I64 x2,I64 y2,I64
}
public U0 GrReflect(CDC *dc,I64 *_x,I64 *_y,I64 *_z)
{
//This uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
{//Reflect 3D point about device context's symmetry. Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.CPP"$.
I64 x=*_x<<32,y=*_y<<32,z=*_z<<32,
xx=*_x-dc->sym.sx,yy=*_y-dc->sym.sy,zz=*_z-dc->sym.sz,
d=(xx*dc->sym.snx+yy*dc->sym.sny+zz*dc->sym.snz)>>16,
@@ -352,7 +341,7 @@ public Bool Circle(U8 *aux_data,
I64 step=1,
F64 start_radians=0,
F64 len_radians=2*ã)
{
{//Step through circle arc calling callback.
I64 i,j,len=Ceil(len_radians*radius),
x,y,x1,y1,s1,s2,c;
F64 t;
@@ -396,7 +385,7 @@ public Bool Ellipse(U8 *aux_data,
I64 step=1,
F64 start_radians=0,
F64 len_radians=2*ã)
{
{//Step through ellipse arc calling callback.
I64 i,j,len,
x,y,_x,_y,x1,y1,x2,y2, s1,s2,c, s12,s22,c2;
F64 t;
@@ -468,7 +457,7 @@ public Bool RegPoly(U8 *aux_data,
I64 step=1,
F64 start_radians=0,
F64 len_radians=2*ã)
{
{//Step through regular polygon calling callback.
I64 i,n,x,y,x1,y1,x2,y2,
xx1,yy1,xx2,yy2,
s1,s2,c, s12,s22,c2;
@@ -523,30 +512,30 @@ public Bool RegPoly(U8 *aux_data,
return TRUE;
}
#help_index "Graphics/CD3I32;Math/CD3I32"
#help_index "Graphics/Data Types;Math/Data Types"
public F64 D3I32Dist(CD3I32 *p1,CD3I32 *p2)
{
{//Dist between p1 and p2.
return Sqrt(SqrI64(p1->x-p2->x)+SqrI64(p1->y-p2->y)+SqrI64(p1->z-p2->z));
}
public I64 D3I32SqrDist(CD3I32 *p1,CD3I32 *p2)
{
public I64 D3I32DistSqr(CD3I32 *p1,CD3I32 *p2)
{//Dist Squared between p1 and p2.
return SqrI64(p1->x-p2->x)+SqrI64(p1->y-p2->y)+SqrI64(p1->z-p2->z);
}
public F64 D3I32Norm(CD3I32 *p)
{
{//Norm of p.
return Sqrt(SqrI64(p->x)+SqrI64(p->y)+SqrI64(p->z));
}
public I64 D3I32SqrNorm(CD3I32 *p)
{
public I64 D3I32NormSqr(CD3I32 *p)
{//Norm Squared of p.
return SqrI64(p->x)+SqrI64(p->y)+SqrI64(p->z);
}
#help_index "Graphics/Math"
public Bool Bezier2(U8 *aux_data,CD3I32 *ctrl,Bool (*fp_plot)(U8 *aux,I64 x,I64 y,I64 z),Bool first=TRUE)
{//2nd order
{//Go in 2nd order bezier calling callback.
I64 x,y,z,xx,yy,zz,dx,dy,dz,d_max;
F64 x0=ctrl[0].x,y0=ctrl[0].y,z0=ctrl[0].z,
x1=ctrl[1].x-x0,y1=ctrl[1].y-y0,z1=ctrl[1].z-z0,
@@ -590,7 +579,7 @@ public Bool Bezier2(U8 *aux_data,CD3I32 *ctrl,Bool (*fp_plot)(U8 *aux,I64 x,I64
}
public Bool Bezier3(U8 *aux_data,CD3I32 *ctrl,Bool (*fp_plot)(U8 *aux,I64 x,I64 y,I64 z),Bool first=TRUE)
{ //3rd order
{//Go in 3rd order bezier calling callback.
I64 x,y,z,xx,yy,zz,dx,dy,dz,d_max;
F64 x0=ctrl[0].x,y0=ctrl[0].y,z0=ctrl[0].z,
x1=ctrl[1].x-x0,y1=ctrl[1].y-y0,z1=ctrl[1].z-z0,
@@ -638,7 +627,7 @@ public Bool Bezier3(U8 *aux_data,CD3I32 *ctrl,Bool (*fp_plot)(U8 *aux,I64 x,I64
}
public Bool BSpline2(U8 *aux_data,CD3I32 *ctrl,I64 cnt,Bool (*fp_plot)(U8 *aux,I64 x,I64 y,I64 z),Bool closed=FALSE)
{ //2nd order
{//Go in 2nd order spline calling callback.
I64 i,j;
CD3I32 *c;
Bool first;
@@ -704,7 +693,7 @@ public Bool BSpline2(U8 *aux_data,CD3I32 *ctrl,I64 cnt,Bool (*fp_plot)(U8 *aux,I
}
public Bool BSpline3(U8 *aux_data,CD3I32 *ctrl,I64 cnt,Bool (*fp_plot)(U8 *aux,I64 x,I64 y,I64 z),Bool closed=FALSE)
{ //3rd order
{//Go in 3rd order spline calling callback.
I64 i,j;
F64 x,y,z;
CD3I32 *c;
@@ -798,7 +787,7 @@ public Bool BSpline3(U8 *aux_data,CD3I32 *ctrl,I64 cnt,Bool (*fp_plot)(U8 *aux,I
#define CC_BOTTOM 8
public Bool ClipLine(I64 *_x1,I64 *_y1,I64 *_x2,I64 *_y2,I64 left,I64 top,I64 right,I64 bottom)
{
{//Clip x1,y1 x2,y2 with left,top,right,bottom.
I64 x,y,x1=*_x1,y1=*_y1,x2=*_x2,y2=*_y2,
cc,cc1,cc2;
if (y1>bottom)
Adam/Gr/SpriteBitMap.CPP
+251 -252
View File
@@ -1,33 +1,33 @@
#help_index "Graphics/Sprite"
#define GEBM_EXIT 0
#define GEBM_MAIN_MENU 1
#define GEBM_COLOR 2
#define GEBM_DITHER_COLOR 3
#define GEBM_WIDTH 4
#define GEBM_PT 5
#define GEBM_LINE 6
#define GEBM_ARROW 7
#define GEBM_RECT 8
#define GEBM_CIRCLE 9
#define GEBM_TEXT 10
#define GEBM_TEXT_BOX 11
#define GEBM_TEXT_DIAMOND 12
#define GEBM_FLOOD_FILL 13
#define GEBM_FLOOD_FILL_NOT 14
#define GEBM_POLYLINE 15
#define GEBM_POLYPT 16
#define GEBM_COPY 17
#define GEBM_DELETE 18
#define GEBM_PASTE 19
#define GEBM_PASTE_TRANSPARENT 20
#define GEBM_FIND_AND_REPLACE 21
#define GEBM_TRIM_TO_EXTENTS 22
#define GEBM_ADD_OUTLINE 23
#define GEBM_ETCH 24
#define GEBM_UNDO 25
#define GEBM_SAVE_BMP 26
#define GEBM_SAVE_GRA 27
#define GBM_EXIT 0
#define GBM_MAIN_MENU 1
#define GBM_COLOR 2
#define GBM_DITHER_COLOR 3
#define GBM_WIDTH 4
#define GBM_PT 5
#define GBM_LINE 6
#define GBM_ARROW 7
#define GBM_RECT 8
#define GBM_CIRCLE 9
#define GBM_TEXT 10
#define GBM_TEXT_BOX 11
#define GBM_TEXT_DIAMOND 12
#define GBM_FLOOD_FILL 13
#define GBM_FLOOD_FILL_NOT 14
#define GBM_POLYLINE 15
#define GBM_POLYPT 16
#define GBM_COPY 17
#define GBM_DELETE 18
#define GBM_PASTE 19
#define GBM_PASTE_TRANSPARENT 20
#define GBM_FIND_AND_REPLACE 21
#define GBM_TRIM_TO_EXTENTS 22
#define GBM_ADD_OUTLINE 23
#define GBM_ETCH 24
#define GBM_UNDO 25
#define GBM_SAVE_BMP 26
#define GBM_SAVE_GRA 27
U0 GrInit4()
{
@@ -46,7 +46,7 @@ I64 PopUpSpriteBitMap(CColorROPU32 color,I64 width)
U8 *st1,*st2,buf[136];
CDoc *doc=DocNew;
Color2Text(buf,color);
Color2Str(buf,color);
if (color&ROPF_DITHER) {
st1="";
st2=buf;
@@ -57,34 +57,34 @@ I64 PopUpSpriteBitMap(CColorROPU32 color,I64 width)
DocPrint(doc,"$$PURPLE$$$$TX+CX,\"Sprite BitMap Menu\"$$\n"
"$$LK+PU+CX,\"Click for Help\",A=\"FI:::/Doc/SpriteBitMap.TXT.Z\"$$\n"
"\n$$LTBLUE$$$$MU-UL,\"Color %s\",LE=GEBM_COLOR$$\n"
"$$MU-UL,\"Dither Color %s\",LE=GEBM_DITHER_COLOR$$\n"
"$$MU-UL,\"Width %d\",LE=GEBM_WIDTH$$\n"
"$$MU-UL,\"Find & Replace Color\",LE=GEBM_FIND_AND_REPLACE$$\n"
"$$MU-UL,\"Trim to Extents\",LE=GEBM_TRIM_TO_EXTENTS$$\n"
"$$MU-UL,\"Add Outline\",LE=GEBM_ADD_OUTLINE$$\n"
"$$MU-UL,\"Etch\",LE=GEBM_ETCH$$\n"
"\n$$MU-UL,\"Point\",LE=GEBM_PT$$\n"
"$$MU-UL,\"Line\",LE=GEBM_LINE$$\n"
"$$MU-UL,\"Arrow\",LE=GEBM_ARROW$$\n"
"$$MU-UL,\"Rect\",LE=GEBM_RECT$$\n"
"$$MU-UL,\"Circle\",LE=GEBM_CIRCLE$$\n"
"$$MU-UL,\"Text\",LE=GEBM_TEXT$$\n"
"$$MU-UL,\"Text Box\",LE=GEBM_TEXT_BOX$$\n"
"$$MU-UL,\"Text Diamond\",LE=GEBM_TEXT_DIAMOND$$\n"
"$$MU-UL,\"Flood Fill\",LE=GEBM_FLOOD_FILL$$\n"
"$$MU-UL,\"Flood Fill Not Color\",LE=GEBM_FLOOD_FILL_NOT$$\n"
"$$MU-UL,\"PolyLine\",LE=GEBM_POLYLINE$$\n"
"$$MU-UL,\"PolyPoint\",LE=GEBM_POLYPT$$\n"
"\n$$MU-UL,\"Copy to Clipboard\",LE=GEBM_COPY$$\n"
"$$MU-UL,\"Delete to Clipboard\",LE=GEBM_DELETE$$\n"
"$$MU-UL,\"Paste Clipboard\",LE=GEBM_PASTE$$\n"
"$$MU-UL,\"Paste Transparent Clipboard\",LE=GEBM_PASTE_TRANSPARENT$$\n"
"\n$$MU-UL,\"Save BMP File\",LE=GEBM_SAVE_BMP$$\n"
"$$MU-UL,\"Save GRA File\",LE=GEBM_SAVE_GRA$$\n"
"\n$$MU-UL,\"Undo\",LE=GEBM_UNDO$$\n"
"\n$$PURPLE$$$$MU-UL,\"+] Sprite Main Menu\",LE=GEBM_MAIN_MENU$$$$LTBLUE$$\n"
"$$MU-UL,\"Exit Sprite\",LE=GEBM_EXIT$$\n"
"\n$$LTBLUE$$$$MU-UL,\"Color %s\",LE=GBM_COLOR$$\n"
"$$MU-UL,\"Dither Color %s\",LE=GBM_DITHER_COLOR$$\n"
"$$MU-UL,\"Width %d\",LE=GBM_WIDTH$$\n"
"$$MU-UL,\"Find & Replace Color\",LE=GBM_FIND_AND_REPLACE$$\n"
"$$MU-UL,\"Trim to Extents\",LE=GBM_TRIM_TO_EXTENTS$$\n"
"$$MU-UL,\"Add Outline\",LE=GBM_ADD_OUTLINE$$\n"
"$$MU-UL,\"Etch\",LE=GBM_ETCH$$\n"
"\n$$MU-UL,\"Point\",LE=GBM_PT$$\n"
"$$MU-UL,\"Line\",LE=GBM_LINE$$\n"
"$$MU-UL,\"Arrow\",LE=GBM_ARROW$$\n"
"$$MU-UL,\"Rect\",LE=GBM_RECT$$\n"
"$$MU-UL,\"Circle\",LE=GBM_CIRCLE$$\n"
"$$MU-UL,\"Text\",LE=GBM_TEXT$$\n"
"$$MU-UL,\"Text Box\",LE=GBM_TEXT_BOX$$\n"
"$$MU-UL,\"Text Diamond\",LE=GBM_TEXT_DIAMOND$$\n"
"$$MU-UL,\"Flood Fill\",LE=GBM_FLOOD_FILL$$\n"
"$$MU-UL,\"Flood Fill Not Color\",LE=GBM_FLOOD_FILL_NOT$$\n"
"$$MU-UL,\"PolyLine\",LE=GBM_POLYLINE$$\n"
"$$MU-UL,\"PolyPoint\",LE=GBM_POLYPT$$\n"
"\n$$MU-UL,\"Copy to Clipboard\",LE=GBM_COPY$$\n"
"$$MU-UL,\"Delete to Clipboard\",LE=GBM_DELETE$$\n"
"$$MU-UL,\"Paste Clipboard\",LE=GBM_PASTE$$\n"
"$$MU-UL,\"Paste Transparent Clipboard\",LE=GBM_PASTE_TRANSPARENT$$\n"
"\n$$MU-UL,\"Save BMP File\",LE=GBM_SAVE_BMP$$\n"
"$$MU-UL,\"Save GRA File\",LE=GBM_SAVE_GRA$$\n"
"\n$$MU-UL,\"Undo\",LE=GBM_UNDO$$\n"
"\n$$PURPLE$$$$MU-UL,\"+] Sprite Main Menu\",LE=GBM_MAIN_MENU$$$$LTBLUE$$\n"
"$$MU-UL,\"Exit Sprite\",LE=GBM_EXIT$$\n"
"$$MU-UL,\"Abort Sprite\",LE=DOCM_CANCEL$$\n",st1,st2,width);
DocPrint(doc,"\nRight-Click to get back to this menu.");
i=PopUpMenu(doc);
@@ -92,13 +92,13 @@ I64 PopUpSpriteBitMap(CColorROPU32 color,I64 width)
return i;
}
U0 GrBMEdPrepPersistentDC(CDC *dc,I64 xx1,I64 yy1,CDC *img)
U0 GrBitMapEdPrepPersistentDC(CDC *dc,I64 xx1,I64 yy1,CDC *img)
{
DCFill(dc);
GrBlot(dc,xx1,yy1,img);
}
U0 GrBMETrimToExtents(CDC **_img,I64 *_xx1,I64 *_yy1,I64 *_xx2,I64 *_yy2,CColorROPU32 bkcolor)
U0 GrBitMapEdTrimToExtents(CDC **_img,I64 *_xx1,I64 *_yy1,I64 *_xx2,I64 *_yy2,CColorROPU32 bkcolor)
{
CDC *img=*_img;
I64 i,c,
@@ -106,7 +106,7 @@ U0 GrBMETrimToExtents(CDC **_img,I64 *_xx1,I64 *_yy1,I64 *_xx2,I64 *_yy2,CColorR
while (y1<y2) {
for (i=x1;i<=x2;i++) {
c=GrPeek(img,i,y1);
if (c!=bkcolor&&c!=COLOR_TRANSPARENT) goto tr_y2;
if (c!=bkcolor&&c!=TRANSPARENT) goto tr_y2;
}
y1++;
}
@@ -115,7 +115,7 @@ tr_y2:
while (y1<y2) {
for (i=x1;i<=x2;i++) {
c=GrPeek(img,i,y2);
if (c!=bkcolor&&c!=COLOR_TRANSPARENT) goto tr_x1;
if (c!=bkcolor&&c!=TRANSPARENT) goto tr_x1;
}
y2--;
}
@@ -124,7 +124,7 @@ tr_x1:
while (x1<x2) {
for (i=y1;i<=y2;i++) {
c=GrPeek(img,x1,i);
if (c!=bkcolor&&c!=COLOR_TRANSPARENT) goto tr_x2;
if (c!=bkcolor&&c!=TRANSPARENT) goto tr_x2;
}
x1++;
}
@@ -133,7 +133,7 @@ tr_x2:
while (x1<x2) {
for (i=y1;i<=y2;i++) {
c=GrPeek(img,x2,i);
if (c!=bkcolor&&c!=COLOR_TRANSPARENT) goto tr_done;
if (c!=bkcolor&&c!=TRANSPARENT) goto tr_done;
}
x2--;
}
@@ -145,8 +145,7 @@ tr_done:
DCDel(img);
}
U0 GrBMEAddOutline(CDC *img,I64 width,CColorROPU32 color,CColorROPU32 bkcolor)
U0 GrBitMapEdAddOutline(CDC *img,I64 width,CColorROPU32 color,CColorROPU32 bkcolor)
{
I64 i,j,k,c;
CColorROPU32 old_color;
@@ -172,7 +171,7 @@ U0 GrBMEAddOutline(CDC *img,I64 width,CColorROPU32 color,CColorROPU32 bkcolor)
}
}
U0 GrBMEEtch(CDC *img,I64 width,CColorROPU32 bkcolor)
U0 GrBitMapEdEtch(CDC *img,I64 width,CColorROPU32 bkcolor)
{
I64 i,j,k,c;
CColorROPU32 old_color;
@@ -198,11 +197,11 @@ U0 GrBMEEtch(CDC *img,I64 width,CColorROPU32 bkcolor)
}
}
I64 SpriteBitMap(CDoc *,CDocEntry *doc_e,CDC *dc,I64 *_xx1,I64 *_yy1,I64 *_xx2,I64 *_yy2,CDC **_img,CColorROPU32 bkcolor)
I64 SpriteBitMapEd(CDoc *,CDocEntry *doc_e,CDC *dc,I64 *_xx1,I64 *_yy1,I64 *_xx2,I64 *_yy2,CDC **_img,CColorROPU32 bkcolor)
{
I64 i,j,mode=GEBM_LINE,color=BLACK,width=1,msg_code,p1,p2,x1,y1,x11,y11,x22,y22,
I64 i,j,mode=GBM_LINE,color=BLACK,width=1,msg_code,a1,a2,x1,y1,x11,y11,x22,y22,
result,xx1=*_xx1,yy1=*_yy1,xx2=*_xx2,yy2=*_yy2,
old_e_flags1=doc_e->flags1;
old_de_flags=doc_e->de_flags;
Bool down=FALSE;
U8 *st=NULL;
CEdFileName filename;
@@ -210,25 +209,25 @@ I64 SpriteBitMap(CDoc *,CDocEntry *doc_e,CDC *dc,I64 *_xx1,I64 *_yy1,I64 *_xx2,I
*clipboard=NULL,*undo=NULL,*dc2;
SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
doc_e->flags1|=DOCEF1_DONT_DRAW;
doc_e->de_flags|=DOCEF_DONT_DRAW;
goto bm_menu;
while (TRUE) {
if (sys_cur_scan_code&SCF_CTRL)//grab scroll update?
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
if (kbd.scan_code&SCF_CTRL)//grab scroll update?
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
dc->color=ROPF_DITHER+WHITE<<16+BLACK;
dc->pen_width=1;
GrLineRect4(dc,xx1-1,yy1-1,xx2,yy2);//This is done little bit too often.
GrBorder(dc,xx1-1,yy1-1,xx2,yy2);//This is done little bit too often.
while (msg_code=ScanMsg(&p1,&p2,1<<MSG_IP_L_DOWN|1<<MSG_IP_L_UP|1<<MSG_IP_R_DOWN|
while (msg_code=ScanMsg(&a1,&a2,1<<MSG_IP_L_DOWN|1<<MSG_IP_L_UP|1<<MSG_IP_R_DOWN|
1<<MSG_IP_MOVE|1<<MSG_KEY_DOWN)) {
switch (msg_code) {
case MSG_KEY_DOWN:
if (p1==CH_SHIFT_ESC) {
if (a1==CH_SHIFT_ESC) {
result=GE_ABORT;
goto bm_key_up_done;
} else if (p1==CH_ESC) {
} else if (a1==CH_ESC) {
result=GE_CONT;
goto bm_key_up_done;
}
@@ -245,73 +244,73 @@ bm_menu:
case DOCM_CANCEL:
result=GE_ABORT;
goto bm_done;
case GEBM_EXIT:
case GBM_EXIT:
result=GE_EXIT;
goto bm_done;
case GEBM_MAIN_MENU:
case GBM_MAIN_MENU:
result=GE_CONT;
goto bm_done;
case GEBM_COLOR:
case GBM_COLOR:
i=PopUpColor(,,FALSE);
if (i>=0) color=i;
goto bm_menu;
case GEBM_FIND_AND_REPLACE:
case GBM_FIND_AND_REPLACE:
i=PopUpColor("Find Color\n",,FALSE);
if (i>=0) {
j=PopUpColor("Replace Color\n",,FALSE);
if (j>=0) {
DCColorChg(img,i,j);
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
}
}
goto bm_menu;
case GEBM_TRIM_TO_EXTENTS:
GrBMETrimToExtents(&img,&xx1,&yy1,&xx2,&yy2,bkcolor);
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
case GBM_TRIM_TO_EXTENTS:
GrBitMapEdTrimToExtents(&img,&xx1,&yy1,&xx2,&yy2,bkcolor);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
goto bm_menu;
case GEBM_ADD_OUTLINE:
case GBM_ADD_OUTLINE:
i=PopUpRangeI64(1,16,1,"Outline Width\n");
if (i>=0) {
GrBMEAddOutline(img,i,color,bkcolor);
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrBitMapEdAddOutline(img,i,color,bkcolor);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
}
goto bm_menu;
case GEBM_ETCH:
case GBM_ETCH:
i=PopUpRangeI64(1,16,1,"Etch Width\n");
if (i>=0) {
GrBMEEtch(img,i,bkcolor);
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrBitMapEdEtch(img,i,bkcolor);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
}
goto bm_menu;
case GEBM_SAVE_BMP:
case GBM_SAVE_BMP:
*filename.name=0;
if (DocFormDo(&filename) && *filename.name)
BMPFileWrite(filename.name,img);
goto bm_menu;
case GEBM_SAVE_GRA:
case GBM_SAVE_GRA:
*filename.name=0;
if (DocFormDo(&filename) && *filename.name)
GRAWrite(filename.name,img);
goto bm_menu;
case GEBM_DITHER_COLOR:
case GBM_DITHER_COLOR:
i=PopUpColorDither;
if (i>=0) color=i;
goto bm_menu;
case GEBM_WIDTH:
case GBM_WIDTH:
i=PopUpRangeI64(1,16,1,"Pen Width\n");
if (i>=0) width=i;
goto bm_menu;
case GEBM_UNDO:
case GBM_UNDO:
if (undo) {
Beep;
img->color=ROP_EQU;
@@ -321,27 +320,27 @@ bm_menu:
}
goto bm_menu;
case GEBM_PT:
case GEBM_LINE:
case GEBM_ARROW:
case GEBM_RECT:
case GEBM_CIRCLE:
case GEBM_FLOOD_FILL:
case GEBM_FLOOD_FILL_NOT:
case GEBM_POLYPT:
case GEBM_POLYLINE:
case GEBM_COPY:
case GEBM_DELETE:
case GEBM_PASTE:
case GEBM_PASTE_TRANSPARENT:
case GBM_PT:
case GBM_LINE:
case GBM_ARROW:
case GBM_RECT:
case GBM_CIRCLE:
case GBM_FLOOD_FILL:
case GBM_FLOOD_FILL_NOT:
case GBM_POLYPT:
case GBM_POLYLINE:
case GBM_COPY:
case GBM_DELETE:
case GBM_PASTE:
case GBM_PASTE_TRANSPARENT:
mode=i;
break;
case GEBM_TEXT:
case GEBM_TEXT_BOX:
case GEBM_TEXT_DIAMOND:
case GBM_TEXT:
case GBM_TEXT_BOX:
case GBM_TEXT_DIAMOND:
Free(st);
st=PopUpMGetS("Enter text and press <ESC>.\n");
st=PopUpGetStr("Enter text and press <ESC>.\n");
if (st && *st)
mode=i;
else
@@ -353,316 +352,316 @@ bm_menu:
undo=DCExtract(img,0,0,img->width-1,img->height-1);
undo->bkcolor=bkcolor;
WinMgrSync(2,TRUE); //Let popup close
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
down=FALSE;
break;
case MSG_IP_L_DOWN:
switch (mode) {
case GEBM_PT:
case GBM_PT:
img->color=color;
img->pen_width=width;
GrPlot3(img,p1-xx1,p2-yy1,0);
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrPlot3(img,a1-xx1,a2-yy1,0);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
break;
case GEBM_LINE:
case GEBM_ARROW:
case GEBM_RECT:
case GEBM_CIRCLE:
case GEBM_COPY:
case GEBM_DELETE:
case GBM_LINE:
case GBM_ARROW:
case GBM_RECT:
case GBM_CIRCLE:
case GBM_COPY:
case GBM_DELETE:
if (down)
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
x1=p1; y1=p2;
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
x1=a1; y1=a2;
down=TRUE;
dc->color=color;
dc->pen_width=width;
switch (mode) {
case GEBM_LINE:
GrLine3(dc,x1,y1,0,p1,p2,0);
case GBM_LINE:
GrLine3(dc,x1,y1,0,a1,a2,0);
break;
case GEBM_ARROW:
GrArrow3(dc,x1,y1,0,p1,p2,0);
case GBM_ARROW:
GrArrow3(dc,x1,y1,0,a1,a2,0);
break;
case GEBM_RECT:
case GBM_RECT:
GrRect(dc,x1,y1,1,1);
break;
case GEBM_CIRCLE:
case GBM_CIRCLE:
GrCircle3(dc,x1,y1,0,1);
break;
case GEBM_COPY:
case GEBM_DELETE:
case GBM_COPY:
case GBM_DELETE:
dc->color=ROPF_DITHER+WHITE<<16+BLACK;
dc->pen_width=1;
GrLineRect4(dc,x1,y1,x1,y1);
GrBorder(dc,x1,y1,x1,y1);
break;
}
break;
case GEBM_PASTE:
case GEBM_PASTE_TRANSPARENT:
case GBM_PASTE:
case GBM_PASTE_TRANSPARENT:
if (clipboard) {
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
if (mode==GEBM_PASTE) {
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
if (mode==GBM_PASTE) {
clipboard->flags|=DCF_NO_TRANSPARENTS;
GrBlot(dc,p1,p2,clipboard);
GrBlot(dc,a1,a2,clipboard);
clipboard->flags&=~DCF_NO_TRANSPARENTS;
} else {
dc2=DCCopy(clipboard);
DCColorChg(dc2,bkcolor);
GrBlot(dc,p1,p2,dc2);
GrBlot(dc,a1,a2,dc2);
DCDel(dc2);
}
}
break;
case GEBM_TEXT:
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
case GBM_TEXT:
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
dc->color=color;
GrPrint(dc,p1,p2,"%s",st);
GrPrint(dc,a1,a2,"%s",st);
break;
case GEBM_TEXT_BOX:
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
case GBM_TEXT_BOX:
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
dc->color=color;
GrTextBox3(dc,p1,p2,0,st);
GrTextBox3(dc,a1,a2,0,st);
break;
case GEBM_TEXT_DIAMOND:
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
case GBM_TEXT_DIAMOND:
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
dc->color=color;
GrTextDiamond3(dc,p1,p2,0,st);
GrTextDiamond3(dc,a1,a2,0,st);
break;
case GEBM_FLOOD_FILL:
case GBM_FLOOD_FILL:
img->color=color;
GrFloodFill(img,p1-xx1,p2-yy1);
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrFloodFill(img,a1-xx1,a2-yy1);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
break;
case GEBM_FLOOD_FILL_NOT:
case GBM_FLOOD_FILL_NOT:
img->color=color;
GrFloodFill(img,p1-xx1,p2-yy1,TRUE);
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrFloodFill(img,a1-xx1,a2-yy1,TRUE);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
break;
case GEBM_POLYLINE:
case GBM_POLYLINE:
if (!down) {
x1=p1; y1=p2;
x1=a1; y1=a2;
down=TRUE;
dc->color=color;
dc->pen_width=width;
GrLine3(dc,x1,y1,0,p1,p2,0);
GrLine3(dc,x1,y1,0,a1,a2,0);
}
break;
case GEBM_POLYPT:
x1=p1; y1=p2;
case GBM_POLYPT:
x1=a1; y1=a2;
down=TRUE;
img->color=color;
img->pen_width=width;
GrLine3(img,x1-xx1,y1-yy1,0,p1-xx1,p2-yy1,0);
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrLine3(img,x1-xx1,y1-yy1,0,a1-xx1,a2-yy1,0);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
break;
}
break;
case MSG_IP_MOVE:
switch (mode) {
case GEBM_LINE:
case GEBM_ARROW:
case GEBM_POLYLINE:
case GBM_LINE:
case GBM_ARROW:
case GBM_POLYLINE:
if (down) {
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
dc->color=color;
dc->pen_width=width;
if (mode==GEBM_ARROW)
GrArrow3(dc,x1,y1,0,p1,p2,0);
if (mode==GBM_ARROW)
GrArrow3(dc,x1,y1,0,a1,a2,0);
else
GrLine3(dc,x1,y1,0,p1,p2,0);
GrLine3(dc,x1,y1,0,a1,a2,0);
}
break;
case GEBM_RECT:
case GBM_RECT:
if (down) {
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
if (x1<p1) {
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
if (x1<a1) {
x11=x1;
x22=p1;
x22=a1;
} else {
x11=p1;
x11=a1;
x22=x1;
}
if (y1<p2) {
if (y1<a2) {
y11=y1;
y22=p2;
y22=a2;
} else {
y11=p2;
y11=a2;
y22=y1;
}
dc->color=color;
GrRect(dc,x11,y11,x22-x11+1,y22-y11+1);
}
break;
case GEBM_COPY:
case GEBM_DELETE:
case GBM_COPY:
case GBM_DELETE:
if (down) {
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
if (x1<p1) {
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
if (x1<a1) {
x11=x1;
x22=p1;
x22=a1;
} else {
x11=p1;
x11=a1;
x22=x1;
}
if (y1<p2) {
if (y1<a2) {
y11=y1;
y22=p2;
y22=a2;
} else {
y11=p2;
y11=a2;
y22=y1;
}
dc->color=ROPF_DITHER+WHITE<<16+BLACK;
dc->pen_width=1;
GrLineRect4(dc,x11,y11,x22,y22);
GrBorder(dc,x11,y11,x22,y22);
}
break;
case GEBM_CIRCLE:
case GBM_CIRCLE:
if (down) {
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
dc->color=color;
dc->pen_width=width;
GrCircle3(dc,x1,y1,0,Sqrt(SqrI64(p1-x1)+SqrI64(p2-y1)));
GrCircle3(dc,x1,y1,0,Sqrt(SqrI64(a1-x1)+SqrI64(a2-y1)));
}
break;
case GEBM_PASTE:
case GEBM_PASTE_TRANSPARENT:
case GBM_PASTE:
case GBM_PASTE_TRANSPARENT:
if (clipboard) {
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
if (mode==GEBM_PASTE) {
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
if (mode==GBM_PASTE) {
clipboard->flags|=DCF_NO_TRANSPARENTS;
GrBlot(dc,p1,p2,clipboard);
GrBlot(dc,a1,a2,clipboard);
clipboard->flags&=~DCF_NO_TRANSPARENTS;
} else {
dc2=DCCopy(clipboard);
DCColorChg(dc2,bkcolor);
GrBlot(dc,p1,p2,dc2);
GrBlot(dc,a1,a2,dc2);
DCDel(dc2);
}
}
break;
case GEBM_TEXT:
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
case GBM_TEXT:
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
dc->color=color;
GrPrint(dc,p1,p2,"%s",st);
GrPrint(dc,a1,a2,"%s",st);
break;
case GEBM_TEXT_BOX:
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
case GBM_TEXT_BOX:
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
dc->color=color;
GrTextBox3(dc,p1,p2,0,st);
GrTextBox3(dc,a1,a2,0,st);
break;
case GEBM_TEXT_DIAMOND:
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
case GBM_TEXT_DIAMOND:
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
dc->color=color;
GrTextDiamond3(dc,p1,p2,0,st);
GrTextDiamond3(dc,a1,a2,0,st);
break;
case GEBM_POLYPT:
case GBM_POLYPT:
if (down) {
img->color=color;
img->pen_width=width;
GrLine3(img,x1-xx1,y1-yy1,0,p1-xx1,p2-yy1,0);
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
x1=p1; y1=p2;
GrLine3(img,x1-xx1,y1-yy1,0,a1-xx1,a2-yy1,0);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
x1=a1; y1=a2;
}
break;
}
break;
case MSG_IP_L_UP:
switch (mode) {
case GEBM_LINE:
case GEBM_ARROW:
case GEBM_POLYPT:
case GEBM_POLYLINE:
case GBM_LINE:
case GBM_ARROW:
case GBM_POLYPT:
case GBM_POLYLINE:
img->color=color;
img->pen_width=width;
if (mode==GEBM_ARROW)
GrArrow3(img,x1-xx1,y1-yy1,0,p1-xx1,p2-yy1,0);
if (mode==GBM_ARROW)
GrArrow3(img,x1-xx1,y1-yy1,0,a1-xx1,a2-yy1,0);
else
GrLine3(img,x1-xx1,y1-yy1,0,p1-xx1,p2-yy1,0);
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
if (mode==GEBM_POLYLINE) {
x1=p1; y1=p2;
GrLine3(img,x1-xx1,y1-yy1,0,a1-xx1,a2-yy1,0);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
if (mode==GBM_POLYLINE) {
x1=a1; y1=a2;
} else
down=FALSE;
break;
case GEBM_RECT:
case GBM_RECT:
img->color=color;
if (x1<p1) {
if (x1<a1) {
x11=x1;
x22=p1;
x22=a1;
} else {
x11=p1;
x11=a1;
x22=x1;
}
if (y1<p2) {
if (y1<a2) {
y11=y1;
y22=p2;
y22=a2;
} else {
y11=p2;
y11=a2;
y22=y1;
}
GrRect(img,x11-xx1,y11-yy1,x22-x11+1,y22-y11+1);
down=FALSE;
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
break;
case GEBM_COPY:
case GEBM_DELETE:
if (x1<p1) {
case GBM_COPY:
case GBM_DELETE:
if (x1<a1) {
x11=x1;
x22=p1;
x22=a1;
} else {
x11=p1;
x11=a1;
x22=x1;
}
if (y1<p2) {
if (y1<a2) {
y11=y1;
y22=p2;
y22=a2;
} else {
y11=p2;
y11=a2;
y22=y1;
}
DCDel(clipboard);
clipboard=DCExtract(img,x11-xx1,y11-yy1,x22-xx1,y22-yy1);
clipboard->bkcolor=bkcolor;
if (mode==GEBM_DELETE) {
if (mode==GBM_DELETE) {
img->color=bkcolor;
GrRect(img,x11-xx1,y11-yy1,x22-x11+1,y22-y11+1);
}
goto bm_menu;
case GEBM_CIRCLE:
case GBM_CIRCLE:
img->color=color;
img->pen_width=width;
GrCircle3(img,x1-xx1,y1-yy1,0,Sqrt(SqrI64(p1-x1)+SqrI64(p2-y1)));
GrCircle3(img,x1-xx1,y1-yy1,0,Sqrt(SqrI64(a1-x1)+SqrI64(a2-y1)));
down=FALSE;
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
break;
case GEBM_PASTE:
case GEBM_PASTE_TRANSPARENT:
case GBM_PASTE:
case GBM_PASTE_TRANSPARENT:
if (clipboard) {
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
if (mode==GEBM_PASTE) {
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
if (mode==GBM_PASTE) {
clipboard->flags|=DCF_NO_TRANSPARENTS;
GrBlot(img,p1-xx1,p2-yy1,clipboard);
GrBlot(img,a1-xx1,a2-yy1,clipboard);
clipboard->flags&=~DCF_NO_TRANSPARENTS;
} else {
dc2=DCCopy(clipboard);
DCColorChg(dc2,bkcolor);
GrBlot(img,p1-xx1,p2-yy1,dc2);
GrBlot(img,a1-xx1,a2-yy1,dc2);
DCDel(dc2);
}
GrBMEdPrepPersistentDC(dc,xx1,yy1,img);
GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img);
}
break;
case GEBM_TEXT:
case GBM_TEXT:
img->color=color;
GrPrint(img,p1-xx1,p2-yy1,"%s",st);
GrPrint(img,a1-xx1,a2-yy1,"%s",st);
goto bm_menu;
case GEBM_TEXT_BOX:
case GBM_TEXT_BOX:
img->color=color;
GrTextBox3(img,p1-xx1,p2-yy1,0,st);
GrTextBox3(img,a1-xx1,a2-yy1,0,st);
goto bm_menu;
case GEBM_TEXT_DIAMOND:
case GBM_TEXT_DIAMOND:
img->color=color;
GrTextDiamond3(img,p1-xx1,p2-yy1,0,st);
GrTextDiamond3(img,a1-xx1,a2-yy1,0,st);
goto bm_menu;
}
break;
@@ -678,7 +677,7 @@ bm_done:
Free(st);
DCFill(dc);
SettingsPop;
doc_e->flags1=old_e_flags1;
doc_e->de_flags=old_de_flags;
*_img=img;
*_xx1=xx1,*_yy1=yy1,*_xx2=xx2,*_yy2=yy2;
return result;
Adam/Gr/SpriteCode.CPP
+607
View File
@@ -0,0 +1,607 @@
#help_index "Graphics/Sprite"
U0 SpriteElem2Code(CDoc *doc,CSprite *tempg)
{
U8 buf1[256],buf2[136];
I32 *ptr;
I64 i,j,k,col,width_internal;
CD3I32 *p;
CMeshTri *tri;
if (!doc) doc=DocPut;
DocPrint(doc,"%Z",tempg->type,"ST_SPRITE_ELEM_CODES");
switch (tempg->type) {
case SPT_COLOR:
DocPrint(doc,"{%s}",
Color2Str(buf1,tempg->color));
break;
case SPT_DITHER_COLOR:
DocPrint(doc,"{%s}",
Color2Str(buf2,ROPF_DITHER|tempg->dither_color.u8[0]|tempg->dither_color.u8[1]<<COLORROP_BITS));
break;
case SPT_TRANSFORM_ON:
DocPrint(doc,"{ON}");
break;
case SPT_TRANSFORM_OFF:
DocPrint(doc,"{OFF}");
break;
case SPT_LINE:
case SPT_ARROW:
case SPT_PLANAR_SYMMETRY:
DocPrint(doc,"{(%d,%d),(%d,%d)}",tempg->x1,tempg->y1,tempg->x2,tempg->y2);
break;
case SPT_RECT:
DocPrint(doc,"{(%d,%d):(%d,%d)}",tempg->x1,tempg->y1,
tempg->x2-tempg->x1,tempg->y2-tempg->y1);
break;
case SPT_ROTATED_RECT:
DocPrint(doc,"{(%d,%d):(%d,%d),%0.4f}",tempg->x1,tempg->y1,
tempg->x2-tempg->x1,tempg->y2-tempg->y1,
180/ã*Wrap(tempg->rot_angle));
break;
case SPT_PT:
case SPT_FLOOD_FILL:
case SPT_SHIFT:
DocPrint(doc,"{(%d,%d)}",tempg->x1,tempg->y1);
break;
case SPT_FLOOD_FILL_NOT:
DocPrint(doc,"{(%d,%d),TRUE}",tempg->x1,tempg->y1);
break;
case SPT_CIRCLE:
DocPrint(doc,"{(%d,%d):%d}",tempg->x1,tempg->y1,tempg->x2);
break;
case SPT_WIDTH:
DocPrint(doc,"{%d}",tempg->width);
break;
case SPT_ELLIPSE:
DocPrint(doc,"{(%d,%d):(%d,%d),%0.4f}",tempg->x2,tempg->y2,
tempg->width,tempg->height,180/ã*Wrap(tempg->rot_angle));
break;
case SPT_POLYGON:
DocPrint(doc,"{%d,(%d,%d):(%d,%d),%0.4f}",tempg->sides,tempg->x2,tempg->y2,
tempg->width,tempg->height,180/ã*Wrap(tempg->rot_angle));
break;
case SPT_TEXT:
case SPT_TEXT_BOX:
case SPT_TEXT_DIAMOND:
DocPrint(doc,"{(%d,%d),\"%Q\"}",tempg->x1,tempg->y1,tempg->st);
break;
case SPT_POLYLINE:
ptr=&tempg->y1;
DocPrint(doc,"{(%d,%d)",ptr[0],ptr[1]);
if (tempg->num>1) DocPrint(doc,",");
ptr+=2;
for (i=1;i<tempg->num;i++) {
DocPrint(doc,"(%d,%d)",ptr[0],ptr[1]);
if (i+1<tempg->num) DocPrint(doc,",");
if (i&3==3 && i+1<tempg->num)
DocPrint(doc,"\n");
ptr+=2;
}
DocPrint(doc,"}");
break;
case SPT_BSPLINE2:
case SPT_BSPLINE3:
case SPT_BSPLINE2_CLOSED:
case SPT_BSPLINE3_CLOSED:
ptr=&tempg->y1;
DocPrint(doc,"{(%d,%d,%d)",ptr[0],ptr[1],ptr[2]);
ptr+=3;
if (tempg->num>1) DocPrint(doc,",");
for (i=1;i<tempg->num;i++,ptr+=3) {
DocPrint(doc,"(%d,%d,%d)",ptr[0],ptr[1],ptr[2]);
if (i+1<tempg->num) DocPrint(doc,",");
if (i&3==3 && i+1<tempg->num)
DocPrint(doc,"\n");
}
if (tempg->type==SPT_BSPLINE2||tempg->type==SPT_BSPLINE3)
DocPrint(doc,",FALSE}");
else
DocPrint(doc,",TRUE}");
break;
case SPT_POLYPT:
ptr=&tempg->y1;
DocPrint(doc,"{(%d,%d),",ptr[0],ptr[1]);
ptr+=2;
col=16;
for (i=0;i<tempg->num;i++) {
DocPrint(doc,"%d",BFieldExtU32(ptr,i*3,3));
if (++col>=64 && i+1<tempg->num) {
DocPrint(doc,"\n");
col=0;
}
}
DocPrint(doc,"}");
break;
case SPT_BITMAP:
DocPrint(doc,"{(%d,%d):(%d,%d),\n",tempg->x2,tempg->y2,tempg->width,tempg->height);
width_internal=(tempg->width+7)&~7;
if (width_internal<80)
k=width_internal;
else
k=64;
ptr=tempg(U8 *)+offset(CSprite.linespeed);
col=0;
for (j=0;j<tempg->height;j++)
for (i=0;i<width_internal;i++,ptr(U8 *)++) {
if (i>=tempg->width)
DocPrint(doc,"_");
else if (*ptr(U8 *)<16)
DocPrint(doc,"%X",*ptr(U8 *));
else
DocPrint(doc,"%c",CH_SHIFT_SPACE);
if (++col>=k && (i+1<width_internal||j+1<tempg->height)) {
DocPrint(doc,"\n");
col=0;
}
}
DocPrint(doc,"}");
break;
case SPT_MESH:
DocPrint(doc,"{FALSE,");
p=(&tempg->tri_cnt)(U8 *)+sizeof(I32);
col=0;
for (i=0;i<tempg->vertex_cnt;i++,p++) {
DocPrint(doc,"(%d,%d,%d)",p->x,p->y,p->z);
if (i+1<tempg->vertex_cnt) DocPrint(doc,",");
if (++col==4) {
DocPrint(doc,"\t//%d\n",i);
col=0;
}
}
DocPrint(doc,":");
tri=p;
for (i=0;i<tempg->tri_cnt;i++,tri++) {
DocPrint(doc,"(%s,%d,%d,%d)",Color2Str(buf1,tri->color),
tri->nums[0],tri->nums[1],tri->nums[2]);
if (i+1<tempg->tri_cnt) DocPrint(doc,",");
if (++col>=3 && i+1<tempg->tri_cnt) {
DocPrint(doc,"\n");
col=0;
}
}
DocPrint(doc,"}");
break;
case SPT_SHIFTABLE_MESH:
DocPrint(doc,"{TRUE,(%d,%d,%d):",tempg->x1,tempg->y1,tempg->z1);
p=(&tempg->shiftable_tri_cnt)(U8 *)+sizeof(I32);
col=1;
for (i=0;i<tempg->shiftable_vertex_cnt;i++,p++) {
DocPrint(doc,"(%d,%d,%d)",p->x,p->y,p->z);
if (i+1<tempg->shiftable_vertex_cnt) DocPrint(doc,",");
if (++col==4) {
DocPrint(doc,"\t//%d\n",i);
col=0;
}
}
DocPrint(doc,":");
tri=p;
for (i=0;i<tempg->shiftable_tri_cnt;i++,tri++) {
DocPrint(doc,"(%s,%d,%d,%d)",Color2Str(buf1,tri->color),
tri->nums[0],tri->nums[1],tri->nums[2]);
if (i+1<tempg->shiftable_tri_cnt) DocPrint(doc,",");
if (++col>=3 && i+1<tempg->shiftable_tri_cnt) {
DocPrint(doc,"\n");
col=0;
}
}
DocPrint(doc,"}");
break;
}
DocPrint(doc,";\n");
}
public U0 Sprite2Code(CDoc *doc=NULL,U8 *elems)
{//Sprite to text.
CSprite *tempg=elems-offset(CSprite.start);
while (tempg->type) {
SpriteElem2Code(doc,tempg);
tempg(U8 *)+=SpriteElemSize(tempg);
}
}
CSprite *Code2SpriteElem(CLex *lx,I64 type)
{
I64 i,num1,num2,size;
CSprite *result,g;
CColorROPU32 color;
U8 *st,*ptr;
CQueD3I32 rootp,*tempp,*tempa1;
CQueMeshTri roott,*tempt,*tempt1;
CQueVectU8 *tempv;
MemSet(&g,0,sizeof(CSprite));
switch (type) {
sub_switch_start:
case SPT_COLOR:
case SPT_DITHER_COLOR:
st=LexFirstRem(lx,"}");
color=Str2ColorU32(st);
Free(st);
Lex(lx); //Skip color
g.color=color.c0.color;
if (color&ROPF_DITHER) {
g.dither_color.u8[1]=color.c1.color;
g.type=SPT_DITHER_COLOR;
} else
g.type=SPT_COLOR;
break;
case SPT_TRANSFORM_ON:
case SPT_TRANSFORM_OFF:
Lex(lx); //Skip {
if (LexExpressionI64(lx))
g.type=SPT_TRANSFORM_ON;
else
g.type=SPT_TRANSFORM_OFF;
break;
case SPT_LINE:
case SPT_ARROW:
case SPT_PLANAR_SYMMETRY:
Lex(lx); //Skip {
g.type=type;
LexD2I32(lx,&g.x1);
if (lx->token!=',')
LexExcept(lx,"expecting ',' at ");
Lex(lx); //Skip ,
LexD2I32(lx,&g.x2);
break;
case SPT_RECT:
case SPT_ROTATED_RECT:
Lex(lx); //Skip {
LexD2I32(lx,&g.x1);
if (lx->token!=':')
LexExcept(lx,"expecting ':' at ");
Lex(lx); //Skip :
LexD2I32(lx,&g.x2);
g.x2+=g.x1;
g.y2+=g.y1;
if (lx->token==',') {
Lex(lx); //Skip ,
g.rot_angle=ã/180*LexExpressionF64(lx);
g.type=SPT_ROTATED_RECT;
} else
g.type=SPT_RECT;
break;
case SPT_PT:
case SPT_SHIFT:
Lex(lx); //Skip {
g.type=type;
LexD2I32(lx,&g.x1);
break;
case SPT_FLOOD_FILL:
case SPT_FLOOD_FILL_NOT:
Lex(lx); //Skip {
LexD2I32(lx,&g.x1);
if (lx->token==',') {
Lex(lx); //Skip ,
i=LexExpressionI64(lx);
} else
i=0;
if (i)
g.type=SPT_FLOOD_FILL_NOT;
else
g.type=SPT_FLOOD_FILL;
break;
case SPT_WIDTH:
Lex(lx); //Skip {
g.width=LexExpressionI64(lx);
g.type=SPT_WIDTH;
break;
case SPT_CIRCLE:
Lex(lx); //Skip {
g.type=SPT_CIRCLE;
LexD2I32(lx,&g.x1);
if (lx->token!=':')
LexExcept(lx,"expecting ':' at ");
Lex(lx); //Skip :
g.x2=LexExpressionI64(lx);
break;
case SPT_POLYGON:
Lex(lx); //Skip {
g.sides=LexExpressionI64(lx);
if (lx->token!=',')
LexExcept(lx,"expecting ',' at ");
Lex(lx); //Skip ,
case SPT_ELLIPSE:
Lex(lx); //Skip {
g.type=type;
LexD2I32(lx,&g.x2);
if (lx->token!=':')
LexExcept(lx,"expecting ':' at ");
Lex(lx); //Skip :
LexD2I32(lx,&g.width);
if (lx->token!=',')
LexExcept(lx,"expecting ',' at ");
Lex(lx); //Skip ,
g.rot_angle=ã/180*LexExpressionF64(lx);
break;
sub_switch_end:
size=SpriteElemSize(&g)+offset(CSprite.start);
result=MAlloc(size);
MemCpy(result,&g,size);
break;
case SPT_TEXT:
case SPT_TEXT_BOX:
case SPT_TEXT_DIAMOND:
Lex(lx); //Skip {
g.type=type;
LexD2I32(lx,&g.x1);
if (lx->token!=',')
LexExcept(lx,"expecting ',' at ");
if (Lex(lx)==TK_STR) //Skip ,
st=LexExtStr(lx);
else
LexExcept(lx,"expecting string at ");
size=SpriteElemQuedBaseSize(type);
i=StrLen(st)+1;
result=MAlloc(size+i);
MemCpy(result,&g,size);
MemCpy(result(U8 *)+size,st,i);
Free(st);
break;
case SPT_POLYLINE:
Lex(lx); //Skip {
g.type=SPT_POLYLINE;
QueInit(&rootp);
while (lx->token=='(') {
tempp=CAlloc(sizeof(CQueD3I32));
LexD2I32(lx,&tempp->p);
QueIns(tempp,rootp.last);
g.num++;
if (lx->token==',')
Lex(lx); //Skip ,
}
if (!g.num)
LexExcept(lx,"expecting point at ");
size=SpriteElemQuedBaseSize(SPT_POLYLINE);
i=g.num*sizeof(CD2I32);
result=MAlloc(size+i);
MemCpy(result,&g,size);
ptr=&result->y1;
tempp=rootp.next;
while (tempp!=&rootp) {
tempa1=tempp->next;
MemCpy(ptr,&tempp->p,sizeof(CD2I32));
ptr+=sizeof(CD2I32);
Free(tempp);
tempp=tempa1;
}
break;
case SPT_BSPLINE2:
case SPT_BSPLINE3:
case SPT_BSPLINE2_CLOSED:
case SPT_BSPLINE3_CLOSED:
Lex(lx); //Skip {
QueInit(&rootp);
while (lx->token=='(') {
tempp=CAlloc(sizeof(CQueD3I32));
LexD3I32(lx,&tempp->p);
QueIns(tempp,rootp.last);
g.num++;
if (lx->token==',')
Lex(lx); //Skip ,
}
if (!g.num)
LexExcept(lx,"expecting point at ");
size=SpriteElemQuedBaseSize(type);
i=g.num*sizeof(CD3I32);
result=MAlloc(size+i);
if (LexExpressionI64(lx)) {
if (type==SPT_BSPLINE2||type==SPT_BSPLINE2_CLOSED)
g.type=SPT_BSPLINE2_CLOSED;
else
g.type=SPT_BSPLINE3_CLOSED;
} else {
if (type==SPT_BSPLINE2||type==SPT_BSPLINE2_CLOSED)
g.type=SPT_BSPLINE2;
else
g.type=SPT_BSPLINE3;
}
MemCpy(result,&g,size);
ptr=&result->y1;
tempp=rootp.next;
while (tempp!=&rootp) {
tempa1=tempp->next;
MemCpy(ptr,&tempp->p,sizeof(CD3I32));
ptr+=sizeof(CD3I32);
Free(tempp);
tempp=tempa1;
}
break;
case SPT_POLYPT:
Lex(lx); //Skip {
LexD2I32(lx,&g.y1);
if (lx->token!=',')
LexExcept(lx,"expecting ',' at ");
tempv=QueVectU8New;
while (TRUE) {
if (!(i=LexGetChar(lx)))
LexExcept(lx,"expecting '}' at ");
if (i=='}')
break;
if ('0'<=i<='7')
QueVectU8Put(tempv,g.num++,i-'0');
}
Bts(&lx->flags,Lf_USE_LAST_U16);
Lex(lx); //Load '}'
g.type=SPT_POLYPT;
size=SpriteElemQuedBaseSize(SPT_POLYPT);
i=(g.num*3+7)>>3;
result=CAlloc(size+i);
MemCpy(result,&g,size);
ptr=&result->y2;
for (i=0;i<g.num;i++)
BFieldOrU32(ptr,i*3,QueVectU8Get(tempv,i));
QueVectU8Del(tempv);
break;
case SPT_BITMAP:
Lex(lx); //Skip {
LexD2I32(lx,&g.x2);
if (lx->token!=':')
LexExcept(lx,"expecting ':' at ");
Lex(lx); //Skip :
LexD2I32(lx,&g.width);
if (lx->token!=',')
LexExcept(lx,"expecting ',' at ");
tempv=QueVectU8New;
num1=0;
while (TRUE) {
if (!(i=ToUpper(LexGetChar(lx))))
LexExcept(lx,"expecting '}' at ");
if (i=='}')
break;
if ('0'<=i<='9')
QueVectU8Put(tempv,num1++,i-'0');
else if ('A'<=i<='F')
QueVectU8Put(tempv,num1++,i-'A'+10);
else if (i==CH_SPACE||i==CH_SHIFT_SPACE)
QueVectU8Put(tempv,num1++,TRANSPARENT);
else if (i=='_')
QueVectU8Put(tempv,num1++,0);
}
Bts(&lx->flags,Lf_USE_LAST_U16);
Lex(lx); //Load '}'
g.type=SPT_BITMAP;
size=SpriteElemQuedBaseSize(SPT_BITMAP);
result=CAlloc(size+num1);
MemCpy(result,&g,size);
ptr=&result->linespeed;
for (i=0;i<num1;i++)
*ptr++=QueVectU8Get(tempv,i);
QueVectU8Del(tempv);
break;
case SPT_MESH:
case SPT_SHIFTABLE_MESH:
Lex(lx); //Skip {
if (LexExpressionI64(lx)) {
g.type=SPT_SHIFTABLE_MESH;
if (lx->token!=',')
LexExcept(lx,"expecting ',' at ");
Lex(lx); //Skip ,
LexD3I32(lx,&g.x1);
if (lx->token!=':')
LexExcept(lx,"expecting ':' at ");
Lex(lx); //Skip :
} else {
g.type=SPT_MESH;
if (lx->token!=',')
LexExcept(lx,"expecting ',' at ");
Lex(lx); //Skip ,
}
num1=0;
QueInit(&rootp);
while (lx->token=='(') {
tempp=CAlloc(sizeof(CQueD3I32));
LexD3I32(lx,&tempp->p);
QueIns(tempp,rootp.last);
num1++;
if (lx->token==',')
Lex(lx); //Skip ,
}
if (lx->token!=':')
LexExcept(lx,"expecting ':' at ");
Lex(lx); //Skip :
num2=0;
QueInit(&roott);
while (lx->token=='(') {
tempt=CAlloc(sizeof(CQueMeshTri));
st=LexFirstRem(lx,",");
tempt->color=Str2ColorU32(st);
Free(st);
Lex(lx); //Skip color
if (lx->token!=',')
LexExcept(lx,"expecting ',' at ");
Lex(lx); //Skip ,
tempt->nums[0]=LexExpressionI64(lx);
if (lx->token!=',')
LexExcept(lx,"expecting ',' at ");
Lex(lx); //Skip ,
tempt->nums[1]=LexExpressionI64(lx);
if (lx->token!=',')
LexExcept(lx,"expecting ',' at ");
Lex(lx); //Skip ,
tempt->nums[2]=LexExpressionI64(lx);
if (lx->token!=')')
LexExcept(lx,"expecting ')' at ");
Lex(lx); //Skip )
QueIns(tempt,roott.last);
num2++;
if (lx->token==',')
Lex(lx); //Skip ,
}
if (g.type==SPT_MESH) {
g.vertex_cnt=num1;
g.tri_cnt=num2;
size=SpriteElemQuedBaseSize(SPT_MESH);
} else {
g.shiftable_vertex_cnt=num1;
g.shiftable_tri_cnt=num2;
}
size=SpriteElemQuedBaseSize(g.type);
result=MAlloc(size+num1*sizeof(CD3I32)+num2*sizeof(CMeshTri));
MemCpy(result,&g,size);
ptr=result(U8 *)+size;
tempp=rootp.next;
while (tempp!=&rootp) {
tempa1=tempp->next;
MemCpy(ptr,&tempp->p,sizeof(CD3I32));
ptr+=sizeof(CD3I32);
Free(tempp);
tempp=tempa1;
}
tempt=roott.next;
while (tempt!=&roott) {
tempt1=tempt->next;
MemCpy(ptr,&tempt->start,sizeof(CMeshTri));
ptr+=sizeof(CMeshTri);
Free(tempt);
tempt=tempt1;
}
break;
}
if (lx->token!='}')
LexExcept(lx,"expecting '}' at ");
if (Lex(lx)!=';')
LexExcept(lx,"expecting ';' at ");
return result;
}
public U8 *Code2Sprite(CDoc *doc,I64 *_size=NULL)
{//Text to sprite.
CSprite root;
U8 *result;
Bool okay=TRUE,unlock_doc=DocLock(doc);
CLex *lx=LexNew(,LF_DONT_FREE_BUF);
CHashTable *old_hash_table_lst=lx->htc.hash_table_lst;
CHashGeneric *temph;
I64 i,size=0;
QueInit(&root);
LexAttachDoc(lx,,doc);
try {
do {
lx->htc.hash_table_lst=NULL;
if (Lex(lx)==TK_IDENT && //Skip ;
(temph=HashFind(lx->cur_str,gr.sprite_hash,SPHT_ELEM_CODE))) {
i=temph->user_data0;
lx->htc.hash_table_lst=old_hash_table_lst;
if (Lex(lx)=='{') //Skip ident
QueIns(Code2SpriteElem(lx,i),root.last);
} else if (lx->token)
LexExcept(lx,"expecting sprite element type name at ");
} while (lx->token);
okay=TRUE;
} catch {
Fs->catch_except=TRUE;
okay=FALSE;
}
if (unlock_doc)
DocUnlock(doc);
if (okay) {
LexDel(lx); //TODO: can crash
result=SpriteQue2Sprite(&root,&size);
} else {
result=NULL;
size=0;
}
if (_size) *_size=size;
QueDel(&root);
return result;
}
Adam/Gr/SpriteEd.CPP
+290 -329
View File
File diff suppressed because it is too large. Load diff
Adam/Gr/SpriteMain.CPP
+370 -366
View File
File diff suppressed because it is too large. Load diff
Adam/Gr/SpriteMesh.CPP
+302 -310
View File
File diff suppressed because it is too large. Load diff
Adam/Gr/SpriteNew.CPP
+96 -94
View File
@@ -1,73 +1,75 @@
#help_index "Graphics/Sprite"
#help_file "::/Doc/Sprite"
I64 sprite_base_size[GRST_NUM_TYPES]=
U8 polypt_map[9]={0,1,2,3,0,4,5,6,7};
I64 sprite_elem_base_sizes[SPT_NUM_TYPES]=
{
offset(CSprite.x1)-offset(CSprite.start), //GRST_END
1+offset(CSprite.color8)-offset(CSprite.start), //GRST_COLOR8
2+offset(CSprite.dither_color8)-offset(CSprite.start), //GRST_DITHER_COLOR8
offset(CSprite.y1)-offset(CSprite.start), //GRST_WIDTH
offset(CSprite.linespeed)-offset(CSprite.start), //GRST_PLANAR_SYMMETRY
offset(CSprite.x1)-offset(CSprite.start), //GRST_TRANSFORM_ON
offset(CSprite.x1)-offset(CSprite.start), //GRST_TRANSFORM_OFF
offset(CSprite.x2)-offset(CSprite.start), //GRST_SHIFT
offset(CSprite.x2)-offset(CSprite.start), //GRST_PT
offset(CSprite.y1)-offset(CSprite.start), //GRST_POLYPT
offset(CSprite.linespeed)-offset(CSprite.start), //GRST_LINE
offset(CSprite.y1)-offset(CSprite.start), //GRST_POLYLINE
offset(CSprite.linespeed)-offset(CSprite.start), //GRST_RECT
offset(CSprite.sides)-offset(CSprite.start), //GRST_ROTATED_RECT
offset(CSprite.y2)-offset(CSprite.start), //GRST_CIRCLE
offset(CSprite.sides)-offset(CSprite.start), //GRST_ELLIPSE
sizeof(CSprite)-offset(CSprite.start), //GRST_POLYGON
offset(CSprite.y1)-offset(CSprite.start), //GRST_BSPLINE2
offset(CSprite.y1)-offset(CSprite.start), //GRST_BSPLINE2_CLOSED
offset(CSprite.y1)-offset(CSprite.start), //GRST_BSPLINE3
offset(CSprite.y1)-offset(CSprite.start), //GRST_BSPLINE3_CLOSED
offset(CSprite.x2)-offset(CSprite.start), //GRST_FLOOD_FILL
offset(CSprite.x2)-offset(CSprite.start), //GRST_FLOOD_FILL_NOT
offset(CSprite.linespeed)-offset(CSprite.start), //GRST_BITMAP8
offset(CSprite.x2)-offset(CSprite.start), //GRST_MESH
offset(CSprite.shiftable_tri_cnt)+sizeof(I32)-offset(CSprite.start), //GRST_SHIFTABLE_MESH
offset(CSprite.linespeed)-offset(CSprite.start), //GRST_ARROW
offset(CSprite.st)-offset(CSprite.start), //GRST_TEXT
offset(CSprite.st)-offset(CSprite.start), //GRST_TEXT_BOX
offset(CSprite.st)-offset(CSprite.start), //GRST_TEXT_DIAMOND
offset(CSprite.x1)-offset(CSprite.start), //SPT_END
1+offset(CSprite.color)-offset(CSprite.start), //SPT_COLOR
2+offset(CSprite.dither_color)-offset(CSprite.start), //SPT_DITHER_COLOR
offset(CSprite.y1)-offset(CSprite.start), //SPT_WIDTH
offset(CSprite.linespeed)-offset(CSprite.start), //SPT_PLANAR_SYMMETRY
offset(CSprite.x1)-offset(CSprite.start), //SPT_TRANSFORM_ON
offset(CSprite.x1)-offset(CSprite.start), //SPT_TRANSFORM_OFF
offset(CSprite.x2)-offset(CSprite.start), //SPT_SHIFT
offset(CSprite.x2)-offset(CSprite.start), //SPT_PT
offset(CSprite.y2)-offset(CSprite.start), //SPT_POLYPT
offset(CSprite.linespeed)-offset(CSprite.start), //SPT_LINE
offset(CSprite.y1)-offset(CSprite.start), //SPT_POLYLINE
offset(CSprite.linespeed)-offset(CSprite.start), //SPT_RECT
offset(CSprite.sides)-offset(CSprite.start), //SPT_ROTATED_RECT
offset(CSprite.y2)-offset(CSprite.start), //SPT_CIRCLE
offset(CSprite.sides)-offset(CSprite.start), //SPT_ELLIPSE
sizeof(CSprite)-offset(CSprite.start), //SPT_POLYGON
offset(CSprite.y1)-offset(CSprite.start), //SPT_BSPLINE2
offset(CSprite.y1)-offset(CSprite.start), //SPT_BSPLINE2_CLOSED
offset(CSprite.y1)-offset(CSprite.start), //SPT_BSPLINE3
offset(CSprite.y1)-offset(CSprite.start), //SPT_BSPLINE3_CLOSED
offset(CSprite.x2)-offset(CSprite.start), //SPT_FLOOD_FILL
offset(CSprite.x2)-offset(CSprite.start), //SPT_FLOOD_FILL_NOT
offset(CSprite.linespeed)-offset(CSprite.start), //SPT_BITMAP
offset(CSprite.x2)-offset(CSprite.start), //SPT_MESH
offset(CSprite.shiftable_tri_cnt)+sizeof(I32)-offset(CSprite.start), //SPT_SHIFTABLE_MESH
offset(CSprite.linespeed)-offset(CSprite.start), //SPT_ARROW
offset(CSprite.st)-offset(CSprite.start), //SPT_TEXT
offset(CSprite.st)-offset(CSprite.start), //SPT_TEXT_BOX
offset(CSprite.st)-offset(CSprite.start), //SPT_TEXT_DIAMOND
};
I64 SpriteQuedBaseSize(I64 type)
I64 SpriteElemQuedBaseSize(I64 type)
{
return sprite_base_size[type]+offset(CSprite.start);
return sprite_elem_base_sizes[type]+offset(CSprite.start);
}
I64 SpriteElemSize(CSprite *tempg)
{
I64 i=sprite_base_size[tempg->type];
I64 i=sprite_elem_base_sizes[tempg->type];
switch (tempg->type) {
case GRST_POLYLINE:
i+=tempg->num<<1*sizeof(I32);
case SPT_POLYLINE:
i+=tempg->num*sizeof(CD2I32);
break;
case GRST_TEXT:
case GRST_TEXT_BOX:
case GRST_TEXT_DIAMOND:
case SPT_TEXT:
case SPT_TEXT_BOX:
case SPT_TEXT_DIAMOND:
i+=StrLen(tempg->st)+1;
break;
case GRST_BITMAP8:
case SPT_BITMAP:
i+=((tempg->width+7)&~7)*tempg->height;
break;
case GRST_POLYPT:
i+=sizeof(I32)<<1+(tempg->num*3+7)>>3;
case SPT_POLYPT:
i+=(tempg->num*3+7)>>3;
break;
case GRST_BSPLINE2:
case GRST_BSPLINE3:
case GRST_BSPLINE2_CLOSED:
case GRST_BSPLINE3_CLOSED:
case SPT_BSPLINE2:
case SPT_BSPLINE3:
case SPT_BSPLINE2_CLOSED:
case SPT_BSPLINE3_CLOSED:
i+=tempg->num*sizeof(CD3I32);
break;
case GRST_MESH:
case SPT_MESH:
i+=tempg->vertex_cnt*sizeof(CD3I32)+tempg->tri_cnt*sizeof(CMeshTri);
break;
case GRST_SHIFTABLE_MESH:
case SPT_SHIFTABLE_MESH:
i+=tempg->shiftable_vertex_cnt*sizeof(CD3I32)+tempg->shiftable_tri_cnt*sizeof(CMeshTri);
break;
}
@@ -75,11 +77,11 @@ I64 SpriteElemSize(CSprite *tempg)
}
public I64 SpriteSize(U8 *elems)
{
{//Walk sprite elements and return size of sprite as binary data.
CSprite *tempg=elems-offset(CSprite.start),*tempg1=tempg;
while (tempg->type)
tempg(U8 *)+=SpriteElemSize(tempg);
return tempg(U8 *)-tempg1(U8 *)+sprite_base_size[GRST_END];
return tempg(U8 *)-tempg1(U8 *)+sprite_elem_base_sizes[SPT_END];
}
I64 SpriteTypeMask(U8 *elems)
@@ -87,8 +89,8 @@ I64 SpriteTypeMask(U8 *elems)
I64 result=0;
CSprite *tempg=elems-offset(CSprite.start);
while (tempg->type) {
if (tempg->type>=GRST_NUM_TYPES)
return 1<<GRST_NUM_TYPES;
if (tempg->type>=SPT_NUM_TYPES)
return 1<<SPT_NUM_TYPES;
Bts(&result,tempg->type);
tempg(U8 *)+=SpriteElemSize(tempg);
}
@@ -96,13 +98,13 @@ I64 SpriteTypeMask(U8 *elems)
}
public U8 *DC2Sprite(CDC *tempb)
{
{//Convert device context to sprite.
CSprite *tempg;
tempg=CAlloc(sprite_base_size[GRST_BITMAP8]+
tempg=CAlloc(sprite_elem_base_sizes[SPT_BITMAP]+
tempb->width_internal*tempb->height+
sprite_base_size[GRST_END])
sprite_elem_base_sizes[SPT_END])
(U8 *)-offset(CSprite.start);
tempg->type=GRST_BITMAP8;
tempg->type=SPT_BITMAP;
tempg->width=tempb->width;
tempg->height=tempb->height;
tempg->x2=0;
@@ -112,62 +114,62 @@ public U8 *DC2Sprite(CDC *tempb)
return tempg(U8 *)+offset(CSprite.start);
}
public U8 *Sprite2Text(CSprite *tempg)
{ //Study $LK,"::/Demo/Graphics/SpriteText.CPP"$.
public U8 *SpriteElem2OneLineSummary(CSprite *tempg)
{//Study $LK,"::/Demo/Graphics/SpriteText.CPP"$.
U8 buf[256],buf2[136];
I32 *ptr;
SPrint(buf,"%Z",tempg->type,"ST_SPRITE_TYPES");
StrPrint(buf,"%Z",tempg->type,"ST_SPRITE_ELEM_TYPES");
switch (tempg->type) {
case GRST_COLOR8:
CatPrint(buf," %s",Color2Text(buf2,tempg->color8));
case SPT_COLOR:
CatPrint(buf," %s",Color2Str(buf2,tempg->color));
break;
case GRST_PT:
case GRST_FLOOD_FILL:
case GRST_FLOOD_FILL_NOT:
case GRST_SHIFT:
CatPrint(buf," %d,%d",tempg->x1,tempg->y1);
case SPT_DITHER_COLOR:
CatPrint(buf," %s",Color2Str(buf2,ROPF_DITHER|tempg->dither_color.u8[0]|tempg->dither_color.u8[1]<<COLORROP_BITS));
break;
case GRST_LINE:
case GRST_ARROW:
case GRST_PLANAR_SYMMETRY:
case GRST_RECT:
case GRST_ROTATED_RECT:
CatPrint(buf," (%d,%d)-(%d,%d)",tempg->x1,tempg->y1,tempg->x2,tempg->y2);
case SPT_PT:
case SPT_FLOOD_FILL:
case SPT_FLOOD_FILL_NOT:
case SPT_SHIFT:
CatPrint(buf," (%d,%d)",tempg->x1,tempg->y1);
break;
case GRST_CIRCLE:
CatPrint(buf," %d,%d:%dR",tempg->x1,tempg->y1,tempg->x2);
case SPT_LINE:
case SPT_ARROW:
case SPT_PLANAR_SYMMETRY:
case SPT_RECT:
case SPT_ROTATED_RECT:
CatPrint(buf," (%d,%d),(%d,%d)",tempg->x1,tempg->y1,tempg->x2,tempg->y2);
break;
case GRST_WIDTH:
case SPT_CIRCLE:
CatPrint(buf," (%d,%d):%dR",tempg->x1,tempg->y1,tempg->x2);
break;
case SPT_WIDTH:
CatPrint(buf," %d",tempg->width);
break;
case GRST_TEXT:
case GRST_TEXT_BOX:
case GRST_TEXT_DIAMOND:
case SPT_TEXT:
case SPT_TEXT_BOX:
case SPT_TEXT_DIAMOND:
CatPrint(buf," %d,%d:%-16tQ",tempg->x1,tempg->y1,tempg->st);
break;
case GRST_DITHER_COLOR8:
CatPrint(buf," %s",Color2Text(buf2,ROPF_DITHER|tempg->dither_color8.u8[0]|tempg->dither_color8.u8[1]<<COLORROP_BITS));
break;
case GRST_POLYLINE:
case GRST_POLYPT:
case SPT_POLYLINE:
case SPT_POLYPT:
ptr=&tempg->y1;
CatPrint(buf," %d %d,%d",tempg->num,ptr[0],ptr[1]);
CatPrint(buf," %d (%d,%d)",tempg->num,ptr[0],ptr[1]);
break;
case GRST_ELLIPSE:
case GRST_POLYGON:
case GRST_BITMAP8:
CatPrint(buf," %dW,%dH:%d,%d",tempg->width,tempg->height,tempg->x2,tempg->y2);
case SPT_ELLIPSE:
case SPT_POLYGON:
case SPT_BITMAP:
CatPrint(buf," (%d,%d):%dW,%dH",tempg->x2,tempg->y2,tempg->width,tempg->height);
break;
case GRST_BSPLINE2:
case GRST_BSPLINE3:
case GRST_BSPLINE2_CLOSED:
case GRST_BSPLINE3_CLOSED:
case SPT_BSPLINE2:
case SPT_BSPLINE3:
case SPT_BSPLINE2_CLOSED:
case SPT_BSPLINE3_CLOSED:
CatPrint(buf," %d",tempg->num);
break;
case GRST_MESH:
case SPT_MESH:
CatPrint(buf," %dV,%dT",tempg->vertex_cnt,tempg->tri_cnt);
break;
case GRST_SHIFTABLE_MESH:
case SPT_SHIFTABLE_MESH:
CatPrint(buf," %dV,%dT",tempg->shiftable_vertex_cnt,tempg->shiftable_tri_cnt);
break;
}
Adam/Hash2a.CPP
+165 -101
View File
@@ -5,7 +5,6 @@ class CWho
U8 *index;
};
I64 HashEntriesCompare(CWho *h1,CWho *h2)
{
I64 i1,i2;
@@ -44,9 +43,9 @@ I64 HelpIndexCnt(U8 *ptr,U8 *index)
return cnt;
}
U8 *HelpIndexStr(U8 **ptr_,U8 *index)
U8 *HelpIndexStr(U8 **_ptr,U8 *index)
{
U8 *ptr=*ptr_,*ptr2,*result;
U8 *ptr=*_ptr,*ptr2,*result;
I64 ch,index_len=StrLen(index);
while (*ptr) {
ptr2=ptr;
@@ -55,7 +54,7 @@ U8 *HelpIndexStr(U8 **ptr_,U8 *index)
break;
if (!ch)
ptr--;
*ptr_=ptr;
*_ptr=ptr;
if (!StrNCmp(ptr2,index,index_len)) {
if (ch==';')
ptr--;
@@ -68,6 +67,60 @@ U8 *HelpIndexStr(U8 **ptr_,U8 *index)
return NULL;
}
U8 *HelpComment(CTask *task,CHash *temph,U8 *_src_link)
{
CDoc *doc;
CDocEntry *doc_e;
U8 *result=NULL,*ptr,*ptr2,*src_link=StrNew(_src_link);
if (*src_link=='F' && src_link[2]==':')
*src_link='P';
XTalkWait(task,"Ed(0x%X,DOF_DONT_WINMGR_SYNC|DOF_DONT_SHOW);\n",src_link);
Free(src_link);
doc=DocPut(task);
doc_e=doc->cur_entry;
if (temph->type&HTT_FUN && !Bt(&temph(CHashFun *)->flags,Ff__EXTERN) &&
!Bt(&temph(CHashFun *)->flags,Ff_INTERNAL))
while (doc_e!=doc &&
(!(doc_e->de_flags&DOCEF_TAG)||!StrOcc(doc_e->tag,'{')))
doc_e=doc_e->next;
if (doc_e!=doc) {
if (doc_e->de_flags&DOCEF_TAG) {
ptr=doc_e->tag;
if (ptr2=StrMatch("//",ptr))
ptr=ptr2+2;
else if (ptr2=StrMatch("/*",ptr))
ptr=ptr2+2;
else if (!StrNCmp(ptr,"public",6))
ptr+=6;
while (*ptr==CH_SPACE)
ptr++;
result=StrNew(ptr);
doc_e=doc_e->next;
}
while (doc_e!=doc && doc_e->type_u8!=DOCT_NEW_LINE) {
if (doc_e->type_u8==DOCT_TAB) {
ptr=MStrPrint("%s ",result);
Free(result);
result=ptr;
} else if (doc_e->de_flags&DOCEF_TAG) {
ptr=MStrPrint("%s%s",result,doc_e->tag);
Free(result);
result=ptr;
}
doc_e=doc_e->next;
}
}
XTalkWait(task,"%c",CH_SHIFT_ESC);
if (result) {
ptr=MStrUtil(result,SUF_REM_TRAILING|SUF_REM_LEADING|SUF_SINGLE_SPACE);
Free(result);
result=ptr;
}
return result;
}
I64 HashEntriesCompare3(CWho *h1,CWho *h2)
{
I64 i,i1=0,i2=0;
@@ -89,20 +142,21 @@ I64 HashEntriesCompare3(CWho *h1,CWho *h2)
public U0 Who(U8 *fu_flags=NULL,CHashTable *h=NULL,
U8 *outname=NULL,U8 mapfile_drv=0,U8 *index=NULL,CDoc *_doc=NULL)
{//Dump Symbol Table
{//Dump hash symbol table.
// "+p" for only public symbols
// "+m" to order by number (normally alphabetical)
// "-r" just local hash table
CHashTable *tempht;
CHashTable *table;
CHashSrcSym *temph;
CHashGeneric *ptr;
CWho *lst;
I64 cnt,i,j,k,size,f=0,dbg_bin_num;
U8 buf[512],*st,*src_link,*last_index=StrNew(""),*cur_index;
U8 buf[512],*st,*src_link,*last_index=StrNew(""),*cur_index,*comment;
CDoc *doc;
Bool recurse,publics,map,old_preempt=Preempt(OFF);
CDocBin *tempb;
CDbgInfo *dbg;
CDbgInfo *dbg_info;
CTask *task;
ScanFlags(&f,Define("ST_FILE_UTIL_FLAGS"),"+r");
ScanFlags(&f,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
@@ -122,51 +176,54 @@ public U0 Who(U8 *fu_flags=NULL,CHashTable *h=NULL,
} else
doc=NULL;
if (index) {
task=SpawnUser;
TaskWait(task);
LBtr(&task->display_flags,DISPLAYf_SHOW);
} else
task=NULL;
cnt=0;
tempht=h;
while (tempht) {
temph=tempht->next_added;
while (temph!=tempht) {
table=h;
while (table) {
temph=table->next_added;
while (temph!=table) {
if (!(temph->type & (HTF_IMPORT | HTF_PRIVATE)) &&
(temph->type & HTF_PUBLIC || !publics))
(temph->type & HTF_PUBLIC || !publics)) {
if (!index)
cnt++;
else
if (temph->type&HTG_SRC_SYM &&
(cur_index=temph->index))
cnt+=HelpIndexCnt(cur_index,index);
else if (temph->type&HTG_SRC_SYM && (cur_index=temph->index))
cnt+=HelpIndexCnt(cur_index,index);
}
temph=temph->next_added;
}
if (recurse)
tempht=tempht->next;
table=table->next;
else
break;
}
if (!cnt) goto end_hash;
if (!cnt) goto wh_done;
lst=CAlloc(cnt*sizeof(CWho));
j=0;
tempht=h;
while (tempht) {
temph=tempht->next_added;
while (temph!=tempht) {
table=h;
while (table) {
temph=table->next_added;
while (temph!=table) {
if (!(temph->type & (HTF_IMPORT | HTF_PRIVATE)) &&
(temph->type & HTF_PUBLIC || !publics))
if (!index)
lst[j++].h=temph;
else
if (temph->type&HTG_SRC_SYM &&
(cur_index=temph->index))
if (k=HelpIndexCnt(cur_index,index)) {
while (k--) {
lst[j].index=HelpIndexStr(&cur_index,index);
lst[j++].h=temph;
}
}
else if (temph->type&HTG_SRC_SYM && (cur_index=temph->index) &&
(k=HelpIndexCnt(cur_index,index)))
while (k--) {
lst[j].index=HelpIndexStr(&cur_index,index);
lst[j++].h=temph;
}
temph=temph->next_added;
}
if (recurse)
tempht=tempht->next;
table=table->next;
else
break;
}
@@ -179,90 +236,87 @@ public U0 Who(U8 *fu_flags=NULL,CHashTable *h=NULL,
else
QSort(lst,cnt,sizeof(CWho),&HashEntriesCompare);
if (index) {
progress1_max=cnt;
progress1=0;
}
for (i=0;i<cnt;i++) {
comment=NULL;
ptr=lst[i].h;
dbg=NULL;
dbg_info=NULL;
if (index)
if (cur_index=lst[i].index) {
if (StrCmp(cur_index,last_index)) {
Free(last_index);
last_index=StrNew(cur_index);
if (doc)
DocPrint(doc,"$$GREEN$$%s$$FG$$\n",cur_index);
else
"$$GREEN$$%s$$FG$$\n",cur_index;
if (i)
DocPrint(doc,"\n\n");
DocPrint(doc,"$$WW,0$$$$PURPLE$$$$TX+CX,\"%Q\"$$$$FG$$\n",cur_index);
}
}
if (index && ptr->type & HTT_HELP_FILE)
if (index && ptr->type & HTT_HELP_FILE) {
DocPrint(doc,"$$WW,1$$");
DocType(doc,ptr->str);
else {
DocPrint(doc,"$$WW,0$$");
} else {
if (ptr->type&HTG_SRC_SYM && ptr(CHashSrcSym *)->src_link) {
src_link=StrNew(ptr(CHashSrcSym *)->src_link);
if (mapfile_drv && StrLen(src_link)>4 && buf[1]==':' && src_link[4]==':')
src_link[3]=mapfile_drv;
dbg=NULL;
dbg_info=NULL;
if (outname && doc && ptr->type & HTT_FUN) {
if (dbg=ptr(CHashFun *)->debug) {
size=offset(CDbgInfo.body)+sizeof(U32)*(dbg->max_line+2-dbg->min_line);
if (size>MSize(dbg)) {
if (dbg_info=ptr(CHashFun *)->dbg_info) {
size=offset(CDbgInfo.body)+sizeof(U32)*(dbg_info->max_line+2-dbg_info->min_line);
if (size>MSize(dbg_info)) {
"Corrupt Map Entry\n";
dbg=NULL;
dbg_info=NULL;
} else {
if (dbg->min_line<=dbg->max_line) {
if (dbg_info->min_line<=dbg_info->max_line) {
tempb=CAlloc(sizeof(CDocBin));
tempb->size=size;
tempb->data=MAlloc(size);
MemCpy(tempb->data,dbg,size);
MemCpy(tempb->data,dbg_info,size);
dbg_bin_num=tempb->num=doc->cur_bin_num++;
tempb->use_cnt=1;
QueIns(tempb,doc->bin_root.last);
} else
dbg=NULL;
dbg_info=NULL;
}
}
}
if (dbg)
DocPrint(doc,"$$LK,\"%-26s\",A=\"%s\",BI=%d$$",
ptr->str,src_link,dbg_bin_num);
if (dbg_info)
DocPrint(doc,"$$LK,\"%-20s\",A=\"%s\",BI=%d$$",ptr->str,src_link,dbg_bin_num);
else {
SPrint(buf,"$$LK,\"%-26s\",A=\"%s\"$$",
ptr->str,src_link);
if (doc)
DocPrint(doc,"%s",buf);
else
"%s",buf;
DocPrint(doc,"$$LK,\"%-20s\",A=\"%s\"$$",ptr->str,src_link);
if (index)
comment=HelpComment(task,ptr,src_link);
}
Free(src_link);
} else {
SPrint(buf,"%-26ts",ptr->str);
if (doc)
DocPrint(doc,"%s",buf);
else
"%s",buf;
}
} else
DocPrint(doc,"%-20s",ptr->str);
if (!index) {
if (ptr->type & HTT_DEFINE_STR) {
st=MStrUtil(ptr(CHashDefineStr *)->data,SUF_SAFE_DOLLAR);
j=ptr(CHashDefineStr *)->cnt;
if (j==-1)
SPrint(buf,"%-10tQ ",st);
StrPrint(buf,"%-10tQ ",st);
else
SPrint(buf,"%-10tQ %02X",st,j);
StrPrint(buf,"%-10tQ %02X",st,j);
Free(st);
} else if (ptr->type & HTT_GLBL_VAR) {
if (outname)
SPrint(buf,"%010X ",ptr(CHashGlblVar *)->data_addr_ip);
StrPrint(buf,"%010X ",ptr(CHashGlblVar *)->data_addr_ip);
else
SPrint(buf,"%010X ",ptr(CHashGlblVar *)->data_addr);
StrPrint(buf,"%010X ",ptr(CHashGlblVar *)->data_addr);
} else
SPrint(buf,"%010X ",HashVal(ptr));
StrPrint(buf,"%010X ",HashVal(ptr));
j=HashEntrySize(ptr);
if (j==-1)
SPrint(buf+StrLen(buf)," %04X ",ptr->use_cnt);
CatPrint(buf," %04X ",ptr->use_cnt);
else
SPrint(buf+StrLen(buf)," %04X %010X ",ptr->use_cnt,j);
CatPrint(buf," %04X %010X ",ptr->use_cnt,j);
} else
*buf=0;
@@ -270,21 +324,30 @@ public U0 Who(U8 *fu_flags=NULL,CHashTable *h=NULL,
if (publics)
k&=~HTF_PUBLIC;
if (!(k&HTG_TYPE_MASK))
SPrint(buf+StrLen(buf),"NULL ");
for (j=0;j<32;j++)
if (Bt(&k,j))
SPrint(buf+StrLen(buf),"%Z ",j,"ST_HTT_TYPES");
CatPrint(buf,"\n");
if (doc)
DocPrint(doc,"%s",buf);
else
"%s",buf;
CatPrint(buf,"NULL ");
while (k) {
j=Bsf(k);
if (j<0)
break;
Btr(&k,j);
CatPrint(buf,"%Z ",j,"ST_HTT_TYPES");
}
DocPrint(doc,"%s",buf);
if (comment) {
DocPrint(doc,"$$GREEN$$%s$$FG$$",comment);
Free(comment);
}
DocPrint(doc,"\n");
}
Free(lst[i].index);
if (index)
progress1++;
}
Free(lst);
if (index)
progress1=progress1_max=0;
end_hash:
wh_done:
Preempt(old_preempt);
if (doc) {
DocBinsValidate(doc);
@@ -299,17 +362,19 @@ public U0 Who(U8 *fu_flags=NULL,CHashTable *h=NULL,
}
}
Free(last_index);
Kill(task);
}
#define HDR_MAX 16
public I64 HashDepthRep(CHashTable *tempht=NULL)
{
public I64 HashDepthRep(CHashTable *table=NULL)
{//Hash table linked-list chain depth report.
//Histogram of collision count.
I64 i,j,longest=0,cnt=0,a[HDR_MAX];
CHash *temph;
if (!tempht) tempht=Fs->hash_table;
if (!table) table=Fs->hash_table;
MemSet(a,0,sizeof(a));
for (i=0;i<=tempht->mask;i++) {
temph=tempht->body[i];
for (i=0;i<=table->mask;i++) {
temph=table->body[i];
if (temph) {
j=1;
while (temph->next) {
@@ -328,7 +393,7 @@ public I64 HashDepthRep(CHashTable *tempht=NULL)
if (a[i])
"%02d:%d\n",i,a[i];
"Size:%d Count:%d Longest:%d\n",
tempht->mask+1,cnt,longest;
table->mask+1,cnt,longest;
return longest;
}
@@ -336,28 +401,28 @@ public I64 HashDepthRep(CHashTable *tempht=NULL)
#help_file "::/Doc/HelpSystem"
public U0 DocHelpIndex(CDoc *doc,U8 *index)
{
{//Put to doc report for given help index.
Who("+p",,,,index,doc);
}
public U0 PopUpHelpIndex(U8 *index,CTask *parent=NULL)
{
{//PopUp win report for given help index.
U8 *buf;
buf=MPrint("DocHelpIndex(DocPut,\"%s\");View;",index);
buf=MStrPrint("DocHelpIndex(DocPut,\"%s\");View;",index);
PopUp(buf,parent);
Free(buf);
}
#help_index "Hash"
public U0 MapFileLoad(U8 *filename)
{
{//Load map file so we have src line info.
U8 *st,*ptr,*name=DftExt(filename,"MAP.Z"),
*absname=FileNameAbs(name);
CDoc *doc=DocRead(name);
CDocEntry *doc_e;
CHashSrcSym *temph;
I64 i,j,base=0;
CDbgInfo *dbg;
CDbgInfo *dbg_info;
FileExtRem(absname);
if (absname[1]==':' && StrLen(absname)>2 &&
@@ -384,17 +449,17 @@ public U0 MapFileLoad(U8 *filename)
doc_e->aux_str=NULL;
}
if (temph->type&(HTT_FUN|HTT_EXPORT_SYS_SYM) &&
!(dbg=temph->debug) && doc_e->bin_data &&
(dbg=doc_e->bin_data->data)) {
if (doc_e->bin_data->size>MSize(dbg))
!(dbg_info=temph->dbg_info) && doc_e->bin_data &&
(dbg_info=doc_e->bin_data->data)) {
if (doc_e->bin_data->size>MSize(dbg_info))
"Corrupt Map Entry\n";
else {
doc_e->bin_data->data=NULL;
temph->debug=dbg;
for (i=dbg->min_line;i<=dbg->max_line+1;i++) {
j=i-dbg->min_line;
if (dbg->body[j])
dbg->body[j]=dbg->body[j]+base;
temph->dbg_info=dbg_info;
for (i=dbg_info->min_line;i<=dbg_info->max_line+1;i++) {
j=i-dbg_info->min_line;
if (dbg_info->body[j])
dbg_info->body[j]=dbg_info->body[j]+base;
}
}
}
@@ -407,4 +472,3 @@ public U0 MapFileLoad(U8 *filename)
Free(name);
Free(absname);
}
#help_index ""
Adam/LogIn.CPP
+14 -16
View File
@@ -1,8 +1,8 @@
#help_index "Misc/Accts"
//This is temporary until defined in $LK,"HOME/Adam3eSys.CPP"$.
U0 UserStartUp()
{ //Run each time a user a spawned
{//Temporary until defined in $LK,"HOME/Adam3eSys.CPP"$.
//Run each time a user a spawned
DocTermNew;
Type("::/Doc/Start.TXT");
LBts(&Fs->display_flags,DISPLAYf_SHOW);
@@ -11,9 +11,9 @@ U0 UserStartUp()
Preempt(ON);
}
//This is temporary until defined in $LK,"HOME/Adam3eSys.CPP"$.
U0 SrvStartUp()
{ //Run each time a srv task is spawned.
{//Temporary until defined in $LK,"HOME/Adam3eSys.CPP"$.
//Run each time a srv task is spawned.
DocTermNew;
LBts(&Fs->display_flags,DISPLAYf_SHOW);
WinToTop;
@@ -29,7 +29,7 @@ U8 *PopUpSysAcct()
*tempde1=tempde;
DocPrint(doc,"$$CM+CX-LE,10$$");
DocSprite(doc,$IB,"<1>",BI=1,BP="::/Misc/StockSprites.TXT,TempleOSLogo"$,"$$SP+SIF,\"\",BI=%d$$");
DocPrint(doc,"$$CM+LX,0,12$$Select Account.\nCursor down and press <SPACE BAR>.\n");
DocPrint(doc,"$$CM+LX,0,12$$Select Account.\nCursor down and press <SPACE>.\n");
while (tempde) {
if (*tempde->name!='.') {
st=tempde->full_name;
@@ -46,7 +46,7 @@ U8 *PopUpSysAcct()
DocDel(doc);
result=AStrNew(tempde->full_name);
DirLstDel(tempde1);
DirTreeDel(tempde1);
return result;
}
@@ -78,7 +78,7 @@ Bool AcctCacheRegistry()
}
public Bool AcctRegSetDftEntry(U8 *path,U8 *val,Bool is_adam_entry=FALSE)
{
{//Add code doc tree branch to registry.
Bool result,unlock_doc;
AcctCacheRegistry;
unlock_doc=DocLock(sys_registry_doc);
@@ -102,16 +102,16 @@ public Bool AcctRegSetDftEntry(U8 *path,U8 *val,Bool is_adam_entry=FALSE)
}
public I64 AcctRegExeBranch(U8 *path)
{
{//Execute doc tree branch in registry.
AcctCacheRegistry;
return DocTreeBranchExe(sys_registry_doc,path);
}
public Bool AcctRegWriteBranch(U8 *path,U8 *fmt,...)
{
{//Rewrite doc tree branch in registry.
Bool result,unlock_doc;
CDocEntry *tree_branch,*start_indent,*end_indent;
U8 *buf=SPrintJoin(NULL,fmt,argc,argv);
U8 *buf=StrPrintJoin(NULL,fmt,argc,argv);
AcctCacheRegistry;
unlock_doc=DocLock(sys_registry_doc);
if (result=DocTreeFind(sys_registry_doc,path,&tree_branch,&start_indent,&end_indent))
@@ -127,7 +127,7 @@ public Bool AcctRegWriteBranch(U8 *path,U8 *fmt,...)
}
public Bool OneTimePopUp(U8 *_flags,I64 flag_num,U8 *msg)
{ // See $LK,"::/Apps/X-Caliber/X-Caliber.CPP.Z"$.
{//See $LK,"::/Apps/X-Caliber/X-Caliber.CPP"$.
Bool result=FALSE;
CDoc *doc=DocNew;
CDocEntry *doc_e;
@@ -135,7 +135,7 @@ public Bool OneTimePopUp(U8 *_flags,I64 flag_num,U8 *msg)
if (msg) DocPrint(doc,"%s",msg);
doc_e=DocPrint(doc,"\n$$CB,\"Do not show this msg again.\",LE=1$$");
DocPrint(doc,"$$CM+CX,0,4$$$$BT,\"OKAY\",LE=1$$\n");
if (PopUpMenu(doc)==1 && doc_e->flags1&DOCEF1_CHECKED_COLLAPSED) {
if (PopUpMenu(doc)==1 && doc_e->de_flags&DOCEF_CHECKED_COLLAPSED) {
LBts(_flags,flag_num);
result=TRUE;
}
@@ -145,7 +145,7 @@ public Bool OneTimePopUp(U8 *_flags,I64 flag_num,U8 *msg)
}
U0 AcctOneTimePopUp(I64 flag_num,U8 *msg)
{ //You're not supposed to make system pop-up flags, only me.
{//You're not supposed to make system pop-up flags, only me.
if (OneTimePopUp(sys_msg_flags,flag_num,msg))
AcctRegWriteBranch("Adam/SysMsgFlags",
"sys_msg_flags[0]=0x%X;\n",
@@ -157,7 +157,7 @@ U0 RegistryInit()
U8 buf[136];
Bool version_present;
AcctRegSetDftEntry("Adam/SysMsgFlags","sys_msg_flags[0]=0;\n",TRUE);
SPrint(buf,"registry_version=%4.3f;\n",os_version);
StrPrint(buf,"registry_version=%4.3f;\n",os_version);
version_present=AcctRegSetDftEntry("Adam/SysRegVer",buf,TRUE);
AcctRegExeBranch("Adam");
if (registry_version!=os_version) {
@@ -165,5 +165,3 @@ U0 RegistryInit()
AcctRegExeBranch("Adam");
}
}
#help_index ""
Adam/Math2a.CPP
+18 -20
View File
@@ -1,7 +1,7 @@
#help_index "Math"
public U0 R2P(F64 *_mag=NULL,F64 *_arg=NULL,F64 x,F64 y)
{ //Rect to polar
//returns angle in range (-ã,ã]
{//Rect to polar
//Returns angle in range (-ã,ã]
if (_arg)
*_arg=Arg(x,y);
if (_mag)
@@ -9,7 +9,7 @@ public U0 R2P(F64 *_mag=NULL,F64 *_arg=NULL,F64 x,F64 y)
}
public U0 P2R(F64 *_x=NULL,F64 *_y=NULL,F64 mag,F64 arg)
{ //Polar to Rect
{//Polar to Rect
if (_x)
*_x=mag*Cos(arg);
if (_y)
@@ -17,7 +17,7 @@ public U0 P2R(F64 *_x=NULL,F64 *_y=NULL,F64 mag,F64 arg)
}
public F64 Wrap(F64 é,F64 base=-ã)
{ //returns angle in range [base,base+2*ã)
{//Returns angle in range [base,base+2*ã)
F64 result=é%(2*ã);
if (result>=base+2*ã)
result-=2*ã;
@@ -26,14 +26,14 @@ public F64 Wrap(F64
return result;
}
public I64 DistI64(I64 x1,I64 y1,I64 x2,I64 y2)
{
public I64 DistSqrI64(I64 x1,I64 y1,I64 x2,I64 y2)
{//Distance-squared between 2 points.
I64 dx=x1-x2,dy=y1-y2;
return dx*dx+dy*dy;
}
public F64 ASin(F64 s)
{
{//Arc Sin (Inverse Sin).
F64 c;
c=s*s;
if (c>=1.0)
@@ -43,7 +43,7 @@ public F64 ASin(F64 s)
}
public F64 ACos(F64 c)
{
{//Arc Cos (Inverse Cos).
F64 s;
if (!c)
return ã/2.0;
@@ -55,39 +55,39 @@ public F64 ACos(F64 c)
}
public F64 Sinh(F64 x)
{
{//Hyperbolic Sine.
return 0.5*(Exp(x)-Exp(-x));
}
public F64 Cosh(F64 x)
{
{//Hyperbolic Cosine.
return 0.5*(Exp(x)+Exp(-x));
}
#help_index "Math/Complex"
public Complex *CAdd(Complex *n1,Complex *n2,Complex *sum)
{
{//n1 + n2 -->sum
sum->x=n1->x+n2->x;
sum->y=n1->y+n2->y;
return sum;
}
public Complex *CSub(Complex *n1,Complex *n2,Complex *diff)
{
{//n1 - n2 -->diff
diff->x=n1->x-n2->x;
diff->y=n1->y-n2->y;
return diff;
}
public Complex *CMul(Complex *n1,Complex *n2,Complex *prod)
{
{//n1 * n2 -->prod
prod->x=n1->x*n2->x-n1->y*n2->y;
prod->y=n1->x*n2->y+n1->y*n2->x;
return prod;
}
public Complex *CDiv(Complex *n1,Complex *n2,Complex *quot)
{
{//n1 / n2 -->quot
F64 m1,a1,m2,a2;
R2P(&m1,&a1,n1->x,n1->y);
R2P(&m2,&a2,n2->x,n2->y);
@@ -99,28 +99,28 @@ public Complex *CDiv(Complex *n1,Complex *n2,Complex *quot)
}
public Complex *CScale(Complex *dst,F64 s)
{
{//dst *= s
dst->x*=s;
dst->y*=s;
return dst;
}
public Complex *CCopy(Complex *dst,Complex *src)
{
{//dst=src
dst->x=src->x;
dst->y=src->y;
return dst;
}
public Complex *CEqu(Complex *dst,F64 x,F64 y)
{
{//dst=x,y
dst->x=x;
dst->y=y;
return dst;
}
public Complex *CPoly(Complex *dst,Complex *x,Complex *zeros,I64 n)
{
{//Eval complex polynomial.
I64 i;
Complex n1,n2;
if (n>0) {
@@ -134,5 +134,3 @@ public Complex *CPoly(Complex *dst,Complex *x,Complex *zeros,I64 n)
CEqu(dst,1.0,0.0);
return dst;
}
#help_index ""
Adam/MathODE.CPP
+17 -26
View File
@@ -1,10 +1,10 @@
#help_index "Math/CMathODE;CMathODE"
#help_index "Math/ODE"
#help_file "::/Doc/ODE"
//See $LK,"::/Doc/Acknowledgements.TXT"$.
F64 LowPass1(F64 a,F64 y0,F64 y,F64 dt=1.0)
{ //First order low pass filter
{//First order low pass filter
dt=Exp(-a*dt);
return y0*dt+y*(1.0-dt);
}
@@ -28,8 +28,7 @@ U0 ODERstPtrs(CMathODE *ode)
}
public CMathODE *ODENew(I64 n,F64 max_tolerance=1e-6,I64 flags=0)
{
//See $LK,"flags",A="MN:ODEF_HAS_MASSES"$.
{//Make differential equation ctrl struct. See $LK,"flags",A="MN:ODEF_HAS_MASSES"$.
//The tolerance is not precise.
//You can min_tolerance and it will
@@ -62,7 +61,7 @@ public CMathODE *ODENew(I64 n,F64 max_tolerance=1e-6,I64 flags=0)
}
public U0 ODEDel(CMathODE *ode)
{
{//Free ODE node, but not masses or springs.
if (!ode) return;
ode->ode_signature=0;
Free(ode->state);
@@ -71,7 +70,7 @@ public U0 ODEDel(CMathODE *ode)
}
public I64 ODESize(CMathODE *ode)
{
{//Mem size of ode ctrl, but not masses and springs.
if (!ode)
return 0;
else
@@ -134,7 +133,7 @@ U0 ODEInternal2State(CMathODE *ode)
}
public U0 ODERenum(CMathODE *ode)
{
{//Renumber masses and springs.
I64 i;
CSpring *temps;
CMass *tempm;
@@ -157,7 +156,7 @@ public U0 ODERenum(CMathODE *ode)
}
public CMass *MassFind(CMathODE *ode,F64 x,F64 y,F64 z=0)
{
{//Search for mass nearest to x,y,z.
CMass *tempm,*best_mass=NULL;
F64 d,best_d=MAX_F64;
@@ -174,7 +173,7 @@ public CMass *MassFind(CMathODE *ode,F64 x,F64 y,F64 z=0)
}
public CSpring *SpringFind(CMathODE *ode,F64 x,F64 y,F64 z=0)
{
{//Find spring midpoint nearest x,y,z.
CSpring *temps,*best_spring=NULL;
F64 d,best_d=MAX_F64;
@@ -194,7 +193,7 @@ public CSpring *SpringFind(CMathODE *ode,F64 x,F64 y,F64 z=0)
public U0 MassOrSpringFind(CMathODE *ode,CMass **result_mass,CSpring **result_spring,
F64 x,F64 y,F64 z=0)
{
{//Find spring or mass nearest x,y,z.
CMass *tempm,*best_mass=NULL;
CSpring *temps,*best_spring=NULL;
F64 d,best_d=MAX_F64;
@@ -226,7 +225,7 @@ public U0 MassOrSpringFind(CMathODE *ode,CMass **result_mass,CSpring **result_sp
}
public CMass *MassFindNum(CMathODE *ode,I64 num)
{
{//Return mass number N.
CMass *tempm=ode->next_mass;
while (tempm!=&ode->next_mass) {
if (tempm->num==num)
@@ -237,7 +236,7 @@ public CMass *MassFindNum(CMathODE *ode,I64 num)
}
public U0 ODERstInactive(CMathODE *ode)
{
{//Set all masses and springs to ACTIVE for new trial.
CMass *tempm;
CSpring *temps;
tempm=ode->next_mass;
@@ -292,7 +291,7 @@ U0 ODECalcDrag(CMathODE *ode)
while (tempm!=&ode->next_mass) {
if (!(tempm->flags & MSF_INACTIVE) &&
tempm->drag_profile_factor &&
(dd=D3SqrNorm(&tempm->state->DxDt))) {
(dd=D3NormSqr(&tempm->state->DxDt))) {
d=ode->drag_v;
if (ode->drag_v2)
d+=ode->drag_v2*Sqrt(dd);
@@ -392,7 +391,6 @@ U0 ODERK4OneStep(CMathODE *ode)
ode->state_internal[i]+=h6*(DstateDt[i]+dyt[i]+2.0*dym[i]);
}
#define ODEa2 0.2
#define ODEa3 0.3
#define ODEa4 0.6
@@ -458,13 +456,11 @@ U0 ODECashKarp(CMathODE *ode)
stateerr[i]=h*(ODEdc1*DstateDt[i]+ODEdc3*ak3[i]+ODEdc4*ak4[i]+ODEdc5*ak5[i]+ODEdc6*ak6[i]);
}
#define SAFETY 0.9
#define PGROW (-0.2)
#define PSHRNK (-0.25)
#define ERRCON 1.89e-4
U0 ODERK5OneStep(CMathODE *ode)
{
I64 i;
@@ -498,9 +494,7 @@ U0 ODERK5OneStep(CMathODE *ode)
F64 ode_allocated_factor=0.75;
U0 ODEsUpdate(CTask *task)
{
/*
This routine is called by the $LK,"window mgr",A="FF:::/Adam/Gr/GrScreen.CPP,ODEsUpdate"$ on a continuous
{/* This routine is called by the $LK,"window mgr",A="FF:::/Adam/Gr/GrScreen.CPP,ODEsUpdate"$ on a continuous
basis to allow real-time simulation. It is intended
to provide results good enough for games. It uses a runge-kutta
integrator which is a better algorithm than doing it with Euler.
@@ -508,7 +502,6 @@ integrator which is a better algorithm than doing it with Euler.
It is adaptive step-sized, so it slows down when an important
event is taking place to improve accuracy, but in my implementation
it has a timeout.
*/
I64 i;
F64 d,start_time,timeout_time,t_desired,t_initial,interpolation;
@@ -519,7 +512,7 @@ it has a timeout.
task->last_ode_time=0;
else {
//See $LK,"GrUpdateWins",A="MN:GrUpdateWins"$()
if (!Bt(&task->win_inhibit,WIf_ODE)) {
if (!Bt(&task->win_inhibit,WIf_SELF_ODE)) {
//TODO: Being preempted here woulds be bad
if (task!=Fs)
old_suspend=Suspend(task);
@@ -528,9 +521,9 @@ it has a timeout.
//last refresh cycle was spent on ODE's
//and what the refresh cycle rate was.
start_time=tS;
d=1.0/win_actual_refresh;
d=1.0/winmgr.fps;
timeout_time=start_time+
(task->last_ode_time/d+0.1)/(last_refresh_ode_time/d+0.1)*
(task->last_ode_time/d+0.1)/(winmgr.last_ode_time/d+0.1)*
ode_allocated_factor*d;
ode=task->next_ode;
while (ode!=&task->next_ode) {
@@ -612,12 +605,10 @@ ode_done:
}
ode=ode->next;
}
refresh_ode_time+=task->last_ode_time=tS-start_time;
winmgr.ode_time+=task->last_ode_time=tS-start_time;
//See $LK,"GrUpdateWins",A="MN:GrUpdateWins"$()
if (task!=Fs)
Suspend(task,old_suspend);
}
}
}
#help_index ""
Adam/Menu.CPP
+17 -20
View File
@@ -12,7 +12,7 @@ CTask *MenuTask()
CMenuEntry *sys_cur_submenu_entry=NULL;
public CMenuEntry *MenuSubEntryFind(CMenuEntry *haystack_first,U8 *needle_entry_name)
{
{//You probably don't need this. Use dir / and $LK,"MenuEntryFind",A="MN:MenuEntryFind"$().
while (haystack_first) {
if (!StrCmp(haystack_first->name,needle_entry_name))
return haystack_first;
@@ -22,7 +22,8 @@ public CMenuEntry *MenuSubEntryFind(CMenuEntry *haystack_first,U8 *needle_entry_
}
public CMenuEntry *MenuEntryFind(CMenu *haystack_menu,U8 *needle_full_name)
{
{//Find pulldown entry. Fs->cur_menu is probably the menu you want.
//Just 2 levels -- across top and down are valid, currently.
U8 *st,*st2;
CMenuEntry *tempse;
if (!haystack_menu || haystack_menu->mu_signature!=MENU_SIGNATURE_VAL || !needle_full_name)
@@ -50,15 +51,15 @@ CMenuEntry *MenuNewSub(CLex *lx,CTask *task)
if (Lex(lx)=='(') {
tempme->msg_code=MSG_KEY_DOWN_UP;
if (Lex(lx)!=',' && lx->token!=')')
tempme->msg_code=LexExpression(lx);
tempme->msg_code=LexExpressionI64(lx);
if (lx->token==',')
Lex(lx);
if (lx->token!=',' && lx->token!=')')
tempme->p1=LexExpression(lx);
tempme->a1=LexExpressionI64(lx);
if (lx->token==',')
Lex(lx);
if (lx->token!=',' && lx->token!=')')
tempme->p2=LexExpression(lx);
tempme->a2=LexExpressionI64(lx);
if (lx->token!=')')
LexExcept(lx,"missing ')' at ");
if (Lex(lx)!=';')
@@ -81,7 +82,7 @@ CMenuEntry *MenuNewSub(CLex *lx,CTask *task)
}
public CMenu *MenuNew(U8 *st,I64 flags=0,CTask *task=NULL)
{
{//Parse a menu. You probably don't need this.
CMenu *m;
CMenuEntry *tempse;
CLex *lx=LexNew(st,LF_DONT_FREE_BUF);
@@ -101,9 +102,9 @@ public CMenu *MenuNew(U8 *st,I64 flags=0,CTask *task=NULL)
}
public CMenu *MenuFile(U8 *filename,I64 flags=0,CTask *task=NULL)
{
{//Parse a pulldown menu file. You probably don't need this.
CMenu *m;
U8 *st=MPrint("#include \"%s\"",filename);
U8 *st=MStrPrint("#include \"%s\"",filename);
m=MenuNew(st,flags,task);
Free(st);
return m;
@@ -124,7 +125,7 @@ U0 MenuDelSub(CMenuEntry *tempme)
}
public U0 MenuDel(CMenu *m)
{
{//Delete a manu. You probably don't need this.
CMenuEntry *tempme,*tempme1;
if (!m || m->mu_signature!=MENU_SIGNATURE_VAL)
return;
@@ -150,7 +151,7 @@ I64 MenuEntryWidth(CMenuEntry *tempme)
}
public CMenu *MenuPush(U8 *st)
{
{//Save old pulldown menu and replace with new from str.
CMenu *m=MenuNew(st);
m->next=Fs->cur_menu;
Fs->cur_menu=m;
@@ -158,7 +159,7 @@ public CMenu *MenuPush(U8 *st)
}
public CMenu *MenuFilePush(U8 *filename)
{
{//Save old pulldown menu and replace with new from file.
CMenu *m=MenuFile(filename);
m->next=Fs->cur_menu;
Fs->cur_menu=m;
@@ -166,7 +167,7 @@ public CMenu *MenuFilePush(U8 *filename)
}
public U0 MenuPop()
{
{//Restore old pulldown menu. Delete just-deactivated menu.
CMenu *m=Fs->cur_menu;
if (!m) return;
Fs->cur_menu=m->next;
@@ -179,7 +180,7 @@ U0 DrawMenu(CDC *dc)
CMenuEntry *tempme,*tempse,*cur_submenu=NULL;
U8 *st=NULL;
CTask *task=MenuTask;
I64 i,w,x0,y0,x1=ipx,y1=ipy;
I64 i,w,x0,y0,x1=ip.pos.x,y1=ip.pos.y;
if (!TaskValidate(task) || !(m=task->cur_menu) ||
m->mu_signature!=MENU_SIGNATURE_VAL) {
sys_cur_submenu_entry=NULL;
@@ -209,9 +210,9 @@ U0 DrawMenu(CDC *dc)
i=m->attr;
if (y0<=y1<y0+FONT_HEIGHT) {
if (tempse->msg_code==MSG_KEY_DOWN||tempse->msg_code==MSG_KEY_DOWN_UP) {
if (!tempse->p2)
tempse->p2=A2ScanCode(tempse->p1);
st=ScanCode2KeyName(tempse->p2);
if (!tempse->a2)
tempse->a2=Char2ScanCode(tempse->a1);
st=ScanCode2KeyName(tempse->a2);
}
sys_cur_submenu_entry=cur_submenu=tempse;
dc->color=i&15;
@@ -243,7 +244,3 @@ U0 DrawMenu(CDC *dc)
}
sys_cur_submenu_entry=cur_submenu;
}
#help_index ""
Adam/Snd/MathAudio.CPP
+11 -15
View File
@@ -1,6 +1,6 @@
#help_index "Snd/Math;Math"
public F64 Saw(F64 t,F64 period)
{ //0.0 - 1.0 think "(Sin+1)/2"
{//Sawtooth. 0.0 - 1.0 think "(Sin+1)/2"
if (period) {
if (t>=0.0)
return t%period/period;
@@ -11,7 +11,7 @@ public F64 Saw(F64 t,F64 period)
}
public F64 FullSaw(F64 t,F64 period)
{ //1.0 - -1.0 think "Sin"
{//Plus&Minus Sawtooth. 1.0 - -1.0 think "Sin"
if (period) {
if (t>=0.0)
return 2.0*(t%period/period)-1.0;
@@ -22,7 +22,7 @@ public F64 FullSaw(F64 t,F64 period)
}
public F64 Caw(F64 t,F64 period)
{ //1.0 - 0.0 think "(Cos+1)/2"
{//Cawtooth. 1.0 - 0.0 think "(Cos+1)/2"
if (period) {
if (t>=0.0)
return 1.0-t%period/period;
@@ -33,7 +33,7 @@ public F64 Caw(F64 t,F64 period)
}
public F64 FullCaw(F64 t,F64 period)
{ //1.0 - -1.0 think "Cos"
{//Plus&Minus Cawtooth. 1.0 - -1.0 think "Cos"
if (period) {
if (t>=0.0)
return -2.0*(t%period/period)+1.0;
@@ -44,7 +44,7 @@ public F64 FullCaw(F64 t,F64 period)
}
public F64 Tri(F64 t,F64 period)
{ //0.0 - 1.0 - 0.0
{//Triangle waveform. 0.0 - 1.0 - 0.0
if (period) {
t=2.0*(Abs(t)%period)/period;
if (t<=1.0)
@@ -55,9 +55,8 @@ public F64 Tri(F64 t,F64 period)
return 0.0;
}
public F64 FullTri(F64 t,F64 period)
{ //0.0 - 1.0 - 0.0 - -1.0 -0.0
{//Plus&Minus Triangle waveform. 0.0 - 1.0 - 0.0 - -1.0 -0.0
if (period) {
t=4.0*(t%period)/period;
if (t<=-1.0) {
@@ -79,14 +78,13 @@ public F64 FullTri(F64 t,F64 period)
#help_index "Snd/Math"
public F64 Note2Freq(I64 note,I64 octave=3)
{
{//Note number in octave to freq.
return 440.0*2.0`(octave-3+note/12.0);
}
F64 SinPhaseCont(F64 last_y,F64 last_dydt,
F64 current_amp,F64 phase_offset)
{
{//Next sample of sin waveform.
F64 phase;
phase=last_y/current_amp;
if (phase>1.0) phase=1.0;
@@ -100,7 +98,7 @@ F64 SinPhaseCont(F64 last_y,F64 last_dydt,
public CSndWaveCtrl *SndWaveCtrlNew(I64 sample_rate=8000,I64 sample_bits=24,
I64 channels=2,CTask *mem_task=NULL)
{
{//MAlloc ctrl struct for generating waveforms.
CSndWaveCtrl *swc=CAlloc(sizeof(CSndWaveCtrl),mem_task);
swc->freq_multiplier=1.0;
swc->amp_multiplier=1.0;
@@ -112,7 +110,7 @@ public CSndWaveCtrl *SndWaveCtrlNew(I64 sample_rate=8000,I64 sample_bits=24,
}
public U0 SndWaveCtrlDel(CSndWaveCtrl *swc)
{
{//Free waveform ctrl.
Free(swc);
}
@@ -126,7 +124,7 @@ public U0 SndWaveCtrlDel(CSndWaveCtrl *swc)
public U0 SndWaveAddBuf(CSndWaveCtrl *swc,U8 *buf,I64 num_samples,
F64 _freq,I64 _waveform=WF_SQUARE,F64 _amp=1.0,F64 _left=1.0, F64 _right=1.0)
{
{//Add waveform to buffer.
//num_samples is multiplied by channels to get buf_len.
//left,right range from 0.0-1.0
//Supports 16,24 and 32 bits
@@ -230,5 +228,3 @@ public U0 SndWaveAddBuf(CSndWaveCtrl *swc,U8 *buf,I64 num_samples,
swc->phase=phase;
}
}
#help_index "Snd"
Adam/Snd/Music.CPP
+61 -61
View File
@@ -1,26 +1,31 @@
#help_index "Snd/Music"
U8 *cur_song=NULL;
CTask *cur_song_task=NULL;
I64 music_octave;
F64 music_note_len;
U8 music_note_map[7]={0,2,3,5,7,8,10};
I64 music_mute=0;
I64 music_meter_top,music_meter_bottom;
public F64 music_tempo,music_stacatto_factor;
//This is if you wish to sync with a
//note in a Play() string. 0 is the start
public I64 music_play_note_num=0;
public class CMusicGlbls
{
U8 *cur_song;
CTask *cur_song_task;
I64 octave;
F64 note_len;
U8 note_map[7];
Bool mute;
I64 meter_top,meter_bottom;
F64 tempo,stacatto_factor;
//If you wish to sync with a
//note in a Play() string. 0 is the start
I64 play_note_num;
F64 tM_correction,last_Beat,last_tM;
} music={NULL,NULL,3,1.0,{0,2,3,5,7,8,10},FALSE,4,4,2.5,0.9,0,0,0,0};
#help_index "Snd/Music;Time/Seconds"
F64 music_tM_correction=0,music_last_Beat=0,music_last_tM=0;
public F64 tM()
{
return (sys_jiffies+music_tM_correction)/JIFFY_FREQ;
{//Time in seconds synchronized to music subsystem.
return (cnts.jiffies+music.tM_correction)/JIFFY_FREQ;
}
public F64 Beat()
{ //Time in music beats
{//Time in music beats.
F64 result,cur_tM;
PUSHFD
CLI
@@ -28,11 +33,11 @@ public F64 Beat()
while (LBts(&sys_semas[SYS_SEMA_TMBEAT],0))
PAUSE
cur_tM=tM;
result=music_last_Beat;
if (music_tempo)
result+=(cur_tM-music_last_tM)*music_tempo;
music_last_tM=cur_tM;
music_last_Beat=result;
result=music.last_Beat;
if (music.tempo)
result+=(cur_tM-music.last_tM)*music.tempo;
music.last_tM=cur_tM;
music.last_Beat=result;
LBtr(&sys_semas[SYS_SEMA_TMBEAT],0);
POPFD
return result;
@@ -44,7 +49,7 @@ U8 *MusicSetOctave(U8 *st)
I64 ch;
ch=*st++;
while ('0'<=ch<='9') {
music_octave=ch-'0';
music.octave=ch-'0';
ch=*st++;
}
return --st;
@@ -57,13 +62,13 @@ U8 *MusicSetMeter(U8 *st)
while (ch=='M') {
ch=*st++;
if ('0'<=ch<='9') {
music_meter_top=ch-'0';
music.meter_top=ch-'0';
ch=*st++;
}
if (ch=='/')
ch=*st++;
if ('0'<=ch<='9') {
music_meter_bottom=ch-'0';
music.meter_bottom=ch-'0';
ch=*st++;
}
}
@@ -75,13 +80,13 @@ U8 *MusicSetNoteLen(U8 *st)
Bool cont=TRUE;
do {
switch (*st++) {
case 'w': music_note_len=4.0; break;
case 'h': music_note_len=2.0; break;
case 'q': music_note_len=1.0; break;
case 'e': music_note_len=0.5; break;
case 's': music_note_len=0.25; break;
case 't': music_note_len=2.0*music_note_len/3.0; break;
case '.': music_note_len=1.5*music_note_len; break;
case 'w': music.note_len=4.0; break;
case 'h': music.note_len=2.0; break;
case 'q': music.note_len=1.0; break;
case 'e': music.note_len=0.5; break;
case 's': music.note_len=0.25; break;
case 't': music.note_len=2.0*music.note_len/3.0; break;
case '.': music.note_len=1.5*music.note_len; break;
default:
st--;
cont=FALSE;
@@ -91,8 +96,7 @@ U8 *MusicSetNoteLen(U8 *st)
}
public U0 Play(U8 *st,U8 *words=NULL)
/*
Notes are entered with a capital letter.
{/* Notes are entered with a capital letter.
Octaves are entered with a digit and
stay set until changed.
@@ -108,30 +112,27 @@ public U0 Play(U8 *st,U8 *words=NULL)
'(' tie, placed before the note to be extended
$LK,"music_meter_top",A="MN:music_meter_top"$,$LK,"music_meter_bottom",A="MN:music_meter_bottom"$ is set with
$LK,"music.meter_top",A="MN:CMusicGlbls"$,$LK,"music.meter_bottom",A="MN:CMusicGlbls"$ is set with
"M3/4"
"M4/4"
etc.
Sharp and flat are done with '#' or 'b'.
The var music_stacatto_factor can
The var music.stacatto_factor can
be set to a range from 0.0 to 1.0.
The var music_tempo is quarter-notes
The var music.tempo is quarter-notes
per second. It defaults to
2.5 and gets faster when bigger.
*/
{
U8 *word,*last_st;
I64 note,i=0,timeout_val,timeout_val2;
Bool tie,old_preempt=Preempt(OFF);
F64 f,d,on_jiffies,off_jiffies;
music_play_note_num=0;
music.play_note_num=0;
while (*st) {
timeout_val=sys_jiffies;
timeout_val=cnts.jiffies;
tie=FALSE;
do {
@@ -149,7 +150,7 @@ public U0 Play(U8 *st,U8 *words=NULL)
if (!*st) break;
note=*st++-'A';
if (note<7) {
note=music_note_map[note];
note=music.note_map[note];
if (*st=='b') {
note--;
st++;
@@ -157,54 +158,54 @@ public U0 Play(U8 *st,U8 *words=NULL)
note++;
st++;
}
f=Note2Freq(note,music_octave);
f=Note2Freq(note,music.octave);
} else
f=0;
if (words && (word=LstSub(i++,words)) && StrCmp(word," "))
"%s",word;
d=JIFFY_FREQ*music_note_len/music_tempo;
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);
on_jiffies =d*music.stacatto_factor;
off_jiffies =d*(1.0-music.stacatto_factor);
}
timeout_val+=on_jiffies;
timeout_val2=timeout_val+off_jiffies;
if (!music_mute)
if (!music.mute)
Snd(f);
SleepUntil(timeout_val);
music_tM_correction+=on_jiffies-ToI64(on_jiffies);
music.tM_correction+=on_jiffies-ToI64(on_jiffies);
if (!music_mute)
if (!music.mute)
Snd(0);
SleepUntil(timeout_val2);
music_tM_correction+=off_jiffies-ToI64(off_jiffies);
music.tM_correction+=off_jiffies-ToI64(off_jiffies);
music_play_note_num++;
music.play_note_num++;
}
Preempt(old_preempt);
}
U0 MusicSettingsRst()
{
music_play_note_num=0;
music_stacatto_factor=0.9;
music_tempo=2.5;
music_octave=3;
music_note_len=1.0;
music_meter_top=4;
music_meter_bottom=4;
music.play_note_num=0;
music.stacatto_factor=0.9;
music.tempo=2.5;
music.octave=3;
music.note_len=1.0;
music.meter_top=4;
music.meter_bottom=4;
PUSHFD
CLI
if (mp_cnt>1)
while (LBts(&sys_semas[SYS_SEMA_TMBEAT],0))
PAUSE
music_last_tM=tM;
music_last_Beat=0.0;
music.last_tM=tM;
music.last_Beat=0.0;
LBtr(&sys_semas[SYS_SEMA_TMBEAT],0);
POPFD
}
@@ -216,6 +217,5 @@ U0 CurSongTask()
Preempt(ON);
Fs->task_end_cb=&SndTaskEndCB;
while (TRUE)
Play(cur_song);
Play(music.cur_song);
}
#help_index "Snd"
Adam/Snd/Snd.CPP
+1 -3
View File
@@ -8,8 +8,7 @@ class CSndWaveCtrl
};
public U0 SndTaskEndCB()
//This will turn-off snd when a task gets killed.
{
{//Will turn-off snd when a task gets killed.
Snd(0);
Exit;
}
@@ -18,4 +17,3 @@ public U0 SndTaskEndCB()
#include "Music"
#include "SndEffects"
#include "SndFile"
#help_index ""
Adam/Snd/SndEffects.CPP
+9 -7
View File
@@ -1,3 +1,5 @@
#help_index "Snd"
#define SE_NOISE 0
#define SE_SWEEP 1
@@ -10,7 +12,7 @@ class CSoundEffectFrame
U0 SoundEffectEndTaskCB()
{
Free(FramePtr("CSoundEffectFrame"));
music_mute--;
music.mute--;
SndTaskEndCB;
}
@@ -26,7 +28,7 @@ U0 SoundEffectTask(CSoundEffectFrame *ns)
while (tS<timeout)
if (f=RandU16%i+ns->freq1) {
Snd(f);
Sleep(MaxI64(3000/f,1));
Sleep(ClampI64(3000/f,1,50));
} else
break;
break;
@@ -35,7 +37,7 @@ U0 SoundEffectTask(CSoundEffectFrame *ns)
t=(tS-t0)/ns->duration;
if (f=(1.0-t)*ns->freq1+t*ns->freq2) {
Snd(f);
Sleep(MaxI64(3000/f,1));
Sleep(ClampI64(3000/f,1,50));
} else
break;
}
@@ -44,7 +46,7 @@ U0 SoundEffectTask(CSoundEffectFrame *ns)
}
public CTask *Noise(I64 mS,F64 min_freq,F64 max_freq)
{
{//Make white noise for given number of mS.
CSoundEffectFrame *ns;
if (mS>0) {
ns=MAlloc(sizeof(CSoundEffectFrame));
@@ -52,14 +54,14 @@ public CTask *Noise(I64 mS,F64 min_freq,F64 max_freq)
ns->duration=mS/1000.0;
ns->freq1=min_freq;
ns->freq2=max_freq;
music_mute++;
music.mute++;
return Spawn(&SoundEffectTask,ns,"Noise",,Fs);
} else
return NULL;
}
public CTask *Sweep(I64 mS,F64 freq1,F64 freq2)
{
{//Sweep through freq range in given number of mS.
CSoundEffectFrame *ns;
if (mS>0) {
ns=MAlloc(sizeof(CSoundEffectFrame));
@@ -67,7 +69,7 @@ public CTask *Sweep(I64 mS,F64 freq1,F64 freq2)
ns->duration=mS/1000.0;
ns->freq1=freq1;
ns->freq2=freq2;
music_mute++;
music.mute++;
return Spawn(&SoundEffectTask,ns,"Noise",,Fs);
} else
return NULL;
Adam/Snd/SndFile.CPP
+14 -19
View File
@@ -2,7 +2,7 @@
#define SNDFILE_SAMPLE_RATE 8000
//Header for a ".SND" file
class CFileSND
{ //big endian
{//big endian
U32 signature; //0x646e732e
U32 offset; //24
U32 data_size;
@@ -12,19 +12,16 @@ class CFileSND
I16 body[1];
};
//This is a windows media constraint.
//Windows media constraint.
//#define MAX_SND_FILE_DATA 0x0007FF00
#define MAX_SND_FILE_DATA 0x7FFFFF00
public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,F64 averaging=0.0,I64 waveform=WF_SQUARE,
F64 reverb_delay=0,F64 reverb_intensity=0)
//Use "snd_record" flag to start or stop
//recording, then call this routine.
{//Use "snd.record" flag to start or stop recording, then call this routine.
//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;
F64 avg,dt;
CFileSND *s;
@@ -32,12 +29,12 @@ public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,F64 averaging=
CSndData *d,*d1;
U8 *name,*name2;
snd_record=FALSE;
snd.record=FALSE;
dt=snd_record_root.last->time_stamp-snd_record_root.next->time_stamp;
dt=snd.record_root.last->time-snd.record_root.next->time;
if (!dt) return 0;
cnt=dt*SNDFILE_SAMPLE_RATE;
cnt++; //terminator
cnt++; //Terminator
name=StrNew(base_filename);
FileExtRem(name);
@@ -49,11 +46,11 @@ public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,F64 averaging=
s->sample_rate=EndianU32(SNDFILE_SAMPLE_RATE);
s->channels=EndianU32(1);
d=snd_record_root.next;
d=snd.record_root.next;
k=0;
while (d->next!=&snd_record_root) {
while (d->next!=&snd.record_root) {
d1=d->next;
dt=d1->time_stamp-d->time_stamp;
dt=d1->time-d->time;
cnt2=dt*SNDFILE_SAMPLE_RATE;
SndWaveAddBuf(swc,&s->body[k],cnt2,d->freq,waveform,normalized_vol);
k+=cnt2;
@@ -69,14 +66,14 @@ public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,F64 averaging=
s->body[i]=avg=LowPass1(averaging,avg,s->body[i],1.0);
}
//reverb
//Reverb
if (reverb_intensity) {
if (dt=reverb_delay*SNDFILE_SAMPLE_RATE)
for (i=dt;i<cnt;i++)
s->body[i]+=reverb_intensity*s->body[i-dt];
}
//Get rid of D.C. component
//Get rid of D.C. component
for (k=0;k<3;k++) {
level=0;
for (i=0;i<cnt-1;i++)
@@ -91,8 +88,8 @@ public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,F64 averaging=
s->body[cnt-1]=0;
d=snd_record_root.next;
while (d!=&snd_record_root) {
d=snd.record_root.next;
while (d!=&snd.record_root) {
d1=d->next;
QueRem(d);
Free(d);
@@ -108,7 +105,7 @@ public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,F64 averaging=
i=MAX_SND_FILE_DATA;
s->data_size=EndianU32(i*sizeof(I16));
MemCpy(s->body,&s->body[file_num*MAX_SND_FILE_DATA],i*sizeof(I16));
SPrint(name2,"%s%03d.SND",name,file_num++);
StrPrint(name2,"%s%03d.SND",name,file_num++);
FileWrite(name2,s,offset(CFileSND.body)+i*sizeof(I16));
cnt2-=i;
}
@@ -119,5 +116,3 @@ public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,F64 averaging=
SndWaveCtrlDel(swc);
return cnt;
}
#help_index ""
Adam/TaskSettings.CPP
+5 -9
View File
@@ -1,9 +1,9 @@
#help_index "Task/Settings"
public CTaskSettings *SettingsPush(CTask *task=NULL,I64 flags=0)
{ //This is typically used at the start of an application.
//It saves many settings so they can be restored
//at the end of the application with $LK,"SettingsPop",A="MN:SettingsPop"$().
{//Typically, called at start of an application.
//It saves many settings so they can be restored
//at the end of the application with $LK,"SettingsPop",A="MN:SettingsPop"$().
CTaskSettings *tempse;
CDoc *doc;
@@ -41,7 +41,6 @@ public CTaskSettings *SettingsPush(CTask *task=NULL,I64 flags=0)
tempse->scroll_z=task->scroll_z;
tempse->win_inhibit=task->win_inhibit;
tempse->win_max_refresh=task->win_max_refresh;
tempse->text_attr=task->text_attr;
StrCpy(tempse->task_title,task->task_title);
tempse->title_src =task->title_src;
@@ -49,7 +48,7 @@ public CTaskSettings *SettingsPush(CTask *task=NULL,I64 flags=0)
tempse->border_src =task->border_src;
tempse->border=!Bt(&task->display_flags,DISPLAYf_NO_BORDER);
tempse->preempt=Bt(&task->task_flags,TASKf_PREEMPT);
if (TaskValidate(ws_task))
if (TaskValidate(ws.task))
tempse->wordstat=TRUE;
else
tempse->wordstat=FALSE;
@@ -75,7 +74,6 @@ U0 SettingsPop2(CTask *task,CTaskSettings *tempse)
task->scroll_y=tempse->scroll_y;
task->scroll_z=tempse->scroll_z;
task->win_inhibit=tempse->win_inhibit;
task->win_max_refresh=tempse->win_max_refresh;
task->text_attr=tempse->text_attr;
task->border_attr=tempse->border_attr;
task->border_src =tempse->border_src;
@@ -87,7 +85,7 @@ U0 SettingsPop2(CTask *task,CTaskSettings *tempse)
}
public U0 SettingsPop(CTask *task=NULL,I64 flags=0)
{
{//Typically, called at end of an application.
CTaskSettings *tempse;
Bool old_preempt=Preempt(OFF);
if (!task) task=Fs;
@@ -122,5 +120,3 @@ public U0 SettingsPop(CTask *task=NULL,I64 flags=0)
} else
Preempt(old_preempt);
}
#help_index ""
Adam/Training.CPP
+42 -42
View File
@@ -1,8 +1,8 @@
#help_index "Training"
public U0 PressKeyHelp(CTask *task=NULL)
{
I64 p1=0,p2=0;
{//Jump to key handlers src for key presses.
I64 a1=0,a2=0;
Bool old_preempt=Preempt(OFF);
CTask *old_hash=Fs->hash_table;
if (!task) task=Fs;
@@ -17,19 +17,19 @@ task=Fs;
"Press keys to show handler code.\n"
"<SHIFT-ESC> to exit.\n"
"Do not press <CTRL-ALT-keys>.\n";
while (p1!=CH_ESC && p1!=CH_SHIFT_ESC) {
GetMsg(&p1,&p2,1<<MSG_KEY_DOWN);
*key_desc=0;
key_handler=NULL;
while (a1!=CH_ESC && a1!=CH_SHIFT_ESC) {
GetMsg(&a1,&a2,1<<MSG_KEY_DOWN);
*keydev.desc=0;
keydev.handler=NULL;
if (task==Fs)
PutKey(p1,p2|SCF_KEY_DESC);
PutKey(a1,a2|SCF_KEY_DESC);
else if (TaskValidate(task)) {
PostMsg(task,MSG_KEY_DOWN,p1,p2|SCF_KEY_DESC);
while (!key_handler)
PostMsg(task,MSG_KEY_DOWN,a1,a2|SCF_KEY_DESC);
while (!keydev.handler)
Yield;
}
if (*key_desc)
E(key_handler,512);
if (*keydev.desc)
E(keydev.handler,512);
}
Fs->hash_table=old_hash;
Preempt(old_preempt);
@@ -37,37 +37,37 @@ task=Fs;
U0 KeyMapCtrlAltFamily()
{
I64 i,p2;
I64 i,a2;
U8 *st,*st2;
p2=SC_DELETE+SCF_CTRL+SCF_ALT;
st2=ScanCode2KeyName(p2);
a2=SC_DELETE+SCF_CTRL+SCF_ALT;
st2=ScanCode2KeyName(a2);
st=SrcEdLink(&Reboot,256);
"%20s $$LK,\"%s\",A=\"%s\"$$\n",st2,"Sys/Reboot",st;
Free(st);
Free(st2);
p2=SC_ESC+SCF_CTRL+SCF_ALT;
st2=ScanCode2KeyName(p2);
a2=SC_ESC+SCF_CTRL+SCF_ALT;
st2=ScanCode2KeyName(a2);
st=SrcEdLink(&SpawnUser,256);
"%20s $$LK,\"%s\",A=\"%s\"$$\n",st2,"Sys/Spawn New User Task",st;
Free(st);
Free(st2);
p2=SC_TAB+SCF_CTRL+SCF_ALT;
st2=ScanCode2KeyName(p2);
a2=SC_TAB+SCF_CTRL+SCF_ALT;
st2=ScanCode2KeyName(a2);
st=SrcEdLink(&WinToTop,256);
"%20s $$LK,\"%s\",A=\"%s\"$$\n",st2,"Sys/Switch Focus to Next Task",st;
Free(st);
Free(st2);
for (i=0;i<26;i++) {
if (fp_ctrl_alt_let_cbs[i] &&
ctrl_alt_let_descs[i]) {
p2=A2ScanCode(i+'a')+SCF_CTRL+SCF_ALT;
st2=ScanCode2KeyName(p2);
st=SrcEdLink(fp_ctrl_alt_let_cbs[i],256);
"%20s $$LK,\"%s\",A=\"%s\"$$\n",st2,ctrl_alt_let_descs[i],st;
if (keydev.fp_ctrl_alt_let_cbs[i] &&
keydev.ctrl_alt_let_descs[i]) {
a2=Char2ScanCode(i+'a')+SCF_CTRL+SCF_ALT;
st2=ScanCode2KeyName(a2);
st=SrcEdLink(keydev.fp_ctrl_alt_let_cbs[i],256);
"%20s $$LK,\"%s\",A=\"%s\"$$\n",st2,keydev.ctrl_alt_let_descs[i],st;
Free(st);
Free(st2);
}
@@ -133,29 +133,29 @@ I64 KMCompare(U8 *e1,U8 *e2)
U0 KeyMapFamily2(U8 **entries,U8 *family,CTask *task,I64 scf)
{
I64 i,p2,p1;
I64 i,a2,a1;
U8 *st,*st2;
CTask *old_hash=Fs->hash_table;
Fs->hash_table=task->hash_table;
for (i=0;i<256;i++) {
p2=scf|i|SCF_KEY_DESC;
p1=ScanCode2A(p2);
*key_desc=0;
key_handler=NULL;
a2=scf|i|SCF_KEY_DESC;
a1=ScanCode2Char(a2);
*keydev.desc=0;
keydev.handler=NULL;
if (task==Fs)
PutKey(p1,p2);
PutKey(a1,a2);
else if (TaskValidate(task)) {
PostMsg(task,MSG_KEY_DOWN,p1,p2);
while (!key_handler)
PostMsg(task,MSG_KEY_DOWN,a1,a2);
while (!keydev.handler)
Yield;
}
if (*key_desc && StrNCmp(key_desc,"Char/",5)) {
st=ScanCode2KeyName(p2&~(SCF_CTRL|SCF_ALT|SCF_SHIFT));
st2=MPrint("%s %s",family,st);
if (*keydev.desc && StrNCmp(keydev.desc,"Char/",5)) {
st=ScanCode2KeyName(a2&~(SCF_CTRL|SCF_ALT|SCF_SHIFT));
st2=MStrPrint("%s %s",family,st);
Free(st);
st=SrcEdLink(key_handler,256);
entries[i]=MPrint("%20s $$LK,\"%s\",A=\"%s\"$$\n",
st2,key_desc,st);
st=SrcEdLink(keydev.handler,256);
entries[i]=MStrPrint("%20s $$LK,\"%s\",A=\"%s\"$$\n",
st2,keydev.desc,st);
Free(st);
Free(st2);
}
@@ -167,8 +167,8 @@ U0 KeyMapFamily(U8 *family,CTask *task,I64 scf)
{
I64 i;
U8 **entries=CAlloc(2*256*sizeof(U8 *)),st1[32],st2[32];
SPrint(st1,"%s ",family);
SPrint(st2,"%s SHIFT",family);
StrPrint(st1,"%s ",family);
StrPrint(st2,"%s SHIFT",family);
KeyMapFamily2(entries ,st1,task,scf);
KeyMapFamily2(entries+256,st2,task,scf+SCF_SHIFT);
QSortI64(entries,2*256,&KMCompare);
@@ -181,7 +181,7 @@ U0 KeyMapFamily(U8 *family,CTask *task,I64 scf)
}
public U0 KeyMap(CTask *task=NULL)
{
{//Report desc of all keys.
if (!task) task=Fs;
/*
This feature is a burden in code. It would be nice to lst key
@@ -198,7 +198,7 @@ task=Fs;
}
public U0 TipOfDay(U8 *tip_file="::/Doc/Tips.TXT")
{
{//Print random tip-of-day from ::/Doc/Tips.TXT.
I64 i=RandU16;
CDoc *doc=DocRead(tip_file),*doc2=DocNew;
CDocEntry *doc_e=doc->root.next;
Adam/Utils/BinRep.CPP
-76
View File
@@ -1,76 +0,0 @@
#help_index "Compiler"
DefineLstLoad("ST_BIN_FILE_TYPES",
"END\0 \0"
"REL_EXPORT\0"
"IMM_EXPORT\0"
"REL_I8\0"
"IMM_U8\0"
"REL_I16\0"
"IMM_U16\0"
"REL_I32\0"
"IMM_U32\0"
"REL_I64\0"
"IMM_U64\0"
" \0 \0 \0 \0"
"MAIN\0"
"MODULE_ALIGN\0MODULE_ORG\0"
" \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0 \0"
"ABS_ADDR\0"
"HEAP_GLBL\0"
);
public Bool BinRep(U8 *filename)
{//This reports imports, exports, etc
//for a .BI* file.
//See $LK,"Loader Patch Table Generation",A="FF:::/Compiler/CmpMain.CPP,EIT_MODULE_ALIGNMENT"$ and $LK,"Load",A="MN:Load"$().
U8 *fbuf,*ptr,*sptr,*absname;
I64 i,j,size,etype;
CBinFile *bfh;
CHashExport *saved_hash_ptr=NULL;
fbuf=DftExt(filename,"BIN.Z");
if (!(bfh=FileRead(fbuf,&size))) {
Free(fbuf);
return FALSE;
}
absname=FileNameAbs(fbuf);
Free(fbuf);
fbuf=StrNew(absname);
FileExtRem(fbuf);
if (fbuf[1]==':' && StrLen(fbuf)>2)
"Module Name:%s\n",fbuf+2;
else
"No Module Name\n";
Free(fbuf);
ptr=bfh(U8 *)+bfh->loader_patch_table_offset;
while (etype=*ptr++) {
i=*ptr(U32 *)++;
sptr=ptr;
ptr+=StrLen(sptr)+1;
"%16Z:$$GREEN$$%s$$FG$$:%X ",etype,"ST_BIN_FILE_TYPES",sptr,i;
switch (etype) {
case EIT_REL_I8...EIT_IMM_U64:
if (*sptr)
saved_hash_ptr=HashFind(sptr,Fs->hash_table,HTG_ALL);
if (!saved_hash_ptr)
"Unresolved Reference:%s\n",sptr;
break;
case EIT_ABS_ADDR:
NewLine;
for (j=0;j<i;j++)
"%X ",*ptr(U32 *)++;
break;
case EIT_HEAP_GLBL:
"Size:%X ",*ptr(I64 *)++;
for (j=0;j<i;j++)
"%X ",*ptr(U32 *)++;
break;
}
NewLine;
}
Free(absname);
Free(bfh);
return TRUE;
}
#help_index ""
Adam/Utils/Diff.CPP
+12 -14
View File
@@ -1,4 +1,4 @@
#help_index "Utils;Cmd Line (Typically)"
#help_index "Cmd Line (Typically)"
#define DS_USE_FILE1 0
#define DS_USE_FILE2 1
@@ -69,7 +69,7 @@ U0 DiffSelect(CDoc *doc,I64 *_df_flags,I64 j1_lo,I64 j1_hi,
"%s",doc_unsorted1[i++]->tag;
if (cur_l)
cur_l->flags= cur_l->flags&~DOCF_PLAIN_TEXT |old_flags;
NewLine;
'\n';
}
"$$CYAN$$";
if (j2_lo<=0)
@@ -84,7 +84,7 @@ U0 DiffSelect(CDoc *doc,I64 *_df_flags,I64 j1_lo,I64 j1_hi,
"%s",doc_unsorted2[i++]->tag;
if (cur_l)
cur_l->flags= cur_l->flags&~DOCF_PLAIN_TEXT |old_flags;
NewLine;
'\n';
}
"$$FG$$";
@@ -168,7 +168,7 @@ Bool DiffSub(CDoc *doc,I64 *_df_flags,I64 j1_lo,I64 j1_hi,I64 j2_lo,I64 j2_hi,
else {
i2b=i2;
while (!StrCmp(doc_sorted1[i1]->tag,doc_sorted2[i2]->tag)) {
if (j2_lo<=doc_sorted2[i2]->user_data<j2_hi) { //user_data is the new y
if (j2_lo<=doc_sorted2[i2]->user_data<j2_hi) {//user_data is the new y
score=0;
j1=doc_sorted1[i1]->user_data; //user_data is the new y
j2=doc_sorted2[i2]->user_data; //user_data is the new y
@@ -229,7 +229,8 @@ Bool DiffBins(CDoc *doc1,CDoc *doc2)
}
public Bool Diff(U8 *dst_file,U8 *src_file,I64 *_df_flags=NULL)
{ //The _df_flags arg is used when this is called by $LK,"Merge",A="MN:Merge"$().
{//Report differences between two files and merge differences
//from src_file to dst_file. Don't use _df_flags arg. (Used by $LK,"Merge",A="MN:Merge"$().)
CDoc *doc1=DocRead(dst_file,DOCF_PLAIN_TEXT_WITH_TABS|DOCF_NO_CURSOR),
*doc2=DocRead(src_file,DOCF_PLAIN_TEXT_WITH_TABS|DOCF_NO_CURSOR);
CDocEntry *doc_e,**doc_sorted1,**doc_sorted2,**doc_unsorted1,**doc_unsorted2;
@@ -305,17 +306,16 @@ public Bool Diff(U8 *dst_file,U8 *src_file,I64 *_df_flags=NULL)
return result;
}
#help_index "Utils;Cmd Line (Typically);Info"
#help_index "Cmd Line (Typically);Info"
I64 ZRepCompare(CDirEntry *e1,CDirEntry *e2)
{
return SignI64(e2->user_data(F64)-e1->user_data(F64));
}
public U0 ZipRep(U8 *files_find_mask="/*",U8 *fu_flags=NULL,
Bool just_text_not_graphics=TRUE)
{//Report of compressibility. Dft is just src files.
//(Used to spot src files with redundancy in them.)
{//Report file compressibility.
//Dft is just src files. (Used to spot
//src files with redundancy in them.)
I64 i=0,cnt,size,fuf_flags=0;
CDirEntry *tempde,*tempde1,**sort_buf;
U8 *buf;
@@ -340,10 +340,8 @@ public U0 ZipRep(U8 *files_find_mask="/*",U8 *fu_flags=NULL,
for (i=0;i<cnt;i++) {
"%4.1f%% %04X ",sort_buf[i]->user_data,sort_buf[i]->size;
PutFileLink(sort_buf[i]->full_name);
NewLine;
'\n';
}
Free(sort_buf);
DirLstDel(tempde1);
DirTreeDel(tempde1);
}
#help_index ""
Adam/Utils/FileBMP.CPP
+8 -15
View File
@@ -1,7 +1,5 @@
#help_index "Graphics/Windows BMP Files"
//This provides support for Window's BMP files.
class CFileBMP
{
U16 type;
@@ -27,8 +25,7 @@ class CFileBMP
};
public CFileBMP *BMPFile4To(CDC *dc)
{
//To Windows 4 bit BMP
{//To Windows 4-bit BMP.
U8 *src,*ptr;
I64 x,y,w=dc->width>>1,
size=offset(CFileBMP.end)+dc->width*dc->height>>1+16*sizeof(CBGR);
@@ -58,8 +55,7 @@ public CFileBMP *BMPFile4To(CDC *dc)
}
public CFileBMP *BMPFileRLE4To(CDC *dc)
{
//To Windows RLE4 bit BMP
{//To Windows RLE4 bit BMP.
U8 *src,*ptr;
I64 x,y,w=dc->width,cnt,pattern;
CFileBMP *r=CAlloc(offset(CFileBMP.end)+2*(dc->width+1)*dc->height+16*sizeof(CBGR));
@@ -111,8 +107,7 @@ public CFileBMP *BMPFileRLE4To(CDC *dc)
}
public CFileBMP *BMPFile24To(CDC *dc)
{
//To Windows 24 bit BMP
{//To Windows 24-bit BMP.
U8 *src;
I64 i,x,y,size=offset(CFileBMP.end)+dc->width*dc->height*sizeof(CRGB);
CBGR *bgr;
@@ -148,7 +143,7 @@ public CFileBMP *BMPFile24To(CDC *dc)
}
public I64 BMPFileWrite(U8 *filename,CDC *dc,I64 bits=4)
{ //Window's BMP Files
{//Window's BMP Files.
I64 size;
CFileBMP *r;
if (bits==4) {
@@ -199,7 +194,7 @@ U8 *BMPFilePaletteNew(CFileBMP *r)
U8 ms_paint_palette[16]={0,4,2,6,1,5,3,8,7,12,10,14,9,13,11,15};
public CDC *BMPFileRead(U8 *filename,Bool use_ms_paint_palette=FALSE)
{ //Window's BMP Files
{//Window's BMP Files.
I64 i,j,cnt;
U8 *palette_map,*ptr;
Bool rle4;
@@ -220,7 +215,7 @@ public CDC *BMPFileRead(U8 *filename,Bool use_ms_paint_palette=FALSE)
else
palette_map=BMPFilePaletteNew(r);
for (i=r->height-1;i>=0;i--)
if (rle4) { //We don't support full RLE4, just our own subset
if (rle4) {//We don't support full RLE4, just our own subset
j=0;
while (cnt=*ptr++) {
if (cnt==1) {
@@ -265,7 +260,7 @@ public CDC *BMPFileRead(U8 *filename,Bool use_ms_paint_palette=FALSE)
return result;
}
#help_index "Graphics/Sprite;Graphics/Windows BMP Files;Doc/Output"
#help_index "Graphics/Sprite;Graphics/Windows BMP Files;DolDoc/Output"
public U0 DocBMPFile(CDoc *doc=NULL,U8 *filename,Bool use_ms_paint_palette=FALSE)
{//Put a BMP file into a document as a sprite.
CDC *dc=BMPFileRead(filename,use_ms_paint_palette);
@@ -277,11 +272,9 @@ public U0 DocBMPFile(CDoc *doc=NULL,U8 *filename,Bool use_ms_paint_palette=FALSE
#help_index "Graphics/Windows BMP Files;Graphics/Screen"
public I64 BMPFileCaptureScreen(U8 *filename,I64 bits=4)
{
{//Capture screen as BMP file.
CDC *dc=DCCaptureScreen;
I64 size=BMPFileWrite(filename,dc,bits);
DCDel(dc);
return size;
}
#help_index ""
Adam/Utils/Grep.CPP
+15 -21
View File
@@ -1,4 +1,4 @@
#help_index "Utils;Cmd Line (Typically)"
#help_index "Cmd Line (Typically)"
#define GRF_REPLACE 0
#define GRF_SKIP 1
@@ -23,8 +23,6 @@ I64 PopUpGrepMenu()
return i;
}
I64 GrepFile(U8 *needle_str,U8 *haystack_filename,I64 *_fuf_flags,U8 *replace_text)
{
Bool first_on_line,write_this_file=FALSE,cont=!Bt(_fuf_flags,FUf_CANCEL);
@@ -58,7 +56,7 @@ I64 GrepFile(U8 *needle_str,U8 *haystack_filename,I64 *_fuf_flags,U8 *replace_te
if (first_on_line || Bt(_fuf_flags,FUf_REPLACE)) {
first_on_line=FALSE;
PutFileLink(haystack_filename,doc_e->y+1,TRUE);
name_buf=MPrint("%s,%d",haystack_filename,doc_e->y+1);
name_buf=MStrPrint("%s,%d",haystack_filename,doc_e->y+1);
if (cur_l=DocPut) {
old_flags=cur_l->flags&DOCF_PLAIN_TEXT;
cur_l->flags|=DOCF_PLAIN_TEXT;
@@ -143,8 +141,8 @@ I64 GrepFile(U8 *needle_str,U8 *haystack_filename,I64 *_fuf_flags,U8 *replace_te
}
public I64 Grep(U8 *needle_str,U8 *files_find_mask="*",U8 *fu_flags=NULL,U8 *replace_text=NULL)
/*
This does not do regular expressions--my bad.
{/*Find occurrences of a string in files.
This does not do regular expressions.
Anyway, it's good for searching and replacing.
Let's say it stands for global replace ;-)
@@ -159,8 +157,6 @@ Let's say it stands for global replace ;-)
"+lb"=only checks for label chars before.
"+la"=only checks for label chars after.
*/
{
I64 cnt=0,fuf_flags=0;
CDirEntry *tempde,*tempde1;
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r+i+f+F+T");
@@ -174,12 +170,12 @@ Let's say it stands for global replace ;-)
cnt+=GrepFile(needle_str,tempde->full_name,&fuf_flags,replace_text);
tempde=tempde->next;
}
DirLstDel(tempde1);
DirTreeDel(tempde1);
return cnt;
}
public I64 FileOcc(U8 *needle_str,U8 *files_find_mask="*",U8 *fu_flags="+r+i+l")
{/*
{/*Report occurrences of a string in files.
"+r"=recurse
"+i"=ignore case
"+l"=whole labels only.
@@ -195,13 +191,13 @@ public I64 FileOcc(U8 *needle_str,U8 *files_find_mask="*",U8 *fu_flags="+r+i+l")
class CGrep
{
U8 find_text[136] fmtstr "$$DA-P,135,A=\"FIND :%s\"$$\n";
U8 replace_text[136] fmtstr "$$DA-P,135,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[136] fmtstr "$$DA-P,135,A=\"FILE MASK :%s\"$$\n";
Bool recurse fmtstr "$$CB,\"RECURSE\"$$\n";
U8 find_text[136] fmtstr "$$DA-P,135,A=\"FIND :%s\"$$\n";
U8 replace_text[136] fmtstr "$$DA-P,135,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[136] fmtstr "$$DA-P,135,A=\"FILE MASK :%s\"$$\n";
Bool recurse fmtstr "$$CB,\"RECURSE\"$$\n";
};
I64 GrepWiz()
@@ -237,9 +233,9 @@ I64 GrepWiz()
if (g->whole_labels)
CatPrint(buf,"+l");
if (g->replace)
st=MPrint("\"$$$$WW+H,1$$$$\";Cd(\"%s\");Grep(\"%Q\",\"%Q\",\"%Q\",\"%Q\");UserTaskCont;",dir,g->find_text,g->filemask,buf,g->replace_text);
st=MStrPrint("\"$$$$WW+H,1$$$$\";Cd(\"%s\");Grep(\"%Q\",\"%Q\",\"%Q\",\"%Q\");UserTaskCont;",dir,g->find_text,g->filemask,buf,g->replace_text);
else
st=MPrint("\"$$$$WW+H,1$$$$\";Cd(\"%s\");Grep(\"%Q\",\"%Q\",\"%Q\");UserTaskCont;",dir,g->find_text,g->filemask,buf);
st=MStrPrint("\"$$$$WW+H,1$$$$\";Cd(\"%s\");Grep(\"%Q\",\"%Q\",\"%Q\");UserTaskCont;",dir,g->find_text,g->filemask,buf);
result=PopUp(st);
}
Free(dir);
@@ -247,5 +243,3 @@ I64 GrepWiz()
Free(g);
return result;
}
#help_index ""
Adam/Utils/HeapLog.CPP
+60 -58
View File
@@ -1,13 +1,13 @@
#help_index "Debugging/Heap"
#define HL_CALLER_DEPTH 4
#define HL_HASH_SIZE 0x1000
class CHeapLog
{
CHeapLog *next,*last;
U8 *addr;
U8 *caller1;
U8 *caller2;
U8 *caller3;
U8 *caller4;
U8 *caller[HL_CALLER_DEPTH];
};
class CHeapLogHash
@@ -15,8 +15,6 @@ class CHeapLogHash
CHeapLog *next,*last;
};
#define HEAPLOG_HASH_SIZE 0x1000
CHeapCtrl *heaplog_hc_watched,*heaplog_hc=NULL;
CHeapLogHash *heaplog_root=NULL;
@@ -27,11 +25,9 @@ U0 HeapLogMAlloc(U8 *addr)
if (MHeapCtrl(addr)==heaplog_hc_watched) {
temphl=MAlloc(sizeof(CHeapLog),heaplog_hc);
temphl->addr=addr;
temphl->caller1=Caller(2);
temphl->caller2=Caller(3);
temphl->caller3=Caller(4);
temphl->caller4=Caller(5);
i=addr>>3 &(HEAPLOG_HASH_SIZE-1);
for (i=0;i<HL_CALLER_DEPTH;i++)
temphl->caller[i]=Caller(i+2);
i=addr>>3 &(HL_HASH_SIZE-1);
PUSHFD
CLI
while (LBts(&sys_semas[SYS_SEMA_HEAPLOG_LOCK],0))
@@ -48,7 +44,7 @@ U0 HeapLogFree(U8 *addr)
CHeapLog *temphl;
if (!addr) return;
if (MHeapCtrl(addr)==heaplog_hc_watched) {
i=addr>>3 &(HEAPLOG_HASH_SIZE-1);
i=addr>>3 &(HL_HASH_SIZE-1);
PUSHFD
CLI
while (LBts(&sys_semas[SYS_SEMA_HEAPLOG_LOCK],0))
@@ -69,9 +65,51 @@ U0 HeapLogFree(U8 *addr)
}
}
public U0 HeapLogRep()
{
I64 i,total=0;
public Bool HeapLog(Bool val=ON,CTask *task=NULL)
{//Turn on. Collect data. Call $LK,"HeapLogRep",A="MN:HeapLogRep"$().
I64 i;
if (val) {
if (Bt(&sys_semas[SYS_SEMA_HEAPLOG_ACTIVE],0)) {
"HeapLog Already Active\n";
return TRUE;
} else {
if (!task) task=Fs;
if (TaskValidate(task))
heaplog_hc_watched=task->data_heap;
else
heaplog_hc_watched=task;//Actually, not a task, must be a HeapCtrl.
PUSHFD
CLI
while (LBts(&sys_semas[SYS_SEMA_HEAPLOG_LOCK],0))
PAUSE
heaplog_hc=HeapCtrlInit(,,sys_data_bp);
ext[EXT_HEAPLOG_MALLOC]=&HeapLogMAlloc;
ext[EXT_HEAPLOG_FREE]=&HeapLogFree;
heaplog_root=MAlloc(sizeof(CHeapLogHash)*HL_HASH_SIZE,heaplog_hc);
for (i=0;i<HL_HASH_SIZE;i++)
QueInit(&heaplog_root[i]);
LBtr(&sys_semas[SYS_SEMA_HEAPLOG_LOCK],0);
POPFD
LBts(&sys_semas[SYS_SEMA_HEAPLOG_ACTIVE],0);
return FALSE;
}
} else {
if (!LBtr(&sys_semas[SYS_SEMA_HEAPLOG_ACTIVE],0)) {
"HeapLog Not Active\n";
return FALSE;
} else {
HeapCtrlDel(heaplog_hc);
heaplog_root=heaplog_hc=NULL;
ext[EXT_HEAPLOG_MALLOC]=NULL;
ext[EXT_HEAPLOG_FREE]=NULL;
return TRUE;
}
}
}
public U0 HeapLogRep(Bool leave_it=OFF)
{//Call $LK,"HeapLog",A="MN:HeapLog"$() first and collect data.
I64 i,j,total=0;
CHeapLog *temphl,hl;
if (!LBtr(&sys_semas[SYS_SEMA_HEAPLOG_ACTIVE],0)) {
"HeapLog Not Active\n";
@@ -80,13 +118,15 @@ public U0 HeapLogRep()
"$$WW,0$$";
while (LBts(&sys_semas[SYS_SEMA_HEAPLOG_LOCK],0))
PAUSE
for (i=0;i<HEAPLOG_HASH_SIZE;i++) {
for (i=0;i<HL_HASH_SIZE;i++) {
temphl=heaplog_root[i].next;
while (temphl!=&heaplog_root[i]) {
//Take snapshot in case modified. (while we work)
MemCpy(&hl,temphl,sizeof(CHeapLog));
"$$PURPLE$$%08X$$FG$$ %08X %P %P %P %P\n",MSize(hl.addr),hl.addr,
hl.caller1,hl.caller2,hl.caller3,hl.caller4;
"$$PURPLE$$%08X$$FG$$ %08X",MSize(hl.addr),hl.addr;
for (j=0;j<HL_CALLER_DEPTH;j++)
" %P",hl.caller[j];
'\n';
total+=MSize(hl.addr);
temphl=hl.next;
}
@@ -94,44 +134,6 @@ public U0 HeapLogRep()
LBtr(&sys_semas[SYS_SEMA_HEAPLOG_LOCK],0);
"\n$$LTRED$$Total:%08X$$FG$$\n",total;
LBts(&sys_semas[SYS_SEMA_HEAPLOG_ACTIVE],0);
if (!leave_it)
HeapLog(OFF);
}
public U0 HeapLog(Bool val=TRUE,CTask *task=NULL)
{
I64 i;
if (val) {
if (Bt(&sys_semas[SYS_SEMA_HEAPLOG_ACTIVE],0))
"HeapLog Already Active\n";
else {
if (!task) task=Fs;
if (TaskValidate(task))
heaplog_hc_watched=task->data_heap;
else
heaplog_hc_watched=task;
PUSHFD
CLI
while (LBts(&sys_semas[SYS_SEMA_HEAPLOG_LOCK],0))
PAUSE
heaplog_hc=HeapCtrlInit(,,sys_data_bp);
ext[EXT_HEAPLOG_MALLOC]=&HeapLogMAlloc;
ext[EXT_HEAPLOG_FREE]=&HeapLogFree;
heaplog_root=MAlloc(sizeof(CHeapLogHash)*HEAPLOG_HASH_SIZE,heaplog_hc);
for (i=0;i<HEAPLOG_HASH_SIZE;i++)
QueInit(&heaplog_root[i]);
LBtr(&sys_semas[SYS_SEMA_HEAPLOG_LOCK],0);
POPFD
LBts(&sys_semas[SYS_SEMA_HEAPLOG_ACTIVE],0);
}
} else {
if (!LBtr(&sys_semas[SYS_SEMA_HEAPLOG_ACTIVE],0))
"HeapLog Not Active\n";
else {
HeapCtrlDel(heaplog_hc);
heaplog_root=heaplog_hc=NULL;
ext[EXT_HEAPLOG_MALLOC]=NULL;
ext[EXT_HEAPLOG_FREE]=NULL;
}
}
}
#help_index ""
Adam/Utils/LineRep.CPP
+10 -13
View File
@@ -1,4 +1,4 @@
#help_index "Utils;Cmd Line (Typically)"
#help_index "Cmd Line (Typically)"
I64 LineRep1(CDirEntry *tempde)
{
@@ -6,7 +6,7 @@ I64 LineRep1(CDirEntry *tempde)
I64 result=0,i;
while (tempde) {
i=0;
if (tempde->attr&_ATTR_DIR)
if (tempde->attr&RS_ATTR_DIR)
i=LineRep1(tempde->sub);
else {
doc=DocRead(tempde->full_name);
@@ -23,7 +23,7 @@ I64 LineRep1(CDirEntry *tempde)
U0 LineRep2(CDoc *doc,CDirEntry *tempde)
{
while (tempde) {
if (tempde->attr&_ATTR_DIR) {
if (tempde->attr&RS_ATTR_DIR) {
DocPrint(doc,"%8,d $$TR+C,\"%s\"$$\n$$ID,2$$",tempde->user_data,tempde->name);
LineRep2(doc,tempde->sub);
DocPrint(doc,"$$ID,-2$$");
@@ -34,7 +34,7 @@ U0 LineRep2(CDoc *doc,CDirEntry *tempde)
}
}
public I64 LineRep(U8 *files_find_mask="/*",U8 *fu_flags=NULL)
{
{//Source line-of-code count report.
I64 fuf_flags=0,result=0;
CDoc *doc=DocNew;
CDirEntry *tempde1=NULL;
@@ -45,7 +45,7 @@ public I64 LineRep(U8 *files_find_mask="/*",U8 *fu_flags=NULL)
DocPrint(doc,"%8,d $$TR+C,\"%s\"$$\n$$ID,2$$",result,files_find_mask);
LineRep2(doc,tempde1);
DocPrint(doc,"$$ID,-2$$");
DirLstDel(tempde1);
DirTreeDel(tempde1);
}
DocInsDoc(DocPut,doc);
DocDel(doc);
@@ -58,10 +58,10 @@ I64 SizeRep1(CDirEntry *tempde,I64 *_fuf_flags)
U8 buf[BLK_SIZE];
CPrt *p;
while (tempde) {
if (tempde->attr&_ATTR_DIR)
if (tempde->attr&RS_ATTR_DIR)
i=SizeRep1(tempde->sub,_fuf_flags);
else if ((i=tempde->size) && Bt(_fuf_flags,FUf_EXPAND) &&
FileAttr(tempde->name)&_ATTR_COMPRESSED) {
FileAttr(tempde->name)&RS_ATTR_COMPRESSED) {
p=Drv2Prt(*tempde->full_name);
RBlks(p,buf,Cluster2Blk(p,tempde->cluster),1);
i=(&buf)(CArcCompress *)->expanded_size;
@@ -75,7 +75,7 @@ I64 SizeRep1(CDirEntry *tempde,I64 *_fuf_flags)
U0 SizeRep2(CDoc *doc,CDirEntry *tempde)
{
while (tempde) {
if (tempde->attr&_ATTR_DIR) {
if (tempde->attr&RS_ATTR_DIR) {
DocPrint(doc,"%10,d $$TR+C,\"%s\"$$\n$$ID,2$$",tempde->user_data,tempde->name);
SizeRep2(doc,tempde->sub);
DocPrint(doc,"$$ID,-2$$");
@@ -88,8 +88,7 @@ U0 SizeRep2(CDoc *doc,CDirEntry *tempde)
}
}
public I64 SizeRep(U8 *files_find_mask="/*",U8 *fu_flags=NULL)
{
//"+x" for expanded size.
{//Report file sizes. "+x" for expanded size of compressed files.
I64 fuf_flags=0,result=0;
CDoc *doc=DocNew;
CDirEntry *tempde1=NULL;
@@ -101,11 +100,9 @@ public I64 SizeRep(U8 *files_find_mask="/*",U8 *fu_flags=NULL)
DocPrint(doc,"%10,d $$TR+C,\"%s\"$$\n$$ID,2$$",result,files_find_mask);
SizeRep2(doc,tempde1);
DocPrint(doc,"$$ID,-2$$");
DirLstDel(tempde1);
DirTreeDel(tempde1);
}
DocInsDoc(DocPut,doc);
DocDel(doc);
return result;
}
#help_index ""
Adam/Utils/LinkChk.CPP
+3 -5
View File
@@ -1,4 +1,4 @@
#help_index "Debugging;Utils;Cmd Line (Typically)"
#help_index "Debugging;Cmd Line (Typically)"
I64 LinkChkDoc(CDoc *doc,I64 *_fuf_flags)
{
@@ -44,8 +44,7 @@ I64 LinkChkFile(U8 *filename,I64 *_fuf_flags)
return result;
}
public I64 LinkChk(U8 *files_find_mask="/*",U8 *fu_flags=NULL)
//Checks for broken file links.
{
{//Check documents for broken file links.
I64 fuf_flags=0,result=0;
CDirEntry *tempde,*tempde1;
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r+T+f+F+O");
@@ -55,7 +54,6 @@ public I64 LinkChk(U8 *files_find_mask="/*",U8 *fu_flags=NULL)
result+=LinkChkFile(tempde->full_name,&fuf_flags);
tempde=tempde->next;
}
DirLstDel(tempde1);
DirTreeDel(tempde1);
return result;
}
#help_index ""
Adam/Utils/MemRep.CPP
+28 -31
View File
@@ -1,4 +1,4 @@
#help_index "Info;Utils;Memory/Info;Cmd Line (Typically)"
#help_index "Info;Memory/Info;Cmd Line (Typically)"
I64 TSSSize(CTSS *tss)
{
@@ -13,10 +13,10 @@ I64 PenBrushesSize()
I64 result=0,i;
for (i=0;i<GR_NUM_PEN_BRUSHES;i++)
result+=
DCSize(gr_pen_brushes[i])+
DCSize(gr_collision_pen_brushes[i])+
DCSize(gr_even_pen_brushes[i])+
DCSize(gr_odd_pen_brushes[i] );
DCSize(gr.pen_brushes[i])+
DCSize(gr.collision_pen_brushes[i])+
DCSize(gr.even_pen_brushes[i])+
DCSize(gr.odd_pen_brushes[i] );
return result;
}
@@ -24,7 +24,7 @@ I64 ScreenZoomTablesSize()
{
I64 result=0,i;
for (i=1;i<=GR_MAX_SCREEN_ZOOM;i++)
result+=MSize2(gr_screen_zoom_tables[i]);
result+=MSize2(gr.screen_zoom_tables[i]);
return result;
}
@@ -69,10 +69,10 @@ I64 TaskQueSize(CTask *task)
I64 BlkDevsSize()
{
I64 i,result=MSize2(sys_blkdevs);
I64 i,result=MSize2(dsk.blkdevs);
CBlkDev *bdev;
for (i=0;i<NUM_BLKDEVS;i++) {
bdev=&sys_blkdevs[i];
bdev=&dsk.blkdevs[i];
if (bdev->bd_signature==BD_SIGNATURE_VAL) {
if (bdev->type==BDT_RAM)
"RAMDsk %C\t:%010X Unused:%010X\n",
@@ -86,10 +86,10 @@ I64 BlkDevsSize()
I64 PrtsSize()
{
I64 i,result=MSize2(sys_prts);
I64 i,result=MSize2(dsk.prts);
for (i=0;i<NUM_PRTS;i++)
result+=MSize2(sys_prts[i].buffered_map_dirty_bits)+
MSize2(sys_prts[i].fis);
result+=MSize2(dsk.prts[i].buffered_map_dirty_bits)+
MSize2(dsk.prts[i].fis);
return result;
}
@@ -142,7 +142,7 @@ Bool MemRepTask(CTask *task,Bool override_validate=FALSE)
}
if (task==sys_winmgr_task) {
"gr_pen_brushes\t:%010X\n",PenBrushesSize;
"gr.pen_brushes\t:%010X\n",PenBrushesSize;
"gr_screen_zoom_tbles:%010X\n",ScreenZoomTablesSize;
} else if (task==adam_task) {
j=0;k=0;m=0;n=0;
@@ -173,30 +173,29 @@ Bool MemRepTask(CTask *task,Bool override_validate=FALSE)
"BlkDevs\t:%010X\n",BlkDevsSize;
"Prts\t:%010X\n",PrtsSize;
"Audio\t:%010X\n",CallExtStr("AudioSize");
if (sys_dsk_cache_base)
if (dsk.cache_base)
"DskCache\t:%010X\n",
MSize2(sys_dsk_cache_base)+MSize2(sys_dsk_cache_hash_table)+MSize2(sys_dsk_cache_ctrl);
MSize2(dsk.cache_base)+MSize2(dsk.cache_hash_table)+MSize2(dsk.cache_ctrl);
"WordStat\t:%010X\n",CallExtStr("WordStatSize");
"Clipboard\t:%010X\n",DocSize(sys_clipboard_doc);
"gr_1_to_8_bits\t:%010X\n",MSize2(gr_1_to_8_bits);
"gr_1_to_8_colors\t:%010X\n",MSize2(gr_1_to_8_colors);
"gr_text_base\t:%010X\n",MSize2(gr_text_base);
"gr_vga_text_cache\t:%010X\n",MSize2(gr_vga_text_cache);
"gr_win_z_buf\t:%010X\n",MSize2(gr_win_z_buf)+MSize2(gr_win_uncovered_bitmap);
"gr_dc\t\t:%010X\n",DCSize(gr_dc);
"gr_dc1\t\t:%010X\n",DCSize(gr_dc1);
"gr_dc2\t\t:%010X\n",DCSize(gr_dc2);
"gr_dc_cache\t\t:%010X\n",DCSize(gr_dc_cache);
"gr_screen_image\t:%010X\n",DCSize(gr_screen_image);
"gr_zoomed_dc\t:%010X\n",DCSize(gr_zoomed_dc);
"gr.to_8_bits\t:%010X\n",MSize2(gr.to_8_bits);
"gr.to_8_colors\t:%010X\n",MSize2(gr.to_8_colors);
"gr.text_base\t:%010X\n",MSize2(gr.text_base);
"gr.vga_text_cache\t:%010X\n",MSize2(gr.vga_text_cache);
"gr.win_z_buf\t:%010X\n",MSize2(gr.win_z_buf)+MSize2(gr.win_uncovered_bitmap);
"gr.dc\t\t:%010X\n",DCSize(gr.dc);
"gr.dc1\t\t:%010X\n",DCSize(gr.dc1);
"gr.dc2\t\t:%010X\n",DCSize(gr.dc2);
"gr.dc_cache\t\t:%010X\n",DCSize(gr.dc_cache);
"gr.screen_image\t:%010X\n",DCSize(gr.screen_image);
"gr.zoomed_dc\t:%010X\n",DCSize(gr.zoomed_dc);
}
"$$ID,-2$$";
return TRUE;
}
public U0 MemRep()
{
{//Memory usage report.
I64 i;
CTask *task;
CCPU *c;
@@ -237,10 +236,8 @@ public U0 MemRep()
}
"$$GREEN$$Independent Heaps$$FG$$\n$$ID,2$$";
"$$BLACK$$sys_uncached_heap:%010X Used:%010X $$RED$$Unused:%010X$$FG$$\n",
sys_uncached_heap->bp->size*PAGE_SIZE,sys_uncached_heap->used_u8s,UnusedBPMem(sys_uncached_heap->bp);
"$$BLACK$$dev.uncached_heap:%010X Used:%010X $$RED$$Unused:%010X$$FG$$\n",
dev.uncached_heap->bp->size*PAGE_SIZE,dev.uncached_heap->used_u8s,UnusedBPMem(dev.uncached_heap->bp);
"$$ID,-2$$\n";
Preempt(old_preempt);
}
#help_index ""
Adam/Utils/Merge.CPP
+15 -14
View File
@@ -1,4 +1,4 @@
#help_index "Utils;Cmd Line (Typically)"
#help_index "Cmd Line (Typically)"
CDirEntry MGFind(CDirEntry *needle_entry,CDirEntry *haystack_lst)
{
@@ -12,20 +12,18 @@ CDirEntry MGFind(CDirEntry *needle_entry,CDirEntry *haystack_lst)
U0 Merge2(CDirEntry *tempde1,CDirEntry *tempde2,I64 *_fuf_flags,I64 *_df_flags)
{
I64 i;
CDirEntry *tempde;
while (tempde1 && !(*_df_flags & DF_ABORT_ALL_FILES)) {
tempde=MGFind(tempde1,tempde2);
if (!tempde)
"$$BROWN$$Does Not Exist:%s$$FG$$\n",tempde1->full_name;
else {
if (tempde1->attr & _ATTR_DIR)
if (tempde1->attr & RS_ATTR_DIR)
Merge2(tempde1->sub,tempde->sub,_fuf_flags,_df_flags);
else {
i=tempde1->datetime-tempde->datetime;
if (AbsI64(i)>CDATE_FREQ*2) { //Filedates can shift due to conversion
if (AbsI64(tempde1->datetime-tempde->datetime)>CDATE_FREQ*2) {//Filedates can shift due to conversion
"%s",tempde1->full_name;
NewLine;
'\n';
if (Bt(_fuf_flags,FUf_DIFF)) {
if (FilesFindMatch(tempde1->full_name,FILEMASK_TXT))
Diff(tempde->full_name,tempde1->full_name,_df_flags);
@@ -38,8 +36,13 @@ U0 Merge2(CDirEntry *tempde1,CDirEntry *tempde2,I64 *_fuf_flags,I64 *_df_flags)
}
public U0 Merge(U8 *dst_files_find_mask="/*",U8 *src_files_find_mask="/*",
U8 *fu_flags=NULL)
//"+d"=Do $LK,"Diff",A="MN:Diff"$() on files
{
{/*Merge text files from one list into another.
Report files whos date/time is different.
"+d" will do $LK,"Diff",A="MN:Diff"$() on files and prompt to
merge changes from source files into
destination files.
*/
I64 df_flags=0,fuf_flags=0;
CDirEntry *tempde1=NULL,*tempde2=NULL;
ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+r");
@@ -51,14 +54,14 @@ public U0 Merge(U8 *dst_files_find_mask="/*",U8 *src_files_find_mask="/*",
tempde2=FilesFind(dst_files_find_mask,fuf_flags&FUG_FILES_FIND);
fuf_flags&=FUF_DIFF;
Merge2(tempde1,tempde2,&fuf_flags,&df_flags);
DirLstDel(tempde1);
DirLstDel(tempde2);
DirTreeDel(tempde1);
DirTreeDel(tempde2);
}
#help_index "Utils;Cmd Line (Typically)"
public U0 NewFiles(U8 *files_find_mask="/*",CDate cdt=0,U8 *fu_flags=NULL)
{//List new files
{//Report files newer than a certain date.
I64 fuf_flags=0;
CDirEntry *tempde,*tempde1;
if (!cdt) cdt=sys_compile_time;
@@ -70,7 +73,5 @@ public U0 NewFiles(U8 *files_find_mask="/*",CDate cdt=0,U8 *fu_flags=NULL)
"%s\n",tempde->full_name;
tempde=tempde->next;
}
DirLstDel(tempde1);
DirTreeDel(tempde1);
}
#help_index ""
Adam/Utils/Profiler.CPP
+79 -177
View File
@@ -1,200 +1,102 @@
#help_index "Debugging/Profiler;Utils/Profiler;Profiler"
#help_index "Debugging/Profiler;Profiler;Cmd Line (Typically)/Profiler"
#help_file "::/Doc/Profiler"
#define PF_ARRAY_CNT 0x100000
I64 pf_time_start,pf_time_end;
I64 pf_low=0,pf_high=SYS_KERNEL_END,pf_size=PF_ARRAY_CNT;
I64 pf_jiffy_start,pf_jiffy_end;
I64 *pf_array=NULL;
I64 pf_cpu=0;
U0 (*fp_chained_timer_routine)(CTask *task)=cpu_structs[pf_cpu].timer_irq_chain;
I64 pf_ptr,pf_depth;
#define PFM_OFF 0
#define PFM_BIN 1
#define PFM_ALL 2
I64 prof_mode=PFM_OFF;
F64 pf_t0;
I64 pf_buf_in_ptr=0,pf_depth;
I64 pf_prof_active=0;
U0 ProfTimerInt(CTask *task)
{
I64 i,j=task->rip,k;
nobound_switch (prof_mode) {
case PFM_OFF:
break;
case PFM_BIN:
i=(j-pf_low) * pf_size/(pf_high-pf_low);
if (0<=i<pf_size)
pf_array[i]++;
break;
case PFM_ALL:
for (k=0;k<=pf_depth;k++) {
if (task==Gs->idle_task)
j=SYS_IDLE_PT;
else
j=TaskCaller(task,k,TRUE);
if (pf_ptr<PF_ARRAY_CNT) {
pf_array[pf_ptr++]=j;
if (pf_ptr==PF_ARRAY_CNT)
pf_time_end=sys_jiffies;
}
{//See $LK,"profiler_timer_irq",A="FF:::/Kernel/Ints.CPP,profiler_timer_irq"$.
I64 i,k;
if (Bt(&pf_prof_active,0))
for (k=0;k<=pf_depth;k++) {
if (task==Gs->idle_task)
i=SYS_IDLE_PT;
else
i=TaskCaller(task,k,TRUE);
if (pf_buf_in_ptr<PF_ARRAY_CNT) {
pf_array[pf_buf_in_ptr++]=i;
pf_jiffy_end=cnts.jiffies;
}
break;
}
(*fp_chained_timer_routine)(task);
}
cpu_structs[pf_cpu].timer_irq_chain=&ProfTimerInt;
public U0 ProfBin(U8 *start,I64 cnt=PF_ARRAY_CNT*3)
//Start profiler in bin mode. Profilers
//report where time is spent by checking
//the instruction ptr during the
//timer interrupt. Do a $LK,"ProfRep",A="MN:ProfRep"$(), (profiler report)
//after you have collected data.
{
if (cnt<PF_ARRAY_CNT)
pf_size=cnt;
else
pf_size=PF_ARRAY_CNT;
pf_low=start;
pf_high=start+cnt;
if (!pf_array)
pf_array=AMAlloc(sizeof(I64)*PF_ARRAY_CNT);
MemSet(pf_array,0,PF_ARRAY_CNT*sizeof(I64));
pf_time_end=0;
pf_time_start=sys_jiffies;
prof_mode=PFM_BIN;
pf_t0=tS;
}
}
public U0 ProfCPUSet(I64 num)
{
if (num>=mp_cnt)
public U0 Prof(I64 depth=0,I64 cpu_num=0)
{/*Start collecting profiler statistics.
Profilers report where time is spent
by sampling RIP during the $TX,"1000 Hz",D="DD_JIFFY_HZ"$
timer interrupt.
Do a $LK,"ProfRep",A="MN:ProfRep"$(), (profiler report)
after you have collected data.
*/
if (!(0<=cpu_num<mp_cnt))
ST_ERR_ST "Invalid CPU\n";
else if (cpu_structs[pf_cpu].timer_irq_chain!=&ProfTimerInt)
ST_ERR_ST "Unchaining not implemented!\n";
else {
cpu_structs[pf_cpu].timer_irq_chain=fp_chained_timer_routine;
pf_cpu=num;
fp_chained_timer_routine=cpu_structs[pf_cpu].timer_irq_chain;
cpu_structs[pf_cpu].timer_irq_chain=&ProfTimerInt;
cpu_structs[pf_cpu].profiler_timer_irq=NULL;
pf_cpu=cpu_num;
pf_depth=depth;
pf_buf_in_ptr=0;
if (!pf_array)
pf_array=AMAlloc(sizeof(I64)*PF_ARRAY_CNT);
pf_jiffy_end=pf_jiffy_start=cnts.jiffies;
LBts(&pf_prof_active,0);
cpu_structs[pf_cpu].profiler_timer_irq=&ProfTimerInt;
}
}
public U0 ProfAll(I64 depth=0)
//Start profiler in record-all mode. Profilers
//report where time is spent by checking
//the instruction ptr during the
//timer interrupt. Do a $LK,"ProfRep",A="MN:ProfRep"$(), (profiler report)
//after you have collected data.
I64 ProfCompare(U8 *i1,U8 *i2)
{
pf_depth=depth;
pf_ptr=0;
if (!pf_array)
pf_array=AMAlloc(sizeof(I64)*PF_ARRAY_CNT);
pf_time_end=0;
pf_time_start=sys_jiffies;
prof_mode=PFM_ALL;
pf_t0=tS;
return i1-i2;
}
I64 PFACompare(U8 *i1,U8 *i2)
{
if (i1<i2)
return -1;
else if (i1>i2)
return 1;
else
return 0;
}
public U0 ProfRep(I64 filter_cnt=1,Bool leave_it=OFF)
{//Profiler report. Call $LK,"Prof",A="MN:Prof"$() first and collect data.
I64 i,hits,ip,last_ip=0,routine_total=0;
F64 total_time;
U8 buf[256],buf2[256],last_buf[256];
if (!LBtr(&pf_prof_active,0))
"Profiler Not Active\n";
if (!pf_buf_in_ptr)
"No Profiler Statistic\n";
else {
if (!(total_time=pf_jiffy_end-pf_jiffy_start))
total_time=1;
QSortI64(pf_array,pf_buf_in_ptr,&ProfCompare);
*last_buf=0;
for (i=0;i<pf_buf_in_ptr;i+=hits) {
ip=pf_array[i];
hits=0;
do hits++;
while (i+hits<pf_buf_in_ptr && pf_array[i+hits]==ip);
public U0 ProfRep(I64 filter_cnt=1)
{
F64 pf_tf=tS;
I64 i,ip,last_ip=pf_low,hits,
total_time,routine_total=0,old_mode=prof_mode;
U8 buf[128],buf2[128],buf3[128],last_buf[128];
prof_mode=PFM_OFF;
if (pf_time_end)
total_time=pf_time_end-pf_time_start;
else
total_time=sys_jiffies-pf_time_start;
if (!total_time) total_time=1;
switch (old_mode) {
case PFM_BIN:
*last_buf=0;
for (i=0;i<pf_size;i++) {
ip=pf_low+i*(pf_high-pf_low)/pf_size;
SPrint(buf,"%p",ip);
StrCpy(buf3,buf);
StrFirstRem(buf3,"+",buf2);
if (StrCmp(buf2,last_buf)) {
if (*last_buf && routine_total>=filter_cnt) {
"$$GREEN$$%3d.%02d%% %08X:",routine_total*100/total_time,
routine_total*10000/total_time%100,routine_total;
"%s\n$$FG$$",last_buf;
}
StrCpy(last_buf,buf2);
routine_total=0;
}
hits=pf_array[i];
routine_total+=hits;
if (hits>=filter_cnt) {
"%3d.%02d%% %08X:",hits*100/total_time,
hits*10000/total_time%100,hits;
if (!PutSrcLink(ip,ip-last_ip))
"%s\n",buf;
else
NewLine;
last_ip=ip;
}
StrPrint(buf,"%p",ip);
StrFirstRem(buf,"+",buf2);
if (StrCmp(buf2,last_buf)) {
if (*last_buf && routine_total>=filter_cnt)
"$$GREEN$$%6.2f %08X:%s\n$$FG$$",100*routine_total/total_time,
routine_total,last_buf;
StrCpy(last_buf,buf2);
routine_total=0;
}
if (*last_buf && routine_total>=filter_cnt) {
"$$GREEN$$%3d.%02d%% %08X:",routine_total*100/total_time,
routine_total*10000/total_time%100,routine_total;
"%s\n$$FG$$",last_buf;
routine_total+=hits;
if (hits>=filter_cnt) {
"%6.2f %08X:%P\n",100*hits/total_time,hits,ip;
last_ip=ip;
}
break;
case PFM_ALL:
QSortI64(pf_array,pf_ptr,&PFACompare);
*last_buf=0;
for (i=0;i<pf_ptr;i++) {
ip=pf_array[i];
hits=0;
while (pf_array[i]==ip) {
hits++;
i++;
if (i>=pf_ptr) break;
}
SPrint(buf,"%p",ip);
StrCpy(buf3,buf);
StrFirstRem(buf3,"+",buf2);
if (StrCmp(buf2,last_buf)) {
if (*last_buf && routine_total>=filter_cnt) {
"$$GREEN$$%3d.%02d%% %08X:",routine_total*100/total_time,
routine_total*10000/total_time%100,routine_total;
"%s\n$$FG$$",last_buf;
}
StrCpy(last_buf,buf2);
routine_total=0;
}
routine_total+=hits;
if (hits>=filter_cnt) {
"%3d.%02d%% %08X:",hits*100/total_time,
hits*10000/total_time%100,hits;
if (!PutSrcLink(ip,ip-last_ip))
"%s\n",buf;
else
NewLine;
last_ip=ip;
}
}
if (*last_buf && routine_total>=filter_cnt) {
"$$GREEN$$%3d.%02d%% %08X:",routine_total*100/total_time,
routine_total*10000/total_time%100,routine_total;
"%s\n$$FG$$",last_buf;
}
break;
}
if (*last_buf && routine_total>=filter_cnt)
"$$GREEN$$%6.2f %08X:%s\n$$FG$$",100*routine_total/total_time,
routine_total,last_buf;
"Total Time:%0.6fs\n",total_time/JIFFY_FREQ;
if (leave_it) {
cpu_structs[pf_cpu].profiler_timer_irq=&ProfTimerInt;
LBts(&pf_prof_active,0);
} else
cpu_structs[pf_cpu].profiler_timer_irq=NULL;
}
"Total Time:%12.6fs\n",pf_tf-pf_t0;
}
#help_index ""
Adam/Utils/S2T.CPP
+3 -6
View File
@@ -1,4 +1,4 @@
#help_index "Utils;Cmd Line (Typically)"
#help_index "Cmd Line (Typically)"
//$LK,"StrUtil",A="MN:StrUtil"$() operations on files
@@ -43,14 +43,11 @@ public U0 SU(U8 *files_find_mask,I64 suf_flags,U8 *fu_flags=NULL,F64 indent_scal
SUFile(tempde->full_name,suf_flags,indent_scale_factor);
tempde=tempde->next;
}
DirLstDel(tempde1);
DirTreeDel(tempde1);
}
public U0 S2T(U8 *files_find_mask,U8 *fu_flags=NULL)
{
//Spaces to tabs.
{//Spaces to tabs.
//Use "Hard Space" (SHIFT-SPACE) for spaces
//in string consts in your code.
SU(files_find_mask,SUF_S2T|SUF_REM_TRAILING,fu_flags);
}
#help_index ""
Adam/Utils/ToHtml.CPP
+55 -51
View File
@@ -1,17 +1,23 @@
#help_index "Doc/Cvt"
#help_index "DolDoc/Conversion"
//See $LK,"::/Doc/Acknowledgements.TXT"$.
U0 HtmlPutS(CDoc *doc,I64 c,I64 *_old_c,U8 *st,I64 *_col,U8 *style_bitmap=NULL)
U0 HtmlPutS(CDoc *doc,I64 u32_attr,I64 *_old_u32_attr,U8 *st,I64 *_col,U8 *style_bitmap=NULL)
{
U8 *ch,*ptr;
if (c!=*_old_c) {
if (*_old_c!=-1)
if (u32_attr&DOCET_INVERT)
u32_attr.u8[1]=(u32_attr.u8[1]&15)<<4|u32_attr.u8[1]>>4;
if (u32_attr!=*_old_u32_attr) {
if (!(u32_attr&DOCET_BLINK) && *_old_u32_attr&DOCET_BLINK)
DocPrint(doc,"</blink>");
if (*_old_u32_attr!=-1)
DocPrint(doc,"</span>");
DocPrint(doc,"<span class=c%02X>",c);
*_old_c=c;
DocPrint(doc,"<span class=c%02X>",u32_attr.u8[1]);
if (u32_attr&DOCET_BLINK && !(*_old_u32_attr&DOCET_BLINK))
DocPrint(doc,"<blink>");
*_old_u32_attr=u32_attr;
if (style_bitmap)
LBts(style_bitmap,c);
LBts(style_bitmap,u32_attr.u8[1]);
}
while (ch=*st++) {
switch (ch) {
@@ -56,13 +62,13 @@ U0 HtmlPutS(CDoc *doc,I64 c,I64 *_old_c,U8 *st,I64 *_col,U8 *style_bitmap=NULL)
}
U8 *TSLinkCvt2(U8 *filename,I64 line_num)
{ // ::/ --> http://www.templeos.org/Wb/
// Make your own LinkCvt routine
{// ::/ --> http://www.templeos.org/Wb/
//Make your own LinkCvt routine
U8 *result=NULL,*st;
if (filename) {
st=ChgExt(filename,"html");
if (st && StrLen(st)>3 && !StrNCmp(st+1,":/",2))
result=MPrint("http://www.templeos.org/Wb/%s#l%d",st+3,line_num);
result=MStrPrint("http://www.templeos.org/Wb/%s#l%d",st+3,line_num);
Free(st);
}
return result;
@@ -84,6 +90,10 @@ U8 *TSLinkCvt1(U8 *link_st)
case -1:
case LK_DEF:
case LK_HELP_INDEX:
case LK_DOC:
case LK_DOC_ANCHOR:
case LK_DOC_FIND:
case LK_DOC_LINE:
break;
case LK_BIBLE_FIND:
while (LBts(&locks,0))
@@ -108,15 +118,15 @@ public CDoc *Doc2Html(CDoc *doc_in,
U8 *html_header=NULL,
U8 *body_header=NULL,U8 *body_footer=NULL,Bool line_anchors=TRUE,
U8 (*link_cvt)(U8 *link_st)=&TSLinkCvt1)
{
{//Cvt $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.TXT"$ doc to HTML file.
CDocEntry *doc_e,*style,*doc_e2;
I64 i,y,old_y=MIN_I64,cur_u8_attr,col,old_c=-1,old_attr;
I64 i,y,old_y=MIN_I64,col,_old_u32_attr=-1,old_attr;
U32 *hl,*src;
U8 *st,st_2[2],*link_st,*style_bitmap=CAlloc(256/8);
CBGR p[16];
GetVGAPalette4(p);
CDoc *doc_out=DocNew;
Bool unlock_doc_in=DocLock(doc_in),no_backward;
Bool unlock_doc_in=DocLock(doc_in),no_bwd;
old_attr=doc_in->win_task->text_attr;
doc_in->win_task->text_attr=DOC_ATTR_DFT_TEXT;
@@ -150,38 +160,36 @@ public CDoc *Doc2Html(CDoc *doc_in,
doc_e=doc_in->root.next;
col=doc_e->x;
y=doc_e->y;
cur_u8_attr=doc_e->type.u8[1];
while (doc_e!=doc_in) {
if (!(doc_e->flags1&(DOCEF1_SKIP|DOCEF1_HARD_SKIP))) {
if (!(doc_e->de_flags&(DOCEF_SKIP|DOCEF_HARD_SKIP))) {
if (line_anchors && y!=old_y) {
DocPrint(doc_out,"<a name=\"l%d\"></a>",y+1);
old_y=y;
}
while (y<doc_e->y) {
HtmlPutS(doc_out,cur_u8_attr,&old_c,"\n",&col,style_bitmap);
y++;
if (line_anchors && y!=old_y) {
HtmlPutS(doc_out,doc_e->settings.final_u32_attr,&_old_u32_attr,"\n",&col,style_bitmap);
if (line_anchors && ++y!=old_y) {
DocPrint(doc_out,"<a name=\"l%d\"></a>",y+1);
old_y=y;
}
col=0;
}
no_backward=TRUE;
no_bwd=TRUE;
doc_e2=doc_e->next;
while (doc_e2!=doc_in && doc_e2->y==doc_e->y) {
if (doc_e2->x<doc_e->x) {
no_backward=FALSE;
no_bwd=FALSE;
break;
}
doc_e2=doc_e2->next;
}
if (no_backward)
if (no_bwd)
while (col<doc_e->x)
HtmlPutS(doc_out,cur_u8_attr,&old_c," ",&col,style_bitmap);
HtmlPutS(doc_out,doc_e->settings.final_u32_attr,&_old_u32_attr," ",&col,style_bitmap);
link_st=NULL;
if (doc_e->flags1&DOCEF1_HTML_LINK)
if (doc_e->de_flags&DOCEF_HTML_LINK)
link_st=StrNew(doc_e->html_link);
else if (st=DocEntryLink(doc_in,doc_e)) {
link_st=link_cvt(st);
@@ -189,53 +197,51 @@ public CDoc *Doc2Html(CDoc *doc_in,
}
if (link_st) {
if (old_c!=-1) {
if (_old_u32_attr!=-1) {
DocPrint(doc_out,"</span>");
old_c=-1;
_old_u32_attr=-1;
}
DocPrint(doc_out,"<a href=\"%s\">",link_st);
}
cur_u8_attr=doc_e->type.u8[1];
switch (doc_e->type_u8) {
case DOCT_TEXT:
if (doc_e->flags1&DOCEF1_HIGHLIGHT) {
if (doc_e->de_flags&DOCEF_HIGHLIGHT) {
if (doc_e->last==doc_in)
MemCpy(&doc_e->settings,&doc_in->settings_root,sizeof(CDocSettings));
else
MemCpy(&doc_e->settings,&doc_e->last->settings,sizeof(CDocSettings));
src=hl=DocHighlight(doc_e,doc_e->tag,StrLen(doc_e->tag),cur_u8_attr<<8);
src=hl=DocHighlight(doc_e,doc_e->tag,StrLen(doc_e->tag),doc_e->type&0xFF00);
while (*src) {
st_2[0]=*src&0xFF;
HtmlPutS(doc_out,*src>>8,&old_c,st_2,&col,style_bitmap);
src++;
HtmlPutS(doc_out,*src++,&_old_u32_attr,st_2,&col,style_bitmap);
}
Free(hl);
} else
HtmlPutS(doc_out,cur_u8_attr,&old_c,doc_e->tag,&col,style_bitmap);
HtmlPutS(doc_out,doc_e->settings.final_u32_attr,&_old_u32_attr,doc_e->tag,&col,style_bitmap);
break;
case DOCT_TAB:
HtmlPutS(doc_out,cur_u8_attr,&old_c,"\t",&col,style_bitmap);
HtmlPutS(doc_out,doc_e->settings.final_u32_attr,&_old_u32_attr,"\t",&col,style_bitmap);
break;
case DOCT_HTML_CODE:
if (old_c!=-1) {
if (_old_u32_attr!=-1) {
DocPrint(doc_out,"</span>");
old_c=-1;
_old_u32_attr=-1;
}
DocPrint(doc_out,"%s",doc_e->tag);
break;
case DOCT_SPRITE:
HtmlPutS(doc_out,cur_u8_attr,&old_c,doc_e->tag,&col,style_bitmap);
HtmlPutS(doc_out,DOC_COLOR_COMMENT+old_c&0xF0,&old_c,"/* Graphics Not Rendered in HTML */",&col,style_bitmap);
HtmlPutS(doc_out,doc_e->settings.final_u32_attr,&_old_u32_attr,doc_e->tag,&col,style_bitmap);
HtmlPutS(doc_out,doc_e->settings.final_u32_attr,&_old_u32_attr,"/* Graphics Not Rendered in HTML */",&col,style_bitmap);
break;
default:
if (doc_e->flags1&DOCEF1_TAG)
HtmlPutS(doc_out,cur_u8_attr,&old_c,doc_e->tag,&col,style_bitmap);
if (doc_e->de_flags&DOCEF_TAG)
HtmlPutS(doc_out,doc_e->settings.final_u32_attr,&_old_u32_attr,doc_e->tag,&col,style_bitmap);
}
if (link_st) {
if (old_c!=-1) {
if (_old_u32_attr!=-1) {
DocPrint(doc_out,"</span>");
old_c=-1;
_old_u32_attr=-1;
}
DocPrint(doc_out,"</a>");
Free(link_st);
@@ -243,14 +249,15 @@ public CDoc *Doc2Html(CDoc *doc_in,
}
doc_e=doc_e->next;
}
while (y<doc_e->y) {
HtmlPutS(doc_out,cur_u8_attr,&old_c,"\n",&col,style_bitmap);
y++;
while (y++<doc_e->y) {
HtmlPutS(doc_out,doc_e->settings.final_u32_attr,&_old_u32_attr,"\n",&col,style_bitmap);
col=0;
}
if (old_c!=-1) {
if (_old_u32_attr!=-1) {
if (_old_u32_attr&DOCET_BLINK)
DocPrint(doc_out,"</blink>");
DocPrint(doc_out,"</span>");
old_c=-1;
_old_u32_attr=-1;
}
DocPrint(doc_out,"%s",body_footer);
DocPrint(doc_out,"</pre></body>\n</html>\n");
@@ -269,18 +276,17 @@ public CDoc *Doc2Html(CDoc *doc_in,
return doc_out;
}
#help_index "Utils;Cmd Line (Typically);Doc/Cvt;Doc/Cmd Line (Typically)"
#help_index "Cmd Line (Typically);DolDoc/Conversion;DolDoc/Cmd Line (Typically)"
public U0 ToHtml(U8 *_in_name,U8 *_out_name=NULL,U8 *html_header=NULL,
U8 *body_header=NULL,U8 *body_footer=NULL,I64 width=80,
Bool line_anchors=TRUE,U8 (*link_cvt)(U8 *link_st)=&TSLinkCvt1)
{//Convert $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.TXT"$ file to HTML.
//Supply your own link_cvt routine.
{
U8 *in_name,*out_name;
CDoc *doc_in,*doc_out;
SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
SetWinHorz(0,width-1); //This sets doc width for word wrap
SetWinHorz(0,width-1); //Sets doc width for word wrap.
in_name=DftExt(_in_name,"CPP.Z"),
if (_out_name)
@@ -300,5 +306,3 @@ public U0 ToHtml(U8 *_in_name,U8 *_out_name=NULL,U8 *html_header=NULL,
Free(in_name);
Free(out_name);
}
#help_index ""
Adam/Utils/ToTXT.CPP
+11 -14
View File
@@ -1,4 +1,4 @@
#help_index "Doc/Cvt"
#help_index "DolDoc/Conversion"
U0 TXTPutS(CDoc *doc,U8 *st,I64 *_col)
{
@@ -36,11 +36,11 @@ U0 TXTPutS(CDoc *doc,U8 *st,I64 *_col)
}
public CDoc *Doc2TXT(CDoc *doc_in)
{
{//Cvt $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.TXT"$ doc to plain text.
CDocEntry *doc_e,*doc_e2;
I64 y,col;
CDoc *doc_out=DocNew;
Bool unlock_doc_in=DocLock(doc_in),no_backward;
Bool unlock_doc_in=DocLock(doc_in),no_bwd;
DocRecalc(doc_in);
@@ -50,23 +50,23 @@ public CDoc *Doc2TXT(CDoc *doc_in)
col=doc_e->x;
y=doc_e->y;
while (doc_e!=doc_in) {
if (!(doc_e->flags1&(DOCEF1_SKIP|DOCEF1_HARD_SKIP))) {
if (!(doc_e->de_flags&(DOCEF_SKIP|DOCEF_HARD_SKIP))) {
while (y<doc_e->y) {
TXTPutS(doc_out,"\n",&col);
y++;
col=0;
}
no_backward=TRUE;
no_bwd=TRUE;
doc_e2=doc_e->next;
while (doc_e2!=doc_in && doc_e2->y==doc_e->y) {
if (doc_e2->x<doc_e->x) {
no_backward=FALSE;
no_bwd=FALSE;
break;
}
doc_e2=doc_e2->next;
}
if (no_backward)
if (no_bwd)
while (col<doc_e->x)
TXTPutS(doc_out," ",&col);
@@ -82,7 +82,7 @@ public CDoc *Doc2TXT(CDoc *doc_in)
case DOCT_SPRITE:
break;
default:
if (doc_e->flags1&DOCEF1_TAG)
if (doc_e->de_flags&DOCEF_TAG)
TXTPutS(doc_out,doc_e->tag,&col);
}
}
@@ -101,15 +101,14 @@ public CDoc *Doc2TXT(CDoc *doc_in)
return doc_out;
}
#help_index "Utils;Cmd Line (Typically);Doc/Cvt;Doc/Cmd Line (Typically)"
#help_index "Cmd Line (Typically);DolDoc/Conversion;DolDoc/Cmd Line (Typically)"
public U0 ToTXT(U8 *_in_name,U8 *_out_name=NULL,I64 width=70)
{
{//Convert $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.TXT"$ file to plain text.
U8 *in_name,*out_name;
CDoc *doc_in,*doc_out;
SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
SetWinHorz(0,width-1); //This sets doc width for word wrap
SetWinHorz(0,width-1); //Sets doc width for word wrap.
in_name=DftExt(_in_name,"TXT.Z"),
if (_out_name)
@@ -129,5 +128,3 @@ public U0 ToTXT(U8 *_in_name,U8 *_out_name=NULL,I64 width=70)
Free(in_name);
Free(out_name);
}
#help_index ""
Adam/Utils2a.CPP
+60 -71
View File
@@ -1,6 +1,6 @@
#help_index "Memory"
#help_index "Memory/Blk Pool"
public I64 UnusedBPMem(CBlkPool *bp)
{
{//Count of unused bytes in bp.
I64 result=0,i;
CMemBlk *tempm;
@@ -42,13 +42,54 @@ public I64 UnusedBPMem(CBlkPool *bp)
return result*PAGE_SIZE;
}
public I64 UnusedSysMem()
#help_index "Memory/Heap Ctrl"
I64 MemBlkLstSize(CHeapCtrl *hc)
{
return UnusedBPMem(sys_code_bp);
CMemBlk *m;
I64 result=0;
m=hc->next_mem_blk;
while (m!=&hc->next_mem_blk) {
result+=sizeof(CMemBlk);
m=m->next;
}
return result;
}
public I64 UnusedHCMem(CHeapCtrl *hc)
{//Unused bytes alloced to a heap ctrl.
I64 result,i;
CMemUnusedAllocated *u;
if (!hc) return 0;
result=UnusedBPMem(hc->bp);
PUSHFD
CLI
while (LBts(&hc->locked_flags,HClf_LOCKED))
PAUSE
for (i=0;i<HEAP_HASH_SIZE>>3;i++) {
u=hc->heap_hash[i];
while (u) {
result+=u->size;
u=u->next;
}
}
u=hc->malloc_free_lst;
while (u) {
result+=u->size;
u=u->next;
}
LBtr(&hc->locked_flags,HClf_LOCKED);
POPFD
return result;
}
#help_index "Memory/Task"
public I64 TaskAllocatedMem(CTask *task=NULL,Bool override_validate=FALSE)
{
{//Count of bytes alloced to a task, used+unused.
CMemBlk *m,*m1;
I64 result=0;
@@ -90,20 +131,8 @@ public I64 TaskAllocatedMem(CTask *task=NULL,Bool override_validate=FALSE)
return result;
}
I64 MemBlkLstSize(CHeapCtrl *hc)
{
CMemBlk *m;
I64 result=0;
m=hc->next_mem_blk;
while (m!=&hc->next_mem_blk) {
result+=sizeof(CMemBlk);
m=m->next;
}
return result;
}
public I64 TaskUnusedAllocatedMem(CTask *task=NULL,Bool override_validate=FALSE)
{
{//Count of bytes alloced to a task but unused.
I64 result=0,i;
CMemUnusedAllocated *uum;
if (!task) task=Fs;
@@ -155,7 +184,7 @@ public I64 TaskUnusedAllocatedMem(CTask *task=NULL,Bool override_validate=FALSE)
}
public I64 TaskUsedMem(CTask *task=NULL,Bool override_validate=FALSE)
{
{//Count of bytes alloced to a task and in use.
I64 result=0;
if (!task) task=Fs;
if (!override_validate && !TaskValidate(task)) return 0;
@@ -165,43 +194,8 @@ public I64 TaskUsedMem(CTask *task=NULL,Bool override_validate=FALSE)
return result;
}
#help_index "Memory/Heap Ctrl"
public I64 UnusedHCMem(CHeapCtrl *hc)
{
I64 result,i;
CMemUnusedAllocated *u;
if (!hc) return 0;
result=UnusedBPMem(hc->bp);
PUSHFD
CLI
while (LBts(&hc->locked_flags,HClf_LOCKED))
PAUSE
for (i=0;i<HEAP_HASH_SIZE>>3;i++) {
u=hc->heap_hash[i];
while (u) {
result+=u->size;
u=u->next;
}
}
u=hc->malloc_free_lst;
while (u) {
result+=u->size;
u=u->next;
}
LBtr(&hc->locked_flags,HClf_LOCKED);
POPFD
return result;
}
#help_index "Info;Memory/Info;Debugging/Heap"
public Bool HeapRep(CTask *task)
{
{//Report status of task's heap.
I64 i,cnt;
CMemUnusedAllocated *uum;
@@ -236,7 +230,7 @@ public Bool HeapRep(CTask *task)
if (cnt)
"%03X:%08X\n",i<<3,cnt;
}
NewLine;
'\n';
uum=task->code_heap->malloc_free_lst;
while (uum) {
@@ -256,13 +250,12 @@ public Bool HeapRep(CTask *task)
LBtr(&task->code_heap->locked_flags,HClf_LOCKED);
POPFD
NewLine;
'\n';
}
#help_index "Memory;Debugging/Heap"
#help_index "Memory/Task;Debugging/Heap"
public Bool IsInHeap(U8 *a,CTask *task=NULL,Bool lock=TRUE)
{
{//Check addr if on heap.
CMemBlk *m;
if (!task) task=Fs;
@@ -312,7 +305,7 @@ public Bool IsInHeap(U8 *a,CTask *task=NULL,Bool lock=TRUE)
}
public Bool HeapWalk(CTask *task=NULL)
{
{//Check integrity of task's heap.
I64 i;
CMemUnusedAllocated *uum;
Bool result=TRUE;
@@ -389,18 +382,16 @@ public Bool HeapWalk(CTask *task=NULL)
}
#help_index "Info;Task"
U0 TaskRepTask(CTask *task,I64 indent)
{
CTask *task1;
U8 *st,*desc=MStrUtil(task->task_title,SUF_SAFE_DOLLAR);
st=MPrint("$$MA,T=\"%08X\",LM=\"Kill(0x%X);\n\",$$",task,task,task);
Spaces(indent);
"%s $$TX,\"%Q...\",SCX=16$$ Mem:%08X\n",
st=MStrPrint("$$MA,T=\"%08X\",LM=\"Kill(0x%X);\n\",$$",task,task,task);
"%h*c%s $$TX,\"%Q...\",SCX=16$$ Mem:%08X\n",indent,CH_SPACE,
st,desc,TaskAllocatedMem(task);
Spaces(indent+2);
"Flags:%04X:%04X\n",task->task_flags,task->display_flags;
"Time:%9.2fm\n",task->total_time/60.0/time_stamp_freq_initial;
"%h*cFlags:%04X:%04X Time:%0.2fm\n",indent+2,CH_SPACE,
task->task_flags,task->display_flags,
task->total_time/60.0/cnts.time_stamp_freq_initial;
Free(st);
Free(desc);
task1=task->next_child_task;
@@ -411,7 +402,7 @@ U0 TaskRepTask(CTask *task,I64 indent)
}
public U0 TaskRep()
{
{//Report current tasks on all cores.
I64 i;
CCPU *c;
PUSHFD
@@ -423,5 +414,3 @@ public U0 TaskRep()
}
POPFD
}
#help_index ""
Adam/WallPaper.CPP
BIN
View File
Binary file not shown.
Adam/Win2a.CPP
+66 -92
View File
@@ -1,32 +1,13 @@
#help_index "Windows"
I64 old_ipx=-1000,old_ipy=-1000,old_ipz=0;
I64 old_ipx_presnap=-1000,old_ipy_presnap=-1000,old_ipz_presnap=0;
Bool old_ip_lb=FALSE,old_ip_rb=FALSE;
F64 left_ip_dbl_time=0;
Bool left_dbl=FALSE,left_down_sent=FALSE;
F64 right_ip_dbl_time=0;
Bool right_dbl=FALSE,right_down_sent=FALSE;
public F64 dbl_click_time=0.350;
CIPStateGlbls old_ip={IP_NULL,{-1000,-1000,0},{-1000,-1000,0},{-1000,-1000,0},
{0,0,0},{1.0,1.0,1.0},
0,(MAX_I32+1)>>3,0.0,GetTSC,0.350,0,0,
FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE};
public I64 win_updates=0;
Bool win_first_after_startup_complete=FALSE;
F64 refresh_ode_time=0,last_refresh_ode_time=0;
//These are not hardware rates. They
//are the rate the video mem is updated.
public F64
win_min_refresh=15,
win_desired_refresh =win_min_refresh, //This is dynamically adjusted
win_actual_refresh =win_min_refresh;
F64 WinMaxRefresh()
{
if (sys_focus_task && TaskValidate(sys_focus_task))
return sys_focus_task->win_max_refresh;
else
return WIN_DFT_MAX_REFRESH;
}
public CWinMgrGlbls winmgr={0,0,0,15,15,NULL,NULL,FALSE,FALSE,FALSE,FALSE};
winmgr.t=CAlloc(sizeof(CWinMgrTimingGlbls));
winmgr.t->last_refresh_time=tS;
#define PROGRESS_BAR_HEIGHT 20
#define PROGRESS_BAR_WIDTH (3*GR_WIDTH/4)
@@ -69,7 +50,7 @@ U0 DrawProgressBars(CDC *dc)
if (*sys_progresses[i].desc)
st=StrNew(sys_progresses[i].desc);
else
st=MPrint("%d/%d",n,m);
st=MStrPrint("%d/%d",n,m);
GrPrint(dc,(GR_WIDTH-FONT_WIDTH*StrLen(st))/2,
(GR_HEIGHT-FONT_HEIGHT-
(NUM_PROGRESS_BARS*2-2-i*4)*PROGRESS_BAR_HEIGHT)/2,"%s",st);
@@ -91,16 +72,16 @@ U0 DrawWinGrid(CDC *dc)
U0 WinGrid(Bool val)
{
CGrid last_grid;
MemCpy(&last_grid,&ip_grid,sizeof(CGrid));
CGridGlbls last_grid;
MemCpy(&last_grid,&ip_grid,sizeof(CGridGlbls));
if (!val || PopUpForm(&ip_grid)) {
if (!val)
GridInit;
mxx_prescale*=last_grid.x_speed/ip_grid.x_speed;
myy_prescale*=last_grid.y_speed/ip_grid.y_speed;
mzz_prescale*=last_grid.z_speed/ip_grid.z_speed;
mouse.prescale.x*=last_grid.x_speed/ip_grid.x_speed;
mouse.prescale.y*=last_grid.y_speed/ip_grid.y_speed;
mouse.prescale.z*=last_grid.z_speed/ip_grid.z_speed;
} else
MemCpy(&ip_grid,&last_grid,sizeof(CGrid));
MemCpy(&ip_grid,&last_grid,sizeof(CGridGlbls));
}
U0 CtrlAltG(I64 sc)
{
@@ -135,7 +116,7 @@ U0 ExtendedASCII()
i=PopUpMenu(doc);
DocDel(doc);
if (i>=0)
PostMsg(ext_ASCII_task,MSG_KEY_DOWN_UP,i,A2ScanCode(i));
PostMsg(ext_ASCII_task,MSG_KEY_DOWN_UP,i,Char2ScanCode(i));
}
U0 CtrlAltA(I64)
@@ -145,10 +126,8 @@ U0 CtrlAltA(I64)
}
SetCtrlAltLetCB('A',&CtrlAltA,"Sys/Extended ASCII");
Bool win_grab_scroll=FALSE,win_grab_scroll_closed=FALSE;
public U0 WinScrollNull(CTask *task,CD3I64 *s)
{
{//If panning a window has been done, restore to zero.
s->x=task->scroll_x;
s->y=task->scroll_y;
s->z=task->scroll_z;
@@ -158,7 +137,7 @@ public U0 WinScrollNull(CTask *task,CD3I64 *s)
}
public U0 WinScrollRestore(CTask *task,CD3I64 *s)
{
{//Set window pan value to stored value.
task->scroll_x=s->x;
task->scroll_y=s->y;
task->scroll_z=s->z;
@@ -169,75 +148,74 @@ U0 DrawInputPtr(CDC *dc)
I64 x,y;
PUSHFD
CLI
x=ipx;
y=ipy;
x=ip.pos.x;
y=ip.pos.y;
POPFD
if (ip_on && ip_dev!=IP_NULL) {
if (text_mode)
gr_text_base[iptx+ipty*TEXT_COLS]^=0x7F00;
if (ip.show && ip.dev!=IP_NULL) {
if (!sys_bios_gr_mode) //if text mode
gr.text_base[ip.pos_text.x+ip.pos_text.y*TEXT_COLS]^=0x7F00;
else {
if (fp_draw_input_ptr) {
if (ip_lb)
dc->color=ROP_XOR+LTPURPLE^COLOR_TRANSPARENT;
else if (ip_rb)
dc->color=ROP_XOR+LTCYAN^COLOR_TRANSPARENT;
if (gr.fp_draw_input_ptr) {
if (ip.lb)
dc->color=ROP_XOR+LTPURPLE^TRANSPARENT;
else if (ip.rb)
dc->color=ROP_XOR+LTCYAN^TRANSPARENT;
else
dc->color=ROP_XOR+BLACK^COLOR_TRANSPARENT;
if (win_grab_scroll && fp_draw_grab_input_ptr)
(*fp_draw_grab_input_ptr)(dc,x,y,win_grab_scroll_closed);
dc->color=ROP_XOR+BLACK^TRANSPARENT;
if (winmgr.grab_scroll && gr.fp_draw_grab_input_ptr)
(*gr.fp_draw_grab_input_ptr)(dc,x,y,winmgr.grab_scroll_closed);
else
(*fp_draw_input_ptr)(dc,x,y);
(*gr.fp_draw_input_ptr)(dc,x,y);
}
}
}
}
Bool win_show_menu=FALSE;
U0 WinFinalUpdate(CDC *dc)
{
if (ip_grid.show)
DrawWinGrid(dc);
DrawProgressBars(dc);
if (win_show_menu)
if (winmgr.show_menu)
DrawMenu(dc);
else
sys_cur_submenu_entry=NULL;
DrawInputPtr(dc);
}
fp_final_screen_update=&WinFinalUpdate;
gr.fp_final_screen_update=&WinFinalUpdate;
U0 WinIPUpdate()
{
I64 dd;
Bool set=FALSE;
if (ip_dev==IP_MOUSE) {
ip_has_wheel=mouse_has_wheel;
if (mouse_evt) {
ip_throttle+=ip_throttle_step*SignI64(mzz-ipz);
IPVarsUpdate(mxx,myy,mzz,mouse_buttons[0],ip_cb,mouse_buttons[1]);
mouse_evt=FALSE;
if (ip.dev==IP_MOUSE) {
ip.has_wheel=mouse.has_wheel;
if (mouse.evt) {
ip.throttle+=ip.throttle_step*SignI64(mouse.pos.z-ip.pos.z);
IPVarsUpdate(mouse.pos.x,mouse.pos.y,mouse.pos.z,mouse.buttons[0],mouse.buttons[1]);
mouse.evt=FALSE;
set=TRUE;
}
} else if (ip_dev==IP_NULL && mouse_installed)
ip_dev=IP_MOUSE;
} else if (ip.dev==IP_NULL && mouse.installed)
ip.dev=IP_MOUSE;
if (set) {
if (ip_dev==IP_MOUSE) {
ip_speed=mouse_speed;
ip_last_move_time=mouse_evt_time;
if (ip.dev==IP_MOUSE) {
ip.speed=mouse.speed;
ip.timestamp=mouse.timestamp;
}
} else
ip_speed*=0.95;
if (gr_screen_zoom!=1) {
if (gr_continuous_scroll)
ip.speed*=0.95;
if (gr.screen_zoom!=1) {
if (gr.continuous_scroll)
GrScaleZoom(1.0);
else {
dd=(ipx-grsx)*gr_screen_zoom;
dd=(ip.pos.x-gr.sx)*gr.screen_zoom;
if (!(8<=dd<GR_WIDTH-8))
GrScaleZoom(1.0);
else {
dd=(ipy-grsy)*gr_screen_zoom;
dd=(ip.pos.y-gr.sy)*gr.screen_zoom;
if (!(8<=dd<GR_HEIGHT-8))
GrScaleZoom(1.0);
}
@@ -248,13 +226,13 @@ U0 WinIPUpdate()
CTask *WinRefocus()
{
CTask *task;
CLI
PUSHFD
CLI
task=sys_focus_task;
if (!task) {
task=sys_winmgr_task->last_task;
while (TaskValidate(task) && task!=sys_winmgr_task) {
if (!Bt(&task->win_inhibit,WIf_FOCUS)) {
if (!Bt(&task->win_inhibit,WIf_SELF_FOCUS)) {
sys_focus_task=task;
break;
}
@@ -293,7 +271,7 @@ I64 WinOnTopWindows()
}
public I64 WinToTop(CTask *task=NULL,Bool update_z_buf=TRUE)
{
{//Put task's win on top of window stack.
CTask *task1;
I64 result=0;
if (!task) task=Fs;
@@ -313,7 +291,7 @@ public I64 WinToTop(CTask *task=NULL,Bool update_z_buf=TRUE)
TaskQueIns(task,sys_winmgr_task);
result++;
}
if (!Bt(&task->win_inhibit,WIf_FOCUS))
if (!Bt(&task->win_inhibit,WIf_SELF_FOCUS))
sys_focus_task=task;
if (result && !Bt(&task->display_flags,DISPLAYf_CHILDREN_NOT_ON_TOP)) {
task1=task->next_child_task;
@@ -336,10 +314,10 @@ public I64 WinToTop(CTask *task=NULL,Bool update_z_buf=TRUE)
ext[EXT_WIN_TO_TOP]=&WinToTop;
public U0 WinFocus(CTask *task=NULL)
{
CLI
{//Set task as focus task.
PUSHFD
if (!TaskValidate(task)||Bt(&task->win_inhibit,WIf_FOCUS))
CLI
if (!TaskValidate(task)||Bt(&task->win_inhibit,WIf_SELF_FOCUS))
task=WinRefocus;
WinToTop(sys_focus_task=task);
POPFD
@@ -347,7 +325,7 @@ public U0 WinFocus(CTask *task=NULL)
ext[EXT_WIN_FOCUS]=&WinFocus;
public Bool SetWinHorz(I64 left,I64 right,CTask *task=NULL)
{
{//Set task's win left and right columns.
I64 d=right-left;
if (!task) task=Fs;
if (!TaskValidate(task)) return FALSE;
@@ -381,7 +359,7 @@ public Bool SetWinHorz(I64 left,I64 right,CTask *task=NULL)
}
public Bool SetWinVert(I64 top,I64 bottom,CTask *task=NULL)
{
{//Set task's win top and bottom rows.
I64 d=bottom-top;
if (!task) task=Fs;
if (!TaskValidate(task)) return FALSE;
@@ -415,7 +393,7 @@ public Bool SetWinVert(I64 top,I64 bottom,CTask *task=NULL)
}
public U0 WinTileHorz()
{
{//Tile windows horizontally top-to-bottom.
CTask *task,*last_task=Fs;
I64 cnt,c,i,vert_size,no_border;
@@ -424,16 +402,15 @@ public U0 WinTileHorz()
task=sys_winmgr_task;
cnt=0;
do {
if (!Bt(&task->win_inhibit,WIf_FOCUS))
if (!Bt(&task->win_inhibit,WIf_SELF_FOCUS))
cnt++;
task=task->last_task;
} while (task!=sys_winmgr_task);
task=sys_winmgr_task;
i=0;
do {
if (!Bt(&task->win_inhibit,WIf_FOCUS)) {
if (!Bt(&task->win_inhibit,WIf_SELF_FOCUS)) {
no_border=Bt(&task->display_flags,DISPLAYf_NO_BORDER);
c=cnt- i&~3;
if (!c)
@@ -456,7 +433,7 @@ public U0 WinTileHorz()
}
public U0 WinTileVert()
{
{//Tile windows vertically side-by-side.
CTask *task,*last_task=Fs;
I64 cnt,c,i,horz_size,no_border;
PUSHFD
@@ -464,7 +441,7 @@ public U0 WinTileVert()
task=sys_winmgr_task;
cnt=0;
do {
if (!Bt(&task->win_inhibit,WIf_FOCUS))
if (!Bt(&task->win_inhibit,WIf_SELF_FOCUS))
cnt++;
task=task->last_task;
} while (task!=sys_winmgr_task);
@@ -472,7 +449,7 @@ public U0 WinTileVert()
task=sys_winmgr_task;
i=0;
do {
if (!Bt(&task->win_inhibit,WIf_FOCUS)) {
if (!Bt(&task->win_inhibit,WIf_SELF_FOCUS)) {
no_border=Bt(&task->display_flags,DISPLAYf_NO_BORDER);
c=cnt- i&~3;
if (!c)
@@ -493,9 +470,8 @@ public U0 WinTileVert()
POPFD
}
public U0 WinMax(CTask *task=NULL)
{
{//Maximize task's window
I64 no_border;
if (!task) task=Fs;
if (!TaskValidate(task)) return;
@@ -509,7 +485,7 @@ public U0 WinMax(CTask *task=NULL)
}
public Bool WinBorder(Bool val=OFF,CTask *task=NULL)
{
{//Turn off (or on) window border.
Bool old_has_border;
if (!task) task=Fs;
if (!TaskValidate(task)) return FALSE;
@@ -534,5 +510,3 @@ public Bool WinBorder(Bool val=OFF,CTask *task=NULL)
POPFD
return old_has_border;
}
#help_index ""
Adam/Win2b.CPP
+307 -323
View File
File diff suppressed because it is too large. Load diff
Adam/WordStat/WSDict.CPP
+44 -51
View File
@@ -1,18 +1,18 @@
#help_index "WordStat/Dictionary"
public U0 WSDWordsLoad()
{
{//Put words from word list into hash table.
I64 size;
CHashGeneric *temph;
U8 *in_ptr,*in_start,*st2;
U16 *d;
ws_dict_num_words=0;
wsd.num_words=0;
if (in_ptr=FileRead(WSD_WORD_FILENAME,&size)) {
in_start=in_ptr;
Free(ws_dict_word_lst);
ws_dict_word_lst=AMAlloc(size);
MemCpy(ws_dict_word_lst,in_start,size);
ws_dict_word_lst_size=size;
Free(wsd.word_lst);
wsd.word_lst=AMAlloc(size);
MemCpy(wsd.word_lst,in_start,size);
wsd.word_lst_size=size;
while (in_ptr<in_start+size) {
if (*in_ptr==WSD_WORD_CHAR)
@@ -29,8 +29,8 @@ public U0 WSDWordsLoad()
d=in_ptr;
temph->user_data0=*d;
in_ptr+=2;
HashAdd(temph,ws_hash_table);
ws_dict_num_words++;
HashAdd(temph,ws.hash_table);
wsd.num_words++;
} else
in_ptr+=3;
}
@@ -38,14 +38,13 @@ public U0 WSDWordsLoad()
}
}
public U8 *WSDGetDef(U8 *st,I64 def_num=1)
{
public U8 *WSDDefGet(U8 *st,I64 def_num=1)
{//MAlloc str holding single dict definition of word.
CFile *f;
CHashGeneric *temph;
U8 *result=NULL,*buf,*in_ptr,
*st2=MStrUtil(st,SUF_TO_UPPER);
temph=HashFind(st2,ws_hash_table,HTT_DICT_WORD);
temph=HashFind(st2,ws.hash_table,HTT_DICT_WORD);
Free(st2);
if (temph) {
if (f=FOpen(WSD_DEF_FILENAME,"r")) {
@@ -82,13 +81,13 @@ public U8 *WSDGetDef(U8 *st,I64 def_num=1)
return result;
}
public U8 *WSDGetWord(U8 *st)
{
public U8 *WSDDefsGet(U8 *st)
{//MAlloc str with all dict definitions of word.
CFile *f;
CHashGeneric *temph;
U8 *result=NULL,*buf,*in_ptr,*in_ptr2,
*st2=MStrUtil(st,SUF_TO_UPPER);
temph=HashFind(st2,ws_hash_table,HTT_DICT_WORD);
temph=HashFind(st2,ws.hash_table,HTT_DICT_WORD);
Free(st2);
if (temph) {
if (f=FOpen(WSD_DEF_FILENAME,"r")) {
@@ -121,27 +120,25 @@ public U8 *WSDGetWord(U8 *st)
return result;
}
/*
Fmt of word lst entry:
/*Fmt of word lst entry:
U8 WSD_WORD_CHAR
U8 word[] with terminating zero
I16 block;
*/
public U8 *WSDPtAtWord(U8 *st)
{
public U8 *WSDWordPtAt(U8 *st)
{//Point to word in word list.
I64 i;
U8 *start=ws_dict_word_lst,*r=start,
*end=ws_dict_word_lst+ws_dict_word_lst_size;
U8 *start=wsd.word_lst,*r=start,
*end=wsd.word_lst+wsd.word_lst_size;
if (!st || !*st)
return ws_dict_word_lst;
if (ws_dict_word_lst_size) {
return wsd.word_lst;
if (wsd.word_lst_size) {
while (start+3<end) {
r=(start+end)>>1;
while (TRUE) {
while (*r!=WSD_WORD_CHAR && r>ws_dict_word_lst)
while (*r!=WSD_WORD_CHAR && r>wsd.word_lst)
r--;
if ((r[2]==WSD_WORD_CHAR||r[1]==WSD_WORD_CHAR)&&r-3>ws_dict_word_lst)
if ((r[2]==WSD_WORD_CHAR||r[1]==WSD_WORD_CHAR)&&r-3>wsd.word_lst)
r--;
else
break;
@@ -159,9 +156,9 @@ public U8 *WSDPtAtWord(U8 *st)
}
r=(start+end)>>1;
while (TRUE) {
while (*r!=WSD_WORD_CHAR && r>ws_dict_word_lst)
while (*r!=WSD_WORD_CHAR && r>wsd.word_lst)
r--;
if ((r[2]==WSD_WORD_CHAR||r[1]==WSD_WORD_CHAR)&&r-3>ws_dict_word_lst)
if ((r[2]==WSD_WORD_CHAR||r[1]==WSD_WORD_CHAR)&&r-3>wsd.word_lst)
r--;
else
break;
@@ -172,27 +169,26 @@ public U8 *WSDPtAtWord(U8 *st)
if (*r==WSD_WORD_CHAR)
return r;
else
return ws_dict_word_lst;
return wsd.word_lst;
}
U0 WSDDictWordsAdd(CDoc *doc,U8 *st=NULL)
{
I64 i;
U8 *ptr;
if (!st)
st=ws_cur_word;
if (st && (ptr=WSDPtAtWord(st))) {
st=ws.cur_word;
if (st && (ptr=WSDWordPtAt(st))) {
for (i=0;i<WSD_MAX_FILLINS;i++) {
if (*ptr++!=WSD_WORD_CHAR)
break;
if (i)
DocPrint(doc,"\n");
wsd_fillins[i]=ptr-1;
DocPrint(doc,"'%d' %s",i,ptr);
wsd.fillins[i]=ptr-1;
DocPrint(doc,"'%d' %-23ts",i,ptr);
ptr+=StrLen(ptr)+3;
}
wsd_num_fillins=i;
wsd.num_fillins=i;
}
}
@@ -200,17 +196,16 @@ U0 WSDFillin(I64 n)
{
U8 *s;
I64 len;
if (0<=n<wsd_num_fillins) {
s=wsd_fillins[n]+1;
if (0<=n<wsd.num_fillins) {
s=wsd.fillins[n]+1;
len=StrLen(s);
if (len>ws_partial_len)
Auto(s+ws_partial_len);
if (len>ws.partial_len)
Auto(s+ws.partial_len);
}
}
public U0 WSDDisplayDefs(CDoc *doc,U8 *st,I64 num=-1)
{
public U0 WSDDefsPut(CDoc *doc=NULL,U8 *st,I64 num=-1)
{//Put to doc a dictionary definition(s) of a word.
U8 *st2,*st3;
I64 ch,i=0;
if (!st) return;
@@ -218,7 +213,7 @@ public U0 WSDDisplayDefs(CDoc *doc,U8 *st,I64 num=-1)
st++;
DocPrint(doc,"$$WW,1$$$$RED$$%s:$$FG$$\n\n",st);
if (num<0) {
if (st3=WSDGetWord(st)) {
if (st3=WSDDefsGet(st)) {
st2=st3;
while (ch=*st2++) {
switch (ch) {
@@ -243,7 +238,7 @@ public U0 WSDDisplayDefs(CDoc *doc,U8 *st,I64 num=-1)
Free(st3);
}
} else {
while (st2=WSDGetDef(st,++i)) {
while (st2=WSDDefGet(st,++i)) {
if (i==num)
DocPrint(doc,"$$GREEN$$(%d)$$FG$$ %s\n",
i,st2);
@@ -255,15 +250,15 @@ public U0 WSDDisplayDefs(CDoc *doc,U8 *st,I64 num=-1)
U0 WSDPopUpDef(U8 *st,I64 num=-1,CTask *parent=NULL)
{
U8 *buf;
buf=MPrint("WSDDisplayDefs(DocPut,\"%s\",%d);View;",st,num);
buf=MStrPrint("WSDDefsPut(DocPut,\"%s\",%d);View;",st,num);
PopUp(buf,parent);
Free(buf);
}
U0 WSDDef(I64 n,CTask *parent=NULL)
{
if (0<=n<wsd_num_fillins)
WSDPopUpDef(wsd_fillins[n],-1,parent);
if (0<=n<wsd.num_fillins)
WSDPopUpDef(wsd.fillins[n],-1,parent);
}
U0 WSFindMisspelled(CDoc *doc)
@@ -272,7 +267,7 @@ U0 WSFindMisspelled(CDoc *doc)
CDocEntry *doc_e=doc->cur_entry;
I64 col=doc->cur_data_col,col2,ch;
do {
if (doc_e!=doc && doc_e->flags1&DOCEF1_TAG) {
if (doc_e!=doc && doc_e->de_flags&DOCEF_TAG) {
while (col<doc_e->max_col) {
while (col<doc_e->max_col && !Bt(chars_bitmap_word,doc_e->tag[col]))
col++;
@@ -282,7 +277,7 @@ U0 WSFindMisspelled(CDoc *doc)
col2++;
ch=doc_e->tag[col2];
doc_e->tag[col2]=0;
if (StrICmp(&doc_e->tag[col],WSDPtAtWord(&doc_e->tag[col])+1)) {
if (StrICmp(&doc_e->tag[col],WSDWordPtAt(&doc_e->tag[col])+1)) {
doc_e->tag[col2]=ch;
doc->cur_entry=doc_e;
doc->cur_data_col=col;
@@ -300,5 +295,3 @@ fm_done:
if (unlock)
DocUnlock(doc);
}
#help_index ""
Adam/WordStat/WSDictGen.CPP
+1 -2
View File
@@ -8,7 +8,7 @@ Supply the raw dictionary filename in
the call at the bottom of this file
and #include this file.
I ran $LK,"::/Misc/Dollar.CPP"$ on it, first.
I ran $LK,"::/Misc/ToDolDoc.CPP"$ on it, first.
See $LK,"::/Doc/Acknowledgements.TXT"$.
*/
@@ -107,7 +107,6 @@ U8 *WSDSortWords(U8 *start,I64 size,I64 word_cnt)
return out_start;
}
U0 WSDGen(U8 *raw_dict_filename)
{
I64 cmd,size,word_cnt=0,largest_entry=0;
Adam/WordStat/WSMain.CPP
+106 -141
View File
@@ -1,36 +1,8 @@
#help_index "WordStat"
/**** Debug code
U0 WSPutMatrix(CWSMatrix *m)
{
I64 i,j;
CWSMatrixSide *ms;
CWS *tempw;
"n:%d\n",m->n;
for (i=0;i<ws_num_matrix_words;i++) {
ms=&m->side[i];
"col:%d rhits:%d chits:%d\n",i,ms->row_hits,ms->col_hits;
tempw=ms->next;
while (tempw!=ms) {
"substructs:%d entries:%d\n",tempw->substructs,tempw->entries;
for (j=0;j<tempw->substructs;j++) {
"(%04X %04X) ",
tempw->subs[j].hits,
tempw->subs[j].repeats;
}
NewLine;
tempw=tempw->next;
}
}
View;
}
****/
CHashWS *WSHashAdd(U8 *w)
{
CHashWS *tempw=HashFind(w,ws_hash_table,HTT_WORD);
CHashWS *tempw=HashFind(w,ws.hash_table,HTT_WORD);
if (tempw) {
tempw->hits++;
return tempw;
@@ -41,8 +13,8 @@ CHashWS *WSHashAdd(U8 *w)
tempw->use_cnt=1;
tempw->hits=1;
tempw->num=-1;
HashAdd(tempw,ws_hash_table);
ws_num_words++;
HashAdd(tempw,ws.hash_table);
ws.num_words++;
return tempw;
}
@@ -57,10 +29,10 @@ U0 WSSidesInit(CWSMatrix *m)
m->side[i].row_hits=0;
m->side[i].col_hits=0;
tempa=AMAlloc(sizeof(CWS));
ws_structs_size+=MSize2(tempa);
ws.structs_size+=MSize2(tempa);
tempa->subs[0].hits=0;
tempa->subs[0].repeats=ws_num_matrix_words;
tempa->entries=ws_num_matrix_words;
tempa->subs[0].repeats=ws.num_matrix_words;
tempa->entries=ws.num_matrix_words;
tempa->substructs=1;
QueIns(tempa,m->side[i].last);
}
@@ -72,10 +44,10 @@ CWS *WSStructFind(CWSMatrix *m,I64 col,I64 row,
CWS *tempa;
I64 row_base,i,j;
if (row>=ws_num_matrix_words ||
col>=ws_num_matrix_words)
if (row>=ws.num_matrix_words ||
col>=ws.num_matrix_words)
return NULL;
if (row<ws_num_matrix_words>>1) {
if (row<ws.num_matrix_words>>1) {
tempa=m->side[col].next;
row_base=0;
j=row;
@@ -89,9 +61,9 @@ CWS *WSStructFind(CWSMatrix *m,I64 col,I64 row,
row_base+=tempa->subs[*_substruct].repeats;
}
} else {
row=ws_num_matrix_words-row;
row=ws.num_matrix_words-row;
tempa=m->side[col].last;
row_base=ws_num_matrix_words;
row_base=ws.num_matrix_words;
j=row;
while (row>(i=tempa->entries)) {
row-=i;
@@ -109,12 +81,12 @@ CWS *WSStructFind(CWSMatrix *m,I64 col,I64 row,
return tempa;
}
public I64 WSGetHits(CWSMatrix *m,I64 col,I64 row)
{
public I64 WSHitsGet(CWSMatrix *m,I64 col,I64 row)
{//Look-up markov stats for word followed by word.
I64 row_base,substruct;
CWS *tempa;
if (row>=ws_num_matrix_words ||
col>=ws_num_matrix_words)
if (row>=ws.num_matrix_words ||
col>=ws.num_matrix_words)
return 0;
tempa=WSStructFind(m,col,row,
&row_base,&substruct);
@@ -152,7 +124,7 @@ U0 WSRem(CWSSub *s,CWS *parent)
return;
if (parent->substructs==1) {
QueRem(parent);
ws_structs_size-=MSize2(parent);
ws.structs_size-=MSize2(parent);
Free(parent);
} else {
parent->entries-=s->repeats;
@@ -172,7 +144,7 @@ CWSSub *WSIns(CWSSub *s,CWS **_parent,CWSSub *last)
*_parent=parent;
if (parent->substructs==-1) {
tempa=AMAlloc(sizeof(CWS));
ws_structs_size+=MSize2(tempa);
ws.structs_size+=MSize2(tempa);
QueIns(tempa,parent->last);
parent=tempa;
*_parent=parent;
@@ -184,7 +156,7 @@ CWSSub *WSIns(CWSSub *s,CWS **_parent,CWSSub *last)
tempa=parent->next;
if (tempa->substructs==-1 || tempa->substructs==WS_SUBSTRUCTS_PER_STRUCT) {
tempa=AMAlloc(sizeof(CWS));
ws_structs_size+=MSize2(tempa);
ws.structs_size+=MSize2(tempa);
tempa->entries=0;
tempa->substructs=0;
QueIns(tempa,parent);
@@ -253,8 +225,8 @@ I64 WSHitsInc(CWSMatrix *m,I64 col,I64 row)
CWSSub sn,*temps,*temps1,*temps_l;
CWS *tempa,*tempa1,*tempa_l;
if (row>=ws_num_matrix_words ||
col>=ws_num_matrix_words)
if (row>=ws.num_matrix_words ||
col>=ws.num_matrix_words)
return 0;
tempa=WSStructFind(m,col,row,&row_base,&substruct);
temps=&tempa->subs[substruct];
@@ -333,12 +305,12 @@ U0 WSSingleFileAdd(U8 *buf,I64 pass)
if (pass==1)
WSHashAdd(ptr);
else {
cur_ptr=HashFind(ptr,ws_hash_table,HTT_WORD);
cur_ptr=HashFind(ptr,ws.hash_table,HTT_WORD);
if (cur_ptr->num<0)
cur_ptr=NULL;
else
if (last_ptr)
WSHitsInc(ws_matrix,last_ptr->num,cur_ptr->num);
WSHitsInc(ws.matrix,last_ptr->num,cur_ptr->num);
last_ptr=cur_ptr;
}
ptr=ptr2;
@@ -384,7 +356,6 @@ I64 WSPriorWordInStr(U8 *src,U8 *dst,I64 len,I64 buf_size)
return i+1;
}
Bool WSPartialMatch(U8 *partial,U8 *complete)
{
I64 i,l=StrLen(partial);
@@ -398,27 +369,24 @@ U0 WSFillIn(I64 n)
{
U8 *s;
I64 len;
if (0<=--n<ws_num_fillins) {
s=ws_sorted_words[ws_fillin_matches[n]]->str;
if (0<=--n<ws.num_fillins) {
s=ws.sorted_words[ws.fillin_matches[n]]->str;
len=StrLen(s);
if (len>ws_partial_len)
Auto(s+ws_partial_len);
if (len>ws.partial_len)
Auto(s+ws.partial_len);
}
}
U0 WSMan(I64 n,CTask *parent_task=NULL)
{
U8 *buf;
CHashWS *tempw;
CHashSrcSym *temph;
Bool old_preempt=Preempt(OFF);
if (0<=--n<ws_num_fillins && (tempw=ws_sorted_words[ws_fillin_matches[n]]) &&
if (0<=--n<ws.num_fillins && (tempw=ws.sorted_words[ws.fillin_matches[n]]) &&
(temph=HashFind(tempw->str,Fs->hash_table,HTG_SRC_SYM)) &&
temph->src_link) {
buf=MPrint("Ed(\"%s\");",temph->src_link);
Preempt(old_preempt);
PopUp(buf,parent_task);
Free(buf);
PopUpEd(temph->src_link,parent_task);
}
Preempt(old_preempt);
}
@@ -427,23 +395,23 @@ U0 WSFillInAdd(I64 i,I64 j,I64 old_num_fillins)
{
Bool cont;
I64 k;
if (ws_num_fillins<WS_MAX_FILLINS || i>ws_fillin_scores[ws_num_fillins-1] ||
i==ws_fillin_scores[ws_num_fillins-1] && ws_sorted_words[j]->hits>ws_fillin_hits[ws_num_fillins-1]) {
if (ws.num_fillins<WS_MAX_FILLINS || i>ws.fillin_scores[ws.num_fillins-1] ||
i==ws.fillin_scores[ws.num_fillins-1] && ws.sorted_words[j]->hits>ws.fillin_hits[ws.num_fillins-1]) {
cont=TRUE;
for (k=ws_num_fillins-1;k>=old_num_fillins && cont;k--)
if (i<=ws_fillin_scores[k] || i==ws_fillin_scores[k] && ws_sorted_words[j]->hits<=ws_fillin_hits[k]) {
for (k=ws.num_fillins-1;k>=old_num_fillins && cont;k--)
if (i<=ws.fillin_scores[k] || i==ws.fillin_scores[k] && ws.sorted_words[j]->hits<=ws.fillin_hits[k]) {
cont=FALSE;
k++; //offset k--
} else {
ws_fillin_scores[k+1]=ws_fillin_scores[k];
ws_fillin_matches[k+1]=ws_fillin_matches[k];
ws_fillin_hits[k+1]=ws_fillin_hits[k];
ws.fillin_scores[k+1]=ws.fillin_scores[k];
ws.fillin_matches[k+1]=ws.fillin_matches[k];
ws.fillin_hits[k+1]=ws.fillin_hits[k];
}
if (ws_num_fillins<WS_MAX_FILLINS)
ws_num_fillins++;
ws_fillin_scores[k+1]=i;
ws_fillin_hits[k+1]=ws_sorted_words[j]->hits;
ws_fillin_matches[k+1]=j;
if (ws.num_fillins<WS_MAX_FILLINS)
ws.num_fillins++;
ws.fillin_scores[k+1]=i;
ws.fillin_hits[k+1]=ws.sorted_words[j]->hits;
ws.fillin_matches[k+1]=j;
}
}
@@ -464,31 +432,31 @@ U0 WSPutChoices(CDoc *focus_l,CDocEntry *doc_e,CTask *focus_task)
if (data_col==-1)
data_col=0;
data_col=WSPriorWordInStr(src,buf,data_col,256);
ws_partial_len=StrLen(buf);
ws.partial_len=StrLen(buf);
data_col=WSSkipCrap(src,data_col);
data_col=WSPriorWordInStr(src,buf1,data_col,256);
if (ws_cur_word && !StrCmp(ws_cur_word,buf))
if (ws.cur_word && !StrCmp(ws.cur_word,buf))
goto pc_done;
st=ws_cur_word;
ws_cur_word=AStrNew(buf);
st=ws.cur_word;
ws.cur_word=AStrNew(buf);
Free(st);
Preempt(ON);
if (StrLen(buf1)&&ws_hash_table)
w2=HashFind(buf1,ws_hash_table,HTT_WORD);
if (StrLen(buf1)&&ws.hash_table)
w2=HashFind(buf1,ws.hash_table,HTT_WORD);
else
w2=NULL;
ws_num_fillins=0;
if (w2 && w2->num<ws_num_matrix_words)
for (j=0;j<ws_num_matrix_words && tS<timeout_time;j++)
if (WSPartialMatch(ws_cur_word,ws_sorted_words[j]->str)) {
i=WSGetHits(ws_matrix,w2->num,ws_sorted_words[j]->num);
ws.num_fillins=0;
if (w2 && w2->num<ws.num_matrix_words)
for (j=0;j<ws.num_matrix_words && tS<timeout_time;j++)
if (WSPartialMatch(ws.cur_word,ws.sorted_words[j]->str)) {
i=WSHitsGet(ws.matrix,w2->num,ws.sorted_words[j]->num);
WSFillInAdd(i,j,0);
}
k=ws_num_fillins;
for (j=0;j<ws_num_words && tS<timeout_time;j++)
if (WSPartialMatch(ws_cur_word,ws_sorted_words[j]->str))
k=ws.num_fillins;
for (j=0;j<ws.num_words && tS<timeout_time;j++)
if (WSPartialMatch(ws.cur_word,ws.sorted_words[j]->str))
WSFillInAdd(0,j,k);
Preempt(OFF);
@@ -499,9 +467,9 @@ pc_done:
Fs->text_attr=LTBLUE<<4+WHITE;
Fs->border_src =BDS_CONST;
Fs->border_attr=LTBLUE<<4+BLACK;
DocPrint(doc,"Word:%s\n",ws_cur_word);
for (i=0;i<ws_num_fillins;i++) {
st=ws_sorted_words[ws_fillin_matches[i]]->str;
DocPrint(doc,"Word:%s\n",ws.cur_word);
for (i=0;i<ws.num_fillins;i++) {
st=ws.sorted_words[ws.fillin_matches[i]]->str;
ch=CH_SPACE;
DocPrint(doc,"F%02d ",i+1);
if (TaskValidate(focus_task) &&
@@ -513,7 +481,7 @@ pc_done:
} else
DocPrint(doc,"%s\n",st);
}
if (wsd_has_words)
if (wsd.has_words)
WSDDictWordsAdd(doc);
DocRecalc(doc);
@@ -534,9 +502,9 @@ U0 WSTask(I64)
DocTermNew;
SetWinHorz(51,Fs->win_right);
LBts(&Fs->display_flags,DISPLAYf_WIN_ON_TOP);
Fs->win_inhibit=WIG_TASK_DFT-WIF_BORDER-WIF_IP_L-WIF_IP_R-WIG_DBL_CLICK;
Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_BORDER-WIF_SELF_IP_L-WIF_SELF_IP_R-WIG_DBL_CLICK;
while (TRUE) {
if (Bt(&ws_flags,WSf_ENABLE)) {
if (Bt(&ws.flags,WSf_ENABLE)) {
original_focus_task=focus_task=sys_focus_task;
while (TaskValidate(focus_task) && Bt(&focus_task->task_flags,TASKf_INPUT_FILTER_TASK))
focus_task=focus_task->parent_task;
@@ -551,7 +519,7 @@ U0 WSTask(I64)
doc_e=doc_e->last;
while (doc_e->last->type_u8 !=DOCT_NEW_LINE && doc_e->last!=doc)
doc_e=doc_e->last;
if (Bt(&ws_flags,WSf_ENABLE))
if (Bt(&ws.flags,WSf_ENABLE))
WSPutChoices(doc,doc_e,focus_task);
else
DocUnlock(doc);
@@ -564,11 +532,11 @@ U0 WSTask(I64)
break;
doc=DocPut;
DocLock(doc);
if (doc->cur_entry!=doc && doc->cur_entry->flags1 & DOCEF1_LINK)
if (doc->cur_entry!=doc && doc->cur_entry->de_flags & DOCEF_LINK)
'' CH_SPACE;
DocUnlock(doc);
}
ws_task=NULL;
ws.task=NULL;
}
U0 WSMainFileLstTraverse(U8 *files_find_mask,I64 pass)
@@ -586,7 +554,7 @@ U0 WSMainFileLstTraverse(U8 *files_find_mask,I64 pass)
}
} catch
Fs->catch_except=TRUE;
DirLstDel(tempde1);
DirTreeDel(tempde1);
}
U0 WSMatrixDel(CWSMatrix *m)
@@ -606,30 +574,29 @@ U0 WSMatrixDel(CWSMatrix *m)
Free(m);
}
public Bool WordStat(Bool val=OFF)
{
{//Turn WordStat OFF (or ON).
Bool old_wordstat=FALSE,
old_preempt=Preempt(OFF);
if (val) {
while (Bt(&ws_flags,WSf_INIT_IN_PROGRESS))
while (Bt(&ws.flags,WSf_INIT_IN_PROGRESS))
Sleep(10);
if (TaskValidate(ws_task))
if (TaskValidate(ws.task))
old_wordstat=TRUE;
else {
ws_task=Spawn(&WSTask,NULL,"WordStat");
TaskWait(ws_task);
ws.task=Spawn(&WSTask,NULL,"WordStat");
TaskWait(ws.task);
}
if (!LBts(&ws_flags,WSf_ENABLE))
WinToTop(ws_task);
if (!LBts(&ws.flags,WSf_ENABLE))
WinToTop(ws.task);
} else {
LBtr(&ws_flags,WSf_ENABLE);
if (TaskValidate(ws_task)) {
LBtr(&ws.flags,WSf_ENABLE);
if (TaskValidate(ws.task)) {
old_wordstat=TRUE;
Kill(ws_task);
while (TaskValidate(ws_task))
Kill(ws.task);
while (TaskValidate(ws.task))
Yield;
ws_task=NULL;
ws.task=NULL;
}
}
Preempt(old_preempt);
@@ -638,27 +605,27 @@ public Bool WordStat(Bool val=OFF)
U0 WSProgressTask(Bool *_start_flag)
{
I64 start=sys_dsk_writes;
I64 start=dsk.write_cnt;
progress1=0;
progress1_max=(Size(WSD_DEF_FILENAME_Z,"+x+s")+BLK_SIZE-1)>>BLK_SIZE_BITS;
StrCpy(progress1_desc,"Uncompressing Dictionary");
start=sys_dsk_writes;
start=dsk.write_cnt;
*_start_flag=TRUE;
while (progress1<progress1_max) {
progress1=sys_dsk_writes-start;
progress1=dsk.write_cnt-start;
Sleep(10);
}
*progress1_desc=progress1=progress1_max=0;
}
public U0 WSInit(U8 *mask=NULL)
{
{//Read files and build WordStat statistics.
I64 i,j=0;
Bool start_flag;
CHashWS *tempw;
CBlkDev *bdev=Drv2BlkDev;
while (LBts(&ws_flags,WSf_INIT_IN_PROGRESS))
while (LBts(&ws.flags,WSf_INIT_IN_PROGRESS))
Yield;
WordStat;
@@ -672,52 +639,50 @@ public U0 WSInit(U8 *mask=NULL)
Move(WSD_DEF_FILENAME_Z,WSD_DEF_FILENAME);
}
HashTableDel(ws_hash_table);
ws_hash_table=HashTableNew(0x4000,adam_task);
HashTableDel(ws.hash_table);
ws.hash_table=HashTableNew(0x4000,adam_task);
ws_num_words=0;
ws_num_matrix_words=0;
ws_structs_size=0;
Free(ws_cur_word);
ws_cur_word=NULL;
ws.num_words=0;
ws.num_matrix_words=0;
ws.structs_size=0;
Free(ws.cur_word);
ws.cur_word=NULL;
"\n\nPass #1\n";
if (mask) WSMainFileLstTraverse(mask,1);
Free(ws_sorted_words);
ws_sorted_words=AMAlloc(sizeof(U8 *)*ws_num_words);
Free(ws.sorted_words);
ws.sorted_words=AMAlloc(sizeof(U8 *)*ws.num_words);
tempw=ws_hash_table->next_added;
while (tempw!=ws_hash_table) {
ws_sorted_words[j++]=tempw;
tempw=ws.hash_table->next_added;
while (tempw!=ws.hash_table) {
ws.sorted_words[j++]=tempw;
tempw=tempw->next_added;
}
QSortI64(ws_sorted_words,ws_num_words,&WSCompare);
for (i=0;i<ws_num_words;i++)
ws_sorted_words[i]->num=i;
if (ws_num_words<=WS_MAX_MATRIX_WORDS)
ws_num_matrix_words=ws_num_words;
QSortI64(ws.sorted_words,ws.num_words,&WSCompare);
for (i=0;i<ws.num_words;i++)
ws.sorted_words[i]->num=i;
if (ws.num_words<=WS_MAX_MATRIX_WORDS)
ws.num_matrix_words=ws.num_words;
else
ws_num_matrix_words=WS_MAX_MATRIX_WORDS;
ws.num_matrix_words=WS_MAX_MATRIX_WORDS;
WSMatrixDel(ws_matrix);
ws_matrix=AMAlloc(sizeof(CWSMatrix));
WSSidesInit(ws_matrix);
WSMatrixDel(ws.matrix);
ws.matrix=AMAlloc(sizeof(CWSMatrix));
WSSidesInit(ws.matrix);
"\n\nPass #2\n";
if (mask) WSMainFileLstTraverse(mask,2);
WSDWordsLoad;
LBtr(&ws_flags,WSf_INIT_IN_PROGRESS);
LBtr(&ws.flags,WSf_INIT_IN_PROGRESS);
WordStat(ON);
}
I64 WordStatSize()
{
if (ws_hash_table)
return HashTableSize2(ws_hash_table)+ws_structs_size+
MSize2(ws_sorted_words)+MSize2(ws_matrix)+MSize2(ws_dict_word_lst);
if (ws.hash_table)
return HashTableSize2(ws.hash_table)+ws.structs_size+
MSize2(ws.sorted_words)+MSize2(ws.matrix)+MSize2(wsd.word_lst);
else
return 0;
}
#help_index ""
Adam/WordStat/WordStat.CPP
+32 -28
View File
@@ -31,34 +31,38 @@ class CWSMatrix
CWSMatrixSide side[WS_MAX_MATRIX_WORDS];
};
public I64 ws_num_words,ws_num_matrix_words;
CHashTable *ws_hash_table=NULL;
public U8 *ws_cur_word=NULL;
#define WSf_ENABLE 0
#define WSf_INIT_IN_PROGRESS 1
I64 ws_flags=0;
public CWSMatrix *ws_matrix=NULL;
public CHashWS **ws_sorted_words=NULL;
CTask *ws_task=NULL;
#define WS_MAX_FILLINS 10
I64 ws_partial_len=0,ws_fillin_matches[WS_MAX_FILLINS+1];
I64 ws_num_fillins=0,ws_fillin_scores[WS_MAX_FILLINS+1],ws_fillin_hits[WS_MAX_FILLINS+1];
//**** Dictionary Stuff
public class CWordStatGlbls
{
I64 num_words,num_matrix_words;
CHashTable *hash_table;
U8 *cur_word;
I64 flags;
CWSMatrix *matrix;
CHashWS **sorted_words;
CTask *task;
I64 partial_len,num_fillins,
structs_size,
fillin_matches [WS_MAX_FILLINS+1],
fillin_scores [WS_MAX_FILLINS+1],
fillin_hits [WS_MAX_FILLINS+1];
} ws={0,0,NULL,NULL,0,NULL,NULL,NULL,0,0,0,
{0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0},
{0,0,0,0,0,0,0,0,0,0,0}};
//Dictionary Stuff
#help_index "WordStat/Dictionary"
#define WSD_WORD_FILENAME "/Adam/WordStat/WSWords.DAT.Z"
#define WSD_DEF_FILENAME "/Adam/WordStat/WSDefs.DAT"
#define WSD_DEF_FILENAME_Z "/Adam/WordStat/WSDefs.DAT.Z"
Bool wsd_has_words=FileFind(WSD_WORD_FILENAME),
wsd_has_defs =FileFind(WSD_DEF_FILENAME)||FileFind(WSD_DEF_FILENAME_Z);
#define WSD_H1 0
#define WSD_H1_END 1
#define WSD_DEF 2
@@ -78,20 +82,20 @@ Bool wsd_has_words=FileFind(WSD_WORD_FILENAME),
#define WSD_POS_CHAR 0x04
#define WSD_EXTRA_CHAR 0x05
public U8 *ws_dict_word_lst=NULL;
public I64 ws_dict_word_lst_size=0,
ws_dict_num_words=0,ws_structs_size=0;
#define WSD_MAX_FILLINS 10
public class CWordStatDictGlbls
{
U8 *word_lst;
I64 word_lst_size,num_words,num_fillins;
U8 *fillins[WSD_MAX_FILLINS];
Bool has_words,has_defs;
} wsd={NULL,0,0,0,{0,0,0,0,0,0,0,0,0,0},FALSE,FALSE};
wsd.has_words=FileFind(WSD_WORD_FILENAME);
wsd.has_defs =FileFind(WSD_DEF_FILENAME)||FileFind(WSD_DEF_FILENAME_Z);
extern U0 WSDWordsLoad();
extern U0 WSDDictWordsAdd(CDoc *doc,U8 *st=NULL);
#define WSD_MAX_FILLINS 10
U8 *wsd_fillins[WSD_MAX_FILLINS];
I64 wsd_num_fillins=0;
// ************************************
#include "WSMain"
#include "WSDict"
#help_index ""