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

86 lines
2 KiB
C++
Raw Normal View History

scene: Introduce window items Currently, dealing with sub-surfaces is very difficult due to the scene design being heavily influenced by X11 requirements. The goal of this change is to re-work scene abstractions to make improving the wayland support easier. The Item class is based on the QQuickItem class. My hope is that one day we will be able to transition to QtQuick for painting scene, but in meanwhile it makes more sense to have a minimalistic internal item class. The WindowItem class represents a window. The SurfaceItem class represents the contents of either an X11, or a Wayland, or an internal surface. The DecorationItem and the ShadowItem class represent the server-side deco and drop-shadow, respectively. At the moment, the SurfaceItem is bound to the scene window, but the long term plan is to break that connection so we could re-use the SurfaceItem for things such as software cursors and drag-and-drop additional icons. One of the responsibilities of the Item is to schedule repaints as needed. Ideally, there shouldn't be any addRepaint() calls in the core code. The Item class schedules repaints on geometry updates. In the future, it also has to request an update if its opacity or visibility changes.
2021-02-04 09:07:20 +00:00
/*
SPDX-FileCopyrightText: 2021 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "surfaceitem_internal.h"
Decouple window pixmaps from scene windows One of the scene redesign goals is to make wayland surface items re-usable. So we have the same rendering path for drag-and-drop icons, software cursors, and window surfaces. The biggest issue at the moment is that window pixmaps are tightly coupled with scene windows. This change de-couples window pixmaps from scene windows. In order to achieve that, some architecture changes were made. The WindowPixmap class was replaced with the SurfacePixmap class. A surface pixmap is created by a surface item. Under the hood, a SurfacePixmap will create a PlatformSurfaceTexture object, which contains all the information necessary for the renderer. The SceneOpenGLTexture class was removed. However, the GLX and the EGL on X11 backends still mess with GLTexture's internals.
2021-04-09 07:06:04 +00:00
#include "composite.h"
#include "scene.h"
scene: Introduce window items Currently, dealing with sub-surfaces is very difficult due to the scene design being heavily influenced by X11 requirements. The goal of this change is to re-work scene abstractions to make improving the wayland support easier. The Item class is based on the QQuickItem class. My hope is that one day we will be able to transition to QtQuick for painting scene, but in meanwhile it makes more sense to have a minimalistic internal item class. The WindowItem class represents a window. The SurfaceItem class represents the contents of either an X11, or a Wayland, or an internal surface. The DecorationItem and the ShadowItem class represent the server-side deco and drop-shadow, respectively. At the moment, the SurfaceItem is bound to the scene window, but the long term plan is to break that connection so we could re-use the SurfaceItem for things such as software cursors and drag-and-drop additional icons. One of the responsibilities of the Item is to schedule repaints as needed. Ideally, there shouldn't be any addRepaint() calls in the core code. The Item class schedules repaints on geometry updates. In the future, it also has to request an update if its opacity or visibility changes.
2021-02-04 09:07:20 +00:00
namespace KWin
{
Remove scene window traces in scene items This further decouples scene items from scene windows. The SurfaceItem still needs to access the underlying window, I would like to re-iterate over that later. With this change, it will be possible to introduce WindowItem factory function in the Toplevel class.
2021-08-12 09:07:38 +00:00
SurfaceItemInternal::SurfaceItemInternal(Toplevel *window, Item *parent)
scene: Introduce window items Currently, dealing with sub-surfaces is very difficult due to the scene design being heavily influenced by X11 requirements. The goal of this change is to re-work scene abstractions to make improving the wayland support easier. The Item class is based on the QQuickItem class. My hope is that one day we will be able to transition to QtQuick for painting scene, but in meanwhile it makes more sense to have a minimalistic internal item class. The WindowItem class represents a window. The SurfaceItem class represents the contents of either an X11, or a Wayland, or an internal surface. The DecorationItem and the ShadowItem class represent the server-side deco and drop-shadow, respectively. At the moment, the SurfaceItem is bound to the scene window, but the long term plan is to break that connection so we could re-use the SurfaceItem for things such as software cursors and drag-and-drop additional icons. One of the responsibilities of the Item is to schedule repaints as needed. Ideally, there shouldn't be any addRepaint() calls in the core code. The Item class schedules repaints on geometry updates. In the future, it also has to request an update if its opacity or visibility changes.
2021-02-04 09:07:20 +00:00
: SurfaceItem(window, parent)
{
Remove scene window traces in scene items This further decouples scene items from scene windows. The SurfaceItem still needs to access the underlying window, I would like to re-iterate over that later. With this change, it will be possible to introduce WindowItem factory function in the Toplevel class.
2021-08-12 09:07:38 +00:00
connect(window, &Toplevel::bufferGeometryChanged,
scene: Introduce window items Currently, dealing with sub-surfaces is very difficult due to the scene design being heavily influenced by X11 requirements. The goal of this change is to re-work scene abstractions to make improving the wayland support easier. The Item class is based on the QQuickItem class. My hope is that one day we will be able to transition to QtQuick for painting scene, but in meanwhile it makes more sense to have a minimalistic internal item class. The WindowItem class represents a window. The SurfaceItem class represents the contents of either an X11, or a Wayland, or an internal surface. The DecorationItem and the ShadowItem class represent the server-side deco and drop-shadow, respectively. At the moment, the SurfaceItem is bound to the scene window, but the long term plan is to break that connection so we could re-use the SurfaceItem for things such as software cursors and drag-and-drop additional icons. One of the responsibilities of the Item is to schedule repaints as needed. Ideally, there shouldn't be any addRepaint() calls in the core code. The Item class schedules repaints on geometry updates. In the future, it also has to request an update if its opacity or visibility changes.
2021-02-04 09:07:20 +00:00
this, &SurfaceItemInternal::handleBufferGeometryChanged);
Remove scene window traces in scene items This further decouples scene items from scene windows. The SurfaceItem still needs to access the underlying window, I would like to re-iterate over that later. With this change, it will be possible to introduce WindowItem factory function in the Toplevel class.
2021-08-12 09:07:38 +00:00
setSize(window->bufferGeometry().size());
scene: Introduce window items Currently, dealing with sub-surfaces is very difficult due to the scene design being heavily influenced by X11 requirements. The goal of this change is to re-work scene abstractions to make improving the wayland support easier. The Item class is based on the QQuickItem class. My hope is that one day we will be able to transition to QtQuick for painting scene, but in meanwhile it makes more sense to have a minimalistic internal item class. The WindowItem class represents a window. The SurfaceItem class represents the contents of either an X11, or a Wayland, or an internal surface. The DecorationItem and the ShadowItem class represent the server-side deco and drop-shadow, respectively. At the moment, the SurfaceItem is bound to the scene window, but the long term plan is to break that connection so we could re-use the SurfaceItem for things such as software cursors and drag-and-drop additional icons. One of the responsibilities of the Item is to schedule repaints as needed. Ideally, there shouldn't be any addRepaint() calls in the core code. The Item class schedules repaints on geometry updates. In the future, it also has to request an update if its opacity or visibility changes.
2021-02-04 09:07:20 +00:00
wayland: Cache last surface-to-buffer matrix If window quads need to be generated after the wl_surface is destroyed, the SurfaceItemWayland::mapToBuffer() function will return wrong values. In order to fix that, we need to store the last surface-to-buffer matrix in SurfaceItem.
2021-07-21 19:25:42 +00:00
// The device pixel ratio of the internal window is static.
QMatrix4x4 surfaceToBufferMatrix;
Remove scene window traces in scene items This further decouples scene items from scene windows. The SurfaceItem still needs to access the underlying window, I would like to re-iterate over that later. With this change, it will be possible to introduce WindowItem factory function in the Toplevel class.
2021-08-12 09:07:38 +00:00
surfaceToBufferMatrix.scale(window->bufferScale());
wayland: Cache last surface-to-buffer matrix If window quads need to be generated after the wl_surface is destroyed, the SurfaceItemWayland::mapToBuffer() function will return wrong values. In order to fix that, we need to store the last surface-to-buffer matrix in SurfaceItem.
2021-07-21 19:25:42 +00:00
setSurfaceToBufferMatrix(surfaceToBufferMatrix);
scene: Introduce window items Currently, dealing with sub-surfaces is very difficult due to the scene design being heavily influenced by X11 requirements. The goal of this change is to re-work scene abstractions to make improving the wayland support easier. The Item class is based on the QQuickItem class. My hope is that one day we will be able to transition to QtQuick for painting scene, but in meanwhile it makes more sense to have a minimalistic internal item class. The WindowItem class represents a window. The SurfaceItem class represents the contents of either an X11, or a Wayland, or an internal surface. The DecorationItem and the ShadowItem class represent the server-side deco and drop-shadow, respectively. At the moment, the SurfaceItem is bound to the scene window, but the long term plan is to break that connection so we could re-use the SurfaceItem for things such as software cursors and drag-and-drop additional icons. One of the responsibilities of the Item is to schedule repaints as needed. Ideally, there shouldn't be any addRepaint() calls in the core code. The Item class schedules repaints on geometry updates. In the future, it also has to request an update if its opacity or visibility changes.
2021-02-04 09:07:20 +00:00
}
QRegion SurfaceItemInternal::shape() const
{
Remove unused geometry setters in Item Originally, only x, y, width, and height property setters were used. A bit later "position" and "size" helper setters were added to simplify code in SurfaceItem sub-classes. It seems like setX(), setY(), setWidth(), and setHeight() are unused now, so remove them.
2021-07-05 17:40:47 +00:00
return QRegion(rect());
scene: Introduce window items Currently, dealing with sub-surfaces is very difficult due to the scene design being heavily influenced by X11 requirements. The goal of this change is to re-work scene abstractions to make improving the wayland support easier. The Item class is based on the QQuickItem class. My hope is that one day we will be able to transition to QtQuick for painting scene, but in meanwhile it makes more sense to have a minimalistic internal item class. The WindowItem class represents a window. The SurfaceItem class represents the contents of either an X11, or a Wayland, or an internal surface. The DecorationItem and the ShadowItem class represent the server-side deco and drop-shadow, respectively. At the moment, the SurfaceItem is bound to the scene window, but the long term plan is to break that connection so we could re-use the SurfaceItem for things such as software cursors and drag-and-drop additional icons. One of the responsibilities of the Item is to schedule repaints as needed. Ideally, there shouldn't be any addRepaint() calls in the core code. The Item class schedules repaints on geometry updates. In the future, it also has to request an update if its opacity or visibility changes.
2021-02-04 09:07:20 +00:00
}
Decouple window pixmaps from scene windows One of the scene redesign goals is to make wayland surface items re-usable. So we have the same rendering path for drag-and-drop icons, software cursors, and window surfaces. The biggest issue at the moment is that window pixmaps are tightly coupled with scene windows. This change de-couples window pixmaps from scene windows. In order to achieve that, some architecture changes were made. The WindowPixmap class was replaced with the SurfacePixmap class. A surface pixmap is created by a surface item. Under the hood, a SurfacePixmap will create a PlatformSurfaceTexture object, which contains all the information necessary for the renderer. The SceneOpenGLTexture class was removed. However, the GLX and the EGL on X11 backends still mess with GLTexture's internals.
2021-04-09 07:06:04 +00:00
SurfacePixmap *SurfaceItemInternal::createPixmap()
scene: Introduce window items Currently, dealing with sub-surfaces is very difficult due to the scene design being heavily influenced by X11 requirements. The goal of this change is to re-work scene abstractions to make improving the wayland support easier. The Item class is based on the QQuickItem class. My hope is that one day we will be able to transition to QtQuick for painting scene, but in meanwhile it makes more sense to have a minimalistic internal item class. The WindowItem class represents a window. The SurfaceItem class represents the contents of either an X11, or a Wayland, or an internal surface. The DecorationItem and the ShadowItem class represent the server-side deco and drop-shadow, respectively. At the moment, the SurfaceItem is bound to the scene window, but the long term plan is to break that connection so we could re-use the SurfaceItem for things such as software cursors and drag-and-drop additional icons. One of the responsibilities of the Item is to schedule repaints as needed. Ideally, there shouldn't be any addRepaint() calls in the core code. The Item class schedules repaints on geometry updates. In the future, it also has to request an update if its opacity or visibility changes.
2021-02-04 09:07:20 +00:00
{
Decouple window pixmaps from scene windows One of the scene redesign goals is to make wayland surface items re-usable. So we have the same rendering path for drag-and-drop icons, software cursors, and window surfaces. The biggest issue at the moment is that window pixmaps are tightly coupled with scene windows. This change de-couples window pixmaps from scene windows. In order to achieve that, some architecture changes were made. The WindowPixmap class was replaced with the SurfacePixmap class. A surface pixmap is created by a surface item. Under the hood, a SurfacePixmap will create a PlatformSurfaceTexture object, which contains all the information necessary for the renderer. The SceneOpenGLTexture class was removed. However, the GLX and the EGL on X11 backends still mess with GLTexture's internals.
2021-04-09 07:06:04 +00:00
return new SurfacePixmapInternal(this);
scene: Introduce window items Currently, dealing with sub-surfaces is very difficult due to the scene design being heavily influenced by X11 requirements. The goal of this change is to re-work scene abstractions to make improving the wayland support easier. The Item class is based on the QQuickItem class. My hope is that one day we will be able to transition to QtQuick for painting scene, but in meanwhile it makes more sense to have a minimalistic internal item class. The WindowItem class represents a window. The SurfaceItem class represents the contents of either an X11, or a Wayland, or an internal surface. The DecorationItem and the ShadowItem class represent the server-side deco and drop-shadow, respectively. At the moment, the SurfaceItem is bound to the scene window, but the long term plan is to break that connection so we could re-use the SurfaceItem for things such as software cursors and drag-and-drop additional icons. One of the responsibilities of the Item is to schedule repaints as needed. Ideally, there shouldn't be any addRepaint() calls in the core code. The Item class schedules repaints on geometry updates. In the future, it also has to request an update if its opacity or visibility changes.
2021-02-04 09:07:20 +00:00
}
void SurfaceItemInternal::handleBufferGeometryChanged(Toplevel *toplevel, const QRect &old)
{
if (toplevel->bufferGeometry().size() != old.size()) {
discardPixmap();
}
setSize(toplevel->bufferGeometry().size());
}
Decouple window pixmaps from scene windows One of the scene redesign goals is to make wayland surface items re-usable. So we have the same rendering path for drag-and-drop icons, software cursors, and window surfaces. The biggest issue at the moment is that window pixmaps are tightly coupled with scene windows. This change de-couples window pixmaps from scene windows. In order to achieve that, some architecture changes were made. The WindowPixmap class was replaced with the SurfacePixmap class. A surface pixmap is created by a surface item. Under the hood, a SurfacePixmap will create a PlatformSurfaceTexture object, which contains all the information necessary for the renderer. The SceneOpenGLTexture class was removed. However, the GLX and the EGL on X11 backends still mess with GLTexture's internals.
2021-04-09 07:06:04 +00:00
SurfacePixmapInternal::SurfacePixmapInternal(SurfaceItemInternal *item, QObject *parent)
Rename PlatformSurfaceTexture to SurfaceTexture This is, primarily, to make naming consistent with SurfaceItem, SurfacePixmap and just "Surface" in the future.
2021-10-20 14:58:58 +00:00
: SurfacePixmap(Compositor::self()->scene()->createSurfaceTextureInternal(this), parent)
Decouple window pixmaps from scene windows One of the scene redesign goals is to make wayland surface items re-usable. So we have the same rendering path for drag-and-drop icons, software cursors, and window surfaces. The biggest issue at the moment is that window pixmaps are tightly coupled with scene windows. This change de-couples window pixmaps from scene windows. In order to achieve that, some architecture changes were made. The WindowPixmap class was replaced with the SurfacePixmap class. A surface pixmap is created by a surface item. Under the hood, a SurfacePixmap will create a PlatformSurfaceTexture object, which contains all the information necessary for the renderer. The SceneOpenGLTexture class was removed. However, the GLX and the EGL on X11 backends still mess with GLTexture's internals.
2021-04-09 07:06:04 +00:00
, m_item(item)
{
}
QOpenGLFramebufferObject *SurfacePixmapInternal::fbo() const
{
return m_fbo.data();
}
QImage SurfacePixmapInternal::image() const
{
return m_rasterBuffer;
}
void SurfacePixmapInternal::create()
{
update();
}
void SurfacePixmapInternal::update()
{
Remove scene window traces in scene items This further decouples scene items from scene windows. The SurfaceItem still needs to access the underlying window, I would like to re-iterate over that later. With this change, it will be possible to introduce WindowItem factory function in the Toplevel class.
2021-08-12 09:07:38 +00:00
const Toplevel *window = m_item->window();
Decouple window pixmaps from scene windows One of the scene redesign goals is to make wayland surface items re-usable. So we have the same rendering path for drag-and-drop icons, software cursors, and window surfaces. The biggest issue at the moment is that window pixmaps are tightly coupled with scene windows. This change de-couples window pixmaps from scene windows. In order to achieve that, some architecture changes were made. The WindowPixmap class was replaced with the SurfacePixmap class. A surface pixmap is created by a surface item. Under the hood, a SurfacePixmap will create a PlatformSurfaceTexture object, which contains all the information necessary for the renderer. The SceneOpenGLTexture class was removed. However, the GLX and the EGL on X11 backends still mess with GLTexture's internals.
2021-04-09 07:06:04 +00:00
Remove scene window traces in scene items This further decouples scene items from scene windows. The SurfaceItem still needs to access the underlying window, I would like to re-iterate over that later. With this change, it will be possible to introduce WindowItem factory function in the Toplevel class.
2021-08-12 09:07:38 +00:00
if (window->internalFramebufferObject()) {
m_fbo = window->internalFramebufferObject();
Decouple window pixmaps from scene windows One of the scene redesign goals is to make wayland surface items re-usable. So we have the same rendering path for drag-and-drop icons, software cursors, and window surfaces. The biggest issue at the moment is that window pixmaps are tightly coupled with scene windows. This change de-couples window pixmaps from scene windows. In order to achieve that, some architecture changes were made. The WindowPixmap class was replaced with the SurfacePixmap class. A surface pixmap is created by a surface item. Under the hood, a SurfacePixmap will create a PlatformSurfaceTexture object, which contains all the information necessary for the renderer. The SceneOpenGLTexture class was removed. However, the GLX and the EGL on X11 backends still mess with GLTexture's internals.
2021-04-09 07:06:04 +00:00
m_hasAlphaChannel = true;
Remove scene window traces in scene items This further decouples scene items from scene windows. The SurfaceItem still needs to access the underlying window, I would like to re-iterate over that later. With this change, it will be possible to introduce WindowItem factory function in the Toplevel class.
2021-08-12 09:07:38 +00:00
} else if (!window->internalImageObject().isNull()) {
m_rasterBuffer = window->internalImageObject();
Decouple window pixmaps from scene windows One of the scene redesign goals is to make wayland surface items re-usable. So we have the same rendering path for drag-and-drop icons, software cursors, and window surfaces. The biggest issue at the moment is that window pixmaps are tightly coupled with scene windows. This change de-couples window pixmaps from scene windows. In order to achieve that, some architecture changes were made. The WindowPixmap class was replaced with the SurfacePixmap class. A surface pixmap is created by a surface item. Under the hood, a SurfacePixmap will create a PlatformSurfaceTexture object, which contains all the information necessary for the renderer. The SceneOpenGLTexture class was removed. However, the GLX and the EGL on X11 backends still mess with GLTexture's internals.
2021-04-09 07:06:04 +00:00
m_hasAlphaChannel = m_rasterBuffer.hasAlphaChannel();
}
}
bool SurfacePixmapInternal::isValid() const
{
return !m_fbo.isNull() || !m_rasterBuffer.isNull();
}
scene: Introduce window items Currently, dealing with sub-surfaces is very difficult due to the scene design being heavily influenced by X11 requirements. The goal of this change is to re-work scene abstractions to make improving the wayland support easier. The Item class is based on the QQuickItem class. My hope is that one day we will be able to transition to QtQuick for painting scene, but in meanwhile it makes more sense to have a minimalistic internal item class. The WindowItem class represents a window. The SurfaceItem class represents the contents of either an X11, or a Wayland, or an internal surface. The DecorationItem and the ShadowItem class represent the server-side deco and drop-shadow, respectively. At the moment, the SurfaceItem is bound to the scene window, but the long term plan is to break that connection so we could re-use the SurfaceItem for things such as software cursors and drag-and-drop additional icons. One of the responsibilities of the Item is to schedule repaints as needed. Ideally, there shouldn't be any addRepaint() calls in the core code. The Item class schedules repaints on geometry updates. In the future, it also has to request an update if its opacity or visibility changes.
2021-02-04 09:07:20 +00:00
} // namespace KWin
Reference in a new issue Copy permalink