aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix
Commit message (Collapse)AuthorAgeFilesLines
* nxagent: use Xorg's callback mechanism for init/free of client privatesUlrich Sibiller2020-05-071-4/+0
|
* dix/dispatch.c: Fix copy/paste error from before git history in ↵Ulrich Sibiller2020-05-071-1/+1
| | | | | | | | | | | | | | | | | | UpdateCurrentTimeIf() Backport from this commit: commit 8dfd98245d2c44a1eb4c8b7c275e6cfc10fe40f1 Author: Chase Douglas <chase.douglas@canonical.com> Date: Wed Apr 11 11:14:51 2012 -0700 Fix copy/paste error from before git history in UpdateCurrentTimeIf() See UpdateCurrentTime() for reference. I don't know what bug this might trigger, but it wouldn't hurt to fix this. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* dix/dispatch.c: fix buggy callback invocationUlrich Sibiller2020-05-071-0/+5
| | | | Looks like a copy'n'paste error.
* (NX)property.c: harmonize function nameUlrich Sibiller2020-05-071-1/+1
| | | | Use the "xorg_" prefix as everywhere else, not "Xorg_".
* NXdixfonts.c: call dix version of SetDefaultFontPathUlrich Sibiller2020-05-071-2/+4
|
* dix: also compile ffs.cUlrich Sibiller2020-05-071-0/+2
| | | | | File was missing in Imakefile. We are not using the ffs function, but nevertheless it's a part of dix.
* nxagent: remove now-obsolete own copies of ScreenSaver procsUlrich Sibiller2020-04-072-7/+0
| | | | | we moved the auto-disconnect feature to an own timer so there's no need for a special treatment in screen saver stuff anymore.
* CheckForEmptyMask does not need to declare int n twiceUlrich Sibiller2020-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | commit 424dbde891486ad6a6c00c61a334031ff18f5556 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Fri Dec 9 10:08:55 2011 -0800 CheckForEmptyMask does not need to declare int n twice Just use the existing n variable again in the ARGB_CURSOR loop instead of creating another one. Fixes gcc -Wshadow warning: cursor.c: In function 'CheckForEmptyMask': cursor.c:155:6: warning: declaration of 'n' shadows a previous local cursor.c:146:9: warning: shadowed declaration is here Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* Remove the numVideoScreens xprintism.Ulrich Sibiller2020-01-061-3/+0
| | | | | | | | | | | | | | Backport of this xorg-xserver commit: commit a82e6efb7b9b2ab9a1597b002f375c5ee105e7f5 Author: Adam Jackson <ajax@redhat.com> Date: Wed Jul 16 14:19:04 2008 -0400 Remove the numVideoScreens xprintism. This was to account for cases where you had video and print screens in the same server. Lunacy. Leave the slot in ScreenInfo, but rename it, and stop looking at it.
* nxagent: remove another xprint renmantUlrich Sibiller2020-01-063-30/+20
| | | | | | reqeuestingClient was dropped with the XPRINT drop. Unfortunetely we are usign it in Image.c. So let's introduce nxagentRequestingClient as replacement for now.
* drop xprint remnants: xpstubsUlrich Sibiller2020-01-062-57/+0
| | | | | | | | | | Backport from xorg-xserver: commit 641ce9c706ce3cbf726fb3fc9623161bb96ba127 Author: George Sapountzis <gsap7@yahoo.gr> Date: Thu Jan 3 17:28:04 2008 +0200 drop xprint remnants: xpstubs
* NXproperty.c: simplify ChangeWindowPropertyUlrich Sibiller2020-01-061-1/+7
|
* xkbsrv.h: move extern XkbFreePrivates to central include fileUlrich Sibiller2020-01-061-2/+0
|
* NXwindow.c: use upstream function DeleteWindow()Ulrich Sibiller2019-11-021-2/+0
| | | | | | | DeleteWindow() is calling FreeWindowResources() which is calling DisposeWindowOptional() which sets pWin->optional to NULL. So the now removed code was never called. After removal DeleteWindow() is identical to the dix version, so we use that one.
* NXwindow.c: call InitRootWindow from dixUlrich Sibiller2019-11-021-2/+4
|
* NXwindow.c: drop own UnmapWindow()Ulrich Sibiller2019-11-021-4/+0
| | | | | The only difference to the dix version was a fprintf if compiled with -D TEST.
* NXwindow.c: call upstream version UnmapWindow()Ulrich Sibiller2019-11-021-2/+4
|
* NXdispatch.c: simplify InitClientPrivates()Ulrich Sibiller2019-11-021-2/+4
| | | | by calling the upstream function from dix/dispatch.c
* NXdispatch.c: call upstream CloseDownClient()Ulrich Sibiller2019-11-021-3/+5
| | | | remove ~80 duplicate lines
* NXdispatch.c: Simplify InitSelections()Ulrich Sibiller2019-11-021-3/+5
| | | | by calling upstream version from dispatch.c
* nxagent: drop NXextension.cUlrich Sibiller2019-11-021-2/+2
| | | | | instead of including it and creating NXextension.o we can simply use the dix version. There are no NX specials anymore.
* NXextension.c: use ProcListExtensions() from dixUlrich Sibiller2019-11-021-2/+0
|
* NXextension.c: use ProcQueryExtension() from dixUlrich Sibiller2019-11-021-1/+1
|
* NXevents.c: use XYToWindow from dixUlrich Sibiller2019-11-011-3/+12
| | | | add a callback to determine the starting window.
* NXevents.c: call upstream ProcAllocEvents()Ulrich Sibiller2019-11-011-0/+4
| | | | | Our version only adds some commented code, so it is not really necessary. But it is cleaner to handle it that way.
* NXevents.c: call upstream DefineInitialRootWindow()Ulrich Sibiller2019-11-011-2/+4
|
* NXevents.c: call upstream version of ProcSendEvent()Ulrich Sibiller2019-11-011-2/+4
|
* NXevents.c: call upstream versions of (De)ActivatePointerGrab()Ulrich Sibiller2019-11-011-3/+10
|
* NXproperty.c: prevent deletion of NX_AGENT_VERSION propertyUlrich Sibiller2019-09-291-0/+2
| | | | Fixes ArcticaProject/nx-libs#825
* Update currentTime in dispatch loopUlrich Sibiller2019-09-291-0/+3
| | | | | | | | | | | | | | | | | | commit 312910b4e34215aaa50fc0c6092684d5878dc32f Author: Chase Douglas <chase.douglas@canonical.com> Date: Wed Apr 18 11:15:40 2012 -0700 Update currentTime in dispatch loop A request, like input device grabs, may check a request timestamp against currentTime. It is possible for currentTime to lag a previously sent event timestamp. If the client makes a request based on such an event timestamp, the request may fail the validity check against currentTime unless we always update the time before processing the request. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* nxagent: drop nxagentRootTileWindowUlrich Sibiller2019-08-271-2/+0
| | | | | | | | We either use a solid black or a white background and no backround pixmap. So nxagentRootTileWindow is always empty and we can drop all stuff around it. remove nxagentSplashCount, too, since it is no longer checked anywhere.
* rework xkb device private handlingUlrich Sibiller2019-06-221-0/+9
| | | | | | | We can only free the xkbDevicePrivate because we do not know the details of any other (possible) extension. So let's limit to that one private for now and call the new xkbFreePrivates from dix (where such a function is completely missing).
* dix/dispatch: fix a small memory leakUlrich Sibiller2019-06-221-0/+3
|
* CloseDevice: call XkbRemoveResourceClient before freeing key class structUlrich Sibiller2019-06-191-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | This patch is not necessary at the current code level. But when xkb code introduced the dev->key check Xorg upstream missed that. So we backport it now to skip that trap when updating xkb code. Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Mon Jan 4 18:21:54 2010 -0800 CloseDevice: call XkbRemoveResourceClient before freeing key class struct XkbRemoveResourceClient() returns immediately if dev->key is NULL. CloseDevice calls XkbRemoveResourceClient until it removes all resources. If we free dev->key and NULL it before XkbRemoveResourceClient, then infinite loop ensues, and the server appears to hang on exit or crash. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
* Remove the Must_have_memory hack.Ulrich Sibiller2019-06-121-17/+8
| | | | | | | | | | | | | We are not using any alloc function that respects that variable, so lets drop it. Backport of this commit: commit 0ce61e21d6d7dcca0090e319bbcdb678570f2c3f Author: Adam Jackson <ajax@redhat.com> Date: Fri Oct 3 16:05:19 2008 -0400 Remove the Must_have_memory hack. Also remove an astonishing amount of misunderstanding of how casts work.
* NXdispatch.c: use upstream version of ProcSetSelectionOwnerUlrich Sibiller2019-06-111-2/+0
|
* Fix NXevents.c: Reactivate errornously commented functionUlrich Sibiller2019-06-111-0/+4
| | | | | | | | | CheckMotion() had been commented in add881931f2e702fb1952f4e1baba04b3dc536ee as it looked identical to the version from dix/events.c except for some commented code. But this based (probably) on a thinko - code that had been disabled by NX became active again this way. Fix this by removing the comments and by adding #ifdef/else to emphasize the difference.
* dix: remove unused requestLogIndexUlrich Sibiller2019-05-291-9/+0
| | | | | | | | | | | | | | | | | | | | | As done in these commits: commit 6583477035234e23ead2fad9db7a07e5862447a4 Author: Nicolai Hähnle <nhaehnle@gmail.com> Date: Sat May 23 13:35:24 2009 +0200 Remove reference to non-existing requestLog and requestLogIndex These fields were removed in 252ec504817e05b185e4896a2d899e9c00b8aeef. Signed-off-by: Nicolai Haehnle <nhaehnle@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 252ec504817e05b185e4896a2d899e9c00b8aeef Author: Adam Jackson <ajax@redhat.com> Date: Mon Mar 30 15:18:30 2009 -0400 Document which bits of ClientRec are currently unused
* Fix uninitialized bytesUlrich Sibiller2018-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes this valgrind finding ==16977== Warning: invalid file descriptor -1 in syscall close() ==16977== Conditional jump or move depends on uninitialised value(s) ==16977== at 0x544B6B: XkbSendNewKeyboardNotify (xkbEvents.c:62) ==16977== by 0x540481: ProcXkbGetKbdByName (xkb.c:5330) ==16977== by 0x4341C5: Dispatch (NXdispatch.c:482) ==16977== by 0x40EB02: main (main.c:353) ==16977== Uninitialised value was created by a heap allocation ==16977== at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==16977== by 0x431BD7: NextAvailableClient (dispatch.c:3719) ==16977== by 0x47B297: AllocNewConnection (connection.c:821) ==16977== by 0x47B297: EstablishNewConnections (connection.c:910) ==16977== by 0x463DFE: ProcessWorkQueue (dixutils.c:541) ==16977== by 0x47635E: WaitForSomething (WaitFor.c:213) ==16977== by 0x434089: Dispatch (NXdispatch.c:360) ==16977== by 0x40EB02: main (main.c:353)
* Fix some memory leaks.Mario Trangoni2018-07-031-0/+1
|
* 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
* 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-031-10/+8
| | | | | | Some of them have not been seen in the wild yet. Partly fixes ArcticaProject/nx-libs#711
* 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>
* Lift dix to xorg-xserver-1.3.0.0 state - non-functional changes onlyUlrich Sibiller2018-02-263-8/+4
|
* Lift dix to xorg-xserver-1.3.0.0 stateUlrich Sibiller2018-02-2611-71/+164
|
* Lift dix to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-263-1/+24
|
* Lift dix to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-265-8/+47
|
* Xext: lift DPMS extension to xorg-xserver-7.1/1.1 stateUlrich Sibiller2018-02-071-6/+0
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 01:45:47 +0000