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
KWin
Commits
d5ee009b
Commit
d5ee009b
authored
Oct 28, 2020
by
Vlad Zahorodnii
Browse files
Fix capitalization in the word "software"
parent
ae883aaa
Changes
6
Hide whitespace changes
Inline
Side-by-side
platform.cpp
View file @
d5ee009b
...
...
@@ -37,7 +37,7 @@ Platform::Platform(QObject *parent)
:
QObject
(
parent
)
,
m_eglDisplay
(
EGL_NO_DISPLAY
)
{
setSoft
W
areCursor
(
false
);
setSoft
w
areCursor
(
false
);
m_colorCorrect
=
new
ColorCorrect
::
Manager
(
this
);
connect
(
Cursors
::
self
(),
&
Cursors
::
currentCursorRendered
,
this
,
&
Platform
::
cursorRendered
);
}
...
...
@@ -181,16 +181,21 @@ AbstractOutput *Platform::findOutput(const QByteArray &uuid)
return
nullptr
;
}
void
Platform
::
setSoftWareCursor
(
bool
set
)
bool
Platform
::
usesSoftwareCursor
()
const
{
return
m_softwareCursor
;
}
void
Platform
::
setSoftwareCursor
(
bool
set
)
{
if
(
qEnvironmentVariableIsSet
(
"KWIN_FORCE_SW_CURSOR"
))
{
set
=
true
;
}
if
(
m_soft
W
areCursor
==
set
)
{
if
(
m_soft
w
areCursor
==
set
)
{
return
;
}
m_soft
W
areCursor
=
set
;
if
(
m_soft
W
areCursor
)
{
m_soft
w
areCursor
=
set
;
if
(
m_soft
w
areCursor
)
{
connect
(
Cursors
::
self
(),
&
Cursors
::
positionChanged
,
this
,
&
Platform
::
triggerCursorRepaint
);
connect
(
Cursors
::
self
(),
&
Cursors
::
currentCursorChanged
,
this
,
&
Platform
::
triggerCursorRepaint
);
}
else
{
...
...
@@ -211,7 +216,7 @@ void Platform::triggerCursorRepaint()
void
Platform
::
cursorRendered
(
const
QRect
&
geometry
)
{
if
(
m_soft
W
areCursor
)
{
if
(
m_soft
w
areCursor
)
{
m_cursor
.
lastRenderedGeometry
=
geometry
;
}
}
...
...
platform.h
View file @
d5ee009b
...
...
@@ -279,9 +279,10 @@ public:
*/
virtual
void
setupActionForGlobalAccel
(
QAction
*
action
);
bool
usesSoftwareCursor
()
const
{
return
m_softWareCursor
;
}
/**
* Returns @c true if the software cursor is being used; otherwise returns @c false.
*/
bool
usesSoftwareCursor
()
const
;
/**
* Returns a PlatformCursorImage. By default this is created by softwareCursor and
...
...
@@ -485,7 +486,7 @@ Q_SIGNALS:
protected:
explicit
Platform
(
QObject
*
parent
=
nullptr
);
void
setSoft
W
areCursor
(
bool
set
);
void
setSoft
w
areCursor
(
bool
set
);
void
repaint
(
const
QRect
&
rect
);
void
setReady
(
bool
ready
);
QSize
initialWindowSize
()
const
{
...
...
@@ -534,7 +535,7 @@ protected:
private:
void
triggerCursorRepaint
();
bool
m_soft
W
areCursor
=
false
;
bool
m_soft
w
areCursor
=
false
;
struct
{
QRect
lastRenderedGeometry
;
}
m_cursor
;
...
...
plugins/platforms/drm/drm_backend.cpp
View file @
d5ee009b
...
...
@@ -506,7 +506,7 @@ void DrmBackend::initCursor()
break
;
}
}
setSoft
W
areCursor
(
needsSoftwareCursor
);
setSoft
w
areCursor
(
needsSoftwareCursor
);
#endif
if
(
waylandServer
()
->
seat
()
->
hasPointer
())
{
...
...
@@ -533,7 +533,7 @@ void DrmBackend::setCursor()
{
for
(
auto
it
=
m_outputs
.
constBegin
();
it
!=
m_outputs
.
constEnd
();
++
it
)
{
if
(
!
(
*
it
)
->
showCursor
())
{
setSoft
W
areCursor
(
true
);
setSoft
w
areCursor
(
true
);
}
}
}
...
...
plugins/platforms/drm/drm_gpu.cpp
View file @
d5ee009b
...
...
@@ -252,7 +252,7 @@ bool DrmGpu::updateOutputs()
continue
;
}
if
(
!
output
->
initCursor
(
m_cursorSize
))
{
m_backend
->
setSoft
W
areCursor
(
true
);
m_backend
->
setSoft
w
areCursor
(
true
);
}
qCDebug
(
KWIN_DRM
)
<<
"Found new output with uuid"
<<
output
->
uuid
();
...
...
plugins/platforms/fbdev/fb_backend.cpp
View file @
d5ee009b
...
...
@@ -67,7 +67,7 @@ QPainterBackend *FramebufferBackend::createQPainterBackend()
void
FramebufferBackend
::
init
()
{
setSoft
W
areCursor
(
true
);
setSoft
w
areCursor
(
true
);
LogindIntegration
*
logind
=
LogindIntegration
::
self
();
auto
takeControl
=
[
logind
,
this
]()
{
if
(
logind
->
hasSessionControl
())
{
...
...
plugins/platforms/virtual/virtual_backend.cpp
View file @
d5ee009b
...
...
@@ -59,7 +59,7 @@ void VirtualBackend::init()
m_enabledOutputs
<<
dummyOutput
;
}
setSoft
W
areCursor
(
true
);
setSoft
w
areCursor
(
true
);
setReady
(
true
);
waylandServer
()
->
seat
()
->
setHasPointer
(
true
);
waylandServer
()
->
seat
()
->
setHasKeyboard
(
true
);
...
...
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