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

Timestamp:

Feb 18, 2000, 6:13:39 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/comctl32/treeview.c

@@ -1 @@
-/* $Id: treeview.c,v 1.27 2000-02-17 17:26:51 cbratschi Exp $ */
+/* $Id: treeview.c,v 1.28 2000-02-18 17:13:39 cbratschi Exp $ */
 /* Treeview control
  *
@@ -34 +34 @@
 
  - bug in SetScrollInfo/ShowScrollBar: WM_SIZE and WM_NCPAINT problems (i.e. RegEdit)
- - WM_HSCROLL: some rects are wrong
  - TVS_FULLROWSELECT
  - TVS_SINGLEEXPAND
@@ -45 +44 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winnls.h"
 #include "commctrl.h"
 #include "comctl32.h"
@@ -79 +79 @@
 static BOOL    TREEVIEW_CalcItems(HWND hwnd,HDC hdc,TREEVIEW_INFO *infoPtr);
 static LRESULT TREEVIEW_EnsureVisible(HWND hwnd,HTREEITEM hItem);
+static VOID    TREEVIEW_ISearch(HWND hwnd,CHAR ch);
 
 static LRESULT CALLBACK TREEVIEW_Edit_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -578 +579 @@
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
 
-  //TRACE("\n");
   return (LRESULT) infoPtr->clrText;
 }
@@ -735 +735 @@
        * Get a dotted pen
        */
-#ifdef OS2LINEHACK //CB: workaround for Open32 PS_DOT bug
+#ifdef OS2LINEHACK
       TREEVIEW_Polyline(hdc,points,2,infoPtr->clrLine);
 #else
@@ -1316 +1316 @@
   BOOL ownDC = FALSE,changedLeftTop = FALSE;
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  INT maxCX,maxCY;
+  INT xDiff = 0,yDiff = 0;
 
   GetClientRect(hwnd,&rect);
@@ -1407 +1409 @@
   infoPtr->uTotalHeight = y;
 
-  if (item && item->visible)
-  {
-    INT xDiff = 0,yDiff = 0;
-
-    //check cx and cy
-#if 0  //CB: next step
-    if ((infoPtr->cy > 0) && (item->rect.bottom < infoPtr->uVisibleHeight))
-    {
-      INT oldCY = infoPtr->cy;
-
-      infoPtr->cy = infoPtr->uTotalHeight-infoPtr->uVisibleHeight;
-      if (infoPtr->cy < 0) infoPtr->cy = 0;
-      yDiff = infoPtr->cy-oldCY;
-    }
-
-    changedLeftTop = xDiff || yDiff;
-    if (changedLeftTop)
-    {
-      iItem = (INT)infoPtr->TopRootItem;
-      item = NULL;
-      indent = 0;
-MessageBeep(MB_OK);
-      while (iItem)
-      {
-        item = &infoPtr->items[iItem];
-        OffsetRect(&item->rect,xDiff,yDiff);
-        OffsetRect(&item->text,xDiff,yDiff);
-        OffsetRect(&item->expandBox,xDiff,yDiff);
-        OffsetRect(&item->bitmap,xDiff,yDiff);
-        OffsetRect(&item->statebitmap,xDiff,yDiff);
-
-
-        if ((item->firstChild) && (item->state & TVIS_EXPANDED))
+  //check cx and cy
+  maxCY = infoPtr->uTotalHeight-infoPtr->uVisibleHeight;
+  if (maxCY < 0) maxCY = 0;
+  if (infoPtr->cy > maxCY)
+  {
+    yDiff = maxCY-infoPtr->cy;
+    infoPtr->cy = maxCY;
+  }
+
+  maxCX = infoPtr->uTotalWidth-infoPtr->uVisibleWidth;
+  if (maxCX < 0) maxCX = 0;
+  if (infoPtr->cx > maxCX)
+  {
+    xDiff = maxCX-infoPtr->cx;
+    infoPtr->cx = maxCX;
+  }
+
+  changedLeftTop = xDiff || yDiff;
+  if (changedLeftTop)
+  {
+    iItem = (INT)infoPtr->TopRootItem;
+    item = NULL;
+    indent = 0;
+
+    while (iItem)
+    {
+      item = &infoPtr->items[iItem];
+      OffsetRect(&item->rect,xDiff,yDiff);
+      OffsetRect(&item->text,xDiff,yDiff);
+      OffsetRect(&item->expandBox,xDiff,yDiff);
+      OffsetRect(&item->bitmap,xDiff,yDiff);
+      OffsetRect(&item->statebitmap,xDiff,yDiff);
+
+      if ((item->firstChild) && (item->state & TVIS_EXPANDED))
+      {
+        iItem = (INT)item->firstChild;
+        indent++;
+      } else
+      {
+        iItem = (INT)item->sibling;
+        while ((!iItem) && (indent > 0))
         {
-          iItem = (INT)item->firstChild;
-          indent++;
-        } else
-        {
+          indent--;
+          item = &infoPtr->items[(INT)item->parent];
           iItem = (INT)item->sibling;
-          while ((!iItem) && (indent > 0))
-          {
-            indent--;
-            item = &infoPtr->items[(INT)item->parent];
-            iItem = (INT)item->sibling;
-          }
         }
-      } /* while */
-    }
-#endif
-  }
-
-  if (!(dwStyle & TVS_NOSCROLL))
+      }
+    } /* while */
+  }
+
+  if (!(dwStyle & TVS_NOSCROLL) && (infoPtr->uVisibleHeight > 0) && (infoPtr->uVisibleWidth > 0))
   {
     if (infoPtr->uTotalHeight > infoPtr->uVisibleHeight)
@@ -1598 +1599 @@
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
 
-//  TRACE (treeview, " %d\n",wParam);
-
-  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);
-                infoPtr->Timer &= ~TV_EDIT_TIMER_SET;
-                if (infoPtr->editItem)
-                   TREEVIEW_EditLabel(hwnd,infoPtr->editItem,TRUE);
-                return 0;
-        default:
-//              ERR (treeview,"got unknown timer\n");
-                break;
+  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);
+      infoPtr->Timer &= ~TV_EDIT_TIMER_SET;
+      if (infoPtr->editItem)
+        TREEVIEW_EditLabel(hwnd,infoPtr->editItem,TRUE);
+      return 0;
+
+    case TV_ISEARCH_TIMER:
+      KillTimer(hwnd,TV_ISEARCH_TIMER);
+      infoPtr->Timer &= ~TV_ISEARCH_TIMER_SET;
+      return 0;
  }
 
@@ -2627 +2629 @@
 }
 
-static LRESULT
-TREEVIEW_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
+static LRESULT TREEVIEW_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -2635 +2636 @@
   {
     if (TREEVIEW_CalcItems(hwnd,0,infoPtr))
+#if 1 //CB: synchron update conflicts with Odin32 implementation -> check and fix
+      TREEVIEW_QueueRefresh(hwnd);
+#else
       TREEVIEW_Refresh(hwnd); //because size redraw isn't set
+#endif
   }
 
@@ -2648 +2653 @@
   if (infoPtr->hwndEdit) SetFocus(hwnd);
 
-  //CB: todo: check styles
   infoPtr->uInternalStatus |= TV_CALCALL;
   TREEVIEW_QueueRefresh(hwnd);
@@ -2666 +2670 @@
 TREEVIEW_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
+  LPCREATESTRUCTA lpcs = (LPCREATESTRUCTA)lParam;
   TREEVIEW_INFO *infoPtr;
   DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
@@ -2686 +2691 @@
   infoPtr->uInternalStatus = 0;
   if (IsWindowUnicode(hwnd)) infoPtr->uInternalStatus |= TV_UNICODE;
-  infoPtr->uNumItems=0;
+  infoPtr->uNumItems = 0;
   infoPtr->clrBk   = GetSysColor (COLOR_WINDOW);
   infoPtr->clrLine = GetSysColor (COLOR_WINDOWTEXT);
@@ -2696 +2701 @@
   infoPtr->himlState = NULL;
   infoPtr->uItemHeight = -1;
+  infoPtr->uRealItemHeight = 0;
+  infoPtr->uVisibleHeight = lpcs->cy;
+  infoPtr->uTotalHeight = 0;
+  infoPtr->uVisibleWidth = lpcs->cx;
+  infoPtr->uTotalWidth = 0;
+
   GetTextMetricsA (hdc, &tm);
   infoPtr->hFont = GetStockObject (DEFAULT_GUI_FONT);
   GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
-  logFont.lfWeight=FW_BOLD;
+  logFont.lfWeight = FW_BOLD;
   infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
 
   infoPtr->items = NULL;
   infoPtr->selectedItem = 0;
-  infoPtr->clrText=-1;        /* use system color */
-  infoPtr->dropItem=0;
-  infoPtr->insertMarkItem=0;
-  infoPtr->insertBeforeorAfter=0;
-  infoPtr->pCallBackSort=NULL;
+  infoPtr->clrText = -1;        /* use system color */
+  infoPtr->dropItem = 0;
+  infoPtr->insertMarkItem = 0;
+  infoPtr->insertBeforeorAfter = 0;
+  infoPtr->pCallBackSort = NULL;
   infoPtr->uScrollTime = 300;  /* milliseconds */
   infoPtr->hwndEdit = 0;
-
-  infoPtr->hwndToolTip=0;
+  infoPtr->pszISearch = NULL;
+  infoPtr->uISearchLen = 0;
+
+  infoPtr->hwndToolTip = 0;
   if (!(dwStyle & TVS_NOTOOLTIPS))
   {
@@ -2755 +2768 @@
     infoPtr->himlState = ImageList_Create (16, 16,ILC_COLOR | ILC_MASK, 15, 1);
 
-    //CB: MSDN docu says: uses DrawFrameControl
+    //MSDN docu says: uses DrawFrameControl but never believe what they write
     hbmLoad = LoadBitmapA (COMCTL32_hModule, MAKEINTRESOURCEA(IDT_CHECK));
     nIndex = ImageList_AddMasked (infoPtr->himlState, hbmLoad, CLR_DEFAULT);
@@ -2769 +2782 @@
 {
    TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-
-//   TRACE (treeview,"\n");
 
    TREEVIEW_RemoveTree (hwnd);
@@ -2783 +2794 @@
 
    DeleteObject(infoPtr->hBoldFont);
+   COMCTL32_Free(infoPtr->pszISearch);
    COMCTL32_Free (infoPtr);
 
@@ -3281 +3293 @@
   TREEVIEW_ITEM *wineItem;
   RECT rect;
-  UINT status,x,y;
+  UINT status;
+  INT x,y;
 
   if (!lpht) return 0;
@@ -3669 +3682 @@
      goto setfocus;
 
-//CB: todo: check ht.flags for WM_HSCROLL!
-
   /*
    * If the style allow editing and the node is already selected
@@ -3959 +3970 @@
 
   GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
-  logFont.lfWeight=FW_BOLD;
+  logFont.lfWeight = FW_BOLD;
   DeleteObject(infoPtr->hBoldFont);
   infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
 
-  hdc = GetDC (0);
+  hdc = GetDC(hwnd);
   hOldFont = SelectObject (hdc, hFont);
   GetTextMetricsA (hdc, &tm);
   height= tm.tmHeight + tm.tmExternalLeading;
-  if (height>infoPtr->uRealItemHeight)
-    infoPtr->uRealItemHeight=height;
+  if (height > infoPtr->uRealItemHeight)
+    infoPtr->uRealItemHeight = height;
   SelectObject (hdc, hOldFont);
-  ReleaseDC (0, hdc);
+  ReleaseDC(hwnd,hdc);
 
   if (lParam)
@@ -3978 +3989 @@
     TREEVIEW_CalcItems(hwnd,0,infoPtr);
     TREEVIEW_Refresh(hwnd);
-  }
+  } else infoPtr->uInternalStatus |= TV_CALCALL;
 
   return 0;
@@ -4165 +4176 @@
   if (control)
   {
-    DWORD scrollMsg = 0;
+    INT scrollMsg = -1;
     BOOL horz = FALSE;
 
@@ -4171 +4182 @@
     {
       case VK_UP:
-//CB: todo: VK_UP doesn't work
         scrollMsg = SB_LINELEFT;
         break;
@@ -4197 +4207 @@
         break;
     }
-    if (scrollMsg)
+    if (scrollMsg != -1)
     {
       SendMessageA(hwnd,horz ? WM_HSCROLL:WM_VSCROLL,MAKELONG(scrollMsg,0),0);
@@ -4315 +4325 @@
     default:
       break;
- }
+  }
 
   if (hNewSelection)
@@ -4330 +4340 @@
 
   return FALSE;
+}
+
+static LRESULT TREEVIEW_Char(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  CHAR ch = (CHAR)wParam;
+
+  TREEVIEW_ISearch(hwnd,ch);
+
+  return 0;
 }
 
@@ -4393 +4412 @@
 }
 
-static LRESULT TREEVIEW_GetISearchString(HWND hwnd,LPSTR lpsz,BOOL unicode)
-{
-  //CB: todo: MSDN documentation is useless
-
-  return 0;
+static BOOL TREEVIEW_Compare(HWND hwnd,TREEVIEW_ITEM *item,LPWSTR text,INT textlen)
+{
+  if (item->pszText == LPSTR_TEXTCALLBACKW)
+    TREEVIEW_SendDispInfoNotify(hwnd,item,TVN_GETDISPINFO,TVIF_TEXT);
+  if (item->pszText == LPSTR_TEXTCALLBACKW) return FALSE;
+
+  //simulate lstrcmpniW
+  return CompareStringW(LOCALE_SYSTEM_DEFAULT,NORM_IGNORECASE,item->pszText,MIN(lstrlenW(item->pszText),textlen),text,textlen) == 2;
+}
+
+static TREEVIEW_ITEM* TREEVIEW_SearchChildren(HWND hwnd,TREEVIEW_INFO *infoPtr,TREEVIEW_ITEM *item,TREEVIEW_ITEM *stop,LPWSTR text,INT textlen)
+{
+  TREEVIEW_ITEM *child,*child2;
+
+  if (!(item->firstChild && (item->state & TVIS_EXPANDED))) return NULL;
+
+  child = &infoPtr->items[(INT)item->firstChild];
+  while (child)
+  {
+    if (child == stop) return NULL;
+    if (TREEVIEW_Compare(hwnd,child,text,textlen)) return child;
+    child2 = TREEVIEW_SearchChildren(hwnd,infoPtr,child,stop,text,textlen);
+    if (child2) return child2;
+    if (child->sibling) child = &infoPtr->items[(INT)child->sibling];
+    else return NULL;
+  }
+
+  return NULL;
+}
+
+static TREEVIEW_ITEM* TREEVIEW_Search(HWND hwnd,TREEVIEW_INFO *infoPtr,INT iItem,LPWSTR text,INT textlen)
+{
+  TREEVIEW_ITEM *item,*start;
+  BOOL found = FALSE;
+
+  item = start = &infoPtr->items[iItem];
+
+  if (TREEVIEW_Compare(hwnd,item,text,textlen)) found = TRUE; else
+  {
+    //search start to end
+    while (item->sibling || item->parent)
+    {
+      TREEVIEW_ITEM *child = TREEVIEW_SearchChildren(hwnd,infoPtr,item,NULL,text,textlen);
+
+      if (child)
+      {
+        found = TRUE;
+        item = child;
+        break;
+      }
+
+      item = TREEVIEW_GetNextListItem(hwnd,infoPtr,item);
+      if (item && TREEVIEW_Compare(hwnd,item,text,textlen))
+      {
+        found = TRUE;
+        break;
+      }
+    }
+    if (!found)
+    {
+      iItem = (INT)infoPtr->TopRootItem;
+      item = &infoPtr->items[iItem];
+      //search first to start
+      while (item != start)
+      {
+        TREEVIEW_ITEM *child;
+
+        if (TREEVIEW_Compare(hwnd,item,text,textlen))
+        {
+          found = TRUE;
+          break;
+        }
+        child = TREEVIEW_SearchChildren(hwnd,infoPtr,item,start,text,textlen);
+
+        if (child)
+        {
+          found = TRUE;
+          item = child;
+          break;
+        }
+        if (item->sibling) item = &infoPtr->items[(INT)item->sibling];
+        else break;
+      }
+    }
+  }
+
+  return found ? item:NULL;
+}
+
+static VOID TREEVIEW_ISearch(HWND hwnd,CHAR ch)
+{
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+  LPWSTR newString;
+  INT len,iItem;
+  CHAR ch2[2];
+  TREEVIEW_ITEM *item;
+
+  //check timer
+  if (infoPtr->Timer & TV_ISEARCH_TIMER_SET)
+  {
+    KillTimer(hwnd,TV_ISEARCH_TIMER);
+    infoPtr->Timer &= ~TV_ISEARCH_TIMER_SET;
+  } else if (infoPtr->uISearchLen > 0)
+  {
+    COMCTL32_Free(infoPtr->pszISearch);
+    infoPtr->pszISearch = NULL;
+    infoPtr->uISearchLen = 0;
+  }
+
+  //prepare new search string
+  len = infoPtr->uISearchLen+1;
+  newString = COMCTL32_Alloc((len+1)*sizeof(WCHAR));
+
+  if (infoPtr->uISearchLen > 0) lstrcpyW(newString,infoPtr->pszISearch);
+
+  ch2[0] = ch;
+  ch2[1] = 0;
+  lstrcpyAtoW((LPWSTR)&newString[len-1],(LPSTR)&ch2);
+
+  //search
+
+  iItem = infoPtr->selectedItem ? (INT)infoPtr->selectedItem:(INT)infoPtr->TopRootItem;
+  item = TREEVIEW_Search(hwnd,infoPtr,iItem,newString,len);
+  if (!item && infoPtr->pszISearch)
+  {
+    TREEVIEW_ITEM *next;
+//CB: todo: must press key twice to go to the next item
+    item = &infoPtr->items[iItem];
+    next = TREEVIEW_GetNextListItem(hwnd,infoPtr,item);
+    if (!next) next = &infoPtr->items[(INT)infoPtr->TopRootItem];
+    if (next && (next != item))
+    {
+      next = TREEVIEW_Search(hwnd,infoPtr,(INT)next->hItem,infoPtr->pszISearch,infoPtr->uISearchLen);
+      if (next)
+        TREEVIEW_SelectItem(hwnd,(WPARAM)TVGN_CARET,(LPARAM)next->hItem);
+    }
+    COMCTL32_Free(newString);
+    return;
+  }
+
+  //done
+  if (item)
+  {
+    COMCTL32_Free(infoPtr->pszISearch);
+    infoPtr->pszISearch = newString;
+    infoPtr->uISearchLen = len;
+    TREEVIEW_SelectItem(hwnd,(WPARAM)TVGN_CARET,(LPARAM)item->hItem);
+    SetTimer(hwnd,TV_ISEARCH_TIMER,TV_ISEARCH_DELAY,0);
+    infoPtr->Timer |= TV_ISEARCH_TIMER_SET;
+  } else
+  {
+    COMCTL32_Free(newString);
+    MessageBeep(0xFFFFFFFF);
+  }
+}
+
+static LRESULT TREEVIEW_GetISearchString(HWND hwnd,LPWSTR lpsz,BOOL unicode)
+{
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+
+  if (infoPtr->uISearchLen == 0) return 0;
+
+  if (unicode)
+    lstrcpyW(lpsz,infoPtr->pszISearch);
+  else
+    lstrcpyWtoA((LPSTR)lpsz,infoPtr->pszISearch);
+
+  return infoPtr->uISearchLen;
 }
 
@@ -4430 +4612 @@
 TREEVIEW_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-   if (uMsg==WM_CREATE)
-                return TREEVIEW_Create (hwnd, wParam, lParam);
+   if (uMsg == WM_CREATE)
+     return TREEVIEW_Create (hwnd, wParam, lParam);
 
    if (!TREEVIEW_GetInfoPtr(hwnd))
-       return DefWindowProcA (hwnd, uMsg, wParam, lParam);
-
-    switch (uMsg) {
+     return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+
+    switch (uMsg)
+    {
         case TVM_INSERTITEMA:
           return TREEVIEW_InsertItem(hwnd,wParam,lParam,FALSE);
@@ -4517 +4700 @@
 
         case TVM_GETISEARCHSTRINGA:
-                return TREEVIEW_GetISearchString(hwnd,(LPSTR)lParam,FALSE);
+                return TREEVIEW_GetISearchString(hwnd,(LPWSTR)lParam,FALSE);
 
         case TVM_GETISEARCHSTRINGW:
-                return TREEVIEW_GetISearchString(hwnd,(LPSTR)lParam,TRUE);
+                return TREEVIEW_GetISearchString(hwnd,(LPWSTR)lParam,TRUE);
 
         case TVM_GETTOOLTIPS:
@@ -4602 +4785 @@
         case WM_KEYDOWN:
                 return TREEVIEW_KeyDown (hwnd, wParam, lParam);
+
+        case WM_CHAR:
+                return TREEVIEW_Char(hwnd,wParam,lParam);
 
         case WM_SETFOCUS: