Adam Jackson
e862a70a38
Don't install librac.a.
...
Thanks, automake.
(cherry picked from f057de4f73
commit)
2006-10-11 16:00:25 -04:00
Adam Jackson
99d798d06b
Merge branch 'autoconfig-for-7.2' into server-1.2-branch
2006-10-11 15:59:54 -04:00
Adam Jackson
61f3eb816b
Back out merge of master to 1.2 branch. Undoes 89987ca...
...
Dear git: please make 'git-revert' work on merge commits kthnxbye.
2006-10-11 15:56:45 -04:00
Alan Coopersmith
cde6872886
Use bash on Solaris to run symlink-mesa.sh
...
symlink-mesa.sh won't run with Solaris Bourne Shell (/bin/sh) so explicitly
run it with /usr/bin/bash instead
2006-10-09 17:24:37 -07:00
Alan Coopersmith
89987cadb1
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into server-1.2-branch
2006-10-06 20:07:53 -07:00
David Nusinow
b8596aff00
Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev.
...
(cherry picked from a10039a100
commit)
2006-10-06 19:26:46 -07:00
Alan Coopersmith
4c34224630
Merge branch 'XACE-modular'
2006-10-06 18:01:13 -07:00
Alan Coopersmith
8db4a42e54
Merge branch 'XACE-modular' into server-1.2-branch
2006-10-06 16:06:24 -07:00
Tilman Sauerbeck
a2d528068f
transformIsIdentity() now doesn't accept a zero matrix as the identity.
...
Added a non-zero test for one of the diagonal values.
(cherry picked from 594d4019c6
commit)
2006-10-06 23:39:22 +02:00
Tilman Sauerbeck
dce3f2a9ce
Bug #8226 : Fixed SetPictureTransform()'s handling of the argument matrix.
...
It now recognizes scaled variants of the identity matrix, too.
(cherry picked from fc30370d14
commit)
2006-10-06 23:39:03 +02:00
Alan Coopersmith
8a27eed995
Update pci.ids to Tue 2006-10-03 daily snapshot
...
(cherry picked from 8382234a7f
commit)
2006-10-06 13:48:34 -07:00
Alan Coopersmith
857b22528c
Don't insert RCS tag into generated pci id header files
...
(cherry picked from 96edf7b853
commit)
2006-10-06 13:48:16 -07:00
Bill Nottingham
31b1f32315
Bug 7641: fix comment written to Xorg.conf (s/VertSync/VertRefresh/)
...
X.Org Bugzilla #7641 <https://bugs.freedesktop.org/show_bug.cgi?id=7641 >
Patch #6349 <https://bugs.freedesktop.org/attachment.cgi?id=6349 >
(cherry picked from 0a62840e2c
commit)
2006-10-06 13:47:23 -07:00
Alan Coopersmith
8382234a7f
Update pci.ids to Tue 2006-10-03 daily snapshot
2006-10-03 17:49:48 -07:00
Alan Coopersmith
96edf7b853
Don't insert RCS tag into generated pci id header files
2006-10-03 17:48:50 -07:00
Alan Coopersmith
df800d87e0
Add (void) casts to clear compiler errors about ?: results having type mismatch
2006-10-02 11:28:47 -07:00
Daniel Stone
d7c89c7c1c
symlink-mesa.sh: expand *.{c,h}
2006-10-02 02:19:51 +03:00
Ivan Pascal
d6ea96b13e
xkb: fix wrapping when switching between groups
...
Use XkbCharToInt as that's what we're doing.
2006-10-02 02:19:45 +03:00
Brian
84eb2c0a06
Replace hard-coded filesnames with loops (all .c and .h files).
...
Should fix problems with Mesa adding/removing source files, for the most part.
Patch by Dan Nicholson.
2006-09-28 15:09:40 -06:00
Aaron Plattner
4bc5dc2854
Merge branch 'wfb'
2006-09-28 13:27:13 -07:00
Aaron Plattner
f9542e7495
Restore the global xx* symbols and add them to wfbrename.h.
...
I don't think they're ever used, but it's best to just leave them alone for ABI
compatibility.
2006-09-28 13:26:54 -07:00
Jeff Smith
cf6e9687ff
Bug #8449 : Yet another Mesa symlink script resync.
2006-09-28 15:34:17 -04:00
Michel Dänzer
2206a92a97
Push information about cliprects of DRI windows to the DRM.
2006-09-27 10:48:49 +02:00
Michel Dänzer
54d371e7a4
Add wrapper for new ioctl to update drawable information in the DRM.
2006-09-27 10:48:41 +02:00
Brian
f7c1d94241
Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap()
...
to prevent potential segfault.
2006-09-23 10:38:10 -06:00
Brian
945b7c6394
The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
...
Otherwise, Xdmx generates a slew of protocol errors.
2006-09-23 10:35:25 -06:00
Brian
891e9c3e6c
Replace broken DMXDBG3() with DMXDBG2()
2006-09-23 10:28:24 -06:00
David Nusinow
a10039a100
Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev.
2006-09-21 23:58:32 -04:00
Adam Jackson
ce78b0cd2b
Close with Pclose() that which we open with Popen().
2006-09-21 20:42:47 -04:00
Aaron Plattner
c1655f0fd4
Bug 8386: Grow parser buffers to fit an entire line if it's longer than CONFIG_BUF_LEN.
2006-09-21 14:45:17 -07:00
Drew Parsons
8b4ed47c5d
* Install Xprint's Xsession script to $(sysconfdir)/X11/Xsession.d
...
* Removing outdated references to CDE and dt, rename script to
92xprint-xpserverlist.
2006-09-21 22:19:44 +10:00
Donnie Berkholz
d812f486a0
Really fix sparc on 64-bit kernel/32-bit userland.
...
Commit b3a3020fd0
used a sparc64 ifdef instead of
sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is
used.
2006-09-20 15:39:39 -07:00
Aaron Plattner
d16e83413e
Hide or rename more global symbols to avoid clashes with libfb.
...
Rename composeFunctions, xxSetup, and xxPrintVisuals. Hide the other xx*
symbols by making them static.
2006-09-20 12:47:17 -07:00
Adam Jackson
f057de4f73
Don't install librac.a.
...
Thanks, automake.
2006-09-16 03:49:11 -04:00
Eamon Walsh
49a70c8570
Merge branch 'master' into my-XACE-modular
2006-09-15 15:26:57 -04:00
Adam Jackson
46af6d1e95
Always believe the monitor when it reports a reduced-blanking mode.
...
CVT reduced blanking modes are typically only seen on digital connections to
LCDs, but there are some monitors that report them as supported over the
VGA connector too, which is perfectly legitimate, electrically speaking.
2006-09-14 19:28:44 -04:00
Adam Jackson
63acf18b7e
In xf86MatchPciInstances, fail gracefully when there's no PCI device at all.
...
This allows the autoconfig logic to fall through sanely on non-PCI machines,
which importantly includes Xen virtual machines.
2006-09-14 19:26:37 -04:00
Adam Jackson
a8f9936f55
Prefer driver-provided modes when matching name strings to modelines.
...
Well, kinda. Strictly we prefer M_T_BUILTIN strongest since those are modes
where the driver has said it absolutely can't do anything else (VBE). Then
we look for user-defined modes, ie, modelines from the config file. Then
we consider modes reported by the monitor via EDID. Finally if nothing has
matched yet we consider the default mode pool.
Within each of the above-mentioned classes, modes with the M_T_PREFERRED bit
take priority over other modes in the same class.
This logic ensures that the timings sent to the monitor exactly match the
timings it reported as supported, which occasionally don't match the numbers
you might get for that mode from CVT or GTF.
2006-09-14 19:24:41 -04:00
Adam Jackson
81ef1b6d60
Mark EDID modes as driver modes. Infer virtual size from driver modes.
...
This allows the server to guess an appropriate initial virtual size and
resolution. The heuristic is to select the largest driver-reported mode
that matches the monitor's physical aspect ratio. We revalidate this
estimate after mode validation, since we may have filtered away all
modes that would fill that size.
Also, the EDID preferred timing is now marked as M_T_PREFERRED as well.
2006-09-14 19:18:58 -04:00
Adam Jackson
43d9edd31e
Attempt to add the 'mouse' driver in more situations.
...
Always add a mouse driver instance configured to send core events, unless
a core pointer already exists using either the mouse or void drivers. This
handles the laptop case where the config file only specifies, say,
synaptics, which causes the touchpad to work but not the pointing stick.
We don't double-instantiate the mouse driver to avoid the mouse moving twice
as fast, and we skip this logic when the user asked for a void core pointer
since that probably means they want to run with no pointer at all.
2006-09-14 19:09:02 -04:00
Adam Jackson
739224d05e
Load the default module set when no Module section is given in the config.
...
Also, synchronize that list with the list for the pseudoconfig file used
when starting with no config file. These really need to be better unified.
2006-09-14 19:03:32 -04:00
Adam Jackson
beac2bf1e4
Expand the default sync ranges to be large enough for 800x600@60.
2006-09-14 19:01:13 -04:00
Adam Jackson
71a15a7d57
Publish the raw EDID block as a property on the root window.
...
This was removed in the patch for bug #5386 , but is still useful.
2006-09-14 19:00:10 -04:00
Adam Jackson
7939c8dfb7
Bump the default pixel depth to 24, and default bpp to 32.
2006-09-14 18:57:57 -04:00
Adam Jackson
72af975f9c
Fix up EDID blocks where the max pixclock exceeds the preferred mode clock.
...
Base EDID only lets you specify the maximum dotclock in tens of MHz, which
is too fuzzy for some monitors. 1600x1200@60 is just over 160MHz, but if
the monitor really can't handle any mode at 170MHz, then 160 is more
correct. Fix up the EDID block before the driver can see it in this case,
so we don't spuriously reject modes.
2006-09-14 18:56:34 -04:00
Adam Jackson
d05e0a97bb
Enable DPMS by default.
2006-09-14 18:49:12 -04:00
Adam Jackson
334f7db9f6
Allow hsync and vsync ranges to be overridden independently again.
2006-09-14 18:46:10 -04:00
Adam Jackson
ced46e1777
Record all standard timings from EDID as modes, instead of just the first five.
2006-09-14 18:41:59 -04:00
Adam Jackson
d89fee68d0
Record the maximum dot clock of the monitor, and filter by it.
2006-09-14 18:41:15 -04:00
Adam Jackson
fa8ef71668
Don't translate monitor gamma to X gamma.
...
The X gamma is used to set the output ramp of the card. Setting a 2.2 output
gamma going into a 2.2 monitor gives an effective gamma of 4.84, which is
very much not what you want.
2006-09-14 18:33:00 -04:00