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
f534a486
Commit
f534a486
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: move attributes/valuemask to inner scopes
parent
d7a091a6
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
11 deletions
+9
-11
Screen.c
nx-X11/programs/Xserver/hw/nxagent/Screen.c
+9
-11
No files found.
nx-X11/programs/Xserver/hw/nxagent/Screen.c
View file @
f534a486
...
...
@@ -844,8 +844,6 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
DepthPtr
depths
;
int
numVisuals
,
numDepths
;
int
depthIndex
;
unsigned
long
valuemask
;
XSetWindowAttributes
attributes
;
Bool
resetAgentPosition
=
False
;
VisualID
defaultVisual
;
...
...
@@ -1678,15 +1676,16 @@ N/A
if
(
nxagentDoFullGeneration
==
1
||
nxagentReconnectTrap
==
1
)
{
valuemask
=
CWBackPixel
|
CWEventMask
|
CWColormap
|
(
nxagentOption
(
AllScreens
)
==
1
?
CWOverrideRedirect
:
0
);
attributes
.
background_pixel
=
nxagentBlackPixel
;
attributes
.
event_mask
=
nxagentGetDefaultEventMask
();
attributes
.
colormap
=
nxagentDefaultVisualColormap
(
nxagentDefaultVisual
(
pScreen
))
;
unsigned
long
valuemask
=
CWBackPixel
|
CWEventMask
|
CWColormap
;
XSetWindowAttributes
attributes
=
{
.
background_pixel
=
nxagentBlackPixel
,
.
event_mask
=
nxagentGetDefaultEventMask
(),
.
colormap
=
nxagentDefaultVisualColormap
(
nxagentDefaultVisual
(
pScreen
))
}
;
if
(
nxagentOption
(
AllScreens
)
==
1
)
{
valuemask
|=
CWOverrideRedirect
;
attributes
.
override_redirect
=
True
;
}
...
...
@@ -1753,8 +1752,7 @@ N/A
if
(
nxagentOption
(
Rootless
)
==
0
)
{
valuemask
=
CWEventMask
;
attributes
.
event_mask
=
PointerMotionMask
;
XSetWindowAttributes
inpattributes
=
{.
event_mask
=
PointerMotionMask
};
nxagentInputWindows
[
pScreen
->
myNum
]
=
XCreateWindow
(
nxagentDisplay
,
...
...
@@ -1764,7 +1762,7 @@ N/A
nxagentOption
(
Height
),
0
,
0
,
InputOnly
,
nxagentDefaultVisual
(
pScreen
),
valuemask
,
&
attributes
);
CWEventMask
,
&
inp
attributes
);
if
(
nxagentReportWindowIds
)
{
...
...
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