===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/asir32gui/asir32guiview.cpp,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -p -r1.8 -r1.10
--- OpenXM_contrib2/windows/asir32gui/asir32guiview.cpp	2002/09/12 03:12:56	1.8
+++ OpenXM_contrib2/windows/asir32gui/asir32guiview.cpp	2005/05/10 09:52:12	1.10
@@ -69,6 +69,7 @@ BEGIN_MESSAGE_MAP(CAsir32guiView, CEditView)
 	ON_WM_CREATE()
 	ON_COMMAND(ID_CONTRIBHELP, OnContribhelp)
 	ON_UPDATE_COMMAND_UI(ID_CONTRIBHELP, OnUpdateContribhelp)
+	ON_WM_SIZE()
 	//}}AFX_MSG_MAP
 	// 標準印刷コマンド
 //	ON_COMMAND(ID_FILE_PRINT, CEditView::OnFilePrint)
@@ -89,7 +90,7 @@ CAsir32guiView::CAsir32guiView()
 	read_input_history();
 	DebugMode = 0;
 	DebugInMain = 0;
-	MaxLineLength = 80;
+//	MaxLineLength = 80;
 	LogStart = 0;
 	Logging = 0;
 	Logfp = NULL;
@@ -305,7 +306,7 @@ void CAsir32guiView::Paste(void) {
     }
     hClip = GetClipboardData(CF_TEXT);
     src = (const char *)::GlobalLock(hClip);
-    if ( !src || (l = strlen(src)) >= sizeof(Buffer) ) {
+    if ( !src || (l=strlen(src)) >= sizeof(Buffer)-EndPos ) {
     	::CloseClipboard();
     	Beep(); return;
     }
@@ -315,12 +316,13 @@ void CAsir32guiView::Paste(void) {
     buf[j] = 0;
     ::GlobalUnlock(hClip);
     ::CloseClipboard();
-    if ( EndPos+j >= sizeof(Buffer)-1 ) {
-        Beep(); return;
-    }
     GetEditCtrl().ReplaceSel(buf);
-    strncpy(Buffer+EndPos,buf,j);
-    EndPos += j; CurrentPos = EndPos;
+    l = strlen(buf);
+    for ( i = EndPos-1; i >= CurrentPos; i-- )
+	Buffer[i+l] = Buffer[i];
+    for ( j = 0, i = CurrentPos; j < l; j++, i++ )
+	Buffer[i] = buf[j];
+    EndPos += l; CurrentPos += l;
 }
 
 #define CTRL(c) (c)&0x1f
@@ -524,14 +526,28 @@ void CAsir32guiView::OnEditPaste() 
     Paste();
 }
 
+void CAsir32guiView::UpdateMetrics()
+{
+   TEXTMETRIC tm;
+   RECT r;
+
+   GetEditCtrl().GetRect(&r);
+   CDC *pDC = GetDC();
+   pDC->SelectObject(GetFont());
+   pDC->GetTextMetrics(&tm);
+   MaxLineLength = (r.right-r.left)/tm.tmAveCharWidth-1;
+}
+
 void CAsir32guiView::OnFont() 
 {
 	// TODO: この位置にコマンド ハンドラ用のコードを追加してください
 	int ret;
-	CFontDialog fd(NULL,CF_EFFECTS | CF_SCREENFONTS | CF_FIXEDPITCHONLY);
-	static CFont *f = 0;
 	LOGFONT lf;
 
+	GetFont()->GetLogFont(&lf);
+	CFontDialog fd(&lf,CF_EFFECTS | CF_SCREENFONTS | CF_FIXEDPITCHONLY);
+	static CFont *f = 0;
+
 	ret = fd.DoModal();
 	if ( ret == IDOK ) {
 		fd.GetCurrentFont(&lf);
@@ -540,6 +556,7 @@ void CAsir32guiView::OnFont() 
 		f = new CFont;
 		f->CreateFontIndirect(&lf);
 		SetFont(f);
+		UpdateMetrics();
 	}
 }
 
@@ -549,7 +566,7 @@ int CAsir32guiView::OnCreate(LPCREATESTRUCT lpCreateSt
 		return -1;
 	
 	// TODO: この位置に固有の作成用コードを追加してください
-	
+
 	LOGFONT logFont; memset(&logFont, 0, sizeof(LOGFONT));
 	logFont.lfHeight = 20;
 	logFont.lfCharSet = DEFAULT_CHARSET;
@@ -557,8 +574,9 @@ int CAsir32guiView::OnCreate(LPCREATESTRUCT lpCreateSt
 	CFont *f = new CFont;
 	f->CreateFontIndirect(&logFont);
 	SetFont(f);
+	UpdateMetrics();
 	GetEditCtrl().LimitText(nMaxSize);
-	GetEditCtrl().SetTabStops(m_nTabStops);
+	GetEditCtrl().SetTabStops(m_nTabStops);	
 
 	return 0;
 }
@@ -587,4 +605,12 @@ void CAsir32guiView::OnUpdateContribhelp(CCmdUI* pCmdU
 		}
 	}
 	pCmdUI->Enable( FALSE );
+}
+
+void CAsir32guiView::OnSize(UINT nType, int cx, int cy) 
+{
+	CEditView::OnSize(nType, cx, cy);
+	
+	// TODO: この位置にメッセージ ハンドラ用のコードを追加してください
+	UpdateMetrics();
 }