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

Fix port

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=637745
This commit is contained in:
Laurent Montel 2007-02-27 16:30:25 +00:00
parent e61ecff9b9
commit ee2db61df1
2 changed files with 58 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/kwmtheme/kwmthemeclient.cpp
View file

@ -147,9 +147,9 @@ static void create_pixmaps()
titleAlign = Qt::AlignCenter; titleAlign = Qt::AlignCenter;
else else
titleAlign = Qt::AlignLeft | Qt::AlignVCenter; titleAlign = Qt::AlignLeft | Qt::AlignVCenter;
titleSunken = config.readEntry("TitleFrameShaded", QVariant(true)).toBool(); titleSunken = config.readEntry("TitleFrameShaded", true);
// titleSunken = true; // is this fixed? // titleSunken = true; // is this fixed?
titleTransparent = config.readEntry("PixmapUnderTitleText", QVariant(true)).toBool(); titleTransparent = config.readEntry("PixmapUnderTitleText", true);
tmpStr = config.readEntry("TitlebarLook"); tmpStr = config.readEntry("TitlebarLook");
if(tmpStr == "shadedVertical"){ if(tmpStr == "shadedVertical"){

160
workspace.cpp
View file

@ -43,10 +43,6 @@ License. See the file "COPYING" for the exact licensing terms.
#include "group.h" #include "group.h"
#include "rules.h" #include "rules.h"
#include "kwinadaptor.h" #include "kwinadaptor.h"
#include "unmanaged.h"
#include "scene.h"
#include "deleted.h"
#include "effects.h"
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#include <X11/keysym.h> #include <X11/keysym.h>
@ -98,7 +94,6 @@ Workspace::Workspace( bool restore )
popupinfo (0), popupinfo (0),
popup (0), popup (0),
advanced_popup (0), advanced_popup (0),
trans_popup (0),
desk_popup (0), desk_popup (0),
desk_popup_index (0), desk_popup_index (0),
keys (0), keys (0),
@ -128,16 +123,12 @@ Workspace::Workspace( bool restore )
topmenu_space( NULL ), topmenu_space( NULL ),
set_active_client_recursion( 0 ), set_active_client_recursion( 0 ),
block_stacking_updates( 0 ), block_stacking_updates( 0 ),
forced_global_mouse_grab( false ), forced_global_mouse_grab( false )
cm_selection( NULL ),
compositeRate( 0 ),
overlay( None ),
transSlider( NULL ),
transButton( NULL )
{ {
(void) new KWinAdaptor( this ); (void) new KWinAdaptor( this );
QDBusConnection::sessionBus().registerObject("/KWin", this); QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject("/KWin", this);
dbus.connect(QString(), "/KWin", "org.kde.KWin", "reloadConfig", this, SLOT(slotReloadConfig()));
_self = this; _self = this;
mgr = new PluginMgr; mgr = new PluginMgr;
root = rootWindow(); root = rootWindow();
@ -178,12 +169,10 @@ Workspace::Workspace( bool restore )
ColormapChangeMask | ColormapChangeMask |
SubstructureRedirectMask | SubstructureRedirectMask |
SubstructureNotifyMask | SubstructureNotifyMask |
FocusChangeMask | // for NotifyDetailNone FocusChangeMask // for NotifyDetailNone
ExposureMask
); );
Extensions::init(); Shape::init();
setupCompositing();
// compatibility // compatibility
long data = 1; long data = 1;
@ -289,6 +278,7 @@ void Workspace::init()
NET::WM2ExtendedStrut | NET::WM2ExtendedStrut |
NET::WM2KDETemporaryRules | NET::WM2KDETemporaryRules |
NET::WM2ShowingDesktop | NET::WM2ShowingDesktop |
NET::WM2DesktopLayout |
0 0
, ,
NET::ActionMove | NET::ActionMove |
@ -332,7 +322,6 @@ void Workspace::init()
connect(&reconfigureTimer, SIGNAL(timeout()), this, connect(&reconfigureTimer, SIGNAL(timeout()), this,
SLOT(slotReconfigure())); SLOT(slotReconfigure()));
connect( &updateToolWindowsTimer, SIGNAL( timeout()), this, SLOT( slotUpdateToolWindows())); connect( &updateToolWindowsTimer, SIGNAL( timeout()), this, SLOT( slotUpdateToolWindows()));
connect( &compositeTimer, SIGNAL( timeout()), SLOT( performCompositing()));
connect(KGlobalSettings::self(), SIGNAL(appearanceChanged()), this, connect(KGlobalSettings::self(), SIGNAL(appearanceChanged()), this,
SLOT(slotReconfigure())); SLOT(slotReconfigure()));
@ -370,10 +359,7 @@ void Workspace::init()
XWindowAttributes attr; XWindowAttributes attr;
XGetWindowAttributes(display(), wins[i], &attr); XGetWindowAttributes(display(), wins[i], &attr);
if (attr.override_redirect ) if (attr.override_redirect )
{
createUnmanaged( wins[ i ] );
continue; continue;
}
if( topmenu_space && topmenu_space->winId() == wins[ i ] ) if( topmenu_space && topmenu_space->winId() == wins[ i ] )
continue; continue;
if (attr.map_state != IsUnmapped) if (attr.map_state != IsUnmapped)
@ -435,7 +421,6 @@ void Workspace::init()
Workspace::~Workspace() Workspace::~Workspace()
{ {
finishCompositing();
blockStackingUpdates( true ); blockStackingUpdates( true );
// TODO grabXServer(); // TODO grabXServer();
// use stacking_order, so that kwin --replace keeps stacking order // use stacking_order, so that kwin --replace keeps stacking order
@ -445,12 +430,12 @@ Workspace::~Workspace()
{ {
// only release the window // only release the window
(*it)->releaseWindow( true ); (*it)->releaseWindow( true );
// no removeClient() is called ! // No removeClient() is called, it does more than just removing.
// However, remove from some lists to e.g. prevent performTransiencyCheck()
// from crashing.
clients.remove( *it );
desktops.remove( *it );
} }
for( UnmanagedList::ConstIterator it = unmanaged.begin();
it != unmanaged.end();
++it )
(*it)->release();
delete desktop_widget; delete desktop_widget;
delete tab_box; delete tab_box;
delete popupinfo; delete popupinfo;
@ -494,28 +479,6 @@ Client* Workspace::createClient( Window w, bool is_mapped )
return NULL; return NULL;
} }
addClient( c, Allowed ); addClient( c, Allowed );
if( scene )
scene->windowAdded( c );
if( effects )
effects->windowAdded( c->effectWindow());
return c;
}
Unmanaged* Workspace::createUnmanaged( Window w )
{
if( w == overlay )
return NULL;
Unmanaged* c = new Unmanaged( this );
if( !c->track( w ))
{
Unmanaged::deleteUnmanaged( c, Allowed );
return NULL;
}
addUnmanaged( c, Allowed );
if( scene )
scene->windowAdded( c );
if( effects )
effects->windowAdded( c->effectWindow());
return c; return c;
} }
@ -556,11 +519,7 @@ void Workspace::addClient( Client* c, allowed_t )
updateStackingOrder( true ); // propagate new client updateStackingOrder( true ); // propagate new client
if( c->isUtility() || c->isMenu() || c->isToolbar()) if( c->isUtility() || c->isMenu() || c->isToolbar())
updateToolWindows( true ); updateToolWindows( true );
} checkNonExistentClients();
void Workspace::addUnmanaged( Unmanaged* c, allowed_t )
{
unmanaged.append( c );
} }
/* /*
@ -617,28 +576,6 @@ void Workspace::removeClient( Client* c, allowed_t )
updateClientArea(); updateClientArea();
} }
void Workspace::removeUnmanaged( Unmanaged* c, allowed_t )
{
assert( unmanaged.contains( c ));
unmanaged.removeAll( c );
}
void Workspace::addDeleted( Deleted* c, allowed_t )
{
assert( !deleted.contains( c ));
deleted.append( c );
}
void Workspace::removeDeleted( Deleted* c, allowed_t )
{
assert( deleted.contains( c ));
if( scene )
scene->windowDeleted( c );
if( effects )
effects->windowDeleted( c->effectWindow());
deleted.removeAll( c );
}
void Workspace::updateFocusChains( Client* c, FocusChainChange change ) void Workspace::updateFocusChains( Client* c, FocusChainChange change )
{ {
if( !c->wantsTabFocus()) // doesn't want tab focus, remove if( !c->wantsTabFocus()) // doesn't want tab focus, remove
@ -664,7 +601,13 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
focus_chain[ i ].prepend( c ); focus_chain[ i ].prepend( c );
} }
else if( !focus_chain[ i ].contains( c )) else if( !focus_chain[ i ].contains( c ))
focus_chain[ i ].prepend( c ); // otherwise add as the last one { // add it after the active one
if( active_client != NULL && active_client != c
&& !focus_chain[ i ].isEmpty() && focus_chain[ i ].last() == active_client )
focus_chain[ i ].insert( focus_chain[ i ].size() - 1, c );
else
focus_chain[ i ].append( c ); // otherwise add as the first one
}
} }
} }
else //now only on desktop, remove it anywhere else else //now only on desktop, remove it anywhere else
@ -684,7 +627,13 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
focus_chain[ i ].prepend( c ); focus_chain[ i ].prepend( c );
} }
else if( !focus_chain[ i ].contains( c )) else if( !focus_chain[ i ].contains( c ))
focus_chain[ i ].prepend( c ); { // add it after the active one
if( active_client != NULL && active_client != c
&& !focus_chain[ i ].isEmpty() && focus_chain[ i ].last() == active_client )
focus_chain[ i ].insert( focus_chain[ i ].size() - 1, c );
else
focus_chain[ i ].append( c ); // otherwise add as the first one
}
} }
else else
focus_chain[ i ].removeAll( c ); focus_chain[ i ].removeAll( c );
@ -701,7 +650,13 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
global_focus_chain.prepend( c ); global_focus_chain.prepend( c );
} }
else if( !global_focus_chain.contains( c )) else if( !global_focus_chain.contains( c ))
global_focus_chain.prepend( c ); { // add it after the active one
if( active_client != NULL && active_client != c
&& !global_focus_chain.isEmpty() && global_focus_chain.last() == active_client )
global_focus_chain.insert( global_focus_chain.size() - 1, c );
else
global_focus_chain.append( c ); // otherwise add as the first one
}
} }
void Workspace::updateCurrentTopMenu() void Workspace::updateCurrentTopMenu()
@ -919,6 +874,11 @@ void Workspace::updateColormap()
} }
} }
void Workspace::slotReloadConfig()
{
reconfigure();
}
void Workspace::reconfigure() void Workspace::reconfigure()
{ {
reconfigureTimer.start( 200 ); reconfigureTimer.start( 200 );
@ -935,7 +895,7 @@ void Workspace::slotSettingsChanged(int category)
/*! /*!
Reread settings Reread settings
*/ */
KWIN_PROCEDURE( CheckBorderSizesProcedure, Client, cl->checkBorderSizes() ); KWIN_PROCEDURE( CheckBorderSizesProcedure, cl->checkBorderSizes() );
void Workspace::slotReconfigure() void Workspace::slotReconfigure()
{ {
@ -992,11 +952,6 @@ void Workspace::slotReconfigure()
updateTopMenuGeometry(); updateTopMenuGeometry();
updateCurrentTopMenu(); updateCurrentTopMenu();
} }
if( options->useTranslucency )
setupCompositing();
else
finishCompositing();
loadWindowRules(); loadWindowRules();
for( ClientList::Iterator it = clients.begin(); for( ClientList::Iterator it = clients.begin();
@ -1279,15 +1234,16 @@ bool Workspace::setCurrentDesktop( int new_desktop )
// and active_client is on_all_desktops and under mouse (hence == old_active_client), // and active_client is on_all_desktops and under mouse (hence == old_active_client),
// conserve focus (thanks to Volker Schatz <V.Schatz at thphys.uni-heidelberg.de>) // conserve focus (thanks to Volker Schatz <V.Schatz at thphys.uni-heidelberg.de>)
else if( active_client && active_client->isShown( true ) && active_client->isOnCurrentDesktop()) else if( active_client && active_client->isShown( true ) && active_client->isOnCurrentDesktop())
c= active_client; c = active_client;
if( c == NULL && !desktops.isEmpty())
c = findDesktop( true, currentDesktop());
if( c != active_client ) if( c != active_client )
setActiveClient( NULL, Allowed ); setActiveClient( NULL, Allowed );
if ( c ) if ( c )
requestFocus( c ); requestFocus( c );
else if( !desktops.isEmpty() )
requestFocus( findDesktop( true, currentDesktop()));
else else
focusToNull(); focusToNull();
@ -1309,10 +1265,6 @@ bool Workspace::setCurrentDesktop( int new_desktop )
if( old_desktop != 0 ) // not for the very first time if( old_desktop != 0 ) // not for the very first time
popupinfo->showInfo( desktopName(currentDesktop()) ); popupinfo->showInfo( desktopName(currentDesktop()) );
if( effects != NULL && old_desktop != 0 )
effects->desktopChanged( old_desktop );
return true; return true;
} }
@ -1545,25 +1497,26 @@ void Workspace::sendClientToDesktop( Client* c, int desk, bool dont_activate )
updateClientArea(); updateClientArea();
} }
void Workspace::setDesktopLayout(int o, int x, int y) void Workspace::setDesktopLayout(NET::Orientation o, int x, int y,NET::DesktopLayoutCorner c)
{ {
layoutOrientation = (Qt::Orientation) o; Q_UNUSED( c ); // I don't find this worth bothering, feel free to
layoutOrientation = ( o == NET::OrientationHorizontal ? Qt::Horizontal : Qt::Vertical );
layoutX = x; layoutX = x;
layoutY = y; layoutY = y;
} }
void Workspace::calcDesktopLayout(int &x, int &y) const void Workspace::calcDesktopLayout(int &x, int &y) const
{ {
x = layoutX; x = layoutX; // <= 0 means compute it from the other and total number of desktops
y = layoutY; y = layoutY;
if ((x == -1) && (y > 0)) if((x <= 0) && (y > 0))
x = (numberOfDesktops()+y-1) / y; x = (numberOfDesktops()+y-1) / y;
else if ((y == -1) && (x > 0)) else if((y <=0) && (x > 0))
y = (numberOfDesktops()+x-1) / x; y = (numberOfDesktops()+x-1) / x;
if (x == -1) if(x <=0)
x = 1; x = 1;
if (y == -1) if (y <= 0)
y = 1; y = 1;
} }
@ -1695,7 +1648,7 @@ void Workspace::slotGrabWindow()
QPixmap snapshot = QPixmap::grabWindow( active_client->frameId() ); QPixmap snapshot = QPixmap::grabWindow( active_client->frameId() );
//No XShape - no work. //No XShape - no work.
if( Extensions::shapeAvailable()) if( Shape::available())
{ {
//As the first step, get the mask from XShape. //As the first step, get the mask from XShape.
int count, order; int count, order;
@ -1896,7 +1849,7 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
bool is_alt = km & Mod1Mask; bool is_alt = km & Mod1Mask;
bool is_shift = km & ShiftMask; bool is_shift = km & ShiftMask;
int delta = is_control?1:is_alt?32:8; int delta = is_control?1:is_alt?32:8;
QPoint pos = cursorPos(); QPoint pos = QCursor::pos();
switch ( kc ) switch ( kc )
{ {
@ -2048,8 +2001,7 @@ void Workspace::createBorderWindows()
XSetWindowAttributes attributes; XSetWindowAttributes attributes;
unsigned long valuemask; unsigned long valuemask;
attributes.override_redirect = True; attributes.override_redirect = True;
attributes.event_mask = (EnterWindowMask | LeaveWindowMask | attributes.event_mask = ( EnterWindowMask | LeaveWindowMask );
VisibilityChangeMask);
valuemask= (CWOverrideRedirect | CWEventMask | CWCursor ); valuemask= (CWOverrideRedirect | CWEventMask | CWCursor );
attributes.cursor = XCreateFontCursor(display(), attributes.cursor = XCreateFontCursor(display(),
XC_sb_up_arrow); XC_sb_up_arrow);
@ -2441,7 +2393,7 @@ void Workspace::helperDialog( const QString& message, const Client* c )
{ {
KConfig cfg( "kwin_dialogsrc" ); KConfig cfg( "kwin_dialogsrc" );
KConfigGroup cg(&cfg, "Notification Messages" ); // this depends on KMessageBox KConfigGroup cg(&cfg, "Notification Messages" ); // this depends on KMessageBox
if( !cg.readEntry( type, QVariant(true )).toBool()) // has don't show again checked if( !cg.readEntry( type, true )) // has don't show again checked
return; // save launching kdialog return; // save launching kdialog
proc << "--dontagain" << "kwin_dialogsrc:" + type; proc << "--dontagain" << "kwin_dialogsrc:" + type;
} }