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
e2ff39e0
Commit
e2ff39e0
authored
Dec 31, 2020
by
Ulrich Sibiller
Committed by
Mike Gabriel
Jan 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nxagent: make nxagentBlocking an Boolean
parent
94fd6d23
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
13 deletions
+13
-13
Display.c
nx-X11/programs/Xserver/hw/nxagent/Display.c
+2
-2
Drawable.c
nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+1
-1
Handlers.c
nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+7
-7
Handlers.h
nx-X11/programs/Xserver/hw/nxagent/Handlers.h
+1
-1
Pixels.h
nx-X11/programs/Xserver/hw/nxagent/Pixels.h
+2
-2
No files found.
nx-X11/programs/Xserver/hw/nxagent/Display.c
View file @
e2ff39e0
...
...
@@ -660,7 +660,7 @@ static void nxagentDisplayBlockHandler(Display *disp, int reason)
fprintf
(
stderr
,
"nxagentDisplayBlockHandler: BLOCK! Display is blocking for [write].
\n
"
);
#endif
nxagentBlocking
=
1
;
nxagentBlocking
=
True
;
if
(
!
SmartScheduleSignalEnable
)
{
...
...
@@ -908,7 +908,7 @@ void nxagentResetDisplayHandlers(void)
*/
nxagentBuffer
=
0
;
nxagentBlocking
=
0
;
nxagentBlocking
=
False
;
nxagentCongestion
=
0
;
/*
...
...
nx-X11/programs/Xserver/hw/nxagent/Drawable.c
View file @
e2ff39e0
...
...
@@ -2815,7 +2815,7 @@ int nxagentSynchronizationPredicate(void)
return
NotNeeded
;
}
if
(
nxagentBlocking
==
0
&&
if
(
!
nxagentBlocking
&&
nxagentCongestion
<=
4
&&
nxagentReady
==
0
&&
nxagentUserInput
(
NULL
)
==
0
)
...
...
nx-X11/programs/Xserver/hw/nxagent/Handlers.c
View file @
e2ff39e0
...
...
@@ -122,7 +122,7 @@ Bool nxagentXdmcpAlertUp = False;
*/
int
nxagentBuffer
;
int
nxagentBlocking
;
Bool
nxagentBlocking
;
int
nxagentCongestion
;
double
nxagentBytesIn
;
...
...
@@ -322,7 +322,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
nxagentForceSynchronization
=
0
;
}
else
if
(
nxagentUserInput
(
NULL
)
==
0
&&
nxagentBlocking
==
0
&&
!
nxagentBlocking
&&
nxagentCongestion
<=
4
)
{
#ifdef TEST
...
...
@@ -391,7 +391,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
#ifdef DYNAMIC_DISPLAY_BUFFER
if
(
nxagentBlocking
==
1
&&
if
(
nxagentBlocking
&&
nxagentBuffer
>
MINIMUM_DISPLAY_BUFFER
)
{
nxagentBuffer
>>=
1
;
...
...
@@ -587,7 +587,7 @@ void nxagentWakeupHandler(void * data, int count, void * mask)
* Can become true during the dispatch loop.
*/
nxagentBlocking
=
0
;
nxagentBlocking
=
False
;
/*
* Check if we got new events.
...
...
@@ -759,7 +759,7 @@ void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mas
nxagentShadowSendUpdates
(
&
suspended
);
if
(
nxagentBlocking
==
0
)
if
(
!
nxagentBlocking
)
{
nxagentSynchronizeDrawable
((
DrawablePtr
)
nxagentShadowPixmapPtr
,
DONT_WAIT
,
ALWAYS_BREAK
,
nxagentShadowWindowPtr
);
...
...
@@ -830,7 +830,7 @@ void nxagentShadowWakeupHandler(void * data, int count, void * mask)
* Can become true during the dispatch loop.
*/
nxagentBlocking
=
0
;
nxagentBlocking
=
False
;
/*
* Check if we got new events.
...
...
@@ -1200,7 +1200,7 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out)
nxagentDispatchEvents
(
NULL
);
nxagentBlocking
=
1
;
nxagentBlocking
=
True
;
}
/*
...
...
nx-X11/programs/Xserver/hw/nxagent/Handlers.h
View file @
e2ff39e0
...
...
@@ -37,7 +37,7 @@ extern int nxagentBuffer;
* the display to become writable.
*/
extern
int
nxagentBlocking
;
extern
Bool
nxagentBlocking
;
/*
* Current congestion level based on
...
...
nx-X11/programs/Xserver/hw/nxagent/Pixels.h
View file @
e2ff39e0
...
...
@@ -77,7 +77,7 @@ while (0)
#define breakOnBlocking(mask) \
(((mask) != NEVER_BREAK) && ((mask) & BLOCKING_BREAK) && \
nxagentBlocking
== 1
)
nxagentBlocking)
#define breakOnCongestion(mask) \
(((mask) != NEVER_BREAK) && ((mask) & CONGESTION_BREAK) && \
...
...
@@ -164,7 +164,7 @@ FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE
#define NXAGENT_SHOULD_SYNCHRONIZE_CORRUPTED_PIXMAPS(mask) \
((nxagentCorruptedWindows == 0 && nxagentCorruptedPixmaps > 0 && \
nxagentCongestion == 0 &&
nxagentBlocking == 0) ||
\
nxagentCongestion == 0 &&
!nxagentBlocking) ||
\
mask == NEVER_BREAK)
/*
...
...
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