aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* os: Immediately queue initial WriteToClientChris Wilson2017-03-191-1/+1
* os/xdmcp: Remove dead 'restart' codeMike Gabriel2017-03-191-10/+0
* Merge branch 'uli42-pr/ignore_caps' into 3.6.xMike Gabriel2017-03-193-3/+32
|\
| * Keystroke.c: ignore CapsLock and NumLock most of the timeUlrich Sibiller2017-03-193-3/+32
|/
* Merge branch 'sunweaver-pr/setnotifyfd-ABI' into 3.6.xMihai Moldovan2017-03-1714-66/+695
|\
| * os: Initialize NotifyFds earlier in startupMike Gabriel2017-03-171-1/+5
| * os: Implement support for NotifyFd X_NOTIFY_WRITE and removal of AddEnabledDe...Keith Packard2017-03-175-56/+69
| * Move the code for resetting the DPMS mode in response to input events, from W...Fredrik Höglund2017-03-172-4/+14
| * nxagent: Use SetNotifyFd to receive events.Mike Gabriel2017-03-174-3/+12
| * os: Add NotifyFd interfacesKeith Packard2017-03-155-0/+118
| * 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
|/
* Merge branch 'uli42-pr/cleanup_keystroke' into 3.6.xMike Gabriel2017-03-135-213/+224
|\
| * 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
| * 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
| * Keystroke.h: sane struct initUlrich Sibiller2017-03-131-0/+1
| * Keyboard.c: Introduce separate masks for Alt and MetaUlrich Sibiller2017-03-131-0/+8
| * Keystroke.c: Fix modifier handlingUlrich Sibiller2017-03-131-1/+2
| * 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
| * 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
| * 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
| * 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
| * 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
|\
| * Xext: fix compiler warningUlrich Sibiller2017-03-101-1/+1
| * xfixes: fix compiler warningUlrich Sibiller2017-03-101-2/+3
| * xfixes: fix compiler warningsUlrich Sibiller2017-03-101-2/+2
| * render/filter.c: add missing return valueUlrich Sibiller2017-03-101-1/+1
| * record.c: fix compiler warningsUlrich Sibiller2017-03-101-3/+3
| * fb: fix compiler warningUlrich Sibiller2017-03-101-2/+0
| * dix: Fix compiler warningUlrich Sibiller2017-03-101-1/+2
| * Display.c: remove unused logo codeUlrich Sibiller2017-03-101-37/+0