summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-10-23xserver 1.7.1xorg-server-1.7.1server-1.7-branchPeter Hutterer1-2/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-23DRI2: Report the correct extension minor versionserver-1.7-nominationsKeith Packard1-1/+1
Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 9a2f6135bfb0f12ec28f304c97917d2f7c64db05)
2009-10-23Kill compilation warnings.Marcin Baczyński2-3/+11
Signed-off-by: Marcin Baczyński <marbacz@gmail.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit d886008c96cd16f735f54dace070cb00b23c6f44)
2009-10-23dix: Fix up colormap fixup.Adam Jackson1-0/+3
FindClientResourcesByType() will walk all colormaps on all screens; we only want to fix up the current screen. Otherwise, screens > 0 will have the visual pointers for their colormaps pointing off into space. Signed-off-by: Adam Jackson <ajax@redhat.com> (cherry picked from commit 15b30fde179cba3877182cd51b0f870ef29ffaee)
2009-10-22Resolve an inconsistency between libX11 and Xserver over GetModifierMappingJon TURNEY1-5/+3
libX11 ModMap.c believes that GetModifierMapping can never return an error Xserver devices.c believes that GetModifierMapping can return an error if the ModMap couldn't be generated According to the protocol document I have, libX11 is right, so adjust the server to send back an empty modmap if one couldn't be made... http://bugs.freedesktop.org/show_bug.cgi?id=24621 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 909df9beb3ddd02632f36ae682537280a6a8e5b4)
2009-10-22Merge branch 'server-1.7-branch' of ↵Peter Hutterer9-74/+128
git://anongit.freedesktop.org/~ewalsh/xserver into server-1.7-nominations
2009-10-21Don't print a failure message when XACE denies an input event delivery.Eamon Walsh1-25/+25
A denial is normal and the behavior should be to drop the event. Having the log message creates excessive log spam. Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> (cherry picked from commit d4fe55c98c28055191faeba92f43f30fb47cc43a)
2009-10-21xselinux: Note something in the log if disabled by boolean.Eamon Walsh1-1/+3
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
2009-10-21xselinux: Use the now-exported IsPointerDevice() instead of a copy.Eamon Walsh1-11/+1
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
2009-10-21dix: Export IsPointerDevice() and IsKeyboardDevice().Eamon Walsh1-2/+2
Makes the functions available to extmod for extensions to call. Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> (cherry picked from commit 0ae1632be045bfbb288bb57190c830f94247460f)
2009-10-21xselinux: Allow SetWindowCreateContext to be used for pixmaps as well.Eamon Walsh1-1/+1
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
2009-10-21xselinux: switch from x_device to separate x_pointer and x_keyboard classes.Eamon Walsh2-9/+51
This will allow separate controls over pointer and keyboard without having to relabel the devices to separate types. [Backport to 1.7] Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> (cherry picked from commit 6c2ae5fec552366e11ad64a27626eb5dec4becf0)
2009-10-21xace: Relax permissions on XkbGetState from Read to Getattr.Eamon Walsh1-1/+1
This request is used to get the current keyboard group and is called from GTK. It does not return an actual keymap (aside from modifiers) so it should be safe to relax the permission on it. However it does return button state information which should be controlled through a separate pointer Read check. Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> (cherry picked from commit c4ffce4dc84a0a9d134a59b7e7765c99ed767e53)
2009-10-21xselinux: Stop special-casing QueryPointer access checks.Eamon Walsh1-11/+0
XACE has been changed to not return BadAccess on device read failures. Thus, no need for this workaround code. [Backport to 1.7] Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> (cherry-picked from commit 0ff28319906eeb3f236acd72201c416ce01f2c6e)
2009-10-21xace: Fake return values on denials in input polling requests.Eamon Walsh5-24/+55
Instead of returning BadAccess when "read" permission is denied on a device, falsify the device state (buttons down, keys pressed). This is nicer to applications, but may still have undesired side effects. The long-term solution is not to use these requests in event-driven code! Requests affected: QueryPointer, QueryKeymap, XiQueryDevice. Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> (cherry picked from commit 8502c06e19a4c00bf1311f54f9a365ee9e026e97)
2009-10-22dmxDestroyWindow() - must call the X's native DetroyWindow()Lee Leahu1-2/+1
Don't really know why this section was disabled, but without it, certain pPicture resources do not get free'd until later in the FreeClientResources() process after the screen has been free'd - resulting in seg fault. With this patch, all resources normally free'd using vanilla X are now also being freed correctly by Xdmx. https://bugs.freedesktop.org/show_bug.cgi?id=24576 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit f713f447a2110718dfc091380699362d76f0cd6c)
2009-10-22dmx: when setting up device axis, use the correct counter numberLee Leahu1-11/+11
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 664a8e37fd83141974b772980f680b94e48b4f87)
2009-10-22kdrive: silence tslib compiler warningsPeter Hutterer1-4/+0
tslib.c: In function 'TslibInit': tslib.c:157: warning: unused variable 'tsDev' tslib.c:156: warning: unused variable 'inputent' tslib.c:155: warning: unused variable 'inputdir' tslib.c:154: warning: unused variable 'i' tslib.c:154: warning: unused variable 'fd' Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit e08d8a2b043e5be821c5e8b2dbf37b09102b5d01)
2009-10-22Fix 'distcheck' to use host xkb files but install to build dirKeith Packard2-2/+12
'make distcheck' needs to read xkb files and write out compiled versions as a part of the 'make check' phase. This patch passes suitable options to the configure stage of the distcheck process to read xkb files from the system location and write them to the distcheck _inst directory. Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 08e7f62faf72540cb3a6f1023024c145f7fa1a23)
2009-10-20Xming: Remove unused X-boxed icon resourceColin Harrison4-3/+0
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> (cherry picked from commit 78c87bdad1feab91c2a39e01513b4b0826665f06) Squashed-into this commit: Fix make dist after 78c87bdad1feab91c2a39e01513b4b0826665f06 Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 63f4bf39170eb2262617ef2dc95fd6d337b9dad5)
2009-10-19XQuartz: Fix a possible minor memory leakJeremy Huddleston1-0/+1
(cherry picked from commit 24e640e1fa6cfb3917ba90dcdabf1fadddff20aa)
2009-10-19XQuartz: Remove the redundant xquartz_resetenv_displayJeremy Huddleston2-8/+1
unsetenv(DISPLAY) takes care of this for us anyway (cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e) (cherry picked from commit f3223c71cfc638e695981e527517d48ea00d124d)
2009-10-19xserver 1.7.0.902xorg-server-1.7.0.902Peter Hutterer1-2/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-19Revert "Xming: Remove unused X-boxed icon resource"Peter Hutterer3-0/+2
Breaks make dist. make[2]: *** No rule to make target `X-boxed.ico', needed by `distdir'. Stop. This reverts commit 2969eaa88c4422fedf1b069e6fe055904b233db2. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-19Fix segfault when -extension XKEYBOARD is passed on the command lineAlan Coopersmith1-5/+23
Users should be told they can't disable XKB or XInput via error messages, not core dumps. Reported by T`2 on #xorg irc Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 2bd71a6db241924bd17ac9dd4aa38e7e563ee5c1)
2009-10-19kdrive: fix Xfake build by removing the old keysym stuffPeter Hutterer1-135/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit a32b2420d85f076282721afe005e85fff7d9837e)
2009-10-19Remove duplicates from Xfake_LDADDYaakov Selkowitz1-2/+1
KDRIVE_LIBS already contains the libs in XSERVER_LIBS, so linking against both leads to multiple-definition errors when linking on Cygwin. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit a2f27b97900f335cd5f6a3e5bf8fa1d0ec9eb9ac)
2009-10-19Fix XWIN_LIBS definitionYaakov Selkowitz1-2/+2
Move XWIN_LIBS from XWIN=auto conditional to XWIN=yes conditional, otherwise the build breaks if an explicit --enable-xwin is passed to configure. Also remove obsolete library values from the definition. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit ed4c6bc79a797830895ad6c3601318b2d1c4bdcb)
2009-10-19Install SDK pkg-config and aclocal files only if XORGYaakov Selkowitz1-0/+2
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit bcd0c02cfd0707b5f8b1ca91dfbe4412df2c643e)
2009-10-19Cygwin/X: Make -logverbose affect the verbosity of logging to the log fileJon TURNEY1-1/+1
Make -logverbose affect the verbosity of logging to the log file, not just the verbosity of logging to the console Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> (cherry picked from commit 1b0dfd8dee639870725d3bd9b70c3bd589d09e5a)
2009-10-19Xming: Remove unused X-boxed icon resourceColin Harrison3-2/+0
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> (cherry picked from commit 78c87bdad1feab91c2a39e01513b4b0826665f06)
2009-10-19Xming: update .rc fileColin Harrison1-6/+6
Remove the obsolete DISCARDABLE flag in the .rc file Replace the obsolete DIALOG resource with DIALOGEX in the .rc file Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> (cherry picked from commit fdf7f7e95c852734c620f58df408a324902172cf)
2009-10-19Cygwin/X: Don't build rootless extension code unless we need itJon TURNEY1-2/+8
Only try to build rootless extension code if we really need it (i.e. mwextwm mode is enabled) Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> (cherry picked from commit 5ddfd9d0898629627e8ab10e65ea2e082be3af37)
2009-10-19dolt: add Cygwin to supported platformsYaakov Selkowitz1-0/+3
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 25344ba7f7845654364d62bf15322b3b79465bd9)
2009-10-15[alpha] assume we have __NR_pciconfig_iobaseMatt Turner1-4/+0
The code path if we didn't have support has been broken since before we switched to git. The pciconfig_iobase syscall has been supported since 2000. Signed-off-by: Matt Turner <mattst88@gmail.com> (cherry picked from commit 5e762f0e2f203b5121a3de3b9af3c8981b31a77f)
2009-10-15[alpha] don't return from void functionsMatt Turner1-6/+12
Signed-off-by: Matt Turner <mattst88@gmail.com> (cherry picked from commit 46785c04bca16f495af3ed8d685aee939a1a8f39)
2009-10-15Fix undefined symbols on alphaMichael Cree1-6/+6
Signed-off-by: Matt Turner <mattst88@gmail.com> (cherry picked from commit 34eddbbb73bb16395dba0818247909c1b4bee4c2)
2009-10-15Fix breakage on alpha caused by c7680befe5aeMatt Turner1-23/+39
Pinpointed by by Michael Cree. Commit c7680befe5ae removed Jensen support, but at the same time broke support for dense memory systems. Signed-off-by: Matt Turner <mattst88@gmail.com> (cherry picked from commit 9625f6d328d6f516520930227b218979309938bc)
2009-10-14dix: extend IsPointerDevice check to valuator-only devices.Peter Hutterer1-1/+3
A device with valuators but no keys is definitely a pointer device and needs to be attached to the VCP. Otherwise, the class copying happens on the VCK and the VCP isn't updated with the events that are to be sent through it. This addresses the trigger for #24441, not the actual issue. Jury is still out on valuator+key devices. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 72f5874434c0c015b671c492c1318f35f1793668)
2009-10-13Rootless: src drawable window can now be NULLJeremy Huddleston1-2/+2
Fix a possible crash when pSrc->pDrawable is NULL. Signed-off-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> (cherry picked from commit 7e178ffbed7c8557faf8d471ad275aa2b0365e1d)
2009-10-13Rootless: Abstract some of the Xplugin specific stuff which has crept into ↵Jeremy Huddleston7-71/+76
rootlessWindow.c The rootless extension now directly calls some Xplugin functions, and relies on types defined in Xplugin.h, which isn't very abstracted :-) This patch is a start at abstracting some of the Xplugin specific stuff which has crept into rootlessWindow.c. This has been done in a pretty mindless fashion, without much thought as to if the additions to the generic rootless interface are the correct ones There is some confusion as to if RootlesscolormapCallback() returns a Bool or xp_error_enum value (not so abstact), but I have no way of checking, of finding out if Xplugin actually checks the result :-) Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> (cherry picked from commit 6980f77892e0409b44bd8f33ba82e7273c6462a4)
2009-10-12xserver 1.7.0.901xorg-server-1.7.0.901Peter Hutterer1-2/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-10EXA: Fix exaTryDriverSolidFill() for solid source pictures.Michel Dänzer1-13/+22
Solid pictures have a NULL pFormat field, but their format is always PICT_a8r8g8b8. Signed-off-by: Michel Dänzer <daenzer@vmware.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 1088073b11ed488c0df45af3867b900ef93c6fe1)
2009-10-10EXA: fix exaGetRGBAFromPixel to not loop forever on PICT_a8 pictureBen Skeggs1-14/+20
Easily reproducible by running "rendercheck -t fill". It should be safe to just test against rbits for all colour components as we should always have values for r/g/bbits for PICT_FORMAT_COLOR formats. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Michel Dänzer <daenzer@vmware Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 55305cf8db7787883bc80b7348eb626e609626f8)
2009-10-10composite: Revert changes from adding support for BGRA picture formats.Michel Dänzer1-3/+1
They were aimed towards a since abandoned approach for making radeon KMS work on big endian machines, and Aaron Plattner pointed out that they break the Composite extension when the X server runs in 16bpp. Signed-off-by: Michel Dänzer <daenzer@vmware.com> Tested-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit b375be9285c40467578fac2f1360c29a75306ab4)
2009-10-09Fix make warning: overriding commands for target `dix.O'Alan Coopersmith1-1/+2
Not only does automake generate unnecessary rules for dix.O on platforms for which SPECIAL_DTRACE_OBJECTS is false, it generates duplicate sets when "if SPECIAL_DTRACE_OBJECTS" is nested inside "if XSERVER_DTRACE" Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit c0a1bb511a4629bf5683d8a710dc4a1c577a5d44)
2009-10-07XQuartz: Send mouse location with scroll events.Jeremy Huddleston1-1/+1
This fixes the problem where (0, 0) was sent as the mouse location with scroll button events causing the event to not reach the client. (cherry picked from commit c4886fbabc1d8b4054654b227fcad83f58e8e798)
2009-10-07Add platform tests for Dtrace linker magicAlan Coopersmith6-8/+18
Replaces special handling for Xquartz DDX and scales better to handling the multiple platforms that now have some level of Dtrace support available. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2009-10-07Fix build of unit tests when dtrace probes are enabledAlan Coopersmith4-2/+12
ar loses the dtrace probe magic when building static libraries, so we have to link with the .O files in order to resolve the dtrace probe symbols. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-10-07Set XQUARTZ to no on non-Darwin OS'esAlan Coopersmith1-0/+1
Fixes build with dtrace probes on Solaris after efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-30 23:23:33 +0000