Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
5920e36e
Commit
5920e36e
authored
Dec 30, 2020
by
Ulrich Sibiller
Committed by
Mike Gabriel
Jan 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nxagent: rework some Boolean checks
nxagentWindowTopLevel() and nxagentNeedConnectionChange() return Boolean nxagentPixmapIsVirtual() and nxagentIsShmPixmap(), too.
parent
6f4dbefb
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
10 deletions
+10
-10
Drawable.c
nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+1
-1
Events.c
nx-X11/programs/Xserver/hw/nxagent/Events.c
+2
-2
Handlers.c
nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+2
-2
NXrender.c
nx-X11/programs/Xserver/hw/nxagent/NXrender.c
+2
-2
Pixmap.c
nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+1
-1
Reconnect.c
nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+1
-1
Window.c
nx-X11/programs/Xserver/hw/nxagent/Window.c
+1
-1
No files found.
nx-X11/programs/Xserver/hw/nxagent/Drawable.c
View file @
5920e36e
...
@@ -2658,7 +2658,7 @@ void nxagentAllocateCorruptedResource(DrawablePtr pDrawable, RESTYPE type)
...
@@ -2658,7 +2658,7 @@ void nxagentAllocateCorruptedResource(DrawablePtr pDrawable, RESTYPE type)
*/
*/
if
(
nxagentPixmapUsageCounter
((
PixmapPtr
)
pDrawable
)
>=
MINIMUM_PIXMAP_USAGE_COUNTER
&&
if
(
nxagentPixmapUsageCounter
((
PixmapPtr
)
pDrawable
)
>=
MINIMUM_PIXMAP_USAGE_COUNTER
&&
nxagentIsShmPixmap
((
PixmapPtr
)
pDrawable
)
==
0
)
!
nxagentIsShmPixmap
((
PixmapPtr
)
pDrawable
)
)
{
{
pRealPixmap
=
nxagentRealPixmap
((
PixmapPtr
)
pDrawable
);
pRealPixmap
=
nxagentRealPixmap
((
PixmapPtr
)
pDrawable
);
...
...
nx-X11/programs/Xserver/hw/nxagent/Events.c
View file @
5920e36e
...
@@ -2009,7 +2009,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
...
@@ -2009,7 +2009,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
if
((
pWin
=
nxagentRootlessTopLevelWindow
(
X
.
xunmap
.
window
))
!=
NULL
||
if
((
pWin
=
nxagentRootlessTopLevelWindow
(
X
.
xunmap
.
window
))
!=
NULL
||
((
pWin
=
nxagentWindowPtr
(
X
.
xunmap
.
window
))
!=
NULL
&&
((
pWin
=
nxagentWindowPtr
(
X
.
xunmap
.
window
))
!=
NULL
&&
nxagentWindowTopLevel
(
pWin
)
==
1
))
nxagentWindowTopLevel
(
pWin
)))
{
{
nxagentScreenTrap
=
True
;
nxagentScreenTrap
=
True
;
...
@@ -2040,7 +2040,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
...
@@ -2040,7 +2040,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
if
((
pWin
=
nxagentRootlessTopLevelWindow
(
X
.
xmap
.
window
))
!=
NULL
||
if
((
pWin
=
nxagentRootlessTopLevelWindow
(
X
.
xmap
.
window
))
!=
NULL
||
((
pWin
=
nxagentWindowPtr
(
X
.
xmap
.
window
))
!=
NULL
&&
((
pWin
=
nxagentWindowPtr
(
X
.
xmap
.
window
))
!=
NULL
&&
nxagentWindowTopLevel
(
pWin
)
==
1
))
nxagentWindowTopLevel
(
pWin
)))
{
{
nxagentScreenTrap
=
True
;
nxagentScreenTrap
=
True
;
...
...
nx-X11/programs/Xserver/hw/nxagent/Handlers.c
View file @
5920e36e
...
@@ -199,7 +199,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
...
@@ -199,7 +199,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
#endif
#endif
if
(
nxagentNeedConnectionChange
()
==
1
)
if
(
nxagentNeedConnectionChange
())
{
{
#ifdef TEST
#ifdef TEST
fprintf
(
stderr
,
"nxagentBlockHandler: Calling nxagentHandleConnectionChanges "
fprintf
(
stderr
,
"nxagentBlockHandler: Calling nxagentHandleConnectionChanges "
...
@@ -703,7 +703,7 @@ void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mas
...
@@ -703,7 +703,7 @@ void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mas
fprintf
(
stderr
,
"[Begin block]
\n
"
);
fprintf
(
stderr
,
"[Begin block]
\n
"
);
#endif
#endif
if
(
nxagentNeedConnectionChange
()
==
1
)
if
(
nxagentNeedConnectionChange
())
{
{
nxagentHandleConnectionChanges
();
nxagentHandleConnectionChanges
();
}
}
...
...
nx-X11/programs/Xserver/hw/nxagent/NXrender.c
View file @
5920e36e
...
@@ -551,8 +551,8 @@ int nxagentCompositePredicate(PicturePtr pSrc, PicturePtr pDst)
...
@@ -551,8 +551,8 @@ int nxagentCompositePredicate(PicturePtr pSrc, PicturePtr pDst)
fprintf
(
stderr
,
"nxagentCompositePredicate: Case 1.
\n
"
);
fprintf
(
stderr
,
"nxagentCompositePredicate: Case 1.
\n
"
);
#endif
#endif
if
(
nxagentPixmapIsVirtual
(
pPixmap1
)
==
1
&&
if
(
nxagentPixmapIsVirtual
(
pPixmap1
)
&&
nxagentPixmapIsVirtual
(
pPixmap2
)
==
1
)
nxagentPixmapIsVirtual
(
pPixmap2
))
{
{
#ifdef TEST
#ifdef TEST
fprintf
(
stderr
,
"nxagentCompositePredicate: Case 2.
\n
"
);
fprintf
(
stderr
,
"nxagentCompositePredicate: Case 2.
\n
"
);
...
...
nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
View file @
5920e36e
...
@@ -1064,7 +1064,7 @@ void nxagentSynchronizeShmPixmap(DrawablePtr pDrawable, int xPict, int yPict,
...
@@ -1064,7 +1064,7 @@ void nxagentSynchronizeShmPixmap(DrawablePtr pDrawable, int xPict, int yPict,
int
wPict
,
int
hPict
)
int
wPict
,
int
hPict
)
{
{
if
(
pDrawable
->
type
==
DRAWABLE_PIXMAP
&&
if
(
pDrawable
->
type
==
DRAWABLE_PIXMAP
&&
nxagentIsShmPixmap
((
PixmapPtr
)
pDrawable
)
==
1
)
nxagentIsShmPixmap
((
PixmapPtr
)
pDrawable
))
{
{
#ifdef TEST
#ifdef TEST
fprintf
(
stderr
,
"nxagentSynchronizeShmPixmap: WARNING! Synchronizing shared pixmap at [%p].
\n
"
,
fprintf
(
stderr
,
"nxagentSynchronizeShmPixmap: WARNING! Synchronizing shared pixmap at [%p].
\n
"
,
...
...
nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
View file @
5920e36e
...
@@ -220,7 +220,7 @@ int nxagentHandleConnectionStates(void)
...
@@ -220,7 +220,7 @@ int nxagentHandleConnectionStates(void)
}
}
}
}
if
(
nxagentNeedConnectionChange
()
==
1
)
if
(
nxagentNeedConnectionChange
())
{
{
#ifdef TEST
#ifdef TEST
fprintf
(
stderr
,
"nxagentHandleConnectionStates: Calling nxagentHandleConnectionChanges "
fprintf
(
stderr
,
"nxagentHandleConnectionStates: Calling nxagentHandleConnectionChanges "
...
...
nx-X11/programs/Xserver/hw/nxagent/Window.c
View file @
5920e36e
...
@@ -1260,7 +1260,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
...
@@ -1260,7 +1260,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
}
}
if
(
nxagentOption
(
Rootless
)
&&
if
(
nxagentOption
(
Rootless
)
&&
nxagentWindowTopLevel
(
pWin
)
==
1
)
nxagentWindowTopLevel
(
pWin
))
{
{
mask
&=
~
(
CWSibling
|
CWStackMode
);
mask
&=
~
(
CWSibling
|
CWStackMode
);
}
}
...
...
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