aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* nxagent: half number of NameForAtom callsUlrich Sibiller2017-03-036-2/+9
| | | | | | | | Because of validateString being a macro NameForAtom was called twice most of the time. Fix that by making validateString a function. Fixes ArticaProject/nx-libs#357
* Merge branch 'sunweaver-pr/really-enable-MITSHM-in-fboverlay-c' into 3.6.xMihai Moldovan2017-03-034-2/+54
|\ | | | | | | Attributes GH PR #318: https://github.com/ArcticaProject/nx-libs/pull/318
| * Xserver/mi/miscrinit.c: Use new shmint.h for making ShmRegisterFbFuncs() ↵Mike Gabriel2017-03-031-2/+1
| | | | | | | | available.
| * Xserver/fb/fboverlay.c: Define -DMITSHM at build as it is used in fboverlay.c.Mike Gabriel2017-03-032-0/+9
| | | | | | | | Fixes ArcticaProject/nx-libs#237.
| * Xserver/Xext/shmint.h: Provide header file exporting ShmRegisterFunc and ↵Mike Gabriel2017-03-031-0/+44
|/ | | | | | | | | | | | | | ShmRegisterFbFuncs (plus ShmSetPixmapFormat as a by-product). commit 9ceffb6b92e55f0d74d71489900d43940f14dfd9 Author: Eric Anholt <anholt@freebsd.org> Date: Wed Dec 28 10:37:17 2005 +0000 Merge from xserver a header for shm's server internal functions, which are called by DDXes. Desired by XGL, and should be used in other locations, probably. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Merge branch 'sunweaver-pr/fix-unused-libNX_X11-files' into 3.6.xMihai Moldovan2017-03-0311-2368/+14
|\ | | | | | | | | | | Attributes GH PR #310: https://github.com/ArcticaProject/nx-libs/pull/310 Fixes: ArcticaProject/nx-libs#265.
| * libNX_X11: Fully drop loadable i18n module support in libNX_X11.Mike Gabriel2017-03-036-2340/+3
| | | | | | | | | | | | - Support for i18n in libNX_X11 is static only, has ever been. - Thus, the files XlcSL.[co], XlcDL.[co], XDefaultIMIF.[co], XDefaultOMIF.[co] and lcDynamic.[co] become obsolete.
| * libNX_X11/lcUTF8.c: Drop not-used X11/lcUniConv/ascii.h.Mike Gabriel2017-03-032-28/+0
| |
| * doc/libNX_X11/lcUniConv: Move over the rather-documentary files ↵Mike Gabriel2017-03-032-0/+0
| | | | | | | | 8bit_tab_to_h.c and cjk_tab_to_h.c to nx-libs's doc/ folder.
| * doc/libNX_X11/lcUniConv: Pull over README from X.org's libX11 to document ↵Mike Gabriel2017-03-031-0/+11
|/ | | | the origin and purpose of 8bit_tab_to_h.c and cjk_tab_to_h.c.
* Merge branch 'sunweaver-pr/happyvalgrind-in-glXQueryVersion' into 3.6.xMike Gabriel2017-03-031-0/+2
|\ | | | | | | Attributes GH PR #374: https://github.com/ArcticaProject/nx-libs/pull/374
| * Xserver/GL/glx/glxcmd.c: Fix uninitialized xGLXQueryVersionReply.Mike Gabriel2017-03-031-0/+2
|/ | | | Fixes ArcticaProject/nx-libs#324.
* misc nx-X11/programs/Xserver/randr/: switch to using xreallocarray, since it ↵Mihai Moldovan2017-03-036-60/+0
| | | | has been ported now.
* misc nx-X11/programs/Xserver/{composite,dix,randr}/: switch to using ↵Mihai Moldovan2017-03-037-62/+0
| | | | reallocarray, since it has been ported now.
* nx-X11/programs/Xserver/include/os.h: backport xallocarray().Mihai Moldovan2017-03-031-0/+2
|
* nx-X11/{config/cf/{{Imake,X11}.tmpl,linux.cf},programs/Xserver/{include/os.h ↵Mihai Moldovan2017-03-036-3/+70
| | | | ,os/{Imakefile,reallocarray.c}}: backport reallocarray() implementation.
* misc nx-X11/programs/Xserver/{hw/nxagent,miext,render}/: move code around so ↵Mihai Moldovan2017-03-0312-557/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | that we can drop nx-X11/programs/Xserver/render/miglyph.c (and by extension nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.) This is essentially a bastardized cross/backport of these X.Org commits - based on our current architecture: commit 4b14c9a9cd2033d3839c4ba364d41ab4c4b198ab Author: Eric Anholt <eric@anholt.net> Date: Fri Oct 19 16:34:54 2007 -0700 Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code. Not all of the DDX/miext Glyphs hook implementations have been removed, but they should be. and commit 2251572062b2c25643671b8d5070de1c3f7ae976 Author: Aaron Plattner <aplattner@nvidia.com> Date: Fri Oct 26 15:13:50 2007 -0700 Restore the CompositeGlyphs -> ps->Glyphs -> miGlyphs callchain to allow acceleration architectures to wrap above miGlyphs. Conflicts: nx-X11/programs/Xserver/render/miglyph.c nx-X11/programs/Xserver/render/mipict.h nx-X11/programs/Xserver/render/picture.c
* nx-X11/programs/Xserver/mi/{Imakefile,mibank.{c,h}}: backport ↵Mihai Moldovan2017-03-033-2697/+0
| | | | | | | | ffaae7c0c69a51a53a76146c79f3630ae197a443. Down with mibank! Fixes ArcticaProject/nx-libs#366.
* Merge branch 'sunweaver-pr/happyvalgrind-nxagentResetSignalHandlers' into 3.6.xMike Gabriel2017-03-031-0/+2
|\ | | | | | | | | | | Attributes GH PR #375: https://github.com/ArcticaProject/nx-libs/pull/375 Reviewed-by: Ulrich Sibiller <uli42@gmx.de> -- Fri, 03 Mar 2017 02:20:38 -0800
| * hw/nxagent/Display.c: Fix uninitialized newAction in ↵Mike Gabriel2017-03-031-0/+2
|/ | | | | | nxagentResetSignalHandlers(). Fixes ArcticaProject/nx-libs#328.
* Merge branch 'uli42-pr/happyvalgrind' into 3.6.xMike Gabriel2017-03-0317-47/+93
|\ | | | | | | | | | | | | Fixes ArcticaProject/nx-libs#325. Fixes ArcticaProject/nx-libs#326. Attribute GH PR #360: https://github.com/ArcticaProject/nx-libs/pull/360
| * Fix "uninitialised byte(s)" complaints from valgrindUlrich Sibiller2017-03-0217-47/+93
|/
* Merge branch 'sunweaver-pr/allow-empty-nx-options-string' into 3.6.xMihai Moldovan2017-03-021-2/+3
|\ | | | | | | | | | | Attributes GH PR #314: https://github.com/ArcticaProject/nx-libs/pull/314 Fixes: ArcticaProject/nx-libs#51.
| * nxcomp/Loop.cpp: Allow nx/nx:<disp> as DISPLAY variable (i.e. an empty nx/nx ↵Mike Gabriel2017-03-021-1/+2
| | | | | | | | options string.
| * nxcomp/Loop.cpp: Ignore, options= nx/nx parameter, if file options path ↵Mike Gabriel2017-03-021-1/+1
|/ | | | | | starts with /dev/, /proc/, or /sys/. Partially resolved ArcticaProject/nx-libs#51.
* Merge branch 'sunweaver-pr/constify-atom-name-strings' into 3.6.xMihai Moldovan2017-03-0210-26/+25
|\ | | | | | | Attributes GH PR #363: https://github.com/ArcticaProject/nx-libs/pull/363
| * Xserver/dix/atom.c (et al.): Constify atom name strings.Mike Gabriel2017-03-0210-26/+25
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by X.org commits: commit 08093c25a91c07ab8af7cece9bba738b827cfd1b Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Mon Oct 24 23:16:30 2011 -0700 Convert some malloc + strncpy pairs into strndup calls Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> commit 816b79dd061e9839cec94a4986a7820b70ca8a7f Author: Mikhail Gusarov <dottedmag@dottedmag.net> Date: Thu May 13 03:45:21 2010 +0700 Remove useless casts Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Keith Packard <keithp@keithp.com> This PR ships a tiny change in MakeAtom, that we adopted. We did not adopt the full commit. commit 5623c27700b7b23a8dbbd8c8f45e5d4fa0c667e3 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Mon Feb 2 19:25:14 2009 -0800 Constify atom name strings Changes MakeAtom to take a const char * and NameForAtom to return them, since many callers pass pointers to constant strings stored in read-only ELF sections. Updates in-tree callers as necessary to clear const mismatch warnings introduced by this change. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Merge branch ↵Mihai Moldovan2017-03-015-0/+25
|\ | | | | | | | | | | 'sunweaver-pr/randr-regression-fix-re-adding-RegisterResourceName-calls' into 3.6.x Attributes GH PR #311: https://github.com/ArcticaProject/nx-libs/pull/311
| * nx-libs.spec: Add BR filesystem for SUSE builds (as it provides ↵Mike Gabriel2017-03-011-0/+4
| | | | | | | | /usr/share/fonts).
| * nx-libs.spec: Add BR for Fedora/RHEL builds: xorg-x11-font-utils.Mike Gabriel2017-03-011-0/+1
| |
| * nx-libs.spec: Versioned BR on libXfont-devel (and alike) (>= 1.4.2).Mike Gabriel2017-03-011-3/+3
| |
| * debian/control: Versioned B-D on libXfont (>= 1.4.2).Mike Gabriel2017-03-011-1/+1
| |
| * dix: use one single function to register fpe fontsTiago Vignatti2017-03-012-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In NXAGENT_SERVER we can also fully rely on libXfont for handling fpe internals. Backported from X.org: commit 75536ee80595c79bba95a1fb6844126ee08486d4 Author: Tiago Vignatti <tiago.vignatti@nokia.com> Date: Wed Jun 23 15:18:03 2010 +0300 dix: use one single function to register fpe fonts X server doesn't need to understand fpe internals, so use register_fpe_functions from libXfont. It's required to get new version of libXfont, therefore adjust it to be passed to autoconf. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * nx-libs.spec: Handle fonts dir symlinking and install /usr/share/nx/fonts ↵Mike Gabriel2017-03-011-2/+11
| | | | | | | | | | | | | | symlink into nxagent bin:pkg. This change probably needs more fine-tuning for the various other RPM distros and versions out there. Thanks to Orion Poplawski for providing a code snippet with a general approach of handling this.
| * For consistency, apply patch from previous commit (630a7c3) to the original ↵Mike Gabriel2017-03-011-3/+31
| | | | | | | | Xserver/dix/dixfonts.c file, although the code is undef'ed when NXAGENT_SERVER is defined.
| * {dix/,hw/nxagent/NX}dixfont.{c,h}: Support using builtin-fonts. Makes ↵Mike Gabriel2017-03-013-11/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependency on X11's misc fonts package obsolete. This backports a mixture of these X.org commits (only focusing on SetDefaultFontPath() function): commit 03e8bfa1d122f7dea905d48c93cfd54afd991dfd Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat Nov 27 20:09:04 2010 -0800 Convert existing Xprintf style calls to asprintf style Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> commit 12e46e83733b47d2704e1509960192365102af46 Author: Tiago Vignatti <tiago.vignatti@nokia.com> Date: Fri Mar 25 22:07:31 2011 +0200 dix: fix memory leak in SetDefaultFontPath Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit 6592db6bb526f0c43b4c7b55859c629709e039b4 Author: Mikhail Gusarov <dottedmag@dottedmag.net> Date: Fri Jun 4 16:58:58 2010 +0700 Get rid of xstrdup when argument is definitely non-NULL Replace xstrdup with strdup when either constant string is being duplicated or argument is guarded by conditionals and obviously can't be NULL Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52 Author: Rémi Cardona <remi@gentoo.org> Date: Mon Sep 14 17:09:59 2009 +0200 dix: append "built-ins" to the font path in SetDefaultFontPath 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on a "fixed" font go away but only Xorg could use the built-ins fonts by default. With this commit, all DDXs get "built-ins" appended to their FontPath, not just Xorg. Tested with Xorg, Xvfb and Xnest. Signed-off-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> Date: Wed Jan 7 19:37:03 2009 -0200 Default to use standard bitmap fonts, with builtins as fallback The builtin-fonts configure option was removed, as it at best should have been a runtime option. Instead, now it always register all "font path element" backends, and adds built-ins fonts at the end of the default font path. This should be a more reasonable solution, to "correct" the most common Xorg FAQ (could not open default font 'fixed'), and also don't break by default applications that use only the standard/historical X Font rendering. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fixes ArcticaProject/nx-libs#84. Fixes ArcticaProject/nx-libs#285.
| * Xserver/dix/main.c: ErrorF requires a string to end with an EOL char.Mike Gabriel2017-03-011-1/+1
| |
| * debian/nx-x11-common.{links,dirs}: Make sure /usr/share/fonts/X11 are ↵Mike Gabriel2017-03-012-0/+3
| | | | | | | | reachable for nxagent (via placing a symlink to /usr/share/nx/fonts).
| * Xserver/hw/nxagent/Font.c: Drop references to /usr/NX/share/fonts/base as ↵Mike Gabriel2017-03-011-8/+4
| | | | | | | | default font path, entirely.
| * Xserver/hw/nxagent/Font.c: Change (alternative) default font path order to ↵Mike Gabriel2017-03-011-10/+10
| | | | | | | | make font path search compliant with latest FHS for X11 fonts (though, prefer /usr/share/nx/fonts as default path).
| * Xserver/hw/nxagent/Font.c: Drop NXAGENT_ALTERNATE_FONT_PATH_4 (pointing to ↵Mike Gabriel2017-03-011-30/+0
| | | | | | | | /usr/NX/share/fonts/base) entirely.
| * nx-X11/config/cf/X11.tmpl: Set a more appropriate font directory ↵Mike Gabriel2017-03-011-2/+2
| | | | | | | | | | | | | | | | (recommended: /usr/{,local/}share/nx/fonts). Note for distribution maintainers: your normally want to symlink /usr/share/nx/fonts to /usr/share/fonts/X11 in your packaging.
| * debian/patches: Update/rebase 016_nx-X11_install-location.debian.patch.Mike Gabriel2017-03-011-2/+2
| |
| * nx-libs.spec: Drop non-shipped-anymore rgb(.txt) file from list of ↵Mike Gabriel2017-03-011-2/+0
| | | | | | | | to-be-installed files.
| * debian/nxagent.*: Drop conffile /etc/nxagent/rgb utilizing ↵Mike Gabriel2017-03-015-2/+26
| | | | | | | | dpkg-maintscript-helper.
| * Xserver/os/oscolor.c: Follow X.org in dropping the rgb.txt file entirely. ↵Mike Gabriel2017-03-0117-1255/+1617
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Content of that file is now hard-coded. Adopting an exact copy of os/oscolor.c from X.org leads to this compiler warning: ``` oscolor.c:844:1: warning: string length ‘7614’ is greater than the length ‘4095’ ISO C99 compilers are required to support [-Woverlength-strings] }; ^ ``` This will be address later in coordination with X.org. Note: there is a tiny change in oscolor.c as we ship it. The original X.org file includes <X11/keysym.h> which seems unneeded. We drop that one line from oscolor.c. Fixes ArcticaProject/nx-libs#259.
| * release 3.5.99.4Mike Gabriel2017-03-016-1915/+2165
| |
| * dix: fix incomplete commitUlrich Sibiller2017-03-016-125/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commit turned out to be incomplete. This commit makes it complete by removing client->lastDrawable/lastGC everywhere thus fixing ArcticaProject/nx-libs#306 and #322 commit e6f2f6427122dc4bc802acebf26f8cec16cd2f62 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jun 20 16:45:38 2016 +0200 dix: remove caching of drawables and graphics contexts. The security checks simply bypass the cached values so they are unused. Backported from X.org: commit 9a183d7ba50e31afa133cc03aee7991517a283ea Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Aug 14 11:39:26 2007 -0400 dix: remove caching of drawables and graphics contexts. The security checks simply bypass the cached values so they are unused. Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Naming change: Security*Access -> Dix*AccessMike Gabriel2017-03-0143-425/+421
| | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit 6c46645cfc1afda8aeabfe0ed4d9342673b702f1 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Dec 14 14:45:42 2006 -0500 Naming change: Security*Access -> Dix*Access Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Switch from using libNX_X11's deprecated XKeycodeToKeysym() function to ↵Mike Gabriel2017-03-012-11/+37
| | | | | | | | | | | | using XGetKeyboardMapping(). Fixes ArcticaProject/nx-libs#229.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 15:34:29 +0000