diff --git a/xserver/ChangeLog b/xserver/ChangeLog index 3a79c2e38..fe25dc533 100644 --- a/xserver/ChangeLog +++ b/xserver/ChangeLog @@ -1,3 +1,849 @@ +commit 4b8d43033bdc5bfb95240a2ef2fe89b0f2fd669a +Author: Jeremy Huddleston +Date: Mon Dec 13 11:45:02 2010 -0800 + + Version bumped to 1.9.3 + + Signed-off-by: Jeremy Huddleston + +commit 07b114eb9c6b47b22b4edf17684bdcf5aa89f42d +Author: Jeremy Huddleston +Date: Fri Dec 3 21:56:54 2010 -0800 + + Version bumped to 1.9.2.902 (1.9.3 RC2) + + Signed-off-by: Jeremy Huddleston + +commit 47d474ee8fb29758ec61c128d000f760dd040be4 +Author: Jeremy Huddleston +Date: Fri Dec 3 17:27:44 2010 -0800 + + XQuartz: RandR: Fix mode changing for multi-monitor configurations. + + This just fixes the regression whereby we couldn't switch between the legacy + fullscreen mode and rootless on multi-monitor configurations. This was + happening because ref wasn't being set in these cases (since we don't ever + actually change CG modes), so we failed a CFEqual. Setting the references + fixes this regression and places us one step closer to more mode RandR + mode switching in multi-monitor configurations. + + Signed-off-by: Jeremy Huddleston + (cherry picked from commit 714b68d9e5bf624a6703f168e0f7dc980e88e8c0) + +commit 4c3aaef3ffa4a22c951331ef36c45b95f719a907 +Author: Jeremy Huddleston +Date: Fri Dec 3 16:46:11 2010 -0800 + + XQuartz: Cleanup some compiler warnings + + Mark __crashreporter_info__ as __attribute__((__used__)) + + Signed-off-by: Jeremy Huddleston + (cherry picked from commit 14f00449eb81771c01fffcdaf3dd697cdf4e41de) + +commit 438dd53e4b39a465e98c270c7c9baf71e701a821 +Author: Jeremy Huddleston +Date: Fri Nov 26 15:31:22 2010 -0500 + + XQuartz: Disable the Mac OS X screensaver when in full screen mode + + Signed-off-by: Jeremy Huddleston + (cherry picked from commit ca431371a23a2b9ad36c1d64e11ea41d5e4e5f04) + +commit 18f21d7c8aeaf0fbedf8a2208f211a63dc01f2c4 +Author: Nicolas Peninguy +Date: Wed Nov 24 00:11:11 2010 +0100 + + Fix Xdmx and Xephyr build when DTrace support is enabled + + This fixes the following build errors when DTrace is enabled + (--with-dtrace): + + CCLD Xdmx + /usr/bin/ld: ../../os/os.O: undefined reference to symbol 'dladdr@@GLIBC_2.2.5' + /usr/bin/ld: note: 'dladdr@@GLIBC_2.2.5' is defined in DSO /lib64/libdl.so.2 so try adding it to the linker command line + + CCLD Xephyr + ../../../os/os.O: In function `TimerForce': + /home/nico/work/xserver/os/WaitFor.c:481: multiple definition of `TimerForce' + ../../../os/os.O:/home/nico/work/xserver/os/WaitFor.c:481: first defined here + + Signed-off-by: Nicolas Peninguy + Reviewed-by: Alan Coopersmith + Signed-off-by: Keith Packard + (cherry picked from commit 311cad33155c64ed996418808727fc417168592e) + +commit 2fa0029b54a6a27ec4cb3fa1239a8f7fd582b562 +Author: Adam Tkac +Date: Wed Aug 25 10:38:40 2010 +0200 + + Return Success from generate_modkeymap() when max_keys_per_mod is zero + + max_keys_per_mod equal to zero is a valid situation so generate_modkeymap + should not return BadAlloc in this case. + + Signed-off-by: Adam Tkac + Reviewed-by: Patrick E. Kane + Signed-off-by: Peter Hutterer + (cherry picked from commit 05e616767e5b7e60b92d31c4042ded5892dce6d4) + +commit 806790bd9194b60419281442b1ae4fc5fff802aa +Author: Andrea Canciani +Date: Tue Nov 2 20:10:32 2010 +0100 + + render: Fix byteswapping of gradient stops + + The function swapStops repeatedly swaps the color components as + CARD16, but incorrectly steps over them as if they were CARD32. + + This causes half of the stops not to be swapped at all and some + unrelated data be swapped instead. + + Signed-off-by: Andrea Canciani + Reviewed-by: Soren Sandmann + Reviewed-by: Julien Cristau + Signed-off-by: Keith Packard + (cherry picked from commit dab064fa5e0b1f5c67222562ad5367005832cba1) + +commit d0157229e89c6d8ffc491ca600cd933d8951fa76 +Author: Ferry Huberts +Date: Tue Nov 30 19:06:55 2010 +0100 + + dix: do not use bit-wise operators on the boolean result of BitIsOn + + Performing bit-wise operations on a boolean amounts to mixing types, + is confusing and basically incorrect; one should only perform + logical operations on booleans. + + Performing such operations relies on the implementation detail + that a boolean is in fact an integer and that its value FALSE + is implemented as zero. + + Signed-off-by: Ferry Huberts + Reviewed-by: Matt Turner + Reviewed-by: Keith Packard + Signed-off-by: Keith Packard + (cherry picked from commit b16964910d29c0bd039e8bb48bcf1199d709fe3e) + +commit fb84f8b5c78cbbcbf32df56d2573e8b93c4eaa49 +Author: Peter Hutterer +Date: Fri Nov 26 10:00:49 2010 +1000 + + dix: remove now unnecessary !! before BitIsOn() + + The macro has been changed to do this already, no need for double + not-not-ing. + + Signed-off-by: Peter Hutterer + Reviewed-by: Keith Packard + (cherry picked from commit 23e3d1f23318ce69623f91908f888a09f8b74ac2) + +commit 1f1c1ae85600c058f1971e981da9a31eadb71dec +Author: Jeremy Huddleston +Date: Thu Dec 2 15:50:28 2010 -0800 + + include: let BitIsOn() return a boolean value. + + Simply returning the mask bit breaks checks like + BitIsOn(mask, 0) != BitIsOn(mask, 1); + as used in 048e93593e3f7a99a7d2a219e1ce2bdc9d407807. + + The naming of this macro suggests that it should return boolean values + anyway. This patch also adds a few simple tests for these macros to make + sure they don't accidentally break in the future. + + Signed-off-by: Peter Hutterer + Reviewed-by: Pat Kane + Reviewed-by: Julien Cristau + Reviewed-by: Keith Packard + (cherry picked from commit 42dc91e32a02b6b21ff5c45f465f3349e5822615) + +commit 444e180ad12baf9d84ff96f68ec9c16b39fac322 +Author: Peter Hutterer +Date: Mon Nov 22 15:14:02 2010 +1000 + + xfree86: add missing linebreak in error message. + + Signed-off-by: Peter Hutterer + Reviewed-by: Magnus Kessler + (cherry picked from commit b31df0439fe336a43a2355e2f1fb223d86045a05) + +commit 7eaf84d2d1d773d908a2e3d213752622973a93d3 +Author: Aaron Plattner +Date: Mon Nov 15 20:43:18 2010 -0800 + + xfree86: Fix rotation of 2-color non-interleaved cursor images + + When RandR 1.2's transformation code is enabled, it rotates the cursor + image so that it appears upright on a rotated screen. This code + completely mangles 2-color cursors on hardware where the the mask and + source images are not interleaved due to two problems: + + 1. stride is calculated as (width / 4) rather than (width / 8), so the + expression (y * stride) skips two lines instead of one for every + time y is incremented. + 2. cursor_bitpos ignores the 'mask' parameter if the hardware doesn't + specify any of the HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_* flags. + + To fix this, refactor the code to pass the whole xf86CursorInfoPtr + through to cursor_bitpos and compute the correct stride there based on + the flags. If none of the SOURCE_MASK_INTERLEAVE flags are set, use + the total cursor size to move the 'image' variable into the mask part + of the image before computing the desired byte pointer. + + Signed-off-by: Aaron Plattner + Reviewed-by: Robert Morell + Reviewed-by: Alex Deucher + Tested-by: Cyril Brulebois + (cherry picked from commit ffcbfa0063bdc7c9ad5ac724285c7b6e67044c18) + +commit e720e0874ead2ffc6b8ece8fd7e24f8b6017f237 +Author: Cyril Brulebois +Date: Wed Dec 1 14:12:55 2010 +0100 + + Fix screen number checks. + + screenInfo.numScreens is not a valid screen number, they go from 0 to + numScreens - 1. + + Signed-off-by: Cyril Brulebois + Reviewed-by: Alex Deucher + Signed-off-by: Keith Packard + (cherry picked from commit 279ef1ffd787dba2f0d5056849b9cb15d36aa3eb) + +commit e2960ce14e18828d0797cca92af3b1886c6cd0e1 +Author: Julien Cristau +Date: Tue Nov 30 17:23:10 2010 +0100 + + DGA: fix screen number check + + screenInfo.numScreens is not a valid screen number, they go from 0 to + numScreens - 1. + + Signed-off-by: Julien Cristau + Reviewed-by: Keith Packard + Signed-off-by: Keith Packard + (cherry picked from commit 8684543021b9b1aa165b1bc69bc58685cb5942c1) + +commit 3b7becd98ad96fa798b25fe1a478586944fc2610 +Author: Bill Nottingham +Date: Mon Nov 15 11:25:14 2010 +1000 + + xfree86: store the screen's gamma information on init. + + This fixes a gamma issue on vt switch observed with KDM. VT switching away + and back would result in a black screen. Avoid this by storing the current + gamma information on init. + + https://bugzilla.redhat.com/show_bug.cgi?id=533217 + + Signed-off-by: Peter Hutterer + Reviewed-by: Keith Packard + Signed-off-by: Keith Packard + (cherry picked from commit 566d09a5cd6452ee2e05e23d2205e7c3aa31f0da) + +commit 602ad9868421f6abb9cc13ed43699e43e2f3e02c +Author: Adam Jackson +Date: Mon Nov 15 11:25:12 2010 +1000 + + xfree86: apply gamma settings on EnterVT. + + When entering the VT, re-apply the saved gamma settings for each screen. + + Signed-off-by: Peter Hutterer + Reviewed-by: Keith Packard + Signed-off-by: Keith Packard + (cherry picked from commit c050aa2f5fa6a7ff8ce4f91def14ca44f799f067) + +commit 2b7588a78f0268928218c530af329509f308b30d +Author: Peter Hutterer +Date: Wed Jun 9 17:10:57 2010 +1000 + + Xi: move property reset from extension shutdown to init. + + If any part of the stack calls XIGetKnownProperty during device shutdown + the property is re-initialized before the server generation resets, leaving + the value invalid again. + + Move the reset to the extension init which happens before input devices are + initialized before the first property is requested. + + Signed-off-by: Peter Hutterer + Reviewed-by: Julien Cristau + (cherry picked from commit 5cd11d2356d153840f1b429bdb8284367f8dc468) + +commit 65f2ab20b22914a142497057cc8919a357829a95 +Author: Jeremy Huddleston +Date: Mon Nov 22 20:43:14 2010 -0800 + + XQuartz: Localization Updates + + Signed-off-by: Jeremy Huddleston + (cherry picked from commit 97b9bb1e2cebbb769ef347455d9c7979d19de99f) + +commit 3603a645643713227c7cafe536ef0d0a0c3df87b +Author: Jeremy Huddleston +Date: Mon Nov 22 20:41:39 2010 -0800 + + XQuartz: Remove existing localization files on install to avoid conflicts + + Signed-off-by: Jeremy Huddleston + (cherry picked from commit f9fbafa1a07f951e89f208bf4928a0bf37b67cfe) + +commit d49f0c1737441a9fda6d3dcabfe492c90347cfee +Author: Jeremy Huddleston +Date: Mon Nov 22 20:25:33 2010 -0800 + + XQuartz dri: Don't check CoreGraphics version + + The version check is hackish, and I highly doubt anyone using this code is on + a version of OS X that predates this support (10.2 has support for it). + + Signed-off-by: Jeremy Huddleston + (cherry picked from commit 6eed13ad5998ba80296bba2bb3f89928ee51194a) + +commit 2da9b72835e30af1ee4bb634ba4a33e2dac6bcbf +Author: Adam Jackson +Date: Tue Jul 27 17:34:36 2010 -0400 + + edid: Fix the HDTV sync pulse adjustment + + Simple typo, should have been adjusting the horizontal timings + consistently since we're not trying to mangle vertical at all. + + Signed-off-by: Adam Jackson + Reviewed-by: Patrick E. Kane + Signed-off-by: Keith Packard + (cherry picked from commit b2f9ce201cc2a14d5d6ad055b46c9317b040ec2e) + +commit a4452133ffb943536dcaeee055e8f14cc4c32d85 +Author: Luc Verhaegen +Date: Sun Oct 24 23:57:06 2010 +0200 + + x86emu: fix jump_near_IMM to handle DATA: flag correctly. + + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=24348 + + Before (data flag ignored -> broken): + 66 DATA: + e944f1 JMP 1ff6 + + After (fixed): + 66 DATA: + e944f1ffff JMP 00001ff8 + + This subtle difference in the length of decoded instruction meant + that the VBE call jumped to the routine setting AX=0x14F (VBE Failed) + instead of the routine that set AX=0x4F (VBE success). + + The ability to run the same code in vm86 significantly aided the + debugging of this issue. Those X.org developers who would like to drop + vm86 better take special care towards _all_ vesa bugs, as those will + expose further issues. + + Patch applies easily to even xserver 1.4.2. + + Signed-off-by: Luc Verhaegen + Tested-by: Luc Verhaegen + Reviewed-by: Adam Jackson + Signed-off-by: Keith Packard + (cherry picked from commit cc2c73ddcb4370a7c3ad439cda4da825156c26c9) + +commit 06ca34fe012c0b6a55851770c47680abe548d229 +Author: Samuel Thibault +Date: Sun Oct 24 15:18:28 2010 +0200 + + Do not trap access to timer and keyboard + + Disable timer/keyboard trapping on GNU/Hurd for now + + Trapping disabled for now, as some VBIOSes (mga-g450 notably) use these + ports, and the int10 wrapper is not emulating them. + + It's effectively what happens in the Linux variant too, as iopl() is used there, + making the ioperm() meaningless. + + Signed-off-by: Olaf Buddenhagen + Signed-off-by: Samuel Thibault + Reviewed-by: Adam Jackson + Signed-off-by: Keith Packard + (cherry picked from commit a6c64d96456d794b2f3ce40915922a3fba636b95) + +commit 32004e8d6e3fcbb98ccacd89662099d190c71f51 +Author: Pauli Nieminen +Date: Mon Oct 25 17:13:57 2010 +0300 + + DRI2: Avoid call to NULL pointer + + DDX driver may implement schedule swap without GetMSC. In that case we + can't call GetMSC in DRI2SwapBuffers. + + Signed-off-by: Pauli Nieminen + Reviewed-by: Mario Kleiner + CC: Keith Packard + CC: Kristian Høgsberg + Reviewed-by: Jesse Barnes + Signed-off-by: Keith Packard + (cherry picked from commit 383dfe23f1641435c0713f8a56424814a156af8e) + +commit 9770500983308c85b84279be3a5ff36e120e7caa +Author: Olivier Fourdan +Date: Mon Oct 18 15:59:35 2010 -0400 + + modes: improve aspect ratio match for classic drivers + + After we infer the aspect ratio for the screen, we pick the largest + mode matching that aspect ratio from the best mode pool available. + We then clamp virtual size to that mode, and run the resulting mode + list through the driver's ValidMode hook. In doing so we might filter + away our initial guess. If this happens we shrink the default mode + to the next largest mode from _any_ mode pool. This is usually wrong, + and we should instead pick the next aspect-matched mode from the best + available mode pool (as always, user then driver then default). + + Reviewed-by: Alex Deucher + Signed-off-by: Adam Jackson + (cherry picked from commit 7bb653bedceb6180a0361ead1c612839e776ce98) + +commit 201273a2b97754d1f9fd672660dcc9c05af29621 +Author: Jeremy Huddleston +Date: Mon Nov 15 10:57:43 2010 -0800 + + XQuartz: Don't use bashism in uninstall-hook + + Signed-off-by: Jeremy Huddleston + +commit 3effb61e207478d92ebbcf5dfc75535cdd2dda12 +Author: Linus Arver +Date: Sun Oct 17 12:26:01 2010 -0700 + + Xext: panoramiXprocs: fix typo + + This fixes a typo introduced in commit + 80b5d3a3264d2c5167e5ac85a3b04af0f89cece1. The pointer pDst was changed + unintentionally to pWin from a copy/paste error. This resulted in all + QT-based apps and some tcl/tk ones (like fontforge) to crash X 1.9 on + starting up, when Xinerama was enabled. + + Bug report: https://bbs.archlinux.org/viewtopic.php?id=106125 + + Signed-off-by: Elie Bleton + Reviewed-by: Adam Jackson + Reviewed-by: Matt Turner + Tested-by: Linus Arver + (cherry picked from commit 78f94f19aab66a1e5331df0ce29f36e310b4195d) + +commit acd78f7fdcd348ef4d368003b537a26ab6a5cec6 +Author: Chase Douglas +Date: Thu Oct 21 22:41:09 2010 -0400 + + test: input - set valuators mask for event to core conversion + + Commit de8be07cc0a8163b6ef04455706fd5ca2cebe587 adds a requirement to + event to core conversion that at least one of the X or Y valuators are + set in the valuator mask. This commit fixes the event conversion test to + be compliant. + + Signed-off-by: Chase Douglas + Reviewed-by: Peter Hutterer + Signed-off-by: Peter Hutterer + (cherry picked from commit 290af0418f8c94355e42ad81aa7779b90e173fc9) + Acked-by: Peter Hutterer + +commit 814413faefbbd28d7a66f6075b06221f87636b90 +Author: Adam Jackson +Date: Mon Oct 18 15:42:54 2010 -0400 + + ddc: Don't probe for DDC/CI or EEPROM + + For whatever reason, some (broken) monitors will crash if you do this. + We're not actually using this information for anything, so let's just + not do it. + + Originally reported as http://bugzilla.redhat.com/620333 + + Reviewed-by: Alex Deucher + Signed-off-by: Adam Jackson + (cherry picked from commit d2064fbb687839c297a851a5d85f32dfbbe4a0d5) + +commit 723c82347c141d298ff82a9605d7455e84c050f8 +Author: Jeremy Huddleston +Date: Sat Nov 13 15:33:32 2010 -0800 + + Version bumped to 1.9.2.901 (1.9.3 RC1) + + Signed-off-by: Jeremy Huddleston + +commit 42a3747f0f694ff918ab719594eefd0a6bbfab0c +Author: Jeremy Huddleston +Date: Sat Nov 13 16:04:10 2010 -0800 + + XQuartz: Fix make distcheck + + Signed-off-by: Jeremy Huddleston + +commit d75a33d47a89bf7668e05fadbc8a154ac492b113 +Author: Jeremy Huddleston +Date: Sat Nov 13 15:46:16 2010 -0800 + + dix: Fix make distcheck + + Signed-off-by: Jeremy Huddleston + +commit f9f381c48a87b700cc9429dce5ddbac74a774803 +Author: Cyril Brulebois +Date: Thu Nov 11 23:55:55 2010 +0100 + + test: Fix missing xkbsrv.h include. + + Otherwise, building fails with CFLAGS="-Wall -Werror" this way: + | protocol-common.c: In function ‘init_simple’: + | protocol-common.c:159: error: implicit declaration of function ‘XkbInitPrivates’ + | protocol-common.c:159: error: nested extern declaration of ‘XkbInitPrivates’ + + Signed-off-by: Cyril Brulebois + Signed-off-by: Peter Hutterer + (cherry picked from commit c481dae0dc89d8d50cac23210023d75bfaf6012b) + +commit 2715529d6b1da1e7b0266e66eba1aa50027c7c86 +Author: Jeremy Huddleston +Date: Tue Nov 9 13:33:55 2010 -0800 + + DOC: Only build dtrace documentation with --enable-docs + + Signed-off-by: Jeremy Huddleston + Reviewed-by: Alan Coopersmith + Signed-off-by: Keith Packard + (cherry picked from commit 291c39dfef84d1b204d7f5e63e925dee2dbdaca7) + +commit 4a7b5a33e1f9e53c9cd19d6790d0d48f05cb54d4 +Author: Adam Jackson +Date: Sat Sep 11 17:55:57 2010 -0400 + + shadow: Optimize shadowUpdatePacked(). (#26973) + + Signed-off-by: Matt Turner + Reviewed-by: Soren Sandmann + Reviewed-by: Matt Turner + Signed-off-by: Keith Packard + (cherry picked from commit f0b4df99486066ad0e638b3b5debc905bc8ef1c4) + +commit a0895a219027e0a52a5a02db903d662562e02dda +Author: Kristian Høgsberg +Date: Thu Oct 28 20:46:23 2010 -0700 + + Set DamageSetReportAfterOp to true for the damage extension + + Change the damage extension reporter to queue up events after we chain + to the wrapped functions. Damage events are typically sent out after + the rendering happens anyway, since we submit batch buffers from the + flush callback chain and then flush client io buffers. Compositing + managers relie on this order, and there is no way we could reliably + provide damage events to clients before the rendering happens anyway. + + By queueing up the damage events before the rendering happens, there's + a risk that the client io buffer may overflow and send the damage + events to the client before the driver has even seen the rendering + request. Reporting damage events after the rendering fixes this + corner case and better corresponds with how we expect this to work. + + Signed-off-by: Kristian Høgsberg + Reviewed-by: Keith Packard + (cherry picked from commit 8d7b7a0d71e0b89321b3341b781bc8845386def6) + [anholt: re-applied to revert the revert, now that the cause of the + revert is fixed] + Signed-off-by: Keith Packard + (cherry picked from commit 333b6ed26e36735ef72f314a3f8c4ec565af223f) + +commit dfda3c696dd72ecc5cc4fa69d8bb4521ba554cf3 +Author: Eric Anholt +Date: Thu Oct 28 20:46:22 2010 -0700 + + Replace usage of DamageRegionAppend with DamageDamageRegion to fix reportAfter. + + In all these cases, any rendering implied by this damage has already + occurred, and we want to get the damage out to the client. Some of + the DamageRegionAppend calls were explicitly telling damage to flush + the reportAfter damage out, but not all. + + Bug #30260. Fixes the compiz wallpaper plugin with client damage + changed to reportAfter. + + Signed-off-by: Eric Anholt + Reviewed-by: Keith Packard + Signed-off-by: Keith Packard + (cherry picked from commit f36153e3ef6b13a87d016caab09cc9be274b0dd5) + +commit 2e08f1d4b7c0c43c90042a71825992f40388c1fb +Author: Aaron Plattner +Date: Mon Oct 25 22:01:32 2010 -0700 + + os: Fix BigReq ignoring when another request is pending + + Commit cf88363db0ebb42df7cc286b85d30d7898aea840 fixed the handling of + BigReq requests that are way too large and handles the case where the + read() syscall returns a short read. However, it neglected to handle + the case where it returns a long read, which happens when the client + has another request in the queue after the bogus large one. + + Handle the long read case by subtracting the smaller of 'needed' and + 'gotnow' from oci->ignoreBytes. If needed < gotnow, simply subtract + the two, leaving gotnow equal to the number of extra bytes read. + Since the code immediately following the (oci->ignoreBytes > 0) block + tries to handle the next request, advance oci->bufptr immediately + instead of setting oci->lenLastReq and letting the next call to + ReadRequestFromClient do it. + + Fixes the XTS pChangeKeyboardMapping-3 test. + + CASES TESTS PASS UNSUP UNTST NOTIU WARN FIP FAIL UNRES UNIN ABORT + -Xproto 122 389 367 2 19 0 0 0 1 0 0 0 + +Xproto 122 389 368 2 19 0 0 0 0 0 0 0 + + Signed-off-by: Aaron Plattner + Reviewed-by: Adam Jackson + Signed-off-by: Keith Packard + (cherry picked from commit c80c41767eb101e9dbd8393d8cca7764b4e248a4) + +commit 8452392c4bffd424458a82a381ea2496e6556e7e +Author: Siddhesh Poyarekar +Date: Tue Oct 26 09:11:53 2010 +0530 + + mi: Integer overflow for dashed lines longer than 46340. #31093 + + Lines of length greater than 46340 can be drawn with one of the + coordinates being negative. However for dashed lines, miPolyBuildPoly + overflows the int type when setting up edges for a section of the + dashed line. This results in the dashed segments not being drawn at + all. + + Signed-off-by: Siddhesh Poyarekar + Reviewed-by: Keith Packard + Signed-off-by: Keith Packard + (cherry picked from commit be7cf14c365c8ee0d69c4335e01316bcfcba69a4) + +commit b4bb374cc356be0a416f1d7f52dbb2adb6e512d3 +Author: Julien Cristau +Date: Mon May 17 19:39:54 2010 +0200 + + os: include dix-config.h, not xorg-config.h + + os/strlc{at,py}.c were trying to include xorg-config.h, which is not + available in dix. + + Signed-off-by: Julien Cristau + Acked-by: Peter Hutterer + Signed-off-by: Peter Hutterer + (cherry picked from commit 69e8e1b0b95a325da3e3a2d76d092e7131baa9ad) + +commit f51f1de995f0e3f0983c873ae51f7c6ae11699cf +Author: Samuel Thibault +Date: Sat Oct 23 22:42:33 2010 +0200 + + hurd: Fix use of deprecated iopl device + + Fix Xserver on GNU/Hurd into using the "mem" device instead of + the deprecated "iopl" device. + + Reviewed-by: Olaf Buddenhagen + Signed-off-by: Samuel Thibault + (cherry picked from commit f72aadd38b730c46c0a027dacbbb57f03068383d) + +commit 0daba1a91a8b601f5168411f2bc123c5346bdb8d +Author: Aaron Plattner +Date: Sun Oct 17 09:58:50 2010 -0700 + + Revert "Set DamageSetReportAfterOp to true for the damage extension" (#30260) + + This commit breaks the Compiz "Wallpaper" plugin. + + This reverts commit 8d7b7a0d71e0b89321b3341b781bc8845386def6. + + Reviewed-by: Keith Packard + Signed-off-by: Keith Packard + (cherry picked from commit 1a0d9324b3d9fd93e685066e0e5cea0611878c0d) + +commit 4c85d94bf70cea583f15d60be5c9127caae3a79f +Author: Michał Górny +Date: Thu Oct 14 15:49:51 2010 +0200 + + kdrive: Fix linking with tslib, with -Wl, --as-needed. #30600 + + Change the library order in TSLIB_LIBS variable, placing ${TSLIB_LIBS} + after the local static libraries. This fixes linking with + -Wl,--as-needed. + + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30600 + Signed-off-by: Michał Górny + Reviewed-by: Daniel Stone + Signed-off-by: Keith Packard + (cherry picked from commit 8806a04f7f028dd9f6a7ff5c36e460d3895c7deb) + +commit 43020e1ac923fb3a7ef792722bcf9d30874f5bfe +Author: Michał Górny +Date: Thu Oct 14 15:49:50 2010 +0200 + + kdrive: Fix tslib check fallback to set TSLIB_LIBS. #30599 + + If pkg-config is unable to find tslib but the fallback check does find + it, the compilation continues with tslib support enabled though + TSLIB_LIBS are unset. Thus, the compilation fails with a linking error + on tslib functions. + + This patch sets TSLIB_LIBS to '-lts' whenever the tslib fallback check + succeeds. + + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30599 + Signed-off-by: Michał Górny + Reviewed-by: Daniel Stone + Signed-off-by: Keith Packard + (cherry picked from commit c7e436e9987a6fb0876c63e96f59ff4c20b4bef0) + +commit 46314e1e7ad05d6ff6a2f722b09a76f2931db7f5 +Author: Paulius Zaleckas +Date: Mon Oct 18 00:02:01 2010 +0300 + + KDrive: Fix error handlig in tslib driver + + If ts_open() fails and return NULL, then next call to ts_fd() + segfaults because of NULL dereference. There is no need to + check output of ts_fd() as ts_open() did this internally. + + Signed-off-by: Paulius Zaleckas + Reviewed-by: Daniel Stone + Reviewed-by: Keith Packard + Signed-off-by: Peter Hutterer + (cherry picked from commit 8990b31214bcbc08090604147287455bfde91c11) + +commit 97915c06d10544d47ca69bd3610fd114d70e071f +Author: Tiago Vignatti +Date: Tue Oct 26 20:50:13 2010 +0300 + + dix: advance parent window pointer when no node is found + + Signed-off-by: Tiago Vignatti + Signed-off-by: Pauli Nieminen + Reviewed-by: Peter Hutterer + Signed-off-by: Peter Hutterer + (cherry picked from commit a210068c5222acbdb04db17cb8cef314735bf977) + +commit 4a2caa287d36128d4f7bf10ced7ecb0e505011b2 +Author: Joe Shaw +Date: Thu Oct 14 15:09:20 2010 -0400 + + fix a sign problem with valuator data. + + Without this patch, any negative valuator value is wrong when returned + from XQueryDeviceState(). This is a regression from at least xserver + 1.4. + + Valuator data is set in dix/getevents.c:set_valuators() by copying + signed int values into an unsigned int field + DeviceEvent.valuators.data. + + That data is converted into a double with an implicit cast by + assignment to axisVal[i] in Xi/exevents.c:UpdateDeviceState(). + + That double is converted back to a signed int in + queryst.c:ProcXQueryDeviceState(). If the original value in + set_valuators() is negative, the double value will be > 2^31 and the + conversion back to a signed int is undefined. (Although I + consistently see the value -2^31.) + + Fix this by changing the definition of DeviceEvent.valuators.data from + uint32_t to int32_t. + + Signed-off-by: Joe Shaw + Reviewed-by: Chase Douglas + Reviewed-by: Peter Hutterer + Signed-off-by: Peter Hutterer + (cherry picked from commit e354ccac36a8ee3a23bdc845833c16a5646cc200) + +commit 0f29d3a09dd96b5c124642f7cb939d48597b228c +Author: Peter Hutterer +Date: Mon Oct 11 15:38:38 2010 +1000 + + xkb: init mapWidth and symsPerKey arrays to 0. + + Helps debugging greatly, random 8 or 16 bit values can sometimes look like + valid values, causing much excitement on the client front. + + Signed-off-by: Peter Hutterer + Reviewed-by: Daniel Stone + (cherry picked from commit ca21a266224b6eff4fd817c2082d2e144f1ea58c) + +commit 8ff9b495e09b378d615cfd17e17f98d269713dd6 +Author: Peter Hutterer +Date: Thu Oct 28 16:13:09 2010 +1000 + + Xi: reshuffle conditions for labeling a device as IsXExtensionKeyboard (#29046) + + From the original bug reporter Ezra Reeves: + + "I did some more digging on this today, and I found that an HP branded + wireless USB mouse has the same issue. With this mouse (as well as the + logitech wireless mouse), the return from: + + xdev = XListInputDevices(GDK_WINDOW_XDISPLAY(rootwin), &ndevices_return); + + lists the USB device twice, but both have xdev[num].use == 3 + (IsXExtensionKeyboard as defined in X11/XI.h). + + [...] + + Swapping the order of the test in Xi/listdev.c that determines whether a + device is a pointer or a keyboard properly detects my devices (OEM USB + wireless mouse/kb combo) -- one as a keyboard and one as a pointer." + + X.Org Bug 29046 + + Reported-by: Erik Kilfoil + Reviewed-by: Peter Hutterer + Signed-off-by: Peter Hutterer + (cherry picked from commit fe8d122b133a43125cc961d2c3c811fa776f29c8) + +commit b144c0f4c72977671a39fa6368cbfea142444096 +Author: Peter Hutterer +Date: Wed Oct 13 10:31:51 2010 +1000 + + xfree86: set mask for valuators 0/1 when emulating core events (#30267) + + EventToCore as of the commit below won't generate core motion events if the + valuator mask for x/y isn't set. For DGA, we work around this check by + forcibly setting the mask in the event we pass down. + + commit de8be07cc0a8163b6ef04455706fd5ca2cebe587 + Author: Peter Hutterer + Date: Tue Aug 17 12:08:52 2010 +1000 + + dix: don't create core motion events for non-x/y valuators. + + X.Org Bug 30267 + + Signed-off-by: Peter Hutterer + Tested-by: Andrew Randrianasulu + Tested-by: Andy Furniss + Reviewed-by: Daniel Stone + (cherry picked from commit 9872e0f0115cd7d0543e55a1831facddf3aff90c) + +commit 79f2a58c323bd1ad373f1f929207b5af98031b95 +Author: Peter Hutterer +Date: Tue Aug 17 12:08:52 2010 +1000 + + dix: don't create core motion events for non-x/y valuators. + + Devices that send motion events with valuators other than x/y get core + motion events with unchanged x/y coordinates. This confuses some + applications. + + If the DeviceEvent does not have the x/y valuators set, return BadMatch on + core conversion, thus skipping the event altogether. + + Reported-by: Bartosz Brachaczek + Signed-off-by: Peter Hutterer + Tested-by: Bartosz Brachaczek + (cherry picked from commit de8be07cc0a8163b6ef04455706fd5ca2cebe587) + commit e3769c20d5f656f76e2c475a722db97c58089260 Author: Jeremy Huddleston Date: Sat Oct 30 19:49:42 2010 -0700 diff --git a/xserver/Makefile.in b/xserver/Makefile.in index c932b97d7..356321695 100644 --- a/xserver/Makefile.in +++ b/xserver/Makefile.in @@ -216,6 +216,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/Xext/Makefile.in b/xserver/Xext/Makefile.in index 5e562e330..7ff83174a 100644 --- a/xserver/Xext/Makefile.in +++ b/xserver/Xext/Makefile.in @@ -285,6 +285,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/Xext/panoramiXprocs.c b/xserver/Xext/panoramiXprocs.c index 67b40304d..d84316895 100644 --- a/xserver/Xext/panoramiXprocs.c +++ b/xserver/Xext/panoramiXprocs.c @@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client) rep.dstX = x - pDst->drawable.x; rep.dstY = y - pDst->drawable.y; if((pDst == screenInfo.screens[0]->root) || - (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid)) + (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid)) { rep.dstX += screenInfo.screens[0]->x; rep.dstY += screenInfo.screens[0]->y; diff --git a/xserver/Xi/Makefile.in b/xserver/Xi/Makefile.in index bba894359..05a9e259a 100644 --- a/xserver/Xi/Makefile.in +++ b/xserver/Xi/Makefile.in @@ -207,6 +207,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/Xi/extinit.c b/xserver/Xi/extinit.c index eda4efb50..fb8ad19ba 100644 --- a/xserver/Xi/extinit.c +++ b/xserver/Xi/extinit.c @@ -1120,8 +1120,6 @@ RestoreExtensionEvents(void) static void IResetProc(ExtensionEntry * unused) { - XIResetProperties(); - ReplySwapVector[IReqCode] = ReplyNotSwappd; EventSwapVector[DeviceValuator] = NotImplemented; EventSwapVector[DeviceKeyPress] = NotImplemented; @@ -1302,6 +1300,8 @@ XInputExtensionInit(void) inputInfo.all_devices = &xi_all_devices; inputInfo.all_master_devices = &xi_all_master_devices; + + XIResetProperties(); } else { FatalError("IExtensionInit: AddExtensions failed\n"); } diff --git a/xserver/Xi/listdev.c b/xserver/Xi/listdev.c index 3b2272bc3..b38fbd1c0 100644 --- a/xserver/Xi/listdev.c +++ b/xserver/Xi/listdev.c @@ -180,10 +180,10 @@ CopySwapDevice(ClientPtr client, DeviceIntPtr d, int num_classes, dev->use = IsXKeyboard; else if (IsMaster(d) && IsPointerDevice(d)) dev->use = IsXPointer; - else if (d->key && d->kbdfeed) - dev->use = IsXExtensionKeyboard; else if (d->valuator && d->button) dev->use = IsXExtensionPointer; + else if (d->key && d->kbdfeed) + dev->use = IsXExtensionKeyboard; else dev->use = IsXExtensionDevice; diff --git a/xserver/aclocal.m4 b/xserver/aclocal.m4 index fe55da927..1ce430705 100644 --- a/xserver/aclocal.m4 +++ b/xserver/aclocal.m4 @@ -9202,32 +9202,28 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)" AC_SUBST([CHANGELOG_CMD]) ]) # XORG_CHANGELOG -dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ dnl -dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved. -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation. -dnl -dnl The above copyright notice and this permission notice shall be included -dnl in all copies or substantial portions of the Software. -dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -dnl OTHER DEALINGS IN THE SOFTWARE. -dnl -dnl Except as contained in this notice, the name of the copyright holders shall -dnl not be used in advertising or otherwise to promote the sale, use or -dnl other dealings in this Software without prior written authorization -dnl from the copyright holders. -dnl +dnl Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +dnl +dnl Permission is hereby granted, free of charge, to any person obtaining a +dnl copy of this software and associated documentation files (the "Software"), +dnl to deal in the Software without restriction, including without limitation +dnl the rights to use, copy, modify, merge, publish, distribute, sublicense, +dnl and/or sell copies of the Software, and to permit persons to whom the +dnl Software is furnished to do so, subject to the following conditions: +dnl +dnl The above copyright notice and this permission notice (including the next +dnl paragraph) shall be included in all copies or substantial portions of the +dnl Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +dnl DEALINGS IN THE SOFTWARE. +dnl # XTRANS_TCP_FLAGS() # ------------------ diff --git a/xserver/composite/Makefile.in b/xserver/composite/Makefile.in index 4134adfdc..13634f94a 100644 --- a/xserver/composite/Makefile.in +++ b/xserver/composite/Makefile.in @@ -209,6 +209,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/composite/compalloc.c b/xserver/composite/compalloc.c index d8ccc1181..246e4c5fd 100644 --- a/xserver/composite/compalloc.c +++ b/xserver/composite/compalloc.c @@ -238,7 +238,7 @@ compFreeClientWindow (WindowPtr pWin, XID id) DamageRegister (&pWin->drawable, cw->damage); cw->damageRegistered = TRUE; pWin->redirectDraw = RedirectDrawAutomatic; - DamageRegionAppend(&pWin->drawable, &pWin->borderSize); + DamageDamageRegion(&pWin->drawable, &pWin->borderSize); } if (wasMapped && !pWin->mapped) { diff --git a/xserver/composite/compwindow.c b/xserver/composite/compwindow.c index 160b7644f..4dab13577 100644 --- a/xserver/composite/compwindow.c +++ b/xserver/composite/compwindow.c @@ -519,7 +519,7 @@ compCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) RegionTranslate(prgnSrc, pWin->drawable.x - ptOldOrg.x, pWin->drawable.y - ptOldOrg.y); - DamageRegionAppend(&pWin->drawable, prgnSrc); + DamageDamageRegion(&pWin->drawable, prgnSrc); } cs->CopyWindow = pScreen->CopyWindow; pScreen->CopyWindow = compCopyWindow; @@ -598,7 +598,7 @@ compSetRedirectBorderClip (WindowPtr pWin, RegionPtr pRegion) /* * Report that as damaged so it will be redrawn */ - DamageRegionAppend(&pWin->drawable, &damage); + DamageDamageRegion(&pWin->drawable, &damage); RegionUninit(&damage); /* * Save the new border clip region diff --git a/xserver/config/Makefile.in b/xserver/config/Makefile.in index 5d8cb8bc3..fbf273f1c 100644 --- a/xserver/config/Makefile.in +++ b/xserver/config/Makefile.in @@ -229,6 +229,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/configure b/xserver/configure index dcb741a03..ef4a2d17e 100644 --- a/xserver/configure +++ b/xserver/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for xorg-server 1.9.2. +# Generated by GNU Autoconf 2.62 for xorg-server 1.9.3. # # Report bugs to . # @@ -810,8 +810,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.9.2' -PACKAGE_STRING='xorg-server 1.9.2' +PACKAGE_VERSION='1.9.3' +PACKAGE_STRING='xorg-server 1.9.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1065,6 +1065,8 @@ INT10_STUB_TRUE INT10_STUB_FALSE BUILDDOCS_TRUE BUILDDOCS_FALSE +ENABLE_DOCS_TRUE +ENABLE_DOCS_FALSE ENABLE_DEVEL_DOCS_TRUE ENABLE_DEVEL_DOCS_FALSE XMLTO @@ -1492,6 +1494,7 @@ enable_tcp_transport enable_ipv6 enable_local_transport enable_secure_rpc +enable_docs enable_devel_docs with_xmlto with_fop @@ -2143,7 +2146,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-server 1.9.2 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.9.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2213,7 +2216,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.9.2:";; + short | recursive ) echo "Configuration of xorg-server 1.9.3:";; esac cat <<\_ACEOF @@ -2312,6 +2315,7 @@ Optional Features: --enable-local-transport Enable os-specific local transport --enable-secure-rpc Enable Secure RPC + --enable-docs Enable building the documentation (yes: yes) --enable-devel-docs Enable building the developer documentation (default: yes) @@ -2600,7 +2604,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.9.2 +xorg-server configure 1.9.3 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2614,7 +2618,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 1.9.2, which was +It was created by xorg-server $as_me 1.9.3, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2980,7 +2984,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -RELEASE_DATE="2010-10-30" +RELEASE_DATE="2010-12-13" am__api_version="1.9" ac_aux_dir= @@ -3265,7 +3269,7 @@ fi # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.9.2' + VERSION='1.9.3' cat >>confdefs.h <<_ACEOF @@ -7693,7 +7697,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7696 "configure"' > conftest.$ac_ext + echo '#line 7700 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10606,11 +10610,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10609: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10613: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10613: \$? = $ac_status" >&5 + echo "$as_me:10617: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10896,11 +10900,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10899: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10903: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10903: \$? = $ac_status" >&5 + echo "$as_me:10907: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11000,11 +11004,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11003: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11007: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11007: \$? = $ac_status" >&5 + echo "$as_me:11011: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13400,7 +13404,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:15916: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15916: \$? = $ac_status" >&5 + echo "$as_me:15920: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16013,11 +16017,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16016: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16020: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16020: \$? = $ac_status" >&5 + echo "$as_me:16024: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17596,11 +17600,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17599: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17603: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17603: \$? = $ac_status" >&5 + echo "$as_me:17607: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17700,11 +17704,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17703: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17707: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17707: \$? = $ac_status" >&5 + echo "$as_me:17711: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19915,11 +19919,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19918: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19922: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19922: \$? = $ac_status" >&5 + echo "$as_me:19926: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -20205,11 +20209,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20208: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20212: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20212: \$? = $ac_status" >&5 + echo "$as_me:20216: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -20309,11 +20313,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20312: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20316: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20316: \$? = $ac_status" >&5 + echo "$as_me:20320: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -32182,6 +32186,31 @@ fi +# Check whether --enable-docs was given. +if test "${enable_docs+set}" = set; then + enableval=$enable_docs; build_docs=$enableval +else + build_docs=yes +fi + + + + +if test x$build_docs = xyes; then + ENABLE_DOCS_TRUE= + ENABLE_DOCS_FALSE='#' +else + ENABLE_DOCS_TRUE='#' + ENABLE_DOCS_FALSE= +fi + +{ $as_echo "$as_me:$LINENO: checking whether to build documentation" >&5 +$as_echo_n "checking whether to build documentation... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $build_docs" >&5 +$as_echo "$build_docs" >&6; } + + + # Check whether --enable-devel-docs was given. if test "${enable_devel_docs+set}" = set; then enableval=$enable_devel_docs; build_devel_docs=$enableval @@ -35977,7 +36006,7 @@ _ACEOF if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then DIX_LIB='$(top_builddir)/dix/dix.O' - OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS)' + OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS)' else DIX_LIB='$(top_builddir)/dix/libdix.la' OS_LIB='$(top_builddir)/os/libos.la' @@ -41584,7 +41613,10 @@ fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ts_ts_open" >&5 $as_echo "$ac_cv_lib_ts_ts_open" >&6; } if test $ac_cv_lib_ts_ts_open = yes; then - HAVE_TSLIB="yes" + + HAVE_TSLIB="yes" + TSLIB_LIBS="-lts" + fi fi @@ -41930,8 +41962,8 @@ fi KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la' KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB" KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" - KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS" + KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB" + KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS" @@ -42462,6 +42494,13 @@ $as_echo "$as_me: error: conditional \"BUILDDOCS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${ENABLE_DOCS_TRUE}" && test -z "${ENABLE_DOCS_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DOCS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ENABLE_DOCS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${ENABLE_DEVEL_DOCS_TRUE}" && test -z "${ENABLE_DEVEL_DOCS_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_DEVEL_DOCS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -43351,7 +43390,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-server $as_me 1.9.2, which was +This file was extended by xorg-server $as_me 1.9.3, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -43404,7 +43443,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xorg-server config.status 1.9.2 +xorg-server config.status 1.9.3 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/xserver/configure.ac b/xserver/configure.ac index ad5f6c18b..42411b0d5 100644 --- a/xserver/configure.ac +++ b/xserver/configure.ac @@ -26,8 +26,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([xorg-server], 1.9.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2010-10-30" +AC_INIT([xorg-server], 1.9.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2010-12-13" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -745,6 +745,7 @@ fi dnl Handle building documentation AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes) +XORG_ENABLE_DOCS XORG_ENABLE_DEVEL_DOCS XORG_WITH_XMLTO(0.0.20) XORG_WITH_FOP @@ -1364,7 +1365,7 @@ AC_DEFINE(BIGREQS, 1, [Support BigRequests extension]) if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then DIX_LIB='$(top_builddir)/dix/dix.O' - OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS)' + OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS)' else DIX_LIB='$(top_builddir)/dix/libdix.la' OS_LIB='$(top_builddir)/os/libos.la' @@ -2083,7 +2084,10 @@ if test "$KDRIVE" = yes; then PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) if test "x$HAVE_TSLIB" = xno; then - AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"]) + AC_CHECK_LIB(ts, ts_open, [ + HAVE_TSLIB="yes" + TSLIB_LIBS="-lts" + ]) fi if test "xTSLIB" = xauto; then @@ -2180,8 +2184,8 @@ if test "$KDRIVE" = yes; then KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la' KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB" KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" - KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS" + KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB" + KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS" AC_SUBST([XEPHYR_LIBS]) AC_SUBST([XEPHYR_INCS]) diff --git a/xserver/damageext/Makefile.in b/xserver/damageext/Makefile.in index 17f70d928..f806bc936 100644 --- a/xserver/damageext/Makefile.in +++ b/xserver/damageext/Makefile.in @@ -196,6 +196,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/damageext/damageext.c b/xserver/damageext/damageext.c index b4bb478dd..754383d49 100644 --- a/xserver/damageext/damageext.c +++ b/xserver/damageext/damageext.c @@ -223,7 +223,7 @@ ProcDamageCreate (ClientPtr client) if (pDrawable->type == DRAWABLE_WINDOW) { pRegion = &((WindowPtr) pDrawable)->borderClip; - DamageRegionAppend(pDrawable, pRegion); + DamageDamageRegion(pDrawable, pRegion); } return Success; @@ -293,7 +293,7 @@ ProcDamageAdd (ClientPtr client) * screen coordinates like damage expects. */ RegionTranslate(pRegion, pDrawable->x, pDrawable->y); - DamageRegionAppend(pDrawable, pRegion); + DamageDamageRegion(pDrawable, pRegion); RegionTranslate(pRegion, -pDrawable->x, -pDrawable->y); return Success; diff --git a/xserver/dbe/Makefile.in b/xserver/dbe/Makefile.in index 3fc9b9be7..b2cce52a0 100644 --- a/xserver/dbe/Makefile.in +++ b/xserver/dbe/Makefile.in @@ -208,6 +208,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/dix/Makefile.am b/xserver/dix/Makefile.am index 5e2dad7d3..59e512ba7 100644 --- a/xserver/dix/Makefile.am +++ b/xserver/dix/Makefile.am @@ -1,5 +1,6 @@ noinst_LTLIBRARIES = libdix.la libmain.la +AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(DIX_CFLAGS) libmain_la_SOURCES = \ diff --git a/xserver/dix/Makefile.in b/xserver/dix/Makefile.in index d1179d679..916361421 100644 --- a/xserver/dix/Makefile.in +++ b/xserver/dix/Makefile.in @@ -222,6 +222,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ @@ -625,6 +627,7 @@ sysconfdir = @sysconfdir@ sysconfigdir = @sysconfigdir@ target_alias = @target_alias@ noinst_LTLIBRARIES = libdix.la libmain.la +AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(DIX_CFLAGS) libmain_la_SOURCES = \ main.c diff --git a/xserver/dix/eventconvert.c b/xserver/dix/eventconvert.c index 4e3de0b46..0f747c1a0 100644 --- a/xserver/dix/eventconvert.c +++ b/xserver/dix/eventconvert.c @@ -102,6 +102,15 @@ EventToCore(InternalEvent *event, xEvent *core) switch(event->any.type) { case ET_Motion: + { + DeviceEvent *e = &event->device_event; + /* Don't create core motion event if neither x nor y are + * present */ + if (!BitIsOn(e->valuators.mask, 0) && + !BitIsOn(e->valuators.mask, 1)) + return BadMatch; + } + /* fallthrough */ case ET_ButtonPress: case ET_ButtonRelease: case ET_KeyPress: diff --git a/xserver/dix/getevents.c b/xserver/dix/getevents.c index e5134d34b..8c64f1d59 100644 --- a/xserver/dix/getevents.c +++ b/xserver/dix/getevents.c @@ -111,12 +111,12 @@ set_button_up(DeviceIntPtr pDev, int button, int type) Bool button_is_down(DeviceIntPtr pDev, int button, int type) { - int ret = 0; + Bool ret = FALSE; if (type & BUTTON_PROCESSED) - ret |= !!BitIsOn(pDev->button->down, button); + ret = ret || BitIsOn(pDev->button->down, button); if (type & BUTTON_POSTED) - ret |= !!BitIsOn(pDev->button->postdown, button); + ret = ret || BitIsOn(pDev->button->postdown, button); return ret; } @@ -142,12 +142,12 @@ set_key_up(DeviceIntPtr pDev, int key_code, int type) Bool key_is_down(DeviceIntPtr pDev, int key_code, int type) { - int ret = 0; + Bool ret = FALSE; if (type & KEY_PROCESSED) - ret |= !!BitIsOn(pDev->key->down, key_code); + ret = ret || BitIsOn(pDev->key->down, key_code); if (type & KEY_POSTED) - ret |= !!BitIsOn(pDev->key->postdown, key_code); + ret = ret || BitIsOn(pDev->key->postdown, key_code); return ret; } @@ -210,7 +210,7 @@ set_valuators(DeviceIntPtr dev, DeviceEvent* event, int first_valuator, } memcpy(&event->valuators.data[first_valuator], - valuators, num_valuators * sizeof(uint32_t)); + valuators, num_valuators * sizeof(int32_t)); } diff --git a/xserver/dix/inpututils.c b/xserver/dix/inpututils.c index 8ec80b5e8..6693c67b3 100644 --- a/xserver/dix/inpututils.c +++ b/xserver/dix/inpututils.c @@ -286,7 +286,7 @@ int generate_modkeymap(ClientPtr client, DeviceIntPtr dev, { CARD8 keys_per_mod[8]; int max_keys_per_mod; - KeyCode *modkeymap; + KeyCode *modkeymap = NULL; int i, j, ret; ret = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixGetAttrAccess); @@ -310,18 +310,20 @@ int generate_modkeymap(ClientPtr client, DeviceIntPtr dev, } } - modkeymap = calloc(max_keys_per_mod * 8, sizeof(KeyCode)); - if (!modkeymap) - return BadAlloc; + if (max_keys_per_mod != 0) { + modkeymap = calloc(max_keys_per_mod * 8, sizeof(KeyCode)); + if (!modkeymap) + return BadAlloc; - for (i = 0; i < 8; i++) - keys_per_mod[i] = 0; + for (i = 0; i < 8; i++) + keys_per_mod[i] = 0; - for (i = 8; i < MAP_LENGTH; i++) { - for (j = 0; j < 8; j++) { - if (dev->key->xkbInfo->desc->map->modmap[i] & (1 << j)) { - modkeymap[(j * max_keys_per_mod) + keys_per_mod[j]] = i; - keys_per_mod[j]++; + for (i = 8; i < MAP_LENGTH; i++) { + for (j = 0; j < 8; j++) { + if (dev->key->xkbInfo->desc->map->modmap[i] & (1 << j)) { + modkeymap[(j * max_keys_per_mod) + keys_per_mod[j]] = i; + keys_per_mod[j]++; + } } } } diff --git a/xserver/dix/window.c b/xserver/dix/window.c index 1913030cf..edb146e97 100644 --- a/xserver/dix/window.c +++ b/xserver/dix/window.c @@ -3660,9 +3660,9 @@ WindowParentHasDeviceCursor(WindowPtr pWin, &pParentNode, &pParentPrev)) { /* if there is a node in the list, the win has a dev cursor */ - if (!pParentNode->cursor) /* inherited. loop needs to cont. */ - { - } else if (pParentNode->cursor == pCursor) /* inherit */ + if (!pParentNode->cursor) /* inherited. */ + pParent = pParent->parent; + else if (pParentNode->cursor == pCursor) /* inherit */ return TRUE; else /* different cursor */ return FALSE; diff --git a/xserver/doc/Makefile.in b/xserver/doc/Makefile.in index 4b74b0b57..fcf92abcf 100644 --- a/xserver/doc/Makefile.in +++ b/xserver/doc/Makefile.in @@ -205,6 +205,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/doc/xml/Makefile.in b/xserver/doc/xml/Makefile.in index 3e121c656..487c24dc7 100644 --- a/xserver/doc/xml/Makefile.in +++ b/xserver/doc/xml/Makefile.in @@ -251,6 +251,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/doc/xml/dtrace/Makefile.am b/xserver/doc/xml/dtrace/Makefile.am index 0e25e5d43..a95d37418 100644 --- a/xserver/doc/xml/dtrace/Makefile.am +++ b/xserver/doc/xml/dtrace/Makefile.am @@ -25,11 +25,13 @@ XML_FILES = Xserver-DTrace.xml include ../xmlrules.in +if ENABLE_DOCS if XSERVER_DTRACE doc_DATA = $(BUILT_DOC_FILES) else noinst_DATA = $(BUILT_DOC_FILES) endif +endif CLEANFILES = $(CLEAN_DOC_FILES) diff --git a/xserver/doc/xml/dtrace/Makefile.in b/xserver/doc/xml/dtrace/Makefile.in index d73c4b312..61c1e162f 100644 --- a/xserver/doc/xml/dtrace/Makefile.in +++ b/xserver/doc/xml/dtrace/Makefile.in @@ -250,6 +250,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ @@ -662,8 +664,8 @@ SUFFIXES = .xml .txt .html .pdf XML_ENT_DIR = $(abs_top_builddir)/doc/xml XMLTO_FLAGS = --searchpath $(XML_ENT_DIR) $(am__append_1) CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES) xorg.css -@XSERVER_DTRACE_TRUE@doc_DATA = $(BUILT_DOC_FILES) -@XSERVER_DTRACE_FALSE@noinst_DATA = $(BUILT_DOC_FILES) +@ENABLE_DOCS_TRUE@@XSERVER_DTRACE_TRUE@doc_DATA = $(BUILT_DOC_FILES) +@ENABLE_DOCS_TRUE@@XSERVER_DTRACE_FALSE@noinst_DATA = $(BUILT_DOC_FILES) CLEANFILES = $(CLEAN_DOC_FILES) EXTRA_DIST = $(XML_FILES) all: all-am diff --git a/xserver/exa/Makefile.in b/xserver/exa/Makefile.in index b7f145d0e..eabc0f881 100644 --- a/xserver/exa/Makefile.in +++ b/xserver/exa/Makefile.in @@ -210,6 +210,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/exa/exa.c b/xserver/exa/exa.c index fc15c2471..8adf8473c 100644 --- a/xserver/exa/exa.c +++ b/xserver/exa/exa.c @@ -159,8 +159,7 @@ exaPixmapDirty (PixmapPtr pPix, int x1, int y1, int x2, int y2) return; RegionInit(®ion, &box, 1); - DamageRegionAppend(&pPix->drawable, ®ion); - DamageRegionProcessPending(&pPix->drawable); + DamageDamageRegion(&pPix->drawable, ®ion); RegionUninit(®ion); } diff --git a/xserver/fb/Makefile.in b/xserver/fb/Makefile.in index 8c5a10138..fc2e6c610 100644 --- a/xserver/fb/Makefile.in +++ b/xserver/fb/Makefile.in @@ -233,6 +233,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/glx/Makefile.in b/xserver/glx/Makefile.in index 4c51838b9..29d4ead65 100644 --- a/xserver/glx/Makefile.in +++ b/xserver/glx/Makefile.in @@ -216,6 +216,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/glx/glxdri.c b/xserver/glx/glxdri.c index 41482c913..6458ef928 100644 --- a/xserver/glx/glxdri.c +++ b/xserver/glx/glxdri.c @@ -834,9 +834,7 @@ static void __glXReportDamage(__DRIdrawable *driDraw, RegionInit(®ion, (BoxPtr) rects, num_rects); RegionTranslate(®ion, pDraw->x, pDraw->y); - DamageRegionAppend(pDraw, ®ion); - /* This is wrong, this needs a seperate function. */ - DamageRegionProcessPending(pDraw); + DamageDamageRegion(pDraw, ®ion); RegionUninit(®ion); __glXleaveServer(GL_FALSE); diff --git a/xserver/hw/Makefile.in b/xserver/hw/Makefile.in index 56a2189b3..b5dbc07eb 100644 --- a/xserver/hw/Makefile.in +++ b/xserver/hw/Makefile.in @@ -189,6 +189,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/dmx/Makefile.in b/xserver/hw/dmx/Makefile.in index bcec2c9d9..339b2c6e3 100644 --- a/xserver/hw/dmx/Makefile.in +++ b/xserver/hw/dmx/Makefile.in @@ -239,6 +239,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/dmx/config/Makefile.in b/xserver/hw/dmx/config/Makefile.in index 80a7a481b..c89c64afa 100644 --- a/xserver/hw/dmx/config/Makefile.in +++ b/xserver/hw/dmx/config/Makefile.in @@ -229,6 +229,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/dmx/doc/Makefile.in b/xserver/hw/dmx/doc/Makefile.in index 554dc6e2f..d67ec7ab3 100644 --- a/xserver/hw/dmx/doc/Makefile.in +++ b/xserver/hw/dmx/doc/Makefile.in @@ -240,6 +240,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/dmx/examples/Makefile.in b/xserver/hw/dmx/examples/Makefile.in index ede9f24f3..a24c3a04d 100644 --- a/xserver/hw/dmx/examples/Makefile.in +++ b/xserver/hw/dmx/examples/Makefile.in @@ -256,6 +256,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/dmx/glxProxy/Makefile.in b/xserver/hw/dmx/glxProxy/Makefile.in index 59e958784..29efbfea5 100644 --- a/xserver/hw/dmx/glxProxy/Makefile.in +++ b/xserver/hw/dmx/glxProxy/Makefile.in @@ -204,6 +204,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/dmx/glxProxy/glxcmds.c b/xserver/hw/dmx/glxProxy/glxcmds.c index 88cf901f7..f7ae11371 100644 --- a/xserver/hw/dmx/glxProxy/glxcmds.c +++ b/xserver/hw/dmx/glxProxy/glxcmds.c @@ -1536,7 +1536,7 @@ int __glXGetVisualConfigs(__GLXclientState *cl, GLbyte *pc) int i, p; screen = req->screen; - if (screen > screenInfo.numScreens) { + if (screen >= screenInfo.numScreens) { /* The client library must send a valid screen number. */ client->errorValue = screen; return BadValue; @@ -2685,7 +2685,7 @@ int __glXGetFBConfigs(__GLXclientState *cl, GLbyte *pc) int numFBConfigs, i, p; __GLXscreenInfo *pGlxScreen; - if (screen > screenInfo.numScreens) { + if (screen >= screenInfo.numScreens) { /* The client library must send a valid screen number. */ client->errorValue = screen; return BadValue; @@ -3107,7 +3107,7 @@ int __glXCreatePbuffer(__GLXclientState *cl, GLbyte *pc) /* ** Look up screen and FBConfig. */ - if (screen > screenInfo.numScreens) { + if (screen >= screenInfo.numScreens) { /* The client library must send a valid screen number. */ client->errorValue = screen; return BadValue; diff --git a/xserver/hw/dmx/glxProxy/glxcmdsswap.c b/xserver/hw/dmx/glxProxy/glxcmdsswap.c index 960c60d81..feb70a4cf 100644 --- a/xserver/hw/dmx/glxProxy/glxcmdsswap.c +++ b/xserver/hw/dmx/glxProxy/glxcmdsswap.c @@ -252,7 +252,7 @@ int __glXSwapGetVisualConfigs(__GLXclientState *cl, GLbyte *pc) __GLX_SWAP_INT(&req->screen); screen = req->screen; - if (screen > screenInfo.numScreens) { + if (screen >= screenInfo.numScreens) { /* The client library must send a valid screen number. */ client->errorValue = screen; return BadValue; diff --git a/xserver/hw/dmx/input/Makefile.in b/xserver/hw/dmx/input/Makefile.in index 2cbe22d7f..6fec64509 100644 --- a/xserver/hw/dmx/input/Makefile.in +++ b/xserver/hw/dmx/input/Makefile.in @@ -218,6 +218,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/kdrive/Makefile.in b/xserver/hw/kdrive/Makefile.in index a9bbabdf8..f2b1d8109 100644 --- a/xserver/hw/kdrive/Makefile.in +++ b/xserver/hw/kdrive/Makefile.in @@ -189,6 +189,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/kdrive/ephyr/Makefile.in b/xserver/hw/kdrive/ephyr/Makefile.in index 836211259..1c39cf4d5 100644 --- a/xserver/hw/kdrive/ephyr/Makefile.in +++ b/xserver/hw/kdrive/ephyr/Makefile.in @@ -245,6 +245,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/kdrive/ephyr/ephyrdriext.c b/xserver/hw/kdrive/ephyr/ephyrdriext.c index ce584b051..050ce6c9a 100644 --- a/xserver/hw/kdrive/ephyr/ephyrdriext.c +++ b/xserver/hw/kdrive/ephyr/ephyrdriext.c @@ -473,7 +473,7 @@ EphyrDuplicateVisual (unsigned int a_screen, int i=0 ; EPHYR_LOG ("enter\n") ; - if (a_screen > screenInfo.numScreens) { + if (a_screen >= screenInfo.numScreens) { EPHYR_LOG_ERROR ("bad screen number\n") ; goto out; } diff --git a/xserver/hw/kdrive/fake/Makefile.in b/xserver/hw/kdrive/fake/Makefile.in index 8bde9143c..a27e17305 100644 --- a/xserver/hw/kdrive/fake/Makefile.in +++ b/xserver/hw/kdrive/fake/Makefile.in @@ -203,6 +203,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/kdrive/fbdev/Makefile.in b/xserver/hw/kdrive/fbdev/Makefile.in index d28db0995..f2dd03dc7 100644 --- a/xserver/hw/kdrive/fbdev/Makefile.in +++ b/xserver/hw/kdrive/fbdev/Makefile.in @@ -204,6 +204,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/kdrive/linux/Makefile.in b/xserver/hw/kdrive/linux/Makefile.in index 75ae40df6..83095d1db 100644 --- a/xserver/hw/kdrive/linux/Makefile.in +++ b/xserver/hw/kdrive/linux/Makefile.in @@ -207,6 +207,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/kdrive/linux/tslib.c b/xserver/hw/kdrive/linux/tslib.c index 48a084220..570cbf99a 100644 --- a/xserver/hw/kdrive/linux/tslib.c +++ b/xserver/hw/kdrive/linux/tslib.c @@ -117,15 +117,22 @@ TslibEnable (KdPointerInfo *pi) pi->path = strdup("/dev/input/touchscreen0"); ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", pi->path); } + private->tsDev = ts_open(pi->path, 0); - private->fd = ts_fd(private->tsDev); - if (!private->tsDev || ts_config(private->tsDev) || private->fd < 0) { + if (!private->tsDev) { ErrorF("[tslib/TslibEnable] failed to open %s\n", pi->path); - if (private->fd >= 0) - close(private->fd); return BadAlloc; } + if (ts_config(private->tsDev)) { + ErrorF("[tslib/TslibEnable] failed to load configuration\n"); + ts_close(private->tsDev); + private->tsDev = NULL; + return BadValue; + } + + private->fd = ts_fd(private->tsDev); + KdRegisterFd(private->fd, TsRead, pi); return Success; diff --git a/xserver/hw/kdrive/openbsd/Makefile.in b/xserver/hw/kdrive/openbsd/Makefile.in index 65b5befd3..ec53a9eb9 100644 --- a/xserver/hw/kdrive/openbsd/Makefile.in +++ b/xserver/hw/kdrive/openbsd/Makefile.in @@ -198,6 +198,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/kdrive/src/Makefile.in b/xserver/hw/kdrive/src/Makefile.in index d17c3831e..da8aef39c 100644 --- a/xserver/hw/kdrive/src/Makefile.in +++ b/xserver/hw/kdrive/src/Makefile.in @@ -205,6 +205,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/kdrive/wscons/Makefile.in b/xserver/hw/kdrive/wscons/Makefile.in index f7f2ba507..2623cd177 100644 --- a/xserver/hw/kdrive/wscons/Makefile.in +++ b/xserver/hw/kdrive/wscons/Makefile.in @@ -208,6 +208,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/vfb/Makefile.in b/xserver/hw/vfb/Makefile.in index 180a741c2..89dec59a3 100644 --- a/xserver/hw/vfb/Makefile.in +++ b/xserver/hw/vfb/Makefile.in @@ -224,6 +224,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/Makefile.in b/xserver/hw/xfree86/Makefile.in index a1ef86c31..d6cd5820d 100644 --- a/xserver/hw/xfree86/Makefile.in +++ b/xserver/hw/xfree86/Makefile.in @@ -223,6 +223,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/common/Makefile.in b/xserver/hw/xfree86/common/Makefile.in index 541593e86..05c056369 100644 --- a/xserver/hw/xfree86/common/Makefile.in +++ b/xserver/hw/xfree86/common/Makefile.in @@ -234,6 +234,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/common/xf86DGA.c b/xserver/hw/xfree86/common/xf86DGA.c index c468c6038..1058a466c 100644 --- a/xserver/hw/xfree86/common/xf86DGA.c +++ b/xserver/hw/xfree86/common/xf86DGA.c @@ -1133,6 +1133,10 @@ DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse) ev.root_x = event->dx; ev.root_y = event->dy; ev.corestate = event->state; + /* DGA is core only, so valuators.data doesn't actually matter. + * Mask must be set for EventToCore to create motion events. */ + SetBit(ev.valuators.mask, 0); + SetBit(ev.valuators.mask, 1); DeliverGrabbedEvent ((InternalEvent*)&ev, mouse, FALSE); } } diff --git a/xserver/hw/xfree86/common/xf86Mode.c b/xserver/hw/xfree86/common/xf86Mode.c index 7bdf79a68..d03310e20 100644 --- a/xserver/hw/xfree86/common/xf86Mode.c +++ b/xserver/hw/xfree86/common/xf86Mode.c @@ -1831,8 +1831,6 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, numModes++; } -#undef _VIRTUALX - /* * If we estimated the virtual size above, we may have filtered away all * the modes that maximally match that size; scan again to find out and @@ -1847,13 +1845,69 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, } } if (vx < virtX || vy < virtY) { + const int types[] = { + M_T_BUILTIN | M_T_PREFERRED, + M_T_BUILTIN, + M_T_DRIVER | M_T_PREFERRED, + M_T_DRIVER, + 0 + }; + const int ntypes = sizeof(types) / sizeof(int); + int n; + + /* + * We did not find the estimated virtual size. So now we want to + * find the largest mode available, but we want to search in the + * modes in the order of "types" listed above. + */ + for (n = 0; n < ntypes; n++) { + int type = types[n]; + + vx = 0; vy = 0; + for (p = scrp->modes; p; p = p->next) { + /* scan through the modes in the sort order above */ + if ((p->type & type) != type) + continue; + if (p->HDisplay > vx && p->VDisplay > vy) { + vx = p->HDisplay; + vy = p->VDisplay; + } + } + if (vx && vy) + /* Found one */ + break; + } xf86DrvMsg(scrp->scrnIndex, X_WARNING, "Shrinking virtual size estimate from %dx%d to %dx%d\n", virtX, virtY, vx, vy); - virtX = vx; + virtX = _VIRTUALX(vx); virtY = vy; - linePitch = scanLineWidth(vx, vy, minPitch, apertureSize, - BankFormat, pitchInc); + for (p = scrp->modes; p; p = p->next) { + if (numModes > 0) { + if (p->HDisplay > virtX) + p->status = MODE_VIRTUAL_X; + if (p->VDisplay > virtY) + p->status = MODE_VIRTUAL_Y; + if (p->status != MODE_OK) { + numModes--; + printModeRejectMessage(scrp->scrnIndex, p, p->status); + } + } + } + if (linePitches != NULL) { + for (i = 0; linePitches[i] != 0; i++) { + if ((linePitches[i] >= virtX) && + (linePitches[i] == + scanLineWidth(virtX, virtY, linePitches[i], + apertureSize, BankFormat, pitchInc))) { + linePitch = linePitches[i]; + break; + } + } + } else { + linePitch = scanLineWidth(virtX, virtY, minPitch, + apertureSize, BankFormat, pitchInc); + } } } diff --git a/xserver/hw/xfree86/common/xf86Xinput.c b/xserver/hw/xfree86/common/xf86Xinput.c index 877eb0382..116d8a4af 100644 --- a/xserver/hw/xfree86/common/xf86Xinput.c +++ b/xserver/hw/xfree86/common/xf86Xinput.c @@ -1265,7 +1265,7 @@ xf86ScaleAxis(int Cx, } else { X = 0; - ErrorF ("Divide by Zero in xf86ScaleAxis"); + ErrorF ("Divide by Zero in xf86ScaleAxis\n"); } if (X > Sxhigh) diff --git a/xserver/hw/xfree86/ddc/Makefile.in b/xserver/hw/xfree86/ddc/Makefile.in index 289e12183..368b093ee 100644 --- a/xserver/hw/xfree86/ddc/Makefile.in +++ b/xserver/hw/xfree86/ddc/Makefile.in @@ -208,6 +208,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/ddc/ddc.c b/xserver/hw/xfree86/ddc/ddc.c index 2d9d4dcd2..7c7dc9c6b 100644 --- a/xserver/hw/xfree86/ddc/ddc.c +++ b/xserver/hw/xfree86/ddc/ddc.c @@ -314,10 +314,6 @@ DDC2Init(int scrnIndex, I2CBusPtr pBus) dev = DDC2MakeDevice(pBus, 0x00A0, "ddc2"); if (xf86I2CProbeAddress(pBus, 0x0060)) DDC2MakeDevice(pBus, 0x0060, "E-EDID segment register"); - if (xf86I2CProbeAddress(pBus, 0x0062)) - DDC2MakeDevice(pBus, 0x0062, "EDID EEPROM interface"); - if (xf86I2CProbeAddress(pBus, 0x006E)) - DDC2MakeDevice(pBus, 0x006E, "DDC control interface"); return dev; } diff --git a/xserver/hw/xfree86/dixmods/Makefile.in b/xserver/hw/xfree86/dixmods/Makefile.in index d0f6e93e5..3c2332890 100644 --- a/xserver/hw/xfree86/dixmods/Makefile.in +++ b/xserver/hw/xfree86/dixmods/Makefile.in @@ -246,6 +246,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/dixmods/extmod/Makefile.in b/xserver/hw/xfree86/dixmods/extmod/Makefile.in index cd32d6d0c..4eb76cdfb 100644 --- a/xserver/hw/xfree86/dixmods/extmod/Makefile.in +++ b/xserver/hw/xfree86/dixmods/extmod/Makefile.in @@ -214,6 +214,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/dixmods/extmod/xf86dga2.c b/xserver/hw/xfree86/dixmods/extmod/xf86dga2.c index e522b5c47..4f3bc3013 100644 --- a/xserver/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/xserver/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -148,7 +148,7 @@ ProcXDGAOpenFramebuffer(ClientPtr client) char *deviceName; int nameSize; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if (!DGAAvailable(stuff->screen)) @@ -182,7 +182,7 @@ ProcXDGACloseFramebuffer(ClientPtr client) { REQUEST(xXDGACloseFramebufferReq); - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if (!DGAAvailable(stuff->screen)) @@ -204,7 +204,7 @@ ProcXDGAQueryModes(ClientPtr client) xXDGAModeInfo info; XDGAModePtr mode; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; REQUEST_SIZE_MATCH(xXDGAQueryModesReq); @@ -323,7 +323,7 @@ ProcXDGASetMode(ClientPtr client) ClientPtr owner; int size; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; owner = DGA_GETCLIENT(stuff->screen); @@ -412,7 +412,7 @@ ProcXDGASetViewport(ClientPtr client) { REQUEST(xXDGASetViewportReq); - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if(DGA_GETCLIENT(stuff->screen) != client) @@ -432,7 +432,7 @@ ProcXDGAInstallColormap(ClientPtr client) int rc; REQUEST(xXDGAInstallColormapReq); - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if(DGA_GETCLIENT(stuff->screen) != client) @@ -454,7 +454,7 @@ ProcXDGASelectInput(ClientPtr client) { REQUEST(xXDGASelectInputReq); - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if(DGA_GETCLIENT(stuff->screen) != client) @@ -474,7 +474,7 @@ ProcXDGAFillRectangle(ClientPtr client) { REQUEST(xXDGAFillRectangleReq); - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if(DGA_GETCLIENT(stuff->screen) != client) @@ -494,7 +494,7 @@ ProcXDGACopyArea(ClientPtr client) { REQUEST(xXDGACopyAreaReq); - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if(DGA_GETCLIENT(stuff->screen) != client) @@ -515,7 +515,7 @@ ProcXDGACopyTransparentArea(ClientPtr client) { REQUEST(xXDGACopyTransparentAreaReq); - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if(DGA_GETCLIENT(stuff->screen) != client) @@ -537,7 +537,7 @@ ProcXDGAGetViewportStatus(ClientPtr client) REQUEST(xXDGAGetViewportStatusReq); xXDGAGetViewportStatusReply rep; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if(DGA_GETCLIENT(stuff->screen) != client) @@ -560,7 +560,7 @@ ProcXDGASync(ClientPtr client) REQUEST(xXDGASyncReq); xXDGASyncReply rep; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if(DGA_GETCLIENT(stuff->screen) != client) @@ -605,7 +605,7 @@ ProcXDGAChangePixmapMode(ClientPtr client) xXDGAChangePixmapModeReply rep; int x, y; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if(DGA_GETCLIENT(stuff->screen) != client) @@ -636,7 +636,7 @@ ProcXDGACreateColormap(ClientPtr client) REQUEST(xXDGACreateColormapReq); int result; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if(DGA_GETCLIENT(stuff->screen) != client) @@ -683,7 +683,7 @@ ProcXF86DGAGetVideoLL(ClientPtr client) int num, offset, flags; char *name; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; REQUEST_SIZE_MATCH(xXF86DGAGetVideoLLReq); @@ -722,7 +722,7 @@ ProcXF86DGADirectVideo(ClientPtr client) ClientPtr owner; REQUEST(xXF86DGADirectVideoReq); - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; REQUEST_SIZE_MATCH(xXF86DGADirectVideoReq); @@ -776,7 +776,7 @@ ProcXF86DGAGetViewPortSize(ClientPtr client) REQUEST(xXF86DGAGetViewPortSizeReq); xXF86DGAGetViewPortSizeReply rep; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; REQUEST_SIZE_MATCH(xXF86DGAGetViewPortSizeReq); @@ -804,7 +804,7 @@ ProcXF86DGASetViewPort(ClientPtr client) { REQUEST(xXF86DGASetViewPortReq); - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if (DGA_GETCLIENT(stuff->screen) != client) @@ -831,7 +831,7 @@ ProcXF86DGAGetVidPage(ClientPtr client) REQUEST(xXF86DGAGetVidPageReq); xXF86DGAGetVidPageReply rep; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; REQUEST_SIZE_MATCH(xXF86DGAGetVidPageReq); @@ -850,7 +850,7 @@ ProcXF86DGASetVidPage(ClientPtr client) { REQUEST(xXF86DGASetVidPageReq); - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; REQUEST_SIZE_MATCH(xXF86DGASetVidPageReq); @@ -868,7 +868,7 @@ ProcXF86DGAInstallColormap(ClientPtr client) int rc; REQUEST(xXF86DGAInstallColormapReq); - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if (DGA_GETCLIENT(stuff->screen) != client) @@ -895,7 +895,7 @@ ProcXF86DGAQueryDirectVideo(ClientPtr client) REQUEST(xXF86DGAQueryDirectVideoReq); xXF86DGAQueryDirectVideoReply rep; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; REQUEST_SIZE_MATCH(xXF86DGAQueryDirectVideoReq); @@ -917,7 +917,7 @@ ProcXF86DGAViewPortChanged(ClientPtr client) REQUEST(xXF86DGAViewPortChangedReq); xXF86DGAViewPortChangedReply rep; - if (stuff->screen > screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) return BadValue; if (DGA_GETCLIENT(stuff->screen) != client) diff --git a/xserver/hw/xfree86/doc/Makefile.in b/xserver/hw/xfree86/doc/Makefile.in index d3e14bffa..534f9c373 100644 --- a/xserver/hw/xfree86/doc/Makefile.in +++ b/xserver/hw/xfree86/doc/Makefile.in @@ -190,6 +190,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/doc/devel/Makefile.in b/xserver/hw/xfree86/doc/devel/Makefile.in index ea585dd38..67f8a7859 100644 --- a/xserver/hw/xfree86/doc/devel/Makefile.in +++ b/xserver/hw/xfree86/doc/devel/Makefile.in @@ -184,6 +184,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/doc/man/Makefile.in b/xserver/hw/xfree86/doc/man/Makefile.in index 872c0c3d9..b6004c17b 100644 --- a/xserver/hw/xfree86/doc/man/Makefile.in +++ b/xserver/hw/xfree86/doc/man/Makefile.in @@ -197,6 +197,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/doc/sgml/Makefile.in b/xserver/hw/xfree86/doc/sgml/Makefile.in index 99292525e..f9d2aa7fb 100644 --- a/xserver/hw/xfree86/doc/sgml/Makefile.in +++ b/xserver/hw/xfree86/doc/sgml/Makefile.in @@ -240,6 +240,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/dri/Makefile.in b/xserver/hw/xfree86/dri/Makefile.in index eba094f8f..799e67e6b 100644 --- a/xserver/hw/xfree86/dri/Makefile.in +++ b/xserver/hw/xfree86/dri/Makefile.in @@ -209,6 +209,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/dri2/Makefile.in b/xserver/hw/xfree86/dri2/Makefile.in index 3313a1a11..f58f9b060 100644 --- a/xserver/hw/xfree86/dri2/Makefile.in +++ b/xserver/hw/xfree86/dri2/Makefile.in @@ -208,6 +208,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/dri2/dri2.c b/xserver/hw/xfree86/dri2/dri2.c index 34f735f52..e4693d92e 100644 --- a/xserver/hw/xfree86/dri2/dri2.c +++ b/xserver/hw/xfree86/dri2/dri2.c @@ -828,11 +828,14 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc, * is moved to a crtc with a lower refresh rate, or a crtc that just * got enabled. */ - if (!(*ds->GetMSC)(pDraw, &ust, ¤t_msc)) - pPriv->last_swap_target = 0; + if (ds->GetMSC) { + if (!(*ds->GetMSC)(pDraw, &ust, ¤t_msc)) + pPriv->last_swap_target = 0; - if (current_msc < pPriv->last_swap_target) - pPriv->last_swap_target = current_msc; + if (current_msc < pPriv->last_swap_target) + pPriv->last_swap_target = current_msc; + + } /* * Swap target for this swap is last swap target + swap interval since diff --git a/xserver/hw/xfree86/exa/Makefile.in b/xserver/hw/xfree86/exa/Makefile.in index 6730b42a1..4c13d52d4 100644 --- a/xserver/hw/xfree86/exa/Makefile.in +++ b/xserver/hw/xfree86/exa/Makefile.in @@ -212,6 +212,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/fbdevhw/Makefile.in b/xserver/hw/xfree86/fbdevhw/Makefile.in index 6b101c8fe..cd516e918 100644 --- a/xserver/hw/xfree86/fbdevhw/Makefile.in +++ b/xserver/hw/xfree86/fbdevhw/Makefile.in @@ -218,6 +218,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/i2c/Makefile.in b/xserver/hw/xfree86/i2c/Makefile.in index d7c410b26..ded372ad3 100644 --- a/xserver/hw/xfree86/i2c/Makefile.in +++ b/xserver/hw/xfree86/i2c/Makefile.in @@ -235,6 +235,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/int10/Makefile.in b/xserver/hw/xfree86/int10/Makefile.in index 8409e1c68..323d38822 100644 --- a/xserver/hw/xfree86/int10/Makefile.in +++ b/xserver/hw/xfree86/int10/Makefile.in @@ -223,6 +223,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/loader/Makefile.in b/xserver/hw/xfree86/loader/Makefile.in index a8d4e5ec2..e4d118262 100644 --- a/xserver/hw/xfree86/loader/Makefile.in +++ b/xserver/hw/xfree86/loader/Makefile.in @@ -198,6 +198,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/modes/Makefile.in b/xserver/hw/xfree86/modes/Makefile.in index 5b426d19d..95a7877da 100644 --- a/xserver/hw/xfree86/modes/Makefile.in +++ b/xserver/hw/xfree86/modes/Makefile.in @@ -214,6 +214,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/modes/xf86Cursors.c b/xserver/hw/xfree86/modes/xf86Cursors.c index 6b2ae97d4..670d682e5 100644 --- a/xserver/hw/xfree86/modes/xf86Cursors.c +++ b/xserver/hw/xfree86/modes/xf86Cursors.c @@ -1,5 +1,6 @@ /* * Copyright © 2007 Keith Packard + * Copyright © 2010 Aaron Plattner * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -126,12 +127,33 @@ xf86_crtc_rotate_coord_back (Rotation rotation, *y_src = y_dst; } +struct cursor_bit { + CARD8 *byte; + char bitpos; +}; + /* * Convert an x coordinate to a position within the cursor bitmap */ -static int -cursor_bitpos (int flags, int x, Bool mask) +static struct cursor_bit +cursor_bitpos (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, + Bool mask) { + const int flags = cursor_info->Flags; + const Bool interleaved = + !!(flags & (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1 | + HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8 | + HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16 | + HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32 | + HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64)); + const int width = cursor_info->MaxWidth; + const int height = cursor_info->MaxHeight; + const int stride = interleaved ? width / 4 : width / 8; + + struct cursor_bit ret; + + image += y * stride; + if (flags & HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK) mask = !mask; if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED) @@ -149,29 +171,33 @@ cursor_bitpos (int flags, int x, Bool mask) x = ((x & ~31) << 1) | (mask << 5) | (x & 31); else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64) x = ((x & ~63) << 1) | (mask << 6) | (x & 63); - return x; + else if (mask) + image += stride * height; + + ret.byte = image + (x / 8); + ret.bitpos = x & 7; + + return ret; } /* * Fetch one bit from a cursor bitmap */ static CARD8 -get_bit (CARD8 *image, int stride, int flags, int x, int y, Bool mask) +get_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask) { - x = cursor_bitpos (flags, x, mask); - image += y * stride; - return (image[(x >> 3)] >> (x & 7)) & 1; + struct cursor_bit bit = cursor_bitpos(image, cursor_info, x, y, mask); + return (*bit.byte >> bit.bitpos) & 1; } /* * Set one bit in a cursor bitmap */ static void -set_bit (CARD8 *image, int stride, int flags, int x, int y, Bool mask) +set_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask) { - x = cursor_bitpos (flags, x, mask); - image += y * stride; - image[(x >> 3)] |= 1 << (x & 7); + struct cursor_bit bit = cursor_bitpos(image, cursor_info, x, y, mask); + *bit.byte |= 1 << bit.bitpos; } /* @@ -186,7 +212,6 @@ xf86_crtc_convert_cursor_to_argb (xf86CrtcPtr crtc, unsigned char *src) CARD32 *cursor_image = (CARD32 *) xf86_config->cursor_image; int x, y; int xin, yin; - int stride = cursor_info->MaxWidth >> 2; int flags = cursor_info->Flags; CARD32 bits; @@ -201,10 +226,10 @@ xf86_crtc_convert_cursor_to_argb (xf86CrtcPtr crtc, unsigned char *src) cursor_info->MaxWidth, cursor_info->MaxHeight, x, y, &xin, &yin); - if (get_bit (src, stride, flags, xin, yin, TRUE) == + if (get_bit (src, cursor_info, xin, yin, TRUE) == ((flags & HARDWARE_CURSOR_INVERT_MASK) == 0)) { - if (get_bit (src, stride, flags, xin, yin, FALSE)) + if (get_bit (src, cursor_info, xin, yin, FALSE)) bits = xf86_config->cursor_fg; else bits = xf86_config->cursor_bg; @@ -411,7 +436,6 @@ xf86_crtc_load_cursor_image (xf86CrtcPtr crtc, CARD8 *src) int x, y; int xin, yin; int stride = cursor_info->MaxWidth >> 2; - int flags = cursor_info->Flags; cursor_image = xf86_config->cursor_image; memset(cursor_image, 0, cursor_info->MaxHeight * stride); @@ -423,10 +447,10 @@ xf86_crtc_load_cursor_image (xf86CrtcPtr crtc, CARD8 *src) cursor_info->MaxWidth, cursor_info->MaxHeight, x, y, &xin, &yin); - if (get_bit(src, stride, flags, xin, yin, FALSE)) - set_bit(cursor_image, stride, flags, x, y, FALSE); - if (get_bit(src, stride, flags, xin, yin, TRUE)) - set_bit(cursor_image, stride, flags, x, y, TRUE); + if (get_bit(src, cursor_info, xin, yin, FALSE)) + set_bit(cursor_image, cursor_info, x, y, FALSE); + if (get_bit(src, cursor_info, xin, yin, TRUE)) + set_bit(cursor_image, cursor_info, x, y, TRUE); } } crtc->funcs->load_cursor_image (crtc, cursor_image); diff --git a/xserver/hw/xfree86/modes/xf86EdidModes.c b/xserver/hw/xfree86/modes/xf86EdidModes.c index 8f4d04f93..a94379f2a 100644 --- a/xserver/hw/xfree86/modes/xf86EdidModes.c +++ b/xserver/hw/xfree86/modes/xf86EdidModes.c @@ -484,8 +484,8 @@ DDCModesFromStandardTiming(struct std_timings *timing, ddc_quirk_t quirks, (hsize == 1368 && vsize == 769))) { Mode = xf86CVTMode(1366, 768, 60, FALSE, FALSE); Mode->HDisplay = 1366; - Mode->VSyncStart--; - Mode->VSyncEnd--; + Mode->HSyncStart--; + Mode->HSyncEnd--; } else if (hsize && vsize && refresh) { Mode = FindDMTMode(hsize, vsize, refresh, rb); diff --git a/xserver/hw/xfree86/modes/xf86RandR12.c b/xserver/hw/xfree86/modes/xf86RandR12.c index c17b5fa95..70c8a4a8a 100644 --- a/xserver/hw/xfree86/modes/xf86RandR12.c +++ b/xserver/hw/xfree86/modes/xf86RandR12.c @@ -1776,7 +1776,9 @@ xf86RandR12EnterVT (int screen_index, int flags) ScreenPtr pScreen = screenInfo.screens[screen_index]; ScrnInfoPtr pScrn = xf86Screens[screen_index]; XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); + rrScrPrivPtr rp = rrGetScrPriv(pScreen); Bool ret; + int i; if (randrp->orig_EnterVT) { pScrn->EnterVT = randrp->orig_EnterVT; @@ -1787,6 +1789,10 @@ xf86RandR12EnterVT (int screen_index, int flags) return FALSE; } + /* reload gamma */ + for (i = 0; i < rp->numCrtcs; i++) + xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]); + return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */ } @@ -1796,6 +1802,7 @@ xf86RandR12Init12 (ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; rrScrPrivPtr rp = rrGetScrPriv(pScreen); XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); + int i; rp->rrGetInfo = xf86RandR12GetInfo12; rp->rrScreenSetSize = xf86RandR12ScreenSetSize; @@ -1825,6 +1832,9 @@ xf86RandR12Init12 (ScreenPtr pScreen) */ if (!xf86RandR12SetInfo12 (pScreen)) return FALSE; + for (i = 0; i < rp->numCrtcs; i++) { + xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]); + } return TRUE; } diff --git a/xserver/hw/xfree86/modes/xf86Rotate.c b/xserver/hw/xfree86/modes/xf86Rotate.c index fdc38c5a6..57c3499ac 100644 --- a/xserver/hw/xfree86/modes/xf86Rotate.c +++ b/xserver/hw/xfree86/modes/xf86Rotate.c @@ -168,7 +168,7 @@ xf86CrtcDamageShadow (xf86CrtcPtr crtc) if (damage_box.x2 > pScreen->width) damage_box.x2 = pScreen->width; if (damage_box.y2 > pScreen->height) damage_box.y2 = pScreen->height; RegionInit(&damage_region, &damage_box, 1); - DamageRegionAppend (&(*pScreen->GetScreenPixmap)(pScreen)->drawable, + DamageDamageRegion (&(*pScreen->GetScreenPixmap)(pScreen)->drawable, &damage_region); RegionUninit(&damage_region); crtc->shadowClear = TRUE; diff --git a/xserver/hw/xfree86/os-support/Makefile.in b/xserver/hw/xfree86/os-support/Makefile.in index a9d0ec674..6694c37d7 100644 --- a/xserver/hw/xfree86/os-support/Makefile.in +++ b/xserver/hw/xfree86/os-support/Makefile.in @@ -214,6 +214,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.in b/xserver/hw/xfree86/os-support/bsd/Makefile.in index 22eef3126..9d3cd7405 100644 --- a/xserver/hw/xfree86/os-support/bsd/Makefile.in +++ b/xserver/hw/xfree86/os-support/bsd/Makefile.in @@ -230,6 +230,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/os-support/bus/Makefile.in b/xserver/hw/xfree86/os-support/bus/Makefile.in index 2dd2fc672..a27560f1a 100644 --- a/xserver/hw/xfree86/os-support/bus/Makefile.in +++ b/xserver/hw/xfree86/os-support/bus/Makefile.in @@ -216,6 +216,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/os-support/hurd/Makefile.in b/xserver/hw/xfree86/os-support/hurd/Makefile.in index 7af8599c8..936d97fc1 100644 --- a/xserver/hw/xfree86/os-support/hurd/Makefile.in +++ b/xserver/hw/xfree86/os-support/hurd/Makefile.in @@ -198,6 +198,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/os-support/hurd/hurd_mmap.c b/xserver/hw/xfree86/os-support/hurd/hurd_mmap.c index ccef5f218..3f942aaca 100644 --- a/xserver/hw/xfree86/os-support/hurd/hurd_mmap.c +++ b/xserver/hw/xfree86/os-support/hurd/hurd_mmap.c @@ -39,8 +39,8 @@ int xf86ReadBIOS(unsigned long Base,unsigned long Offset,unsigned char *Buf,int Len) { - mach_port_t device,iopl_dev; - memory_object_t iopl_mem; + mach_port_t device,mem_dev; + memory_object_t mem_obj; vm_address_t addr = (vm_address_t)0; /* serach starting address */ kern_return_t err; @@ -51,14 +51,14 @@ xf86ReadBIOS(unsigned long Base,unsigned long Offset,unsigned char *Buf,int Len) errno = err; FatalError("xf86ReadBIOS() can't get_privileged_ports. (%s)\n",strerror(errno)); } - err = device_open(device,D_READ|D_WRITE,"iopl",&iopl_dev); + err = device_open(device,D_READ|D_WRITE,"mem",&mem_dev); mach_port_deallocate (mach_task_self (), device); if( err ) { errno = err; FatalError("xf86ReadBIOS() can't device_open. (%s)\n",strerror(errno)); } - err = device_map(iopl_dev,VM_PROT_READ|VM_PROT_WRITE, Base , BIOS_SIZE ,&iopl_mem,0); + err = device_map(mem_dev,VM_PROT_READ|VM_PROT_WRITE, Base , BIOS_SIZE ,&mem_obj,0); if( err ) { errno = err; @@ -69,13 +69,13 @@ xf86ReadBIOS(unsigned long Base,unsigned long Offset,unsigned char *Buf,int Len) BIOS_SIZE, 0, TRUE, - iopl_mem, + mem_obj, Base, FALSE, VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE, VM_INHERIT_SHARE); - mach_port_deallocate(mach_task_self(),iopl_mem); + mach_port_deallocate(mach_task_self(),mem_obj); if( err ) { errno = err; diff --git a/xserver/hw/xfree86/os-support/hurd/hurd_video.c b/xserver/hw/xfree86/os-support/hurd/hurd_video.c index 4a99db375..39f353bd3 100644 --- a/xserver/hw/xfree86/os-support/hurd/hurd_video.c +++ b/xserver/hw/xfree86/os-support/hurd/hurd_video.c @@ -44,8 +44,8 @@ static pointer mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags) { - mach_port_t device,iopl_dev; - memory_object_t iopl_mem; + mach_port_t device,mem_dev; + memory_object_t mem_obj; kern_return_t err; vm_address_t addr=(vm_address_t)0; @@ -55,7 +55,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags) errno = err; FatalError("xf86MapVidMem() can't get_privileged_ports. (%s)\n",strerror(errno)); } - err = device_open(device,D_READ|D_WRITE,"iopl",&iopl_dev); + err = device_open(device,D_READ|D_WRITE,"mem",&mem_dev); mach_port_deallocate (mach_task_self(), device); if( err ) { @@ -63,7 +63,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags) FatalError("xf86MapVidMem() can't device_open. (%s)\n",strerror(errno)); } - err = device_map(iopl_dev,VM_PROT_READ|VM_PROT_WRITE, Base , Size ,&iopl_mem,0); + err = device_map(mem_dev,VM_PROT_READ|VM_PROT_WRITE, Base , Size ,&mem_obj,0); if( err ) { errno = err; @@ -74,23 +74,23 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags) Size, 0, /* mask */ TRUE, /* anywhere */ - iopl_mem, + mem_obj, (vm_offset_t)Base, FALSE, /* copy on write */ VM_PROT_READ|VM_PROT_WRITE, VM_PROT_READ|VM_PROT_WRITE, VM_INHERIT_SHARE); - mach_port_deallocate(mach_task_self(),iopl_mem); + mach_port_deallocate(mach_task_self(),mem_obj); if( err ) { errno = err; - FatalError("xf86MapVidMem() can't vm_map.(iopl_mem) (%s)\n",strerror(errno)); + FatalError("xf86MapVidMem() can't vm_map.(mem_obj) (%s)\n",strerror(errno)); } - mach_port_deallocate(mach_task_self(),iopl_dev); + mach_port_deallocate(mach_task_self(),mem_dev); if( err ) { errno = err; - FatalError("xf86MapVidMem() can't mach_port_deallocate.(iopl_dev) (%s)\n",strerror(errno)); + FatalError("xf86MapVidMem() can't mach_port_deallocate.(mem_dev) (%s)\n",strerror(errno)); } return (pointer)addr; } @@ -124,8 +124,17 @@ xf86EnableIO() FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno)); return FALSE; } +#if 0 + /* + * Trapping disabled for now, as some VBIOSes (mga-g450 notably) use these + * ports, and the int10 wrapper is not emulating them. (Note that it's + * effectively what happens in the Linux variant too, as iopl() is used + * there, making the ioperm() meaningless.) + * + * Reenable this when int10 gets fixed. */ ioperm(0x40,4,0); /* trap access to the timer chip */ ioperm(0x60,4,0); /* trap access to the keyboard controller */ +#endif return TRUE; } diff --git a/xserver/hw/xfree86/os-support/linux/Makefile.in b/xserver/hw/xfree86/os-support/linux/Makefile.in index b3ed47b65..f64ef3865 100644 --- a/xserver/hw/xfree86/os-support/linux/Makefile.in +++ b/xserver/hw/xfree86/os-support/linux/Makefile.in @@ -219,6 +219,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/os-support/linux/lnx_video.c b/xserver/hw/xfree86/os-support/linux/lnx_video.c index bdd2639ba..1c40a1b75 100644 --- a/xserver/hw/xfree86/os-support/linux/lnx_video.c +++ b/xserver/hw/xfree86/os-support/linux/lnx_video.c @@ -529,6 +529,8 @@ xf86EnableIO(void) return FALSE; } # if !defined(__alpha__) + /* XXX: this is actually not trapping anything because of iopl(3) + * above */ ioperm(0x40,4,0); /* trap access to the timer chip */ ioperm(0x60,4,0); /* trap access to the keyboard controller */ # endif diff --git a/xserver/hw/xfree86/os-support/misc/Makefile.in b/xserver/hw/xfree86/os-support/misc/Makefile.in index 3dca17267..d7bb52acc 100644 --- a/xserver/hw/xfree86/os-support/misc/Makefile.in +++ b/xserver/hw/xfree86/os-support/misc/Makefile.in @@ -196,6 +196,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/os-support/sco/Makefile.in b/xserver/hw/xfree86/os-support/sco/Makefile.in index 4d05b32a4..c6e679ac5 100644 --- a/xserver/hw/xfree86/os-support/sco/Makefile.in +++ b/xserver/hw/xfree86/os-support/sco/Makefile.in @@ -181,6 +181,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/os-support/solaris/Makefile.in b/xserver/hw/xfree86/os-support/solaris/Makefile.in index 86b117c19..e42ee20e2 100644 --- a/xserver/hw/xfree86/os-support/solaris/Makefile.in +++ b/xserver/hw/xfree86/os-support/solaris/Makefile.in @@ -226,6 +226,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/os-support/sysv/Makefile.in b/xserver/hw/xfree86/os-support/sysv/Makefile.in index 405522f28..9fdde88f6 100644 --- a/xserver/hw/xfree86/os-support/sysv/Makefile.in +++ b/xserver/hw/xfree86/os-support/sysv/Makefile.in @@ -181,6 +181,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/parser/Makefile.in b/xserver/hw/xfree86/parser/Makefile.in index 160b666ad..56ea0b123 100644 --- a/xserver/hw/xfree86/parser/Makefile.in +++ b/xserver/hw/xfree86/parser/Makefile.in @@ -238,6 +238,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/ramdac/Makefile.in b/xserver/hw/xfree86/ramdac/Makefile.in index e094b5449..f6769458b 100644 --- a/xserver/hw/xfree86/ramdac/Makefile.in +++ b/xserver/hw/xfree86/ramdac/Makefile.in @@ -208,6 +208,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/shadowfb/Makefile.in b/xserver/hw/xfree86/shadowfb/Makefile.in index 3c44b9726..e2f858a52 100644 --- a/xserver/hw/xfree86/shadowfb/Makefile.in +++ b/xserver/hw/xfree86/shadowfb/Makefile.in @@ -208,6 +208,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/utils/Makefile.in b/xserver/hw/xfree86/utils/Makefile.in index 310bd81d1..097dc31a9 100644 --- a/xserver/hw/xfree86/utils/Makefile.in +++ b/xserver/hw/xfree86/utils/Makefile.in @@ -190,6 +190,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/utils/cvt/Makefile.in b/xserver/hw/xfree86/utils/cvt/Makefile.in index 8d54724c1..27d36eb36 100644 --- a/xserver/hw/xfree86/utils/cvt/Makefile.in +++ b/xserver/hw/xfree86/utils/cvt/Makefile.in @@ -229,6 +229,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/utils/gtf/Makefile.in b/xserver/hw/xfree86/utils/gtf/Makefile.in index a230e8614..7c8c21b11 100644 --- a/xserver/hw/xfree86/utils/gtf/Makefile.in +++ b/xserver/hw/xfree86/utils/gtf/Makefile.in @@ -235,6 +235,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/vbe/Makefile.in b/xserver/hw/xfree86/vbe/Makefile.in index 4b8ee6096..8d6c64b3c 100644 --- a/xserver/hw/xfree86/vbe/Makefile.in +++ b/xserver/hw/xfree86/vbe/Makefile.in @@ -208,6 +208,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/vgahw/Makefile.in b/xserver/hw/xfree86/vgahw/Makefile.in index f1b1bdfb9..afd6f8b7a 100644 --- a/xserver/hw/xfree86/vgahw/Makefile.in +++ b/xserver/hw/xfree86/vgahw/Makefile.in @@ -208,6 +208,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/x86emu/Makefile.in b/xserver/hw/xfree86/x86emu/Makefile.in index f17900bd8..2d408119a 100644 --- a/xserver/hw/xfree86/x86emu/Makefile.in +++ b/xserver/hw/xfree86/x86emu/Makefile.in @@ -198,6 +198,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/x86emu/ops.c b/xserver/hw/xfree86/x86emu/ops.c index 21a034712..c6b2f0a4b 100644 --- a/xserver/hw/xfree86/x86emu/ops.c +++ b/xserver/hw/xfree86/x86emu/ops.c @@ -9691,15 +9691,23 @@ Handles opcode 0xe9 ****************************************************************************/ static void x86emuOp_jump_near_IMM(u8 X86EMU_UNUSED(op1)) { - int ip; + u32 ip; START_OF_INSTR(); DECODE_PRINTF("JMP\t"); - ip = (s16)fetch_word_imm(); - ip += (s16)M.x86.R_IP; - DECODE_PRINTF2("%04x\n", (u16)ip); - TRACE_AND_STEP(); - M.x86.R_IP = (u16)ip; + if (M.x86.mode & SYSMODE_PREFIX_DATA) { + ip = (u32)fetch_long_imm(); + ip += (u32)M.x86.R_EIP; + DECODE_PRINTF2("%08x\n", (u32)ip); + TRACE_AND_STEP(); + M.x86.R_EIP = (u32)ip; + } else { + ip = (s16)fetch_word_imm(); + ip += (s16)M.x86.R_IP; + DECODE_PRINTF2("%04x\n", (u16)ip); + TRACE_AND_STEP(); + M.x86.R_IP = (u16)ip; + } DECODE_CLEAR_SEGOVR(); END_OF_INSTR(); } diff --git a/xserver/hw/xfree86/xaa/Makefile.in b/xserver/hw/xfree86/xaa/Makefile.in index c92132eaa..8b4f748e7 100644 --- a/xserver/hw/xfree86/xaa/Makefile.in +++ b/xserver/hw/xfree86/xaa/Makefile.in @@ -228,6 +228,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xfree86/xf8_16bpp/Makefile.in b/xserver/hw/xfree86/xf8_16bpp/Makefile.in index b47a30042..31b4fecfa 100644 --- a/xserver/hw/xfree86/xf8_16bpp/Makefile.in +++ b/xserver/hw/xfree86/xf8_16bpp/Makefile.in @@ -208,6 +208,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xnest/Makefile.in b/xserver/hw/xnest/Makefile.in index 18b45f677..e8130b1b2 100644 --- a/xserver/hw/xnest/Makefile.in +++ b/xserver/hw/xnest/Makefile.in @@ -227,6 +227,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xquartz/GL/Makefile.in b/xserver/hw/xquartz/GL/Makefile.in index 4e1872ff2..a8ec2ea65 100644 --- a/xserver/hw/xquartz/GL/Makefile.in +++ b/xserver/hw/xquartz/GL/Makefile.in @@ -197,6 +197,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xquartz/Makefile.in b/xserver/hw/xquartz/Makefile.in index b4bb9d8d0..8166cd8dc 100644 --- a/xserver/hw/xquartz/Makefile.in +++ b/xserver/hw/xquartz/Makefile.in @@ -212,6 +212,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xquartz/bundle/Makefile.am b/xserver/hw/xquartz/bundle/Makefile.am index c4d77c099..8a206cf4b 100644 --- a/xserver/hw/xquartz/bundle/Makefile.am +++ b/xserver/hw/xquartz/bundle/Makefile.am @@ -12,7 +12,9 @@ install-data-hook: $(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install uninstall-hook: - $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app + $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Resources + $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Info.plist + $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/PkgInfo noinst_PRE = Info.plist.cpp noinst_DATA = $(noinst_PRE:plist.cpp=plist) diff --git a/xserver/hw/xquartz/bundle/Makefile.in b/xserver/hw/xquartz/bundle/Makefile.in index 5aeee9c9a..d05f0072a 100644 --- a/xserver/hw/xquartz/bundle/Makefile.in +++ b/xserver/hw/xquartz/bundle/Makefile.in @@ -200,6 +200,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ @@ -900,7 +902,9 @@ install-data-hook: $(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install uninstall-hook: - $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app + $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Resources + $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Info.plist + $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/PkgInfo # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xserver/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist b/xserver/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist index c648282a2..72d75140a 100644 --- a/xserver/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist +++ b/xserver/hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist @@ -3,12 +3,12 @@ LprojCompatibleVersion - 97 + 99 LprojLocale es LprojRevisionLevel 1 LprojVersion - 97 + 99 diff --git a/xserver/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib b/xserver/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib index 19e139bb7..3afc950fb 100644 --- a/xserver/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib +++ b/xserver/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib @@ -2,15 +2,18 @@ 1040 - 11A79a - 784 - 1059 - 478.00 + 11A194b + 787 + 1079 + 502.00 com.apple.InterfaceBuilder.CocoaPlugin - 784 + 787 - + + + + com.apple.InterfaceBuilder.CocoaPlugin @@ -366,7 +369,8 @@ View - {1.7976931348623157e+308, 1.7976931348623157e+308} + + {3.4028235e+38, 3.4028235e+38} {320, 240} @@ -377,7 +381,6 @@ 256 {{13, 10}, {593, 292}} - @@ -392,7 +395,6 @@ 256 {{18, 215}, {402, 18}} - YES 67239424 @@ -424,7 +426,6 @@ 256 {{36, 65}, {501, 28}} - YES 67239424 @@ -443,7 +444,7 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -462,7 +463,6 @@ 256 {{36, 181}, {501, 28}} - YES 67239424 @@ -481,7 +481,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA256 {{18, 99}, {402, 18}} - YES 67239424 @@ -504,7 +503,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA256 {{36, 123}, {501, 28}} - YES 67239424 @@ -522,7 +520,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA256 {{18, 157}, {402, 18}} - YES 67239424 @@ -545,7 +542,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA256 {{36, 7}, {501, 28}} - YES 67239424 @@ -562,7 +558,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA256 {{18, 41}, {402, 18}} - YES 67239424 @@ -583,7 +578,6 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA {{10, 33}, {573, 246}} - Entrada @@ -1248,11 +1242,10 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA {619, 308} - {{0, 0}, {1280, 938}} {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} + {3.4028235e+38, 3.4028235e+38} x11_prefs @@ -1265,10 +1258,11 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA View - {1.7976931348623157e+308, 1.7976931348623157e+308} + + {3.4028235e+38, 3.4028235e+38} {320, 240} - + 256 @@ -1350,7 +1344,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA - 121.73100280761719 + 105 62.730998992919922 1000 @@ -1360,7 +1354,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA 3 - MC4zMzMzMzI5OQA + MC4zMzMzMzI5ODU2AA 6 @@ -1417,7 +1411,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA - 82 + 99 10 1000 @@ -1497,7 +1491,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA _doScroller: - 0.99492380000000002 + 0.99492377042770386 @@ -1507,7 +1501,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA1 _doScroller: - 0.96474358974358976 + 0.96474361419677734 @@ -1532,6 +1526,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA + QSAAAEEgAABBmAAAQZgAAA @@ -1559,10 +1554,11 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA {454, 271} + {{0, 0}, {1280, 938}} {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} + {3.4028235e+38, 3.4028235e+38} x11_apps diff --git a/xserver/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist b/xserver/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist index 627fb3ea7..c8e77aa60 100644 --- a/xserver/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist +++ b/xserver/hw/xquartz/bundle/Resources/ar.lproj/locversion.plist @@ -3,12 +3,12 @@ LprojCompatibleVersion - 98 + 100 LprojLocale ar LprojRevisionLevel 1 LprojVersion - 98 + 100 diff --git a/xserver/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib b/xserver/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib index 8bc6b618d..52ebeefb7 100644 --- a/xserver/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib +++ b/xserver/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib @@ -367,7 +367,7 @@ View - {3.4028235e+38, 3.4028235e+38} + {1.7976931348623157e+308, 1.7976931348623157e+308} {320, 240} @@ -459,7 +459,7 @@ controlColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -508,7 +508,7 @@ {{10, 33}, {438, 246}} - أمان + الأمان @@ -637,7 +637,7 @@ {{10, 33}, {438, 246}} - Windows + نوافذ @@ -853,7 +853,7 @@ 67239424 71303296 - تستخدم إشارات X11 الصوتية تنبيه النظام القياسي، كما هو محدد في لوحة تفضيلات النظام لمؤثرات الصوت. + تستخدم إشارات X11 الصوتية التنبيه القياسي للنظام، كما هو محدد في لوحة تفضيلات النظام لمؤثرات الصوت. @@ -908,7 +908,7 @@ - 256 لونًا + ٢٥٦ لونًا 1048576 2147483647 @@ -1035,7 +1035,7 @@ 67239424 71303296 - تمكين نافذة X11 الجذري. استخدم ضغط مفاتيح الأوامر-الاختيار-A لدخول ومغادرة وضع ملء الشاشة. + تمكين نافذة X11 root. استخدم ضغط مفاتيح الأوامر-الاختيار-A لدخول ومغادرة وضع ملء الشاشة. @@ -1145,7 +1145,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF 67239424 71303296 - السماح بكتابة تغييرات قائمة الإدخال فوق مخطط مفاتيح X11 الحالي. + السماح لتغييرات قائمة الإدخال بالكتابة فوق مخطط مفاتيح X11 الحالي. @@ -1183,7 +1183,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF 67239424 71303296 - عند التمكين، مفاتيح الخيار إرسال Alt_L و Alt_R X11 علامات المفتاح بدلًا من Mode_switch. + عند تمكينها، تقوم مفاتيح الاختيار بإرسال علامات المفتاح Alt_L و Alt_R X11 بدلًا من Mode_switch. @@ -1199,7 +1199,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF 67239424 67108992 - مفاتيح الخيار إرسال Alt_L و Alt_R + مفاتيح الاختيار تقوم بإرسال Alt_L و Alt_R 1210864127 @@ -1216,7 +1216,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF {{10, 33}, {438, 246}} - إدخال + الإدخال @@ -1235,7 +1235,7 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF {{0, 0}, {1280, 938}} {320, 262} - {3.4028235e+38, 3.4028235e+38} + {1.7976931348623157e+308, 1.7976931348623157e+308} x11_prefs @@ -1249,10 +1249,10 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF View - {3.4028235e+38, 3.4028235e+38} + {1.7976931348623157e+308, 1.7976931348623157e+308} {320, 240} - + 256 @@ -1260,7 +1260,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF 268 {{14, 191}, {100, 32}} - YES 67239424 @@ -1288,7 +1287,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF 268 {{14, 159}, {100, 32}} - YES 67239424 @@ -1320,14 +1318,12 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF 256 {301, 198} - YES 256 {301, 17} - @@ -1335,7 +1331,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF 256 {{302, 0}, {16, 17}} - @@ -1468,7 +1463,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF {{1, 17}, {301, 198}} - @@ -1479,7 +1473,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF 256 {{302, 17}, {15, 198}} - _doScroller: 0.99492377042770386 @@ -1489,7 +1482,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF 256 {{1, 215}, {301, 15}} - 1 _doScroller: @@ -1503,7 +1495,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF {{1, 0}, {301, 17}} - @@ -1513,14 +1504,12 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF {{116, 20}, {318, 231}} - 50 - QSAAAEEgAABBmAAAQZgAAA @@ -1528,7 +1517,6 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF 268 {{14, 223}, {100, 32}} - YES -2080244224 @@ -1549,12 +1537,10 @@ INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF {454, 271} - - {{0, 0}, {1280, 938}} {320, 262} - {3.4028235e+38, 3.4028235e+38} + {1.7976931348623157e+308, 1.7976931348623157e+308} x11_apps diff --git a/xserver/hw/xquartz/bundle/Resources/da.lproj/locversion.plist b/xserver/hw/xquartz/bundle/Resources/da.lproj/locversion.plist index c565c6f71..0a247b5e5 100644 --- a/xserver/hw/xquartz/bundle/Resources/da.lproj/locversion.plist +++ b/xserver/hw/xquartz/bundle/Resources/da.lproj/locversion.plist @@ -3,12 +3,12 @@ LprojCompatibleVersion - 97 + 100 LprojLocale da LprojRevisionLevel 1 LprojVersion - 97 + 100 diff --git a/xserver/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib b/xserver/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib index 087c79245..3224c69f6 100644 --- a/xserver/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib +++ b/xserver/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ 1040 - 11A79a - 732 - 1059 - 478.00 + 11A194b + 787 + 1079 + 502.00 com.apple.InterfaceBuilder.CocoaPlugin - 732 + 787 @@ -366,6 +366,7 @@ View + {1.7976931348623157e+308, 1.7976931348623157e+308} {320, 240} @@ -1067,7 +1068,7 @@ ZW4uCg 67239424 4194304 - Fokus i X11-vinduet følger markøren + Fokus i X11-vinduet følger markøren. @@ -1254,6 +1255,7 @@ ZW4uCg View + {1.7976931348623157e+308, 1.7976931348623157e+308} {320, 240} @@ -1518,7 +1520,6 @@ ZW4uCg - QSAAAEEgAABBmAAAQZgAAA @@ -3572,6 +3573,7 @@ ZW4uCg 0 + IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx @@ -3579,5 +3581,10 @@ ZW4uCg YES ../X11.xcodeproj 3 + + {9, 8} + {7, 2} + {15, 15} + diff --git a/xserver/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist b/xserver/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist index 6dc0d45c1..58baaa0f6 100644 --- a/xserver/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist +++ b/xserver/hw/xquartz/bundle/Resources/pl.lproj/locversion.plist @@ -3,12 +3,12 @@ LprojCompatibleVersion - 97 + 100 LprojLocale pl LprojRevisionLevel 1 LprojVersion - 97 + 100 diff --git a/xserver/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib b/xserver/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib index dca6bb2bf..89cf79086 100644 --- a/xserver/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib +++ b/xserver/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ 1040 - 11A79a - 732 - 1059 - 478.00 + 11A194b + 787 + 1079 + 502.00 com.apple.InterfaceBuilder.CocoaPlugin - 732 + 787 @@ -257,7 +257,7 @@ - Miniaturka + Minimalizuj okno m 1048576 2147483647 @@ -366,6 +366,7 @@ View + {1.7976931348623157e+308, 1.7976931348623157e+308} {320, 240} @@ -1028,7 +1029,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg 67239424 4194304 - Lliknięcie nieaktywnego okna będzie powodowało jego uaktywnienie i przeniesienie do niego fokusu. + Kliknięcie nieaktywnego okna będzie powodowało jego uaktywnienie i przeniesienie do niego fokusu. @@ -1256,6 +1257,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg View + {1.7976931348623157e+308, 1.7976931348623157e+308} {320, 240} @@ -1523,7 +1525,6 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg - QSAAAEEgAABBmAAAQZgAAA @@ -3583,6 +3584,7 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg 0 + IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx @@ -3590,5 +3592,10 @@ dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg YES ../X11.xcodeproj 3 + + {9, 8} + {7, 2} + {15, 15} + diff --git a/xserver/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist b/xserver/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist index 3b46498b4..45ac16e53 100644 --- a/xserver/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist +++ b/xserver/hw/xquartz/bundle/Resources/pt.lproj/locversion.plist @@ -3,12 +3,12 @@ LprojCompatibleVersion - 97 + 100 LprojLocale pt LprojRevisionLevel 1 LprojVersion - 97 + 100 diff --git a/xserver/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib b/xserver/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib index ea9f5f321..693ea24bc 100644 --- a/xserver/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib +++ b/xserver/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ 1040 - 11A79a - 732 - 1059 - 478.00 + 11A194b + 787 + 1079 + 502.00 com.apple.InterfaceBuilder.CocoaPlugin - 732 + 787 @@ -296,8 +296,8 @@ Percorrer Janelas no Sentido Inverso - ~ - 1179914 + ` + 1179648 2147483647 @@ -315,7 +315,7 @@ - Trazer Tudo para Frente + Trazer Todas Para a Frente 1048576 2147483647 @@ -366,10 +366,11 @@ View - {1.7976931348623157e+308, 1.7976931348623157e+308} + + {3.4028235e+38, 3.4028235e+38} {320, 240} - + 256 @@ -377,6 +378,7 @@ 256 {{13, 10}, {618, 292}} + @@ -389,8 +391,9 @@ 256 - {{18, 210}, {402, 18}} + {{18, 214}, {402, 18}} + YES 67239424 @@ -422,6 +425,7 @@ 256 {{36, 60}, {548, 31}} + YES 67239424 @@ -440,7 +444,7 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -457,8 +461,9 @@ 256 - {{36, 162}, {548, 42}} + {{36, 166}, {548, 42}} + YES 67239424 @@ -478,6 +483,7 @@ ZS4KA 256 {{18, 97}, {402, 18}} + YES 67239424 @@ -498,13 +504,14 @@ ZS4KA 256 - {{36, 126}, {548, 14}} + {{36, 121}, {548, 28}} + YES 67239424 4194304 - Permitir que as mudanças no menu de entrada sobreescrevam o mapa do teclado atual do X11. + Permite que as alterações feitas no menu de leiautes de teclado sobrescrevam o mapa de teclado atual do X11. @@ -515,8 +522,9 @@ ZS4KA 256 - {{18, 146}, {402, 18}} + {{18, 153}, {402, 18}} + YES 67239424 @@ -537,8 +545,9 @@ ZS4KA 256 - {{36, -1}, {385, 31}} + {{36, -1}, {548, 31}} + YES 67239424 @@ -555,6 +564,7 @@ ZS4KA 256 {{18, 36}, {402, 18}} + YES 67239424 @@ -575,6 +585,7 @@ ZS4KA {{10, 33}, {598, 246}} + Entrada @@ -1238,10 +1249,12 @@ ZS4KA {644, 308} + + {{0, 0}, {1280, 938}} {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} + {3.4028235e+38, 3.4028235e+38} x11_prefs @@ -1254,10 +1267,11 @@ ZS4KA View - {1.7976931348623157e+308, 1.7976931348623157e+308} + + {3.4028235e+38, 3.4028235e+38} {320, 240} - + 256 @@ -1265,6 +1279,7 @@ ZS4KA 265 {{372, 191}, {132, 32}} + YES 67239424 @@ -1292,6 +1307,7 @@ ZS4KA 265 {{372, 159}, {132, 32}} + YES 67239424 @@ -1323,12 +1339,14 @@ ZS4KA 256 {333, 198} + YES 256 {333, 17} + @@ -1336,11 +1354,12 @@ ZS4KA 256 {{334, 0}, {16, 17}} + - 132.73099999999999 - 62.731000000000002 + 132.73100280761719 + 62.730998992919922 1000 75628096 @@ -1349,7 +1368,7 @@ ZS4KA 3 - MC4zMzMzMzI5OQA + MC4zMzMzMzI5ODU2AA 6 @@ -1471,6 +1490,7 @@ ZS4KA {{1, 17}, {333, 198}} + @@ -1481,19 +1501,21 @@ ZS4KA 256 {{334, 17}, {15, 198}} + _doScroller: - 0.99492380000000002 + 0.99492377042770386 256 {{1, 215}, {333, 15}} + 1 _doScroller: - 0.68852460000000004 + 0.68852460384368896 @@ -1503,6 +1525,7 @@ ZS4KA {{1, 0}, {333, 17}} + @@ -1512,6 +1535,7 @@ ZS4KA {{20, 20}, {350, 231}} + 50 @@ -1526,6 +1550,7 @@ ZS4KA 265 {{372, 223}, {132, 32}} + YES -2080244224 @@ -1546,10 +1571,12 @@ ZS4KA {519, 271} + + {{0, 0}, {1280, 938}} {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} + {3.4028235e+38, 3.4028235e+38} x11_apps @@ -3259,6 +3286,7 @@ ZS4KA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + IBBuiltInLabel-Red com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3315,9 +3343,9 @@ ZS4KA com.apple.InterfaceBuilder.CocoaPlugin {{271, 666}, {301, 153}} - {{507, 565}, {484, 308}} + {{507, 548}, {644, 308}} com.apple.InterfaceBuilder.CocoaPlugin - {{507, 565}, {484, 308}} + {{507, 548}, {644, 308}} {{184, 290}, {481, 345}} @@ -3334,11 +3362,11 @@ ZS4KA {{100, 746}, {155, 33}} com.apple.InterfaceBuilder.CocoaPlugin - {{68, 585}, {454, 271}} + {{68, 585}, {519, 271}} com.apple.InterfaceBuilder.CocoaPlugin - {{68, 585}, {454, 271}} + {{68, 585}, {519, 271}} {{433, 406}, {486, 327}} @@ -3347,7 +3375,7 @@ ZS4KA {320, 240} com.apple.InterfaceBuilder.CocoaPlugin - {{145, 1011}, {336, 20}} + {{145, 836}, {337, 20}} com.apple.InterfaceBuilder.CocoaPlugin {{67, 819}, {336, 20}} @@ -3452,6 +3480,7 @@ ZS4KA com.apple.InterfaceBuilder.CocoaPlugin + IBBuiltInLabel-Red com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3572,6 +3601,7 @@ ZS4KA 0 + IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx @@ -3579,5 +3609,10 @@ ZS4KA YES ../X11.xcodeproj 3 + + {9, 8} + {7, 2} + {15, 15} + diff --git a/xserver/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist b/xserver/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist index 43e790ad5..8c7691512 100644 --- a/xserver/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist +++ b/xserver/hw/xquartz/bundle/Resources/sv.lproj/locversion.plist @@ -3,12 +3,12 @@ LprojCompatibleVersion - 97 + 99 LprojLocale sv LprojRevisionLevel 1 LprojVersion - 97 + 99 diff --git a/xserver/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib b/xserver/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib index 601aca4ba..16e06436f 100644 --- a/xserver/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib +++ b/xserver/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib @@ -2,13 +2,13 @@ 1040 - 11A79a - 784 - 1059 - 478.00 + 11A194b + 787 + 1079 + 502.00 com.apple.InterfaceBuilder.CocoaPlugin - 784 + 787 @@ -366,10 +366,11 @@ View - {3.4028235e+38, 3.4028235e+38} + + {1.7976931348623157e+308, 1.7976931348623157e+308} {320, 240} - + 256 @@ -377,7 +378,6 @@ 256 {{13, 10}, {458, 292}} - @@ -392,7 +392,6 @@ 256 {{18, 210}, {402, 18}} - YES 67239424 @@ -424,7 +423,6 @@ 256 {{36, 56}, {385, 31}} - YES 67239424 @@ -443,7 +441,7 @@ controlColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -462,7 +460,6 @@ 256 {{36, 164}, {385, 42}} - YES 67239424 @@ -481,7 +478,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo 256 {{18, 91}, {402, 18}} - YES 67239424 @@ -504,12 +500,11 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo 256 {{36, 116}, {400, 29}} - YES 67239424 4194304 - Tillåter att ändringar i indatamenyn skriver över de befintliga X11-tangentkopplingarna. + Tillåter att ändringar i inmatningsmenyn skriver över de befintliga X11-tangentkopplingarna. @@ -522,7 +517,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo 256 {{18, 149}, {402, 18}} - YES 67239424 @@ -545,7 +539,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo 256 {{36, 1}, {385, 31}} - YES 67239424 @@ -562,7 +555,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo 256 {{18, 36}, {402, 18}} - YES 67239424 @@ -583,7 +575,6 @@ ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo {{10, 33}, {438, 246}} - Indata @@ -1252,12 +1243,10 @@ cmthIGlubmVow6VsbGV0Lgo {484, 308} - - {{0, 0}, {1440, 878}} {320, 262} - {3.4028235e+38, 3.4028235e+38} + {1.7976931348623157e+308, 1.7976931348623157e+308} x11_prefs @@ -1270,7 +1259,8 @@ cmthIGlubmVow6VsbGV0Lgo View - {3.4028235e+38, 3.4028235e+38} + + {1.7976931348623157e+308, 1.7976931348623157e+308} {320, 240} @@ -1490,6 +1480,7 @@ cmthIGlubmVow6VsbGV0Lgo {{1, 17}, {301, 198}} + 4 @@ -1521,6 +1512,7 @@ cmthIGlubmVow6VsbGV0Lgo {{1, 0}, {301, 17}} + 4 @@ -1529,12 +1521,12 @@ cmthIGlubmVow6VsbGV0Lgo {{20, 20}, {318, 231}} + 50 - QSAAAEEgAABBmAAAQZgAAA @@ -1565,7 +1557,7 @@ cmthIGlubmVow6VsbGV0Lgo {{0, 0}, {1440, 878}} {320, 262} - {3.4028235e+38, 3.4028235e+38} + {1.7976931348623157e+308, 1.7976931348623157e+308} x11_apps diff --git a/xserver/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib b/xserver/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib index 13cf11e0d..8e86061fa 100644 --- a/xserver/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib +++ b/xserver/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib @@ -960,7 +960,7 @@ moTpvKDmoIfmjInplK7jgIIKA 67239424 4194304 - 如果您想要使用 xclipboard、klipper 或其他任何 X11 夹纸板管理程序，请停用此选项。 + 如果您想要使用 xclipboard、klipper 或其他任何 X11 剪切板管理程序，请停用此选项。 diff --git a/xserver/hw/xquartz/bundle/mk_bundke.sh b/xserver/hw/xquartz/bundle/mk_bundke.sh index c85b21765..58d5f6abf 100644 --- a/xserver/hw/xquartz/bundle/mk_bundke.sh +++ b/xserver/hw/xquartz/bundle/mk_bundke.sh @@ -8,6 +8,7 @@ BUNDLE_ROOT=$3 localities="Dutch English French German Italian Japanese Spanish da fi ko no pl pt pt_PT ru sv zh_CN zh_TW" for lang in ${localities} ; do + [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj ] && rm -rf ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj mkdir -p ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1 @@ -16,7 +17,7 @@ for lang in ${localities} ; do done done -install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib//designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib +install -m 644 ${SRCDIR}/Resources/English.lproj/main.nib/designable.nib ${BUNDLE_ROOT}/Contents/Resources/English.lproj/main.nib install -m 644 ${SRCDIR}/Resources/X11.icns ${BUNDLE_ROOT}/Contents/Resources install -m 644 ${BUILDDIR}/Info.plist ${BUNDLE_ROOT}/Contents diff --git a/xserver/hw/xquartz/doc/Makefile.in b/xserver/hw/xquartz/doc/Makefile.in index 1837673e7..530ddf9fb 100644 --- a/xserver/hw/xquartz/doc/Makefile.in +++ b/xserver/hw/xquartz/doc/Makefile.in @@ -196,6 +196,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xquartz/mach-startup/Makefile.in b/xserver/hw/xquartz/mach-startup/Makefile.in index f8ba5b90d..0ba28941c 100644 --- a/xserver/hw/xquartz/mach-startup/Makefile.in +++ b/xserver/hw/xquartz/mach-startup/Makefile.in @@ -234,6 +234,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xquartz/mach-startup/bundle-main.c b/xserver/hw/xquartz/mach-startup/bundle-main.c index 6f7bbfdc2..498d6b738 100644 --- a/xserver/hw/xquartz/mach-startup/bundle-main.c +++ b/xserver/hw/xquartz/mach-startup/bundle-main.c @@ -74,7 +74,7 @@ extern int noPanoramiXExtension; #endif static char __crashreporter_info_buff__[4096] = {0}; -static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0]; +static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0]; #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 // This is actually a toolchain requirement, but I'm not sure the correct check, // but it should be fine to just only include it for Leopard and later. This line diff --git a/xserver/hw/xquartz/pbproxy/Makefile.in b/xserver/hw/xquartz/pbproxy/Makefile.in index d21311ac9..65ff05ed7 100644 --- a/xserver/hw/xquartz/pbproxy/Makefile.in +++ b/xserver/hw/xquartz/pbproxy/Makefile.in @@ -213,6 +213,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xquartz/quartz.c b/xserver/hw/xquartz/quartz.c index e21303ccd..26b2c1f38 100644 --- a/xserver/hw/xquartz/quartz.c +++ b/xserver/hw/xquartz/quartz.c @@ -62,6 +62,7 @@ #include #include #include +#include #include #include @@ -246,6 +247,40 @@ void QuartzUpdateScreens(void) { quartzProcs->UpdateScreen(pScreen); } +static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) { + UpdateSystemActivity(OverallAct); +} + +static void QuartzScreenSaver(int state) { + static CFRunLoopTimerRef pokeActivityTimer = NULL; + static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL }; + static pthread_mutex_t pokeActivityMutex = PTHREAD_MUTEX_INITIALIZER; + + pthread_mutex_lock(&pokeActivityMutex); + + if(state) { + if(pokeActivityTimer == NULL) + goto QuartzScreenSaverEnd; + + CFRunLoopTimerInvalidate(pokeActivityTimer); + CFRelease(pokeActivityTimer); + pokeActivityTimer = NULL; + } else { + if(pokeActivityTimer != NULL) + goto QuartzScreenSaverEnd; + + pokeActivityTimer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0, pokeActivityCallback, &pokeActivityContext); + if(pokeActivityTimer == NULL) { + ErrorF("Unable to create pokeActivityTimer.\n"); + goto QuartzScreenSaverEnd; + } + + CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes); + } +QuartzScreenSaverEnd: + pthread_mutex_unlock(&pokeActivityMutex); +} + void QuartzShowFullscreen(int state) { int i; @@ -256,6 +291,8 @@ void QuartzShowFullscreen(int state) { return; } + QuartzScreenSaver(!state); + if(XQuartzFullscreenVisible == state) return; diff --git a/xserver/hw/xquartz/quartzRandR.c b/xserver/hw/xquartz/quartzRandR.c index 298ec0a52..296f9b669 100644 --- a/xserver/hw/xquartz/quartzRandR.c +++ b/xserver/hw/xquartz/quartzRandR.c @@ -438,18 +438,16 @@ static Bool QuartzRandRSetConfig (ScreenPtr pScreen, static Bool _QuartzRandRUpdateFakeModes (ScreenPtr pScreen) { QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen); - if (pQuartzScreen->displayCount == 1) { - if(pQuartzScreen->fullscreenMode.ref) - CFRelease(pQuartzScreen->fullscreenMode.ref); - if(pQuartzScreen->currentMode.ref) - CFRelease(pQuartzScreen->currentMode.ref); + if(pQuartzScreen->fullscreenMode.ref) + CFRelease(pQuartzScreen->fullscreenMode.ref); + if(pQuartzScreen->currentMode.ref) + CFRelease(pQuartzScreen->currentMode.ref); - if (!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0], - &pQuartzScreen->fullscreenMode)) - return FALSE; + if (!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0], + &pQuartzScreen->fullscreenMode)) + return FALSE; - CFRetain(pQuartzScreen->fullscreenMode.ref); /* This extra retain is for currentMode's copy */ - } else { + if (pQuartzScreen->displayCount > 1) { pQuartzScreen->fullscreenMode.width = pScreen->width; pQuartzScreen->fullscreenMode.height = pScreen->height; if(XQuartzIsRootless) @@ -467,6 +465,11 @@ static Bool _QuartzRandRUpdateFakeModes (ScreenPtr pScreen) { } else { pQuartzScreen->currentMode = pQuartzScreen->fullscreenMode; } + + /* This extra retain is for currentMode's copy. + * fullscreen and rootless share a retain. + */ + CFRetain(pQuartzScreen->currentMode.ref); DEBUG_LOG("rootlessMode: %d x %d\n", (int)pQuartzScreen->rootlessMode.width, (int)pQuartzScreen->rootlessMode.height); DEBUG_LOG("fullscreenMode: %d x %d\n", (int)pQuartzScreen->fullscreenMode.width, (int)pQuartzScreen->fullscreenMode.height); diff --git a/xserver/hw/xquartz/xpr/Makefile.in b/xserver/hw/xquartz/xpr/Makefile.in index 3b9eaf48f..125458276 100644 --- a/xserver/hw/xquartz/xpr/Makefile.in +++ b/xserver/hw/xquartz/xpr/Makefile.in @@ -198,6 +198,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xquartz/xpr/dri.c b/xserver/hw/xquartz/xpr/dri.c index 0d2c51a2a..3474d27a7 100644 --- a/xserver/hw/xquartz/xpr/dri.c +++ b/xserver/hw/xquartz/xpr/dri.c @@ -89,14 +89,6 @@ static x_hash_table *surface_hash; /* maps surface ids -> drawablePrivs */ static Bool DRIFreePixmapImp(DrawablePtr pDrawable); -/* FIXME: don't hardcode this? */ -#define CG_INFO_FILE "/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/Info-macos.plist" - -/* Corresponds to SU Jaguar Green */ -#define CG_REQUIRED_MAJOR 1 -#define CG_REQUIRED_MINOR 157 -#define CG_REQUIRED_MICRO 11 - typedef struct { DrawablePtr pDrawable; int refCount; @@ -109,96 +101,6 @@ typedef struct { void *buffer; } DRIPixmapBuffer, *DRIPixmapBufferPtr; -/* Returns version as major.minor.micro in 10.10.10 fixed form */ -static unsigned int -get_cg_version (void) -{ - static unsigned int version; - - FILE *fh; - char *ptr; - - if (version != 0) - return version; - - /* I tried CFBundleGetVersion, but it returns zero, so.. */ - - fh = fopen (CG_INFO_FILE, "r"); - if (fh != NULL) - { - char buf[256]; - - while (fgets (buf, sizeof (buf), fh) != NULL) - { - unsigned char c; - - if (!strstr (buf, "CFBundleShortVersionString") - || fgets (buf, sizeof (buf), fh) == NULL) - { - continue; - } - - ptr = strstr (buf, ""); - if (ptr == NULL) - continue; - - ptr += strlen (""); - - /* Now PTR points to "MAJOR.MINOR.MICRO". */ - - version = 0; - - again: - switch ((c = *ptr++)) - { - case '.': - version = version * 1024; - goto again; - - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - version = ((version & ~0x3ff) - + (version & 0x3ff) * 10 + (c - '0')); - goto again; - } - break; - } - - fclose (fh); - } - - return version; -} - -static Bool -test_cg_version (unsigned int major, unsigned int minor, unsigned int micro) -{ - unsigned int cg_ver = get_cg_version (); - - unsigned int cg_major = (cg_ver >> 20) & 0x3ff; - unsigned int cg_minor = (cg_ver >> 10) & 0x3ff; - unsigned int cg_micro = cg_ver & 0x3ff; - - if (cg_major > major) - return TRUE; - else if (cg_major < major) - return FALSE; - - /* cg_major == major */ - - if (cg_minor > minor) - return TRUE; - else if (cg_minor < minor) - return FALSE; - - /* cg_minor == minor */ - - if (cg_micro < micro) - return FALSE; - - return TRUE; -} - Bool DRIScreenInit(ScreenPtr pScreen) { @@ -224,20 +126,6 @@ DRIScreenInit(ScreenPtr pScreen) pDRIPriv->directRenderingSupport = TRUE; pDRIPriv->nrWindows = 0; - /* Need recent cg for window access update */ - if (!test_cg_version (CG_REQUIRED_MAJOR, - CG_REQUIRED_MINOR, - CG_REQUIRED_MICRO)) - { - ErrorF ("[DRI] disabled direct rendering; requires CoreGraphics %d.%d.%d\n", - CG_REQUIRED_MAJOR, CG_REQUIRED_MINOR, CG_REQUIRED_MICRO); - - pDRIPriv->directRenderingSupport = FALSE; - - /* Note we don't nuke the dri private, since we need it for - managing indirect surfaces. */ - } - /* Initialize drawable tables */ for (i = 0; i < DRI_MAX_DRAWABLES; i++) { pDRIPriv->DRIDrawables[i] = NULL; diff --git a/xserver/hw/xwin/Makefile.in b/xserver/hw/xwin/Makefile.in index dcdb8ae9f..446a8f4ab 100644 --- a/xserver/hw/xwin/Makefile.in +++ b/xserver/hw/xwin/Makefile.in @@ -304,6 +304,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/hw/xwin/glx/Makefile.in b/xserver/hw/xwin/glx/Makefile.in index d364a2766..af9811af4 100644 --- a/xserver/hw/xwin/glx/Makefile.in +++ b/xserver/hw/xwin/glx/Makefile.in @@ -197,6 +197,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/include/Makefile.in b/xserver/include/Makefile.in index 6dc36fab3..fa701944f 100644 --- a/xserver/include/Makefile.in +++ b/xserver/include/Makefile.in @@ -205,6 +205,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/include/eventstr.h b/xserver/include/eventstr.h index 433227e6e..377cceba2 100644 --- a/xserver/include/eventstr.h +++ b/xserver/include/eventstr.h @@ -99,7 +99,7 @@ struct _DeviceEvent struct { uint8_t mask[(MAX_VALUATORS + 7)/8]; /**< Valuator mask */ uint8_t mode[(MAX_VALUATORS + 7)/8]; /**< Valuator mode (Abs or Rel)*/ - uint32_t data[MAX_VALUATORS]; /**< Valuator data */ + int32_t data[MAX_VALUATORS]; /**< Valuator data */ int32_t data_frac[MAX_VALUATORS]; /**< Fractional part for data */ } valuators; struct { diff --git a/xserver/include/inputstr.h b/xserver/include/inputstr.h index 1b504e939..df6721093 100644 --- a/xserver/include/inputstr.h +++ b/xserver/include/inputstr.h @@ -57,7 +57,7 @@ SOFTWARE. #include "geext.h" #include "privates.h" -#define BitIsOn(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))) +#define BitIsOn(ptr, bit) (!!(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))) #define SetBit(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7))) #define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7))) diff --git a/xserver/mi/Makefile.in b/xserver/mi/Makefile.in index c92693bc0..901538a92 100644 --- a/xserver/mi/Makefile.in +++ b/xserver/mi/Makefile.in @@ -217,6 +217,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/mi/miwideline.c b/xserver/mi/miwideline.c index b11b40bd2..bc5ee74c2 100644 --- a/xserver/mi/miwideline.c +++ b/xserver/mi/miwideline.c @@ -403,7 +403,7 @@ miPolyBuildPoly ( i = top; j = StepAround (top, -1, count); - if (slopes[j].dy * slopes[i].dx > slopes[i].dy * slopes[j].dx) + if ((int64_t)slopes[j].dy * slopes[i].dx > (int64_t)slopes[i].dy * slopes[j].dx) { clockwise = -1; slopeoff = -1; diff --git a/xserver/miext/Makefile.in b/xserver/miext/Makefile.in index d4a455f2e..be1d250f2 100644 --- a/xserver/miext/Makefile.in +++ b/xserver/miext/Makefile.in @@ -192,6 +192,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/miext/cw/Makefile.in b/xserver/miext/cw/Makefile.in index 50e54e17d..7535acc63 100644 --- a/xserver/miext/cw/Makefile.in +++ b/xserver/miext/cw/Makefile.in @@ -196,6 +196,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/miext/damage/Makefile.in b/xserver/miext/damage/Makefile.in index c60aa34ca..780268a01 100644 --- a/xserver/miext/damage/Makefile.in +++ b/xserver/miext/damage/Makefile.in @@ -208,6 +208,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/miext/rootless/Makefile.in b/xserver/miext/rootless/Makefile.in index b3da9831b..55080b997 100644 --- a/xserver/miext/rootless/Makefile.in +++ b/xserver/miext/rootless/Makefile.in @@ -197,6 +197,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/miext/shadow/Makefile.in b/xserver/miext/shadow/Makefile.in index 671d06d23..a251979b0 100644 --- a/xserver/miext/shadow/Makefile.in +++ b/xserver/miext/shadow/Makefile.in @@ -213,6 +213,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/miext/shadow/shpacked.c b/xserver/miext/shadow/shpacked.c index 20d2ea19e..06606bcf3 100644 --- a/xserver/miext/shadow/shpacked.c +++ b/xserver/miext/shadow/shpacked.c @@ -102,8 +102,8 @@ shadowUpdatePacked (ScreenPtr pScreen, width -= i; scr += i; #define PickBit(a,i) (((a) >> (i)) & 1) - while (i--) - *win++ = *sha++; + memcpy(win, sha, i * sizeof(FbBits)); + sha += i; } shaLine += shaStride; y++; diff --git a/xserver/os/Makefile.in b/xserver/os/Makefile.in index 7a9acd783..94ab7b9e6 100644 --- a/xserver/os/Makefile.in +++ b/xserver/os/Makefile.in @@ -226,6 +226,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/os/io.c b/xserver/os/io.c index fb9f76207..421023807 100644 --- a/xserver/os/io.c +++ b/xserver/os/io.c @@ -410,16 +410,29 @@ ReadRequestFromClient(ClientPtr client) else needed = sizeof(xReq); } - oci->lenLastReq = needed; /* If there are bytes to ignore, ignore them now. */ if (oci->ignoreBytes > 0) { assert(needed == oci->ignoreBytes || needed == oci->size); - oci->ignoreBytes -= gotnow; - needed = gotnow = 0; + /* + * The _XSERVTransRead call above may return more or fewer bytes than we + * want to ignore. Ignore the smaller of the two sizes. + */ + if (gotnow < needed) { + oci->ignoreBytes -= gotnow; + oci->bufptr += gotnow; + gotnow = 0; + } else { + oci->ignoreBytes -= needed; + oci->bufptr += needed; + gotnow -= needed; + } + needed = 0; } + oci->lenLastReq = needed; + /* * Check to see if client has at least one whole request in the * buffer beyond the request we're returning to the caller. diff --git a/xserver/os/log.c b/xserver/os/log.c index e5eae148b..ff275af2f 100644 --- a/xserver/os/log.c +++ b/xserver/os/log.c @@ -121,7 +121,7 @@ static Bool needBuffer = TRUE; #include static char __crashreporter_info_buff__[4096] = {0}; -static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0]; +static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0]; #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 // This is actually a toolchain requirement, but I'm not sure the correct check, // but it should be fine to just only include it for Leopard and later. This line diff --git a/xserver/os/strlcat.c b/xserver/os/strlcat.c index 91ceabb1c..7d53b0a6a 100644 --- a/xserver/os/strlcat.c +++ b/xserver/os/strlcat.c @@ -15,8 +15,8 @@ */ -#ifdef HAVE_XORG_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include diff --git a/xserver/os/strlcpy.c b/xserver/os/strlcpy.c index e8e1b0217..2e55b2e63 100644 --- a/xserver/os/strlcpy.c +++ b/xserver/os/strlcpy.c @@ -14,8 +14,8 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_XORG_CONFIG_H -#include +#ifdef HAVE_DIX_CONFIG_H +#include #endif #include diff --git a/xserver/randr/Makefile.in b/xserver/randr/Makefile.in index 858d4237e..8307ecb47 100644 --- a/xserver/randr/Makefile.in +++ b/xserver/randr/Makefile.in @@ -217,6 +217,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/record/Makefile.in b/xserver/record/Makefile.in index c05f59bca..a036c00b3 100644 --- a/xserver/record/Makefile.in +++ b/xserver/record/Makefile.in @@ -196,6 +196,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/render/Makefile.in b/xserver/render/Makefile.in index 5a935a0a6..007049ecb 100644 --- a/xserver/render/Makefile.in +++ b/xserver/render/Makefile.in @@ -211,6 +211,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/render/render.c b/xserver/render/render.c index 00241f9af..85a43924a 100644 --- a/xserver/render/render.c +++ b/xserver/render/render.c @@ -2552,8 +2552,8 @@ static void swapStops(void *stuff, int num) } colors = (CARD16 *)(stops); for (i = 0; i < 4*num; ++i) { - swaps(stops, n); - ++stops; + swaps(colors, n); + ++colors; } } diff --git a/xserver/test/Makefile.in b/xserver/test/Makefile.in index b3e9fffe8..623ef1ab4 100644 --- a/xserver/test/Makefile.in +++ b/xserver/test/Makefile.in @@ -234,6 +234,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/test/input.c b/xserver/test/input.c index b90d3b4fd..f08e13b9e 100644 --- a/xserver/test/input.c +++ b/xserver/test/input.c @@ -182,6 +182,8 @@ static void dix_event_to_core(int type) ev.time = time; ev.root_y = x; ev.root_x = y; + SetBit(ev.valuators.mask, 0); + SetBit(ev.valuators.mask, 1); ev.root = ROOT_WINDOW_ID; ev.corestate = state; ev.detail.key = detail; diff --git a/xserver/test/xi2/Makefile.in b/xserver/test/xi2/Makefile.in index 847d1e228..1c6ff93fb 100644 --- a/xserver/test/xi2/Makefile.in +++ b/xserver/test/xi2/Makefile.in @@ -293,6 +293,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/test/xi2/protocol-common.c b/xserver/test/xi2/protocol-common.c index 50f2b8698..10d82a501 100644 --- a/xserver/test/xi2/protocol-common.c +++ b/xserver/test/xi2/protocol-common.c @@ -28,6 +28,7 @@ #include #include "extinit.h" /* for XInputExtensionInit */ #include "exglobals.h" +#include "xkbsrv.h" /* for XkbInitPrivates */ #include #include "protocol-common.h" diff --git a/xserver/xfixes/Makefile.in b/xserver/xfixes/Makefile.in index 44b3afe52..08e3eaec3 100644 --- a/xserver/xfixes/Makefile.in +++ b/xserver/xfixes/Makefile.in @@ -209,6 +209,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/xkb/Makefile.in b/xserver/xkb/Makefile.in index 6ef9af55c..7c788e649 100644 --- a/xserver/xkb/Makefile.in +++ b/xserver/xkb/Makefile.in @@ -218,6 +218,8 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_DEVEL_DOCS_FALSE = @ENABLE_DEVEL_DOCS_FALSE@ ENABLE_DEVEL_DOCS_TRUE = @ENABLE_DEVEL_DOCS_TRUE@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FBDEVHW_FALSE = @FBDEVHW_FALSE@ diff --git a/xserver/xkb/xkb.c b/xserver/xkb/xkb.c index 4105c1c6b..7d95bc0e3 100644 --- a/xserver/xkb/xkb.c +++ b/xserver/xkb/xkb.c @@ -2343,8 +2343,8 @@ _XkbSetMapChecks(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq *req, char* va XkbDescPtr xkb; int error; int nTypes = 0, nActions; - CARD8 mapWidths[XkbMaxLegalKeyCode + 1]; - CARD16 symsPerKey[XkbMaxLegalKeyCode + 1]; + CARD8 mapWidths[XkbMaxLegalKeyCode + 1] = {0}; + CARD16 symsPerKey[XkbMaxLegalKeyCode + 1] = {0}; xkbi= dev->key->xkbInfo; xkb = xkbi->desc;