Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
KWin
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
18
Issues
18
List
Boards
Labels
Service Desk
Milestones
Merge Requests
43
Merge Requests
43
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Plasma
KWin
Commits
018afd09
Commit
018afd09
authored
Nov 01, 2017
by
Martin Flöser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Guard X11 access in supportInformation
Caused crash when running KWin without X11 support.
parent
54565a94
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
12 deletions
+14
-12
workspace.cpp
workspace.cpp
+14
-12
No files found.
workspace.cpp
View file @
018afd09
...
...
@@ -1403,19 +1403,21 @@ QString Workspace::supportInformation() const
#endif
support
.
append
(
QStringLiteral
(
"
\n
"
));
support
.
append
(
QStringLiteral
(
"X11
\n
"
));
support
.
append
(
QStringLiteral
(
"===
\n
"
));
auto
x11setup
=
xcb_get_setup
(
connection
());
support
.
append
(
QStringLiteral
(
"Vendor: %1
\n
"
).
arg
(
QString
::
fromUtf8
(
QByteArray
::
fromRawData
(
xcb_setup_vendor
(
x11setup
),
xcb_setup_vendor_length
(
x11setup
)))));
support
.
append
(
QStringLiteral
(
"Vendor Release: %1
\n
"
).
arg
(
x11setup
->
release_number
));
support
.
append
(
QStringLiteral
(
"Protocol Version/Revision: %1/%2
\n
"
).
arg
(
x11setup
->
protocol_major_version
).
arg
(
x11setup
->
protocol_minor_version
));
const
auto
extensions
=
Xcb
::
Extensions
::
self
()
->
extensions
();
for
(
const
auto
&
e
:
extensions
)
{
support
.
append
(
QStringLiteral
(
"%1: %2; Version: 0x%3
\n
"
).
arg
(
QString
::
fromUtf8
(
e
.
name
))
.
arg
(
e
.
present
?
yes
.
trimmed
()
:
no
.
trimmed
())
.
arg
(
QString
::
number
(
e
.
version
,
16
)));
if
(
auto
c
=
kwinApp
()
->
x11Connection
())
{
support
.
append
(
QStringLiteral
(
"X11
\n
"
));
support
.
append
(
QStringLiteral
(
"===
\n
"
));
auto
x11setup
=
xcb_get_setup
(
c
);
support
.
append
(
QStringLiteral
(
"Vendor: %1
\n
"
).
arg
(
QString
::
fromUtf8
(
QByteArray
::
fromRawData
(
xcb_setup_vendor
(
x11setup
),
xcb_setup_vendor_length
(
x11setup
)))));
support
.
append
(
QStringLiteral
(
"Vendor Release: %1
\n
"
).
arg
(
x11setup
->
release_number
));
support
.
append
(
QStringLiteral
(
"Protocol Version/Revision: %1/%2
\n
"
).
arg
(
x11setup
->
protocol_major_version
).
arg
(
x11setup
->
protocol_minor_version
));
const
auto
extensions
=
Xcb
::
Extensions
::
self
()
->
extensions
();
for
(
const
auto
&
e
:
extensions
)
{
support
.
append
(
QStringLiteral
(
"%1: %2; Version: 0x%3
\n
"
).
arg
(
QString
::
fromUtf8
(
e
.
name
))
.
arg
(
e
.
present
?
yes
.
trimmed
()
:
no
.
trimmed
())
.
arg
(
QString
::
number
(
e
.
version
,
16
)));
}
support
.
append
(
QStringLiteral
(
"
\n
"
));
}
support
.
append
(
QStringLiteral
(
"
\n
"
));
if
(
auto
bridge
=
Decoration
::
DecorationBridge
::
self
())
{
support
.
append
(
QStringLiteral
(
"Decoration
\n
"
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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