Daniel Stone
8d3b465eb3
WaitForSomething: allow time to rewind
...
If time rewinds dramatically, reset all the timers to fix their expiry.
(cherry picked from d3e57faffe
commit)
2006-11-08 18:34:43 +02:00
Rich Coe
22bccea8dc
CheckConnections: don't close down the server client (bug #7876 )
...
When an appgroup is shutting down, the list of clients can change, so make
sure we're not trying to shut the server down.
(cherry picked from b5d09d4adb
commit)
2006-11-08 18:10:40 +02:00
Bram Verweij
be91a981df
xfree86/linux acpi: fix tokenising
...
Split on a space, rather on the 'video' string, as strtok takes a char,
not a string.
(cherry picked from 0567a6337b
commit)
2006-11-08 18:10:40 +02:00
Daniel Stone
66b2c9bd2d
add 'general socket' handler, port ACPI to use it
...
Add a general socket (not input device, but still need to be woken for it)
handler to both the DIX and XFree86, and make XFree86's ACPI handling use
it. This stops DPMS waking up every time an ACPI notification comes in.
2006-11-08 18:10:40 +02:00
Bjorn Helgaas
58653b676d
Do not map full 0-1MB legacy range
...
If we're mapping something in the "legacy range" (0-1Mb), we shouldn't
expand the requested range to the entire 0-1Mb range. Typically this
is for mapping the VGA frame buffer, and some platforms support mmap of
the frame buffer but not the entire 0-1Mb range.
For example, HP sx1000 and sx2000 ia64 platforms can have memory from
0-0x9ffff, VGA frame buffer from 0xa0000-0xbffff, and memory from
0xc0000-0xfffff. On these platforms, we can't map the entire 0-1Mb
range with the same attribute because the memory only supports WB,
while the frame buffer supports only UC. But an mmap of just the
frame buffer should work fine.
(cherry picked from bd0c829654
commit)
2006-11-08 10:18:51 -05:00
Egbert Eich
93ae22b16b
Fixing mach64 driver bailing out on ia64
...
Mach64 driver bails out on ia64 because it cannot map device
memory. It turns out that some bogus and unneeded code attempts
to find the root bridge of the device and fails to do so proberly
as there this host-to-pci bridge is not existant. This code has
been around for years although it completely unclear what it had
been intended for. Fixing this by eliminating the bogus code.
(cherry picked from c1828a8ff5
commit)
2006-11-08 10:17:58 -05:00
Matthias Hopf
816b95be37
Build with -D_PC on ix86 only.
...
(cherry picked from 46901063e8
commit)
2006-11-08 10:17:37 -05:00
Aaron Plattner
c969c7e10c
Fix standard VESA modes.
...
The built-in mode timings were off slightly for the 640x480@60, 640x480@72,
and 1024x768@75 modes.
(cherry picked from 97fd471a62
commit)
2006-11-08 09:56:23 -05:00
Myron Stowe
267dc25e5c
xfree86: re-enable chipset-specific drivers for Linux/ia64
...
Re-enable chipset-specific support for Linux/ia64, by linking in
lnx_ia64.c.
(cherry picked from 794f2e7291
commit)
2006-11-08 09:53:33 -05:00
Laurence Withers
00a1e648ef
CreateColormap: fix return value (bug #7083 )
...
Return BadMatch when an unsupported visual type is given, not BadValue --
this is correct according to the spec.
(cherry picked from af606f9dab4d51724b4be6f43f1de7b3342c443a commit)
2006-11-08 15:37:01 +02:00
Erik Andren
b94e320205
remove XFree86 changelogs (bug #7262 )
...
Without being able to tie these to specific commits, the text changelog is
useless, as well as being huge.
(cherry picked from 430411ae07ad74662e22da70563f757a931c72b9 commit)
2006-11-08 15:37:01 +02:00
Eamon Walsh
c9ff47033e
Bug #8937 : Extension setup functions not called on server resets
...
(cherry picked from 5e946dd853
commit)
2006-11-07 13:55:44 -05:00
Eamon Walsh
e6778fee47
More work on Bug #8875 : revert previous fix and try using client argument
...
instead of serverClient. Also don't use totalClientSize as it is not
initialized until after the first call to InitClient
(cherry picked from 3d39c02fe6
commit)
2006-11-06 21:31:21 -05:00
Eamon Walsh
3e39bae79f
whitespace adjust
...
(cherry picked from 75fe0670eb1f71144246f1c20759d5878bbee00 commit)
2006-11-06 15:39:06 -05:00
Eamon Walsh
dca5274920
Bug #8875 : Security extension causes Xorg to core dump on server reset
...
(cherry picked from 0539d9cf24
commit)
2006-11-06 15:37:50 -05:00
Alan Coopersmith
19a4be9bf3
If getpeerucred() is available, include pid & zoneid in audit messages too
...
(cherry picked from a7b944f0d9
commit)
2006-11-03 13:50:33 -08:00
Alan Coopersmith
bc6f95af33
Bug #1997 : AUDIT messages should contain uid for local accesses
...
<https://bugs.freedesktop.org/show_bug.cgi?id=1997 >
(cherry picked from fbfb35189e
commit)
2006-11-03 13:50:22 -08:00
Alan Coopersmith
f1ef85689a
Fix automake error: BUILT_SOURCES was defined multiple times on Solaris
...
(cherry picked from c03311a1e7
commit)
2006-11-03 13:13:38 -08:00
Matthieu Herrb
00e8237839
Handle building in a separate objdir
...
(cherry picked from 645d057620
commit)
2006-10-29 18:20:19 +01:00
Matthieu Herrb
dabf032853
kill GNU-make'ism.
...
(cherry picked from 59584c375f
commit)
2006-10-29 17:50:25 +01:00
Daniel Stone
e9fb258d09
Revert "GetTimeInMillis: spuport monotonic clock"
...
This reverts d04e2545a7
commit.
2006-10-26 01:10:42 +03:00
Daniel Stone
8ce4846b4d
Revert "WaitForSomething: allow time to rewind"
...
This reverts dfac36e56a
commit.
2006-10-26 01:10:30 +03:00
Daniel Stone
dfac36e56a
WaitForSomething: allow time to rewind
...
If time rewinds dramatically, reset all the timers to fix their expiry.
(cherry picked from d3e57faffe
commit)
2006-10-26 00:25:38 +03:00
Daniel Stone
d04e2545a7
GetTimeInMillis: spuport monotonic clock
...
Add support for CLOCK_MONOTONIC from clock_gettime, and use that in
GetTimeInMillis() if available, falling back to the old gettimeofday()
implementation.
This is _slightly_ faster on some 64-bit architectures, and _slightly_
slower on others (though barely measurable).
(cherry picked from d285833290
commit)
2006-10-26 00:25:34 +03:00
Michel Dänzer
d12d0839fd
Fix test for Option "IgnoreABI".
...
This option has plenty of potential for wasting the time of bug triagers
without pretending it's always on.
(cherry picked from becbda6d51
commit)
2006-10-25 11:41:20 +02:00
Joshua Baergen
6e73c87c53
Create xorg.conf.example (Gentoo bug #138623 ).
...
(cherry picked from 62d2409793
commit)
2006-10-24 09:18:41 -07:00
Michel Dänzer
1ab7fe38df
Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms.
...
(cherry picked from 3ad1642f1b
commit)
2006-10-21 13:30:14 +02:00
Alan Coopersmith
fe32a0eb9f
Pre-release message should tell users to check git, not CVS, for updates
...
(cherry picked from e1dd1904c6
commit)
2006-10-19 14:28:12 -07:00
Alan Coopersmith
f6920869d9
Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris
...
(cherry picked from 357b37b382
commit)
2006-10-18 18:11:57 -07:00
Alan Hourihane
a935222f93
Small modification to blocking signals when switching modes.
...
(cherry picked from d430e76a16
commit)
2006-10-16 12:39:38 +01:00
Alan Coopersmith
180e1bc979
Make sure xorgcfg files are included even when dist made with --disable-xorgcfg
...
(cherry picked from b9108a13fc
commit)
2006-10-13 19:06:19 -07:00
Adam Jackson
3c70fda04c
Bump to 1.1.99.901
2006-10-13 19:04:35 -04:00
Alan Hourihane
7a995802b3
Block IO on switchmode just as we do for VT switching
...
to avoid cursor movements signalling io.
(cherry picked from cf948b7b04
commit)
2006-10-13 14:50:33 +01:00
Ian Romanick
4702375764
Fix bug #8608 .
...
Regenerate files based on recent commits to Mesa (that fix Mesa bug
that return pixel data.
(cherry picked from a6df780e4d
commit)
2006-10-11 15:42:02 -07:00
Daniel Stone
4b5ca6b3df
symlink-mesa.sh: expand *.{c,h}
...
(cherry picked from d7c89c7c1c
commit)
2006-10-11 16:02:41 -04:00
Ivan Pascal
6e2958c5c5
xkb: fix wrapping when switching between groups
...
Use XkbCharToInt as that's what we're doing.
(cherry picked from d6ea96b13e
commit)
2006-10-11 16:02:32 -04:00
Brian
4c7d76cbac
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.
(cherry picked from 84eb2c0a06
commit)
2006-10-11 16:02:24 -04:00
Jeff Smith
e95920b7d7
Bug #8449 : Yet another Mesa symlink script resync.
...
(cherry picked from cf6e9687ff
commit)
2006-10-11 16:02:09 -04:00
Brian
d3c6688781
Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap()
...
to prevent potential segfault.
(cherry picked from f7c1d94241
commit)
2006-10-11 16:02:00 -04:00
Brian
32c293aa1c
The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
...
Otherwise, Xdmx generates a slew of protocol errors.
(cherry picked from 945b7c6394
commit)
2006-10-11 16:01:37 -04:00
Brian
26a94bab11
Replace broken DMXDBG3() with DMXDBG2()
...
(cherry picked from 891e9c3e6c
commit)
2006-10-11 16:01:27 -04:00
Adam Jackson
c559940c10
Close with Pclose() that which we open with Popen().
...
(cherry picked from ce78b0cd2b
commit)
2006-10-11 16:01:19 -04:00
Aaron Plattner
b84fb534fb
Bug 8386: Grow parser buffers to fit an entire line if it's longer than CONFIG_BUF_LEN.
...
(cherry picked from c1655f0fd4
commit)
2006-10-11 16:01:08 -04:00
Drew Parsons
27f0a0066f
* Install Xprint's Xsession script to $(sysconfdir)/X11/Xsession.d
...
* Removing outdated references to CDE and dt, rename script to
92xprint-xpserverlist.
(cherry picked from 8b4ed47c5d
commit)
2006-10-11 16:01:00 -04:00
Donnie Berkholz
0790665ff0
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.
(cherry picked from d812f486a0
commit)
2006-10-11 16:00:34 -04:00
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