Changeset 2769 for trunk/src/comctl32/treeview.c

Timestamp:

Feb 12, 2000, 7:10:40 PM (26 years ago)

Author:

cbratschi

Message:

next steps

File:

• trunk/src/comctl32/treeview.c (modified) (51 diffs)

trunk/src/comctl32/treeview.c

@@ -1 @@
-/* $Id: treeview.c,v 1.23 2000-02-10 18:51:19 cbratschi Exp $ */
+/* $Id: treeview.c,v 1.24 2000-02-12 18:10:40 cbratschi Exp $ */
 /* Treeview control
  *
@@ -32 +32 @@
  *   WM_HSCROLL is broken.
  *   use separate routine to get item text/image.
- *   WM_SETREDRAW isn't handled
  *
  *   Separate drawing/calculation.
@@ -44 +43 @@
 
 /* WINE 991212 level */
+
+/* CB: todo
+
+ - sub parent lines aren't redrawn in expand handler
+ - invisible sibling lines aren't drawn in WM_PAINT
+ - WM_LBUTTONDOWN: bug in highlight code
+ - WM_SIZE: redraw doesn't work
+ - hscroll not set
+
+*/
 
 #include <string.h>
@@ -74 +83 @@
 static void    TREEVIEW_Refresh(HWND hwnd);
 static void    TREEVIEW_Draw(HWND hwnd,HDC hdc,RECT *updateRect);
+static void    TREEVIEW_UnqueueRefresh(HWND hwnd,BOOL calc,BOOL refresh);
+static void    TREEVIEW_QueueRefresh(HWND hwnd);
 
 static LRESULT CALLBACK TREEVIEW_Edit_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -488 +499 @@
 
   //CB: todo
-  TREEVIEW_Refresh(hwnd);
+  if (!(infoPtr->uInternalStatus & TV_NOREDRAW))
+    TREEVIEW_Refresh(hwnd);
 
   return 1;
@@ -539 +551 @@
 #define TREEVIEW_LEFT_MARGIN 8
 
+//CB: hack for PS_DOT bug in Open32 pen handling
+
+BOOL drawPixel;
+HDC  drawDC;
+
+VOID CALLBACK TREEVIEW_DDAProc(int x,int y,LPARAM lpData)
+{
+  if (drawPixel) SetPixel(drawDC,x,y,(COLORREF)lpData);
+  else SetPixel(drawDC,x,y,RGB(255,255,255));
+  drawPixel = !drawPixel;
+}
+
+static void TREEVIEW_Polyline(HDC hdc,const POINT *lppt,int cPoints,COLORREF color)
+{
+  INT x;
+
+  drawPixel = TRUE;
+  drawDC = hdc;
+  for (x = 0;x < cPoints-1;x++)
+    LineDDA(lppt[x].x,lppt[x].y,lppt[x+1].x,lppt[x+1].y,TREEVIEW_DDAProc,color);
+}
 
 static void
@@ -550 +583 @@
   RECT  r;
 
-
   if (wineItem->state & TVIS_BOLD)
-        hOldFont = SelectObject (hdc, infoPtr->hBoldFont);
+    hOldFont = SelectObject (hdc, infoPtr->hBoldFont);
   else
-        hOldFont = SelectObject (hdc, infoPtr->hFont);
-
-  cditem=0;
-  //TRACE ("cdmode:%x\n",infoPtr->cdmode);
-  if (infoPtr->cdmode & CDRF_NOTIFYITEMDRAW) {
-                cditem = TREEVIEW_SendCustomDrawItemNotify(hwnd, hdc,
-                             wineItem, CDDS_ITEMPREPAINT);
-
-                if (cditem & CDRF_SKIPDEFAULT)
-                        return;
-        }
+    hOldFont = SelectObject (hdc, infoPtr->hFont);
+
+  cditem = 0;
+
+  if (infoPtr->cdmode & CDRF_NOTIFYITEMDRAW)
+  {
+    cditem = TREEVIEW_SendCustomDrawItemNotify(hwnd, hdc, wineItem, CDDS_ITEMPREPAINT);
+
+    if (cditem & CDRF_SKIPDEFAULT) return;
+  }
 
   /*
@@ -576 +607 @@
    * Display the tree hierarchy
    */
-  if ( dwStyle & TVS_HASLINES)
+  if ((dwStyle & TVS_HASLINES) && (wineItem->hItem != infoPtr->TopRootItem))
   {
     /*
@@ -586 +617 @@
      * points[2] is attached to the parent or the up sibling
      */
-    if ( dwStyle & TVS_LINESATROOT)
+    if (dwStyle & TVS_LINESATROOT)
     {
       TREEVIEW_ITEM *upNode    = NULL;
-        BOOL  hasParentOrSibling = TRUE;
+      BOOL  hasParentOrSibling = TRUE;
       RECT  upRect             = {0,0,0,0};
       HPEN  hOldPen, hnewPen;
-        POINT points[3];
+      POINT points[3];
       /*
        * determine the target location of the line at root, either be linked
@@ -606 +637 @@
       if (upNode)
         upRect = upNode->rect;
-
-      if ( wineItem->iLevel == 0 )
+//CB: todo: draw full lines to avoid problems with PS_DOT and scrolling
+      if (wineItem->iLevel == 0)
       {
         points[2].x = points[1].x = upRect.left+8;
@@ -613 +644 @@
         points[2].y = upRect.bottom-3;
         points[1].y = points[0].y = center;
-      }
-      else
+      } else
       {
         points[2].x = points[1].x = 8 + (20*wineItem->iLevel);
-        points[2].y = ( upNode->cChildren == 0) ?
+        points[2].y = (upNode->cChildren == 0) ?
                         upRect.top :        /* is linked to the "L" above */
                         ( wineItem->upsibling != NULL) ?
@@ -629 +659 @@
        * Get a dotted pen
        */
+#if 0 //CB: workaround for Open32 PS_DOT bug
       hnewPen = CreatePen(PS_DOT, 0, infoPtr->clrLine);
       hOldPen = SelectObject( hdc, hnewPen );
 
       if (hasParentOrSibling)
-        Polyline (hdc,points,3);
+        Polyline(hdc,points,3);
       else
-        Polyline (hdc,points,2);
+        Polyline(hdc,points,2);
 
       DeleteObject(hnewPen);
       SelectObject(hdc, hOldPen);
+#else
+      if (hasParentOrSibling)
+        TREEVIEW_Polyline(hdc,points,3,infoPtr->clrLine);
+      else
+        TREEVIEW_Polyline(hdc,points,2,infoPtr->clrLine);
+#endif
     }
   }
@@ -650 +687 @@
   if (( dwStyle & TVS_HASBUTTONS) && ( dwStyle & TVS_HASLINES))
   {
-          if ( (wineItem->cChildren) ||
-               (wineItem->cChildren == I_CHILDRENCALLBACK))
+    if ( (wineItem->cChildren) ||
+         (wineItem->cChildren == I_CHILDRENCALLBACK))
     {
       /* Setup expand box coordinate to facilitate the LMBClick handling */
@@ -659 +696 @@
       wineItem->expandBox.bottom = center+5;
 
-                Rectangle (
-        hdc,
-        wineItem->expandBox.left,
-        wineItem->expandBox.top ,
-        wineItem->expandBox.right,
-        wineItem->expandBox.bottom);
-
-                MoveToEx (hdc, xpos-2, center, NULL);
-                LineTo   (hdc, xpos+3, center);
-
-                if (!(wineItem->state & TVIS_EXPANDED)) {
-                        MoveToEx (hdc, xpos,   center-2, NULL);
-                        LineTo   (hdc, xpos,   center+3);
-          }
+      Rectangle(hdc,wineItem->expandBox.left,wineItem->expandBox.top,wineItem->expandBox.right,wineItem->expandBox.bottom);
+
+      MoveToEx (hdc, xpos-2, center, NULL);
+      LineTo   (hdc, xpos+3, center);
+
+      if (!(wineItem->state & TVIS_EXPANDED))
+      {
+        MoveToEx (hdc, xpos,   center-2, NULL);
+        LineTo   (hdc, xpos,   center+3);
+      }
     }
   }
@@ -680 +713 @@
    */
   xpos += 13; /* update position */
-  if (wineItem->mask & (TVIF_IMAGE|TVIF_SELECTEDIMAGE)) {
+  if (wineItem->mask & (TVIF_IMAGE|TVIF_SELECTEDIMAGE))
+  {
     INT        imageIndex;
     HIMAGELIST *himlp = NULL;
 
-   /* State images are displayed to the left of the Normal image
-    * image number is in state; zero should be `display no image'.
-    * FIXME: that last sentence looks like it needs some checking.
-    */
-        if (infoPtr->himlState)
-        himlp=&infoPtr->himlState;
-        imageIndex=wineItem->state>>12;
-        imageIndex++;          /* yeah, right */
-        //TRACE ("imindex:%d\n",imageIndex);
+    /* State images are displayed to the left of the Normal image
+     * image number is in state; zero should be `display no image'.
+     * FIXME: that last sentence looks like it needs some checking.
+     */
+    if (infoPtr->himlState)
+      himlp=&infoPtr->himlState;
+    imageIndex=wineItem->state>>12;
+    imageIndex++;          /* yeah, right */
+
     if ((himlp) && (imageIndex))
     {
-          imageIndex--;       /* see FIXME */
+      imageIndex--;       /* see FIXME */
       ImageList_Draw ( *himlp, imageIndex, hdc, xpos-2, r.top+1, ILD_NORMAL);
-          ImageList_GetIconSize (*himlp, &cx, &cy);
-          wineItem->statebitmap.left=xpos-2;
-          wineItem->statebitmap.right=xpos-2+cx;
-          wineItem->statebitmap.top=r.top+1;
-          wineItem->statebitmap.bottom=r.top+1+cy;
-          xpos+=cx;
+      ImageList_GetIconSize (*himlp, &cx, &cy);
+      wineItem->statebitmap.left=xpos-2;
+      wineItem->statebitmap.right=xpos-2+cx;
+      wineItem->statebitmap.top=r.top+1;
+      wineItem->statebitmap.bottom=r.top+1+cy;
+      xpos += cx;
     }
 
-                /* Now, draw the normal image; can be either selected or
-                 * non-selected image.
-                 */
-
-        himlp=NULL;
-        if (infoPtr->himlNormal)
+    /* Now, draw the normal image; can be either selected or
+     * non-selected image.
+     */
+
+    himlp=NULL;
+    if (infoPtr->himlNormal)
       himlp=&infoPtr->himlNormal; /* get the image list */
 
     imageIndex = wineItem->iImage;
-        if ( (wineItem->state & TVIS_SELECTED) &&
-         (wineItem->iSelectedImage)) {
+    if ( (wineItem->state & TVIS_SELECTED) &&
+         (wineItem->iSelectedImage))
+    {
 
       /* The item is curently selected */
-                  if (wineItem->iSelectedImage == I_IMAGECALLBACK)
-                        TREEVIEW_SendDispInfoNotify
-                                        (hwnd, wineItem, TVN_GETDISPINFO, TVIF_SELECTEDIMAGE);
-
-          imageIndex = wineItem->iSelectedImage;
-          } else {
+      if (wineItem->iSelectedImage == I_IMAGECALLBACK)
+        TREEVIEW_SendDispInfoNotify(hwnd, wineItem, TVN_GETDISPINFO, TVIF_SELECTEDIMAGE);
+
+      imageIndex = wineItem->iSelectedImage;
+    } else
+    {
       /* The item is not selected */
-                  if (wineItem->iImage == I_IMAGECALLBACK)
-                          TREEVIEW_SendDispInfoNotify
-                                        (hwnd, wineItem, TVN_GETDISPINFO, TVIF_IMAGE);
+      if (wineItem->iImage == I_IMAGECALLBACK)
+        TREEVIEW_SendDispInfoNotify(hwnd, wineItem, TVN_GETDISPINFO, TVIF_IMAGE);
 
       imageIndex = wineItem->iImage;
-        }
+    }
 
     if (himlp)
     {
       ImageList_Draw ( *himlp, imageIndex, hdc, xpos-2, r.top+1, ILD_NORMAL);
-          ImageList_GetIconSize (*himlp, &cx, &cy);
-          wineItem->bitmap.left=xpos-2;
-          wineItem->bitmap.right=xpos-2+cx;
-          wineItem->bitmap.top=r.top+1;
-          wineItem->bitmap.bottom=r.top+1+cy;
-          xpos+=cx;
+      ImageList_GetIconSize (*himlp, &cx, &cy);
+      wineItem->bitmap.left=xpos-2;
+      wineItem->bitmap.right=xpos-2+cx;
+      wineItem->bitmap.top=r.top+1;
+      wineItem->bitmap.bottom=r.top+1+cy;
+      xpos += cx;
     }
   }
@@ -763 +797 @@
     wineItem->text.bottom= r.bottom;
 
-    if (wineItem->pszText== LPSTR_TEXTCALLBACKA) {
+    if (wineItem->pszText== LPSTR_TEXTCALLBACKA)
+    {
       //TRACE("LPSTR_TEXTCALLBACK\n");
       TREEVIEW_SendDispInfoNotify (hwnd, wineItem, TVN_GETDISPINFO, TVIF_TEXT);
@@ -782 +817 @@
 
     if (!(cditem & CDRF_NOTIFYPOSTPAINT) &&
-        (wineItem->state & (TVIS_SELECTED | TVIS_DROPHILITED)) ) {
-        oldBkMode    = SetBkMode  (hdc, OPAQUE);
-        oldBkColor   = SetBkColor  (hdc, GetSysColor( COLOR_HIGHLIGHT));
-        oldTextColor = SetTextColor(hdc, GetSysColor( COLOR_HIGHLIGHTTEXT));
-        } else {
-        oldBkMode    = SetBkMode  (hdc, TRANSPARENT);
-                oldBkColor   = SetBkColor (hdc, infoPtr->clrBk);
+        (wineItem->state & (TVIS_SELECTED | TVIS_DROPHILITED)) )
+    {
+      oldBkMode    = SetBkMode  (hdc, OPAQUE);
+      oldBkColor   = SetBkColor  (hdc, GetSysColor( COLOR_HIGHLIGHT));
+      oldTextColor = SetTextColor(hdc, GetSysColor( COLOR_HIGHLIGHTTEXT));
+    } else
+    {
+      oldBkMode    = SetBkMode  (hdc, TRANSPARENT);
+      oldBkColor   = SetBkColor (hdc, infoPtr->clrBk);
  /*         oldTextColor = SetTextColor(hdc, infoPtr->clrText);  */
-        }
+    }
 
 
@@ -845 +882 @@
   //              TRACE ("item:%d,mark:%d\n", (int)wineItem->hItem,
   //                             (int) infoPtr->insertMarkItem);
-  if (wineItem->hItem==infoPtr->insertMarkItem) {
-                HPEN hNewPen, hOldPen;
-                int offset;
-
-                hNewPen = CreatePen(PS_SOLID, 2, infoPtr->clrInsertMark);
-                hOldPen = SelectObject( hdc, hNewPen );
-
-                if (infoPtr->insertBeforeorAfter)
-                        offset=wineItem->text.top+1;
-                else
-                        offset=wineItem->text.bottom-1;
-
-                MoveToEx (hdc, wineItem->text.left, offset-3, NULL);
-                LineTo (hdc, wineItem->text.left, offset+3);
-
-                MoveToEx (hdc, wineItem->text.left, offset, NULL);
-                LineTo (hdc, r.right-2, offset);
-
-                MoveToEx (hdc, r.right-2, offset+3, NULL);
-                LineTo (hdc, r.right-2, offset-3);
-
-        DeleteObject(hNewPen);
-
-        SelectObject(hdc, hOldPen);
-        }
-
-  if (cditem & CDRF_NOTIFYPOSTPAINT) {
-                cditem=TREEVIEW_SendCustomDrawItemNotify
-                       (hwnd, hdc, wineItem, CDDS_ITEMPOSTPAINT);
-                //TRACE("postpaint:cditem-app returns 0x%x\n",cditem);
-        }
+  if (wineItem->hItem==infoPtr->insertMarkItem)
+  {
+    HPEN hNewPen, hOldPen;
+    int offset;
+
+    hNewPen = CreatePen(PS_SOLID, 2, infoPtr->clrInsertMark);
+    hOldPen = SelectObject( hdc, hNewPen );
+
+    if (infoPtr->insertBeforeorAfter)
+      offset=wineItem->text.top+1;
+    else
+      offset=wineItem->text.bottom-1;
+
+    MoveToEx (hdc, wineItem->text.left, offset-3, NULL);
+    LineTo (hdc, wineItem->text.left, offset+3);
+
+    MoveToEx (hdc, wineItem->text.left, offset, NULL);
+    LineTo (hdc, r.right-2, offset);
+
+    MoveToEx (hdc, r.right-2, offset+3, NULL);
+    LineTo (hdc, r.right-2, offset-3);
+
+    DeleteObject(hNewPen);
+
+    SelectObject(hdc, hOldPen);
+  }
+
+  if (cditem & CDRF_NOTIFYPOSTPAINT)
+  {
+    cditem = TREEVIEW_SendCustomDrawItemNotify(hwnd, hdc, wineItem, CDDS_ITEMPOSTPAINT);
+    //TRACE("postpaint:cditem-app returns 0x%x\n",cditem);
+  }
 
   SelectObject (hdc, hOldFont);
@@ -894 +932 @@
   if (lpRect == NULL)
     return FALSE;
+
+  TREEVIEW_UnqueueRefresh(hwnd,TRUE,TRUE);
 
   /*
@@ -1007 +1047 @@
 {
     TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-        TREEVIEW_ITEM *wineItem;
-
-        wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)wParam);
-        if (!wineItem) return 0;
-
-        return (wineItem->state & lParam);
+    TREEVIEW_ITEM *wineItem;
+
+    wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)wParam);
+    if (!wineItem) return 0;
+
+    return (wineItem->state & lParam);
+}
+
+static void TREEVIEW_Refresh(HWND hwnd)
+{
+  InvalidateRect(hwnd,NULL,TRUE);
 }
 
@@ -1019 +1064 @@
   if (item && item->visible)
   {
-    //CB: todo: only redraw text and icon
-    InvalidateRect(hwnd,&item->rect,TRUE);
-  }
-}
-
-static void TREEVIEW_Refresh(HWND hwnd)
-{
-  InvalidateRect(hwnd,NULL,TRUE);
-}
-
-static void TREEVIEW_CalcItems(HWND hwnd)
-{
-  //CB: todo: TREEVIEW_Draw should only draw, not calculate!
-}
-
-static void TREEVIEW_SetScrollbars(HWND hwnd)
-{
-  //CB: todo: dito
-}
-
-static int TREEVIEW_GetFirstVisibleItem(HWND hwnd)
-{
-  //CB: todo
-
-  return 0;
+    RECT rect = item->rect;
+
+    rect.left += TREEVIEW_LEFT_MARGIN;
+    if (item->iLevel != 0) rect.left += (5*item->iLevel);
+    rect.left += 15;
+    InvalidateRect(hwnd,&rect,TRUE);
+  }
+}
+
+//CB: HDC parameter is optional
+
+static void TREEVIEW_CalcItems(HWND hwnd,HDC hdc,TREEVIEW_INFO *infoPtr)
+{
+  TREEVIEW_ITEM *item,*prevItem;
+  INT iItem, indent, x, y, cx, height, itemHeight;
+  TEXTMETRICA tm;
+  RECT rect,view;
+  BOOL ownDC = FALSE;
+
+  GetClientRect(hwnd,&rect);
+  infoPtr->uVisibleHeight = rect.bottom-rect.top;
+  infoPtr->uVisibleWidth = rect.right-rect.left;
+  view = rect;
+  OffsetRect(&view,infoPtr->cx,infoPtr->cy);
+
+  iItem = (INT)infoPtr->TopRootItem;
+  infoPtr->firstVisible = 0;
+  item = NULL;
+  indent = 0;
+  x = y = 0;
+
+  while (iItem)
+  {
+    prevItem = item;
+    item = &infoPtr->items[iItem];
+    item->iLevel = indent;
+
+    if ((infoPtr->uInternalStatus & TV_CALCALL) || !item->calculated)
+    {
+      ImageList_GetIconSize(infoPtr->himlNormal,&cx,&itemHeight);
+      if (infoPtr->uItemHeight > itemHeight)
+        itemHeight = infoPtr->uItemHeight;
+
+      if (!hdc)
+      {
+        ownDC = TRUE;
+        hdc = GetDC(hwnd);
+      }
+
+      GetTextMetricsA(hdc,&tm);
+      if ((tm.tmHeight + tm.tmExternalLeading) > itemHeight)
+        itemHeight = tm.tmHeight + tm.tmExternalLeading;
+
+      infoPtr->uRealItemHeight = itemHeight;
+
+      height = itemHeight * item->iIntegral +1;
+      item->calculated = TRUE;
+    } else height = infoPtr->uRealItemHeight*item->iIntegral+1;
+
+    item->rect.top    = y - infoPtr->cy + rect.top;
+    item->rect.bottom = item->rect.top + height ;
+    item->rect.left   = x - infoPtr->cx + rect.left;
+    item->rect.right  = rect.right;
+
+    if ((((y >= view.top) && (y <= view.bottom)) || ((y+height >= view.top) && (y+height <= view.bottom))) &&
+        (x >= view.left) && (x <= view.right))
+    {
+      item->visible     = TRUE;
+      if (!infoPtr->firstVisible)
+        infoPtr->firstVisible = item->hItem;
+    } else item->visible    = FALSE;
+
+    /* look up next item */
+
+    if ((item->firstChild) && (item->state & TVIS_EXPANDED))
+    {
+      iItem = (INT)item->firstChild;
+      indent++;
+      x += infoPtr->uIndent;
+      if (x > infoPtr->uTotalWidth)
+        infoPtr->uTotalWidth=x;
+    } else
+    {
+      iItem = (INT)item->sibling;
+      while ((!iItem) && (indent > 0))
+      {
+        indent--;
+        x -= infoPtr->uIndent;
+        prevItem = item;
+        item =& infoPtr->items[(INT)item->parent];
+        iItem = (INT)item->sibling;
+      }
+    }
+    y +=height;
+  } /* while */
+
+  if (ownDC) ReleaseDC(hwnd,hdc);
+
+/* FIXME: infoPtr->uTotalWidth should also take item label into account */
+
+  infoPtr->uTotalHeight = y;
+
+  infoPtr->uInternalStatus &= ~TV_CALCALL;
+
+//CB: todo: use SetScrollInfo, HSCROLL
+
+  if (infoPtr->uTotalHeight >= infoPtr->uVisibleHeight)
+  {
+    if (!(infoPtr->uInternalStatus & TV_VSCROLL))
+      ShowScrollBar (hwnd, SB_VERT, TRUE);
+    infoPtr->uInternalStatus |= TV_VSCROLL;
+    SetScrollRange (hwnd, SB_VERT, 0, infoPtr->uTotalHeight - infoPtr->uVisibleHeight, FALSE);
+    SetScrollPos (hwnd, SB_VERT, infoPtr->cy, TRUE);
+  } else
+  {
+    if (infoPtr->uInternalStatus & TV_VSCROLL)
+      ShowScrollBar (hwnd, SB_VERT, FALSE);
+    infoPtr->uInternalStatus &= ~TV_VSCROLL;
+  }
 }
 
@@ -1050 +1189 @@
 {
     TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-    TEXTMETRICA tm;
     HBRUSH hbrBk;
-    RECT rect,view;
-    INT iItem, indent, x, y, cx, height, itemHeight;
-    TREEVIEW_ITEM *wineItem, *prevItem;
-
-    //TRACE("\n");
+    RECT rect;
+    TREEVIEW_ITEM *item;
+    INT iItem,indent;
+    INT visIndent = -1;
+
+    TREEVIEW_UnqueueRefresh(hwnd,TRUE,FALSE);
 
     GetClientRect (hwnd, &rect);
-    if ((rect.left-rect.right ==0) || (rect.top-rect.bottom==0)) return;
-
-    infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify
-                                                (hwnd, CDDS_PREPAINT, hdc, rect);
-
-    if (infoPtr->cdmode==CDRF_SKIPDEFAULT) return;
-
-    infoPtr->uVisibleHeight= rect.bottom-rect.top;
-    infoPtr->uVisibleWidth= rect.right-rect.left;
-
-    view = updateRect ? *updateRect:rect;
-    view.left = 0;
-    view.right = rect.right;
-    OffsetRect(&view,infoPtr->cx,infoPtr->cy);
+    if ((rect.left == rect.right) || (rect.top == rect.bottom)) return;
+
+    infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(hwnd, CDDS_PREPAINT, hdc, rect);
+
+    if (infoPtr->cdmode == CDRF_SKIPDEFAULT) return;
 
     /* draw background */
@@ -1080 +1210 @@
     DeleteObject(hbrBk);
 
-    iItem=(INT)infoPtr->TopRootItem;
-    infoPtr->firstVisible=0;
-    wineItem=NULL;
-    indent=0;
-    x=y=0;
-
-    while (iItem) {
-                prevItem=wineItem;
-        wineItem= & infoPtr->items[iItem];
-                wineItem->iLevel=indent;
-
-        ImageList_GetIconSize (infoPtr->himlNormal, &cx, &itemHeight);
-        if (infoPtr->uItemHeight>itemHeight)
-                    itemHeight=infoPtr->uItemHeight;
-
-            GetTextMetricsA (hdc, &tm);
-            if ((tm.tmHeight + tm.tmExternalLeading) > itemHeight)
-                     itemHeight=tm.tmHeight + tm.tmExternalLeading;
-
-        infoPtr->uRealItemHeight=itemHeight;
-
-                height=itemHeight * wineItem->iIntegral +1;
-                if ((((y >= view.top) && (y <= view.bottom)) || ((y+height >= view.top) && (y+height <= view.bottom))) &&
-                    (x >= view.left) && (x <= view.right))
-                {
-                                wineItem->visible = TRUE;
-                        wineItem->rect.top = y - infoPtr->cy + rect.top;
-                        wineItem->rect.bottom = wineItem->rect.top + height ;
-                        wineItem->rect.left = x - infoPtr->cx + rect.left;
-                        wineItem->rect.right = rect.right;
-                        if (!infoPtr->firstVisible)
-                                infoPtr->firstVisible=wineItem->hItem;
-                TREEVIEW_DrawItem (hwnd, hdc, wineItem);
-                }
-                else {
-                        wineItem->visible   = FALSE;
-                        wineItem->rect.left = wineItem->rect.top    = 0;
-                        wineItem->rect.right= wineItem->rect.bottom = 0;
-                        wineItem->text.left = wineItem->text.top    = 0;
-                        wineItem->text.right= wineItem->text.bottom = 0;
-                }
-
-                /* look up next item */
-
-                if ((wineItem->firstChild) && (wineItem->state & TVIS_EXPANDED)) {
-                        iItem=(INT)wineItem->firstChild;
-                        indent++;
-                        x+=infoPtr->uIndent;
-                        if (x>infoPtr->uTotalWidth)
-                                infoPtr->uTotalWidth=x;
-                }
-                else {
-                        iItem=(INT)wineItem->sibling;
-                        while ((!iItem) && (indent>0)) {
-                                indent--;
-                                x-=infoPtr->uIndent;
-                                prevItem=wineItem;
-                                wineItem=&infoPtr->items[(INT)wineItem->parent];
-                                iItem=(INT)wineItem->sibling;
-                        }
-                }
-        y +=height;
-    }                           /* while */
-
-/* FIXME: infoPtr->uTotalWidth should also take item label into account */
-/* FIXME: or should query item sizes (ie check CDRF_NEWFONT) */
-
-    infoPtr->uTotalHeight=y;
-    if (y >= (view.bottom-view.top)) {
-                if (!(infoPtr->uInternalStatus & TV_VSCROLL))
-                        ShowScrollBar (hwnd, SB_VERT, TRUE);
-                infoPtr->uInternalStatus |=TV_VSCROLL;
-                SetScrollRange (hwnd, SB_VERT, 0,
-                                        y - infoPtr->uVisibleHeight, FALSE);
-                SetScrollPos (hwnd, SB_VERT, infoPtr->cy, TRUE);
+    //draw items
+
+    iItem = (INT)infoPtr->TopRootItem;
+    indent = 0;
+
+    while (iItem)
+    {
+      item = &infoPtr->items[iItem];
+      /* FIXME: should query item sizes (ie check CDRF_NEWFONT) */
+      if (item->visible)
+      {
+        if (updateRect && IntersectRect(NULL,&item->rect,updateRect)) TREEVIEW_DrawItem(hwnd,hdc,item);
+        visIndent = indent;
+      } else if (visIndent != -1)
+      {
+        //draw vertical connections
+
+        if (visIndent == 0) break;
+
+        if (indent < visIndent)
+        {
+//CB: todo
+          visIndent = indent;
         }
-    else {
-                if (infoPtr->uInternalStatus & TV_VSCROLL)
-                        ShowScrollBar (hwnd, SB_VERT, FALSE);
-                infoPtr->uInternalStatus &= ~TV_VSCROLL;
+      }
+      if ((item->firstChild) && (item->state & TVIS_EXPANDED))
+      {
+        iItem = (INT)item->firstChild;
+        indent++;
+      } else
+      {
+        iItem = (INT)item->sibling;
+        while ((!iItem) && (indent > 0))
+        {
+          item = &infoPtr->items[(INT)item->parent];
+          iItem = (INT)item->sibling;
+          indent--;
         }
-
-
-        if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
-        infoPtr->cdmode=TREEVIEW_SendCustomDrawNotify
-                                                                (hwnd, CDDS_POSTPAINT, hdc, rect);
-
-    //TRACE("done\n");
+      }
+    }
+
+    if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
+      infoPtr->cdmode = TREEVIEW_SendCustomDrawNotify(hwnd, CDDS_POSTPAINT, hdc, rect);
+}
+
+static LRESULT TREEVIEW_SetRedraw(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+
+  if (wParam)
+  {
+    if (!(infoPtr->uInternalStatus & TV_NOREDRAW)) return 0;
+    infoPtr->uInternalStatus &= ~TV_NOREDRAW;
+    TREEVIEW_CalcItems(hwnd,0,infoPtr);
+    TREEVIEW_Refresh(hwnd);
+  } else
+  {
+    infoPtr->uInternalStatus |= TV_NOREDRAW;
+  }
+
+  return 0;
 }
 
@@ -1179 +1282 @@
 
   switch (wParam) {
+        case TV_REFRESH_TIMER:
+                KillTimer (hwnd, TV_REFRESH_TIMER);
+                infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
+                TREEVIEW_CalcItems(hwnd,0,infoPtr);
+                TREEVIEW_Refresh(hwnd);
+                return 0;
+
         case TV_EDIT_TIMER:
                 KillTimer (hwnd, TV_EDIT_TIMER);
@@ -1189 +1299 @@
 
  return 1;
+}
+
+static void TREEVIEW_QueueRefresh(HWND hwnd)
+
+{
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+
+  if (infoPtr->Timer & TV_REFRESH_TIMER_SET)
+    KillTimer (hwnd, TV_REFRESH_TIMER);
+
+  if (infoPtr->uInternalStatus & TV_NOREDRAW)
+  {
+    infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
+
+    return;
+  }
+
+  SetTimer (hwnd, TV_REFRESH_TIMER, TV_REFRESH_DELAY, 0);
+  infoPtr->Timer |= TV_REFRESH_TIMER_SET;
+}
+
+static void TREEVIEW_UnqueueRefresh(HWND hwnd,BOOL calc,BOOL refresh)
+{
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+
+  if (infoPtr->Timer & TV_REFRESH_TIMER_SET)
+  {
+    KillTimer (hwnd, TV_REFRESH_TIMER);
+    infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
+    if (calc) TREEVIEW_CalcItems(hwnd,0,infoPtr);
+    if (refresh) TREEVIEW_Refresh(hwnd);
+  }
 }
 
@@ -1275 +1417 @@
         case TVGN_CARET:retval=(INT)infoPtr->selectedItem;
                                         break;
-        case TVGN_FIRSTVISIBLE: /* FIXME:we should only recalculate, not redraw */
-                                        //CB: todo: remove
-                                        TREEVIEW_Refresh(hwnd);
-                                        retval=(INT)infoPtr->firstVisible;
+        case TVGN_FIRSTVISIBLE:
+                                        TREEVIEW_UnqueueRefresh(hwnd,TRUE,TRUE);
+                                        retval = (INT)infoPtr->firstVisible;
                                         break;
         case TVGN_DROPHILITE:
@@ -1914 +2055 @@
   wineItem->expandBox.right  = 0;
   wineItem->expandBox.bottom = 0;
+  wineItem->calculated = FALSE;
 
    if (tvItem->mask & TVIF_IMAGE)
@@ -1935 +2077 @@
    }
 
-   //CB: todo: calc
-   TREEVIEW_Refresh(hwnd);
+   TREEVIEW_QueueRefresh(hwnd);
 
    return (LRESULT) iItem;
@@ -2012 +2153 @@
   }
 
-  //CB: todo: calc
-  TREEVIEW_Refresh(hwnd);
+  TREEVIEW_QueueRefresh(hwnd);
 
   return TRUE;
@@ -2184 +2324 @@
   if (wParam == SIZE_RESTORED)
   {
-    infoPtr->uTotalWidth  = LOWORD (lParam);
-        infoPtr->uTotalHeight = HIWORD (lParam);
-  } else {
-//      FIXME (treeview,"WM_SIZE flag %x %lx not handled\n", wParam, lParam);
-  }
-
-  //CB: todo: calc
-  TREEVIEW_Refresh(hwnd);
+    TREEVIEW_UnqueueRefresh(hwnd,FALSE,FALSE);
+    TREEVIEW_CalcItems(hwnd,0,infoPtr);
+    TREEVIEW_Refresh(hwnd);
+  }
+
   return 0;
 }
@@ -2199 +2336 @@
 TREEVIEW_StyleChanged (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  //TRACE("(%x %lx)\n",wParam,lParam);
-  //CB: todo: calc
-  TREEVIEW_Refresh (hwnd);
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+
+  //CB: todo: check styles
+  infoPtr->uInternalStatus |= TV_CALCALL;
+  TREEVIEW_QueueRefresh(hwnd);
 
   return 0;
@@ -2340 +2479 @@
    TREEVIEW_RemoveTree (hwnd);
    SetWindowLongA( hwnd, 0, (DWORD)NULL);
-
+   if (infoPtr->Timer & TV_REFRESH_TIMER_SET)
+     KillTimer (hwnd, TV_REFRESH_TIMER);
    if (infoPtr->hwndToolTip)
-                DestroyWindow (infoPtr->hwndToolTip);
+     DestroyWindow (infoPtr->hwndToolTip);
 
    COMCTL32_Free (infoPtr);
@@ -2678 +2818 @@
 
   if (wineItem->cChildren==I_CHILDRENCALLBACK) {
-//    FIXME (treeview,"we don't handle I_CHILDRENCALLBACK yet\n");
+    //FIXME (treeview,"we don't handle I_CHILDRENCALLBACK yet\n");
     return 0;
   }
@@ -2693 +2833 @@
   {
     case TVE_COLLAPSERESET:
-//      TRACE(treeview, "  case TVE_COLLAPSERESET\n");
       if (!wineItem->state & TVIS_EXPANDED)
         return 0;
@@ -2702 +2841 @@
 
     case TVE_COLLAPSE:
-//      TRACE(treeview, "  case TVE_COLLAPSE\n");
       if (!wineItem->state & TVIS_EXPANDED)
         return 0;
@@ -2710 +2848 @@
 
     case TVE_EXPAND:
-//      TRACE(treeview, "  case TVE_EXPAND\n");
       if (wineItem->state & TVIS_EXPANDED)
         return 0;
 
-//      TRACE(treeview, "  is not expanded...\n");
-
       if (!(wineItem->state & TVIS_EXPANDEDONCE))
       {
-//        TRACE(treeview, "  and has never been expanded...\n");
+        //TRACE(treeview, "  and has never been expanded...\n");
         wineItem->state |= TVIS_EXPANDED;
 
@@ -2729 +2864 @@
               (HTREEITEM)expand))
         {
-//          TRACE(treeview, "  TVN_ITEMEXPANDING returned TRUE, exiting...\n");
+          //TRACE(treeview, "  TVN_ITEMEXPANDING returned TRUE, exiting...\n");
           return FALSE;
         }
@@ -2744 +2879 @@
         if (! wineItem)
         {
-//          ERR(treeview,
-//            "Catastropic situation, cannot retreive item #%d\n",
-//            expand);
+          //ERR(treeview,
+          //  "Catastropic situation, cannot retreive item #%d\n",
+          //  expand);
           return FALSE;
         }
 
         wineItem->state |= TVIS_EXPANDEDONCE;
-//        TRACE(treeview, "  TVN_ITEMEXPANDING sent...\n");
+        //TRACE(treeview, "  TVN_ITEMEXPANDING sent...\n");
 
         TREEVIEW_SendTreeviewNotify (
@@ -2760 +2895 @@
           (HTREEITEM)expand);
 
-//        TRACE(treeview, "  TVN_ITEMEXPANDED sent...\n");
+        //TRACE(treeview, "  TVN_ITEMEXPANDED sent...\n");
 
       }
@@ -2771 +2906 @@
 
     case TVE_EXPANDPARTIAL:
-//      TRACE(treeview, "  case TVE_EXPANDPARTIAL\n");
-//      FIXME (treeview, "TVE_EXPANDPARTIAL not implemented\n");
+      //TRACE(treeview, "  case TVE_EXPANDPARTIAL\n");
+      //FIXME (treeview, "TVE_EXPANDPARTIAL not implemented\n");
       wineItem->state ^=TVIS_EXPANDED;
       wineItem->state |=TVIS_EXPANDEDONCE;
@@ -2778 +2913 @@
   }
 
-//  TRACE(treeview, "Exiting, Item %d state is now %d...\n",
-//    expand,
-//    wineItem->state);
-
-  //CB: todo: replace
+  //TRACE(treeview, "Exiting, Item %d state is now %d...\n",
+  //  expand,
+  //  wineItem->state);
+
+  //CB: todo: optimize!
+  TREEVIEW_UnqueueRefresh(hwnd,FALSE,FALSE);
+  TREEVIEW_CalcItems(hwnd,0,infoPtr);
   TREEVIEW_Refresh(hwnd);
+
   return TRUE;
 }
@@ -3225 +3363 @@
      */
     TREEVIEW_ITEM *parentItem = TREEVIEW_ValidItem (infoPtr, wineItem->parent);
-    if ( !(parentItem->state & TVIS_EXPANDED))
+
+    if (!(parentItem->state & TVIS_EXPANDED))
       TREEVIEW_Expand (hwnd, TVE_EXPAND, (LPARAM) wineItem->parent);
   }
@@ -3255 +3394 @@
       infoPtr->selectedItem=(HTREEITEM)newSelect;
 
+      TREEVIEW_UnqueueRefresh(hwnd,TRUE,TRUE);
       TREEVIEW_RefreshItem(hwnd,prevItem);
       TREEVIEW_RefreshItem(hwnd,wineItem);
@@ -3278 +3418 @@
         wineItem->state |=TVIS_DROPHILITED;
 
+      TREEVIEW_UnqueueRefresh(hwnd,TRUE,TRUE);
       TREEVIEW_RefreshItem(hwnd,prevItem);
       TREEVIEW_RefreshItem(hwnd,wineItem);
@@ -3317 +3458 @@
 
 {
- TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TEXTMETRICA tm;
- LOGFONTA logFont;
- HFONT hFont, hOldFont;
- INT height;
- HDC hdc;
-
-// TRACE (treeview,"%x %lx\n",wParam, lParam);
-
- infoPtr->hFont = (HFONT)wParam;
-
- hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
-
- GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
- logFont.lfWeight=FW_BOLD;
- infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
-
- hdc = GetDC (0);
- hOldFont = SelectObject (hdc, hFont);
- GetTextMetricsA (hdc, &tm);
- height= tm.tmHeight + tm.tmExternalLeading;
- if (height>infoPtr->uRealItemHeight)
-        infoPtr->uRealItemHeight=height;
- SelectObject (hdc, hOldFont);
- ReleaseDC (0, hdc);
-
- //CB: todo: calc
- if (lParam)
-        TREEVIEW_Refresh(hwnd);
-
- return 0;
-}
-
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+  TEXTMETRICA tm;
+  LOGFONTA logFont;
+  HFONT hFont, hOldFont;
+  INT height;
+  HDC hdc;
+
+  infoPtr->hFont = (HFONT)wParam;
+
+  hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
+
+  GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
+  logFont.lfWeight=FW_BOLD;
+  infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
+
+  hdc = GetDC (0);
+  hOldFont = SelectObject (hdc, hFont);
+  GetTextMetricsA (hdc, &tm);
+  height= tm.tmHeight + tm.tmExternalLeading;
+  if (height>infoPtr->uRealItemHeight)
+    infoPtr->uRealItemHeight=height;
+  SelectObject (hdc, hOldFont);
+  ReleaseDC (0, hdc);
+
+  if (lParam)
+  {
+    TREEVIEW_UnqueueRefresh(hwnd,FALSE,FALSE);
+    infoPtr->uInternalStatus |= TV_CALCALL;
+    TREEVIEW_CalcItems(hwnd,0,infoPtr);
+    TREEVIEW_Refresh(hwnd);
+  }
+
+  return 0;
+}
 
 
@@ -3394 +3536 @@
   }
 
+  TREEVIEW_CalcItems(hwnd,0,infoPtr);
   ScrollWindowEx(hwnd,0,lastPos-infoPtr->cy,NULL,NULL,0,NULL,SW_INVALIDATE);
 
@@ -3404 +3547 @@
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
   int maxWidth;
+  int lastPos = infoPtr->cx;
 
 //  TRACE (treeview,"wp %lx, lp %x\n", lParam, wParam);
@@ -3440 +3584 @@
   }
 
-  TREEVIEW_Refresh(hwnd);
-
-  //CB: todo: use ScrollWindowEx
+  TREEVIEW_CalcItems(hwnd,0,infoPtr);
+  ScrollWindowEx(hwnd,lastPos-infoPtr->cx,0,NULL,NULL,0,NULL,SW_INVALIDATE);
 
   return TRUE;
@@ -3642 +3785 @@
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
   UINT uOldScrollTime = infoPtr->uScrollTime;
+
   infoPtr->uScrollTime = min (uScrollTime, 100);
+
   return uOldScrollTime;
 }
@@ -3854 +3999 @@
 
 /*      case WM_SYSCOLORCHANGE: */
-/*      case WM_SETREDRAW: */
+
+        case WM_SETREDRAW:
+                return TREEVIEW_SetRedraw(hwnd,wParam,lParam);
 
         case WM_TIMER:
@@ -3893 +4040 @@
 
     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
-    wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;
+    wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS;
     wndClass.lpfnWndProc   = (WNDPROC)TREEVIEW_WindowProc;
     wndClass.cbClsExtra    = 0;