6ff7f2ad6a
Fix build on FreeBSD after input-hotplug.
...
(cherry picked from commit 4e6e4baead
2006-11-15 15:35:22 -08:00
2eab230d9b
For NetBSD, define PCVT_SUPPORT (System has PCVT console).
...
Noticed by Joerg Sonnenberger. This fixes problem with console
switching.
This was in original imake NetBSD.cf.
2006-11-14 16:37:18 -06:00
26d2e45bdb
Bug #9023 : Only check mice for "mouse" or "void" if identifier is != NULL.
2006-11-14 15:33:07 +01:00
a724b7f130
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-11-13 20:32:26 -06:00
6facd958c2
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.
2006-11-13 20:23:06 -06:00
f80a8ae6e6
Disable Xprt server build by default.
2006-11-13 18:26:05 -05:00
5bfe7f4dfc
DRI: call drmSetServerInfo() before drmOpen().
...
Also, remove some libdrm remnants.
2006-11-13 01:54:32 +02:00
acb5ff4c73
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)
2006-11-11 14:13:56 +02:00
ca09468419
Correct symlink-mesa.sh usage message
2006-11-10 18:02:05 -08:00
28337cc106
Fix typo before the last commit.
2006-11-09 19:51:17 -08:00
e1720b1089
Bug #8868 : Remove drm from SUBDIRS now that the directory is gone.
2006-11-09 18:53:37 -08:00
0dee48b8af
Add RRInit function to create resource types for RR objects.
...
To allow RandR objects to be created before the screen object exists,
the resource types must be registered with the resource database.
A driver wishing to create RandR objects must call RRInit before doing so.
Also, fix a segfault when setting Output data before it is associated with a
screen.
2006-11-08 23:17:55 -08:00
ec77a95a02
Allow RandR objects to be created before the associated ScreenRec.
...
xf86 drivers need to create RandR object in the PreInit stage,
before the ScreenRec is allocated. Changing the RandR DIX code
to permit this required the addition of functions that later associate the
objects with the related screen.
An additional change is that modes are now global, and no longer associated
with a specific screen. This change actually makes mode management cleaner
as there is no more per-screen list of modes to deal with.
This changes the RandR 1.2 ABI/API for drivers.
2006-11-08 21:36:35 -08:00
fd91630b73
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
2006-11-09 09:30:33 +11:00
0409e1627a
'make dist' fixes.
2006-11-08 16:17:20 -05:00
7e0aeebb8f
Bug #6786 : Use separate defines for server's Fixes support level.
2006-11-08 12:03:37 -05:00
b5d09d4adb
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.
2006-11-08 18:10:14 +02:00
0567a6337b
xfree86/linux acpi: fix tokenising
...
Split on a space, rather on the 'video' string, as strtok takes a char,
not a string.
2006-11-08 18:00:52 +02:00
e7900d68c3
remove trailing whitespace
...
Whitespace police in full effect.
2006-11-08 15:36:47 +02:00
2035f115b7
xfree86: remove xf86Keymap.h
2006-11-08 15:30:03 +02:00
809e2841aa
xfree86: add general handler, port ACPI to it (bug #5665 )
...
Add 'general' handler registration, which will not trigger DPMS when an
event comes in.
Make ACPI use this.
2006-11-08 15:30:03 +02:00
b5438f7fb2
Get*Events: massive reorganisation
...
Reorganise the code logically, and put more comments in.
Clip valuators in proximity calls.
2006-11-08 15:30:03 +02:00
b0a7443ca8
configure.ac: axe redundant SDL test
2006-11-08 15:30:03 +02:00
332f179db7
kdrive/sdl: fix compilation
2006-11-08 15:30:03 +02:00
988757a441
config: error messages non-fatal, and before we free them
...
Move error messages before we free the error structure, and make them all
non-fatal.
2006-11-08 15:30:03 +02:00
e2b78df580
xkb: warning fix
2006-11-08 15:29:17 +02:00
b55007d8cc
SyntheticMotion: don't dereference sprite.screen when not using Xinerama
2006-11-08 15:29:17 +02:00
f93d10ce9b
dix: remove staggeringly broken vendor workarounds
...
Dear SGI,
No.
Scant regards,
Daniel
2006-11-08 15:29:16 +02:00
389275d240
XkbCopyKeymap: don't iterate broken types, or dereference null pointers
...
Don't iterate invalid destination types (>= num_types) when coping key
types.
Don't free key_aliases if it's NULL (theoretical, but sure).
Make sure dst's label_font gets allocated if it's NULL.
(Thanks, Chris Lee.)
2006-11-08 15:29:16 +02:00
d585b4189a
xkb: fix uninitialised warning
...
Fix uninitialised warning with memset(); we never actually use it
uninitialised, but gcc doesn't know that.
2006-11-08 15:29:16 +02:00
b6d7b537ed
os: fix sun extensions test
...
'else if' is not very valid, plus the logic is kind of broken, so just
move it outside the ifdef in the first place.
2006-11-08 15:29:16 +02:00
8ba0c7b62c
xace: avoid 'unused variable pScreen'
...
Initialise pScreen explicitly, as REGION_* macros ignore pScreen.
2006-11-08 15:29:16 +02:00
c3ea1f7db4
dix/mi: still more warning fixes
...
Fix up prototypes for PrintChildren and PrintWindowTree in the dix.
Make miPrintRegion be unconditionally defined, and move the prototype into
regionstr.h.
Change a bunch of ScreenPtr pScreen = foo; to
ScreenPtr pScreen; pScreen = foo; in window.c, so we avoid unused variable
references (as inline REGION_* doesn't reference pScreen).
2006-11-08 15:29:16 +02:00
3a9b964258
dix: add missing prototypes
...
Add missing prototype for ffs, and include headers from ffs.c.
Move PostSyntheticMotion prototype to input.h.
2006-11-08 15:29:16 +02:00
6716488fa2
dix: remove unused debug code
2006-11-08 15:29:16 +02:00
51813d77bf
dix: remove unused variable
2006-11-08 15:29:15 +02:00
844090a5b5
xfree86/xf86misc: warning fixes
2006-11-08 15:29:15 +02:00
61b570d0c1
xfree86/os-support: update prototype for OSRingBell
2006-11-08 15:29:15 +02:00
c51fadc07d
mieq: annotate with some more comments
2006-11-08 15:29:15 +02:00
578899139f
RemoveGeneralSocket: don't touch EnabledDevices
...
RemoveGeneralSocket. Harmless, but.
2006-11-08 15:29:15 +02:00
ae58d349c1
CreateColormap: fix return value (bug #7083 )
...
Return BadMatch when an unsupported visual type is given, not BadValue --
this is correct according to the spec.
2006-11-08 15:29:15 +02:00
96f78e3886
remove XFree86 changelogs (bug #7262 )
...
Without being able to tie these to specific commits, the text changelog is
useless, as well as being huge.
2006-11-08 15:29:15 +02:00
5a40448f2d
A couple more cases of error message before freeing strings.
2006-11-07 15:48:29 -08:00
05f1c30246
Merge branch 'autoconfig-for-7.2'
2006-11-07 18:42:54 -05:00
3e7e0e3509
Report the error before freeing the error strings.
2006-11-07 14:13:23 -08:00
4e6e4baead
Fix build on FreeBSD after input-hotplug.
2006-11-07 13:36:54 -08:00
20e9144c07
Add $(DIX_CFLAGS) to remaining Makefile.am files
2006-11-07 12:49:28 -08:00
5e946dd853
Bug #8937 : Extension setup functions not called on server resets
2006-11-07 13:50:19 -05:00
1dcda4f3c5
Avoid dereferencing sprite.screen when Xinerama is not running. ( #8925 )
...
With Xinerama support built into the X server but not in use,
sprite.screen is NULL and yet the SyntheticMotion
macro would dereference it. Avoid that by just passing sprite.screen
to PostSyntheticMotion which can then dereference it when Xinerama is
enabled.
Also, define PostSyntheticMotion in dixevents.h and include dixevents.h in
getevents.c
2006-11-07 01:29:51 -08:00
c20d3bf753
Merge branch 'origin' into randr-1.2
2006-11-07 01:21:28 -08:00
Eric Anholt
Jeremy C. Reed
Matthias Hopf
Adam Jackson
George Sapountzis
Jurij Smakov
Alan Coopersmith
Keith Packard
Dave Airlie
Rich Coe
Bram Verweij
Daniel Stone
Laurence Withers
Erik Andren
Keith Packard
Eamon Walsh