This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.6.x in repository nx-libs. from 28c14ac release 3.5.99.16 adds 13bf7c0 Makefile: Don't do a parallel clean-up of nx-X11. We have seen failures and due to the upcoming switch to autotools, it is pointless to dive into fixing it in the Imakefile stack. adds da47704 Makefile targets: Rewriting and consolidating the target structure for nx-X11/ subdir (except nx-X11/lib/). adds 94d77e2 debian/rules: Avoid dh_auto_build. It adds -Oline since 11.2 which let's make choke in nx-X11/ subdir on the Makefiles target. Reason unknown. adds f944a0d debian/rules: Drop override_dh_clean. Makefile (et al.) removal in nx-X11/ has now been moved to the distclean target. adds 190e3df debian/rules: Typo fix (NUMJOBS, not NUM_JOBS). adds 0fc5040 Makefile: Enforce -j1 for BuildDependsOnly target. adds b817592 Revert "debian/rules: Typo fix (NUMJOBS, not NUM_JOBS)." adds 3d8818f Revert "debian/rules: Avoid dh_auto_build. It adds -Oline since 11.2 which let's make choke in nx-X11/ subdir on the Makefiles target. Reason unknown." adds 90156e3 Makefile: Run BuildIncludes and clean target in nx-X11/ with -j1. adds 01dbfde debian/rules: Run dh_auto_clean with --no-parallel. adds 997f2bb nx-libs.spec: we never used gpg-offline, drop it. new a32554d nxcomp: fix spelling errors as reported by codespell new 94f7ce7 nxcompshad: fix spelling errors as reported by codespell new 170416d hw/nxagent: fix spelling errors as reported by codespell new d5da7e7 manpage: fix spelling error as reported by codespell new 781b8a0 compext: fix spelling errors as reported by codespell new e91406e nxproxy: fix spelling errors as reported by codespell new cce9756 config/cf: fix spelling errors as reported by codespell new 11b534a Merge branch 'uli42-pr/codespell' into 3.6.x new 7cb0035 debian/rules: Highly enforce --no-parallel mode while Xserver is still on imake. Can be re-parallelized after autotools conversion. new 985bed9 debian/rules: Typo fix in dh_auto_build --no-parallel option. new 9937fbd Screen.c: replace XSetWMNormalHints code block by already existing function new 82c4c28 Screen.c/Events.c: add some FIXMEs new 82dc005 nxagent: use XAllocSizeHints() instead of XSizeHints struct new 845ae6e Screen.c/Events.c: fix some comments new 00c1f05 nxagent: remove mmwidth/mmheight from nxagentChangeScreenConfig new f9bae75 Events.c: catch intermediate window position changes new 0167591 Screen.c: simplify setting of window name/class new 9138a9e whitespace fixes new c0f67ab Merge branch 'uli42-pr/cleanup_window_hints' into 3.6.x new 3f6d8f3 Update Xinerama on XMapEvent new 7ec73ef Merge branch 'uli42-pr/xinerama_without_wm' into 3.6.x new 70ac10c Clipboard.c: add missing include new 7429573 Merge branch 'uli42-pr/fix_missing_include' into 3.6.x The 23 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Makefile | 44 ++-- debian/rules | 73 +----- m4/nx-macros.m4 | 8 +- nx-X11/Makefile | 133 +++++----- nx-X11/config/cf/Imake.rules | 4 +- nx-X11/config/cf/Imake.tmpl | 2 +- nx-X11/config/cf/gnu.cf | 2 +- nx-X11/config/cf/host.def | 2 +- nx-X11/config/cf/linux.cf | 2 +- nx-X11/config/cf/xorg.cf | 2 +- nx-X11/config/cf/xorgsite.def | 2 +- nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 12 +- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 3 +- nx-X11/programs/Xserver/hw/nxagent/Display.c | 6 +- nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 10 +- nx-X11/programs/Xserver/hw/nxagent/Error.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 102 +++++--- nx-X11/programs/Xserver/hw/nxagent/Events.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Extensions.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Font.c | 6 +- nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Image.c | 8 +- nx-X11/programs/Xserver/hw/nxagent/Image.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Imakefile | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXresource.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Options.h | 4 +- nx-X11/programs/Xserver/hw/nxagent/Pixels.h | 7 +- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 275 +++++++++++---------- nx-X11/programs/Xserver/hw/nxagent/Screen.h | 8 +- nx-X11/programs/Xserver/hw/nxagent/Visual.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Window.c | 19 +- .../programs/Xserver/hw/nxagent/compext/Compext.c | 2 +- .../programs/Xserver/hw/nxagent/compext/Compext.h | 4 +- nx-X11/programs/Xserver/hw/nxagent/compext/Png.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/compext/Z.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 +- nx-libs.spec | 4 - nxcomp/src/Agent.h | 2 +- nxcomp/src/Children.cpp | 2 +- nxcomp/src/ClientChannel.cpp | 4 +- nxcomp/src/Control.cpp | 2 +- nxcomp/src/DecodeBuffer.cpp | 2 +- nxcomp/src/GenericReadBuffer.cpp | 2 +- nxcomp/src/Keeper.cpp | 2 +- nxcomp/src/Loop.cpp | 8 +- nxcomp/src/MD5.c | 2 +- nxcomp/src/Proxy.h | 2 +- nxcomp/src/PutPackedImage.h | 2 +- nxcomp/src/Statistics.cpp | 6 +- nxcompshad/src/Core.cpp | 2 +- nxcompshad/src/Manager.cpp | 2 +- nxcompshad/src/X11.cpp | 4 +- nxproxy/src/Main.c | 2 +- 58 files changed, 399 insertions(+), 431 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit a32554dbf9ad4b42bbfa007bb5abde14e4a9ceee Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Apr 10 21:05:29 2018 +0200 nxcomp: fix spelling errors as reported by codespell --- nxcomp/src/Agent.h | 2 +- nxcomp/src/Children.cpp | 2 +- nxcomp/src/ClientChannel.cpp | 4 ++-- nxcomp/src/Control.cpp | 2 +- nxcomp/src/DecodeBuffer.cpp | 2 +- nxcomp/src/GenericReadBuffer.cpp | 2 +- nxcomp/src/Keeper.cpp | 2 +- nxcomp/src/Loop.cpp | 8 ++++---- nxcomp/src/MD5.c | 2 +- nxcomp/src/Proxy.h | 2 +- nxcomp/src/PutPackedImage.h | 2 +- nxcomp/src/Statistics.cpp | 6 +++--- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nxcomp/src/Agent.h b/nxcomp/src/Agent.h index 3e1a50a..a7c8b63 100644 --- a/nxcomp/src/Agent.h +++ b/nxcomp/src/Agent.h @@ -50,7 +50,7 @@ class Agent // // Must be created by passing the fake descriptor that // will be used for simulating socket communication - // betwen the agent and the proxy. I/O will take place + // between the agent and the proxy. I/O will take place // by copying data to the agent's read and write buf- // fers. // diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp index e586292..2431e53 100644 --- a/nxcomp/src/Children.cpp +++ b/nxcomp/src/Children.cpp @@ -893,7 +893,7 @@ int NXTransKeeper(int caches, int images, const char *root) } // - // Take care of the persisten image cache. + // Take care of the persistent image cache. // Run a number of iterations and then exit, // so we can keep the memory consumption // low. The parent will check our exit code diff --git a/nxcomp/src/ClientChannel.cpp b/nxcomp/src/ClientChannel.cpp index 1c63548..f67ee0a 100644 --- a/nxcomp/src/ClientChannel.cpp +++ b/nxcomp/src/ClientChannel.cpp @@ -3850,7 +3850,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length // // Use differential compression at startup and plain // data compression later. Check X_ListFonts message - // for an explaination. + // for an explanation. // MessageStore *messageStore = serverStore_ -> @@ -5974,7 +5974,7 @@ int ClientChannel::handleRestart(T_sequence_mode mode, int resource) // integer number (0-255) referred to as the 'resource' field. // // Before the proxy will be able to report the status of the - // split, the agent will have to close the sequence by issueing + // split, the agent will have to close the sequence by issuing // an end-split. The proxy will then report the result of the // operation, so that the agent will have the option of suspend- // ing the client or marking the drawable as dirty and take diff --git a/nxcomp/src/Control.cpp b/nxcomp/src/Control.cpp index 75fd56e..d894e65 100644 --- a/nxcomp/src/Control.cpp +++ b/nxcomp/src/Control.cpp @@ -131,7 +131,7 @@ #define SHMEM_TIMEOUT 200 // // Before closing down the proxy, wait for the -// given amount of miliseconds to let all the +// given amount of milliseconds to let all the // running applications to close down their // connections. // diff --git a/nxcomp/src/DecodeBuffer.cpp b/nxcomp/src/DecodeBuffer.cpp index 4c1530d..09ed673 100644 --- a/nxcomp/src/DecodeBuffer.cpp +++ b/nxcomp/src/DecodeBuffer.cpp @@ -476,7 +476,7 @@ const unsigned char *DecodeBuffer::decodeMemory(unsigned int numBytes) // // Force ourselves to a byte boundary. // Is up to application to ensure data - // is word alligned when needed. + // is word aligned when needed. // if (srcMask_ != 0x80) diff --git a/nxcomp/src/GenericReadBuffer.cpp b/nxcomp/src/GenericReadBuffer.cpp index 7821715..dd8bfd8 100644 --- a/nxcomp/src/GenericReadBuffer.cpp +++ b/nxcomp/src/GenericReadBuffer.cpp @@ -52,7 +52,7 @@ int GenericReadBuffer::locateMessage(const unsigned char *start, unsigned int &trailerLength) { // - // We don't care about the endianess + // We don't care about the endianness // in generic channels. // diff --git a/nxcomp/src/Keeper.cpp b/nxcomp/src/Keeper.cpp index 4babbe8..d945e6a 100644 --- a/nxcomp/src/Keeper.cpp +++ b/nxcomp/src/Keeper.cpp @@ -100,7 +100,7 @@ File::File() // // TODO: This class can leak industrial amounts of memory. -// I'm 100% sure that the desctructor is called and that +// I'm 100% sure that the destructor is called and that // also the string pointed in the File structure is dele- // ted. Everything is logged, but still the memory is not // freed. This is less a problem on Windows, where the me- diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index f22053c..ddffcd1 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -751,7 +751,7 @@ static char sessionDir[DEFAULT_STRING_LENGTH] = { 0 }; // // Log files for errors and statistics. Error log is -// the place where we print also debug informations. +// the place where we print also debug information. // Both files are closed, deleted and reopened as // their size exceed the limit set in control class. // The session log is not reopened, as it is used by @@ -3100,7 +3100,7 @@ int InitBeforeNegotiation() SetDescriptors(); // - // Set local endianess. + // Set local endianness. // unsigned int test = 1; @@ -5664,7 +5664,7 @@ void HandleSignal(int signal) // if (agentFD[1] != -1) // { // cerr << "Info" << ": Received signal 'SIGPIPE'. " - // << "Closing agent conection.\n"; + // << "Closing agent connection.\n"; // // shutdown(agentFD[1], SHUT_RDWR); // } @@ -6636,7 +6636,7 @@ int ConnectToRemote(ChannelEndPoint &socketAddress) // Show an alert after 20 seconds and use the // same timeout to interrupt the connect. The // retry timeout is incremental, starting from - // 100 miliseconds up to 1 second. + // 100 milliseconds up to 1 second. // int alertTimeout = 20000; diff --git a/nxcomp/src/MD5.c b/nxcomp/src/MD5.c index 7255ca5..43a2793 100644 --- a/nxcomp/src/MD5.c +++ b/nxcomp/src/MD5.c @@ -60,7 +60,7 @@ #include <string.h> /* - * Try to determine the CPU endianess + * Try to determine the CPU endianness * at compile time. */ diff --git a/nxcomp/src/Proxy.h b/nxcomp/src/Proxy.h index ea60c82..2c4353f 100644 --- a/nxcomp/src/Proxy.h +++ b/nxcomp/src/Proxy.h @@ -184,7 +184,7 @@ class Proxy static const int TOKEN_TYPES = 3; // - // Lenght of buffer we use to add our + // Length of buffer we use to add our // control messages plus the length of // the data frame. // diff --git a/nxcomp/src/PutPackedImage.h b/nxcomp/src/PutPackedImage.h index d28ad39..9e35596 100644 --- a/nxcomp/src/PutPackedImage.h +++ b/nxcomp/src/PutPackedImage.h @@ -47,7 +47,7 @@ #define PUTPACKEDIMAGE_ENABLE_COMPRESS 0 // -// We can't exceed lenght of 262144 bytes. +// We can't exceed a length of 262144 bytes. // #define PUTPACKEDIMAGE_DATA_LIMIT 262144 - 40 diff --git a/nxcomp/src/Statistics.cpp b/nxcomp/src/Statistics.cpp index 68673ff..c6f6658 100644 --- a/nxcomp/src/Statistics.cpp +++ b/nxcomp/src/Statistics.cpp @@ -348,9 +348,9 @@ void Statistics::addCompressedBytes(unsigned int bytesIn, unsigned int bytesOut) // receives the data from the upper layers. The reason // is that data can be compressed by the stream com- // pressor, so we can become aware of the new bitrate -// only afer having flushed the ZLIB stream. This also -// means that, to have a reliable estimate, we need to -// flush the link often. +// only after having flushed the ZLIB stream. This also +// means that, to have a reliable estimatation, we need +// to flush the link often. // void Statistics::updateBitrate(int bytes) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 94f7ce7d17e4d537211b6a344c4e9e0e467e1d0e Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Apr 10 21:06:01 2018 +0200 nxcompshad: fix spelling errors as reported by codespell --- nxcompshad/src/Core.cpp | 2 +- nxcompshad/src/Manager.cpp | 2 +- nxcompshad/src/X11.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nxcompshad/src/Core.cpp b/nxcompshad/src/Core.cpp index 39ac4a3..c5084e8 100644 --- a/nxcompshad/src/Core.cpp +++ b/nxcompshad/src/Core.cpp @@ -251,7 +251,7 @@ int CorePoller::isChanged(int (*checkIfInputCallback)(void *), void *arg, int *s for (; curLine < (int) height_; curLine++) { - logDebug("CorePoller::isChanged", "Analizing line [%d] move backward [%d] status [%d] priority [%d].", + logDebug("CorePoller::isChanged", "Analyzing line [%d] move backward [%d] status [%d] priority [%d].", curLine, moveBackward, lineStatus_[curIlace], linePriority_[curLine]); // diff --git a/nxcompshad/src/Manager.cpp b/nxcompshad/src/Manager.cpp index 6e3f6b1..ef337db 100644 --- a/nxcompshad/src/Manager.cpp +++ b/nxcompshad/src/Manager.cpp @@ -239,7 +239,7 @@ void UpdateManager::handleInput() } catch (UpdaterClosing u) { - logTest("UpdateManager::handleInput", "Catched exception UpdaterClosing()."); + logTest("UpdateManager::handleInput", "Caught exception UpdaterClosing()."); removeUpdater((UpdaterHandle)updaterVector[i]); diff --git a/nxcompshad/src/X11.cpp b/nxcompshad/src/X11.cpp index 8c5dbd5..7a84b73 100644 --- a/nxcompshad/src/X11.cpp +++ b/nxcompshad/src/X11.cpp @@ -212,7 +212,7 @@ char *Poller::getRect(XRectangle r) { logTrace("Poller::getRect"); - logDebug("Poller::getRect", "Going to retrive rectangle [%d, %d, %d, %d].", + logDebug("Poller::getRect", "Going to retrieve rectangle [%d, %d, %d, %d].", r.x, r.y, r.width, r.height); if (shmExtension_ == 1) @@ -1144,7 +1144,7 @@ SendKeycode: // // Use keysyms to translate keycodes across different - // keyboard models. Unuseful when both keyboards have + // keyboard models. Useless when both keyboards have // same keycodes (e.g. both are pc keyboards). // -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 170416d26e885d4a6544a214b078162a0883bd94 Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Apr 10 21:11:57 2018 +0200 hw/nxagent: fix spelling errors as reported by codespell --- nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 12 ++++++------ nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Display.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 10 +++++----- nx-X11/programs/Xserver/hw/nxagent/Error.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Font.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Image.c | 8 ++++---- nx-X11/programs/Xserver/hw/nxagent/Image.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Imakefile | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXresource.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Options.h | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Pixels.h | 7 +++---- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Visual.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Window.c | 12 ++++++------ 21 files changed, 50 insertions(+), 51 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c index e2d97d2..5e578a5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c @@ -415,8 +415,8 @@ static void nxagentWriteAtom(Atom local, Atom remote, const char *string, Bool d /* * FIXME: We should clean up the atom map - * at nxagent reset, in order to cancel - * all the local atoms but still mantaining + * at nxagent reset, in order to cancel + * all the local atoms but still maintaining * the Xserver values and the atom names. */ @@ -470,8 +470,8 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet) } /* - * Ask X-Server for ours Atoms - * ... if successfull cache them too. + * Ask X-Server for our Atoms + * ... if successful cache them too. */ ret_value = XInternAtoms(nxagentDisplay, name_list, list_size, False, atom_list); @@ -532,7 +532,7 @@ static int nxagentInitAtomMap(char **atomNameList, int count, Atom *atomsRet) } /* - * If the nxagent has been resetted, + * If the nxagent has been reset, * the local value of the atoms stored * in cache could have the value None, * do not call this function with None. @@ -639,7 +639,7 @@ Atom nxagentMakeAtom(char *string, unsigned int length, Bool Makeit) { /* * Found Cached by name. - * It means that nxagent has been resetted, + * It means that nxagent has been reset, * but not the xserver so we still have cached its atoms. */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index a13c842..a2ea7d6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -43,7 +43,7 @@ #include "X11/include/Xfixes_nxagent.h" /* - * Use asyncronous get property replies. + * Use asynchronous get property replies. */ #include "compext/Compext.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 494a732..3ca3db2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -589,8 +589,8 @@ FIXME: Should print a warning if the user tries to let the agent impersonate the same display as the display where the agent is supposed to connect. We actually handle this by means of RejectWell- - KnownSockets() but without giving to the user - a friendly explaination for the error. + KnownSockets() but without giving a friendly + explanation for the error to the user. */ newAction.sa_handler = nxagentRejectConnection; @@ -1280,7 +1280,7 @@ N/A /* FIXME: Use of nxagentParentWindow is strongly deprecated. We need also to clarify which events are selected - in the diferent operating modes. + in the different operating modes. */ nxagentInitDefaultEventMask(); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index 8e82836..5228705 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -71,8 +71,8 @@ /* * If defined, send the XClearArea at the end * of the loop synchronizing the shadow pixmap. - * In this way, large images can be splitted but - * the user will see more updates togheter. + * In this way, large images can be split but + * the user will see more updates together. */ #undef COLLECTED_UPDATES @@ -643,7 +643,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned fprintf(stderr, "nxagentSynchronizeRegion: WARNING! Failed to allocate memory for synchronization.\n"); /* - * Print detailed informations if the + * Print detailed information if the * image length is zero. */ @@ -2645,8 +2645,8 @@ void nxagentCreateDrawableBitmap(DrawablePtr pDrawable) /* * Should create a function to append - * a bitmap to another, instead of de- - * stroy the old one. + * a bitmap to another, instead of + * destroying the old one. */ if (nxagentDrawableBitmap(pDrawable) != NullPixmap) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Error.c b/nx-X11/programs/Xserver/hw/nxagent/Error.c index 33d8abe..bc58ef8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Error.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c @@ -103,7 +103,7 @@ void nxagentGetClientsPath(void); static int nxagentPrintError(Display *dpy, XErrorEvent *event, FILE *fp); /* declare an error handler that does not exit when an error - * event is catched. + * event is caught. */ int nxagentErrorHandler(Display *dpy, XErrorEvent *event) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 91a3c6e..5e598f5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -3231,7 +3231,7 @@ int nxagentHandleConfigureNotify(XEvent* X) if ((pWin = nxagentRootlessTopLevelWindow(X -> xconfigure.window)) != NULL) { /* - * Cheking for new geometry or stacking order changes. + * Checking for new geometry or stacking order changes. */ nxagentCheckWindowConfiguration((XConfigureEvent*)X); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 72c5eb9..a1690eb 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -245,7 +245,7 @@ void nxagentListRemoteFonts(const char *searchPattern, const int maxNames) * number of dashes in the pattern acts as * a rule to select how to search for the * font names, so the pattern '*' is useful - * to retrive the font aliases, while the + * to retrieve the font aliases, while the * other one will select the 'real' fonts. */ @@ -717,7 +717,7 @@ int nxagentDestroyNewFontResourceType(void * p, XID id) /* FIXME: It happens that this resource had been already - destroied. We should verify if the same font is + destroyed. We should verify if the same font is assigned both to the server client and another client. We had a crash when freeing server client resources. @@ -788,7 +788,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP numSearchFields = nxagentSplitString(nxagentRemoteFontList.list[i]->name, searchFields, FIELDS+1, "-"); - /* The following code attemps to find an accurate approximation + /* The following code attempts to find an accurate approximation * of the missing font. The current candidate and the missing font are * compared on the 14 fields of the X Logical Font Description Convention. * The selection is performed by the analysis of the matching fields, diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index e4c0568..c9aea9c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -96,7 +96,7 @@ #define TIME_BEFORE_YIELD 500 /* - * Dinamically reduce the display buffer + * Dynamically reduce the display buffer * size after a congestion. */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c index 7043f09..a5e1972 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c @@ -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. - * If we got an image from a X server having a different - * endianess, we will need to redormat the image to match + * If we got an image from an X server having a different + * endianness, we will need to reformat the image to match * our own image-order so that ProcGetImage can return * the expected format to the client. */ @@ -1157,9 +1157,9 @@ FIXME: Should use an unpack resource here. /* * 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 endianness. * Byte swap the image data if the display has - * a different endianess than our own. + * a different endianness than our own. */ if (nxagentImageNormalize(plainImage) != 0) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.h b/nx-X11/programs/Xserver/hw/nxagent/Image.h index 771c0db..6e22fa9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.h @@ -84,7 +84,7 @@ void nxagentResetAlphaCache(void); /* * Byte swap the image if the display - * uses a different endianess. + * uses a different endianness. */ #define nxagentImageNormalize(image) \ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index 26374f8..6e68b80 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -212,7 +212,7 @@ INCLUDES = \ # NXAGENT_GLYPHCACHE # NXAGENT_GLYPHCACHE_SIZE Slots for glyph cache # NXAGENT_SHAPE2 New shape code -# NXAGENT_FIXKEYS Force the release of pressed key when loosing focus +# NXAGENT_FIXKEYS Force the release of pressed key when losing focus # NXAGENT_EXPOSURES Manage expose events # NXAGENT_CLIPBOARD Enables clipboard cut and paste function between X servers. # NXAGENT_FONTEXCLUDE Exclude some specific font names (only "-ult1mo" at this moment). diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 44b1033..5cfa927 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -540,7 +540,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio #if defined(DDXBEFORERESET) ddxBeforeReset (); #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) && (serverGeneration > nxagentMaxAllowedResets)) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c index 727246c..370fff6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c @@ -568,7 +568,7 @@ ProcSendEvent(ClientPtr client) return Success; /* If the input focus is PointerRootWin, send the event to where - the pointer is if possible, then perhaps propogate up to root. */ + the pointer is if possible, then perhaps propagate up to root. */ if (inputFocus == PointerRootWin) inputFocus = ROOT; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c index a564d84..e05b368 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c @@ -437,7 +437,7 @@ RestartLoop: /* * It's not enough to check if the number of elements has - * changed, beacause 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 * the freed ones. * 'nxagentResChangedFlag' is set if a resource has been @@ -521,7 +521,7 @@ RestartLoop: /* * It's not enough to check if the number of elements has - * changed, beacause 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 * the freed ones. * 'nxagentResChangedFlag' is set if a resource has been diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c index d108d3e..64bbf67 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c @@ -543,7 +543,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP if (!pParent) 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 */ #ifdef TEST @@ -769,7 +769,7 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent, if (pWin->prevSib) pWin->prevSib->nextSib = pWin->nextSib; - /* insert at begining of pParent */ + /* insert at beginning of pParent */ pWin->parent = pParent; pPrev = RealChildHead(pParent); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h index a4e2c50..8e898bd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Options.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h @@ -334,7 +334,7 @@ typedef struct _AgentOptions /* * If set, prevent the shadow session to - * interact with master diplay. + * interact with master display. */ int ViewOnly; @@ -429,7 +429,7 @@ typedef struct _AgentOptions * we cannot rely on them because RandR and PanoramiX change their * values when trying to initialize. So we use this variable to * save the user preference provided by the -/+(rr)xinerama parameter(s) - * before initalizing those extensions. + * before initializing those extensions. */ int Xinerama; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h index fa25a46..316d147 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixels.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixels.h @@ -111,10 +111,9 @@ while (0) nxagentCongestion > 4) /* -FIXME: The condition checking for the render - version is a workaround implemented to - avoid problems with the render composi- - te on XFree86 remote server. +FIXME: The condition checking for the render version is a workaround + implemented to avoid problems with the render composite on + XFree86 remote server. */ /* FIXME: Changed macro: NXAGENT_SHOULD_DEFER_COMPOSITE diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index 25d410d..421e023 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -1129,7 +1129,7 @@ Bool nxagentCheckPixmapIntegrity(PixmapPtr pPixmap) #ifdef TEST fprintf(stderr, "nxagentCheckPixmapIntegrity: Pixmap at [%p] has been realized. " - "Now remote and frambuffer data are synchronized.\n", (void *) pPixmap); + "Now remote and framebuffer data are synchronized.\n", (void *) pPixmap); #endif } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 2739847..6753897 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -236,7 +236,7 @@ void nxagentSetScreenInfo(ScreenInfo *screenInfo) * server this stuff is done after having opened the * real display as Xnest lets the screen reflect the * order of the remote end. Agent will instead set - * the order according to local endianess and swap + * the order according to local endianness and swap * data whenever it is appropriate. * * From a standard implementation: @@ -329,7 +329,7 @@ void nxagentMaximizeToFullScreen(ScreenPtr pScreen) /* FIXME: We'll check for ReparentNotify and LeaveNotify events after XReparentWindow() in order to avoid the session window is iconified. - We could avoid the sesssion 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. */ struct timeval timeout; @@ -4012,7 +4012,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) /* * 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 - * do this here it will be done implicitely later and add mode(s) to + * do this here it will be done implicitly later and add mode(s) to * our crtc(s)! */ rrgetinfo = RRGetInfo(pScreen, FALSE); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.c b/nx-X11/programs/Xserver/hw/nxagent/Visual.c index c123791..a29560d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Visual.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Visual.c @@ -141,7 +141,7 @@ Visual *nxagentVisualFromDepth(ScreenPtr pScreen, int depth) /* * Create a fake 32 bits depth visual and - * initialize it based on the endianess + * initialize it based on the endianness * of the remote display. */ @@ -152,7 +152,7 @@ void nxagentInitAlphaVisual(void) /* * Color masks are referred to bits inside * the pixel. This is independent from the - * endianess. + * endianness. */ nxagentAlphaVisual.red_mask = 0x00ff0000; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index e2ce9d3..073021e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -1752,7 +1752,7 @@ Bool nxagentChangeWindowAttributes(pWin, mask) } /* - * As we set this bit, whe must change dix in + * As we set this bit, we must change dix in * order not to perform PositionWindow and let * X move children windows for us. */ @@ -2635,7 +2635,7 @@ void nxagentMapDefaultWindows(void) Bool nxagentDisconnectAllWindows(void) { - Bool succeded = True; + Bool succeeded = True; int i; WindowPtr pWin; @@ -2646,7 +2646,7 @@ Bool nxagentDisconnectAllWindows(void) for (i = 0; i < screenInfo.numScreens; i++) { pWin = screenInfo.screens[i]->root; - nxagentTraverseWindow( pWin, nxagentDisconnectWindow, &succeded); + nxagentTraverseWindow( pWin, nxagentDisconnectWindow, &succeeded); nxagentDefaultWindows[i] = None; } @@ -2654,7 +2654,7 @@ Bool nxagentDisconnectAllWindows(void) fprintf(stderr, "nxagentDisconnectAllWindows: all windows disconnected\n"); #endif - return succeded; + return succeeded; } /* @@ -3270,7 +3270,7 @@ static void nxagentReconfigureWindow(void * param0, XID param1, void * data_buff } /* 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 following UnmapWindow() wouldn't do anything, leaving this mapped window around. XMapWindow() is called in nxagentRealizeWindow() and there it is enough. @@ -3387,7 +3387,7 @@ Bool nxagentCheckWindowIntegrity(WindowPtr pWin) { #ifdef WARNING fprintf(stderr, "nxagentCheckWindowIntegrity: Window %p has been realized " - "now remote and frambuffer data are synchronized.\n", (void*) pWin); + "now remote and framebuffer data are synchronized.\n", (void*) pWin); #endif } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit d5da7e76f5de27f649ef91b0b0cca4600d26620f Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Apr 10 21:12:19 2018 +0200 manpage: fix spelling error as reported by codespell --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 7ba24a4..b9c81cd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -775,7 +775,7 @@ the text after the /; it is used to distinguish between instances of <action> ::= a | i | e -<string> ::= <dbl quoted string> | <single quoted string> | <unqouted string> +<string> ::= <dbl quoted string> | <single quoted string> | <unquoted string> <dbl quoted string> ::= <space> " <not dqoute>* " <space> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 781b8a057f1e4e83884c615a7014475cc85f018a Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Apr 10 21:12:44 2018 +0200 compext: fix spelling errors as reported by codespell --- nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/compext/Png.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/compext/Z.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c index 7e560b3..230c9ab 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c +++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c @@ -501,7 +501,7 @@ int NXSetDisplayBuffer(Display *dpy, int size) /* * If set, the Popen() function in the X server - * wil remove the LD_LIBRARY_PATH variable from + * will remove the LD_LIBRARY_PATH variable from * the environment before calling the execl() * function on the child process. */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h index a403843..c0259a9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h +++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h @@ -103,7 +103,7 @@ extern int NXSetDisplayBuffer( /* * If set, the Popen() function in the X server - * wil remove the LD_LIBRARY_PATH variable from + * will remove the LD_LIBRARY_PATH variable from * the environment before calling the execl() * function on the child process. The function * returns the previous value. @@ -334,7 +334,7 @@ extern Status NXGetUnpackParameters( * shared memory blocks. A MIT-SHM compliant protocol is used * between proxy and the real server, while a simplified * version is used between the agent and the client proxy to - * accomodate both packed images and plain X bitmaps. + * accommodate both packed images and plain X bitmaps. */ extern Status NXGetShmemParameters( diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Png.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Png.c index b235e09..4570800 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/compext/Png.c +++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Png.c @@ -258,7 +258,7 @@ char *PngCompressData(XImage *image, int *compressed_size) /* * TODO: Be sure the padded bytes are cleaned. * It would be better to set to zero the bytes - * that are not alligned to the word boundary + * that are not aligned to the word boundary * at the end of the procedure. */ @@ -491,7 +491,7 @@ char *PngCompressData(XImage *image, int *compressed_size) /* * TODO: Be sure the padded bytes are cleaned. * It would be better to set to zero the bytes - * that are not alligned to the word boundary + * that are not aligned to the word boundary * at the end of the procedure. */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c index 594269d..9bf59ea 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c +++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c @@ -261,7 +261,7 @@ int ZInitEncoder(void) zStream -> opaque = (voidpf) 0; #ifdef TEST - fprintf(stderr, "******ZInitEncoder: Initializing compressor with level [%d] and startegy [%d].\n", + fprintf(stderr, "******ZInitEncoder: Initializing compressor with level [%d] and strategy [%d].\n", zCompressionLevel, zCompressionStrategy); #endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit e91406e9b799f5e8659a47d820645ff7f194e39f Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Apr 10 21:15:50 2018 +0200 nxproxy: fix spelling errors as reported by codespell --- m4/nx-macros.m4 | 8 ++++---- nxproxy/src/Main.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/m4/nx-macros.m4 b/m4/nx-macros.m4 index 81d6ea1..6e58b7f 100644 --- a/m4/nx-macros.m4 +++ b/m4/nx-macros.m4 @@ -51,7 +51,7 @@ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) # NX_TESTSET_CFLAG(<variable>, <flag>, [<alternative flag>, ...]) # --------------- # Test if the compiler works when passed the given flag as a command line argument. -# If it succeeds, the flag is appeneded to the given variable. If not, it tries the +# If it succeeds, the flag is appended to the given variable. If not, it tries the # next flag in the list until there are no more options. # # Note that this does not guarantee that the compiler supports the flag as some @@ -212,7 +212,7 @@ NX_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) # NX_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # NX_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -425,7 +425,7 @@ AM_CONDITIONAL([TARGET_ELF], [test x"$nxconf_cv_targetelf" = "xyes"]) ]) # NX_TARGET_USE_ELF AC_DEFUN([LIBJPEG_FALLBACK_CHECK],[ -AC_MSG_CHECKING([for libjpeg shared libary file and headers]) +AC_MSG_CHECKING([for libjpeg shared library file and headers]) AC_CHECK_LIB([jpeg], [jpeg_destroy_compress], [have_jpeg_lib=yes], [have_jpeg_lib=no]) AC_CHECK_HEADERS([jpeglib.h], @@ -443,7 +443,7 @@ fi ]) # LIBJPEG_FALLBACK_CHECK AC_DEFUN([ZLIB_FALLBACK_CHECK],[ -AC_MSG_CHECKING([for zlib shared libary file and headers]) +AC_MSG_CHECKING([for zlib shared library file and headers]) AC_CHECK_LIB([z], [inflateEnd], [have_zlib_lib=yes], [have_zlib_lib=no]) AC_CHECK_HEADERS([zlib.h], diff --git a/nxproxy/src/Main.c b/nxproxy/src/Main.c index dc4e0fd..fd3a497 100644 --- a/nxproxy/src/Main.c +++ b/nxproxy/src/Main.c @@ -11,7 +11,7 @@ /* */ /* NX and NoMachine are trademarks of Medialogic S.p.A. */ /* */ -/* All rigths reserved. */ +/* All rights reserved. */ /* */ /**************************************************************************/ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit cce9756545ab266ccff7ec363907aa25f4d7c1c7 Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Apr 10 21:27:00 2018 +0200 config/cf: fix spelling errors as reported by codespell --- nx-X11/config/cf/Imake.rules | 4 ++-- nx-X11/config/cf/Imake.tmpl | 2 +- nx-X11/config/cf/gnu.cf | 2 +- nx-X11/config/cf/host.def | 2 +- nx-X11/config/cf/linux.cf | 2 +- nx-X11/config/cf/xorg.cf | 2 +- nx-X11/config/cf/xorgsite.def | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules index 8fc344a..4d522f9 100644 --- a/nx-X11/config/cf/Imake.rules +++ b/nx-X11/config/cf/Imake.rules @@ -1185,7 +1185,7 @@ clean:: @@\ /* This rule is used for libs in Xserver/Imakefile which are loaded, not * linked into the core module. Since modules are called libXXXX.a, - * this rule mustn't be overriden by .cf files. + * this rule mustn't be overridden by .cf files. */ #ifndef ModuleLibraryTargetName #define ModuleLibraryTargetName(libname)Concat(lib,libname.a) @@ -3609,7 +3609,7 @@ clean:: @@\ #endif /* Phony targets - GNU make has a feature to mark a target as phony, - * which means that it wont consider that target to be the name of a + * which means that it won't consider that target to be the name of a * file. In general this speeds up make, since it doesn't have to * look for those files when it sets out to create a phony target. * However, on cygwin, this is actually required for correct diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index d6ef779..e202dab 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -1736,7 +1736,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes #else CPP = CppCmd $(STD_CPP_DEFINES) /* simple filters */ RAWCPP = RawCppCmd $(STD_CPP_OPTIONS) - PREPROCESSCMD = PreProcessCmd $(STD_CPP_DEFINES) /* prefered; mdep */ + PREPROCESSCMD = PreProcessCmd $(STD_CPP_DEFINES) /* preferred; mdep */ #endif INSTALL = InstallCmd INSTALLFLAGS = InstallFlags diff --git a/nx-X11/config/cf/gnu.cf b/nx-X11/config/cf/gnu.cf index c7dd071..d575801 100644 --- a/nx-X11/config/cf/gnu.cf +++ b/nx-X11/config/cf/gnu.cf @@ -142,7 +142,7 @@ XCOMM i386Architecture #define ConnectionFlags -DUNIXCONN -DTCPCONN -/* Some of these man page defaults are overriden in the above OS sections */ +/* Some of these man page defaults are overridden in the above OS sections */ #ifndef ManSuffix # define ManSuffix 1x #endif diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 0969a8f..1360331 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -145,7 +145,7 @@ /* * To use the deprecated, old keyboard driver, uncomment this. But * even better, make the new keyboard driver (hw/xfree86/input/keyboard) - * work for your architechture. The old driver will be removed in the + * work for your architecture. The old driver will be removed in the * next release. * #define UseDeprecatedKeyboardDriver YES diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index df7837c..fe8d97e 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -875,7 +875,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define ConnectionFlags -DUNIXCONN -DTCPCONN -/* Some of these man page defaults are overriden in the above OS sections */ +/* Some of these man page defaults are overridden in the above OS sections */ #ifndef ManSuffix # define ManSuffix 1x #endif diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index dc8a773..578d82a 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -645,7 +645,7 @@ DRIVERSDKMODULEDIR = DriverSDKModuleDir DRIVERSDKINCLUDEDIR = DriverSDKIncludeDir /* - * Some commonly refered to directories are defined here. + * Some commonly referred to directories are defined here. */ XF86SRC = $(SERVERSRC)/hw/xfree86 diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def index f735495..0ffe860 100644 --- a/nx-X11/config/cf/xorgsite.def +++ b/nx-X11/config/cf/xorgsite.def @@ -65,7 +65,7 @@ /* * To use the deprecated, old keyboard driver, uncomment this. But * even better, make the new keyboard driver (hw/xfree86/input/keyboard) - * work for your architechture. The old driver will be removed in the + * work for your architecture. The old driver will be removed in the * next release. * #define UseDeprecatedKeyboardDriver YES -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 11b534ab008f9f0ac831d96f0426adf4c3561319 Merge: 997f2bb cce9756 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu May 24 09:04:43 2018 +0200 Merge branch 'uli42-pr/codespell' into 3.6.x Attributes GH PR #686: https://github.com/ArcticaProject/nx-libs/pull/686 m4/nx-macros.m4 | 8 ++++---- nx-X11/config/cf/Imake.rules | 4 ++-- nx-X11/config/cf/Imake.tmpl | 2 +- nx-X11/config/cf/gnu.cf | 2 +- nx-X11/config/cf/host.def | 2 +- nx-X11/config/cf/linux.cf | 2 +- nx-X11/config/cf/xorg.cf | 2 +- nx-X11/config/cf/xorgsite.def | 2 +- nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 12 ++++++------ nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Display.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 10 +++++----- nx-X11/programs/Xserver/hw/nxagent/Error.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Font.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Image.c | 8 ++++---- nx-X11/programs/Xserver/hw/nxagent/Image.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Imakefile | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXresource.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/NXwindow.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Options.h | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Pixels.h | 7 +++---- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 6 +++--- nx-X11/programs/Xserver/hw/nxagent/Visual.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Window.c | 12 ++++++------ nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/compext/Compext.h | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/compext/Png.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/compext/Z.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 +- nxcomp/src/Agent.h | 2 +- nxcomp/src/Children.cpp | 2 +- nxcomp/src/ClientChannel.cpp | 4 ++-- nxcomp/src/Control.cpp | 2 +- nxcomp/src/DecodeBuffer.cpp | 2 +- nxcomp/src/GenericReadBuffer.cpp | 2 +- nxcomp/src/Keeper.cpp | 2 +- nxcomp/src/Loop.cpp | 8 ++++---- nxcomp/src/MD5.c | 2 +- nxcomp/src/Proxy.h | 2 +- nxcomp/src/PutPackedImage.h | 2 +- nxcomp/src/Statistics.cpp | 6 +++--- nxcompshad/src/Core.cpp | 2 +- nxcompshad/src/Manager.cpp | 2 +- nxcompshad/src/X11.cpp | 4 ++-- nxproxy/src/Main.c | 2 +- 50 files changed, 92 insertions(+), 93 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 7cb00355c66248381120dae69f2658ede64b0417 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu May 24 09:05:55 2018 +0200 debian/rules: Highly enforce --no-parallel mode while Xserver is still on imake. Can be re-parallelized after autotools conversion. --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index f5f7c5b..82564db 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,7 @@ export INCLUDEDIR = "/usr/include/$(DEB_HOST_MULTIARCH)" --includedir=$(INCLUDEDIR) \ --libexecdir=$(LIBEXECDIR) \ --build=$(DEB_BUILD_GNU_TYPE) \ - --host=$(DEB_HOST_GNU_TYPE)" dh $@ --with quilt + --host=$(DEB_HOST_GNU_TYPE)" dh $@ --no-parallel --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports @@ -47,11 +47,11 @@ override_dh_install: dh_install --fail-missing override_dh_auto_install: - PREFIX=/usr dh_auto_install -Smakefile + PREFIX=/usr dh_auto_install --no-parallel -Smakefile override_dh_auto_build: debian/compat.sh - PREFIX=/usr dh_auto_build --parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' + PREFIX=/usr dh_auto_build ---no-parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 985bed9545f20152599819155c67f8a403ae65bf Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu May 24 09:41:27 2018 +0200 debian/rules: Typo fix in dh_auto_build --no-parallel option. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 82564db..8f3cbb0 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,7 @@ override_dh_auto_install: override_dh_auto_build: debian/compat.sh - PREFIX=/usr dh_auto_build ---no-parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' + PREFIX=/usr dh_auto_build --no-parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 9937fbdf5385373c4ea2105efb3a88cac8b78a51 Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Apr 10 23:32:57 2018 +0200 Screen.c: replace XSetWMNormalHints code block by already existing function nxagentSetWMNormalHints was slightly adapted therefore --- nx-X11/programs/Xserver/hw/nxagent/Extensions.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 41 +++---------------------- nx-X11/programs/Xserver/hw/nxagent/Screen.h | 2 +- 3 files changed, 7 insertions(+), 38 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c index 05a4b4f..d4f195b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c @@ -470,7 +470,7 @@ int nxagentRandRScreenSetSize(ScreenPtr pScreen, CARD16 width, CARD16 height, nxagentOption(Fullscreen) == 0 && nxagentOption(AllScreens) == 0) { nxagentRandRSetWindowsSize(width, height); - nxagentSetWMNormalHints(pScreen -> myNum); + nxagentSetWMNormalHints(pScreen -> myNum, nxagentOption(Width), nxagentOption(Height)); } nxagentMoveViewport(pScreen, 0, 0); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 6753897..b374b20 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -2281,7 +2281,6 @@ Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height, int mmWidth, int mmHeight) { BoxRec box; - XSizeHints sizeHints; PixmapPtr pPixmap; char *fbBits; @@ -2407,37 +2406,7 @@ FIXME: We should try to restore the previously if ((nxagentOption(Fullscreen) == 0 && nxagentOption(AllScreens) == 0)) { - sizeHints.flags = PPosition | PMinSize | PMaxSize; - sizeHints.x = nxagentOption(X); - sizeHints.y = nxagentOption(Y); - - sizeHints.min_width = MIN_NXAGENT_WIDTH; - sizeHints.min_height = MIN_NXAGENT_HEIGHT; - sizeHints.width = width; - sizeHints.height = height; - - if (nxagentOption(DesktopResize) == 1) - { - sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - } - else - { - sizeHints.max_width = nxagentOption(RootWidth); - sizeHints.max_height = nxagentOption(RootHeight); - } - - if (nxagentUserGeometry.flag & XValue || nxagentUserGeometry.flag & YValue) - { - sizeHints.flags |= USPosition; - } - - if (nxagentUserGeometry.flag & WidthValue || nxagentUserGeometry.flag & HeightValue) - { - sizeHints.flags |= USSize; - } - - XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], &sizeHints); + nxagentSetWMNormalHints(pScreen->myNum, width, height); XResizeWindow(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], width, height); @@ -2838,7 +2807,7 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin) { nxagentShadowSetWindowsSize(); - nxagentSetWMNormalHints(0); + nxagentSetWMNormalHints(0, nxagentOption(Width), nxagentOption(Height)); } XMapWindow(nxagentDisplay, nxagentDefaultWindows[0]); @@ -4557,7 +4526,7 @@ void nxagentRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, return; } -void nxagentSetWMNormalHints(int screen) +void nxagentSetWMNormalHints(int screen, int width, int height) { XSizeHints sizeHints; @@ -4572,8 +4541,8 @@ void nxagentSetWMNormalHints(int screen) sizeHints.min_width = MIN_NXAGENT_WIDTH; sizeHints.min_height = MIN_NXAGENT_HEIGHT; - sizeHints.width = nxagentOption(Width); - sizeHints.height = nxagentOption(Height); + sizeHints.width = width; + sizeHints.height = height; if (nxagentOption(DesktopResize) == 1) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h b/nx-X11/programs/Xserver/hw/nxagent/Screen.h index 3df586f..416136e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h @@ -130,7 +130,7 @@ int nxagentShadowPoll(PixmapPtr, GCPtr, unsigned char, int, int, char *, int *, void nxagentShadowSetWindowsSize(void); -void nxagentSetWMNormalHints(int); +void nxagentSetWMNormalHints(int, int, int); void nxagentShadowSetRatio(float, float); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 82c4c28ea726444c355835a5a0850b9dd6865e9a Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Apr 10 23:34:14 2018 +0200 Screen.c/Events.c: add some FIXMEs --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 1 + nx-X11/programs/Xserver/hw/nxagent/Screen.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 5e598f5..177860d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -3248,6 +3248,7 @@ int nxagentHandleConfigureNotify(XEvent* X) pClient = wClient(pWinWindow); + /* FIXME: override_redirect is always FALSE here */ if (X -> xconfigure.send_event || !nxagentWMIsRunning || X -> xconfigure.override_redirect) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index b374b20..39a5b77 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1891,6 +1891,7 @@ N/A if (nxagentUserGeometry.flag & WidthValue || nxagentUserGeometry.flag & HeightValue) sizeHints.flags |= USSize; + /* FIXME: deprecated, replaced by XSetWmProperties() */ XSetStandardProperties(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], nxagentWindowName, @@ -1976,6 +1977,8 @@ N/A deleteWMatom); #endif + /* FIXME: This doing the same thing in both cases. The + comments do not seem accurate (anymore?) */ if (nxagentOption(Rootless) == False) { /* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 82dc00539c12323bb8daa8e0ada6e8eab8561e09 Author: Ulrich Sibiller <uli42@gmx.de> Date: Wed Apr 11 00:10:20 2018 +0200 nxagent: use XAllocSizeHints() instead of XSizeHints struct This is the preferred way. It ensures, that a) the data is zeroed b) a correct size in case xlib is changing the size of the structure in future releases --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 37 ++---- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 188 +++++++++++++++++----------- nx-X11/programs/Xserver/hw/nxagent/Screen.h | 2 + 3 files changed, 130 insertions(+), 97 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 177860d..9ded855 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -575,8 +575,6 @@ void nxagentInternalWindowsTree(WindowPtr pWin, int indent) void nxagentSwitchResizeMode(ScreenPtr pScreen) { - XSizeHints sizeHints; - #ifdef DEBUG fprintf(stderr, "nxagentSwitchResizeMode called.\n"); #endif @@ -585,8 +583,6 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen) nxagentChangeOption(DesktopResize, !desktopResize); - sizeHints.flags = PMaxSize; - if (nxagentOption(DesktopResize) == 0) { fprintf(stderr,"Info: Disabled desktop resize mode in agent.\n"); @@ -595,11 +591,9 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen) if (nxagentOption(Fullscreen) == 0) { - sizeHints.max_width = nxagentOption(RootWidth); - sizeHints.max_height = nxagentOption(RootHeight); - - XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], - &sizeHints); + nxagentSetWMNormalHintsMaxsize(pScreen, + nxagentOption(RootWidth), + nxagentOption(RootHeight)); } } else @@ -616,24 +610,18 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen) NXSetExposeParameters(nxagentDisplay, 0, 0, 0); } - sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - - XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], - &sizeHints); + nxagentSetWMNormalHintsMaxsize(pScreen, + WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)), + HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay))); } } void nxagentShadowSwitchResizeMode(ScreenPtr pScreen) { - XSizeHints sizeHints; - int desktopResize = nxagentOption(DesktopResize); nxagentChangeOption(DesktopResize, !desktopResize); - sizeHints.flags = PMaxSize; - if (nxagentOption(DesktopResize) == 0) { nxagentShadowSetRatio(1.0, 1.0); @@ -641,8 +629,9 @@ void nxagentShadowSwitchResizeMode(ScreenPtr pScreen) nxagentShadowCreateMainWindow(screenInfo.screens[DefaultScreen(nxagentDisplay)], screenInfo.screens[0]->root, screenInfo.screens[0]->root -> drawable.width, screenInfo.screens[0]->root -> drawable.height); - sizeHints.max_width = nxagentOption(RootWidth); - sizeHints.max_height = nxagentOption(RootHeight); + nxagentSetWMNormalHintsMaxsize(pScreen, + nxagentOption(RootWidth), + nxagentOption(RootHeight)); fprintf(stderr,"Info: Disabled resize mode in shadow agent.\n"); } @@ -657,14 +646,12 @@ void nxagentShadowSwitchResizeMode(ScreenPtr pScreen) screenInfo.screens[0]->root, screenInfo.screens[0]->root -> drawable.width, screenInfo.screens[0]->root -> drawable.height); - sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); + nxagentSetWMNormalHintsMaxsize(pScreen, + WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)), + HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay))); fprintf(stderr,"Info: Enabled resize mode in shadow agent.\n"); } - - XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], - &sizeHints); } static void nxagentSwitchDeferMode(void) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 39a5b77..cd50c96 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -376,8 +376,8 @@ Window nxagentCreateIconWindow(void) unsigned long valuemask; char* window_name; XTextProperty windowName; - XSizeHints sizeHints; - XWMHints wmHints; + XSizeHints* sizeHints; + XWMHints* wmHints; Window w; Mask mask; @@ -416,26 +416,40 @@ Window nxagentCreateIconWindow(void) window_name = nxagentWindowName; XStringListToTextProperty(&window_name, 1, &windowName); - sizeHints.flags = PMinSize | PMaxSize; - sizeHints.min_width = sizeHints.max_width = 1; - sizeHints.min_height = sizeHints.max_height = 1; - wmHints.flags = IconPixmapHint | IconMaskHint; - wmHints.initial_state = IconicState; - wmHints.icon_pixmap = nxagentIconPixmap; - - if (useXpmIcon) + + if ((sizeHints = XAllocSizeHints())) { - wmHints.icon_mask = nxagentIconShape; - wmHints.flags = IconPixmapHint | IconMaskHint; + sizeHints->flags = PMinSize | PMaxSize; + sizeHints->min_width = sizeHints->max_width = 1; + sizeHints->min_height = sizeHints->max_height = 1; } - else + + if ((wmHints = XAllocWMHints())) { - wmHints.flags = StateHint | IconPixmapHint; + wmHints->flags = IconPixmapHint | IconMaskHint; + wmHints->initial_state = IconicState; + wmHints->icon_pixmap = nxagentIconPixmap; + + if (useXpmIcon) + { + wmHints->icon_mask = nxagentIconShape; + wmHints->flags = IconPixmapHint | IconMaskHint; + } + else + { + wmHints->flags = StateHint | IconPixmapHint; + } } XSetWMProperties(nxagentDisplay, w, &windowName, &windowName, - NULL , 0 , &sizeHints, &wmHints, NULL); + NULL , 0 , sizeHints, wmHints, NULL); + + if (sizeHints) + XFree(sizeHints); + + if (wmHints) + XFree(wmHints); /* * Enable events from the icon window. @@ -839,8 +853,8 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, unsigned long valuemask; XSetWindowAttributes attributes; XWindowAttributes gattributes; - XSizeHints sizeHints; - XWMHints wmHints; + XSizeHints* sizeHints; + XWMHints* wmHints; Mask mask; Bool resetAgentPosition = False; @@ -1866,52 +1880,61 @@ N/A XSelectInput(nxagentDisplay, nxagentFullscreenWindow, mask); } - sizeHints.flags = PPosition | PMinSize | PMaxSize; - sizeHints.x = nxagentOption(X) + POSITION_OFFSET; - sizeHints.y = nxagentOption(Y) + POSITION_OFFSET; - sizeHints.min_width = MIN_NXAGENT_WIDTH; - sizeHints.min_height = MIN_NXAGENT_HEIGHT; - - sizeHints.width = nxagentOption(RootWidth); - sizeHints.height = nxagentOption(RootHeight); - - if (nxagentOption(DesktopResize) == 1 || nxagentOption(Fullscreen) == 1) - { - sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - } - else + if ((sizeHints = XAllocSizeHints())) { - sizeHints.max_width = nxagentOption(RootWidth); - sizeHints.max_height = nxagentOption(RootHeight); - } + sizeHints->flags = PPosition | PMinSize | PMaxSize; + sizeHints->x = nxagentOption(X) + POSITION_OFFSET; + sizeHints->y = nxagentOption(Y) + POSITION_OFFSET; + sizeHints->min_width = MIN_NXAGENT_WIDTH; + sizeHints->min_height = MIN_NXAGENT_HEIGHT; + + sizeHints->width = nxagentOption(RootWidth); + sizeHints->height = nxagentOption(RootHeight); - if (nxagentUserGeometry.flag & XValue || nxagentUserGeometry.flag & YValue) - sizeHints.flags |= USPosition; - if (nxagentUserGeometry.flag & WidthValue || nxagentUserGeometry.flag & HeightValue) - sizeHints.flags |= USSize; + if (nxagentOption(DesktopResize) == 1 || nxagentOption(Fullscreen) == 1) + { + sizeHints->max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); + sizeHints->max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); + } + else + { + sizeHints->max_width = nxagentOption(RootWidth); + sizeHints->max_height = nxagentOption(RootHeight); + } + if (nxagentUserGeometry.flag & XValue || nxagentUserGeometry.flag & YValue) + sizeHints->flags |= USPosition; + if (nxagentUserGeometry.flag & WidthValue || nxagentUserGeometry.flag & HeightValue) + sizeHints->flags |= USSize; + } /* FIXME: deprecated, replaced by XSetWmProperties() */ XSetStandardProperties(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], nxagentWindowName, nxagentWindowName, nxagentIconPixmap, - argv, argc, &sizeHints); + argv, argc, sizeHints); - wmHints.icon_pixmap = nxagentIconPixmap; + if (sizeHints) + XFree(sizeHints); - if (useXpmIcon) - { - wmHints.icon_mask = nxagentIconShape; - wmHints.flags = IconPixmapHint | IconMaskHint; - } - else + if ((wmHints = XAllocWMHints())) { - wmHints.flags = IconPixmapHint; - } + wmHints->icon_pixmap = nxagentIconPixmap; - XSetWMHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], &wmHints); + if (useXpmIcon) + { + wmHints->icon_mask = nxagentIconShape; + wmHints->flags = IconPixmapHint | IconMaskHint; + } + else + { + wmHints->flags = IconPixmapHint; + } + + XSetWMHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], wmHints); + XFree(wmHints); + } /* * Clear the window but let it unmapped. We'll map it @@ -4531,49 +4554,73 @@ void nxagentRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, void nxagentSetWMNormalHints(int screen, int width, int height) { - XSizeHints sizeHints; + XSizeHints* sizeHints = XAllocSizeHints(); + + if (!sizeHints) + return; /* * Change agent window size and size hints. */ - sizeHints.flags = PPosition | PMinSize | PMaxSize; - sizeHints.x = nxagentOption(X); - sizeHints.y = nxagentOption(Y); + sizeHints->flags = PPosition | PMinSize | PMaxSize; + sizeHints->x = nxagentOption(X); + sizeHints->y = nxagentOption(Y); - sizeHints.min_width = MIN_NXAGENT_WIDTH; - sizeHints.min_height = MIN_NXAGENT_HEIGHT; + sizeHints->min_width = MIN_NXAGENT_WIDTH; + sizeHints->min_height = MIN_NXAGENT_HEIGHT; - sizeHints.width = width; - sizeHints.height = height; + sizeHints->width = width; + sizeHints->height = height; if (nxagentOption(DesktopResize) == 1) { - sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); + sizeHints->max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); + sizeHints->max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); } else { - sizeHints.max_width = nxagentOption(RootWidth); - sizeHints.max_height = nxagentOption(RootHeight); + sizeHints->max_width = nxagentOption(RootWidth); + sizeHints->max_height = nxagentOption(RootHeight); } if (nxagentUserGeometry.flag & XValue || nxagentUserGeometry.flag & YValue) { - sizeHints.flags |= USPosition; + sizeHints->flags |= USPosition; } if (nxagentUserGeometry.flag & WidthValue || nxagentUserGeometry.flag & HeightValue) { - sizeHints.flags |= USSize; + sizeHints->flags |= USSize; } - XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[screen], &sizeHints); + XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[screen], sizeHints); + + XFree(sizeHints); +} + +/* + set maxsize in WMNormalSizeHints + Note: this will _drop_ all existing hints since XSetWMNormalHints() + replaces any existing property +*/ +void nxagentSetWMNormalHintsMaxsize(ScreenPtr pScreen, int maxwidth, int maxheight) +{ + XSizeHints* sizeHints; + + if ((sizeHints = XAllocSizeHints())) + { + sizeHints->flags = PMaxSize; + sizeHints->max_width = maxwidth; + sizeHints->max_height = maxheight; + XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], + sizeHints); + XFree(sizeHints); + } } void nxagentShadowAdaptToRatio(void) { - XSizeHints sizeHints; ScreenPtr pScreen; RegionRec region; BoxRec box; @@ -4585,12 +4632,9 @@ void nxagentShadowAdaptToRatio(void) nxagentShadowCreateMainWindow(pScreen, screenInfo.screens[0]->root, nxagentShadowWidth, nxagentShadowHeight); - sizeHints.max_width = WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - sizeHints.max_height = HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)); - - sizeHints.flags = PMaxSize; - - XSetWMNormalHints(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], &sizeHints); + nxagentSetWMNormalHintsMaxsize(pScreen, + WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)), + HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay))); box.x1 = 0; box.y1 = 0; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h b/nx-X11/programs/Xserver/hw/nxagent/Screen.h index 416136e..8e5865f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h @@ -132,6 +132,8 @@ void nxagentShadowSetWindowsSize(void); void nxagentSetWMNormalHints(int, int, int); +void nxagentSetWMNormalHintsMaxsize(ScreenPtr, int, int); + void nxagentShadowSetRatio(float, float); /* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 845ae6eab1794976943e484c202d3d10c673cc30 Author: Ulrich Sibiller <uli42@gmx.de> Date: Wed Apr 11 00:28:04 2018 +0200 Screen.c/Events.c: fix some comments --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 3 +-- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Window.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 9ded855..0408c4e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -3365,8 +3365,7 @@ int nxagentHandleConfigureNotify(XEvent* X) nxagentWaitEvents(nxagentDisplay, &timeout); /* - * This should also flush - * the NX link for us. + * This should also flush the NX link for us. */ XSync(nxagentDisplay, 0); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index cd50c96..75ecbfa 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -2471,7 +2471,7 @@ FIXME: We should try to restore the previously nxagentMoveViewport(pScreen, 0, 0); /* - * Update void * bounds. + * Update pointer bounds. */ ScreenRestructured(pScreen); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index 073021e..ca0de46 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -869,8 +869,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn) } /* - * This should also flush - * the NX link for us. + * This should also flush the NX link for us. */ XSync(nxagentDisplay, 0); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 00c1f05efd043fb6f2dba342694c7091dad342cb Author: Ulrich Sibiller <uli42@gmx.de> Date: Wed Apr 11 00:39:40 2018 +0200 nxagent: remove mmwidth/mmheight from nxagentChangeScreenConfig Was 0,0 on every call... --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 7 +++---- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 8 ++++---- nx-X11/programs/Xserver/hw/nxagent/Screen.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Window.c | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 0408c4e..34d1d31 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -602,8 +602,7 @@ void nxagentSwitchResizeMode(ScreenPtr pScreen) nxagentLaunchDialog(DIALOG_ENABLE_DESKTOP_RESIZE_MODE); - nxagentChangeScreenConfig(0, nxagentOption(Width), nxagentOption(Height), - 0, 0); + nxagentChangeScreenConfig(0, nxagentOption(Width), nxagentOption(Height)); if (nxagentOption(ClientOs) == ClientOsWinnt) { @@ -3451,7 +3450,7 @@ int nxagentHandleConfigureNotify(XEvent* X) #endif nxagentChangeScreenConfig(0, nxagentOption(Width), - nxagentOption(Height), 0, 0); + nxagentOption(Height)); } } @@ -3471,7 +3470,7 @@ int nxagentHandleConfigureNotify(XEvent* X) nxagentChangeOption(RootHeight, X -> xconfigure.height); nxagentChangeScreenConfig(0, nxagentOption(Width), - nxagentOption(Height), 0, 0); + nxagentOption(Height)); return 1; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 56ac017..9a6cbf2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -626,7 +626,7 @@ Bool nxagentReconnectSession(void) if (nxagentResizeDesktopAtStartup || nxagentOption(Rootless) == True || nxagentOption(Xinerama) == True) { nxagentChangeScreenConfig(0, nxagentOption(RootWidth), - nxagentOption(RootHeight), 0, 0); + nxagentOption(RootHeight)); nxagentResizeDesktopAtStartup = False; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 75ecbfa..c29df92 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -3834,13 +3834,13 @@ void nxagentAdjustCustomMode(ScreenPtr pScreen) RRScreenSizeNotify(pScreen); } -int nxagentChangeScreenConfig(int screen, int width, int height, int mmWidth, int mmHeight) +int nxagentChangeScreenConfig(int screen, int width, int height) { ScreenPtr pScreen; int r; #ifdef DEBUG - fprintf(stderr, "nxagentChangeScreenConfig: called for screen [%d], width [%d] height [%d] mmWidth [%d] mmHeight [%d]\n", screen, width, height, mmWidth, mmHeight); + fprintf(stderr, "nxagentChangeScreenConfig: called for screen [%d], width [%d] height [%d]\n", screen, width, height); #endif #ifdef TEST @@ -3885,10 +3885,10 @@ int nxagentChangeScreenConfig(int screen, int width, int height, int mmWidth, in pScreen = screenInfo.screens[screen] -> root -> drawable.pScreen; #ifdef TEST - fprintf(stderr, "nxagentChangeScreenConfig: Changing config to %d x %d (%dmm x %dmm).\n", width, height, mmWidth, mmHeight); + fprintf(stderr, "nxagentChangeScreenConfig: Changing config to %d x %d\n", width, height); #endif - r = nxagentResizeScreen(pScreen, width, height, mmWidth, mmHeight); + r = nxagentResizeScreen(pScreen, width, height, 0, 0); if (r != 0) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h b/nx-X11/programs/Xserver/hw/nxagent/Screen.h index 8e5865f..14b20a7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h @@ -110,7 +110,7 @@ Bool nxagentMagicPixelZone(int x, int y); Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height, int mmWidth, int mmHeight); -int nxagentChangeScreenConfig(int screen, int width, int height, int mmWidth, int mmHeight); +int nxagentChangeScreenConfig(int screen, int width, int height); int nxagentAdjustRandRXinerama(ScreenPtr pScreen); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index ca0de46..b12fe76 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -952,7 +952,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn) if (nxagentOption(Shadow) == 0) { nxagentChangeScreenConfig(0, WidthOfScreen(DefaultScreenOfDisplay(nxagentDisplay)), - HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay)), 0, 0); + HeightOfScreen(DefaultScreenOfDisplay(nxagentDisplay))); } else { @@ -1006,7 +1006,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn) if (nxagentOption(Shadow) == 0) { nxagentChangeScreenConfig(0, nxagentOption(RootWidth), - nxagentOption(RootHeight), 0, 0); + nxagentOption(RootHeight)); } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit f9bae755424cc413707e9657c8baf84a6cd8effe Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri May 4 22:29:55 2018 +0200 Events.c: catch intermediate window position changes nxagentHandleConfigureNotify() has an optimization that accumulates ConfigureNotify events from the queue to only perform the changes of the last ConfigureNotify event in the queue. But that code used to ignore position changes and only adapt the new window position if the last event happened to contain a position change. This change ensures the latest position change - if any - found in the queue will be applied after the accumulation. Fixes: ArticaProject/nx-libs#688 (second part) --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 40 +++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 34d1d31..dee8dd7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -3341,13 +3341,26 @@ int nxagentHandleConfigureNotify(XEvent* X) { if (nxagentOption(AllScreens) == 0) { + /* + * - WITHOUT window manager any position change is relevant + * - WITH window manager only synthetic position changes send + * by the window manager are relevant, see ICCCM Chapter 4, + * "Configuring the Window" + */ + Bool updatePos = (nxagentWMIsRunning == 0 || X -> xconfigure.send_event != 0); + int newX = X -> xconfigure.x; + int newY = X -> xconfigure.y; + if (nxagentOption(DesktopResize) == 1) { if (nxagentOption(Width) != X -> xconfigure.width || nxagentOption(Height) != X -> xconfigure.height || - nxagentOption(X) != X -> xconfigure.x || - nxagentOption(Y) != X -> xconfigure.y) + (updatePos && (nxagentOption(X) != newX || + nxagentOption(Y) != newY))) { + #ifdef DEBUG + int count = 0; + #endif Bool newEvents = False; doRandR = True; @@ -3372,17 +3385,34 @@ int nxagentHandleConfigureNotify(XEvent* X) while (XCheckTypedWindowEvent(nxagentDisplay, nxagentDefaultWindows[pScreen -> myNum], ConfigureNotify, X)) { + #ifdef DEBUG + count++; + #endif + + if (nxagentWMIsRunning == 0 || X -> xconfigure.send_event) + { + updatePos = True; + newX = X -> xconfigure.x; + newY = X -> xconfigure.y; + } newEvents = True; } } while (newEvents); + + #ifdef DEBUG + fprintf(stderr, "%s: accumulated %d events\n", __func__, count); + #endif } } - if (nxagentWMIsRunning == 0 || X -> xconfigure.send_event) + if (updatePos) { - nxagentChangeOption(X, X -> xconfigure.x); - nxagentChangeOption(Y, X -> xconfigure.y); + #ifdef DEBUG + fprintf(stderr, "%s: Updating nxagent window position [%d,%d]\n", __func__, newX, newY); + #endif + nxagentChangeOption(X, newX); + nxagentChangeOption(Y, newY); } if (nxagentOption(Shadow) == 1 && nxagentOption(DesktopResize) == 1 && -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 0167591986a482dc516d0ae62cda87aa421d4dc9 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sat May 5 20:13:20 2018 +0200 Screen.c: simplify setting of window name/class --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index c29df92..db8e713 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1812,20 +1812,6 @@ N/A * we need it to properly display all window parameters by some WMs * (for example on Maemo) */ - if(nxagentX2go) - { - #ifdef TEST - fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window with id [%ld].\n", - (long int)nxagentDefaultWindows[pScreen->myNum]); - #endif - XClassHint hint; - hint.res_name = strdup("X2GoAgent"); - hint.res_class = strdup("X2GoAgent"); - XSetClassHint(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], &hint); - free(hint.res_name); - free(hint.res_class); - } - else { #ifdef TEST fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window with id [%ld].\n", @@ -1833,8 +1819,17 @@ N/A #endif XClassHint hint; - hint.res_name = strdup("NXAgent"); - hint.res_class = strdup("NXAgent"); + + if(nxagentX2go) + { + hint.res_name = strdup("X2GoAgent"); + hint.res_class = strdup("X2GoAgent"); + } + else + { + hint.res_name = strdup("NXAgent"); + hint.res_class = strdup("NXAgent"); + } XSetClassHint(nxagentDisplay, nxagentDefaultWindows[pScreen->myNum], &hint); free(hint.res_name); free(hint.res_class); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 9138a9e3bf6f1b0962c20a29735c4f89dc80d572 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sat May 5 20:14:04 2018 +0200 whitespace fixes --- nx-X11/programs/Xserver/hw/nxagent/Events.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Screen.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.h b/nx-X11/programs/Xserver/hw/nxagent/Events.h index bf9d10c..5175be1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.h @@ -231,7 +231,7 @@ Bool nxagentPendingEvents(Display *dpy); XEventsQueued((display), QueuedAfterReading) #define nxagentCheckEvents(display, event, predicate, argument) \ - XCheckIfEventNoFlush((display), (event), (predicate), (argument)) + XCheckIfEventNoFlush((display), (event), (predicate), (argument)) int nxagentWaitEvents(Display *, struct timeval *); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index db8e713..6eae711 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1864,8 +1864,8 @@ N/A nxagentDefaultWindows[pScreen->myNum], nxagentAtoms[8], /* NX_AGENT_SIGNATURE */ XA_STRING, - 8, - PropModeReplace, + 8, + PropModeReplace, (unsigned char*) "X-AGENT", strlen("X-AGENT")); } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h b/nx-X11/programs/Xserver/hw/nxagent/Screen.h index 14b20a7..2f93105 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h @@ -48,7 +48,7 @@ is" without express or implied warranty. #define nxagentSetPrintGeometry(screen) \ nxagentPrintGeometryFlags = (1 << (screen)); - + extern int nxagentClients; extern int nxagentAutoDisconnectTimeout; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit c0f67abb494b6d61dc4a67284004072570b3c5e7 Merge: 985bed9 9138a9e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu May 24 09:43:11 2018 +0200 Merge branch 'uli42-pr/cleanup_window_hints' into 3.6.x Attributes GH PR #689: https://github.com/ArcticaProject/nx-libs/pull/689 nx-X11/programs/Xserver/hw/nxagent/Events.c | 88 ++++---- nx-X11/programs/Xserver/hw/nxagent/Events.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Extensions.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 269 ++++++++++++------------ nx-X11/programs/Xserver/hw/nxagent/Screen.h | 8 +- nx-X11/programs/Xserver/hw/nxagent/Window.c | 7 +- 7 files changed, 203 insertions(+), 175 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 3f6d8f3e8faca7dc060a9be51dbb9b76d2bdb9a5 Author: Ulrich Sibiller <uli42@gmx.de> Date: Thu May 17 23:13:38 2018 +0200 Update Xinerama on XMapEvent Fixes ArcticaProject/nx-libs#694 --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index dee8dd7..0eca8e4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -2041,6 +2041,18 @@ FIXME: Don't enqueue the KeyRelease event if the key was nxagentVisibilityTimeout = GetTimeInMillis() + 2000; } + /* + * without window manager there will be no ConfigureNotify + * event that would trigger xinerama updates. So we do that once + * the nxagent window gets mapped. + */ + if (nxagentWMIsRunning == 0 && + X.xmap.window == nxagentDefaultWindows[nxagentScreen(X.xmap.window)->myNum]) + { + nxagentChangeScreenConfig(nxagentScreen(X.xmap.window)->myNum, nxagentOption(Width), + nxagentOption(Height)); + } + break; } case MappingNotify: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 7ec73ef21efa5411d768d0648e2670c2b476ee02 Merge: c0f67ab 3f6d8f3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu May 24 11:15:38 2018 +0200 Merge branch 'uli42-pr/xinerama_without_wm' into 3.6.x Attributes GH PR #695: https://github.com/ArcticaProject/nx-libs/pull/695 nx-X11/programs/Xserver/hw/nxagent/Events.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 70ac10c8cd50e46fb79b3ee0b542a40c03257472 Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Jun 5 22:26:51 2018 +0200 Clipboard.c: add missing include Fixes ArcticaProject/nx-libs#701 --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index a2ea7d6..703a491 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -37,6 +37,7 @@ #include "Trap.h" #include "Rootless.h" #include "Clipboard.h" +#include "Utils.h" #include "gcstruct.h" #include "xfixeswire.h" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 742957393627b6556d6f27aaff29c17f23c9b0d2 Merge: 7ec73ef 70ac10c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 6 10:22:15 2018 +0200 Merge branch 'uli42-pr/fix_missing_include' into 3.6.x Attributes GH PR #702: https://github.com/ArcticaProject/nx-libs/pull/702 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 1 + 1 file changed, 1 insertion(+) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org