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
bb9ac3fd
Commit
bb9ac3fd
authored
Jan 06, 2020
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hw/nxagent/Splash.c Fix build on 32bit architecture.
Regression fix for
427b7b97
. As suggested by Ulrich Sibiller. Fixes ArcticaProject/nx-libs#891.
parent
67599026
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
10 deletions
+3
-10
Splash.c
nx-X11/programs/Xserver/hw/nxagent/Splash.c
+3
-10
No files found.
nx-X11/programs/Xserver/hw/nxagent/Splash.c
View file @
bb9ac3fd
...
...
@@ -26,14 +26,8 @@
#include "windowstr.h"
#include "scrnintstr.h"
#ifdef _XSERVER64
#include "Agent.h"
#define GC XlibGC
#endif
/* _XSERVER64 */
#include "Xlib.h"
#include "Xutil.h"
...
...
@@ -67,14 +61,13 @@ Pixmap nxagentPixmapLogo;
Window
nxagentSplashWindow
=
None
;
Bool
nxagentWMPassed
=
False
;
static
void
nxagentPaintLogo
(
Window
win
,
GC
gc
,
int
scale
,
int
width
,
int
height
);
static
void
nxagentPaintLogo
(
Window
win
,
Xlib
GC
gc
,
int
scale
,
int
width
,
int
height
);
void
nxagentShowSplashWindow
(
Window
parentWindow
)
{
XWindowAttributes
getAttributes
;
XWindowChanges
values
;
XSetWindowAttributes
attributes
;
GC
gc
;
/*
* Show splash window only when running as X2Go Agent
...
...
@@ -149,7 +142,7 @@ void nxagentShowSplashWindow(Window parentWindow)
nxagentSplashWindow
);
#endif
gc
=
XCreateGC
(
nxagentDisplay
,
nxagentSplashWindow
,
0
,
NULL
);
XlibGC
gc
=
XCreateGC
(
nxagentDisplay
,
nxagentSplashWindow
,
0
,
NULL
);
nxagentPaintLogo
(
nxagentSplashWindow
,
gc
,
1
,
getAttributes
.
width
,
getAttributes
.
height
);
XMapRaised
(
nxagentDisplay
,
nxagentSplashWindow
);
values
.
stack_mode
=
Above
;
...
...
@@ -167,7 +160,7 @@ void nxagentShowSplashWindow(Window parentWindow)
#endif
}
void
nxagentPaintLogo
(
Window
win
,
GC
gc
,
int
scale
,
int
width
,
int
height
)
void
nxagentPaintLogo
(
Window
win
,
Xlib
GC
gc
,
int
scale
,
int
width
,
int
height
)
{
int
depth
=
DefaultDepth
(
nxagentDisplay
,
DefaultScreen
(
nxagentDisplay
));
...
...
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