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
199c32ea
Commit
199c32ea
authored
May 26, 2020
by
Ulrich Sibiller
Committed by
Mike Gabriel
Oct 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Screen.c: some more (cosmetic) changes
parent
42fb6833
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
40 deletions
+28
-40
Screen.c
nx-X11/programs/Xserver/hw/nxagent/Screen.c
+28
-40
No files found.
nx-X11/programs/Xserver/hw/nxagent/Screen.c
View file @
199c32ea
...
...
@@ -971,7 +971,6 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
#endif
nxagentChangeOption
(
Fullscreen
,
False
);
nxagentChangeOption
(
AllScreens
,
False
);
nxagentFullscreenWindow
=
0
;
...
...
@@ -1343,9 +1342,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
#endif
/*
* Complete the initialization of the GLX
* extension. This will add the GLX visuals
* and will modify numVisuals and numDepths.
* Complete the initialization of the GLX extension. This will add
* the GLX visuals and will modify numVisuals and numDepths.
*/
#if defined(DEBUG) || defined(DEBUG_COLORMAP)
...
...
@@ -1364,8 +1362,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
#endif
/*
* Replace the visuals and depths initialized
*
by fbScreenInit with
our own.
* Replace the visuals and depths initialized
by fbScreenInit with
* our own.
*/
freeDepths
(
pScreen
->
allowedDepths
,
pScreen
->
numDepths
);
...
...
@@ -1379,9 +1377,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
pScreen
->
rootVisual
=
defaultVisual
;
/*
* Set up the internal structures used for
* tracking the proxy resources associated
* to the unpack and split operations.
* Set up the internal structures used for tracking the proxy
* resources associated to the unpack and split operations.
*/
nxagentInitSplitResources
();
...
...
@@ -1419,9 +1416,9 @@ N/A
if
(
nxagentOption
(
Fullscreen
))
{
/*
* We need to disable the host's screensaver or
*
it will otherwise grab the screen even if it
*
is under agent's
control.
* We need to disable the host's screensaver or
it will
*
otherwise grab the screen even if it is under agent's
* control.
*/
XSetScreenSaver
(
nxagentDisplay
,
0
,
0
,
DefaultExposures
,
DefaultBlanking
);
...
...
@@ -1528,9 +1525,8 @@ N/A
pScreen
->
DestroyPixmap
=
nxagentDestroyPixmap
;
/*
* This is originally miModifyPixmapHeader()
* from miscrinit.c. It is used to recycle
* the scratch pixmap for this screen.
* This is originally miModifyPixmapHeader() from miscrinit.c. It
* is used to recycle the scratch pixmap for this screen.
*/
pScreen
->
ModifyPixmapHeader
=
nxagentModifyPixmapHeader
;
...
...
@@ -1599,11 +1595,9 @@ N/A
#ifdef RENDER
/*
* Initialize picture support. This have to be
* placed here because miDCInitialize calls
* DamageSetup, that should wrap the picture
* screen functions. So PictureInit has to be
* called before.
* Initialize picture support. This have to be placed here because
* miDCInitialize calls DamageSetup, that should wrap the picture
* screen functions. So PictureInit has to be called before.
*/
if
(
nxagentRenderEnable
&&
!
nxagentReconnectTrap
)
...
...
@@ -1650,8 +1644,7 @@ N/A
nxagentOption(Height)) / 32)
/*
* Complete the initialization of the RANDR
* extension.
* Complete the initialization of the RANDR extension.
*/
nxagentInitRandRExtension
(
pScreen
);
...
...
@@ -1686,7 +1679,6 @@ N/A
* it will otherwise grab the screen even if it
* is under agent's control.
*/
XSetScreenSaver
(
nxagentDisplay
,
0
,
0
,
DefaultExposures
,
DefaultBlanking
);
}
}
...
...
@@ -1705,10 +1697,9 @@ N/A
else
{
/*
* Create any top-level window as a child of the
* real root of the remote display. See also the
* InitRootWindow() procedure and the function
* handling the splash screen.
* Create any top-level window as a child of the real root of
* the remote display. See also the InitRootWindow() procedure
* and the function handling the splash screen.
*/
#ifdef TEST
...
...
@@ -1943,10 +1934,9 @@ N/A
}
/*
* The purpose of this check is to verify if there
* is a window manager running. Unfortunately due
* to the way we manage the intern atoms call, the
* atom will always exist.
* The purpose of this check is to verify if there is a window
* manager running. Unfortunately due to the way we manage the
* intern atoms call, the atom will always exist.
*/
if
(
nxagentWMIsRunning
)
...
...
@@ -1988,9 +1978,9 @@ N/A
else
{
/*
* We should always enable the configuration of the
*
remote X server's devices if we are running full-
*
screen and there is no
WM running.
* We should always enable the configuration of the
remote X
*
server's devices if we are running fullscreen and there is no
* WM running.
*/
if
(
nxagentOption
(
Fullscreen
))
...
...
@@ -2004,9 +1994,8 @@ N/A
}
/*
* Inform the user whether the agent's clients will
* be able to change the real X server's keyboard
* and pointer settings.
* Inform the user whether the agent's clients will be able to
* change the real X server's keyboard and pointer settings.
*/
if
(
nxagentOption
(
DeviceControl
)
==
False
)
...
...
@@ -2040,9 +2029,8 @@ N/A
#endif
/* RENDER */
/*
* Check if the composite extension is
* supported on the remote display and
* prepare the agent for its use.
* Check if the composite extension is supported on the remote
* display and prepare the agent for its use.
*/
nxagentCompositeExtensionInit
();
...
...
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