[X2Go-Commits] [nx-libs] branch 3.6.x updated (1e16939 -> 989398a)

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 1e16939 [PATCH] os: XDMCP options like -query etc. should imply -listen tcp adds 489c173 Use min() [defined in include/misc.h] instead of MIN() [not defined in any Xorg header]. adds 643e13b fix window title encoding (use utf8) for nxagent adds 9a7c0b0 nxagent: Used 'Xutf8SetVMPropertis' instead of 'XSetStandardProperties' + 'Xutf8SetWMProperties' adds aaae5d5 Merge branch 'Etersoft-fix-nxagent-window-title-encoding' into 3.6.x adds 0154ef4 add list with versions of the xserver modules adds c0bef5e Merge branch 'uli42-pr/track_versions' into 3.6.x adds 129d1cc refactor nxagentGet(Default)EventMask adds 9f4eb6a Merge branch 'uli42-pr/refactor_defaulteventmask' into 3.6.x adds f8e76fd Events.c: mitigate compiler warning adds 2fe89c5 Events.c: fix compiler warnings adds 553b96f Events.c: fix wrong printf format specifiers adds 0db1770 Events.c: drop variable that caused compilation warning adds f9e4a54 Merge branch 'uli42-pr/fix_events_debug_warnings' into 3.6.x adds f9c2d56 Fix broken 9a7c0b081fad98bfcfcceff9557781f4b39ec572 adds b517b66 Merge branch 'uli42-pr/fix_wm_props' into 3.6.x adds 3bd41aa Replace MIN/MAX macros by min/max from misc.h adds fad80bc Merge branch 'uli42-pr/drop_double_min_max' into 3.6.x adds f8e20d0 Args.c: rename nxagentParseOptions to nxagentParseSingleOption adds 30a9627 Args.c: allow options to contain URL encoded characters adds 930bd28 Merge branch 'uli42-pr/decode_options' into 3.6.x adds c7eadb8 nxmissing.xpm: Add XPM marker so that image viewers recognize the image file format. adds 4d6bae0 Application icon: Drop NoMachine logo as nxagent icon, switch to X11 icon for now. adds 3738364 Call checkX2goAgent much earlier (in ddxProcessArgument) and adapt NXAGENTWINDOWNAMELENGTH to its result. adds 25c7f02 Use basename() to derive nxagentProgName cleanly. adds c2b4e42 X2Go XPM icon: white background, not transparent. adds 31ac5a1 X2Go Agent XPM: Rename from x2go.xpm to x2goagent.xpm (like the symlink name we expect). adds d3bbca7 Merge branch 'sunweaver-pr/drop-nomachine-icon' into 3.6.x adds da9d1a5 nxagent: Fix an excessive request size limitation that broke big-requests. adds c478ba2 Merge branch 'uli42-pr/fix_bigrequests' into 3.6.x adds 6b2033b nxagent: use nxagentWMIsRunning as Bool all over the place adds 1a8c453 nxagent: use nxagentWMPassed as Bool all over the place adds f91f02d Pixmap.c: use some Bools as Bools not integers adds 67432ac Render.c: improve Bool usage adds 7b8aef8 nxagentInitAndCheckVisuals: adapt bool usage to match the previous function adds 1584395 Window.c: improve Bool usage adds 7f7895e Window.c: remove useless code adds 450760b Events.c: improve Bool usage adds 7392dd6 Merge branch 'uli42-pr/cleanup_wmisrunning' into 3.6.x adds 97f768a X11.tmpl: whitespace fix adds 71abe0b enable CLIENTIDS functions in xserver adds 3dc4595 Merge branch 'uli42-pr/enableclientids' into 3.6.x adds e1938c1 libNX_X11: upgrade to X.org upstream version 1.6.6 adds 701e702 libNX_X11: upgrade to X.org upstream version 1.6.7 adds 2eb4a65 Merge branch 'uli42-pr/libX11_1.6.6' into 3.6.x adds 8baec5d Clipboard: print requested target in debugging mode adds 6cdddad Clipboard.c: add function for debugging output adds 35f6b32 NXproperty.c:add debug output adds fab6911 Clipboard.c: introduce helper macros for easier debugging adds 85a28a6 Clipboard.c: add macro for safe XFree calls with ptr clearance adds e90306e Clipboard.c: some scope optimizations adds 888de83 Clipboard.c: print X errors adds 9a5f519 Clipboard.c: Code optimization (missing else) adds 719488d Clipboard.c: add FIXME adds 018b561 Clipboard.c: whitespace fixes adds 1af67b4 Clipboard.c: GetWindowProperty() does not return BadMatch adds 1c4c9f6 Clipboard.c: more debugging info for nxagentGetClipboardWindow() adds 5d26add Clipboard.c: new debug function to reduce duplicate code adds f8bfdc8 Clipboard.c: improve nxagentClearSelection() debug code adds 934d9ea Clipboard.c: Use constant instead of hardcoded value adds 2517d8c Clipboard.c: more DEBUG output adds 6ea7558 Clipboard.c: fix fprintf type warnings adds 60bce14 Clipboard.c: use __func__ everywhere adds 2804320 Merge branch 'uli42-pr/clipboard_debug' into 3.6.x adds e8c6a74 Window.c: convert old-style function definitions to ANSI C89 style adds 2769cbb Window.c: indent FIXMEs adds 7a0b401 Window.c: reformat/add braces for readability adds 1fb32cf Window.c: scope improvements adds ea27530 Window.c: whitespace cleanup adds 9e6e431 Window.c: some code simplifications adds df531c1 Window.c: silence compiler warnings adds c8383b8 Window.c: indent ifdefs for better readability adds 1eb5603 Window.c: save some lines by declaring loop variables in the loop adds 728a3d1 Window.c: add FIXME adds e2421bb Window.c: use C99 designated initializers at some places adds 70b4946 Merge branch 'uli42-pr/small_improvements' into 3.6.x adds 266c3d6 Lift Xi to 1.3.0.0 (identical to 1.2.0) adds 122db3f Merge branch 'uli42-pr/Xi-1.2.0' into 3.6.x adds 2db5191 Check nxagentXkbInfo.EventBase before use adds 9808c66 Lift xkb to XORG-1.2.0 state adds bebdf09 Keyboard.c: Remove (now) unused defines adds 0fc5368 Keyboard.c: remove unnecessary includes adds d54f1fb Keyboard.c: remove unused defines adds 11a1f31 no more own XkbBaseDirectory handling adds eb07ed5 Keyboard.c: do not define own RLMVO defaults adds 4ed8145 XKB: provide XKB defines via Imakefile adds 3fbef7d Lift xkb to XORG-1.3.0.0 state adds b891e5f Keyboard.c: always ask for remote XKB adds 6186383 Keyboard.c: simplify RLMVO string handling adds 1b05251 Keyboard.c: simplify over-specific if adds d8bbbcf Keyboard.c: guard XkbFreeKeyboard calls adds 05e03b9 Keyboard.c: greatly simplify the code in nxagentKeyboardProc adds b8ae794 Keyboard.c: fix keyboard=query logic adds 59524cd Keyboard.c: simplify even more: free stuff at one place adds 018b2d0 XkbSendNames: fix use of uninitialised bytes valgrind error. adds 6947595 ProcXkbGetKbdByName: fix use of uninitialised bytes valgrind error. adds 6625e78 XKB: Fix garbage initialization adds 7487d7f XKB: Fix logic error adds 3c1b1ef XKB: Remove unused DDX functions adds 1ca0aee Event.c: improve DEBUG output adds 824b629 XKB: Fix size_syms calculation bug adds f23189e Make: Automatically determine xkb dir adds 90b83a7 xkb: Fix memory leak if opening file fails adds b01e29e xkb: Don't check for NULL before calling free adds b09a72b Convert existing Xprintf style calls to asprintf style adds 3965f24 adapt code-versions.txt adds fccef5f Merge branch 'uli42-pr/xkb_1.3.0.0' into 3.6.x adds 49607e9 Lift Xext to xorg 1.4.2 adds d2dae84 Merge branch 'uli42-pr/Xext-1.4.2' into 3.6.x adds 7b08c7d debian/control: Add to B-D: libxkbfile-dev. Required by xkbcomp.pc (pkg-config). adds a12ab41 debian/contrl: Bump Standards-Version: to 4.2.1. No changes needed. adds 89f1e3b Makefile: support systems without xkbcomp.pc. adds 93c9b88 nx-libs.spec: newer versions of SLE* and OpenSuSE use xkbcomp-devel, while RedHat-based distros want xorg-x11-xkb-utils-devel for xkbcomp.pc. adds abf47fe Makefile: drop intermediate NX version vars adds 77b3923 Makefile: Rework handling auto-determined values for imake adds 58615f9 Makefile: use (more) RM macros adds a93f64e Makefile: use test + && instead of if test/else/fi adds ffc723e silence imake compilation adds c4656c5 imake: also silence makedepend adds 8632895 imake: adapt output to automake output as seen in lib/src adds f78a8b3 nx-X11/config/cf/nxcompile.def: Rephrase header comment slightly. adds 1a42901 Merge branch 'uli42-pr/fix_font_defines_once_more2' into 3.6.x adds a118ab8 debian/patches: Rebase 2001_nx-X11_install-location.debian.patch. adds e4a7baf Regression fix for a93f64e4. The test executables bails out on test failure, whereas ifdef does not. Adding "|| true" where needed. adds 071e41b Makefile: Assure that nx-X11's Makefiles are created after everything has been defined. adds 623a74a Makefile: fix (dist)clean dependencies adds 3a19d8d release 3.5.99.17 adds afa56ea debian/changelog: post-release fix (UNRELEASED -> unstable). adds 6d7784e debian/nxagent.{post,pre}*: Fix versions in dpkg-maintscript-helper calls. adds 989398a debian/*: Adopt packaging changes from official Debian package. No new revisions were added by this update. Summary of changes: ChangeLog | 1192 +++++++++++++----- Makefile | 105 +- VERSION | 2 +- debian/changelog | 9 +- debian/control | 9 +- debian/copyright | 107 +- debian/copyright.in | 172 ++- debian/libnx-x11-6.symbols | 1 + debian/nxagent.postinst | 4 +- debian/nxagent.postrm | 4 +- debian/nxagent.preinst | 4 +- .../2001_nx-X11_install-location.debian.patch | 4 +- doc/nxagent/x11.svg | 27 + nx-X11/config/cf/Imake.tmpl | 8 + nx-X11/config/cf/X11.tmpl | 2 +- nx-X11/config/cf/nxcompile.def | 30 + nx-X11/config/cf/xorg.cf | 4 +- nx-X11/lib/include/X11/Xlibint.h | 125 +- nx-X11/lib/modules/im/ximcp/imCallbk.c | 6 +- nx-X11/lib/modules/im/ximcp/imDefIc.c | 82 +- nx-X11/lib/modules/im/ximcp/imInsClbk.c | 2 +- nx-X11/lib/modules/im/ximcp/imLcIm.c | 8 +- nx-X11/lib/modules/im/ximcp/imLcLkup.c | 6 +- nx-X11/lib/modules/om/generic/omGeneric.c | 32 +- nx-X11/lib/src/DisName.c | 2 +- nx-X11/lib/src/FSWrap.c | 2 +- nx-X11/lib/src/FontNames.c | 16 +- nx-X11/lib/src/GetFPath.c | 11 +- nx-X11/lib/src/GetImage.c | 16 +- nx-X11/lib/src/LiHosts.c | 19 +- nx-X11/lib/src/ListExt.c | 19 +- nx-X11/lib/src/SetHints.c | 4 +- nx-X11/lib/src/StColor.c | 1 + nx-X11/lib/src/StColors.c | 1 + nx-X11/lib/src/StrKeysym.c | 10 +- nx-X11/lib/src/XlibInt.c | 86 +- nx-X11/lib/src/xcms/LRGB.c | 3 + nx-X11/lib/src/xcms/cmsColNm.c | 2 +- nx-X11/lib/src/xcms/cmsLkCol.c | 3 +- nx-X11/lib/src/xcms/cmsProp.c | 1 + nx-X11/lib/src/xkb/XKBAlloc.c | 8 +- nx-X11/lib/src/xlibi18n/lcCT.c | 10 +- nx-X11/lib/src/xlibi18n/lcDB.c | 2 +- nx-X11/lib/src/xlibi18n/lcGeneric.c | 1 + nx-X11/lib/src/xlibi18n/lcPublic.c | 1 + nx-X11/programs/Xserver/Xext/dpms.c | 7 +- nx-X11/programs/Xserver/Xext/panoramiX.c | 46 +- nx-X11/programs/Xserver/Xext/panoramiX.h | 13 - nx-X11/programs/Xserver/Xext/panoramiXSwap.c | 4 + nx-X11/programs/Xserver/Xext/panoramiXh.h | 5 +- nx-X11/programs/Xserver/Xext/panoramiXprocs.c | 8 +- nx-X11/programs/Xserver/Xext/saver.c | 15 +- nx-X11/programs/Xserver/Xext/shm.c | 20 +- nx-X11/programs/Xserver/Xext/shmint.h | 2 - nx-X11/programs/Xserver/Xext/sleepuntil.c | 1 - nx-X11/programs/Xserver/Xext/sync.c | 24 +- nx-X11/programs/Xserver/Xext/xf86bigfont.c | 1 + nx-X11/programs/Xserver/Xext/xres.c | 64 +- nx-X11/programs/Xserver/Xext/xtest.c | 6 +- nx-X11/programs/Xserver/Xext/xvdisp.c | 24 +- nx-X11/programs/Xserver/Xext/xvmain.c | 4 +- nx-X11/programs/Xserver/Xext/xvmc.c | 2 +- nx-X11/programs/Xserver/Xi/allowev.c | 1 - nx-X11/programs/Xserver/Xi/chgdctl.c | 1 - nx-X11/programs/Xserver/Xi/chgfctl.c | 1 - nx-X11/programs/Xserver/Xi/chgkbd.c | 1 - nx-X11/programs/Xserver/Xi/chgkmap.c | 1 - nx-X11/programs/Xserver/Xi/chgprop.c | 1 - nx-X11/programs/Xserver/Xi/chgptr.c | 1 - nx-X11/programs/Xserver/Xi/closedev.c | 1 - nx-X11/programs/Xserver/Xi/devbell.c | 1 - nx-X11/programs/Xserver/Xi/exevents.c | 18 + nx-X11/programs/Xserver/Xi/extinit.c | 10 +- nx-X11/programs/Xserver/Xi/getbmap.c | 1 - nx-X11/programs/Xserver/Xi/getdctl.c | 1 - nx-X11/programs/Xserver/Xi/getfctl.c | 1 - nx-X11/programs/Xserver/Xi/getfocus.c | 1 - nx-X11/programs/Xserver/Xi/getkmap.c | 1 - nx-X11/programs/Xserver/Xi/getmmap.c | 1 - nx-X11/programs/Xserver/Xi/getprop.c | 1 - nx-X11/programs/Xserver/Xi/getselev.c | 1 - nx-X11/programs/Xserver/Xi/getvers.c | 1 - nx-X11/programs/Xserver/Xi/grabdev.c | 1 - nx-X11/programs/Xserver/Xi/grabdevb.c | 1 - nx-X11/programs/Xserver/Xi/grabdevk.c | 1 - nx-X11/programs/Xserver/Xi/gtmotion.c | 4 +- nx-X11/programs/Xserver/Xi/listdev.c | 1 - nx-X11/programs/Xserver/Xi/opendev.c | 3 +- nx-X11/programs/Xserver/Xi/selectev.c | 1 - nx-X11/programs/Xserver/Xi/sendexev.c | 1 - nx-X11/programs/Xserver/Xi/setbmap.c | 1 - nx-X11/programs/Xserver/Xi/setdval.c | 1 - nx-X11/programs/Xserver/Xi/setfocus.c | 1 - nx-X11/programs/Xserver/Xi/setmmap.c | 1 - nx-X11/programs/Xserver/Xi/setmode.c | 1 - nx-X11/programs/Xserver/Xi/stubs.c | 1 - nx-X11/programs/Xserver/Xi/ungrdev.c | 1 - nx-X11/programs/Xserver/Xi/ungrdevb.c | 1 - nx-X11/programs/Xserver/Xi/ungrdevk.c | 1 - nx-X11/programs/Xserver/code-versions.txt | 22 + nx-X11/programs/Xserver/hw/nxagent/Args.c | 85 +- nx-X11/programs/Xserver/hw/nxagent/Atoms.c | 6 +- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 569 ++++++--- nx-X11/programs/Xserver/hw/nxagent/Display.c | 16 +- nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 5 +- nx-X11/programs/Xserver/hw/nxagent/Events.c | 95 +- nx-X11/programs/Xserver/hw/nxagent/Events.h | 4 +- nx-X11/programs/Xserver/hw/nxagent/Font.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Icons.h | 2 +- nx-X11/programs/Xserver/hw/nxagent/Init.c | 9 +- nx-X11/programs/Xserver/hw/nxagent/Init.h | 1 + nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 263 +--- nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 25 +- nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 165 ++- nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c | 195 +-- nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 16 +- nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Render.c | 12 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 76 +- nx-X11/programs/Xserver/hw/nxagent/Utils.h | 10 +- nx-X11/programs/Xserver/hw/nxagent/Window.c | 784 +++++------- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 7 +- nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm | 422 ++++++- nx-X11/programs/Xserver/hw/nxagent/nxmissing.xpm | 1 + nx-X11/programs/Xserver/hw/nxagent/x11.svg | 27 + nx-X11/programs/Xserver/hw/nxagent/x2go.xpm | 163 --- nx-X11/programs/Xserver/hw/nxagent/x2goagent.xpm | 165 +++ nx-X11/programs/Xserver/include/inputstr.h | 5 + nx-X11/programs/Xserver/include/os.h | 6 + nx-X11/programs/Xserver/include/xkbfile.h | 32 +- nx-X11/programs/Xserver/include/xkbsrv.h | 3 +- nx-X11/programs/Xserver/os/WaitFor.c | 6 +- nx-X11/programs/Xserver/os/io.c | 4 +- nx-X11/programs/Xserver/xkb/Imakefile | 18 +- nx-X11/programs/Xserver/xkb/XKBMAlloc.c | 2 +- nx-X11/programs/Xserver/xkb/XKBMisc.c | 7 +- nx-X11/programs/Xserver/xkb/ddxBeep.c | 1 + nx-X11/programs/Xserver/xkb/ddxInit.c | 45 - nx-X11/programs/Xserver/xkb/ddxKeyClick.c | 49 - nx-X11/programs/Xserver/xkb/ddxKillSrv.c | 5 - nx-X11/programs/Xserver/xkb/ddxList.c | 55 +- nx-X11/programs/Xserver/xkb/ddxLoad.c | 350 +----- nx-X11/programs/Xserver/xkb/ddxPrivate.c | 5 - nx-X11/programs/Xserver/xkb/ddxVT.c | 5 - nx-X11/programs/Xserver/xkb/maprules.c | 16 +- nx-X11/programs/Xserver/xkb/xkb.c | 298 ++--- nx-X11/programs/Xserver/xkb/xkbAccessX.c | 6 +- nx-X11/programs/Xserver/xkb/xkbActions.c | 4 - nx-X11/programs/Xserver/xkb/xkbEvents.c | 4 + nx-X11/programs/Xserver/xkb/xkbInit.c | 11 +- nx-X11/programs/Xserver/xkb/xkbLEDs.c | 24 +- nx-X11/programs/Xserver/xkb/xkbPrKeyEv.c | 4 - nx-X11/programs/Xserver/xkb/xkbUtils.c | 6 +- nx-X11/programs/Xserver/xkb/xkbfmisc.c | 456 ++++++- nx-X11/programs/Xserver/xkb/xkbout.c | 1047 ++++++++++++++++ nx-X11/programs/Xserver/xkb/xkbtext.c | 1325 ++++++++++++++++++++ nx-X11/programs/Xserver/xkb/xkmread.c | 94 +- nx-libs.spec | 11 +- nxproxy/man/nxproxy.1 | 2 +- 161 files changed, 6538 insertions(+), 2998 deletions(-) create mode 100644 doc/nxagent/x11.svg create mode 100644 nx-X11/config/cf/nxcompile.def create mode 100644 nx-X11/programs/Xserver/code-versions.txt create mode 100644 nx-X11/programs/Xserver/hw/nxagent/x11.svg delete mode 100644 nx-X11/programs/Xserver/hw/nxagent/x2go.xpm create mode 100644 nx-X11/programs/Xserver/hw/nxagent/x2goagent.xpm delete mode 100644 nx-X11/programs/Xserver/xkb/ddxInit.c delete mode 100644 nx-X11/programs/Xserver/xkb/ddxKeyClick.c create mode 100644 nx-X11/programs/Xserver/xkb/xkbout.c create mode 100644 nx-X11/programs/Xserver/xkb/xkbtext.c -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git