diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C index 2d1695f7..b5f9bc48 100755 Binary files a/src/0000Boot/0000Kernel.BIN.C and b/src/0000Boot/0000Kernel.BIN.C differ diff --git a/src/Apps/Budget/BgtAccts.HC b/src/Apps/Budget/BgtAccts.HC index 881b99c6..fab0f0d2 100755 --- a/src/Apps/Budget/BgtAccts.HC +++ b/src/Apps/Budget/BgtAccts.HC @@ -51,12 +51,12 @@ I64 BgtAcctColor(U8 *st) return BLACK; } -U8 *BgtPopUpAcct(U8 *header=NULL,U8 *dft=NULL) +U8 *BgtPopUpAcct(U8 *header=NULL,U8 *default=NULL) { I64 i; U8 *res; CDoc *doc=DocNew; - CDocEntry *doc_e,*doc_dft=NULL; + CDocEntry *doc_e,*doc_default=NULL; CHashGeneric *tmph; if (header) @@ -67,14 +67,14 @@ U8 *BgtPopUpAcct(U8 *header=NULL,U8 *dft=NULL) while (tmph) { doc_e=DocPrint(doc,"$$FG,%d$$$$MU-UL,\"%s\",LE=0x%X$$\n", tmph->user_data1,tmph->str,tmph->str); - if (dft && !StrCmp(dft,tmph->str)) - doc_dft=doc_e; + if (default && !StrCmp(default,tmph->str)) + doc_default=doc_e; tmph=tmph->next; } } - if (doc_dft) { - doc->cur_entry=doc_dft; + if (doc_default) { + doc->cur_entry=doc_default; doc->cur_col=0; } res=PopUpMenu(doc,DOF_DONT_HOME); diff --git a/src/Apps/Budget/BgtEntry.HC b/src/Apps/Budget/BgtEntry.HC index 2a6197fb..cc3f4591 100755 --- a/src/Apps/Budget/BgtEntry.HC +++ b/src/Apps/Budget/BgtEntry.HC @@ -42,19 +42,19 @@ class CBgtEntryForm U8 desc [512] format "$$DA-P,A=\"Desc:%s\"$$\n"; }; -CBgtEntry *BgtEntryPrompt(CBgtEntry *dft=NULL) +CBgtEntry *BgtEntryPrompt(CBgtEntry *default=NULL) { CBgtEntryForm b; CBgtEntry *tmpb; U8 *st; MemSet(&b,0,sizeof(CBgtEntryForm)); StrCpy(&b.date,"*"); - if (dft) { - StrPrint(b.date,"%D",dft->date); - b.amount=dft->amount; - StrCpy(b.credit,dft->credit); - StrCpy(b.debit ,dft->debit); - StrCpy(b.desc ,dft->desc); + if (default) { + StrPrint(b.date,"%D",default->date); + b.amount=default->amount; + StrCpy(b.credit,default->credit); + StrCpy(b.debit ,default->debit); + StrCpy(b.desc ,default->desc); } while (TRUE) if (PopUpForm(&b)) { diff --git a/src/Apps/Budget/BgtTemplate.HC b/src/Apps/Budget/BgtTemplate.HC index 548ed245..e6ac00a9 100755 --- a/src/Apps/Budget/BgtTemplate.HC +++ b/src/Apps/Budget/BgtTemplate.HC @@ -150,18 +150,18 @@ U0 CBgtTemplatesExpand() } } -CBgtTemplate *BgtTemplatePrompt(CBgtTemplate *dft_t=NULL,CBgtEntry *dft_b=NULL) +CBgtTemplate *BgtTemplatePrompt(CBgtTemplate *default_t=NULL,CBgtEntry *default_b=NULL) { CBgtTemplate t,*tmpt; CBgtEntry *tmpb; MemSet(&t,0,sizeof(CBgtTemplate)); - if (dft_t) { - MemCpy(&t.start,&dft_t->start,BT_SIZE); - dft_b=&dft_t->b; + if (default_t) { + MemCpy(&t.start,&default_t->start,BT_SIZE); + default_b=&default_t->b; } else { t.type=BT_INTERVAL; - if (dft_b) - StrPrint(&t.start_date,"%D",dft_b->date); + if (default_b) + StrPrint(&t.start_date,"%D",default_b->date); else StrCpy(&t.start_date,"["); StrCpy(&t.end_date,"]"); @@ -169,7 +169,7 @@ CBgtTemplate *BgtTemplatePrompt(CBgtTemplate *dft_t=NULL,CBgtEntry *dft_b=NULL) while (TRUE) if (PopUpForm(&t) && ((t.type==BT_INTERVAL && t.period>0) || t.type>BT_INTERVAL)) { - if (tmpb=BgtEntryPrompt(dft_b)) { + if (tmpb=BgtEntryPrompt(default_b)) { tmpt=CAlloc(sizeof(CBgtTemplate)); MemCpy(&tmpt->start,&t.start,BT_SIZE); MemCpy(&tmpt->b,tmpb,sizeof(CBgtEntry)); diff --git a/src/Apps/KeepAway/KeepAway.HC b/src/Apps/KeepAway/KeepAway.HC index 99a5ffcd..9797285d 100755 --- a/src/Apps/KeepAway/KeepAway.HC +++ b/src/Apps/KeepAway/KeepAway.HC @@ -218,7 +218,7 @@ Frame imgs[LAST_STOPPED_DRIBBLING+1]={ {{$IB,"<22>",BI=22$,$IB,"<23>",BI=23$},DRIBBLE_T/STOPPED_DRIBBLING_IMGS_NUM}, }; -RegDft("ZenithOS/KeepAway","I64 best_score0=0,best_score1=9999;\n"); +RegDefault("ZenithOS/KeepAway","I64 best_score0=0,best_score1=9999;\n"); RegExe("ZenithOS/KeepAway"); F64 game_t_end,foul_t_end; diff --git a/src/Apps/Psalmody/JukeBox.HC b/src/Apps/Psalmody/JukeBox.HC index 327e4697..9e4da72e 100755 --- a/src/Apps/Psalmody/JukeBox.HC +++ b/src/Apps/Psalmody/JukeBox.HC @@ -17,7 +17,7 @@ CTask *JukeReward(U8 *message) res->border_src =BDS_CONST; res->border_attr=LTGRAY<<4+DriveTextAttrGet(':')&15; res->text_attr =LTGRAY<<4+BLUE; - res->win_inhibit=WIG_NO_FOCUS_TASK_DFT; + res->win_inhibit=WIG_NO_FOCUS_TASK_DEFAULT; WinHorz(Fs->win_right+2,TEXT_COLS-2,res); WinVert(2,TEXT_ROWS-2,res); @@ -33,7 +33,7 @@ CTask *SingleSong(U8 *message,U8 *name) TaskExe(task,Fs,";",1<win_left,task->win_left+50,task); WinVert(2,2+8,task); - task->win_inhibit=WIG_NO_FOCUS_TASK_DFT; + task->win_inhibit=WIG_NO_FOCUS_TASK_DEFAULT; TaskExe(task,NULL,message,1<max_entries=100; return task; diff --git a/src/Apps/Psalmody/PsalmodyMain.HC b/src/Apps/Psalmody/PsalmodyMain.HC index 068e83c9..444a772c 100755 --- a/src/Apps/Psalmody/PsalmodyMain.HC +++ b/src/Apps/Psalmody/PsalmodyMain.HC @@ -33,7 +33,7 @@ U0 PsmRightClick(I64 x,I64 y) if (DocPut) old_doc_flags=DocPut->flags; psm.cur_note=tmpn=PsmFindNote(x,y); if (tmpn!=&psm.head) { - Fs->win_inhibit=WIG_USER_TASK_DFT; + Fs->win_inhibit=WIG_USER_TASK_DEFAULT; i=PopUpDuration; if (0<=itype==PSMT_NOTE) @@ -100,7 +100,7 @@ U0 PsmRightClick(I64 x,I64 y) } } PsmSetWidth(psm.cur_note); - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS -WIF_SELF_BORDER-WIF_FOCUS_TASK_MENU-WIF_SELF_CTRLS; } } @@ -333,14 +333,14 @@ U0 PsmUpKey(I64 x,I64 y) U0 PsmPushMode(I64 psm_octave) { - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS -WIF_SELF_BORDER-WIF_FOCUS_TASK_MENU-WIF_SELF_CTRLS; PsmMenu(psm_octave); } U0 PsmPopMode() { - Fs->win_inhibit=WIG_USER_TASK_DFT; + Fs->win_inhibit=WIG_USER_TASK_DEFAULT; DCFill; } @@ -726,9 +726,9 @@ mo_got_message: break; case MESSAGE_MS_MOVE: if (arg2>18*FONT_HEIGHT) - Fs->win_inhibit=WIG_USER_TASK_DFT; + Fs->win_inhibit=WIG_USER_TASK_DEFAULT; else - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS-WIF_SELF_BORDER + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS-WIF_SELF_BORDER -WIF_FOCUS_TASK_MENU-WIF_SELF_CTRLS; break; case MESSAGE_MS_L_DOWN: diff --git a/src/Apps/Titanium/Titanium.HC b/src/Apps/Titanium/Titanium.HC index ce67077c..e212a8de 100755 --- a/src/Apps/Titanium/Titanium.HC +++ b/src/Apps/Titanium/Titanium.HC @@ -1,4 +1,4 @@ -RegDft("ZenithOS/Titanium","I64 best_score=0;\n"); +RegDefault("ZenithOS/Titanium","I64 best_score=0;\n"); RegExe("ZenithOS/Titanium"); #define MAP_HEIGHT 4096 diff --git a/src/Apps/ToTheFront/ToTheFront.HC b/src/Apps/ToTheFront/ToTheFront.HC index 11140598..4a2b860b 100755 --- a/src/Apps/ToTheFront/ToTheFront.HC +++ b/src/Apps/ToTheFront/ToTheFront.HC @@ -75,7 +75,7 @@ U0 CharDo(U8 ch) old_draw_it=Fs->draw_it; old_inhibit=Fs->win_inhibit; Fs->draw_it=Fs->next_settings->draw_it; - Fs->win_inhibit=WIG_USER_TASK_DFT; + Fs->win_inhibit=WIG_USER_TASK_DEFAULT; old_cursor=DocCursor(ON); DocBottom; "\n$$GREEN$$$$FG$$ to return to game.\n"; diff --git a/src/Apps/X-Caliber/X-Caliber.HC b/src/Apps/X-Caliber/X-Caliber.HC index 40b60e60..f376436a 100755 --- a/src/Apps/X-Caliber/X-Caliber.HC +++ b/src/Apps/X-Caliber/X-Caliber.HC @@ -1,6 +1,6 @@ #define XMESSAGEF_ANTISPIN 0 #define XMESSAGEF_SOLAR_STORM 1 -RegDft("ZenithOS/XCaliber", +RegDefault("ZenithOS/XCaliber", "I64 best_score=0;\n" "I64 message_flags=0;\n" ); @@ -1381,7 +1381,7 @@ U0 XCaliber() WinMax; DocCursor; DocClear; - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS -WIF_SELF_BORDER-WIF_FOCUS_TASK_MENU-WIF_SELF_CTRLS; Fs->draw_it=&DrawIt; do { diff --git a/src/Compiler/Asm.HC b/src/Compiler/Asm.HC index 8afe063f..12a52cdd 100755 --- a/src/Compiler/Asm.HC +++ b/src/Compiler/Asm.HC @@ -419,7 +419,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcount) MemSet(&cur,0,sizeof(CAsmIns)); cur.tmpins=tmpins; ModrM_complete=FALSE; - cur.is_dft=ToBool(tmpins->flags & IEF_DFT); + cur.is_default=ToBool(tmpins->flags & IEF_DEFAULT); if (aotc->seg_size==64) { if (tmpins->flags & IEF_48_REX) cur.REX=0x48; @@ -460,7 +460,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcount) } if (argcount==1) { - if (best.U8_count!=255 && !found_second_possible && !best.is_dft) { + if (best.U8_count!=255 && !found_second_possible && !best.is_default) { found_second_possible=TRUE; if (!aotc->arg1.size) PrintWarn("no size specified at %s,%04d\n", @@ -570,7 +570,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcount) MemCpy(&cur.imm.num,&tmpa1->num,sizeof(CAsmNum)); } } else if (argcount==2) { - if (best.U8_count!=255 && !found_second_possible && !best.is_dft) { + if (best.U8_count!=255 && !found_second_possible && !best.is_default) { found_second_possible=TRUE; if (!aotc->arg1.size && !aotc->arg2.size) PrintWarn("no size specified at %s,%04d\n", @@ -891,7 +891,7 @@ U0 ParseBinFile(CCompCtrl *cc) U8 *buf,*st; if (cc->token!=TK_STR) LexExcept(cc,"Expecting string at "); - st=ExtDft(cc->cur_str,"BIN"); + st=ExtDefault(cc->cur_str,"BIN"); buf=FileRead(st,&size); Free(st); for (i=0;iflags|=IEF_DONT_SWITCH_MODES; break; - case '&': tmpins->flags|=IEF_DFT; break; + case '&': tmpins->flags|=IEF_DEFAULT; break; case '%': tmpins->flags|=IEF_NOT_IN_64_BIT; break; case '=': tmpins->flags|=IEF_48_REX; break; case '`': tmpins->flags|=IEF_REX_ONLY_R8_R15; break; diff --git a/src/Compiler/BackC.HC b/src/Compiler/BackC.HC index 7e061ffa..65d0891f 100755 --- a/src/Compiler/BackC.HC +++ b/src/Compiler/BackC.HC @@ -646,7 +646,7 @@ U0 ICSwitch(CIntermediateCode *tmpi,I64 rip, } rip+=tmpi->ic_count; - lb=tmpi->ic_data(CCodeMisc *)->dft; + lb=tmpi->ic_data(CCodeMisc *)->default; short_jmp=ToBool(tmpi->ic_flags&ICF_SHORT_JMP); if (!buf && lb->addr!=INVALID_PTR) { i=lb->addr-(rip+2); diff --git a/src/Compiler/CMain.HC b/src/Compiler/CMain.HC index 2db7e79e..141da650 100755 --- a/src/Compiler/CMain.HC +++ b/src/Compiler/CMain.HC @@ -428,10 +428,10 @@ I64 Comp(U8 *filename,U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0) CAOTHeapGlobalRef *tmphgr,*tmphgr1; CAOTHeapGlobal *tmphg,*tmphg1; - fbuf=ExtDft(filename,"PRJ"); + fbuf=ExtDefault(filename,"PRJ"); fbuf2=MStrPrint("#include \"%s\"",fbuf); if (map_name) - fbuf3=ExtDft(map_name,"MAP"); + fbuf3=ExtDefault(map_name,"MAP"); if (tmpaot=CompBuf(fbuf2,fbuf3,&error_count,&warning_count,mapfile_drv_let)) { aot_U8s=tmpaot->aot_U8s; @@ -550,7 +550,7 @@ I64 Comp(U8 *filename,U8 *map_name=NULL,U8 *out_name=NULL,U8 mapfile_drv_let=0) size-aot_U8s-sizeof(CBinFile)); Free(fbuf2); if (out_name) - fbuf2=ExtDft(out_name,"BIN"); + fbuf2=ExtDefault(out_name,"BIN"); else fbuf2=ExtChg(fbuf,"BIN"); FileWrite(fbuf2,bfh,size); @@ -614,7 +614,7 @@ I64 ExePrint(U8 *fmt,...) I64 ExeFile(U8 *name,I64 ccf_flags=0) {//JIT Compile and execute a file. I64 res; - U8 *name2=ExtDft(name,"HC"), + U8 *name2=ExtDefault(name,"HC"), *st=MStrPrint("#include \"%s\";",name2); res=ExePutS(st,name,ccf_flags); Free(st); @@ -657,7 +657,7 @@ I64 ExePrint2(U8 *fmt,...) I64 ExeFile2(U8 *name,I64 ccf_flags=0) {//throws exceptions I64 res; - U8 *name2=ExtDft(name,"HC"),*st=MStrPrint("#include \"%s\";",name2); + U8 *name2=ExtDefault(name,"HC"),*st=MStrPrint("#include \"%s\";",name2); res=ExePutS2(st,name,ccf_flags); Free(st); Free(name2); diff --git a/src/Compiler/Compiler.BIN b/src/Compiler/Compiler.BIN index cbbd3449..e54e97db 100755 Binary files a/src/Compiler/Compiler.BIN and b/src/Compiler/Compiler.BIN differ diff --git a/src/Compiler/CompilerA.HH b/src/Compiler/CompilerA.HH index 5859cbb0..f3a0dbb8 100755 --- a/src/Compiler/CompilerA.HH +++ b/src/Compiler/CompilerA.HH @@ -260,7 +260,7 @@ class CIntermediateStruct #define KW_START 21 #define KW_END 22 #define KW_CASE 23 -#define KW_DFT 24 +#define KW_DEFAULT 24 #define KW_PUBLIC 25 #define KW_OFFSET 26 #define KW_IMPORT 27 diff --git a/src/Compiler/Lex.HC b/src/Compiler/Lex.HC index 6d1feca7..c2dd9fbd 100755 --- a/src/Compiler/Lex.HC +++ b/src/Compiler/Lex.HC @@ -698,7 +698,7 @@ lex_float_start: case KW_INCLUDE: if (Lex(cc)!=TK_STR) goto lex_end; - fbuf=ExtDft(cc->cur_str,"HC"); + fbuf=ExtDefault(cc->cur_str,"HC"); buf2=FileNameAbs(fbuf); Free(fbuf); if (Bt(&sys_run_level,RLf_DOC)) @@ -1043,7 +1043,7 @@ lex_ifjit: if (Lex(cc)!=TK_STR) goto lex_end; tmph=CAlloc(sizeof(CHashSrcSym)); - fbuf=ExtDft(cc->cur_str,"DD"); + fbuf=ExtDefault(cc->cur_str,"DD"); tmph->str=FileNameAbs(fbuf); Free(fbuf); tmph->type=HTT_HELP_FILE|HTF_PUBLIC; diff --git a/src/Compiler/LexLib.HC b/src/Compiler/LexLib.HC index caeafa60..f8d712df 100755 --- a/src/Compiler/LexLib.HC +++ b/src/Compiler/LexLib.HC @@ -161,14 +161,14 @@ Bool MemberListCmp(CMemberList *tmpm1,CMemberList *tmpm2,I64 count=I64_MAX) tmpm1->member_class!=tmpm2->member_class || tmpm1->member_class_base!=tmpm2->member_class_base) return FALSE; - if (tmpm1->flags&MLF_DFT_AVAILABLE || tmpm2->flags&MLF_DFT_AVAILABLE) { - if (tmpm1->flags&(MLF_DFT_AVAILABLE|MLF_STR_DFT_AVAILABLE)!= - tmpm2->flags&(MLF_DFT_AVAILABLE|MLF_STR_DFT_AVAILABLE)) + if (tmpm1->flags&MLF_DEFAULT_AVAILABLE || tmpm2->flags&MLF_DEFAULT_AVAILABLE) { + if (tmpm1->flags&(MLF_DEFAULT_AVAILABLE|MLF_STR_DEFAULT_AVAILABLE)!= + tmpm2->flags&(MLF_DEFAULT_AVAILABLE|MLF_STR_DEFAULT_AVAILABLE)) return FALSE; - if (tmpm1->flags&MLF_STR_DFT_AVAILABLE) { - if (StrCmp(tmpm1->dft_val,tmpm2->dft_val)) + if (tmpm1->flags&MLF_STR_DEFAULT_AVAILABLE) { + if (StrCmp(tmpm1->default_val,tmpm2->default_val)) return FALSE; - } else if (tmpm1->dft_val!=tmpm2->dft_val) + } else if (tmpm1->default_val!=tmpm2->default_val) return FALSE; } tmpm1=tmpm1->next; @@ -188,8 +188,8 @@ U0 MemberListDel(CMemberList *tmpm) tmpm1=tmpm->next; Free(tmpm->str); LinkedListDel(tmpm->dim.next); - if (tmpm->flags & MLF_STR_DFT_AVAILABLE) - Free(tmpm->dft_val); + if (tmpm->flags & MLF_STR_DEFAULT_AVAILABLE) + Free(tmpm->default_val); if (tmpm->flags & MLF_FUN) HashDel(tmpm->fun_ptr-tmpm->fun_ptr->ptr_stars_count); tmp_meta=tmpm->meta; @@ -227,8 +227,8 @@ I64 MemberListSize(CHashClass *tmpc) while (tmpm) { res+=MSize2(tmpm->str); res+=LinkedListSize(tmpm->dim.next); - if (tmpm->flags & MLF_STR_DFT_AVAILABLE) - res+=MSize2(tmpm->dft_val); + if (tmpm->flags & MLF_STR_DEFAULT_AVAILABLE) + res+=MSize2(tmpm->default_val); if (tmpm->flags & MLF_FUN) res+=HashEntrySize2(tmpm->fun_ptr-tmpm->fun_ptr->ptr_stars_count); tmp_meta=tmpm->meta; diff --git a/src/Compiler/OpCodes.DD b/src/Compiler/OpCodes.DD index 403a25e2..12c85648 100755 --- a/src/Compiler/OpCodes.DD +++ b/src/Compiler/OpCodes.DD @@ -1,7 +1,7 @@ /* See $LK,"AsmHashLoad",A="MN:AsmHashLoad"$(). '!'= IEF_DONT_SWITCH_MODES -'&'= IEF_DFT +'&'= IEF_DEFAULT '%'= IEF_NOT_IN_64_BIT Not Allowed in 64-bit. '='= IEF_48_REX Rex 0x48 only if in 64-bit mode. '`'= IEF_REX_ONLY_R8_R15 diff --git a/src/Compiler/OptPass3.HC b/src/Compiler/OptPass3.HC index 57956bf2..810f888a 100755 --- a/src/Compiler/OptPass3.HC +++ b/src/Compiler/OptPass3.HC @@ -268,7 +268,7 @@ U0 OptPass3(CCompCtrl *cc,COptReg *reg_offsets) break; case IC_NOBOUND_SWITCH: case IC_SWITCH: - lb=OptLabelFwd(tmpi->ic_data(CCodeMisc *)->dft); + lb=OptLabelFwd(tmpi->ic_data(CCodeMisc *)->default); lb->use_count++; break; case IC_ASM: diff --git a/src/Compiler/ParseExp.HC b/src/Compiler/ParseExp.HC index c4f9890f..bd67f636 100755 --- a/src/Compiler/ParseExp.HC +++ b/src/Compiler/ParseExp.HC @@ -382,7 +382,7 @@ U0 ParseOffsetOf(CCompCtrl *cc) I64 ParseFunCall(CCompCtrl *cc,CPrsStk *ps,Bool indirect,CHashFun *tmpf) { - I64 i,argc_count,dft_val; + I64 i,argc_count,default_val; Bool is_first_arg=TRUE,needs_right_paren,is_print,is_putchars, is_template_fun; CHashClass *tmpc2,*last_class=NULL; @@ -452,20 +452,20 @@ I64 ParseFunCall(CCompCtrl *cc,CPrsStk *ps,Bool indirect,CHashFun *tmpf) } } } - if (tmpm->flags & MLF_DFT_AVAILABLE && + if (tmpm->flags & MLF_DEFAULT_AVAILABLE && (cc->token==')' || cc->token==',' || !needs_right_paren)) { - dft_val=tmpm->dft_val; + default_val=tmpm->default_val; if (tmpm->flags & MLF_LASTCLASS && last_class) - dft_val=(last_class-last_class->ptr_stars_count)->str; - if (tmpm->flags & (MLF_STR_DFT_AVAILABLE|MLF_LASTCLASS) && + default_val=(last_class-last_class->ptr_stars_count)->str; + if (tmpm->flags & (MLF_STR_DEFAULT_AVAILABLE|MLF_LASTCLASS) && cc->flags&CCF_AOT_COMPILE) { cm=COCMiscNew(cc,CMT_STR_CONST); ICAdd(cc,IC_STR_CONST,cm,cmp.internal_types[RT_U8]+1); - cm->st_len=StrLen(dft_val)+1; - cm->str=StrNew(dft_val); + cm->st_len=StrLen(default_val)+1; + cm->str=StrNew(default_val); cc->flags|=CCF_HAS_MISC_DATA; } else - ICAdd(cc,IC_IMM_I64,dft_val,tmpm->member_class); + ICAdd(cc,IC_IMM_I64,default_val,tmpm->member_class); } else { if (!ParseExpression(cc,NULL,FALSE,ps)) throw('Compiler'); diff --git a/src/Compiler/ParseLib.HC b/src/Compiler/ParseLib.HC index 8ece3f8b..5fde0fff 100755 --- a/src/Compiler/ParseLib.HC +++ b/src/Compiler/ParseLib.HC @@ -274,7 +274,7 @@ U8 *COCCompile(CCompCtrl *cc,I64 *_code_size,CDebugInfo **_dbg,I64 *_type) if (lb->type==CMT_JMP_TABLE) { for (i=0;irange;i++) lb->jmp_table[i]=OptLabelFwd(lb->jmp_table[i]); - lb->dft=OptLabelFwd(lb->dft); + lb->default=OptLabelFwd(lb->default); } lb=lb->next; } diff --git a/src/Compiler/ParseStatement.HC b/src/Compiler/ParseStatement.HC index abbfcae6..88a11b28 100755 --- a/src/Compiler/ParseStatement.HC +++ b/src/Compiler/ParseStatement.HC @@ -579,9 +579,9 @@ U0 ParseSwitch(CCompCtrl *cc,I64 try_count) { CSwitchCase *header=NULL,*tmps,*tmps1; //Leaks on except CSubSwitch head,*tmpss; //Leaks on except - CCodeMisc *lb_dft,*lb_fwd_case,*mc_jt,*lb_entry,**jmp_table; + CCodeMisc *lb_default,*lb_fwd_case,*mc_jt,*lb_entry,**jmp_table; CIntermediateCode *tmpi_sub,*tmpi_cmp,*tmpi_jmp,*tmpi_start; - Bool dft_found=FALSE,nobound; + Bool default_found=FALSE,nobound; I64 i,k_start=I64_MIN,k_end,lo=I64_MAX,hi=I64_MIN,range; if (cc->token=='(') @@ -595,8 +595,8 @@ U0 ParseSwitch(CCompCtrl *cc,I64 try_count) head.last->lb_break=COCMiscNew(cc,CMT_LABEL); head.last->lb_break->use_count++; - lb_dft=COCMiscNew(cc,CMT_LABEL); - lb_dft->use_count++; + lb_default=COCMiscNew(cc,CMT_LABEL); + lb_default->use_count++; mc_jt=COCMiscNew(cc,CMT_JMP_TABLE); mc_jt->begin=COCMiscNew(cc,CMT_LABEL); mc_jt->begin->use_count++; @@ -645,7 +645,7 @@ sw_cont: goto sw_sub_end; case KW_START: case KW_CASE: - case KW_DFT: + case KW_DEFAULT: if (cc->coc.coc_head.last==tmpi_start) { OptFree(tmpi_jmp); tmpss->lb_start=NULL; @@ -716,13 +716,13 @@ sw_cont: } else LexExcept(cc,"Expecting ':' at "); break; - case KW_DFT: + case KW_DEFAULT: if (head.next!=&head) { lb_fwd_case=COCMiscNew(cc,CMT_LABEL); tmpi_jmp=ICAdd(cc,IC_JMP,lb_fwd_case,0);//In case fall-thru } Lex(cc); - ICAdd(cc,IC_LABEL,lb_dft,0); + ICAdd(cc,IC_LABEL,lb_default,0); if (cc->token==':') Lex(cc); else @@ -736,7 +736,7 @@ sw_cont: } ICAdd(cc,IC_LABEL,lb_fwd_case,0); } - dft_found=TRUE; + default_found=TRUE; break; default: ParseStatement(cc,try_count,head.last->lb_break); @@ -761,8 +761,8 @@ sw_sub_end: LexExcept(cc,"Expecting ':' at "); } } - if (!dft_found) - ICAdd(cc,IC_LABEL,lb_dft,0); + if (!default_found) + ICAdd(cc,IC_LABEL,lb_default,0); if (0hi || !(0ic_data=lo; tmpi_cmp->ic_data=range; tmps=header; while (tmps) { tmps1=tmps->next; - if (jmp_table[tmps->val-lo]!=lb_dft) + if (jmp_table[tmps->val-lo]!=lb_default) LexExcept(cc,"Duplicate case at "); else jmp_table[tmps->val-lo]=tmps->label; Free(tmps); tmps=tmps1; } - mc_jt->dft=lb_dft; + mc_jt->default=lb_default; mc_jt->jmp_table=jmp_table; mc_jt->range=range; } diff --git a/src/Compiler/ParseVar.HC b/src/Compiler/ParseVar.HC index 452a1f6b..fd8d2d77 100755 --- a/src/Compiler/ParseVar.HC +++ b/src/Compiler/ParseVar.HC @@ -637,23 +637,23 @@ pvl_restart3: machine_code=LexExpression2Bin(cc,&type); if (!machine_code) throw('Compiler'); - tmpm->dft_val=Call(machine_code); + tmpm->default_val=Call(machine_code); tmpc2=OptClassFwd(tmpc2); if (tmpc2->raw_type==RT_F64) { if (type!=RT_F64) - tmpm->dft_val(F64)=tmpm->dft_val; + tmpm->default_val(F64)=tmpm->default_val; } else { if (type==RT_F64) - tmpm->dft_val=tmpm->dft_val(F64); + tmpm->default_val=tmpm->default_val(F64); } if (cc->flags & CCF_HAS_MISC_DATA) { - tmpm->dft_val=StrNew(tmpm->dft_val); - tmpm->flags|=MLF_STR_DFT_AVAILABLE; + tmpm->default_val=StrNew(tmpm->default_val); + tmpm->flags|=MLF_STR_DEFAULT_AVAILABLE; } Free(machine_code); cc->flags|=old_flags2&CCF_HAS_MISC_DATA; } - tmpm->flags|=MLF_DFT_AVAILABLE; + tmpm->flags|=MLF_DEFAULT_AVAILABLE; } LexPopNoRestore(cc); break; diff --git a/src/Demo/AcctExample/PersonalNotes.DD b/src/Demo/AcctExample/PersonalNotes.DD index 705a9f3c..cd40b2bd 100755 --- a/src/Demo/AcctExample/PersonalNotes.DD +++ b/src/Demo/AcctExample/PersonalNotes.DD @@ -216,7 +216,7 @@ $FG,5$$TX+CX,"TODO? Not really, just angst."$$FG$ $ID,5$CArrayDim dim; CHashFun *fun_ptr; $ID,-5$ -* extern of fun with dft arg of str? +* extern of fun with default arg of str? * ISO.C on FAT32 created by Windows or Linux are not contiguous. diff --git a/src/Demo/ClassMeta.HC b/src/Demo/ClassMeta.HC index ab9103d4..69f4dc4e 100755 --- a/src/Demo/ClassMeta.HC +++ b/src/Demo/ClassMeta.HC @@ -15,23 +15,23 @@ U0 RankOut(I64 i) class Test1Struct { - I64 age print_str "%2d" dft_val 38; - I64 color dft_val RED; //Accepts expressions - I64 rank print_str "%1d" dft_val 6/2 output_fun &RankOut; + I64 age print_str "%2d" default_val 38; + I64 color default_val RED; //Accepts expressions + I64 rank print_str "%1d" default_val 6/2 output_fun &RankOut; }; class Test2Struct { - I64 age print_str "%2d" dft_val 38 percentile 54.20; - I64 rank print_str "%1d" dft_val 5; - I64 serial_num print_str "%6d" dft_val 123456; + I64 age print_str "%2d" default_val 38 percentile 54.20; + I64 rank print_str "%1d" default_val 5; + I64 serial_num print_str "%6d" default_val 123456; }; U0 DumpStruct(U8 *_d,U8 *class_name=lastclass) {//lastclass is keyword. See $LK,"::/Demo/LastClass.HC"$. CHashClass *tmpc=HashFind(class_name,Fs->hash_table,HTT_CLASS); U8 *print_str; - I64 *q,dft_val; + I64 *q,default_val; U0 (* fp_output_fun)(I64 i); F64 percentile; if (!tmpc) return; @@ -48,8 +48,8 @@ U0 DumpStruct(U8 *_d,U8 *class_name=lastclass) "" print_str,*q; //This is slightly ambiguous -- if no meta is present it will return zero. - if (dft_val=MemberMetaData("dft_val",ml)) - " default:%d",dft_val; + if (default_val=MemberMetaData("default_val",ml)) + " default:%d",default_val; //This corrects for the ambiguity, allowing zero percentile. if (MemberMetaFind("percentile",ml)) {//check if it exists diff --git a/src/Demo/DolDoc/MenuSprite.HC b/src/Demo/DolDoc/MenuSprite.HC index 04415d0a..c8bbca38 100755 Binary files a/src/Demo/DolDoc/MenuSprite.HC and b/src/Demo/DolDoc/MenuSprite.HC differ diff --git a/src/Demo/Games/BattleLines.HC b/src/Demo/Games/BattleLines.HC index 6faf220f..c967c99c 100755 Binary files a/src/Demo/Games/BattleLines.HC and b/src/Demo/Games/BattleLines.HC differ diff --git a/src/Demo/Games/BlackDiamond.HC b/src/Demo/Games/BlackDiamond.HC index a193d87f..8f95a80b 100755 Binary files a/src/Demo/Games/BlackDiamond.HC and b/src/Demo/Games/BlackDiamond.HC differ diff --git a/src/Demo/Games/BomberGolf.HC b/src/Demo/Games/BomberGolf.HC index 626cf0a6..17519469 100755 Binary files a/src/Demo/Games/BomberGolf.HC and b/src/Demo/Games/BomberGolf.HC differ diff --git a/src/Demo/Games/CastleFrankenstein.HC b/src/Demo/Games/CastleFrankenstein.HC index bda86347..7b76e3bd 100755 --- a/src/Demo/Games/CastleFrankenstein.HC +++ b/src/Demo/Games/CastleFrankenstein.HC @@ -1,6 +1,6 @@ //Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.HC"$. -RegDft("ZenithOS/CastleFrankenstein","F64 best_score=9999;\n"); +RegDefault("ZenithOS/CastleFrankenstein","F64 best_score=9999;\n"); RegExe("ZenithOS/CastleFrankenstein"); //Set snap to 4 and width to 4 diff --git a/src/Demo/Games/CircleTrace.HC b/src/Demo/Games/CircleTrace.HC index c08a309a..e4cc6968 100755 --- a/src/Demo/Games/CircleTrace.HC +++ b/src/Demo/Games/CircleTrace.HC @@ -2,7 +2,7 @@ //Giotto, a famous artist, drew a freehand circle to get a job. -RegDft("ZenithOS/CircleTrace","F64 best_score=999;\n"); +RegDefault("ZenithOS/CircleTrace","F64 best_score=999;\n"); RegExe("ZenithOS/CircleTrace"); I64 cx,cy; @@ -50,7 +50,7 @@ U0 CircleTrace() cx=Fs->pix_width/2; cy=Fs->pix_height/2; - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS-WIF_SELF_BORDER; + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS-WIF_SELF_BORDER; Fs->draw_it=&DrawIt; DCFill; diff --git a/src/Demo/Games/DunGen.HC b/src/Demo/Games/DunGen.HC index 89c1fe0e..52af5960 100755 --- a/src/Demo/Games/DunGen.HC +++ b/src/Demo/Games/DunGen.HC @@ -1,4 +1,4 @@ -RegDft("ZenithOS/DunGen","F64 best_score=9999;\n"); +RegDefault("ZenithOS/DunGen","F64 best_score=9999;\n"); RegExe("ZenithOS/DunGen"); //Set snap to 4 and width to 4 diff --git a/src/Demo/Games/FlapBat.HC b/src/Demo/Games/FlapBat.HC index 5d6ee1cb..fa0a2c8d 100755 Binary files a/src/Demo/Games/FlapBat.HC and b/src/Demo/Games/FlapBat.HC differ diff --git a/src/Demo/Games/Maze.HC b/src/Demo/Games/Maze.HC index 5256d7d3..12e616b9 100755 --- a/src/Demo/Games/Maze.HC +++ b/src/Demo/Games/Maze.HC @@ -85,7 +85,7 @@ U0 Maze() DocCursor; DocClear; Fs->draw_it=&DrawIt; - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS-WIF_SELF_BORDER; + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS-WIF_SELF_BORDER; try do { diff --git a/src/Demo/Games/RawHide.HC b/src/Demo/Games/RawHide.HC index 88090790..72fc3ce7 100755 --- a/src/Demo/Games/RawHide.HC +++ b/src/Demo/Games/RawHide.HC @@ -1,6 +1,6 @@ //Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.HC"$. -RegDft("ZenithOS/RawHide","F64 best_score=9999;\n"); +RegDefault("ZenithOS/RawHide","F64 best_score=9999;\n"); RegExe("ZenithOS/RawHide"); F64 t0,tf; @@ -547,7 +547,7 @@ U0 RawHide() "Keep holding the $$GREEN$$$$FG$$ key and\n" "scroll with $$GREEN$${CTRL-Left Grab}$$FG$$."); - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS -WIF_SELF_BORDER-WIF_SELF_GRAB_SCROLL-WIF_FOCUS_TASK_MENU; AutoComplete; WinBorder; diff --git a/src/Demo/Games/Talons.HC b/src/Demo/Games/Talons.HC index a7b2e9e7..8383346d 100755 --- a/src/Demo/Games/Talons.HC +++ b/src/Demo/Games/Talons.HC @@ -1,6 +1,6 @@ //Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.HC"$. -RegDft("ZenithOS/Talons","F64 best_score=9999;\n"); +RegDefault("ZenithOS/Talons","F64 best_score=9999;\n"); RegExe("ZenithOS/Talons"); //Keep these power of two so shift is used instead of multiply diff --git a/src/Demo/Games/TreeCheckers.HC b/src/Demo/Games/TreeCheckers.HC index a187be83..e82e39f6 100755 --- a/src/Demo/Games/TreeCheckers.HC +++ b/src/Demo/Games/TreeCheckers.HC @@ -302,7 +302,7 @@ U0 TreeCheckers() DocCursor; DocClear; PopUpOk("Step on the link mid points.\n"); - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS -WIF_SELF_BORDER-WIF_FOCUS_TASK_MENU; try { cn_start: diff --git a/src/Demo/Games/Varoom.HC b/src/Demo/Games/Varoom.HC index 2db7b3d7..b1534564 100755 --- a/src/Demo/Games/Varoom.HC +++ b/src/Demo/Games/Varoom.HC @@ -87,7 +87,7 @@ -RegDft("ZenithOS/Varoom","F64 best_score=9999;\n"); +RegDefault("ZenithOS/Varoom","F64 best_score=9999;\n"); RegExe("ZenithOS/Varoom"); F64 distance,t0,tf; @@ -654,7 +654,7 @@ U0 Varoom() SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$ try { Fs->text_attr=YELLOW<<4+BLUE; - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS -WIF_SELF_GRAB_SCROLL-WIF_FOCUS_TASK_MENU; AutoComplete; WinBorder; diff --git a/src/Demo/Games/Wenceslas.HC b/src/Demo/Games/Wenceslas.HC index ec0317a9..622e1939 100755 --- a/src/Demo/Games/Wenceslas.HC +++ b/src/Demo/Games/Wenceslas.HC @@ -1,4 +1,4 @@ -RegDft("ZenithOS/Wenceslas","F64 best_score=9999;\n"); +RegDefault("ZenithOS/Wenceslas","F64 best_score=9999;\n"); RegExe("ZenithOS/Wenceslas"); #define BORDER 5 diff --git a/src/Demo/Games/Zing.HC b/src/Demo/Games/Zing.HC index 4a8d8d41..458f926f 100755 Binary files a/src/Demo/Games/Zing.HC and b/src/Demo/Games/Zing.HC differ diff --git a/src/Demo/Games/ZoneOut.HC b/src/Demo/Games/ZoneOut.HC index f7d20b6b..7dd9b903 100755 Binary files a/src/Demo/Games/ZoneOut.HC and b/src/Demo/Games/ZoneOut.HC differ diff --git a/src/Demo/Graphics/BSpline.HC b/src/Demo/Graphics/BSpline.HC index 53e492cc..08a2b393 100755 --- a/src/Demo/Graphics/BSpline.HC +++ b/src/Demo/Graphics/BSpline.HC @@ -7,7 +7,7 @@ U0 BSplineDemo() CD3I32 c[PTS_NUM]; SettingsPush; - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS-WIF_SELF_BORDER; + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS-WIF_SELF_BORDER; DocClear; "Sel ctrl points with left mouse.Right when finished.\n"; diff --git a/src/Demo/Graphics/Doodle.HC b/src/Demo/Graphics/Doodle.HC index 679d732e..59181f8b 100755 --- a/src/Demo/Graphics/Doodle.HC +++ b/src/Demo/Graphics/Doodle.HC @@ -6,7 +6,7 @@ U0 Doodle() CDC *dc=DCAlias; SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$ - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS-WIF_SELF_BORDER; + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS-WIF_SELF_BORDER; AutoComplete; WinBorder; diff --git a/src/Demo/Graphics/Lattice.HC b/src/Demo/Graphics/Lattice.HC index cfe3d3f7..7e77d84d 100755 --- a/src/Demo/Graphics/Lattice.HC +++ b/src/Demo/Graphics/Lattice.HC @@ -176,7 +176,7 @@ U0 Lattice() DocClear; TurtleInit(&tt); SetMenu; - Fs->win_inhibit=WIG_TASK_DFT-WIF_FOCUS_TASK_MENU + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_FOCUS_TASK_MENU -WIF_SELF_FOCUS-WIF_SELF_GRAB_SCROLL; Fs->draw_it=&DrawIt; try { diff --git a/src/Demo/Graphics/Life.HC b/src/Demo/Graphics/Life.HC index 032bc3fa..c5aed143 100755 --- a/src/Demo/Graphics/Life.HC +++ b/src/Demo/Graphics/Life.HC @@ -64,7 +64,7 @@ public U0 Life() Fs->animate_task=Spawn(&AnimateTask,NULL,"Animate",,Fs); Fs->draw_it=&DrawIt; - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS-WIF_SELF_BORDER; + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS-WIF_SELF_BORDER; do { message_code=GetMessage(&arg1,&arg2,1<win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS- + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS- WIF_SELF_BORDER-WIF_FOCUS_TASK_MENU; Fs->text_attr=BLACK<<4+WHITE; //Current $LK,"CTask",A="MN:CTask"$ is Fs segment register. AutoComplete; diff --git a/src/Demo/Graphics/Pick.HC b/src/Demo/Graphics/Pick.HC index 66112fe6..13cab091 100755 Binary files a/src/Demo/Graphics/Pick.HC and b/src/Demo/Graphics/Pick.HC differ diff --git a/src/Demo/Graphics/Pick3D.HC b/src/Demo/Graphics/Pick3D.HC index 96f18ada..80983951 100755 Binary files a/src/Demo/Graphics/Pick3D.HC and b/src/Demo/Graphics/Pick3D.HC differ diff --git a/src/Demo/Graphics/PoleZeros.HC b/src/Demo/Graphics/PoleZeros.HC index c9c82235..b26defc6 100755 --- a/src/Demo/Graphics/PoleZeros.HC +++ b/src/Demo/Graphics/PoleZeros.HC @@ -103,7 +103,7 @@ U0 PoleZeros() ); SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$ - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS-WIF_SELF_BORDER; + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS-WIF_SELF_BORDER; GrPaletteSet(gr_palette_gray); GrPaletteColorSet(15,0xFFFF00000000); //White is red diff --git a/src/Demo/Graphics/Speedline.HC b/src/Demo/Graphics/Speedline.HC index af37c432..0896989c 100755 --- a/src/Demo/Graphics/Speedline.HC +++ b/src/Demo/Graphics/Speedline.HC @@ -7,7 +7,7 @@ public U0 SpeedLineDemo() dc->color=color; SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$ - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS-WIF_SELF_BORDER; + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS-WIF_SELF_BORDER; AutoComplete; WinBorder; diff --git a/src/Demo/Graphics/Symmetry.HC b/src/Demo/Graphics/Symmetry.HC index d0ab4801..9b011668 100755 --- a/src/Demo/Graphics/Symmetry.HC +++ b/src/Demo/Graphics/Symmetry.HC @@ -9,7 +9,7 @@ U0 SymmetryDemo() CDC *dc=DCAlias; SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$ - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS-WIF_SELF_BORDER; + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS-WIF_SELF_BORDER; WinBorder; WinMax; diff --git a/src/Demo/Graphics/Transform.HC b/src/Demo/Graphics/Transform.HC index 674e3651..d555d107 100755 Binary files a/src/Demo/Graphics/Transform.HC and b/src/Demo/Graphics/Transform.HC differ diff --git a/src/Demo/MessageLoop.HC b/src/Demo/MessageLoop.HC index e4d0bf35..f9950bee 100755 --- a/src/Demo/MessageLoop.HC +++ b/src/Demo/MessageLoop.HC @@ -15,7 +15,7 @@ U0 MessageLoop() } while (message_code!=MESSAGE_KEY_DOWN || arg1!=CH_ESC && arg1!=CH_SHIFT_ESC); GetMessage(,,1<win_inhibit=WIG_USER_TASK_DFT; + Fs->win_inhibit=WIG_USER_TASK_DEFAULT; } MessageLoop; diff --git a/src/Demo/RandDemo.HC b/src/Demo/RandDemo.HC index 802b0950..d2a1dc8e 100755 --- a/src/Demo/RandDemo.HC +++ b/src/Demo/RandDemo.HC @@ -17,7 +17,7 @@ U0 RandDemo() I64 i; "Seed(0) will do timer XORed random numbers." - "A task starts with $LK,"Seed(0)",A="FF:::/Kernel/KTask.HC,Seed("$ by dft.\n"; + "A task starts with $LK,"Seed(0)",A="FF:::/Kernel/KTask.HC,Seed("$ by default.\n"; PressAKey; Seed; RandPts; @@ -58,7 +58,7 @@ U0 RandDemo() for (i=0;i<5;i++) "%d: %d\n",i,RandI16; - Seed; //Dft should be kept to zero. + Seed; //Default should be kept to zero. } RandDemo; diff --git a/src/Demo/RegistryDemo.HC b/src/Demo/RegistryDemo.HC index 0f984ddc..c046d532 100755 --- a/src/Demo/RegistryDemo.HC +++ b/src/Demo/RegistryDemo.HC @@ -7,8 +7,8 @@ is valid in HolyC you can place simple expressions without vars. */ -RegDft("DemoCompany/Game1","F64 best_score=1.23;\n"); -RegDft("DemoCompany/Game1/SimpleVal","1234;\n"); +RegDefault("DemoCompany/Game1","F64 best_score=1.23;\n"); +RegDefault("DemoCompany/Game1/SimpleVal","1234;\n"); RegExe("DemoCompany/Game1"); U0 Game() diff --git a/src/Demo/Templates/Registry1.HC b/src/Demo/Templates/Registry1.HC index 4557274e..c2046991 100755 --- a/src/Demo/Templates/Registry1.HC +++ b/src/Demo/Templates/Registry1.HC @@ -1,4 +1,4 @@ -RegDft("MyCompany/MyApp","F64 best_score=9999;\n"); +RegDefault("MyCompany/MyApp","F64 best_score=9999;\n"); RegExe("MyCompany/MyApp"); U0 Main() diff --git a/src/Demo/ToHtmlToTXTDemo/ToHtml.HC b/src/Demo/ToHtmlToTXTDemo/ToHtml.HC index f63c4316..352cc1dc 100755 --- a/src/Demo/ToHtmlToTXTDemo/ToHtml.HC +++ b/src/Demo/ToHtmlToTXTDemo/ToHtml.HC @@ -166,7 +166,7 @@ public CDoc *Doc2Html(CDoc *doc_in,U8 *html_header=NULL,U8 *body_header=NULL, 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; + doc_in->win_task->text_attr=DOC_ATTR_DEFAULT_TEXT; for (i=0xF0;i<=0xFF;i++) LBts(style_bitmap,i); @@ -368,9 +368,9 @@ public U0 ToHtml(U8 *_in_name,U8 *_out_name=NULL,U8 *html_header=NULL, SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$ WinHorz(0,width-1); //Sets doc width for word wrap. - in_name=ExtDft(_in_name,"HC"); + in_name=ExtDefault(_in_name,"HC"); if (_out_name) - out_name=ExtDft(_out_name,"html"); + out_name=ExtDefault(_out_name,"html"); else out_name=ExtChg(_in_name,"html"); diff --git a/src/Doc/FileMgr.DD b/src/Doc/FileMgr.DD index b999d0d4..2709fab6 100755 --- a/src/Doc/FileMgr.DD +++ b/src/Doc/FileMgr.DD @@ -49,10 +49,10 @@ $FG,2$'u'$FG$ $ID,2$Unmount drive(s). $ID,-2$ $FG,2$'m'$FG$ -$ID,2$Make CD/DVD ISO.C file. This creates a $LK,"RedSea",A="FI:::/Doc/RedSea.DD"$ ISO file image of the dir the cursor is on. The name of the ISO file is $FG,2$$TX,"\"::/Tmp/CDDVD.ISO.C\"",D="DFT_ISO_C_FILENAME"$$FG$ $LK,"blkdev.dft_iso_c_filename",A="MN:CBlkDevGlobals"$ and can be redefined in your start-up scripts. You may wish to place it on a different drive. +$ID,2$Make CD/DVD ISO.C file. This creates a $LK,"RedSea",A="FI:::/Doc/RedSea.DD"$ ISO file image of the dir the cursor is on. The name of the ISO file is $FG,2$$TX,"\"::/Tmp/CDDVD.ISO.C\"",D="DEFAULT_ISO_C_FILENAME"$$FG$ $LK,"blkdev.default_iso_c_filename",A="MN:CBlkDevGlobals"$ and can be redefined in your start-up scripts. You may wish to place it on a different drive. $ID,-2$ $FG,2$'B'$FG$ -$ID,2$Burn CD/DVD ISO file. This burns a CD/DVD using the image file, $FG,2$$TX,"\"::/Tmp/CDDVD.ISO\"",D="DFT_ISO_FILENAME"$$FG$ $LK,"blkdev.dft_iso_filename",A="MN:CBlkDevGlobals"$ to the drive the cursor is on. +$ID,2$Burn CD/DVD ISO file. This burns a CD/DVD using the image file, $FG,2$$TX,"\"::/Tmp/CDDVD.ISO\"",D="DEFAULT_ISO_FILENAME"$$FG$ $LK,"blkdev.default_iso_filename",A="MN:CBlkDevGlobals"$ to the drive the cursor is on. $ID,-2$ $FG,5$Instructions on Using CD/DVD's$FG$ @@ -60,7 +60,7 @@ $ID,2$If you have not recompiled Kernel and defined your CD/DVD drive, exit the $ID,-2$ $FG,5$Instructions on Burning CD/DVD's$FG$ -$ID,2$Create a temporary dir to hold files and copy files into the holding dir. Make an ISO image of the dir by pressing $FG,2$'M'$FG$ when on top of the dir. Press $FG,2$'B'$FG$ when on top of the CD/DVD ROM drive to burn the ISO, $FG,2$$TX,"\"::/Tmp/CDDVD.ISO\"",D="DFT_ISO_FILENAME"$$FG$ $LK,"blkdev.dft_iso_filename",A="MN:CBlkDevGlobals"$, to disk. If you have not recompiled $FG,2$Kernel$FG$ and defined your CD/DVD drive, exit the FileMgr and use $LK,"Mount",A="MN:Mount"$. +$ID,2$Create a temporary dir to hold files and copy files into the holding dir. Make an ISO image of the dir by pressing $FG,2$'M'$FG$ when on top of the dir. Press $FG,2$'B'$FG$ when on top of the CD/DVD ROM drive to burn the ISO, $FG,2$$TX,"\"::/Tmp/CDDVD.ISO\"",D="DEFAULT_ISO_FILENAME"$$FG$ $LK,"blkdev.default_iso_filename",A="MN:CBlkDevGlobals"$, to disk. If you have not recompiled $FG,2$Kernel$FG$ and defined your CD/DVD drive, exit the FileMgr and use $LK,"Mount",A="MN:Mount"$. $LK,"Making Your Own Distro",A="FI:::/Misc/DoDistro.HC"$ $ID,-2$ \ No newline at end of file diff --git a/src/Doc/Glossary.DD b/src/Doc/Glossary.DD index 8d0a5ca3..9b806a73 100755 --- a/src/Doc/Glossary.DD +++ b/src/Doc/Glossary.DD @@ -41,7 +41,7 @@ $FG,2$DC$FG$ Device Context $FG,2$Del$FG$ Delete $FG,2$Desc$FG$ Descriptor, Description $FG,2$Dev$FG$ Device -$FG,2$Dft$FG$ Default +$FG,2$Default$FG$ Default $FG,2$Dir$FG$ Directory, Direction $FG,2$Div$FG$ Divide $FG,2$Doc$FG$ Document diff --git a/src/Doc/HolyC.DD b/src/Doc/HolyC.DD index 2a3db69e..947da3c4 100755 --- a/src/Doc/HolyC.DD +++ b/src/Doc/HolyC.DD @@ -225,7 +225,7 @@ $FG$$ID,-2$ * $FG,2$class$FG$ member vars can have meta data. $FG,2$format$FG$ and $FG,2$data$FG$ are two meta data types now used. All compiler structures are saved and you can access the compiler's info about classes and vars. See $LK,"::/Demo/ClassMeta.HC"$ and $LK,"DocForm",A="MN:DocForm"$(). -* There is a keyword $FG,2$lastclass$FG$ you use as a dft arg. It is set to the class name of the prev arg. See $LK,"::/Demo/LastClass.HC"$, $LK,"ClassRep",A="MN:ClassRep"$(), $LK,"DocForm",A="MN:DocForm"$() and $LK,"::/Demo/Disk/BlkDevRep.HC"$. +* There is a keyword $FG,2$lastclass$FG$ you use as a default arg. It is set to the class name of the prev arg. See $LK,"::/Demo/LastClass.HC"$, $LK,"ClassRep",A="MN:ClassRep"$(), $LK,"DocForm",A="MN:DocForm"$() and $LK,"::/Demo/Disk/BlkDevRep.HC"$. * See $LK,"::/Demo/Exceptions.HC"$. $FG,2$try{} catch{}$FG$ and $FG,2$throw$FG$ are different from C++. $FG,2$throw$FG$ is a function with an 8-byte or less char arg. The char string passed in $FG,2$throw()$FG$ can be accessed from within a $FG,2$catch{}$FG$ using the $FG,2$Fs->except_ch$FG$. Within a $FG,2$catch {}$FG$ blk, set the var $FG,2$Fs->catch_except$FG$ to $FG,2$TRUE$FG$ if you want to terminate the search for a handler. Use $LK,"PutExcept",A="MN:PutExcept"$() as a handler, if you like. @@ -239,7 +239,7 @@ $FG$$ID,-2$ * You CAN $LK,"Free",A="MN:Free"$() a $FG,2$NULL$FG$ ptr. Useful variants of $LK,"MAlloc",A="MN:MAlloc"$() can be found $LK,"Here",A="MN:CAlloc"$. Each task has a heap and you can $FG,2$MAlloc$FG$ and $FG,2$Free$FG$ off-of other task's heaps, or make an independent heap with $LK,"HeapCtrlInit",A="MN:HeapCtrlInit"$(). See $LK,"HeapLog",A="MN:HeapLog"$() for an example. -* The stk does not grow because virtual mem is not used. I recommend allocating large local vars from the heap. You can change $LK,"MEM_DFT_STK",A="MN:MEM_DFT_STK"$ and recompile $FG,2$Kernel$FG$ or request more when doing a $LK,"Spawn",A="MN:Spawn"$(). You can use $LK,"CallStkGrow",A="MN:CallStkGrow"$(), but it's odd. See $LK,"::/Demo/StkGrow.HC"$. +* The stk does not grow because virtual mem is not used. I recommend allocating large local vars from the heap. You can change $LK,"MEM_DEFAULT_STK",A="MN:MEM_DEFAULT_STK"$ and recompile $FG,2$Kernel$FG$ or request more when doing a $LK,"Spawn",A="MN:Spawn"$(). You can use $LK,"CallStkGrow",A="MN:CallStkGrow"$(), but it's odd. See $LK,"::/Demo/StkGrow.HC"$. * Only one base class is allowed. diff --git a/src/Doc/Quirks.DD b/src/Doc/Quirks.DD index 31d2c853..12e20a9c 100755 --- a/src/Doc/Quirks.DD +++ b/src/Doc/Quirks.DD @@ -4,7 +4,7 @@ $WW,1$* You run a risk of problems if you do file operations on the same files s * When using $FG,2$FAT32$FG$, ZenithOS does not generate unique short-entry names, the ones with the $FG,2$~$FG$s. Not all $FG,2$FAT32$FG$ filenames are valid ZenithOS names and it will complain. Do not access $FG,2$FAT32$FG$ drives not dedicated to ZenithOS. Disable them with $LK,"DriveEnable",A="MN:DriveEnable"$(OFF), or they will generate error messages. $FG,2$FAT32$FG$ involves a long and short name for each file. -* The stk does not grow because virtual mem is not used. I recommend allocating large local vars from the heap. You can change $LK,"MEM_DFT_STK",A="MN:MEM_DFT_STK"$ and recompile $FG,2$Kernel$FG$ or request more when doing a $LK,"Spawn",A="MN:Spawn"$(). +* The stk does not grow because virtual mem is not used. I recommend allocating large local vars from the heap. You can change $LK,"MEM_DEFAULT_STK",A="MN:MEM_DEFAULT_STK"$ and recompile $FG,2$Kernel$FG$ or request more when doing a $LK,"Spawn",A="MN:Spawn"$(). * The syntax highlighting occassionally glitches. The compiler doesn't. diff --git a/src/Doc/Tips.DD b/src/Doc/Tips.DD index 83b525d7..2ac81c6c 100755 --- a/src/Doc/Tips.DD +++ b/src/Doc/Tips.DD @@ -31,7 +31,7 @@ $FG,2$Merge(\"C:/*\",\"D:/*\",\"+r+d\");$FG$ to check my changes. * You can recompile and reinstall the kernel with $LK,"BootHDIns",A="MN:BootHDIns"$(). You'll probably want to make a function for recompiling that uses the $LK,"In",A="MN:In"$() function to answer the cfg questions. See my technique $LK,"Cfg Strs",A="FL:::/Demo/AcctExample/TOS/TOSCfg.HC,1"$, $LK,"Update Funs",A="FL:::/Demo/AcctExample/TOS/TOSDistro.HC,1"$. -* $LK,"Scale2Mem",A="MN:Scale2Mem"$(min,max,limit=2*1024*1024*1024) can be used for cfg questions when recompiling. The $LK,"BootHDIns",A="MN:BootHDIns"$() cfg prompts accept expressions, not just numbers. The dft disk cache is $FG,2$Scale2Mem(0x80000,0x8000000)$FG$. +* $LK,"Scale2Mem",A="MN:Scale2Mem"$(min,max,limit=2*1024*1024*1024) can be used for cfg questions when recompiling. The $LK,"BootHDIns",A="MN:BootHDIns"$() cfg prompts accept expressions, not just numbers. The default disk cache is $FG,2$Scale2Mem(0x80000,0x8000000)$FG$. * You can permanently disable $FG,2$AutoComplete$FG$ commenting-out $LK,"ACInit",A="FF:/Home/HomeSys.HC,ACInit"$() in $LK,"~/HomeSys.HC",A="FF:/Home/HomeSys.HC,ACInit"$. @@ -43,7 +43,7 @@ $FG,2$Merge(\"C:/*\",\"D:/*\",\"+r+d\");$FG$ to check my changes. * Many data structures have a $FG,2$user_data$FG$ member. Those are available for you to store a data item, for convenience. $LK,"CTask",A="MN:CTask"$, $LK,"CDocEntry",A="MN:CDocEntry"$ and $LK,"CDirEntry",A="MN:CDirEntry"$ have them. You shouldn't encounter conflicts with ZenithOS using them. -* If, for some strange reason, you wanted to reduce mem usage, make a smaller disk cache when you recompile the kernel; disabling $FG,2$AutoComplete$FG$; Specify smaller stk sizes when doing $LK,"Spawn",A="MN:Spawn"$(), chang $LK,"MEM_DFT_STK",A="MN:MEM_DFT_STK"$, and using $LK,"DocMax",A="MN:DocMax"$() to reduce the cmd line buffer size. +* If, for some strange reason, you wanted to reduce mem usage, make a smaller disk cache when you recompile the kernel; disabling $FG,2$AutoComplete$FG$; Specify smaller stk sizes when doing $LK,"Spawn",A="MN:Spawn"$(), chang $LK,"MEM_DEFAULT_STK",A="MN:MEM_DEFAULT_STK"$, and using $LK,"DocMax",A="MN:DocMax"$() to reduce the cmd line buffer size. * Filenames ending in "$FG,2$$FG$" will be automatically compressed and uncompressed when read or written. The compression method is not supported by other operating systems. You can store files uncompressed by $LK,"Move",A="MN:Move"$()ing them to a filename not ending in "$FG,2$$FG$". See $LK,"::/Doc/TOSZ.DD"$ if you want to uncompress while in $FG,2$Linux$FG$. diff --git a/src/Home/MakeHome.HC b/src/Home/MakeHome.HC deleted file mode 100755 index 742a91fa..00000000 --- a/src/Home/MakeHome.HC +++ /dev/null @@ -1,13 +0,0 @@ -Cd(__DIR__);; - -//If these are not present in /Home, it uses the version in the root dir. You -//can make your own, modified, version of these files in your /Home directory. -#include "~/HomeLocalize" -#include "/Zenith/Boot/MakeBoot" -#include "/Zenith/Utils/MakeUtils" -#include "~/HomeWrappers" -MapFileLoad("::/Kernel/Kernel"); -MapFileLoad("::/Compiler/Compiler"); -#include "~/HomeKeyPlugIns" -#include "~/HomeSys" -Cd("..");; diff --git a/src/Kernel.BIN.C b/src/Kernel.BIN.C index 8d280722..cb22ed3e 100755 Binary files a/src/Kernel.BIN.C and b/src/Kernel.BIN.C differ diff --git a/src/Kernel/BlkDev/DiskCDDVD.HC b/src/Kernel/BlkDev/DiskCDDVD.HC index 18218c83..e25b1f1e 100755 --- a/src/Kernel/BlkDev/DiskCDDVD.HC +++ b/src/Kernel/BlkDev/DiskCDDVD.HC @@ -67,14 +67,14 @@ U0 DVDImageRead(U8 dvd_drv_let,U8 *out_name) CDrive *dv=Letter2Drive(dvd_drv_let); CBlkDev *bd=dv->bd; U8 *buf=MAlloc(COPY_BUF_BLKS<blk_size>>BLK_SIZE_BITS,blk=0,count,retry; BlkDevInit(bd); if (bd->type!=BDT_ATAPI) throw('BlkDev'); if (!out_name) - out_name=blkdev.dft_iso_filename; + out_name=blkdev.default_iso_filename; count=CeilU64(dv->size,spc); while (count>0) { if (count>COPY_BUF_BLKS) @@ -151,8 +151,8 @@ U0 DVDImageWrite(U8 dvd_drv_let,U8 *in_name=NULL,I64 media_type=MT_DVD) CFile *f; if (!in_name) - in_name=blkdev.dft_iso_filename; - in_name3=ExtDft(in_name,"ISO"); + in_name=blkdev.default_iso_filename; + in_name3=ExtDefault(in_name,"ISO"); in_name2=FileNameAbs(in_name3); f=FOpen(in_name2,"r"); if (!f) { diff --git a/src/Kernel/BlkDev/DiskStrA.HC b/src/Kernel/BlkDev/DiskStrA.HC index 821fa363..e33dbce4 100755 --- a/src/Kernel/BlkDev/DiskStrA.HC +++ b/src/Kernel/BlkDev/DiskStrA.HC @@ -209,7 +209,7 @@ U8 *ExtChg(U8 *filename,U8 *extension) return CatPrint(res,".%s",extension); } -U8 *ExtDft(U8 *filename,U8 *extension) +U8 *ExtDefault(U8 *filename,U8 *extension) {//Give extension if has none. U8 *res=MAlloc(StrLen(filename)+1+StrLen(extension)+1); StrCpy(res,filename); @@ -300,7 +300,7 @@ returns default. ("/Kernel/BlkDev",NULL,"PRJ") returns "D:/Kernel/Kernel.PRJ" ("/Apps/Psalmody","Load","HC") returns "D:/Apps/Psalmody/Load.HC" */ - U8 *st=DirNameAbs(dirname),*st2,*st3,*res,*dft=NULL,*ext; + U8 *st=DirNameAbs(dirname),*st2,*st3,*res,*default=NULL,*ext; if (_extension && *_extension) { if (*_extension=='.') ext=StrNew(_extension); @@ -323,13 +323,13 @@ returns default. else res=StrNew(st); } - if (!dft) - dft=StrNew(res); + if (!default) + default=StrNew(res); if (!*ext && (!name||!*name) || FileFind(res)) { Free(st3); Free(st2); Free(st); - Free(dft); + Free(default); Free(ext); return res; } @@ -339,5 +339,5 @@ returns default. } Free(st); Free(ext); - return dft; + return default; } diff --git a/src/Kernel/Job.HC b/src/Kernel/Job.HC index ceea9943..a2f12d1f 100755 --- a/src/Kernel/Job.HC +++ b/src/Kernel/Job.HC @@ -473,7 +473,7 @@ U0 InStr(U8 *fmt,...) U0 InFile(U8 *filename) {//Send InFile code file to self. - U8 *name=ExtDft(filename,"IN"); + U8 *name=ExtDefault(filename,"IN"); InStr("Cd(\"%C:%s\");;#include \"%s\"", Drive2Letter(Fs->cur_dv),Fs->cur_dir,name); Free(name); diff --git a/src/Kernel/KDebug.HC b/src/Kernel/KDebug.HC index ab657ce7..534fb339 100755 --- a/src/Kernel/KDebug.HC +++ b/src/Kernel/KDebug.HC @@ -546,7 +546,7 @@ U0 Debug2() dbg.panic=TRUE; old_waiting_message=LBtr(&Fs->task_flags,TASKf_AWAITING_MESSAGE); old_win_inhibit=Fs->win_inhibit; - Fs->win_inhibit=WIG_USER_TASK_DFT; + Fs->win_inhibit=WIG_USER_TASK_DEFAULT; sys_focus_task=Fs; kbd.scan_code=0; old_getstr2=fp_getstr2; diff --git a/src/Kernel/KExts.HC b/src/Kernel/KExts.HC index c1f3bdef..eb367fd4 100755 --- a/src/Kernel/KExts.HC +++ b/src/Kernel/KExts.HC @@ -40,7 +40,7 @@ extern Bool DriveTypeSet(U8 drv_let,I64 type=FSt_REDSEA); extern U0 DrivesRelease(); extern U0 DiskCacheInvalidate(CDrive *dv); extern U0 Exit(); -extern U8 *ExtDft(U8 *filename,U8 *extension); +extern U8 *ExtDefault(U8 *filename,U8 *extension); extern I64 FAT32AllocClus(CDrive *dv,I64 c,I64 count); extern I64 FAT32AllocContiguousClus(CDrive *dv,I64 count); extern Bool FAT32DirNew(CDrive *dv,U8 *cur_dir,CDirEntry *tmpde, diff --git a/src/Kernel/KLoad.HC b/src/Kernel/KLoad.HC index 0263583c..05f338da 100755 --- a/src/Kernel/KLoad.HC +++ b/src/Kernel/KLoad.HC @@ -185,7 +185,7 @@ CBinFile *Load(U8 *filename,I64 ld_flags=0,CBinFile *bfh_addr=INVALID_PTR) I64 size,module_align,misalignment; CBinFile *bfh; - fbuf=ExtDft(filename,"BIN"); + fbuf=ExtDefault(filename,"BIN"); if (!(bfh=FileRead(fbuf,&size))) { Free(fbuf); return NULL; diff --git a/src/Kernel/KMain.HC b/src/Kernel/KMain.HC index c6c66b2d..9c290a04 100755 --- a/src/Kernel/KMain.HC +++ b/src/Kernel/KMain.HC @@ -9,8 +9,8 @@ U0 SysGlobalsInit() sys_focus_task=Fs; QueueInit(&sys_macro_head); - blkdev.dft_iso_filename =AStrNew(DFT_ISO_FILENAME); - blkdev.dft_iso_c_filename =AStrNew(DFT_ISO_C_FILENAME); + blkdev.default_iso_filename =AStrNew(DEFAULT_ISO_FILENAME); + blkdev.default_iso_c_filename =AStrNew(DEFAULT_ISO_C_FILENAME); blkdev.tmp_filename =AStrNew("~/Tmp.DD"); blkdev.dvd_boot_is_good=TRUE; #exe { diff --git a/src/Kernel/KStart32.HC b/src/Kernel/KStart32.HC index 52ded94b..3e90657b 100755 --- a/src/Kernel/KStart32.HC +++ b/src/Kernel/KStart32.HC @@ -66,10 +66,10 @@ SYS_MP_CNT:: DU64 1; SYS_MP_CNT_INITIAL:: DU64 1; SYS_MP_CNT_LOCK:: DU64 1; - ALIGN DFT_CACHE_LINE_WIDTH,OC_NOP -SYS_CACHE_LINE_WIDTH:: DU64 DFT_CACHE_LINE_WIDTH; - DU8 DFT_CACHE_LINE_WIDTH-sizeof(CBinFile)-8 DUP(0); -SYS_SEMAS:: DU8 SEMA_SEMAS_NUM*DFT_CACHE_LINE_WIDTH DUP(0); + ALIGN DEFAULT_CACHE_LINE_WIDTH,OC_NOP +SYS_CACHE_LINE_WIDTH:: DU64 DEFAULT_CACHE_LINE_WIDTH; + DU8 DEFAULT_CACHE_LINE_WIDTH-sizeof(CBinFile)-8 DUP(0); +SYS_SEMAS:: DU8 SEMA_SEMAS_NUM*DEFAULT_CACHE_LINE_WIDTH DUP(0); //************************************ ALIGN 16,OC_NOP CORE0_32BIT_INIT:: //Entry point for $LK,"BootRAM",A="MN:BootRAM"$. diff --git a/src/Kernel/KTask.HC b/src/Kernel/KTask.HC index 8a3c6308..94147e0a 100755 --- a/src/Kernel/KTask.HC +++ b/src/Kernel/KTask.HC @@ -197,7 +197,7 @@ I64 TaskInit(CTask *task,I64 stk_size) task->task_num=sys_num_spawned_tasks++; task->rflags=RFLAGG_NORMAL; - task->win_inhibit=WIG_TASK_DFT; + task->win_inhibit=WIG_TASK_DEFAULT; task->next_child_task=task->last_child_task= (&task->next_child_task)(U8 *)-offset(CTask.next_sibling_task); @@ -215,7 +215,7 @@ I64 TaskInit(CTask *task,I64 stk_size) task->hash_table=HashTableNew(TASK_HASH_TABLE_SIZE,task); if (!stk_size) - stk_size=MEM_DFT_STK; + stk_size=MEM_DEFAULT_STK; task->stk=tmps=TaskStkNew(stk_size,task); task->rsp=(&tmps->stk_base)(U8 *)+tmps->stk_size; @@ -406,7 +406,7 @@ U0 UserTaskCont() U0 SrvCmdLine(I64 dummy=0) { no_warn dummy; - Fs->win_inhibit=WIG_USER_TASK_DFT; + Fs->win_inhibit=WIG_USER_TASK_DEFAULT; CallExtStr("SrvStartUp"); SrvTaskCont; } @@ -414,7 +414,7 @@ U0 SrvCmdLine(I64 dummy=0) U0 UserCmdLine(I64 dummy=0) {//A user task ends-up calling this. no_warn dummy; - Fs->win_inhibit=WIG_USER_TASK_DFT; + Fs->win_inhibit=WIG_USER_TASK_DEFAULT; CallExtStr("UserStartUp"); if (!LBts(&Fs->display_flags,DISPLAYf_SHOW)) Debug; diff --git a/src/Kernel/Kernel.MAP b/src/Kernel/Kernel.MAP index be59d0d5..328d7f1e 100755 --- a/src/Kernel/Kernel.MAP +++ b/src/Kernel/Kernel.MAP @@ -11,6 +11,7 @@ $LK,"ICF_ARG2_TO_F64",A="FL:::/Kernel/KernelA.HH,1606"$ $LK,"DOCM_CANCEL",A="FL:::/Kernel/KernelA.HH,1355"$ $LK,"BLK_SIZE",A="FL:::/Kernel/KernelA.HH,2309"$ $LK,"ARGT_SS",A="FL:::/Kernel/KernelA.HH,1938"$ +$LK,"DOCEf_DEFAULT_RAW_TYPE",A="FL:::/Kernel/KernelA.HH,1116"$ $LK,"c32_eax",A="FL:::/Kernel/PCIBIOS.HC,152"$ $LK,"ARGT_EAX",A="FL:::/Kernel/KernelA.HH,1931"$ $LK,"DOCT_HEADER",A="FL:::/Kernel/KernelA.HH,917"$ @@ -26,6 +27,7 @@ $LK,"RLf_BLKDEV",A="FL:::/Kernel/KernelA.HH,463"$ $LK,"DriveModelNum",A="FL:::/Kernel/BlkDev/DiskDrive.HC,303",BI=3$ $LK,"c32_ecx",A="FL:::/Kernel/PCIBIOS.HC,154"$ $LK,"CCF_USE_LAST_U16",A="FL:::/Kernel/KernelA.HH,2168"$ +$LK,"DEFAULT_CACHE_LINE_WIDTH",A="FL:::/Kernel/KernelA.HH,604"$ $LK,"SSF_INACTIVE",A="FL:::/Kernel/KernelA.HH,225"$ $LK,"MSF_INACTIVE",A="FL:::/Kernel/KernelA.HH,208"$ $LK,"Letter2Drive",A="FL:::/Kernel/BlkDev/DiskDrive.HC,188",BI=4$ @@ -114,7 +116,6 @@ $LK,"CDocUndo",A="FL:::/Kernel/KernelA.HH,1347"$ $LK,"ROPB_XOR",A="FL:::/Kernel/KernelA.HH,2890"$ $LK,"FUF_JUST_FILES",A="FL:::/Kernel/KernelA.HH,2578"$ $LK,"ATA_SET_MAX",A="FL:::/Kernel/KernelA.HH,2274"$ -$LK,"IEF_DFT",A="FL:::/Kernel/KernelA.HH,1741"$ $LK,"RT_F32",A="FL:::/Kernel/KernelA.HH,1575"$ $LK,"FUf_JUST_FILES",A="FL:::/Kernel/KernelA.HH,2550"$ $LK,"ARGT_M1632",A="FL:::/Kernel/KernelA.HH,1919"$ @@ -125,6 +126,8 @@ $LK,"RFLAGf_AUX_CARRY",A="FL:::/Kernel/KernelA.HH,323"$ $LK,"DOCEf_LEFT_X",A="FL:::/Kernel/KernelA.HH,1080"$ $LK,"Mem64DevFree",A="FL:::/Kernel/Mem/MemPhysical.HC,127",BI=19$ $LK,"Mem32DevFree",A="FL:::/Kernel/Mem/MemPhysical.HC,91",BI=20$ +$LK,"DOCT_DEFAULT_BACKGROUND",A="FL:::/Kernel/KernelA.HH,923"$ +$LK,"DOCT_DEFAULT_FOREGROUND",A="FL:::/Kernel/KernelA.HH,922"$ $LK,"ARGT_UIMM64",A="FL:::/Kernel/KernelA.HH,1902"$ $LK,"ATARepEntry",A="FL:::/Kernel/BlkDev/DiskATAId.HC,91",BI=21$ $LK,"BLUE",A="FL:::/Kernel/KernelA.HH,2915"$ @@ -155,7 +158,6 @@ $LK,"ScanCode2Char",A="FL:::/Kernel/SerialDev/Keyboard.HC,136",BI=27$ $LK,"DefineListLoad",A="FL:::/Kernel/KDefine.HC,13",BI=28$ $LK,"_D3_ADD",A="FL:::/Kernel/KMathA.HC,131"$ $LK,"RCache",A="FL:::/Kernel/BlkDev/DiskCache.HC,119",BI=29$ -$LK,"DOC_ATTR_DFT_TEXT",A="FL:::/Kernel/KernelA.HH,1139"$ $LK,"D3Dot",A="FL:::/Kernel/KernelB.HH,153"$ $LK,"ARGT_RAX",A="FL:::/Kernel/KernelA.HH,1932"$ $LK,"EDf_WAS_WRITE",A="FL:::/Kernel/KernelA.HH,1267"$ @@ -483,7 +485,6 @@ $LK,"CCf_PMT",A="FL:::/Kernel/KernelA.HH,2139"$ $LK,"ACD_EXTRA",A="FL:::/Kernel/KernelA.HH,1521"$ $LK,"WIf_SELF_ODE",A="FL:::/Kernel/KernelA.HH,1458"$ $LK,"WIF_SELF_ODE",A="FL:::/Kernel/KernelA.HH,1430"$ -$LK,"MLF_DFT_AVAILABLE",A="FL:::/Kernel/KernelA.HH,779"$ $LK,"COREAP_16BIT_INIT",A="FL:::/Kernel/MultiProc.HC,9"$ $LK,"SCf_NUM",A="FL:::/Kernel/KernelA.HH,3469"$ $LK,"RS_ATTR_RESIDENT",A="FL:::/Kernel/KernelA.HH,2507"$ @@ -498,7 +499,6 @@ $LK,"sys_boot_blk",A="FL:::/Kernel/KernelB.HH,38"$ $LK,"TASKf_PENDING_BREAK",A="FL:::/Kernel/KernelA.HH,3240"$ $LK,"BDf_EXT_SIZE",A="FL:::/Kernel/KernelA.HH,2627"$ $LK,"JOBT_SPAWN_TASK",A="FL:::/Kernel/KernelA.HH,3145"$ -$LK,"DFT_ISO_FILENAME",A="FL:::/Kernel/KernelA.HH,2727"$ $LK,"DOCEF_UPDATE_DATA",A="FL:::/Kernel/KernelA.HH,1013"$ $LK,"TASKf_KILL_TASK",A="FL:::/Kernel/KernelA.HH,3230"$ $LK,"ACD_H1",A="FL:::/Kernel/KernelA.HH,1513"$ @@ -524,6 +524,7 @@ $LK,"FF_BUF_DIRTY",A="FL:::/Kernel/KernelA.HH,2758"$ $LK,"ICF_SWAP",A="FL:::/Kernel/KernelA.HH,1622"$ $LK,"_STRMATCH",A="FL:::/Kernel/StrA.HC,223"$ $LK,"CMsStateGlobals",A="FL:::/Kernel/KernelA.HH,2998"$ +$LK,"DEFAULT_ISO_FILENAME",A="FL:::/Kernel/KernelA.HH,2727"$ $LK,"MSF_FIXED",A="FL:::/Kernel/KernelA.HH,209"$ $LK,"MEM_HEAP_BASE",A="FL:::/Kernel/KStart32.HC,6"$ $LK,"_CPUID",A="FL:::/Kernel/KUtils.HC,319"$ @@ -539,6 +540,7 @@ $LK,"ARGT_NONE",A="FL:::/Kernel/KernelA.HH,1889"$ $LK,"DOCT_DATA",A="FL:::/Kernel/KernelA.HH,935"$ $LK,"SUF_T2S",A="FL:::/Kernel/KernelA.HH,3738"$ $LK,"MEM_MIN_MEG",A="FL:::/Kernel/KernelA.HH,3411"$ +$LK,"DOC_ATTR_DEFAULT_TEXT",A="FL:::/Kernel/KernelA.HH,1139"$ $LK,"exp_1",A="FL:::/Kernel/KernelA.HH,53"$ $LK,"CTRL_KEY_SCAN_DECODE_TABLE",A="FL:::/Kernel/SerialDev/Keyboard.HC,15"$ $LK,"G2",A="FL:::/Kernel/KDebug.HC,469",BI=118$ @@ -735,6 +737,7 @@ $LK,"Letter2BlkDevType",A="FL:::/Kernel/BlkDev/DiskDrive.HC,172",BI=150$ $LK,"Fs",A="FL:::/Kernel/KernelB.HH,288"$ $LK,"SCF_CAPS",A="FL:::/Kernel/KernelA.HH,3483"$ $LK,"SCf_CAPS",A="FL:::/Kernel/KernelA.HH,3468"$ +$LK,"WIG_USER_TASK_DEFAULT",A="FL:::/Kernel/KernelA.HH,1448"$ $LK,"In",A="FL:::/Kernel/Job.HC,482",BI=151$ $LK,"ACD_DEF_CHAR",A="FL:::/Kernel/KernelA.HH,1527"$ $LK,"Gs",A="FL:::/Kernel/KernelB.HH,245"$ @@ -1048,7 +1051,6 @@ $LK,"DOCT_TEXT",A="FL:::/Kernel/KernelA.HH,905"$ $LK,"CMathODE",A="FL:::/Kernel/KernelA.HH,252"$ $LK,"WinInside",A="FL:::/Kernel/Display.HC,110",BI=226$ $LK,"str2color_list",A="FL:::/Kernel/KDefine.HC,156"$ -$LK,"WIG_NO_FOCUS_TASK_DFT",A="FL:::/Kernel/KernelA.HH,1446"$ $LK,"SEMA_FIX",A="FL:::/Kernel/KernelA.HH,631"$ $LK,"RFLAGf_ALIGN_CHECK",A="FL:::/Kernel/KernelA.HH,335"$ $LK,"MsHardSet",A="FL:::/Kernel/SerialDev/Mouse.HC,272",BI=227$ @@ -1129,7 +1131,6 @@ $LK,"WIF_FOCUS_TASK_MENU",A="FL:::/Kernel/KernelA.HH,1433"$ $LK,"RedSeaCd",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,236",BI=241$ $LK,"JobDel",A="FL:::/Kernel/Job.HC,1",BI=242$ $LK,"SC_F6",A="FL:::/Kernel/KernelA.HH,3522"$ -$LK,"DFT_ISO_C_FILENAME",A="FL:::/Kernel/KernelA.HH,2728"$ $LK,"SysGrInit",A="FL:::/Kernel/KMain.HC,65",BI=243$ $LK,"ArcCtrlDel",A="FL:::/Kernel/Compress.HC,244",BI=244$ $LK,"SysBadMAlloc",A="FL:::/Kernel/Mem/MemPag.HC,6",BI=245$ @@ -1214,6 +1215,7 @@ $LK,"TK_AND_AND",A="FL:::/Kernel/KernelA.HH,2098"$ $LK,"REG_NONE",A="FL:::/Kernel/KernelA.HH,1797"$ $LK,"OC_LOCK_PREFIX",A="FL:::/Kernel/KernelA.HH,1769"$ $LK,"Ff_INTERRUPT",A="FL:::/Kernel/KernelA.HH,852"$ +$LK,"MLF_DEFAULT_AVAILABLE",A="FL:::/Kernel/KernelA.HH,779"$ $LK,"DriveLock",A="FL:::/Kernel/BlkDev/DiskDrive.HC,1",BI=266$ $LK,"CFunSegCache",A="FL:::/Kernel/KernelA.HH,3801"$ $LK,"OM_CD",A="FL:::/Kernel/KernelA.HH,1883"$ @@ -1278,6 +1280,7 @@ $LK,"OM_CW",A="FL:::/Kernel/KernelA.HH,1882"$ $LK,"DOCF_DONT_SWAP_OUT",A="FL:::/Kernel/KernelA.HH,1290"$ $LK,"IA32_LAPIC_BASE",A="FL:::/Kernel/KernelA.HH,541"$ $LK,"ATACmd",A="FL:::/Kernel/BlkDev/DiskATA.HC,59",BI=274$ +$LK,"DEFAULT_ISO_C_FILENAME",A="FL:::/Kernel/KernelA.HH,2728"$ $LK,"FILEMASK_DD",A="FL:::/Kernel/KernelA.HH,2303"$ $LK,"DOCEf_SHIFTED_X",A="FL:::/Kernel/KernelA.HH,1070"$ $LK,"DOCEG_DONT_EDIT",A="FL:::/Kernel/KernelA.HH,1040"$ @@ -1297,7 +1300,6 @@ $LK,"DOCEF_BIN_PTR_LINK",A="FL:::/Kernel/KernelA.HH,980"$ $LK,"SYS_CPU_STRUCTS",A="FL:::/Kernel/KStart32.HC,64"$ $LK,"DOCf_DONT_SWAP_OUT",A="FL:::/Kernel/KernelA.HH,1327"$ $LK,"CDocEntryBase",A="FL:::/Kernel/KernelA.HH,1170"$ -$LK,"MLF_STR_DFT_AVAILABLE",A="FL:::/Kernel/KernelA.HH,781"$ $LK,"ArcCtrlNew",A="FL:::/Kernel/Compress.HC,221",BI=278$ $LK,"DCF_DONT_DRAW",A="FL:::/Kernel/KernelA.HH,3579"$ $LK,"DOC_SCROLL_SPEED",A="FL:::/Kernel/KernelA.HH,1131"$ @@ -1338,6 +1340,7 @@ $LK,"SYS_BOOT_BLK",A="FL:::/Kernel/KStart16.HC,24"$ $LK,"progress4_desc",A="FL:::/Kernel/KernelB.HH,229"$ $LK,"RFLAGf_ZERO",A="FL:::/Kernel/KernelA.HH,324"$ $LK,"mp_count_lock",A="FL:::/Kernel/KernelB.HH,241"$ +$LK,"IEF_DEFAULT",A="FL:::/Kernel/KernelA.HH,1741"$ $LK,"PCIReadU8",A="FL:::/Kernel/PCIBIOS.HC,163",BI=285$ $LK,"EXT_WIN_FOCUS",A="FL:::/Kernel/KernelA.HH,597"$ $LK,"CHashAC",A="FL:::/Kernel/KernelA.HH,758"$ @@ -1380,7 +1383,6 @@ $LK,"BDF_READ_ONLY",A="FL:::/Kernel/KernelA.HH,2611"$ $LK,"ISOT_BOOT_RECORD",A="FL:::/Kernel/KernelA.HH,2462"$ $LK,"DCF_JUST_MIRROR",A="FL:::/Kernel/KernelA.HH,3576"$ $LK,"FSt_UNKNOWN",A="FL:::/Kernel/KernelA.HH,2663"$ -$LK,"WIG_USER_TASK_DFT",A="FL:::/Kernel/KernelA.HH,1448"$ $LK,"KMain",A="FL:::/Kernel/KMain.HC,135",BI=297$ $LK,"sys_cache_line_width",A="FL:::/Kernel/KernelB.HH,280"$ $LK,"XchgI64",A="FL:::/Kernel/KernelB.HH,271"$ @@ -1389,6 +1391,7 @@ $LK,"WIF_FOCUS_TASK_MS_R",A="FL:::/Kernel/KernelA.HH,1437"$ $LK,"DOF_DONT_WINMGR_SYNC",A="FL:::/Kernel/KernelA.HH,1231"$ $LK,"RLf_ZENITH_SERVER",A="FL:::/Kernel/KernelA.HH,471"$ $LK,"I_SINGLE_STEP",A="FL:::/Kernel/KernelA.HH,301"$ +$LK,"MEM_DEFAULT_STK",A="FL:::/Kernel/KernelA.HH,2843"$ $LK,"ATA_WRITE_MULTI",A="FL:::/Kernel/KernelA.HH,2278"$ $LK,"DOC_COLOR_KEYWORD",A="FL:::/Kernel/KernelA.HH,1155"$ $LK,"XTalkStr",A="FL:::/Kernel/Job.HC,489",BI=298$ @@ -1405,6 +1408,7 @@ $LK,"_MALLOC",A="FL:::/Kernel/Mem/MAllocFree.HC,5"$ $LK,"CHashDefineStr",A="FL:::/Kernel/KernelA.HH,829"$ $LK,"MemSet",A="FL:::/Kernel/KernelB.HH,171"$ $LK,"_TRUNC",A="FL:::/Kernel/KMathA.HC,400"$ +$LK,"WIG_NO_FOCUS_TASK_DEFAULT",A="FL:::/Kernel/KernelA.HH,1446"$ $LK,"HTF_IMM",A="FL:::/Kernel/KernelA.HH,710"$ $LK,"char_bmp_dec_numeric",A="FL:::/Kernel/StrA.HC,350"$ $LK,"FUF_IGNORE",A="FL:::/Kernel/KernelA.HH,2568"$ @@ -1503,68 +1507,70 @@ $LK,"SysUntry",A="FL:::/Kernel/KExcept.HC,77",BI=325$ $LK,"WIF_FOCUS_TASK_BORDER",A="FL:::/Kernel/KernelA.HH,1440"$ $LK,"_MEMCMP",A="FL:::/Kernel/KUtils.HC,70"$ $LK,"DISPLAYf_NO_BORDER",A="FL:::/Kernel/KernelA.HH,3250"$ +$LK,"DOCEF_DEFAULT_LEN",A="FL:::/Kernel/KernelA.HH,1029"$ $LK,"OFF",A="FL:::/Kernel/KernelA.HH,23"$ $LK,"DOCF_DO_FULL_REFRESH",A="FL:::/Kernel/KernelA.HH,1291"$ $LK,"FifoI64Remove",A="FL:::/Kernel/KDataTypes.HC,275",BI=326$ -$LK,"ExtDft",A="FL:::/Kernel/BlkDev/DiskStrA.HC,212",BI=327$ $LK,"SYS_BOOT_SRC",A="FL:::/Kernel/KStart16.HC,23"$ $LK,"FUF_JUST_SRC",A="FL:::/Kernel/KernelA.HH,2581"$ $LK,"FUf_JUST_SRC",A="FL:::/Kernel/KernelA.HH,2553"$ $LK,"OC_CALL",A="FL:::/Kernel/KernelA.HH,1772"$ -$LK,"TaskExe",A="FL:::/Kernel/Job.HC,39",BI=328$ -$LK,"KbdMessagesQueue",A="FL:::/Kernel/SerialDev/Keyboard.HC,467",BI=329$ -$LK,"FileWrite",A="FL:::/Kernel/BlkDev/DiskFile.HC,79",BI=330$ +$LK,"DOCE_LEN_DEFAULT",A="FL:::/Kernel/KernelA.HH,1190"$ +$LK,"DOCEf_DEFAULT_LEN",A="FL:::/Kernel/KernelA.HH,1115"$ +$LK,"TaskExe",A="FL:::/Kernel/Job.HC,39",BI=327$ +$LK,"KbdMessagesQueue",A="FL:::/Kernel/SerialDev/Keyboard.HC,467",BI=328$ +$LK,"FileWrite",A="FL:::/Kernel/BlkDev/DiskFile.HC,79",BI=329$ $LK,"ARf_CSPRITE_PTS_RECTANGLES",A="FL:::/Kernel/KernelA.HH,3855"$ $LK,"MESSAGE_KEY_DOWN_UP",A="FL:::/Kernel/KernelA.HH,3189"$ $LK,"RFLAGf_ID",A="FL:::/Kernel/KernelA.HH,338"$ $LK,"SCF_E0_PREFIX",A="FL:::/Kernel/KernelA.HH,3478"$ $LK,"SCf_E0_PREFIX",A="FL:::/Kernel/KernelA.HH,3463"$ -$LK,"ATAWaitNotBUSY",A="FL:::/Kernel/BlkDev/DiskATA.HC,24",BI=331$ +$LK,"ATAWaitNotBUSY",A="FL:::/Kernel/BlkDev/DiskATA.HC,24",BI=330$ $LK,"_XCHG_U16",A="FL:::/Kernel/KUtils.HC,200"$ $LK,"_XCHG_U32",A="FL:::/Kernel/KUtils.HC,192"$ $LK,"SUF_TO_LOWER",A="FL:::/Kernel/KernelA.HH,3736"$ $LK,"ARGT_XMM32",A="FL:::/Kernel/KernelA.HH,1953"$ $LK,"WIF_SELF_GRAB_SCROLL",A="FL:::/Kernel/KernelA.HH,1428"$ $LK,"LDF_SILENT",A="FL:::/Kernel/KernelA.HH,382"$ -$LK,"MsInit",A="FL:::/Kernel/SerialDev/Mouse.HC,63",BI=332$ -$LK,"ZenithLog",A="FL:::/Kernel/Job.HC,423",BI=333$ +$LK,"MsInit",A="FL:::/Kernel/SerialDev/Mouse.HC,63",BI=331$ +$LK,"ZenithLog",A="FL:::/Kernel/Job.HC,423",BI=332$ $LK,"RED",A="FL:::/Kernel/KernelA.HH,2918"$ $LK,"RT_U0",A="FL:::/Kernel/KernelA.HH,1565"$ $LK,"VGAR_MAP_MASK",A="FL:::/Kernel/KernelA.HH,3682"$ $LK,"PRTF_COMMA",A="FL:::/Kernel/KernelA.HH,3872"$ $LK,"CAOTCtrl",A="FL:::/Kernel/KernelA.HH,2061"$ $LK,"DOC_COLOR_DEFINE_STR",A="FL:::/Kernel/KernelA.HH,1151"$ -$LK,"DriveFATBlkAlloc",A="FL:::/Kernel/BlkDev/DiskDrive.HC,89",BI=334$ +$LK,"DriveFATBlkAlloc",A="FL:::/Kernel/BlkDev/DiskDrive.HC,89",BI=333$ $LK,"VM_VIRTUALBOX",A="FL:::/Kernel/KernelA.HH,3893"$ $LK,"SCF_NEW_KEY",A="FL:::/Kernel/KernelA.HH,3486"$ $LK,"CCompCtrl",A="FL:::/Kernel/KernelA.HH,2179"$ $LK,"TASK_CONTEXT_SAVE",A="FL:::/Kernel/Sched.HC,56"$ $LK,"SCf_NEW_KEY",A="FL:::/Kernel/KernelA.HH,3471"$ $LK,"CDirContext",A="FL:::/Kernel/KernelA.HH,2747"$ -$LK,"BootDVDProbeAll",A="FL:::/Kernel/BlkDev/DiskATAId.HC,29",BI=335$ +$LK,"BootDVDProbeAll",A="FL:::/Kernel/BlkDev/DiskATAId.HC,29",BI=334$ $LK,"_MEMCPY",A="FL:::/Kernel/KUtils.HC,55"$ $LK,"_D3_DIST_SQR",A="FL:::/Kernel/KMathA.HC,61"$ $LK,"ARGT_XMM64",A="FL:::/Kernel/KernelA.HH,1954"$ -$LK,"ATAWriteBlks",A="FL:::/Kernel/BlkDev/DiskATA.HC,464",BI=336$ +$LK,"ATAWriteBlks",A="FL:::/Kernel/BlkDev/DiskATA.HC,464",BI=335$ $LK,"RT_U8",A="FL:::/Kernel/KernelA.HH,1567"$ $LK,"RLf_16MEG_SYS_CODE_BP",A="FL:::/Kernel/KernelA.HH,457"$ $LK,"DOCEf_USER_DATA",A="FL:::/Kernel/KernelA.HH,1073"$ $LK,"DOCEF_USER_DATA",A="FL:::/Kernel/KernelA.HH,985"$ $LK,"COPY_BUF_BLKS",A="FL:::/Kernel/BlkDev/DiskCopy.HC,22"$ -$LK,"FAT32FileWrite",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,799",BI=337$ +$LK,"FAT32FileWrite",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,799",BI=336$ $LK,"EDf_BAIL",A="FL:::/Kernel/KernelA.HH,1264"$ $LK,"EDF_BAIL",A="FL:::/Kernel/KernelA.HH,1258"$ -$LK,"HashListAdd",A="FL:::/Kernel/KHashB.HC,185",BI=338$ +$LK,"HashListAdd",A="FL:::/Kernel/KHashB.HC,185",BI=337$ $LK,"SYS_RAM_REBOOT",A="FL:::/Kernel/KStart64.HC,74"$ $LK,"CWinMgrGlobals",A="FL:::/Kernel/KernelA.HH,1482"$ -$LK,"FileFind",A="FL:::/Kernel/BlkDev/DiskFind.HC,54",BI=339$ +$LK,"FileFind",A="FL:::/Kernel/BlkDev/DiskFind.HC,54",BI=338$ $LK,"SYS_FIND_PCI_SERVICES",A="FL:::/Kernel/PCIBIOS.HC,38"$ $LK,"VGAP_ATTR_DATA_WRITE",A="FL:::/Kernel/KernelA.HH,3668"$ $LK,"FUF_WHOLE_LABELS_BEFORE",A="FL:::/Kernel/KernelA.HH,2590"$ $LK,"TK_MUL_EQU",A="FL:::/Kernel/KernelA.HH,2103"$ $LK,"TK_NOT_EQU",A="FL:::/Kernel/KernelA.HH,2095"$ -$LK,"CFileNameTo",A="FL:::/Kernel/BlkDev/DiskStrB.HC,1",BI=340$ -$LK,"IntNop",A="FL:::/Kernel/KInts.HC,143",BI=341$ +$LK,"CFileNameTo",A="FL:::/Kernel/BlkDev/DiskStrB.HC,1",BI=339$ +$LK,"IntNop",A="FL:::/Kernel/KInts.HC,143",BI=340$ $LK,"_D3_MUL_EQU",A="FL:::/Kernel/KMathA.HC,273"$ $LK,"DISPLAYf_SHOW",A="FL:::/Kernel/KernelA.HH,3247"$ $LK,"DOF_DONT_SHOW",A="FL:::/Kernel/KernelA.HH,1232"$ @@ -1574,6 +1580,7 @@ $LK,"SYS_HASH_SINGLE_TABLE_FIND",A="FL:::/Kernel/KHashA.HC,41"$ $LK,"OC_OP_SIZE_PREFIX",A="FL:::/Kernel/KernelA.HH,1767"$ $LK,"CCF_UNRESOLVED",A="FL:::/Kernel/KernelA.HH,2158"$ $LK,"MLF_FUN",A="FL:::/Kernel/KernelA.HH,782"$ +$LK,"ExtDefault",A="FL:::/Kernel/BlkDev/DiskStrA.HC,212",BI=341$ $LK,"DOCEF_ZERO_BASED",A="FL:::/Kernel/KernelA.HH,1019"$ $LK,"HTF_UNRESOLVED",A="FL:::/Kernel/KernelA.HH,713"$ $LK,"FAT32Cd",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,387",BI=342$ @@ -1601,8 +1608,6 @@ $LK,"MsHardSpeedSet",A="FL:::/Kernel/SerialDev/Mouse.HC,186",BI=348$ $LK,"DirTreeDel2",A="FL:::/Kernel/BlkDev/DiskDirA.HC,46",BI=349$ $LK,"FUF_JUST_TXT",A="FL:::/Kernel/KernelA.HH,2579"$ $LK,"FUf_JUST_TXT",A="FL:::/Kernel/KernelA.HH,2551"$ -$LK,"DOCT_DFT_BACKGROUND",A="FL:::/Kernel/KernelA.HH,923"$ -$LK,"DOCT_DFT_FOREGROUND",A="FL:::/Kernel/KernelA.HH,922"$ $LK,"CCF_KEEP_SIGN_NUM",A="FL:::/Kernel/KernelA.HH,2147"$ $LK,"BOOT_SRC_HARDDRV",A="FL:::/Kernel/KernelA.HH,3842"$ $LK,"HashFind",A="FL:::/Kernel/KHashA.HC,255"$ @@ -1955,7 +1960,6 @@ $LK,"QuickSort2b",A="FL:::/Kernel/QuickSort.HC,55",BI=429$ $LK,"MPrintq",A="FL:::/Kernel/StrPrint.HC,113",BI=430$ $LK,"LinkedListCount",A="FL:::/Kernel/KDataTypes.HC,21",BI=431$ $LK,"AMAllocIdent",A="FL:::/Kernel/Mem/MAllocFree.HC,418",BI=432$ -$LK,"MEM_DFT_STK",A="FL:::/Kernel/KernelA.HH,2843"$ $LK,"sys_font_cyrillic",A="FL:::/Kernel/FontCyrillic.HC,3"$ $LK,"SYS_FOCUS_TASK",A="FL:::/Kernel/KStart32.HC,63"$ $LK,"DYING_JIFFIES",A="FL:::/Kernel/KernelA.HH,3264"$ @@ -2000,6 +2004,7 @@ $LK,"AOT_BIN_BLK_BITS",A="FL:::/Kernel/KernelA.HH,1807"$ $LK,"HTT_FUN",A="FL:::/Kernel/KernelA.HH,693"$ $LK,"I_DIV_ZERO",A="FL:::/Kernel/KernelA.HH,300"$ $LK,"DOCEF_DEFINE",A="FL:::/Kernel/KernelA.HH,973"$ +$LK,"DOC_DEFAULT",A="FL:::/Kernel/KernelA.HH,1168"$ $LK,"DOCEf_DEFINE",A="FL:::/Kernel/KernelA.HH,1061"$ $LK,"HeapCtrlInit",A="FL:::/Kernel/Mem/HeapCtrl.HC,1",BI=437$ $LK,"MESSAGE_MS_MOVE",A="FL:::/Kernel/KernelA.HH,3178"$ @@ -2009,6 +2014,7 @@ $LK,"progress1",A="FL:::/Kernel/KernelB.HH,209"$ $LK,"Floor",A="FL:::/Kernel/KernelB.HH,131"$ $LK,"progress2",A="FL:::/Kernel/KernelB.HH,215"$ $LK,"_CLAMP_U64",A="FL:::/Kernel/KUtils.HC,133"$ +$LK,"MLF_STR_DEFAULT_AVAILABLE",A="FL:::/Kernel/KernelA.HH,781"$ $LK,"progress3",A="FL:::/Kernel/KernelB.HH,221"$ $LK,"FUF_JUST_GR",A="FL:::/Kernel/KernelA.HH,2584"$ $LK,"FUf_JUST_GR",A="FL:::/Kernel/KernelA.HH,2556"$ @@ -2209,7 +2215,6 @@ $LK,"CGridGlobals",A="FL:::/Kernel/KernelA.HH,3020"$ $LK,"CCompGlobals",A="FL:::/Kernel/KernelA.HH,2226"$ $LK,"StrPrintFunSeg",A="FL:::/Kernel/FunSeg.HC,134",BI=475$ $LK,"HashVal",A="FL:::/Kernel/KHashB.HC,9",BI=476$ -$LK,"DOCEF_DFT_RAW_TYPE",A="FL:::/Kernel/KernelA.HH,1030"$ $LK,"IET_IMM_U32",A="FL:::/Kernel/KernelA.HH,414"$ $LK,"IET_IMM_U16",A="FL:::/Kernel/KernelA.HH,412"$ $LK,"KbdMsInit",A="FL:::/Kernel/SerialDev/Mouse.HC,348",BI=477$ @@ -2222,11 +2227,11 @@ $LK,"SCF_NO_SHIFT",A="FL:::/Kernel/KernelA.HH,3491"$ $LK,"SCf_NO_SHIFT",A="FL:::/Kernel/KernelA.HH,3476"$ $LK,"ARGT_MOFFS32",A="FL:::/Kernel/KernelA.HH,1926"$ $LK,"ARGT_MOFFS16",A="FL:::/Kernel/KernelA.HH,1925"$ +$LK,"WIG_TASK_DEFAULT",A="FL:::/Kernel/KernelA.HH,1444"$ $LK,"sys_heap_dbg",A="FL:::/Kernel/KernelB.HH,180"$ $LK,"PRTF_LEFT_JUSTIFY",A="FL:::/Kernel/KernelA.HH,3870"$ $LK,"FUF_SINGLE",A="FL:::/Kernel/KernelA.HH,2576"$ $LK,"FUf_SINGLE",A="FL:::/Kernel/KernelA.HH,2548"$ -$LK,"DOCEf_DFT_RAW_TYPE",A="FL:::/Kernel/KernelA.HH,1116"$ $LK,"DVDImageWriteTask",A="FL:::/Kernel/BlkDev/DiskCDDVD.HC,113",BI=478$ $LK,"LTGRAY",A="FL:::/Kernel/KernelA.HH,2921"$ $LK,"CoreAPSethInit",A="FL:::/Kernel/MultiProc.HC,275",BI=479$ @@ -2339,7 +2344,6 @@ $LK,"MESSAGE_MS_R_UP",A="FL:::/Kernel/KernelA.HH,3184"$ $LK,"RepOutU32",A="FL:::/Kernel/KernelB.HH,90"$ $LK,"RepOutU16",A="FL:::/Kernel/KernelB.HH,88"$ $LK,"TK_SUBSCRIPT",A="FL:::/Kernel/KernelA.HH,2081"$ -$LK,"WIG_TASK_DFT",A="FL:::/Kernel/KernelA.HH,1444"$ $LK,"REGT_NONE",A="FL:::/Kernel/KernelA.HH,743"$ $LK,"ARf_PSALMODY_JUKEBOX",A="FL:::/Kernel/KernelA.HH,3853"$ $LK,"DOCEf_HTML_LINK",A="FL:::/Kernel/KernelA.HH,1062"$ @@ -2415,7 +2419,6 @@ $LK,"HTF_GOTO_LABEL",A="FL:::/Kernel/KernelA.HH,711"$ $LK,"mon_start_days2",A="FL:::/Kernel/KDate.HC,5"$ $LK,"FONT_HEIGHT",A="FL:::/Kernel/KernelA.HH,3552"$ $LK,"HTf_GOTO_LABEL",A="FL:::/Kernel/KernelA.HH,681"$ -$LK,"DFT_CACHE_LINE_WIDTH",A="FL:::/Kernel/KernelA.HH,604"$ $LK,"ATAR0_LCYL",A="FL:::/Kernel/KernelA.HH,2292"$ $LK,"ICf_DONT_PUSH_FLOAT0",A="FL:::/Kernel/KernelA.HH,1623"$ $LK,"JOB_EXIT",A="FL:::/Kernel/Job.HC,267"$ @@ -2548,8 +2551,6 @@ $LK,"BlkDevDel",A="FL:::/Kernel/BlkDev/DiskBlkDev.HC,159",BI=546$ $LK,"ST_ERR_ST",A="FL:::/Kernel/KernelA.HH,3459"$ $LK,"FSt_REDSEA",A="FL:::/Kernel/KernelA.HH,2659"$ $LK,"CPCIDev",A="FL:::/Kernel/KernelA.HH,2252"$ -$LK,"DOCEf_DFT_LEN",A="FL:::/Kernel/KernelA.HH,1115"$ -$LK,"DOCEF_DFT_LEN",A="FL:::/Kernel/KernelA.HH,1029"$ $LK,"RepOutU8",A="FL:::/Kernel/KernelB.HH,92"$ $LK,"VGAP_PALETTE_MASK",A="FL:::/Kernel/KernelA.HH,3673"$ $LK,"ATAPISync",A="FL:::/Kernel/BlkDev/DiskATA.HC,504",BI=547$ @@ -2691,6 +2692,7 @@ $LK,"TK_CHAR_CONST",A="FL:::/Kernel/KernelA.HH,2086"$ $LK,"DOCf_DBL_DOLLARS",A="FL:::/Kernel/KernelA.HH,1312"$ $LK,"EDF_UNCOLLAPSE",A="FL:::/Kernel/KernelA.HH,1260"$ $LK,"DOCEG_HAS_ALLOC",A="FL:::/Kernel/KernelA.HH,1032"$ +$LK,"DOCEF_DEFAULT_RAW_TYPE",A="FL:::/Kernel/KernelA.HH,1030"$ $LK,"CHashSrcSym",A="FL:::/Kernel/KernelA.HH,729"$ $LK,"HashPublic",A="FL:::/Kernel/KHashB.HC,170",BI=579$ $LK,"TASKf_AWAITING_MESSAGE",A="FL:::/Kernel/KernelA.HH,3238"$ @@ -2793,7 +2795,6 @@ $LK,"ARGT_FS",A="FL:::/Kernel/KernelA.HH,1941"$ $LK,"TK_I64",A="FL:::/Kernel/KernelA.HH,2085"$ $LK,"ARGT_DX",A="FL:::/Kernel/KernelA.HH,1935"$ $LK,"ARGT_M64",A="FL:::/Kernel/KernelA.HH,1917"$ -$LK,"DOCE_LEN_DFT",A="FL:::/Kernel/KernelA.HH,1190"$ $LK,"CD2I32",A="FL:::/Kernel/KernelA.HH,139"$ $LK,"ARGT_GS",A="FL:::/Kernel/KernelA.HH,1943"$ $LK,"CICTreeLinks",A="FL:::/Kernel/KernelA.HH,1650"$ @@ -2820,7 +2821,6 @@ $LK,"FUf_JUST_DIRS",A="FL:::/Kernel/KernelA.HH,2549"$ $LK,"IET_REL_I8",A="FL:::/Kernel/KernelA.HH,409"$ $LK,"ARGT_R32",A="FL:::/Kernel/KernelA.HH,1906"$ $LK,"ARGT_R16",A="FL:::/Kernel/KernelA.HH,1905"$ -$LK,"DOC_DFT",A="FL:::/Kernel/KernelA.HH,1168"$ $LK,"DISPLAYf_WIN_ON_TOP",A="FL:::/Kernel/KernelA.HH,3251"$ $LK,"INVALID_CLUS",A="FL:::/Kernel/KernelA.HH,2312"$ $LK,"char_bmp_non_eol",A="FL:::/Kernel/StrA.HC,391"$ @@ -2888,10 +2888,10 @@ E EEE)E3EAEFEUE\E^E^E^EdE| .9HTh!##55==I]eew~~P~~~ ###%7>o0CpCpYplp~pppp<al22@QY]inrx\+6J[} &A\XAwAwawnwswwwwwwwwww, G6Øɘݘ . <S_s|ƙ)1CFFFFR   H`g`gggggggggghhhhh#hTajo°8@Scs±ܱ ,7FVfv,(+?+?4?;?[?b?e?-4_________.p !zzzzz{ {{,{b{k{t{{/#5>^c| .DFRh~119COe{08uVVds}180:  -;^jw2,```````30 ƄЄ4,8?5@-9eQeQuQ~QQQQQQ6,@g@gIgTgVgVg[g7\mzz 81`1`A`H`[`g``````````aaa'a-a3a6a=aEa9F 'Pbj (CCCU\\nt~:X`````````a aa!a,a4aMa_alauauazaaaaaaaaaaaaaaaaaab b bbb(b3bObObObWb^beblbsbzbbbbbbbbbbbbbc;|Kf &-49EISSZ]ccm{<,++CNt=022F>*4=N^q~-L__#.<<AM?LRaɤѤԤ @8GQttA0B<qqqqqrr"r8r>rDrzrCTct.4444:DP[[exGE(MS +46FH!bbp|G0֝":=IH'Jsdsddddddddddee e'e+e+e1e7eOeXe^egelelelepezeIX44444444445555 5JOpeeeeeeef%f%fDfFfFfefgfgfwfwfffffffffg g*4=N^q~-L__#.<<AM?LRaɤѤԤ @8GQttA0B<qqqqqrr"r8r>rDrzrCTct.4444:DP[[exGE(MS +46FH!bbp|G'Jsdsddddddddddee e'e+e+e1e7eOeXe^egelelelepezeHX44444444445555 5IOpeeeeeeef%f%fDfFfFfefgfgfwfwfffffffffg gH^^nz»»»ʻػ$Q?HHHHHHHHHII&I3I8IH^^nz»»»ʻػ$P?HHHHHHHHHII&I3I8I.P.i.x............ //5/7/7/J/R/R/R/d/d/m///////\4>>>>>>?%?)?]@.:ss^PPjÌԌԌԌیJadf}Ѝލ _D 6Yfs~`  a4 !#)b8#,/5chRhttttttttttutuuu*u*u2uaud0[S[SdSvSSSSSSet/# # . = L Z u     !#!4!=!J!a!|!!!!!!!f&**46N\ox!$&-ORRU`gng @Ñԑ %8JRsڒ46GS_t{h&X  diff --git a/src/Kernel/KernelA.HH b/src/Kernel/KernelA.HH index f63db1ca..8f4ed288 100755 --- a/src/Kernel/KernelA.HH +++ b/src/Kernel/KernelA.HH @@ -601,12 +601,12 @@ class CRAXRBCRCXRDX #define EXT_EXTS_NUM 5 #help_index "Processor" -#define DFT_CACHE_LINE_WIDTH 128 +#define DEFAULT_CACHE_LINE_WIDTH 128 //Semaphores class CSema { - Bool val,pad[DFT_CACHE_LINE_WIDTH-1]; + Bool val,pad[DEFAULT_CACHE_LINE_WIDTH-1]; }; #define SEMA_DEBUG 0 #define SEMA_RECORD_MACRO 1 @@ -776,9 +776,9 @@ public class CHashImport:CHashSrcSym #define PTR_STARS_NUM 4 //Member List Flags -#define MLF_DFT_AVAILABLE 1 +#define MLF_DEFAULT_AVAILABLE 1 #define MLF_LASTCLASS 2 -#define MLF_STR_DFT_AVAILABLE 4 +#define MLF_STR_DEFAULT_AVAILABLE 4 #define MLF_FUN 8 #define MLF_DOT_DOT_DOT 16 #define MLF_NO_UNUSED_WARN 32 @@ -814,7 +814,7 @@ public class CMemberList U8 *static_data; union { I64 static_data_rip; - I64 dft_val; + I64 default_val; } CHashFun *fun_ptr; }; @@ -919,8 +919,8 @@ public class CHashGlobalVar:CHashSrcSym #define DOCT_INDENT 14 #define DOCT_FOREGROUND 15 #define DOCT_BACKGROUND 16 -#define DOCT_DFT_FOREGROUND 17 -#define DOCT_DFT_BACKGROUND 18 +#define DOCT_DEFAULT_FOREGROUND 17 +#define DOCT_DEFAULT_BACKGROUND 18 #define DOCT_WORD_WRAP 19 #define DOCT_HIGHLIGHT 20 #define DOCT_BLINK 21 @@ -1026,8 +1026,8 @@ public class CHashGlobalVar:CHashSrcSym #define DOCEF_FILTER_SKIP 0x200000000000000 #define DOCEF_NO_CLICK_ON 0x400000000000000 #define DOCEF_DONT_DRAW 0x800000000000000 //only works on sprites -#define DOCEF_DFT_LEN 0x1000000000000000 -#define DOCEF_DFT_RAW_TYPE 0x2000000000000000 +#define DOCEF_DEFAULT_LEN 0x1000000000000000 +#define DOCEF_DEFAULT_RAW_TYPE 0x2000000000000000 #define DOCEG_HAS_ALLOC (DOCEF_TAG|DOCEF_AUX_STR|DOCEF_DEFINE|\ DOCEF_HTML_LINK|DOCEF_LEFT_MACRO|DOCEF_RIGHT_MACRO|DOCEF_BIN_PTR_LINK|\ @@ -1112,8 +1112,8 @@ public class CHashGlobalVar:CHashSrcSym #define DOCEf_FILTER_SKIP 57 #define DOCEf_NO_CLICK_ON 58 #define DOCEf_DONT_DRAW 59 //only works on sprites -#define DOCEf_DFT_LEN 60 -#define DOCEf_DFT_RAW_TYPE 61 +#define DOCEf_DEFAULT_LEN 60 +#define DOCEf_DEFAULT_RAW_TYPE 61 #define DOCEf_FLAGS_NUM 62 public class CDocBin @@ -1136,7 +1136,7 @@ public class CDocBin #define DOCSS_COMMENT 3 #define DOCSS_CPP_Z_COMMENT 4 -#define DOC_ATTR_DFT_TEXT WHITE<<4+BLACK +#define DOC_ATTR_DEFAULT_TEXT WHITE<<4+BLACK #define DOC_COLOR_ALT_TEXT LTGRAY #define DOC_COLOR_LINK RED #define DOC_COLOR_MACRO LTBLUE @@ -1162,10 +1162,10 @@ public class CDocSettings U16 page_len,header,footer; I8 shifted_x,shifted_y; U8 state,comment_depth,paren_depth,brace_depth, - cur_text_attr,dft_text_attr; + cur_text_attr,default_text_attr; }; -#define DOC_DFT I32_MIN +#define DOC_DEFAULT I32_MIN public class CDocEntryBase { @@ -1187,7 +1187,7 @@ public class CDocEntryBase #assert !($$&7) }; -#define DOCE_LEN_DFT 64 +#define DOCE_LEN_DEFAULT 64 public class CDocEntry:CDocEntryBase { @@ -1214,7 +1214,7 @@ public class CDocEntry:CDocEntryBase *my_fmt_data; I64 hex_ed_width; I32 scroll_len, - len, //$LK,"DOCE_LEN_DFT",A="MN:DOCE_LEN_DFT"$ + len, //$LK,"DOCE_LEN_DEFAULT",A="MN:DOCE_LEN_DEFAULT"$ bin_num; U8 raw_type,pad[3]; CDocBin *bin_data; @@ -1441,11 +1441,11 @@ tries to do something. #define WIF_FOCUS_TASK_GRAB_SCROLL 0x02000000 #define WIG_DBL_CLICK (WIF_FOCUS_TASK_MS_L_D|WIF_FOCUS_TASK_MS_R_D) -#define WIG_TASK_DFT (WIF_FOCUS_TASK_MENU|WIG_DBL_CLICK|\ +#define WIG_TASK_DEFAULT (WIF_FOCUS_TASK_MENU|WIG_DBL_CLICK|\ 0xFFFF-WIF_SELF_DOC-WIF_SELF_ODE) -#define WIG_NO_FOCUS_TASK_DFT (WIG_TASK_DFT-WIF_SELF_BORDER\ +#define WIG_NO_FOCUS_TASK_DEFAULT (WIG_TASK_DEFAULT-WIF_SELF_BORDER\ -WIF_SELF_MS_L-WIF_SELF_MS_R-WIG_DBL_CLICK) -#define WIG_USER_TASK_DFT WIF_SELF_KEY_DESC +#define WIG_USER_TASK_DEFAULT WIF_SELF_KEY_DESC #define WIf_SELF_FOCUS 0 #define WIf_SELF_CTRLS 2 @@ -1714,7 +1714,7 @@ class CPrsStk class CCodeMisc { - CCodeMisc *next,*last,*fwd,*dft,*begin; + CCodeMisc *next,*last,*fwd,*default,*begin; U8 *str; U32 type,flags; I64 use_count; @@ -1738,7 +1738,7 @@ class CCodeMisc #define IEF_OP_SIZE32 0x002 #define IEF_PLUS_OPCODE 0x004 #define IEF_DONT_SWITCH_MODES 0x008 -#define IEF_DFT 0x010 +#define IEF_DEFAULT 0x010 #define IEF_NOT_IN_64_BIT 0x020 #define IEF_48_REX 0x040 #define IEF_REX_ONLY_R8_R15 0x080 @@ -1850,7 +1850,7 @@ class CAsmIns Bool has_REX,has_ModrM,has_SIB, has_addr_prefix, has_operand_prefix, - is_dft,pad[2]; + is_default,pad[2]; }; class CAsmArg @@ -2724,14 +2724,14 @@ class CCacheBlk }; #help_index "File/System" -#define DFT_ISO_FILENAME "::/Tmp/CDDVD.ISO" -#define DFT_ISO_C_FILENAME "::/Tmp/CDDVD.ISO.C" +#define DEFAULT_ISO_FILENAME "::/Tmp/CDDVD.ISO" +#define DEFAULT_ISO_C_FILENAME "::/Tmp/CDDVD.ISO.C" public class CBlkDevGlobals { CBlkDev *blkdevs; - U8 *dft_iso_filename; //$TX,"\"::/Tmp/CDDVD.ISO\"",D="DFT_ISO_FILENAME"$ - U8 *dft_iso_c_filename; //$TX,"\"::/Tmp/CDDVD.ISO.C\"",D="DFT_ISO_C_FILENAME"$ + U8 *default_iso_filename; //$TX,"\"::/Tmp/CDDVD.ISO\"",D="DEFAULT_ISO_FILENAME"$ + U8 *default_iso_c_filename; //$TX,"\"::/Tmp/CDDVD.ISO.C\"",D="DEFAULT_ISO_C_FILENAME"$ U8 *tmp_filename; U8 *home_dir; CCacheBlk *cache_base,*cache_ctrl,**cache_hash_table; @@ -2840,7 +2840,7 @@ class CMemRange #define MEM_ZENITH_STK (MEM_PAG_SIZE*512) //Like 16384*MEM_PAG_SIZE #define MEM_SETH_STK (MEM_PAG_SIZE*512) #define MEM_INTERRUPT_STK (MEM_PAG_SIZE*512) -#define MEM_DFT_STK (MEM_PAG_SIZE*512) +#define MEM_DEFAULT_STK (MEM_PAG_SIZE*512) #define TASK_HASH_TABLE_SIZE (1<<10) diff --git a/src/Kernel/KernelC.HH b/src/Kernel/KernelC.HH index bf258492..d8021e16 100755 --- a/src/Kernel/KernelC.HH +++ b/src/Kernel/KernelC.HH @@ -296,7 +296,7 @@ public extern U8 *DirFile(U8 *dirname,U8 *name=NULL,U8 *_extension=NULL); public extern U8 *DirNameAbs(U8 *dirname); public extern CBlkDev *DriveIsWritable(U8 drv_let=0,Bool except=FALSE); public extern U8 *ExtChg(U8 *filename,U8 *extension); -public extern U8 *ExtDft(U8 *filename,U8 *extension); +public extern U8 *ExtDefault(U8 *filename,U8 *extension); public extern U8 *FileExtDot(U8 *src); public extern U8 *FileExtRemove(U8 *src,U8 *dst=NULL); public extern U8 *FileNameAbs(U8 *filename,I64 fuf_flags=0); @@ -521,7 +521,7 @@ public extern I64 GetChar(I64 *_scan_code=NULL,Bool echo=TRUE, public extern I64 GetKey(I64 *_scan_code=NULL,Bool echo=FALSE, Bool raw_cursor=FALSE); public extern I64 GetS(U8 *buf,I64 size,Bool allow_ext=TRUE); -public extern U8 *GetStr(U8 *message=NULL,U8 *dft=NULL,I64 flags=0); +public extern U8 *GetStr(U8 *message=NULL,U8 *default=NULL,I64 flags=0); extern U0 KbdInit(); public extern I64 KbdMsEvtTime(); extern U0 KbdMsHandler(Bool poll_kbd,Bool poll_ms); diff --git a/src/Kernel/Mem/MAllocFree.HC b/src/Kernel/Mem/MAllocFree.HC index e69a7768..5a31fa9d 100755 --- a/src/Kernel/Mem/MAllocFree.HC +++ b/src/Kernel/Mem/MAllocFree.HC @@ -190,7 +190,7 @@ MALLOC_ALMOST_DONE: MOV U64 CMemUsed.hc[RSI],RDX LEA RAX,U64 CMemUsed.start[RSI] - TEST U8 [SYS_SEMAS+SEMA_HEAPLOG_ACTIVE*DFT_CACHE_LINE_WIDTH],1 + TEST U8 [SYS_SEMAS+SEMA_HEAPLOG_ACTIVE*DEFAULT_CACHE_LINE_WIDTH],1 JZ @@105 PUSH RAX PUSH RAX @@ -227,7 +227,7 @@ _FREE:: PUSH RSI PUSH RDI - TEST U8 [SYS_SEMAS+SEMA_HEAPLOG_ACTIVE*DFT_CACHE_LINE_WIDTH],1 + TEST U8 [SYS_SEMAS+SEMA_HEAPLOG_ACTIVE*DEFAULT_CACHE_LINE_WIDTH],1 JZ @@15 MOV RBX,U64 SF_ARG1[RBP] TEST RBX,RBX diff --git a/src/Kernel/Sched.HC b/src/Kernel/Sched.HC index 01c9aa06..753b5804 100755 --- a/src/Kernel/Sched.HC +++ b/src/Kernel/Sched.HC @@ -155,7 +155,7 @@ _TASK_END_NOW:: _YIELD:: PUSHFD - TEST U8 [SYS_SEMAS+SEMA_SINGLE_USER*DFT_CACHE_LINE_WIDTH],1 + TEST U8 [SYS_SEMAS+SEMA_SINGLE_USER*DEFAULT_CACHE_LINE_WIDTH],1 JZ @@05 POPFD //If single user, don't change task. RET @@ -196,7 +196,7 @@ RESTORE_RSI_TASK2: JC @@20 //Jmp if had chance for IRQ already MOV RAX,U64 GS:CCPU.idle_task[RAX] MOV RSP,U64 CTask.stk[RAX] - ADD RSP,MEM_DFT_STK+CTaskStk.stk_base //Rst to top + ADD RSP,MEM_DEFAULT_STK+CTaskStk.stk_base //Rst to top CALL SET_FS_BASE STI //Restore idle task so we can unmask IRQs. HLT diff --git a/src/Kernel/SerialDev/Message.HC b/src/Kernel/SerialDev/Message.HC index 65ceaa1e..a9bb06f1 100755 --- a/src/Kernel/SerialDev/Message.HC +++ b/src/Kernel/SerialDev/Message.HC @@ -3,7 +3,7 @@ U0 InputFilterTask() CJob *tmpc,*tmpc1; Bool old_filter; I64 old_flags=GetRFlags; - Fs->win_inhibit=WIG_USER_TASK_DFT; + Fs->win_inhibit=WIG_USER_TASK_DEFAULT; LBts(&Fs->task_flags,TASKf_INPUT_FILTER_TASK); old_filter=LBts(&Fs->last_input_filter_task->task_flags,TASKf_FILTER_INPUT); LBEqu(&Fs->task_flags,TASKf_FILTER_INPUT,old_filter); @@ -190,16 +190,16 @@ I64 GetChar(I64 *_scan_code=NULL,Bool echo=TRUE,Bool raw_cursor=FALSE) return ch1; } -U8 *GetStr(U8 *message=NULL,U8 *dft=NULL,I64 flags=0) +U8 *GetStr(U8 *message=NULL,U8 *default=NULL,I64 flags=0) {//Returns a $LK,"MAlloc",A="MN:MAlloc"$()ed prompted string. See $LK,"Flags",A="MN:GSF_SHIFT_ESC_EXIT"$. U8 *st; if (message) - "" message,dft; + "" message,default; st=(*fp_getstr2)(flags); if (!*st) { Free(st); - if (dft) - return StrNew(dft); + if (default) + return StrNew(default); else return StrNew(""); } diff --git a/src/Misc/OSInstall.HC b/src/Misc/OSInstall.HC index f83ebfc8..d9c98b4e 100755 --- a/src/Misc/OSInstall.HC +++ b/src/Misc/OSInstall.HC @@ -50,7 +50,7 @@ U0 VMInstallWiz() task->border_src=BDS_CONST; task->border_attr=LTGRAY<<4+DriveTextAttrGet(':')&15; task->text_attr =LTGRAY<<4+BLUE; - task->win_inhibit=WIG_TASK_DFT-WIF_SELF_BORDER; + task->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_BORDER; WinHorz(Fs->win_left,Fs->win_right,task); WinVert(Fs->win_top,(Fs->win_top+Fs->win_bottom)>>2-1,task); WinVert(task->win_bottom+3,Fs->win_bottom); @@ -84,7 +84,7 @@ U0 RegularInstallWiz() task->border_src=BDS_CONST; task->border_attr=LTGRAY<<4+DriveTextAttrGet(':')&15; task->text_attr =LTGRAY<<4+BLUE; - task->win_inhibit=WIG_TASK_DFT-WIF_SELF_BORDER; + task->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_BORDER; WinHorz(Fs->win_left,Fs->win_right,task); WinVert(Fs->win_top,(Fs->win_top+Fs->win_bottom)>>2-1,task); WinVert(task->win_bottom+3,Fs->win_bottom); diff --git a/src/Misc/PCIDevices.DD b/src/Misc/PCIDevices.DD index ae8a5c7c..a7da01fa 100755 --- a/src/Misc/PCIDevices.DD +++ b/src/Misc/PCIDevices.DD @@ -1164,7 +1164,7 @@ 0009 82C597-AFC2 000C 82C541 000D 82C543 - 0100 dtdftdfz CPU to PCI Bridge for notebook + 0100 dtdefaultdfz CPU to PCI Bridge for notebook 0101 82C532 Peripheral Controller 0102 82C534 PCI to PCI Bridge 0103 82C538 PCI to ISA Bridge diff --git a/src/Misc/Tour/Tour.IN b/src/Misc/Tour/Tour.IN index f347e65c..cc90808a 100755 --- a/src/Misc/Tour/Tour.IN +++ b/src/Misc/Tour/Tour.IN @@ -13,7 +13,7 @@ U0 TourPutTask() Fs->border_src=BDS_CONST; Fs->border_attr=LTGRAY<<4+DriveTextAttrGet(':')&15; Fs->text_attr =LTGRAY<<4+BLUE; - Fs->win_inhibit=WIG_NO_FOCUS_TASK_DFT; + Fs->win_inhibit=WIG_NO_FOCUS_TASK_DEFAULT; doc=DocPut; doc->flags|=DOCF_FORM; DocCursor(FALSE,doc); @@ -33,7 +33,7 @@ U0 TourPutTask() } DocUnlock(doc); if (tour_okay_pressed) { - Fs->win_inhibit=WIG_NO_FOCUS_TASK_DFT; + Fs->win_inhibit=WIG_NO_FOCUS_TASK_DEFAULT; if (sys_focus_task==Fs) WinRefocus; } else { diff --git a/src/StartOS.HC b/src/StartOS.HC index e5f07a52..2b4b7456 100755 --- a/src/StartOS.HC +++ b/src/StartOS.HC @@ -22,7 +22,7 @@ DocTermNew; WinVert(2,10); sys_winmgr_task=Spawn(&WinMgrTask,NULL,"Window Mgr"); -Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_BORDER +Fs->win_inhibit=WIG_TASK_DEFAULT-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); diff --git a/src/Tmp/MyDistro.iso b/src/Tmp/MyDistro.iso index 777f0d2c..7aab5c90 100755 Binary files a/src/Tmp/MyDistro.iso and b/src/Tmp/MyDistro.iso differ diff --git a/src/Zenith/AutoComplete/ACTask.HC b/src/Zenith/AutoComplete/ACTask.HC index 77892cb5..ac018bcd 100755 --- a/src/Zenith/AutoComplete/ACTask.HC +++ b/src/Zenith/AutoComplete/ACTask.HC @@ -222,7 +222,7 @@ U0 ACTask(I64) LBts(&Fs->display_flags,DISPLAYf_SHOW); WinHorz(51,Fs->win_right); LBts(&Fs->display_flags,DISPLAYf_WIN_ON_TOP); - Fs->win_inhibit=WIG_NO_FOCUS_TASK_DFT; + Fs->win_inhibit=WIG_NO_FOCUS_TASK_DEFAULT; Free(ac.cur_word); ac.cur_word=NULL; while (TRUE) { diff --git a/src/Zenith/Boot/DiskISORedSea.HC b/src/Zenith/Boot/DiskISORedSea.HC index c6ca694b..2b94b8df 100755 --- a/src/Zenith/Boot/DiskISORedSea.HC +++ b/src/Zenith/Boot/DiskISORedSea.HC @@ -146,7 +146,7 @@ public I64 RedSeaISO(U8 *_iso_filename=NULL,U8 *_src_dir, PrintErr("'%s' is not a dir.\n",_src_dir); else { if (!_iso_filename) - _iso_filename=blkdev.dft_iso_c_filename; + _iso_filename=blkdev.default_iso_c_filename; iso_filename=ExtChg(_iso_filename,"ISO.C"); src_dir=DirNameAbs(_src_dir); if (_stage2_filename) { diff --git a/src/Zenith/DolDoc/DocChar.HC b/src/Zenith/DolDoc/DocChar.HC index ebec41fe..2f4f15a4 100755 --- a/src/Zenith/DolDoc/DocChar.HC +++ b/src/Zenith/DolDoc/DocChar.HC @@ -129,7 +129,7 @@ public U0 EdCursorRight(CDoc *doc,I64 sc=I64_MIN) doc_ne=DocEntryNewTag(doc,doc_ce,dst); *dst=0; doc_ne->type=DOCT_TEXT | old_color & -0x100; - doc_ne->de_flags=old_de_flags|doldoc.dft_de_flags[DOCT_TEXT]; + doc_ne->de_flags=old_de_flags|doldoc.default_de_flags[DOCT_TEXT]; doc_ce->max_col=cc; QueueInsert(doc_ne,doc_ce); doc_ce=doc_ne; @@ -365,7 +365,7 @@ public U0 EdLineDown(CDoc *doc,I64 sc=I64_MIN) doc_ne=DocEntryNewTag(doc,doc_ce,dst); *dst=0; doc_ne->type=DOCT_TEXT | old_color & -0x100; - doc_ne->de_flags=old_de_flags|doldoc.dft_de_flags[DOCT_TEXT]; + doc_ne->de_flags=old_de_flags|doldoc.default_de_flags[DOCT_TEXT]; doc_ce->max_col=doc->cur_col; doc_ne->x=doc_ce->x+doc->cur_col; QueueInsert(doc_ne,doc_ce); @@ -540,8 +540,8 @@ ic_overstrike: goto ic_done; } doc_ne=DocEntryNewTag(doc,doc_ce,&ch); - doc_ne->type=DOCT_TEXT | doc->settings_head.dft_text_attr<<8; - doc_ne->de_flags=doldoc.dft_de_flags[DOCT_TEXT]; + doc_ne->type=DOCT_TEXT | doc->settings_head.default_text_attr<<8; + doc_ne->de_flags=doldoc.default_de_flags[DOCT_TEXT]; QueueInsert(doc_ne,doc_ce->last); } else if (ch=='\n') { while (doc->cur_entry->next!=doc && doc->cur_entry->y==y) @@ -557,10 +557,10 @@ ic_not_overstrike: if (ch=='\n') { if (sc&SCF_CTRL && !(sc&SCF_SHIFT)) { doc_ne=DocEntryNewBase(doc, - DOCT_PAGE_BREAK|doc->settings_head.dft_text_attr<<8); + DOCT_PAGE_BREAK|doc->settings_head.default_text_attr<<8); } else { doc_ne=DocEntryNewBase(doc, - DOCT_NEW_LINE|doc->settings_head.dft_text_attr<<8); + DOCT_NEW_LINE|doc->settings_head.default_text_attr<<8); } DocInsEntry(doc,doc_ne); } else if (ch=='\t') { @@ -574,7 +574,7 @@ ic_form_tab: DocFormFwd(doc); goto ic_done; } else { - doc_ne=DocEntryNewBase(doc,DOCT_TAB|doc->settings_head.dft_text_attr<<8); + doc_ne=DocEntryNewBase(doc,DOCT_TAB|doc->settings_head.default_text_attr<<8); DocInsEntry(doc,doc_ne); } } else { @@ -616,8 +616,8 @@ ic_form_tab: doc->cur_col++; } else { doc_ne=DocEntryNewTag(doc,doc_ce,&ch); - doc_ne->type=DOCT_TEXT | doc->settings_head.dft_text_attr<<8; - doc_ne->de_flags=doldoc.dft_de_flags[DOCT_TEXT]; + doc_ne->type=DOCT_TEXT | doc->settings_head.default_text_attr<<8; + doc_ne->de_flags=doldoc.default_de_flags[DOCT_TEXT]; doc_ne->x=doc_ce->x+1; QueueInsert(doc_ne,doc_ce->last); } diff --git a/src/Zenith/DolDoc/DocCodeTools.HC b/src/Zenith/DolDoc/DocCodeTools.HC index 19c57145..b2794679 100755 --- a/src/Zenith/DolDoc/DocCodeTools.HC +++ b/src/Zenith/DolDoc/DocCodeTools.HC @@ -76,7 +76,7 @@ I64 EdRILex(CRILex *rx) !rx->exp_depth || i==KW_ELSE || i==KW_CATCH || i==KW_DO) rx->is_not_cont=TRUE; if (rx->was_new_line && (rx->cc1->token!=':' || i==KW_CASE || - i==KW_DFT || i==KW_START || i==KW_END)) { + i==KW_DEFAULT || i==KW_START || i==KW_END)) { tmpf=rx->cc2->lex_include_stk; while (tmpf->next) tmpf=tmpf->next; @@ -202,7 +202,7 @@ U0 EdRIStatement(CRILex *rx,Bool indent) EdRILex(rx); break; case KW_CASE: - case KW_DFT: + case KW_DEFAULT: rx->depth+=i; i=0; while (EdRILex(rx) && rx->cc1->token!=':'); EdRILex(rx); @@ -531,7 +531,7 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action,Bool beep=TRUE) x=doc_e->x+1; while (i>8) { doc_ne=DocEntryNewBase(doc, - DOCT_TAB|doc->settings_head.dft_text_attr<<8,, + DOCT_TAB|doc->settings_head.default_text_attr<<8,, x,doc_e->y,doc_e->page_line_num); MemCpy(&doc_ne->settings, &doc_e->settings,sizeof(CDocSettings)); @@ -544,7 +544,7 @@ U0 EdCodeTools2(CDoc *doc,I64 tool_action,Bool beep=TRUE) MemSet(b,CH_SPACE,i); b[i]=0; doc_ne=DocEntryNewBase(doc, - DOCT_TEXT|doc->settings_head.dft_text_attr<<8,, + DOCT_TEXT|doc->settings_head.default_text_attr<<8,, x,doc_e->y,doc_e->page_line_num); doc_ne->tag=b; doc_ne->max_col=1; diff --git a/src/Zenith/DolDoc/DocEd.HC b/src/Zenith/DolDoc/DocEd.HC index 867336a5..47df10f3 100755 --- a/src/Zenith/DolDoc/DocEd.HC +++ b/src/Zenith/DolDoc/DocEd.HC @@ -156,7 +156,7 @@ public Bool DocEd(CDoc *doc,I64 dof_flags=0) doc->parent_doc=old_display_doc; Fs->put_doc=Fs->display_doc=doc; if (!(dof_flags&DOF_DONT_TEXT_ATTR)) - Fs->text_attr=DOC_ATTR_DFT_TEXT; + Fs->text_attr=DOC_ATTR_DEFAULT_TEXT; if (!(dof_flags&DOF_DONT_SHOW)) { LBts(&Fs->display_flags,DISPLAYf_SHOW); WinZBufUpdate; diff --git a/src/Zenith/DolDoc/DocForm.HC b/src/Zenith/DolDoc/DocForm.HC index f5577fdd..2e1784fb 100755 --- a/src/Zenith/DolDoc/DocForm.HC +++ b/src/Zenith/DolDoc/DocForm.HC @@ -237,7 +237,7 @@ public Bool DocForm(U8 *_d,U8 *class_name=lastclass, if (tmpc2->type & HTT_INTERNAL_TYPE) { if (ml->dim.next) { //Array if (tmpc2->raw_type==RT_U8 && - LBtr(&doc_e->de_flags,&DOCEf_DFT_LEN)) { + LBtr(&doc_e->de_flags,&DOCEf_DEFAULT_LEN)) { doc_e->len=ml->dim.total_count; if (doc_e->de_flags&DOCEF_HAS_TERMINATOR) doc_e->len--; @@ -245,7 +245,7 @@ public Bool DocForm(U8 *_d,U8 *class_name=lastclass, doc_e->tag=MAlloc(doc_e->len+doc_e->min_col+2, doc->mem_task); //+2 because "_\0" } - } else if (LBtr(&doc_e->de_flags,DOCEf_DFT_RAW_TYPE)) + } else if (LBtr(&doc_e->de_flags,DOCEf_DEFAULT_RAW_TYPE)) doc_e->raw_type=tmpc2->raw_type; } } diff --git a/src/Zenith/DolDoc/DocGet.HC b/src/Zenith/DolDoc/DocGet.HC index 54877658..94dd24ea 100755 --- a/src/Zenith/DolDoc/DocGet.HC +++ b/src/Zenith/DolDoc/DocGet.HC @@ -169,18 +169,18 @@ gs_done: } #help_index "Keyboard Devices;Char/Input;StdIn" -public I64 GetI64(U8 *message=NULL,I64 dft=0,I64 lo=I64_MIN,I64 hi=I64_MAX) +public I64 GetI64(U8 *message=NULL,I64 default=0,I64 lo=I64_MIN,I64 hi=I64_MAX) {//Prompt user for I64 expression. Bool okay; U8 *st; I64 res; while (TRUE) { if (message) - "" message,dft; + "" message,default; st=GetStr; if (!*st) { Free(st); - return dft; + return default; } try { res=ExePrint2("ToI64(%s);",st); @@ -195,18 +195,18 @@ public I64 GetI64(U8 *message=NULL,I64 dft=0,I64 lo=I64_MIN,I64 hi=I64_MAX) } } -public F64 GetF64(U8 *message=NULL,F64 dft=0,F64 lo=F64_MIN,F64 hi=F64_MAX) +public F64 GetF64(U8 *message=NULL,F64 default=0,F64 lo=F64_MIN,F64 hi=F64_MAX) {//Prompt user for F64 expression. Bool okay; U8 *st; F64 res; while (TRUE) { if (message) - "" message,dft; + "" message,default; st=GetStr; if (!*st) { Free(st); - return dft; + return default; } try { res=ExePrint2("ToF64(%s);",st)(F64); @@ -221,19 +221,19 @@ public F64 GetF64(U8 *message=NULL,F64 dft=0,F64 lo=F64_MIN,F64 hi=F64_MAX) } } -public CDate GetDate(U8 *message=NULL,CDate dft=I64_MIN, +public CDate GetDate(U8 *message=NULL,CDate default=I64_MIN, CDate lo=I64_MIN,CDate hi=I64_MAX) {//Prompt user for date expression. (Use $LK,"Now",A="MN:Now"$() if you want current time.) U8 *st; CDate res; - if (dft==I64_MIN) dft=Now; + if (default==I64_MIN) default=Now; while (TRUE) { if (message) - "" message,dft,dft; + "" message,default,default; st=GetStr; if (!*st) { Free(st); - return dft; + return default; } res=Str2Date(st); Free(st); diff --git a/src/Zenith/DolDoc/DocGr.HC b/src/Zenith/DolDoc/DocGr.HC index ec8d88cf..1f802329 100755 --- a/src/Zenith/DolDoc/DocGr.HC +++ b/src/Zenith/DolDoc/DocGr.HC @@ -1,7 +1,7 @@ #help_index "Graphics/Input" public I64 PopUpColor(U8 *header=NULL, - Bool allow_transparent=TRUE,Bool allow_dft=TRUE) + Bool allow_transparent=TRUE,Bool allow_default=TRUE) {//Chooser for 16-color, default or transparent. I64 i; CDoc *doc=DocNew; @@ -11,8 +11,8 @@ public I64 PopUpColor(U8 *header=NULL, DocPrint(doc,"$$MU,\"TRANSPARENT\",LE=TRANSPARENT$$\n"); for (i=0;icur_str,doldoc.hash,DHT_DOC_CMD)) { i=tmph->user_data0; Lex(cc); - ParseDocFlags(cc,&doldoc.dft_de_flags[i],&doldoc.dft_type_flags[i]); + ParseDocFlags(cc,&doldoc.default_de_flags[i],&doldoc.default_type_flags[i]); } if (cc->token==';') Lex(cc); @@ -43,11 +43,11 @@ U0 DocInit() CompCtrlDel(cc); for (i=0;imem_task); res->type=type; - res->de_flags=de_flags|doldoc.dft_de_flags[type.u8[0]]; + res->de_flags=de_flags|doldoc.default_de_flags[type.u8[0]]; res->x=x; res->y=y; res->page_line_num=page_line_num; @@ -234,7 +234,7 @@ public U0 DocInsEntry(CDoc *doc,CDocEntry *doc_e) } public U0 DocRst(CDoc *doc,Bool is_old) -{//Del all entries and set doc to dfts. +{//Del all entries and set doc to defaults. Bool unlock; CDocEntry *doc_e,*doc_e2; CDocUndo *u,*u8; @@ -279,19 +279,19 @@ public U0 DocRst(CDoc *doc,Bool is_old) doc->best_d=I64_MAX; s=&doc->settings_head; - s->left_margin=DOC_DFT; - s->right_margin=DOC_DFT; + s->left_margin=DOC_DEFAULT; + s->right_margin=DOC_DEFAULT; s->indent=0; s->page_len=66; - s->header=DOC_DFT; - s->footer=DOC_DFT; + s->header=DOC_DEFAULT; + s->footer=DOC_DEFAULT; s->state=DOCSS_NORMAL; s->comment_depth=0; s->paren_depth=0; s->brace_depth=0; s->shifted_x=0; s->shifted_y=0; - s->cur_text_attr=s->dft_text_attr=DOC_ATTR_DFT_TEXT; + s->cur_text_attr=s->default_text_attr=DOC_ATTR_DEFAULT_TEXT; doc_e=&doc->head; doc_e->type=DOCT_ERROR; diff --git a/src/Zenith/DolDoc/DocPlain.HC b/src/Zenith/DolDoc/DocPlain.HC index 88f53b03..3ba5a1fb 100755 --- a/src/Zenith/DolDoc/DocPlain.HC +++ b/src/Zenith/DolDoc/DocPlain.HC @@ -49,12 +49,12 @@ U8 *Doc2PlainText(CDoc *doc,CDocEntry *doc_e) if (doc_e->type_u8==DOCT_FOREGROUND && doc->flags&DOCF_COLOR_NAMES && 0<=attrtype_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]; + f1=doldoc.default_de_flags[doc_e->type_u8]; + t1=doc_e->type_u8|doldoc.default_type_flags[doc_e->type_u8]; de_flags=doc_e->de_flags&~(DOCG_BL_IV_UL|DOCEF_SEL| DOCEF_HIGHLIGHT|DOCEF_WORD_WRAP|DOCEF_SKIP|DOCEF_FILTER_SKIP); @@ -90,8 +90,8 @@ U8 *Doc2PlainText(CDoc *doc,CDocEntry *doc_e) break; case DOCT_FOREGROUND: case DOCT_BACKGROUND: - case DOCT_DFT_FOREGROUND: - case DOCT_DFT_BACKGROUND: + case DOCT_DEFAULT_FOREGROUND: + case DOCT_DEFAULT_BACKGROUND: if (doc->flags&DOCF_COLOR_NAMES && 0<=attrattr,"ST_COLORS"); Free(buf); buf=buf2; @@ -110,7 +110,7 @@ U8 *Doc2PlainText(CDoc *doc,CDocEntry *doc_e) case DOCT_UNDERLINE: case DOCT_SHIFTED_X: case DOCT_SHIFTED_Y: - if (attr!=DOC_DFT) { + if (attr!=DOC_DEFAULT) { buf2=MStrPrint("%s%d,",buf,doc_e->attr); Free(buf); buf=buf2; } @@ -145,7 +145,7 @@ U8 *Doc2PlainText(CDoc *doc,CDocEntry *doc_e) buf2=""; } else buf2=doc_e->tag; - if (Bt(&doldoc.dft_de_flags[doc_e->type_u8],DOCEf_TAG)) + if (Bt(&doldoc.default_de_flags[doc_e->type_u8],DOCEf_TAG)) buf2=MStrPrint("%s\"%$$Q\",",buf,buf2); else buf2=MStrPrint("%sT=\"%$$Q\",",buf,buf2); @@ -216,7 +216,7 @@ U8 *Doc2PlainText(CDoc *doc,CDocEntry *doc_e) CDocEntry *ParseDollarCmd(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; + I64 i,j,de_flags,processed_flags,attr=DOC_DEFAULT; U8 *ptr,*st2; CDocEntry *doc_e=NULL; CHashGeneric *tmph; @@ -237,10 +237,10 @@ CDocEntry *ParseDollarCmd(CDoc *doc,U8 *st) Lex(cc); //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->de_flags=doldoc.default_de_flags[i]; + doc_e->type|=doldoc.default_type_flags[i]; doc_e->raw_type=RT_I64; - doc_e->len=DOCE_LEN_DFT; + doc_e->len=DOCE_LEN_DEFAULT; j=ParseDocFlags(cc,&doc_e->de_flags,&doc_e->type); cc->htc.hash_table_list=old_hash_table_list; switch [i] { @@ -269,8 +269,8 @@ CDocEntry *ParseDollarCmd(CDoc *doc,U8 *st) case DOCT_INDENT: case DOCT_FOREGROUND: case DOCT_BACKGROUND: - case DOCT_DFT_FOREGROUND: - case DOCT_DFT_BACKGROUND: + case DOCT_DEFAULT_FOREGROUND: + case DOCT_DEFAULT_BACKGROUND: case DOCT_WORD_WRAP: case DOCT_HIGHLIGHT: case DOCT_BLINK: @@ -311,7 +311,7 @@ CDocEntry *ParseDollarCmd(CDoc *doc,U8 *st) //If a $$MA,LM=""$$, Tag is filled when the LM is processed. //if doc_e->df_flags&DOCEF_LIST, // Tag is filled when the Define is processed. - //(The dft_flag1.tag calls this after.) + //(The default_flag1.tag calls this after.) if (cc->token==TK_STR) { st2=LexExtStr(cc); if (i==DOCT_CHECK_BOX) { @@ -340,7 +340,7 @@ CDocEntry *ParseDollarCmd(CDoc *doc,U8 *st) case DOCEf_LEN: if (cc->token) { doc_e->len=LexExpression(cc); - doc_e->de_flags&=~DOCEF_DFT_LEN; + doc_e->de_flags&=~DOCEF_DEFAULT_LEN; } else goto pd_err; break; @@ -431,7 +431,7 @@ CDocEntry *ParseDollarCmd(CDoc *doc,U8 *st) if (j<0) goto pd_err; doc_e->raw_type=j; - doc_e->de_flags&=~DOCEF_DFT_RAW_TYPE; + doc_e->de_flags&=~DOCEF_DEFAULT_RAW_TYPE; Lex(cc); } else goto pd_err; diff --git a/src/Zenith/DolDoc/DocPopUp.HC b/src/Zenith/DolDoc/DocPopUp.HC index 8d24670b..754d748f 100755 --- a/src/Zenith/DolDoc/DocPopUp.HC +++ b/src/Zenith/DolDoc/DocPopUp.HC @@ -52,11 +52,11 @@ public U8 *PopUpPickDir(U8 *dir=NULL) return res; } -public U8 *FileNameForm(U8 *dft=NULL,I64 dof_flags=0,CTask *mem_task=NULL) +public U8 *FileNameForm(U8 *default=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); + if (default) + StrCpy(fn.name,default); else *fn.name=0; if (DocForm(&fn,,dof_flags)) @@ -65,10 +65,10 @@ public U8 *FileNameForm(U8 *dft=NULL,I64 dof_flags=0,CTask *mem_task=NULL) return NULL; } -public U8 *PopUpFileName(U8 *dft=NULL,I64 dof_flags=0) +public U8 *PopUpFileName(U8 *default=NULL,I64 dof_flags=0) {//Filename chooser. Uses form, not $LK,"FileMgr",A="MN:FileMgr"$(). U8 *st=MStrPrint("FileNameForm(\"%Q\",0x%X,Fs->parent_task);", - dft,dof_flags|DOF_SIZE_MIN),*res=PopUp(st,Fs); + default,dof_flags|DOF_SIZE_MIN),*res=PopUp(st,Fs); Free(st); return res; } @@ -178,17 +178,17 @@ public U8 *PopUpGetStr(U8 *header=NULL) return res; } -public I64 PopUpGetI64(U8 *message,I64 dft,I64 lo=I64_MIN,I64 hi=I64_MAX) +public I64 PopUpGetI64(U8 *message,I64 default,I64 lo=I64_MIN,I64 hi=I64_MAX) {//Prompt for I64 text expression in PopUp win task. - U8 *st=MStrPrint("GetI64(0x%X,0x%X,0x%X,0x%X);",message,dft,lo,hi); + U8 *st=MStrPrint("GetI64(0x%X,0x%X,0x%X,0x%X);",message,default,lo,hi); I64 res=PopUp(st,Fs); Free(st); return res; } -public F64 PopUpGetF64(U8 *message,F64 dft,F64 lo=F64_MIN,F64 hi=F64_MAX) +public F64 PopUpGetF64(U8 *message,F64 default,F64 lo=F64_MIN,F64 hi=F64_MAX) {//Prompt for F64 text expression in PopUp win task. - U8 *st=MStrPrint("GetF64(0x%X,0x%X(F64),0x%X(F64),0x%X(F64));",message,dft,lo,hi); + U8 *st=MStrPrint("GetF64(0x%X,0x%X(F64),0x%X(F64),0x%X(F64));",message,default,lo,hi); F64 res=PopUp(st,Fs)(F64); Free(st); return res; @@ -264,7 +264,7 @@ public I64 ZenithFile(U8 *filename,Bool warn_ext=TRUE) {//Make zenith_task execute file. Bool okay=TRUE; U8 *name=FileNameAbs(filename), - *name2=ExtDft(name,"HC"); + *name2=ExtDefault(name,"HC"); I64 res=0; if (warn_ext && !FilesFindMatch(name2,FILEMASK_JIT) && @@ -282,7 +282,7 @@ public I64 PopUpFile(U8 *filename,Bool warn_ext=TRUE, {//$LK,"ExeFile2",A="MN:ExeFile2"$() in $LK,"PopUp",A="MN:PopUp"$ task. Cont as User. Bool okay=TRUE; U8 *st,*name=FileNameAbs(filename), - *name2=ExtDft(name,"HC"); + *name2=ExtDefault(name,"HC"); I64 res=0; if (warn_ext && !FilesFindMatch(name2,FILEMASK_JIT) && @@ -304,7 +304,7 @@ public I64 PopUpFile(U8 *filename,Bool warn_ext=TRUE, public I64 PopUpRunFile(U8 *filename,I64 ccf_flags=0,...) {//$LK,"ExeFile",A="MN:ExeFile"$() with args using $LK,"LastFun",A="MN:LastFun"$() in $LK,"PopUp",A="MN:PopUp"$ task. U8 *st,*name=FileNameAbs(filename), - *name2=ExtDft(name,"HC"); + *name2=ExtDefault(name,"HC"); I64 res=0; st=MStrPrint( "\"$$$$WW+H,1$$$$\";ExeFile2(\"%s\",0x%X);LastFun(0x%X,0x%X);", diff --git a/src/Zenith/DolDoc/DocPutS.HC b/src/Zenith/DolDoc/DocPutS.HC index 1c1ba18d..02a01f9b 100755 --- a/src/Zenith/DolDoc/DocPutS.HC +++ b/src/Zenith/DolDoc/DocPutS.HC @@ -27,7 +27,7 @@ CDocEntry *DocPutS(CDoc *doc,U8 *st) if (!ch) { if (j=ptr-ptr2) { doc_e=DocEntryNewBase(doc, - DOCT_TEXT|doc->settings_head.dft_text_attr<<8); + DOCT_TEXT|doc->settings_head.default_text_attr<<8); if (doc->flags & DOCF_NO_CURSOR) { src=MAlloc(j+1); MemCpy(src,ptr2,j+1); @@ -46,7 +46,7 @@ CDocEntry *DocPutS(CDoc *doc,U8 *st) if (j=ptr-ptr2) { *ptr=0; doc_e=DocEntryNewBase(doc, - DOCT_TEXT|doc->settings_head.dft_text_attr<<8); + DOCT_TEXT|doc->settings_head.default_text_attr<<8); if (doc->flags & DOCF_NO_CURSOR) { src=MAlloc(j+1); MemCpy(src,ptr2,j+1); @@ -72,13 +72,13 @@ CDocEntry *DocPutS(CDoc *doc,U8 *st) switch (ch) { case CH_CURSOR: doc_e=DocEntryNewBase(doc, - DOCT_CURSOR|doc->settings_head.dft_text_attr<<8); + DOCT_CURSOR|doc->settings_head.default_text_attr<<8); DocInsEntry(doc,doc_e); ptr++; break; case '\t': doc_e=DocEntryNewBase(doc, - DOCT_TAB|doc->settings_head.dft_text_attr<<8); + DOCT_TAB|doc->settings_head.default_text_attr<<8); DocInsEntry(doc,doc_e); ptr++; break; @@ -91,13 +91,13 @@ CDocEntry *DocPutS(CDoc *doc,U8 *st) *ptr=0; //zero second dollar if (ptr-1==ptr2 && *ptr2==CH_CURSOR) { doc_e=DocEntryNewBase(doc, - DOCT_CURSOR|doc->settings_head.dft_text_attr<<8); + DOCT_CURSOR|doc->settings_head.default_text_attr<<8); DocInsEntry(doc,doc_e); ptr2++; } if (ptr==ptr2) { doc_e=DocEntryNewBase(doc, - DOCT_TEXT|doc->settings_head.dft_text_attr<<8); + DOCT_TEXT|doc->settings_head.default_text_attr<<8); doc_e->max_col=1; if (doc->flags & DOCF_DBL_DOLLARS) doc_e->tag=StrNew("$$$$",doc->mem_task); @@ -111,7 +111,7 @@ CDocEntry *DocPutS(CDoc *doc,U8 *st) while (ch=*ptr3++) { if (ch==CH_CURSOR) { doc_e=DocEntryNewBase(doc, - DOCT_CURSOR|doc->settings_head.dft_text_attr<<8); + DOCT_CURSOR|doc->settings_head.default_text_attr<<8); DocInsEntry(doc,doc_e); } else *ptr4++=ch; @@ -128,7 +128,7 @@ CDocEntry *DocPutS(CDoc *doc,U8 *st) break; default: doc_e=DocEntryNewBase(doc, - DOCT_NEW_LINE|doc->settings_head.dft_text_attr<<8); + DOCT_NEW_LINE|doc->settings_head.default_text_attr<<8); DocInsEntry(doc,doc_e); if (ch=='\r') while (*ptr=='\r') @@ -204,8 +204,8 @@ public U0 DocPrintPartial(CDoc *doc=NULL,U8 *fmt,...) doc_ce->tag=st; } else { doc_ne=DocEntryNewTag(doc,doc_ce,ptr2); - doc_ne->type=DOCT_TEXT|doc->settings_head.dft_text_attr<<8; - doc_ne->de_flags=doldoc.dft_de_flags[DOCT_TEXT]; + doc_ne->type=DOCT_TEXT|doc->settings_head.default_text_attr<<8; + doc_ne->de_flags=doldoc.default_de_flags[DOCT_TEXT]; QueueInsert(doc_ne,doc_ce->last); doc->cur_entry=doc_ne; doc->cur_col=StrLen(ptr2); diff --git a/src/Zenith/DolDoc/DocRecalc.HC b/src/Zenith/DolDoc/DocRecalc.HC index ebf8a2bf..5ed0131b 100755 --- a/src/Zenith/DolDoc/DocRecalc.HC +++ b/src/Zenith/DolDoc/DocRecalc.HC @@ -97,14 +97,14 @@ U0 DocRecalcXY(CDoc *doc,CDocEntry *doc_e, doc->page_line_num%doc_e->settings.page_len; else doc->page_line_num=doc->page_line_num%doc_e->settings.page_len; - if (doc_e->settings.header!=DOC_DFT && + if (doc_e->settings.header!=DOC_DEFAULT && doc->page_line_numsettings.header) { y+=doc_e->settings.header-doc->page_line_num; doc->page_line_num=doc_e->settings.header; } - if (doc_e->settings.footer==DOC_DFT) { + if (doc_e->settings.footer==DOC_DEFAULT) { if (doc->page_line_num>=doc_e->settings.page_len) { - if (doc_e->settings.header==DOC_DFT) + if (doc_e->settings.header==DOC_DEFAULT) doc->page_line_num=0; else { doc->page_line_num=doc_e->settings.header; @@ -115,7 +115,7 @@ U0 DocRecalcXY(CDoc *doc,CDocEntry *doc_e, if (doc->page_line_num>= doc_e->settings.page_len-doc_e->settings.footer) { y+=doc_e->settings.footer; - if (doc_e->settings.header==DOC_DFT) + if (doc_e->settings.header==DOC_DEFAULT) doc->page_line_num=0; else { doc->page_line_num=doc_e->settings.header; @@ -354,7 +354,7 @@ public Bool DocRecalc(CDoc *doc,I64 recalc_flags=RECALCt_NORMAL) recalc_flags&=~RECALCF_HAS_CURSOR; if (recalc_flags&RECALCG_MASK==RECALCt_TO_SCRN) doc->settings_head.cur_text_attr= - doc->settings_head.dft_text_attr=win_task->border_attr; + doc->settings_head.default_text_attr=win_task->border_attr; } else { if (recalc_flags&RECALCF_HAS_CURSOR && full_refresh) { if (Bt(&hss->flags,WSSf_SET_TO_POS)||Bt(&vss->flags,WSSf_SET_TO_POS)) { @@ -375,7 +375,7 @@ public Bool DocRecalc(CDoc *doc,I64 recalc_flags=RECALCt_NORMAL) } if (recalc_flags&RECALCG_MASK==RECALCt_TO_SCRN) doc->settings_head.cur_text_attr= - doc->settings_head.dft_text_attr=win_task->text_attr; + doc->settings_head.default_text_attr=win_task->text_attr; } x0=doc->line_start_col; y0=doc->top_line_num; @@ -727,7 +727,7 @@ public Bool DocRecalc(CDoc *doc,I64 recalc_flags=RECALCt_NORMAL) y++; doc->page_line_num++; rc_start_of_line: - if (s->left_margin==DOC_DFT) + if (s->left_margin==DOC_DEFAULT) x=s->indent; else x=s->indent+s->left_margin; @@ -744,16 +744,16 @@ rc_adjust_xy: doc->page_line_num=doc->page_line_num%s->page_len; } } - if (s->header!=DOC_DFT) { + if (s->header!=DOC_DEFAULT) { if (doc->page_line_numheader) { y+=s->header-doc->page_line_num; doc->page_line_num=s->header; goto rc_start_of_line; } } - if (s->footer==DOC_DFT) { + if (s->footer==DOC_DEFAULT) { if (doc->page_line_num>=s->page_len) { - if (s->header==DOC_DFT) + if (s->header==DOC_DEFAULT) doc->page_line_num=0; else { doc->page_line_num=s->header; @@ -764,7 +764,7 @@ rc_adjust_xy: } else { if (doc->page_line_num>=s->page_len-s->footer) { y+=s->footer; - if (s->header==DOC_DFT) + if (s->header==DOC_DEFAULT) doc->page_line_num=0; else { doc->page_line_num=s->header; @@ -869,36 +869,36 @@ rc_adjust_xy: goto rc_start_of_line; case DOCT_FOREGROUND: cur_u8_attr&=0xF0; - if (doc_e->attr==DOC_DFT) - cur_u8_attr|=s->dft_text_attr&0x0F; + if (doc_e->attr==DOC_DEFAULT) + cur_u8_attr|=s->default_text_attr&0x0F; else cur_u8_attr|=doc_e->attr; s->cur_text_attr=cur_u8_attr; break; case DOCT_BACKGROUND: cur_u8_attr&=0x0F; - if (doc_e->attr==DOC_DFT) - cur_u8_attr|=s->dft_text_attr&0xF0; + if (doc_e->attr==DOC_DEFAULT) + cur_u8_attr|=s->default_text_attr&0xF0; else cur_u8_attr|=doc_e->attr<<4; s->cur_text_attr=cur_u8_attr; break; - case DOCT_DFT_FOREGROUND: + case DOCT_DEFAULT_FOREGROUND: cur_u8_attr&=0xF0; - if (doc_e->attr==DOC_DFT) - cur_u8_attr|=s->dft_text_attr&0xF; + if (doc_e->attr==DOC_DEFAULT) + cur_u8_attr|=s->default_text_attr&0xF; else cur_u8_attr|=doc_e->attr; - s->dft_text_attr=s->dft_text_attr&0xF0|cur_u8_attr&0x0F; + s->default_text_attr=s->default_text_attr&0xF0|cur_u8_attr&0x0F; s->cur_text_attr=cur_u8_attr; break; - case DOCT_DFT_BACKGROUND: + case DOCT_DEFAULT_BACKGROUND: cur_u8_attr&=0x0F; - if (doc_e->attr==DOC_DFT) - cur_u8_attr|=s->dft_text_attr&0xF0; + if (doc_e->attr==DOC_DEFAULT) + cur_u8_attr|=s->default_text_attr&0xF0; else cur_u8_attr|=doc_e->attr<<4; - s->dft_text_attr=s->dft_text_attr&0x0F|cur_u8_attr&0xF0; + s->default_text_attr=s->default_text_attr&0x0F|cur_u8_attr&0xF0; s->cur_text_attr=cur_u8_attr; break; case DOCT_WORD_WRAP: diff --git a/src/Zenith/DolDoc/DocWidgetWiz.HC b/src/Zenith/DolDoc/DocWidgetWiz.HC index 04f58863..a98787d6 100755 --- a/src/Zenith/DolDoc/DocWidgetWiz.HC +++ b/src/Zenith/DolDoc/DocWidgetWiz.HC @@ -313,10 +313,10 @@ Bool GetLink(I64 type,U8 **_tag,U8 **_link,Bool *_pop_up, } break; case LK_ADDR: - e->num=DFT_ADDR_LINK_BIN_SIZE; + e->num=DEFAULT_ADDR_LINK_BIN_SIZE; if (DocForm(e,"CEdAddrLink",,,ctrl_L_footer)) { res=TRUE; - if (e->num==DFT_ADDR_LINK_BIN_SIZE) { + if (e->num==DEFAULT_ADDR_LINK_BIN_SIZE) { if (!*e->tag) *_tag=StrNew(e->aux); else @@ -396,8 +396,8 @@ I64 PopUpColorType() DocPrint(doc,"$$PURPLE$$$$TX+CX,\"Color Type Menu\"$$\n" "\n$$LTBLUE$$$$MU,\"Foreground\",LE=DOCT_FOREGROUND$$\n" "$$MU,\"Background\",LE=DOCT_BACKGROUND$$\n" - "$$MU,\"Default Foreground\",LE=DOCT_DFT_FOREGROUND$$\n" - "$$MU,\"Default Background\",LE=DOCT_DFT_BACKGROUND$$\n" + "$$MU,\"Default Foreground\",LE=DOCT_DEFAULT_FOREGROUND$$\n" + "$$MU,\"Default Background\",LE=DOCT_DEFAULT_BACKGROUND$$\n" "%s",ctrl_L_footer); i=PopUpMenu(doc); DocDel(doc); @@ -422,10 +422,10 @@ I64 PopUpPageSettingType() U0 EdInsColor() { - I64 type=PopUpColorType,col=DOC_DFT; + I64 type=PopUpColorType,col=DOC_DEFAULT; if (type>=0) { col=PopUpColor(,FALSE); - if (col==DOC_DFT) + if (col==DOC_DEFAULT) "$$%Z$$",type,"ST_DOC_CMDS"; else if (col>=0) "$$%Z,%d$$",type,"ST_DOC_CMDS",col; @@ -792,7 +792,7 @@ U0 EdInsData() U8 *st,buf[512],raw_type[16]; CEdDataNum *e=CAlloc(sizeof(CEdDataNum)); e->term=TRUE; - e->len=DOCE_LEN_DFT; + e->len=DOCE_LEN_DEFAULT; if ((i=PopUpPickDefineSub("ST_NATURAL_TYPES"))>=0) { *buf=0; i+=RT_I8; @@ -822,7 +822,7 @@ U0 EdInsData() st=MStrPrint("%q",e->fmt_str); if (e->remalloc) "$$$$DA%s,A=\\\"%$$Q\\\"$$$$",buf,st; - else if (e->len==DOCE_LEN_DFT) + else if (e->len==DOCE_LEN_DEFAULT) "$$$$DA%s%s,A=\\\"%$$Q\\\"$$$$",buf,raw_type,st; else "$$$$DA%s,LEN=%d%s,A=\\\"%$$Q\\\"$$$$",buf,e->len,raw_type,st; @@ -861,7 +861,7 @@ U0 EdInsCheckBox() class CEdList { - U8 tag[512] format "$$DA-P,A=\"Dft Sel:%s\"$$\n", + U8 tag[512] format "$$DA-P,A=\"Default Sel:%s\"$$\n", define_str[512] format "$$DA-P,A=\"Define Str:%s\"$$\n"; Bool refresh format "$$CB,\"Refresh Data\"$$\n"; I64 type format "$$LS,D=\"ST_INT_SIZE_TYPES\"$$\n"; diff --git a/src/Zenith/DolDoc/MakeDoc.HC b/src/Zenith/DolDoc/MakeDoc.HC index 0d64c2d9..306329d8 100755 --- a/src/Zenith/DolDoc/MakeDoc.HC +++ b/src/Zenith/DolDoc/MakeDoc.HC @@ -21,13 +21,13 @@ See $LK,"::/Doc/DolDocOverview.DD"$ public class CDolDocGlobals { CHashTable *hash; - I64 dft_de_flags [DOCT_TYPES_NUM], + I64 default_de_flags [DOCT_TYPES_NUM], type_flags_nontag_invis [(DOCT_TYPES_NUM+63)/64], type_flags_form [(DOCT_TYPES_NUM+63)/64], type_flags_data [(DOCT_TYPES_NUM+63)/64], type_flags_chk_dup [(DOCT_TYPES_NUM+63)/64], clean_scan_codes [4]; - I32 dft_type_flags [DOCT_TYPES_NUM]; + I32 default_type_flags [DOCT_TYPES_NUM]; } doldoc; MemSet(&doldoc,0,sizeof(CDolDocGlobals)); diff --git a/src/Zenith/Gr/GrDC.HC b/src/Zenith/Gr/GrDC.HC index 55c6e67c..35d39e74 100755 --- a/src/Zenith/Gr/GrDC.HC +++ b/src/Zenith/Gr/GrDC.HC @@ -13,7 +13,7 @@ public U0 Mat4x4MulXYZ(I64 *r,I64 *_x,I64 *_y,I64 *_z) } public U0 DCTransform(CDC *dc,I64 *_x,I64 *_y,I64 *_z) -{//This is the dft dc->transform() callback. +{//This is the default dc->transform() callback. //Uses $LK,"fixed-point",A="FI:::/Demo/Lectures/FixedPoint.HC"$. Mat4x4MulXYZ(dc->r,_x,_y,_z); *_x+=dc->x; @@ -56,7 +56,7 @@ public U0 DCMat4x4Set(CDC *dc=NULL,I64 *r) #help_index "Graphics/Mesh" public U0 DCLighting(CDC *dc, CD3I32 *p1,CD3I32 *p2,CD3I32 *p3,CColorROPU32 color) -{//This is the dft dc->lighting() callback. +{//This is the default dc->lighting() callback. CD3I32 v1,v2; I64 i,vn_x,vn_y,vn_z; F64 d; @@ -383,7 +383,7 @@ public CDC *DCLoad(U8 *src,I64 *_size=NULL,CTask *task=NULL) public I64 GRWrite(U8 *filename,CDC *dc,I64 dcsf_flags=DCSF_COMPRESSED) {//ZenithOS GR File. I64 size; - U8 *st=ExtDft(filename,"GR"), + U8 *st=ExtDefault(filename,"GR"), *src=DCSave(dc,&size,dcsf_flags); FileWrite(st,src,size); Free(st); @@ -394,7 +394,7 @@ public I64 GRWrite(U8 *filename,CDC *dc,I64 dcsf_flags=DCSF_COMPRESSED) public CDC *GRRead(U8 *filename,CTask *task=NULL) {//ZenithOS GR File. CDC *dc=NULL; - U8 *st=ExtDft(filename,"GR"), + U8 *st=ExtDefault(filename,"GR"), *src=FileRead(st); if (src) dc=DCLoad(src,,task); diff --git a/src/Zenith/Gr/ScreenCast.HC b/src/Zenith/Gr/ScreenCast.HC index 38515cbb..13805e7b 100755 --- a/src/Zenith/Gr/ScreenCast.HC +++ b/src/Zenith/Gr/ScreenCast.HC @@ -80,7 +80,7 @@ public I64 AUWrite(U8 *filename,CSndData *head,CDate *t0_now,F64 t0_tS) CSndData *tmpsd; CAUData *base,*dst; I64 size=(1+QueueCount(head))*sizeof(CAUData); - U8 *st=ExtDft(filename,"AU"); + U8 *st=ExtDefault(filename,"AU"); base=dst=MAlloc(size); tmpsd=head; do { diff --git a/src/Zenith/Gr/SpriteMain.HC b/src/Zenith/Gr/SpriteMain.HC index 48c2a969..3cd0c799 100755 --- a/src/Zenith/Gr/SpriteMain.HC +++ b/src/Zenith/Gr/SpriteMain.HC @@ -280,7 +280,7 @@ CSprite *SMScreenBitMap(I64 eletype,CDC *dc,CDC *dc2,I64 x,I64 y, DCDel(img); DCDel(dc3); dc2->thick=old_width; - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS -WIF_SELF_BORDER-WIF_SELF_GRAB_SCROLL; return res; } @@ -835,7 +835,7 @@ I64 SpriteMainEd(CDoc *doc) x+=xx; y+=yy; DCFill; if (eletype==SPT_MENU) { - Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_FOCUS + Fs->win_inhibit=WIG_TASK_DEFAULT-WIF_SELF_FOCUS -WIF_SELF_BORDER-WIF_SELF_GRAB_SCROLL; if (winmgr.fps<10) doc_ce->de_flags|=DOCEF_DONT_DRAW; @@ -941,7 +941,7 @@ I64 SpriteMainEd(CDoc *doc) doc_ce->de_flags|=DOCEF_DONT_DRAW; PopUpOk("Drag-out a rect for the extents of the\nbitmap.\n"); doc_ce->de_flags=old_de_flags; - Fs->win_inhibit=WIG_TASK_DFT|WIF_FOCUS_TASK_MS_L|WIF_FOCUS_TASK_MS_R| + Fs->win_inhibit=WIG_TASK_DEFAULT|WIF_FOCUS_TASK_MS_L|WIF_FOCUS_TASK_MS_R| WIF_FOCUS_TASK_BORDER-WIF_SELF_FOCUS-WIF_SELF_GRAB_SCROLL; break; case SPT_BITMAP: @@ -979,7 +979,7 @@ I64 SpriteMainEd(CDoc *doc) PopUpOk("Drag-out a rect for the extents of the\nbitmap.\n"); } doc_ce->de_flags=old_de_flags; - Fs->win_inhibit=WIG_TASK_DFT|WIF_FOCUS_TASK_MS_L|WIF_FOCUS_TASK_MS_R| + Fs->win_inhibit=WIG_TASK_DEFAULT|WIF_FOCUS_TASK_MS_L|WIF_FOCUS_TASK_MS_R| WIF_FOCUS_TASK_BORDER-WIF_SELF_FOCUS-WIF_SELF_GRAB_SCROLL; break; case SPT_THICK: diff --git a/src/Zenith/Gr/SpriteMesh.HC b/src/Zenith/Gr/SpriteMesh.HC index 66325f6d..b0f50082 100755 --- a/src/Zenith/Gr/SpriteMesh.HC +++ b/src/Zenith/Gr/SpriteMesh.HC @@ -790,7 +790,7 @@ U0 DrawIt(CTask *task,CDC *dc) task->win_inhibit=WIF_SELF_DOC; } else { MeshCurSnap(e); - task->win_inhibit=WIG_TASK_DFT|WIF_SELF_DOC-WIF_SELF_FOCUS-WIF_SELF_BORDER + task->win_inhibit=WIG_TASK_DEFAULT|WIF_SELF_DOC-WIF_SELF_FOCUS-WIF_SELF_BORDER -WIF_SELF_CTRLS-WIF_FOCUS_TASK_MENU-WIF_SELF_GRAB_SCROLL; } @@ -1062,7 +1062,7 @@ $WW,0$*/ "$$GREEN$$'s'$$FG$$: Set snap\n" "\nSee menu at top of scrn for more.\n"); - Fs->win_inhibit=WIG_TASK_DFT|WIF_SELF_DOC-WIF_SELF_FOCUS-WIF_SELF_BORDER + Fs->win_inhibit=WIG_TASK_DEFAULT|WIF_SELF_DOC-WIF_SELF_FOCUS-WIF_SELF_BORDER -WIF_SELF_CTRLS-WIF_FOCUS_TASK_MENU-WIF_SELF_GRAB_SCROLL; Fs->horz_scroll.pos=0; Fs->vert_scroll.pos=0; diff --git a/src/Zenith/Utils/Diff.HC b/src/Zenith/Utils/Diff.HC index 1f962f62..bac8f8ca 100755 --- a/src/Zenith/Utils/Diff.HC +++ b/src/Zenith/Utils/Diff.HC @@ -320,7 +320,7 @@ I64 ZRepCompare(CDirEntry *e1,CDirEntry *e2) public U0 ZipRep(U8 *files_find_mask="/*",U8 *fu_flags=NULL, Bool just_text_not_graphics=TRUE) {//Report file compressibility. -//Dft is just src files. (Used to spot +//Default is just src files. (Used to spot //src files with redundancy in them.) I64 i=0,count,size,fuf_flags=0; CDirEntry *tmpde,*tmpde1,**sort_buf; diff --git a/src/Zenith/Utils/StrUtils.HC b/src/Zenith/Utils/StrUtils.HC index 324a6b71..64bf11b0 100755 --- a/src/Zenith/Utils/StrUtils.HC +++ b/src/Zenith/Utils/StrUtils.HC @@ -14,9 +14,9 @@ public I64 Sort(U8 *_in_name,U8 *_out_name=NULL, I64 i,j,count=0,res; if (!_in_name) return 0; - in_name=ExtDft(_in_name,".DD"); + in_name=ExtDefault(_in_name,".DD"); if (_out_name) - out_name=ExtDft(_out_name,".DD"); + out_name=ExtDefault(_out_name,".DD"); else out_name=StrNew(in_name); diff --git a/src/Zenith/Utils/ToTXT.HC b/src/Zenith/Utils/ToTXT.HC index 71640e70..a2bf00e1 100755 --- a/src/Zenith/Utils/ToTXT.HC +++ b/src/Zenith/Utils/ToTXT.HC @@ -112,9 +112,9 @@ public U0 ToTXT(U8 *_in_name,U8 *_out_name=NULL,I64 width=70) SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$ WinHorz(0,width-1); //Sets doc width for word wrap. - in_name=ExtDft(_in_name,".DD"); + in_name=ExtDefault(_in_name,".DD"); if (_out_name) - out_name=ExtDft(_out_name,"TXT"); + out_name=ExtDefault(_out_name,"TXT"); else out_name=ExtChg(_in_name,"TXT"); diff --git a/src/Zenith/ZBlkDev/Mount.HC b/src/Zenith/ZBlkDev/Mount.HC index aa010d7b..65b5ae65 100755 --- a/src/Zenith/ZBlkDev/Mount.HC +++ b/src/Zenith/ZBlkDev/Mount.HC @@ -147,7 +147,7 @@ public U0 Unmount(U8 drv_let=0) public U8 MountFile(U8 *filename) {//Mount ISO.C file. - U8 *filename2=ExtDft(filename,"ISO.C"),*filename3=FileNameAbs(filename2); + U8 *filename2=ExtDefault(filename,"ISO.C"),*filename3=FileNameAbs(filename2); CDrive *dv=DriveMakeFreeSlot(DriveNextFreeLet('M')); //First $LK,"BDT_ISO_FILE_READ",A="MN:BDT_ISO_FILE_READ"$ CBlkDev *bd=BlkDevNextFreeSlot(dv->drv_let,BDT_ISO_FILE_READ); bd->drv_offset=19<<2+(DVD_BLK_SIZE*2+DVD_BOOT_LOADER_SIZE)/BLK_SIZE; diff --git a/src/Zenith/ZExterns.HC b/src/Zenith/ZExterns.HC index 34cf30f1..806946ee 100755 --- a/src/Zenith/ZExterns.HC +++ b/src/Zenith/ZExterns.HC @@ -46,7 +46,7 @@ extern U0 EdCodeTools(CDoc *doc); extern U8 *EdSprite(I64 bin_num); extern I64 ExeDoc(CDoc *doc,I64 ccf_flags=0); extern I64 FindWiz(); -extern I64 GetI64(U8 *message=NULL,I64 dft=0,I64 lo=I64_MIN,I64 hi=I64_MAX); +extern I64 GetI64(U8 *message=NULL,I64 default=0,I64 lo=I64_MIN,I64 hi=I64_MAX); extern Bool GrPlot0(CDC *dc,I64 x,I64 y); extern CMenuEntry *MenuEntryFind(CMenu *haystack_menu,U8 *needle_full_name); extern CMenu *MenuFilePush(U8 *filename); @@ -57,14 +57,14 @@ extern CTask *Noise(I64 mS,F64 min_ona,F64 max_ona); extern Bool Plain(U8 *filename,I64 edf_dof_flags=0); extern Bool PopUpCancelOk(U8 *header=NULL,U8 *footer=NULL); extern I64 PopUpColor(U8 *header=NULL, - Bool allow_transparent=TRUE,Bool allow_dft=TRUE); + Bool allow_transparent=TRUE,Bool allow_default=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 Bool PopUpForm(U8 *_d,U8 *class_name=lastclass, I64 dof_flags=DOF_SIZE_MIN,U8 *header=NULL,U8 *footer=NULL); -extern I64 PopUpGetI64(U8 *message,I64 dft,I64 lo=I64_MIN,I64 hi=I64_MAX); +extern I64 PopUpGetI64(U8 *message,I64 default,I64 lo=I64_MIN,I64 hi=I64_MAX); extern U8 *PopUpGetStr(U8 *header=NULL); extern I64 PopUpMenu(CDoc *doc,I64 dof_flags=0); extern Bool PopUpNoYes(U8 *header=NULL,U8 *footer=NULL); diff --git a/src/Zenith/ZHash.HC b/src/Zenith/ZHash.HC index 098662cc..25375286 100755 --- a/src/Zenith/ZHash.HC +++ b/src/Zenith/ZHash.HC @@ -371,7 +371,7 @@ public U0 PopUpHelpIndex(U8 *idx,CTask *parent=NULL) #help_index "Hash/System" public U0 MapFileLoad(U8 *filename) {//Load map file so we have src line info. - U8 *st,*ptr,*name=ExtDft(filename,"MAP"), + U8 *st,*ptr,*name=ExtDefault(filename,"MAP"), *absname=FileNameAbs(name); CDoc *doc=DocRead(name); CDocEntry *doc_e; diff --git a/src/Zenith/ZRegistry.HC b/src/Zenith/ZRegistry.HC index 053ead4a..048681fc 100755 --- a/src/Zenith/ZRegistry.HC +++ b/src/Zenith/ZRegistry.HC @@ -16,7 +16,7 @@ Bool RegCache() return TRUE; } -public Bool RegDft(U8 *path,U8 *val,Bool is_zenith_entry=FALSE) +public Bool RegDefault(U8 *path,U8 *val,Bool is_zenith_entry=FALSE) {//Add code doc tree branch to registry. Bool res,unlock_doc; RegCache; @@ -109,9 +109,9 @@ U0 RegInit() { U8 buf[STR_LEN]; Bool version_present; - RegDft("Zenith/SysMessageFlags","sys_message_flags[0]=0;\n",TRUE); + RegDefault("Zenith/SysMessageFlags","sys_message_flags[0]=0;\n",TRUE); StrPrint(buf,"registry_version=%4.3f;\n",sys_os_version); - version_present=RegDft("Zenith/SysRegVer",buf,TRUE); + version_present=RegDefault("Zenith/SysRegVer",buf,TRUE); RegExe("Zenith"); if (registry_version!=sys_os_version) { RegWrite("Zenith/SysRegVer",buf); @@ -180,14 +180,14 @@ public U0 OnceExe() {//Execute Once code. Call goes in $LK,"~/Once.HC"$. try { - RegDft("Once/Zenith",""); + RegDefault("Once/Zenith",""); if (RegCount("Once/Zenith")>2) { Zenith("RegExe(\"Once/Zenith\");"); AOnceFlush; } LBts(&sys_run_level,RLf_ONCE_ZENITH); - RegDft("Once/User",""); + RegDefault("Once/User",""); if (RegCount("Once/User")>2) { RegExe("Once/User"); OnceFlush;