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

KWM->KWindowSystem

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=659662
This commit is contained in:
Luboš Luňák 2007-04-30 15:48:34 +00:00
parent 2700b9d5a2
commit 7a0f50b298
7 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
client.cpp
View file

@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <unistd.h> #include <unistd.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <QWhatsThis> #include <QWhatsThis>
#include <kwm.h> #include <kwindowsystem.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <stdlib.h> #include <stdlib.h>
@ -1225,7 +1225,7 @@ QString Client::readName() const
if ( info->name() && info->name()[ 0 ] != '\0' ) if ( info->name() && info->name()[ 0 ] != '\0' )
return QString::fromUtf8( info->name() ); return QString::fromUtf8( info->name() );
else else
return KWM::readNameProperty( window(), XA_WM_NAME ); return KWindowSystem::readNameProperty( window(), XA_WM_NAME );
} }
KWIN_COMPARE_PREDICATE( FetchNameInternalPredicate, Client, const Client*, (!cl->isSpecialWindow() || cl->isToolbar()) && cl != value && cl->caption() == value->caption()); KWIN_COMPARE_PREDICATE( FetchNameInternalPredicate, Client, const Client*, (!cl->isSpecialWindow() || cl->isToolbar()) && cl != value && cl->caption() == value->caption());
@ -1284,7 +1284,7 @@ void Client::fetchIconicName()
if ( info->iconName() && info->iconName()[ 0 ] != '\0' ) if ( info->iconName() && info->iconName()[ 0 ] != '\0' )
s = QString::fromUtf8( info->iconName() ); s = QString::fromUtf8( info->iconName() );
else else
s = KWM::readNameProperty( window(), XA_WM_ICON_NAME ); s = KWindowSystem::readNameProperty( window(), XA_WM_ICON_NAME );
if ( s != cap_iconic ) if ( s != cap_iconic )
{ {
bool was_set = !cap_iconic.isEmpty(); bool was_set = !cap_iconic.isEmpty();
@ -1349,10 +1349,10 @@ void Client::readIcons( Window win, QPixmap* icon, QPixmap* miniicon )
{ {
// get the icons, allow scaling // get the icons, allow scaling
if( icon != NULL ) if( icon != NULL )
*icon = KWM::icon( win, 32, 32, true, KWM::NETWM | KWM::WMHints ); *icon = KWindowSystem::icon( win, 32, 32, true, KWindowSystem::NETWM | KWindowSystem::WMHints );
if( miniicon != NULL ) if( miniicon != NULL )
if( icon == NULL || !icon->isNull()) if( icon == NULL || !icon->isNull())
*miniicon = KWM::icon( win, 16, 16, true, KWM::NETWM | KWM::WMHints ); *miniicon = KWindowSystem::icon( win, 16, 16, true, KWindowSystem::NETWM | KWindowSystem::WMHints );
else else
*miniicon = QPixmap(); *miniicon = QPixmap();
} }
@ -1379,8 +1379,8 @@ void Client::getIcons()
} }
if( icon_pix.isNull()) if( icon_pix.isNull())
{ // and if nothing else, load icon from classhint or xapp icon { // and if nothing else, load icon from classhint or xapp icon
icon_pix = KWM::icon( window(), 32, 32, true, KWM::ClassHint | KWM::XApp ); icon_pix = KWindowSystem::icon( window(), 32, 32, true, KWindowSystem::ClassHint | KWindowSystem::XApp );
miniicon_pix = KWM::icon( window(), 16, 16, true, KWM::ClassHint | KWM::XApp ); miniicon_pix = KWindowSystem::icon( window(), 16, 16, true, KWindowSystem::ClassHint | KWindowSystem::XApp );
} }
if( isManaged() && decoration != NULL ) if( isManaged() && decoration != NULL )
decoration->iconChange(); decoration->iconChange();

4
geometry.cpp
View file

@ -22,7 +22,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kapplication.h> #include <kapplication.h>
#include <kglobal.h> #include <kglobal.h>
#include <QPainter> #include <QPainter>
#include <kwm.h> #include <kwindowsystem.h>
#include "placement.h" #include "placement.h"
#include "notifications.h" #include "notifications.h"
@ -658,7 +658,7 @@ void Workspace::updateTopMenuGeometry( Client* c )
ev.xclient.data.l[3] = 0; ev.xclient.data.l[3] = 0;
ev.xclient.data.l[4] = 0; ev.xclient.data.l[4] = 0;
XSendEvent( display(), c->window(), False, NoEventMask, &ev ); XSendEvent( display(), c->window(), False, NoEventMask, &ev );
KWM::setStrut( c->window(), 0, 0, topmenu_height, 0 ); // so that kicker etc. know KWindowSystem::setStrut( c->window(), 0, 0, topmenu_height, 0 ); // so that kicker etc. know
c->checkWorkspacePosition(); c->checkWorkspacePosition();
return; return;
} }

4
kcmkwin/kwinrules/detectwidget.cpp
View file

@ -22,7 +22,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kwm.h> #include <kwindowsystem.h>
#include <QLabel> #include <QLabel>
#include <QRadioButton> #include <QRadioButton>
#include <QCheckBox> #include <QCheckBox>
@ -72,7 +72,7 @@ void DetectDialog::readWindow( WId w )
emit detectionDone( false ); emit detectionDone( false );
return; return;
} }
info = KWM::windowInfo( w, -1U, -1U ); // read everything info = KWindowSystem::windowInfo( w, -1U, -1U ); // read everything
if( !info.valid()) if( !info.valid())
{ {
emit detectionDone( false ); emit detectionDone( false );

2
kcmkwin/kwinrules/detectwidget.h
View file

@ -23,7 +23,7 @@
#include "ui_detectwidgetbase.h" #include "ui_detectwidgetbase.h"
#include <kdialog.h> #include <kdialog.h>
#include <kwm.h> #include <kwindowsystem.h>
#include "../../rules.h" #include "../../rules.h"
//Added by qt3to4: //Added by qt3to4:

4
kcmkwin/kwinrules/main.cpp
View file

@ -20,7 +20,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <kconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kwm.h> #include <kwindowsystem.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <fixx11h.h> #include <fixx11h.h>
@ -69,7 +69,7 @@ static void saveRules( const QList< Rules* >& rules )
static Rules* findRule( const QList< Rules* >& rules, Window wid, bool whole_app ) static Rules* findRule( const QList< Rules* >& rules, Window wid, bool whole_app )
{ {
KWindowInfo info = KWM::windowInfo( wid, KWindowInfo info = KWindowSystem::windowInfo( wid,
NET::WMName | NET::WMWindowType, NET::WMName | NET::WMWindowType,
NET::WM2WindowClass | NET::WM2WindowRole | NET::WM2ClientMachine ); NET::WM2WindowClass | NET::WM2WindowRole | NET::WM2ClientMachine );
if( !info.valid()) // shouldn't really happen if( !info.valid()) // shouldn't really happen

6
kcmkwin/kwinrules/ruleswidget.cpp
View file

@ -24,7 +24,7 @@
#include <QCheckBox> #include <QCheckBox>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <QLabel> #include <QLabel>
#include <kwm.h> #include <kwindowsystem.h>
#include <klocale.h> #include <klocale.h>
#include <QRegExp> #include <QRegExp>
@ -110,9 +110,9 @@ RulesWidget::RulesWidget( QWidget* parent )
SETUP( disableglobalshortcuts, force ); SETUP( disableglobalshortcuts, force );
int i; int i;
for( i = 1; for( i = 1;
i <= KWM::numberOfDesktops(); i <= KWindowSystem::numberOfDesktops();
++i ) ++i )
desktop->addItem( QString::number( i ).rightJustified( 2 ) + ':' + KWM::desktopName( i )); desktop->addItem( QString::number( i ).rightJustified( 2 ) + ':' + KWindowSystem::desktopName( i ));
desktop->addItem( i18n( "All Desktops" )); desktop->addItem( i18n( "All Desktops" ));
} }

2
kcmkwin/kwinrules/ruleswidget.h
View file

@ -21,7 +21,7 @@
#define __RULESWIDGET_H__ #define __RULESWIDGET_H__
#include <kdialog.h> #include <kdialog.h>
#include <kwm.h> #include <kwindowsystem.h>
//#include <kshortcutdialog.h> //#include <kshortcutdialog.h>
#include "ruleswidgetbase.h" #include "ruleswidgetbase.h"