Skip to content

N
nx-libs
Commit 01ed7571 authored by Reinhard Tartler's avatar Reinhard Tartler
Browse files
Options

Imported nx-X11-3.3.0-3.tar.gz

Summary: Imported nx-X11-3.3.0-3.tar.gz Keywords: Imported nx-X11-3.3.0-3.tar.gz into Git repository
parent 30463b08
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 8 deletions
nx-X11/CHANGELOG
View file @ 01ed7571
ChangeLog:
nx-X11-3.3.0-3
- Fixed the search path for the XKB base directory.
nx-X11-3.3.0-2
- Fixed TR10F02116. The X11 agent could enter an indefinite wait state
if connection to X display is broken and libX11 output buffer is not
empty.
nx-X11-3.3.0-1
- Opened the 3.3.0 branch based on nx-X11-3.2.0-2.
nx-X11-3.2.0-2
- Imported patch fixing issues from X.Org security advisory, June
......
nx-X11/CHANGELOG.NX.original
View file @ 01ed7571
ChangeLog:
nx-X11-3.3.0-3
- Fixed the search path for the XKB base directory.
nx-X11-3.3.0-2
- Fixed TR10F02116. The X11 agent could enter an indefinite wait state
if connection to X display is broken and libX11 output buffer is not
empty.
nx-X11-3.3.0-1
- Opened the 3.3.0 branch based on nx-X11-3.2.0-2.
nx-X11-3.2.0-2
- Imported patch fixing issues from X.Org security advisory, June
......
nx-X11/lib/X11/XlibInt.c
View file @ 01ed7571
......@@ -1840,7 +1840,20 @@ _XSend (
int congestion;
#endif
#ifdef AGENT_SERVER
if (!size || (dpy->flags & XlibDisplayIOError))
{
if (dpy->flags & XlibDisplayIOError)
{
dpy->bufptr = dpy->buffer;
dpy->last_req = (char *)&_dummy_request;
}
return;
}
#else
if (!size || (dpy->flags & XlibDisplayIOError)) return;
#endif
dbufsize = dpy->bufptr - dpy->buffer;
#ifdef XTHREADS
dpy->flags |= XlibDisplayWriting;
......
nx-X11/lib/X11/XlibInt.c.NX.original
View file @ 01ed7571
......@@ -1840,7 +1840,20 @@ _XSend (
int congestion;
#endif
#ifdef AGENT_SERVER
if (!size || (dpy->flags & XlibDisplayIOError))
{
if (dpy->flags & XlibDisplayIOError)
{
dpy->bufptr = dpy->buffer;
dpy->last_req = (char *)&_dummy_request;
}
return;
}
#else
if (!size || (dpy->flags & XlibDisplayIOError)) return;
#endif
dbufsize = dpy->bufptr - dpy->buffer;
#ifdef XTHREADS
dpy->flags |= XlibDisplayWriting;
......
nx-X11/programs/Xserver/xkb/ddxLoad.c
View file @ 01ed7571
......@@ -559,7 +559,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
#ifndef __UNIXOS2__
#ifdef NXAGENT_SERVER
char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory);
char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory);
char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory);
#else
char *xkbbasedir = XkbBaseDirectory;
......@@ -569,7 +569,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
#else
/* relocate the basedir and replace the slashes with backslashes */
#ifdef NXAGENT_SERVER
char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory));
char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory));
char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory));
#else
char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);
......@@ -675,7 +675,7 @@ char tmpname[PATH_MAX];
#endif
#ifndef __UNIXOS2__
#ifdef NXAGENT_SERVER
char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory);
char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory);
char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory);
#else
char *xkbbasedir = XkbBaseDirectory;
......@@ -684,7 +684,7 @@ char tmpname[PATH_MAX];
#else
int i;
#ifdef NXAGENT_SERVER
char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory));
char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory));
char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory));
#else
char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);
......
nx-X11/programs/Xserver/xkb/ddxLoad.c.NX.original
View file @ 01ed7571
......@@ -559,7 +559,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
#ifndef __UNIXOS2__
#ifdef NXAGENT_SERVER
char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory);
char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory);
char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory);
#else
char *xkbbasedir = XkbBaseDirectory;
......@@ -569,7 +569,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
#else
/* relocate the basedir and replace the slashes with backslashes */
#ifdef NXAGENT_SERVER
char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory));
char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory));
char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory));
#else
char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);
......@@ -675,7 +675,7 @@ char tmpname[PATH_MAX];
#endif
#ifndef __UNIXOS2__
#ifdef NXAGENT_SERVER
char *xkbbasedir = _NXGetXkbCompPath(XkbBaseDirectory);
char *xkbbasedir = _NXGetXkbBasePath(XkbBaseDirectory);
char *xkbbindir = _NXGetXkbCompPath(XkbBinDirectory);
#else
char *xkbbasedir = XkbBaseDirectory;
......@@ -684,7 +684,7 @@ char tmpname[PATH_MAX];
#else
int i;
#ifdef NXAGENT_SERVER
char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBaseDirectory));
char *xkbbasedir = (char*)__XOS2RedirRoot(_NXGetXkbBasePath(XkbBaseDirectory));
char *xkbbindir = (char*)__XOS2RedirRoot(_NXGetXkbCompPath(XkbBinDirectory));
#else
char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment