aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sunweaver-pr/setnotifyfd-ABI' into 3.6.xMihai Moldovan2017-03-1714-66/+695
|\ | | | | | | Attributes GH PR #331: https://github.com/ArcticaProject/nx-libs/pull/331
| * os: Initialize NotifyFds earlier in startupMike Gabriel2017-03-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit ce6546337487c052b5dd3c04d3d8d4b09d691c3d Author: Keith Packard <keithp@keithp.com> Date: Tue May 31 09:38:17 2016 -0700 os: Initialize NotifyFds earlier in startup If the server calls AbortServer during the first-time initialization (which can happen if you start the server on an already using DISPLAY), then the dbus code will shut down and call the notify fd interface. If the notify fd list hasn't been initialized, the server will crash. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * os: Implement support for NotifyFd X_NOTIFY_WRITE and removal of ↵Keith Packard2017-03-175-56/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AddEnabledDevices/RemoveEnabledDevices Backported from X.org: commit be5a513fee6cbf29ef7570e57eb0436d70fbd88c Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 7 15:12:14 2015 -0800 Remove AddEnabledDevice and AddGeneralSocket APIs All uses of these interfaces should instead be using the NotifyFd API instead. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com> commit 4020aacd1fc5b9c63369f011aeb9120af9c55218 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 11 22:02:03 2015 -0800 os: Implement support for NotifyFd X_NOTIFY_WRITE This adds the ability to be notified when a file descriptor is available for writing. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Move the code for resetting the DPMS mode in response to input events, from ↵Fredrik Höglund2017-03-172-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WaitForSomething to mieqProcessInputEvents. Backported from X.org: commit 3b5b7ef5c2ab1d196806f6359e0972fd78d204dd Author: Fredrik Höglund <fredrik@kde.org> Date: Wed Jan 3 21:05:35 2007 +0100 Move the code for resetting the DPMS mode in response to input events, from WaitForSomething to mieqProcessInputEvents. mieqProcessInputEvents already handles resetting the screen saver. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * nxagent: Use SetNotifyFd to receive events.Mike Gabriel2017-03-174-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by X.org commit: commit 55c2e1a3aa587c58a74066724e11e30b3df267b8 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 7 15:11:33 2015 -0800 xnest: Use SetNotifyFd to receive events Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
| * os: Add NotifyFd interfacesKeith Packard2017-03-155-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit 0c41b7af4ab0c8d22b88f201293f59524d1e7317 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 11 22:02:02 2015 -0800 os: Add NotifyFd interfaces This provides a callback-based interface to monitor file descriptors beyond the usual client and device interfaces. Modules within the server using file descriptors for reading and/or writing can call Bool SetNotifyFd(int fd, NotifyFdProcPtr notify_fd, int mask, void *data); mask can be any combination of X_NOTIFY_READ and X_NOTIFY_WRITE. When 'fd' becomes readable or writable, the notify_fd function will be called with the 'fd', the ready conditions and 'data' values as arguments, When the module no longer needs to monitor the fd, it will call void RemoveNotifyFd(int fd); RemoveNotifyFd may be called from the notify function. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Xserver/include/list.h: Add list.h from X.org (from X.org commit 63f83d1).Mike Gabriel2017-03-152-0/+495
| |
| * os/xdmcp: Just send XDMCP keepalive packets once every three minuteKeith Packard2017-03-151-22/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit db1089eafc1c5371fa0030202de588d2e2b4f8e5 Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 21 07:16:17 2015 +0100 os/xdmcp: Just send XDMCP keepalive packets once every three minutes There was a complicated scheme to increase the time between keepalives from 3 minutes up to as much as 24 hours in an attempt to reduce network traffic from idle X terminals. X terminals receiving X traffic, or receiving user input would use the 3 minute value; X terminals without any network traffic would use a longer value. However, this was actually broken -- any activity in the X server, either client requests or user input, would end up resetting the keepalive timeout, so a user mashing on the keyboard would never discover that the XDMCP master had disappeared and have the session terminated, which was precisely the design goal of the XDMCP keepalive mechanism. Instead of attempting to fix this, accept the cost of a pair of XDMCP packets once every three minutes and just perform keepalives regularly. This will also make reworking the block and wakeup handler APIs to eliminate select masks easier. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Merge branch 'uli42-pr/cleanup_keystroke' into 3.6.xMike Gabriel2017-03-135-213/+224
|\ | | | | | | Attributes GH PR #392: https://github.com/ArcticaProject/nx-libs/pull/392
| * Update keystroke readmeUlrich Sibiller2017-03-131-4/+11
| |
| * Keystroke.c: remove unneeded capital keys for default keystrokesUlrich Sibiller2017-03-131-11/+0
| |
| * Keystroke.c: add new keystroke to reread keystroke configUlrich Sibiller2017-03-134-6/+39
| | | | | | | | Default is ctrl-alt-k
| * Keystroke.c: simplify parse_keystroke_fileUlrich Sibiller2017-03-131-36/+15
| |
| * Keystroke.c: fix formattingUlrich Sibiller2017-03-131-1/+1
| |
| * Keystroke.c: use an own environment variable for X2GoUlrich Sibiller2017-03-132-4/+11
| |
| * Keystroke.c: make nxagentKeystrokeFileParsed localUlrich Sibiller2017-03-131-4/+5
| |
| * Keystroke.c: add missing Mod5 modifierUlrich Sibiller2017-03-132-1/+2
| |
| * Keystroke.c: fix code orderUlrich Sibiller2017-03-131-1/+3
| | | | | | | | Do not use map before calling parse_keystroke_file() since it will malloc map.
| * Keystroke.h: sane struct initUlrich Sibiller2017-03-131-0/+1
| | | | | | | | | | Correctly use constant for unused structs instead of implicitly setting it through calloc().
| * Keyboard.c: Introduce separate masks for Alt and MetaUlrich Sibiller2017-03-131-0/+8
| | | | | | | | Unclear why they have been merged at all.
| * Keystroke.c: Fix modifier handlingUlrich Sibiller2017-03-131-1/+2
| | | | | | | | | | | | Code could not distinguish between ctrl-alt-shift and ctrl-alt. Fixes ArcticaProject/nx-libs#395
| * Keystroke.c: more/fixed debug outputUlrich Sibiller2017-03-131-2/+17
| |
| * Keystroke: whitespace fixesUlrich Sibiller2017-03-132-2/+2
| |
| * Keystroke.c: arrange switch_all_screens and fullscreen close togetherUlrich Sibiller2017-03-133-18/+18
| | | | | | | | | | Both use the same keystroke 'f' (with different modifiers) for a very similar function.
| * Keystroke.c: print keystroke name in TEST modeUlrich Sibiller2017-03-131-2/+6
| |
| * Keystroke.c: improve TEST outputUlrich Sibiller2017-03-131-3/+3
| |
| * Keystroke.c: add another FIXMEUlrich Sibiller2017-03-131-0/+2
| |
| * Keystroke.c: Simplify read_binding_from_xmlnodeUlrich Sibiller2017-03-131-16/+17
| |
| * Keystroke.c: use symbols instead of integersUlrich Sibiller2017-03-131-2/+4
| | | | | | | | We have defined them, so use them!
| * Keystroke.c: Boolify read_binding_from_xmlnodeUlrich Sibiller2017-03-132-45/+45
| |
| * Keystroke.c: Boolify nxagentCheckSpecialKeystrokeUlrich Sibiller2017-03-132-8/+8
| |
| * Keystroke.c: reorder parse_keystroke_fileUlrich Sibiller2017-03-131-7/+5
| | | | | | | | for better readability
| * Keystroke.c: handle parsing state in parse_keystroke_file()Ulrich Sibiller2017-03-131-5/+6
| |
| * Keystroke.c: simplify nxagentCheckSpecialKeystrokeUlrich Sibiller2017-03-131-19/+3
| |
| * Keystroke.c: fix code formattingUlrich Sibiller2017-03-131-5/+4
| |
| * Keystroke.c: rework read_binding_from_xmlnode()Ulrich Sibiller2017-03-111-54/+30
| | | | | | | | code cleanup
| * Keystroke.c: use Bool type where appropriateUlrich Sibiller2017-03-111-4/+4
|/
* Merge branch 'uli42-pr/misc_cherries' into 3.6.xMihai Moldovan2017-03-1011-65/+65
|\ | | | | | | Attributes GH PR #378: https://github.com/ArcticaProject/nx-libs/pull/378
| * Xext: fix compiler warningUlrich Sibiller2017-03-101-1/+1
| | | | | | | | | | | | xf86bigfont.c: In function ‘ProcXF86BigfontQueryFont’: xf86bigfont.c:724:9: warning: ‘pDesc’ may be used uninitialized in this function [-Wmaybe-uninitialized] if (!pDesc) free(pCI);
| * xfixes: fix compiler warningUlrich Sibiller2017-03-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cursor.c: In function ‘TestForCursorName’: cursor.c:649:30: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return (pCursor->name == (Atom) closure); ^ cursor.c: In function ‘ProcXFixesChangeCursorByName’: cursor.c:665:45: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ReplaceCursor (pSource, TestForCursorName, (void *) name); ^ Backport of commit 019ad5acd20e34dc2aa3b89cc426138db5164c48 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Feb 5 15:44:41 2008 -0500 XFixes: squash a pointer/integer size mismatch warning.
| * xfixes: fix compiler warningsUlrich Sibiller2017-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | cursor.c: In function ‘ProcXFixesGetCursorName’: cursor.c:399:6: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default] str = NameForAtom (pCursor->name); ^ cursor.c: In function ‘ProcXFixesGetCursorImageAndName’: cursor.c:453:10: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default] name = pCursor->name ? NameForAtom (pCursor->name) : ""; ^
| * render/filter.c: add missing return valueUlrich Sibiller2017-03-101-1/+1
| | | | | | | | | | | | | | | | | | Fixes filter.c: In function ‘SetPicturePictFilter’: filter.c:363:5: warning: ‘return’ with no value, in function returning non-void [enabled by default] return ; ^
| * record.c: fix compiler warningsUlrich Sibiller2017-03-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | record.c: In function ‘RecordAReply’: record.c:714:7: warning: passing argument 4 of ‘RecordAProtocolElement’ discards ‘const’ qualifier from pointer target type [enabled by default] pri->replyData, pri->dataLenBytes, /* continuation */ -1); ^ record.c:286:1: note: expected ‘void *’ but argument is of type ‘const void *’ RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient, ^ record.c:724:10: warning: passing argument 4 of ‘RecordAProtocolElement’ discards ‘const’ qualifier from pointer target type [enabled by default] pri->replyData, pri->dataLenBytes, pri->bytesRemaining); ^ record.c:286:1: note: expected ‘void *’ but argument is of type ‘const void *’ RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient, ^ record.c:746:5: warning: passing argument 4 of ‘RecordAProtocolElement’ discards ‘const’ qualifier from pointer target type [enabled by default] pri->dataLenBytes, pri->bytesRemaining); ^ record.c:286:1: note: expected ‘void *’ but argument is of type ‘const void *’ RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient, ^
| * fb: fix compiler warningUlrich Sibiller2017-03-101-2/+0
| | | | | | | | | | | | fbtrap.c: In function ‘fbRasterizeTrapezoid’: fbtrap.c:113:12: warning: variable ‘x_off_fixed’ set but not used [-Wunused-but-set-variable] xFixed x_off_fixed;
| * dix: Fix compiler warningUlrich Sibiller2017-03-101-1/+2
| | | | | | | | | | | | devices.c: In function ‘_AddInputDevice’: devices.c:120:22: warning: assignment from incompatible pointer type [enabled by default] dev->devPrivates = dev->unwrapProc = NULL;
| * Display.c: remove unused logo codeUlrich Sibiller2017-03-101-37/+0
| |
| * Rootless.c: improve debugging outputUlrich Sibiller2017-03-101-4/+4
| |
| * Rootless.c: improve malloc failure handlingUlrich Sibiller2017-03-101-2/+34
| |
| * Rootless.c: fix possible memleakUlrich Sibiller2017-03-101-0/+1
| |
| * Display.c: pid is always 0, remove checkUlrich Sibiller2017-03-101-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 16:01:21 +0000