TempleOSCDV3.11.ISO

Adam/DolDoc/DocNew.CPP

@@ -27,100 +27,6 @@ public Bool DocUnlock(CDoc *doc)
     return FALSE;
 }
 
-CDocBin *DocBinFindNum(CDoc *haystack_doc,I64 needle_num)
-{
-  CDocBin *b=haystack_doc->bin_root.next;
-  while (b!=&haystack_doc->bin_root) {
-    if (b->num==needle_num)
-      return b;
-    b=b->next;
-  }
-  return NULL;
-}
-
-CDocBin *DocBinFindTag(CDoc *haystack_doc,U8 *needle_tag)
-{
-  CDocBin *b;
-  if (needle_tag) {
-    b=haystack_doc->bin_root.next;
-    while (b!=&haystack_doc->bin_root) {
-      if (b->tag && !StrCmp(b->tag,needle_tag))
-	return b;
-      b=b->next;
-    }
-  }
-  return NULL;
-}
-
-U0 DocBinsValidate(CDoc *doc)
-{
-  Bool unlock=DocLock(doc);
-  CDocBin *b,*b1;
-  CDocEntry *doc_e,*doc_e2;
-  I64 renum_num=0;
-  b=doc->bin_root.next;
-  while (b!=&doc->bin_root) {
-    b->use_cnt=0;
-    b->temp_use_cnt=0;
-    b->renum_num=-1;
-    Free(b->tag);
-    b->tag=NULL;
-    b=b->next;
-  }
-  doc_e=doc->root.next;
-  while (doc_e!=doc) {
-    doc_e2=doc_e->next;
-    if (doc_e->de_flags & DOCEF_HAS_BIN) {
-      if (b=doc_e->bin_data=DocBinFindNum(doc,doc_e->bin_num)) {
-	if (doc_e->de_flags & DOCEF_BIN_PTR_LINK)
-	  b->temp_use_cnt=MAX_I32;
-	if (!b->use_cnt++)
-	  b->renum_num=++renum_num;
-	doc_e->bin_num=b->renum_num;
-	if (!b->tag && doc_e->de_flags&DOCEF_TAG && doc_e->tag && *doc_e->tag)
-	  b->tag=StrNew(doc_e->tag,doc->mem_task);
-      } else {
-	RawPrint(3000,"Bin Not Found");
-	doc_e->type=doc_e->de_flags=0;
-	doc_e->type_u8=DOCT_ERROR;
-      }
-    }
-    doc_e=doc_e2;
-  }
-
-  b=doc->bin_root.next;
-  doc->cur_bin_num=1;
-  while (b!=&doc->bin_root) {
-    b1=b->next;
-    if (!b->use_cnt) {
-      QueRem(b);
-      Free(b->data);
-      Free(b);
-    } else {
-      b->num=b->renum_num;
-      if (b->num>=doc->cur_bin_num)
-	doc->cur_bin_num=b->num+1;
-    }
-    b=b1;
-  }
-  if (unlock)
-    DocUnlock(doc);
-}
-
-U0 DocBinDel(CDoc *doc,CDocBin *b)
-{
-  if (doc && b && b->use_cnt) {
-    b->use_cnt--;
-    if (!b->use_cnt) {
-      QueRem(b);
-      Free(b->tag);
-      Free(b->data);
-      Free(b);
-    }
-  } else
-    RawPrint(3000,"DocBinDel");
-}
-
 Bool IsEditableText(CDocEntry *doc_e)
 {
   if (doc_e->type_u8==DOCT_TEXT&&!(doc_e->de_flags&DOCEG1_DONT_EDIT))
@@ -249,88 +155,63 @@ public CDocEntry *DocEntryCopy(CDoc *doc,CDocEntry *doc_e)
   return doc_ne;
 }
 
-public U8 *DocEntryLink(CDoc *doc,CDocEntry *doc_e)
-{//MAlloc new str, either tag or aux_str if link.
-  if (doc_e->de_flags&DOCEF_LINK) {
-    if (doc_e->de_flags & DOCEF_AUX_STR)
-      return StrNew(doc_e->aux_str,doc->mem_task);
-    else if (doc_e->de_flags & DOCEF_TAG)
-      return StrNew(doc_e->tag,doc->mem_task);
-  }
-  return NULL;
-}
-
-U0 DocFormFwd(CDoc *doc,Bool giveup=FALSE)
+U0 DocRemSoftNewLines(CDoc *doc=NULL,CDocEntry *doc_e=NULL)
 {
-  CDocEntry *doc_e=doc->cur_entry,*doc_e2=doc_e;
-  if (doc->flags & DOCF_FORM) {
-    if (doc_e==doc) goto ff_recover;
-    while (!Bt(doldoc.type_flags_form,doc_e->type_u8) &&
-	  !(doc_e->de_flags&DOCEF_LINK) ||
-	  doc_e->de_flags&DOCEF_SKIP_IN_FORM) {
-      doc_e=doc_e->next;
-      if (doc_e==doc) {
-ff_recover:
-	doc->cur_col=0;
-	if (!giveup) {
-	  doc->cur_entry=doc_e->last;
-	  DocFormBwd(doc,TRUE);
-	} else
-	  doc->cur_entry=doc;
-	return;
-      }
-    }
-  }
-  while (doc_e->type_u8==DOCT_INDENT)
-    doc_e=doc_e->next;
-  if (doc_e!=doc_e2) {
-    doc->cur_col=doc_e->min_col;
-    doc->cur_entry=doc_e;
-  }
-}
-
-U0 DocFormBwd(CDoc *doc,Bool giveup=FALSE)
-{
-  CDocEntry *doc_e=doc->cur_entry,*doc_e2=doc_e;
-  if (doc->flags & DOCF_FORM) {
-    while (!Bt(doldoc.type_flags_form,doc_e->type_u8) &&
-	  !(doc_e->de_flags&DOCEF_LINK) ||
-	  doc_e->de_flags&DOCEF_SKIP_IN_FORM) {
-      doc_e=doc_e->last;
-      if (doc_e==doc) {
-	doc->cur_col=0;
-	if (!giveup) {
-	  doc->cur_entry=doc_e->next;
-	  DocFormFwd(doc,TRUE);
-	} else
-	  doc->cur_entry=doc;
-	return;
-      }
-    }
-  }
-  while (doc_e->type_u8==DOCT_INDENT)
-    doc_e=doc_e->next;
-  if (doc_e!=doc_e2) {
-    doc->cur_col=doc_e->min_col;
-    doc->cur_entry=doc_e;
-  }
-}
-
-public U0 DocTop(CDoc *doc=NULL)
-{//Move cursor, cur_entry, to top.
+  CDocEntry *doc_e2,*saved_ll=doc_e;
   Bool unlock;
   if (!doc && !(doc=DocPut))
     return;
   unlock=DocLock(doc);
-  doc->cur_entry=doc->root.next;
-  doc->cur_col=doc->cur_entry->min_col;
-  doc->x=0;
-  doc->y=0;
-  doc->line_start_col=0;
-  doc->top_line_num=0;
+  if (!doc_e) doc_e=doc->root.next;
+  while (doc_e!=doc) {
+    doc_e2=doc_e->next;
+    if (doc_e->type_u8==DOCT_SOFT_NEW_LINE) {
+      if (doc->cur_entry==doc_e) {
+	doc->cur_entry=doc_e2;
+	doc->cur_col=doc->cur_entry->min_col;
+      }
+      DocEntryDel(doc,doc_e);
+    } else if (saved_ll && doc_e->type_u8==DOCT_NEW_LINE)
+      break;
+    doc_e=doc_e2;
+  }
+  if (unlock)
+    DocUnlock(doc);
+}
 
-  DocFormFwd(doc);
-  DocRecalc(doc);
+public U0 DocInsEntry(CDoc *doc,CDocEntry *doc_e)
+{//Insert entry into doc, updating its vals.
+  U8 *dst;
+  Bool unlock=DocLock(doc);
+  CDocEntry *doc_ce=doc->cur_entry,*doc_ne;
+
+  doc_e->x=doc_ce->x;
+  doc_e->y=doc_ce->y;
+  doc_e->page_line_num=doc_ce->page_line_num;
+  MemCpy(&doc_e->settings,&doc_ce->settings,sizeof(CDocSettings));
+  if (doc->cur_col>0 &&
+	doc_ce->type_u8==DOCT_TEXT &&
+	!(doc_ce->de_flags&(DOCEF_TAG_CB|DOCEF_DEFINE|DOCEF_AUX_STR|
+	DOCEF_HTML_LINK|DOCEF_BIN_PTR_LINK)) &&
+	doc->cur_col<doc_ce->max_col) {
+    dst=doc_ce->tag+doc->cur_col;
+    doc_ne=DocEntryNew(doc,doc_ce,StrNew(dst,doc->mem_task));
+    *dst=0;
+    doc_ne->type=DOCT_TEXT|doc_ce->type&0xFFFFFF00;
+    doc_ce->max_col=doc->cur_col;
+    QueIns(doc_ne,doc_ce);
+    doc->cur_col=0;
+    doc_ce=doc_ne;
+  }
+  if (doc_ce->type_u8==DOCT_TEXT && doc->cur_col>=doc_ce->max_col) {
+    QueIns(doc_e,doc_ce);
+    doc->cur_entry=doc_e->next;
+  } else {
+    QueIns(doc_e,doc_ce->last);
+    doc->cur_entry=doc_ce;
+  }
+  doc->cur_col=doc->cur_entry->min_col;
+  DocRemSoftNewLines(doc,doc->cur_entry);
   if (unlock)
     DocUnlock(doc);
 }
@@ -376,7 +257,6 @@ public U0 DocRst(CDoc *doc,Bool is_old)
   doc->undo_cnt=0;
   doc->cur_bin_num=1;
   doc->dollar_buf_ptr=0;
-  doc->ext_ascii_cnt=doc->ext_ascii_val=0;
   doc->cmd_U8=CH_SPACE;
   doc->page_line_num=0;
   doc->best_d=MAX_I64;
@@ -462,169 +342,6 @@ public I64 DocSize(CDoc *doc)
   return result;
 }
 
-U0 DocDataFmt(CDoc *doc,CDocEntry *doc_e,I64 d=DOCM_CANCEL)
-{
-  I64 i;
-  U8 *ptr;
-  CHashDefineStr *temph;
-  if (doc_e->type_u8==DOCT_DATA && doc_e->de_flags&DOCEF_AUX_STR ||
-	doc_e->type_u8==DOCT_CHECK_BOX || doc_e->de_flags & DOCEF_LST) {
-    if (d==DOCM_CANCEL) {
-      if (doc_e->de_flags & DOCEF_DATA_IS_PTR) {
-	if (!(ptr=doc_e->data)) return;
-      } else
-	ptr=&doc_e->data;
-      switch(doc_e->raw_type) {
-	case RT_I0:
-	case RT_U0:	d=0;		break;
-	case RT_I8:	d=*ptr(I8 *);	break;
-	case RT_U8:	d=*ptr(U8 *);	break;
-	case RT_I16:	d=*ptr(I16 *);	break;
-	case RT_U16:	d=*ptr(U16 *);	break;
-	case RT_I32:	d=*ptr(I32 *);	break;
-	case RT_U32:	d=*ptr(U32 *);	break;
-	default:	d=*ptr(I64 *);
-      }
-    }
-    if (doc_e->type_u8==DOCT_DATA) {
-      StrPrint(doc_e->tag,doc_e->aux_str,d,doc_e->my_fmt_data);
-      if (doc_e->de_flags & DOCEF_HAS_TERMINATOR) {
-	i=StrLen(doc_e->tag);
-	doc_e->tag[i++]='_';
-	doc_e->tag[i]=0;
-      }
-      doc_e->max_col=StrLen(doc_e->tag);
-    } else if (doc_e->de_flags & DOCEF_LST) {
-      if (doc_e->de_flags & DOCEF_DEFINE && (temph=HashFind(doc_e->define_str,
-	    doc->win_task->hash_table,HTT_DEFINE_STR)) && 0<=d<temph->cnt) {
-	ptr=MStrPrint("[%s]",temph->sub_lst[d]);
-	Free(doc_e->tag);
-	doc_e->tag=StrNew(ptr,doc->mem_task);
-	Free(ptr);
-      } else {
-	Free(doc_e->tag);
-	doc_e->tag=StrNew("[]",doc->mem_task);
-      }
-    } else {
-      if (d)
-	doc_e->de_flags|=DOCEF_CHECKED_COLLAPSED;
-      else
-	doc_e->de_flags&=~DOCEF_CHECKED_COLLAPSED;
-    }
-  }
-}
-
-U0 DocDataScan(CDoc *doc,CDocEntry *doc_e)
-{
-  I64 i,d;
-  U8 *ptr,*ptr1,*ptr2;
-  CHashDefineStr *temph;
-  if (doc_e->type_u8==DOCT_DATA && doc_e->de_flags&DOCEF_AUX_STR ||
-	doc_e->type_u8==DOCT_CHECK_BOX || doc_e->de_flags & DOCEF_LST) {
-    if (doc_e->de_flags & DOCEF_DATA_IS_PTR) {
-      if (!(ptr=doc_e->data)) return;
-    } else
-      ptr=&doc_e->data;
-    if (doc_e->type_u8==DOCT_DATA) {
-      i=StrLen(doc_e->tag);
-      if (doc_e->de_flags & DOCEF_HAS_TERMINATOR)
-	doc_e->tag[--i]=0;
-      if (i>doc_e->len+doc_e->min_col)
-	doc_e->tag[doc_e->len+doc_e->min_col]=0;
-      if (RT_I8<=doc_e->raw_type<=RT_U32) {
-	StrScan(doc_e->tag,doc_e->aux_str,&d,doc_e->my_fmt_data);
-	if (doc_e->de_flags & DOCEF_HAS_TERMINATOR)
-	  doc_e->tag[i]='_';
-      } else if (RT_I64<=doc_e->raw_type<=RT_UF64) {
-	StrScan(doc_e->tag,doc_e->aux_str,ptr,doc_e->my_fmt_data);
-	if (doc_e->de_flags & DOCEF_HAS_TERMINATOR)
-	  doc_e->tag[i]='_';
-	return;
-      }
-    } else if (doc_e->de_flags & DOCEF_LST) {
-      d=0;
-      if (doc_e->tag && doc_e->de_flags & DOCEF_DEFINE &&
-	    (temph=HashFind(doc_e->define_str,
-	    doc->win_task->hash_table,HTT_DEFINE_STR))) {
-	ptr1=ptr2=StrNew(doc_e->tag);
-	if (*ptr2=='[') {
-	  ptr2++;
-	  i=StrLen(ptr2);
-	  if (ptr2[i-1]==']')
-	    ptr2[i-1]=0;
-	}
-	d=LstMatch(ptr2,temph->data);
-	Free(ptr1);
-      }
-    } else {
-      if (doc_e->de_flags & DOCEF_CHECKED_COLLAPSED)
-	d=TRUE;
-      else
-	d=FALSE;
-    }
-    switch(doc_e->raw_type) {
-      case RT_I8:
-      case RT_U8:
-	*ptr(U8 *)=d;
-      case RT_I0:
-      case RT_U0:
-	break;
-      case RT_I16:
-      case RT_U16:
-	*ptr(U16 *)=d;
-	break;
-      case RT_I32:
-      case RT_U32:
-	*ptr(U32 *)=d;
-	break;
-      default:
-	*ptr(I64 *)=d;
-    }
-  }
-}
-
-U0 DocRemSoftNewLines(CDoc *doc=NULL,CDocEntry *doc_e=NULL)
-{
-  CDocEntry *doc_e2,*saved_ll=doc_e;
-  Bool unlock;
-  if (!doc && !(doc=DocPut))
-    return;
-  unlock=DocLock(doc);
-  if (!doc_e) doc_e=doc->root.next;
-  while (doc_e!=doc) {
-    doc_e2=doc_e->next;
-    if (doc_e->type_u8==DOCT_SOFT_NEW_LINE) {
-      if (doc->cur_entry==doc_e) {
-	doc->cur_entry=doc_e2;
-	doc->cur_col=doc->cur_entry->min_col;
-      }
-      DocEntryDel(doc,doc_e);
-    } else if (saved_ll && doc_e->type_u8==DOCT_NEW_LINE)
-      break;
-    doc_e=doc_e2;
-  }
-  if (unlock)
-    DocUnlock(doc);
-}
-
-#help_index "DolDoc/Cmd Line (Typically);Cmd Line (Typically)"
-
-public I64 DocMax(I64 i=MAX_I64)
-{//Set max document entries. (Cmd line buffer.)
-//Adjusts the size of the cmd line buf.
-  //Normally, the cmd line deletes entries
-  //when more are added and the old scroll up.
-  //See $LK,"max_entries",A="FF:::/Adam/DolDoc/DocMain.CPP,max_entries"$.
-  I64 result;
-  CDoc *doc;
-  if (doc=DocPut) {
-    result=doc->max_entries;
-    doc->max_entries=i;
-    return result;
-  } else
-    return 0;
-}
-
 #help_index "DolDoc"
 public CDoc *DocNew(U8 *filename=NULL,CTask *task=NULL)
 {//MAlloc new $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.TXT"$. (Begin a new doc.)
@@ -634,7 +351,7 @@ public CDoc *DocNew(U8 *filename=NULL,CTask *task=NULL)
   if (filename)
     StrCpy(doc->filename.name,filename);
   else
-    StrCpy(doc->filename.name,dsk.temp_filename);
+    StrCpy(doc->filename.name,blkdev.temp_filename);
   doc->find_replace=CAlloc(sizeof(CEdFindText),task);
   doc->find_replace->scan_fwd=TRUE;
   doc->find_replace->match_case=TRUE;
@@ -649,115 +366,3 @@ public CDoc *DocNew(U8 *filename=NULL,CTask *task=NULL)
   doc->doc_signature=DOC_SIGNATURE_VAL;
   return doc;
 }
-
-#help_index "DolDoc/Task;StdOut/Task"
-public CDoc *DocPut(CTask *task=NULL)
-{//Current document that StdOut Put() goes to.
-//Basically, StdOut unless double buffering.
-  CDoc *result;
-  if (!task) task=Fs;
-  if ((result=task->put_doc) && result->doc_signature==DOC_SIGNATURE_VAL)
-    return result;
-  else
-    return NULL;
-}
-
-public CDoc *DocDisplay(CTask *task=NULL)
-{//StdOut displayed unless double buffering.
-  CDoc *result;
-  if (!task) task=Fs;
-  if ((result=task->display_doc) && result->doc_signature==DOC_SIGNATURE_VAL)
-    return result;
-  else
-    return NULL;
-}
-
-public CDoc *DocBorder(CTask *task=NULL)
-{//Doc holding border of window text.
-  CDoc *result;
-  if (!task) task=Fs;
-  if ((result=task->border_doc) && result->doc_signature==DOC_SIGNATURE_VAL)
-    return result;
-  else
-    return NULL;
-}
-
-public CDoc *DocDblBufStart(CTask *task=NULL)
-{//See $LK,"::/Demo/Spy.CPP"$
-  Bool unlock_ddoc,old_preempt=Preempt;
-  CDoc *pdoc=DocPut(task),*ddoc=DocDisplay(task),*result;
-  if (!pdoc || !ddoc || pdoc!=ddoc)
-    result=NULL; //Already Double buffering
-  else {
-    if (!task) task=Fs;
-    unlock_ddoc=DocLock(ddoc); //dont change during winupdate, so lock DocPut$WW,0$
-    result=DocNew(,task);
-    result->win_task		=ddoc->win_task;
-    result->max_entries		=ddoc->max_entries;
-    MemCpy(result->find_replace,ddoc->find_replace,sizeof(CEdFindText));
-    MemCpy(&result->filename,&ddoc->filename,sizeof(CEdFileName));
-    result->left_click_link	=ddoc->left_click_link;
-    result->right_click_link	=ddoc->right_click_link;
-    result->user_put_data	=ddoc->user_put_data;
-    result->user_put_key	=ddoc->user_put_key;
-    result->user_put_s		=ddoc->user_put_s;
-    result->parent_doc		=ddoc->parent_doc;
-    result->desc		=ddoc->desc;
-    result->user_data		=ddoc->user_data;
-    result->flags|=ddoc->flags&DOCG_DBL_BUF_FLAGS | DOCF_DONT_SHOW;
-    task->put_doc=result;
-    if (unlock_ddoc)
-      DocUnlock(ddoc);
-  }
-  Preempt(old_preempt);
-  return result;
-}
-
-public Bool DocDblBufEnd(CTask *task=NULL)
-{//See $LK,"::/Demo/Spy.CPP"$
-  Bool result=FALSE,old_preempt=Preempt;
-  CDoc *pdoc=DocPut(task),*ddoc=DocDisplay(task);
-  if (pdoc && ddoc && pdoc!=ddoc) {//Double buffering?
-    if (!task) task=Fs;
-    ddoc->flags|=DOCF_DONT_SHOW;
-    pdoc->flags&=~DOCF_DONT_SHOW;
-    DocLock(ddoc);
-    task->display_doc=pdoc;
-    DocUnlock(ddoc);
-    DocDel(ddoc);
-    result=TRUE;
-  }
-  Preempt(old_preempt);
-  return result;
-}
-
-public Bool DocDblBufSwap(CTask *task=NULL)
-{//See $LK,"::/Demo/Spy.CPP"$
-  Bool result=FALSE,old_preempt=Preempt;
-  CDoc *pdoc=DocPut(task),*ddoc=DocDisplay(task);
-  if (pdoc && ddoc && pdoc!=ddoc) {//Double buffering?
-    if (!task) task=Fs;
-    ddoc->flags|=DOCF_DONT_SHOW;
-    pdoc->flags&=~DOCF_DONT_SHOW;
-    DocLock(ddoc);
-    task->display_doc=pdoc;
-    DocUnlock(ddoc);
-    DocRst(ddoc,TRUE);
-    MemCpy(ddoc->find_replace,pdoc->find_replace,sizeof(CEdFindText));
-    MemCpy(&ddoc->filename,&pdoc->filename,sizeof(CEdFileName));
-    ddoc->max_entries		=pdoc->max_entries;
-    ddoc->flags			=pdoc->flags&DOCG_DBL_BUF_FLAGS |
-	  ddoc->flags&~DOCG_DBL_BUF_FLAGS;
-    ddoc->left_click_link	=pdoc->left_click_link;
-    ddoc->right_click_link	=pdoc->right_click_link;
-    ddoc->user_put_data		=pdoc->user_put_data;
-    ddoc->user_put_key		=pdoc->user_put_key;
-    ddoc->user_put_s		=pdoc->user_put_s;
-    ddoc->desc			=pdoc->desc;
-    ddoc->user_data		=pdoc->user_data;
-    task->put_doc=ddoc;
-    result=TRUE;
-  }
-  Preempt(old_preempt);
-  return result;
-}