Erich Hoover : hhctrl.ocx: Support HTML Help having indented Index tab items.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4dc019a41fb1f02461412c6cf0e7e38b501fcc2a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4dc019a41fb1f02461412c6cf0...

Author: Erich Hoover <ehoover(a)mines.edu>
Date:   Sun Feb  7 10:08:18 2010 -0700

hhctrl.ocx: Support HTML Help having indented Index tab items.

---

 dlls/hhctrl.ocx/hhctrl.h |    1 +
 dlls/hhctrl.ocx/index.c  |   14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h
index d0c1545..adff42d 100644
--- a/dlls/hhctrl.ocx/hhctrl.h
+++ b/dlls/hhctrl.ocx/hhctrl.h
@@ -79,6 +79,7 @@ typedef struct IndexItem {
 
     int nItems;
     int itemFlags;
+    int indentLevel;
     IndexSubItem *items;
 } IndexItem;
 
diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c
index 52a414e..e9385c3 100644
--- a/dlls/hhctrl.ocx/index.c
+++ b/dlls/hhctrl.ocx/index.c
@@ -44,7 +44,8 @@ static void fill_index_tree(HWND hwnd, IndexItem *item)
         }
         memset(&lvi, 0, sizeof(lvi));
         lvi.iItem = index++;
-        lvi.mask = LVIF_TEXT|LVIF_PARAM;
+        lvi.mask = LVIF_TEXT|LVIF_PARAM|LVIF_INDENT;
+        lvi.iIndent = item->indentLevel;
         lvi.cchTextMax = strlenW(item->keyword)+1;
         lvi.pszText = item->keyword;
         lvi.lParam = (LPARAM)item;
@@ -205,11 +206,17 @@ static IndexItem *parse_li(HHInfo *info, stream_t *stream)
  * At this high-level stage we locate out each HTML list item tag.
  * Since there is no end-tag for the <LI> item, we must hope that
  * the <LI> entry is parsed correctly or tags might get lost.
+ *
+ * Within each entry it is also possible to encounter an additional
+ * <UL> tag.  When this occurs the tag indicates that the topics
+ * contained within it are related to the parent <LI> topic and
+ * should be inset by an indent.
  */
 static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item)
 {
     stream_t stream;
     strbuf_t node, node_name;
+    int indent_level = -1;
 
     strbuf_init(&node);
     strbuf_init(&node_name);
@@ -225,6 +232,11 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item)
             item->next = parse_li(info, &stream);
             item->next->merge = item->merge;
             item = item->next;
+            item->indentLevel = indent_level;
+        }else if(!strcasecmp(node_name.buf, "ul")) {
+            indent_level++;
+        }else if(!strcasecmp(node_name.buf, "/ul")) {
+            indent_level--;
         }else {
             WARN("Unhandled tag! %s\n", node_name.buf);
         }