Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | nx-X11/programs/Xserver/hw/nxagent/Screen.c: initialize pointers to NULL to ↵ | Mihai Moldovan | 2018-03-15 | 1 | -1/+1 | |
| | | | | avoid referencing random data. | |||||
* | release 3.5.99.153.5.99.15 | Mike Gabriel | 2018-03-07 | 1 | -1/+1 | |
| | ||||||
* | Xserver/Xext/saver.c Unvalidated lengths (X.org CVE-2017-12185). | Nathan Kidd | 2018-03-07 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | commit cad5a1050b7184d828aef9c1dd151c3ab649d37e Author: Nathan Kidd <nkidd@opentext.com> Date: Fri Jan 9 09:57:23 2015 -0500 Unvalidated lengths v2: Add overflow check and remove unnecessary check (Julien Cristau) This addresses: CVE-2017-12184 in XINERAMA CVE-2017-12185 in MIT-SCREEN-SAVER CVE-2017-12186 in X-Resource CVE-2017-12187 in RENDER Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Nathan Kidd <nkidd@opentext.com> Signed-off-by: Julien Cristau <jcristau@debian.org> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | |||||
* | Xserver/hw/nxagent/Screen.c: Drop commented out code. Functionality now ↵ | Mike Gabriel | 2018-03-07 | 1 | -16/+0 | |
| | | | | implemented in intersect_bb() function. | |||||
* | hw/nxagent/Screen.c: Cover Xinerama bounding box corner cases. | Mike Gabriel | 2018-03-07 | 1 | -16/+81 | |
| | | | | | | | | | | | | | | | | | If the agent window is moved around on screen, it can happen that it is moved into an invisible area of the real Xserver, we calls this "beyond the bounding box". . If the agent window is partially beyond the bounding box, we don't want Xinerama to re-adjust the RandR parameters inside the agent. Near the bounding box, the session shall stay intact. . This means, desktop env wise, the desktop session control elements can be moved (with the agent window) into the invisible areas of the real Xserver and moved out again without RandR events arriving inside the agent session. Fixes ArcticaProject/nx-libs#662. | |||||
* | nx-X11/programs/Xserver/hw/nxagent/Init.c: disable DPMS support within nxagent. | Mihai Moldovan | 2018-03-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keeping it enabled leads to nxagent consuming 100% of CPU resources after some time. Older code used three different timers for each DPMS mode (standby, suspend, off), with each timer checking that the elapsed idle time is strictly less than the DPMS mode timeout value. Newer code started merging DPMS and ScreenSaver timers into a single one, with checking DPMS modes and timeouts in a fall-through fashion. The code expects that, if a timeout is reached, the mode is set accordingly, so that the old timeout is disregarded next time. Since we stub out DPMSSetMode() in nxagent, this doesn't happen. In this case, the old DPMS timeout will be checked the next time around and we will be calculating DPMS_MODE_TIMEOUT - IDLE_TIME. If IDLE_TIME is bigger than DPMS_MODE_TIMEOUT, we run into problems with unsigned integers. What happens next will be *another* overflow once DoTimers() is executed and from that function SetTimers(), which will add the current timestamp to the timeout value. Later functions subtract the current timestamp again (which will be even higher since some time elapsed) and underflow the value again. It looks like this leads to consistent firing of the timer - something we do not want to have. For new, disable DPMS support in nxagent. We do not execute it on actual hardware that could change DPMS modes. At a later time, implementing a DPMS timeout/mode passthrough to the connected X server/display might be beneficial. Fixes: ArcticaProject/nx-libs#671 | |||||
* | hw/nxagent/Screen.c: Settle down with 96 DPI as the default resolution, if ↵ | Simon Matter | 2018-03-01 | 1 | -1/+1 | |
| | | | | | | nothing better can be detected. Fixes ArcticaProject/nx-libs#668. | |||||
* | release 3.5.99.143.5.99.14 | Mike Gabriel | 2018-02-28 | 1 | -1/+1 | |
| | ||||||
* | os: hide ttyxx option | Ulrich Sibiller | 2018-02-28 | 2 | -3/+6 | |
| | | | | is used nowhere anyway | |||||
* | nxagent: rearrange nx options in usage | Ulrich Sibiller | 2018-02-28 | 1 | -4/+4 | |
| | | | | | make them appear in the nx section. Also separate the nx section from the other options by an extra emtpy line. | |||||
* | Lift xkb to xorg-xserver-7.1/1.1.0 state - non-functional changes only | Ulrich Sibiller | 2018-02-28 | 9 | -15/+1 | |
| | ||||||
* | Lift xkb to xorg-xserver-7.1/1.1.0 state | Ulrich Sibiller | 2018-02-28 | 19 | -3199/+159 | |
| | | | | | | | In XORG-7_1 xkbconfig.c had been dropped. We must keep this file because it is used by hw/nxagent/Keyboard.c to load the xkb configuration file. Maybe we should move the relevant code to there or drop xkb configuration file support from nxagent. | |||||
* | nxagent: Also provide auto DPI feature via nx/nx option 'autodpi', taking ↵ | Mike Gabriel | 2018-02-27 | 2 | -0/+24 | |
| | | | | only effect on session startups. | |||||
* | nxagent: Auto-detect client-side DPI at session startup. | Simon Matter | 2018-02-27 | 4 | -6/+64 | |
| | ||||||
* | {nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1,nxproxy/man/nxproxy.1}: ↵ | Mihai Moldovan | 2018-02-27 | 1 | -1/+1 | |
| | | | | magicpixel takes a boolean argument for now. | |||||
* | nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1: remove empty line on top ↵ | Mihai Moldovan | 2018-02-27 | 1 | -1/+0 | |
| | | | | | | of file. Fixes: ArcticaProject/nx-libs#664 | |||||
* | nx-X11/programs/Xserver/{include/globals.h,mi/miinitext.c}: remove DPSEXT ↵ | Mihai Moldovan | 2018-02-27 | 2 | -7/+0 | |
| | | | | left-overs. | |||||
* | Lift os to XORG-7_1 state - non-functional changes only | Ulrich Sibiller | 2018-02-27 | 1 | -0/+1 | |
| | ||||||
* | Lift os to XORG-7_1 state | Ulrich Sibiller | 2018-02-27 | 3 | -9/+6 | |
| | ||||||
* | Remove unused X11R4 DDX compatibility function miClipNotify. | Mihai Moldovan | 2018-02-27 | 2 | -84/+0 | |
| | | | | | | | | | | | | Backported from X.org: commit 39ce5f1544029412f4060f3e89ce1d87222ef42b Author: Adam Jackson <ajax@nwnk.net> Date: Fri Jan 6 17:05:26 2006 +0000 Remove unused X11R4 DDX compatibility function miClipNotify. Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de> | |||||
* | Lift mi to xorg-xserver-7.1/1.1.0 state - non-functional changes only | Ulrich Sibiller | 2018-02-27 | 2 | -2/+2 | |
| | ||||||
* | Lift mi to xorg-xserver-7.1/1.1.0 state | Ulrich Sibiller | 2018-02-27 | 8 | -72/+41 | |
| | | | | I left out glx changes to miinitext.c for now. | |||||
* | Lift miext to xorg-xserver-7.1/1.1.10 state | Ulrich Sibiller | 2018-02-27 | 2 | -1/+2 | |
| | ||||||
* | Lift record to xorg-server-1.4.2 state | Ulrich Sibiller | 2018-02-27 | 1 | -4/+4 | |
| | ||||||
* | Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 state - non-functional ↵ | Ulrich Sibiller | 2018-02-27 | 1 | -53/+22 | |
| | | | | changes only | |||||
* | Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 state | Ulrich Sibiller | 2018-02-27 | 1 | -222/+0 | |
| | ||||||
* | Lift record to xorg-xserver-7.1/1.1.0 state - non-functional changes only | Ulrich Sibiller | 2018-02-27 | 1 | -115/+43 | |
| | ||||||
* | Lift record to xorg-xserver-7.1/1.1.0 state | Ulrich Sibiller | 2018-02-27 | 1 | -9/+7 | |
| | ||||||
* | hw/nxagent/: Stop using non-portable '__progname', set up our own ↵ | Mike Gabriel | 2018-02-26 | 3 | -7/+9 | |
| | | | | 'nxagentProgName' instead and pass it around where needed. | |||||
* | hw/nxagent/: Use <function>(void) rather than <function>(). | Mike Gabriel | 2018-02-26 | 28 | -94/+94 | |
| | ||||||
* | nxagent/Args.c: Mention new -options cmdline parameter in usage info. | Simon Matter | 2018-02-26 | 1 | -0/+1 | |
| | | | | Fixes ArcticaProject/nx-libs#639 | |||||
* | nxagent: Print correct application in usage message. | Simon Matter | 2018-02-26 | 1 | -0/+5 | |
| | | | | Fixes ArcticaProject/nx-libs#639. | |||||
* | nxagent: Add -version cmdline option. | Simon Matter | 2018-02-26 | 4 | -4/+17 | |
| | | | | Fixes ArcticaProject/nx-libs#653. | |||||
* | dbe: add NXAGENT_SERVER guard for DixLookup | Ulrich Sibiller | 2018-02-26 | 2 | -0/+32 | |
| | ||||||
* | Lift dbe to xorg-xserver-1.4.2 state - non-functional changes only | Ulrich Sibiller | 2018-02-26 | 2 | -9/+0 | |
| | ||||||
* | Lift dbe to xorg-xserver-1.4.2 state | Ulrich Sibiller | 2018-02-26 | 3 | -50/+4 | |
| | ||||||
* | Lift dbe to xorg-xserver-7.1/1.1.0 state - non-functional changes only | Ulrich Sibiller | 2018-02-26 | 2 | -86/+34 | |
| | ||||||
* | Lift dbe to xorg-xserver-7.1/1.1.0 state | Ulrich Sibiller | 2018-02-26 | 2 | -3/+9 | |
| | ||||||
* | Transfer previous dix changes into hw/nxagent | Ulrich Sibiller | 2018-02-26 | 1 | -21/+31 | |
| | ||||||
* | Lift dix to xorg-xserver-1.3.0.0 state - non-functional changes only | Ulrich Sibiller | 2018-02-26 | 4 | -10/+5 | |
| | ||||||
* | Lift dix to xorg-xserver-1.3.0.0 state | Ulrich Sibiller | 2018-02-26 | 18 | -85/+184 | |
| | ||||||
* | Lift dix to xorg-xserver-7.1/1.1.0 state - non-functional changes only | Ulrich Sibiller | 2018-02-26 | 3 | -1/+24 | |
| | ||||||
* | Lift dix to xorg-xserver-7.1/1.1.0 state | Ulrich Sibiller | 2018-02-26 | 9 | -14/+84 | |
| | ||||||
* | Lift XFIXES to xorg-xserver-1.4.2 state - non-functional changes only | Ulrich Sibiller | 2018-02-26 | 7 | -15/+1 | |
| | ||||||
* | Lift XFIXES to xorg-xserver-1.4.2 state | Ulrich Sibiller | 2018-02-26 | 6 | -6/+46 | |
| | ||||||
* | Lift XFIXES to xorg-xserver-7.1/1.1.0 state (XFIXES 4.0) - non-functional ↵ | Ulrich Sibiller | 2018-02-26 | 9 | -12/+114 | |
| | | | | changes only | |||||
* | Lift XFIXES to xorg-xserver-7.1/1.1.0 state (XFIXES 4.0) | Ulrich Sibiller | 2018-02-26 | 8 | -9/+421 | |
| | ||||||
* | nxagent: Add support for optionally enabling/disabling the magic pixel feature. | Mike Gabriel | 2018-02-26 | 5 | -1/+34 | |
| | | | | Fixes ArcticaProject/nx-libs#657. | |||||
* | Xi: change () prototypes to (void) | Ulrich Sibiller | 2018-02-26 | 2 | -5/+5 | |
| | | | | | | | | According to the C standard these are not equivalent. However, the same change has been done in Xorg upstream. Plus these functions are not called with parameters anywhere so we should be fine. Besides, include/{extinit.h,XIstubs.h} always had the "void". | |||||
* | Xi/getbmap.c: remove unnecessary cast | Ulrich Sibiller | 2018-02-26 | 1 | -1/+1 | |
| | | | | Was forgotten in f6a1bda2dff0c70aa13f3cb763a9b08c4c037c53 |