Commit graph

1584 commits

Author SHA1 Message Date
Keith Packard
1418fd8ce4 Merge branch 'server-1.3-origin' into server-1.3-branch 2007-02-17 17:37:56 -08:00
Alan Coopersmith
9ad0811a54 Check for __sparc as well as __sparc__ for compatibility with Sun cc
(gcc defines __sparc__, Sun cc defines __sparc)
(cherry picked from commit f9f7d7f3be)
2007-02-17 17:31:36 -08:00
Carl Switzky
6fd297e362 Add ast driver/device info to Xorg server & config utilities
(cherry picked from commit edd5f17454)
2007-02-17 17:18:28 -08:00
Aaron Plattner
d3f507c2a2 Add an RDTSC implementation to the x86 emulator.
This instruction is being used in some debug VBIOSes.  This implementation
doesn't even try to be accurate.  Instead, it just increments the counter by a
fixed amount every time an rdtsc instruction in encountered, to avoid divides by
zero.
2007-02-17 17:15:56 -08:00
Alan Coopersmith
8a16682892 Fix bus error on startup in 64-bit Xephyr
hostx_get_visual_masks takes unsigned long * arguments, but was being
passed pointers to CARD32's.
(cherry picked from commit 5dcad9e9d7)
2007-02-17 17:14:33 -08:00
Daniel Stone
33c2d2ce8a kdrive/ephyr: free screen struct
Free screen->driver on screenFini, instead of just leaking it.
(cherry picked from commit 0f6dd4aea6)
2007-02-17 17:12:23 -08:00
Keith Packard
5f6f8616d8 Don't set subpixel order during startup; the screen won't be ready.
in xf86CrtcSetMode, scrn->pScreen will be NULL during server startup time,
so don't try to set the subpixel order. subpixel order will be set in the
randr initialization anyways.
2007-02-16 10:06:22 -08:00
Keith Packard
0ab6c03c17 Ensure drivers can use new modes header files.
New modes header files required a few minor changes to be used by external
drivers, the most notable of which is the publication of the config file
parser header files.
2007-02-16 02:17:11 -08:00
Keith Packard
3d5e2bc5a6 Respect rotation in initial screen size computation. 2007-02-16 00:56:00 -08:00
Keith Packard
5f1046f6d3 Enable startup-time rotation; change rotation pixmap creation API.
Add monitor "Rotate" option taking one of "normal", "left", "inverted" or
"right". However, because initial mode selection is made before the screen
is completely initialized, we cannot create the shadow pixmap object at this
point. Pend the shadow pixmap creation until the block handler.

Note that this code is not completely functional yet.
2007-02-16 00:41:29 -08:00
Keith Packard
3eebfb0a99 Report correct RandR 1.0 sizeID. Report correct subpixel order.
RandR 1.0 sizeID must be computed the same way every time, so when reporting
it in the ScreenChangeNotify event, just construct the usual 1.0 data block
and use that.

subpixel geometry information can be computed by looking at the connected
outputs and finding any with subpixel geometry and using one of those for
the global screen subpixel geometry. This might be improved by reporting
None if more than one screen has information and they conflict.
2007-02-15 20:13:15 -08:00
Keith Packard
7971392cdd Merge branch 'server-1.2-branch' into server-1.3-branch 2007-02-15 11:32:19 -08:00
Keith Packard
585a32be88 Allow new modes code to build inside drivers as well as server.
Use config.h for driver builds where xorg-config.h isn't available.
2007-02-15 11:27:35 -08:00
Tilman Sauerbeck
96c637350d Distribute hw/xfree86/modes. 2007-02-15 17:51:01 +01:00
Keith Packard
12505d9c0a Merge crtc/output-based mode selection code.
This code comes from the intel driver, so there's no history in this tree.

As the crtc/output-based mode selection code uses ddc, the ddc and i2c
modules have been merged into the server. Attempts to load them are safely
ignored now.
2007-02-14 18:13:15 -08:00
Alan Coopersmith
967865393c Plug memory leak in doLoadModule()
(cherry picked from cf7ca9d09c commit)
2007-02-13 13:25:46 -08:00
Alan Coopersmith
46e3ed88cc Make xf1bpp build correctly with compilers that don't support -include
(cherry picked from 0f0c321adf commit)
2007-02-13 13:25:43 -08:00
Eric Anholt
ed1778cfb2 Merge EXA updates up to commit cf5b29d75d.
This is EXA version 2.1, including the damagetrack work.
2007-02-12 16:08:00 -08:00
George Sapountzis
ec1c2fc092 dmx: drop leftover __GLXdrawablePrivateRec struct.
(cherry picked from commit cf5b29d75d)
2007-02-02 11:13:02 -08:00
Keith Packard
ceca97cb84 Merge branch 'server-1.2' into randr-1.2-for-server-1.2 2007-01-29 22:03:19 -08:00
Adam Jackson
bd8ef88d18 Bump video and input ABI minors.
Sadly this is a video ABI number already present in master, but that'll
just have to change, won't it?
2007-01-22 23:00:06 -05:00
Eric Anholt
fd77f9cbba Try dlsym(RTLD_DEFAULT) first when finding symbols.
The previous mechanism failed when finding drm symbols now that libdrm has
moved to being linked by libdri instead of being linked into the server.
(cherry picked from aab2ca2042 commit)
2007-01-22 17:53:15 -05:00
Alan Coopersmith
1dac07bf52 Update pci.ids to 2007-01-18 snapshot
(includes a whole bunch of ATI device id updates)
(cherry picked from 8b3a591cd3 commit)
2007-01-18 16:04:41 -08:00
Aaron Plattner
7c937bfb8d Fix BSF and BSR instructions in the x86 emulator.
Patch courtesy of Michael Yaroslavtsev.
(cherry picked from 66fa87292e commit)
2007-01-10 15:34:23 -05: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
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
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
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
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
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
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
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