Changeset 1302

Timestamp:

11/05/07 01:10:45 (10 months ago)

Author:

calvin

Message:

optimized machine view led updating, pattern editor selecting and scrolling

Location:

trunk/src/buzelib

Files:

• MachineView.cpp (modified) (3 diffs)
• MachineView.h (modified) (1 diff)
• PatternEditor/PatternEditorInner.cpp (modified) (9 diffs)

trunk/src/buzelib/MachineView.cpp

@@ -1159 +1159 @@
                 if (!machine) continue;
                 if (machine->nonSongPlugin) continue;
-                RECT rc;
-                getStatusRect(machine, &rc);
-                InvalidateRect(&rc, FALSE);
+
+                std::map<zzub::metaplugin*, bool>::iterator ledState = ledStates.find(machine);
+
+                bool newState = machine->lastWorkState || machine->lastMidiState;
+
+                if (ledState == ledStates.end() || newState != ledState->second) {
+                        RECT rc;
+                        getStatusRect(machine, &rc);
+                        InvalidateRect(&rc, FALSE);
+                }
         }
 }
@@ -1494 +1501 @@
                 getStatusRect(machine, &rc);
 
-                MachineSkin* skin = mainFrame->getSkin(machine->loader->plugin_info->uri);
-                if (skin && skin->led && !machine->minimized) {
-                        CDC bitmapDC;
-                        bitmapDC.CreateCompatibleDC(0);
-                        bitmapDC.SelectBitmap(skin->led);
-                        BITMAP bm;
-                        ::GetObject(skin->led, sizeof(bm), &bm);
-
-                        if (machine->lastWorkState || machine->lastMidiState) {
-                                dc.StretchBlt(rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, bitmapDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY);
+                std::map<zzub::metaplugin*, bool>::iterator ledState = ledStates.find(machine);
+
+                bool newState = machine->lastWorkState || machine->lastMidiState;
+
+                if (dirtyMachines || ledState == ledStates.end() || newState != ledState->second) {
+
+                        MachineSkin* skin = mainFrame->getSkin(machine->loader->plugin_info->uri);
+                        if (skin && skin->led && !machine->minimized) {
+                                CDC bitmapDC;
+                                bitmapDC.CreateCompatibleDC(0);
+                                bitmapDC.SelectBitmap(skin->led);
+                                BITMAP bm;
+                                ::GetObject(skin->led, sizeof(bm), &bm);
+
+                                if (newState) {
+                                        dc.StretchBlt(rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, bitmapDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY);
+                                } else {
+                                        // draw a rectangle from the machine skin where the led is drawn
+                                        drawMachine(dc, machine, true);
+                                }
                         } else {
-                                // draw a rectangle from the machine skin where the led is drawn
-                                drawMachine(dc, machine, true);
+                                CBrushHandle prevBrush = dc.SelectBrush(getMachineLedBrush(machine));
+                                dc.Rectangle(&rc);
+                                dc.SelectBrush(prevBrush);
                         }
-                } else {
-                        CBrushHandle prevBrush = dc.SelectBrush(getMachineLedBrush(machine));
-                        dc.Rectangle(&rc);
-                        dc.SelectBrush(prevBrush);
+
+                        ledStates[machine] = newState;
                 }
 
@@ -1649 +1665 @@
                 case UpdateNewDocument:
                 case UpdateOpenDocument:
+                        ledStates.clear();
                         document->clearSelectedMachines();
                         document->selectMachine(document->player->master);
+                        break;
+                case UpdateDeleteMachine:
+                        ledStates.clear();
                         break;
                 case UpdateMachines:

trunk/src/buzelib/MachineView.h

@@ -69 +69 @@
         bool dirtyOffscreenBitmap;
         CBitmap offscreenBitmap;
+
+        std::map<zzub::metaplugin*, bool> ledStates;
+
 public:
         double scale;

trunk/src/buzelib/PatternEditor/PatternEditorInner.cpp

@@ -103 +103 @@
         dc.SetBkColor(colors[PE_BG]);
         dc.SetTextColor(colors[PE_TextValue]);
-        dc.FillSolidRect(&rcClient, colors[PE_BG]);
+        dc.FillSolidRect(&dc.m_rc, colors[PE_BG]);
 
         int screenrows = rcClient.bottom / font_size.cy;
-
-        for (int i = 0; i <= screenrows && i+scroll.y < rows; i++) {
+        int cliprows = dc.m_rc.bottom / font_size.cy;
+        int firscliprow = dc.m_rc.top / font_size.cy;
+
+        for (int i = firscliprow; i <= cliprows && i+scroll.y < rows; i++) {
                 int src_y = (i + scroll.y) * font_size.cy;
                 int dest_y = i * font_size.cy;
@@ -189 +191 @@
 bool CPatternEditorInner::GetRangeRectScreen(int from_col, int from_row, int to_col, int to_row, RECT* rc) {
         if (from_col == -1) return false;
+        if (columns.size() == 0) return false;
 
         int left_col = std::min(from_col, to_col);
@@ -356 +359 @@
 
                 if (mouse_mode == mouse_mode_drag) {
+                        RECT rcPrevDrag;
+                        int sel_width = select_end.x - select_start.x;
+                        int sel_height = select_end.y - select_start.y;
+                        if (!GetRangeRectScreen(drag_to.x, drag_to.y, drag_to.x + sel_width, drag_to.y + sel_height, &rcPrevDrag)) {
+                                rcPrevDrag.left = -1;
+                        }
+
                         int scroll_diff_y = (scroll.y - drag_scroll.y);
                         int scroll_diff_x = (scroll.x - drag_scroll.x);
@@ -373 +383 @@
 
                         GetParent().SendMessage(WM_COMMAND, MAKEWPARAM(ID_PATTERNEDITOR_SELDRAG, 0), 0);
-                        Invalidate(FALSE);
+                        
+                        // invalidate drag rect
+                        RECT rcDrag;
+
+                        if (!GetRangeRectScreen(drag_to.x, drag_to.y, drag_to.x + sel_width, drag_to.y + sel_height, &rcDrag))
+                                rcDrag.left = -1;
+
+                        if (rcPrevDrag.left != -1 && rcDrag.left != -1) {
+                                UnionRect(&rcDrag, &rcDrag, &rcPrevDrag);
+                        } else
+                        if (rcDrag.left == -1) {
+                                rcDrag = rcPrevDrag;
+                        }
+
+                        if (rcDrag.left != -1)
+                                InvalidateRect(&rcDrag, FALSE);
                 }
 
@@ -490 +515 @@
         if (scroll.x != last_x) {
                 ScrollWindow((last_x - scroll.x) * font_size.cx, 0);
-                UpdateWindow();
                 GetParent().SendMessage(WM_COMMAND, MAKEWPARAM(ID_PATTERNEDITOR_SCROLLED, 0), 0);
         }
@@ -524 +548 @@
 
         if (scroll.y != last_y) {
-                LockWindowUpdate();
                 ScrollWindow(0, (last_y - scroll.y) * font_size.cy);
-                UpdateWindow();
                 GetParent().SendMessage(WM_COMMAND, MAKEWPARAM(ID_PATTERNEDITOR_SCROLLED, 0), 0);
-                LockWindowUpdate(FALSE);
         }
 
@@ -971 +992 @@
         ScrollWindow((scroll.x - new_scroll.x) * font_size.cx, (scroll.y - new_scroll.y) * font_size.cy, 0);
         scroll = new_scroll;
-        UpdateWindow();
         UpdateCaretPosition();
         GetParent().SendMessage(WM_COMMAND, MAKEWPARAM(ID_PATTERNEDITOR_SCROLLED, 0), 0);
@@ -1017 +1037 @@
 
 void CPatternEditorInner::SelectRange(int from_col, int from_row, int to_col, int to_row) {
+        RECT rcPrevSel;
+        if (!GetSelectionRectScreen(&rcPrevSel))
+                rcPrevSel.left = -1;
+
         select_first.x = from_col;
         select_first.y = from_row;
@@ -1031 +1055 @@
         SortSelection();
         if (!m_hWnd) return ;
-        Invalidate(FALSE);
-        GetParent().SendMessage(WM_COMMAND, MAKEWPARAM(ID_PATTERNEDITOR_SELCHANGED, 0), 0);
+
+        RECT rcSel;
+        if (!GetSelectionRectScreen(&rcSel))
+                rcSel.left = -1;
+
+        if (rcSel.left != -1 && rcPrevSel.left != -1) {
+                UnionRect(&rcSel, &rcSel, &rcPrevSel);
+        } else 
+        if (rcSel.left == -1) {
+                rcSel = rcPrevSel;
+        }
+
+        if (rcSel.left != -1) {
+                InvalidateRect(&rcSel, FALSE);
+                GetParent().SendMessage(WM_COMMAND, MAKEWPARAM(ID_PATTERNEDITOR_SELCHANGED, 0), 0);
+        }
 }