summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-26dmx: Delete unused ChangeKeyboardDevice/ChangePointerDevice.Jamey Sharp1-57/+0
Daniel Stone deleted the API for these in 2006, in commit 96e32805d12fc36f0fa0926dbfb0dd8a5cadb739. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-05-26Ignore build products in the server's test suite.Jamey Sharp1-0/+13
Signed-off-by: Jamey Sharp <jamey@minilop.net> Cc: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-05-26dmx: Remove dead __glXDispSwap_DrawArraysEXT definition.Jamey Sharp1-6/+0
Eric Anholt made the corresponding fix in glx/render2swap.c in commit 49d38ab2328c409b2a98465b52677af057121513. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-05-26dmx: Delete unused local variables.Jamey Sharp6-49/+2
Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-05-26dmx: Xfree -> freeJamey Sharp4-12/+12
Mikhail fixed the corresponding Xallocs, but missed these uses of Xfree in commit 3f3ff971ecff9936cebafc813af9193b97bba89c. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-05-26Xephyr: Fix Xcalloc deprecation warnings.Jamey Sharp2-8/+8
Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-05-26xfree86/int10/helper_mem: Fix log message.Jamey Sharp1-4/+1
Three years ago in commit f62beb6f3609e8b6e61325ac89017590811bbd07 ajax deleted the code that could have set this format string to anything else, so just use the format string literal. This makes GCC happy since it can check the argument types, which, by the way, weren't correct since this format string doesn't need any arguments. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2010-05-26xf86bigfont: Silence compiler warning by initializing pDesc.Jamey Sharp1-3/+1
Access to pDesc was always guarded by (nCharInfos > 0), so the code wasn't actually buggy, but this makes it clear that it's correct. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-05-26Revert "Add a "flags" field to DeleteInputDeviceRequest."Keith Packard10-18/+14
Peter wants to get a larger patch sequence put together and I didn't read past the commit message to see the 'don't take this patch please'. This reverts commit 531ff40301975519af7b20109c17d296312d3f2b.
2010-05-25Add a "flags" field to DeleteInputDeviceRequest.Peter Hutterer10-14/+18
Some input drivers need to implement an internal hotplugging scheme for dependent devices to provide multiple X devices off one kernel device file. Such dependent devices can be added with NewInputDeviceRequest() but they are not removed when the config backend calls DeleteInputDeviceRequest(), leaving the original device to clean up. Example of the wacom driver: config/udev calls NewInputDeviceRequest("stylus") wacom PreInit calls NewInputDeviceRequest("eraser") NewInputDeviceRequest("pad") NewInputDeviceRequest("cursor") PreInit finishes. When the device is removed, the config backend only calls DeleteInputDeviceRequest for "stylus". The driver needs to call DeleteInputDeviceRequest for the dependent devices eraser, pad and cursor to clean up properly. However, when the server terminates, DeleteInputDeviceRequest is called for all devices - the driver must not remove the dependent devices to avoid double-frees. There is no method for the driver to detect why a device is being removed, leading to elaborate guesswork and some amount of wishful thinking. Though the input driver's UnInit already supports flags, they are unused. This patch uses the flags to supply information where the DeleteInputDeviceRequest request originates from, allowing a driver to selectively call DeleteInputDeviceRequest when necessary. Also bumps XINPUT ABI. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-25xfree86: store the InputAttributes in the input device.Peter Hutterer5-1/+10
InputAttributes largely decide which configuration values get merged from the xorg.conf.d snippets. While they are available in the config backend, they are not available for any other callers of NewInputDeviceRequest(). Drivers implementing driver-side hotplugging do not have access to these attributes and cannot have xorg.conf.d snippets specific to dependent devices. For example, the following case cannot work right now: Section "InputClass" MatchProduct "Wacom" Option "PressCurve" "0 0 100 100" ... EndSection Section "InputClass" MatchProduct "Wacom" MatchProduct "eraser" Option "PressCurve" "10 10 50 50" ... EndSection The second section is not triggered, as the wacom driver cannot supply the InputAttributes to NewInputDeviceRequest(). Add the attributes to the IDevRec and merge them into the InputInfoRec to make them accessible in the driver. This changes the ABI for input drivers. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-25dix: add helper functions to duplicate and free InputAttributes.Peter Hutterer3-0/+183
No special memory handling is used to give drivers the maximum flexibility with the data. Drivers should be able to call realloc on the product string if needed and perform similar operations. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-25midispcur: Construct Picture objects lazily in case Render is disabled.Jamey Sharp1-7/+6
Reverts part of the effects of 518f3b189b6c8aa28b62837d14309fd06163ccbb, "mi: don't thrash resources when displaying the software cursor across screens". The per-screen cache is preserved, and the GCs are still allocated eagerly, but now it doesn't construct pRootPicture until somebody attempts to draw an ARGB cursor. I noticed crashes in Xnest, which doesn't support the RENDER extension, but I suspect other DDXes that support disabling that extension would have had issues as well. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
2010-05-25xnest: Don't ignore errors from DeviceCursorInitialize.Jamey Sharp1-2/+1
Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
2010-05-24Merge remote branch 'vignatti/bus-cleanup-take2'Keith Packard13-839/+776
2010-05-24xfixes: Remove the invisible cursor sprite, using NullCursor instead.Jamey Sharp1-38/+1
Oliver McFadden reports that the invisible cursor sprite caused damage events and thus unnecessary redrawing, so removing it improves performance when using software cursor sprites, especially on those devices where you do not want a visible cursor: touchscreen tablets, embedded devices, etc. For the xfree86 DDX, if hardware cursors are used, the driver is required to provide a HideCursor function, which will be called instead of trying to set a null cursor. I think software cursors are already safe. The other DDXes also look safe. As far as I can tell, there's no reason to realize a null cursor. I think everything that handles null cursors doesn't rely on any setup in RealizeCursor, and treats them as empty cursors. Xnest assumes that if a cursor is created, it will be realized before it is freed, which didn't happen if the invisible cursor was never used in a server generation. So this fixes a segfault in Xnest as well. Signed-off-by: Jamey Sharp <jamey@minilop.net> Cc: Oliver McFadden <oliver.mcfadden@nokia.com> Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com> Tested-by: Oliver McFadden <oliver.mcfadden@nokia.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-24xfree86: move all pci code from auto configurator into a meaningful locationTiago Vignatti3-246/+255
This patch creates the private xf86PciMatchDriver hook, which goes inside pci code to match the drivers found in the system. Now there's no direct references to PCI inside xf86AutoConfig.c anymore. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-05-24xfree86: no need to check for the configuration case when matching devicesTiago Vignatti1-2/+0
xf86MatchDevice will never be called in configuration time. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-05-24xfree86: organize and group all pci related stuff inside xf86.hTiago Vignatti1-30/+27
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-05-24xfree86: remove BUS_ISA type given we don't support anymoreTiago Vignatti1-2/+0
Should go together within commit df14682a. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-05-24xfree86: remove all kind of bus and PCI dependency from the common helper fileTiago Vignatti2-503/+494
Move all PCI procedures from xf86Helper.c to a more meaningful place (namely xf86pciBus.c). xf86Helper.c is free of PCI code now. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-05-24xfree86: bus: remove useless field from EntityRecTiago Vignatti1-1/+0
RAC is the champion of remaining trash for sure! Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Reviewed-by: Keith Packard <keithp@keithp.com>
2010-05-24xfree86: bus: delete useless xf86FindPrimaryDeviceTiago Vignatti3-43/+0
This function had a wrong name and was just logging the primary device. No one cares about it honestly. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-05-24xfree86: bus: remove unused headersTiago Vignatti4-6/+0
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-05-24xfree86: bus: remove unused pci macrosTiago Vignatti1-6/+0
Should be gone in commits 3c03d9f1 and a9d7d659a respectively. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-05-23Merge remote branch 'alanc/docs'Keith Packard4-1308/+2
2010-05-23xfree86: fix multiple InputAttributes tag matching.Peter Hutterer1-3/+3
attr->tags is an array of strings (null-terminated). When matching, match against each string instead of each [i,end] substring in the first tag. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-23Remove obsolete reference to README.DRI in xorg.conf.manBrice Goglin1-2/+1
Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-05-23Remove ancient documentation of IBM RapidAccess keyboard hackAlan Coopersmith2-50/+1
Keyboard setup belongs in drivers, not in a document no one sees because we don't even install it. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
2010-05-23Remove completely out-of-date README.DRIAlan Coopersmith2-1257/+0
The license only allows distribution of verbatim copies, so we can't update it, even to correct the incorrect address to send updates to. The Mesa & DRI web pages are much better sources of current information anyway. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-05-23Add RandR 1.2 README.modes doc to EXTRA_DISTAlan Coopersmith1-0/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-05-23xf86: allow for no outputs connected at startup operation.Dave Airlie1-17/+44
When nothing is connected at startup and we canGrow, allow the server to start with a 1024x768 framebuffer, and when the drivers send hotplug events this will expand to the correct size dynamically. Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-23Device init: Don't crash when CreateGC fails.Jamey Sharp2-2/+3
ActivateDevice was ignoring errors from DeviceCursorInitialize, so cursor-related calls failed later. Jeremy Huddleston saw that crash in miPointerConstrainCursor, while with Xvfb I saw it in miSpriteRealizeCursor. miDCDeviceCleanup frees any non-NULL GCs. miDCDeviceInitialize calls Cleanup on any failure, but if it failed early then some of the pointers in the miDCBufferPtr were garbage. Switch from malloc to calloc to ensure everything's initialized safely first. With these two fixes, if CreateGC fails then the server gracefully fails in FatalError instead of segfaulting. Signed-off-by: Jamey Sharp <jamey@minilop.net> Cc: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-22xorg-server.pc Requires: xproto >= 7.0.17Alan Coopersmith1-1/+1
Since the headers we export in the SDK use the _X_NORETURN #define introduced in xproto 7.0.17, drivers built with the SDK will also need to have at least that version of xproto installed. I considered exporting the version from configure.ac, but decided not to since the minimum required to build the X server may not always be the same as the minimum required to build drivers (for instance, if the X server used a new #define in its .c files or internal headers, but didn't export it in any of the SDK headers). Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-22Declare functions that unconditionally call FatalError as _X_NORETURN.Jamey Sharp3-3/+3
For AtomError, this should fix a clang warning; in the other cases it's just good documentation. Signed-off-by: Jamey Sharp <jamey@minilop.net> Cc: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-21vfb: Remove dead variable and header fileAdam Jackson3-161/+0
Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-21doPolyText: forget about FontChange's XID after looking up pFont.Jamey Sharp1-4/+2
As of e2929db7b737413cf93fbebdf4d15abdfebff05c, doPolyText uses pFont consistently rather than looking it up again from the saved XID. clang noticed that "oldfid = fid" could run when fid hadn't been initialized yet. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Tested-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-21Solaris: Use VT_SET_CONSUSER ioctl to set Console User rights profileAaron Zang1-22/+80
When Xorg is started on display :0, this ioctl is called to grant the user the rights traditionally associated with /dev/console (before VT support was added), such as access to local peripheral devices. Also adds a Solaris-specific -C flag to force starting on /dev/console instead of /dev/vt*, allowing programs like xterm -C to access the console device. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-21vbe.h: Use __attribute__((packed)) on Sun cc 5.9 & later as well as gccAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-21Xserver(1) man page updatesAlan Coopersmith1-17/+9
- Note that -br is now default. - Move -bs after -br for alphabetical ordering. - Remove -config option that's been hidden in "ignore" section, since ajax removed the -config code a couple years back. - Add -nocursor option. - Add xinput & xrandr to list of runtime server control programs - Replace XDarwin with Xquartz in list of Xservers Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-20dix: remove obsolete comment.from EnableDevice.Peter Hutterer1-4/+0
The code this comment was referring to was removed in 8b5086250aa5dae8de8b763408ff480d7beac819 "Eliminate bogus event resizing." Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-20Replace screen->rgf scratch GC flags with a bit in each GC.Jamey Sharp5-23/+20
This eliminates a poorly-named, poorly-documented field from the ScreenRec, using a previously-unused flag bit in each GC instead. Signed-off-by: Jamey Sharp <jamey@minilop.net> Cc: Keith Packard <keithp@keithp.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-05-20Find windows GL wrapper files in $(srcdir) instead of .Keith Packard1-2/+2
This fixes 'make distcheck' for me. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-05-20winpriv.h was moved from hw/xwin to hw/xwin/glx in NovemberKeith Packard2-1/+1
hw/xwin/Makefile.am was referencing this instead of hw/xwin/glx/Makefile.am Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-05-20XFree86 Design doc: Convert LinuxDoc ``quotes'' to DocBook <quote> tagsAlan Coopersmith1-45/+45
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-20XFree86 Design doc: Explain this version covers the current Xorg releaseAlan Coopersmith1-7/+30
Update the title & preface to explain that while this was originally the XFree86 4.0 design, we've changed a lot since forking. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-20Show Xserver release/version date in DIX & DDX docsAlan Coopersmith6-5/+28
Uses a fake absolute path to the entity definition files so that the xmlto --searchpath will work for finding the actual path Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-20Move Xserver-spec.xml from xorg-docs to doc/xmlAlan Coopersmith4-0/+5216
Allows keeping it in sync with the sources it documents, and to be released with them Requires the previous patch to convert the Xserver tree from LinuxDoc to DocBook for SGML/XML documents. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rémi Cardona <remi@gentoo.org> Tested-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-20Convert LinuxDoc documents to DocBook/XMLAlan Coopersmith8-8704/+11360
Only the markup/formatting is changed - the contents should still be wildly out of date for now. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rémi Cardona <remi@gentoo.org> Tested-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-20Add documentation for the new DefaultModes optionSimon Farnsworth1-0/+8
This patch adds documentation for the DefaultModes monitor option added in the previous patch. Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 17:23:44 +0000