aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* {dix/,hw/nxagent/NX}dixfont.{c,h}: Support using builtin-fonts. Makes ↵Mike Gabriel2017-02-273-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-02-271-1/+1
|
* debian/nx-x11-common.{links,dirs}: Make sure /usr/share/fonts/X11 are ↵Mike Gabriel2017-02-272-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-02-271-8/+4
| | | | default font path, entirely.
* Xserver/hw/nxagent/Font.c: Change (alternative) default font path order to ↵Mike Gabriel2017-02-271-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-02-271-30/+0
| | | | /usr/NX/share/fonts/base) entirely.
* nx-X11/config/cf/X11.tmpl: Set a more appropriate font directory ↵Mike Gabriel2017-02-271-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.
* Merge branch 'sunweaver-pr/hard-code-rgb-colors' into 3.6.xMihai Moldovan2017-02-2724-1261/+1645
|\ | | | | | | Attributes GH PR #319: https://github.com/ArcticaProject/nx-libs/pull/319
| * debian/patches: Update/rebase 016_nx-X11_install-location.debian.patch.Mike Gabriel2017-02-261-2/+2
| |
| * nx-libs.spec: Drop non-shipped-anymore rgb(.txt) file from list of ↵Mike Gabriel2017-02-261-2/+0
| | | | | | | | to-be-installed files.
| * debian/nxagent.*: Drop conffile /etc/nxagent/rgb utilizing ↵Mike Gabriel2017-02-265-2/+26
| | | | | | | | dpkg-maintscript-helper.
| * Xserver/os/oscolor.c: Follow X.org in dropping the rgb.txt file entirely. ↵Mike Gabriel2017-02-2617-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.43.5.99.4Mike Gabriel2017-02-246-1915/+2165
|
* Merge branch 'uli42-fix_#306_#322' into 3.6.xMihai Moldovan2017-02-246-125/+12
|\ | | | | | | Attributes GH PR #338: https://github.com/ArcticaProject/nx-libs/pull/338
| * dix: fix incomplete commitUlrich Sibiller2017-02-246-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>
* Merge branch 'sunweaver-pr/security-acl-naming-change' into 3.6.xMihai Moldovan2017-02-2043-425/+421
|\ | | | | | | Attributes GH PR #329: https://github.com/ArcticaProject/nx-libs/pull/329
| * Naming change: Security*Access -> Dix*AccessMike Gabriel2017-02-2043-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>
* Merge branch ↵Mike Gabriel2017-02-202-11/+37
|\ | | | | | | | | | | | | | | 'sunweaver-pr/use-xgetkeyboardMapping-instead-of-deprecated-xkeycodetokeysym' into 3.6.x Attributes GH PR #335: https://github.com/ArcticaProject/nx-libs/pull/335 Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Fri, 17 Feb 2017 06:49:03 -0800
| * Switch from using libNX_X11's deprecated XKeycodeToKeysym() function to ↵Mike Gabriel2017-02-202-11/+37
|/ | | | | | using XGetKeyboardMapping(). Fixes ArcticaProject/nx-libs#229.
* Merge branch 'sunweaver-pr/smart-scheduler-is-not-optional' into 3.6.xMihai Moldovan2017-02-1814-177/+0
|\ | | | | | | Attributes GH PR #330: https://github.com/ArcticaProject/nx-libs/pull/330
| * The smart scheduler is not optional.Mathieu Bérard2017-02-1514-177/+0
|/ | | | | | | | | | | | Backported from X.org: commit 9f9268821b13038556fbc029df54ab0e9b2aa77f Author: Mathieu Bérard <mathieu.berard@crans.org> Date: Mon Aug 11 13:52:38 2008 -0400 The smart scheduler is not optional. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Merge branch 'sunweaver-pr/use-rpath-for-nxagent' into 3.6.xMihai Moldovan2017-02-1010-40/+48
|\ | | | | | | Attributes GH PR #313: https://github.com/ArcticaProject/nx-libs/pull/313
| * Makefile: Fix flawed uninstall-* targets. Spotted by Ionic while reviewing ↵Mike Gabriel2017-02-091-2/+2
| | | | | | | | the nxagent RPATH changeset. Thanks!
| * debian/patches: Update comment header of ↵Mike Gabriel2017-02-091-3/+11
| | | | | | | | 016_nx-X11_install-location.debian.patch.
| * debian/patches: Update 016_nx-X11_install-location.debian.patch. Adapt path ↵Mike Gabriel2017-02-091-5/+5
| | | | | | | | to recent upstream changes.
| * Load libNX_X11 / faked libX11 via RPATH setting rather than fidgeting with ↵Mike Gabriel2017-02-094-6/+5
| | | | | | | | | | | | LD_LIBRARY_PATH in the nxagent wrapper script. Fixes ArcticaProject/nx-libs#225.
| * Makefile: Allow longer names for variables that we want to allow distro ↵Mike Gabriel2017-02-091-9/+9
| | | | | | | | maintainers to override.
| * Makefile: Actively set/override USRLIBDIR and SHLIBDIR when calling ↵Mike Gabriel2017-02-091-1/+1
| | | | | | | | | | | | | | | | | | Xserver's make process. SHLIBDIR -> Points to the system's official library folder. USRLIBDIR -> In NX, this variable (amongst others) is used to set the executables RPATH (if enabled), so pointing this to SHLIBDIR/nx-X11.
| * debian/rules: Don't manually override SHLIBDIR via the dh_auto_build call. ↵Mike Gabriel2017-02-091-1/+1
| | | | | | | | The default in the main Makefile should work fine.
| * nx-libs.spec: Don't manually override SHLIBDIR via the .spec file. The ↵Mike Gabriel2017-02-091-1/+1
| | | | | | | | default in the main Makefile should work fine.
| * Makefile: Align variable names USRLIBDIR, SHLIBDIR (and NX_DIR) with nx-X11 ↵Mike Gabriel2017-02-095-16/+17
|/ | | | internal naming schemes (and use /usr/<lib>/nx/X11 rather than /usr/<lib>/nx-X11).
* Merge branch 'sunweaver-pr/drop-support-for-ancient-platforms' into 3.6.xMihai Moldovan2017-02-0982-2040/+94
|\ | | | | | | Attributes GH PR #289: https://github.com/ArcticaProject/nx-libs/pull/289
| * nx-X11/include/Xos_r.h: Drop one _POSIX_REENTRANT_FUNCTIONS macro block, ↵Mike Gabriel2017-02-081-5/+0
| | | | | | | | where offenders AIXV3, AIXV4 and __osf__ are gone now.
| * dix: remove staggeringly broken vendor workaroundsDaniel Stone2017-02-081-8/+0
| | | | | | | | | | | | | | | | | | | | | | Backported from X.org: From f93d10ce9bb4a6de83b561f44fb7b046def16234 Mon Sep 17 00:00:00 2001 From: Daniel Stone <daniel@fooishbar.org> Date: Mon, 6 Nov 2006 18:33:45 +0200 Subject: dix: remove staggeringly broken vendor workarounds Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * drop platform support: unifdef sgi.Mike Gabriel2017-02-0824-91/+14
| | | | | | | | Relates to ArcticaProject/nx-libs#275.
| * drop platform support: unifdef QNX.Mike Gabriel2017-02-0816-103/+8
| | | | | | | | Relates to ArcticaProject/nx-libs#275.
| * drop platform support: unifdef DGUX.Mike Gabriel2017-02-087-74/+14
| | | | | | | | Relates to ArcticaProject/nx-libs#275.
| * drop platform support: unifdef __osf__.Mike Gabriel2017-02-089-127/+12
| | | | | | | | Fixes ArcticaProject/nx-libs#288.
| * drop platform support: unifdef AIXV3, AIXV4 (and AIXrt, AIX386).Mike Gabriel2017-02-0815-125/+19
| | | | | | | | Fixes ArcticaProject/nx-libs#274.
| * drop platform support: unifdef hpux and __hppa__.Mike Gabriel2017-02-0817-216/+19
| | | | | | | | Fixes ArcticaProject/nx-libs#273.
| * drop platform support: unifdef Lynx.Mike Gabriel2017-02-0822-128/+15
| | | | | | | | Fixes ArcticaProject/nx-libs#272.
| * drop platform support: unifdef __UNIXOS2__.Mike Gabriel2017-02-0843-1194/+24
|/ | | | Fixes ArcticaProject/nx-libs#271.
* Merge branch 'uli42-pr/fix_#293' into 3.6.xMike Gabriel2017-02-081-18/+31
|\ | | | | | | Attributes GH PR #323: https://github.com/ArcticaProject/nx-libs/pull/323
| * Screen.c: clean up superfluous whitespaceUlrich Sibiller2017-02-081-4/+3
| |
| * Screen.c: Ensure that an output is unused before destroying itUlrich Sibiller2017-02-081-14/+28
|/ | | | Fixes ArcticaProject/nx-libs#293
* Merge branch 'sunweaver-pr/fix-DefaultRGBDatabase-path' into 3.6.xMihai Moldovan2017-02-061-1/+1
|\ | | | | | | Attributes GH PR #315: https://github.com/ArcticaProject/nx-libs/pull/315
| * nx-X11/config/cf/X11.tmpl: Fix DefaultRGBDatabase path to $(USRDATADIR)/rgb ↵Mike Gabriel2017-02-051-1/+1
|/ | | | (not $(LIBDIR)/rgb).
* debian/copyright{,.in}: Adopt from Debian's upload candidate, being DEP-5 ↵Mike Gabriel2017-02-042-72/+3770
| | | | | | compliant and up-to-date for 3.5.99.3. Fixes ArcticaProject/nx-libs#2.
* Makefile: Don't create superfluous symlink for libX11.so -> ../libNX_X11.so. ↵Mike Gabriel2017-02-031-1/+0
| | | | | | The libNX_X11.so is only required at build time, so need to use it for faking libX11.so in nxagent. Fixes ArcticaProject/nx-libs#286.
* debian/changelog: Cosmetic fix, restoring correct version number for ↵Mike Gabriel2017-02-031-1/+1
| | | | | | 3.5.99.2 release stanza. Fixes ArcticaProject/nx-libs#303.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 05:35:05 +0000