yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Big B2/KWin change:

Browse source 
* title bar now tries to avoid to become completely obscured by other windows ;)
* moving of title bar flicker free (at least on my machine)
* all repaint problems fixed (those I knew of course), even the one on resize
* mousePosition (those arrowed cursors) now complete

svn path=/trunk/kdebase/kwin/; revision=48189
This commit is contained in:
Michael Matz 2000-05-03 00:04:26 +00:00
parent 2021961a07
commit 732c7d78bd
4 changed files with 268 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client.h
View file

@ -117,6 +117,7 @@ public:
void takeFocus(); void takeFocus();
void setMask( const QRegion & ); void setMask( const QRegion & );
const QRegion& getMask() const;
// transparent stuff // transparent stuff
virtual void drawbound( const QRect& geom ); virtual void drawbound( const QRect& geom );
@ -331,6 +332,11 @@ inline bool Client::shape() const
return is_shape; return is_shape;
} }
inline const QRegion& Client::getMask() const
{
return mask;
}
class NoBorderClient : public Client class NoBorderClient : public Client
{ {
Q_OBJECT Q_OBJECT

302
clients/b2/b2client.cpp
View file

@ -174,10 +174,11 @@ static void create_pixmaps()
} }
B2Button::B2Button(KPixmap *pix, KPixmap *pixDown, KPixmap *iPix, B2Button::B2Button(KPixmap *pix, KPixmap *pixDown, KPixmap *iPix,
KPixmap *iPixDown, Client *parent, const char *name) KPixmap *iPixDown, Client *_client, QWidget *parent,
const char *name)
: QButton(parent, name) : QButton(parent, name)
{ {
client = parent; client = _client;
pNorm = pix; pNorm = pix;
pDown = pixDown; pDown = pixDown;
iNorm = iPix; iNorm = iPix;
@ -236,12 +237,124 @@ void B2Button::setPixmaps(KPixmap *pix, KPixmap *pixDown, KPixmap *iPix,
repaint(false); repaint(false);
} }
B2Titlebar::B2Titlebar(B2Client *parent)
: QWidget(parent)
{
set_x11mask = false;
isfullyobscured = false;
shift_move = false;
client = parent;
}
bool B2Titlebar::x11Event(XEvent *e)
{
if (!set_x11mask) {
set_x11mask = true;
XSelectInput(qt_xdisplay(), winId(),
KeyPressMask | KeyReleaseMask |
ButtonPressMask | ButtonReleaseMask |
KeymapStateMask |
ButtonMotionMask |
EnterWindowMask | LeaveWindowMask |
FocusChangeMask |
ExposureMask |
PropertyChangeMask |
StructureNotifyMask | SubstructureRedirectMask |
VisibilityChangeMask);
}
switch( e->type ) {
case VisibilityNotify:
isfullyobscured = false;
if (e->xvisibility.state == VisibilityFullyObscured) {
isfullyobscured = true;
client->unobscureTitlebar();
}
break;
default:
break;
}
return QWidget::x11Event(e);
}
void B2Titlebar::paintEvent(QPaintEvent * /*e*/)
{
QPainter p(this);
QRect t=rect();
bool active = client->isActive();
// black titlebar frame
p.setPen(Qt::black);
p.drawLine(0, 0, 0, t.bottom() );
p.drawLine(0, 0, t.right(), 0);
p.drawLine(t.right(), 0, t.right(), t.bottom());
// titlebar fill
qDrawShadeRect(&p, 1, 1, t.right()-1, t.height()-1,
options->colorGroup(Options::TitleBar, active),
false, 1, 0,
&options->colorGroup(Options::TitleBar, active).
brush(QColorGroup::Button));
// and the caption
p.setPen(options->color(Options::Font, active));
p.setFont(options->font(active));
t.setX(client->providesContextHelp() ?
client->button[B2Client::BtnHelp]->x()+17 :
client->button[B2Client::BtnSticky]->x()+17);
t.setRight(client->button[B2Client::BtnIconify]->x()-1);
p.drawText(t, AlignLeft | AlignVCenter, client->caption());
}
void B2Titlebar::mouseDoubleClickEvent( QMouseEvent * )
{
client->setShade( !client->isShade() );
client->workspace()->requestFocus( client );
}
void B2Titlebar::mousePressEvent( QMouseEvent * e )
{
shift_move = e->state() & ShiftButton;
if (shift_move ) {
moveOffset = e->globalPos();
}
QMouseEvent _e(QEvent::MouseButtonPress, mapToParent(e->pos()),
e->globalPos(), e->button(), e->state());
//QWidget::mousePressEvent( e );
client->mousePressEvent( &_e);
}
void B2Titlebar::mouseReleaseEvent( QMouseEvent * e )
{
shift_move = false;
QMouseEvent _e(QEvent::MouseButtonRelease, mapToParent(e->pos()),
e->globalPos(), e->button(), e->state());
//QWidget::mouseReleaseEvent( e );
client->mouseReleaseEvent( &_e);
}
void B2Titlebar::mouseMoveEvent( QMouseEvent * e )
{
if (shift_move) {
int oldx = mapFromGlobal(moveOffset).x();
int xdiff = e->globalPos().x() - moveOffset.x();
moveOffset = e->globalPos();
if (oldx >= 0 && oldx <= rect().right()) {
client->titleMoveRel(xdiff);
}
} else {
QMouseEvent _e(QEvent::MouseMove, mapToParent(e->pos()),
e->globalPos(), e->button(), e->state());
client->mouseMoveEvent( &_e);
}
}
B2Client::B2Client( Workspace *ws, WId w, QWidget *parent, B2Client::B2Client( Workspace *ws, WId w, QWidget *parent,
const char *name ) const char *name )
: Client( ws, w, parent, name, WResizeNoErase ) : Client( ws, w, parent, name, WResizeNoErase )
{ {
bar_x_ofs = 0; bar_x_ofs = 0;
shift_move = FALSE; in_unobs = 0;
create_pixmaps(); create_pixmaps();
g = new QGridLayout( this, 0, 0); g = new QGridLayout( this, 0, 0);
@ -260,9 +373,10 @@ B2Client::B2Client( Workspace *ws, WId w, QWidget *parent,
// titlebar // titlebar
g->addRowSpacing(0, 20); g->addRowSpacing(0, 20);
titlebar = new B2Titlebar(this);
int i; int i;
for(i=0; i < 6; ++i){ for(i=0; i < 6; ++i){
button[i] = new B2Button(this); button[i] = new B2Button(this, titlebar/*this*/);
button[i]->setFixedSize(16, 16); button[i]->setFixedSize(16, 16);
} }
@ -293,6 +407,7 @@ B2Client::B2Client( Workspace *ws, WId w, QWidget *parent,
QColor c = options->colorGroup(Options::TitleBar, isActive()). QColor c = options->colorGroup(Options::TitleBar, isActive()).
color(QColorGroup::Button); color(QColorGroup::Button);
titlebar->setBackgroundColor(c);
for(i=0; i < 6; ++i) for(i=0; i < 6; ++i)
button[i]->setBg(c); button[i]->setBg(c);
@ -310,35 +425,38 @@ B2Client::B2Client( Workspace *ws, WId w, QWidget *parent,
void B2Client::resizeEvent( QResizeEvent* e) void B2Client::resizeEvent( QResizeEvent* e)
{ {
Client::resizeEvent( e ); Client::resizeEvent( e );
/* may be the resize cuted off some space occupied by titlebar, which
was moved, so instead of reducing it, we first try to move it */
titleMoveAbs(bar_x_ofs);
positionButtons(); positionButtons();
doShape(); doShape();
/*
What does this? (MM)
if ( isVisibleToTLW() && !testWFlags( WNorthWestGravity )) { if ( isVisibleToTLW() && !testWFlags( WNorthWestGravity )) {
QPainter p( this ); QPainter p( this );
QRect t = g->cellGeometry(0, 1); QRect t = titlebar->geometry();
t.setRight(button[BtnClose]->x()+17);
t.setHeight(20);
QRegion r = rect(); QRegion r = rect();
r = r.subtract( t ); r = r.subtract( t );
p.setClipRegion( r ); p.setClipRegion( r );
p.eraseRect( rect() ); p.eraseRect( rect() );
} }
*/
repaint(); //there is some strange wrong repaint of the frame without
} }
void B2Client::captionChange( const QString &) void B2Client::captionChange( const QString &)
{ {
positionButtons(); positionButtons();
doShape(); doShape();
repaint(); //repaint();
titlebar->repaint();
} }
void B2Client::paintEvent( QPaintEvent* ) void B2Client::paintEvent( QPaintEvent* e)
{ {
QPainter p( this ); QPainter p( this );
QRect t = g->cellGeometry(0, 1); QRect t = titlebar->geometry();
t.setRight(button[BtnClose]->x()+17);
t.setHeight(20);
// inner window rect // inner window rect
p.drawRect(3, t.bottom(), width()-6, height()-t.height()-6); p.drawRect(3, t.bottom(), width()-6, height()-t.height()-6);
@ -346,24 +464,11 @@ void B2Client::paintEvent( QPaintEvent* )
// outer frame rect // outer frame rect
p.drawRect(0, t.bottom()-3, width(), height()-t.height()); p.drawRect(0, t.bottom()-3, width(), height()-t.height());
// frame shade panel // frame shade panel
qDrawShadePanel(&p, 1, t.bottom()-2, width()-2, height()-t.height()-2, qDrawShadePanel(&p, 1, t.bottom()-2, width()-2, height()-t.height()-2,
options->colorGroup(Options::Frame, isActive()), options->colorGroup(Options::Frame, isActive()),
false); false);
// black titlebar frame
p.setPen(Qt::black);
p.drawLine(bar_x_ofs, 0, bar_x_ofs, t.bottom() );
p.drawLine(bar_x_ofs, 0, t.right()+4, 0);
p.drawLine(t.right()+4, 0, t.right()+4, t.bottom());
// titlebar fill
qDrawShadeRect(&p, 1+bar_x_ofs, 1, t.width()+6-bar_x_ofs, t.height()-1,
options->colorGroup(Options::TitleBar, isActive()),
false, 1, 0,
&options->colorGroup(Options::TitleBar, isActive()).
brush(QColorGroup::Button));
//bottom handle rect //bottom handle rect
int hx = width()-40; int hx = width()-40;
int hw = 40; int hw = 40;
@ -383,32 +488,39 @@ void B2Client::paintEvent( QPaintEvent* )
p.setPen(options->colorGroup(Options::Frame, isActive()).light()); p.setPen(options->colorGroup(Options::Frame, isActive()).light());
p.drawLine(hx+1, height()-6, hx+1, height()-3); p.drawLine(hx+1, height()-6, hx+1, height()-3);
p.drawLine(hx+1, height()-7, width()-3, height()-7); p.drawLine(hx+1, height()-7, width()-3, height()-7);
p.setPen(options->color(Options::Font, isActive()));
p.setFont(options->font(isActive()));
t.setX(providesContextHelp() ? button[BtnHelp]->x()+17 : /* OK, we got a paint event, which means parts of us are now visible
button[BtnSticky]->x()+17); which were not before. We try the titlebar if it is currently fully
t.setRight(button[BtnIconify]->x()-1); obscured, and if yes, try to unobscure it, in the hope that some
p.drawText(t, AlignLeft | AlignVCenter, caption()); of the parts which we just painted were in the titlebar area.
It can happen, that the titlebar, as it got the FullyObscured event
had no chance of becoming partly visible. The problem is, that
we now might have the space available, but the titlebar gets no
visibilitinotify events until its state changes, so we just try
*/
if (titlebar->isFullyObscured()) {
/* We first see, if our repaint contained the titlebar area */
QRegion reg(QRect(0,0,width(),20));
reg = reg.intersect(e->region());
if (!reg.isEmpty())
unobscureTitlebar();
}
} }
#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) #define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
void B2Client::doShape() void B2Client::doShape()
{ {
QRect t = g->cellGeometry(0, 1); QRect t = titlebar->geometry();
t.setRight(button[BtnClose]->x()+17); QRegion mask(rect());
t.setHeight(20);
QRegion mask(QRect(0, 0, width(), height()));
// top to the tilebar right // top to the tilebar right
if (bar_x_ofs) { if (bar_x_ofs) {
mask -= QRect(0, 0, bar_x_ofs, t.height()-4); //left from bar mask -= QRect(0, 0, bar_x_ofs, t.height()-4); //left from bar
mask -= QRect(0, t.height()-4, 1, 1); //top left point mask -= QRect(0, t.height()-4, 1, 1); //top left point
} }
if (t.right() < width() - 5) { if (t.right() < width()-1) {
mask -= QRect(width()-1, t.height()-4, 1, 1); // top right point mask -= QRect(width()-1, t.height()-4, 1, 1); // top right point
mask -= QRect(t.width()+8, 0, width()-t.width()-7, t.height()-4); mask -= QRect(t.right()+1, 0, width()-t.right()-1, t.height()-4);
} }
mask -= QRect(width()-1, height()-1, 1, 1); // bottom right point mask -= QRect(width()-1, height()-1, 1, 1); // bottom right point
mask -= QRect(0, height()-5, 1, 1); // bottom left point mask -= QRect(0, height()-5, 1, 1); // bottom left point
@ -424,6 +536,7 @@ void B2Client::showEvent(QShowEvent *ev)
Client::showEvent(ev); Client::showEvent(ev);
doShape(); doShape();
repaint(); repaint();
titlebar->repaint();
} }
void B2Client::windowWrapperShowEvent( QShowEvent* ) void B2Client::windowWrapperShowEvent( QShowEvent* )
@ -431,19 +544,14 @@ void B2Client::windowWrapperShowEvent( QShowEvent* )
doShape(); doShape();
} }
void B2Client::mouseDoubleClickEvent( QMouseEvent * e )
{
if (e->pos().y() < 19)
setShade( !isShade() );
workspace()->requestFocus( this );
}
Client::MousePosition B2Client::mousePosition( const QPoint& p ) const Client::MousePosition B2Client::mousePosition( const QPoint& p ) const
{ {
const int range = 16; const int range = 16;
const int border = 4; const int border = 4;
QRect t = g->cellGeometry(0, 1); /*QRect t = g->cellGeometry(0, 1);
t.setRight(button[BtnClose]->x()+17); t.setRight(button[BtnClose]->x()+17);
*/
QRect t = titlebar->geometry();
t.setHeight(20-border); t.setHeight(20-border);
int ly = t.bottom(); int ly = t.bottom();
int lx = t.right(); int lx = t.right();
@ -473,51 +581,36 @@ Client::MousePosition B2Client::mousePosition( const QPoint& p ) const
else return Right; else return Right;
} }
} }
if (p.y() >= height() - 8) {
/* the normal Client:: only wants border of 4 pixels */
if (p.x() <= range) return BottomLeft;
if (p.x() >= width()-range) return BottomRight;
return Bottom;
}
return Client::mousePosition( p ); return Client::mousePosition( p );
} }
void B2Client::mousePressEvent( QMouseEvent * e ) void B2Client::titleMoveAbs(int new_ofs)
{ {
shift_move = e->state() & ShiftButton; if (new_ofs < 0) new_ofs = 0;
if (shift_move ) { if (new_ofs + titlebar->width() > width()) {
moveOffset = e->pos(); new_ofs = width() - titlebar->width();
if (moveOffset.y() >= 19) shift_move=FALSE; }
if (bar_x_ofs != new_ofs) {
bar_x_ofs = new_ofs;
positionButtons();
doShape();
repaint( 0, 0, width(), 20, false );
titlebar->repaint(false);
} }
Client::mousePressEvent( e );
} }
void B2Client::mouseReleaseEvent( QMouseEvent * e ) void B2Client::titleMoveRel(int xdiff)
{ {
Client::mouseReleaseEvent( e ); titleMoveAbs(bar_x_ofs + xdiff);
shift_move = FALSE;
}
void B2Client::mouseMoveEvent( QMouseEvent * e)
{
int x = e->pos().x();
if (shift_move) {
int old_ofs = bar_x_ofs;
int oldx = moveOffset.x();
int xdiff = x - oldx;
moveOffset = e->pos();
QRect t = g->cellGeometry(0, 1);
t.setRight(button[BtnClose]->x()+17);
t.setHeight(20);
if (oldx >= bar_x_ofs && oldx <= t.right()) {
bar_x_ofs += xdiff;
if (bar_x_ofs < 0) bar_x_ofs = 0;
if ( t.right() + xdiff >= width()-4)
bar_x_ofs = old_ofs;
if (bar_x_ofs != old_ofs) {
positionButtons();
doShape();
repaint( 0, 0, width(), t.height(), true );
}
}
} else
Client::mouseMoveEvent(e);
} }
void B2Client::stickyChange(bool on) void B2Client::stickyChange(bool on)
@ -543,6 +636,7 @@ void B2Client::activeChange(bool on)
{ {
int i; int i;
repaint(false); repaint(false);
titlebar->repaint(false);
QColor c = options->colorGroup(Options::TitleBar, on). QColor c = options->colorGroup(Options::TitleBar, on).
color(QColorGroup::Button); color(QColorGroup::Button);
for(i=0; i < 6; ++i){ for(i=0; i < 6; ++i){
@ -574,6 +668,45 @@ void B2Client::slotReset()
button[i]->repaint(false); button[i]->repaint(false);
} }
repaint(); repaint();
titlebar->repaint();
}
void B2Client::unobscureTitlebar()
{
/* we just noticed, that we got obscured by other windows
so we look at all windows above us (stacking_order) merging their
masks, intersecting it with our titlebar area, and see if we can
find a place not covered by any window */
if (in_unobs) {
return;
}
in_unobs = 1;
QRegion reg(QRect(0,0,width(),20));
ClientList::ConstIterator it = workspace()->stackingOrder().find(this);
++it;
while (it != workspace()->stackingOrder().end()) {
/* the clients all have their mask-regions in local coords
so we have to translate them to a shared coord system
we choose ours */
int dx = (*it)->x() - x();
int dy = (*it)->y() - y();
QRegion creg = (*it)->getMask();
creg.translate(dx, dy);
reg -= creg;
if (reg.isEmpty()) {
// early out, we are completely obscured
break;
}
++it;
}
if (!reg.isEmpty()) {
// there is at least _one_ pixel from our title area, which is not
// obscured, we use the first rect we find
// for a first test, we use boundingRect(), later we may refine
// to rect(), and search for the nearest, or biggest, or smthg.
titleMoveAbs(reg.boundingRect().x());
}
in_unobs = 0;
} }
static void redraw_pixmaps() static void redraw_pixmaps()
@ -715,7 +848,8 @@ void B2Client::positionButtons()
QFontMetrics fm(options->font(isActive())); QFontMetrics fm(options->font(isActive()));
int textLen = fm.width(caption()); int textLen = fm.width(caption());
int xpos = bar_x_ofs+4; //int xpos = bar_x_ofs+4;
int xpos = 4;
button[BtnMenu]->move(xpos, 2); button[BtnMenu]->move(xpos, 2);
xpos+=17; xpos+=17;
button[BtnSticky]->move(xpos, 2); button[BtnSticky]->move(xpos, 2);
@ -735,6 +869,8 @@ void B2Client::positionButtons()
button[BtnMax]->move(xpos, 2); button[BtnMax]->move(xpos, 2);
xpos+=17; xpos+=17;
button[BtnClose]->move(xpos, 2); button[BtnClose]->move(xpos, 2);
titlebar->setFixedSize(xpos+17+4,20);
titlebar->move(bar_x_ofs, 0);
} }
#include "b2client.moc" #include "b2client.moc"

45
clients/b2/b2client.h
View file

@ -13,10 +13,10 @@ class QGridLayout;
class B2Button : public QButton class B2Button : public QButton
{ {
public: public:
B2Button(Client *parent=0, const char *name=0) B2Button(Client *_client=0, QWidget *parent=0, const char *name=0)
: QButton(parent, name){useMiniIcon = false; client = parent;} : QButton(parent, name){useMiniIcon = false; client = _client;}
B2Button(KPixmap *pix, KPixmap *pixDown, KPixmap *iPix, KPixmap *iPixDown, B2Button(KPixmap *pix, KPixmap *pixDown, KPixmap *iPix, KPixmap *iPixDown,
Client *parent=0, const char *name=0); Client *_client=0, QWidget *parent=0, const char *name=0);
void setBg(const QColor &c){bg = c;} void setBg(const QColor &c){bg = c;}
void setPixmaps(KPixmap *pix, KPixmap *pixDown, KPixmap *iPix, void setPixmaps(KPixmap *pix, KPixmap *pixDown, KPixmap *iPix,
KPixmap *iPixDown); KPixmap *iPixDown);
@ -34,21 +34,44 @@ protected:
Client *client; Client *client;
}; };
class B2Client : public Client class B2Client;
class B2Titlebar : public QWidget
{ {
Q_OBJECT Q_OBJECT
public:
B2Titlebar(B2Client *parent);
~B2Titlebar(){;}
bool isFullyObscured() const {return isfullyobscured;}
protected:
void paintEvent( QPaintEvent* );
bool x11Event(XEvent *e);
void mouseDoubleClickEvent( QMouseEvent * );
void mousePressEvent( QMouseEvent * );
void mouseReleaseEvent( QMouseEvent * );
void mouseMoveEvent(QMouseEvent *);
void init();
bool set_x11mask;
bool isfullyobscured;
bool shift_move;
QPoint moveOffset;
B2Client *client;
};
class B2Client : public Client
{
Q_OBJECT
friend class B2Titlebar;
public: public:
B2Client( Workspace *ws, WId w, QWidget *parent=0, const char *name=0 ); B2Client( Workspace *ws, WId w, QWidget *parent=0, const char *name=0 );
~B2Client(){;} ~B2Client(){;}
void unobscureTitlebar();
void titleMoveAbs(int new_ofs);
void titleMoveRel(int xdiff);
protected: protected:
void resizeEvent( QResizeEvent* ); void resizeEvent( QResizeEvent* );
void paintEvent( QPaintEvent* ); void paintEvent( QPaintEvent* );
void showEvent( QShowEvent* ); void showEvent( QShowEvent* );
void windowWrapperShowEvent( QShowEvent* ); void windowWrapperShowEvent( QShowEvent* );
void mouseDoubleClickEvent( QMouseEvent * );
void mousePressEvent( QMouseEvent * );
void mouseReleaseEvent( QMouseEvent * );
void mouseMoveEvent(QMouseEvent *);
void init(); void init();
void captionChange( const QString& name ); void captionChange( const QString& name );
void stickyChange(bool on); void stickyChange(bool on);
@ -69,9 +92,9 @@ private:
//QHBoxLayout *tLayout; //QHBoxLayout *tLayout;
QGridLayout *g; QGridLayout *g;
int bar_x_ofs; int bar_x_ofs;
bool shift_move; B2Titlebar *titlebar;
QPoint moveOffset; int in_unobs;
}; };

9
workspace.h
View file

@ -118,6 +118,7 @@ public:
Client* previousClient(Client*) const; Client* previousClient(Client*) const;
Client* nextStaticClient(Client*) const; Client* nextStaticClient(Client*) const;
Client* previousStaticClient(Client*) const; Client* previousStaticClient(Client*) const;
const ClientList& stackingOrder() const;
//#### TODO right layers as default //#### TODO right layers as default
Client* topClientOnDesktop( int fromLayer = 0, int toLayer = 0) const; Client* topClientOnDesktop( int fromLayer = 0, int toLayer = 0) const;
@ -274,4 +275,12 @@ inline int Workspace::numberOfDesktops() const
return number_of_desktops; return number_of_desktops;
} }
/*!
Returns the list of clients sorted in stacking order, with topmost client
at the last position
*/
inline const ClientList& Workspace::stackingOrder() const
{
return stacking_order;
}
#endif #endif