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 949b91c nxcomp/src/Loop.cpp: Typo fix in error msg. new ef0a3d6 debian/rules: Fix FTCBFS: (see Debian bug #875867) Fix build/host confusion in debian/rules. Pass --host to ./configure. new c804d99 NXhsm.c: add missing code new 9fb582f NXhsm.c: drop setting of sequence number new 995350d Merge branch 'uli42-pr/shm_missing_code' into 3.6.x new 99b1143 Handlers.c: Fix wrong function names in TEST output new acbc9cd NXdispatch.c: fix wrong indentation new 9e22a10 NXdispatch.c: add FIXME new 876063c Client.c: Fix wrong function names in DEBUG/WARNING output new 61e4d29 Composite.c: Fix wrong function names in TEST output new 5cee71a Dialog.c: Fix wrong function names in TEST output new 1997c04 Events.c: Fix wrong function name in TEST output new 1c020ea Events.c: change scope of XButtonEvent struct and clear it before use new 87afc32 Pixmap.c: Fix wrong function names in TEST/WARNING output new f511fba Reconnect.c: Fix wrong function names in TEST output new 1930f18 Rootless.c: Fix wrong function name in WARNING output new 0e54be6 Screen.c: Fix wrong function names in TEST output new 0a2a9da Splash.c: Fix wrong function names in TEST/DEBUG output new e3d749f Split.c: Fix wrong function names in TEST output new ffc363c Split.c: make nxagentWaitDrawable TEST messages look like all the others new 7db6cff Window.c: fix TEST/DEBUG output new b1c42dc Merge branch 'uli42-pr/some_cleanups' into 3.6.x new f7207bc Lift fb to xorg-xserver-7.1/1.1 state new a110b0c Merge branch 'uli42-pr/update_fb' 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: debian/rules | 36 ++++---- nx-X11/programs/Xserver/fb/fbblt.c | 24 ++++++ nx-X11/programs/Xserver/fb/fbcompose.c | 110 +++++++++++++++--------- nx-X11/programs/Xserver/fb/fbgc.c | 9 +- nx-X11/programs/Xserver/fb/fbpict.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Client.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Composite.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 7 +- nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 10 +-- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 13 +-- nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 27 ++++-- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 4 +- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 20 ++--- nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Splash.c | 12 +-- nx-X11/programs/Xserver/hw/nxagent/Split.c | 14 +-- nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 +- nx-X11/programs/Xserver/render/picture.h | 10 +++ 20 files changed, 200 insertions(+), 118 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 ef0a3d636681a0cb46b29eb2c1e20c55b68ce2fb Author: Helmut Grohne <helmut@subdivi.de> Date: Sun Jan 28 21:36:03 2018 +0100 debian/rules: Fix FTCBFS: (see Debian bug #875867) Fix build/host confusion in debian/rules. Pass --host to ./configure. --- debian/rules | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/debian/rules b/debian/rules index b2258cd..dffab72 100755 --- a/debian/rules +++ b/debian/rules @@ -6,16 +6,20 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" +include /usr/share/dpkg/architecture.mk + +export LIBDIR = "/usr/lib/$(DEB_HOST_MULTIARCH)" export LIBEXECDIR = "$(LIBDIR)/nx/bin" -export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" +export INCLUDEDIR = "/usr/include/$(DEB_HOST_MULTIARCH)" %: CONFIGURE="./configure --disable-silent-rules \ --prefix=/usr \ --libdir=$(LIBDIR) \ --includedir=$(INCLUDEDIR) \ - --libexecdir=$(LIBEXECDIR)" dh $@ --with quilt + --libexecdir=$(LIBEXECDIR) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE)" dh $@ --with quilt override_dh_auto_clean: rm -Rf nx-X11/.build-exports @@ -89,21 +93,21 @@ override_dh_clean: override_dh_install: # strip static libs and remove .la files - rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.la - strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a - rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.la - strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.a - rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libNX_X11.la - strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libNX_X11.a + rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXcomp.la + strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXcomp.a + rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXcompshad.la + strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXcompshad.a + rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libNX_X11.la + strip --strip-debug --remove-section=.comment --remove-section=.note debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libNX_X11.a # remove extras, GL, and other unneeded headers - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/GL/ - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XK*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/*Xv*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XRes*.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XI.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/Xtrans/ + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/GL/ + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/extensions/XK*.h + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/extensions/*Xv*.h + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/extensions/XRes*.h + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/extensions/XIproto.h + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/extensions/XI.h + rm -R debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/nx-X11/Xtrans/ dh_install --fail-missing -- 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 c804d99f2c4ea21e37cc8f6c3168b7b79d0d721a Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Feb 2 22:40:23 2018 +0100 NXhsm.c: add missing code This code was already existing in Xorg 6.6, but never in NX, for whatever reason. --- nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 2ffca80..fa53af1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -349,12 +349,26 @@ ProcShmPutImage(client) fprintf(stderr, "ProcShmPutImage: Calling (*shmFuncs[pDraw->pScreen->myNum]->PutImage)().\n"); #endif - (*shmFuncs[pDraw->pScreen->myNum]->PutImage)( - pDraw, pGC, stuff->depth, stuff->format, - stuff->totalWidth, stuff->totalHeight, - stuff->srcX, stuff->srcY, - stuff->srcWidth, stuff->srcHeight, - stuff->dstX, stuff->dstY, + if ((((stuff->format == ZPixmap) && (stuff->srcX == 0)) || + ((stuff->format != ZPixmap) && + (stuff->srcX < screenInfo.bitmapScanlinePad) && + ((stuff->format == XYBitmap) || + ((stuff->srcY == 0) && + (stuff->srcHeight == stuff->totalHeight))))) && + ((stuff->srcX + stuff->srcWidth) == stuff->totalWidth)) + (*pGC->ops->PutImage) (pDraw, pGC, stuff->depth, + stuff->dstX, stuff->dstY, + stuff->totalWidth, stuff->srcHeight, + stuff->srcX, stuff->format, + shmdesc->addr + stuff->offset + + (stuff->srcY * length)); + else + (*shmFuncs[pDraw->pScreen->myNum]->PutImage)( + pDraw, pGC, stuff->depth, stuff->format, + stuff->totalWidth, stuff->totalHeight, + stuff->srcX, stuff->srcY, + stuff->srcWidth, stuff->srcHeight, + stuff->dstX, stuff->dstY, shmdesc->addr + stuff->offset); if (stuff->sendEvent) -- 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 9fb582f420b5ad5d1f23a287bd74b3ff6b462f90 Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Feb 2 22:39:06 2018 +0100 NXhsm.c: drop setting of sequence number is done in WriteEventsToClient --- nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index fa53af1..fd74fad 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -378,7 +378,6 @@ ProcShmPutImage(client) memset(&ev, 0, sizeof(xShmCompletionEvent)); ev.type = ShmCompletionCode; ev.drawable = stuff->drawable; - ev.sequenceNumber = client->sequence; ev.minorEvent = X_ShmPutImage; ev.majorEvent = ShmReqCode; ev.shmseg = stuff->shmseg; -- 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 995350d14335d8b5ef52dba47c7ae8d942901b10 Merge: ef0a3d6 9fb582f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 5 12:14:39 2018 +0100 Merge branch 'uli42-pr/shm_missing_code' into 3.6.x Attributes GH PR #655: https://github.com/ArcticaProject/nx-libs/pull/655 nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 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 acbc9cd3146161dd5c07f8c5774b2ebe88d08faa Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 00:47:11 2018 +0100 NXdispatch.c: fix wrong indentation --- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index ca7086d..6c55a58 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -378,14 +378,14 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio * that the agent is ready. */ - if (!nxagentWMPassed && (nxagentWMtimeout < currentDispatch)) - { - nxagentRemoveSplashWindow(NULL); - } + if (!nxagentWMPassed && (nxagentWMtimeout < currentDispatch)) + { + nxagentRemoveSplashWindow(NULL); + } - nxagentClients = nClients; + nxagentClients = nClients; - #endif + #endif if (nready) { -- 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 9e22a10a5a59e8d45f0ca66bf3585d0aee88a9e7 Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 00:47:32 2018 +0100 NXdispatch.c: add FIXME --- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 6c55a58..44b1033 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -540,6 +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? */ if ((dispatchException & DE_RESET) && (serverGeneration > nxagentMaxAllowedResets)) { -- 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 99b11437002ffa4f14ab8be566dad680c273f05e Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 00:46:34 2018 +0100 Handlers.c: Fix wrong function names in TEST output --- nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index 634f7aa..e4c0568 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -423,7 +423,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask) } #ifdef TEST - fprintf(stderr, "nxagentDispatchHandler: Reducing the display buffer to [%d] bytes.\n", + fprintf(stderr, "nxagentBlockHandler: Reducing the display buffer to [%d] bytes.\n", nxagentBuffer); #endif @@ -435,7 +435,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask) nxagentBuffer = nxagentOption(DisplayBuffer); #ifdef TEST - fprintf(stderr, "nxagentDispatchHandler: Increasing the display buffer to [%d] bytes.\n", + fprintf(stderr, "nxagentBlockHandler: Increasing the display buffer to [%d] bytes.\n", nxagentBuffer); #endif @@ -590,7 +590,7 @@ void nxagentWakeupHandler(void * data, int count, void * mask) #endif #ifdef TEST - fprintf(stderr, "nxagentBlockHandler: Calling nxagentHandleConnectionStates " + fprintf(stderr, "nxagentWakeupHandler: Calling nxagentHandleConnectionStates " "with ioError [%d] sigHup [%d].\n", nxagentException.ioError, nxagentException.sigHup); #endif @@ -743,14 +743,14 @@ void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mas if (nxagentSessionState == SESSION_DOWN && nxagentOption(SleepTime) > 0) { #ifdef TEST - fprintf(stderr, "nxagentBlockHandler: sleeping for %d milliseconds for slowdown.\n", + fprintf(stderr, "nxagentShadowBlockHandler: sleeping for %d milliseconds for slowdown.\n", nxagentOption(SleepTime)); #endif usleep(nxagentOption(SleepTime) * 1000); } #ifdef TEST else if (0 == nxagentOption(SleepTime)) { - fprintf(stderr, "nxagentBlockHandler: not sleeping for slowdown.\n"); + fprintf(stderr, "nxagentShadowBlockHandler: not sleeping for slowdown.\n"); } #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 61e4d294942ac103c10b5f79cff49fdf3c820e6d Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:05:44 2018 +0100 Composite.c: Fix wrong function names in TEST output --- nx-X11/programs/Xserver/hw/nxagent/Composite.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.c b/nx-X11/programs/Xserver/hw/nxagent/Composite.c index bd84c52..8f15794 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Composite.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.c @@ -110,7 +110,7 @@ void nxagentCompositeExtensionInit() #ifdef TEST else { - fprintf(stderr, "nxagentRenderExtensionInit: Use of the composite extension not enabled.\n"); + fprintf(stderr, "nxagentCompositeExtensionInit: Use of the composite extension not enabled.\n"); } #endif } @@ -188,7 +188,7 @@ void nxagentUnredirectWindow(WindowPtr pWin) if (nxagentWindowPriv(pWin) -> isRedirected == 1) { #ifdef TEST - fprintf(stderr, "nxagentRedirectWindow: Disabling redirection of window id [%ld] " + fprintf(stderr, "nxagentUnredirectWindow: Disabling redirection of window id [%ld] " "to off-screen memory.\n", nxagentWindow(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 876063ce1f0d951f08232f0fce80b558e044ab5b Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 00:50:29 2018 +0100 Client.c: Fix wrong function names in DEBUG/WARNING output --- nx-X11/programs/Xserver/hw/nxagent/Client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c index 38d877e..1149545 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Client.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c @@ -517,12 +517,12 @@ void nxagentCheckRestartedClients(struct timeval **timeout) if (FD_ISSET(fd, &ClientsWithInput)) { #ifdef WARNING - fprintf(stderr, "nxagentBlockHandler: WARNING! Client [%d] with fd [%d] has input.\n", + fprintf(stderr, "nxagentCheckRestartedClients: WARNING! Client [%d] with fd [%d] has input.\n", clients[i] -> index, fd); #endif #ifdef DEBUG - fprintf(stderr, "nxagentBlockHandler: Setting a null timeout with former timeout [%ld] Ms.\n", + fprintf(stderr, "nxagentCheckRestartedClients: Setting a null timeout with former timeout [%ld] Ms.\n", (*timeout) -> tv_sec * 1000 + (*timeout) -> tv_usec / 1000); #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 5cee71a3cd402217946db4634e235c9b1cfbd3b3 Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:08:18 2018 +0100 Dialog.c: Fix wrong function names in TEST output --- nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c index c096186..73bd37a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c @@ -91,7 +91,7 @@ void nxagentResetDialog(int pid) else if (pid == nxagentFontsReplacementDialogPid) { #ifdef TEST - fprintf(stderr, "nxagentFontsReplacementDialog: Resetting fonts replacement dialog pid [%d].\n", + fprintf(stderr, "nxagentResetDialog: Resetting fonts replacement dialog pid [%d].\n", nxagentFontsReplacementDialogPid); #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 1997c04ab2571db44d5a80fa977a794229857d7f Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:19:26 2018 +0100 Events.c: Fix wrong function name in TEST output --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 0b6e0ca..cf42d84 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -3948,7 +3948,7 @@ void nxagentUngrabPointerAndKeyboard(XEvent *X) XUngrabKeyboard(nxagentDisplay, now); #ifdef TEST - fprintf(stderr, "nxagentGrabPointerAndKeyboard: Going to ungrab the pointer in context [B6].\n"); + fprintf(stderr, "nxagentUngrabPointerAndKeyboard: Going to ungrab the pointer in context [B6].\n"); #endif XUngrabPointer(nxagentDisplay, now); -- 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 87afc32f9869659bbb665b2f46123fde58befa6f Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:31:44 2018 +0100 Pixmap.c: Fix wrong function names in TEST/WARNING output --- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index 8536217..6a02f2f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -540,7 +540,7 @@ Bool nxagentDestroyVirtualPixmap(PixmapPtr pPixmap) RegionPtr nxagentPixmapToRegion(PixmapPtr pPixmap) { #ifdef TEST - fprintf(stderr, "PixmapToRegion: Pixmap = [%p] nxagentVirtualPixmap = [%p]\n", + fprintf(stderr, "nxagentPixmapToRegion: Pixmap = [%p] nxagentVirtualPixmap = [%p]\n", (void *) pPixmap, (void *) nxagentVirtualPixmap(pPixmap)); #endif @@ -727,7 +727,7 @@ PixmapPtr nxagentPixmapPtr(Pixmap pixmap) if (pair.pMap == NULL) { - fprintf(stderr, "nxagentFindPixmap: WARNING! Failed to find " + fprintf(stderr, "nxagentPixmapPtr: WARNING! Failed to find " "remote pixmap [%ld].\n", (long int) pair.pixmap); } else if (nxagentDrawableStatus((DrawablePtr) pair.pMap) == NotSynchronized) -- 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 1c020ea9ce571fef7a893b73e866b3dfa45da9d7 Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:19:40 2018 +0100 Events.c: change scope of XButtonEvent struct and clear it before use --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index cf42d84..315b657 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -3958,10 +3958,11 @@ void nxagentDeactivatePointerGrab() { GrabPtr grab = inputInfo.pointer -> grab; - XButtonEvent X; - if (grab) { + XButtonEvent X; + memset(&X, 0, sizeof(XButtonEvent)); + X.type = ButtonRelease; X.serial = 0; X.send_event = 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 f511fba349b098dace6ae70ea349a34148886f2a Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:34:11 2018 +0100 Reconnect.c: Fix wrong function names in TEST output --- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 4774579..b81796b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -463,7 +463,7 @@ Bool nxagentReconnectSession(void) failedStep = DISPLAY_STEP; #ifdef TEST - fprintf(stderr, "nxagentReconnect: WARNING! Failed display reconnection.\n"); + fprintf(stderr, "nxagentReconnectSession: WARNING! Failed display reconnection.\n"); #endif goto nxagentReconnectError; @@ -491,7 +491,7 @@ Bool nxagentReconnectSession(void) else { #ifdef WARNING - fprintf(stderr, "nxagentReconnect: WARNING! Unable to retrieve all the fonts currently in use. " + fprintf(stderr, "nxagentReconnectSession: WARNING! Unable to retrieve all the fonts currently in use. " "Missing fonts have been replaced.\n"); #endif @@ -594,7 +594,7 @@ Bool nxagentReconnectSession(void) #ifdef WARNING if (nxagentVerbose == 1) { - fprintf(stderr, "nxagentReconnect: Failed to reset keyboard device.\n"); + fprintf(stderr, "nxagentReconnectSession: Failed to reset keyboard device.\n"); } #endif @@ -638,7 +638,7 @@ Bool nxagentReconnectSession(void) if (nxagentSessionState != SESSION_GOING_UP) { #ifdef WARNING - fprintf(stderr, "nxagentReconnect: WARNING! Unexpected session state [%s] while reconnecting.\n", + fprintf(stderr, "nxagentReconnectSession: WARNING! Unexpected session state [%s] while reconnecting.\n", DECODE_SESSION_STATE(nxagentSessionState)); #endif @@ -666,7 +666,7 @@ Bool nxagentReconnectSession(void) */ #ifdef TEST - fprintf(stderr, "nxagentReconnect: Setting the NX flush policy to deferred.\n"); + fprintf(stderr, "nxagentReconnectSession: Setting the NX flush policy to deferred.\n"); #endif NXSetDisplayPolicy(nxagentDisplay, NXPolicyDeferred); @@ -680,7 +680,7 @@ nxagentReconnectError: if (failedStep == DISPLAY_STEP) { #ifdef TEST - fprintf(stderr, "nxagentReconnect: Reconnection failed in display step. Restoring options.\n"); + fprintf(stderr, "nxagentReconnectSession: Reconnection failed in display step. Restoring options.\n"); #endif nxagentRestoreOptions(); @@ -695,19 +695,19 @@ nxagentReconnectError: #ifdef WARNING if (nxagentVerbose == 1) { - fprintf(stderr, "nxagentReconnect: WARNING! The reconnect error message is not set. Failed step is [%d].\n", + fprintf(stderr, "nxagentReconnectSession: WARNING! The reconnect error message is not set. Failed step is [%d].\n", failedStep); } #endif #ifdef TEST - fprintf(stderr, "nxagentReconnect: Reconnection failed due to a display error.\n"); + fprintf(stderr, "nxagentReconnectSession: Reconnection failed due to a display error.\n"); #endif } else { #ifdef TEST - fprintf(stderr, "nxagentReconnect: Reconnection failed with reason '%s'\n", + fprintf(stderr, "nxagentReconnectSession: Reconnection failed with reason '%s'\n", nxagentGetReconnectError()); #endif } @@ -721,7 +721,7 @@ nxagentReconnectError: #ifdef TEST else { - fprintf(stderr, "nxagentReconnect: Cannot launch the dialog without a valid display.\n"); + fprintf(stderr, "nxagentReconnectSession: Cannot launch the dialog without a valid display.\n"); } #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 1930f184c5dc2b599477a10ab1e6bf92977b16ef Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:36:12 2018 +0100 Rootless.c: Fix wrong function name in WARNING output --- nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index 437140f..a115dd1 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -1002,7 +1002,7 @@ void nxagentImportProperty(Window window, wmHints.flags &= ~IconWindowHint; #ifdef WARNING - fprintf(stderr, "nxagenImportProperty: WARNING! Failed to look up remote icon " + fprintf(stderr, "nxagentImportProperty: WARNING! Failed to look up remote icon " "window %x from hint importing property [%ld] type %s on window %p.\n", (unsigned int) wmHints.icon_window, (long int) property, typeS, (void *) pWin); -- 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 0e54be636a2afd17c0005cdb62729639c3065e45 Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:39:00 2018 +0100 Screen.c: Fix wrong function names in TEST output --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 75e448c..c5aa389 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -2780,7 +2780,7 @@ int nxagentShadowInit(ScreenPtr pScreen, WindowPtr pWin) #endif #ifdef TEST - fprintf(stderr, "nxagentAddXConnection: Adding the X connection [%d] " + fprintf(stderr, "nxagentShadowInit: Adding the X connection [%d] " "to the device set.\n", fd); #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 0a2a9da33e0a239a3783c5a1d67396ee753473cb Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:41:52 2018 +0100 Splash.c: Fix wrong function names in TEST/DEBUG output --- nx-X11/programs/Xserver/hw/nxagent/Splash.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c index 0d3c2ff..bc86fed 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c @@ -86,14 +86,14 @@ int nxagentShowSplashWindow(Window parentWindow) GC gc; #ifdef TEST - fprintf(stderr, "nxagentShowSplash: Got called.\n"); + fprintf(stderr, "nxagentShowSplashWindow: Got called.\n"); #endif #ifdef NXAGENT_TIMESTAMP { extern unsigned long startTime; - fprintf(stderr, "nxagentShowSplash: Initializing splash start at [%d] milliseconds.\n", + fprintf(stderr, "nxagentShowSplashWindow: Initializing splash start at [%d] milliseconds.\n", GetTimeInMillis() - startTime); } #endif @@ -133,7 +133,7 @@ int nxagentShowSplashWindow(Window parentWindow) getAttributes.height = nxagentOption(RootHeight); #ifdef TEST - fprintf(stderr, "nxagentShowSplash: Going to create new splash window.\n"); + fprintf(stderr, "nxagentShowSplashWindow: Going to create new splash window.\n"); #endif nxagentSplashWindow = @@ -146,7 +146,7 @@ int nxagentShowSplashWindow(Window parentWindow) BlackPixel (nxagentDisplay, 0)); #ifdef TEST - fprintf(stderr, "nxagentShowSplash: Created new splash window with id [%ld].\n", + fprintf(stderr, "nxagentShowSplashWindow: Created new splash window with id [%ld].\n", nxagentSplashWindow); #endif @@ -162,7 +162,7 @@ int nxagentShowSplashWindow(Window parentWindow) #ifdef NXAGENT_TIMESTAMP { extern unsigned long startTime; - fprintf(stderr, "nxagentShowSplash: Splash ends [%d] milliseconds.\n", + fprintf(stderr, "nxagentShowSplashWindow: Splash ends [%d] milliseconds.\n", GetTimeInMillis() - startTime); } #endif @@ -185,7 +185,7 @@ void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height) } #ifdef DEBUG - fprintf(stderr, "nxagenShowtLogo: Got called.\n"); + fprintf(stderr, "nxagentPaintLogo: Got called.\n"); #endif #ifdef NXAGENT_LOGO_DEBUG -- 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 e3d749f681b9a1c597afa032ffb372c9e4b6278e Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:44:58 2018 +0100 Split.c: Fix wrong function names in TEST output --- nx-X11/programs/Xserver/hw/nxagent/Split.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c index 9b9691b..b8fc698 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Split.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c @@ -492,14 +492,14 @@ void nxagentReleaseSplit(DrawablePtr pDrawable) "commits are invalid.\n", pResource -> split); #endif - FatalError("nxagentCheckSplit: PANIC! Found a region for resource [%d] but the " + FatalError("nxagentReleaseSplit: PANIC! Found a region for resource [%d] but the " "commits are invalid.\n", pResource -> split); } #endif #ifdef TEST - fprintf(stderr, "nxagentValidateSplit: Aborting the data transfer for resource [%d].\n", + fprintf(stderr, "nxagentReleaseSplit: Aborting the data transfer for resource [%d].\n", pResource -> split); #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 ffc363c54398ce24419d6e8dc15f054213aa0645 Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:45:15 2018 +0100 Split.c: make nxagentWaitDrawable TEST messages look like all the others --- nx-X11/programs/Xserver/hw/nxagent/Split.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c index b8fc698..f66a97a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Split.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c @@ -734,7 +734,7 @@ void nxagentWaitDrawable(DrawablePtr pDrawable) if (pResource == NULL) { #ifdef TEST - fprintf(stderr, "++++++nxagentWaitDrawable: WARNING! The drawable at [%p] is already awake.\n", + fprintf(stderr, "nxagentWaitDrawable: WARNING! The drawable at [%p] is already awake.\n", (void *) pDrawable); #endif @@ -742,7 +742,7 @@ void nxagentWaitDrawable(DrawablePtr pDrawable) } #ifdef TEST - fprintf(stderr, "++++++nxagentWaitDrawable: Waiting drawable at [%p] with resource [%d].\n", + fprintf(stderr, "nxagentWaitDrawable: Waiting drawable at [%p] with resource [%d].\n", (void *) pDrawable, pResource -> split); #endif @@ -786,12 +786,12 @@ void nxagentWaitDrawable(DrawablePtr pDrawable) if (NXDisplayError(nxagentDisplay) == 1) { - fprintf(stderr, "++++++nxagentWaitDrawable: WARNING! Display error detected while " + fprintf(stderr, "nxagentWaitDrawable: WARNING! Display error detected while " "waiting for the drawable.\n"); } else { - fprintf(stderr, "++++++nxagentWaitDrawable: Drawable at [%p] can now be restarted.\n", + fprintf(stderr, "nxagentWaitDrawable: Drawable at [%p] can now be restarted.\n", (void *) pDrawable); } @@ -801,7 +801,7 @@ void nxagentWaitDrawable(DrawablePtr pDrawable) } #ifdef TEST - fprintf(stderr, "++++++nxagentWaitDrawable: Yielding control to the NX transport.\n"); + fprintf(stderr, "nxagentWaitDrawable: Yielding control to the NX transport.\n"); #endif nxagentWaitEvents(nxagentDisplay, NULL); -- 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 7db6cff1cd9f4f7c7ae8b34866dd921bddf31642 Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Jan 5 01:51:02 2018 +0100 Window.c: fix TEST/DEBUG output --- nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index 1cad4ca..977b955 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -283,7 +283,7 @@ Bool nxagentCreateWindow(pWin) nxagentClearSplash(nxagentRootTileWindow); } #ifdef NXAGENT_LOGO_DEBUG - fprintf(stderr, "nxagentSplashCount: %d\n", nxagentSplashCount); + fprintf(stderr, "nxagentCreateWindow: nxagentSplashCount [%d]\n", nxagentSplashCount); #endif if (pWin->drawable.class == InputOnly) { @@ -303,7 +303,7 @@ Bool nxagentCreateWindow(pWin) attributes.backing_store = NotUseful; #ifdef TEST - fprintf(stderr, "nxagentCreateWindow: Backing store on window at %p is %d.\n", + fprintf(stderr, "nxagentCreateWindow: Backing store on window at [%p] is [%d].\n", (void*)pWin, attributes.backing_store); #endif @@ -2865,7 +2865,7 @@ Bool nxagentSetWindowCursors(void *p0) } #ifdef NXAGENT_RECONNECT_WINDOW_DEBUG - fprintf(stderr, "nxagentLoopOverWindows: All cursors configured.\n"); + fprintf(stderr, "nxagentSetWindowCursors: All cursors configured.\n"); #endif nxagentReDisplayCurrentCursor(); -- 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 b1c42dc98bea8b99eb8a2b1618421bdb698cf690 Merge: 995350d 7db6cff Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 5 13:02:30 2018 +0100 Merge branch 'uli42-pr/some_cleanups' into 3.6.x Attributes GH PR #626: https://github.com/ArcticaProject/nx-libs/pull/626 nx-X11/programs/Xserver/hw/nxagent/Client.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Composite.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 7 ++++--- nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 10 +++++----- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 13 +++++++------ nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 4 ++-- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 20 ++++++++++---------- nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Splash.c | 12 ++++++------ nx-X11/programs/Xserver/hw/nxagent/Split.c | 14 +++++++------- nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 +++--- 13 files changed, 51 insertions(+), 49 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 a110b0c456916f78b4653c39db5196acadfc0681 Merge: b1c42dc f7207bc Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 5 14:07:27 2018 +0100 Merge branch 'uli42-pr/update_fb' into 3.6.x Attributes GH PR #642: https://github.com/ArcticaProject/nx-libs/pull/642 nx-X11/programs/Xserver/fb/fbblt.c | 24 +++++++ nx-X11/programs/Xserver/fb/fbcompose.c | 110 +++++++++++++++++++------------ nx-X11/programs/Xserver/fb/fbgc.c | 9 ++- nx-X11/programs/Xserver/fb/fbpict.h | 2 +- nx-X11/programs/Xserver/render/picture.h | 10 +++ 5 files changed, 109 insertions(+), 46 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 f7207bcdc1b1f5d4b52cd3dccdde3762245ee42b Author: Ulrich Sibiller <uli42@gmx.de> Date: Sun Nov 5 21:41:08 2017 +0100 Lift fb to xorg-xserver-7.1/1.1 state Fixes ArcticaProject/nx-libs#640 --- nx-X11/programs/Xserver/fb/fbblt.c | 24 +++++++ nx-X11/programs/Xserver/fb/fbcompose.c | 110 +++++++++++++++++++------------ nx-X11/programs/Xserver/fb/fbgc.c | 9 ++- nx-X11/programs/Xserver/fb/fbpict.h | 2 +- nx-X11/programs/Xserver/render/picture.h | 10 +++ 5 files changed, 109 insertions(+), 46 deletions(-) diff --git a/nx-X11/programs/Xserver/fb/fbblt.c b/nx-X11/programs/Xserver/fb/fbblt.c index 085a8e6..e820a85 100644 --- a/nx-X11/programs/Xserver/fb/fbblt.c +++ b/nx-X11/programs/Xserver/fb/fbblt.c @@ -26,6 +26,7 @@ #include <dix-config.h> #endif +#include <string.h> #include "fb.h" #define InitializeShifts(sx,dx,ls,rs) { \ @@ -76,6 +77,29 @@ fbBlt (FbBits *srcLine, return; } #endif + + if (alu == GXcopy && pm == FB_ALLONES && !reverse && + !(srcX & 7) && !(dstX & 7) && !(width & 7)) { + int i; + CARD8 *src = (CARD8 *) srcLine; + CARD8 *dst = (CARD8 *) dstLine; + + srcStride *= sizeof(FbBits); + dstStride *= sizeof(FbBits); + width >>= 3; + src += (srcX >> 3); + dst += (dstX >> 3); + + if (!upsidedown) + for (i = 0; i < height; i++) + memcpy(dst + i * dstStride, src + i * srcStride, width); + else + for (i = height - 1; i >= 0; i--) + memcpy(dst + i * dstStride, src + i * srcStride, width); + + return; + } + FbInitializeMergeRop(alu, pm); destInvarient = FbDestInvarientMergeRop(); if (upsidedown) diff --git a/nx-X11/programs/Xserver/fb/fbcompose.c b/nx-X11/programs/Xserver/fb/fbcompose.c index 3f4e6ec..7699ae7 100644 --- a/nx-X11/programs/Xserver/fb/fbcompose.c +++ b/nx-X11/programs/Xserver/fb/fbcompose.c @@ -382,6 +382,17 @@ fbFetch_c8 (const FbBits *bits, int x, int width, CARD32 *buffer, miIndexedPtr i } } +static FASTCALL void +fbFetch_x4a4 (const FbBits *bits, int x, int width, CARD32 *buffer, miIndexedPtr indexed) +{ + const CARD8 *pixel = (const CARD8 *)bits + x; + const CARD8 *end = pixel + width; + while (pixel < end) { + CARD8 p = (*pixel++) & 0xf; + *buffer++ = (p | (p << 4)) << 24; + } +} + #define Fetch8(l,o) (((CARD8 *) (l))[(o) >> 2]) #if IMAGE_BYTE_ORDER == MSBFirst #define Fetch4(l,o) ((o) & 2 ? Fetch8(l,o) & 0xf : Fetch8(l,o) >> 4) @@ -545,6 +556,7 @@ static fetchProc fetchProcForPicture (PicturePtr pict) case PICT_a2b2g2r2: return fbFetch_a2b2g2r2; case PICT_c8: return fbFetch_c8; case PICT_g8: return fbFetch_c8; + case PICT_x4a4: return fbFetch_x4a4; /* 4bpp formats */ case PICT_a4: return fbFetch_a4; @@ -1258,6 +1270,16 @@ fbStore_c8 (FbBits *bits, const CARD32 *values, int x, int width, miIndexedPtr i } } +static FASTCALL void +fbStore_x4a4 (FbBits *bits, const CARD32 *values, int x, int width, miIndexedPtr indexed) +{ + int i; + CARD8 *pixel = ((CARD8 *) bits) + x; + for (i = 0; i < width; ++i) { + *pixel++ = values[i] >> 28; + } +} + #define Store8(l,o,v) (((CARD8 *) l)[(o) >> 3] = (v)) #if IMAGE_BYTE_ORDER == MSBFirst #define Store4(l,o,v) Store8(l,o,((o) & 4 ? \ @@ -1409,6 +1431,7 @@ static storeProc storeProcForPicture (PicturePtr pict) case PICT_a2r2g2b2: return fbStore_a2r2g2b2; case PICT_c8: return fbStore_c8; case PICT_g8: return fbStore_c8; + case PICT_x4a4: return fbStore_x4a4; /* 4bpp formats */ case PICT_a4: return fbStore_a4; @@ -2861,7 +2884,7 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 FbBits *bits; FbStride stride; int bpp; - int xoff, yoff; + int xoff, yoff, dx, dy; fetchPixelProc fetch; PictVector v; PictVector unit; @@ -2876,8 +2899,11 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 x += xoff; y += yoff; - v.vector[0] = IntToxFixed(x); - v.vector[1] = IntToxFixed(y); + dx = pict->pDrawable->x; + dy = pict->pDrawable->y; + + v.vector[0] = IntToxFixed(x - dx); + v.vector[1] = IntToxFixed(y - dy); v.vector[2] = xFixed1; /* when using convolution filters one might get here without a transform */ @@ -2898,7 +2924,6 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 { if (pict->repeatType == RepeatNormal) { if (RegionNumRects(pict->pCompositeClip) == 1) { - box = pict->pCompositeClip->extents; for (i = 0; i < width; ++i) { if (!v.vector[2]) { buffer[i] = 0; @@ -2910,7 +2935,7 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 y = MOD(v.vector[1]>>16, pict->pDrawable->height); x = MOD(v.vector[0]>>16, pict->pDrawable->width); } - buffer[i] = fetch(bits + (y + pict->pDrawable->y)*stride, x + pict->pDrawable->x, indexed); + buffer[i] = fetch(bits + (y + dy)*stride, x + dx, indexed); } v.vector[0] += unit.vector[0]; v.vector[1] += unit.vector[1]; @@ -2928,8 +2953,8 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 y = MOD(v.vector[1]>>16, pict->pDrawable->height); x = MOD(v.vector[0]>>16, pict->pDrawable->width); } - if (RegionContainsPoint(pict->pCompositeClip, x, y, &box)) - buffer[i] = fetch(bits + (y + pict->pDrawable->y)*stride, x + pict->pDrawable->x, indexed); + if (RegionContainsPoint(pict->pCompositeClip, x + dx, y + dy, &box)) + buffer[i] = fetch(bits + (y + dy)*stride, x + dx, indexed); else buffer[i] = 0; } @@ -2952,8 +2977,8 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 y = v.vector[1]>>16; x = v.vector[0]>>16; } - buffer[i] = ((x < box.x1) | (x >= box.x2) | (y < box.y1) | (y >= box.y2)) ? - 0 : fetch(bits + (y + pict->pDrawable->y)*stride, x + pict->pDrawable->x, indexed); + buffer[i] = ((x < box.x1-dx) | (x >= box.x2-dx) | (y < box.y1-dy) | (y >= box.y2-dy)) ? + 0 : fetch(bits + (y + dy)*stride, x + dx, indexed); } v.vector[0] += unit.vector[0]; v.vector[1] += unit.vector[1]; @@ -2971,8 +2996,8 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 y = v.vector[1]>>16; x = v.vector[0]>>16; } - if (RegionContainsPoint(pict->pCompositeClip, x, y, &box)) - buffer[i] = fetch(bits + (y + pict->pDrawable->y)*stride, x + pict->pDrawable->x, indexed); + if (RegionContainsPoint(pict->pCompositeClip, x + dx, y + dy, &box)) + buffer[i] = fetch(bits + (y + dy)*stride, x + dx, indexed); else buffer[i] = 0; } @@ -2985,7 +3010,6 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 } else if (pict->filter == PictFilterBilinear) { if (pict->repeatType == RepeatNormal) { if (RegionNumRects(pict->pCompositeClip) == 1) { - box = pict->pCompositeClip->extents; for (i = 0; i < width; ++i) { if (!v.vector[2]) { buffer[i] = 0; @@ -3020,13 +3044,13 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 y1 = MOD (y1, pict->pDrawable->height); y2 = MOD (y2, pict->pDrawable->height); - b = bits + (y1 + pict->pDrawable->y)*stride; + b = bits + (y1 + dy)*stride; - tl = fetch(b, x1 + pict->pDrawable->x, indexed); - tr = fetch(b, x2 + pict->pDrawable->x, indexed); - b = bits + (y2 + pict->pDrawable->y)*stride; - bl = fetch(b, x1 + pict->pDrawable->x, indexed); - br = fetch(b, x2 + pict->pDrawable->x, indexed); + tl = fetch(b, x1 + dx, indexed); + tr = fetch(b, x2 + dx, indexed); + b = bits + (y2 + dy)*stride; + bl = fetch(b, x1 + dx, indexed); + br = fetch(b, x2 + dx, indexed); ft = FbGet8(tl,0) * idistx + FbGet8(tr,0) * distx; fb = FbGet8(bl,0) * idistx + FbGet8(br,0) * distx; @@ -3081,17 +3105,17 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 y1 = MOD (y1, pict->pDrawable->height); y2 = MOD (y2, pict->pDrawable->height); - b = bits + (y1 + pict->pDrawable->y)*stride; + b = bits + (y1 + dy)*stride; - tl = RegionContainsPoint(pict->pCompositeClip, x1, y1, &box) - ? fetch(b, x1 + pict->pDrawable->x, indexed) : 0; - tr = RegionContainsPoint(pict->pCompositeClip, x2, y1, &box) - ? fetch(b, x2 + pict->pDrawable->x, indexed) : 0; - b = bits + (y2 + pict->pDrawable->y)*stride; - bl = RegionContainsPoint(pict->pCompositeClip, x1, y2, &box) - ? fetch(b, x1 + pict->pDrawable->x, indexed) : 0; - br = RegionContainsPoint(pict->pCompositeClip, x2, y2, &box) - ? fetch(b, x2 + pict->pDrawable->x, indexed) : 0; + tl = RegionContainsPoint(pict->pCompositeClip, x1 + dx, y1 + dy, &box) + ? fetch(b, x1 + dx, indexed) : 0; + tr = RegionContainsPoint(pict->pCompositeClip, x2 + dx, y1 + dy, &box) + ? fetch(b, x2 + dx, indexed) : 0; + b = bits + (y2 + dy)*stride; + bl = RegionContainsPoint(pict->pCompositeClip, x1 + dx, y2 + dy, &box) + ? fetch(b, x1 + dx, indexed) : 0; + br = RegionContainsPoint(pict->pCompositeClip, x2 + dx, y2 + dy, &box) + ? fetch(b, x2 + dx, indexed) : 0; ft = FbGet8(tl,0) * idistx + FbGet8(tr,0) * distx; fb = FbGet8(bl,0) * idistx + FbGet8(br,0) * distx; @@ -3145,13 +3169,13 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 idistx = 256 - distx; idisty = 256 - disty; - b = bits + (y1 + pict->pDrawable->y)*stride; - x_off = x1 + pict->pDrawable->x; + b = bits + (y1 + dy)*stride; + x_off = x1 + dx; - x1_out = (x1 < box.x1) | (x1 >= box.x2); - x2_out = (x2 < box.x1) | (x2 >= box.x2); - y1_out = (y1 < box.y1) | (y1 >= box.y2); - y2_out = (y2 < box.y1) | (y2 >= box.y2); + x1_out = (x1 < box.x1-dx) | (x1 >= box.x2-dx); + x2_out = (x2 < box.x1-dx) | (x2 >= box.x2-dx); + y1_out = (y1 < box.y1-dy) | (y1 >= box.y2-dy); + y2_out = (y2 < box.y1-dy) | (y2 >= box.y2-dy); tl = x1_out|y1_out ? 0 : fetch(b, x_off, indexed); tr = x2_out|y1_out ? 0 : fetch(b, x_off + 1, indexed); @@ -3207,17 +3231,17 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 idistx = 256 - distx; idisty = 256 - disty; - b = bits + (y1 + pict->pDrawable->y)*stride; - x_off = x1 + pict->pDrawable->x; + b = bits + (y1 + dy)*stride; + x_off = x1 + dx; - tl = RegionContainsPoint(pict->pCompositeClip, x1, y1, &box) + tl = RegionContainsPoint(pict->pCompositeClip, x1 + dx, y1 + dy, &box) ? fetch(b, x_off, indexed) : 0; - tr = RegionContainsPoint(pict->pCompositeClip, x2, y1, &box) + tr = RegionContainsPoint(pict->pCompositeClip, x2 + dx, y1 + dy, &box) ? fetch(b, x_off + 1, indexed) : 0; b += stride; - bl = RegionContainsPoint(pict->pCompositeClip, x1, y2, &box) + bl = RegionContainsPoint(pict->pCompositeClip, x1 + dx, y2 + dy, &box) ? fetch(b, x_off, indexed) : 0; - br = RegionContainsPoint(pict->pCompositeClip, x2, y2, &box) + br = RegionContainsPoint(pict->pCompositeClip, x2 + dx, y2 + dy, &box) ? fetch(b, x_off + 1, indexed) : 0; ft = FbGet8(tl,0) * idistx + FbGet8(tr,0) * distx; @@ -3275,9 +3299,9 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 for (x = x1; x < x2; x++) { if (*p) { int tx = (pict->repeatType == RepeatNormal) ? MOD (x, pict->pDrawable->width) : x; - if (RegionContainsPoint(pict->pCompositeClip, tx, ty, &box)) { - FbBits *b = bits + (ty + pict->pDrawable->y)*stride; - CARD32 c = fetch(b, tx + pict->pDrawable->x, indexed); + if (RegionContainsPoint(pict->pCompositeClip, tx + dx, ty + dy, &box)) { + FbBits *b = bits + (ty + dy)*stride; + CARD32 c = fetch(b, tx + dx, indexed); srtot += Red(c) * *p; sgtot += Green(c) * *p; diff --git a/nx-X11/programs/Xserver/fb/fbgc.c b/nx-X11/programs/Xserver/fb/fbgc.c index 437bc5d..44eecfb 100644 --- a/nx-X11/programs/Xserver/fb/fbgc.c +++ b/nx-X11/programs/Xserver/fb/fbgc.c @@ -98,9 +98,13 @@ fbPadPixmap (PixmapPtr pPixmap) FbBits mask; int height; int w; + int stride; + int bpp; + _X_UNUSED int xOff, yOff; + + fbGetDrawable (&pPixmap->drawable, bits, stride, bpp, xOff, yOff); width = pPixmap->drawable.width * pPixmap->drawable.bitsPerPixel; - bits = pPixmap->devPrivate.ptr; height = pPixmap->drawable.height; mask = FbBitsMask (0, width); while (height--) @@ -112,7 +116,8 @@ fbPadPixmap (PixmapPtr pPixmap) b = b | FbScrRight(b, w); w <<= 1; } - *bits++ = b; + *bits = b; + bits += stride; } } diff --git a/nx-X11/programs/Xserver/fb/fbpict.h b/nx-X11/programs/Xserver/fb/fbpict.h index 78d2807..55c863d 100644 --- a/nx-X11/programs/Xserver/fb/fbpict.h +++ b/nx-X11/programs/Xserver/fb/fbpict.h @@ -171,7 +171,7 @@ x = (x + ((x >> 8) & 0xff00ff)) >> 8; \ x &= 0xff00ff; \ x += (y >> 8) & 0xff00ff; \ - x |= 0x1000100 - ((t >> 8) & 0xff00ff); \ + x |= 0x1000100 - ((x >> 8) & 0xff00ff); \ x &= 0xff00ff; \ x <<= 8; \ x += t; \ diff --git a/nx-X11/programs/Xserver/render/picture.h b/nx-X11/programs/Xserver/render/picture.h index 5dde2d0..518e9fb 100644 --- a/nx-X11/programs/Xserver/render/picture.h +++ b/nx-X11/programs/Xserver/render/picture.h @@ -1,4 +1,5 @@ /* + * * Copyright © 2000 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -98,6 +99,15 @@ typedef struct _Picture *PicturePtr; #define PICT_c8 PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0) #define PICT_g8 PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0) +#define PICT_x4a4 PICT_FORMAT(8,PICT_TYPE_A,4,0,0,0) +#define PICT_x4r1g2b1 PICT_FORMAT(8,PICT_TYPE_ARGB,0,1,2,1) +#define PICT_x4b1g2r1 PICT_FORMAT(8,PICT_TYPE_ABGR,0,1,2,1) +#define PICT_x4a1r1g1b1 PICT_FORMAT(8,PICT_TYPE_ARGB,1,1,1,1) +#define PICT_x4a1b1g1r1 PICT_FORMAT(8,PICT_TYPE_ABGR,1,1,1,1) + +#define PICT_x4c4 PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0) +#define PICT_x4g4 PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0) + /* 4bpp formats */ #define PICT_a4 PICT_FORMAT(4,PICT_TYPE_A,4,0,0,0) #define PICT_r1g2b1 PICT_FORMAT(4,PICT_TYPE_ARGB,0,1,2,1) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org