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
170416d2
Commit
170416d2
authored
Apr 10, 2018
by
Ulrich Sibiller
Committed by
Mike Gabriel
May 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hw/nxagent: fix spelling errors as reported by codespell
parent
94f7ce7d
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
49 additions
and
50 deletions
+49
-50
Atoms.c
nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+5
-5
Clipboard.c
nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+1
-1
Display.c
nx-X11/programs/Xserver/hw/nxagent/Display.c
+3
-3
Drawable.c
nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+5
-5
Error.c
nx-X11/programs/Xserver/hw/nxagent/Error.c
+1
-1
Events.c
nx-X11/programs/Xserver/hw/nxagent/Events.c
+1
-1
Font.c
nx-X11/programs/Xserver/hw/nxagent/Font.c
+3
-3
Handlers.c
nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+1
-1
Image.c
nx-X11/programs/Xserver/hw/nxagent/Image.c
+4
-4
Image.h
nx-X11/programs/Xserver/hw/nxagent/Image.h
+1
-1
Imakefile
nx-X11/programs/Xserver/hw/nxagent/Imakefile
+1
-1
NXdispatch.c
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+1
-1
NXevents.c
nx-X11/programs/Xserver/hw/nxagent/NXevents.c
+1
-1
NXresource.c
nx-X11/programs/Xserver/hw/nxagent/NXresource.c
+2
-2
NXwindow.c
nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+2
-2
Options.h
nx-X11/programs/Xserver/hw/nxagent/Options.h
+2
-2
Pixels.h
nx-X11/programs/Xserver/hw/nxagent/Pixels.h
+3
-4
Pixmap.c
nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+1
-1
Screen.c
nx-X11/programs/Xserver/hw/nxagent/Screen.c
+3
-3
Visual.c
nx-X11/programs/Xserver/hw/nxagent/Visual.c
+2
-2
Window.c
nx-X11/programs/Xserver/hw/nxagent/Window.c
+6
-6
No files found.
nx-X11/programs/Xserver/hw/nxagent/Atoms.c
View file @
170416d2
...
@@ -416,7 +416,7 @@ static void nxagentWriteAtom(Atom local, Atom remote, const char *string, Bool d
...
@@ -416,7 +416,7 @@ static void nxagentWriteAtom(Atom local, Atom remote, const char *string, Bool d
/*
/*
* FIXME: We should clean up the atom map
* FIXME: We should clean up the atom map
* at nxagent reset, in order to cancel
* at nxagent reset, in order to cancel
* all the local atoms but still ma
ntaining
* all the local atoms but still ma
intaining
* the Xserver values and the atom names.
* the Xserver values and the atom names.
*/
*/
...
@@ -470,8 +470,8 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet)
...
@@ -470,8 +470,8 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet)
}
}
/*
/*
* Ask X-Server for our
s
Atoms
* Ask X-Server for our Atoms
* ... if successful
l
cache them too.
* ... if successful cache them too.
*/
*/
ret_value
=
XInternAtoms
(
nxagentDisplay
,
name_list
,
list_size
,
False
,
atom_list
);
ret_value
=
XInternAtoms
(
nxagentDisplay
,
name_list
,
list_size
,
False
,
atom_list
);
...
@@ -532,7 +532,7 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet)
...
@@ -532,7 +532,7 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet)
}
}
/*
/*
* If the nxagent has been reset
ted
,
* If the nxagent has been reset,
* the local value of the atoms stored
* the local value of the atoms stored
* in cache could have the value None,
* in cache could have the value None,
* do not call this function with None.
* do not call this function with None.
...
@@ -639,7 +639,7 @@ Atom nxagentMakeAtom(char *string, unsigned int length, Bool Makeit)
...
@@ -639,7 +639,7 @@ Atom nxagentMakeAtom(char *string, unsigned int length, Bool Makeit)
{
{
/*
/*
* Found Cached by name.
* Found Cached by name.
* It means that nxagent has been reset
ted
,
* It means that nxagent has been reset,
* but not the xserver so we still have cached its atoms.
* but not the xserver so we still have cached its atoms.
*/
*/
...
...
nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
View file @
170416d2
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
#include "X11/include/Xfixes_nxagent.h"
#include "X11/include/Xfixes_nxagent.h"
/*
/*
* Use asyncronous get property replies.
* Use async
h
ronous get property replies.
*/
*/
#include "compext/Compext.h"
#include "compext/Compext.h"
...
...
nx-X11/programs/Xserver/hw/nxagent/Display.c
View file @
170416d2
...
@@ -589,8 +589,8 @@ FIXME: Should print a warning if the user tries to let
...
@@ -589,8 +589,8 @@ FIXME: Should print a warning if the user tries to let
the agent impersonate the same display as the
the agent impersonate the same display as the
display where the agent is supposed to connect.
display where the agent is supposed to connect.
We actually handle this by means of RejectWell-
We actually handle this by means of RejectWell-
KnownSockets() but without giving
to the user
KnownSockets() but without giving
a friendly
a friendly explaination for the erro
r.
explanation for the error to the use
r.
*/
*/
newAction
.
sa_handler
=
nxagentRejectConnection
;
newAction
.
sa_handler
=
nxagentRejectConnection
;
...
@@ -1280,7 +1280,7 @@ N/A
...
@@ -1280,7 +1280,7 @@ N/A
/*
/*
FIXME: Use of nxagentParentWindow is strongly deprecated.
FIXME: Use of nxagentParentWindow is strongly deprecated.
We need also to clarify which events are selected
We need also to clarify which events are selected
in the diferent operating modes.
in the dif
f
erent operating modes.
*/
*/
nxagentInitDefaultEventMask
();
nxagentInitDefaultEventMask
();
...
...
nx-X11/programs/Xserver/hw/nxagent/Drawable.c
View file @
170416d2
...
@@ -71,8 +71,8 @@
...
@@ -71,8 +71,8 @@
/*
/*
* If defined, send the XClearArea at the end
* If defined, send the XClearArea at the end
* of the loop synchronizing the shadow pixmap.
* of the loop synchronizing the shadow pixmap.
* In this way, large images can be split
ted
but
* In this way, large images can be split but
* the user will see more updates tog
het
er.
* the user will see more updates tog
eth
er.
*/
*/
#undef COLLECTED_UPDATES
#undef COLLECTED_UPDATES
...
@@ -643,7 +643,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
...
@@ -643,7 +643,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
fprintf
(
stderr
,
"nxagentSynchronizeRegion: WARNING! Failed to allocate memory for synchronization.
\n
"
);
fprintf
(
stderr
,
"nxagentSynchronizeRegion: WARNING! Failed to allocate memory for synchronization.
\n
"
);
/*
/*
* Print detailed information
s
if the
* Print detailed information if the
* image length is zero.
* image length is zero.
*/
*/
...
@@ -2645,8 +2645,8 @@ void nxagentCreateDrawableBitmap(DrawablePtr pDrawable)
...
@@ -2645,8 +2645,8 @@ void nxagentCreateDrawableBitmap(DrawablePtr pDrawable)
/*
/*
* Should create a function to append
* Should create a function to append
* a bitmap to another, instead of
de-
* a bitmap to another, instead of
*
stroy
the old one.
*
destroying
the old one.
*/
*/
if
(
nxagentDrawableBitmap
(
pDrawable
)
!=
NullPixmap
)
if
(
nxagentDrawableBitmap
(
pDrawable
)
!=
NullPixmap
)
...
...
nx-X11/programs/Xserver/hw/nxagent/Error.c
View file @
170416d2
...
@@ -103,7 +103,7 @@ void nxagentGetClientsPath(void);
...
@@ -103,7 +103,7 @@ void nxagentGetClientsPath(void);
static
int
nxagentPrintError
(
Display
*
dpy
,
XErrorEvent
*
event
,
FILE
*
fp
);
static
int
nxagentPrintError
(
Display
*
dpy
,
XErrorEvent
*
event
,
FILE
*
fp
);
/* declare an error handler that does not exit when an error
/* declare an error handler that does not exit when an error
* event is ca
tched
.
* event is ca
ught
.
*/
*/
int
nxagentErrorHandler
(
Display
*
dpy
,
XErrorEvent
*
event
)
int
nxagentErrorHandler
(
Display
*
dpy
,
XErrorEvent
*
event
)
...
...
nx-X11/programs/Xserver/hw/nxagent/Events.c
View file @
170416d2
...
@@ -3231,7 +3231,7 @@ int nxagentHandleConfigureNotify(XEvent* X)
...
@@ -3231,7 +3231,7 @@ int nxagentHandleConfigureNotify(XEvent* X)
if
((
pWin
=
nxagentRootlessTopLevelWindow
(
X
->
xconfigure
.
window
))
!=
NULL
)
if
((
pWin
=
nxagentRootlessTopLevelWindow
(
X
->
xconfigure
.
window
))
!=
NULL
)
{
{
/*
/*
* Cheking for new geometry or stacking order changes.
* Che
c
king for new geometry or stacking order changes.
*/
*/
nxagentCheckWindowConfiguration
((
XConfigureEvent
*
)
X
);
nxagentCheckWindowConfiguration
((
XConfigureEvent
*
)
X
);
...
...
nx-X11/programs/Xserver/hw/nxagent/Font.c
View file @
170416d2
...
@@ -245,7 +245,7 @@ void nxagentListRemoteFonts(const char *searchPattern, const int maxNames)
...
@@ -245,7 +245,7 @@ void nxagentListRemoteFonts(const char *searchPattern, const int maxNames)
* number of dashes in the pattern acts as
* number of dashes in the pattern acts as
* a rule to select how to search for the
* a rule to select how to search for the
* font names, so the pattern '*' is useful
* font names, so the pattern '*' is useful
* to retrive the font aliases, while the
* to retri
e
ve the font aliases, while the
* other one will select the 'real' fonts.
* other one will select the 'real' fonts.
*/
*/
...
@@ -717,7 +717,7 @@ int nxagentDestroyNewFontResourceType(void * p, XID id)
...
@@ -717,7 +717,7 @@ int nxagentDestroyNewFontResourceType(void * p, XID id)
/*
/*
FIXME: It happens that this resource had been already
FIXME: It happens that this resource had been already
destro
i
ed. We should verify if the same font is
destro
y
ed. We should verify if the same font is
assigned both to the server client and another
assigned both to the server client and another
client. We had a crash when freeing server client
client. We had a crash when freeing server client
resources.
resources.
...
@@ -788,7 +788,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP
...
@@ -788,7 +788,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP
numSearchFields
=
nxagentSplitString
(
nxagentRemoteFontList
.
list
[
i
]
->
name
,
searchFields
,
FIELDS
+
1
,
"-"
);
numSearchFields
=
nxagentSplitString
(
nxagentRemoteFontList
.
list
[
i
]
->
name
,
searchFields
,
FIELDS
+
1
,
"-"
);
/* The following code attemps to find an accurate approximation
/* The following code attemp
t
s to find an accurate approximation
* of the missing font. The current candidate and the missing font are
* of the missing font. The current candidate and the missing font are
* compared on the 14 fields of the X Logical Font Description Convention.
* compared on the 14 fields of the X Logical Font Description Convention.
* The selection is performed by the analysis of the matching fields,
* The selection is performed by the analysis of the matching fields,
...
...
nx-X11/programs/Xserver/hw/nxagent/Handlers.c
View file @
170416d2
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
#define TIME_BEFORE_YIELD 500
#define TIME_BEFORE_YIELD 500
/*
/*
* D
i
namically reduce the display buffer
* D
y
namically reduce the display buffer
* size after a congestion.
* size after a congestion.
*/
*/
...
...
nx-X11/programs/Xserver/hw/nxagent/Image.c
View file @
170416d2
...
@@ -189,8 +189,8 @@ int nxagentImageReformat(char *base, int nbytes, int bpp, int order)
...
@@ -189,8 +189,8 @@ int nxagentImageReformat(char *base, int nbytes, int bpp, int order)
{
{
/*
/*
* This is used whenever we need to swap the image data.
* This is used whenever we need to swap the image data.
* If we got an image from a X server having a different
* If we got an image from a
n
X server having a different
* endian
ess, we will need to red
ormat the image to match
* endian
ness, we will need to ref
ormat the image to match
* our own image-order so that ProcGetImage can return
* our own image-order so that ProcGetImage can return
* the expected format to the client.
* the expected format to the client.
*/
*/
...
@@ -1157,9 +1157,9 @@ FIXME: Should use an unpack resource here.
...
@@ -1157,9 +1157,9 @@ FIXME: Should use an unpack resource here.
/*
/*
* We got the image data from the X client or
* We got the image data from the X client or
* from the frame-buffer with our own endianess.
* from the frame-buffer with our own endian
n
ess.
* Byte swap the image data if the display has
* Byte swap the image data if the display has
* a different endianess than our own.
* a different endian
n
ess than our own.
*/
*/
if
(
nxagentImageNormalize
(
plainImage
)
!=
0
)
if
(
nxagentImageNormalize
(
plainImage
)
!=
0
)
...
...
nx-X11/programs/Xserver/hw/nxagent/Image.h
View file @
170416d2
...
@@ -84,7 +84,7 @@ void nxagentResetAlphaCache(void);
...
@@ -84,7 +84,7 @@ void nxagentResetAlphaCache(void);
/*
/*
* Byte swap the image if the display
* Byte swap the image if the display
* uses a different endianess.
* uses a different endian
n
ess.
*/
*/
#define nxagentImageNormalize(image) \
#define nxagentImageNormalize(image) \
...
...
nx-X11/programs/Xserver/hw/nxagent/Imakefile
View file @
170416d2
...
@@ -212,7 +212,7 @@ INCLUDES = \
...
@@ -212,7 +212,7 @@ INCLUDES = \
# NXAGENT_GLYPHCACHE
# NXAGENT_GLYPHCACHE
# NXAGENT_GLYPHCACHE_SIZE Slots for glyph cache
# NXAGENT_GLYPHCACHE_SIZE Slots for glyph cache
# NXAGENT_SHAPE2 New shape code
# NXAGENT_SHAPE2 New shape code
# NXAGENT_FIXKEYS Force the release of pressed key when lo
o
sing focus
# NXAGENT_FIXKEYS Force the release of pressed key when losing focus
# NXAGENT_EXPOSURES Manage expose events
# NXAGENT_EXPOSURES Manage expose events
# NXAGENT_CLIPBOARD Enables clipboard cut and paste function between X servers.
# NXAGENT_CLIPBOARD Enables clipboard cut and paste function between X servers.
# NXAGENT_FONTEXCLUDE Exclude some specific font names (only "-ult1mo" at this moment).
# NXAGENT_FONTEXCLUDE Exclude some specific font names (only "-ult1mo" at this moment).
...
...
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
View file @
170416d2
...
@@ -540,7 +540,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
...
@@ -540,7 +540,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
#if defined(DDXBEFORERESET)
#if defined(DDXBEFORERESET)
ddxBeforeReset
();
ddxBeforeReset
();
#endif
#endif
/* FIXME: maybe move the code upto the KillAllClients() call to ddxBeforeReset? */
/* FIXME: maybe move the code up
to the KillAllClients() call to ddxBeforeReset? */
if
((
dispatchException
&
DE_RESET
)
&&
if
((
dispatchException
&
DE_RESET
)
&&
(
serverGeneration
>
nxagentMaxAllowedResets
))
(
serverGeneration
>
nxagentMaxAllowedResets
))
{
{
...
...
nx-X11/programs/Xserver/hw/nxagent/NXevents.c
View file @
170416d2
...
@@ -568,7 +568,7 @@ ProcSendEvent(ClientPtr client)
...
@@ -568,7 +568,7 @@ ProcSendEvent(ClientPtr client)
return
Success
;
return
Success
;
/* If the input focus is PointerRootWin, send the event to where
/* If the input focus is PointerRootWin, send the event to where
the pointer is if possible, then perhaps prop
o
gate up to root. */
the pointer is if possible, then perhaps prop
a
gate up to root. */
if
(
inputFocus
==
PointerRootWin
)
if
(
inputFocus
==
PointerRootWin
)
inputFocus
=
ROOT
;
inputFocus
=
ROOT
;
...
...
nx-X11/programs/Xserver/hw/nxagent/NXresource.c
View file @
170416d2
...
@@ -437,7 +437,7 @@ RestartLoop:
...
@@ -437,7 +437,7 @@ RestartLoop:
/*
/*
* It's not enough to check if the number of elements has
* It's not enough to check if the number of elements has
* changed, be
a
cause it could happen that the number of
* changed, because it could happen that the number of
* resources that have been added matches the number of
* resources that have been added matches the number of
* the freed ones.
* the freed ones.
* 'nxagentResChangedFlag' is set if a resource has been
* 'nxagentResChangedFlag' is set if a resource has been
...
@@ -521,7 +521,7 @@ RestartLoop:
...
@@ -521,7 +521,7 @@ RestartLoop:
/*
/*
* It's not enough to check if the number of elements has
* It's not enough to check if the number of elements has
* changed, be
a
cause it could happen that the number of
* changed, because it could happen that the number of
* resources that have been added matches the number of
* resources that have been added matches the number of
* the freed ones.
* the freed ones.
* 'nxagentResChangedFlag' is set if a resource has been
* 'nxagentResChangedFlag' is set if a resource has been
...
...
nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
View file @
170416d2
...
@@ -543,7 +543,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP
...
@@ -543,7 +543,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP
if
(
!
pParent
)
if
(
!
pParent
)
return
Success
;
return
Success
;
/* Figure out if the window should be moved. Doesnt
/* Figure out if the window should be moved. Doesn
'
t
make the changes to the window if event sent */
make the changes to the window if event sent */
#ifdef TEST
#ifdef TEST
...
@@ -769,7 +769,7 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent,
...
@@ -769,7 +769,7 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent,
if
(
pWin
->
prevSib
)
if
(
pWin
->
prevSib
)
pWin
->
prevSib
->
nextSib
=
pWin
->
nextSib
;
pWin
->
prevSib
->
nextSib
=
pWin
->
nextSib
;
/* insert at begining of pParent */
/* insert at begin
n
ing of pParent */
pWin
->
parent
=
pParent
;
pWin
->
parent
=
pParent
;
pPrev
=
RealChildHead
(
pParent
);
pPrev
=
RealChildHead
(
pParent
);
...
...
nx-X11/programs/Xserver/hw/nxagent/Options.h
View file @
170416d2
...
@@ -334,7 +334,7 @@ typedef struct _AgentOptions
...
@@ -334,7 +334,7 @@ typedef struct _AgentOptions
/*
/*
* If set, prevent the shadow session to
* If set, prevent the shadow session to
* interact with master diplay.
* interact with master di
s
play.
*/
*/
int
ViewOnly
;
int
ViewOnly
;
...
@@ -429,7 +429,7 @@ typedef struct _AgentOptions
...
@@ -429,7 +429,7 @@ typedef struct _AgentOptions
* we cannot rely on them because RandR and PanoramiX change their
* we cannot rely on them because RandR and PanoramiX change their
* values when trying to initialize. So we use this variable to
* values when trying to initialize. So we use this variable to
* save the user preference provided by the -/+(rr)xinerama parameter(s)
* save the user preference provided by the -/+(rr)xinerama parameter(s)
* before initalizing those extensions.
* before init
i
alizing those extensions.
*/
*/
int
Xinerama
;
int
Xinerama
;
...
...
nx-X11/programs/Xserver/hw/nxagent/Pixels.h
View file @
170416d2
...
@@ -111,10 +111,9 @@ while (0)
...
@@ -111,10 +111,9 @@ while (0)
nxagentCongestion > 4)
nxagentCongestion > 4)
/*
/*
FIXME: The condition checking for the render
FIXME: The condition checking for the render version is a workaround
version is a workaround implemented to
implemented to avoid problems with the render composite on
avoid problems with the render composi-
XFree86 remote server.
te on XFree86 remote server.
*/
*/
/*
/*
FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE
FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE
...
...
nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
View file @
170416d2
...
@@ -1129,7 +1129,7 @@ Bool nxagentCheckPixmapIntegrity(PixmapPtr pPixmap)
...
@@ -1129,7 +1129,7 @@ Bool nxagentCheckPixmapIntegrity(PixmapPtr pPixmap)
#ifdef TEST
#ifdef TEST
fprintf
(
stderr
,
"nxagentCheckPixmapIntegrity: Pixmap at [%p] has been realized. "
fprintf
(
stderr
,
"nxagentCheckPixmapIntegrity: Pixmap at [%p] has been realized. "
"Now remote and frambuffer data are synchronized.
\n
"
,
(
void
*
)
pPixmap
);
"Now remote and fram
e
buffer data are synchronized.
\n
"
,
(
void
*
)
pPixmap
);
#endif
#endif
}
}
...
...
nx-X11/programs/Xserver/hw/nxagent/Screen.c
View file @
170416d2
...
@@ -236,7 +236,7 @@ void nxagentSetScreenInfo(ScreenInfo *screenInfo)
...
@@ -236,7 +236,7 @@ void nxagentSetScreenInfo(ScreenInfo *screenInfo)
* server this stuff is done after having opened the
* server this stuff is done after having opened the
* real display as Xnest lets the screen reflect the
* real display as Xnest lets the screen reflect the
* order of the remote end. Agent will instead set
* order of the remote end. Agent will instead set
* the order according to local endianess and swap
* the order according to local endian
n
ess and swap
* data whenever it is appropriate.
* data whenever it is appropriate.
*
*
* From a standard implementation:
* From a standard implementation:
...
@@ -329,7 +329,7 @@ void nxagentMaximizeToFullScreen(ScreenPtr pScreen)
...
@@ -329,7 +329,7 @@ void nxagentMaximizeToFullScreen(ScreenPtr pScreen)
/*
/*
FIXME: We'll check for ReparentNotify and LeaveNotify events after XReparentWindow()
FIXME: We'll check for ReparentNotify and LeaveNotify events after XReparentWindow()
in order to avoid the session window is iconified.
in order to avoid the session window is iconified.
We could avoid the sess
s
ion window is iconified when a LeaveNotify event is received,
We could avoid the session window is iconified when a LeaveNotify event is received,
so this check would be unnecessary.
so this check would be unnecessary.
*/
*/
struct
timeval
timeout
;
struct
timeval
timeout
;
...
@@ -4012,7 +4012,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
...
@@ -4012,7 +4012,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
/*
/*
* Convert old RANDR 1.0 data (if any) to current structure. This
* Convert old RANDR 1.0 data (if any) to current structure. This
* is needed once at the first run of this function. If we don't
* is needed once at the first run of this function. If we don't
* do this here it will be done implicit
e
ly later and add mode(s) to
* do this here it will be done implicitly later and add mode(s) to
* our crtc(s)!
* our crtc(s)!
*/
*/
rrgetinfo
=
RRGetInfo
(
pScreen
,
FALSE
);
rrgetinfo
=
RRGetInfo
(
pScreen
,
FALSE
);
...
...
nx-X11/programs/Xserver/hw/nxagent/Visual.c
View file @
170416d2
...
@@ -141,7 +141,7 @@ Visual *nxagentVisualFromDepth(ScreenPtr pScreen, int depth)
...
@@ -141,7 +141,7 @@ Visual *nxagentVisualFromDepth(ScreenPtr pScreen, int depth)
/*
/*
* Create a fake 32 bits depth visual and
* Create a fake 32 bits depth visual and
* initialize it based on the endianess
* initialize it based on the endian
n
ess
* of the remote display.
* of the remote display.
*/
*/
...
@@ -152,7 +152,7 @@ void nxagentInitAlphaVisual(void)
...
@@ -152,7 +152,7 @@ void nxagentInitAlphaVisual(void)
/*
/*
* Color masks are referred to bits inside
* Color masks are referred to bits inside
* the pixel. This is independent from the
* the pixel. This is independent from the
* endianess.
* endian
n
ess.
*/
*/
nxagentAlphaVisual
.
red_mask
=
0x00ff0000
;
nxagentAlphaVisual
.
red_mask
=
0x00ff0000
;
...
...
nx-X11/programs/Xserver/hw/nxagent/Window.c
View file @
170416d2
...
@@ -1752,7 +1752,7 @@ Bool nxagentChangeWindowAttributes(pWin, mask)
...
@@ -1752,7 +1752,7 @@ Bool nxagentChangeWindowAttributes(pWin, mask)
}
}
/*
/*
* As we set this bit, w
h
e must change dix in
* As we set this bit, we must change dix in
* order not to perform PositionWindow and let
* order not to perform PositionWindow and let
* X move children windows for us.
* X move children windows for us.
*/
*/
...
@@ -2635,7 +2635,7 @@ void nxagentMapDefaultWindows(void)
...
@@ -2635,7 +2635,7 @@ void nxagentMapDefaultWindows(void)
Bool
nxagentDisconnectAllWindows
(
void
)
Bool
nxagentDisconnectAllWindows
(
void
)
{
{
Bool
succeded
=
True
;
Bool
succe
e
ded
=
True
;
int
i
;
int
i
;
WindowPtr
pWin
;
WindowPtr
pWin
;
...
@@ -2646,7 +2646,7 @@ Bool nxagentDisconnectAllWindows(void)
...
@@ -2646,7 +2646,7 @@ Bool nxagentDisconnectAllWindows(void)
for
(
i
=
0
;
i
<
screenInfo
.
numScreens
;
i
++
)
for
(
i
=
0
;
i
<
screenInfo
.
numScreens
;
i
++
)
{
{
pWin
=
screenInfo
.
screens
[
i
]
->
root
;
pWin
=
screenInfo
.
screens
[
i
]
->
root
;
nxagentTraverseWindow
(
pWin
,
nxagentDisconnectWindow
,
&
succeded
);
nxagentTraverseWindow
(
pWin
,
nxagentDisconnectWindow
,
&
succe
e
ded
);
nxagentDefaultWindows
[
i
]
=
None
;
nxagentDefaultWindows
[
i
]
=
None
;
}
}
...
@@ -2654,7 +2654,7 @@ Bool nxagentDisconnectAllWindows(void)
...
@@ -2654,7 +2654,7 @@ Bool nxagentDisconnectAllWindows(void)
fprintf
(
stderr
,
"nxagentDisconnectAllWindows: all windows disconnected
\n
"
);
fprintf
(
stderr
,
"nxagentDisconnectAllWindows: all windows disconnected
\n
"
);
#endif
#endif
return
succeded
;
return
succe
e
ded
;
}
}
/*
/*
...
@@ -3270,7 +3270,7 @@ static void nxagentReconfigureWindow(void * param0, XID param1, void * data_buff
...
@@ -3270,7 +3270,7 @@ static void nxagentReconfigureWindow(void * param0, XID param1, void * data_buff
}
}
/*
/*
XXX: This would break Motif menus.
XXX: This would break Motif menus.
If pWin is mapped but not realized, a followin UnmapWindow() wouldn't
If pWin is mapped but not realized, a followin
g
UnmapWindow() wouldn't
do anything, leaving this mapped window around. XMapWindow()
do anything, leaving this mapped window around. XMapWindow()
is called in nxagentRealizeWindow() and there it is enough.
is called in nxagentRealizeWindow() and there it is enough.
...
@@ -3387,7 +3387,7 @@ Bool nxagentCheckWindowIntegrity(WindowPtr pWin)
...
@@ -3387,7 +3387,7 @@ Bool nxagentCheckWindowIntegrity(WindowPtr pWin)
{
{
#ifdef WARNING
#ifdef WARNING
fprintf
(
stderr
,
"nxagentCheckWindowIntegrity: Window %p has been realized "
fprintf
(
stderr
,
"nxagentCheckWindowIntegrity: Window %p has been realized "
"now remote and frambuffer data are synchronized.
\n
"
,
(
void
*
)
pWin
);
"now remote and fram
e
buffer data are synchronized.
\n
"
,
(
void
*
)
pWin
);
#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