summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--LICENSE.LGPL4
-rw-r--r--debian/README2
-rw-r--r--debian/changelog6
-rw-r--r--debian/control20
-rw-r--r--debian/duicompositor.install3
-rw-r--r--debian/mcompositor.dir (renamed from debian/duicompositor.dir)0
-rw-r--r--debian/mcompositor.install3
-rwxr-xr-xdebian/rules12
-rw-r--r--decorators/decorators.pro2
-rw-r--r--decorators/libdecorator/libdecorator.pro18
-rw-r--r--decorators/libdecorator/mabstractdecorator.cpp (renamed from decorators/libdecorator/duiabstractdecorator.cpp)20
-rw-r--r--decorators/libdecorator/mabstractdecorator.h (renamed from decorators/libdecorator/duiabstractdecorator.h)18
-rw-r--r--decorators/libdecorator/mrmiclient.cpp (renamed from decorators/libdecorator/duirmiclient.cpp)98
-rw-r--r--decorators/libdecorator/mrmiclient.h (renamed from decorators/libdecorator/duirmiclient.h)36
-rw-r--r--decorators/libdecorator/mrmiclient_p.h (renamed from decorators/libdecorator/duirmiclient_p.h)24
-rw-r--r--decorators/libdecorator/mrmiserver.cpp (renamed from decorators/libdecorator/duirmiserver.cpp)48
-rw-r--r--decorators/libdecorator/mrmiserver.h (renamed from decorators/libdecorator/duirmiserver.h)34
-rw-r--r--decorators/libdecorator/mrmiserver_p.h (renamed from decorators/libdecorator/duirmiserver_p.h)22
-rw-r--r--decorators/mdecorator/.gitignore (renamed from decorators/duidecorator/.gitignore)0
-rw-r--r--decorators/mdecorator/main.cpp (renamed from decorators/duidecorator/main.cpp)28
-rw-r--r--decorators/mdecorator/mdecorator.pro (renamed from decorators/duidecorator/duidecorator.pro)8
-rw-r--r--decorators/mdecorator/mdecoratorwindow.cpp (renamed from decorators/duidecorator/duidecoratorwindow.cpp)42
-rw-r--r--decorators/mdecorator/mdecoratorwindow.h (renamed from decorators/duidecorator/duidecoratorwindow.h)22
-rw-r--r--mcompositor.pro (renamed from duicompositor.pro)0
-rw-r--r--meegotouch_config.pri (renamed from duiconfig.pri)4
-rw-r--r--src/main.cpp11
-rw-r--r--src/mcompositemanager.cpp (renamed from src/duicompositemanager.cpp)490
-rw-r--r--src/mcompositemanager.h (renamed from src/duicompositemanager.h)24
-rw-r--r--src/mcompositemanager_p.h (renamed from src/duicompositemanager_p.h)46
-rw-r--r--src/mcompositescene.cpp (renamed from src/duicompositescene.cpp)16
-rw-r--r--src/mcompositescene.h (renamed from src/duicompositescene.h)10
-rw-r--r--src/mcompositewindow.cpp (renamed from src/duicompositewindow.cpp)134
-rw-r--r--src/mcompositewindow.h (renamed from src/duicompositewindow.h)26
-rw-r--r--src/mcompwindowanimator.cpp (renamed from src/duicompwindowanimator.cpp)66
-rw-r--r--src/mcompwindowanimator.h (renamed from src/duicompwindowanimator.h)12
-rw-r--r--src/mdecoratorframe.cpp (renamed from src/duidecoratorframe.cpp)52
-rw-r--r--src/mdecoratorframe.h (renamed from src/duidecoratorframe.h)24
-rw-r--r--src/msimplewindowframe.cpp (renamed from src/duisimplewindowframe.cpp)28
-rw-r--r--src/msimplewindowframe.h (renamed from src/duisimplewindowframe.h)14
-rw-r--r--src/mtexturepixmapitem.h (renamed from src/duitexturepixmapitem.h)24
-rw-r--r--src/mtexturepixmapitem_egl.cpp (renamed from src/duitexturepixmapitem_egl.cpp)60
-rw-r--r--src/mtexturepixmapitem_glx.cpp (renamed from src/duitexturepixmapitem_glx.cpp)52
-rw-r--r--src/mtexturepixmapitem_p.cpp (renamed from src/duitexturepixmapitem_p.cpp)44
-rw-r--r--src/mtexturepixmapitem_p.h (renamed from src/duitexturepixmapitem_p.h)18
-rw-r--r--src/src.pro48
-rw-r--r--src/texturepixmapshaders.h2
46 files changed, 840 insertions, 835 deletions
diff --git a/LICENSE.LGPL b/LICENSE.LGPL
index 5be4c8f..922be29 100644
--- a/LICENSE.LGPL
+++ b/LICENSE.LGPL
@@ -1,9 +1,9 @@
GNU LESSER GENERAL PUBLIC LICENSE
- The DirectUI Framework is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ The MeeGo Touch UI Framework is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
Contact: Nokia Corporation (directui@nokia.com)
- You may use, distribute and copy the DirectUI Framework under the terms of
+ You may use, distribute and copy the MeeGo Touch UI Framework under the terms of
GNU Lesser General Public License version 2.1, which is displayed below.
-------------------------------------------------------------------------
diff --git a/debian/README b/debian/README
index 37e1d78..54f85e1 100644
--- a/debian/README
+++ b/debian/README
@@ -1,4 +1,4 @@
-DUICOMPOSITOR
+MCOMPOSITOR
-------------
No-one here but us chicken!
diff --git a/debian/changelog b/debian/changelog
index 11a8258..f91fb46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mcompositor (0.3.11~1) unstable; urgency=low
+
+ * Using the "MeeGo Touch UI" brand instead of "Direct UI"
+
+ -- Daniel d'Andrada <daniel.dandrada@nokia.com> Wed, 14 Apr 2010 16:56:54 +0300
+
duicompositor (0.3.10~1) unstable; urgency=low
* New version [UNRELEASED]
diff --git a/debian/control b/debian/control
index 1217201..b4997fa 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,18 @@
-Source: duicompositor
+Source: mcompositor
Section: x11
Priority: extra
Maintainer: Abdiel Janulgue <abdiel.janulgue@nokia.com>
-Build-Depends: debhelper (>= 5), libqt4-dev, libdui-dev, libgles2-sgx-img-dev [arm armel], opengles-sgx-img-common-dev [arm armel], libgl-dev [i386], libgl1 [i386], libqt4-opengl-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev, libxtst-dev, libxi-dev, mce-dev [arm armel]
+Build-Depends: debhelper (>= 5), libqt4-dev, libmeegotouch-dev, libgles2-sgx-img-dev [arm armel], opengles-sgx-img-common-dev [arm armel], libgl-dev [i386], libgl1 [i386], libqt4-opengl-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev, libxtst-dev, libxi-dev, mce-dev [arm armel]
Standards-Version: 3.7.2
-Package: duicompositor
+Package: mcompositor
Architecture: any
-Depends: libdui0, ${shlibs:Depends}
-Description: Direct UI Compositor application
- Direct UI Compositor application
+Depends: libmeegotouchcore0, ${shlibs:Depends}
+Description: MeeGo Touch UI Compositor application
+ MeeGo Touch UI Compositor application
-Package: duicompositor-dbg
+Package: mcompositor-dbg
Architecture: any
-Depends: duicompositor (=${Source-Version})
-Description: Direct UI Compositor debug symbols
- Direct UI Compositor debug symbols
+Depends: mcompositor (=${Source-Version})
+Description: MeeGo Touch UI Compositor debug symbols
+ MeeGo Touch UI Compositor debug symbols
diff --git a/debian/duicompositor.install b/debian/duicompositor.install
deleted file mode 100644
index 27ec67b..0000000
--- a/debian/duicompositor.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/duicompositor
-usr/bin/duidecorator
-usr/lib/libdecorator.so*
diff --git a/debian/duicompositor.dir b/debian/mcompositor.dir
index 415f082..415f082 100644
--- a/debian/duicompositor.dir
+++ b/debian/mcompositor.dir
diff --git a/debian/mcompositor.install b/debian/mcompositor.install
new file mode 100644
index 0000000..7c96776
--- /dev/null
+++ b/debian/mcompositor.install
@@ -0,0 +1,3 @@
+usr/bin/mcompositor
+usr/bin/mdecorator
+usr/lib/libdecorator.so*
diff --git a/debian/rules b/debian/rules
index e6933c4..2a460cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ endif
QMAKE_OPTIONS = COV_OPTION=off
BASENAME_ORIGIN = $(shell cat .git/config | grep url | sed 's/.*\///')
-ifeq (duitests,$(BASENAME_ORIGIN))
+ifeq (mtests,$(BASENAME_ORIGIN))
QMAKE_OPTIONS = COV_OPTION=on
endif
@@ -82,13 +82,13 @@ install: build
# Add here commands to install the package into debian/tmp
- #duicompositor package
+ #mcompositor package
INSTALL_ROOT=$(CURDIR)/debian/tmp make $(PARALLEL_MAKEFLAGS) install
- #duicompositor-doc package
+ #mcompositor-doc package
#make $(PARALLEL_MAKEFLAGS) doc
- #mkdir -p ${CURDIR}/debian/tmp/usr/share/doc/duicompositor/api
- #cp -r doc/html/* ${CURDIR}/debian/tmp/usr/share/doc/duicompositor/api/
+ #mkdir -p ${CURDIR}/debian/tmp/usr/share/doc/mcompositor/api
+ #cp -r doc/html/* ${CURDIR}/debian/tmp/usr/share/doc/mcompositor/api/
# Build architecture-independent files here.
@@ -115,7 +115,7 @@ binary-arch: build install
# dh_installinfo
# dh_installman
dh_link
- dh_strip --dbg-package=duicompositor
+ dh_strip --dbg-package=mcompositor
dh_compress
dh_fixperms
# dh_perl
diff --git a/decorators/decorators.pro b/decorators/decorators.pro
index a04e533..758f8a3 100644
--- a/decorators/decorators.pro
+++ b/decorators/decorators.pro
@@ -8,7 +8,7 @@ SUBDIRS += \
sub_lib.subdir=libdecorator
sub_decorator.depends=sub_lib
-sub_decorator.subdir=duidecorator
+sub_decorator.subdir=mdecorator
check.target = check
diff --git a/decorators/libdecorator/libdecorator.pro b/decorators/libdecorator/libdecorator.pro
index ece6af0..443a965 100644
--- a/decorators/libdecorator/libdecorator.pro
+++ b/decorators/libdecorator/libdecorator.pro
@@ -1,4 +1,4 @@
-include(../../duiconfig.pri)
+include(../../meegotouch_config.pri)
TEMPLATE = lib
DEPENDPATH += .
INCLUDEPATH += .
@@ -7,14 +7,14 @@ QT += opengl network
TARGET = decorator
VERSION = 0.3.7
-HEADERS += duiabstractdecorator.h \
- duirmiclient_p.h \
- duirmiclient.h \
- duirmiserver_p.h \
- duirmiserver.h
-SOURCES += duiabstractdecorator.cpp \
- duirmiclient.cpp \
- duirmiserver.cpp
+HEADERS += mabstractdecorator.h \
+ mrmiclient_p.h \
+ mrmiclient.h \
+ mrmiserver_p.h \
+ mrmiserver.h
+SOURCES += mabstractdecorator.cpp \
+ mrmiclient.cpp \
+ mrmiserver.cpp
target.path=/usr/lib
INSTALLS += target
diff --git a/decorators/libdecorator/duiabstractdecorator.cpp b/decorators/libdecorator/mabstractdecorator.cpp
index fcfee33..0a84e34 100644
--- a/decorators/libdecorator/duiabstractdecorator.cpp
+++ b/decorators/libdecorator/mabstractdecorator.cpp
@@ -17,11 +17,11 @@
**
****************************************************************************/
-#include "duiabstractdecorator.h"
+#include "mabstractdecorator.h"
#include <QtDebug>
-#include <duirmiserver.h>
+#include <mrmiserver.h>
#include <QX11Info>
#include <X11/Xutil.h>
@@ -29,23 +29,23 @@
#include <X11/Xatom.h>
#include <X11/Xmd.h>
-DuiAbstractDecorator::DuiAbstractDecorator(QObject *parent)
+MAbstractDecorator::MAbstractDecorator(QObject *parent)
: QObject(parent)
{
- DuiRmiServer *s = new DuiRmiServer(".duiabstractdecorator", this);
+ MRmiServer *s = new MRmiServer(".mabstractdecorator", this);
s->exportObject(this);
}
-DuiAbstractDecorator::~DuiAbstractDecorator()
+MAbstractDecorator::~MAbstractDecorator()
{
}
-Qt::HANDLE DuiAbstractDecorator::managedWinId()
+Qt::HANDLE MAbstractDecorator::managedWinId()
{
return client;
}
-void DuiAbstractDecorator::minimize()
+void MAbstractDecorator::minimize()
{
/* TODO */
XEvent e;
@@ -68,7 +68,7 @@ void DuiAbstractDecorator::minimize()
XSync(QX11Info::display(), FALSE);
}
-void DuiAbstractDecorator::close()
+void MAbstractDecorator::close()
{
XEvent e;
memset(&e, 0, sizeof(e));
@@ -86,13 +86,13 @@ void DuiAbstractDecorator::close()
XSync(QX11Info::display(), FALSE);
}
-void DuiAbstractDecorator::RemoteSetManagedWinId(qulonglong window)
+void MAbstractDecorator::RemoteSetManagedWinId(qulonglong window)
{
client = window;
manageEvent(window);
}
-void DuiAbstractDecorator::RemoteActivateWindow()
+void MAbstractDecorator::RemoteActivateWindow()
{
activateEvent();
}
diff --git a/decorators/libdecorator/duiabstractdecorator.h b/decorators/libdecorator/mabstractdecorator.h
index 2dcb77b..1b52a64 100644
--- a/decorators/libdecorator/duiabstractdecorator.h
+++ b/decorators/libdecorator/mabstractdecorator.h
@@ -17,23 +17,23 @@
**
****************************************************************************/
-#ifndef DUIABSTRACTDECORATOR_H
-#define DUIABSTRACTDECORATOR_H
+#ifndef MABSTRACTDECORATOR_H
+#define MABSTRACTDECORATOR_H
#include <QObject>
/*!
- * DuiAbstractDecorator is the base class for window decorators
+ * MAbstractDecorator is the base class for window decorators
*/
-class DuiAbstractDecorator: public QObject
+class MAbstractDecorator: public QObject
{
Q_OBJECT
public:
/*!
- * Initializes DuiAbstractDecorator and the connections to DuiCompositor
+ * Initializes MAbstractDecorator and the connections to MCompositor
*/
- DuiAbstractDecorator(QObject *parent = 0);
- virtual ~DuiAbstractDecorator() = 0;
+ MAbstractDecorator(QObject *parent = 0);
+ virtual ~MAbstractDecorator() = 0;
/*!
* Returns the id of the window decorated by this decorator
@@ -53,7 +53,7 @@ public slots:
void close();
/*!
- * Interface to DuiRMI sockets
+ * Interface to MRMI sockets
*/
void RemoteSetManagedWinId(qulonglong window);
void RemoteActivateWindow();
@@ -77,4 +77,4 @@ private:
};
-#endif //DUIABSTRACTDECORATOR_H
+#endif //MABSTRACTDECORATOR_H
diff --git a/decorators/libdecorator/duirmiclient.cpp b/decorators/libdecorator/mrmiclient.cpp
index 4cd87ba..443b7d6 100644
--- a/decorators/libdecorator/duirmiclient.cpp
+++ b/decorators/libdecorator/mrmiclient.cpp
@@ -16,38 +16,38 @@
** of this file.
**
****************************************************************************/
-#include "duirmiclient_p.h"
-#include "duirmiclient.h"
+#include "mrmiclient_p.h"
+#include "mrmiclient.h"
#include <QDataStream>
#include <QByteArray>
-#include <DuiDebug>
+#include <MDebug>
-DuiRmiClientPrivate:: DuiRmiClientPrivate(const QString& key)
+MRmiClientPrivate:: MRmiClientPrivate(const QString& key)
: _key(key)
{
}
-DuiRmiClientPrivate::~DuiRmiClientPrivate()
+MRmiClientPrivate::~MRmiClientPrivate()
{
}
-void DuiRmiClientPrivate::initConnection()
+void MRmiClientPrivate::initConnection()
{
//unused
}
-void DuiRmiClientPrivate::finalizeConnection()
+void MRmiClientPrivate::finalizeConnection()
{
// unused
}
-QString DuiRmiClientPrivate::key() const
+QString MRmiClientPrivate::key() const
{
return _key;
}
-DuiRmiClientPrivateSocket::DuiRmiClientPrivateSocket(const QString& key, DuiRmiClient *q)
- : DuiRmiClientPrivate(key),
+MRmiClientPrivateSocket::MRmiClientPrivateSocket(const QString& key, MRmiClient *q)
+ : MRmiClientPrivate(key),
return_sz(0)
{
q_ptr = q;
@@ -55,7 +55,7 @@ DuiRmiClientPrivateSocket::DuiRmiClientPrivateSocket(const QString& key, DuiRmiC
}
-void DuiRmiClientPrivateSocket::initConnection()
+void MRmiClientPrivateSocket::initConnection()
{
_buf.clear();
_stream = new QDataStream(&_buf, QIODevice::WriteOnly);
@@ -63,13 +63,13 @@ void DuiRmiClientPrivateSocket::initConnection()
connectToServer();
if (!_socket.waitForConnected())
- duiDebug("DuiRmiClientPrivateSocket") << _socket.errorString() << key();
+ mDebug("MRmiClientPrivateSocket") << _socket.errorString() << key();
}
-void DuiRmiClientPrivateSocket::finalizeConnection()
+void MRmiClientPrivateSocket::finalizeConnection()
{
uint sz = _buf.size();
- duiDebug("DuiRmiClientPrivateSocket") << sz;
+ mDebug("MRmiClientPrivateSocket") << sz;
_stream->device()->seek(0);
*_stream << (quint16)(sz - sizeof(quint16));
@@ -81,27 +81,27 @@ void DuiRmiClientPrivateSocket::finalizeConnection()
delete _stream;
}
-QDataStream& DuiRmiClientPrivateSocket::stream()
+QDataStream& MRmiClientPrivateSocket::stream()
{
return *_stream;
}
-void DuiRmiClientPrivateSocket::writeData(const QByteArray& buffer)
+void MRmiClientPrivateSocket::writeData(const QByteArray& buffer)
{
_socket.write(buffer);
_socket.waitForBytesWritten();
// _socket.disconnect();
}
-void DuiRmiClientPrivateSocket::connectToServer()
+void MRmiClientPrivateSocket::connectToServer()
{
if (_socket.state() == QLocalSocket::UnconnectedState)
_socket.connectToServer(key());
}
-void DuiRmiClientPrivateSocket::_q_readyRead()
+void MRmiClientPrivateSocket::_q_readyRead()
{
- Q_Q(DuiRmiClient);
+ Q_Q(MRmiClient);
QDataStream stream(&_socket);
stream.setVersion(QDataStream::Qt_4_0);
@@ -119,31 +119,31 @@ void DuiRmiClientPrivateSocket::_q_readyRead()
emit q->returnValue(v);
}
-DuiRmiClient::DuiRmiClient(const QString& key, QObject* p)
+MRmiClient::MRmiClient(const QString& key, QObject* p)
: QObject(p),
- d_ptr(new DuiRmiClientPrivateSocket(key, this))
+ d_ptr(new MRmiClientPrivateSocket(key, this))
{
}
-DuiRmiClient::~DuiRmiClient()
+MRmiClient::~MRmiClient()
{
delete d_ptr;
}
-void DuiRmiClient::initConnection()
+void MRmiClient::initConnection()
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
d->initConnection();
}
-void DuiRmiClient::finalizeConnection()
+void MRmiClient::finalizeConnection()
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
d->finalizeConnection();
}
-void DuiRmiClient::invoke(const char* objectName, const char* method)
+void MRmiClient::invoke(const char* objectName, const char* method)
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
initConnection();
/* packet is composed of |block size|argument length|arguments...| */
@@ -153,65 +153,65 @@ void DuiRmiClient::invoke(const char* objectName, const char* method)
}
-void DuiRmiClient::invoke(const char* objectName, const char* method,
+void MRmiClient::invoke(const char* objectName, const char* method,
const QVariant& arg0)
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
initConnection();
d->stream() << (quint16)0 << (quint16)1 << objectName << method << arg0;
finalizeConnection();
}
-void DuiRmiClient::invoke(const char* objectName, const char* method,
+void MRmiClient::invoke(const char* objectName, const char* method,
const QVariant& arg0, const QVariant& arg1)
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
initConnection();
d->stream() << (quint16)0 << (quint16)2 << objectName << method << arg0
<< arg1;
finalizeConnection();
}
-void DuiRmiClient::invoke(const char* objectName, const char* method,
+void MRmiClient::invoke(const char* objectName, const char* method,
const QVariant& arg0, const QVariant& arg1,
const QVariant& arg2)
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
initConnection();
d->stream() << (quint16)0 << (quint16)3 << objectName << method << arg0
<< arg1 << arg2;
finalizeConnection();
}
-void DuiRmiClient::invoke(const char* objectName, const char* method,
+void MRmiClient::invoke(const char* objectName, const char* method,
const QVariant& arg0, const QVariant& arg1,
const QVariant& arg2, const QVariant& arg3)
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
initConnection();
d->stream() << (quint16)0 << (quint16)4 << objectName << method << arg0
<< arg1 << arg2 << arg3;
finalizeConnection();
}
-void DuiRmiClient::invoke(const char* objectName, const char* method,
+void MRmiClient::invoke(const char* objectName, const char* method,
const QVariant& arg0, const QVariant& arg1,
const QVariant& arg2, const QVariant& arg3,
const QVariant& arg4)
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
initConnection();
d->stream() << (quint16)0 << (quint16)5 << objectName << method << arg0
<< arg1 << arg2 << arg3 << arg4;
finalizeConnection();
}
-void DuiRmiClient::invoke(const char* objectName, const char* method,
+void MRmiClient::invoke(const char* objectName, const char* method,
const QVariant& arg0, const QVariant& arg1,
const QVariant& arg2, const QVariant& arg3,
const QVariant& arg4, const QVariant& arg5)
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
initConnection();
d->stream() << (quint16)0 << (quint16)6 << objectName << method << arg0
<< arg1 << arg2 << arg3 << arg4 << arg5;
@@ -219,26 +219,26 @@ void DuiRmiClient::invoke(const char* objectName, const char* method,
}
-void DuiRmiClient::invoke(const char* objectName, const char* method,
+void MRmiClient::invoke(const char* objectName, const char* method,
const QVariant& arg0, const QVariant& arg1,
const QVariant& arg2, const QVariant& arg3,
const QVariant& arg4, const QVariant& arg5,
const QVariant& arg6)
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
initConnection();
d->stream() << (quint16)0 << (quint16)7 << objectName << method << arg0
<< arg1 << arg2 << arg3 << arg4 << arg5 << arg6;
finalizeConnection();
}
-void DuiRmiClient::invoke(const char* objectName, const char* method,
+void MRmiClient::invoke(const char* objectName, const char* method,
const QVariant& arg0, const QVariant& arg1,
const QVariant& arg2, const QVariant& arg3,
const QVariant& arg4, const QVariant& arg5,
const QVariant& arg6, const QVariant& arg7)
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
initConnection();
d->stream() << (quint16)0 << (quint16)8 << objectName << method << arg0
<< arg1 << arg2 << arg3 << arg4 << arg5 << arg6 << arg7;
@@ -246,28 +246,28 @@ void DuiRmiClient::invoke(const char* objectName, const char* method,
}
-void DuiRmiClient::invoke(const char* objectName, const char* method,
+void MRmiClient::invoke(const char* objectName, const char* method,
const QVariant& arg0, const QVariant& arg1,
const QVariant& arg2, const QVariant& arg3,
const QVariant& arg4, const QVariant& arg5,
const QVariant& arg6, const QVariant& arg7,
const QVariant& arg8)
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
initConnection();
d->stream() << (quint16)0 << (quint16)9 << objectName << method << arg0
<< arg1 << arg2 << arg3 << arg4 << arg5 << arg6 << arg7 << arg8;
finalizeConnection();
}
-void DuiRmiClient::invoke(const char* objectName, const char* method,
+void MRmiClient::invoke(const char* objectName, const char* method,
const QVariant& arg0, const QVariant& arg1,
const QVariant& arg2, const QVariant& arg3,
const QVariant& arg4, const QVariant& arg5,
const QVariant& arg6, const QVariant& arg7,
const QVariant& arg8, const QVariant& arg9)
{
- Q_D(DuiRmiClient);
+ Q_D(MRmiClient);
initConnection();
d->stream() << (quint16)0 << (quint16)10 << objectName << method << arg0
<< arg1 << arg2 << arg3 << arg4 << arg5 << arg6 << arg7 << arg8
@@ -275,5 +275,5 @@ void DuiRmiClient::invoke(const char* objectName, const char* method,
finalizeConnection();
}
-#include "moc_duirmiclient.cpp"
+#include "moc_mrmiclient.cpp"
diff --git a/decorators/libdecorator/duirmiclient.h b/decorators/libdecorator/mrmiclient.h
index 239e271..02a7ac6 100644
--- a/decorators/libdecorator/duirmiclient.h
+++ b/decorators/libdecorator/mrmiclient.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -17,40 +17,40 @@
**
****************************************************************************/
// -*- C++ -*-
-#ifndef DUIRMICLIENT_H
-#define DUIRMICLIENT_H
+#ifndef MRMICLIENT_H
+#define MRMICLIENT_H
#include <QVariant>
#include <QObject>
-#include <duiexport.h>
+#include <mexport.h>
-class DuiRmiClientPrivate;
-class DuiRmiClientPrivateSocket;
+class MRmiClientPrivate;
+class MRmiClientPrivateSocket;
/*!
- * \class DuiRmiClient
+ * \class MRmiClient
*
- * \brief The DuiRmiClient allows member functions of QObjects exported by
- * DuiRmiServer from another process to be invoked remotely.
+ * \brief The MRmiClient allows member functions of QObjects exported by
+ * MRmiServer from another process to be invoked remotely.
*/
-class DUI_EXPORT DuiRmiClient: public QObject
+class M_EXPORT MRmiClient: public QObject
{
Q_OBJECT
public:
/*!
- * Creates a DuiRmiClient
+ * Creates a MRmiClient
*
- * \param key the key used to identify the remote DuiRmiServer
+ * \param key the key used to identify the remote MRmiServer
* \param parent the parent QObject
*/
- explicit DuiRmiClient(const QString& key, QObject* parent = 0);
+ explicit MRmiClient(const QString& key, QObject* parent = 0);
/*!
* Disconnects all connections and destroys this object
*/
- virtual ~DuiRmiClient();
+ virtual ~MRmiClient();
/*!
* Invoked the remote function
@@ -110,14 +110,14 @@ Q_SIGNALS:
void returnValue(const QVariant& arg);
private:
- Q_DISABLE_COPY(DuiRmiClient)
- Q_DECLARE_PRIVATE(DuiRmiClient)
+ Q_DISABLE_COPY(MRmiClient)
+ Q_DECLARE_PRIVATE(MRmiClient)
void initConnection();
void finalizeConnection();
- DuiRmiClientPrivate * const d_ptr;
- friend class DuiRmiClientPrivateSocket;
+ MRmiClientPrivate * const d_ptr;
+ friend class MRmiClientPrivateSocket;
Q_PRIVATE_SLOT(d_func(), void _q_readyRead())
};
diff --git a/decorators/libdecorator/duirmiclient_p.h b/decorators/libdecorator/mrmiclient_p.h
index cf04889..ce35deb 100644
--- a/decorators/libdecorator/duirmiclient_p.h
+++ b/decorators/libdecorator/mrmiclient_p.h
@@ -16,21 +16,21 @@
** of this file.
**
****************************************************************************/
-#ifndef DUIRMICLIENT_P_H
-#define DUIRMICLIENT_P_H
+#ifndef MRMICLIENT_P_H
+#define MRMICLIENT_P_H
#include <QLocalSocket>
#include <QByteArray>
class QDataStream;
-class DuiRmiClient;
+class MRmiClient;
-class DuiRmiClientPrivate
+class MRmiClientPrivate
{
- Q_DECLARE_PUBLIC(DuiRmiClient)
+ Q_DECLARE_PUBLIC(MRmiClient)
public:
- DuiRmiClientPrivate(const QString& key);
- virtual ~DuiRmiClientPrivate();
+ MRmiClientPrivate(const QString& key);
+ virtual ~MRmiClientPrivate();
virtual void writeData(const QByteArray&) = 0;
virtual void connectToServer() = 0;
virtual QDataStream& stream() = 0;
@@ -42,19 +42,19 @@ public:
void returnValue(const QVariant& v);
- DuiRmiClient * q_ptr;
+ MRmiClient * q_ptr;
virtual void _q_readyRead() = 0;
private:
QString _key;
};
-class DuiRmiClientPrivateSocket: public DuiRmiClientPrivate
+class MRmiClientPrivateSocket: public MRmiClientPrivate
{
- Q_DECLARE_PUBLIC(DuiRmiClient)
+ Q_DECLARE_PUBLIC(MRmiClient)
public:
- DuiRmiClientPrivateSocket(const QString& key, DuiRmiClient *q);
+ MRmiClientPrivateSocket(const QString& key, MRmiClient *q);
void writeData(const QByteArray&);
void connectToServer();
@@ -71,4 +71,4 @@ private:
quint16 return_sz;
};
-#endif //DUIRMICLIENT_P_H
+#endif //MRMICLIENT_P_H
diff --git a/decorators/libdecorator/duirmiserver.cpp b/decorators/libdecorator/mrmiserver.cpp
index 32b95a9..af830a4 100644
--- a/decorators/libdecorator/duirmiserver.cpp
+++ b/decorators/libdecorator/mrmiserver.cpp
@@ -16,8 +16,8 @@
** of this file.
**
****************************************************************************/
-#include "duirmiserver.h"
-#include "duirmiserver_p.h"
+#include "mrmiserver.h"
+#include "mrmiserver_p.h"
#include <QLocalSocket>
#include <QDataStream>
@@ -25,47 +25,47 @@
#include <QGenericArgument>
#include <QFile>
#include <QTextStream>
-#include <DuiDebug>
+#include <MDebug>
QGenericArgument unmarshall(const char*name, const void* data)
{
return QGenericArgument(name, data);
}
-DuiRmiServerPrivate::DuiRmiServerPrivate(const QString& key)
+MRmiServerPrivate::MRmiServerPrivate(const QString& key)
: _key(key), _obj(0)
{
}
-DuiRmiServerPrivate::~DuiRmiServerPrivate()
+MRmiServerPrivate::~MRmiServerPrivate()
{
}
-void DuiRmiServerPrivate::exportObject(QObject* p)
+void MRmiServerPrivate::exportObject(QObject* p)
{
_obj = p;
}
// TODO object selection from multiple sources
-QObject* DuiRmiServerPrivate::currentObject()
+QObject* MRmiServerPrivate::currentObject()
{
return _obj;
}
-QString DuiRmiServerPrivate::key() const
+QString MRmiServerPrivate::key() const
{
return _key;
}
-DuiRmiServerPrivateSocket::DuiRmiServerPrivateSocket(const QString& key)
- : DuiRmiServerPrivate(key), method_size(0)
+MRmiServerPrivateSocket::MRmiServerPrivateSocket(const QString& key)
+ : MRmiServerPrivate(key), method_size(0)
{
}
-void DuiRmiServerPrivateSocket::exportObject(QObject* p)
+void MRmiServerPrivateSocket::exportObject(QObject* p)
{
- Q_Q(DuiRmiServer);
- DuiRmiServerPrivate::exportObject(p);
+ Q_Q(MRmiServer);
+ MRmiServerPrivate::exportObject(p);
q->connect(&_serv, SIGNAL(newConnection()), q, SLOT(_q_incoming()));
@@ -73,12 +73,12 @@ void DuiRmiServerPrivateSocket::exportObject(QObject* p)
QFile::remove("/tmp/" + key());
if (!_serv.listen(key()))
- duiDebug("DuiRmiServerPrivateSocket") << "system error, can't listen to local socket";
+ mDebug("MRmiServerPrivateSocket") << "system error, can't listen to local socket";
}
-void DuiRmiServerPrivateSocket::_q_incoming()
+void MRmiServerPrivateSocket::_q_incoming()
{
- Q_Q(DuiRmiServer);
+ Q_Q(MRmiServer);
QLocalSocket* s = _serv.nextPendingConnection();
q->connect(s, SIGNAL(disconnected()), s, SLOT(deleteLater()));
if (!s)
@@ -87,7 +87,7 @@ void DuiRmiServerPrivateSocket::_q_incoming()
q->connect(_sock, SIGNAL(readyRead()), q, SLOT(_q_readData()));
}
-void DuiRmiServerPrivateSocket::_q_readData()
+void MRmiServerPrivateSocket::_q_readData()
{
uint sz = _sock->bytesAvailable();
@@ -106,7 +106,7 @@ void DuiRmiServerPrivateSocket::_q_readData()
invoke(stream);
}
-void DuiRmiServerPrivateSocket::invoke(QDataStream& stream)
+void MRmiServerPrivateSocket::invoke(QDataStream& stream)
{
char* className = 0;
char* methodName = 0;
@@ -294,25 +294,25 @@ void DuiRmiServerPrivateSocket::invoke(QDataStream& stream)
}
-DuiRmiServer::DuiRmiServer(const QString& key, QObject* p)
+MRmiServer::MRmiServer(const QString& key, QObject* p)
: QObject(p),
- d_ptr(new DuiRmiServerPrivateSocket(key))
+ d_ptr(new MRmiServerPrivateSocket(key))
{
d_ptr->q_ptr = this;
}
-DuiRmiServer::~DuiRmiServer()
+MRmiServer::~MRmiServer()
{
delete d_ptr;
}
-void DuiRmiServer::exportObject(QObject* obj)
+void MRmiServer::exportObject(QObject* obj)
{
- Q_D(DuiRmiServer);
+ Q_D(MRmiServer);
d->exportObject(obj);
}
-#include "moc_duirmiserver.cpp"
+#include "moc_mrmiserver.cpp"
diff --git a/decorators/libdecorator/duirmiserver.h b/decorators/libdecorator/mrmiserver.h
index 9530a3f..8a5fc92 100644
--- a/decorators/libdecorator/duirmiserver.h
+++ b/decorators/libdecorator/mrmiserver.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -18,19 +18,19 @@
****************************************************************************/
// -*- C++ -*-
-#ifndef DUIRMISERVER_H
-#define DUIRMISERVER_H
+#ifndef MRMISERVER_H
+#define MRMISERVER_H
#include <QObject>
-#include "duiexport.h"
+#include "mexport.h"
-class DuiRmiServerPrivate;
-class DuiRmiServerPrivateSocket;
+class MRmiServerPrivate;
+class MRmiServerPrivateSocket;
/*!
- * \class DuiRmiServer
- * \brief The DuiRmiServer provides a way for member functions of QObject-based
+ * \class MRmiServer
+ * \brief The MRmiServer provides a way for member functions of QObject-based
* classes to be directly invoked from another process without relying on an
* external transport such as d-bus.
*
@@ -49,40 +49,40 @@ class DuiRmiServerPrivateSocket;
* system using qRegisterMetaType(). Qt uses this class internally for
* mashalling/unmarshalling types (see QMetaType for details).
*/
-class DUI_EXPORT DuiRmiServer: public QObject
+class M_EXPORT MRmiServer: public QObject
{
Q_OBJECT
public:
/*!
- * Creates a DuiRmiServer
+ * Creates a MRmiServer
*
* \param key a unique key that identifies this server
* \param parent QObject.
*/
- explicit DuiRmiServer(const QString& key, QObject* parent = 0);
+ explicit MRmiServer(const QString& key, QObject* parent = 0);
/*!
* Disconnects all connections and destroys this object
*/
- virtual ~DuiRmiServer();
+ virtual ~MRmiServer();
/*!
* Export a QObject for remote invocation. Currently only one QObject per
- * DuiRmiServer is supported.
+ * MRmiServer is supported.
*
* \param object QObject to be exported.
*/
void exportObject(QObject* object);
private:
- Q_DISABLE_COPY(DuiRmiServer)
- Q_DECLARE_PRIVATE(DuiRmiServer)
+ Q_DISABLE_COPY(MRmiServer)
+ Q_DECLARE_PRIVATE(MRmiServer)
Q_PRIVATE_SLOT(d_func(), void _q_incoming())
Q_PRIVATE_SLOT(d_func(), void _q_readData())
- DuiRmiServerPrivate * const d_ptr;
- friend class DuiRmiServerPrivateSocket;
+ MRmiServerPrivate * const d_ptr;
+ friend class MRmiServerPrivateSocket;
};
#endif
diff --git a/decorators/libdecorator/duirmiserver_p.h b/decorators/libdecorator/mrmiserver_p.h
index c047fef..8725f19 100644
--- a/decorators/libdecorator/duirmiserver_p.h
+++ b/decorators/libdecorator/mrmiserver_p.h
@@ -18,21 +18,21 @@
****************************************************************************/
-#ifndef DUIRMISERVER_P_H
-#define DUIRMISERVER_P_H
+#ifndef MRMISERVER_P_H
+#define MRMISERVER_P_H
#include <QVariant>
#include <QLocalServer>
class QDataStream;
-class DuiRmiServerPrivate
+class MRmiServerPrivate
{
- Q_DECLARE_PUBLIC( DuiRmiServer )
+ Q_DECLARE_PUBLIC( MRmiServer )
public:
- DuiRmiServerPrivate(const QString& key);
- virtual ~DuiRmiServerPrivate();
+ MRmiServerPrivate(const QString& key);
+ virtual ~MRmiServerPrivate();
virtual void exportObject(QObject* p);
QObject* currentObject();
QString key() const;
@@ -40,18 +40,18 @@ public:
virtual void _q_incoming() = 0;
virtual void _q_readData() = 0;
- DuiRmiServer * q_ptr;
+ MRmiServer * q_ptr;
private:
QString _key;
QObject* _obj;
};
-class DuiRmiServerPrivateSocket: public DuiRmiServerPrivate
+class MRmiServerPrivateSocket: public MRmiServerPrivate
{
- Q_DECLARE_PUBLIC( DuiRmiServer )
+ Q_DECLARE_PUBLIC( MRmiServer )
public:
- DuiRmiServerPrivateSocket(const QString& key);
+ MRmiServerPrivateSocket(const QString& key);
virtual void exportObject(QObject* p);
@@ -66,4 +66,4 @@ private:
quint16 method_size;
};
-#endif //DUIRMISERVER_P_H
+#endif //MRMISERVER_P_H
diff --git a/decorators/duidecorator/.gitignore b/decorators/mdecorator/.gitignore
index cd0cf58..cd0cf58 100644
--- a/decorators/duidecorator/.gitignore
+++ b/decorators/mdecorator/.gitignore
diff --git a/decorators/duidecorator/main.cpp b/decorators/mdecorator/main.cpp
index 597848f..1207ca5 100644
--- a/decorators/duidecorator/main.cpp
+++ b/decorators/mdecorator/main.cpp
@@ -16,14 +16,14 @@
** of this file.
**
****************************************************************************/
-#include <DuiApplication>
-#include <DuiHomeButtonPanel>
-#include <DuiEscapeButtonPanel>
-#include <DuiNavigationBar>
-#include <DuiScene>
-#include <DuiSceneManager>
+#include <MApplication>
+#include <MHomeButtonPanel>
+#include <MEscapeButtonPanel>
+#include <MNavigationBar>
+#include <MScene>
+#include <MSceneManager>
-#include "duidecoratorwindow.h"
+#include "mdecoratorwindow.h"
static QRect windowRectFromGraphicsItem(QGraphicsView &view, QGraphicsItem &item)
{
@@ -36,20 +36,20 @@ static QRect windowRectFromGraphicsItem(QGraphicsView &view, QGraphicsItem &item
int main(int argc, char **argv)
{
- DuiApplication app(argc, argv);
- DuiScene scene;
- DuiDecoratorWindow window;
+ MApplication app(argc, argv);
+ MScene scene;
+ MDecoratorWindow window;
window.setScene(&scene);
- DuiSceneManager sceneManager(&scene);
- DuiHomeButtonPanel homeButtonPanel;
- DuiEscapeButtonPanel escapeButtonPanel;
+ MSceneManager sceneManager(&scene);
+ MHomeButtonPanel homeButtonPanel;
+ MEscapeButtonPanel escapeButtonPanel;
QObject::connect(&homeButtonPanel, SIGNAL(buttonClicked()), &window,
SIGNAL(homeClicked()));
QObject::connect(&escapeButtonPanel, SIGNAL(buttonClicked()), &window,
SIGNAL(escapeClicked()));
- DuiNavigationBar navigationBar;
+ MNavigationBar navigationBar;
QObject::connect(&window, SIGNAL(windowTitleChanged(const QString&)), &navigationBar,
SLOT(setViewMenuDescription(const QString&)));
diff --git a/decorators/duidecorator/duidecorator.pro b/decorators/mdecorator/mdecorator.pro
index d179ed4..2d9b01a 100644
--- a/decorators/duidecorator/duidecorator.pro
+++ b/decorators/mdecorator/mdecorator.pro
@@ -1,14 +1,14 @@
-include(../../duiconfig.pri)
+include(../../meegotouch_config.pri)
TEMPLATE = app
DEPENDPATH += .
INCLUDEPATH += . ../libdecorator
-CONFIG += dui release
+CONFIG += meegotouch release
QT += opengl
LIBS += ../libdecorator/libdecorator.so
-SOURCES += main.cpp duidecoratorwindow.cpp
-HEADERS += duidecoratorwindow.h
+SOURCES += main.cpp mdecoratorwindow.cpp
+HEADERS += mdecoratorwindow.h
QMAKE_EXTRA_TARGETS += check
check.depends = $$TARGET
diff --git a/decorators/duidecorator/duidecoratorwindow.cpp b/decorators/mdecorator/mdecoratorwindow.cpp
index 55f053e..bb5534b 100644
--- a/decorators/duidecorator/duidecoratorwindow.cpp
+++ b/decorators/mdecorator/mdecoratorwindow.cpp
@@ -19,15 +19,15 @@
#include <QtDebug>
-#include <DuiSceneManager>
-#include <DuiScene>
+#include <MSceneManager>
+#include <MScene>
#include <QCoreApplication>
#include <QX11Info>
#include <QGLFormat>
#include <QGLWidget>
-#include "duidecoratorwindow.h"
+#include "mdecoratorwindow.h"
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -40,21 +40,21 @@
#include <X11/extensions/shape.h>
#endif
-#include <duiabstractdecorator.h>
+#include <mabstractdecorator.h>
-class DuiDecorator: public DuiAbstractDecorator
+class MDecorator: public MAbstractDecorator
{
Q_OBJECT
public:
- DuiDecorator(DuiDecoratorWindow *p)
- : DuiAbstractDecorator(p)
+ MDecorator(MDecoratorWindow *p)
+ : MAbstractDecorator(p)
{
connect(this, SIGNAL(windowTitleChanged(const QString&)),
p, SIGNAL(windowTitleChanged(const QString&)));
}
- ~DuiDecorator() {
+ ~MDecorator() {
}
protected:
@@ -81,31 +81,31 @@ signals:
void windowTitleChanged(const QString&);
};
-DuiDecoratorWindow::DuiDecoratorWindow(QWidget *parent)
- : DuiWindow(parent)
+MDecoratorWindow::MDecoratorWindow(QWidget *parent)
+ : MWindow(parent)
{
setTranslucentBackground(true);
// We do not rotate (change orientation) at all.
- setOrientationAngle(Dui::Angle0);
+ setOrientationAngle(M::Angle0);
setOrientationAngleLocked(true);
- DuiDecorator *d = new DuiDecorator(this);
+ MDecorator *d = new MDecorator(this);
connect(this, SIGNAL(homeClicked()), d, SLOT(minimize()));
connect(this, SIGNAL(escapeClicked()), d, SLOT(close()));
}
-DuiDecoratorWindow::~DuiDecoratorWindow()
+MDecoratorWindow::~MDecoratorWindow()
{
}
-void DuiDecoratorWindow::init(DuiSceneManager &sceneManager)
+void MDecoratorWindow::init(MSceneManager &sceneManager)
{
setFocusPolicy(Qt::NoFocus);
setSceneSize(sceneManager);
- setDuiDecoratorWindowProperty();
+ setMDecoratorWindowProperty();
}
-void DuiDecoratorWindow::setInputRegion(const QRegion &region)
+void MDecoratorWindow::setInputRegion(const QRegion &region)
{
Display *dpy = QX11Info::display();
@@ -137,7 +137,7 @@ void DuiDecoratorWindow::setInputRegion(const QRegion &region)
}
}
-void DuiDecoratorWindow::fillXRectangle(XRectangle *xRect, const QRect &rect) const
+void MDecoratorWindow::fillXRectangle(XRectangle *xRect, const QRect &rect) const
{
xRect->x = rect.x();
xRect->y = rect.y();
@@ -145,7 +145,7 @@ void DuiDecoratorWindow::fillXRectangle(XRectangle *xRect, const QRect &rect) co
xRect->height = rect.height();
}
-void DuiDecoratorWindow::setSceneSize(DuiSceneManager &sceneManager)
+void MDecoratorWindow::setSceneSize(MSceneManager &sceneManager)
{
QSize sceneSize = sceneManager.visibleSceneSize();
scene()->setSceneRect(0, 0, sceneSize.width(), sceneSize.height());
@@ -153,16 +153,16 @@ void DuiDecoratorWindow::setSceneSize(DuiSceneManager &sceneManager)
setMaximumSize(sceneSize.width(), sceneSize.height());
}
-void DuiDecoratorWindow::setDuiDecoratorWindowProperty()
+void MDecoratorWindow::setMDecoratorWindowProperty()
{
long on = 1;
XChangeProperty(QX11Info::display(), winId(),
- XInternAtom(QX11Info::display(), "_DUI_DECORATOR_WINDOW", False),
+ XInternAtom(QX11Info::display(), "_MEEGOTOUCH_DECORATOR_WINDOW", False),
XA_CARDINAL,
32, PropModeReplace,
(unsigned char *) &on, 1);
}
-#include "duidecoratorwindow.moc"
+#include "mdecoratorwindow.moc"
diff --git a/decorators/duidecorator/duidecoratorwindow.h b/decorators/mdecorator/mdecoratorwindow.h
index 12bbb27..3d8f288 100644
--- a/decorators/duidecorator/duidecoratorwindow.h
+++ b/decorators/mdecorator/mdecoratorwindow.h
@@ -16,10 +16,10 @@
** of this file.
**
****************************************************************************/
-#ifndef DUIDECORATORWINDOW_H
-#define DUIDECORATORWINDOW_H
+#ifndef MDECORATORWINDOW_H
+#define MDECORATORWINDOW_H
-#include <DuiWindow>
+#include <MWindow>
#include <X11/Xlib.h>
#ifdef HAVE_SHAPECONST
@@ -30,17 +30,17 @@
#include <QObject>
-class DuiSceneManager;
+class MSceneManager;
-class DuiDecoratorWindow : public DuiWindow
+class MDecoratorWindow : public MWindow
{
Q_OBJECT
public:
- explicit DuiDecoratorWindow(QWidget *parent = 0);
- virtual ~DuiDecoratorWindow();
+ explicit MDecoratorWindow(QWidget *parent = 0);
+ virtual ~MDecoratorWindow();
- void init(DuiSceneManager &sceneManager);
+ void init(MSceneManager &sceneManager);
/*!
* \brief Sets the region of the window that can receive input events.
@@ -58,10 +58,10 @@ signals:
private:
void fillXRectangle(XRectangle *xRect, const QRect &rect) const;
- void setSceneSize(DuiSceneManager &sceneManager);
- void setDuiDecoratorWindowProperty();
+ void setSceneSize(MSceneManager &sceneManager);
+ void setMDecoratorWindowProperty();
- Q_DISABLE_COPY(DuiDecoratorWindow);
+ Q_DISABLE_COPY(MDecoratorWindow);
};
#endif
diff --git a/duicompositor.pro b/mcompositor.pro
index 129c089..129c089 100644
--- a/duicompositor.pro
+++ b/mcompositor.pro
diff --git a/duiconfig.pri b/meegotouch_config.pri
index fc84955..eb72b70 100644
--- a/duiconfig.pri
+++ b/meegotouch_config.pri
@@ -1,8 +1,8 @@
# Load more defines from the dui_defines...
-load(dui_defines)
+load(meegotouch_defines)
# Add global libdui includes
-INCLUDEPATH += $$DUI_INSTALL_HEADERS
+INCLUDEPATH += $$M_INSTALL_HEADERS
# Check for testability features, should they be compiled in or not ?
diff --git a/src/main.cpp b/src/main.cpp
index 3f8c2b7..62bc54b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -19,19 +19,22 @@
#include <QtGui>
#include <QGLWidget>
-#include "duicompositescene.h"
-#include "duicompositemanager.h"
+#include "mcompositescene.h"
+#include "mcompositemanager.h"
int main(int argc, char *argv[])
{
// Don't load any Qt plugins
QCoreApplication::setLibraryPaths(QStringList());
- DuiCompositeManager app(argc, argv);
+ MCompositeManager app(argc, argv);
QGraphicsScene *scene = app.scene();
QGraphicsView view(scene);
+ // TODO: Which property is valid now?
view.setProperty("NoDuiStyle", true);
+ view.setProperty("NoMStyle", true);
+
view.setUpdatesEnabled(false);
view.setAutoFillBackground(false);
view.setBackgroundBrush(Qt::NoBrush);
diff --git a/src/duicompositemanager.cpp b/src/mcompositemanager.cpp
index 285998e..1bd6649 100644
--- a/src/duicompositemanager.cpp
+++ b/src/mcompositemanager.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -17,14 +17,14 @@
**
****************************************************************************/
-#include "duitexturepixmapitem.h"
-#include "duitexturepixmapitem_p.h"
-#include "duicompositemanager.h"
-#include "duicompositemanager_p.h"
-#include "duicompositescene.h"
-#include "duisimplewindowframe.h"
-#include "duidecoratorframe.h"
-#include <duirmiserver.h>
+#include "mtexturepixmapitem.h"
+#include "mtexturepixmapitem_p.h"
+#include "mcompositemanager.h"
+#include "mcompositemanager_p.h"
+#include "mcompositescene.h"
+#include "msimplewindowframe.h"
+#include "mdecoratorframe.h"
+#include <mrmiserver.h>
#include <QX11Info>
#include <QByteArray>
@@ -59,9 +59,9 @@
*/
// own log for catching bugs
-#define _log(txt, args... ) { FILE *out; out = fopen("/tmp/duicompositor.log", "a"); if(out) { fprintf(out, "" txt, ##args ); fclose(out); } }
+#define _log(txt, args... ) { FILE *out; out = fopen("/tmp/mcompositor.log", "a"); if(out) { fprintf(out, "" txt, ##args ); fclose(out); } }
-class DuiCompAtoms
+class MCompAtoms
{
public:
@@ -119,7 +119,7 @@ public:
WM_CHANGE_STATE,
// DUI-specific
- _DUI_DECORATOR_WINDOW,
+ _MEEGOTOUCH_DECORATOR_WINDOW,
_DUI_STATUSBAR_OVERLAY,
_DUI_GLOBAL_ALPHA,
@@ -134,7 +134,7 @@ public:
ATOMS_TOTAL
};
- static DuiCompAtoms *instance();
+ static MCompAtoms *instance();
Type windowType(Window w);
bool isDecorator(Window w);
bool statusBarOverlayed(Window w);
@@ -153,8 +153,8 @@ public:
static Atom atoms[ATOMS_TOTAL];
private:
- explicit DuiCompAtoms();
- static DuiCompAtoms *d;
+ explicit MCompAtoms();
+ static MCompAtoms *d;
int intValueProperty(Window w, Atom property);
Atom getAtom(Window w, Atoms atomtype);
@@ -162,24 +162,24 @@ private:
Display *dpy;
};
-#define ATOM(t) DuiCompAtoms::instance()->getAtom(DuiCompAtoms::t)
-Atom DuiCompAtoms::atoms[DuiCompAtoms::ATOMS_TOTAL];
-Window DuiCompositeManagerPrivate::stack[TOTAL_LAYERS];
-DuiCompAtoms *DuiCompAtoms::d = 0;
+#define ATOM(t) MCompAtoms::instance()->getAtom(MCompAtoms::t)
+Atom MCompAtoms::atoms[MCompAtoms::ATOMS_TOTAL];
+Window MCompositeManagerPrivate::stack[TOTAL_LAYERS];
+MCompAtoms *MCompAtoms::d = 0;
static bool hasDock = false;
static QRect availScreenRect = QRect();
// temporary launch indicator. will get replaced later
static QGraphicsTextItem *launchIndicator = 0;
-DuiCompAtoms *DuiCompAtoms::instance()
+MCompAtoms *MCompAtoms::instance()
{
if (!d)
- d = new DuiCompAtoms();
+ d = new MCompAtoms();
return d;
}
-DuiCompAtoms::DuiCompAtoms()
+MCompAtoms::MCompAtoms()
{
const char *atom_names[] = {
"WM_PROTOCOLS",
@@ -220,7 +220,7 @@ DuiCompAtoms::DuiCompAtoms()
"_NET_CLIENT_LIST_STACKING",
"WM_CHANGE_STATE",
- "_DUI_DECORATOR_WINDOW",
+ "_MEEGOTOUCH_DECORATOR_WINDOW",
// TODO: remove this when statusbar in-scene approach is done
"_DUI_STATUSBAR_OVERLAY",
"_DUI_GLOBAL_ALPHA",
@@ -253,7 +253,7 @@ static bool is_desktop_window(Window w, Atom type = 0)
{
Atom a;
if (!type)
- a = DuiCompAtoms::instance()->getType(w);
+ a = MCompAtoms::instance()->getType(w);
else
a = type;
if (a == ATOM(_NET_WM_WINDOW_TYPE_DESKTOP))
@@ -273,7 +273,7 @@ static bool is_desktop_dock(Window w, Atom type = 0)
{
Atom a;
if (!type)
- a = DuiCompAtoms::instance()->getType(w);
+ a = MCompAtoms::instance()->getType(w);
else
a = type;
if (a != ATOM(_NET_WM_WINDOW_TYPE_DOCK))
@@ -289,7 +289,7 @@ static bool is_desktop_dock(Window w, Atom type = 0)
return true;
}
-DuiCompAtoms::Type DuiCompAtoms::windowType(Window w)
+MCompAtoms::Type MCompAtoms::windowType(Window w)
{
// freedesktop.org window type
Atom a = getType(w);
@@ -311,28 +311,28 @@ DuiCompAtoms::Type DuiCompAtoms::windowType(Window w)
return UNKNOWN;
}
-bool DuiCompAtoms::isDecorator(Window w)
+bool MCompAtoms::isDecorator(Window w)
{
- return (intValueProperty(w, atoms[_DUI_DECORATOR_WINDOW]) == 1);
+ return (intValueProperty(w, atoms[_MEEGOTOUCH_DECORATOR_WINDOW]) == 1);
}
// Remove this when statusbar in-scene approach is done
-bool DuiCompAtoms::statusBarOverlayed(Window w)
+bool MCompAtoms::statusBarOverlayed(Window w)
{
return (intValueProperty(w, atoms[_DUI_STATUSBAR_OVERLAY]) == 1);
}
-int DuiCompAtoms::getPid(Window w)
+int MCompAtoms::getPid(Window w)
{
return intValueProperty(w, atoms[_NET_WM_PID]);
}
-Atom DuiCompAtoms::getState(Window w)
+Atom MCompAtoms::getState(Window w)
{
return getAtom(w, _NET_WM_STATE);
}
-QRectF DuiCompAtoms::iconGeometry(Window w)
+QRectF MCompAtoms::iconGeometry(Window w)
{
Atom actual;
int format;
@@ -351,7 +351,7 @@ QRectF DuiCompAtoms::iconGeometry(Window w)
return QRectF(); // empty
}
-QVector<Atom> DuiCompAtoms::netWmStates(Window w)
+QVector<Atom> MCompAtoms::netWmStates(Window w)
{
QVector<Atom> ret;
@@ -382,7 +382,7 @@ QVector<Atom> DuiCompAtoms::netWmStates(Window w)
return ret;
}
-long DuiCompAtoms::getWmState(Window w)
+long MCompAtoms::getWmState(Window w)
{
Atom actual;
int format;
@@ -401,7 +401,7 @@ long DuiCompAtoms::getWmState(Window w)
return state;
}
-unsigned int DuiCompAtoms::get_opacity_prop(Display *dpy, Window w, unsigned int def)
+unsigned int MCompAtoms::get_opacity_prop(Display *dpy, Window w, unsigned int def)
{
Q_UNUSED(dpy);
Atom actual;
@@ -421,14 +421,14 @@ unsigned int DuiCompAtoms::get_opacity_prop(Display *dpy, Window w, unsigned int
return def;
}
-double DuiCompAtoms::get_opacity_percent(Display *dpy, Window w, double def)
+double MCompAtoms::get_opacity_percent(Display *dpy, Window w, double def)
{
unsigned int opacity = get_opacity_prop(dpy, w,
(unsigned int)(OPAQUE * def));
return opacity * 1.0 / OPAQUE;
}
-int DuiCompAtoms::globalAlphaFromWindow(Window w)
+int MCompAtoms::globalAlphaFromWindow(Window w)
{
Atom actual;
int format;
@@ -449,12 +449,12 @@ int DuiCompAtoms::globalAlphaFromWindow(Window w)
return 255;
}
-Atom DuiCompAtoms::getAtom(const unsigned int name)
+Atom MCompAtoms::getAtom(const unsigned int name)
{
return atoms[name];
}
-int DuiCompAtoms::intValueProperty(Window w, Atom property)
+int MCompAtoms::intValueProperty(Window w, Atom property)
{
Atom actual;
int format;
@@ -473,7 +473,7 @@ int DuiCompAtoms::intValueProperty(Window w, Atom property)
return 0;
}
-Atom DuiCompAtoms::getType(Window w)
+Atom MCompAtoms::getType(Window w)
{
Atom t = getAtom(w, _NET_WM_WINDOW_TYPE);
if (t)
@@ -481,7 +481,7 @@ Atom DuiCompAtoms::getType(Window w)
return atoms[_NET_WM_WINDOW_TYPE_NORMAL];
}
-Atom DuiCompAtoms::getAtom(Window w, Atoms atomtype)
+Atom MCompAtoms::getAtom(Window w, Atoms atomtype)
{
Atom actual;
int format;
@@ -510,7 +510,7 @@ static Window transient_for(Window window)
static void skiptaskbar_wm_state(int toggle, Window window)
{
Atom skip = ATOM(_NET_WM_STATE_SKIP_TASKBAR);
- DuiCompAtoms *atom = DuiCompAtoms::instance();
+ MCompAtoms *atom = MCompAtoms::instance();
QVector<Atom> states = atom->netWmStates(window);
bool update_root = false;
@@ -553,7 +553,7 @@ static void skiptaskbar_wm_state(int toggle, Window window)
static bool need_geometry_modify(Window window)
{
- DuiCompAtoms *atom = DuiCompAtoms::instance();
+ MCompAtoms *atom = MCompAtoms::instance();
if ((atom->getState(window) == ATOM(_NET_WM_STATE_FULLSCREEN)) ||
(atom->statusBarOverlayed(window)))
@@ -562,12 +562,12 @@ static bool need_geometry_modify(Window window)
return true;
}
-static void fullscreen_wm_state(DuiCompositeManagerPrivate *priv,
+static void fullscreen_wm_state(MCompositeManagerPrivate *priv,
int toggle, Window window)
{
Atom fullscreen = ATOM(_NET_WM_STATE_FULLSCREEN);
Display *dpy = QX11Info::display();
- DuiCompAtoms *atom = DuiCompAtoms::instance();
+ MCompAtoms *atom = MCompAtoms::instance();
QVector<Atom> states = atom->netWmStates(window);
int i = states.indexOf(fullscreen);
@@ -580,7 +580,7 @@ static void fullscreen_wm_state(DuiCompositeManagerPrivate *priv,
(unsigned char *) states.data(), states.size());
}
- DuiCompositeWindow *win = DuiCompositeWindow::compositeWindow(window);
+ MCompositeWindow *win = MCompositeWindow::compositeWindow(window);
if (win && need_geometry_modify(window) && !availScreenRect.isEmpty()) {
QRect r = availScreenRect;
XMoveResizeWindow(dpy, window, r.x(), r.y(), r.width(), r.height());
@@ -640,7 +640,7 @@ static void set_global_alpha(unsigned int plane, unsigned int level)
}
#endif
-DuiCompositeManagerPrivate::DuiCompositeManagerPrivate(QObject *p)
+MCompositeManagerPrivate::MCompositeManagerPrivate(QObject *p)
: QObject(p),
glwidget(0),
damage_cache(0),
@@ -648,8 +648,8 @@ DuiCompositeManagerPrivate::DuiCompositeManagerPrivate(QObject *p)
compositing(true),
display_off(false)
{
- watch = new DuiCompositeScene(this);
- atom = DuiCompAtoms::instance();
+ watch = new MCompositeScene(this);
+ atom = MCompAtoms::instance();
#ifdef GLES2_VERSION
systembus_conn = new QDBusConnection(QDBusConnection::systemBus());
@@ -675,7 +675,7 @@ DuiCompositeManagerPrivate::DuiCompositeManagerPrivate(QObject *p)
#endif
}
-DuiCompositeManagerPrivate::~DuiCompositeManagerPrivate()
+MCompositeManagerPrivate::~MCompositeManagerPrivate()
{
delete watch;
delete atom;
@@ -683,7 +683,7 @@ DuiCompositeManagerPrivate::~DuiCompositeManagerPrivate()
atom = 0;
}
-Window DuiCompositeManagerPrivate::parentWindow(Window child)
+Window MCompositeManagerPrivate::parentWindow(Window child)
{
uint children = 0;
Window r, p, *kids = 0;
@@ -694,13 +694,13 @@ Window DuiCompositeManagerPrivate::parentWindow(Window child)
return p;
}
-void DuiCompositeManagerPrivate::disableInput()
+void MCompositeManagerPrivate::disableInput()
{
watch->setupOverlay(xoverlay, QRect(0, 0, 0, 0), true);
watch->setupOverlay(localwin, QRect(0, 0, 0, 0), true);
}
-void DuiCompositeManagerPrivate::enableInput()
+void MCompositeManagerPrivate::enableInput()
{
watch->setupOverlay(xoverlay, QRect(0, 0, 0, 0));
watch->setupOverlay(localwin, QRect(0, 0, 0, 0));
@@ -708,11 +708,11 @@ void DuiCompositeManagerPrivate::enableInput()
emit inputEnabled();
}
-void DuiCompositeManagerPrivate::prepare()
+void MCompositeManagerPrivate::prepare()
{
watch->prepareRoot();
Window w;
- QString wm_name = "DuiCompositor";
+ QString wm_name = "MCompositor";
w = XCreateSimpleWindow(QX11Info::display(),
RootWindow(QX11Info::display(), 0),
@@ -729,8 +729,8 @@ void DuiCompositeManagerPrivate::prepare()
wm_name.size());
- Xutf8SetWMProperties(QX11Info::display(), w, "DuiCompositor",
- "DuiCompositor", NULL, 0, NULL, NULL,
+ Xutf8SetWMProperties(QX11Info::display(), w, "MCompositor",
+ "MCompositor", NULL, 0, NULL, NULL,
NULL);
Atom a = XInternAtom(QX11Info::display(), "_NET_WM_CM_S0", False);
XSetSelectionOwner(QX11Info::display(), a, w, 0);
@@ -743,18 +743,18 @@ void DuiCompositeManagerPrivate::prepare()
XDamageQueryExtension(QX11Info::display(), &damage_event, &damage_error);
}
-bool DuiCompositeManagerPrivate::needDecoration(Window window)
+bool MCompositeManagerPrivate::needDecoration(Window window)
{
- DuiCompAtoms::Type t = atom->windowType(window);
- return (t != DuiCompAtoms::FRAMELESS
- && t != DuiCompAtoms::DESKTOP
- && t != DuiCompAtoms::NOTIFICATION
- && t != DuiCompAtoms::INPUT
- && t != DuiCompAtoms::DOCK
+ MCompAtoms::Type t = atom->windowType(window);
+ return (t != MCompAtoms::FRAMELESS
+ && t != MCompAtoms::DESKTOP
+ && t != MCompAtoms::NOTIFICATION
+ && t != MCompAtoms::INPUT
+ && t != MCompAtoms::DOCK
&& !transient_for(window));
}
-void DuiCompositeManagerPrivate::damageEvent(XDamageNotifyEvent *e)
+void MCompositeManagerPrivate::damageEvent(XDamageNotifyEvent *e)
{
if (display_off)
return;
@@ -773,7 +773,7 @@ void DuiCompositeManagerPrivate::damageEvent(XDamageNotifyEvent *e)
}
return;
}
- DuiCompositeWindow *item = texturePixmapItem(e->drawable);
+ MCompositeWindow *item = texturePixmapItem(e->drawable);
damage_cache = item;
if (item)
item->updateWindowPixmap(rects, num);
@@ -782,10 +782,10 @@ void DuiCompositeManagerPrivate::damageEvent(XDamageNotifyEvent *e)
XFree(rects);
}
-void DuiCompositeManagerPrivate::destroyEvent(XDestroyWindowEvent *e)
+void MCompositeManagerPrivate::destroyEvent(XDestroyWindowEvent *e)
{
bool already_unredirected = false;
- DuiCompositeWindow *item = texturePixmapItem(e->window);
+ MCompositeWindow *item = texturePixmapItem(e->window);
if (item) {
if (item->isDirectRendered())
already_unredirected = true;
@@ -820,7 +820,7 @@ void DuiCompositeManagerPrivate::destroyEvent(XDestroyWindowEvent *e)
This doesn't really do anything for now. It will be used to get
the NETWM hints in the future like window opacity and stuff
*/
-void DuiCompositeManagerPrivate::propertyEvent(XPropertyEvent *e)
+void MCompositeManagerPrivate::propertyEvent(XPropertyEvent *e)
{
Q_UNUSED(e);
/*
@@ -830,7 +830,7 @@ void DuiCompositeManagerPrivate::propertyEvent(XPropertyEvent *e)
*/
}
-Window DuiCompositeManagerPrivate::getLastVisibleParent(DuiCompositeWindow *cw)
+Window MCompositeManagerPrivate::getLastVisibleParent(MCompositeWindow *cw)
{
Window last = 0, parent;
while (cw && (parent = cw->transientFor())) {
@@ -843,7 +843,7 @@ Window DuiCompositeManagerPrivate::getLastVisibleParent(DuiCompositeWindow *cw)
return last;
}
-bool DuiCompositeManagerPrivate::isAppWindow(DuiCompositeWindow *cw)
+bool MCompositeManagerPrivate::isAppWindow(MCompositeWindow *cw)
{
if (cw && !getLastVisibleParent(cw) &&
(cw->windowTypeAtom() == ATOM(_NET_WM_WINDOW_TYPE_NORMAL) ||
@@ -853,7 +853,7 @@ bool DuiCompositeManagerPrivate::isAppWindow(DuiCompositeWindow *cw)
return false;
}
-Window DuiCompositeManagerPrivate::getTopmostApp(int *index_in_stacking_list)
+Window MCompositeManagerPrivate::getTopmostApp(int *index_in_stacking_list)
{
Window topmost_app = 0;
for (int i = stacking_list.size() - 1; i >= 0; --i) {
@@ -861,7 +861,7 @@ Window DuiCompositeManagerPrivate::getTopmostApp(int *index_in_stacking_list)
if (w == stack[DESKTOP_LAYER])
/* desktop is above all applications */
break;
- DuiCompositeWindow *cw = windows.value(w);
+ MCompositeWindow *cw = windows.value(w);
if (cw && cw->isMapped() && isAppWindow(cw)) {
topmost_app = w;
if (index_in_stacking_list)
@@ -874,12 +874,12 @@ Window DuiCompositeManagerPrivate::getTopmostApp(int *index_in_stacking_list)
// TODO: merge this with disableCompositing() so that in the end we have
// stacking order sensitive logic
-bool DuiCompositeManagerPrivate::possiblyUnredirectTopmostWindow()
+bool MCompositeManagerPrivate::possiblyUnredirectTopmostWindow()
{
bool ret = false;
Window top = 0;
int win_i = -1;
- DuiCompositeWindow *cw = 0;
+ MCompositeWindow *cw = 0;
for (int i = stacking_list.size() - 1; i >= 0; --i) {
Window w = stacking_list.at(i);
if (!(cw = windows.value(w)))
@@ -901,7 +901,7 @@ bool DuiCompositeManagerPrivate::possiblyUnredirectTopmostWindow()
}
if (top && cw) {
// unredirect the chosen window and any docks above it
- ((DuiTexturePixmapItem *)cw)->enableDirectFbRendering();
+ ((MTexturePixmapItem *)cw)->enableDirectFbRendering();
setWindowDebugProperties(top);
// make sure unobscured event is sent when compositing again
cw->setWindowObscured(true, true);
@@ -909,7 +909,7 @@ bool DuiCompositeManagerPrivate::possiblyUnredirectTopmostWindow()
Window w = stacking_list.at(i);
if ((cw = windows.value(w)) && cw->isMapped() &&
cw->windowTypeAtom() == ATOM(_NET_WM_WINDOW_TYPE_DOCK)) {
- ((DuiTexturePixmapItem *)cw)->enableDirectFbRendering();
+ ((MTexturePixmapItem *)cw)->enableDirectFbRendering();
setWindowDebugProperties(w);
cw->setWindowObscured(true, true);
}
@@ -924,7 +924,7 @@ bool DuiCompositeManagerPrivate::possiblyUnredirectTopmostWindow()
return ret;
}
-void DuiCompositeManagerPrivate::unmapEvent(XUnmapEvent *e)
+void MCompositeManagerPrivate::unmapEvent(XUnmapEvent *e)
{
if (e->window == xoverlay)
return;
@@ -932,7 +932,7 @@ void DuiCompositeManagerPrivate::unmapEvent(XUnmapEvent *e)
Window topmost_win = 0;
for (int i = stacking_list.size() - 1; i >= 0; --i) {
Window w = stacking_list.at(i);
- DuiCompositeWindow *cw = windows.value(w);
+ MCompositeWindow *cw = windows.value(w);
if (cw && cw->isMapped() && !cw->isDecorator() &&
cw->windowTypeAtom() != ATOM(_NET_WM_WINDOW_TYPE_DOCK)) {
topmost_win = w;
@@ -940,7 +940,7 @@ void DuiCompositeManagerPrivate::unmapEvent(XUnmapEvent *e)
}
}
- DuiCompositeWindow *item = texturePixmapItem(e->window);
+ MCompositeWindow *item = texturePixmapItem(e->window);
if (item) {
item->setIsMapped(false);
setWindowState(e->window, IconicState);
@@ -949,8 +949,8 @@ void DuiCompositeManagerPrivate::unmapEvent(XUnmapEvent *e)
item->clearTexture();
glwidget->update();
}
- if (DuiDecoratorFrame::instance()->managedWindow() == e->window)
- DuiDecoratorFrame::instance()->lower();
+ if (MDecoratorFrame::instance()->managedWindow() == e->window)
+ MDecoratorFrame::instance()->lower();
} else {
// We got an unmap event from a framed window
FrameData fd = framed_windows.value(e->window);
@@ -982,7 +982,7 @@ void DuiCompositeManagerPrivate::unmapEvent(XUnmapEvent *e)
// moved below home in stacking_list at this point. Needs to be fixed
// so that the chained window case does not break.
for (int i = stacking_list.indexOf(e->window) - 1; i >= 0; --i) {
- DuiCompositeWindow *cw = windows.value(stacking_list.at(i));
+ MCompositeWindow *cw = windows.value(stacking_list.at(i));
if (cw && cw->isMapped()) {
/* either lower window of the application (in chained window
* case), or duihome is activated */
@@ -993,12 +993,12 @@ void DuiCompositeManagerPrivate::unmapEvent(XUnmapEvent *e)
}
}
-void DuiCompositeManagerPrivate::configureEvent(XConfigureEvent *e)
+void MCompositeManagerPrivate::configureEvent(XConfigureEvent *e)
{
if (e->window == xoverlay)
return;
- DuiCompositeWindow *item = texturePixmapItem(e->window);
+ MCompositeWindow *item = texturePixmapItem(e->window);
if (item) {
item->setPos(e->x, e->y);
item->resize(e->width, e->height);
@@ -1010,22 +1010,22 @@ void DuiCompositeManagerPrivate::configureEvent(XConfigureEvent *e)
/* FIXME: this is flawed because it assumes the window is on top,
* which will break when we have one decorated window
* on top of this window */
- if (item->needDecoration() && DuiDecoratorFrame::instance()->decoratorItem()) {
- DuiDecoratorFrame::instance()->setManagedWindow(e->window);
- DuiDecoratorFrame::instance()->decoratorItem()->setVisible(true);
- DuiDecoratorFrame::instance()->raise();
- DuiDecoratorFrame::instance()->decoratorItem()->setZValue(item->zValue() + 1);
+ if (item->needDecoration() && MDecoratorFrame::instance()->decoratorItem()) {
+ MDecoratorFrame::instance()->setManagedWindow(e->window);
+ MDecoratorFrame::instance()->decoratorItem()->setVisible(true);
+ MDecoratorFrame::instance()->raise();
+ MDecoratorFrame::instance()->decoratorItem()->setZValue(item->zValue() + 1);
item->update();
}
} else {
// FIXME: seems that this branch is never executed?
- if (e->window == DuiDecoratorFrame::instance()->managedWindow())
- DuiDecoratorFrame::instance()->lower();
+ if (e->window == MDecoratorFrame::instance()->managedWindow())
+ MDecoratorFrame::instance()->lower();
item->setIconified(true);
// ensure ZValue is set only after the animation is done
item->requestZValue(0);
- DuiCompositeWindow *desktop = texturePixmapItem(stack[DESKTOP_LAYER]);
+ MCompositeWindow *desktop = texturePixmapItem(stack[DESKTOP_LAYER]);
if (desktop)
#if (QT_VERSION >= 0x040600)
item->stackBefore(desktop);
@@ -1034,13 +1034,13 @@ void DuiCompositeManagerPrivate::configureEvent(XConfigureEvent *e)
}
}
-void DuiCompositeManagerPrivate::configureRequestEvent(XConfigureRequestEvent *e)
+void MCompositeManagerPrivate::configureRequestEvent(XConfigureRequestEvent *e)
{
if (e->parent != RootWindow(QX11Info::display(), 0))
return;
- DuiCompAtoms::Type wtype = atom->windowType(e->window);
- bool isInput = (wtype == DuiCompAtoms::INPUT);
+ MCompAtoms::Type wtype = atom->windowType(e->window);
+ bool isInput = (wtype == MCompAtoms::INPUT);
// sandbox these windows. we own them
if (atom->isDecorator(e->window))
return;
@@ -1050,7 +1050,7 @@ void DuiCompositeManagerPrivate::configureRequestEvent(XConfigureRequestEvent *e
<< e->above << e->detail;*/
// dock changed
- if (hasDock && (wtype == DuiCompAtoms::DOCK)) {
+ if (hasDock && (wtype == MCompAtoms::DOCK)) {
dock_region = QRegion(e->x, e->y, e->width, e->height);
QRect r = (QRegion(QApplication::desktop()->screenGeometry()) - dock_region).boundingRect();
if (stack[DESKTOP_LAYER] && need_geometry_modify(stack[DESKTOP_LAYER]))
@@ -1082,20 +1082,20 @@ void DuiCompositeManagerPrivate::configureRequestEvent(XConfigureRequestEvent *e
qWarning("XGetWindowAttributes for 0x%lx failed", e->window);
return;
}
- if ((a.map_state == IsViewable) && (wtype != DuiCompAtoms::DOCK)) {
+ if ((a.map_state == IsViewable) && (wtype != MCompAtoms::DOCK)) {
setWindowState(e->window, NormalState);
setExposeDesktop(false);
stack[APPLICATION_LAYER] = e->window;
// selective compositing support
- DuiCompositeWindow *i = texturePixmapItem(e->window);
+ MCompositeWindow *i = texturePixmapItem(e->window);
if (i) {
// since we call disable compositing immediately
// we don't see the animated transition
if (!i->hasAlpha() && !i->needDecoration()) {
i->setIconified(false);
disableCompositing(FORCED);
- } else if (DuiDecoratorFrame::instance()->managedWindow() == e->window)
+ } else if (MDecoratorFrame::instance()->managedWindow() == e->window)
enableCompositing();
i->restore();
}
@@ -1147,7 +1147,7 @@ void DuiCompositeManagerPrivate::configureRequestEvent(XConfigureRequestEvent *e
XConfigureWindow(QX11Info::display(), e->window, value_mask, &wc);
}
-void DuiCompositeManagerPrivate::mapRequestEvent(XMapRequestEvent *e)
+void MCompositeManagerPrivate::mapRequestEvent(XMapRequestEvent *e)
{
XWindowAttributes a;
Display *dpy = QX11Info::display();
@@ -1156,17 +1156,17 @@ void DuiCompositeManagerPrivate::mapRequestEvent(XMapRequestEvent *e)
if (!XGetWindowAttributes(QX11Info::display(), e->window, &a))
return;
if (!hasDock) {
- hasDock = (atom->windowType(e->window) == DuiCompAtoms::DOCK);
+ hasDock = (atom->windowType(e->window) == MCompAtoms::DOCK);
if (hasDock)
dock_region = QRegion(a.x, a.y, a.width, a.height);
}
int xres = ScreenOfDisplay(dpy, DefaultScreen(dpy))->width;
int yres = ScreenOfDisplay(dpy, DefaultScreen(dpy))->height;
- if ((atom->windowType(e->window) == DuiCompAtoms::FRAMELESS
- || atom->windowType(e->window) == DuiCompAtoms::DESKTOP
- || atom->windowType(e->window) == DuiCompAtoms::INPUT)
- && (atom->windowType(e->window) != DuiCompAtoms::DOCK)) {
+ if ((atom->windowType(e->window) == MCompAtoms::FRAMELESS
+ || atom->windowType(e->window) == MCompAtoms::DESKTOP
+ || atom->windowType(e->window) == MCompAtoms::INPUT)
+ && (atom->windowType(e->window) != MCompAtoms::DOCK)) {
if (hasDock) {
QRect r = (QRegion(QApplication::desktop()->screenGeometry()) - dock_region).boundingRect();
if (availScreenRect != r)
@@ -1180,7 +1180,7 @@ void DuiCompositeManagerPrivate::mapRequestEvent(XMapRequestEvent *e)
if (atom->isDecorator(e->window)) {
enableCompositing();
- DuiDecoratorFrame::instance()->setDecoratorWindow(e->window);
+ MDecoratorFrame::instance()->setDecoratorWindow(e->window);
return;
}
@@ -1197,18 +1197,18 @@ void DuiCompositeManagerPrivate::mapRequestEvent(XMapRequestEvent *e)
PropertyChangeMask);
XAddToSaveSet(QX11Info::display(), e->window);
- if (DuiDecoratorFrame::instance()->decoratorItem()) {
+ if (MDecoratorFrame::instance()->decoratorItem()) {
enableCompositing();
XMapWindow(QX11Info::display(), e->window);
// initially visualize decorator item so selective compositing
// checks won't disable compositing
- DuiDecoratorFrame::instance()->decoratorItem()->setVisible(true);
+ MDecoratorFrame::instance()->decoratorItem()->setVisible(true);
} else {
- DuiSimpleWindowFrame *frame = 0;
+ MSimpleWindowFrame *frame = 0;
FrameData f = framed_windows.value(e->window);
frame = f.frame;
if (!frame) {
- frame = new DuiSimpleWindowFrame(e->window);
+ frame = new MSimpleWindowFrame(e->window);
Window trans;
XGetTransientForHint(QX11Info::display(), e->window, &trans);
if (trans)
@@ -1255,7 +1255,7 @@ void DuiCompositeManagerPrivate::mapRequestEvent(XMapRequestEvent *e)
/* recursion is needed to handle transients that are transient for other
* transients */
-static void raise_transients(DuiCompositeManagerPrivate *priv,
+static void raise_transients(MCompositeManagerPrivate *priv,
Window w, int last_i)
{
Window first_moved = 0;
@@ -1264,7 +1264,7 @@ static void raise_transients(DuiCompositeManagerPrivate *priv,
if (iw == first_moved)
/* each window is only considered once */
break;
- DuiCompositeWindow *cw = priv->windows.value(iw);
+ MCompositeWindow *cw = priv->windows.value(iw);
if (cw && cw->transientFor() == w) {
priv->stacking_list.move(i, last_i);
if (!first_moved) first_moved = iw;
@@ -1306,14 +1306,14 @@ static Time get_server_time()
#endif
/* NOTE: this assumes that stacking is correct */
-void DuiCompositeManagerPrivate::checkInputFocus(Time timestamp)
+void MCompositeManagerPrivate::checkInputFocus(Time timestamp)
{
Window w = None;
/* find topmost window wanting the input focus */
for (int i = stacking_list.size() - 1; i >= 0; --i) {
Window iw = stacking_list.at(i);
- DuiCompositeWindow *cw = windows.value(iw);
+ MCompositeWindow *cw = windows.value(iw);
if (!cw || !cw->isMapped() || !cw->wantsFocus())
continue;
/* workaround for NB#161629 */
@@ -1336,7 +1336,7 @@ void DuiCompositeManagerPrivate::checkInputFocus(Time timestamp)
prev_focus = w;
#if 0 // disabled due to bugs in applications (e.g. widgetsgallery)
- DuiCompositeWindow *cw = windows.value(w);
+ MCompositeWindow *cw = windows.value(w);
if (cw && cw->supportedProtocols().indexOf(ATOM(WM_TAKE_FOCUS)) != -1) {
/* CurrentTime for WM_TAKE_FOCUS brings trouble
* (a lesson learned from Fremantle) */
@@ -1362,7 +1362,7 @@ void DuiCompositeManagerPrivate::checkInputFocus(Time timestamp)
* If it isn't, reorder it and call XRestackWindows.
* NOTE: stacking_list needs to be reversed before giving it to
* XRestackWindows.*/
-void DuiCompositeManagerPrivate::checkStacking(bool force_visibility_check,
+void MCompositeManagerPrivate::checkStacking(bool force_visibility_check,
Time timestamp)
{
static QList<Window> prev_list;
@@ -1370,7 +1370,7 @@ void DuiCompositeManagerPrivate::checkStacking(bool force_visibility_check,
int last_i = stacking_list.size() - 1;
bool desktop_up = false;
int app_i = -1;
- DuiDecoratorFrame *deco = DuiDecoratorFrame::instance();
+ MDecoratorFrame *deco = MDecoratorFrame::instance();
active_app = getTopmostApp(&app_i);
if (!active_app || app_i < 0)
@@ -1385,7 +1385,7 @@ void DuiCompositeManagerPrivate::checkStacking(bool force_visibility_check,
app_i = stacking_list.indexOf(active_app);
}
/* raise application windows belonging to the same group */
- DuiCompositeWindow *cw = windows.value(active_app);
+ MCompositeWindow *cw = windows.value(active_app);
XID group;
if (cw && (group = cw->windowGroup())) {
for (int i = 0; i < app_i; ) {
@@ -1408,7 +1408,7 @@ void DuiCompositeManagerPrivate::checkStacking(bool force_visibility_check,
if (!compositing)
// decor requires compositing
enableCompositing(true);
- DuiCompositeWindow *cw = windows.value(deco_w);
+ MCompositeWindow *cw = windows.value(deco_w);
cw->updateWindowPixmap();
cw->setVisible(true);
}
@@ -1428,7 +1428,7 @@ void DuiCompositeManagerPrivate::checkStacking(bool force_visibility_check,
for (int i = 0; i < last_i;) {
Window w = stacking_list.at(i);
if (w == first_moved) break;
- DuiCompositeWindow *cw = windows.value(w);
+ MCompositeWindow *cw = windows.value(w);
if (cw && cw->windowTypeAtom() == ATOM(_NET_WM_WINDOW_TYPE_DOCK)) {
stacking_list.move(i, last_i);
if (!first_moved) first_moved = w;
@@ -1456,7 +1456,7 @@ void DuiCompositeManagerPrivate::checkStacking(bool force_visibility_check,
/* TODO: transients */
Window w = stacking_list.at(i);
if (w == first_moved) break;
- DuiCompositeWindow *cw = windows.value(w);
+ MCompositeWindow *cw = windows.value(w);
if (cw && !cw->transientFor()
&& cw->windowTypeAtom() == ATOM(_NET_WM_WINDOW_TYPE_DIALOG)) {
stacking_list.move(i, last_i);
@@ -1470,7 +1470,7 @@ void DuiCompositeManagerPrivate::checkStacking(bool force_visibility_check,
/* TODO: transients */
Window w = stacking_list.at(i);
if (w == first_moved) break;
- DuiCompositeWindow *cw = windows.value(w);
+ MCompositeWindow *cw = windows.value(w);
if (cw && cw->isDecorator()) {
++i;
continue;
@@ -1487,7 +1487,7 @@ void DuiCompositeManagerPrivate::checkStacking(bool force_visibility_check,
for (int i = 0; i < last_i;) {
Window w = stacking_list.at(i);
if (w == first_moved) break;
- DuiCompositeWindow *cw = windows.value(w);
+ MCompositeWindow *cw = windows.value(w);
if (cw && !cw->transientFor() &&
cw->windowTypeAtom() == ATOM(_NET_WM_WINDOW_TYPE_NOTIFICATION)) {
stacking_list.move(i, last_i);
@@ -1499,7 +1499,7 @@ void DuiCompositeManagerPrivate::checkStacking(bool force_visibility_check,
if (order_changed) {
/* fix Z-values */
for (int i = 0; i <= last_i; ++i) {
- DuiCompositeWindow *witem = windows.value(stacking_list.at(i));
+ MCompositeWindow *witem = windows.value(stacking_list.at(i));
if (witem)
witem->requestZValue(i);
}
@@ -1526,7 +1526,7 @@ void DuiCompositeManagerPrivate::checkStacking(bool force_visibility_check,
/* Send synthetic visibility events for composited windows */
int home_i = stacking_list.indexOf(duihome);
for (int i = 0; i <= last_i; ++i) {
- DuiCompositeWindow *cw = windows.value(stacking_list.at(i));
+ MCompositeWindow *cw = windows.value(stacking_list.at(i));
if (!cw || cw->isDirectRendered()) continue;
if (duihome && i > home_i) {
cw->setWindowObscured(false);
@@ -1545,7 +1545,7 @@ void DuiCompositeManagerPrivate::checkStacking(bool force_visibility_check,
}
}
-void DuiCompositeManagerPrivate::mapEvent(XMapEvent *e)
+void MCompositeManagerPrivate::mapEvent(XMapEvent *e)
{
Window win = e->window;
Window transient_for = 0;
@@ -1576,15 +1576,15 @@ void DuiCompositeManagerPrivate::mapEvent(XMapEvent *e)
}
// simple stacking model fulfills the current DUI concept,
- if (atom->windowType(e->window) == DuiCompAtoms::DESKTOP) {
+ if (atom->windowType(e->window) == MCompAtoms::DESKTOP) {
stack[DESKTOP_LAYER] = e->window; // below topmost
- } else if (atom->windowType(e->window) == DuiCompAtoms::INPUT) {
+ } else if (atom->windowType(e->window) == MCompAtoms::INPUT) {
stack[INPUT_LAYER] = e->window; // topmost
- } else if (atom->windowType(e->window) == DuiCompAtoms::DOCK) {
+ } else if (atom->windowType(e->window) == MCompAtoms::DOCK) {
stack[DOCK_LAYER] = e->window; // topmost
} else {
- if ((atom->windowType(e->window) == DuiCompAtoms::FRAMELESS ||
- (atom->windowType(e->window) == DuiCompAtoms::NORMAL))
+ if ((atom->windowType(e->window) == MCompAtoms::FRAMELESS ||
+ (atom->windowType(e->window) == MCompAtoms::NORMAL))
&& !atom->isDecorator(e->window)
&& (parentWindow(win) == RootWindow(QX11Info::display(), 0))
&& (e->event == QX11Info::appRootWindow())) {
@@ -1606,7 +1606,7 @@ void DuiCompositeManagerPrivate::mapEvent(XMapEvent *e)
set_global_alpha(0, g_alpha);
#endif
- DuiCompositeWindow *item = texturePixmapItem(win);
+ MCompositeWindow *item = texturePixmapItem(win);
if (item) item->setIsMapped(true);
// Compositing is assumed to be enabled at this point if a window
// has alpha channels
@@ -1622,7 +1622,7 @@ void DuiCompositeManagerPrivate::mapEvent(XMapEvent *e)
item->updateWindowPixmap();
disableCompositing();
} else if (!display_off) {
- ((DuiTexturePixmapItem *)item)->enableRedirectedRendering();
+ ((MTexturePixmapItem *)item)->enableRedirectedRendering();
item->delayShow(100);
}
/* do this after bindWindow() so that the window is in
@@ -1643,23 +1643,23 @@ void DuiCompositeManagerPrivate::mapEvent(XMapEvent *e)
&& (e->event == QX11Info::appRootWindow())) {
item = bindWindow(win);
if (transient_for)
- item->setWindowType(DuiCompositeWindow::Transient);
+ item->setWindowType(MCompositeWindow::Transient);
else
- item->setWindowType(DuiCompositeWindow::Normal);
+ item->setWindowType(MCompositeWindow::Normal);
if (!item->hasAlpha())
disableCompositing(FORCED);
else
item->delayShow(500);
// the current decorated window got mapped
- if (e->window == DuiDecoratorFrame::instance()->managedWindow() &&
- DuiDecoratorFrame::instance()->decoratorItem()) {
+ if (e->window == MDecoratorFrame::instance()->managedWindow() &&
+ MDecoratorFrame::instance()->decoratorItem()) {
connect(item, SIGNAL(visualized(bool)),
- DuiDecoratorFrame::instance(),
+ MDecoratorFrame::instance(),
SLOT(visualizeDecorator(bool)));
- DuiDecoratorFrame::instance()->decoratorItem()->setVisible(true);
- DuiDecoratorFrame::instance()->raise();
- DuiDecoratorFrame::instance()->decoratorItem()->setZValue(item->zValue() + 1);
+ MDecoratorFrame::instance()->decoratorItem()->setVisible(true);
+ MDecoratorFrame::instance()->raise();
+ MDecoratorFrame::instance()->decoratorItem()->setZValue(item->zValue() + 1);
stack[APPLICATION_LAYER] = e->window;
}
setWindowDebugProperties(win);
@@ -1668,20 +1668,20 @@ void DuiCompositeManagerPrivate::mapEvent(XMapEvent *e)
activateWindow(win, CurrentTime, false);
}
-static bool should_be_pinged(DuiCompositeWindow *cw)
+static bool should_be_pinged(MCompositeWindow *cw)
{
if (cw && cw->supportedProtocols().indexOf(ATOM(_NET_WM_PING)) != -1
&& cw->windowTypeAtom() != ATOM(_NET_WM_WINDOW_TYPE_DOCK)
- && cw->iconifyState() == DuiCompositeWindow::NoIconifyState
+ && cw->iconifyState() == MCompositeWindow::NoIconifyState
&& !cw->isDecorator()
&& !is_desktop_window(cw->window()))
return true;
return false;
}
-void DuiCompositeManagerPrivate::rootMessageEvent(XClientMessageEvent *event)
+void MCompositeManagerPrivate::rootMessageEvent(XClientMessageEvent *event)
{
- DuiCompositeWindow *i = texturePixmapItem(event->window);
+ MCompositeWindow *i = texturePixmapItem(event->window);
FrameData fd = framed_windows.value(event->window);
if (event->message_type == ATOM(_NET_ACTIVE_WINDOW)) {
@@ -1691,7 +1691,7 @@ void DuiCompositeManagerPrivate::rootMessageEvent(XClientMessageEvent *event)
setExposeDesktop(false);
Window raise = event->window;
- DuiCompositeWindow *d_item = texturePixmapItem(stack[DESKTOP_LAYER]);
+ MCompositeWindow *d_item = texturePixmapItem(stack[DESKTOP_LAYER]);
bool needComp = false;
if (d_item && d_item->isDirectRendered()) {
needComp = true;
@@ -1734,26 +1734,26 @@ void DuiCompositeManagerPrivate::rootMessageEvent(XClientMessageEvent *event)
setExposeDesktop(true);
XSync(QX11Info::display(), False);
- DuiCompositeWindow *check_hung = texturePixmapItem(close_window);
+ MCompositeWindow *check_hung = texturePixmapItem(close_window);
if (check_hung) {
- if (check_hung->status() == DuiCompositeWindow::HUNG) {
+ if (check_hung->status() == MCompositeWindow::HUNG) {
// destroy at the server level
XKillClient(QX11Info::display(), close_window);
delete check_hung;
- DuiDecoratorFrame::instance()->lower();
+ MDecoratorFrame::instance()->lower();
removeWindow(close_window);
return;
}
}
} else if (event->message_type == ATOM(WM_PROTOCOLS)) {
if (event->data.l[0] == (long) ATOM(_NET_WM_PING)) {
- DuiCompositeWindow *ping_source = texturePixmapItem(event->data.l[2]);
+ MCompositeWindow *ping_source = texturePixmapItem(event->data.l[2]);
if (ping_source) {
ping_source->receivedPing(event->data.l[1]);
- Window managed = DuiDecoratorFrame::instance()->managedWindow();
+ Window managed = MDecoratorFrame::instance()->managedWindow();
if (ping_source->window() == managed && !ping_source->needDecoration()) {
- DuiDecoratorFrame::instance()->lower();
- DuiDecoratorFrame::instance()->setManagedWindow(0);
+ MDecoratorFrame::instance()->lower();
+ MDecoratorFrame::instance()->setManagedWindow(0);
if(!ping_source->hasAlpha())
disableCompositing(FORCED);
}
@@ -1767,15 +1767,15 @@ void DuiCompositeManagerPrivate::rootMessageEvent(XClientMessageEvent *event)
}
}
-void DuiCompositeManagerPrivate::clientMessageEvent(XClientMessageEvent *event)
+void MCompositeManagerPrivate::clientMessageEvent(XClientMessageEvent *event)
{
// Handle iconify requests
if (event->message_type == ATOM(WM_CHANGE_STATE))
if (event->data.l[0] == IconicState && event->format == 32) {
setWindowState(event->window, IconicState);
- DuiCompositeWindow *i = texturePixmapItem(event->window);
- DuiCompositeWindow *d_item = texturePixmapItem(stack[DESKTOP_LAYER]);
+ MCompositeWindow *i = texturePixmapItem(event->window);
+ MCompositeWindow *d_item = texturePixmapItem(stack[DESKTOP_LAYER]);
if (d_item && i) {
d_item->setZValue(i->zValue() - 1);
@@ -1802,9 +1802,9 @@ void DuiCompositeManagerPrivate::clientMessageEvent(XClientMessageEvent *event)
rootMessageEvent(event);
}
-void DuiCompositeManagerPrivate::iconifyOnLower(DuiCompositeWindow *window)
+void MCompositeManagerPrivate::iconifyOnLower(MCompositeWindow *window)
{
- if (window->iconifyState() != DuiCompositeWindow::TransitionIconifyState)
+ if (window->iconifyState() != MCompositeWindow::TransitionIconifyState)
return;
// TODO: (work for more)
@@ -1813,7 +1813,7 @@ void DuiCompositeManagerPrivate::iconifyOnLower(DuiCompositeWindow *window)
FrameData fd = framed_windows.value(window->window());
if (fd.frame) {
setWindowState(fd.frame->managedWindow(), IconicState);
- DuiCompositeWindow *i = texturePixmapItem(fd.frame->winId());
+ MCompositeWindow *i = texturePixmapItem(fd.frame->winId());
if (i)
i->iconify();
}
@@ -1826,7 +1826,7 @@ void DuiCompositeManagerPrivate::iconifyOnLower(DuiCompositeWindow *window)
}
}
-void DuiCompositeManagerPrivate::raiseOnRestore(DuiCompositeWindow *window)
+void MCompositeManagerPrivate::raiseOnRestore(MCompositeWindow *window)
{
stack[APPLICATION_LAYER] = window->window();
positionWindow(window->window(), STACK_TOP);
@@ -1835,7 +1835,7 @@ void DuiCompositeManagerPrivate::raiseOnRestore(DuiCompositeWindow *window)
possiblyUnredirectTopmostWindow();
}
-void DuiCompositeManagerPrivate::setExposeDesktop(bool exposed)
+void MCompositeManagerPrivate::setExposeDesktop(bool exposed)
{
if (stack[DESKTOP_LAYER]) {
XVisibilityEvent desk_notify;
@@ -1861,34 +1861,34 @@ void DuiCompositeManagerPrivate::setExposeDesktop(bool exposed)
// Visibility notification to desktop window. Ensure this is called once
// transitions are done
-void DuiCompositeManagerPrivate::exposeDesktop()
+void MCompositeManagerPrivate::exposeDesktop()
{
setExposeDesktop(true);
}
-bool DuiCompositeManagerPrivate::isSelfManagedFocus(Window w)
+bool MCompositeManagerPrivate::isSelfManagedFocus(Window w)
{
/* FIXME: store these to the object */
XWindowAttributes attr;
if (!XGetWindowAttributes(QX11Info::display(), w, &attr))
return false;
- if (attr.override_redirect || atom->windowType(w) == DuiCompAtoms::INPUT)
+ if (attr.override_redirect || atom->windowType(w) == MCompAtoms::INPUT)
return false;
return true;
}
-void DuiCompositeManagerPrivate::activateWindow(Window w, Time timestamp,
+void MCompositeManagerPrivate::activateWindow(Window w, Time timestamp,
bool disableCompositing)
{
- if (DuiDecoratorFrame::instance()->managedWindow() == w)
- DuiDecoratorFrame::instance()->activate();
+ if (MDecoratorFrame::instance()->managedWindow() == w)
+ MDecoratorFrame::instance()->activate();
- if ((atom->windowType(w) != DuiCompAtoms::DESKTOP) &&
- (atom->windowType(w) != DuiCompAtoms::DOCK)) {
+ if ((atom->windowType(w) != MCompAtoms::DESKTOP) &&
+ (atom->windowType(w) != MCompAtoms::DOCK)) {
stack[APPLICATION_LAYER] = w;
setExposeDesktop(false);
// if this is a transient window, raise the "parent" instead
- DuiCompositeWindow *cw = windows.value(w);
+ MCompositeWindow *cw = windows.value(w);
Window last = getLastVisibleParent(cw);
if (last)
positionWindow(last, STACK_TOP);
@@ -1906,15 +1906,15 @@ void DuiCompositeManagerPrivate::activateWindow(Window w, Time timestamp,
}
#ifdef GLES2_VERSION
-void DuiCompositeManagerPrivate::mceDisplayStatusIndSignal(QString mode)
+void MCompositeManagerPrivate::mceDisplayStatusIndSignal(QString mode)
{
if (mode == MCE_DISPLAY_OFF_STRING) {
disableCompositing(REALLY_FORCED);
display_off = true;
/* stop pinging to save some battery */
- for (QHash<Window, DuiCompositeWindow *>::iterator it = windows.begin();
+ for (QHash<Window, MCompositeWindow *>::iterator it = windows.begin();
it != windows.end(); ++it) {
- DuiCompositeWindow *i = it.value();
+ MCompositeWindow *i = it.value();
i->stopPing();
}
} else if (mode == MCE_DISPLAY_ON_STRING) {
@@ -1923,9 +1923,9 @@ void DuiCompositeManagerPrivate::mceDisplayStatusIndSignal(QString mode)
if (!possiblyUnredirectTopmostWindow())
enableCompositing(false);
/* start pinging again */
- for (QHash<Window, DuiCompositeWindow *>::iterator it = windows.begin();
+ for (QHash<Window, MCompositeWindow *>::iterator it = windows.begin();
it != windows.end(); ++it) {
- DuiCompositeWindow *i = it.value();
+ MCompositeWindow *i = it.value();
if (should_be_pinged(i))
i->startPing();
}
@@ -1933,7 +1933,7 @@ void DuiCompositeManagerPrivate::mceDisplayStatusIndSignal(QString mode)
}
#endif
-void DuiCompositeManagerPrivate::setWindowState(Window w, int state)
+void MCompositeManagerPrivate::setWindowState(Window w, int state)
{
CARD32 d[2];
d[0] = state;
@@ -1942,10 +1942,10 @@ void DuiCompositeManagerPrivate::setWindowState(Window w, int state)
32, PropModeReplace, (unsigned char *)d, 2);
}
-void DuiCompositeManagerPrivate::setWindowDebugProperties(Window w)
+void MCompositeManagerPrivate::setWindowDebugProperties(Window w)
{
#ifdef WINDOW_DEBUG
- DuiCompositeWindow *i = texturePixmapItem(w);
+ MCompositeWindow *i = texturePixmapItem(w);
if (!i)
return;
@@ -1968,7 +1968,7 @@ void DuiCompositeManagerPrivate::setWindowDebugProperties(Window w)
#endif
}
-bool DuiCompositeManagerPrivate::x11EventFilter(XEvent *event)
+bool MCompositeManagerPrivate::x11EventFilter(XEvent *event)
{
static const int damage_ev = damage_event + XDamageNotify;
@@ -2007,12 +2007,12 @@ bool DuiCompositeManagerPrivate::x11EventFilter(XEvent *event)
return true;
}
-QGraphicsScene *DuiCompositeManagerPrivate::scene()
+QGraphicsScene *MCompositeManagerPrivate::scene()
{
return watch;
}
-void DuiCompositeManagerPrivate::redirectWindows()
+void MCompositeManagerPrivate::redirectWindows()
{
uint children = 0, i = 0;
Window r, p, *kids = 0;
@@ -2048,17 +2048,17 @@ void DuiCompositeManagerPrivate::redirectWindows()
checkStacking(false);
}
-bool DuiCompositeManagerPrivate::isRedirected(Window w)
+bool MCompositeManagerPrivate::isRedirected(Window w)
{
return (texturePixmapItem(w) != 0);
}
-DuiCompositeWindow *DuiCompositeManagerPrivate::texturePixmapItem(Window w)
+MCompositeWindow *MCompositeManagerPrivate::texturePixmapItem(Window w)
{
return windows.value(w, 0);
}
-bool DuiCompositeManagerPrivate::removeWindow(Window w)
+bool MCompositeManagerPrivate::removeWindow(Window w)
{
windows_as_mapped.removeAll(w);
if (windows.remove(w) == 0)
@@ -2073,7 +2073,7 @@ bool DuiCompositeManagerPrivate::removeWindow(Window w)
return true;
}
-DuiCompositeWindow *DuiCompositeManagerPrivate::bindWindow(Window window)
+MCompositeWindow *MCompositeManagerPrivate::bindWindow(Window window)
{
Display *display = QX11Info::display();
bool is_decorator = atom->isDecorator(window);
@@ -2081,8 +2081,8 @@ DuiCompositeWindow *DuiCompositeManagerPrivate::bindWindow(Window window)
XSelectInput(display, window, StructureNotifyMask | PropertyChangeMask | ButtonPressMask);
XCompositeRedirectWindow(display, window, CompositeRedirectManual);
- DuiCompAtoms::Type wtype = atom->windowType(window);
- DuiTexturePixmapItem *item = new DuiTexturePixmapItem(window, glwidget);
+ MCompAtoms::Type wtype = atom->windowType(window);
+ MTexturePixmapItem *item = new MTexturePixmapItem(window, glwidget);
item->setZValue(wtype);
item->saveState();
item->setIsMapped(true);
@@ -2093,7 +2093,7 @@ DuiCompositeWindow *DuiCompositeManagerPrivate::bindWindow(Window window)
if (needDecoration(window)) {
item->setDecorated(true);
- DuiDecoratorFrame::instance()->setManagedWindow(window);
+ MDecoratorFrame::instance()->setManagedWindow(window);
}
item->setIsDecorator(is_decorator);
@@ -2103,11 +2103,11 @@ DuiCompositeWindow *DuiCompositeManagerPrivate::bindWindow(Window window)
addItem(item);
item->setWindowTypeAtom(atom->getType(window));
- if (wtype == DuiCompAtoms::INPUT) {
+ if (wtype == MCompAtoms::INPUT) {
if (!display_off)
item->updateWindowPixmap();
return item;
- } else if (wtype == DuiCompAtoms::DESKTOP) {
+ } else if (wtype == MCompAtoms::DESKTOP) {
// just in case startup sequence changes
stack[DESKTOP_LAYER] = window;
connect(this, SIGNAL(inputEnabled()), item,
@@ -2119,13 +2119,13 @@ DuiCompositeWindow *DuiCompositeManagerPrivate::bindWindow(Window window)
// the decorator got mapped. this is here because the compositor
// could be restarted at any point
- if (is_decorator && !DuiDecoratorFrame::instance()->decoratorItem()) {
+ if (is_decorator && !MDecoratorFrame::instance()->decoratorItem()) {
// initially update the texture for this window because this
// will be hidden on first show
if (!display_off)
item->updateWindowPixmap();
item->setVisible(false);
- DuiDecoratorFrame::instance()->setDecoratorItem(item);
+ MDecoratorFrame::instance()->setDecoratorItem(item);
} else
item->setVisible(true);
@@ -2145,30 +2145,30 @@ DuiCompositeWindow *DuiCompositeManagerPrivate::bindWindow(Window window)
return item;
}
-void DuiCompositeManagerPrivate::addItem(DuiCompositeWindow *item)
+void MCompositeManagerPrivate::addItem(MCompositeWindow *item)
{
watch->addItem(item);
updateWinList();
setWindowDebugProperties(item->window());
connect(item, SIGNAL(acceptingInput()), SLOT(enableInput()));
- if (atom->windowType(item->window()) == DuiCompAtoms::DESKTOP)
+ if (atom->windowType(item->window()) == MCompAtoms::DESKTOP)
return;
- connect(item, SIGNAL(itemIconified(DuiCompositeWindow *)), SLOT(exposeDesktop()));
+ connect(item, SIGNAL(itemIconified(MCompositeWindow *)), SLOT(exposeDesktop()));
connect(this, SIGNAL(compositingEnabled()), item, SLOT(startTransition()));
- connect(item, SIGNAL(itemRestored(DuiCompositeWindow *)), SLOT(raiseOnRestore(DuiCompositeWindow *)));
- connect(item, SIGNAL(itemIconified(DuiCompositeWindow *)), SLOT(iconifyOnLower(DuiCompositeWindow *)));
+ connect(item, SIGNAL(itemRestored(MCompositeWindow *)), SLOT(raiseOnRestore(MCompositeWindow *)));
+ connect(item, SIGNAL(itemIconified(MCompositeWindow *)), SLOT(iconifyOnLower(MCompositeWindow *)));
// ping protocol
- connect(item, SIGNAL(windowHung(DuiCompositeWindow *)),
- SLOT(gotHungWindow(DuiCompositeWindow *)));
+ connect(item, SIGNAL(windowHung(MCompositeWindow *)),
+ SLOT(gotHungWindow(MCompositeWindow *)));
- connect(item, SIGNAL(pingTriggered(DuiCompositeWindow *)),
- SLOT(sendPing(DuiCompositeWindow *)));
+ connect(item, SIGNAL(pingTriggered(MCompositeWindow *)),
+ SLOT(sendPing(MCompositeWindow *)));
}
-void DuiCompositeManagerPrivate::updateWinList(bool stackingOnly)
+void MCompositeManagerPrivate::updateWinList(bool stackingOnly)
{
if (!stackingOnly) {
static QList<Window> prev_list;
@@ -2177,7 +2177,7 @@ void DuiCompositeManagerPrivate::updateWinList(bool stackingOnly)
QList<Window> new_list;
for (int i = 0; i < windows_as_mapped.size(); ++i) {
Window w = windows_as_mapped.at(i);
- DuiCompositeWindow *d = windows.value(w);
+ MCompositeWindow *d = windows.value(w);
if (d->isMapped()) new_list.append(w);
}
@@ -2200,8 +2200,8 @@ void DuiCompositeManagerPrivate::updateWinList(bool stackingOnly)
in the _NET_CLIENT_LIST_STACKING
*/
void
-DuiCompositeManagerPrivate::positionWindow(Window w,
- DuiCompositeManagerPrivate::StackPosition pos)
+MCompositeManagerPrivate::positionWindow(Window w,
+ MCompositeManagerPrivate::StackPosition pos)
{
int wp = stacking_list.indexOf(w);
if (wp == -1 || wp >= stacking_list.size())
@@ -2225,7 +2225,7 @@ DuiCompositeManagerPrivate::positionWindow(Window w,
updateWinList(true);
}
-void DuiCompositeManagerPrivate::enableCompositing(bool forced,
+void MCompositeManagerPrivate::enableCompositing(bool forced,
bool ignore_display_off)
{
if ((!ignore_display_off && display_off) || (compositing && !forced))
@@ -2242,7 +2242,7 @@ void DuiCompositeManagerPrivate::enableCompositing(bool forced,
enableRedirection();
}
-void DuiCompositeManagerPrivate::mapOverlayWindow()
+void MCompositeManagerPrivate::mapOverlayWindow()
{
// Render the previous contents of the framebuffer
// here exactly before compositing was enabled
@@ -2259,13 +2259,13 @@ void DuiCompositeManagerPrivate::mapOverlayWindow()
XMapWindow(QX11Info::display(), xoverlay);
}
-void DuiCompositeManagerPrivate::enableRedirection()
+void MCompositeManagerPrivate::enableRedirection()
{
- for (QHash<Window, DuiCompositeWindow *>::iterator it = windows.begin();
+ for (QHash<Window, MCompositeWindow *>::iterator it = windows.begin();
it != windows.end(); ++it) {
- DuiCompositeWindow *tp = it.value();
+ MCompositeWindow *tp = it.value();
if (tp->windowVisible())
- ((DuiTexturePixmapItem *)tp)->enableRedirectedRendering();
+ ((MTexturePixmapItem *)tp)->enableRedirectedRendering();
setWindowDebugProperties(it.key());
}
glwidget->update();
@@ -2280,9 +2280,9 @@ void DuiCompositeManagerPrivate::enableRedirection()
emit compositingEnabled();
}
-void DuiCompositeManagerPrivate::disableCompositing(ForcingLevel forced)
+void MCompositeManagerPrivate::disableCompositing(ForcingLevel forced)
{
- if (DuiCompositeWindow::isTransitioning() && forced != REALLY_FORCED)
+ if (MCompositeWindow::isTransitioning() && forced != REALLY_FORCED)
return;
if (!compositing && forced == NO_FORCED)
return;
@@ -2290,9 +2290,9 @@ void DuiCompositeManagerPrivate::disableCompositing(ForcingLevel forced)
if (forced != REALLY_FORCED)
// we could still have existing decorator on-screen.
// ensure we don't accidentally disturb it
- for (QHash<Window, DuiCompositeWindow *>::iterator it = windows.begin();
+ for (QHash<Window, MCompositeWindow *>::iterator it = windows.begin();
it != windows.end(); ++it) {
- DuiCompositeWindow *i = it.value();
+ MCompositeWindow *i = it.value();
if (i->isDecorator())
continue;
if (i->windowVisible() && (i->hasAlpha() || i->needDecoration()))
@@ -2301,12 +2301,12 @@ void DuiCompositeManagerPrivate::disableCompositing(ForcingLevel forced)
scene()->views()[0]->setUpdatesEnabled(false);
- for (QHash<Window, DuiCompositeWindow *>::iterator it = windows.begin();
+ for (QHash<Window, MCompositeWindow *>::iterator it = windows.begin();
it != windows.end(); ++it) {
- DuiCompositeWindow *tp = it.value();
+ MCompositeWindow *tp = it.value();
// checks above fail. somehow decorator got in. stop it at this point
if (!tp->isDecorator() && !tp->isIconified() && !tp->hasAlpha())
- ((DuiTexturePixmapItem *)tp)->enableDirectFbRendering();
+ ((MTexturePixmapItem *)tp)->enableDirectFbRendering();
setWindowDebugProperties(it.key());
/* Mark all windows obscured so that Unobscured events are sent when
@@ -2321,15 +2321,15 @@ void DuiCompositeManagerPrivate::disableCompositing(ForcingLevel forced)
XUnmapWindow(QX11Info::display(), xoverlay);
XFlush(QX11Info::display());
- if (DuiDecoratorFrame::instance()->decoratorItem())
- DuiDecoratorFrame::instance()->lower();
+ if (MDecoratorFrame::instance()->decoratorItem())
+ MDecoratorFrame::instance()->lower();
compositing = false;
}
-void DuiCompositeManagerPrivate::sendPing(DuiCompositeWindow *w)
+void MCompositeManagerPrivate::sendPing(MCompositeWindow *w)
{
- Window window = ((DuiCompositeWindow *) w)->window();
+ Window window = ((MCompositeWindow *) w)->window();
ulong t = QDateTime::currentDateTime().toTime_t();
w->setClientTimeStamp(t);
@@ -2348,21 +2348,21 @@ void DuiCompositeManagerPrivate::sendPing(DuiCompositeWindow *w)
XSync(QX11Info::display(), False);
}
-void DuiCompositeManagerPrivate::gotHungWindow(DuiCompositeWindow *w)
+void MCompositeManagerPrivate::gotHungWindow(MCompositeWindow *w)
{
- if (!DuiDecoratorFrame::instance()->decoratorItem())
+ if (!MDecoratorFrame::instance()->decoratorItem())
return;
enableCompositing(true);
// own the window so we could kill it if we want to.
- DuiDecoratorFrame::instance()->setManagedWindow(w->window());
+ MDecoratorFrame::instance()->setManagedWindow(w->window());
checkStacking(false);
- DuiDecoratorFrame::instance()->raise();
+ MDecoratorFrame::instance()->raise();
w->updateWindowPixmap();
}
-void DuiCompositeManagerPrivate::showLaunchIndicator(int timeout)
+void MCompositeManagerPrivate::showLaunchIndicator(int timeout)
{
if (!launchIndicator) {
launchIndicator = new QGraphicsTextItem("launching...");
@@ -2376,13 +2376,13 @@ void DuiCompositeManagerPrivate::showLaunchIndicator(int timeout)
QTimer::singleShot(timeout * 1000, this, SLOT(hideLaunchIndicator()));
}
-void DuiCompositeManagerPrivate::hideLaunchIndicator()
+void MCompositeManagerPrivate::hideLaunchIndicator()
{
if (launchIndicator)
launchIndicator->hide();
}
-DuiCompositeManager::DuiCompositeManager(int &argc, char **argv)
+MCompositeManager::MCompositeManager(int &argc, char **argv)
: QApplication(argc, argv)
{
if (QX11Info::isCompositingManagerRunning()) {
@@ -2390,74 +2390,74 @@ DuiCompositeManager::DuiCompositeManager(int &argc, char **argv)
::exit(0);
}
- d = new DuiCompositeManagerPrivate(this);
- DuiRmiServer *s = new DuiRmiServer(".duicompositor", this);
+ d = new MCompositeManagerPrivate(this);
+ MRmiServer *s = new MRmiServer(".mcompositor", this);
s->exportObject(this);
}
-DuiCompositeManager::~DuiCompositeManager()
+MCompositeManager::~MCompositeManager()
{
delete d;
d = 0;
}
-void DuiCompositeManager::setGLWidget(QGLWidget *glw)
+void MCompositeManager::setGLWidget(QGLWidget *glw)
{
glw->setAttribute(Qt::WA_PaintOutsidePaintEvent);
d->glwidget = glw;
}
-QGraphicsScene *DuiCompositeManager::scene()
+QGraphicsScene *MCompositeManager::scene()
{
return d->scene();
}
-void DuiCompositeManager::prepareEvents()
+void MCompositeManager::prepareEvents()
{
d->prepare();
}
-bool DuiCompositeManager::x11EventFilter(XEvent *event)
+bool MCompositeManager::x11EventFilter(XEvent *event)
{
return d->x11EventFilter(event);
}
-void DuiCompositeManager::setSurfaceWindow(Qt::HANDLE window)
+void MCompositeManager::setSurfaceWindow(Qt::HANDLE window)
{
d->localwin = window;
}
-void DuiCompositeManager::redirectWindows()
+void MCompositeManager::redirectWindows()
{
d->redirectWindows();
}
-bool DuiCompositeManager::isRedirected(Qt::HANDLE w)
+bool MCompositeManager::isRedirected(Qt::HANDLE w)
{
return d->isRedirected(w);
}
-void DuiCompositeManager::enableCompositing()
+void MCompositeManager::enableCompositing()
{
d->enableCompositing();
}
-void DuiCompositeManager::disableCompositing()
+void MCompositeManager::disableCompositing()
{
d->disableCompositing();
}
-void DuiCompositeManager::showLaunchIndicator(int timeout)
+void MCompositeManager::showLaunchIndicator(int timeout)
{
d->showLaunchIndicator(timeout);
}
-void DuiCompositeManager::hideLaunchIndicator()
+void MCompositeManager::hideLaunchIndicator()
{
d->hideLaunchIndicator();
}
-void DuiCompositeManager::topmostWindowsRaise()
+void MCompositeManager::topmostWindowsRaise()
{
d->checkStacking(false);
}
diff --git a/src/duicompositemanager.h b/src/mcompositemanager.h
index 5b664ac..a839500 100644
--- a/src/duicompositemanager.h
+++ b/src/mcompositemanager.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -24,20 +24,20 @@
#include <QGLWidget>
class QGraphicsScene;
-class DuiCompositeManagerPrivate;
-class DuiCompAtoms;
+class MCompositeManagerPrivate;
+class MCompAtoms;
/*!
- * DuiCompositeManager is responsible for managing window events.
+ * MCompositeManager is responsible for managing window events.
*
* It catches and redirects appropriate windows to offscreen pixmaps and
- * creates a DuiTexturePixmapItem object from these windows and adds them
+ * creates a MTexturePixmapItem object from these windows and adds them
* to a QGraphicsScene. The manager also ensures the items are updated
* when their contents change and removes them from its control when they are
* destroyed.
*
*/
-class DuiCompositeManager: public QApplication
+class MCompositeManager: public QApplication
{
Q_OBJECT
public:
@@ -48,12 +48,12 @@ public:
* \param argc number of arguments passed from the command line
* \param argv argument of strings passed from the command line
*/
- DuiCompositeManager(int &argc, char **argv);
+ MCompositeManager(int &argc, char **argv);
/*!
* Cleans up resources
*/
- ~DuiCompositeManager();
+ ~MCompositeManager();
/*! Prepare and start composite management. This function should get called
* after the window of this compositor is created and mapped to the screen
@@ -107,7 +107,7 @@ public slots:
void enableCompositing();
void disableCompositing();
- /*! Invoked remotely by DuiRmiClient to show a launch indicator
+ /*! Invoked remotely by MRmiClient to show a launch indicator
*
* \param timeout seconds elapsed to hide the launch indicator in case
* window does not yet appear.
@@ -116,10 +116,10 @@ public slots:
void hideLaunchIndicator();
private:
- DuiCompositeManagerPrivate *d;
+ MCompositeManagerPrivate *d;
- friend class DuiCompositeWindow;
- friend class DuiCompWindowAnimator;
+ friend class MCompositeWindow;
+ friend class MCompWindowAnimator;
};
#endif
diff --git a/src/duicompositemanager_p.h b/src/mcompositemanager_p.h
index 04e574d..8d051d7 100644
--- a/src/duicompositemanager_p.h
+++ b/src/mcompositemanager_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -32,10 +32,10 @@
class QGraphicsScene;
class QGLWidget;
-class DuiCompositeScene;
-class DuiSimpleWindowFrame;
-class DuiCompAtoms;
-class DuiCompositeWindow;
+class MCompositeScene;
+class MSimpleWindowFrame;
+class MCompAtoms;
+class MCompositeWindow;
enum {
INPUT_LAYER = 0,
@@ -47,10 +47,10 @@ enum {
};
/*!
- * Internal implementation of DuiCompositeManager
+ * Internal implementation of MCompositeManager
*/
-class DuiCompositeManagerPrivate: public QObject
+class MCompositeManagerPrivate: public QObject
{
Q_OBJECT
public:
@@ -64,12 +64,12 @@ public:
REALLY_FORCED
};
- DuiCompositeManagerPrivate(QObject *p);
- ~DuiCompositeManagerPrivate();
+ MCompositeManagerPrivate(QObject *p);
+ ~MCompositeManagerPrivate();
static Window parentWindow(Window child);
- DuiCompositeWindow *texturePixmapItem(Window w);
- DuiCompositeWindow *bindWindow(Window win);
+ MCompositeWindow *texturePixmapItem(Window w);
+ MCompositeWindow *bindWindow(Window win);
QGraphicsScene *scene();
void prepare();
@@ -79,7 +79,7 @@ public:
void setWindowState(Window , int);
void setWindowDebugProperties(Window w);
void positionWindow(Window w, StackPosition pos);
- void addItem(DuiCompositeWindow *item);
+ void addItem(MCompositeWindow *item);
void damageEvent(XDamageNotifyEvent *);
void destroyEvent(XDestroyWindowEvent *);
void propertyEvent(XPropertyEvent *);
@@ -99,8 +99,8 @@ public:
void checkInputFocus(Time timestamp = CurrentTime);
Window getTopmostApp(int *index_in_stacking_list = 0);
bool possiblyUnredirectTopmostWindow();
- Window getLastVisibleParent(DuiCompositeWindow *cw);
- bool isAppWindow(DuiCompositeWindow *cw);
+ Window getLastVisibleParent(MCompositeWindow *cw);
+ bool isAppWindow(MCompositeWindow *cw);
bool isRedirected(Window window);
bool x11EventFilter(XEvent *event);
@@ -108,24 +108,24 @@ public:
bool isSelfManagedFocus(Window w);
bool needDecoration(Window w);
- DuiCompositeScene *watch;
+ MCompositeScene *watch;
Window localwin;
Window xoverlay;
Window prev_focus;
static Window stack[TOTAL_LAYERS];
- DuiCompAtoms *atom;
+ MCompAtoms *atom;
QGLWidget *glwidget;
- DuiCompositeWindow *damage_cache;
+ MCompositeWindow *damage_cache;
QList<Window> stacking_list;
QList<Window> windows_as_mapped;
- QHash<Window, DuiCompositeWindow *> windows;
+ QHash<Window, MCompositeWindow *> windows;
struct FrameData {
FrameData(): frame(0), parentWindow(0), mapped(false) {}
- DuiSimpleWindowFrame *frame;
+ MSimpleWindowFrame *frame;
Window parentWindow;
bool mapped;
};
@@ -146,8 +146,8 @@ signals:
public slots:
- void gotHungWindow(DuiCompositeWindow *window);
- void sendPing(DuiCompositeWindow *window);
+ void gotHungWindow(MCompositeWindow *window);
+ void sendPing(MCompositeWindow *window);
void enableInput();
void disableInput();
void enableCompositing(bool forced = false,
@@ -155,8 +155,8 @@ public slots:
void disableCompositing(ForcingLevel forced = NO_FORCED);
void showLaunchIndicator(int timeout);
void hideLaunchIndicator();
- void iconifyOnLower(DuiCompositeWindow *window);
- void raiseOnRestore(DuiCompositeWindow *window);
+ void iconifyOnLower(MCompositeWindow *window);
+ void raiseOnRestore(MCompositeWindow *window);
void exposeDesktop();
#ifdef GLES2_VERSION
void mceDisplayStatusIndSignal(QString mode);
diff --git a/src/duicompositescene.cpp b/src/mcompositescene.cpp
index 8fcdd2e..b138c4f 100644
--- a/src/duicompositescene.cpp
+++ b/src/mcompositescene.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -25,8 +25,8 @@
#include <QApplication>
#include <QDesktopWidget>
-#include "duicompositewindow.h"
-#include "duicompositescene.h"
+#include "mcompositewindow.h"
+#include "mcompositescene.h"
#include <X11/extensions/Xfixes.h>
#ifdef HAVE_SHAPECONST
@@ -48,7 +48,7 @@ static int error_handler(Display * , XErrorEvent *error)
return 0;
}
-DuiCompositeScene::DuiCompositeScene(QObject *p)
+MCompositeScene::MCompositeScene(QObject *p)
: QGraphicsScene(p)
{
setBackgroundBrush(Qt::NoBrush);
@@ -59,7 +59,7 @@ DuiCompositeScene::DuiCompositeScene(QObject *p)
installEventFilter(this);
}
-void DuiCompositeScene::prepareRoot()
+void MCompositeScene::prepareRoot()
{
Display *dpy = QX11Info::display();
Window root = QX11Info::appRootWindow();
@@ -75,7 +75,7 @@ void DuiCompositeScene::prepareRoot()
}
-void DuiCompositeScene::setupOverlay(Window window, const QRect &geom,
+void MCompositeScene::setupOverlay(Window window, const QRect &geom,
bool restoreInput)
{
Display *dpy = QX11Info::display();
@@ -96,10 +96,10 @@ void DuiCompositeScene::setupOverlay(Window window, const QRect &geom,
XFixesDestroyRegion(dpy, region);
}
-void DuiCompositeScene::drawItems(QPainter *painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[], QWidget *widget)
+void MCompositeScene::drawItems(QPainter *painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[], QWidget *widget)
{
for (int i = 0; i < numItems; ++i) {
- DuiCompositeWindow *window = (DuiCompositeWindow *) items[i];
+ MCompositeWindow *window = (MCompositeWindow *) items[i];
if (window->windowVisible() && !window->isIconified()) {
painter->save();
painter->setMatrix(items[i]->sceneMatrix(), true);
diff --git a/src/duicompositescene.h b/src/mcompositescene.h
index 132ad9b..572cb90 100644
--- a/src/duicompositescene.h
+++ b/src/mcompositescene.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -28,23 +28,23 @@
class QMouseEvent;
/*!
- * The QGraphicsScene used by DuiCompositor to render the DuiGLXTexturePixmap
+ * The QGraphicsScene used by MCompositor to render the MGLXTexturePixmap
* items.
*
* We use a custom scene to capture mouse and keyboard events generated by
* the user as they manipulate the composited items on the screen
*/
-class DuiCompositeScene: public QGraphicsScene
+class MCompositeScene: public QGraphicsScene
{
Q_OBJECT
public:
/*!
- * Constructs a DuiCompositeScene
+ * Constructs a MCompositeScene
*
* \param parent QObject, defaults to 0
*/
- DuiCompositeScene(QObject *parent = 0);
+ MCompositeScene(QObject *parent = 0);
/*!
* Prepares the root window by hooking up to its event delivery system and
diff --git a/src/duicompositewindow.cpp b/src/mcompositewindow.cpp
index e231d9f..5b48210 100644
--- a/src/duicompositewindow.cpp
+++ b/src/mcompositewindow.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -17,20 +17,20 @@
**
****************************************************************************/
-#include "duicompositewindow.h"
-#include "duicompwindowanimator.h"
-#include "duicompositemanager.h"
-#include "duicompositemanager_p.h"
-#include "duitexturepixmapitem.h"
+#include "mcompositewindow.h"
+#include "mcompwindowanimator.h"
+#include "mcompositemanager.h"
+#include "mcompositemanager_p.h"
+#include "mtexturepixmapitem.h"
#include <QX11Info>
#include <QGraphicsScene>
#include <QGraphicsSceneMouseEvent>
#include <X11/Xatom.h>
-bool DuiCompositeWindow::window_transitioning = false;
+bool MCompositeWindow::window_transitioning = false;
-DuiCompositeWindow::DuiCompositeWindow(Qt::HANDLE window, QGraphicsItem *p)
+MCompositeWindow::MCompositeWindow(Qt::HANDLE window, QGraphicsItem *p)
: QGraphicsItem(p),
scalefrom(1),
scaleto(1),
@@ -51,7 +51,7 @@ DuiCompositeWindow::DuiCompositeWindow(Qt::HANDLE window, QGraphicsItem *p)
window_obscured(false),
win_id(window)
{
- anim = new DuiCompWindowAnimator(this);
+ anim = new MCompWindowAnimator(this);
connect(anim, SIGNAL(transitionDone()), SLOT(finalizeState()));
connect(anim, SIGNAL(transitionDone()), SLOT(windowSettled()));
connect(anim, SIGNAL(transitionStart()), SLOT(windowTransitioning()));
@@ -62,52 +62,52 @@ DuiCompositeWindow::DuiCompositeWindow(Qt::HANDLE window, QGraphicsItem *p)
connect(t_ping, SIGNAL(timeout()), SLOT(pingWindow()));
}
-DuiCompositeWindow::~DuiCompositeWindow()
+MCompositeWindow::~MCompositeWindow()
{
delete anim;
anim = 0;
}
-void DuiCompositeWindow::setBlurred(bool b)
+void MCompositeWindow::setBlurred(bool b)
{
blur = b;
update();
}
-void DuiCompositeWindow::setUnBlurred()
+void MCompositeWindow::setUnBlurred()
{
blur = false;
update();
}
-bool DuiCompositeWindow::blurred()
+bool MCompositeWindow::blurred()
{
return blur;
}
-void DuiCompositeWindow::saveState()
+void MCompositeWindow::saveState()
{
anim->saveState();
}
-void DuiCompositeWindow::localSaveState()
+void MCompositeWindow::localSaveState()
{
anim->localSaveState();
}
-// void DuiCompositeWindow::restore()
+// void MCompositeWindow::restore()
// {
// anim->restore();
// }
// set the scale point to actual values
-void DuiCompositeWindow::setScalePoint(qreal from, qreal to)
+void MCompositeWindow::setScalePoint(qreal from, qreal to)
{
scalefrom = from;
scaleto = to;
}
-void DuiCompositeWindow::setThumbMode(bool mode)
+void MCompositeWindow::setThumbMode(bool mode)
{
thumb_mode = mode;
}
@@ -115,7 +115,7 @@ void DuiCompositeWindow::setThumbMode(bool mode)
/* This is a delayed animation. Actual animation is triggered
* when startTransition() is called
*/
-void DuiCompositeWindow::iconify(const QRectF &iconGeometry, bool defer)
+void MCompositeWindow::iconify(const QRectF &iconGeometry, bool defer)
{
this->iconGeometry = iconGeometry;
origPosition = pos();
@@ -130,7 +130,7 @@ void DuiCompositeWindow::iconify(const QRectF &iconGeometry, bool defer)
iconified = true;
}
-void DuiCompositeWindow::setIconified(bool iconified)
+void MCompositeWindow::setIconified(bool iconified)
{
iconified_final = iconified;
iconify_state = ManualIconifyState;
@@ -140,12 +140,12 @@ void DuiCompositeWindow::setIconified(bool iconified)
iconify_state = NoIconifyState;
}
-DuiCompositeWindow::IconifyState DuiCompositeWindow::iconifyState() const
+MCompositeWindow::IconifyState MCompositeWindow::iconifyState() const
{
return iconify_state;
}
-void DuiCompositeWindow::setWindowObscured(bool obscured, bool no_notify)
+void MCompositeWindow::setWindowObscured(bool obscured, bool no_notify)
{
if (obscured == window_obscured)
return;
@@ -163,7 +163,7 @@ void DuiCompositeWindow::setWindowObscured(bool obscured, bool no_notify)
}
}
-void DuiCompositeWindow::startTransition()
+void MCompositeWindow::startTransition()
{
if (anim->pendingAnimation()) {
anim->startAnimation();
@@ -172,7 +172,7 @@ void DuiCompositeWindow::startTransition()
}
// TODO: have an option of disabling the animation
-void DuiCompositeWindow::restore(const QRectF &iconGeometry, bool defer)
+void MCompositeWindow::restore(const QRectF &iconGeometry, bool defer)
{
this->iconGeometry = iconGeometry;
// horizontal and vert. scaling factors
@@ -186,14 +186,14 @@ void DuiCompositeWindow::restore(const QRectF &iconGeometry, bool defer)
iconified = false;
}
-void DuiCompositeWindow::prettyDestroy()
+void MCompositeWindow::prettyDestroy()
{
setVisible(true);
destroyed = true;
iconify();
}
-void DuiCompositeWindow::finalizeState()
+void MCompositeWindow::finalizeState()
{
// request zvalue
if (requestzval)
@@ -219,12 +219,12 @@ void DuiCompositeWindow::finalizeState()
requestzval = false;
}
-void DuiCompositeWindow::q_itemRestored()
+void MCompositeWindow::q_itemRestored()
{
emit itemRestored(this);
}
-void DuiCompositeWindow::requestZValue(int zvalue)
+void MCompositeWindow::requestZValue(int zvalue)
{
if (anim->isActive()) {
zval = zvalue;
@@ -235,30 +235,30 @@ void DuiCompositeWindow::requestZValue(int zvalue)
}
}
-bool DuiCompositeWindow::isIconified() const
+bool MCompositeWindow::isIconified() const
{
if (anim->isActive())
return false;
return iconified_final;
}
-bool DuiCompositeWindow::isScaled() const
+bool MCompositeWindow::isScaled() const
{
return scaled;
}
-void DuiCompositeWindow::setScaled(bool s)
+void MCompositeWindow::setScaled(bool s)
{
scaled = s;
}
-Window DuiCompositeWindow::transientFor()
+Window MCompositeWindow::transientFor()
{
/* TODO: make this update the property based on PropertyNotifys */
XGetTransientForHint(QX11Info::display(), win_id, &transient_for);
return transient_for;
}
-bool DuiCompositeWindow::wantsFocus()
+bool MCompositeWindow::wantsFocus()
{
/* FIXME: check if it is enough to cache this... */
bool val = true;
@@ -272,7 +272,7 @@ bool DuiCompositeWindow::wantsFocus()
return wants_focus;
}
-XID DuiCompositeWindow::windowGroup()
+XID MCompositeWindow::windowGroup()
{
/* FIXME: check if it is enough to cache this... */
XID val = 0;
@@ -285,7 +285,7 @@ XID DuiCompositeWindow::windowGroup()
return val;
}
-const QList<Atom>& DuiCompositeWindow::supportedProtocols()
+const QList<Atom>& MCompositeWindow::supportedProtocols()
{
static Atom atom = 0;
Atom actual_type;
@@ -309,7 +309,7 @@ const QList<Atom>& DuiCompositeWindow::supportedProtocols()
return wm_protocols;
}
-void DuiCompositeWindow::hoverEnterEvent(QGraphicsSceneHoverEvent *e)
+void MCompositeWindow::hoverEnterEvent(QGraphicsSceneHoverEvent *e)
{
if (thumb_mode) {
zval = zValue();
@@ -321,7 +321,7 @@ void DuiCompositeWindow::hoverEnterEvent(QGraphicsSceneHoverEvent *e)
return QGraphicsItem::hoverEnterEvent(e);
}
-void DuiCompositeWindow::hoverLeaveEvent(QGraphicsSceneHoverEvent *e)
+void MCompositeWindow::hoverLeaveEvent(QGraphicsSceneHoverEvent *e)
{
if (thumb_mode) {
setZValue(zval);
@@ -330,7 +330,7 @@ void DuiCompositeWindow::hoverLeaveEvent(QGraphicsSceneHoverEvent *e)
return QGraphicsItem::hoverLeaveEvent(e);
}
-void DuiCompositeWindow::mouseReleaseEvent(QGraphicsSceneMouseEvent *m)
+void MCompositeWindow::mouseReleaseEvent(QGraphicsSceneMouseEvent *m)
{
anim->restore();
setThumbMode(false);
@@ -342,13 +342,13 @@ void DuiCompositeWindow::mouseReleaseEvent(QGraphicsSceneMouseEvent *m)
QGraphicsItem::mouseReleaseEvent(m);
}
-void DuiCompositeWindow::manipulationEnabled(bool isEnabled)
+void MCompositeWindow::manipulationEnabled(bool isEnabled)
{
setFlag(QGraphicsItem::ItemIsMovable, isEnabled);
setFlag(QGraphicsItem::ItemIsSelectable, isEnabled);
}
-void DuiCompositeWindow::setVisible(bool visible)
+void MCompositeWindow::setVisible(bool visible)
{
// Set the iconification status as well
iconified_final = !visible;
@@ -357,11 +357,11 @@ void DuiCompositeWindow::setVisible(bool visible)
window_visible = visible;
QGraphicsItem::setVisible(visible);
- DuiCompositeManager *p = (DuiCompositeManager *) qApp;
+ MCompositeManager *p = (MCompositeManager *) qApp;
p->d->setWindowDebugProperties(window());
}
-void DuiCompositeWindow::startPing()
+void MCompositeWindow::startPing()
{
if (t_ping->isActive())
t_ping->stop();
@@ -369,12 +369,12 @@ void DuiCompositeWindow::startPing()
t_ping->start(5000);
}
-void DuiCompositeWindow::stopPing()
+void MCompositeWindow::stopPing()
{
t_ping->stop();
}
-void DuiCompositeWindow::receivedPing(ulong serverTimeStamp)
+void MCompositeWindow::receivedPing(ulong serverTimeStamp)
{
ping_server_timestamp = serverTimeStamp;
startPing();
@@ -383,7 +383,7 @@ void DuiCompositeWindow::receivedPing(ulong serverTimeStamp)
setBlurred(false);
}
-void DuiCompositeWindow::pingTimeout()
+void MCompositeWindow::pingTimeout()
{
if (ping_server_timestamp != ping_client_timestamp && process_status != HUNG) {
setBlurred(true);
@@ -392,86 +392,86 @@ void DuiCompositeWindow::pingTimeout()
}
}
-void DuiCompositeWindow::setClientTimeStamp(ulong timeStamp)
+void MCompositeWindow::setClientTimeStamp(ulong timeStamp)
{
ping_client_timestamp = timeStamp;
}
-void DuiCompositeWindow::pingWindow()
+void MCompositeWindow::pingWindow()
{
QTimer::singleShot(5000, this, SLOT(pingTimeout()));
emit pingTriggered(this);
}
-DuiCompositeWindow::ProcessStatus DuiCompositeWindow::status() const
+MCompositeWindow::ProcessStatus MCompositeWindow::status() const
{
return process_status;
}
-bool DuiCompositeWindow::needDecoration() const
+bool MCompositeWindow::needDecoration() const
{
return need_decor;
}
-void DuiCompositeWindow::setDecorated(bool decorated)
+void MCompositeWindow::setDecorated(bool decorated)
{
need_decor = decorated;
}
-DuiCompositeWindow *DuiCompositeWindow::compositeWindow(Qt::HANDLE window)
+MCompositeWindow *MCompositeWindow::compositeWindow(Qt::HANDLE window)
{
- DuiCompositeManager *p = (DuiCompositeManager *) qApp;
+ MCompositeManager *p = (MCompositeManager *) qApp;
return p->d->texturePixmapItem(window);
}
-Qt::HANDLE DuiCompositeWindow::window() const
+Qt::HANDLE MCompositeWindow::window() const
{
return win_id;
}
-bool DuiCompositeWindow::isDecorator() const
+bool MCompositeWindow::isDecorator() const
{
return is_decorator;
}
-void DuiCompositeWindow::setIsDecorator(bool decorator)
+void MCompositeWindow::setIsDecorator(bool decorator)
{
is_decorator = decorator;
}
-void DuiCompositeWindow::windowTransitioning()
+void MCompositeWindow::windowTransitioning()
{
window_transitioning = true;
}
-void DuiCompositeWindow::windowSettled()
+void MCompositeWindow::windowSettled()
{
window_transitioning = false;
}
-bool DuiCompositeWindow::isTransitioning()
+bool MCompositeWindow::isTransitioning()
{
return window_transitioning;
}
-void DuiCompositeWindow::delayShow(int delay)
+void MCompositeWindow::delayShow(int delay)
{
// TODO: only do this for qt/dui apps because it delays translucency
setVisible(false);
QTimer::singleShot(delay, this, SLOT(q_delayShow()));
}
-void DuiCompositeWindow::q_delayShow()
+void MCompositeWindow::q_delayShow()
{
- DuiCompositeWindow::setVisible(true);
+ MCompositeWindow::setVisible(true);
updateWindowPixmap();
- DuiCompositeManager *p = (DuiCompositeManager *) qApp;
+ MCompositeManager *p = (MCompositeManager *) qApp;
p->d->updateWinList();
}
-QVariant DuiCompositeWindow::itemChange(GraphicsItemChange change, const QVariant &value)
+QVariant MCompositeWindow::itemChange(GraphicsItemChange change, const QVariant &value)
{
- DuiCompositeManager *p = (DuiCompositeManager *) qApp;
+ MCompositeManager *p = (MCompositeManager *) qApp;
bool zvalChanged = (change == ItemZValueHasChanged);
if (zvalChanged)
p->d->setWindowDebugProperties(window());
@@ -482,13 +482,13 @@ QVariant DuiCompositeWindow::itemChange(GraphicsItemChange change, const QVarian
return QGraphicsItem::itemChange(change, value);
}
-void DuiCompositeWindow::update()
+void MCompositeWindow::update()
{
- DuiCompositeManager *p = (DuiCompositeManager *) qApp;
+ MCompositeManager *p = (MCompositeManager *) qApp;
p->d->glwidget->update();
}
-bool DuiCompositeWindow::windowVisible() const
+bool MCompositeWindow::windowVisible() const
{
return window_visible;
}
diff --git a/src/duicompositewindow.h b/src/mcompositewindow.h
index 674c359..94927a9 100644
--- a/src/duicompositewindow.h
+++ b/src/mcompositewindow.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -24,7 +24,7 @@
#include <QtOpenGL>
#include <X11/Xutil.h>
-class DuiCompWindowAnimator;
+class MCompWindowAnimator;
/*!
* This is the base class for composited window items. It provided general
@@ -32,7 +32,7 @@ class DuiCompWindowAnimator;
* composited desktop. Also provides functionality for thumbnailed view of
* the contents.
*/
-class DuiCompositeWindow: public QObject, public QGraphicsItem
+class MCompositeWindow: public QObject, public QGraphicsItem
{
Q_OBJECT
#if QT_VERSION >= 0x040600
@@ -56,17 +56,17 @@ public:
Transient
};
- /*! Construct a DuiCompositeWindow
+ /*! Construct a MCompositeWindow
*
* \param window id to the window represented by this item
* \param item QGraphicsItem parent, defaults to none
*/
- DuiCompositeWindow(Qt::HANDLE window, QGraphicsItem *item = 0);
+ MCompositeWindow(Qt::HANDLE window, QGraphicsItem *item = 0);
- /*! Destroys this DuiCompositeWindow and frees resources
+ /*! Destroys this MCompositeWindow and frees resources
*
*/
- virtual ~DuiCompositeWindow();
+ virtual ~MCompositeWindow();
/*!
* Saves the global state of this item. Possibly transformations and
@@ -248,7 +248,7 @@ public:
QRect originalGeometry() const { return origGeometry; }
- static DuiCompositeWindow *compositeWindow(Qt::HANDLE window);
+ static MCompositeWindow *compositeWindow(Qt::HANDLE window);
Qt::HANDLE window() const;
@@ -326,20 +326,20 @@ signals:
/*!
* Emitted if this window is hung
*/
- void windowHung(DuiCompositeWindow *window);
+ void windowHung(MCompositeWindow *window);
/*!
* Emitted for every ping signal sent to the window
*/
- void pingTriggered(DuiCompositeWindow *window);
+ void pingTriggered(MCompositeWindow *window);
void acceptingInput();
void visualized(bool);
/*! Emmitted when this window gets restored from an iconified state */
- void itemRestored(DuiCompositeWindow *window);
+ void itemRestored(MCompositeWindow *window);
/*! Emmitted just after this window gets iconified */
- void itemIconified(DuiCompositeWindow *window);
+ void itemIconified(MCompositeWindow *window);
protected:
@@ -350,7 +350,7 @@ protected:
private:
bool thumb_mode;
- DuiCompWindowAnimator *anim;
+ MCompWindowAnimator *anim;
qreal scalefrom;
qreal scaleto;
bool scaled;
diff --git a/src/duicompwindowanimator.cpp b/src/mcompwindowanimator.cpp
index 88a1fdb..303be3e 100644
--- a/src/duicompwindowanimator.cpp
+++ b/src/mcompwindowanimator.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -17,10 +17,10 @@
**
****************************************************************************/
-#include "duicompwindowanimator.h"
-#include "duicompositewindow.h"
-#include "duicompositemanager.h"
-#include "duicompositemanager_p.h"
+#include "mcompwindowanimator.h"
+#include "mcompositewindow.h"
+#include "mcompositemanager.h"
+#include "mcompositemanager_p.h"
static int Fps = 60;
@@ -29,7 +29,7 @@ static qreal interpolate(qreal step, qreal x1, qreal x2)
return ((x2 - x1) * step) + x1;
}
-DuiCompWindowAnimator::DuiCompWindowAnimator(DuiCompositeWindow *item)
+MCompWindowAnimator::MCompWindowAnimator(MCompositeWindow *item)
: QObject(item),
timer(200),
reversed(false),
@@ -50,7 +50,7 @@ DuiCompWindowAnimator::DuiCompWindowAnimator(DuiCompositeWindow *item)
// restore original global state w/ animation
// TODO: rename this. this is not similar to restore state!
-void DuiCompWindowAnimator::restore()
+void MCompWindowAnimator::restore()
{
item->setTransform(matrix);
item->setZValue(zval);
@@ -71,7 +71,7 @@ void DuiCompWindowAnimator::restore()
}
// item transition
-void DuiCompWindowAnimator::advanceFrame(qreal step)
+void MCompWindowAnimator::advanceFrame(qreal step)
{
//item->setTransform(QTransform(anim.matrixAt(step)) );
item->setTransform(matrix);
@@ -84,12 +84,12 @@ void DuiCompWindowAnimator::advanceFrame(qreal step)
item->setOpacity(!reversed ? interpolate(step, 1.0, 0.1) :
interpolate(step, 0.1, 1.0));
- DuiCompositeManager *p = (DuiCompositeManager *) qApp;
+ MCompositeManager *p = (MCompositeManager *) qApp;
p->d->glwidget->update();
}
// translate item + scale
-void DuiCompWindowAnimator::translateScale(qreal fromSx, qreal fromSy,
+void MCompWindowAnimator::translateScale(qreal fromSx, qreal fromSy,
qreal toSx, qreal toSy,
const QPointF &newPos,
bool reverse)
@@ -119,55 +119,55 @@ void DuiCompWindowAnimator::translateScale(qreal fromSx, qreal fromSy,
}
// call this after item is scaled to desired size
-void DuiCompWindowAnimator::localSaveState()
+void MCompWindowAnimator::localSaveState()
{
local = item->transform();
}
-void DuiCompWindowAnimator::saveState(int states)
+void MCompWindowAnimator::saveState(int states)
{
- if ((states & DuiCompWindowAnimator::Transformation) ||
- (states & DuiCompWindowAnimator::All))
+ if ((states & MCompWindowAnimator::Transformation) ||
+ (states & MCompWindowAnimator::All))
matrix = item->transform();
- if ((states & DuiCompWindowAnimator::ZValue) ||
- (states & DuiCompWindowAnimator::All))
+ if ((states & MCompWindowAnimator::ZValue) ||
+ (states & MCompWindowAnimator::All))
zval = item->zValue();
- if ((states & DuiCompWindowAnimator::InitialPosition) ||
- (states & DuiCompWindowAnimator::All))
+ if ((states & MCompWindowAnimator::InitialPosition) ||
+ (states & MCompWindowAnimator::All))
initpos = item->pos();
- if ((states & DuiCompWindowAnimator::Visibility) ||
- (states & DuiCompWindowAnimator::All))
+ if ((states & MCompWindowAnimator::Visibility) ||
+ (states & MCompWindowAnimator::All))
visibility = item->isVisible();
}
-void DuiCompWindowAnimator::restoreState(int states)
+void MCompWindowAnimator::restoreState(int states)
{
- if ((states & DuiCompWindowAnimator::Transformation) ||
- (states & DuiCompWindowAnimator::All))
+ if ((states & MCompWindowAnimator::Transformation) ||
+ (states & MCompWindowAnimator::All))
item->setTransform(matrix);
- if ((states & DuiCompWindowAnimator::ZValue) ||
- (states & DuiCompWindowAnimator::All))
+ if ((states & MCompWindowAnimator::ZValue) ||
+ (states & MCompWindowAnimator::All))
item->setZValue(zval);
- if ((states & DuiCompWindowAnimator::InitialPosition) ||
- (states & DuiCompWindowAnimator::All))
+ if ((states & MCompWindowAnimator::InitialPosition) ||
+ (states & MCompWindowAnimator::All))
item->setPos(initpos);
- if ((states & DuiCompWindowAnimator::Visibility) ||
- (states & DuiCompWindowAnimator::All))
+ if ((states & MCompWindowAnimator::Visibility) ||
+ (states & MCompWindowAnimator::All))
item->setVisible(visibility);
}
-bool DuiCompWindowAnimator::isActive()
+bool MCompWindowAnimator::isActive()
{
return !(timer.state() == QTimeLine::NotRunning);
}
-void DuiCompWindowAnimator::startAnimation()
+void MCompWindowAnimator::startAnimation()
{
if (deferred_animation) {
if (timer.state() == QTimeLine::NotRunning) {
@@ -177,12 +177,12 @@ void DuiCompWindowAnimator::startAnimation()
}
}
-void DuiCompWindowAnimator::deferAnimation(bool defer)
+void MCompWindowAnimator::deferAnimation(bool defer)
{
deferred_animation = defer;
}
-bool DuiCompWindowAnimator::pendingAnimation() const
+bool MCompWindowAnimator::pendingAnimation() const
{
return deferred_animation;
}
diff --git a/src/duicompwindowanimator.h b/src/mcompwindowanimator.h
index dfff9c2..f1725bc 100644
--- a/src/duicompwindowanimator.h
+++ b/src/mcompwindowanimator.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -26,16 +26,16 @@
#include <QTransform>
class QGraphicsItem;
-class DuiCompositeWindow;
+class MCompositeWindow;
/*!
* This class is responsible for complete control of the animation of
- * DuiCompositeWindow items. It provides a way to save and restore
+ * MCompositeWindow items. It provides a way to save and restore
* transformation matrices directly in animations. Some transformation
* functions are provided which animates the transitions by default.
* These transitions could be themeable in the future
*/
-class DuiCompWindowAnimator: public QObject
+class MCompWindowAnimator: public QObject
{
Q_OBJECT
@@ -49,7 +49,7 @@ public:
Visibility
};
- DuiCompWindowAnimator(DuiCompositeWindow *item);
+ MCompWindowAnimator(MCompositeWindow *item);
//! Restores original item with animation. (TODO: deprecate this!(
void restore();
@@ -80,7 +80,7 @@ public:
public slots:
/*!
- * Direct interface to timeline. DuiTexturePixmapItem doesn't support
+ * Direct interface to timeline. MTexturePixmapItem doesn't support
* standard QGraphicsItem scale and rotation. So we call this for each
* item's frame for complete control of the transitions
*/
diff --git a/src/duidecoratorframe.cpp b/src/mdecoratorframe.cpp
index 9eff79b..d9c4746 100644
--- a/src/duidecoratorframe.cpp
+++ b/src/mdecoratorframe.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -17,11 +17,11 @@
**
****************************************************************************/
-#include "duidecoratorframe.h"
-#include "duicompositewindow.h"
-#include "duitexturepixmapitem.h"
+#include "mdecoratorframe.h"
+#include "mcompositewindow.h"
+#include "mtexturepixmapitem.h"
-#include <duirmiclient.h>
+#include <mrmiclient.h>
#include <QX11Info>
#include <X11/Xutil.h>
@@ -29,16 +29,16 @@
#include <X11/Xatom.h>
#include <X11/Xmd.h>
-DuiDecoratorFrame *DuiDecoratorFrame::d = 0;
+MDecoratorFrame *MDecoratorFrame::d = 0;
-DuiDecoratorFrame *DuiDecoratorFrame::instance()
+MDecoratorFrame *MDecoratorFrame::instance()
{
if (!d)
- d = new DuiDecoratorFrame();
+ d = new MDecoratorFrame();
return d;
}
-DuiDecoratorFrame::DuiDecoratorFrame(QObject *p)
+MDecoratorFrame::MDecoratorFrame(QObject *p)
: QObject(p),
decorator_window(0),
decorator_item(0)
@@ -47,32 +47,32 @@ DuiDecoratorFrame::DuiDecoratorFrame(QObject *p)
* Excute decorator process here.
*/
- remote_decorator = new DuiRmiClient(".duiabstractdecorator", this);
+ remote_decorator = new MRmiClient(".mabstractdecorator", this);
}
-Qt::HANDLE DuiDecoratorFrame::managedWindow() const
+Qt::HANDLE MDecoratorFrame::managedWindow() const
{
return client;
}
-Qt::HANDLE DuiDecoratorFrame::winId() const
+Qt::HANDLE MDecoratorFrame::winId() const
{
return decorator_window;
}
-void DuiDecoratorFrame::lower()
+void MDecoratorFrame::lower()
{
if (decorator_item)
decorator_item->setVisible(false);
}
-void DuiDecoratorFrame::raise()
+void MDecoratorFrame::raise()
{
if (decorator_item)
decorator_item->setVisible(true);
}
-void DuiDecoratorFrame::setManagedWindow(Qt::HANDLE window)
+void MDecoratorFrame::setManagedWindow(Qt::HANDLE window)
{
Display *dpy = QX11Info::display();
@@ -84,7 +84,7 @@ void DuiDecoratorFrame::setManagedWindow(Qt::HANDLE window)
return;
// TODO: Make this dynamic based on decorator dimensions.
- DuiCompositeWindow *w = DuiCompositeWindow::compositeWindow(window);
+ MCompositeWindow *w = MCompositeWindow::compositeWindow(window);
if (w && w->needDecoration()) {
XWindowAttributes a;
if (!XGetWindowAttributes(dpy, decorator_window, &a)) {
@@ -97,52 +97,52 @@ void DuiDecoratorFrame::setManagedWindow(Qt::HANDLE window)
}
qulonglong winid = client;
- remote_decorator->invoke("DuiAbstractDecorator",
+ remote_decorator->invoke("MAbstractDecorator",
"RemoteSetManagedWinId", winid);
if (w)
connect(w, SIGNAL(destroyed()), SLOT(destroyClient()));
}
-void DuiDecoratorFrame::setDecoratorWindow(Qt::HANDLE window)
+void MDecoratorFrame::setDecoratorWindow(Qt::HANDLE window)
{
decorator_window = window;
XMapWindow(QX11Info::display(), window);
}
-void DuiDecoratorFrame::setDecoratorItem(DuiCompositeWindow *window)
+void MDecoratorFrame::setDecoratorItem(MCompositeWindow *window)
{
decorator_item = window;
decorator_item->setIsDecorator(true);
connect(decorator_item, SIGNAL(destroyed()), SLOT(destroyDecorator()));
- DuiTexturePixmapItem *item = (DuiTexturePixmapItem *) window;
+ MTexturePixmapItem *item = (MTexturePixmapItem *) window;
if (!decorator_window)
setDecoratorWindow(item->window());
}
-DuiCompositeWindow *DuiDecoratorFrame::decoratorItem() const
+MCompositeWindow *MDecoratorFrame::decoratorItem() const
{
return decorator_item;
}
-void DuiDecoratorFrame::destroyDecorator()
+void MDecoratorFrame::destroyDecorator()
{
decorator_item = 0;
decorator_window = 0;
}
-void DuiDecoratorFrame::destroyClient()
+void MDecoratorFrame::destroyClient()
{
client = 0;
}
-void DuiDecoratorFrame::visualizeDecorator(bool visible)
+void MDecoratorFrame::visualizeDecorator(bool visible)
{
if (decorator_item)
decorator_item->setVisible(visible);
}
-void DuiDecoratorFrame::activate()
+void MDecoratorFrame::activate()
{
- remote_decorator->invoke("DuiAbstractDecorator", "RemoteActivateWindow");
+ remote_decorator->invoke("MAbstractDecorator", "RemoteActivateWindow");
}
diff --git a/src/duidecoratorframe.h b/src/mdecoratorframe.h
index c0912d9..1d3013a 100644
--- a/src/duidecoratorframe.h
+++ b/src/mdecoratorframe.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -22,15 +22,15 @@
#include <QObject>
-class DuiCompositeWindow;
-class DuiRmiClient;
+class MCompositeWindow;
+class MRmiClient;
/*!
- * DuiDecoratorFrame is a singleton class that represents the decorator process
+ * MDecoratorFrame is a singleton class that represents the decorator process
* which draws the decorations for non-DirectUI applications.
* This class handles the communication as well to the decorator.
*/
-class DuiDecoratorFrame: public QObject
+class MDecoratorFrame: public QObject
{
Q_OBJECT
public:
@@ -38,7 +38,7 @@ public:
/*!
* Singleton accessor
*/
- static DuiDecoratorFrame *instance();
+ static MDecoratorFrame *instance();
/*!
* Retuns the window id of the managed window.
@@ -75,9 +75,9 @@ public:
*/
void setDecoratorWindow(Qt::HANDLE window);
- void setDecoratorItem(DuiCompositeWindow *window);
+ void setDecoratorItem(MCompositeWindow *window);
- DuiCompositeWindow *decoratorItem() const;
+ MCompositeWindow *decoratorItem() const;
private slots:
void destroyDecorator();
@@ -85,13 +85,13 @@ private slots:
void visualizeDecorator(bool visible);
private:
- explicit DuiDecoratorFrame(QObject *object = 0);
- static DuiDecoratorFrame *d;
+ explicit MDecoratorFrame(QObject *object = 0);
+ static MDecoratorFrame *d;
Qt::HANDLE client;
Qt::HANDLE decorator_window;
- DuiCompositeWindow *decorator_item;
- DuiRmiClient *remote_decorator;
+ MCompositeWindow *decorator_item;
+ MRmiClient *remote_decorator;
};
#endif // DUIDECORATORFRAME_H
diff --git a/src/duisimplewindowframe.cpp b/src/msimplewindowframe.cpp
index a12f80e..ff12e03 100644
--- a/src/duisimplewindowframe.cpp
+++ b/src/msimplewindowframe.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -17,7 +17,7 @@
**
****************************************************************************/
-#include "duisimplewindowframe.h"
+#include "msimplewindowframe.h"
#include <QApplication>
#include <QHBoxLayout>
@@ -34,8 +34,8 @@
#include <X11/Xatom.h>
#include <X11/Xmd.h>
-QPixmap *DuiSimpleWindowFrame::homepix = 0;
-QPixmap *DuiSimpleWindowFrame::closepix = 0;
+QPixmap *MSimpleWindowFrame::homepix = 0;
+QPixmap *MSimpleWindowFrame::closepix = 0;
class SystemButton: public QLabel
{
@@ -55,7 +55,7 @@ signals:
void clicked();
};
-DuiSimpleWindowFrame::DuiSimpleWindowFrame(Qt::HANDLE w)
+MSimpleWindowFrame::MSimpleWindowFrame(Qt::HANDLE w)
: QWidget(0),
managed_window(w)
{
@@ -104,32 +104,32 @@ DuiSimpleWindowFrame::DuiSimpleWindowFrame(Qt::HANDLE w)
resize(QApplication::desktop()->size());
}
-DuiSimpleWindowFrame::~DuiSimpleWindowFrame()
+MSimpleWindowFrame::~MSimpleWindowFrame()
{
// QObject frees allocated resources
}
-void DuiSimpleWindowFrame::setDialogDecoration(bool dialogDecor)
+void MSimpleWindowFrame::setDialogDecoration(bool dialogDecor)
{
dialogDecor ? homesb->hide() : homesb->show();
}
-const QSize &DuiSimpleWindowFrame::suggestedWindowSize() const
+const QSize &MSimpleWindowFrame::suggestedWindowSize() const
{
return window_size;
}
-Qt::HANDLE DuiSimpleWindowFrame::windowArea()
+Qt::HANDLE MSimpleWindowFrame::windowArea()
{
return window_area->winId();
}
-Qt::HANDLE DuiSimpleWindowFrame::managedWindow()
+Qt::HANDLE MSimpleWindowFrame::managedWindow()
{
return managed_window;
}
-void DuiSimpleWindowFrame::minimizeWindow()
+void MSimpleWindowFrame::minimizeWindow()
{
XEvent e;
memset(&e, 0, sizeof(e));
@@ -151,7 +151,7 @@ void DuiSimpleWindowFrame::minimizeWindow()
XSync(QX11Info::display(), FALSE);
}
-void DuiSimpleWindowFrame::closeWindow()
+void MSimpleWindowFrame::closeWindow()
{
XEvent e;
memset(&e, 0, sizeof(e));
@@ -169,9 +169,9 @@ void DuiSimpleWindowFrame::closeWindow()
XSync(QX11Info::display(), FALSE);
}
-void DuiSimpleWindowFrame::setParentFrame(Qt::HANDLE frame)
+void MSimpleWindowFrame::setParentFrame(Qt::HANDLE frame)
{
parent_frame = frame;
}
-#include "duisimplewindowframe.moc"
+#include "msimplewindowframe.moc"
diff --git a/src/duisimplewindowframe.h b/src/msimplewindowframe.h
index 6a3c16e..a44c086 100644
--- a/src/duisimplewindowframe.h
+++ b/src/msimplewindowframe.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -22,27 +22,27 @@
class SystemButton;
/*!
- * DuiSimpleWindow is responsible for drawing window frames for windows
+ * MSimpleWindow is responsible for drawing window frames for windows
* which do not manage itself. It draws a simple toolbar which contains
* a close button and a minimize button.
*
*/
-class DuiSimpleWindowFrame: public QWidget
+class MSimpleWindowFrame: public QWidget
{
Q_OBJECT
public:
/*!
- * Initializes the DuiSimpleWindowFrame
+ * Initializes the MSimpleWindowFrame
*
* \param managedWindow the window that will be drawn with a frame
*/
- DuiSimpleWindowFrame(Qt::HANDLE managedWindow);
+ MSimpleWindowFrame(Qt::HANDLE managedWindow);
/*!
* Frees the resources
*/
- virtual ~DuiSimpleWindowFrame();
+ virtual ~MSimpleWindowFrame();
/*!
* Returns the suggested size of the contents of the window that
@@ -103,6 +103,6 @@ private:
static QPixmap *closepix;
#ifdef UNIT_TEST
- friend class Ut_DuiSimpleWindowFrame;
+ friend class Ut_MSimpleWindowFrame;
#endif
};
diff --git a/src/duitexturepixmapitem.h b/src/mtexturepixmapitem.h
index 83416c4..a0b9273 100644
--- a/src/duitexturepixmapitem.h
+++ b/src/mtexturepixmapitem.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -20,16 +20,16 @@
#ifndef DUITEXTUREPIXMAPITEM_H
#define DUITEXTUREPIXMAPITEM_H
-#include "duicompositewindow.h"
+#include "mcompositewindow.h"
#include <QtOpenGL>
#include <QPixmap>
#include <X11/Xutil.h>
-class DuiTexturePixmapPrivate;
+class MTexturePixmapPrivate;
/*!
- * DuiTexturePixmapItem represents an offscreen pixmap that is rendered
+ * MTexturePixmapItem represents an offscreen pixmap that is rendered
* directly as a texture. The texture is drawn as an item in a
* QGraphicsView directly using standard OpenGL / OpenGL ES2 calls without
* the use of QPainter.
@@ -38,22 +38,22 @@ class DuiTexturePixmapPrivate;
* renderer defaults to its own custom texture to pixmap routines
*
*/
-class DuiTexturePixmapItem: public DuiCompositeWindow
+class MTexturePixmapItem: public MCompositeWindow
{
public:
/*!
- * Constructs a DuiTexturePixmapItem
+ * Constructs a MTexturePixmapItem
*
* \param w the redirected window where the texture is derived.
* \param enableAlpha if the alpha component of window is rendered
* \param parent QGraphicsItem, defaults to 0
*/
- DuiTexturePixmapItem(Window window, QGLWidget *glwidget, QGraphicsItem *parent = 0);
+ MTexturePixmapItem(Window window, QGLWidget *glwidget, QGraphicsItem *parent = 0);
/*!
- * Destroys the DuiTexturePixmapItem and frees the allocated
+ * Destroys the MTexturePixmapItem and frees the allocated
* surface and texture
*/
- virtual ~DuiTexturePixmapItem();
+ virtual ~MTexturePixmapItem();
/*!
* Ensures that the corresponding texture reflects the contents of the
@@ -117,9 +117,9 @@ private:
void cleanup();
void rebindPixmap();
- DuiTexturePixmapPrivate *const d;
- friend class DuiTexturePixmapPrivate;
- friend class DuiCompositeManagerPrivate;
+ MTexturePixmapPrivate *const d;
+ friend class MTexturePixmapPrivate;
+ friend class MCompositeManagerPrivate;
};
#endif // DUIGLXTEXTUREPIXMAPITEM_H
diff --git a/src/duitexturepixmapitem_egl.cpp b/src/mtexturepixmapitem_egl.cpp
index b3da167..981e70e 100644
--- a/src/duitexturepixmapitem_egl.cpp
+++ b/src/mtexturepixmapitem_egl.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -17,8 +17,8 @@
**
****************************************************************************/
-#include "duitexturepixmapitem.h"
-#include "duitexturepixmapitem_p.h"
+#include "mtexturepixmapitem.h"
+#include "mtexturepixmapitem_p.h"
#include <QPainterPath>
#include <QRect>
@@ -104,15 +104,15 @@ public:
bool has_tfp;
};
-EglResourceManager *DuiTexturePixmapPrivate::eglresource = 0;
+EglResourceManager *MTexturePixmapPrivate::eglresource = 0;
EGLConfig EglResourceManager::config = 0;
EGLConfig EglResourceManager::configAlpha = 0;
EGLDisplay EglResourceManager::dpy = 0;
-void DuiTexturePixmapItem::init()
+void MTexturePixmapItem::init()
{
if (!d->viewable) {
- qWarning("DuiTexturePixmapItem::init(): Failed getting offscreen pixmap");
+ qWarning("MTexturePixmapItem::init(): Failed getting offscreen pixmap");
return;
}
@@ -174,7 +174,7 @@ void DuiTexturePixmapItem::init()
(EGLNativePixmapType) d->windowp,
pixmapAttribs);
if (d->glpixmap == EGL_NO_SURFACE)
- qWarning("DuiTexturePixmapItem: Cannot create EGL surface: 0x%x",
+ qWarning("MTexturePixmapItem: Cannot create EGL surface: 0x%x",
eglGetError());
d->textureId = d->eglresource->texman->getTexture();
@@ -188,19 +188,19 @@ void DuiTexturePixmapItem::init()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
}
-DuiTexturePixmapItem::DuiTexturePixmapItem(Window window, QGLWidget *glwidget, QGraphicsItem *parent)
- : DuiCompositeWindow(window, parent),
- d(new DuiTexturePixmapPrivate(window, glwidget, this))
+MTexturePixmapItem::MTexturePixmapItem(Window window, QGLWidget *glwidget, QGraphicsItem *parent)
+ : MCompositeWindow(window, parent),
+ d(new MTexturePixmapPrivate(window, glwidget, this))
{
init();
}
-void DuiTexturePixmapItem::saveBackingStore(bool renew)
+void MTexturePixmapItem::saveBackingStore(bool renew)
{
d->saveBackingStore(renew);
}
-void DuiTexturePixmapItem::rebindPixmap()
+void MTexturePixmapItem::rebindPixmap()
{
EGLint pixmapAttribs[] = {
EGL_TEXTURE_TARGET, EGL_TEXTURE_2D,
@@ -220,11 +220,11 @@ void DuiTexturePixmapItem::rebindPixmap()
(EGLNativePixmapType) d->windowp,
pixmapAttribs);
if (d->glpixmap == EGL_NO_SURFACE)
- qWarning("DuiTexturePixmapItem: Cannot renew EGL surface: 0x%x",
+ qWarning("MTexturePixmapItem: Cannot renew EGL surface: 0x%x",
eglGetError());
}
-void DuiTexturePixmapItem::enableDirectFbRendering()
+void MTexturePixmapItem::enableDirectFbRendering()
{
d->damageTracking(false);
@@ -235,7 +235,7 @@ void DuiTexturePixmapItem::enableDirectFbRendering()
// Just free the off-screen surface but re-use the
// existing texture id, so don't delete it yet.
if (eglReleaseTexImage(d->eglresource->dpy, d->glpixmap, EGL_BACK_BUFFER) == EGL_FALSE)
- qWarning("DuiTexturePixmapItem::enableDirectFbRender: "
+ qWarning("MTexturePixmapItem::enableDirectFbRender: "
"Cant release bound texture: 0x%x", eglGetError());
glBindTexture(0, 0);
@@ -251,7 +251,7 @@ void DuiTexturePixmapItem::enableDirectFbRendering()
XSync(QX11Info::display(), FALSE);
}
-void DuiTexturePixmapItem::enableRedirectedRendering()
+void MTexturePixmapItem::enableRedirectedRendering()
{
d->damageTracking(true);
@@ -266,18 +266,18 @@ void DuiTexturePixmapItem::enableRedirectedRendering()
updateWindowPixmap();
}
-bool DuiTexturePixmapItem::isDirectRendered() const
+bool MTexturePixmapItem::isDirectRendered() const
{
return d->direct_fb_render;
}
-DuiTexturePixmapItem::~DuiTexturePixmapItem()
+MTexturePixmapItem::~MTexturePixmapItem()
{
cleanup();
delete d;
}
-void DuiTexturePixmapItem::initCustomTfp()
+void MTexturePixmapItem::initCustomTfp()
{
d->ctextureId = d->eglresource->texman->getTexture();
@@ -286,7 +286,7 @@ void DuiTexturePixmapItem::initCustomTfp()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}
-void DuiTexturePixmapItem::cleanup()
+void MTexturePixmapItem::cleanup()
{
eglDestroySurface(d->eglresource->dpy, d->glpixmap);
d->glpixmap = EGL_NO_SURFACE;
@@ -304,7 +304,7 @@ void DuiTexturePixmapItem::cleanup()
XFreePixmap(QX11Info::display(), d->windowp);
}
-void DuiTexturePixmapItem::updateWindowPixmap(XRectangle *rects, int num)
+void MTexturePixmapItem::updateWindowPixmap(XRectangle *rects, int num)
{
if (isTransitioning() || d->direct_fb_render || !windowVisible())
return;
@@ -349,7 +349,7 @@ void DuiTexturePixmapItem::updateWindowPixmap(XRectangle *rects, int num)
}
}
-void DuiTexturePixmapItem::paint(QPainter *painter,
+void MTexturePixmapItem::paint(QPainter *painter,
const QStyleOptionGraphicsItem *option,
QWidget *widget)
{
@@ -401,44 +401,44 @@ void DuiTexturePixmapItem::paint(QPainter *painter,
glDisable(GL_BLEND);
}
-void DuiTexturePixmapItem::windowRaised()
+void MTexturePixmapItem::windowRaised()
{
d->windowRaised();
}
-void DuiTexturePixmapItem::resize(int w, int h)
+void MTexturePixmapItem::resize(int w, int h)
{
d->resize(w, h);
}
-QSizeF DuiTexturePixmapItem::sizeHint(Qt::SizeHint, const QSizeF &) const
+QSizeF MTexturePixmapItem::sizeHint(Qt::SizeHint, const QSizeF &) const
{
return boundingRect().size();
}
-QRectF DuiTexturePixmapItem::boundingRect() const
+QRectF MTexturePixmapItem::boundingRect() const
{
return d->brect;
}
-QPainterPath DuiTexturePixmapItem::shape() const
+QPainterPath MTexturePixmapItem::shape() const
{
QPainterPath path;
path.addRect(boundingRect());
return path;
}
-bool DuiTexturePixmapItem::hasAlpha() const
+bool MTexturePixmapItem::hasAlpha() const
{
return d->has_alpha;
}
-bool DuiTexturePixmapItem::isOverrideRedirect() const
+bool MTexturePixmapItem::isOverrideRedirect() const
{
return d->override_redirect;
}
-void DuiTexturePixmapItem::clearTexture()
+void MTexturePixmapItem::clearTexture()
{
glBindTexture(GL_TEXTURE_2D, d->custom_tfp ? d->ctextureId : d->textureId);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, 0, GL_RGBA,
diff --git a/src/duitexturepixmapitem_glx.cpp b/src/mtexturepixmapitem_glx.cpp
index 9d03e07..03b3a81 100644
--- a/src/duitexturepixmapitem_glx.cpp
+++ b/src/mtexturepixmapitem_glx.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -20,8 +20,8 @@
#define GLX_GLXEXT_PROTOTYPES 1
#define GLX_EXT_texture_from_pixmap 1
-#include "duitexturepixmapitem.h"
-#include "duitexturepixmapitem_p.h"
+#include "mtexturepixmapitem.h"
+#include "mtexturepixmapitem_p.h"
#include <QPainterPath>
#include <QRect>
@@ -82,10 +82,10 @@ static bool hasTextureFromPixmap()
}
#endif
-void DuiTexturePixmapItem::init()
+void MTexturePixmapItem::init()
{
if (!d->viewable) {
- qWarning("DuiTexturePixmapItem::init(): Failed getting offscreen pixmap");
+ qWarning("MTexturePixmapItem::init(): Failed getting offscreen pixmap");
return;
}
@@ -154,19 +154,19 @@ void DuiTexturePixmapItem::init()
glXBindTexImageEXT(QX11Info::display(), d->glpixmap, GLX_FRONT_LEFT_EXT, NULL);
}
-DuiTexturePixmapItem::DuiTexturePixmapItem(Window window, QGLWidget *glwidget, QGraphicsItem *parent)
- : DuiCompositeWindow(window, parent),
- d(new DuiTexturePixmapPrivate(window, glwidget, this))
+MTexturePixmapItem::MTexturePixmapItem(Window window, QGLWidget *glwidget, QGraphicsItem *parent)
+ : MCompositeWindow(window, parent),
+ d(new MTexturePixmapPrivate(window, glwidget, this))
{
init();
}
-void DuiTexturePixmapItem::saveBackingStore(bool renew)
+void MTexturePixmapItem::saveBackingStore(bool renew)
{
d->saveBackingStore(renew);
}
-void DuiTexturePixmapItem::rebindPixmap()
+void MTexturePixmapItem::rebindPixmap()
{
static const int pixmapAttribs[] = {
GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT,
@@ -184,7 +184,7 @@ void DuiTexturePixmapItem::rebindPixmap()
}
}
-void DuiTexturePixmapItem::enableDirectFbRendering()
+void MTexturePixmapItem::enableDirectFbRendering()
{
d->damageTracking(false);
@@ -210,7 +210,7 @@ void DuiTexturePixmapItem::enableDirectFbRendering()
XSync(QX11Info::display(), FALSE);
}
-void DuiTexturePixmapItem::enableRedirectedRendering()
+void MTexturePixmapItem::enableRedirectedRendering()
{
d->damageTracking(true);
@@ -225,18 +225,18 @@ void DuiTexturePixmapItem::enableRedirectedRendering()
updateWindowPixmap();
}
-bool DuiTexturePixmapItem::isDirectRendered() const
+bool MTexturePixmapItem::isDirectRendered() const
{
return d->direct_fb_render;
}
-DuiTexturePixmapItem::~DuiTexturePixmapItem()
+MTexturePixmapItem::~MTexturePixmapItem()
{
cleanup();
delete d;
}
-void DuiTexturePixmapItem::initCustomTfp()
+void MTexturePixmapItem::initCustomTfp()
{
glGenTextures(1, &d->ctextureId);
@@ -247,7 +247,7 @@ void DuiTexturePixmapItem::initCustomTfp()
d->inverted_texture = false;
}
-void DuiTexturePixmapItem::cleanup()
+void MTexturePixmapItem::cleanup()
{
if (!d->custom_tfp) {
glXReleaseTexImageEXT(QX11Info::display(), d->glpixmap, GLX_FRONT_LEFT_EXT);
@@ -260,7 +260,7 @@ void DuiTexturePixmapItem::cleanup()
XFreePixmap(QX11Info::display(), d->windowp);
}
-void DuiTexturePixmapItem::updateWindowPixmap(XRectangle *rects, int num)
+void MTexturePixmapItem::updateWindowPixmap(XRectangle *rects, int num)
{
Q_UNUSED(rects);
Q_UNUSED(num);
@@ -280,7 +280,7 @@ void DuiTexturePixmapItem::updateWindowPixmap(XRectangle *rects, int num)
update();
}
-void DuiTexturePixmapItem::paint(QPainter *painter,
+void MTexturePixmapItem::paint(QPainter *painter,
const QStyleOptionGraphicsItem *option,
QWidget *widget)
{
@@ -317,44 +317,44 @@ void DuiTexturePixmapItem::paint(QPainter *painter,
}
-void DuiTexturePixmapItem::windowRaised()
+void MTexturePixmapItem::windowRaised()
{
d->windowRaised();
}
-void DuiTexturePixmapItem::resize(int w, int h)
+void MTexturePixmapItem::resize(int w, int h)
{
d->resize(w, h);
}
-QSizeF DuiTexturePixmapItem::sizeHint(Qt::SizeHint, const QSizeF &) const
+QSizeF MTexturePixmapItem::sizeHint(Qt::SizeHint, const QSizeF &) const
{
return boundingRect().size();
}
-QRectF DuiTexturePixmapItem::boundingRect() const
+QRectF MTexturePixmapItem::boundingRect() const
{
return d->brect;
}
-QPainterPath DuiTexturePixmapItem::shape() const
+QPainterPath MTexturePixmapItem::shape() const
{
QPainterPath path;
path.addRect(boundingRect());
return path;
}
-bool DuiTexturePixmapItem::hasAlpha() const
+bool MTexturePixmapItem::hasAlpha() const
{
return d->has_alpha;
}
-bool DuiTexturePixmapItem::isOverrideRedirect() const
+bool MTexturePixmapItem::isOverrideRedirect() const
{
return d->override_redirect;
}
-void DuiTexturePixmapItem::clearTexture()
+void MTexturePixmapItem::clearTexture()
{
glBindTexture(GL_TEXTURE_2D, d->custom_tfp ? d->ctextureId : d->textureId);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, 0, GL_RGBA,
diff --git a/src/duitexturepixmapitem_p.cpp b/src/mtexturepixmapitem_p.cpp
index 6303b26..d079c86 100644
--- a/src/duitexturepixmapitem_p.cpp
+++ b/src/mtexturepixmapitem_p.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -20,7 +20,7 @@
#ifdef DESKTOP_VERSION
#define GL_GLEXT_PROTOTYPES 1
#endif
-#include "duitexturepixmapitem.h"
+#include "mtexturepixmapitem.h"
#include "texturepixmapshaders.h"
#include <QX11Info>
@@ -38,10 +38,10 @@
#include <GL/glxext.h>
#endif
-#include "duitexturepixmapitem_p.h"
+#include "mtexturepixmapitem_p.h"
-bool DuiTexturePixmapPrivate::inverted_texture = true;
-DuiGLResourceManager *DuiTexturePixmapPrivate::glresource = 0;
+bool MTexturePixmapPrivate::inverted_texture = true;
+MGLResourceManager *MTexturePixmapPrivate::glresource = 0;
static const GLuint D_VERTEX_COORDS = 0;
static const GLuint D_TEXTURE_COORDS = 1;
@@ -54,7 +54,7 @@ static void bindAttribLocation(QGLShaderProgram *p, const char *attrib, int loca
}
// OpenGL ES 2.0 / OpenGL 2.0 - compatible texture painter
-class DuiGLResourceManager: public QObject
+class MGLResourceManager: public QObject
{
public:
@@ -65,7 +65,7 @@ public:
ShaderTotal
};
- DuiGLResourceManager(QGLWidget *glwidget)
+ MGLResourceManager(QGLWidget *glwidget)
: QObject(glwidget),
currentShader(0) {
QGLShader *sharedVertexShader = new QGLShader(QGLShader::Vertex,
@@ -160,19 +160,19 @@ private:
int width;
int height;
- friend class DuiTexturePixmapPrivate;
+ friend class MTexturePixmapPrivate;
};
-QGLShaderProgram *DuiGLResourceManager::shader[ShaderTotal];
+QGLShaderProgram *MGLResourceManager::shader[ShaderTotal];
#endif
-void DuiTexturePixmapPrivate::drawTexture(const QTransform &transform, const QRectF &drawRect, qreal opacity)
+void MTexturePixmapPrivate::drawTexture(const QTransform &transform, const QRectF &drawRect, qreal opacity)
{
glwidget->makeCurrent();
// TODO only update if matrix is dirty
glresource->updateVertices(transform, item->blurred() ?
- DuiGLResourceManager::BlurShader :
- DuiGLResourceManager::NormalShader);
+ MGLResourceManager::BlurShader :
+ MGLResourceManager::NormalShader);
GLfloat vertexCoords[] = {
drawRect.left(), drawRect.top(),
drawRect.left(), drawRect.bottom(),
@@ -201,10 +201,10 @@ void DuiTexturePixmapPrivate::drawTexture(const QTransform &transform, const QRe
glActiveTexture(GL_TEXTURE0);
}
-void DuiTexturePixmapPrivate::init()
+void MTexturePixmapPrivate::init()
{
if (!glresource) {
- glresource = new DuiGLResourceManager(glwidget);
+ glresource = new MGLResourceManager(glwidget);
glresource->initVertices(glwidget);
}
@@ -225,7 +225,7 @@ void DuiTexturePixmapPrivate::init()
item->setPos(a.x, a.y);
}
-DuiTexturePixmapPrivate::DuiTexturePixmapPrivate(Qt::HANDLE window, QGLWidget *w, DuiTexturePixmapItem *p)
+MTexturePixmapPrivate::MTexturePixmapPrivate(Qt::HANDLE window, QGLWidget *w, MTexturePixmapItem *p)
: ctx(0),
glwidget(w),
window(window),
@@ -242,12 +242,12 @@ DuiTexturePixmapPrivate::DuiTexturePixmapPrivate(Qt::HANDLE window, QGLWidget *w
init();
}
-DuiTexturePixmapPrivate::~DuiTexturePixmapPrivate()
+MTexturePixmapPrivate::~MTexturePixmapPrivate()
{
damageTracking(false);
}
-void DuiTexturePixmapPrivate::damageTracking(bool enabled)
+void MTexturePixmapPrivate::damageTracking(bool enabled)
{
if (enabled) {
if (!damage_object)
@@ -261,7 +261,7 @@ void DuiTexturePixmapPrivate::damageTracking(bool enabled)
}
}
-void DuiTexturePixmapPrivate::saveBackingStore(bool renew)
+void MTexturePixmapPrivate::saveBackingStore(bool renew)
{
XWindowAttributes a;
if (!XGetWindowAttributes(QX11Info::display(), item->window(), &a)) {
@@ -281,12 +281,12 @@ void DuiTexturePixmapPrivate::saveBackingStore(bool renew)
XSync(QX11Info::display(), FALSE);
}
-void DuiTexturePixmapPrivate::windowRaised()
+void MTexturePixmapPrivate::windowRaised()
{
XRaiseWindow(QX11Info::display(), item->window());
}
-void DuiTexturePixmapPrivate::resize(int w, int h)
+void MTexturePixmapPrivate::resize(int w, int h)
{
if (!brect.isEmpty() && !item->isDirectRendered() && (brect.width() != w || brect.height() != h)) {
item->saveBackingStore(true);
@@ -296,12 +296,12 @@ void DuiTexturePixmapPrivate::resize(int w, int h)
brect.setHeight(h);
}
-bool DuiTexturePixmapPrivate::hasAlpha() const
+bool MTexturePixmapPrivate::hasAlpha() const
{
return has_alpha;
}
-bool DuiTexturePixmapPrivate::isOverrideRedirect() const
+bool MTexturePixmapPrivate::isOverrideRedirect() const
{
return override_redirect;
}
diff --git a/src/duitexturepixmapitem_p.h b/src/mtexturepixmapitem_p.h
index 9e3a5a4..44b751e 100644
--- a/src/duitexturepixmapitem_p.h
+++ b/src/mtexturepixmapitem_p.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
@@ -38,18 +38,18 @@ class EglResourceManager;
class QGLWidget;
class QGraphicsItem;
-class DuiTexturePixmapItem;
+class MTexturePixmapItem;
class QGLContext;
-class DuiGLResourceManager;
+class MGLResourceManager;
-/*! Internal private implementation of DuiTexturePixmapItem
+/*! Internal private implementation of MTexturePixmapItem
Warning! Interface here may change at any time!
*/
-class DuiTexturePixmapPrivate
+class MTexturePixmapPrivate
{
public:
- DuiTexturePixmapPrivate(Window window, QGLWidget *w, DuiTexturePixmapItem *item);
- ~DuiTexturePixmapPrivate();
+ MTexturePixmapPrivate(Window window, QGLWidget *w, MTexturePixmapItem *item);
+ ~MTexturePixmapPrivate();
void init();
void updateWindowPixmap(XRectangle *rects = 0, int num = 0);
void saveBackingStore(bool renew = false);
@@ -81,12 +81,12 @@ public:
qreal angle;
Damage damage_object;
- DuiTexturePixmapItem *item;
+ MTexturePixmapItem *item;
#ifdef GLES2_VERSION
static EglResourceManager *eglresource;
#endif
- static DuiGLResourceManager* glresource;
+ static MGLResourceManager* glresource;
};
#endif //DUITEXTUREPIXMAPITEM_P_H
diff --git a/src/src.pro b/src/src.pro
index bc514f0..154a7ef 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,54 +1,50 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Mon Oct 20 16:08:50 2008
-######################################################################
-
-include(../duiconfig.pri)
+include(../meegotouch_config.pri)
contains(QT_CONFIG, opengles2) {
DEFINES += GLES2_VERSION
- SOURCES += duitexturepixmapitem_egl.cpp
+ SOURCES += mtexturepixmapitem_egl.cpp
} else {
DEFINES += DESKTOP_VERSION
- SOURCES += duitexturepixmapitem_glx.cpp
+ SOURCES += mtexturepixmapitem_glx.cpp
}
-exists($$DUI_PREFIX/include/X11/extensions/shapeconst.h) {
+exists($$M_PREFIX/include/X11/extensions/shapeconst.h) {
DEFINES += HAVE_SHAPECONST
}
TEMPLATE = app
-TARGET = duicompositor
+TARGET = mcompositor
DEPENDPATH += .
QT += dbus
# Input
INCLUDEPATH += ../decorators/libdecorator/
HEADERS += \
- duitexturepixmapitem.h \
- duicompositescene.h \
- duicompositewindow.h \
- duicompwindowanimator.h \
- duicompositemanager.h \
- duisimplewindowframe.h \
- duicompositemanager_p.h \
- duidecoratorframe.h
+ mtexturepixmapitem.h \
+ mcompositescene.h \
+ mcompositewindow.h \
+ mcompwindowanimator.h \
+ mcompositemanager.h \
+ msimplewindowframe.h \
+ mcompositemanager_p.h \
+ mdecoratorframe.h
SOURCES += \
- main.cpp \
- duitexturepixmapitem_p.cpp \
- duicompositescene.cpp \
- duicompositewindow.cpp \
- duicompwindowanimator.cpp \
- duicompositemanager.cpp \
- duisimplewindowframe.cpp \
- duidecoratorframe.cpp
+ main.cpp \
+ mtexturepixmapitem_p.cpp \
+ mcompositescene.cpp \
+ mcompositewindow.cpp \
+ mcompwindowanimator.cpp \
+ mcompositemanager.cpp \
+ msimplewindowframe.cpp \
+ mdecoratorframe.cpp
RESOURCES = tools.qrc
CONFIG += release
QT += core gui opengl
-target.path += $$DUI_INSTALL_BIN
+target.path += $$M_INSTALL_BIN
INSTALLS += target
LIBS += -lXdamage -lXcomposite -lXfixes ../decorators/libdecorator/libdecorator.so
diff --git a/src/texturepixmapshaders.h b/src/texturepixmapshaders.h
index 9b4a648..9aebccc 100644
--- a/src/texturepixmapshaders.h
+++ b/src/texturepixmapshaders.h
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
-** This file is part of duicompositor.
+** This file is part of mcompositor.
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 08:04:39 +0000