aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* XKB.h: Use the correct value for XkbAllAccessXEventsMaskUlrich Sibiller2018-07-031-1/+1
| | | | | | | | | | | | | | | | | Fixes ArcticaProject/nx-libs#704 Backport from kbproto: commit 2306fcd4c511d41ae4b31b9cbd9f79cf69287730 Author: Dirk Wallenstein <halsmit@t-online.de> Date: Fri Feb 5 20:42:43 2010 +0100 Use the correct value for XkbAllAccessXEventsMask Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
* Merge branch 'mjtrangoni-WIP-add-cppcheck' into 3.6.xMike Gabriel2018-07-0314-44/+118
|\ | | | | | | Attributes GH PR #678: https://github.com/ArcticaProject/nx-libs/pull/678
| * travis.yml: refactor some config options, add gcc-8 and clang-6.0.Mario Trangoni2018-07-031-22/+53
| |
| * Fix some memory leaks.Mario Trangoni2018-07-0312-30/+44
| |
| * travis.yml: Add cppcheck - A tool for static C/C++ code analysis.Mario Trangoni2018-07-032-2/+31
|/
* Merge branch 'uli42-pr/fix_xfont2' into 3.6.xMike Gabriel2018-07-031-4/+5
|\ | | | | | | Attributes GH PR #709: https://github.com/ArcticaProject/nx-libs/pull/709
| * Makefile: pass down Xfont2 define for ImakeUlrich Sibiller2018-07-031-4/+5
|/ | | | Fixes: ArcticaProject/nx-libs#708
* Merge branch 'uli42-gh-sunweaver/pr/xserver-xkb-cleanup' into 3.6.xMike Gabriel2018-07-0327-2599/+207
|\ | | | | | | Attributes GH PR #706: https://github.com/ArcticaProject/nx-libs/pull/706
| * debian/nxagent.*: Drop conffile /etc/nxagent/nxagent.keyboard. Not shipped ↵Mike Gabriel2018-07-034-1/+9
| | | | | | | | upstream anymore.
| * nx-libs.spec: Drop reference to obsolete nxagent.keyboard file.Mike Gabriel2018-07-031-1/+0
| |
| * etc/nxagent.keyboard: Drop file. Not required anymore.Mike Gabriel2018-07-032-2/+0
| |
| * Xserver/xkb: Remove XkbCF DDX configuration code.Mike Gabriel2018-07-032-1343/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1ef60ce8ebb681b3cfb5e515be5c187c0442dcda Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Mar 25 22:35:48 2006 +0000 Really remove all DDX pre-config code. commit ec10f70b2114e5369a5b2f34b084dcf55634dcb4 Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Mar 25 21:52:49 2006 +0000 Remove XkbCF DDX configuration code. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Removal of dead code in Xserver/xkb. Follow-up commit for 3739a9b.Mike Gabriel2018-07-0317-1079/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spotted in and backported from X.org: commit 021fc5cb2cb4a7972b4a6fcb570c1da92787d68d Author: Adam Jackson <ajax@benzedrine.nwnk.net> Date: Sun Mar 18 16:31:19 2007 -0400 Static markup and dead code cull over xkb/. The former <X11/extensions/XKBsrv.h> has been pulled into the server now as include/xkbsrv.h, and the world updated to look for it in the new place, since it made no sense to define server API in an extension header. Any further work along this line will need to do similar things with XKBgeom.h and friends. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Xserver/xkb: Remove -xkbmap argument.Daniel Stone2018-07-033-76/+0
| | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit fd8bde8bb0f9d796b3464973b53285c0a6d22a31 Author: Daniel Stone <daniel@fooishbar.org> Date: Mon May 29 11:14:03 2006 +0000 Remove -xkbmap argument. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * hw/nxagent/Keyboard.c: Drop support for loading XKB config from file.Mike Gabriel2018-07-031-97/+7
|/ | | | | | * Support for XkbCF has been dropped in XKB extension by X.org * Has never been used in recent NXv3 implementations (e.g. X2Go) * Config file parsing is error prone, use setxkbmap API instead
* Merge branch 'uli42-pr/more_debug' into 3.6.xMike Gabriel2018-07-031-0/+29
|\ | | | | | | Attributes GH PR #707: https://github.com/ArcticaProject/nx-libs/pull/707
| * Atoms.c: more debugging outputUlrich Sibiller2018-07-031-0/+29
|/
* Merge branch 'uli42-pr/misc' into 3.6.xMike Gabriel2018-07-036-72/+64
|\ | | | | | | Attributes GH PR #712: https://github.com/ArcticaProject/nx-libs/pull/712
| * dixfonts.c: use calloc for LFclosurePtrMike Gabriel2018-07-031-1/+1
| | | | | | | | ... to keep dix/dixfonts and hw/nxagnet/NXdixfonts.c in sync.
| * dix/dixfonts.c: free() can handle NULLMike Gabriel2018-07-031-8/+6
| | | | | | | | so let's remove some superflous tests
| * NXdixfonts.c: free() can handle NULLUlrich Sibiller2018-07-031-13/+10
| | | | | | | | so let's remove some superflous tests
| * NXdixfonts.c: use calloc for LFclosurePtrUlrich Sibiller2018-07-031-1/+1
| | | | | | | | Just to be sure. It is used at lots of locations afterwards.
| * xkb/xkb.c: init all reply structsUlrich Sibiller2018-07-031-26/+19
| | | | | | | | | | | | and do it identically everywhere. As we are using C99 designated initializers here we remove the memset and bzero calls that had been used for this at some locations.
| * os/io.c: fix unitialised bytesUlrich Sibiller2018-07-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by implementing some kind of recalloc (mix of realloc and calloc). Fixes this valgrind finding: ==7061== Syscall param writev(vector[...]) points to uninitialised byte(s) ==7061== at 0x781EFE0: __writev_nocancel (syscall-template.S:84) ==7061== by 0x488974: _XSERVTransSocketWritev (Xtranssock.c:2914) ==7061== by 0x47DBD3: FlushClient (io.c:1080) ==7061== by 0x47DBD3: FlushAllOutput.part.0 (io.c:817) ==7061== by 0x477304: WaitForSomething (WaitFor.c:246) ==7061== by 0x434369: Dispatch (NXdispatch.c:360) ==7061== by 0x40EB92: main (main.c:353) ==7061== Address 0x102106f3 is 50,211 bytes inside a block of size 54,308 alloc'd ==7061== at 0x4C2FD5F: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==7061== by 0x47F08F: FlushClient (io.c:1123) ==7061== by 0x47F307: WriteToClient (io.c:991) ==7061== by 0x42903C: doListFontsAndAliases (NXdixfonts.c:660) ==7061== by 0x42B7D6: ListFonts (NXdixfonts.c:735) ==7061== by 0x433A6D: ProcListFonts (NXdispatch.c:989) ==7061== by 0x4344A5: Dispatch (NXdispatch.c:482) ==7061== by 0x40EB92: main (main.c:353) ==7061== Uninitialised value was created by a heap allocation ==7061== at 0x4C2FD5F: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==7061== by 0x47F08F: FlushClient (io.c:1123) ==7061== by 0x47F307: WriteToClient (io.c:991) ==7061== by 0x42903C: doListFontsAndAliases (NXdixfonts.c:660) ==7061== by 0x42B7D6: ListFonts (NXdixfonts.c:735) ==7061== by 0x433A6D: ProcListFonts (NXdispatch.c:989) ==7061== by 0x4344A5: Dispatch (NXdispatch.c:482) ==7061== by 0x40EB92: main (main.c:353) ==7061==
| * ProcGetPointerMapping uses rep.nElts before it is initializedUlrich Sibiller2018-07-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of this xorg upstream commit (with omitting the mentioned d792ac125a0462a04a930af543cbc732f8cdab7d). commit 34cf559bcf99dad550527b5ff53f247f0e8e73ee Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 10 15:58:48 2012 -0700 ProcGetPointerMapping uses rep.nElts before it is initialized In: commit d792ac125a0462a04a930af543cbc732f8cdab7d Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Mon Jul 9 19:12:43 2012 -0700 Use C99 designated initializers in dix Replies the initializer for the .length element of the xGetPointerMappingReply structure uses the value of rep.nElts, but that won't be set until after this initializer runs, so we get garbage in the length element and clients using it will generally wedge. Easy to verify: $ xmodmap -pp Fixed by creating a local nElts variable and using that. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * Fix some valgrind findingsUlrich Sibiller2018-07-032-15/+11
| | | | | | | | | | | | Some of them have not been seen in the wild yet. Partly fixes ArcticaProject/nx-libs#711
| * Some small Keyboard.c improvementsUlrich Sibiller2018-07-031-4/+4
|/ | | | as in xorg-xserver upstream's hw/xnest/Keyboard.c
* Merge branch 'sunweaver-pr/idletime-counter' into 3.6.xMike Gabriel2018-07-033-15/+163
|\ | | | | | | | | | | Attributes GH PR #713: https://github.com/ArcticaProject/nx-libs/pull/713 Reviewed by Ulrich Sibiller <uli42@gmx.de> -- Tue, 3 Jul 2018 15:24:31 +0200 (CEST)
| * Don't reset the lastDeviceEventTime when doing DPMS actionsMike Gabriel2018-07-031-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org's Xserver: commit c1d901d723c3bee523736eacc15b44a7dff484fe Author: Richard Hughes <richard@hughsie.com> Date: Fri Aug 14 11:44:35 2009 +0100 Don't reset the lastDeviceEventTime when doing DPMS actions When we change the DPMS mode, don't play games with the last event time as this breaks applications using IDLETIME to turn the backlight off after a preset time. This patch fixes gnome-power-manager and xfce-power-manager Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Backport-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Do not reset lastDeviceEventTime when we do dixSaveScreensRichard Hughes2018-07-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org's Xserver: commit 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 Author: Richard Hughes <richard@hughsie.com> Date: Mon Aug 17 09:15:32 2009 +0100 Do not reset lastDeviceEventTime when we do dixSaveScreens When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the event time else session clients using IDLETIME will be reset. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Backport IDLETIME system counter to nx-X11 Xserver.Mike Gabriel2018-07-031-0/+159
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves issues with non-starting mate-screensaver which relies on the IDLETIME API these days. This commit backports the following X.org Xserver commits: commit a2e67a6412386782cb8b644b86a5744591397d45 Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> Date: Mon Dec 6 11:24:01 2010 +1100 IDLETIME: Fix edge-case in IdleTimeBlockHandler Ensure that if we're called exactly on the threshold of a NegativeTransition trigger that we reshedule to pick up an idle time over the threshold. Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> commit 1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5 Author: Adam Jackson <ajax@redhat.com> Date: Wed Dec 10 16:13:20 2008 -0500 xsync: Fix wakeup storm in idletime counter. Wakeup scheduling only considered the threshold values, and not whether the trigger was edge or level. See also: https://bugzilla.redhat.com/show_bug.cgi?id=474586 http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/test-idle-ext.c?view=markup commit 0f9e89b4e309e570d7d366489d250ca2143f0ad7 Author: Fredrik Höglund <fredrik@kde.org> Date: Tue Aug 14 22:47:49 2007 +0200 Fix the value comparisons in the IDLETIME wakeup handler. LessThan/GreaterThan comparisons were used in the wakeup handler, and LessOrEqual/GreaterOrEqual in the block handler. Change it to use LessOrEqual/GreaterOrEqual in both functions, since this is what XSyncNegativeComparison and XSyncPositiveComparison imply. commit 7e2c935920cafadbd87c351f1a3239932864fb90 Author: Fredrik Höglund <fredrik@kde.org> Date: Fri May 18 20:06:14 2007 +0200 Add a new IDLETIME system sync counter. This counter exposes the time in milliseconds since the last input event. Clients such as screen savers and power managers can set an alarm on this counter to find out when the idle time reaches a certain value, without having to poll the server. Backport-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* nx-X11/Makefile: pass down $(MFLAGS) to imake call, because... we probably ↵Mihai Moldovan2018-06-171-1/+1
| | | | want that. Likely.
* nx-libs.spec: disable parallel builds, was pure luck that it worked before.Mihai Moldovan2018-06-171-1/+1
| | | | | | | | What actually happened was that MFLAGS were passed-through more correctly, which forced make into jobserver mode (due to the inclusion of --jobserver-fds=... in %{_smp_mflags}), but the processes were not able to read from their FD's, so it defaulted to non-parallel builds instead.
* debian/rules: more Jessie unbreaking, also for dh_auto_{build,install}.Mihai Moldovan2018-06-171-2/+4
|
* debian/rules: unbreak Jessie: dh_auto_clean doesn't gracefully discard ↵Mihai Moldovan2018-06-161-1/+1
| | | | unknown --no-parallel flag.
* Merge branch 'uli42-pr/fix_missing_include' into 3.6.xMike Gabriel2018-06-061-0/+1
|\ | | | | | | Attributes GH PR #702: https://github.com/ArcticaProject/nx-libs/pull/702
| * Clipboard.c: add missing includeUlrich Sibiller2018-06-051-0/+1
|/ | | | Fixes ArcticaProject/nx-libs#701
* Merge branch 'uli42-pr/xinerama_without_wm' into 3.6.xMike Gabriel2018-05-241-0/+12
|\ | | | | | | Attributes GH PR #695: https://github.com/ArcticaProject/nx-libs/pull/695
| * Update Xinerama on XMapEventUlrich Sibiller2018-05-241-0/+12
|/ | | | Fixes ArcticaProject/nx-libs#694
* Merge branch 'uli42-pr/cleanup_window_hints' into 3.6.xMike Gabriel2018-05-247-175/+203
|\ | | | | | | Attributes GH PR #689: https://github.com/ArcticaProject/nx-libs/pull/689
| * whitespace fixesUlrich Sibiller2018-05-243-4/+4
| |
| * Screen.c: simplify setting of window name/classUlrich Sibiller2018-05-241-16/+11
| |
| * Events.c: catch intermediate window position changesUlrich Sibiller2018-05-241-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | nxagentHandleConfigureNotify() has an optimization that accumulates ConfigureNotify events from the queue to only perform the changes of the last ConfigureNotify event in the queue. But that code used to ignore position changes and only adapt the new window position if the last event happened to contain a position change. This change ensures the latest position change - if any - found in the queue will be applied after the accumulation. Fixes: ArticaProject/nx-libs#688 (second part)
| * nxagent: remove mmwidth/mmheight from nxagentChangeScreenConfigUlrich Sibiller2018-05-245-12/+11
| | | | | | | | Was 0,0 on every call...
| * Screen.c/Events.c: fix some commentsUlrich Sibiller2018-05-243-5/+3
| |
| * nxagent: use XAllocSizeHints() instead of XSizeHints structUlrich Sibiller2018-05-243-97/+130
| | | | | | | | | | | | This is the preferred way. It ensures, that a) the data is zeroed b) a correct size in case xlib is changing the size of the structure in future releases
| * Screen.c/Events.c: add some FIXMEsUlrich Sibiller2018-05-242-0/+4
| |
| * Screen.c: replace XSetWMNormalHints code block by already existing functionUlrich Sibiller2018-05-243-38/+7
|/ | | | nxagentSetWMNormalHints was slightly adapted therefore
* debian/rules: Typo fix in dh_auto_build --no-parallel option.Mike Gabriel2018-05-241-1/+1
|
* debian/rules: Highly enforce --no-parallel mode while Xserver is still on ↵Mike Gabriel2018-05-241-3/+3
| | | | imake. Can be re-parallelized after autotools conversion.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 11:14:13 +0000