Commit Graph

2710 Commits

Author SHA1 Message Date
Matthieu Herrb
24e1ad4831 Multiple integer overflows in dbe and render extensions
CVE IDs: CVE-2006-6101 CVE-2006-6102 CVE-2006-6103
2007-01-09 14:13:40 +01:00
Eric Anholt
fe37d26f30 Fix several cases where optimized paths were hit when they shouldn't be.
This fixes a number of rendercheck cases.
(cherry picked from commit 6fdfd9dad9)
2007-01-03 10:38:04 -08:00
Keith Packard
f05dd384d3 Use RRScreenSetSizeRange in 1.0 compat. Check RRGetInfo for error.
The RRScreenSizeSetRange function is used externally for 1.2 API drivers,
but can also be used in the 1.0 compatibility code. This also ensures that
the right changed bits are set so that clients are correctly notified when
the range changes.

RRGetInfo can return an error, use that to return BadAlloc to clients
instead of blindly going on with various requests.
2006-12-30 21:52:22 -08:00
Daniel Stone
9bc6752f68 configure.ac: prepare for 1.2.0 (X11R7.2)
No, it's not released yet.  Settle down.
2006-12-24 06:37:56 +02:00
Samuel Thibault
594d180fe4 remove last remaning 'linux'isms (bug #5613)
Make sure we don't build non-Linux stuff in configure.ac, and test based
on userland, rather than kernel.
2006-12-24 06:31:05 +02:00
Keith Packard
06a4be5e7a Merge branch 'server-1.2-branch' into randr-1.2-for-server-1.2 2006-12-21 23:52:24 -08:00
Keith Packard
f42e3cea23 Track physical screen size and send out updates when that changes.
Events and internal data structures need to be updated whenever the physical
or pixel size of the screen changes. The code was ignoring the physical
size, so changing only that would not be registered anywhere.
2006-12-21 23:50:39 -08:00
Alan Coopersmith
f4ef99e816 xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA"
(cherry picked from e437f357b6 commit)
2006-12-21 10:51:27 -08:00
Brian
198560a081 added mipmap.c 2006-12-21 09:06:44 -07:00
Alan Coopersmith
5f14c9a78b Xorg & Xserver man page updates for 1.2 release
- Added -extension & +extension to Xserver man page
- Changed Xorg synopsis from X11R6 to X11R7
- Clarified Xorg ancestry description
- Moved Solaris to free/Open Source OS list
- Removed references to MetroLink module loader & getconfig
- Converted (1) to (__appmansuffix__) in a few more places
- Replaced http://www.freedesktop.org/cvs/ with http://gitweb.freedesktop.org/
(cherry picked from 1b029fd896 commit)
2006-12-18 14:51:49 -08:00
Samuel Thibault
bd7377f9e8 xfree86/hurd: re-add missing keyboard support (bug #5613)
Re-add missing hurd_io.c and hurd_kbd.c, which aren't needed in master,
but are required in the 1.2.x branch.
2006-12-16 19:41:25 +02:00
James Steven Supancic III
c10663e9cc Fix RENDER issues (bug #7555) and implement RENDER add/remove screen
support (bug #8485).
2006-12-16 12:04:42 -05:00
Kevin E Martin
7d927a6f6a For Xvfb, Xnest and Xprt, compile fbcmap.c with -DXFree86Server 2006-12-16 12:03:30 -05:00
Alan Hourihane
731952c561 Set Int10Current->Tag for the linux native int10 module
Fixes bug #9296
2006-12-13 12:13:11 +00:00
Keith Packard
91396f1430 Merge branch 'randr-1.2-for-server-1.2-origin' into randr-1.2-for-server-1.2 2006-12-13 01:21:53 -08:00
Keith Packard
612a8e6180 RandR 1.2 rotation code must adjust width/height.
Mode lines reflect the monitor mode, not the projected size into the frame
buffer. Flip width/height around so that the dimensions are oriented
correctly.
2006-12-13 01:21:32 -08:00
Keith Packard
6dc711833d RandR 1.0 refresh rates unscrambled. SetScreenConfig uses RRCrtcSet right.
RandR 1.0 refresh rates were scrambled when working with a 1.2 driver that
returned sizes in a mixed order. SetScreenConfig was treating RRCrtcSet as
returning an RandR status instead of a Bool.
2006-12-13 00:58:54 -08:00
Keith Packard
98d18a6578 RandR: config time updates when hardware config changes.
The config time in the RandR protocol reflects when the hardware state has
changed. It was getting changed anytime the driver changed the usage
of the hardware as well.
2006-12-12 22:59:03 -08:00
Keith Packard
78689d0d66 RandR mode list needs both output and crtc modes.
When an output no longer reports the current mode, it must still be included
in the list advertised by the X server. Walk the crtcs to ensure it is
included.
2006-12-12 20:16:49 -08:00
Keith Packard
12c9714ba7 Merge branch 'server-1.2-branch' into randr-1.2-for-server-1.2 2006-12-12 09:22:14 -08:00
Alan Hourihane
8049eeea99 Fix bad commit
(cherry picked from 81281cb298 commit)
2006-12-12 11:28:55 +00:00
Alan Hourihane
f604d0b69a Fix Xming fails to use xkb bug
bug #5049 (Colin Harrison)
(cherry picked from 792e0f71c6 commit)
2006-12-11 14:55:15 +00:00
Alan Hourihane
1587946f87 Fix Tooltip from minimized clients
Bug #3678 (Colin Harrison)
(cherry picked from 27d4b84f26 commit)
2006-12-11 14:52:07 +00:00
Aaron Plattner
a092419fe7 Bug #9219: Use pWin->viewable instead of pWin->realized to catch InputOnly windows too.
(cherry picked from 724f9cb578 commit)
2006-12-10 18:21:22 -05:00
Aaron Plattner
d1e8b7c4a4 Bug #9219: Return BadMatch when trying to name the backing pixmap of an unrealized window.
Before this change, ProcCompositeNameWindowPixmap would name the screen pixmap
if !pWin->realized.
(cherry picked from 3690de9b1b commit)
2006-12-10 18:21:17 -05:00
Alan Coopersmith
2cba9a4f1c Update pci.ids to 2006-12-06 from pciids.sf.net
(cherry picked from abe5e079af commit)
2006-12-06 07:59:30 -08:00
Alan Coopersmith
77df812453 Map missing keycodes for Sun Type 5 keyboard on Solaris SPARC 2006-12-05 20:05:15 -08:00
Alan Coopersmith
fde2d5e033 Fix syntax error in configure check for SYSV_IPC that broke with Sun cc
(cherry picked from a5d6499d66 commit)
2006-12-01 16:48:23 -08:00
Adam Jackson
dd8bc0162c Fix release date, and tag 1.1.99.903 2006-12-01 18:45:02 -05:00
Keith Packard
66b6358a39 RandR ListOutputProperties has nAtoms element, not nProperties
Earlier RandR 1.2 encoding revisions used 8-bit nProperties field.
Final RandR 1.2 spec uses 16-bit nAtoms field instead.
2006-11-30 23:16:42 -08:00
Keith Packard
b5e3731436 Merge branch 'server-1.2' into randr-1.2-for-server-1.2 2006-11-30 17:40:12 -08:00
airlied
7c639791be fixup configure.ac problems with DRI_SOURCES and LBX_SOURCES 2006-12-01 11:10:19 +11:00
airlied
0755ba0686 add extern to struct definition 2006-12-01 11:10:06 +11:00
Dave Airlie
2e0a53d820 dri: setup libdrm hooks as early as possible.
This is due to radeon doing drm stuff before DRI extension gets initialised
(cherry picked from e2f6dacc73 commit)
2006-12-01 10:35:24 +11:00
airlied
03fcf5ec99 DRI: call drmSetServerInfo() before drmOpen().
Also, remove some libdrm remnants.
(cherry picked from 5bfe7f4dfc commit)
2006-12-01 10:35:03 +11:00
Eric Anholt
d8c3c0ee09 Fix typo before the last commit.
(cherry picked from 28337cc106 commit)
2006-12-01 10:34:01 +11:00
Eric Anholt
5a91845236 Bug #8868: Remove drm from SUBDIRS now that the directory is gone.
(cherry picked from e1720b1089 commit)
2006-12-01 10:33:46 +11:00
airlied
e87285c2a0 make X server use system libdrm - this requires libdrm >= 2.3.0
This patch blacklists the load "drm" line, moves some functions in dri module
links dri module against libdrm, and removes the X copy of libdrm
(cherry picked from fd91630b73 commit)
2006-12-01 10:32:57 +11:00
Daniel Stone
69820a10e3 remove CID support (bug #5553)
Remove CID from all our fontpaths.
2006-12-01 00:41:41 +02:00
Daniel Stone
2efd6aca00 bump to 1.1.99.903 2006-12-01 00:11:51 +02:00
Jurij Smakov
69508dd98b ffs: handle 0 argument (bug #8968)
Handle an argument of 0 in ffs(), instead of looping indefinitely.
Add an ffs prototype to dix.h, and add includes to ffs.c.
(cherry picked from 34164e551e4c3909322d50b09835ca4ac1d49d68 commit)
(cherry picked from acb5ff4c73 commit)
2006-11-30 20:20:16 +02:00
Jeremy C. Reed
9348662cc8 On DragonFLy, default to /dev/sysmouse (just like on FreeBSD).
TODO: use autoconf to handle this so the code is not platform
based but feature based.
(cherry picked from 6facd958c2 commit)
2006-11-30 20:20:02 +02:00
Matthias Hopf
e88d09e75d Fix potential NULL pointer access in timer code.
https://bugzilla.novell.com/show_bug.cgi?id=223718
(cherry picked from 834e4b0798 commit)
2006-11-30 20:19:15 +02:00
Aaron Plattner
51c78f5652 Add DIX_CFLAGS to util builds.
Fixes a build breakage when $(top_srcdir) != $(top_builddir) because
-I$(top_srcdir)/include is missing for the cvt, ioport, pcitweak, and scanpci
builds.

Signed-off-by: Adam Jackson <ajax@nwnk.net>
(cherry picked from ee9bdd3f4a commit)
2006-11-30 20:19:01 +02:00
Aaron Plattner
11c260736f Add a -showDefaultLibPath option.
A corollary to the previous change, this option prints $libdir.
(cherry picked from 64de3baf85 commit)
2006-11-30 20:18:37 +02:00
Aaron Plattner
32e122466e Add a -showDefaultModulePath option.
As discussed on the mailing list, people would rather have an X command-line
option to print the module path so installers can know where to put modules,
rather than the installers using `pkg-config --variable=moduledir xorg-server`,
since some distros choose not to install xorg-server.pc.
(cherry picked from 0a2a6e4070 commit)
2006-11-30 20:17:32 +02:00
George Sapountzis
782166ac22 Fix GL context destruction with AIGLX.
The logic for freeing GL contexts introduced by "Fix AIGLX VT switching." is
inverted. As it is now, GL context destruction is deferred for glxDRIEnterVT().
(cherry picked from f17e3c34df commit)
2006-11-30 20:17:27 +02:00
Matthias Hopf
3d513382d1 Bug #9023: Only check mice for "mouse" or "void" if identifier is != NULL.
(cherry picked from 26d2e45bdb commit)
2006-11-30 20:17:23 +02:00
Keith Packard
4202b23ed8 Destroying RandR crtc or output overwrites memory.
RRCrtcDestroyResource and RROutputDestroyResource had matching
bugs that would overwrite memory past the end of the storage
of the crtc or output arrays. Oops.
2006-11-27 21:40:24 -08:00
Keith Packard
ec83d67416 Ensure RandR resource types are registered before resources are created.
Now that resources can be created during server initialization, make sure
the crtc, output and mode resource types are created before attempting to
create associated resources.
2006-11-26 19:31:48 -08:00