Ticket #11007: patch-v4.patch

new file src/preferences/shortcuts/EditWindow.cpp

@@ +1 @@
+/*
+ * Copyright 2015 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *      Josef Gajdusek
+ */
+
+
+#include "EditWindow.h"
+
+#include <math.h>
+
+#include <Button.h>
+#include <LayoutBuilder.h>
+#include <TextControl.h>
+#include <String.h>
+#include <StringView.h>
+
+#include "ShortcutsWindow.h"
+
+
+EditWindow::EditWindow(const char* placeholder, uint32 flags)
+    :
+    BWindow(BRect(0, 0, 0, 0), "", B_MODAL_WINDOW, flags)
+{
+    fTextControl = new BTextControl("", placeholder, NULL);
+
+    BButton* okButton = new BButton("Ok", new BMessage(B_CONTROL_MODIFIED));
+    okButton->SetExplicitAlignment(BAlignment(B_ALIGN_RIGHT, B_ALIGN_TOP));
+    SetDefaultButton(okButton);
+
+    BLayoutBuilder::Group<>(this, B_VERTICAL)
+        .SetInsets(B_USE_WINDOW_INSETS)
+        .Add(fTextControl)
+        .Add(okButton);
+}
+
+
+void
+EditWindow::MessageReceived(BMessage* message)
+{
+    switch (message->what) {
+        case B_CONTROL_MODIFIED:
+            delete_sem(fSem);
+            break;
+        default:
+            BWindow::MessageReceived(message);
+            break;
+    }
+}
+
+
+BString
+EditWindow::Go()
+{
+    fSem = create_sem(0, "EditSem");
+    if (fSem < B_OK) {
+        Quit();
+        return "";
+    }
+
+    BSize psize = GetLayout()->PreferredSize();
+    ResizeTo(max_c(be_plain_font->StringWidth(fTextControl->Text()) * 1.5,
+                psize.Width()),
+        psize.Height());
+    Show();
+    CenterOnScreen();
+
+    acquire_sem(fSem);
+    if (Lock())
+        Quit();
+    return fTextControl->Text();
+}

new file src/preferences/shortcuts/EditWindow.h

@@ +1 @@
+/*
+ * Copyright 2015 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *      Josef Gajdusek
+ */
+
+#ifndef EDITWINDOW_H
+#define EDITWINDOW_H
+
+#include <Window.h>
+
+class BTextControl;
+
+class EditWindow : public BWindow {
+public:
+                        EditWindow(const char* placeholder, uint32 flags);
+
+        void            MessageReceived(BMessage* message);
+        BString         Go();
+
+private:
+    sem_id              fSem;
+    BTextControl*       fTextControl;
+};
+
+#endif  // EDITWINDOW_H

src/preferences/shortcuts/Jamfile

@@ -1 +1 @@
 SubDir HAIKU_TOP src preferences shortcuts ;
 
+UsePrivateHeaders interface ;
+
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src preferences shortcuts clv ] ;
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons input_server filters shortcut_catcher ] ;
 
@@ -7 +9 @@
     main.cpp
     MetaKeyStateMap.cpp
     ShortcutsApp.cpp
-    ShortcutsSpec.cpp
     ShortcutsWindow.cpp
+    ShortcutsSpec.cpp
+    PopUpColumn.cpp
+    EditWindow.cpp
 
-#   clv files
-    CLVColumn.cpp
-    CLVColumnLabelView.cpp
-    CLVListItem.cpp
-    ColumnListView.cpp
-    MouseWatcher.cpp
-    PrefilledBitmap.cpp
-    ScrollViewCorner.cpp
-    
-    : be localestub tracker libshortcuts_shared.a [ TargetLibstdc++ ]
+    : be localestub tracker libshortcuts_shared.a libcolumnlistview.a [ TargetLibstdc++ ]
     : Shortcuts.rdef
 ;
 

new file src/preferences/shortcuts/PopUpColumn.cpp

@@ +1 @@
+/*
+ * Copyright 2015 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *      Josef Gajdusek
+ */
+
+
+#include "PopUpColumn.h"
+
+#include <PopUpMenu.h>
+#include <MenuItem.h>
+#include <Window.h>
+
+#include "EditWindow.h"
+#include "ShortcutsWindow.h"
+
+PopUpColumn::PopUpColumn(BPopUpMenu* menu, const char* name, float width,
+    float minWidth, float maxWidth, uint32 truncate, bool editable,
+    bool cycle, int cycleInit, alignment align)
+    :
+    BStringColumn(name, width, minWidth, maxWidth, truncate, align),
+    fEditable(editable),
+    fCycle(cycle),
+    fCycleInit(cycleInit),
+    fMenu(menu)
+{
+    SetWantsEvents(true);
+}
+
+
+PopUpColumn::~PopUpColumn()
+{
+    delete fMenu;
+}
+
+void
+PopUpColumn::MouseDown(BColumnListView* parent, BRow* row, BField* field,
+    BRect fieldRect, BPoint point, uint32 buttons)
+{
+    if ((buttons & B_SECONDARY_MOUSE_BUTTON)
+        || (buttons & B_PRIMARY_MOUSE_BUTTON && (fEditable || fCycle))) {
+        BMessage* msg = new BMessage(ShortcutsWindow::HOTKEY_ITEM_MODIFIED);
+        msg->SetInt32("row", parent->IndexOf(row));
+        msg->SetInt32("column", LogicalFieldNum());
+        if (buttons & B_SECONDARY_MOUSE_BUTTON) {
+            BMenuItem* selected = fMenu->Go(parent->ConvertToScreen(point));
+            if (selected) {
+                msg->SetString("text", selected->Label());
+                parent->Window()->PostMessage(msg);
+            }
+        }
+        if (buttons & B_PRIMARY_MOUSE_BUTTON && row->IsSelected()) {
+            BStringField* stringField = static_cast<BStringField*>(field);
+            if (fEditable) {
+                EditWindow* edit = new EditWindow(stringField->String(), 0);
+                msg->SetString("text", edit->Go());
+            } else if (fCycle) {
+                BMenuItem* item;
+                for (int i = 0; (item = fMenu->ItemAt(i)) != NULL; i++)
+                    if (strcmp(stringField->String(), item->Label()) == 0) {
+                        item = fMenu->ItemAt((i + 1) % fMenu->CountItems());
+                        break;
+                    }
+                if (item == NULL)
+                    item = fMenu->ItemAt(fCycleInit);
+                msg->SetString("text", item->Label());
+            }
+            parent->Window()->PostMessage(msg);
+        }
+    }
+    BStringColumn::MouseDown(parent, row, field, fieldRect, point, buttons);
+}
+

new file src/preferences/shortcuts/PopUpColumn.h

@@ +1 @@
+/*
+ * Copyright 2015 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *      Josef Gajdusek
+ */
+#ifndef POPUPCOLUMN_H
+#define POPUPCOLUMN_H
+
+#include <ColumnTypes.h>
+
+class BPopUpMenu;
+
+class PopUpColumn : public BStringColumn {
+public:
+                        PopUpColumn(BPopUpMenu* menu, const char* name,
+                                float width, float minWidth, float maxWidth,
+                                uint32 truncate, bool editable = false,
+                                bool cycle = false, int cycleInit = 0,
+                                alignment align = B_ALIGN_LEFT);
+    virtual             ~PopUpColumn();
+
+            void        MouseDown(BColumnListView* parent, BRow* row,
+                            BField* field, BRect fieldRect, BPoint point,
+                            uint32 buttons);
+
+private:
+            bool        fEditable;
+            bool        fCycle;
+            int         fCycleInit;
+            BPopUpMenu* fMenu;
+};
+
+#endif  // POPUPCOLUMN_H

src/preferences/shortcuts/ShortcutsSpec.cpp

@@ -14 +14 @@
 
 #include <Beep.h>
 #include <Catalog.h>
+#include <ColumnTypes.h>
 #include <Directory.h>
 #include <Locale.h>
 #include <NodeInfo.h>
@@ -24 +25 @@
 #include "ColumnListView.h"
 
 #include "BitFieldTesters.h"
-#include "Colors.h"
 #include "CommandActuators.h"
+#include "KeyInfos.h"
 #include "MetaKeyStateMap.h"
 #include "ParseCommandLine.h"
 
@@ -42 +43 @@
 static bool sFontCached = false;
 static BFont sViewFont;
 static float sFontHeight;
-static BBitmap* sActuatorBitmaps[2];
 
 const char* ShortcutsSpec::sShiftName;
 const char* ShortcutsSpec::sControlName;
@@ -99 +99 @@
 }
 
 
-static BBitmap*
-MakeActuatorBitmap(bool lit)
-{
-    BBitmap* map = new BBitmap(ICON_BITMAP_RECT, ICON_BITMAP_SPACE, true);
-    const rgb_color yellow = {255, 255, 0};
-    const rgb_color red = {200, 200, 200};
-    const rgb_color black = {0, 0, 0};
-    const BPoint points[10] = {
-        BPoint(8, 0), BPoint(9.8, 5.8), BPoint(16, 5.8),
-        BPoint(11, 9.0), BPoint(13, 16), BPoint(8, 11),
-        BPoint(3, 16), BPoint(5, 9.0), BPoint(0, 5.8),
-        BPoint(6.2, 5.8) };
-
-    BView* view = new BView(BRect(0, 0, 16, 16), NULL, B_FOLLOW_ALL_SIDES, 0L);
-    map->AddChild(view);
-    map->Lock();
-    view->SetHighColor(B_TRANSPARENT_32_BIT);
-    view->FillRect(ICON_BITMAP_RECT);
-    view->SetHighColor(lit ? yellow : red);
-    view->FillPolygon(points, 10);
-    view->SetHighColor(black);
-    view->StrokePolygon(points, 10);
-    map->Unlock();
-    map->RemoveChild(view);
-    delete view;
-    return map;
-}
-
-
 /*static*/ void
 ShortcutsSpec::InitializeMetaMaps()
 {
@@ -149 +120 @@
 
     SetupStandardMap(sMetaMaps[ShortcutsSpec::OPTION_COLUMN_INDEX], sOptionName
         , B_OPTION_KEY, B_LEFT_OPTION_KEY, B_RIGHT_OPTION_KEY);
-
-    sActuatorBitmaps[0] = MakeActuatorBitmap(false);
-    sActuatorBitmaps[1] = MakeActuatorBitmap(true);
 }
 
 
 ShortcutsSpec::ShortcutsSpec(const char* cmd)
     :
-    CLVListItem(0, false, false, _height),
+    BRow(),
     fCommand(NULL),
-    fTextOffset(0),
     fBitmap(ICON_BITMAP_RECT, ICON_BITMAP_SPACE),
     fLastBitmapName(NULL),
     fBitmapValid(false),
@@ -174 +141 @@
 
 ShortcutsSpec::ShortcutsSpec(const ShortcutsSpec& from)
     :
-    CLVListItem(0, false, false, _height),
+    BRow(),
     fCommand(NULL),
-    fTextOffset(from.fTextOffset),
     fBitmap(ICON_BITMAP_RECT, ICON_BITMAP_SPACE),
     fLastBitmapName(NULL),
     fBitmapValid(false),
@@ -188 +154 @@
 
     SetCommand(from.fCommand);
     SetSelectedColumn(from.GetSelectedColumn());
+
+    for (int i = 0; i < from.CountFields(); i++)
+        SetField(new BStringField(
+                    static_cast<const BStringField*>(from.GetField(i))->String()), i);
 }
 
 
 ShortcutsSpec::ShortcutsSpec(BMessage* from)
     :
-    CLVListItem(0, false, false, _height),
+    BRow(),
     fCommand(NULL),
-    fTextOffset(0),
     fBitmap(ICON_BITMAP_RECT, ICON_BITMAP_SPACE),
     fLastBitmapName(NULL),
     fBitmapValid(false),
@@ -221 +190 @@
             printf(CLASS);
             printf(" Error, no modifiers int32 in archive BMessage!\n");
         }
+
+    const char* string;
+    for (int i = 0; (string = from->GetString("strings", i, NULL)); i++)
+        SetField(new BStringField(string), i);
 }
 
 
@@ -233 +206 @@
     fCommandNul = fCommandLen - 1;
     fCommand = new char[fCommandLen];
     strcpy(fCommand, command);
-    _UpdateIconBitmap();
+    SetField(new BStringField(command), STRING_COLUMN_INDEX);
 }
 
 
@@ -253 +226 @@
 
     into->AddString("class", "ShortcutsSpec");
 
+    for (int i = 0; i < CountFields(); i++) {
+        const BStringField* field =
+            static_cast<const BStringField*>(GetField(i));
+        into->AddString("strings", field->String());
+    }
+
     // These fields are for our prefs panel's benefit only
     into->AddString("command", fCommand);
     into->AddInt32("key", fKey);
@@ -281 +260 @@
     delete act;
 
     into->AddMessage("act", &actMsg);
-    return ret;
-}
-
 
-static bool IsValidActuatorName(const char* c);
-static bool
-IsValidActuatorName(const char* c)
-{
-    return (strcmp(c, B_TRANSLATE("InsertString")) == 0
-        || strcmp(c, B_TRANSLATE("MoveMouse")) == 0
-        || strcmp(c, B_TRANSLATE("MoveMouseTo")) == 0
-        || strcmp(c, B_TRANSLATE("MouseButton")) == 0
-        || strcmp(c, B_TRANSLATE("LaunchHandler")) == 0
-        || strcmp(c, B_TRANSLATE("Multi")) == 0
-        || strcmp(c, B_TRANSLATE("MouseDown")) == 0
-        || strcmp(c, B_TRANSLATE("MouseUp")) == 0
-        || strcmp(c, B_TRANSLATE("SendMessage")) == 0
-        || strcmp(c, B_TRANSLATE("Beep")) == 0);
+    return ret;
 }
 
 
@@ -339 +302 @@
 }
 
 
-void
-ShortcutsSpec::DrawItemColumn(BView* owner, BRect item_column_rect,
-    int32 column_index, bool columnSelected, bool complete)
-{
-    const float STRING_COLUMN_LEFT_MARGIN = 25.0f;
-        // 16 for the icon, +9 empty
-
-    rgb_color color;
-    bool selected = IsSelected();
-    if (selected)
-        color = columnSelected ? BeBackgroundGrey : BeListSelectGrey;
-    else
-        color = BeInactiveControlGrey;
-    owner->SetLowColor(color);
-    owner->SetDrawingMode(B_OP_COPY);
-    owner->SetHighColor(color);
-    owner->FillRect(item_column_rect);
-
-    const char* text = GetCellText(column_index);
-
-    if (text == NULL)
-        return;
-
-    _CacheViewFont(owner);
-        // Ensure that sViewFont is configured before using it to calculate
-        // widths.  The lack of this call was causing the initial display of
-        // columns to be incorrect, with a "jump" as all the columns correct
-        // themselves upon the first column resize.
-
-    float textWidth = sViewFont.StringWidth(text);
-    BPoint point;
-    rgb_color lowColor = color;
-
-    if (column_index == STRING_COLUMN_INDEX) {
-        // left justified
-        point.Set(item_column_rect.left + STRING_COLUMN_LEFT_MARGIN,
-            item_column_rect.top + fTextOffset);
-
-        item_column_rect.left = point.x;
-            // keep text from drawing into icon area
-
-        // scroll if too wide
-        float rectWidth = item_column_rect.Width() - STRING_COLUMN_LEFT_MARGIN;
-        float extra = textWidth - rectWidth;
-        if (extra > 0.0f)
-            point.x -= extra;
-    } else {
-        if ((column_index < NUM_META_COLUMNS) && (text[0] == '('))
-            return; // don't draw for this ...
-
-        if ((column_index <= NUM_META_COLUMNS) && (text[0] == '\0'))
-            return; // don't draw for this ...
-
-        // centered
-        point.Set((item_column_rect.left + item_column_rect.right) / 2.0,
-            item_column_rect.top + fTextOffset);
-        _CacheViewFont(owner);
-        point.x -= textWidth / 2.0f;
-    }
-
-    BRegion Region;
-    Region.Include(item_column_rect);
-    owner->ConstrainClippingRegion(&Region);
-    if (column_index != STRING_COLUMN_INDEX) {
-        const float KEY_MARGIN = 3.0f;
-        const float CORNER_RADIUS = 3.0f;
-        _CacheViewFont(owner);
-
-        // How about I draw a nice "key" background for this one?
-        BRect textRect(point.x - KEY_MARGIN, (point.y - sFontHeight) - KEY_MARGIN,
-            point.x + textWidth + KEY_MARGIN - 2.0f, point.y + KEY_MARGIN);
-
-        if (column_index == KEY_COLUMN_INDEX)
-            lowColor = ReallyLightPurple;
-        else
-            lowColor = LightYellow;
-
-        owner->SetHighColor(lowColor);
-        owner->FillRoundRect(textRect, CORNER_RADIUS, CORNER_RADIUS);
-        owner->SetHighColor(Black);
-        owner->StrokeRoundRect(textRect, CORNER_RADIUS, CORNER_RADIUS);
-    }
-
-    owner->SetHighColor(Black);
-    owner->SetLowColor(lowColor);
-    owner->DrawString(text, point);
-    // with a cursor at the end if highlighted
-    if (column_index == STRING_COLUMN_INDEX) {
-        // Draw cursor
-        if ((columnSelected) && (selected)) {
-            point.x += textWidth;
-            point.y += (fTextOffset / 4.0f);
-
-            BPoint pt2 = point;
-            pt2.y -= fTextOffset;
-            owner->StrokeLine(point, pt2);
-
-            fCursorPt1 = point;
-            fCursorPt2 = pt2;
-            fCursorPtsValid = true;
-        }
-
-        BRegion bitmapRegion;
-        item_column_rect.left   -= (STRING_COLUMN_LEFT_MARGIN - 4.0f);
-        item_column_rect.right  = item_column_rect.left + 16.0f;
-        item_column_rect.top    += 3.0f;
-        item_column_rect.bottom = item_column_rect.top + 16.0f;
-
-        bitmapRegion.Include(item_column_rect);
-        owner->ConstrainClippingRegion(&bitmapRegion);
-        owner->SetDrawingMode(B_OP_ALPHA);
-
-        if ((fCommand != NULL) && (fCommand[0] == '*'))
-            owner->DrawBitmap(sActuatorBitmaps[fBitmapValid ? 1 : 0],
-                ICON_BITMAP_RECT, item_column_rect);
-        else
-            // Draw icon, if any
-            if (fBitmapValid)
-                owner->DrawBitmap(&fBitmap, ICON_BITMAP_RECT,
-                    item_column_rect);
-    }
-
-    owner->SetDrawingMode(B_OP_COPY);
-    owner->ConstrainClippingRegion(NULL);
-}
-
-
-void
-ShortcutsSpec::Update(BView* owner, const BFont* font)
-{
-    CLVListItem::Update(owner, font);
-    font_height FontAttributes;
-    be_plain_font->GetHeight(&FontAttributes);
-    float fontHeight = ceil(FontAttributes.ascent) +
-        ceil(FontAttributes.descent);
-    fTextOffset = ceil(FontAttributes.ascent) + (Height() - fontHeight) / 2.0;
-}
-
-
 const char*
 ShortcutsSpec::GetCellText(int whichColumn) const
 {
     const char* temp = ""; // default
-    switch(whichColumn) {
+    switch (whichColumn) {
         case KEY_COLUMN_INDEX:
         {
             if ((fKey > 0) && (fKey <= 0xFF)) {
@@ -504 +328 @@
             if ((whichColumn >= 0) && (whichColumn < NUM_META_COLUMNS))
                 temp = sMetaMaps[whichColumn].GetNthStateDesc(
                             fMetaCellStateIndex[whichColumn]);
+            if (temp[0] == '(')
+                temp = "";
             break;
     }
     return temp;
@@ -527 +353 @@
 bool
 ShortcutsSpec::ProcessColumnTextString(int whichColumn, const char* string)
 {
-    switch(whichColumn) {
+    switch (whichColumn) {
         case STRING_COLUMN_INDEX:
             SetCommand(string);
             return true;
@@ -536 +362 @@
         case KEY_COLUMN_INDEX:
         {
             fKey = FindKeyCode(string);
+            SetField(new BStringField(GetCellText(whichColumn)),
+                KEY_COLUMN_INDEX);
             return true;
             break;
         }
@@ -669 +497 @@
 {
     bool result = false;
 
-    switch(whichColumn) {
+    switch (whichColumn) {
         case KEY_COLUMN_INDEX:
             if (key > -1) {
                 if ((int32)fKey != key) {
@@ -681 +509 @@
 
         case STRING_COLUMN_INDEX:
         {
-            switch(bytes[0]) {
+            switch (bytes[0]) {
                 case B_BACKSPACE:
                 case B_DELETE:
                     if (fCommandNul > 0) {
@@ -689 +517 @@
                         fCommand[fCommandNul - 1] = '\0';
                         fCommandNul--;  // note new nul position
                         result = true;
-                        _UpdateIconBitmap();
                     }
                     break;
 
                 case B_TAB:
                     if (_AttemptTabCompletion()) {
-                        _UpdateIconBitmap();
                         result = true;
                     } else
                         beep();
@@ -727 +553 @@
                         strncat(fCommand, bytes, fCommandLen);
                         fCommandNul += newCharLen;
                         result = true;
-                        _UpdateIconBitmap();
                     }
                 }
             }
@@ -787 +612 @@
                 result = true;
     }
 
-    return result;
-}
-
+    SetField(new BStringField(GetCellText(whichColumn)), whichColumn);
 
-int
-ShortcutsSpec::CLVListItemCompare(const CLVListItem* firstItem,
-    const CLVListItem* secondItem, int32 keyColumn)
-{
-    ShortcutsSpec* left = (ShortcutsSpec*) firstItem;
-    ShortcutsSpec* right = (ShortcutsSpec*) secondItem;
-
-    int result = strcmp(left->GetCellText(keyColumn),
-        right->GetCellText(keyColumn));
-
-    return result > 0 ? 1 : (result == 0 ? 0 : -1);
-}
-
-
-void
-ShortcutsSpec::Pulse(BView* owner)
-{
-    if ((fCursorPtsValid)&&(owner->Window()->IsActive())) {
-        rgb_color prevColor = owner->HighColor();
-        rgb_color backgroundColor = (GetSelectedColumn() ==
-            STRING_COLUMN_INDEX) ? BeBackgroundGrey : BeListSelectGrey;
-        rgb_color barColor = ((GetSelectedColumn() == STRING_COLUMN_INDEX)
-            && ((system_time() % 1000000) > 500000)) ? Black : backgroundColor;
-        owner->SetHighColor(barColor);
-        owner->StrokeLine(fCursorPt1, fCursorPt2);
-        owner->SetHighColor(prevColor);
-    }
-}
-
-
-void
-ShortcutsSpec::_UpdateIconBitmap()
-{
-    BString firstWord = ParseArgvZeroFromString(fCommand);
-
-    // we only need to change if the first word has changed...
-    if (fLastBitmapName == NULL || firstWord.Length() == 0
-        || firstWord.Compare(fLastBitmapName)) {
-        if (firstWord.ByteAt(0) == '*')
-            fBitmapValid = IsValidActuatorName(&firstWord.String()[1]);
-        else {
-            fBitmapValid = false;
-            // default until we prove otherwise
-
-            if (firstWord.Length() > 0) {
-                delete [] fLastBitmapName;
-                fLastBitmapName = new char[firstWord.Length() + 1];
-                strcpy(fLastBitmapName, firstWord.String());
-
-                BEntry progEntry(fLastBitmapName, true);
-                if ((progEntry.InitCheck() == B_NO_ERROR)
-                    && (progEntry.Exists())) {
-                    BNode progNode(&progEntry);
-                    if (progNode.InitCheck() == B_NO_ERROR) {
-                        BNodeInfo progNodeInfo(&progNode);
-                        if ((progNodeInfo.InitCheck() == B_NO_ERROR)
-                        && (progNodeInfo.GetTrackerIcon(&fBitmap, B_MINI_ICON)
-                            == B_NO_ERROR)) {
-                            fBitmapValid = fBitmap.IsValid();
-                        }
-                    }
-                }
-            }
-        }
-    }
+    return result;
 }
 
 

src/preferences/shortcuts/ShortcutsSpec.h

@@ -12 +12 @@
 
 #include <Bitmap.h>
 
-#include "CLVListItem.h"
+#include <ColumnListView.h>
 #include "KeyInfos.h"
 
 
@@ -28 +28 @@
  * the proper GUI display, and the proper BitFieldTester and CommandActuator
  * object for the ShortcutsCatcher add-on to use.
  */
-class ShortcutsSpec : public CLVListItem {
+class ShortcutsSpec : public BRow, public BArchivable {
 public:
     static  void            InitializeMetaMaps();
 
@@ -38 +38 @@
                             ~ShortcutsSpec();
 
     virtual status_t        Archive(BMessage* into, bool deep = true) const;
-    virtual void            Pulse(BView* owner);
     static  BArchivable*    Instantiate(BMessage* from);
-            void            Update(BView* owner, const BFont* font);
     const   char*           GetCellText(int whichColumn) const;
             void            SetCommand(const char* commandStr);
 
-    virtual void            DrawItemColumn(BView* owner, BRect item_column_rect,
-                                int32 column_index, bool columnSelected,
-                                bool complete);
-    
-    static  int             CLVListItemCompare(const CLVListItem* firstItem,
-                                const CLVListItem* secondItem, int32 keyColumn);
-
     // Returns the name of the Nth Column.
     static  const char*     GetColumnName(int index);
 
@@ -84 +75 @@
             void            _CacheViewFont(BView* owner);
             bool            _AttemptTabCompletion();
 
-            // call this to ensure the icon is up-to-date
-            void            _UpdateIconBitmap();
-
             char*           fCommand;
             uint32          fCommandLen;    // number of bytes in fCommand buffer
             uint32          fCommandNul;    // index of the NUL byte in fCommand
-            float           fTextOffset;
 
             // icon for associated program. Invalid if none available.
             BBitmap         fBitmap;

src/preferences/shortcuts/ShortcutsWindow.cpp

@@ -19 +19 @@
 #include <Button.h>
 #include <Catalog.h>
 #include <Clipboard.h>
+#include <ColumnListView.h>
+#include <ColumnTypes.h>
 #include <ControlLook.h>
 #include <File.h>
 #include <FilePanel.h>
 #include <FindDirectory.h>
 #include <Input.h>
+#include <LayoutBuilder.h>
 #include <Locale.h>
 #include <Message.h>
 #include <Menu.h>
@@ -38 +41 @@
 #include <String.h>
 #include <SupportDefs.h>
 
-#include "ColumnListView.h"
-
+#include "EditWindow.h"
 #include "KeyInfos.h"
 #include "MetaKeyStateMap.h"
 #include "ParseCommandLine.h"
+#include "PopUpColumn.h"
 #include "ShortcutsFilterConstants.h"
 #include "ShortcutsSpec.h"
 
@@ -113 +116 @@
 
     float spacing = be_control_look->DefaultItemSpacing();
 
-    BView* top = new BView(Bounds(), NULL, B_FOLLOW_ALL_SIDES, 0);
-    top->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(top);
-
     BMenuBar* menuBar = new BMenuBar(BRect(0, 0, 0, 0), "Menu Bar");
 
     BMenu* fileMenu = new BMenu(B_TRANSLATE("File"));
@@ -136 +135 @@
         new BMessage(B_QUIT_REQUESTED), 'Q'));
     menuBar->AddItem(fileMenu);
 
-    top->AddChild(menuBar);
-
     BRect tableBounds = Bounds();
     tableBounds.top = menuBar->Bounds().bottom + 1;
     tableBounds.right -= B_V_SCROLL_BAR_WIDTH;
     tableBounds.bottom -= B_H_SCROLL_BAR_HEIGHT;
 
-    BScrollView* containerView;
-    fColumnListView = new ColumnListView(tableBounds, &containerView, NULL,
-        B_FOLLOW_ALL_SIDES, B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE,
-        B_SINGLE_SELECTION_LIST, true, true, true, B_NO_BORDER);
-
-    fColumnListView->SetEditMessage(new BMessage(HOTKEY_ITEM_MODIFIED),
-        BMessenger(this));
+    fColumnListView = new BColumnListView(NULL,
+        B_WILL_DRAW | B_FRAME_EVENTS, B_FANCY_BORDER);
 
-    float minListWidth = 0;
-        // A running total is kept as the columns are created.
     float cellWidth = be_plain_font->StringWidth("Either") + 20;
         // ShortcutsSpec does not seem to translate the string "Either".
 
@@ -160 +150 @@
         const char* name = ShortcutsSpec::GetColumnName(i);
         float headerWidth = be_plain_font->StringWidth(name) + 20;
         float width = max_c(headerWidth, cellWidth);
-        minListWidth += width + 1;
 
-        fColumnListView->AddColumn(
-            new CLVColumn(name, CreateMetaPopUp(i), width, CLV_SORT_KEYABLE));
+        fColumnListView->AddColumn(new PopUpColumn(CreateMetaPopUp(i), name,
+                width, width - 1, width * 1.5, B_TRUNCATE_END, false, true, 1),
+            fColumnListView->CountColumns());
     }
 
     float keyCellWidth = be_plain_font->StringWidth("Caps Lock") + 20;
-    fColumnListView->AddColumn(new CLVColumn(B_TRANSLATE("Key"),
-        CreateKeysPopUp(), keyCellWidth, CLV_SORT_KEYABLE));
-    minListWidth += keyCellWidth + 1;
-
+    fColumnListView->AddColumn(new PopUpColumn(CreateKeysPopUp(),
+            B_TRANSLATE("Key"), keyCellWidth, keyCellWidth - 10,
+            keyCellWidth + 30, B_TRUNCATE_END),
+        fColumnListView->CountColumns());
     BPopUpMenu* popup = new BPopUpMenu(NULL, false);
     popup->AddItem(new BMenuItem(
         B_TRANSLATE("(Choose application with file requester)"), NULL));
@@ -190 +180 @@
     popup->AddItem(new BMenuItem(
         B_TRANSLATE("*SendMessage application/x-vnd.Be-TRAK 'Tfnd'"), NULL));
     popup->AddItem(new BMenuItem(B_TRANSLATE("*Beep"), NULL));
-    fColumnListView->AddColumn(new CLVColumn(B_TRANSLATE("Application"), popup,
-        323.0, CLV_SORT_KEYABLE));
-    minListWidth += 323.0 + 1;
-    minListWidth += B_V_SCROLL_BAR_WIDTH;
-
-    fColumnListView->SetSortFunction(ShortcutsSpec::CLVListItemCompare);
-    top->AddChild(containerView);
+    fColumnListView->AddColumn(new PopUpColumn(popup, B_TRANSLATE("Application"),
+            300.0, 223.0, 324.0, B_TRUNCATE_END, true),
+        fColumnListView->CountColumns());
 
     fColumnListView->SetSelectionMessage(new BMessage(HOTKEY_ITEM_SELECTED));
+    fColumnListView->SetSelectionMode(B_SINGLE_SELECTION_LIST);
     fColumnListView->SetTarget(this);
 
     fAddButton = new BButton(BRect(0, 0, 0, 0), "add",
@@ -207 +194 @@
     fAddButton->ResizeToPreferred();
     fAddButton->MoveBy(spacing,
         Bounds().bottom - fAddButton->Bounds().bottom - spacing);
-    top->AddChild(fAddButton);
 
     fRemoveButton = new BButton(BRect(0, 0, 0, 0), "remove",
         B_TRANSLATE("Remove selected shortcut"),
@@ -215 +201 @@
     fRemoveButton->ResizeToPreferred();
     fRemoveButton->MoveBy(fAddButton->Frame().right + spacing,
         Bounds().bottom - fRemoveButton->Bounds().bottom - spacing);
-    top->AddChild(fRemoveButton);
 
     fRemoveButton->SetEnabled(false);
 
@@ -225 +210 @@
     fSaveButton->ResizeToPreferred();
     fSaveButton->MoveBy(Bounds().right - fSaveButton->Bounds().right - spacing,
         Bounds().bottom - fSaveButton->Bounds().bottom - spacing);
-    top->AddChild(fSaveButton);
 
     fSaveButton->SetEnabled(false);
 
-    containerView->ResizeBy(0,
-        -(fAddButton->Bounds().bottom + 2 * spacing + 2));
-
-    float minButtonBarWidth = fRemoveButton->Frame().right
-        + fSaveButton->Bounds().right + 2 * spacing;
-    float minWidth = max_c(minListWidth, minButtonBarWidth);
-
-    float menuBarHeight = menuBar->Bounds().bottom;
-    float buttonBarHeight = Bounds().bottom - containerView->Frame().bottom;
-    float minHeight = menuBarHeight + 200 + buttonBarHeight;
-
-    SetSizeLimits(minWidth, MAX_WIDTH, minHeight, MAX_HEIGHT);
-        // SetSizeLimits() will resize the window to the minimum size.
-
     CenterOnScreen();
 
     entry_ref windowSettingsRef;
@@ -265 +235 @@
             // tell ourselves to load this file if it exists
     }
 
+    fColumnListView->ResizeAllColumnsToPreferred();
+
+    BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
+        .Add(menuBar)
+        .AddGroup(B_VERTICAL)
+            .SetInsets(B_USE_WINDOW_INSETS)
+            .Add(fColumnListView)
+            .AddGroup(B_HORIZONTAL)
+                .AddGroup(B_HORIZONTAL)
+                .SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP))
+                .Add(fAddButton)
+                .Add(fRemoveButton)
+                .End()
+                .AddGroup(B_HORIZONTAL)
+                    .SetExplicitAlignment(BAlignment(B_ALIGN_RIGHT, B_ALIGN_TOP))
+                    .Add(fSaveButton)
+                .End()
+            .End()
+        .End();
+
     Show();
 }
 
@@ -291 +281 @@
         alert->SetShortcut(0, B_ESCAPE);
         alert->SetShortcut(1, 'd');
         alert->SetShortcut(2, 's');
-        switch(alert->Go()) {
+        switch (alert->Go()) {
             case 0:
                 result = false;
                 break;
@@ -311 +301 @@
                             B_TRANSLATE("Oh no"));
                         alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
                         alert->Go();
-                        result = true; //quit anyway
+                        result = true; // quit anyway
                     }
                 } else {
                     PostMessage(SAVE_KEYSET);
@@ -361 +351 @@
         return false;
 
     BMessage saveMessage;
-    for (int i = 0; i < fColumnListView->CountItems(); i++) {
+    for (int i = 0; i < fColumnListView->CountRows(); i++) {
         BMessage next;
-        if (((ShortcutsSpec*)fColumnListView->ItemAt(i))->Archive(&next)
+        if (((ShortcutsSpec*)fColumnListView->RowAt(i))->Archive(&next)
                 == B_OK) {
             saveMessage.AddMessage("spec", &next);
         } else
@@ -392 +382 @@
         ShortcutsSpec* spec
             = (ShortcutsSpec*)ShortcutsSpec::Instantiate(&message);
         if (spec != NULL)
-            fColumnListView->AddItem(spec);
+            fColumnListView->AddRow(spec);
         else
             printf("_LoadKeySet: Error parsing spec!\n");
     }
@@ -428 +418 @@
     saveMsg.AddRect("window frame", Frame());
 
     for (int i = 0; i < fColumnListView->CountColumns(); i++) {
-        CLVColumn* column = fColumnListView->ColumnAt(i);
+        BColumn* column = fColumnListView->ColumnAt(i);
         saveMsg.AddFloat("column width", column->Width());
     }
 
@@ -457 +447 @@
     }
 
     for (int i = 0; i < fColumnListView->CountColumns(); i++) {
-        CLVColumn* column = fColumnListView->ColumnAt(i);
+        BColumn* column = fColumnListView->ColumnAt(i);
         float columnWidth;
         if (loadMessage.FindFloat("column width", i, &columnWidth) == B_OK)
             column->SetWidth(max_c(column->Width(), columnWidth));
@@ -473 +463 @@
     _MarkKeySetModified();
 
     ShortcutsSpec* spec;
-    int curSel = fColumnListView->CurrentSelection();
-    if (curSel >= 0) {
-        spec = new ShortcutsSpec(*((ShortcutsSpec*)
-            fColumnListView->ItemAt(curSel)));
-
-        if (defaultCommand)
-            spec->SetCommand(defaultCommand);
-    } else
-        spec = new ShortcutsSpec(defaultCommand ? defaultCommand : "");
-
-    fColumnListView->AddItem(spec);
-    fColumnListView->Select(fColumnListView->CountItems() - 1);
-    fColumnListView->ScrollToSelection();
+    BRow* curSel = fColumnListView->CurrentSelection();
+    if (curSel)
+        spec = new ShortcutsSpec(*((ShortcutsSpec*)curSel));
+    else {
+        spec = new ShortcutsSpec("");
+        for (int i = 0; i < fColumnListView->CountColumns(); i++)
+            spec->SetField(new BStringField(""), i);
+    }
+
+    fColumnListView->AddRow(spec);
+    fColumnListView->AddToSelection(spec);
+    fColumnListView->ScrollTo(spec);
+    if (defaultCommand)
+        spec->SetCommand(defaultCommand);
 }
 
 
 void
 ShortcutsWindow::MessageReceived(BMessage* message)
 {
-    switch(message->what) {
+    switch (message->what) {
         case OPEN_KEYSET:
         case APPEND_KEYSET:
             fLastOpenWasAppend = (message->what == APPEND_KEYSET);
@@ -531 +522 @@
                 BEntry entry(&ref);
                 if (entry.InitCheck() == B_OK) {
                     BPath path(&entry);
-                    
+
                     if (path.InitCheck() == B_OK) {
                         // Add a new item with the given path.
                         BString str(path.Path());
@@ -570 +561 @@
                         }
                     }
                 }
- 
+
                 if (fLastOpenWasAppend == false) {
                     // Clear the menu...
-                    while (ShortcutsSpec* item
-                        = ((ShortcutsSpec*)
-                            fColumnListView->RemoveItem((int32)0))) {
-                        delete item;
+                    while (fColumnListView->CountRows()) {
+                        ShortcutsSpec* row =
+                            static_cast<ShortcutsSpec*>(fColumnListView->RowAt(0));
+                        fColumnListView->RemoveRow(row);
+                        delete row;
                     }
                 }
 
@@ -604 +596 @@
         // these messages come from the pop-up menu of the Applications column
         case SELECT_APPLICATION:
         {
-            int csel = fColumnListView->CurrentSelection();
-            if (csel >= 0) {
+            ShortcutsSpec* row =
+                static_cast<ShortcutsSpec*>(fColumnListView->CurrentSelection());
+            if (row != NULL) {
                 entry_ref aref;
                 if (message->FindRef("refs", &aref) == B_OK) {
                     BEntry ent(&aref);
                     if (ent.InitCheck() == B_OK) {
                         BPath path;
                         if ((ent.GetPath(&path) == B_OK)
-                            && (((ShortcutsSpec*)fColumnListView->ItemAt(csel))->
+                            && (row->
                                 ProcessColumnTextString(ShortcutsSpec::STRING_COLUMN_INDEX,
                                     path.Path()))) {
-                            fColumnListView->InvalidateItem(csel);
                             _MarkKeySetModified();
                         }
                     }
@@ -673 +665 @@
 
         case REMOVE_HOTKEY_ITEM:
         {
-            int index = fColumnListView->CurrentSelection();
-            if (index >= 0) {
-                CLVListItem* item = (CLVListItem*) 
-                    fColumnListView->ItemAt(index);
-                fColumnListView->RemoveItem(index);
+            BRow* item = fColumnListView->CurrentSelection();
+            if (item) {
+                int index = fColumnListView->IndexOf(item);
+                fColumnListView->RemoveRow(item);
                 delete item;
                 _MarkKeySetModified();
 
                 // Rules for new selection: If there is an item at (index),
                 // select it. Otherwise, if there is an item at (index-1), 
                 // select it. Otherwise, select nothing.
-                int num = fColumnListView->CountItems();
+                int num = fColumnListView->CountRows();
                 if (num > 0) {
                     if (index < num)
-                        fColumnListView->Select(index);
+                        fColumnListView->AddToSelection(
+                            fColumnListView->RowAt(index));
                     else {
                         if (index > 0)
                             index--;
-                        if (index < num) 
-                            fColumnListView->Select(index);
+                        if (index < num)
+                            fColumnListView->AddToSelection(
+                                fColumnListView->RowAt(index));
                     }
                 }
             }
@@ -702 +695 @@
         // Received when the user clicks on the ColumnListView
         case HOTKEY_ITEM_SELECTED:
         {
-            int32 index = -1;
-            message->FindInt32("index", &index);
-            bool validItem = (index >= 0);
-            fRemoveButton->SetEnabled(validItem);
+            if (fColumnListView->CountRows() > 0)
+                fRemoveButton->SetEnabled(true);
+            else
+                fRemoveButton->SetEnabled(false);
             break;
         }
 
@@ -721 +714 @@
 
                 if (row >= 0) {
                     ShortcutsSpec* item = (ShortcutsSpec*)
-                        fColumnListView->ItemAt(row);
+                        fColumnListView->RowAt(row);
                     bool repaintNeeded = false; // default
 
                     if (message->HasInt32("mouseClick")) {
                         repaintNeeded = item->ProcessColumnMouseClick(column);
                     } else if ((message->FindString("bytes", &bytes) == B_OK)
                         && (message->FindInt32("key", &key) == B_OK)) {
-                        repaintNeeded = item->ProcessColumnKeyStroke(column, 
+                        repaintNeeded = item->ProcessColumnKeyStroke(column,
                             bytes, key);
                     } else if (message->FindInt32("unmappedkey", &key) ==
                         B_OK) {
-                        repaintNeeded = ((column == item->KEY_COLUMN_INDEX) 
-                            && ((key > 0xFF) || (GetKeyName(key) != NULL)) 
-                            && (item->ProcessColumnKeyStroke(column, NULL, 
+                        repaintNeeded = ((column == item->KEY_COLUMN_INDEX)
+                            && ((key > 0xFF) || (GetKeyName(key) != NULL))
+                            && (item->ProcessColumnKeyStroke(column, NULL,
                             key)));
                     } else if (message->FindString("text", &bytes) == B_OK) {
                         if ((bytes[0] == '(')&&(bytes[1] == 'C')) {
@@ -747 +740 @@
                                     NULL, 0, false, &message);
                                 fSelectPanel->Show();
                             }
-                            fSelectPanel->SetButtonLabel(B_DEFAULT_BUTTON, 
+                            fSelectPanel->SetButtonLabel(B_DEFAULT_BUTTON,
                                 B_TRANSLATE("Select"));
-                        } else {
+                        } else
                             repaintNeeded = item->ProcessColumnTextString(
                                 column, bytes);
-                        }
                     }
-                    
+
                     if (repaintNeeded) {
-                        fColumnListView->InvalidateItem(row);
+                        fColumnListView->Invalidate(row);
                         _MarkKeySetModified();
                     }
                 }
@@ -784 +776 @@
 void
 ShortcutsWindow::Quit()
 {
-    for (int i = fColumnListView->CountItems() - 1; i >= 0; i--)
-        delete (ShortcutsSpec*)fColumnListView->ItemAt(i);
-
-    fColumnListView->MakeEmpty();
     BWindow::Quit();
 }
 
@@ -795 +783 @@
 void
 ShortcutsWindow::DispatchMessage(BMessage* message, BHandler* handler)
 {
-    switch(message->what) {
+    switch (message->what) {
+        case B_SIMPLE_DATA:
+            MessageReceived(message);
+            break;
+
         case B_COPY:
         case B_CUT:
             if (be_clipboard->Lock()) {
-                int32 row = fColumnListView->CurrentSelection(); 
-                int32 column = fColumnListView->GetSelectedColumn();
-                if ((row >= 0) 
-                    && (column == ShortcutsSpec::STRING_COLUMN_INDEX)) {
-                    ShortcutsSpec* spec = (ShortcutsSpec*)
-                        fColumnListView->ItemAt(row);
-                    if (spec) {
-                        BMessage* data = be_clipboard->Data();
-                        data->RemoveName("text/plain");
-                        data->AddData("text/plain", B_MIME_TYPE, 
-                            spec->GetCellText(column), 
-                            strlen(spec->GetCellText(column)));
-                        be_clipboard->Commit();
-                        
-                        if (message->what == B_CUT) {
-                            spec->ProcessColumnTextString(column, "");
-                            _MarkKeySetModified();
-                            fColumnListView->InvalidateItem(row);
-                        }
+                ShortcutsSpec* row =
+                    static_cast<ShortcutsSpec*>(fColumnListView->CurrentSelection());
+                if (row) {
+                    BMessage* data = be_clipboard->Data();
+                    data->RemoveName("text/plain");
+                    data->AddData("text/plain", B_MIME_TYPE,
+                        row->GetCellText(ShortcutsSpec::STRING_COLUMN_INDEX),
+                        strlen(row->GetCellText(ShortcutsSpec::STRING_COLUMN_INDEX)));
+                    be_clipboard->Commit();
+
+                    if (message->what == B_CUT) {
+                        row->ProcessColumnTextString(
+                            ShortcutsSpec::STRING_COLUMN_INDEX, "");
+                        _MarkKeySetModified();
                     }
                 }
                 be_clipboard->Unlock();
@@ -831 +818 @@
                 ssize_t textLen;
                 if (data->FindData("text/plain", B_MIME_TYPE, (const void**)
                     &text, &textLen) == B_OK) {
-                    int32 row = fColumnListView->CurrentSelection();
-                    int32 column = fColumnListView->GetSelectedColumn();
-                    if ((row >= 0) 
-                        && (column == ShortcutsSpec::STRING_COLUMN_INDEX)) {
-                        ShortcutsSpec* spec = (ShortcutsSpec*)
-                            fColumnListView->ItemAt(row);
-                        if (spec) {
-                            for (ssize_t i = 0; i < textLen; i++) {
-                                char buf[2] = {text[i], 0x00};
-                                spec->ProcessColumnKeyStroke(column, buf, 0);
-                            }
+                    ShortcutsSpec* row =
+                    static_cast<ShortcutsSpec*>(fColumnListView->CurrentSelection());
+                    if (row) {
+                        for (ssize_t i = 0; i < textLen; i++) {
+                            char buf[2] = {text[i], 0x00};
+                            row->ProcessColumnKeyStroke(
+                                ShortcutsSpec::STRING_COLUMN_INDEX, buf, 0);
                         }
-                        fColumnListView->InvalidateItem(row);
-                        _MarkKeySetModified();
                     }
+                    _MarkKeySetModified();
                 }
                 be_clipboard->Unlock();
             }
             break;
-        
+
+        case B_KEY_DOWN:
+            ShortcutsSpec* selected;
+            if (message->GetInt32("modifiers", 0) != 0)
+                BWindow::DispatchMessage(message, handler);
+            else if (handler == fColumnListView
+                && (selected =
+                    static_cast<ShortcutsSpec*>(fColumnListView->CurrentSelection()))) {
+                selected->ProcessColumnTextString(
+                        ShortcutsSpec::KEY_COLUMN_INDEX,
+                        GetKeyName(message->GetInt32("key", 0)));
+                _MarkKeySetModified();
+            }
+            break;
+
         default:
             BWindow::DispatchMessage(message, handler);
             break;

src/preferences/shortcuts/ShortcutsWindow.h

@@ -10 +10 @@
 #define SHORTCUTS_WINDOW_H
 
 
+#include <ColumnListView.h>
 #include <Entry.h>
 #include <Window.h>
 
-#include "ColumnListView.h"
-
 
 class BButton;
+class BColumnListView;
 class BFilePanel;
 class BMessage;
+class ShortcutsSpec;
 
 // This class defines our preferences/configuration window.
 class ShortcutsWindow : public BWindow {
@@ -69 +70 @@
             BButton*            fAddButton;
             BButton*            fRemoveButton;
             BButton*            fSaveButton;
-            ColumnListView*     fColumnListView;
+            BColumnListView*    fColumnListView;
             BFilePanel*         fSavePanel;
                 // for saving settings
             BFilePanel*         fOpenPanel;
@@ -85 +86 @@
 
             // true iff the file-requester's ref should be appended to current
             bool                fLastOpenWasAppend;
+
+            BRow*               fSelectedRow;
 };
 
 

deleted file src/preferences/shortcuts/clv/CLVColumn.cpp

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-
-
-#define CLVColumn_CPP
-
-#include <string.h>
-
-#include "CLVColumn.h"
-#include "ColumnListView.h"
-#include "CLVColumnLabelView.h"
-
-
-CLVColumn::CLVColumn(const char* label, BPopUpMenu* popup, float width,
-    uint32 flags, float minWidth)
-{
-    fPopup = popup;
-
-    if (flags & CLV_EXPANDER) {
-        label = NULL;
-        width = 20.0;
-        minWidth = 20.0;
-        flags &= CLV_NOT_MOVABLE | CLV_LOCK_AT_BEGINNING | CLV_HIDDEN
-            | CLV_LOCK_WITH_RIGHT;
-        flags |= CLV_EXPANDER | CLV_NOT_RESIZABLE | CLV_MERGE_WITH_RIGHT;
-    }
-
-    if (minWidth < 4.0)
-        minWidth = 4.0;
-
-    if (width < minWidth)
-        width = minWidth;
-
-    if (label != NULL) {
-        fLabel = new char[strlen(label) + 1];
-        strcpy((char*)fLabel, label);
-    } else
-        fLabel = NULL;
-
-    fWidth = width;
-    fMinWidth = minWidth;
-    fFlags = flags;
-    fPushedByExpander = false;
-    fParent = NULL;
-    fSortMode = SORT_MODE_NONE;
-}
-
-
-CLVColumn::~CLVColumn()
-{
-    delete[] fLabel;
-    if (fParent != NULL)
-        fParent->RemoveColumn(this);
-
-    delete fPopup;
-}
-
-
-float
-CLVColumn::Width() const
-{
-    return fWidth;
-}
-
-
-void
-CLVColumn::SetWidth(float width)
-{
-    if(width < fMinWidth)
-        width = fMinWidth;
-
-    if(width != fWidth) {
-        float oldWidth = fWidth;
-        fWidth = width;
-        if (IsShown() && fParent != NULL) {
-            BWindow* parentWindow = fParent->Window();
-            if (parentWindow != NULL)
-                parentWindow->Lock();
-
-            // figure out the area after this column to scroll
-            BRect ColumnViewBounds = fParent->fColumnLabelView->Bounds();
-            BRect MainViewBounds = fParent->Bounds();
-            BRect sourceArea = ColumnViewBounds;
-            sourceArea.left = fColumnEnd + 1.0;
-            BRect destArea = sourceArea;
-            float delta = width-oldWidth;
-            destArea.left += delta;
-            destArea.right += delta;
-            float LimitShift;
-            if (destArea.right > ColumnViewBounds.right) {
-                LimitShift = destArea.right-ColumnViewBounds.right;
-                destArea.right -= LimitShift;
-                sourceArea.right -= LimitShift;
-            }
-            if (destArea.left < ColumnViewBounds.left) {
-                LimitShift = ColumnViewBounds.left - destArea.left;
-                destArea.left += LimitShift;
-                sourceArea.left += LimitShift;
-            }
-
-            // scroll the area that is being shifted
-            if(parentWindow)
-                parentWindow->UpdateIfNeeded();
-
-            fParent->fColumnLabelView->CopyBits(sourceArea, destArea);
-            sourceArea.top = MainViewBounds.top;
-            sourceArea.bottom = MainViewBounds.bottom;
-            destArea.top = MainViewBounds.top;
-            destArea.bottom = MainViewBounds.bottom;
-            fParent->CopyBits(sourceArea, destArea);
-
-            // invalidate the region that got revealed
-            destArea = ColumnViewBounds;
-            if (width > oldWidth) {
-                destArea.left = fColumnEnd + 1.0;
-                destArea.right = fColumnEnd + delta;
-            } else {
-                destArea.left = ColumnViewBounds.right + delta + 1.0;
-                destArea.right = ColumnViewBounds.right;
-            }
-            fParent->fColumnLabelView->Invalidate(destArea);
-            destArea.top = MainViewBounds.top;
-            destArea.bottom = MainViewBounds.bottom;
-            fParent->Invalidate(destArea);
-
-            // invalidate the old or new resize handle as necessary
-            destArea = ColumnViewBounds;
-            if (width > oldWidth)
-                destArea.left = fColumnEnd;
-            else
-                destArea.left = fColumnEnd + delta;
-
-            destArea.right = destArea.left;
-            fParent->fColumnLabelView->Invalidate(destArea);
-
-            // update the column sizes, positions and group positions
-            fParent->ShiftDragGroup();
-            fParent->fColumnLabelView->UpdateDragGroups();
-            if(parentWindow)
-                parentWindow->Unlock();
-        }
-        if (fParent != NULL) {
-            fParent->ColumnWidthChanged(fParent->fColumnList.IndexOf(this),
-                fWidth);
-        }
-    }
-}
-
-
-uint32
-CLVColumn::Flags() const
-{
-    return fFlags;
-}
-
-
-bool
-CLVColumn::IsShown() const
-{
-    if ((fFlags & CLV_HIDDEN) != 0)
-        return false;
-    else
-        return true;
-}
-
-
-void
-CLVColumn::SetShown(bool show)
-{
-    bool shown = IsShown();
-    if (shown != show) {
-        if (show)
-            fFlags &= 0xFFFFFFFF^CLV_HIDDEN;
-        else
-            fFlags |= CLV_HIDDEN;
-
-        if (fParent != NULL) {
-            float updateLeft = fColumnBegin;
-            BWindow* parentWindow = fParent->Window();
-            if (parentWindow != NULL)
-                parentWindow->Lock();
-
-            fParent->ShiftDragGroup();
-            fParent->fColumnLabelView->UpdateDragGroups();
-            if (show)
-                updateLeft = fColumnBegin;
-
-            BRect area = fParent->fColumnLabelView->Bounds();
-            area.left = updateLeft;
-            fParent->fColumnLabelView->Invalidate(area);
-            area = fParent->Bounds();
-            area.left = updateLeft;
-            fParent->Invalidate(area);
-            if ((fFlags & CLV_EXPANDER) != 0) {
-                if (!show)
-                    fParent->fExpanderColumn = -1;
-                else
-                    fParent->fExpanderColumn = fParent->IndexOfColumn(this);
-            }
-            if (parentWindow != NULL)
-                parentWindow->Unlock();
-        }
-    }
-}
-
-
-CLVSortMode
-CLVColumn::SortMode() const
-{
-    return fSortMode;
-}
-
-
-void
-CLVColumn::SetSortMode(CLVSortMode mode)
-{
-    if (fParent != NULL)
-        fParent->SetSortMode(fParent->IndexOfColumn(this), mode);
-    else
-        fSortMode = mode;
-}

deleted file src/preferences/shortcuts/clv/CLVColumn.h

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-#ifndef CLV_COLUMN_H
-#define CLV_COLUMN_H
-
-
-#include <support/SupportDefs.h>
-#include <interface/PopUpMenu.h>
-
-
-// flags
-enum {
-    CLV_SORT_KEYABLE =          0x00000001,
-        // Can be used as the sorting key
-    CLV_NOT_MOVABLE =           0x00000002,
-        // Column can't be moved by user
-    CLV_NOT_RESIZABLE =         0x00000004,
-        // Column can't be resized by user
-    CLV_LOCK_AT_BEGINNING =     0x00000008,
-        // Movable columns may not be placed or moved by the user
-        // into a position before this one
-    CLV_LOCK_AT_END =           0x00000010,
-        // Movable columns may not be placed or moved by the user
-        // into a position after this one
-    CLV_HIDDEN =                0x00000020,
-        // This column is hidden initially
-    CLV_MERGE_WITH_RIGHT =      0x00000040,
-        // Merge this column label with the one that follows it.
-    CLV_LOCK_WITH_RIGHT =       0x00000080,
-        // Lock this column to the one that follows it such that
-        // if the column to the right is moved by the user, this
-        // one will move with it and vice versa
-    CLV_EXPANDER =              0x00000100,
-        // Column contains an expander. You may only use one
-        // expander in a ColumnListView, and an expander may not be
-        // added to a non-hierarchal ColumnListView.  It may not
-        // have a label.  Its width is automatically set to 20.0.
-        // The only flags that affect it are CLV_NOT_MOVABLE,
-        // CLV_LOCK_AT_BEGINNING, CLV_NOT_SHOWN and
-        // CLV_LOCK_WITH_RIGHT.  The others are set for you:
-        // CLV_NOT_RESIZABLE | CLV_MERGE_WITH_RIGHT
-    CLV_PUSH_PASS =             0x00000200
-        // Causes this column, if pushed by an expander to the
-        // left, to pass that push on and also push the next
-        // column to the right.
-};
-
-enum CLVSortMode {
-    SORT_MODE_ASCENDING,
-    SORT_MODE_DESCENDING,
-    SORT_MODE_NONE
-};
-
-
-class ColumnListView;
-class CLVColumn;
-class CLVListItem;
-
-
-class CLVColumn {
-public:
-                                CLVColumn(const char* label,
-                                    BPopUpMenu* popup = NULL,
-                                    float width = 20.0, uint32 flags = 0L,
-                                    float min_width = 20.0);
-    virtual                     ~CLVColumn();
-
-    // Archival stuff
-    /* Not implemented yet
-                                CLVColumn(BMessage* archive);
-                                static CLVColumn* Instantiate(BMessage* data);
-    virtual status_t            Archive(BMessage* data, bool deep = true) const;
-    */
-
-    // Functions
-            float               Width() const;
-    virtual void                SetWidth(float width);
-            // Can be overridden to detect changes to the column width
-            // however since you are probably overriding ColumnListView
-            // and dealing with an array of columns anyway, it is
-            // probably more useful to override
-            // ColumnListView::ColumnWidthChanged to detect changes to
-            // column widths
-            uint32              Flags() const;
-            bool                IsShown() const;
-            void                SetShown(bool show);
-            CLVSortMode         SortMode() const;
-            void                SetSortMode(CLVSortMode mode);
-            const char*         GetLabel() const { return fLabel; }
-            BPopUpMenu*         GetPopup() { return fPopup; }
-
-private:
-        friend class ColumnListView;
-        friend class CLVColumnLabelView;
-        friend class CLVListItem;
-
-            const char*         fLabel;
-            float               fWidth;
-            float               fMinWidth;
-            float               fColumnBegin;
-            float               fColumnEnd;
-            uint32              fFlags;
-            bool                fPushedByExpander;
-            CLVSortMode         fSortMode;
-            ColumnListView*     fParent;
-            BPopUpMenu*         fPopup;
-                // added by jaf
-};
-
-
-#endif  // CLV_COLUMN_H

deleted file src/preferences/shortcuts/clv/CLVColumnLabelView.cpp

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-
-
-#define CLVColumnLabelView_CPP
-
-#include "CLVColumnLabelView.h"
-#include "ColumnListView.h"
-#include "CLVColumn.h"
-#include "MouseWatcher.h"
-
-
-CLVColumnLabelView::CLVColumnLabelView(BRect frame, ColumnListView* parent,
-    const BFont* font)
-    :
-    BView(frame, NULL, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP,
-        B_WILL_DRAW | B_FRAME_EVENTS),
-    fDragGroupsList(10)
-{
-    SetFont(font);
-    SetViewColor(BeBackgroundGrey);
-    SetLowColor(BeBackgroundGrey);
-    SetHighColor(Black);
-    fParent = parent;
-    fDisplayList = &fParent->fColumnDisplayList;
-    fColumnClicked = NULL;
-    fColumnDragging = false;
-    fColumnResizing = false;
-    font_height fontAttributes;
-    font->GetHeight(&fontAttributes);
-    fFontAscent = ceil(fontAttributes.ascent);
-}
-
-
-CLVColumnLabelView::~CLVColumnLabelView()
-{
-    int32 groupCount = fDragGroupsList.CountItems();
-    for (int32 i = 0; i < groupCount; i++)
-        fDragGroupsList.RemoveItem(int32(0));
-}
-
-
-void
-CLVColumnLabelView::Draw(BRect updateRect)
-{
-    BRegion clippingRegion;
-    GetClippingRegion(&clippingRegion);
-    BRect bounds = Bounds();
-
-    // draw each column label in turn
-    float columnBegin = 0.0;
-    float columnEnd = -1.0;
-    bool shouldMergeWithLeft = false;
-    int32 columnCount = fDisplayList->CountItems();
-    BPoint startingPoint;
-    BPoint stoppingPoint;
-    for (int32 i = 0; i < columnCount; i++) {
-        CLVColumn* column = (CLVColumn*)fDisplayList->ItemAt(i);
-        if (column->IsShown()) {
-            // figure out where this column is
-            columnBegin = column->fColumnBegin;
-            columnEnd = column->fColumnEnd;
-            // start by figuring out if this column will merge
-            // with a shown column to the right
-            bool shouldMergeWithRight = false;
-            if ((column->fFlags & CLV_MERGE_WITH_RIGHT) != 0) {
-                for (int32 j = i + 1; j < columnCount; j++) {
-                    CLVColumn* nextColumn = (CLVColumn*)fDisplayList->ItemAt(j);
-                    if (nextColumn->IsShown()) {
-                        // next column is shown
-                        shouldMergeWithRight = true;
-                        break;
-                    } else if ((nextColumn->fFlags & CLV_MERGE_WITH_RIGHT)
-                            == 0) {
-                        // next column is not shown and doesn't
-                        // pass on the merge
-                        break;
-                    }
-                }
-            }
-
-            if (clippingRegion.Intersects(BRect(columnBegin,
-                    bounds.top, columnEnd, bounds.bottom))) {
-                // need to draw this column
-                BeginLineArray(4);
-
-                // top line
-                startingPoint.Set(columnBegin, bounds.top);
-                stoppingPoint.Set(columnEnd - 1.0, bounds.top);
-                if (shouldMergeWithRight && !(column == fColumnClicked
-                    && fColumnResizing)) {
-                    stoppingPoint.x = columnEnd;
-                }
-                AddLine(startingPoint, stoppingPoint, BeHighlight);
-
-                // left line
-                if (!shouldMergeWithLeft) {
-                    AddLine(BPoint(columnBegin, bounds.top + 1.0),
-                        BPoint(columnBegin, bounds.bottom), BeHighlight);
-                }
-
-                // bottom line
-                startingPoint.Set(columnBegin + 1.0, bounds.bottom);
-                if (shouldMergeWithLeft)
-                    startingPoint.x = columnBegin;
-
-                stoppingPoint.Set(columnEnd - 1.0, bounds.bottom);
-                if (shouldMergeWithRight && !(column == fColumnClicked
-                    && fColumnResizing)) {
-                    stoppingPoint.x = columnEnd;
-                }
-                AddLine(startingPoint, stoppingPoint, BeShadow);
-
-                // right line
-                if (column == fColumnClicked && fColumnResizing) {
-                    AddLine(BPoint(columnEnd, bounds.top),
-                    BPoint(columnEnd, bounds.bottom), BeFocusBlue);
-                } else if (!shouldMergeWithRight) {
-                    AddLine(BPoint(columnEnd, bounds.top),
-                        BPoint(columnEnd, bounds.bottom), BeShadow);
-                }
-                EndLineArray();
-
-                // add the label
-                if (column->fLabel != NULL) {
-                    // limit the clipping region to the interior of the box
-                    BRegion textRegion;
-                    textRegion.Include(BRect(columnBegin + 1.0,
-                        bounds.top + 1.0, columnEnd - 1.0,
-                        bounds.bottom - 1.0));
-                    ConstrainClippingRegion(&textRegion);
-
-                    // draw the label
-                    if (column == fColumnClicked && !fColumnResizing)
-                        SetHighColor(BeFocusBlue);
-
-                    SetDrawingMode(B_OP_OVER);
-                    DrawString(column->fLabel,
-                        BPoint(columnBegin + 9.0,
-                            bounds.top + 2.0 + fFontAscent));
-                    SetDrawingMode(B_OP_COPY);
-
-                    // underline if this is a selected sort column
-                    if (fParent->fSortKeyList.HasItem(column)
-                        && column->fSortMode != SORT_MODE_NONE) {
-                        float Width = StringWidth(column->fLabel);
-                        StrokeLine(BPoint(columnBegin + 8.0,
-                            bounds.top + 2.0 + fFontAscent + 2.0),
-                            BPoint(columnBegin + 8.0 + Width,
-                                bounds.top + 2.0 + fFontAscent + 2.0));
-                    }
-                    if (column == fColumnClicked && !fColumnResizing)
-                        SetHighColor(Black);
-
-                    // restore the clipping region
-                    ConstrainClippingRegion(NULL);
-                }
-            }
-
-            // set shouldMergeWithLeft flag for the next column to
-            // the appropriate state
-            shouldMergeWithLeft = shouldMergeWithRight;
-        }
-    }
-
-    // add highlight and shadow to the region after the columns if necessary
-    if (columnEnd < bounds.right) {
-        columnBegin = columnEnd + 1.0;
-
-        if (clippingRegion.Intersects(BRect(columnEnd + 1.0,
-                bounds.top, bounds.right, bounds.bottom))) {
-            BeginLineArray(3);
-
-            // top line
-            AddLine(BPoint(columnBegin, bounds.top),
-                BPoint(bounds.right, bounds.top), BeHighlight);
-
-            // left line
-            AddLine(BPoint(columnBegin, bounds.top + 1.0),
-                BPoint(columnBegin, bounds.bottom), BeHighlight);
-
-            // bottom line
-            startingPoint.Set(columnBegin + 1.0, bounds.bottom);
-            if (shouldMergeWithLeft)
-                startingPoint.x = columnBegin;
-
-            stoppingPoint.Set(bounds.right, bounds.bottom);
-            AddLine(startingPoint, stoppingPoint, BeShadow);
-            EndLineArray();
-        }
-    }
-
-    // draw the dragging box if necessary
-    if (fColumnClicked && fColumnDragging) {
-        float dragOutlineLeft = fPreviousMousePosition.x
-            - fDragBoxMouseHoldOffset;
-        float groupBegin = ((CLVDragGroup*)fDragGroupsList.ItemAt(
-            fDragGroupIndex))->groupBeginIndex;
-        if (dragOutlineLeft < groupBegin && fSnapGroupBeforeIndex == -1)
-            dragOutlineLeft = groupBegin;
-
-        if (dragOutlineLeft > groupBegin && fSnapGroupAfterIndex == -1)
-            dragOutlineLeft = groupBegin;
-
-        float DragOutlineRight = dragOutlineLeft + fDragBoxWidth;
-
-        BeginLineArray(4);
-        AddLine(BPoint(dragOutlineLeft, bounds.top),
-            BPoint(DragOutlineRight, bounds.top), BeFocusBlue);
-        AddLine(BPoint(dragOutlineLeft, bounds.bottom),
-            BPoint(DragOutlineRight, bounds.bottom), BeFocusBlue);
-        AddLine(BPoint(dragOutlineLeft, bounds.top + 1.0),
-            BPoint(dragOutlineLeft, bounds.bottom - 1.0), BeFocusBlue);
-        AddLine(BPoint(DragOutlineRight, bounds.top + 1.0),
-            BPoint(DragOutlineRight, bounds.bottom - 1.0), BeFocusBlue);
-        EndLineArray();
-
-        fPreviousDragOutlineLeft = dragOutlineLeft;
-        fPreviousDragOutlineRight = DragOutlineRight;
-    }
-}
-
-
-void
-CLVColumnLabelView::MouseDown(BPoint where)
-{
-    // pay attention only to primary mouse button
-    bool shouldWatchMouse = false;
-    BPoint mousePosition;
-    uint32 buttons;
-    GetMouse(&mousePosition, &buttons);
-    if (buttons == B_PRIMARY_MOUSE_BUTTON) {
-        BRect bounds = Bounds();
-
-        // Make sure no other column was already clicked.
-        // If so, just discard the old one and redraw the view.
-        if (fColumnClicked != NULL) {
-            Invalidate();
-            fColumnClicked = NULL;
-        }
-
-        // find the column that the user clicked, if any
-        bool didGrabResizeTab = false;
-        int32 columnCount = fDisplayList->CountItems();
-        int32 i;
-        CLVColumn* column = NULL;
-        for (i = 0; i < columnCount; i++) {
-            column = (CLVColumn*)fDisplayList->ItemAt(i);
-            if (column->IsShown()) {
-                float columnBegin = column->fColumnBegin;
-                float columnEnd = column->fColumnEnd;
-                if ((where.x >= columnBegin && where.x <= columnEnd)
-                    || ((i == columnCount - 1) && (where.x >= columnBegin))) {
-                    // anything after the rightmost column can drag... jaf
-                    const float resizeTolerance = 5.0f;
-                    // jaf is too clumsy to click on a 2 pixel space.  :)
-
-                    // user clicked in this column
-                    if (where.x <= columnBegin + resizeTolerance) {
-                        // user clicked the resize tab preceding this column
-                        for (i--; i >= 0; i--) {
-                            column = (CLVColumn*)fDisplayList->ItemAt(i);
-                            if (column->IsShown()) {
-                                didGrabResizeTab = true;
-                                break;
-                            }
-                        }
-                    } else if (where.x >= columnEnd-resizeTolerance) {
-                        // user clicked the resize tab for (after) this column
-                        didGrabResizeTab = true;
-                    } else {
-                        // user clicked in this column
-                        fColumnClicked = (CLVColumn*)fDisplayList->ItemAt(i);
-                        fColumnResizing = false;
-                        fPreviousMousePosition = where;
-                        fMouseClickedPosition = where;
-                        fColumnDragging = false;
-                        SetSnapMinMax();
-                        fDragBoxMouseHoldOffset = where.x
-                            - ((CLVDragGroup*)fDragGroupsList.ItemAt(
-                                fDragGroupIndex))->groupBeginIndex;
-
-                            Invalidate(BRect(columnBegin + 1.0,
-                                bounds.top + 1.0, columnEnd - 1.0,
-                                bounds.bottom - 1.0));
-
-                        // start watching the mouse
-                        shouldWatchMouse = true;
-                    }
-                    break;
-                }
-            }
-        }
-
-        if (didGrabResizeTab) {
-            // user grabbed a resize tab, check to see if
-            // resizing this column is allowed
-            if ((column->fFlags & CLV_NOT_RESIZABLE) == 0) {
-                fColumnClicked = (CLVColumn*)fDisplayList->ItemAt(i);
-                fColumnResizing = true;
-                fPreviousMousePosition = where;
-                fMouseClickedPosition = where;
-                fColumnDragging = false;
-                fResizeMouseHoldOffset = where.x - fColumnClicked->fColumnEnd;
-                Invalidate(BRect(fColumnClicked->fColumnEnd, bounds.top,
-                    column->fColumnEnd, bounds.bottom));
-
-                // start watching the mouse
-                shouldWatchMouse = true;
-            }
-        }
-    }
-
-    if (shouldWatchMouse) {
-        thread_id MouseWatcherThread = StartMouseWatcher(this);
-        if (MouseWatcherThread == B_NO_MORE_THREADS
-            || MouseWatcherThread == B_NO_MEMORY) {
-            fColumnClicked = NULL;
-        }
-    }
-}
-
-
-void
-CLVColumnLabelView::MessageReceived(BMessage* message)
-{
-    if (message->what != MW_MOUSE_MOVED && message->what != MW_MOUSE_DOWN
-        && message->what != MW_MOUSE_UP) {
-        BView::MessageReceived(message);
-    } else if (fColumnClicked != NULL) {
-        BPoint mousePosition;
-        message->FindPoint("where", &mousePosition);
-        uint32 buttons;
-        message->FindInt32("buttons", (int32*)&buttons);
-        uint32 modifiers;
-        message->FindInt32("modifiers", (int32*)&modifiers);
-        BRect bounds;
-        bounds = Bounds();
-        uint32 columnFlags = fColumnClicked->Flags();
-        if (buttons == B_PRIMARY_MOUSE_BUTTON) {
-            // mouse is still held down
-            if (!fColumnResizing) {
-                // user is clicking or dragging
-                if ((mousePosition.x < fMouseClickedPosition.x - 2.0
-                        || mousePosition.x > fMouseClickedPosition.x + 2.0)
-                    && !fColumnDragging) {
-                    // user is initiating a drag
-                    if ((fDragGroup->flags & CLV_NOT_MOVABLE) != 0) {
-                        // not allowed to drag this column - terminate the click
-                        Invalidate(BRect(fColumnClicked->fColumnBegin,
-                            bounds.top, fColumnClicked->fColumnEnd,
-                            bounds.bottom));
-                        fColumnClicked = NULL;
-                    } else {
-                        // actually initiate a drag
-                        fColumnDragging = true;
-                        fPreviousDragOutlineLeft = -1.0;
-                        fPreviousDragOutlineRight = -1.0;
-                    }
-                }
-
-                // now deal with dragging
-                if (fColumnDragging) {
-                    // user is dragging
-                    if (mousePosition.x < fPreviousMousePosition.x
-                        || mousePosition.x > fPreviousMousePosition.x) {
-                        // mouse moved since I last checked
-                        bounds = Bounds();
-
-                        bool hasColumnSnapped;
-                        do {
-                            // live dragging of columns
-                            hasColumnSnapped = false;
-                            float columnsUpdateLeft = 0;
-                            float columnsUpdateRight = 0;
-                            float MainViewUpdateLeft = 0;
-                            float MainViewUpdateRight = 0;
-                            CLVColumn* lastSwapColumn = NULL;
-                            if (fSnapMin != -1.0
-                                && mousePosition.x < fSnapMin) {
-                                // shift the group left
-                                columnsUpdateLeft
-                                    = fShownGroupBefore->groupBeginIndex;
-                                columnsUpdateRight = fDragGroup->groupEndIndex;
-                                MainViewUpdateLeft = columnsUpdateLeft;
-                                MainViewUpdateRight = columnsUpdateRight;
-                                lastSwapColumn
-                                    = fShownGroupBefore->lastColumnShown;
-                                if ((fDragGroup->lastColumnShown->fFlags
-                                        & CLV_MERGE_WITH_RIGHT) != 0) {
-                                    columnsUpdateRight += 1.0;
-                                } else if ((fShownGroupBefore->
-                                    lastColumnShown->fFlags
-                                        & CLV_MERGE_WITH_RIGHT) != 0) {
-                                    columnsUpdateRight += 1.0;
-                                }
-
-                                ShiftDragGroup(fSnapGroupBeforeIndex);
-                                hasColumnSnapped = true;
-                            }
-
-                            if (fSnapMax != -1.0
-                                && mousePosition.x > fSnapMax) {
-                                // shift the group right
-                                columnsUpdateLeft = fDragGroup->groupBeginIndex;
-                                columnsUpdateRight
-                                    = fShownGroupAfter->groupEndIndex;
-                                MainViewUpdateLeft = columnsUpdateLeft;
-                                MainViewUpdateRight = columnsUpdateRight;
-                                lastSwapColumn = fDragGroup->lastColumnShown;
-                                if ((fDragGroup->lastColumnShown->fFlags
-                                        & CLV_MERGE_WITH_RIGHT) != 0) {
-                                    columnsUpdateRight += 1.0;
-                                } else if ((fShownGroupAfter
-                                    ->lastColumnShown->fFlags
-                                        & CLV_MERGE_WITH_RIGHT) != 0) {
-                                    columnsUpdateRight += 1.0;
-                                }
-                                ShiftDragGroup(fSnapGroupAfterIndex + 1);
-                                hasColumnSnapped = true;
-                            }
-
-                            if (hasColumnSnapped) {
-                                // redraw the snapped column labels
-                                Invalidate(BRect(columnsUpdateLeft,
-                                    bounds.top, columnsUpdateRight,
-                                    bounds.bottom));
-                                BRect mainBounds = fParent->Bounds();
-                                // modify MainViewUpdateRight if more
-                                // columns are pushed by expanders
-                                if ((lastSwapColumn->fFlags & CLV_EXPANDER) != 0
-                                        || (lastSwapColumn->fPushedByExpander
-                                    && ((lastSwapColumn->fFlags & CLV_PUSH_PASS)
-                                        != 0))) {
-                                    int32 columnCount
-                                        = fDisplayList->CountItems();
-                                    for (int32 j = fDisplayList->IndexOf(
-                                            lastSwapColumn) + 1;
-                                        j < columnCount; j++) {
-                                        CLVColumn* column =
-                                            (CLVColumn*)fDisplayList->ItemAt(j);
-                                        if (column->IsShown()) {
-                                            if (column->fPushedByExpander)
-                                                MainViewUpdateRight
-                                                    = column->fColumnEnd;
-                                            else
-                                                break;
-                                        }
-                                    }
-                                }
-                                fParent->Invalidate(BRect(MainViewUpdateLeft,
-                                    mainBounds.top, MainViewUpdateRight,
-                                    mainBounds.bottom));
-                            }
-                        } while (hasColumnSnapped);
-                        // erase and redraw the drag rectangle but not the
-                        // interior to avoid label flicker
-                        float min = fPreviousDragOutlineLeft;
-                        float max = fPreviousDragOutlineRight;
-                        float min2 = mousePosition.x - fDragBoxMouseHoldOffset;
-                        float groupBegin = ((CLVDragGroup*)fDragGroupsList.ItemAt(
-                            fDragGroupIndex))->groupBeginIndex;
-                        if (min2 < groupBegin && fSnapGroupBeforeIndex == -1)
-                            min2 = groupBegin;
-
-                        if (min2 > groupBegin && fSnapGroupAfterIndex == -1)
-                            min2 = groupBegin;
-
-                        float max2 = min2 + fDragBoxWidth;
-                        float Temp;
-                        if (min2 < min || min == -1.0) {
-                            Temp = min2;
-                            min2 = min;
-                            min = Temp;
-                        }
-
-                        if (max2 > max || max == -1.0) {
-                            Temp = max2;
-                            max2 = max;
-                            max = Temp;
-                        }
-                        Invalidate(BRect(min, bounds.top + 1.0, min,
-                            bounds.bottom - 1.0));
-                        if (min2 != -1.0) {
-                            Invalidate(BRect(min2, bounds.top + 1.0, min2,
-                                bounds.bottom - 1.0));
-                        }
-                        Invalidate(BRect(max, bounds.top + 1.0, max,
-                            bounds.bottom - 1.0));
-                        if (max2 != -1.0) {
-                            Invalidate(BRect(max2, bounds.top + 1.0, max2,
-                                bounds.bottom - 1.0));
-                        }
-                        Invalidate(BRect(min, bounds.top, max, bounds.top));
-                        Invalidate(BRect(min, bounds.bottom, max,
-                            bounds.bottom));
-                    }
-                }
-            } else {
-                // user is resizing the column
-                if (mousePosition.x < fPreviousMousePosition.x
-                    || mousePosition.x > fPreviousMousePosition.x) {
-                    float newWidth = mousePosition.x - fResizeMouseHoldOffset
-                        - fColumnClicked->fColumnBegin;
-                    if (newWidth < fColumnClicked->fMinWidth)
-                        newWidth = fColumnClicked->fMinWidth;
-
-                    if (newWidth != fColumnClicked->fWidth) {
-                        fColumnClicked->SetWidth(newWidth);
-                        fParent->ColumnWidthChanged(fParent->IndexOfColumn(
-                            fColumnClicked), newWidth);
-                    }
-                }
-            }
-        } else if (buttons == 0) {
-            // mouse button was released
-            if (!fColumnDragging && !fColumnResizing) {
-                // column was clicked
-                if ((columnFlags & CLV_SORT_KEYABLE) != 0) {
-                    // column is a "sortable" column
-                    if ((modifiers & B_SHIFT_KEY) == 0) {
-                        // user wants to select it as the main sorting column
-                        if (fParent->fSortKeyList.ItemAt(0) == fColumnClicked) {
-                            // column was already selected; switch sort modes
-                            fParent->ReverseSortMode(
-                                fParent->fColumnList.IndexOf(fColumnClicked));
-                        } else {
-                            //The user selected this column for sorting
-                            fParent->SetSortKey(
-                                fParent->fColumnList.IndexOf(fColumnClicked));
-                        }
-                    } else {
-                        // user wants to add it as a secondary sorting column
-                        if (fParent->fSortKeyList.HasItem(fColumnClicked)) {
-                            // column was already selected; switch sort modes
-                            fParent->ReverseSortMode(
-                                fParent->fColumnList.IndexOf(fColumnClicked));
-                        } else {
-                            // user selected this column for sorting
-                            fParent->AddSortKey(
-                                fParent->fColumnList.IndexOf(fColumnClicked));
-                        }
-                    }
-                }
-            } else if (fColumnDragging) {
-                // column was dragging; erase the drag box but not
-                // the interior to avoid label flicker
-                Invalidate(BRect(fPreviousDragOutlineLeft, bounds.top + 1.0,
-                    fPreviousDragOutlineLeft, bounds.bottom - 1.0));
-                Invalidate(BRect(fPreviousDragOutlineRight, bounds.top + 1.0,
-                    fPreviousDragOutlineRight, bounds.bottom - 1.0));
-                Invalidate(BRect(fPreviousDragOutlineLeft, bounds.top,
-                    fPreviousDragOutlineRight, bounds.top));
-                Invalidate(BRect(fPreviousDragOutlineLeft, bounds.bottom,
-                    fPreviousDragOutlineRight, bounds.bottom));
-            } else {
-                // column was resizing; erase the drag tab
-                Invalidate(BRect(fColumnClicked->fColumnEnd,
-                    bounds.top, fColumnClicked->fColumnEnd,
-                    bounds.bottom));
-            }
-
-            // unhighlight the label and forget the column
-            Invalidate(BRect(fColumnClicked->fColumnBegin + 1.0,
-                bounds.top + 1.0, fColumnClicked->fColumnEnd - 1.0,
-                bounds.bottom - 1.0));
-            fColumnClicked = NULL;
-            fColumnDragging = false;
-            fColumnResizing = false;
-        } else {
-            // unused button combination, unhighlight the label and
-            // forget the column
-            Invalidate(BRect(fColumnClicked->fColumnBegin + 1.0,
-                bounds.top + 1.0, fColumnClicked->fColumnEnd - 1.0,
-                bounds.bottom - 1.0));
-            fColumnClicked = NULL;
-            fColumnDragging = false;
-            fColumnResizing = false;
-        }
-
-        fPreviousMousePosition = mousePosition;
-    }
-}
-
-
-// Shift the drag group into a new position
-void
-CLVColumnLabelView::ShiftDragGroup(int32 newPosition)
-{
-    int32 groupCount = fDragGroupsList.CountItems();
-    CLVDragGroup* group;
-    BList newDisplayList;
-
-    //Copy the groups up to the new position
-    for (int32 i = 0; i < newPosition; i++) {
-        if (i != fDragGroupIndex) {
-            group = (CLVDragGroup*)fDragGroupsList.ItemAt(i);
-            for (int32 j = group->groupStartDisplayListIndex;
-                    j <= group->groupStopDisplayListIndex; j++) {
-                newDisplayList.AddItem(fDisplayList->ItemAt(j));
-            }
-        }
-    }
-
-    // copy the group into the new position
-    group = (CLVDragGroup*)fDragGroupsList.ItemAt(fDragGroupIndex);
-    for (int32 j = group->groupStartDisplayListIndex;
-            j <= group->groupStopDisplayListIndex; j++) {
-        newDisplayList.AddItem(fDisplayList->ItemAt(j));
-    }
-
-    // copy the rest of the groups, but skip the dragging group
-    for (int32 i = newPosition; i < groupCount; i++) {
-        if (i != fDragGroupIndex) {
-            group = (CLVDragGroup*)fDragGroupsList.ItemAt(i);
-            for (int32 j = group->groupStartDisplayListIndex;
-                    j <= group->groupStopDisplayListIndex; j++) {
-                newDisplayList.AddItem(fDisplayList->ItemAt(j));
-            }
-        }
-    }
-
-    // set the new order
-    *fDisplayList = newDisplayList;
-
-    // update columns and drag groups
-    fParent->ShiftDragGroup();
-    UpdateDragGroups();
-    SetSnapMinMax();
-
-    // inform the program that the display order changed
-    int32* newOrder = fParent->DisplayOrder();
-    fParent->DisplayOrderChanged(newOrder);
-    delete[] newOrder;
-}
-
-
-// Make a copy of the DragGroups list, use it to store
-// the CLVDragGroup's for recycling.
-void
-CLVColumnLabelView::UpdateDragGroups()
-{
-    BList tempList(fDragGroupsList);
-    fDragGroupsList.MakeEmpty();
-    int32 columnCount = fDisplayList->CountItems();
-    bool shouldContinueGroup = false;
-    CLVDragGroup* CurrentGroup = NULL;
-
-    for (int32 i = 0; i < columnCount; i++) {
-        CLVColumn* CurrentColumn = (CLVColumn*)fDisplayList->ItemAt(i);
-        if (!shouldContinueGroup) {
-            // recycle or obtain a new CLVDragGroup
-            CurrentGroup = (CLVDragGroup*)tempList.RemoveItem(int32(0));
-            if (CurrentGroup == NULL)
-                CurrentGroup = new CLVDragGroup;
-
-            // add the CLVDragGroup to the DragGroups list
-            fDragGroupsList.AddItem(CurrentGroup);
-            // set up the new DragGroup
-            CurrentGroup->groupStartDisplayListIndex = i;
-            CurrentGroup->groupStopDisplayListIndex = i;
-            CurrentGroup->flags = 0;
-
-            if (CurrentColumn->IsShown()) {
-                CurrentGroup->groupBeginIndex = CurrentColumn->fColumnBegin;
-                CurrentGroup->groupEndIndex = CurrentColumn->fColumnEnd;
-                CurrentGroup->lastColumnShown = CurrentColumn;
-                CurrentGroup->isShown = true;
-                if (CurrentColumn->fFlags & CLV_LOCK_AT_BEGINNING)
-                    CurrentGroup->isAllLockBeginning = true;
-                else
-                    CurrentGroup->isAllLockBeginning = false;
-
-                if (CurrentColumn->fFlags & CLV_LOCK_AT_END)
-                    CurrentGroup->isAllLockEnd = true;
-                else
-                    CurrentGroup->isAllLockEnd = false;
-            } else {
-                CurrentGroup->groupBeginIndex = -1.0;
-                CurrentGroup->groupEndIndex = -1.0;
-                CurrentGroup->lastColumnShown = NULL;
-                CurrentGroup->isShown = false;
-                if (CurrentColumn->fFlags & CLV_LOCK_AT_BEGINNING)
-                    CurrentGroup->isAllLockBeginning = true;
-                else
-                    CurrentGroup->isAllLockBeginning = false;
-                if (CurrentColumn->fFlags & CLV_LOCK_AT_END)
-                    CurrentGroup->isAllLockEnd = true;
-                else
-                    CurrentGroup->isAllLockEnd = false;
-            }
-        } else {
-            // add this column to the current DragGroup
-            CurrentGroup->groupStopDisplayListIndex = i;
-            if (CurrentColumn->IsShown()) {
-                if (CurrentGroup->groupBeginIndex == -1.0)
-                    CurrentGroup->groupBeginIndex = CurrentColumn->fColumnBegin;
-                CurrentGroup->groupEndIndex = CurrentColumn->fColumnEnd;
-                CurrentGroup->lastColumnShown = CurrentColumn;
-                CurrentGroup->isShown = true;
-            }
-            if ((CurrentColumn->fFlags & CLV_LOCK_AT_BEGINNING) == 0)
-                CurrentGroup->isAllLockBeginning = false;
-            if ((CurrentColumn->fFlags & CLV_LOCK_AT_END) == 0)
-                CurrentGroup->isAllLockEnd = false;
-        }
-
-        CurrentGroup->flags = CurrentColumn->fFlags
-            & (CLV_NOT_MOVABLE | CLV_LOCK_AT_BEGINNING
-                | CLV_LOCK_AT_END);
-        // see if I should add more columns to this group
-        if (CurrentColumn->fFlags & CLV_LOCK_WITH_RIGHT)
-            shouldContinueGroup = true;
-        else
-            shouldContinueGroup = false;
-    }
-    // if any unused groups remain in tempList, delete them
-    while ((CurrentGroup = (CLVDragGroup*)tempList.RemoveItem(int32(0)))
-            != NULL) {
-        delete CurrentGroup;
-    }
-}
-
-
-// find the column group that the user is dragging and the shown
-// group before it
-void
-CLVColumnLabelView::SetSnapMinMax()
-{
-    int32 groupCount = fDragGroupsList.CountItems();
-    int32 columnCount;
-    fDragGroupIndex = -1;
-    fShownGroupBefore = NULL;
-    fSnapGroupBeforeIndex = -1;
-    CLVDragGroup* group;
-    for (int32 i = 0; i < groupCount; i++) {
-        group = (CLVDragGroup*)fDragGroupsList.ItemAt(i);
-        for (columnCount = group->groupStartDisplayListIndex;
-            columnCount <= group->groupStopDisplayListIndex; columnCount++) {
-            if (fDisplayList->ItemAt(columnCount) == fColumnClicked) {
-                fDragGroupIndex = i;
-                fDragGroup = group;
-                break;
-            }
-        }
-
-        if (fDragGroupIndex != -1)
-            break;
-        else if (group->isShown) {
-            fShownGroupBefore = group;
-            fSnapGroupBeforeIndex = i;
-        }
-    }
-
-    // find the position of shown group after the one that the user is dragging
-    fShownGroupAfter = NULL;
-    fSnapGroupAfterIndex = -1;
-    for (int32 i = fDragGroupIndex + 1; i < groupCount; i++) {
-        group = (CLVDragGroup*)fDragGroupsList.ItemAt(i);
-        if (group->isShown) {
-            fShownGroupAfter = group;
-            fSnapGroupAfterIndex = i;
-            break;
-        }
-    }
-
-    // see if it can actually snap in the given direction
-    if (fSnapGroupBeforeIndex != -1) {
-        if ((fShownGroupBefore->flags & CLV_LOCK_AT_BEGINNING) != 0
-            && !fDragGroup->isAllLockBeginning) {
-            fSnapGroupBeforeIndex = -1;
-        }
-        if ((fDragGroup->flags & CLV_LOCK_AT_END) != 0
-            && !fShownGroupBefore->isAllLockEnd) {
-            fSnapGroupBeforeIndex = -1;
-        }
-    }
-    if (fSnapGroupAfterIndex != -1) {
-        if (fShownGroupAfter->flags & CLV_LOCK_AT_END
-            && !fDragGroup->isAllLockEnd) {
-                fSnapGroupAfterIndex = -1;
-        }
-        if (fDragGroup->flags & CLV_LOCK_AT_BEGINNING
-            && !fShownGroupAfter->isAllLockBeginning) {
-                fSnapGroupAfterIndex = -1;
-        }
-    }
-
-    // find the minumum and maximum positions for the group to snap
-    fSnapMin = -1.0;
-    fSnapMax = -1.0;
-    fDragBoxWidth = fDragGroup->groupEndIndex - fDragGroup->groupBeginIndex;
-    if (fSnapGroupBeforeIndex != -1) {
-        fSnapMin = fShownGroupBefore->groupBeginIndex + fDragBoxWidth;
-        if (fSnapMin > fShownGroupBefore->groupEndIndex)
-            fSnapMin = fShownGroupBefore->groupEndIndex;
-    }
-    if (fSnapGroupAfterIndex != -1){
-        fSnapMax = fShownGroupAfter->groupEndIndex - fDragBoxWidth;
-        if (fSnapMax < fShownGroupAfter->groupBeginIndex)
-            fSnapMax = fShownGroupAfter->groupBeginIndex;
-    }
-}

deleted file src/preferences/shortcuts/clv/CLVColumnLabelView.h

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-#ifndef CLV_COLUMN_LABEL_VIEW_H
-#define CLV_COLUMN_LABEL_VIEW_H
-
-
-#include <support/SupportDefs.h>
-#include <InterfaceKit.h>
-
-
-class ColumnListView;
-class CLVColumn;
-
-
-struct CLVDragGroup
-{
-    int32 groupStartDisplayListIndex;
-        // indices in the column display list where this group starts
-    int32 groupStopDisplayListIndex;
-        // and finishes
-    float groupBeginIndex;
-        // -1.0 if whole group is hidden
-    float groupEndIndex;
-        // -1.0 if whole group is hidden
-    CLVColumn* lastColumnShown;
-    bool isAllLockBeginning;
-    bool isAllLockEnd;
-    bool isShown;
-        // false if none of the columns in this group are shown
-    uint32 flags;
-        // Uses CLV_NOT_MOVABLE, CLV_LOCK_AT_BEGINNING, CLV_LOCK_AT_END
-};
-
-
-class CLVColumnLabelView : public BView
-{
-public:
-                            CLVColumnLabelView(BRect frame,
-                                ColumnListView* parent,
-                                const BFont* font);
-                            ~CLVColumnLabelView();
-
-        // BView overrides
-            void            Draw(BRect UpdateRect);
-            void            MouseDown(BPoint Point);
-            void            MessageReceived(BMessage* message);
-
-private:
-        friend class ColumnListView;
-        friend class CLVColumn;
-
-            void            ShiftDragGroup(int32 newPosition);
-            void            UpdateDragGroups();
-            void            SetSnapMinMax();
-
-            float           fFontAscent;
-            BList*          fDisplayList;
-
-        // column select and drag stuff
-            CLVColumn*      fColumnClicked;
-            BPoint          fPreviousMousePosition;
-            BPoint          fMouseClickedPosition;
-            bool            fColumnDragging;
-            bool            fColumnResizing;
-            BList           fDragGroupsList;
-        // groups of CLVColumns that must drag together
-            int32           fDragGroupIndex;
-        // index into DragGroups of the group being dragged by user
-            CLVDragGroup*   fDragGroup;
-            CLVDragGroup*   fShownGroupBefore;
-            CLVDragGroup*   fShownGroupAfter;
-            int32           fSnapGroupBeforeIndex;
-            int32           fSnapGroupAfterIndex;
-        // index into DragGroups of fShownGroupBefore and
-        // fShownGroupAfter, if the group the user is dragging is
-        // allowed to snap there, otherwise -1
-            float           fDragBoxMouseHoldOffset;
-            float           fResizeMouseHoldOffset;
-            float           fDragBoxWidth;
-        // can include multiple columns; depends on CLV_LOCK_WITH_RIGHT
-            float           fPreviousDragOutlineLeft;
-            float           fPreviousDragOutlineRight;
-            float           fSnapMin;
-            float           fSnapMax;
-        // -1.0 indicates the column can't snap in the given direction
-            ColumnListView* fParent;
-};
-
-
-#endif  // CLV_COLUMN_LABEL_VIEW_H

deleted file src/preferences/shortcuts/clv/CLVListItem.cpp

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-
-
-#define CLVListItem_CPP
-
-#include <stdio.h>
-
-#include "CLVListItem.h"
-#include "ColumnListView.h"
-#include "CLVColumn.h"
-#include "PrefilledBitmap.h"
-
-#include "InterfaceKit.h"
-
-
-CLVListItem::CLVListItem(uint32 level, bool superitem, bool expanded,
-    float minheight)
-    :
-    BListItem(level, expanded),
-    fExpanderButtonRect(-1.0, -1.0, -1.0, -1.0),
-    fExpanderColumnRect(-1.0, -1.0, -1.0, -1.0),
-    fSelectedColumn(-1)
-{
-    fIsSuperItem = superitem;
-    fOutlineLevel = level;
-    fMinHeight = minheight;
-}
-
-
-CLVListItem::~CLVListItem()
-{
-}
-
-
-bool
-CLVListItem::IsSuperItem() const
-{
-    return fIsSuperItem;
-}
-
-
-void
-CLVListItem::SetSuperItem(bool superitem)
-{
-    fIsSuperItem = superitem;
-}
-
-
-uint32
-CLVListItem::OutlineLevel() const
-{
-    return fOutlineLevel;
-}
-
-
-void
-CLVListItem::SetOutlineLevel(uint32 level)
-{
-    fOutlineLevel = level;
-}
-
-
-void
-CLVListItem::Pulse(BView* owner)
-{
-}
-
-void
-CLVListItem::DrawItem(BView* owner, BRect itemRect, bool complete)
-{
-    BList* displayList = &((ColumnListView*)owner)->fColumnDisplayList;
-    int32 columnCount = displayList->CountItems();
-    float PushMax = itemRect.right;
-    CLVColumn* column;
-    BRect columnRect = itemRect;
-    float expanderDelta = OutlineLevel() * 20.0;
-    // figure out what the limit is for expanders pushing other columns
-    for (int32 i = 0; i < columnCount; i++) {
-        column = (CLVColumn*)displayList->ItemAt(i);
-        if((column->fFlags & CLV_EXPANDER) || column->fPushedByExpander)
-            PushMax = column->fColumnEnd;
-    }
-
-    BRegion ClippingRegion;
-    if (!complete)
-        owner->GetClippingRegion(&ClippingRegion);
-    else
-        ClippingRegion.Set(itemRect);
-
-    float LastColumnEnd = -1.0;
-
-    // draw the columns
-    for (int32 Counter = 0; Counter < columnCount; Counter++) {
-        column = (CLVColumn*)displayList->ItemAt(Counter);
-        if(!column->IsShown())
-            continue;
-
-        columnRect.left = column->fColumnBegin;
-        columnRect.right = LastColumnEnd = column->fColumnEnd;
-        float shift = 0.0;
-        if ((column->fFlags & CLV_EXPANDER) || column->fPushedByExpander)
-            shift = expanderDelta;
-
-        if (column->fFlags & CLV_EXPANDER) {
-            columnRect.right += shift;
-            if(columnRect.right > PushMax)
-                columnRect.right = PushMax;
-
-            fExpanderColumnRect = columnRect;
-            if (ClippingRegion.Intersects(columnRect)) {
-                // give the programmer a chance to do his kind of
-                // highlighting if the item is selected
-                int32 actualIndex
-                    = ((ColumnListView*)owner)->fColumnList.IndexOf(column);
-                DrawItemColumn(owner, columnRect, actualIndex,
-                    (fSelectedColumn == actualIndex), complete);
-                if (fIsSuperItem) {
-                    // draw the expander, clip manually
-                    float top
-                        = ceilf((columnRect.bottom-columnRect.top - 10.0)
-                            / 2.0);
-                    float left = column->fColumnEnd + shift - 3.0 - 10.0;
-                    float rightClip = left + 10.0 - columnRect.right;
-                    if (rightClip < 0.0)
-                        rightClip = 0.0;
-
-                    BBitmap* arrow;
-                    if (IsExpanded())
-                        arrow = &((ColumnListView*)owner)->fDownArrow;
-                    else
-                        arrow = &((ColumnListView*)owner)->fRightArrow;
-
-                    if (left <= columnRect.right) {
-                        fExpanderButtonRect.Set(left, columnRect.top + top,
-                            left + 10.0 - rightClip, columnRect.top + top + 10.0);
-                        owner->SetDrawingMode(B_OP_OVER);
-                        owner->DrawBitmap(arrow,
-                            BRect(0.0, 0.0, 10.0 - rightClip, 10.0),
-                            fExpanderButtonRect);
-                        owner->SetDrawingMode(B_OP_COPY);
-                    } else
-                        fExpanderButtonRect.Set(-1.0, -1.0, -1.0, -1.0);
-                }
-            }
-        } else {
-            columnRect.left += shift;
-            columnRect.right += shift;
-            if (shift > 0.0 && columnRect.right > PushMax)
-                columnRect.right = PushMax;
-
-            if (columnRect.right >= columnRect.left
-                && ClippingRegion.Intersects(columnRect))
-            {
-                int32 actualIndex
-                    = ((ColumnListView*)owner)->fColumnList.IndexOf(column);
-                DrawItemColumn(owner, columnRect, actualIndex,
-                    (fSelectedColumn == actualIndex), complete);
-            }
-        }
-    }
-
-    // fill the area after all the columns (so the select highlight goes
-    // all the way across)
-    columnRect.left = LastColumnEnd + 1.0;
-    columnRect.right = owner->Bounds().right;
-    if (columnRect.left <= columnRect.right
-        && ClippingRegion.Intersects(columnRect)) {
-        DrawItemColumn(owner, columnRect, -1, false, complete);
-    }
-}
-
-
-float
-CLVListItem::ExpanderShift(int32 columnIndex, BView* owner)
-{
-    BList* displayList = &((ColumnListView*)owner)->fColumnDisplayList;
-    CLVColumn* column = (CLVColumn*)displayList->ItemAt(columnIndex);
-    float expanderDelta = OutlineLevel() * 20.0f;
-    if (!column->fPushedByExpander)
-        expanderDelta = 0.0;
-
-    return expanderDelta;
-}
-
-
-void
-CLVListItem::Update(BView* owner, const BFont* font)
-{
-    BListItem::Update(owner, font);
-    float itemHeight = Height();
-    if (itemHeight < fMinHeight)
-        itemHeight = fMinHeight;
-
-    SetWidth(((ColumnListView*)owner)->fPageWidth);
-    SetHeight(itemHeight);
-}

deleted file src/preferences/shortcuts/clv/CLVListItem.h

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-#ifndef CLV_LIST_ITEM_H
-#define CLV_LIST_ITEM_H
-
-
-#include <interface/ListItem.h>
-
-
-class ColumnListView;
-
-
-class CLVListItem : public BListItem
-{
-public:
-                                    CLVListItem(uint32 level = 0,
-                                        bool superitem = false,
-                                        bool expanded = false,
-                                        float minheight = 0.0);
-    virtual                         ~CLVListItem();
-
-        //Archival stuff
-        /* Not implemented yet
-                                    CLVItem(BMessage* archive);
-    static  CLVItem*                Instantiate(BMessage* data);
-    virtual status_t                Archive(BMessage* data, bool deep = true)
-                                        const;
-        */
-
-    virtual void                    DrawItemColumn(BView* owner,
-                                        BRect columnRect,
-                                        int32 columnIndex,
-                                        bool columnSelected,
-                                        bool complete) = 0;
-        // columnIndex (0-N) is based on the order in which the columns
-        // were added to the ColumnListView, not the display order.
-        // An index of -1 indicates that the program needs to draw a blank
-        // area beyond the last column. The main purpose is to allow the
-        // highlighting bar to continue all the way to the end of the'
-        // ColumnListView, even after the end of the last column.
-
-    virtual void                    DrawItem(BView* owner, BRect itemRect,
-                                        bool complete);
-        // In general, you don't need or want to override DrawItem().
-            float                   ExpanderShift(int32 columnIndex,
-                                        BView* owner);
-    virtual void                    Update(BView* owner, const BFont* font);
-            bool                    IsSuperItem() const;
-            void                    SetSuperItem(bool superitem);
-            uint32                  OutlineLevel() const;
-            void                    SetOutlineLevel(uint32 level);
-
-    virtual void                    Pulse(BView* owner);
-        // Called periodically when this item is selected.
-
-            int32                   GetSelectedColumn() const
-                                        { return fSelectedColumn; }
-            void                    SetSelectedColumn(int32 i)
-                                        { fSelectedColumn = i; }
-
-    private:
-        friend class ColumnListView;
-
-            bool                    fIsSuperItem;
-            uint32                  fOutlineLevel;
-            float                   fMinHeight;
-            BRect                   fExpanderButtonRect;
-            BRect                   fExpanderColumnRect;
-            BList*                  fSortingContextBList;
-            ColumnListView*         fSortingContextCLV;
-            int32                   fSelectedColumn;
-};
-
-
-#endif  // CLV_LIST_ITEM_H

deleted file src/preferences/shortcuts/clv/Colors.h

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-#ifndef J_COLORS_H
-#define J_COLORS_H
-
-// useful until be gets around to making these sorts of things
-// globals akin to be_plain_font, etc.
-#include <ColorControl.h>
-
-// Be standard UI colors
-const rgb_color BeBackgroundGrey =      { 216, 216, 216, 255 };
-const rgb_color BeInactiveControlGrey = { 240, 240, 240, 255 };
-const rgb_color BeFocusBlue =           { 0,   0,   229, 255 };
-const rgb_color BeHighlight =           { 255, 255, 255, 255 };
-const rgb_color BeShadow =              { 152, 152, 152, 255 };
-const rgb_color BeDarkShadow =          { 108, 108, 108, 255 };
-const rgb_color BeLightShadow =         { 194, 194, 194, 255 };
-const rgb_color BeButtonGrey =          { 232, 232, 232, 255 };
-const rgb_color BeInactiveGrey =        { 127, 127, 127, 255 };
-const rgb_color BeListSelectGrey =      { 178, 178, 178, 255 };
-const rgb_color BeTitleBarYellow =      { 255, 203, 0,   255 };
-
-// Other colors
-const rgb_color Black =                 { 0,   0,   0,   255 };
-const rgb_color White =                 { 255, 255, 255, 255 };
-const rgb_color Red =                   { 255, 0,   0,   255 };
-const rgb_color Green =                 { 0,   167, 0,   255 };
-const rgb_color LightGreen =            { 90,  240, 90,  255 };
-const rgb_color Blue =                  { 49,  61,  225, 255 };
-const rgb_color LightBlue =             { 64,  162, 255, 255 };
-const rgb_color Purple =                { 144, 64,  221, 255 };
-const rgb_color LightPurple =           { 166, 74,  255, 255 };
-const rgb_color Lavender =              { 193, 122, 255, 255 };
-const rgb_color Yellow =                { 255, 203, 0,   255 };
-const rgb_color Orange =                { 255, 163, 0,   255 };
-const rgb_color Flesh =                 { 255, 231, 186, 255 };
-const rgb_color Tan =                   { 208, 182, 121, 255 };
-const rgb_color Brown =                 { 154, 110, 45,  255 };
-const rgb_color LightMetallicBlue =     { 143, 166, 240, 255 };
-const rgb_color MedMetallicBlue =       { 75,  96,  154, 255 };
-const rgb_color DarkMetallicBlue =      { 78,  89,  126, 255 };
-
-const rgb_color ReallyLightPurple =     { 255, 210, 255, 255 };
-const rgb_color LightYellow =           { 255, 255, 210, 255 };
-
-
-#endif  // J_COLORS_H

deleted file src/preferences/shortcuts/clv/ColumnListView.cpp

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-
-
-#define ColumnListView_CPP
-
-#include "ColumnListView.h"
-#include "CLVColumnLabelView.h"
-#include "CLVColumn.h"
-#include "CLVListItem.h"
-
-#include <stdio.h>
-#include <interface/Rect.h>
-
-
-uint8 CLVRightArrowData[132] = {
-    0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x00, 0x12, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x00, 0x12, 0x12, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x00, 0x12, 0x12, 0x12, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x00, 0x12, 0x12, 0x12, 0x12, 0x00, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x00, 0x12, 0x12, 0x12, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x00, 0x12, 0x12, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x00, 0x12, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
-};
-
-uint8 CLVDownArrowData[132] = {
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-    0xFF, 0x00, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x00, 0xFF, 0xFF,
-    0xFF, 0xFF, 0x00, 0x12, 0x12, 0x12, 0x12, 0x12, 0x00, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x00, 0x12, 0x12, 0x12, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x12, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
-};
-
-
-class CLVContainerView : public BScrollView
-{
-public:
-                            CLVContainerView(char* name, BView* target,
-                                uint32 resizingMode, uint32 flags,
-                                bool horizontal, bool vertical,
-                                border_style border);
-    virtual                 ~CLVContainerView();
-
-            bool            IsBeingDestroyed() const
-                                { return fIsBeingDestroyed; };
-
-private:
-            bool            fIsBeingDestroyed;
-};
-
-
-CLVContainerView::CLVContainerView(char* name, BView* target,
-    uint32 resizingMode, uint32 flags, bool horizontal, bool vertical,
-    border_style border)
-    :
-    BScrollView(name, target, resizingMode, flags, horizontal, vertical,
-        border)
-{
-    fIsBeingDestroyed = false;
-}
-
-
-CLVContainerView::~CLVContainerView()
-{
-    fIsBeingDestroyed = true;
-}
-
-
-ColumnListView::ColumnListView(BRect frame, BScrollView** containerView,
-    const char* name, uint32 resizingMode, uint32 flags, list_view_type type,
-    bool hierarchical, bool horizontal, bool vertical, border_style border,
-    const BFont* labelFont)
-    :
-    BListView(frame, name, type, B_FOLLOW_ALL_SIDES, flags | B_PULSE_NEEDED),
-    fHierarchical(hierarchical),
-    fColumnList(6),
-    fColumnDisplayList(6),
-    fDataWidth(0),
-    fDataHeight(0),
-    fPageWidth(0),
-    fPageHeight(0),
-    fSortKeyList(6),
-    fRightArrow(BRect(0, 0, 10, 10), B_RGBA32, CLVRightArrowData, false, false),
-    fDownArrow(BRect(0, 0, 10, 10), B_RGBA32, CLVDownArrowData, false, false),
-    fFullItemList(32),
-    fSelectedColumn(-1),
-    fEditMessage(NULL)
-{
-    // create the column titles bar view
-    font_height fontAttributes;
-    labelFont->GetHeight(&fontAttributes);
-    float fLabelFontHeight = ceil(fontAttributes.ascent)
-        + ceil(fontAttributes.descent);
-    float columnLabelViewBottom = frame.top + 1 + fLabelFontHeight + 3;
-    fColumnLabelView = new CLVColumnLabelView(BRect(frame.left, frame.top,
-        frame.right, columnLabelViewBottom), this, labelFont);
-
-    // create the container view
-    CreateContainer(horizontal, vertical, border, resizingMode, flags);
-    *containerView = fScrollView;
-
-    // complete the setup
-    ShiftDragGroup();
-    fColumnLabelView->UpdateDragGroups();
-    fExpanderColumn = -1;
-    fCompareFunction = NULL;
-}
-
-
-ColumnListView::~ColumnListView()
-{
-    // delete all list columns
-    int32 ColumnCount = fColumnList.CountItems();
-    for (int32 i = ColumnCount - 1; i >= 0; i--) {
-        CLVColumn* item = (CLVColumn*)fColumnList.RemoveItem(i);
-        if (item != NULL)
-            delete item;
-    }
-
-    // remove and delete the container view if necessary
-    if (!fScrollView->IsBeingDestroyed()) {
-        fScrollView->RemoveChild(this);
-        delete fScrollView;
-    }
-
-    delete fEditMessage;
-}
-
-
-void
-ColumnListView::CreateContainer(bool horizontal, bool vertical,
-    border_style border, uint32 resizingMode, uint32 flags)
-{
-    BRect frame = Frame();
-    BRect labelsFrame = fColumnLabelView->Frame();
-
-    fScrollView = new CLVContainerView(NULL, this, resizingMode, flags,
-        horizontal, vertical, border);
-    BRect newFrame = Frame();
-    // resize the main view to make room for the CLVColumnLabelView
-    ResizeTo(frame.right - frame.left, frame.bottom -
-        labelsFrame.bottom - 1.0);
-    MoveTo(newFrame.left, newFrame.top
-        + (labelsFrame.bottom - labelsFrame.top + 1.0));
-    fColumnLabelView->MoveTo(newFrame.left, newFrame.top);
-
-    // add the ColumnLabelView
-    fScrollView->AddChild(fColumnLabelView);
-
-    // remove and re-add the BListView so that it will draw after
-    // the CLVColumnLabelView
-    fScrollView->RemoveChild(this);
-    fScrollView->AddChild(this);
-
-    fFillerView = NULL;
-}
-
-
-void
-ColumnListView::AddScrollViewCorner()
-{
-    BPoint farCorner = fScrollView->Bounds().RightBottom();
-    fFillerView = new ScrollViewCorner(farCorner.x - B_V_SCROLL_BAR_WIDTH,
-        farCorner.y - B_H_SCROLL_BAR_HEIGHT);
-    fScrollView->AddChild(fFillerView);
-}
-
-
-void
-ColumnListView::ShiftDragGroup()
-{
-    // figure out the width
-    float columnBegin;
-    float columnEnd = -1.0;
-    fDataWidth = 0.0;
-    bool nextPushedByExpander = false;
-    int32 columnCount = fColumnDisplayList.CountItems();
-    for (int32 i = 0; i < columnCount; i++) {
-        CLVColumn* column = (CLVColumn*)fColumnDisplayList.ItemAt(i);
-        if (nextPushedByExpander)
-            column->fPushedByExpander = true;
-        else
-            column->fPushedByExpander = false;
-
-        if (column->IsShown()) {
-            float columnWidth = column->Width();
-            columnBegin = columnEnd + 1.0;
-            columnEnd = columnBegin + columnWidth;
-            column->fColumnBegin = columnBegin;
-            column->fColumnEnd = columnEnd;
-            fDataWidth = column->fColumnEnd;
-            if (nextPushedByExpander && !(column->fFlags & CLV_PUSH_PASS))
-                nextPushedByExpander = false;
-
-            if (column->fFlags & CLV_EXPANDER) {
-                // set the next column to be pushed
-                nextPushedByExpander = true;
-            }
-        }
-    }
-
-    // figure out the height
-    fDataHeight = 0.0;
-    int32 itemCount = CountItems();
-    for (int32 i = 0; i < itemCount; i++)
-        fDataHeight += ItemAt(i)->Height() + 1.0;
-
-    if (itemCount > 0)
-        fDataHeight -= 1.0;
-
-    // update the scroll bars
-    UpdateScrollBars();
-}
-
-
-void
-ColumnListView::UpdateScrollBars()
-{
-    if (fScrollView != NULL) {
-        // figure out the bounds and scroll if necessary
-        BRect bounds;
-        float deltaX;
-        float deltaY;
-        do {
-            bounds = Bounds();
-            //Figure out the width of the page rectangle
-            fPageWidth = fDataWidth;
-            fPageHeight = fDataHeight;
-            //If view runs past the end, make more visible at the beginning
-            deltaX = 0.0;
-            if (bounds.right > fDataWidth && bounds.left > 0) {
-                deltaX = bounds.right - fDataWidth;
-                if (deltaX > bounds.left)
-                    deltaX = bounds.left;
-            }
-            deltaY = 0.0;
-            if (bounds.bottom > fDataHeight && bounds.top > 0) {
-                deltaY = bounds.bottom - fDataHeight;
-                if (deltaY > bounds.top)
-                    deltaY = bounds.top;
-            }
-            if (deltaX != 0.0 || deltaY != 0.0) {
-                ScrollTo(BPoint(bounds.left - deltaX, bounds.top - deltaY));
-                bounds = Bounds();
-            }
-            if (bounds.right-bounds.left > fDataWidth)
-                fPageWidth = bounds.right;
-
-            if (bounds.bottom-bounds.top > fDataHeight)
-                fPageHeight = bounds.bottom;
-        } while (deltaX != 0.0 || deltaY != 0.0);
-
-        // figure out the ratio of the bounds rectangle width or height
-        // to the page rectangle width or height
-        float widthRatio = (bounds.right - bounds.left) / fPageWidth;
-        float heightRatio = (bounds.bottom - bounds.top) / fPageHeight;
-
-        BScrollBar* horizontalScrollBar = fScrollView->ScrollBar(B_HORIZONTAL);
-        BScrollBar* verticalScrollBar = fScrollView->ScrollBar(B_VERTICAL);
-        // set the scroll bar ranges and proportions.  If the whole document
-        // is visible, inactivate the slider
-        if (horizontalScrollBar != NULL) {
-            if (widthRatio >= 1.0 && bounds.left == 0.0)
-                horizontalScrollBar->SetRange(0.0, 0.0);
-            else {
-                horizontalScrollBar->SetRange(0.0, fPageWidth
-                    - (bounds.right - bounds.left));
-            }
-            horizontalScrollBar->SetProportion(widthRatio);
-            // set the step values
-            horizontalScrollBar->SetSteps(20.0, bounds.right - bounds.left);
-        }
-
-        if (verticalScrollBar != NULL) {
-            if (heightRatio >= 1.0 && bounds.top == 0.0) {
-                verticalScrollBar->SetRange(0.0, 0.0);
-                if (fFillerView)
-                    fFillerView->SetViewColor(BeInactiveControlGrey);
-            } else {
-                verticalScrollBar->SetRange(0.0,
-                    fPageHeight - (bounds.bottom-bounds.top));
-                if (fFillerView != NULL)
-                    fFillerView->SetViewColor(BeBackgroundGrey);
-            }
-            verticalScrollBar->SetProportion(heightRatio);
-        }
-    }
-}
-
-
-void
-ColumnListView::ColumnsChanged()
-{
-    // any previous column dragging/resizing will get corrupted, so deselect
-    if (fColumnLabelView->fColumnClicked)
-        fColumnLabelView->fColumnClicked = NULL;
-
-    // update the internal sizes and grouping of the columns and sizes
-    // of drag groups
-    ShiftDragGroup();
-    fColumnLabelView->UpdateDragGroups();
-    fColumnLabelView->Invalidate();
-    Invalidate();
-}
-
-
-// Adds a column to the ColumnListView at the end of the list.
-// Returns true if successful.
-bool
-ColumnListView::AddColumn(CLVColumn* column)
-{
-    int32 columnCount = fColumnList.CountItems();
-    int32 displayIndex = columnCount;
-
-    // make sure a second Expander is not being added
-    if ((column->fFlags & CLV_EXPANDER) != 0) {
-        if (!fHierarchical)
-            return false;
-
-        for (int32 i = 0; i < columnCount; i++) {
-            if ((((CLVColumn*)fColumnList.ItemAt(i))->fFlags & CLV_EXPANDER)
-                    != 0) {
-                return false;
-            }
-        }
-
-        if (column->IsShown())
-            fExpanderColumn = columnCount;
-    }
-
-    // make sure this column hasn't already been added to another ColumnListView
-    if (column->fParent != NULL)
-        return false;
-
-    BWindow* parentWindow = Window();
-    if (parentWindow != NULL)
-        parentWindow->Lock();
-
-    // check if this should be locked at the beginning or end, and adjust
-    // its position if necessary
-    if ((column->Flags() & CLV_LOCK_AT_END) == 0) {
-        bool shouldRepeat;
-        if ((column->Flags() & CLV_LOCK_AT_BEGINNING) != 0) {
-            // move it to the beginning, after the last
-            // CLV_LOCK_AT_BEGINNING item
-            displayIndex = 0;
-            shouldRepeat = true;
-            while (shouldRepeat && displayIndex < columnCount) {
-                shouldRepeat = false;
-                CLVColumn* lastColumn
-                    = (CLVColumn*)fColumnDisplayList.ItemAt(displayIndex);
-                if ((lastColumn->Flags() & CLV_LOCK_AT_BEGINNING) != 0) {
-                    displayIndex++;
-                    shouldRepeat = true;
-                }
-            }
-        } else {
-            // make sure it isn't after a CLV_LOCK_AT_END item
-            shouldRepeat = true;
-            while (shouldRepeat && displayIndex > 0)
-            {
-                shouldRepeat = false;
-                CLVColumn* lastColumn
-                    = (CLVColumn*)fColumnDisplayList.ItemAt(displayIndex - 1);
-                if ((lastColumn->Flags() & CLV_LOCK_AT_END) != 0) {
-                    displayIndex--;
-                    shouldRepeat = true;
-                }
-            }
-        }
-    }
-
-    // add the column to the display list in the appropriate position
-    fColumnDisplayList.AddItem(column, displayIndex);
-
-    // add the column to the end of the column list
-    fColumnList.AddItem(column);
-
-    // tell the column it belongs to me now
-    column->fParent = this;
-
-    // set the scroll bars and tell views to update
-    ColumnsChanged();
-    if (parentWindow != NULL)
-        parentWindow->Unlock();
-
-    return true;
-}
-
-
-// Adds a BList of CLVColumn's to the ColumnListView at the position specified,
-// or at the end of the list if AtIndex == -1.  Returns true if successful.
-bool
-ColumnListView::AddColumnList(BList* newColumns)
-{
-    int32 columnCount = int32(fColumnList.CountItems());
-    int32 columnCountToAdd = int32(newColumns->CountItems());
-
-    // make sure a second CLVExpander is not being added
-    int32 expanderCount = 0;
-    for (int32 i = 0; i < columnCount; i++) {
-        if ((((CLVColumn*)fColumnList.ItemAt(i))->fFlags & CLV_EXPANDER) != 0)
-            expanderCount++;
-    }
-
-    int32 expandercolumnIndex = -1;
-    for (int32 i = 0; i < columnCountToAdd; i++) {
-        CLVColumn* current = (CLVColumn*)newColumns->ItemAt(i);
-        if ((current->fFlags & CLV_EXPANDER) != 0) {
-            expanderCount++;
-            if (current->IsShown())
-                expandercolumnIndex = columnCount + i;
-        }
-    }
-
-    if (expanderCount != 0 && !fHierarchical)
-        return false;
-
-    if (expanderCount > 1)
-        return false;
-
-    if (expandercolumnIndex != -1)
-        fExpanderColumn = expandercolumnIndex;
-
-    // make sure none of these columns have already been added
-    // to a ColumnListView
-    for (int32 i = 0; i < columnCountToAdd; i++) {
-        if (((CLVColumn*)newColumns->ItemAt(i))->fParent != NULL)
-            return false;
-    }
-
-    // make sure none of these columns are being added twice
-    for (int32 i = 0; i < columnCountToAdd - 1; i++) {
-        for (int32 j = i + 1; j < columnCountToAdd; j++) {
-            if (newColumns->ItemAt(i) == newColumns->ItemAt(j))
-                return false;
-        }
-    }
-
-    BWindow* parentWindow = Window();
-    if (parentWindow != NULL)
-        parentWindow->Lock();
-
-    for (int32 i = 0; i < columnCountToAdd; i++) {
-        CLVColumn* column = (CLVColumn*)newColumns->ItemAt(i);
-        // check if this should be locked at the beginning or end,
-        // and adjust its position if necessary
-        int32 displayIndex = columnCount;
-        if ((column->Flags() & CLV_LOCK_AT_END) == 0) {
-            bool shouldRepeat;
-            if ((column->Flags() & CLV_LOCK_AT_BEGINNING) != 0) {
-                // move it to the beginning, after the last
-                // CLV_LOCK_AT_BEGINNING item
-                displayIndex = 0;
-                shouldRepeat = true;
-                while (shouldRepeat && displayIndex < columnCount) {
-                    shouldRepeat = false;
-                    CLVColumn* lastColumn
-                        = (CLVColumn*)fColumnDisplayList.ItemAt(displayIndex);
-                    if ((lastColumn->Flags() & CLV_LOCK_AT_BEGINNING) != 0) {
-                        displayIndex++;
-                        shouldRepeat = true;
-                    }
-                }
-            } else {
-                // make sure it isn't after a CLV_LOCK_AT_END item
-                shouldRepeat = true;
-                while (shouldRepeat && displayIndex > 0) {
-                    shouldRepeat = false;
-                    CLVColumn* lastColumn
-                        = (CLVColumn*)fColumnDisplayList.ItemAt(
-                            displayIndex - 1);
-                    if ((lastColumn->Flags() & CLV_LOCK_AT_END) != 0) {
-                        displayIndex--;
-                        shouldRepeat = true;
-                    }
-                }
-            }
-        }
-
-        // add the column to the display list in the appropriate position
-        fColumnDisplayList.AddItem(column, displayIndex);
-
-        // tell the column it belongs to me now
-        column->fParent = this;
-
-        columnCount++;
-    }
-
-    // add the columns to the end of the column list
-    fColumnList.AddList(newColumns);
-
-    // set the scroll bars and tell views to update
-    ColumnsChanged();
-    if (parentWindow != NULL)
-        parentWindow->Unlock();
-
-    return true;
-}
-
-
-// Removes a CLVColumn from the ColumnListView.
-// Returns true if successful.
-bool
-ColumnListView::RemoveColumn(CLVColumn* column)
-{
-    if (!fColumnList.HasItem(column))
-        return false;
-
-    int32 columnIndex = fSortKeyList.IndexOf(column);
-    if (columnIndex >= 0)
-        fSortKeyList.RemoveItem(columnIndex);
-
-    if ((column->fFlags & CLV_EXPANDER) != 0)
-        fExpanderColumn = -1;
-
-    BWindow* parentWindow = Window();
-    if (parentWindow != NULL)
-        parentWindow->Lock();
-
-    // remove column from the column and display lists
-    fColumnDisplayList.RemoveItem(column);
-    fColumnList.RemoveItem(column);
-
-    //tell the column it has been removed
-    column->fParent = NULL;
-
-    // set the scroll bars and tell views to update
-    ColumnsChanged();
-    if (parentWindow != NULL)
-        parentWindow->Unlock();
-
-    return true;
-}
-
-
-// Finds column in columnList and removes Count columns and their data
-// from the view and its items.
-bool
-ColumnListView::RemoveColumns(CLVColumn* column, int32 count)
-{
-    BWindow* parentWindow = Window();
-    if (parentWindow != NULL)
-        parentWindow->Lock();
-
-    int32 columnIndex = fColumnList.IndexOf(column);
-    if (columnIndex < 0) {
-        if (parentWindow != NULL)
-            parentWindow->Unlock();
-
-        return false;
-    }
-
-    if (columnIndex + count >= fColumnList.CountItems()) {
-        if (parentWindow != NULL)
-            parentWindow->Unlock();
-
-        return false;
-    }
-
-    for (int32 i = columnIndex; i < columnIndex + count; i++) {
-        // remove columns from the column and display lists
-        CLVColumn* current = (CLVColumn*)fColumnList.ItemAt(i);
-        fColumnDisplayList.RemoveItem(current);
-
-        int32 sortIndex = fSortKeyList.IndexOf(column);
-        if (sortIndex >= 0)
-            fSortKeyList.RemoveItem(sortIndex);
-
-        if ((current->fFlags & CLV_EXPANDER) != 0)
-            fExpanderColumn = -1;
-
-        // tell the column it has been removed
-        current->fParent = NULL;
-    }
-    fColumnList.RemoveItems(columnIndex, count);
-
-    // set the scroll bars and tell views to update
-    ColumnsChanged();
-    if (parentWindow != NULL)
-        parentWindow->Unlock();
-
-    return true;
-}
-
-void
-ColumnListView::SetEditMessage(BMessage* message, BMessenger target)
-{
-    delete fEditMessage;
-    fEditMessage = message;
-    fEditTarget = target;
-}
-
-
-void
-ColumnListView::KeyDown(const char* bytes, int32 numBytes)
-{
-    int colDiff = 0;
-    bool metaKeysPressed = false;
-
-    // find out if any meta-keys are pressed
-    int32 q;
-    if (Window()->CurrentMessage()->FindInt32("modifiers", &q) == B_NO_ERROR) {
-        metaKeysPressed = ((q & (B_SHIFT_KEY | B_COMMAND_KEY | B_CONTROL_KEY
-            | B_OPTION_KEY)) != 0);
-    }
-
-    if (numBytes > 0) {
-        switch (*bytes)
-        {
-            case B_LEFT_ARROW:
-            if (metaKeysPressed == false)
-            {
-                colDiff = -1;
-                break;
-            }
-
-            case B_RIGHT_ARROW:
-            if (metaKeysPressed == false)
-            {
-                colDiff = 1;
-                break;
-            }
-
-            case B_UP_ARROW:
-            case B_DOWN_ARROW:
-            if (metaKeysPressed == false)
-            {
-                BListView::KeyDown(bytes, numBytes);
-                break;
-            }
-
-            default:
-            if (fEditMessage != NULL)
-            {
-                BMessage temp(*fEditMessage);
-                temp.AddInt32("column", fSelectedColumn);
-                temp.AddInt32("row", CurrentSelection());
-                temp.AddString("bytes", bytes);
-
-                int32 key;
-                if (Window()->CurrentMessage()->FindInt32("key", &key)
-                        == B_NO_ERROR) {
-                    temp.AddInt32("key", key);
-                }
-
-                fEditTarget.SendMessage(&temp);
-            }
-            break;
-        }
-    }
-
-    if (colDiff != 0) {
-        // we need to move the highlighted column by (colDiff) columns
-        // if possible.
-        int displayColumnCount = fColumnDisplayList.CountItems();
-        int currentColumn = fSelectedColumn;
-            // currentColumn is an ACTUAL index.
-        if (currentColumn == -1) {
-            // no current column selected?
-            currentColumn = (colDiff > 0) ? GetActualIndexOf(0)
-                : GetActualIndexOf(displayColumnCount-1);
-                // go to an edge
-        } else {
-            // go to the display column adjacent to the current column's
-            // display column.
-            int32 currentDisplayIndex = GetDisplayIndexOf(currentColumn);
-            if (currentDisplayIndex < 0)
-                currentDisplayIndex = 0;
-
-            currentDisplayIndex += colDiff;
-
-            if (currentDisplayIndex < 0)
-                currentDisplayIndex = displayColumnCount - 1;
-
-            if (currentDisplayIndex >= displayColumnCount)
-                currentDisplayIndex = 0;
-
-            currentColumn = GetActualIndexOf(currentDisplayIndex);
-        }
-
-        SetSelectedColumnIndex(currentColumn);
-    }
-}
-
-
-int32
-ColumnListView::CountColumns() const
-{
-    return fColumnList.CountItems();
-}
-
-
-int32
-ColumnListView::IndexOfColumn(CLVColumn* column) const
-{
-    return fColumnList.IndexOf(column);
-}
-
-
-CLVColumn*
-ColumnListView::ColumnAt(int32 columnIndex) const
-{
-    return (CLVColumn*)fColumnList.ItemAt(columnIndex);
-}
-
-
-CLVColumn*
-ColumnListView::ColumnAt(BPoint point) const
-{
-    int32 columnCount = fColumnList.CountItems();
-    for (int32 i = 0; i < columnCount; i++) {
-        CLVColumn* col = (CLVColumn*)fColumnList.ItemAt(i);
-        if ((point.x >= col->fColumnBegin) && (point.x <= col->fColumnEnd))
-            return col;
-    }
-
-    return NULL;
-}
-
-
-//Sets the display order using a BList of CLVColumn's
-bool
-ColumnListView::SetDisplayOrder(const int32* ColumnOrder)
-{
-    BWindow* parentWindow = Window();
-    if (parentWindow != NULL)
-        parentWindow->Lock();
-
-    // add the items to the display list in order
-    fColumnDisplayList.MakeEmpty();
-    int32 columnCount = fColumnList.CountItems();
-    for (int32 i = 0; i < columnCount; i++) {
-        if (ColumnOrder[i] >= columnCount) {
-            if (parentWindow != NULL)
-                parentWindow->Unlock();
-
-            return false;
-        }
-
-        for (int32 j = 0; j < i; j++) {
-            if (ColumnOrder[i] == ColumnOrder[j]) {
-                if (parentWindow != NULL)
-                    parentWindow->Unlock();
-
-                return false;
-            }
-        }
-        fColumnDisplayList.AddItem(fColumnList.ItemAt(ColumnOrder[i]));
-    }
-
-    // update everything about the columns
-    ColumnsChanged();
-
-    // let the program know that the display order changed.
-    if (parentWindow != NULL)
-        parentWindow->Unlock();
-
-    DisplayOrderChanged(ColumnOrder);
-
-    return true;
-}
-
-
-void
-ColumnListView::ColumnWidthChanged(int32 columnIndex, float newWidth)
-{
-    Invalidate();
-}
-
-
-void
-ColumnListView::DisplayOrderChanged(const int32* order)
-{
-}
-
-
-int32*
-ColumnListView::DisplayOrder() const
-{
-    int32 columnCount = fColumnList.CountItems();
-    int32* list = new int32[columnCount];
-    BWindow* parentWindow = Window();
-    if (parentWindow != NULL)
-        parentWindow->Lock();
-
-    for (int32 i = 0; i < columnCount; i++)
-        list[i] = int32(fColumnList.IndexOf(fColumnDisplayList.ItemAt(i)));
-
-    if (parentWindow != NULL)
-        parentWindow->Unlock();
-
-    return list;
-}
-
-
-void
-ColumnListView::SetSortKey(int32 columnIndex)
-{
-    CLVColumn* column;
-    if (columnIndex >= 0) {
-        column = (CLVColumn*)fColumnList.ItemAt(columnIndex);
-        if ((column->Flags() & CLV_SORT_KEYABLE) == 0)
-            return;
-    } else
-        column = NULL;
-
-    if (fSortKeyList.ItemAt(0) != column || column == NULL) {
-        BWindow* parentWindow = Window();
-        if (parentWindow != NULL)
-            parentWindow->Lock();
-
-        BRect labelBounds = fColumnLabelView->Bounds();
-        // need to remove old sort keys and erase all the old underlines
-        int32 sortKeyCount = fSortKeyList.CountItems();
-        for (int32 i = 0; i < sortKeyCount; i++) {
-            CLVColumn* underlineColumn = (CLVColumn*)fSortKeyList.ItemAt(i);
-            if (underlineColumn->fSortMode != SORT_MODE_NONE) {
-                fColumnLabelView->Invalidate(
-                BRect(underlineColumn->fColumnBegin,
-                    labelBounds.top, underlineColumn->fColumnEnd,
-                    labelBounds.bottom));
-            }
-        }
-        fSortKeyList.MakeEmpty();
-
-        if (column != NULL) {
-            fSortKeyList.AddItem(column);
-            if (column->fSortMode == SORT_MODE_NONE)
-                SetSortMode(columnIndex, SORT_MODE_ASCENDING);
-
-            SortItems();
-            // need to draw new underline
-            fColumnLabelView->Invalidate(BRect(column->fColumnBegin,
-                labelBounds.top, column->fColumnEnd, labelBounds.bottom));
-        }
-        if (parentWindow != NULL)
-            parentWindow->Unlock();
-    }
-}
-
-
-void
-ColumnListView::AddSortKey(int32 columnIndex)
-{
-    CLVColumn* column;
-    if (columnIndex >= 0) {
-        column = (CLVColumn*)fColumnList.ItemAt(columnIndex);
-        if ((column->Flags() & CLV_SORT_KEYABLE) == 0)
-            return;
-    } else
-        column = NULL;
-
-    if (column != NULL && !fSortKeyList.HasItem(column)) {
-        BWindow* parentWindow = Window();
-        if (parentWindow != NULL)
-            parentWindow->Lock();
-
-        BRect labelBounds = fColumnLabelView->Bounds();
-        fSortKeyList.AddItem(column);
-        if (column->fSortMode == SORT_MODE_NONE)
-            SetSortMode(columnIndex, SORT_MODE_ASCENDING);
-
-        SortItems();
-
-        // need to draw new underline
-        fColumnLabelView->Invalidate(BRect(column->fColumnBegin,
-            labelBounds.top, column->fColumnEnd, labelBounds.bottom));
-
-        if (parentWindow != NULL)
-            parentWindow->Unlock();
-    }
-}
-
-
-void
-ColumnListView::SetSortMode(int32 columnIndex, CLVSortMode sortMode)
-{
-    CLVColumn* column;
-    if (columnIndex >= 0) {
-        column = (CLVColumn*)fColumnList.ItemAt(columnIndex);
-        if ((column->Flags() & CLV_SORT_KEYABLE) == 0)
-            return;
-    } else
-        return;
-
-    if (column->fSortMode != sortMode) {
-        BWindow* parentWindow = Window();
-        if (parentWindow != NULL)
-            parentWindow->Lock();
-
-        BRect labelBounds = fColumnLabelView->Bounds();
-        column->fSortMode = sortMode;
-        if (sortMode == SORT_MODE_NONE && fSortKeyList.HasItem(column))
-            fSortKeyList.RemoveItem(column);
-
-        SortItems();
-        // need to draw or erase underline
-
-        fColumnLabelView->Invalidate(BRect(column->fColumnBegin,
-            labelBounds.top, column->fColumnEnd, labelBounds.bottom));
-        if (parentWindow != NULL)
-            parentWindow->Unlock();
-    }
-}
-
-
-void
-ColumnListView::ReverseSortMode(int32 columnIndex)
-{
-    CLVColumn* column;
-    if (columnIndex >= 0) {
-        column = (CLVColumn*)fColumnList.ItemAt(columnIndex);
-        if ((column->Flags() & CLV_SORT_KEYABLE) == 0)
-            return;
-    } else
-        return;
-
-    if (column->fSortMode == SORT_MODE_ASCENDING)
-        SetSortMode(columnIndex, SORT_MODE_DESCENDING);
-    else if (column->fSortMode == SORT_MODE_DESCENDING)
-        SetSortMode(columnIndex, SORT_MODE_NONE);
-    else if (column->fSortMode == SORT_MODE_NONE)
-        SetSortMode(columnIndex, SORT_MODE_ASCENDING);
-}
-
-
-int32
-ColumnListView::Sorting(int32* sortKeys, CLVSortMode* sortModes) const
-{
-    BWindow* parentWindow = Window();
-    if (parentWindow != NULL)
-        parentWindow->Lock();
-
-    int32 keyCount = fSortKeyList.CountItems();
-    for (int32 i = 0; i < keyCount; i++) {
-        CLVColumn* Column = (CLVColumn*)fSortKeyList.ItemAt(i);
-        sortKeys[i] = IndexOfColumn(Column);
-        sortModes[i] = Column->SortMode();
-    }
-
-    if (parentWindow != NULL)
-        parentWindow->Unlock();
-
-    return keyCount;
-}
-
-void
-ColumnListView::Pulse()
-{
-    int32 curSel = CurrentSelection();
-    if (curSel >= 0) {
-        CLVListItem* item = (CLVListItem*) ItemAt(curSel);
-        item->Pulse(this);
-    }
-}
-
-
-void
-ColumnListView::SetSorting(int32 keyCount, int32* sortKeys,
-    CLVSortMode* sortModes)
-{
-    BWindow* parentWindow = Window();
-    if (parentWindow != NULL)
-        parentWindow->Lock();
-
-    // need to remove old sort keys and erase all the old underlines
-    BRect labelBounds = fColumnLabelView->Bounds();
-    int32 sortKeyCount = fSortKeyList.CountItems();
-    for (int32 i = 0; i < sortKeyCount; i++) {
-        CLVColumn* underlineColumn = (CLVColumn*)fSortKeyList.ItemAt(i);
-        if (underlineColumn->fSortMode != SORT_MODE_NONE) {
-            fColumnLabelView->Invalidate(BRect(underlineColumn->fColumnBegin,
-                labelBounds.top, underlineColumn->fColumnEnd,
-                labelBounds.bottom));
-        }
-    }
-    fSortKeyList.MakeEmpty();
-
-    for (int32 i = 0; i < keyCount; i++) {
-        if (i == 0)
-            SetSortKey(sortKeys[0]);
-        else
-            AddSortKey(sortKeys[i]);
-
-        SetSortMode(sortKeys[i], sortModes[i]);
-    }
-
-    if (parentWindow != NULL)
-        parentWindow->Unlock();
-}
-
-
-void
-ColumnListView::FrameResized(float newWidth, float newHeight)
-{
-    ShiftDragGroup();
-    uint32 itemCount = CountItems();
-    BFont font;
-    GetFont(&font);
-    for (uint32 i = 0; i < itemCount; i++)
-        ItemAt(i)->Update(this, &font);
-
-    BListView::FrameResized(newWidth, newHeight);
-}
-
-
-void
-ColumnListView::AttachedToWindow()
-{
-    // Hack to work around app_server bug
-    BListView::AttachedToWindow();
-    ShiftDragGroup();
-}
-
-
-void
-ColumnListView::ScrollTo(BPoint point)
-{
-    BListView::ScrollTo(point);
-    fColumnLabelView->ScrollTo(BPoint(point.x, 0.0));
-}
-
-int32
-ColumnListView::GetActualIndexOf(int32 displayIndex) const
-{
-    if ((displayIndex < 0) || (displayIndex >= fColumnDisplayList.CountItems()))
-        return -1;
-
-    return (int32)fColumnList.IndexOf(fColumnDisplayList.ItemAt(displayIndex));
-}
-
-
-int32
-ColumnListView::GetDisplayIndexOf(int32 realIndex) const
-{
-    if ((realIndex < 0) || (realIndex >= fColumnList.CountItems()))
-        return -1;
-
-    return (int32)fColumnDisplayList.IndexOf(fColumnList.ItemAt(realIndex));
-}
-
-
-// Set a new (actual) column index as the selected index.
-// Call with arg -1 to unselect all.
-// Gotta change the fSelectedColumn on all entries.
-// There is undoubtedly a more efficient way to do this!  --jaf
-void
-ColumnListView :: SetSelectedColumnIndex(int32 col)
-{
-    if (fSelectedColumn != col) {
-        fSelectedColumn = col;
-
-        int32 numRows = fFullItemList.CountItems();
-        for (int32 j = 0; j < numRows; j++) {
-            ((CLVListItem *)fFullItemList.ItemAt(j))->fSelectedColumn
-                = fSelectedColumn;
-        }
-
-        // update current row if necessary
-        int32 selectedIndex = CurrentSelection();
-        if (selectedIndex != -1)
-            InvalidateItem(selectedIndex);
-   }
-}
-
-
-void
-ColumnListView::MouseDown(BPoint point)
-{
-    int prevColumn = fSelectedColumn;
-    int32 columnCount = fColumnDisplayList.CountItems();
-    float xleft = point.x;
-    for (int32 i = 0; i < columnCount; i++) {
-        CLVColumn* column = (CLVColumn*)fColumnDisplayList.ItemAt(i);
-        if (column->IsShown()) {
-            if (xleft > 0) {
-                xleft -= column->Width();
-                if (xleft <= 0) {
-                    SetSelectedColumnIndex(GetActualIndexOf(i));
-                    break;
-                }
-            }
-        }
-    }
-
-    int32 itemIndex = IndexOf(point);
-    if (itemIndex >= 0) {
-        CLVListItem* clickedItem = (CLVListItem*)BListView::ItemAt(itemIndex);
-        if (clickedItem->fIsSuperItem) {
-            if (clickedItem->fExpanderButtonRect.Contains(point)) {
-                if (clickedItem->IsExpanded())
-                    Collapse(clickedItem);
-                else
-                    Expand(clickedItem);
-
-                return;
-            }
-        }
-    }
-
-
-    // if secondary mouse click, hoist up the popup-menu
-    const char* selectedText = NULL;
-    CLVColumn* column = ColumnAt(fSelectedColumn);
-    if (column != NULL) {
-        BPopUpMenu* popup = column->GetPopup();
-        if (popup != NULL) {
-            BMessage* message = Window()->CurrentMessage();
-            int32 buttons;
-            if ((message->FindInt32("buttons", &buttons) == B_NO_ERROR)
-                && (buttons == B_SECONDARY_MOUSE_BUTTON)) {
-                BPoint where(point);
-                Select(IndexOf(where));
-                ConvertToScreen(&where);
-                BMenuItem* result = popup->Go(where, false);
-                if (result != NULL)
-                    selectedText = result->Label();
-            }
-        }
-    }
-
-    int32 previousRow = CurrentSelection();
-    BListView::MouseDown(point);
-
-    int32 currentRow = CurrentSelection();
-    if ((fEditMessage != NULL) && (selectedText != NULL
-        || (fSelectedColumn == prevColumn && currentRow == previousRow))) {
-        // send mouse message...
-        BMessage temp(*fEditMessage);
-        temp.AddInt32("column", fSelectedColumn);
-        temp.AddInt32("row", CurrentSelection());
-        if (selectedText)
-            temp.AddString("text", selectedText);
-        else
-            temp.AddInt32("mouseClick", 0);
-
-        fEditTarget.SendMessage(&temp);
-    }
-}
-
-
-bool
-ColumnListView::AddUnder(CLVListItem* item, CLVListItem* superitem)
-{
-    if (!fHierarchical)
-        return false;
-
-    // find the superitem in the full list and display list (if shown)
-    int32 superItemPosition = fFullItemList.IndexOf(superitem);
-    if (superItemPosition < 0)
-        return false;
-
-    uint32 SuperitemLevel = superitem->fOutlineLevel;
-
-    // add the item under the superitem in the full list
-    int32 itemPosition = superItemPosition + 1;
-    item->fOutlineLevel = SuperitemLevel + 1;
-    while (true) {
-        CLVListItem* temp = (CLVListItem*)fFullItemList.ItemAt(itemPosition);
-        if (temp) {
-            if (temp->fOutlineLevel > SuperitemLevel)
-                itemPosition++;
-            else
-                break;
-        }
-        else
-            break;
-    }
-
-    return AddItemPrivate(item, itemPosition);
-}
-
-
-bool
-ColumnListView::AddItem(CLVListItem* item, int32 fullListIndex)
-{
-    return AddItemPrivate(item, fullListIndex);
-}
-
-
-bool
-ColumnListView::AddItem(CLVListItem* item)
-{
-    if (fHierarchical)
-        return AddItemPrivate(item, fFullItemList.CountItems());
-    else
-        return AddItemPrivate(item, CountItems());
-}
-
-
-bool
-ColumnListView::AddItem(BListItem* item, int32 fullListIndex)
-{
-    return BListView::AddItem(item, fullListIndex);
-}
-
-
-bool
-ColumnListView::AddItem(BListItem* item)
-{
-    return BListView::AddItem(item);
-}
-
-
-bool
-ColumnListView::AddItemPrivate(CLVListItem* item, int32 fullListIndex)
-{
-    item->fSelectedColumn = fSelectedColumn;
-
-    if (fHierarchical) {
-        uint32 itemLevel = item->OutlineLevel();
-
-        // figure out whether it is visible (should it be added to visible list)
-        bool isVisible = true;
-
-        // find the item that contains it in the full list
-        int32 superItemPosition;
-        if (itemLevel == 0)
-            superItemPosition = -1;
-        else
-            superItemPosition = fullListIndex - 1;
-
-        CLVListItem* superItem;
-        while (superItemPosition >= 0) {
-            superItem = (CLVListItem*)fFullItemList.ItemAt(superItemPosition);
-            if (superItem != NULL) {
-                if (superItem->fOutlineLevel >= itemLevel)
-                    superItemPosition--;
-                else
-                    break;
-            } else
-                return false;
-        }
-
-        if (superItemPosition >= 0 && superItem != NULL) {
-            if (!superItem->IsExpanded()) {
-                // superItem's contents aren't visible
-                isVisible = false;
-            }
-            if (!HasItem(superItem)) {
-                // superItem itself isn't showing
-                isVisible = false;
-            }
-        }
-
-        // add the item to the full list
-        if (!fFullItemList.AddItem(item, fullListIndex))
-            return false;
-        else {
-            // add the item to the display list
-            if (isVisible) {
-                // find the previous item, or -1 if the item I'm adding
-                // will be the first one
-                int32 PreviousitemPosition = fullListIndex - 1;
-                CLVListItem* previousItem;
-                while (PreviousitemPosition >= 0) {
-                    previousItem
-                        = (CLVListItem*)fFullItemList.ItemAt(
-                            PreviousitemPosition);
-                    if (previousItem != NULL && HasItem(previousItem))
-                        break;
-                    else
-                        PreviousitemPosition--;
-                }
-
-                // add the item after the previous item, or first on the list
-                bool itemAdded;
-                if (PreviousitemPosition >= 0)
-                    itemAdded = BListView::AddItem((BListItem*)item,
-                        IndexOf(previousItem) + 1);
-                else
-                    itemAdded = BListView::AddItem((BListItem*)item, 0);
-
-                if (itemAdded == false)
-                    fFullItemList.RemoveItem(item);
-
-                return itemAdded;
-            }
-
-            return true;
-        }
-    } else
-        return BListView::AddItem(item, fullListIndex);
-}
-
-
-bool
-ColumnListView::AddList(BList* newItems)
-{
-    if (fHierarchical)
-        return AddListPrivate(newItems, fFullItemList.CountItems());
-    else
-        return AddListPrivate(newItems, CountItems());
-}
-
-
-bool
-ColumnListView::AddList(BList* newItems, int32 fullListIndex)
-{
-    return AddListPrivate(newItems, fullListIndex);
-}
-
-
-bool
-ColumnListView::AddListPrivate(BList* newItems, int32 fullListIndex)
-{
-    int32 itemCount = newItems->CountItems();
-    for (int32 count = 0; count < itemCount; count++) {
-        if (!AddItemPrivate((CLVListItem*)newItems->ItemAt(count),
-                fullListIndex + count)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-
-bool
-ColumnListView::RemoveItem(CLVListItem* item)
-{
-    if (item == NULL || !fFullItemList.HasItem(item))
-        return false;
-
-    if (fHierarchical) {
-        int32 itemsToRemove = 1 + FullListNumberOfSubitems(item);
-        return RemoveItems(fFullItemList.IndexOf(item), itemsToRemove);
-    } else
-        return BListView::RemoveItem((BListItem*)item);
-}
-
-
-BListItem*
-ColumnListView::RemoveItem(int32 fullListIndex)
-{
-    if (fHierarchical) {
-        CLVListItem* item = (CLVListItem*)fFullItemList.ItemAt(fullListIndex);
-        if (item)
-        {
-            int32 itemsToRemove = 1 + FullListNumberOfSubitems(item);
-            if (RemoveItems(fullListIndex, itemsToRemove))
-                return item;
-            else
-                return NULL;
-        }
-        else
-            return NULL;
-    } else
-        return BListView::RemoveItem(fullListIndex);
-}
-
-
-bool
-ColumnListView::RemoveItems(int32 fullListIndex, int32 count)
-{
-    CLVListItem* item;
-    if (fHierarchical) {
-        uint32 LastSuperitemLevel = UINT32_MAX;
-        int32 i;
-        int32 DisplayitemsToRemove = 0;
-        int32 firstDisplayItemToRemove = -1;
-
-        for (i = fullListIndex; i < fullListIndex + count; i++) {
-            item = FullListItemAt(i);
-            if (item->fOutlineLevel < LastSuperitemLevel)
-                LastSuperitemLevel = item->fOutlineLevel;
-
-            if (BListView::HasItem((BListItem*)item)) {
-                DisplayitemsToRemove++;
-                if (firstDisplayItemToRemove == -1)
-                    firstDisplayItemToRemove = BListView::IndexOf(item);
-            }
-        }
-
-        while (true) {
-            item = FullListItemAt(i);
-            if (item != NULL && item->fOutlineLevel > LastSuperitemLevel) {
-                count++;
-                i++;
-                if (BListView::HasItem((BListItem*)item)) {
-                    DisplayitemsToRemove++;
-                    if (firstDisplayItemToRemove == -1) {
-                        firstDisplayItemToRemove
-                            = BListView::IndexOf((BListItem*)item);
-                    }
-                }
-            } else
-                break;
-        }
-
-        while (DisplayitemsToRemove > 0) {
-            if (BListView::RemoveItem(firstDisplayItemToRemove) == NULL)
-                return false;
-
-            DisplayitemsToRemove--;
-        }
-
-        return fFullItemList.RemoveItems(fullListIndex, count);
-    } else
-        return BListView::RemoveItems(fullListIndex, count);
-}
-
-
-bool
-ColumnListView::RemoveItem(BListItem* item)
-{
-    return BListView::RemoveItem(item);
-}
-
-
-CLVListItem*
-ColumnListView::FullListItemAt(int32 fullListIndex) const
-{
-    return (CLVListItem*)fFullItemList.ItemAt(fullListIndex);
-}
-
-
-int32
-ColumnListView::FullListIndexOf(const CLVListItem* item) const
-{
-    return fFullItemList.IndexOf((CLVListItem*)item);
-}
-
-
-int32
-ColumnListView::FullListIndexOf(BPoint point) const
-{
-    int32 DisplayListIndex = IndexOf(point);
-    CLVListItem* item = (CLVListItem*)ItemAt(DisplayListIndex);
-
-    return item != NULL ? FullListIndexOf(item) : -1;
-}
-
-
-CLVListItem*
-ColumnListView::FullListFirstItem() const
-{
-    return (CLVListItem*)fFullItemList.FirstItem();
-}
-
-
-CLVListItem*
-ColumnListView::FullListLastItem() const
-{
-    return (CLVListItem*)fFullItemList.LastItem();
-}
-
-
-bool
-ColumnListView::FullListHasItem(const CLVListItem* item) const
-{
-    return fFullItemList.HasItem((CLVListItem*)item);
-}
-
-
-int32
-ColumnListView::FullListCountItems() const
-{
-    return fFullItemList.CountItems();
-}
-
-
-void
-ColumnListView::MakeEmpty()
-{
-    fFullItemList.MakeEmpty();
-    BListView::MakeEmpty();
-}
-
-
-void
-ColumnListView::MakeEmptyPrivate()
-{
-    fFullItemList.MakeEmpty();
-    BListView::MakeEmpty();
-}
-
-
-bool
-ColumnListView::FullListIsEmpty() const
-{
-    return fFullItemList.IsEmpty();
-}
-
-
-int32
-ColumnListView::FullListCurrentSelection(int32 index) const
-{
-    return FullListIndexOf((CLVListItem*)ItemAt(CurrentSelection(index)));
-}
-
-
-void
-ColumnListView::FullListDoForEach(bool (*func)(CLVListItem*))
-{
-    int32 itemCount = fFullItemList.CountItems();
-    for (int32 i = 0; i < itemCount; i++) {
-        if (func((CLVListItem*)fFullItemList.ItemAt(i)) == true)
-            return;
-    }
-}
-
-
-void
-ColumnListView::FullListDoForEach(bool (*func)(CLVListItem*, void*),
-    void* arg2)
-{
-    int32 itemCount = fFullItemList.CountItems();
-    for (int32 i = 0; i < itemCount; i++) {
-        if (func((CLVListItem*)fFullItemList.ItemAt(i), arg2) == true)
-            return;
-    }
-}
-
-
-CLVListItem*
-ColumnListView::Superitem(const CLVListItem* item) const
-{
-    int32 superItemPosition;
-    uint32 itemLevel = item->fOutlineLevel;
-
-    if (itemLevel == 0)
-        superItemPosition = -1;
-    else
-        superItemPosition = fFullItemList.IndexOf((CLVListItem*)item) - 1;
-
-    CLVListItem* superItem = NULL;
-    while (superItemPosition >= 0) {
-        superItem = (CLVListItem*)fFullItemList.ItemAt(superItemPosition);
-        if (superItem != NULL) {
-            if (superItem->fOutlineLevel >= itemLevel)
-                superItemPosition--;
-            else
-                break;
-        } else
-            return NULL;
-    }
-
-    return superItemPosition >= 0 ? superItem : NULL;
-}
-
-
-int32
-ColumnListView::FullListNumberOfSubitems(const CLVListItem* item) const
-{
-    if (!fHierarchical)
-        return 0;
-
-    int32 itemPosition = FullListIndexOf(item);
-    int32 subitemPosition;
-    uint32 SuperitemLevel = item->fOutlineLevel;
-    if (itemPosition >= 0) {
-        for (subitemPosition = itemPosition + 1; subitemPosition >= 1;
-            subitemPosition++) {
-            CLVListItem* item = FullListItemAt(subitemPosition);
-            if (item == NULL || item->fOutlineLevel <= SuperitemLevel)
-                break;
-        }
-    } else
-        return 0;
-
-    return subitemPosition - itemPosition - 1;
-}
-
-
-void
-ColumnListView::Expand(CLVListItem* item)
-{
-    BWindow* parentWindow = Window();
-    if (parentWindow != NULL)
-        parentWindow->Lock();
-
-    if (!item->fIsSuperItem)
-        item->fIsSuperItem = true;
-
-    if (item->IsExpanded()) {
-        if (parentWindow != NULL)
-            parentWindow->Unlock();
-
-        return;
-    }
-
-    item->SetExpanded(true);
-    if (!fHierarchical) {
-        if (parentWindow != NULL)
-            parentWindow->Unlock();
-
-        return;
-    }
-
-    int32 displayIndex = IndexOf(item);
-    if (displayIndex >= 0) {
-        if (fExpanderColumn >= 0) {
-            // change the state of the arrow
-            item->DrawItemColumn(this, item->fExpanderColumnRect,
-                fExpanderColumn, (fExpanderColumn == fSelectedColumn), true);
-            SetDrawingMode(B_OP_OVER);
-            DrawBitmap(&fDownArrow, BRect(0.0, 0.0,
-                item->fExpanderButtonRect.right -
-                    item->fExpanderButtonRect.left, 10.0),
-                item->fExpanderButtonRect);
-            SetDrawingMode(B_OP_COPY);
-        }
-
-        // add the items under it
-        int32 fullListIndex = fFullItemList.IndexOf(item);
-        uint32 itemLevel = item->fOutlineLevel;
-        int32 i = fullListIndex + 1;
-        int32 addPosition = displayIndex + 1;
-        while (true) {
-            CLVListItem* nextItem = (CLVListItem*)fFullItemList.ItemAt(i);
-            if (nextItem == NULL)
-                break;
-
-            if (nextItem->fOutlineLevel > itemLevel) {
-                BListView::AddItem((BListItem*)nextItem, addPosition++);
-                if (nextItem->fIsSuperItem && !nextItem->IsExpanded()) {
-                    // the item I just added is collapsed, so skip over all
-                    // its children
-                    uint32 SkipLevel = nextItem->fOutlineLevel + 1;
-                    while (true) {
-                        i++;
-                        nextItem = (CLVListItem*)fFullItemList.ItemAt(i);
-                        if (nextItem == NULL)
-                            break;
-
-                        if (nextItem->fOutlineLevel < SkipLevel)
-                            break;
-                    }
-                } else
-                    i++;
-            } else
-                break;
-        }
-    }
-
-    if (parentWindow != NULL)
-        parentWindow->Unlock();
-}
-
-
-void
-ColumnListView::Collapse(CLVListItem* item)
-{
-    BWindow* parentWindow = Window();
-    if (parentWindow != NULL)
-        parentWindow->Lock();
-
-    if (!item->fIsSuperItem)
-        item->fIsSuperItem = true;
-
-    if (!(item->IsExpanded())) {
-        if (parentWindow != NULL)
-            parentWindow->Unlock();
-
-        return;
-    }
-
-    item->SetExpanded(false);
-    if (!fHierarchical) {
-        if (parentWindow != NULL)
-            parentWindow->Unlock();
-        return;
-    }
-
-    int32 displayIndex = IndexOf((BListItem*)item);
-    if (displayIndex >= 0) {
-        if (fExpanderColumn >= 0) {
-            // change the state of the arrow
-            item->DrawItemColumn(this, item->fExpanderColumnRect,
-                fExpanderColumn, (fExpanderColumn == fSelectedColumn), true);
-            SetDrawingMode(B_OP_OVER);
-            DrawBitmap(&fRightArrow, BRect(0.0, 0.0,
-                item->fExpanderButtonRect.right -
-                    item->fExpanderButtonRect.left,
-                10.0), item->fExpanderButtonRect);
-            SetDrawingMode(B_OP_COPY);
-        }
-
-        // remove the items under it
-        uint32 itemLevel = item->fOutlineLevel;
-        int32 nextItemIndex = displayIndex + 1;
-        while (true) {
-            CLVListItem* nextItem = (CLVListItem*)ItemAt(nextItemIndex);
-            if (nextItem != NULL) {
-                if (nextItem->fOutlineLevel > itemLevel)
-                    BListView::RemoveItem(nextItemIndex);
-                else
-                    break;
-            } else
-                break;
-        }
-    }
-
-    if (parentWindow != NULL)
-        parentWindow->Unlock();
-}
-
-
-bool
-ColumnListView::IsExpanded(int32 fullListIndex) const
-{
-    BListItem* item = (BListItem*)fFullItemList.ItemAt(fullListIndex);
-    return item != NULL ? item->IsExpanded() : false;
-}
-
-
-void
-ColumnListView::SetSortFunction(CLVCompareFuncPtr compare)
-{
-    fCompareFunction = compare;
-}
-
-
-void
-ColumnListView::SortItems()
-{
-    BWindow* parentWindow = Window();
-    if (parentWindow != NULL)
-        parentWindow->Lock();
-
-    BList newList;
-    int32 itemCount;
-    if (!fHierarchical)
-        itemCount = CountItems();
-    else
-        itemCount = fFullItemList.CountItems();
-
-    if (itemCount == 0) {
-        if (parentWindow != NULL)
-            parentWindow->Unlock();
-
-        return;
-    }
-
-    int32 i;
-    if (!fHierarchical) {
-        // plain sort, remember the list context for each item
-        for (i = 0; i < itemCount; i++)
-            ((CLVListItem*)ItemAt(i))->fSortingContextCLV = this;
-        // do the actual sort
-        BListView::SortItems((int (*)(const void*,
-            const void*))ColumnListView::PlainBListSortFunc);
-    } else {
-        // block-by-block sort
-        SortFullListSegment(0, 0, &newList);
-        fFullItemList = newList;
-        // remember the list context for each item
-        for (i = 0; i < itemCount; i++) {
-            ((CLVListItem*)fFullItemList.ItemAt(i))->fSortingContextBList
-                = &newList;
-        }
-        // do the actual sort
-        BListView::SortItems((int (*)(const void*,
-            const void*))ColumnListView::HierarchicalBListSortFunc);
-    }
-
-    if (parentWindow != NULL)
-        parentWindow->Unlock();
-}
-
-
-int
-ColumnListView::PlainBListSortFunc(BListItem** firstItem,
-    BListItem** secondItem)
-{
-    CLVListItem* item1 = (CLVListItem*)*firstItem;
-    CLVListItem* item2 = (CLVListItem*)*secondItem;
-    ColumnListView* sortingContext = item1->fSortingContextCLV;
-    int32 sortDepth = sortingContext->fSortKeyList.CountItems();
-    int compareResult = 0;
-
-    if (sortingContext->fCompareFunction) {
-        for (int32 SortIteration = 0;
-                SortIteration < sortDepth && compareResult == 0;
-                SortIteration++) {
-            CLVColumn* column = (CLVColumn*)sortingContext->fSortKeyList.ItemAt(
-                SortIteration);
-            compareResult = sortingContext->fCompareFunction(item1, item2,
-                sortingContext->fColumnList.IndexOf(column));
-            if (column->fSortMode == SORT_MODE_DESCENDING)
-                compareResult = 0 - compareResult;
-        }
-    }
-
-    return compareResult;
-}
-
-
-int
-ColumnListView::HierarchicalBListSortFunc(BListItem** firstItem,
-    BListItem** secondItem)
-{
-    CLVListItem* item1 = (CLVListItem*)*firstItem;
-    CLVListItem* item2 = (CLVListItem*)*secondItem;
-    if (item1->fSortingContextBList->IndexOf(item1)
-            < item1->fSortingContextBList->IndexOf(item2)) {
-        return -1;
-    } else
-        return 1;
-}
-
-
-void
-ColumnListView::SortFullListSegment(int32 originalListStartIndex,
-    int32 insertionPoint, BList* newList)
-{
-    // identify and sort the items at this level
-    BList* itemCount = SortItemCount(originalListStartIndex);
-    int32 newItemsStopIndex = insertionPoint + itemCount->CountItems();
-    newList->AddList(itemCount, insertionPoint);
-    delete itemCount;
-
-    // identify and sort the subitems
-    for (int32 i = insertionPoint; i < newItemsStopIndex; i++) {
-        CLVListItem* item = (CLVListItem*)newList->ItemAt(i);
-        CLVListItem* nextItem = (CLVListItem*)fFullItemList.ItemAt(
-            fFullItemList.IndexOf(item) + 1);
-        if (item->fIsSuperItem && nextItem != NULL
-            && item->fOutlineLevel < nextItem->fOutlineLevel) {
-            int32 OldListSize = newList->CountItems();
-            SortFullListSegment(fFullItemList.IndexOf(item) + 1,
-                i + 1, newList);
-            int32 newListSize = newList->CountItems();
-            newItemsStopIndex += newListSize - OldListSize;
-            i += newListSize - OldListSize;
-        }
-    }
-}
-
-
-BList*
-ColumnListView::SortItemCount(int32 originalListStartIndex)
-{
-    uint32 level = ((CLVListItem*)fFullItemList.ItemAt(
-        originalListStartIndex))->fOutlineLevel;
-
-    // create a new BList of the items in this level
-    int32 i = originalListStartIndex;
-    int32 itemCount = 0;
-    BList* itemsList = new BList(16);
-    while (true) {
-        CLVListItem* item = (CLVListItem*)fFullItemList.ItemAt(i);
-        if (item == NULL)
-            break;
-
-        uint32 itemLevel = item->fOutlineLevel;
-        if (itemLevel == level) {
-            itemsList->AddItem(item);
-            itemCount++;
-        } else if (itemLevel < level)
-            break;
-
-        i++;
-    }
-
-    // sort the BList of the items in this level
-    CLVListItem** sortArray = new CLVListItem*[itemCount];
-    CLVListItem** levelListItems = (CLVListItem**)itemsList->Items();
-    for (i = 0; i < itemCount; i++)
-        sortArray[i] = levelListItems[i];
-
-    itemsList->MakeEmpty();
-    SortListArray(sortArray, itemCount);
-    for (i = 0; i < itemCount; i++)
-        itemsList->AddItem(sortArray[i]);
-
-    delete[] sortArray;
-
-    return itemsList;
-}
-
-
-void
-ColumnListView::SortListArray(CLVListItem** sortArray, int32 itemCount)
-{
-    int32 sortDepth = fSortKeyList.CountItems();
-    for (int32 i = 0; i < itemCount - 1; i++) {
-        for (int32 j = i + 1; j < itemCount; j++) {
-            int compareResult = 0;
-            if (fCompareFunction) {
-                for (int32 SortIteration = 0;
-                    SortIteration < sortDepth && compareResult == 0;
-                    SortIteration++) {
-                    CLVColumn* Column = (CLVColumn*)fSortKeyList.ItemAt(
-                        SortIteration);
-                    compareResult = fCompareFunction(sortArray[i],
-                        sortArray[j], fColumnList.IndexOf(Column));
-                    if (Column->fSortMode == SORT_MODE_DESCENDING)
-                        compareResult = 0 - compareResult;
-                }
-            }
-
-            if (compareResult == 1) {
-                CLVListItem* Temp = sortArray[i];
-                sortArray[i] = sortArray[j];
-                sortArray[j] = Temp;
-            }
-        }
-    }
-}
-
-
-void
-ColumnListView::MessageReceived(BMessage* message)
-{
-    switch(message->what) {
-        case B_UNMAPPED_KEY_DOWN:
-            if (fEditMessage != NULL) {
-                BMessage temp(*fEditMessage);
-                temp.AddInt32("column", fSelectedColumn);
-                temp.AddInt32("row", CurrentSelection());
-
-                int32 key;
-                if (message->FindInt32("key", &key) == B_NO_ERROR)
-                    temp.AddInt32("unmappedkey", key);
-                fEditTarget.SendMessage(&temp);
-            }
-            break;
-
-        default:
-            BListView::MessageReceived(message);
-    }
-}

deleted file src/preferences/shortcuts/clv/ColumnListView.h

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-#ifndef COLUMN_LIST_VIEW_H
-#define COLUMN_LIST_VIEW_H
-
-
-#include <ListView.h>
-
-#include "Colors.h"
-#include "CLVColumn.h"
-#include "PrefilledBitmap.h"
-#include "ScrollViewCorner.h"
-
-
-class CLVListItem;
-class CLVColumnLabelView;
-class CLVFillerView;
-class CLVContainerView;
-
-
-typedef int (*CLVCompareFuncPtr)(const CLVListItem* item1,
-    const CLVListItem* item2, int32 sort_key);
-
-
-class ColumnListView : public BListView {
-public:
-                                ColumnListView(BRect frame,
-                                    BScrollView** containerView,
-    // Used to get back a pointer to the container
-    // view that will hold the ColumnListView, the
-    // the CLVColumnLabelView, and the scrollbars.
-    // If no scroll bars or border are asked for,
-    // this will act like a plain BView container.
-                                    const char* name = NULL,
-                                    uint32 resizingMode
-                                        = B_FOLLOW_LEFT | B_FOLLOW_TOP,
-                                    uint32 flags
-                                        = B_WILL_DRAW | B_FRAME_EVENTS
-                                            | B_NAVIGABLE,
-                                    list_view_type type
-                                        = B_SINGLE_SELECTION_LIST,
-                                    bool hierarchical = false,
-                                    bool horizontal = true,
-    // which scroll bars should I add, if any
-                                    bool vertical = true,
-                                    border_style border = B_NO_BORDER,
-    // what type of border to add, if any
-                                    const BFont* labelFont = be_plain_font);
-
-    virtual                         ~ColumnListView();
-
-            void                    AddScrollViewCorner();
-
-    //Archival stuff
-    /*** Not implemented yet
-                                    ColumnListView(BMessage* archive);
-    static                          ColumnListView* Instantiate(BMessage* data);
-    virtual status_t                Archive(BMessage* data, bool deep = true)
-                                        const;
-    ***/
-
-    virtual void                    MessageReceived(BMessage* message);
-
-        // column setup functions
-    virtual bool                    AddColumn(CLVColumn* column);
-        // Note that a column may only be added to
-        // one ColumnListView at a time, and may not
-        // be added more than once to the same
-        // ColumnListView without removing it
-        // inbetween
-    virtual bool                    AddColumnList(BList* newColumns);
-    virtual bool                    RemoveColumn(CLVColumn* column);
-    virtual bool                    RemoveColumns(CLVColumn* column,
-                                        int32 Count);
-        // Finds Column in ColumnList and removes Count columns and
-        // their data from the view and its items
-            int32                   CountColumns() const;
-            int32                   IndexOfColumn(CLVColumn* column) const;
-        CLVColumn*              ColumnAt(BPoint point) const;
-        // Returns column located at point on screen --added by jaf
-            CLVColumn*              ColumnAt(int32 columnIndex) const;
-    virtual bool                    SetDisplayOrder(const int32* order);
-        // Sets the display order: each int32 in the Order list specifies
-        // the column index of the next column to display.  Note that this
-        // DOES NOT get called if the user drags a column, so overriding
-        // it will not inform you of user changes. If you need that info,
-        // override DisplayOrderChanged instead. Also note that
-        // SetDisplayOrder does call DisplayOrderChanged(false).
-    virtual void                    ColumnWidthChanged(int32 columnIndex,
-                                        float newWidth);
-    virtual void                    DisplayOrderChanged(const int32* order);
-        // Override this if you want to find out when the display order changed.
-            int32*                  DisplayOrder() const;
-        // Gets the display order in the same format as that used by
-        // SetDisplayOrder. The returned array belongs to the caller and
-        // must be delete[]'d when done with it.
-    virtual void                    SetSortKey(int32 columnIndex);
-        // Set it to -1 to remove the sort key.
-    virtual void                    AddSortKey(int32 columnIndex);
-            void                    ReverseSortMode(int32 columnIndex);
-    virtual void                    SetSortMode(int32 columnIndex,
-                                        CLVSortMode Mode);
-            int32                   Sorting(int32* SortKeys,
-                                        CLVSortMode* SortModes) const;
-        // Returns the number of used sort keys, and fills the provided
-        // arrays with the sort keys by column index and sort modes,
-        // in priority order.  The pointers should point to an array
-        // int32 SortKeys[n], and an array CLVSortMode SortModes[n] where
-        // n is the number of sortable columns in the ColumnListView.
-        // Note: sorting will only occur if the key column is shown.
-            void                    SetSorting(int32 NumberOfKeys,
-                                        int32* SortKeys,
-                                        CLVSortMode* SortModes);
-        // Sets the sorting parameters using the same format returned by sorting
-
-        // BView overrides
-    virtual void                    FrameResized(float newWidth,
-                                        float newHeight);
-    virtual void                    AttachedToWindow();
-    virtual void                    ScrollTo(BPoint point);
-    virtual void                    MouseDown(BPoint point);
-
-        // List functions
-    virtual bool                    AddUnder(CLVListItem*,
-                                        CLVListItem* superitem);
-    virtual bool                    AddItem(CLVListItem*,
-                                        int32 fullListIndex);
-    virtual bool                    AddItem(CLVListItem*);
-    virtual bool                    AddList(BList* newItems);
-        // This must be a BList of CLVListItem*'s, NOT BListItem*'s
-    virtual bool                    AddList(BList* newItems,
-                                        int32 fullListIndex);
-        //This must be a BList of CLVListItem*'s, NOT BListItem*'s
-    virtual bool                    AddItem(BListItem*, int32 fullListIndex);
-        // unhide
-    virtual bool                    AddItem(BListItem*);
-        // unhide
-    virtual bool                    RemoveItem(CLVListItem* item);
-    virtual BListItem*              RemoveItem(int32 fullListIndex);
-        // actually returns CLVListItem
-    virtual bool                    RemoveItems(int32 fullListIndex,
-                                        int32 count);
-    virtual bool                    RemoveItem(BListItem* item);
-        // unhide
-    virtual void                    MakeEmpty();
-            CLVListItem*            FullListItemAt(int32 fullListIndex) const;
-            int32                   FullListIndexOf(const CLVListItem* item)
-                                        const;
-            int32                   FullListIndexOf(BPoint point) const;
-            CLVListItem*            FullListFirstItem() const;
-            CLVListItem*            FullListLastItem() const;
-            bool                    FullListHasItem(const CLVListItem* item)
-                                        const;
-            int32                   FullListCountItems() const;
-            bool                    FullListIsEmpty() const;
-            int32                   FullListCurrentSelection(int32 index = 0)
-                                        const;
-            void                    FullListDoForEach(
-                                        bool (*func)(CLVListItem*));
-            void                    FullListDoForEach(bool (*func)(
-                                        CLVListItem*, void*), void* arg2);
-            CLVListItem*            Superitem(const CLVListItem* item) const;
-            int32                   FullListNumberOfSubitems(
-                                        const CLVListItem* item) const;
-    virtual void                    Expand(CLVListItem* item);
-    virtual void                    Collapse(CLVListItem* item);
-            bool                    IsExpanded(int32 fullListIndex) const;
-            void                    SetSortFunction(CLVCompareFuncPtr compare);
-            void                    SortItems();
-
-    virtual void                    KeyDown(const char* bytes, int32 numBytes);
-
-            void                    SetEditMessage(BMessage* message,
-                                        BMessenger target);
-        // Sets a BMessage that will be sent every time a key is pressed,
-        // or the mouse is clicked in the active cell. (message) becomes
-        // property of this ColumnListView.
-        // Copies of (message) will be sent to (target).
-
-    virtual void                    Pulse();
-        // Used to make the cursor blink on the string column...
-
-            int32                   GetSelectedColumn() const
-                                        { return fSelectedColumn; }
-
-    private:
-        friend class CLVMainView;
-        friend class CLVColumn;
-        friend class CLVColumnLabelView;
-        friend class CLVListItem;
-
-            int32                   GetActualIndexOf(int32 displayIndex) const;
-        // Returns the "real" index of the given display index,
-        // or -1 if there is none.
-
-            int32                   GetDisplayIndexOf(int32 actualIndex) const;
-        // Returns the display index of the given "real" index,
-        // or -1 if there is none.
-
-            void                    SetSelectedColumnIndex(
-                                        int32 selectedcolumnIndex);
-        // Call this to change fSelectedColumn to a new value properly.
-
-            void                    ShiftDragGroup();
-            void                    UpdateScrollBars();
-            void                    ColumnsChanged();
-            void                    CreateContainer(bool horizontal,
-                                        bool vertical, border_style border,
-                                        uint32 resizingMode, uint32 flags);
-            void                    SortListArray(CLVListItem** sortArray,
-                                        int32 itemCount);
-            void                    MakeEmptyPrivate();
-            bool                    AddListPrivate(BList* newItems,
-                                        int32 fullListIndex);
-            bool                    AddItemPrivate(CLVListItem* item,
-                                        int32 fullListIndex);
-            void                    SortFullListSegment(
-                                        int32 originalListStartIndex,
-                                        int32 insertionPoint, BList* newList);
-            BList*                  SortItemCount(
-                                        int32 originalListStartIndex);
-    static  int                     PlainBListSortFunc(BListItem** firstItem,
-                                        BListItem** secondItem);
-    static  int                     HierarchicalBListSortFunc(
-                                        BListItem** firstItem,
-                                        BListItem** secondItem);
-
-            CLVColumnLabelView*     fColumnLabelView;
-            CLVContainerView*       fScrollView;
-            ScrollViewCorner*       fFillerView;
-            bool                    fHierarchical;
-            BList                   fColumnList;
-            BList                   fColumnDisplayList;
-            float                   fDataWidth;
-            float                   fDataHeight;
-            float                   fPageWidth;
-            float                   fPageHeight;
-            BList                   fSortKeyList;
-        // list contains CLVColumn pointers
-            PrefilledBitmap         fRightArrow;
-            PrefilledBitmap         fDownArrow;
-            BList                   fFullItemList;
-            int32                   fExpanderColumn;
-            CLVCompareFuncPtr       fCompareFunction;
-        // added by jaf
-            int32                   fSelectedColumn;
-        // actual index of the column that contains the active cell.
-            BMessage*               fEditMessage;
-        // if non-NULL, sent on keypress or when active cell is clicked.
-            BMessenger              fEditTarget;
-        // target for fEditMessage.
-};
-
-
-#endif  // COLUMN_LIST_VIEW_H

deleted file src/preferences/shortcuts/clv/MouseWatcher.cpp

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-
-
-#include "MouseWatcher.h"
-
-#include <Messenger.h>
-#include <InterfaceKit.h>
-
-
-int32 MouseWatcher(void* data);
-
-
-thread_id
-StartMouseWatcher(BView* target)
-{
-    thread_id MouseWatcherThread = spawn_thread(MouseWatcher,
-        "MouseWatcher", B_NORMAL_PRIORITY, new BMessenger(target));
-    if (MouseWatcherThread != B_NO_MORE_THREADS
-        && MouseWatcherThread != B_NO_MEMORY) {
-        resume_thread(MouseWatcherThread);
-    }
-
-    return MouseWatcherThread;
-}
-
-
-int32
-MouseWatcher(void* data)
-{
-    BMessenger* messenger = (BMessenger*)data;
-    BPoint previousPosition;
-    uint32 previousbuttons = 0xFFFFFFFF;
-    bool isFirstCheck = true;
-    BMessage messageToSend;
-    messageToSend.AddPoint("where", BPoint(0, 0));
-    messageToSend.AddInt32("buttons", 0);
-    messageToSend.AddInt32("modifiers", 0);
-
-    while(true) {
-        if (!messenger->LockTarget()) {
-            // window is dead so exit
-            delete messenger;
-            return 0;
-        }
-        BLooper* looper;
-        BView* view = (BView*)messenger->Target(&looper);
-        BPoint where;
-        uint32 buttons;
-        view->GetMouse(&where, &buttons, false);
-        if (isFirstCheck) {
-            previousPosition = where;
-            previousbuttons = buttons;
-            isFirstCheck = false;
-        }
-        bool shouldSend = false;
-        if (buttons != previousbuttons || buttons == 0
-            || where != previousPosition) {
-            if (buttons == 0)
-                messageToSend.what = MW_MOUSE_UP;
-            else if (buttons != previousbuttons)
-                messageToSend.what = MW_MOUSE_DOWN;
-            else
-                messageToSend.what = MW_MOUSE_MOVED;
-
-            messageToSend.ReplacePoint("where", where);
-            messageToSend.ReplaceInt32("buttons", buttons);
-            messageToSend.ReplaceInt32("modifiers", modifiers());
-            shouldSend = true;
-        }
-
-        looper->Unlock();
-        if (shouldSend)
-            messenger->SendMessage(&messageToSend);
-
-        if (buttons == 0) {
-            // mouse button was released
-            delete messenger;
-            return 0;
-        }
-
-        snooze(50000);
-    }
-}

deleted file src/preferences/shortcuts/clv/MouseWatcher.h

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-#ifndef MOUSE_WATCHER_H
-#define MOUSE_WATCHER_H
-
-
-/**** DOCUMENTATION
- *
- * Once started, MouseWatcher will watch the mouse until the mouse buttons
- * are all released, sendin messages to the target BView (TargetView is
- * specified as the target handler in the BMessenger used to send the messages.
- * The BLooper == window of the target view is determined automatically by the
- * BMessenger)
- *
- * If the mouse moves, a MW_MOUSE_MOVED message is sent.
- * If the mouse buttons are changed, but not released, a MW_MOUSE_DOWN
- * message is sent.
- * If the mouse button(s) are released, a MW_MOUSE_UP message is sent.
- *
- * These messages will have three data entries:
- *
- * "where" (B_POINT_TYPE)       - The position of the mouse in TargetView's
- *                            coordinate system.
- * "buttons" (B_INT32_TYPE) - The mouse buttons.  See BView::GetMouse().
- * "modifiers" (B_INT32_TYPE)   - The modifier keys held down at the time.
- *                            See modifiers().
- *
- * Once it is started, you can't stop it, but that shouldn't matter - the user
- * will most likely releas the buttons soon, and you can interpret the events
- * however you want.
- *
- * StartMouseWatcher returns a valid thread ID, or it returns an error code:
- *  B_NO_MORE_THREADS All thread_id numbers are currently in use.
- *  B_NO_MEMORY Not enough memory to allocate the resources for another
- *              thread.
- */
-
-
-#include <SupportDefs.h>
-#include <OS.h>
-
-
-const uint32 MW_MOUSE_DOWN = 'Mw-D';
-const uint32 MW_MOUSE_UP = 'Mw-U';
-const uint32 MW_MOUSE_MOVED = 'Mw-M';
-
-
-class BView;
-
-thread_id StartMouseWatcher(BView* target);
-
-
-#endif  // MOUSE_WATCHER_H

deleted file src/preferences/shortcuts/clv/PrefilledBitmap.cpp

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-
-
-#include "PrefilledBitmap.h"
-
-
-PrefilledBitmap::PrefilledBitmap(BRect bounds, color_space space,
-    const void* data, bool acceptsViews, bool needsContiguousMemory)
-    :
-    BBitmap(bounds, space, acceptsViews, needsContiguousMemory)
-{
-    int32 length = ((int32(bounds.right - bounds.left) + 3) / 4) * 4;
-    length *= int32(bounds.bottom - bounds.top) + 1;
-    SetBits(data, length, 0, space);
-}
-
-
-PrefilledBitmap::~PrefilledBitmap()
-{
-}

deleted file src/preferences/shortcuts/clv/PrefilledBitmap.h

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-#ifndef PREFILLED_BITMAP_H
-#define PREFILLED_BITMAP_H
-
-
-#include <interface/Bitmap.h>
-
-
-class PrefilledBitmap : public BBitmap
-{
-public:
-                                PrefilledBitmap(BRect bounds,
-                                    color_space space, const void* data,
-                                    bool acceptsViews,
-                                    bool needsContiguousMemory);
-    virtual                     ~PrefilledBitmap();
-};
-
-
-#endif  // PREFILLED_BITMAP_H

deleted file src/preferences/shortcuts/clv/ScrollViewCorner.cpp

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-
-
-#include "Colors.h"
-#include "ScrollViewCorner.h"
-
-#include <InterfaceKit.h>
-
-
-ScrollViewCorner::ScrollViewCorner(float left, float top)
-    :
-    BView(BRect(left, top, left + B_V_SCROLL_BAR_WIDTH,
-        top + B_H_SCROLL_BAR_HEIGHT), NULL,
-        B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM, B_WILL_DRAW)
-{
-    SetHighColor(BeShadow);
-    SetViewColor(BeInactiveGrey);
-}
-
-
-ScrollViewCorner::~ScrollViewCorner()
-{
-}
-
-
-void
-ScrollViewCorner::Draw(BRect updateRect)
-{
-    if (updateRect.bottom >= B_H_SCROLL_BAR_HEIGHT) {
-        StrokeLine(BPoint(0.0, B_H_SCROLL_BAR_HEIGHT),
-            BPoint(B_V_SCROLL_BAR_WIDTH, B_H_SCROLL_BAR_HEIGHT));
-    }
-    if (updateRect.right >= B_V_SCROLL_BAR_WIDTH) {
-        StrokeLine(BPoint(B_V_SCROLL_BAR_WIDTH, 0.0),
-            BPoint(B_V_SCROLL_BAR_WIDTH, B_H_SCROLL_BAR_HEIGHT - 1.0));
-    }
-}

deleted file src/preferences/shortcuts/clv/ScrollViewCorner.h

@@ -1 @@
-/*
- * Copyright 1999-2009 Jeremy Friesner
- * Copyright 2009-2014 Haiku, Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- *      John Scipione, jscipione@gmail.com
- */
-#ifndef SCROLL_VIEW_CORNER_H
-#define SCROLL_VIEW_CORNER_H
-
-
-/*
- * If you have a BScrollView with horizontal and vertical sliders that isn't
- * seated to the lower-right corner of a B_DOCUMENT_WINDOW, there's a "hole"
- * between the sliders that needs to be filled.  You can use this to fill it.
- * In general, it looks best to set the ScrollViewCorner color to
- * BeInactiveControlGrey if the vertical BScrollBar is inactive, and the color
- * to BeBackgroundGrey if the vertical BScrollBar is active.  Have a look at
- * Demo3 of ColumnListView to see what I mean if this is unclear.
- */
-
-
-class ScrollViewCorner : public BView
-{
-public:
-                                ScrollViewCorner(float left, float top);
-    virtual                     ~ScrollViewCorner();
-
-    virtual void                Draw(BRect updateRect);
-};
-
-
-#endif  // SCROLL_VIEW_CORNER_H