Changeset 771 in dev for trunk

Timestamp:

Aug 2, 2009, 10:29:43 PM (15 years ago)

Author:

イグトランス (egtra)

Message:

リモートデスクトップ使用時の描画を改善（ダブルバッファの不使用、キャレット移動時の再描画をいくらか排除）。

Location:

trunk/ab5.0/abdev/abdev

Files:

• DrawBuffer.cpp (modified) (6 diffs)
• TextEditor_KeyEvent.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/abdev/DrawBuffer.cpp

@@ -23 +23 @@
 public:
     HDC memdc;
-    CDrawReserve(int WndNum,HDC _hDC,int cx,int cy,int ctrl_tab_space,int nMaxOnePageChar,int linenum_textcount){
+    CDrawReserve(int WndNum,HDC _hDC,int cx,int cy,int ctrl_tab_space,int nMaxOnePageChar,int linenum_textcount,BOOL isRemoteSession){
         m_WndNum=WndNum;
         x=-1;
         y=-1;
         bNowUnder=0;
-        hdc=_hDC;
         ClientSize.cx=cx;
         ClientSize.cy=cy;
@@ -35 +34 @@
         iMax_OneLine_TextLength=cx/font_width+1;
         iLineNumberTextCount=linenum_textcount;
-        memdc=CreateCompatibleDC(hdc);
-        hMemBmp=CreateCompatibleBitmap(hdc,cx,cy);
-        hOldBitmap=(HBITMAP)SelectObject(memdc,hMemBmp);
+        if(isRemoteSession){
+            hdc=0;
+            memdc=_hDC;
+        }
+        else{
+            hdc=_hDC;
+            memdc=CreateCompatibleDC(hdc);
+            hMemBmp=CreateCompatibleBitmap(hdc,cx,cy);
+            hOldBitmap=(HBITMAP)SelectObject(memdc,hMemBmp);
+        }
 
         //背景色でメモリ画面を初期化
@@ -43 +49 @@
         hBrush=CreateSolidBrush(tci.rgbBackground);
         hOldBrush=(HBRUSH)SelectObject(memdc,hBrush);
-        PatBlt(memdc,0,0,cx,cy,PATCOPY);
+        PatBlt(memdc,ctrl_tab_space,0,cx-ctrl_tab_space,cy,PATCOPY);
         DeleteObject(hBrush);
 
@@ -69 +75 @@
     }
     ~CDrawReserve(){
-        SelectObject(memdc,hOldBitmap);
-        DeleteObject(hMemBmp);
-
         SelectObject(memdc,hOldFont);
-
-        DeleteDC(memdc);
-
+        if(hdc){
+            SelectObject(memdc,hOldBitmap);
+            DeleteObject(hMemBmp);
+
+            DeleteDC(memdc);
+        }
         HeapDefaultFree(lpszBuffer);
     }
@@ -260 +266 @@
 
 
-        //メモリDCの内容を画面に描画
-        BitBlt(hdc,0,0,ClientSize.cx,ClientSize.cy,memdc,0,0,SRCCOPY);
+        //メモリDCを使用している場合、その内容を画面に描画
+        if (hdc){
+            BitBlt(hdc,0,0,ClientSize.cx,ClientSize.cy,memdc,0,0,SRCCOPY);
+        }
     }
 };
@@ -298 +306 @@
         iControlTabSpace,
         OnePage_CharHeight,
-        iLineNumberTextCount);
+        iLineNumberTextCount,
+        GetSystemMetrics(SM_REMOTESESSION));
 
 

trunk/ab5.0/abdev/abdev/TextEditor_KeyEvent.cpp

@@ -488 +488 @@
     int WndNum;
     WndNum=GetWndNum(GetParent(hwnd));
+    bool isSelectedBefore = MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.x!=MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.x
+        || MdiInfo[WndNum]->pMdiTextEdit->StartCaretPos.y!=MdiInfo[WndNum]->pMdiTextEdit->EndCaretPos.y;
 
     if(nVirtualKey==VK_LEFT||nVirtualKey==VK_UP||nVirtualKey==VK_RIGHT||nVirtualKey==VK_DOWN||nVirtualKey==VK_PRIOR||nVirtualKey==VK_NEXT){
@@ -665 +667 @@
         ResetState_EditMenu();
 
-        //再描画（選択時の反転表示が解除されたときを考慮）
-        UpdateWindow(hwnd); //ちらつき防止
-        InvalidateRect(hwnd,NULL,0);
+        if(!TextEdit_ScrollCaret(WndNum,0)&&isSelectedBefore){
+            UpdateWindow(hwnd); //ちらつき防止
+            //再描画（選択時の反転表示が解除されたときを考慮）
+            InvalidateRect(hwnd,NULL,0);
+        }
     }
     else if(nVirtualKey==VK_HOME||nVirtualKey==VK_END){
@@ -705 +709 @@
         }
 
-        if(!TextEdit_ScrollCaret(WndNum,0)){
+        if(!TextEdit_ScrollCaret(WndNum,0)&&isSelectedBefore){
             //再描画（選択時の反転表示が解除されたときを考慮）
             InvalidateRect(hwnd,NULL,0);