summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-04-16DRI2: Track DRI2 drawables as resources, not privatesKristian Høgsberg3-128/+38
The main motivation here is to have the resource system clean up the DRI2 drawable automatically so glx doesn't have to. Right now, the glx drawable resource must be destroyed before the X drawable, so that calling DRI2DestroyDrawable doesn't crash. By making the DRI2 drawable a resource, GLX doesn't have to worry about that and the resource destruction order becomes irrelevant. https://bugs.freedesktop.org/show_bug.cgi?id=26394 Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-16glx: Let the resource system destroy pixmapsKristian Høgsberg1-14/+15
GLX pbuffers are implemented using a pixmap allocated by the server. With the change to DRI2 to track DRI2 drawables as resources, we need to make sure that every drawable we create a DRI2 drawable for has an XID. By using the XID of the pbuffer, the resource system will automatically reclaim the hidden pixmap and the DRI2 drawable when the pbuffer is destroyed or the client exits. Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-16glx: Track GLX 1.3 style GLX drawables under their X drawable ID as wellKristian Høgsberg2-0/+23
This ensures that the DrawableGone callback gets called as necessary when the X drawable goes away. Otherwise, using a GLX drawable (say, glXSwapBuffers) in indirect mode after the X drawable has been destroyed will crash the server. Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Michel Dänzer <michel@daenzer.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-15Merge remote branch 'whot/for-keith'Keith Packard5-185/+132
2010-04-16vfb: add a name and type to the pointer and keyboardJulien Cristau1-0/+6
Fixes a crash in XIQueryDevice which calls strlen on a NULL pointer. #0 strlen () at ../sysdeps/x86_64/strlen.S:31 #1 0x00000000004c16ed in SizeDeviceInfo (dev=0x969bd0) at ../../Xi/xiquerydevice.c:204 #2 0x00000000004c1a01 in ProcXIQueryDevice (client=0xa57510) at ../../Xi/xiquerydevice.c:98 Debian bug#575905 <http://bugs.debian.org/575905> Reported-by: "Bernhard R. Link" <brlink@debian.org> Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-16dix: Export AllocDevicePair GetPointerEvents, GetKeyboardEvents and ↵Adam Tkac1-4/+4
generate_modkeymap functions from Xorg. Those functions are used by TigerVNC libvnc.so module which doesn't use standard XInput infrastructure but uses same functions like, for example, XTest devices. Signed-off-by: Adam Tkac <atkac@redhat.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-16mi: remove log-spamming bogus error message (#26843)Peter Hutterer1-21/+6
miSpriteRealizeCursor is called whenever a device is set floating and it's fine to do so, no need for an error message. Same goes for the other miSprite messages. X.Org Bug 26843 <http://bugs.freedesktop.org/show_bug.cgi?id=26843> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-16mi: don't thrash resources when displaying the software cursor across screensPierre-Loup A. Griffais1-159/+111
This changes the DC layer to maintain a persistent set of GCs/pixmaps/pictures for each pScreen instead of failing to thrash between them when changing screens. Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-16dix: fix cursor screen check for xinerama setups.Tim Yamin1-1/+5
The de-duplication of CheckPhysLimits 942eae6868b8b0f343b6a added a condition that is invalid for a Xinerama setup. pScreen is invalid for the Xinerama case, so comparing it to anything is a bad idea. Signed-off-by: Tim Yamin <plasm@roo.me.uk> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-15XQuartz GLX: Don't let garbage enter our pixel requestJeremy Huddleston1-1/+1
https://bugs.freedesktop.org/show_bug.cgi?id=27654 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-15XQuartz: Fix possible NULL dereference in ListenOnOpenFDJeremy Huddleston1-2/+3
<rdar://problem/7862319> Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Marc Majka <majka@apple.com>
2010-04-15XQuartz: Localization updateJeremy Huddleston73-1177/+4563
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-15dix: Fix crash in DeliverGrabbedEvents.Peter Hutterer1-1/+1
If both devices are synchronously grabbed, first with a GrabPointer, then with a GrabKeyboard (GrabModeSync on both), sync.other of each device points to the grab of the respective other device. If the keyboard is then thawed through a AllowSome request, the VCK's sync.other is reset to NULL. Subsequently, an event on the VCP would crash the server when dereferencing sync.other on the VCP. The check's purpose is to compare if the other device is grabbed by the same client, which should be checked by accessing (dev->deviceGrab->grab->resource). A check of the server-1.3 sources confirms that. XTS test case: Xlib13 XAllowEvents 20. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-14EXA: Check sys_ptr isn't NULL before passing it to the UploadToScreen hook.Michel Dänzer1-1/+1
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27510 . Signed-off-by: Michel Dänzer <daenzer@vmware.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-13XGE: don't register an extension eventJulien Cristau2-15/+1
The GenericEvent is a core event, we never send an extension event, so don't reserve an id for one. Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-13Bump version in configure.acJulien Cristau1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-12glx: Set the pbuffer bit for dri2 fbconfigsKristian Høgsberg5-12/+21
They've been implemented for a while, but we never advertised them. All we need to do is set the GLX_PBUFFER_BIT in the drawable type fbconfig field when we're using DRI2. https://bugs.freedesktop.org/show_bug.cgi?id=26581 Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-12Merge remote branch 'jeremyhu/master'Keith Packard12-1186/+877
2010-04-11XQuartz: Add a GUI preference for the Alt / Mode_switch toggleJeremy Huddleston3-1084/+712
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Kevin Van Vechten <kvv@apple.com>
2010-04-11XQuartz: Customize the NSDefaults id in the man file.Jeremy Huddleston2-19/+21
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Kevin Van Vechten <kvv@apple.com>
2010-04-11XQuartz: Add a defaults option to toggle Alt / Mode_switchJeremy Huddleston9-64/+104
See option_sends_alt in Xquartz(1) Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Kevin Van Vechten <kvv@apple.com>
2010-04-11XQuartz: Blacklist some oddball legacy Mac keycodes that break wineJeremy Huddleston1-20/+41
http://xquartz.macosforge.org/trac/ticket/295 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Kevin Van Vechten <kvv@apple.com>
2010-04-11xfree86: Fix priority ordering for ignoring input classesDan Nicholson1-7/+12
Commit 8736d112afb0dd61dfdaadd6378eafd200b2ef5f changed the priority ordering of the InputClass option merging to be "last match wins". This fixes the handling of Option "Ignore" to follow that logic. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Keith Packard <keithp@keithp.com>
2010-04-07Merge remote branch 'whot/for-keith'Keith Packard10-36/+113
2010-04-08xfree86: remove dead input drivers from xorg.conf man page.Peter Hutterer1-9/+0
These drivers have been deactivated for over a year now, let's not refer potential users to them. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-08Move 10-evdev.conf to system config dir $datadir/X11/xorg.conf.dDan Nicholson1-1/+1
Since the server searches in a vendor specific path now, we can install the evdev catchall there without disturbing local administration files. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-08xfree86: Search for a system xorg.conf.dDan Nicholson4-2/+26
In addition to the conf files found in /etc/X11 or $sysconfdir/X11 used for local administration, we also reserve a system directory for vendor and package usage. The simple search path is: /usr/share/X11/xorg.conf.d $datadir/X11/xorg.conf.d Files from these directories will have the lowest config priority. The directory $datadir/X11/xorg.conf.d is exported from xorg-server.pc in the variable "sysconfigdir". Packages should install their .conf files to the directory specified by: `pkg-config --variable=sysconfigdir xorg-server` Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-08xfree86: Set a saner search path for xorg.conf.dDan Nicholson3-30/+9
There's no reason to carry all the oddities from xorg.conf like appended hostname to the search path for xorg.conf.d. This changes it to something very simple: /etc/X11/<cmdline> $sysconfdir/X11/<cmdline> /etc/X11/xorg.conf.d $sysconfdir/X11/xorg.conf.d Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-08xfree86: Document how -configdir affects the xorg.conf.d search pathDan Nicholson1-1/+35
Explain the "safe" path dance for -configdir, too. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-08xfree86: Allow adding sysconfdir and datadir to config search pathsDan Nicholson2-1/+17
We could just use $projectroot/etc and $projectroot/share, but the user might have other plans for them. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-08config: only match sane devices in 10-evdev.confPeter Hutterer1-2/+34
Having a generic catchall also adds devices like accelerometers. These devices make X unusable, hence restrict matching to "known sane" devices like pointers, touchpads, keyboards, tablets and touchscreens. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Julien Cristau <jcristau@debian.org> Acked-by: Dan Nicholson <dbn.lists@gmail.com> Acked-by: James Cloos <cloos@jhcloos.com>
2010-04-08Don't keep a pointer to a possibly freed cursor when changing screens, ↵Pierre-Loup A. Griffais1-0/+1
preventing a crash in xf86CursorEnableDisableFBAccess() trying to restore it. Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-07Convert x86emu fixed size int typedefs to use stdint typesAlan Coopersmith1-33/+9
Fixes x86emu builds when using non-gnu compilers now that u64 is required Before this fix, the u64 type would not be defined, causing x86emu/sys.c to fail to build: "sys.c", line 102: syntax error before or at: ldq_u "sys.c", line 102: syntax error before or at: * Since Keith requested using <stdint.h>, converted all the x86emu typedefs to use the stdint types. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Acked-by: Matt Turner <mattst88@gmail.com> Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-07dix: be more verbose when we run out of opcodesPaulo Ricardo Zanoni1-1/+4
If we run out of opcodes, nothing is print on the log, making the problem hard to debug. In the current Xserver, if you enable some extensions like multibuffer (+2 events) and use nvidia binary driver (+5 events) you can run out of opcode numbers. Signed-off-by: Paulo Ricardo Zanoni <pzanoni@mandriva.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-07doc: specify 1.6.1 as the minimum version for doxygen.Gaetan Nadon1-3/+3
Older versions generate filenames that are different from the ones listed in the Makefile. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-07Merge remote branch 'yselkowitz/master'Keith Packard1-14/+23
2010-04-06Merge remote branch 'jbarnes/master'Keith Packard5-75/+143
2010-04-02Cygwin/X: Add configure option for WindowsWMYaakov Selkowitz1-8/+13
WindowsWM support is still experimental, and uses the Rootless extension which currently breaks the simultaneous build of the other DDXs (see commit b3415187e92960cbff784108b5a3a8d130dc34c5). So we disable it by default for now; once the latter issue is fixed we can make this 'auto'. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2010-04-02Don't enable ROOTLESS_WORKAROUND, it breaks compositeJon TURNEY1-1/+0
This possibly brings back whatever the bug is in http://bugs.freedesktop.org/show_bug.cgi?id=1168 for -rootless mode, but since we don't have reproduction steps for that, I can't test that... Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2010-04-02Cygwin/X: Disable unsupported extensions in configureYaakov Selkowitz1-5/+9
Several extensions are not supported by XWin, some of which are enabled by default in configure. We forcefully disable these early on so that configure will succeed without arguments and without the corresponding proto installed. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2010-04-02Disable setuid configure test on CygwinYaakov Selkowitz1-0/+1
Only Xorg is installed setuid, so there is no need to run this configure test on Cygwin. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2010-04-02xserver 1.8.0xorg-server-1.8.0Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-02xfree86: die gracefully in the vga arbiter if AddScreen failsTiago Vignatti1-0/+2
vga arbiter will be locked in one device while AbortDDX will call LeaveVT routines from the other device. Fail! Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-02configure: enable udev backend as "auto"Peter Hutterer1-1/+1
Due to the checks in configure, this means it gets priority over HAL if libudev is found. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-01Install 10-evdev.conf in $(prefix)/etc/X11/xorg.conf.d under udevKeith Packard3-1/+13
udev needs some xorg.conf file to tell it to load a suitable input driver, 10-evdev.conf is as simple as they come, mapping all evdev devices to the evdev driver. Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-01Bump bundle version to 2.5.1Jeremy Huddleston1-2/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-01darwin: Correct inline assembly for ___crashreporter_info__Jeremy Huddleston2-2/+2
It was missing an underscore. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-03-29Remove now obsolete function chooseVideoDriverRuediger Oertel1-25/+0
Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-29xfree86: Handle driver autoconfiguration when .conf files existRuediger Oertel1-6/+82
When doing driver autoconfiguration with some parts of the config file present but no driver set (e.g. only input configuration) fix the case that we may have multiple drivers to try. Create a screen section for each driver and let them be tried in a row. Signed-off-by: Ruediger Oertel <ro@suse.de> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Timo Aaltonen <timo.aaltonen@aalto.fi> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-29Merge remote branch 'jeremyhu/master'Keith Packard8-19/+30
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-19 00:28:45 +0000