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
de46c64e
You need to sign in or sign up before continuing.
Commit
de46c64e
authored
Jan 19, 2020
by
Ulrich Sibiller
Committed by
Mike Gabriel
May 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Splash.c: move the GC to nxagentPaintLogo
It is not needed elsewhere.
parent
26ea6d33
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
Splash.c
nx-X11/programs/Xserver/hw/nxagent/Splash.c
+7
-5
No files found.
nx-X11/programs/Xserver/hw/nxagent/Splash.c
View file @
de46c64e
...
@@ -61,7 +61,7 @@ static XlibPixmap nxagentPixmapLogo;
...
@@ -61,7 +61,7 @@ static XlibPixmap nxagentPixmapLogo;
static
XlibWindow
nxagentSplashWindow
=
None
;
static
XlibWindow
nxagentSplashWindow
=
None
;
static
Bool
nxagentWMPassed
=
False
;
static
Bool
nxagentWMPassed
=
False
;
static
void
nxagentPaintLogo
(
XlibWindow
win
,
XlibGC
gc
,
int
scale
,
int
width
,
int
height
);
static
void
nxagentPaintLogo
(
XlibWindow
win
,
int
scale
,
int
width
,
int
height
);
void
nxagentShowSplashWindow
(
XlibWindow
parentWindow
)
void
nxagentShowSplashWindow
(
XlibWindow
parentWindow
)
{
{
...
@@ -138,14 +138,12 @@ void nxagentShowSplashWindow(XlibWindow parentWindow)
...
@@ -138,14 +138,12 @@ void nxagentShowSplashWindow(XlibWindow parentWindow)
nxagentSplashWindow
);
nxagentSplashWindow
);
#endif
#endif
XlibGC
gc
=
XCreateGC
(
nxagentDisplay
,
nxagentSplashWindow
,
0
,
NULL
);
nxagentPaintLogo
(
nxagentSplashWindow
,
1
,
getAttributes
.
width
,
getAttributes
.
height
);
nxagentPaintLogo
(
nxagentSplashWindow
,
gc
,
1
,
getAttributes
.
width
,
getAttributes
.
height
);
XMapRaised
(
nxagentDisplay
,
nxagentSplashWindow
);
XMapRaised
(
nxagentDisplay
,
nxagentSplashWindow
);
XWindowChanges
values
=
{.
stack_mode
=
Above
};
XWindowChanges
values
=
{.
stack_mode
=
Above
};
XConfigureWindow
(
nxagentDisplay
,
nxagentSplashWindow
,
CWStackMode
,
&
values
);
XConfigureWindow
(
nxagentDisplay
,
nxagentSplashWindow
,
CWStackMode
,
&
values
);
XSetWindowAttributes
attributes
=
{.
override_redirect
=
True
};
XSetWindowAttributes
attributes
=
{.
override_redirect
=
True
};
XChangeWindowAttributes
(
nxagentDisplay
,
nxagentSplashWindow
,
CWOverrideRedirect
,
&
attributes
);
XChangeWindowAttributes
(
nxagentDisplay
,
nxagentSplashWindow
,
CWOverrideRedirect
,
&
attributes
);
XFreeGC
(
nxagentDisplay
,
gc
);
#ifdef NXAGENT_TIMESTAMP
#ifdef NXAGENT_TIMESTAMP
{
{
...
@@ -161,8 +159,10 @@ Bool nxagentHaveSplashWindow(void)
...
@@ -161,8 +159,10 @@ Bool nxagentHaveSplashWindow(void)
return
(
nxagentSplashWindow
!=
None
);
return
(
nxagentSplashWindow
!=
None
);
}
}
void
nxagentPaintLogo
(
XlibWindow
win
,
XlibGC
gc
,
int
scale
,
int
width
,
int
height
)
void
nxagentPaintLogo
(
XlibWindow
win
,
int
scale
,
int
width
,
int
height
)
{
{
XlibGC
gc
=
XCreateGC
(
nxagentDisplay
,
nxagentSplashWindow
,
0
,
NULL
);
int
depth
=
DefaultDepth
(
nxagentDisplay
,
DefaultScreen
(
nxagentDisplay
));
int
depth
=
DefaultDepth
(
nxagentDisplay
,
DefaultScreen
(
nxagentDisplay
));
#ifdef DEBUG
#ifdef DEBUG
...
@@ -396,6 +396,8 @@ void nxagentPaintLogo(XlibWindow win, XlibGC gc, int scale, int width, int heigh
...
@@ -396,6 +396,8 @@ void nxagentPaintLogo(XlibWindow win, XlibGC gc, int scale, int width, int heigh
XSetWindowBackgroundPixmap
(
nxagentDisplay
,
win
,
nxagentPixmapLogo
);
XSetWindowBackgroundPixmap
(
nxagentDisplay
,
win
,
nxagentPixmapLogo
);
XFreeGC
(
nxagentDisplay
,
gc
);
#ifdef NXAGENT_LOGO_DEBUG
#ifdef NXAGENT_LOGO_DEBUG
fprintf
(
stderr
,
"%s: end
\n
"
,
__func__
);
fprintf
(
stderr
,
"%s: end
\n
"
,
__func__
);
#endif
#endif
...
...
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