Nightly update (ISO SHA-1 ac7be1d)

TempleOSCD/Adam/ADefine.HC

@@ -18,8 +18,8 @@ U0 LoadDocDefines()
   //$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/Adam/Opt/Boot/BootDVD.HC,DD_BOOT_HIGH_LOC_DVD"$
 
   $TR-C,"LineRep"$
-$ID,4$DefinePrint("DD_TEMPLEOS_LOC","119,822");
+$ID,4$DefinePrint("DD_TEMPLEOS_LOC","119,873");
-DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","81,987");
+DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","81,990");
 $ID,-4$
   DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR);
   DefinePrint("DD_MP_VECT_END","%08X",

TempleOSCD/Adam/AutoComplete/ACTask.HC

@@ -222,8 +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_TASK_DFT-WIF_SELF_BORDER
+  Fs->win_inhibit=WIG_NO_FOCUS_TASK_DFT;
-	-WIF_SELF_MS_L-WIF_SELF_MS_R-WIG_DBL_CLICK;
   Free(ac.cur_word);
   ac.cur_word=NULL;
   while (TRUE) {

TempleOSCD/Adam/DolDoc/DocPopUp.HC

@@ -8,22 +8,16 @@ public CTask *PopUpViewDoc(CDoc *doc,I64 dof_flags=0)
   return task;
 }
 
-U0 PopUpViewPrintEndCB()
-{
-  DocDel(FramePtr("ViewStrFrame"));
-  Exit;
-}
-
 public CTask *PopUpViewPrint(U8 *fmt,...)
 {//View Print stmt in PopUp win task.
-  CTask *task;
+  CTask *task=Spawn(&SrvCmdLine,NULL,"View",,Fs);
   U8 *buf=StrPrintJoin(NULL,fmt,argc,argv);
-  CDoc *doc=DocNew;
+  CDoc *doc=DocNew(,task);
   DocPrint(doc,buf);
   Free(buf);
-  task=PopUpViewDoc(doc);
+  buf=MStrPrint("DocEd(0x%X);",doc);
-  FramePtrAdd("ViewStrFrame",doc,task);
+  TaskExe(task,NULL,buf,1<<JOBf_EXIT_ON_COMPLETE|1<<JOBf_FREE_ON_COMPLETE);
-  task->task_end_cb=&PopUpViewPrintEndCB;
+  Free(buf);
   return task;
 }
 

TempleOSCD/Adam/God/HolySpirit.HC

@@ -135,6 +135,14 @@ public I64 GodInit(U8 *files_find_mask="/Adam/God/Vocab.DD*",U8 *fu_flags=NULL)
   return god.num_words;
 } GodInit;
 
+public U8 *GodWordStr(I64 bits=17)
+{//Make God pick a word. $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.DD"$
+  if (god.num_words)
+    return god.words[GodBits(bits)%god.num_words];
+  else
+    return NULL;
+}
+
 public U0 GodWord(I64 bits=17,Bool show_num=FALSE)
 {//Make God pick a word. $LK+PU,"Holy Spirit Instructions",A="FI:::/Adam/God/HSNotes.DD"$
   I64 i;

TempleOSCD/Adam/Win.HC

@@ -343,6 +343,7 @@ ext[EXT_WIN_TO_TOP]=&WinToTop;
 
 public CTask *WinFocus(CTask *task=NULL)
 {//Set task as focus task.
+  if (!task) task=Fs;
   PUSHFD
   CLI
   if (!TaskValidate(task)||Bt(&task->win_inhibit,WIf_SELF_FOCUS))

TempleOSCD/Apps/Psalmody/Help.DD

@@ -6,7 +6,7 @@ $WW,1$$FG,5$$TX+CX,"Psalmody Help"$$FG$
 
 * $FG,2$Psalmody$FG$ uses $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$ files as the song format!  See $LK,"::/Apps/Psalmody/Examples/prosper.HC"$.  The $FG,2$Psalmody$FG$ program does not fully parse the songs when loading them back in, so changes made outside $FG,2$Psalmody$FG$ will be lost, like if you add graphics.
 
-* The first line of the $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$ song files is a comment with a category recognized by $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$().  The categories are $FG,2$"no nothing"$FG$, $FG,2$"has words"$FG$, $FG,2$"has graphics"$FG$, or $FG,2$"special"$FG$.  The third character in the song comment is a digit rating number, shown in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$().  You can set the song rating in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$() by pressing $FG,2$0$FG$-$FG,2$9$FG$.  You can press $FG,2$<DELETE>$FG$ to delete songs.
+* The first line of the $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$ song files is a comment with a category recognized by $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$().  The categories are $FG,2$"no nothing"$FG$, $FG,2$"has words"$FG$, $FG,2$"has graphics"$FG$, or $FG,2$"special"$FG$.  The third character in the song comment is a digit rating number, shown in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$().  You can set the song rating in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$() by pressing $FG,2$0$FG$-$FG,2$9$FG$.  You can request your reward from God by pressing $FG,2$r$FG$.  You can press $FG,2$<DEL>$FG$ to delete songs.
 
 * You can take the $LK,"Play",A="MN:Play"$() stmts out of a song file and place them in your programs.  You can also add a song to a document with $FG,2$<CTRL-l>$FG$, but you should do it after pressing $FG,2$<CTRL-t>$FG$ because the clipboard-insert in $FG,2$<CTRL-l>$FG$ is screwy.  See this $SO,"<Song>",A="4qG5EC4BeGG5qCeFD4sB5G4B5G4qG5EC4BeGG5qCeFD4sB5G4B5GqEeEFqE4BeG5FetC4A5GqFCEeEFqE4BeG5FetC4A5GqFC"$ after pressing $FG,2$<CTRL-t>$FG$, now.
 

TempleOSCD/Apps/Psalmody/JukeBox.HC

@@ -1,3 +1,30 @@
+CTask *JukeReward(U8 *msg)
+{
+  U8 *buf;
+  CDoc *doc;
+  CTask *res=Spawn(&SrvCmdLine,NULL,"Reward",,Fs);
+  StrCpy(res->task_title,"Reward");
+  res->title_src=TTS_LOCKED_CONST;
+
+  doc=DocNew(,res);
+  DocPrint(doc,"$$WW+H,1$$%s",msg);
+
+  buf=MStrPrint("DocEd(0x%X);",doc);
+  TaskExe(res,NULL,buf,1<<JOBf_EXIT_ON_COMPLETE|1<<JOBf_FREE_ON_COMPLETE);
+  Free(buf);
+  TaskWait(res);
+
+  res->border_src =BDS_CONST;
+  res->border_attr=LTGRAY<<4+DrvTextAttrGet(':')&15;
+  res->text_attr  =LTGRAY<<4+BLUE;
+  res->win_inhibit=WIG_NO_FOCUS_TASK_DFT;
+  WinHorz(Fs->win_right+2,TEXT_COLS-2,res);
+  WinVert(2,TEXT_ROWS-2,res);
+
+  WinFocus(Fs->parent_task);
+  return res;
+}
+
 CTask *SingleSong(U8 *msg,U8 *name)
 {
   CTask *task=Spawn(&SrvCmdLine,NULL,name,,Fs);
@@ -6,6 +33,7 @@ CTask *SingleSong(U8 *msg,U8 *name)
   TaskExe(task,Fs,";",1<<JOBf_WAKE_MASTER|1<<JOBf_FREE_ON_COMPLETE);
   WinHorz(task->win_left,task->win_left+50,task);
   WinVert(2,2+8,task);
+  task->win_inhibit=WIG_NO_FOCUS_TASK_DFT;
   TaskExe(task,NULL,msg,1<<JOBf_EXIT_ON_COMPLETE|1<<JOBf_FREE_ON_COMPLETE);
   DocPut(task)->max_entries=100;
   return task;
@@ -19,7 +47,9 @@ Bool JBPutKey(CDoc *doc,U8 *,I64 ch,I64 sc)
 {//ch=ASCII; sc=scan_code
   CDocEntry *doc_ce=doc->cur_entry,*doc_e;
   CDirEntry *tmpde;
-  CDoc *s;
+  I64 i;
+  U8 *st;
+  CDoc *doc2;
   if (!(sc&(SCF_ALT|SCF_CTRL|SCF_SHIFT))
 	&& doc_ce->type_u8==DOCT_MENU_VAL && doc_ce->left_exp>=0) {
     tmpde=doc_ce->left_exp;
@@ -31,20 +61,45 @@ Bool JBPutKey(CDoc *doc,U8 *,I64 ch,I64 sc)
     } else if ('0'<=ch<='9') {
       if (StrLen(doc_ce->tag)>1)
 	doc_ce->tag[0]=ch;
-      s=DocRead(tmpde->full_name);
+      doc2=DocRead(tmpde->full_name);
-      doc_e=s->head.next;
+      DocLineNumGoTo(doc2,1);
-      while (doc_e!=s && doc_e->type_u8!=DOCT_TEXT)
+      doc_e=doc2->cur_entry;
-	doc_e=doc_e->next;
+      if (doc_e!=doc2 && doc_e->type_u8==DOCT_TEXT && StrLen(doc_e->tag)>=3) {
-      if (doc_e!=s && doc_e->type_u8==DOCT_TEXT && StrLen(doc_e->tag)>=3) {
 	doc_e->tag[2]=ch;
-	DocWrite(s);
+	DocWrite(doc2);
+      }
+      DocDel(doc2);
+      return TRUE;
+    } else if (ch=='r') {
+      if (!DocTreeFFind(tmpde->full_name,"Reward1")) {
+	doc2=DocRead(tmpde->full_name);
+	DocLineNumGoTo(doc2,2);
+	DocPrint(doc2,
+	      "\n$$TR,\"Reward1\"$$\n"
+	      "$$ID,2$$CallExtStr(\"JukeReward\",\"\"\n"
+	      "$$TR,\"Reward2\"$$\n"
+	      "$$ID,2$$\n"
+	      "$$ID,-2$$\n"
+	      ");\n$$ID,-2$$\n"
+	      );
+	DocWrite(doc2);
+	DocDel(doc2);
+      }
+      if (DocTreeFFind(tmpde->full_name,"Reward1/Reward2")) {
+	for (i=0;i<5;i++) {
+	  st=MStrPrint("%s %s %s %s ",
+		GodWordStr,GodWordStr,GodWordStr,GodWordStr);
+	  DocTreeFAppend(tmpde->full_name,"Reward1/Reward2",
+		"\"%s\"\n",st);
+	  Free(st);
+	}
+	In(" ");
       }
-      DocDel(s);
       return TRUE;
     } else if (ch==CH_SPACE||ch==CH_ESC)
       tmpde->user_data++; //JB_RUN_LEVEL++
 //<SPACE> is followed by <ESC> --> JB_RUN_LEVEL_TWO
-      //Actual <ESC> just exits          --> JB_RUN_LEVEL_ONE
+      //Actual <ESC> just exits      --> JB_RUN_LEVEL_ONE
   }
   return FALSE;
 }
@@ -59,80 +114,87 @@ public U0 JukeBox(U8 *dirname="~/Psalmody",U8 **_filename=NULL)
   CTask *task=NULL;
   if (_filename)
     *_filename=NULL;
-  dirname=StrNew(dirname);
+  SettingsPush; //See $LK,"SettingsPush",A="MN:SettingsPush"$
-  st=MStrPrint("%s/*.HC.Z",dirname);
+  AutoComplete;
-  tmpde=tmpde1=FilesFind(st);
+  try {
-  Free(st);
+    dirname=StrNew(dirname);
-  Free(dirname);
+    st=MStrPrint("%s/*.HC.Z",dirname);
-  doc->user_put_key=&JBPutKey;
+    tmpde=tmpde1=FilesFind(st);
-  DocPrint(doc,
+    Free(st);
-	"Key: $$GREEN$$Graphics $$BLUE$$Words $$RED$$No Nothing "
+    Free(dirname);
-	"$$BLACK$$Incomplete $$CYAN$$Special$$FG$$\n\n"
+    doc->user_put_key=&JBPutKey;
-	"$$GREEN$$<DELETE>$$FG$$ to delete a song.\n"
+    DocPrint(doc,
-	"Press a number to rate a song.\n");
+	  "Key: $$GREEN$$Graphics $$BLUE$$Words $$RED$$No Nothing "
-  while (tmpde) {
+	  "$$BLACK$$Incomplete $$CYAN$$Special$$FG$$\n\n"
-    if (!(i++%5))
+	  "$$GREEN$$<DEL>$$FG$$\tto delete a song.\n"
-      DocPrint(doc,"\n");
+	  "'$$GREEN$$0$$FG$$'-'$$GREEN$$9$$FG$$'\tto rate a song.\n"
-    if (FileOcc("Play(",tmpde->full_name,"")) {
+	  "'$$GREEN$$r$$FG$$'\tto get your reward from God.\n");
-      st=StrNew(tmpde->name);
+    while (tmpde) {
-      FileExtRem(st);
+      if (!(i++%5))
-      s=DocRead(tmpde->full_name);
+	DocPrint(doc,"\n");
-      doc_e=s->head.next;
+      if (FileOcc("Play(",tmpde->full_name,"")) {
-      while (doc_e!=s && doc_e->type_u8!=DOCT_TEXT)
+	st=StrNew(tmpde->name);
-	doc_e=doc_e->next;
+	FileExtRem(st);
-      rating='0';
+	s=DocRead(tmpde->full_name);
-      if (doc_e!=s && doc_e->type_u8==DOCT_TEXT) {
+	doc_e=s->head.next;
-	if ('0'<=doc_e->tag[2]<='9')
+	while (doc_e!=s && doc_e->type_u8!=DOCT_TEXT)
-	  rating=doc_e->tag[2];
+	  doc_e=doc_e->next;
-	if (StrMatch("incomplete",doc_e->tag))
+	rating='0';
-	  DocPrint(doc,"$$BLACK$$");
+	if (doc_e!=s && doc_e->type_u8==DOCT_TEXT) {
-	else if (StrMatch("has graphics",doc_e->tag))
+	  if ('0'<=doc_e->tag[2]<='9')
-	  DocPrint(doc,"$$GREEN$$");
+	    rating=doc_e->tag[2];
-	else if (StrMatch("has words",doc_e->tag))
+	  if (StrMatch("incomplete",doc_e->tag))
-	  DocPrint(doc,"$$BLUE$$");
+	    DocPrint(doc,"$$BLACK$$");
-	else if (StrMatch("special",doc_e->tag))
+	  else if (StrMatch("has graphics",doc_e->tag))
-	  DocPrint(doc,"$$CYAN$$");
+	    DocPrint(doc,"$$GREEN$$");
-	else if (StrMatch("no nothing",doc_e->tag)) {
+	  else if (StrMatch("has words",doc_e->tag))
-	  DocPrint(doc,"$$RED$$");
+	    DocPrint(doc,"$$BLUE$$");
-	  if (FileOcc("\\0",tmpde->full_name,"")) {
+	  else if (StrMatch("special",doc_e->tag))
-	    s->cur_entry=doc_e->next;
+	    DocPrint(doc,"$$CYAN$$");
-	    s->cur_col=0;
+	  else if (StrMatch("no nothing",doc_e->tag)) {
-	    DocEntryDel(s,doc_e);
+	    DocPrint(doc,"$$RED$$");
-	    DocPrint(s,"//0 has words\n");
+	    if (FileOcc("\\0",tmpde->full_name,"")) {
-	    DocWrite(s);
+	      s->cur_entry=doc_e->next;
+	      s->cur_col=0;
+	      DocEntryDel(s,doc_e);
+	      DocPrint(s,"//0 has words\n");
+	      DocWrite(s);
+	    }
 	  }
+	  DocPrint(doc,"$$MU-UL,\"%c%-8ts\",LE=%d$$ ",rating,st,tmpde);
+	  tmpde->user_data=JB_RUN_LEVEL_NULL;
 	}
-	DocPrint(doc,"$$MU-UL,\"%c%-8ts\",LE=%d$$ ",rating,st,tmpde);
+	DocDel(s);
-	tmpde->user_data=JB_RUN_LEVEL_NULL;
+	Free(st);
       }
-      DocDel(s);
+      tmpde=tmpde->next;
+    }
+    DocPrint(doc,"\n$$CYAN$$$$MU-UL,\"DONE\",LE=%d$$\n",DOCM_CANCEL);
+    while (TRUE) {
+      if (_filename)
+	tmpde=PopUpMenu(doc,DOF_INTERCEPT_TASK_END);
+      else
+	tmpde=PopUpMenu(doc);
+      if (task)
+	Kill(task);
+      if (tmpde<=0) break;
+      st2=StrNew(tmpde->name);
+      if (_filename) {
+	Free(*_filename);
+	*_filename=StrNew(tmpde->full_name);
+      }
+      if (tmpde->user_data==JB_RUN_LEVEL_ONE) break; //<ESC>
+      tmpde->user_data=JB_RUN_LEVEL_NULL; //Rst from <SPACE>
+      FileExtRem(st2);
+      st=MStrPrint("ExeFile(\"%s\");",tmpde->full_name);
+      MusicSettingsRst;
+      task=SingleSong(st,st2);
+      Free(st2);
       Free(st);
     }
-    tmpde=tmpde->next;
+    DocDel(doc);
-  }
+    DirTreeDel(tmpde1);
-  DocPrint(doc,"\n$$CYAN$$$$MU-UL,\"DONE\",LE=%d$$\n",DOCM_CANCEL);
+  } catch
-  while (TRUE) {
+    PutExcept;
-    if (_filename)
+  SettingsPop;
-      tmpde=PopUpMenu(doc,DOF_INTERCEPT_TASK_END);
-    else
-      tmpde=PopUpMenu(doc);
-    if (task)
-      Kill(task);
-    if (tmpde<=0) break;
-    st2=StrNew(tmpde->name);
-    if (_filename) {
-      Free(*_filename);
-      *_filename=StrNew(tmpde->full_name);
-    }
-    if (tmpde->user_data==JB_RUN_LEVEL_ONE) break; //<ESC>
-    tmpde->user_data=JB_RUN_LEVEL_NULL; //Rst from <SPACE>
-    FileExtRem(st2);
-    st=MStrPrint("ExeFile(\"%s\");",tmpde->full_name);
-    MusicSettingsRst;
-    task=SingleSong(st,st2);
-    Free(st2);
-    Free(st);
-  }
-  DocDel(doc);
-  DirTreeDel(tmpde1);
 }

TempleOSCD/Compiler/CompilerB.HH

@@ -11,6 +11,7 @@ public _extern _LAST_FUN I64 LastFun(I64 argc,I64 *argv);
 public extern I64 RunFile(U8 *name,I64 ccf_flags=0,...);
 public extern I64 RunFile2(U8 *name,I64 ccf_flags=0,...);
 public extern CCmpGlbls cmp;
+
 #help_index "Compiler/Directive"
 #help_file "::/Doc/Directives"
 public extern Bool Echo(Bool val);

TempleOSCD/Demo/AcctExample/Registry.HC

@@ -62,7 +62,7 @@ $ID,-2$$TR,"Titanium"$
 $ID,2$I64 best_score=16469;
 $ID,-2$$TR,"TOSRegen"$
 $ID,2$progress1_tf=0.000;progress2_tf=0.000;
-progress3_tf=0.000;progress4_tf=186.240;
+progress3_tf=0.000;progress4_tf=196.900;
 $ID,-2$$ID,-2$$TR,"Once"$
 $ID,2$$TR,"Adam"$
 $ID,2$$ID,-2$$TR,"User"$

TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC

@@ -80,7 +80,6 @@ public U0 FrameGrabberToggle()
 
 public U0 JukeSong(I64 num)
 {//Make movie of one song.
-  AutoComplete;
   if (!fg_on)
     FrameGrabberToggle;
   JukeSongsPuppet("~/Sup1/Sup1Hymns",,num,num+1);
@@ -90,7 +89,6 @@ public U0 JukeSong(I64 num)
 
 public U0 JukeLines(I64 start_line,I64 end_line)
 {//Make movie of many lines of songs.
-  AutoComplete;
   if (!fg_on)
     FrameGrabberToggle;
   JukeSongsPuppet("~/Sup1/Sup1Hymns",,start_line*5,end_line*5);
@@ -187,16 +185,6 @@ U0 TOSTheme()
   DocClear;
 }
 
-U0 TOSJukeVideo(I64 start=0,I64 end=10)
-{
-  U8 *buf=FileRead("::/Misc/Bible.TXT.Z"); //Put in cache
-  Free(buf);
-  AutoComplete;
-  FrameGrabberToggle;
-  JukeSongsPuppet("~/Sup1/Sup1Hymns",,start,end);
-  FrameGrabberToggle;
-}
-
 #define MEM_TEST_SIZE	1024*1024
 U0 MemTest()
 {

TempleOSCD/Doc/ChgLog.DD

@@ -2,7 +2,8 @@ $WW,1$$FG,5$$TX+CX,"Change Log"$$FG$
 
 Use $LK,"R",A="MN:R"$() to rename if I change a label.
 
-$IV,1$----01/24/17 18:15:33----$IV,0$
+$IV,1$----01/24/17 21:56:06----$IV,0$
+* Improved $LK,"::/Apps/Psalmody/JukeBox.HC"$
 * $LK,"R",A="MN:R"$("TreeBranch","Tree");
 * Added $LK,"DocTreeWrite",A="MN:DocTreeWrite"$() and $LK,"DocTreeAppend",A="MN:DocTreeAppend"$().
 

TempleOSCD/Doc/FileMgr.DD

@@ -3,7 +3,7 @@ $WW,1$$FG,5$$TX+CX,"File Manager"$$FG$
 $FG,2$<SHIFT CURSOR>$FG$
 $ID,2$Select files.
 $ID,-2$
-$FG,2$<CTRL-y> or <DELETE>$FG$
+$FG,2$<CTRL-y> or <DEL>$FG$
 $ID,2$Delete file or tree.
 $ID,-2$
 $FG,2$<CTRL-c> or <CTRL-INS>$FG$

TempleOSCD/Doc/Tips.DD

@@ -145,7 +145,7 @@ $FG,2$Merge(\"C:/*\",\"D:/*\",\"+r+d\");$FG$ to check my changes.
 
 * With $FG,2$start$FG$/$FG,2$end$FG$, common trailing code is fast.  Common leading code is slow.$FG$
 
-* The first line of the $MA-X+PU,"Psalmody",LM="#include \"::/Apps/Psalmody/Run\"\n"$ $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$ song files is a comment with a category recognized by $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$().  The categories are $FG,2$"no nothing"$FG$, $FG,2$"has words"$FG$, $FG,2$"has graphics"$FG$, or $FG,2$"special"$FG$.  The third character in the song comment is a digit rating number, shown in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$().  You can set the song rating in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$() by pressing $FG,2$0$FG$-$FG,2$9$FG$.  You can press $FG,2$<DELETE>$FG$ to delete songs.
+* The first line of the $MA-X+PU,"Psalmody",LM="#include \"::/Apps/Psalmody/Run\"\n"$ $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$ song files is a comment with a category recognized by $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$().  The categories are $FG,2$"no nothing"$FG$, $FG,2$"has words"$FG$, $FG,2$"has graphics"$FG$, or $FG,2$"special"$FG$.  The third character in the song comment is a digit rating number, shown in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$().  You can set the song rating in $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$() by pressing $FG,2$0$FG$-$FG,2$9$FG$.  You can press $FG,2$<DEL>$FG$ to delete songs.
 
 $FG,8$
 * "Linux" is a trademark owned by Linus Torvalds.

TempleOSCD/Kernel/KernelA.HH

@@ -1426,8 +1426,10 @@ 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_DFT		(WIF_FOCUS_TASK_MENU|WIG_DBL_CLICK|\
-			0xFFFF-WIF_SELF_DOC-WIF_SELF_ODE)
+	0xFFFF-WIF_SELF_DOC-WIF_SELF_ODE)
+#define WIG_NO_FOCUS_TASK_DFT	(WIG_TASK_DFT-WIF_SELF_BORDER\
+	-WIF_SELF_MS_L-WIF_SELF_MS_R-WIG_DBL_CLICK)
 #define WIG_USER_TASK_DFT	WIF_SELF_KEY_DESC
 
 #define WIf_SELF_FOCUS		0

TempleOSCD/Misc/Tour/Tour.IN

@@ -13,8 +13,7 @@ U0 TourPutTask()
   Fs->border_src=BDS_CONST;
   Fs->border_attr=LTGRAY<<4+DrvTextAttrGet(':')&15;
   Fs->text_attr  =LTGRAY<<4+BLUE;
-  Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_BORDER-WIF_SELF_MS_L
+  Fs->win_inhibit=WIG_NO_FOCUS_TASK_DFT;
-		-WIF_SELF_MS_R-WIG_DBL_CLICK;
   doc=DocPut;
   doc->flags|=DOCF_FORM;
   DocCursor(FALSE,doc);
@@ -34,8 +33,7 @@ U0 TourPutTask()
     }
     DocUnlock(doc);
     if (tour_okay_pressed) {
-      Fs->win_inhibit=WIG_TASK_DFT-WIF_SELF_BORDER-WIF_SELF_MS_L
+      Fs->win_inhibit=WIG_NO_FOCUS_TASK_DFT;
-		-WIF_SELF_MS_R-WIG_DBL_CLICK;
       if (sys_focus_task==Fs)
 	WinRefocus;
     } else {