Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeartwork@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 1146 insertions, 0 deletions

diff --git a/kwin-styles/kstep/Makefile.am b/kwin-styles/kstep/Makefile.am
new file mode 100644
index 00000000..89397fad
--- /dev/null
+++ b/kwin-styles/kstep/Makefile.am
@@ -0,0 +1,22 @@
+
+INCLUDES = $(all_includes) 
+
+kde_module_LTLIBRARIES = kwin3_kstep.la
+
+kwin3_kstep_la_SOURCES = nextclient.cpp
+kwin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+#kwin_kstep_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+kwin3_kstep_la_LIBADD = $(LIB_KDEUI) -lkdecorations
+
+METASOURCES = AUTO
+noinst_HEADERS = nextclient.h
+
+lnkdir = $(kde_datadir)/kwin/
+lnk_DATA = kstep.desktop
+
+EXTRA_DIST = $(lnk_DATA)
+
+
+###KMAKE-start (don't edit or delete this block)
+
+###KMAKE-end
diff --git a/kwin-styles/kstep/kstep.desktop b/kwin-styles/kstep/kstep.desktop
new file mode 100644
index 00000000..bf663c8c
--- /dev/null
+++ b/kwin-styles/kstep/kstep.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=KStep
+Name[cy]=KCam
+Name[hi]=के-स्टेप
+Name[ne]=केडीई चरण
+Name[sv]=Kstep
+Name[ta]=Kஅடி
+Name[th]=ตัวจัดการหน้าต่างสเต็ป - K
+Name[ven]=Tshitepe tsha K
+Name[xh]=Inqwanqwa le K
+Name[zu]=Izinga le K
+X-KDE-Library=kwin3_kstep
diff --git a/kwin-styles/kstep/nextclient.cpp b/kwin-styles/kstep/nextclient.cpp
new file mode 100644
index 00000000..64fb5217
--- /dev/null
+++ b/kwin-styles/kstep/nextclient.cpp
@@ -0,0 +1,987 @@
+#include "nextclient.h"
+#include <qdatetime.h>
+#include <qdrawutil.h>
+#include <qlayout.h>
+#include <qpainter.h>
+#include <qbitmap.h>
+#include <qlabel.h>
+#include <qtooltip.h>
+#include <kdebug.h>
+#include <klocale.h>
+#include <kpixmapeffect.h>
+
+namespace KStep {
+
+static const unsigned char close_bits[] = {
+  0x03, 0x03, 0x87, 0x03, 0xce, 0x01, 0xfc, 0x00, 0x78, 0x00, 0x78, 0x00,
+  0xfc, 0x00, 0xce, 0x01, 0x87, 0x03, 0x03, 0x03};
+
+static const unsigned char iconify_bits[] = {
+  0xff, 0x03, 0xff, 0x03, 0xff, 0x03, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03,
+  0x03, 0x03, 0x03, 0x03, 0xff, 0x03, 0xff, 0x03};
+
+static const unsigned char question_bits[] = {
+  0x00, 0x00, 0x78, 0x00, 0xcc, 0x00, 0xc0, 0x00, 0x60, 0x00, 0x30, 0x00,
+  0x00, 0x00, 0x30, 0x00, 0x30, 0x00, 0x00, 0x00};
+
+static const unsigned char sticky_bits[] = {
+  0x00, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0xfe, 0x01, 0xfe, 0x01,
+  0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x00, 0x00};
+
+static const unsigned char unsticky_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x01, 0xfe, 0x01,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static const unsigned char maximize_bits[] = {
+   0x30, 0x00, 0x78, 0x00, 0xfc, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x01,
+   0x02, 0x01, 0x84, 0x00, 0x48, 0x00, 0x30, 0x00 };
+
+static const unsigned char shade_bits[] = {
+    0xff,0x03,
+    0xff,0x03,
+    0x03,0x03,
+    0xff,0x03,
+    0xff,0x03,
+    0x00,0x00,
+    0x00,0x00,
+    0x00,0x00,
+    0x00,0x00,
+    0x00,0x00 
+};
+    
+static const unsigned char unshade_bits[] = {
+    0xff,0x03,
+    0xff,0x03,
+    0x03,0x03,
+    0x03,0x03,
+    0x03,0x03,
+    0x03,0x03,
+    0x03,0x03,
+    0x03,0x03,
+    0xff,0x03,
+    0xff,0x03 
+};
+
+static const unsigned char keep_above_bits[] = {
+    0x30,0x00,
+    0x78,0x00,
+    0xfc,0x00,
+    0x00,0x00,
+    0xff,0x03,
+    0xff,0x03,
+    0x00,0x00,
+    0x00,0x00,
+    0x00,0x00,
+    0x00,0x00 
+};
+
+static const unsigned char from_above_bits[] = {
+    0xff,0x03,
+    0xff,0x03,
+    0x00,0x00,
+    0xfc,0x00,
+    0x78,0x00,
+    0x30,0x00,
+    0x00,0x00,
+    0x00,0x00,
+    0x00,0x00,
+    0x00,0x00 
+};
+    
+static const unsigned char keep_below_bits[] = {
+    0x00,0x00,
+    0x00,0x00,
+    0x00,0x00,
+    0x00,0x00,
+    0xff,0x03,
+    0xff,0x03,
+    0x00,0x00,
+    0xfc,0x00,
+    0x78,0x00,
+    0x30,0x00
+};
+
+static const unsigned char from_below_bits[] = {
+    0x00,0x00,
+    0x00,0x00,
+    0x00,0x00,
+    0x00,0x00,
+    0x30,0x00,
+    0x78,0x00,
+    0xfc,0x00,
+    0x00,0x00,
+    0xff,0x03,
+    0xff,0x03
+};
+
+static const unsigned char resize_bits[] = {
+    0xff, 0x03, 
+    0xff, 0x03, 
+    0x33, 0x03, 
+    0x33, 0x03, 
+    0xf3, 0x03, 
+    0xf3, 0x03,
+    0x03, 0x03, 
+    0x03, 0x03, 
+    0xff, 0x03, 
+    0xff, 0x03
+};
+
+
+// If the maximize graphic above (which I did quickly in about a
+// minute, just so I could have something) doesn't please, maybe one
+// of the following would be better.  IMO it doesn't matter, as long
+// as it's not offensive---people will get used to whatever you use.
+// True NeXT fans won't turn on the maximize button anyway.
+//
+// static const unsigned char maximize_bits[] = {
+//    0xcf, 0x03, 0x87, 0x03, 0xcf, 0x03, 0xfd, 0x02, 0x48, 0x00, 0x48, 0x00,
+//    0xfd, 0x02, 0xcf, 0x03, 0x87, 0x03, 0xcf, 0x03 };
+//
+// static const unsigned char maximize_bits[] = {
+//    0xcf, 0x03, 0x87, 0x03, 0x87, 0x03, 0x79, 0x02, 0x48, 0x00, 0x48, 0x00,
+//    0x79, 0x02, 0x87, 0x03, 0x87, 0x03, 0xcf, 0x03 };
+//
+// static const unsigned char maximize_bits[] = {
+//    0x87, 0x03, 0x03, 0x03, 0xfd, 0x02, 0x84, 0x00, 0x84, 0x00, 0x84, 0x00,
+//    0x84, 0x00, 0xfd, 0x02, 0x03, 0x03, 0x87, 0x03 };
+//
+// static const unsigned char maximize_bits[] = {
+//    0x30, 0x00, 0x78, 0x00, 0xcc, 0x00, 0x86, 0x01, 0x33, 0x03, 0x79, 0x02,
+//    0xcd, 0x02, 0x87, 0x03, 0x03, 0x03, 0x01, 0x02 };
+//
+// static const unsigned char maximize_bits[] = {
+//    0x30, 0x00, 0x78, 0x00, 0x78, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xfe, 0x01,
+//    0xfe, 0x01, 0xff, 0x03, 0xff, 0x03, 0xff, 0x03 };
+
+
+static KPixmap *aTitlePix;
+static KPixmap *iTitlePix;
+static KPixmap *aFramePix;
+static KPixmap *iFramePix;
+static KPixmap *aHandlePix;
+static KPixmap *iHandlePix;
+static KPixmap *aBtn;
+static KPixmap *aBtnDown;
+static KPixmap *iBtn;
+static KPixmap *iBtnDown;
+static QColor *btnForeground;
+static bool pixmaps_created = false;
+
+static int titleHeight = 16;
+
+// Precomputed border sizes for accessibility
+// The sizes are applied for tiny -> normal -> large -> very large -> huge -> very huge -> oversized
+static const int borderSizes[] = { 4,  6,  9, 14, 21, 32, 48 };
+
+static int handleSize = 6;	// the resize handle size in pixels
+
+static inline const KDecorationOptions* options()
+{
+    return KDecoration::options();
+}
+
+static void create_pixmaps(NextClientFactory *f)
+{
+    if(pixmaps_created)
+        return;
+    pixmaps_created = true;
+
+    // find preferred border size
+    int i = options()->preferredBorderSize(f);
+    if (i >= 0 && i <= 6) handleSize = borderSizes[i];
+
+    titleHeight = QFontMetrics(options()->font(true)).height() + 4;
+    if (titleHeight < handleSize) titleHeight = handleSize;
+    titleHeight &= ~1; // Make title height even
+    if (titleHeight < 16) titleHeight = 16;
+
+    aTitlePix = new KPixmap();
+    aTitlePix->resize(32, titleHeight - 2);
+    KPixmapEffect::gradient(*aTitlePix,
+                            options()->color(KDecoration::ColorTitleBar, true),
+                            options()->color(KDecoration::ColorTitleBlend, true),
+                            KPixmapEffect::VerticalGradient);
+    iTitlePix = new KPixmap();
+    iTitlePix->resize(32, titleHeight - 2);
+    KPixmapEffect::gradient(*iTitlePix,
+                            options()->color(KDecoration::ColorTitleBar, false),
+                            options()->color(KDecoration::ColorTitleBlend, false),
+                            KPixmapEffect::VerticalGradient);
+    // Bottom frame gradient
+    aFramePix = new KPixmap();
+    aFramePix->resize(32, handleSize);
+    KPixmapEffect::gradient(*aFramePix,
+                            options()->color(KDecoration::ColorFrame, true).light(150),
+                            options()->color(KDecoration::ColorFrame, true).dark(120),
+                            KPixmapEffect::VerticalGradient);
+    iFramePix = new KPixmap();
+    iFramePix->resize(32, handleSize);
+    KPixmapEffect::gradient(*iFramePix,
+                            options()->color(KDecoration::ColorFrame, false).light(150),
+                            options()->color(KDecoration::ColorFrame, false).dark(120),
+                            KPixmapEffect::VerticalGradient);
+
+    // Handle gradient
+    aHandlePix = new KPixmap();
+    aHandlePix->resize(32, handleSize);
+    KPixmapEffect::gradient(*aHandlePix,
+                            options()->color(KDecoration::ColorHandle, true).light(150),
+                            options()->color(KDecoration::ColorHandle, true).dark(120),
+                            KPixmapEffect::VerticalGradient);
+    iHandlePix = new KPixmap();
+    iHandlePix->resize(32, handleSize);
+    KPixmapEffect::gradient(*iHandlePix,
+                            options()->color(KDecoration::ColorHandle, false).light(150),
+                            options()->color(KDecoration::ColorHandle, false).dark(120),
+                            KPixmapEffect::VerticalGradient);
+
+    int btnWidth = titleHeight;
+    iBtn = new KPixmap;
+    iBtn->resize(btnWidth, btnWidth);
+    iBtnDown = new KPixmap;
+    iBtnDown->resize(btnWidth, btnWidth);
+    aBtn = new KPixmap;
+    aBtn->resize(btnWidth, btnWidth);
+    aBtnDown = new KPixmap;
+    aBtnDown->resize(btnWidth, btnWidth);
+    KPixmap internal;
+    int internalHeight = btnWidth - 6;
+    internal.resize(internalHeight, internalHeight);
+
+    // inactive buttons
+    QColor c(options()->color(KDecoration::ColorButtonBg, false));
+    KPixmapEffect::gradient(*iBtn, c.light(120), c.dark(120),
+                            KPixmapEffect::DiagonalGradient);
+    KPixmapEffect::gradient(internal, c.dark(120), c.light(120),
+                            KPixmapEffect::DiagonalGradient);
+    bitBlt(iBtn, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true);
+
+    KPixmapEffect::gradient(*iBtnDown, c.dark(120), c.light(120),
+                            KPixmapEffect::DiagonalGradient);
+    KPixmapEffect::gradient(internal, c.light(120), c.dark(120),
+                            KPixmapEffect::DiagonalGradient);
+    bitBlt(iBtnDown, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true);
+
+    // active buttons
+    c = options()->color(KDecoration::ColorButtonBg, true);
+    KPixmapEffect::gradient(*aBtn, c.light(120), c.dark(120),
+                            KPixmapEffect::DiagonalGradient);
+    KPixmapEffect::gradient(internal, c.dark(120), c.light(120),
+                            KPixmapEffect::DiagonalGradient);
+    bitBlt(aBtn, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true);
+
+    KPixmapEffect::gradient(*aBtnDown, c.dark(120), c.light(120),
+                            KPixmapEffect::DiagonalGradient);
+    KPixmapEffect::gradient(internal, c.light(120), c.dark(120),
+                            KPixmapEffect::DiagonalGradient);
+    bitBlt(aBtnDown, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true);
+
+    QPainter p;
+    p.begin(aBtn);
+    p.setPen(Qt::black);
+    p.drawRect(0, 0, btnWidth, btnWidth);
+    p.end();
+    p.begin(iBtn);
+    p.setPen(Qt::black);
+    p.drawRect(0, 0, btnWidth, btnWidth);
+    p.end();
+    p.begin(aBtnDown);
+    p.setPen(Qt::black);
+    p.drawRect(0, 0, btnWidth, btnWidth);
+    p.end();
+    p.begin(iBtnDown);
+    p.setPen(Qt::black);
+    p.drawRect(0, 0, btnWidth, btnWidth);
+    p.end();
+
+    if(qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128)
+        btnForeground = new QColor(Qt::black);
+    else
+        btnForeground = new QColor(Qt::white);
+}
+
+static void delete_pixmaps()
+{
+    delete aTitlePix;
+    delete iTitlePix;
+    delete aFramePix;
+    delete iFramePix;
+    delete aHandlePix;
+    delete iHandlePix;
+    delete aBtn;
+    delete iBtn;
+    delete aBtnDown;
+    delete iBtnDown;
+    delete btnForeground;
+
+    pixmaps_created = false;
+}
+
+// =====================================
+
+NextButton::NextButton(NextClient *parent, const char *name,
+                       const unsigned char *bitmap, int bw, int bh,
+                       const QString& tip, const int realizeBtns)
+    : QButton(parent->widget(), name),
+      deco(NULL), client(parent), last_button(NoButton)
+{
+    realizeButtons = realizeBtns;
+
+    setBackgroundMode( NoBackground );
+    resize(titleHeight, titleHeight);
+    setFixedSize(titleHeight, titleHeight);
+
+    if(bitmap)
+        setBitmap(bitmap, bw, bh);
+
+    QToolTip::add(this, tip);
+}
+
+void NextButton::reset()
+{
+    repaint(false);
+}
+
+void NextButton::setBitmap(const unsigned char *bitmap, int w, int h)
+{
+    deco = new QBitmap(w, h, bitmap, true);
+    deco->setMask(*deco);
+    repaint();
+}
+
+void NextButton::drawButton(QPainter *p)
+{
+    if(client->isActive())
+        p->drawPixmap(0, 0, isDown() ? *aBtnDown : *aBtn);
+    else
+        p->drawPixmap(0, 0, isDown() ? *iBtnDown : *iBtn);
+
+    // If we have a decoration, draw it; otherwise, we have the menu
+    // button (remember, we set the bitmap to NULL).
+    int offset;
+    if (deco) {
+        offset = (titleHeight - 10) / 2 + (isDown() ? 1 : 0);
+        p->setPen(*btnForeground);
+        p->drawPixmap(offset, offset, *deco);
+    } else {
+        offset = (titleHeight - 16) / 2;
+	KPixmap btnpix = client->icon().pixmap(QIconSet::Small,
+		client->isActive() ? QIconSet::Normal : QIconSet::Disabled);
+        p->drawPixmap( offset, offset, btnpix );
+    }
+}
+
+void NextButton::mousePressEvent( QMouseEvent* e )
+{
+    last_button = e->button();
+    QMouseEvent me( e->type(), e->pos(), e->globalPos(),
+                    (e->button()&realizeButtons)?LeftButton:NoButton, e->state() );
+    QButton::mousePressEvent( &me );
+}
+
+void NextButton::mouseReleaseEvent( QMouseEvent* e )
+{
+    last_button = e->button();
+    QMouseEvent me( e->type(), e->pos(), e->globalPos(),
+                    (e->button()&realizeButtons)?LeftButton:NoButton, e->state() );
+    QButton::mouseReleaseEvent( &me );
+}
+
+// =====================================
+
+NextClient::NextClient(KDecorationBridge *b, KDecorationFactory *f)
+    : KDecoration(b, f)
+{
+}
+
+void NextClient::init()
+{
+    createMainWidget(WResizeNoErase | WStaticContents);
+    widget()->installEventFilter(this);
+
+    widget()->setBackgroundMode( NoBackground );
+
+    QVBoxLayout *mainLayout = new QVBoxLayout(widget());
+    QBoxLayout  *titleLayout = new QBoxLayout(0, QBoxLayout::LeftToRight, 0, 0, 0);
+    QHBoxLayout *windowLayout = new QHBoxLayout();
+    mainLayout->addLayout(titleLayout);
+    mainLayout->addLayout(windowLayout, 1);
+    mainLayout->addSpacing(mustDrawHandle() ? handleSize : 1);
+
+    windowLayout->addSpacing(1);
+    if (isPreview())
+        windowLayout->addWidget(new QLabel(i18n(
+			"<center><b>KStep preview</b></center>"), widget()));
+    else
+        windowLayout->addItem(new QSpacerItem( 0, 0 ));
+
+    windowLayout->addSpacing(1);
+
+    initializeButtonsAndTitlebar(titleLayout);
+}
+
+/**
+   Preconditions:
+       + button is an array of length MAX_NUM_BUTTONS
+
+   Postconditions:
+       + Title bar and buttons have been initialized and laid out
+       + for all i in 0..(MAX_NUM_BUTTONS-1), button[i] points to
+         either (1) a valid NextButton instance, if the corresponding
+         button is selected in the current button scheme, or (2) null
+         otherwise.
+ */
+void NextClient::initializeButtonsAndTitlebar(QBoxLayout* titleLayout)
+{
+    // Null the buttons to begin with (they are not guaranteed to be null).
+    for (int i=0; i<MAX_NUM_BUTTONS; i++) {
+        button[i] = NULL;
+    }
+
+    // The default button positions for other styles do not match the
+    // behavior of older versions of KStep, so we have to set these
+    // manually when customButtonPositions isn't enabled.
+    QString left, right;
+    if (options()->customButtonPositions()) {
+        left = options()->titleButtonsLeft();
+        right = options()->titleButtonsRight();
+    } else {
+        left = QString("I");
+        right = QString("SX");
+    }
+
+    // Do actual creation and addition to titleLayout
+    addButtons(titleLayout, left);
+
+    titlebar = new QSpacerItem(10, titleHeight, QSizePolicy::Expanding,
+                               QSizePolicy::Minimum );
+    titleLayout->addItem(titlebar);
+    addButtons(titleLayout, right);
+
+    // Finally, activate all live buttons
+    for ( int i = 0; i < MAX_NUM_BUTTONS; i++) {
+        if (button[i]) {
+            button[i]->setMouseTracking( TRUE );
+        }
+    }
+}
+
+/** Adds the buttons for one side of the title bar, based on the spec
+ * string; see the KWinInternal::KDecoration class, methods
+ * titleButtonsLeft and titleBUttonsRight. */
+void NextClient::addButtons(QBoxLayout* titleLayout, const QString& spec)
+{
+    for (unsigned int i=0; i<spec.length(); i++) {
+        switch (spec[i].latin1()) {
+        case 'A':
+            if (isMaximizable()) {
+                button[MAXIMIZE_IDX] =
+                    new NextButton(this, "maximize", maximize_bits, 10, 10,
+                                   i18n("Maximize"), LeftButton|MidButton|RightButton);
+                titleLayout->addWidget( button[MAXIMIZE_IDX] );
+                connect( button[MAXIMIZE_IDX], SIGNAL(clicked()),
+                         this, SLOT(maximizeButtonClicked()) );
+            }
+            break;
+
+        case 'H':
+	    if (providesContextHelp()) {
+		button[HELP_IDX] = new NextButton(this,
+			"help", question_bits, 10, 10, i18n("Help"));
+		titleLayout->addWidget( button[HELP_IDX] );
+		connect( button[HELP_IDX], SIGNAL(clicked()),
+			 this, SLOT(showContextHelp()) );
+	    }
+            break;
+
+        case 'I':
+            if (isMinimizable()) {
+                button[ICONIFY_IDX] =
+                    new NextButton(this, "iconify", iconify_bits, 10, 10,
+                                   i18n("Minimize"));
+                titleLayout->addWidget( button[ICONIFY_IDX] );
+                connect( button[ICONIFY_IDX], SIGNAL(clicked()),
+                         this, SLOT(minimize()) );
+            }
+            break;
+
+        case 'M':
+            button[MENU_IDX] =
+                new NextButton(this, "menu", NULL, 10, 10, i18n("Menu"), LeftButton|RightButton);
+            titleLayout->addWidget( button[MENU_IDX] );
+            // NOTE DIFFERENCE: capture pressed(), not clicked()
+            connect( button[MENU_IDX], SIGNAL(pressed()),
+                     this, SLOT(menuButtonPressed()) );
+            break;
+
+        case 'L':
+            button[SHADE_IDX] =
+                new NextButton(this, "shade", NULL, 0, 0, i18n("Shade"));
+            titleLayout->addWidget( button[SHADE_IDX] );
+            connect( button[SHADE_IDX], SIGNAL(clicked()),
+                     this, SLOT(shadeClicked()) );
+            // NOTE DIFFERENCE: set the pixmap separately (2 states)
+	    shadeChange();
+            break;
+	    
+        case 'S':
+            button[STICKY_IDX] =
+                new NextButton(this, "sticky", NULL, 0, 0, i18n("On all desktops"));
+            titleLayout->addWidget( button[STICKY_IDX] );
+            connect( button[STICKY_IDX], SIGNAL(clicked()),
+                     this, SLOT(toggleOnAllDesktops()) );
+            // NOTE DIFFERENCE: set the pixmap separately (2 states)
+	    desktopChange();
+            break;
+
+	case 'F':
+            button[ABOVE_IDX] = new NextButton(this, "above", NULL, 0, 0, "");
+            titleLayout->addWidget( button[ABOVE_IDX] );
+            connect( button[ABOVE_IDX], SIGNAL(clicked()),
+                     this, SLOT(aboveClicked()) );
+	    connect(this, SIGNAL(keepAboveChanged(bool)), 
+		    SLOT(keepAboveChange(bool)));
+	    keepAboveChange(keepAbove());
+	    break;
+	    
+	case 'B':
+            button[BELOW_IDX] = new NextButton(this, "below", NULL, 0, 0, "");
+            titleLayout->addWidget( button[BELOW_IDX] );
+            connect( button[BELOW_IDX], SIGNAL(clicked()),
+                     this, SLOT(belowClicked()) );
+	    connect(this, SIGNAL(keepBelowChanged(bool)), 
+		    SLOT(keepBelowChange(bool)));
+	    keepBelowChange(keepBelow());
+	    break;
+        
+	case 'X':
+            if (isCloseable()) {
+		button[CLOSE_IDX] =
+		    new NextButton(this, "close", close_bits, 10, 10,
+				   i18n("Close"));
+		titleLayout->addWidget(button[CLOSE_IDX]);
+		connect(button[CLOSE_IDX], SIGNAL(clicked()),
+			 this, SLOT(closeWindow()));
+            }
+            break;
+
+	case 'R':
+            if (mustDrawHandle()) {
+		button[RESIZE_IDX] =
+		    new NextButton(this, "resize", resize_bits, 10, 10,
+				   i18n("Resize"));
+		titleLayout->addWidget(button[RESIZE_IDX]);
+		// NOTE DIFFERENCE: capture pressed(), not clicked()
+		connect(button[RESIZE_IDX], SIGNAL(pressed()),
+			 this, SLOT(resizePressed()));
+            }
+	    break;
+        case '_':
+            // TODO: Add spacer handling
+            break;
+
+        default:
+            kdDebug() << " Can't happen: unknown button code "
+                      << QString(spec[i]);
+            break;
+        }
+    }
+}
+
+bool NextClient::mustDrawHandle() const 
+{ 
+    bool drawSmallBorders = !options()->moveResizeMaximizedWindows();
+    if (drawSmallBorders && (maximizeMode() & MaximizeVertical)) {
+	return false;
+    } else {
+	return isResizable();
+    }
+}
+
+void NextClient::iconChange()
+{
+    if (button[MENU_IDX] && button[MENU_IDX]->isVisible())
+	button[MENU_IDX]->repaint(false);
+}
+
+void NextClient::menuButtonPressed()
+{
+    // Probably don't need this null check, but we might as well.
+    if (button[MENU_IDX]) {
+	QRect menuRect = button[MENU_IDX]->rect();
+        QPoint menuTop = button[MENU_IDX]->mapToGlobal(menuRect.topLeft());
+        QPoint menuBottom = button[MENU_IDX]->mapToGlobal(menuRect.bottomRight());
+	menuTop += QPoint(1, 1);
+	menuBottom += QPoint(1, 1);
+        KDecorationFactory* f = factory();
+        showWindowMenu(QRect(menuTop, menuBottom));
+        if( !f->exists( this )) // 'this' was deleted
+            return;
+	button[MENU_IDX]->setDown(false);
+    }
+}
+
+// Copied, with minor edits, from KDEDefaultClient::slotMaximize()
+void NextClient::maximizeButtonClicked()
+{
+    if (button[MAXIMIZE_IDX]) {
+        maximize(button[MAXIMIZE_IDX]->lastButton());
+    }
+}
+
+void NextClient::shadeClicked()
+{
+    setShade(!isSetShade());
+}
+
+void NextClient::aboveClicked()
+{
+    setKeepAbove(!keepAbove());
+}
+
+void NextClient::belowClicked()
+{
+    setKeepBelow(!keepBelow());
+    keepAboveChange(keepAbove());
+    keepBelowChange(keepBelow());
+}
+
+void NextClient::resizePressed()
+{
+    performWindowOperation(ResizeOp);
+}
+
+void NextClient::resizeEvent(QResizeEvent *)
+{
+    if (widget()->isVisible()) {
+	// TODO ? update border area only?
+        widget()->update();
+#if 0
+        widget()->update(titlebar->geometry());
+        QPainter p(widget());
+	QRect t = titlebar->geometry();
+	t.setTop( 0 );
+	QRegion r = widget()->rect();
+	r = r.subtract( t );
+	p.setClipRegion( r );
+	p.eraseRect(widget()->rect());
+#endif
+    }
+}
+
+void NextClient::captionChange()
+{
+    widget()->repaint(titlebar->geometry(), false);
+}
+
+
+void NextClient::paintEvent( QPaintEvent* )
+{
+    QPainter p(widget());
+
+    // Draw black frame
+    QRect fr = widget()->rect();
+    p.setPen(Qt::black);
+    p.drawRect(fr);
+
+    // Draw title bar
+    QRect t = titlebar->geometry();
+    t.setTop(1);
+    p.drawTiledPixmap(t.x()+1, t.y()+1, t.width()-2, t.height()-2,
+                      isActive() ? *aTitlePix : *iTitlePix);
+    qDrawShadePanel(&p, t.x(), t.y(), t.width(), t.height()-1,
+                   options()->colorGroup(KDecoration::ColorTitleBar, isActive()));
+    p.drawLine(t.x(), t.bottom(), t.right(), t.bottom());
+
+#if 0
+    // Why setting up a clipping region if it is not used? (setClipping(false))
+    QRegion r = fr;
+    r = r.subtract( t );
+    p.setClipRegion( r );
+    p.setClipping(false);
+#endif
+
+    t.setTop( 1 );
+    t.setHeight(t.height()-2);
+    t.setLeft( t.left() + 4 );
+    t.setRight( t.right() - 2 );
+
+    p.setPen(options()->color(KDecoration::ColorFont, isActive()));
+    p.setFont(options()->font(isActive()));
+    p.drawText( t, AlignCenter | AlignVCenter, caption() );
+
+    // Draw resize handle
+    if (mustDrawHandle()) {
+        int corner = 16 + 3*handleSize/2;
+	qDrawShadePanel(&p,
+		fr.x() + 1, fr.bottom() - handleSize, corner-1, handleSize,
+		options()->colorGroup(KDecoration::ColorHandle, isActive()),
+		false);
+	p.drawTiledPixmap(fr.x() + 2, fr.bottom() - handleSize + 1,
+		corner - 3, handleSize - 2, isActive() ? *aHandlePix : *iHandlePix);
+
+	qDrawShadePanel(&p,
+		fr.x() + corner, fr.bottom() - handleSize,
+		fr.width() - 2*corner, handleSize,
+		options()->colorGroup(KDecoration::ColorFrame, isActive()),
+		false);
+	p.drawTiledPixmap(fr.x() + corner + 1, fr.bottom() - handleSize + 1,
+		fr.width() - 2*corner - 2, handleSize - 2,
+		isActive() ? *aFramePix : *iFramePix);
+
+	qDrawShadePanel(&p,
+		fr.right() - corner + 1, fr.bottom() - handleSize, corner - 1, handleSize,
+		options()->colorGroup(KDecoration::ColorHandle, isActive()),
+		false);
+	p.drawTiledPixmap(fr.right() - corner + 2, fr.bottom() - handleSize + 1,
+		corner - 3, handleSize - 2, isActive() ? *aHandlePix : *iHandlePix);
+    }
+}
+
+void NextClient::mouseDoubleClickEvent( QMouseEvent * e )
+{
+    if (e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) )
+	titlebarDblClickOperation();
+}
+
+void NextClient::wheelEvent( QWheelEvent * e )
+{
+    if (isSetShade() || QRect( 0, 0, width(), titleHeight ).contains( e->pos() ) )
+	titlebarMouseWheelOperation( e->delta());
+}
+
+void NextClient::showEvent(QShowEvent *)
+{
+    widget()->repaint();
+}
+
+void NextClient::desktopChange()
+{
+    bool on = isOnAllDesktops();
+    if (NextButton * b = button[STICKY_IDX]) {
+        b->setBitmap( on ? unsticky_bits : sticky_bits, 10, 10);
+	QToolTip::remove(b);
+	QToolTip::add(b, on ? i18n("Not on all desktops") : i18n("On all desktops"));
+    }
+}
+
+void NextClient::maximizeChange()
+{
+    if (button[MAXIMIZE_IDX]) {
+	bool m = maximizeMode() == MaximizeFull;
+	//button[MAXIMIZE_IDX]->setBitmap(m ? minmax_bits : maximize_bits);
+	QToolTip::remove(button[MAXIMIZE_IDX]);
+	QToolTip::add(button[MAXIMIZE_IDX],
+		m ? i18n("Restore") : i18n("Maximize"));
+    }
+    //spacer->changeSize(10, mustDrawHandle() ? handleSize : 1,
+    //		    QSizePolicy::Expanding, QSizePolicy::Minimum);
+    //mainLayout->activate();
+}
+
+void NextClient::activeChange()
+{
+    widget()->repaint(false);
+    slotReset();
+}
+
+void NextClient::slotReset()
+{
+    for (int i=0; i<MAX_NUM_BUTTONS; i++) {
+        if (button[i]) {
+            button[i]->reset();
+        }
+    }
+}
+
+KDecoration::Position
+NextClient::mousePosition( const QPoint& p ) const
+{
+  Position m = PositionCenter;
+
+  if (p.y() < (height() - handleSize))
+    m = KDecoration::mousePosition(p);
+
+  else {
+    int corner = 16 + 3*handleSize/2;
+    if (p.x() >= (width() - corner))
+      m = PositionBottomRight;
+    else if (p.x() <= corner)
+      m = PositionBottomLeft;
+    else
+      m = PositionBottom;
+  }
+
+  return m;
+}
+
+void NextClient::borders(int &left, int &right, int &top, int &bottom) const
+{
+    left = right = 1;
+    top = titleHeight; // FRAME is this ok?
+    bottom = mustDrawHandle() ? handleSize : 1;
+}
+
+void NextClient::shadeChange()
+{
+    if (NextButton *b = button[SHADE_IDX]) {
+        b->setBitmap(isSetShade() ? unshade_bits : shade_bits, 10, 10);
+	QToolTip::remove(b);
+	QToolTip::add(b, isSetShade() ? i18n("Unshade") : i18n("Shade"));
+    }
+}
+
+void NextClient::keepAboveChange(bool above)
+{
+    if (NextButton *b = button[ABOVE_IDX]) {
+        b->setBitmap(above ? from_above_bits : keep_above_bits, 10, 10);
+	QToolTip::remove(b);
+	QToolTip::add(b, above ? 
+		i18n("Do not keep above others") : i18n("Keep above others"));
+	b->repaint(false);
+    }
+}
+
+void NextClient::keepBelowChange(bool below)
+{
+    if (NextButton *b = button[BELOW_IDX]) {
+        b->setBitmap(below ? from_below_bits : keep_below_bits, 10, 10);
+	QToolTip::remove(b);
+	QToolTip::add(b, below ? 
+		i18n("Do not keep below others") : i18n("Keep below others"));
+	b->repaint(false);
+    }
+}
+
+QSize NextClient::minimumSize() const
+{
+    return QSize(titleHeight * 6 + 2, titleHeight + handleSize + 2);
+}
+
+void NextClient::resize(const QSize& s)
+{
+    widget()->resize(s);
+}
+
+void NextClient::reset(unsigned long)
+{
+    for (int i = 0; i < MAX_NUM_BUTTONS; ++i) {
+        if (button[i])
+            button[i]->reset();
+    }
+    widget()->repaint();
+}
+
+bool NextClient::eventFilter(QObject *o, QEvent *e)
+{
+    if (o != widget())
+	return false;
+    switch (e->type()) {
+    case QEvent::Resize:
+	resizeEvent(static_cast< QResizeEvent* >( e ));
+	return true;
+    case QEvent::Paint:
+	paintEvent(static_cast< QPaintEvent* >( e ));
+	return true;
+    case QEvent::MouseButtonDblClick:
+	mouseDoubleClickEvent(static_cast< QMouseEvent* >( e ));
+	return true;
+    case QEvent::Wheel:
+	wheelEvent( static_cast< QWheelEvent* >( e ));
+	return true;
+    case QEvent::MouseButtonPress:
+	processMousePressEvent(static_cast< QMouseEvent* >( e ));
+	return true;
+    case QEvent::Show:
+	showEvent(static_cast< QShowEvent* >( e ));
+	return true;
+    default:
+	break;
+    }
+    return false;
+}
+
+bool NextClient::drawbound(const QRect& geom, bool /* clear */)
+{
+    QPainter p(workspaceWidget());
+    p.setPen(QPen(Qt::white, 3));
+    p.setRasterOp(Qt::XorROP);
+    p.drawRect(geom);
+    int leftMargin = geom.left() + 2;
+    p.fillRect(leftMargin, geom.top() + titleHeight - 1,
+	    geom.width() - 4, 3, Qt::white);
+    if (mustDrawHandle()) {
+	p.fillRect(leftMargin, geom.bottom() - handleSize - 1,
+		geom.width() - 4, 3, Qt::white);
+    }	    
+    return true;
+}
+
+// =====================================
+
+NextClientFactory::NextClientFactory()
+{
+    create_pixmaps(this);
+}
+
+NextClientFactory::~NextClientFactory()
+{
+    delete_pixmaps();
+}
+
+KDecoration *NextClientFactory::createDecoration(KDecorationBridge *b)
+{
+    return new NextClient(b, this);
+}
+
+bool NextClientFactory::reset(unsigned long /*changed*/)
+{
+    // TODO Do not recreate decorations if it is not needed. Look at
+    // ModernSystem for how to do that
+    delete_pixmaps();
+    create_pixmaps(this);
+    // For now just return true.
+    return true;
+}
+
+bool NextClientFactory::supports( Ability ability )
+{
+    switch( ability )
+    {
+        case AbilityAnnounceButtons:
+        case AbilityButtonMenu:
+        case AbilityButtonOnAllDesktops:
+        case AbilityButtonHelp:
+        case AbilityButtonMinimize:
+        case AbilityButtonMaximize:
+        case AbilityButtonClose:
+        case AbilityButtonAboveOthers:
+        case AbilityButtonBelowOthers:
+        case AbilityButtonShade:
+        case AbilityButtonResize:
+            return true;
+        default:
+            return false;
+    };
+}
+
+QValueList< NextClientFactory::BorderSize >
+NextClientFactory::borderSizes() const
+{
+    // the list must be sorted
+    return QValueList< BorderSize >() << BorderTiny << BorderNormal <<
+	BorderLarge << BorderVeryLarge <<  BorderHuge <<
+	BorderVeryHuge << BorderOversized;
+}
+
+} // KStep namespace
+
+extern "C" KDE_EXPORT KDecorationFactory* create_factory()
+{
+    return new KStep::NextClientFactory();
+}
+
+#include "nextclient.moc"
+
+// vim: sw=4
diff --git a/kwin-styles/kstep/nextclient.h b/kwin-styles/kstep/nextclient.h
new file mode 100644
index 00000000..dc0470c8
--- /dev/null
+++ b/kwin-styles/kstep/nextclient.h
@@ -0,0 +1,125 @@
+#ifndef __NEXTCLIENT_H
+#define __NEXTCLIENT_H
+
+#include <qvariant.h>
+#include <qbitmap.h>
+#include <kpixmap.h>
+#include <qlayout.h>
+#include <qbutton.h>
+#include <kdecoration.h>
+#include <kdecorationfactory.h>
+
+class QLabel;
+class QSpacerItem;
+
+namespace KStep {
+
+class NextClient;
+
+class NextButton : public QButton
+{
+public:
+    NextButton(NextClient *parent=0, const char *name=0,
+               const unsigned char *bitmap=NULL, int bw=0, int bh=0,
+               const QString& tip=NULL, const int realizeBtns = LeftButton);
+    void setBitmap(const unsigned char *bitmap, int bw, int bh);
+    void reset();
+    ButtonState lastButton() { return last_button; }
+
+protected:
+    void mousePressEvent( QMouseEvent* e );
+    void mouseReleaseEvent( QMouseEvent* e );
+    virtual void drawButton(QPainter *p);
+    void drawButtonLabel(QPainter *){;}
+
+    KPixmap aBackground, iBackground;
+    QBitmap* deco;
+    NextClient *client;
+    ButtonState last_button;
+    int realizeButtons;
+};
+
+class NextClient : public KDecoration
+{
+    Q_OBJECT
+public:
+    NextClient(KDecorationBridge *b, KDecorationFactory *f);
+    ~NextClient() {;}
+    void init();
+    virtual bool drawbound(const QRect& geom, bool clear);
+protected:
+    bool eventFilter(QObject *o, QEvent *e);
+    void resizeEvent( QResizeEvent* );
+    void paintEvent( QPaintEvent* );
+    void showEvent( QShowEvent* );
+
+    void mouseDoubleClickEvent( QMouseEvent * );
+    void wheelEvent( QWheelEvent * );
+    void captionChange();
+    void desktopChange();
+    void activeChange();
+    void shadeChange();
+    void iconChange();
+    QSize minimumSize() const;
+    void resize(const QSize &size);
+    void borders(int &left, int &right, int &top, int &bottom) const;
+    void reset(unsigned long changed);
+    void calcHiddenButtons();
+    void updateActiveBuffer();
+
+    Position mousePosition(const QPoint &) const;
+    void maximizeChange();
+
+protected slots:
+    void slotReset();
+    void menuButtonPressed();
+    void maximizeButtonClicked();
+    void shadeClicked();
+    void aboveClicked();
+    void belowClicked();
+    void resizePressed();
+
+    void keepAboveChange(bool above);
+    void keepBelowChange(bool below);
+
+private:
+    void initializeButtonsAndTitlebar(QBoxLayout* titleLayout);
+    void addButtons(QBoxLayout* titleLayout, const QString& buttons);
+    bool mustDrawHandle() const;
+
+    QSpacerItem* titlebar;
+
+    // Helpful constants for buttons in array
+    enum { CLOSE_IDX = 0,
+           HELP_IDX,
+           ICONIFY_IDX,
+           MAXIMIZE_IDX,
+           MENU_IDX,
+           SHADE_IDX,
+           ABOVE_IDX,
+           BELOW_IDX,
+           RESIZE_IDX,
+           STICKY_IDX,
+           MAX_NUM_BUTTONS = STICKY_IDX + 1 };
+
+    // WARNING: button[i] may be null for any given i.  Make sure you
+    // always check for null before doing button[i]->foo().
+    NextButton* button[MAX_NUM_BUTTONS];
+};
+
+class NextClientFactory: public QObject, public KDecorationFactory
+{
+public:
+    NextClientFactory();
+    virtual ~NextClientFactory();
+    virtual KDecoration *createDecoration(KDecorationBridge *);
+    virtual bool reset(unsigned long changed);
+    virtual bool supports( Ability ability );
+
+    QValueList< NextClientFactory::BorderSize > borderSizes() const;
+
+};
+
+}
+
+#endif