Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KWayland Server
Commits
deb3bab9
Commit
deb3bab9
authored
Jul 04, 2020
by
Vlad Zahorodnii
Browse files
Port the wl_compositor wrapper to the new approach
parent
fb9846c5
Changes
35
Hide whitespace changes
Inline
Side-by-side
autotests/client/test_compositor.cpp
View file @
deb3bab9
...
...
@@ -77,10 +77,6 @@ void TestCompositor::init()
// here we need a shm pool
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
QVERIFY
(
m_compositorInterface
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
QVERIFY
(
compositorSpy
.
wait
());
m_compositor
=
registry
.
createCompositor
(
compositorSpy
.
first
().
first
().
value
<
quint32
>
(),
compositorSpy
.
first
().
last
().
value
<
quint32
>
(),
this
);
}
...
...
autotests/client/test_datadevice.cpp
View file @
deb3bab9
...
...
@@ -122,9 +122,6 @@ void TestDataDevice::init()
QVERIFY
(
pointerChangedSpy
.
wait
());
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
QVERIFY
(
compositorSpy
.
wait
());
m_compositor
=
registry
.
createCompositor
(
compositorSpy
.
first
().
first
().
value
<
quint32
>
(),
compositorSpy
.
first
().
last
().
value
<
quint32
>
(),
this
);
...
...
autotests/client/test_drag_drop.cpp
View file @
deb3bab9
...
...
@@ -78,8 +78,6 @@ void TestDragAndDrop::init()
m_connection
->
setSocketName
(
s_socketName
);
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
m_seatInterface
=
m_display
->
createSeat
(
m_display
);
m_seatInterface
->
setHasPointer
(
true
);
m_seatInterface
->
setHasTouch
(
true
);
...
...
autotests/client/test_error.cpp
View file @
deb3bab9
...
...
@@ -56,7 +56,6 @@ void ErrorTest::init()
QVERIFY
(
m_display
->
isRunning
());
m_display
->
createShm
();
m_ci
=
m_display
->
createCompositor
(
m_display
);
m_ci
->
create
();
m_psi
=
m_display
->
createPlasmaShell
(
m_display
);
m_psi
->
create
();
...
...
autotests/client/test_plasma_virtual_desktop.cpp
View file @
deb3bab9
...
...
@@ -117,9 +117,6 @@ void TestVirtualDesktop::init()
registry
.
setup
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
QVERIFY
(
compositorSpy
.
wait
());
m_compositor
=
registry
.
createCompositor
(
compositorSpy
.
first
().
first
().
value
<
quint32
>
(),
compositorSpy
.
first
().
last
().
value
<
quint32
>
(),
this
);
...
...
autotests/client/test_plasmashell.cpp
View file @
deb3bab9
...
...
@@ -65,7 +65,6 @@ void TestPlasmaShell::init()
QVERIFY
(
m_display
->
isRunning
());
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
m_display
->
createShm
();
m_plasmaShellInterface
=
m_display
->
createPlasmaShell
(
m_display
);
...
...
autotests/client/test_pointer_constraints.cpp
View file @
deb3bab9
...
...
@@ -71,7 +71,6 @@ void TestPointerConstraints::init()
m_seatInterface
->
setHasPointer
(
true
);
m_seatInterface
->
create
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
m_pointerConstraintsInterface
=
m_display
->
createPointerConstraints
(
PointerConstraintsInterfaceVersion
::
UnstableV1
,
m_display
);
m_pointerConstraintsInterface
->
create
();
...
...
autotests/client/test_selection.cpp
View file @
deb3bab9
...
...
@@ -68,7 +68,6 @@ void SelectionTest::init()
QVERIFY
(
m_display
->
isRunning
());
m_display
->
createShm
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
m_seatInterface
=
m_display
->
createSeat
(
m_display
);
m_seatInterface
->
setHasKeyboard
(
true
);
m_seatInterface
->
create
();
...
...
autotests/client/test_server_side_decoration.cpp
View file @
deb3bab9
...
...
@@ -94,9 +94,6 @@ void TestServerSideDecoration::init()
m_registry
->
setup
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
QVERIFY
(
compositorSpy
.
wait
());
m_compositor
=
m_registry
->
createCompositor
(
compositorSpy
.
first
().
first
().
value
<
quint32
>
(),
compositorSpy
.
first
().
last
().
value
<
quint32
>
(),
this
);
...
...
autotests/client/test_server_side_decoration_palette.cpp
View file @
deb3bab9
...
...
@@ -98,9 +98,6 @@ void TestServerSideDecorationPalette::init()
registry
.
setup
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
QVERIFY
(
compositorSpy
.
wait
());
m_compositor
=
registry
.
createCompositor
(
compositorSpy
.
first
().
first
().
value
<
quint32
>
(),
compositorSpy
.
first
().
last
().
value
<
quint32
>
(),
this
);
...
...
autotests/client/test_shadow.cpp
View file @
deb3bab9
...
...
@@ -57,7 +57,6 @@ void ShadowTest::init()
QVERIFY
(
m_display
->
isRunning
());
m_display
->
createShm
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
m_shadowInterface
=
m_display
->
createShadowManager
(
m_display
);
m_shadowInterface
->
create
();
...
...
autotests/client/test_text_input.cpp
View file @
deb3bab9
...
...
@@ -90,7 +90,6 @@ void TextInputTest::init()
m_seatInterface
->
setHasTouch
(
true
);
m_seatInterface
->
create
();
m_compositorInterface
=
m_display
->
createCompositor
();
m_compositorInterface
->
create
();
m_textInputManagerV0Interface
=
m_display
->
createTextInputManager
(
TextInputInterfaceVersion
::
UnstableV0
);
m_textInputManagerV0Interface
->
create
();
m_textInputManagerV2Interface
=
m_display
->
createTextInputManager
(
TextInputInterfaceVersion
::
UnstableV2
);
...
...
autotests/client/test_wayland_appmenu.cpp
View file @
deb3bab9
...
...
@@ -101,9 +101,6 @@ void TestAppmenu::init()
registry
.
setup
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
QVERIFY
(
compositorSpy
.
wait
());
m_compositor
=
registry
.
createCompositor
(
compositorSpy
.
first
().
first
().
value
<
quint32
>
(),
compositorSpy
.
first
().
last
().
value
<
quint32
>
(),
this
);
...
...
autotests/client/test_wayland_blur.cpp
View file @
deb3bab9
...
...
@@ -98,9 +98,6 @@ void TestBlur::init()
registry
.
setup
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
QVERIFY
(
compositorSpy
.
wait
());
m_compositor
=
registry
.
createCompositor
(
compositorSpy
.
first
().
first
().
value
<
quint32
>
(),
compositorSpy
.
first
().
last
().
value
<
quint32
>
(),
this
);
...
...
autotests/client/test_wayland_contrast.cpp
View file @
deb3bab9
...
...
@@ -100,9 +100,6 @@ void TestContrast::init()
registry
.
setup
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
QVERIFY
(
compositorSpy
.
wait
());
m_compositor
=
registry
.
createCompositor
(
compositorSpy
.
first
().
first
().
value
<
quint32
>
(),
compositorSpy
.
first
().
last
().
value
<
quint32
>
(),
this
);
...
...
autotests/client/test_wayland_filter.cpp
View file @
deb3bab9
...
...
@@ -82,9 +82,6 @@ void TestFilter::init()
QVERIFY
(
m_display
->
isRunning
());
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
m_blurManagerInterface
=
m_display
->
createBlurManager
(
m_display
);
}
...
...
autotests/client/test_wayland_outputmanagement.cpp
View file @
deb3bab9
...
...
@@ -95,9 +95,7 @@ void TestWaylandOutputManagement::init()
m_display
->
start
();
QVERIFY
(
m_display
->
isRunning
());
auto
comp
=
m_display
->
createCompositor
(
this
);
comp
->
create
();
m_display
->
createCompositor
(
this
);
auto
outputDeviceInterface
=
m_display
->
createOutputDevice
(
this
);
OutputDeviceInterface
::
Mode
m0
;
...
...
autotests/client/test_wayland_region.cpp
View file @
deb3bab9
...
...
@@ -91,9 +91,6 @@ void TestRegion::init()
registry
.
setup
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
QVERIFY
(
compositorSpy
.
wait
());
m_compositor
=
registry
.
createCompositor
(
compositorSpy
.
first
().
first
().
value
<
quint32
>
(),
compositorSpy
.
first
().
last
().
value
<
quint32
>
(),
this
);
}
...
...
autotests/client/test_wayland_seat.cpp
View file @
deb3bab9
...
...
@@ -130,10 +130,6 @@ void TestWaylandSeat::init()
m_display
->
createShm
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
QVERIFY
(
m_compositorInterface
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
m_subCompositorInterface
=
m_display
->
createSubCompositor
(
m_display
);
QVERIFY
(
m_subCompositorInterface
);
m_subCompositorInterface
->
create
();
...
...
autotests/client/test_wayland_slide.cpp
View file @
deb3bab9
...
...
@@ -97,9 +97,6 @@ void TestSlide::init()
registry
.
setup
();
m_compositorInterface
=
m_display
->
createCompositor
(
m_display
);
m_compositorInterface
->
create
();
QVERIFY
(
m_compositorInterface
->
isValid
());
QVERIFY
(
compositorSpy
.
wait
());
m_compositor
=
registry
.
createCompositor
(
compositorSpy
.
first
().
first
().
value
<
quint32
>
(),
compositorSpy
.
first
().
last
().
value
<
quint32
>
(),
this
);
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment