Commit Graph

6808 Commits

Author SHA1 Message Date
Adam Jackson
0d27dd23cf Default to x86emu even on i386 linux
vm86 mode is a bad idea anyway, and using the emulator everywhere
means we get a consistent set of bugs.
(cherry picked from commit 58a27d2932)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:49:55 -08:00
Sascha Hlusiak
ff9b55d8cb ddxCtrls.c: XkbDDXUsesSoftRepeat always returns 1 now
We'd like to do soft repeat in the server for all keys. Remove obscure check, that'd
prevent the server from autorepeating when delay is set to exactly 660ms and rate is
set to exactly 25 (interval=40).

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit bbf811514d)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:49:22 -08:00
Peter Hutterer
b0c6472552 xfree86: don't FatalError on "too many input devices".
Just ignore devices after MAXDEVICES has been reached, but warn the user that
the devices are ignored.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:48:20 -08:00
Peter Hutterer
db5abde7ea dix: fix calculation of valuator events.
Follow-up to 4971315296. countValuatorEvents was copied from GKVE where it
was obviously broken but nobody noticed. GPE had the correct version, but that
one got lost during de-duplication. Restoring the correct calculation - if we
have 6 valuators, we want 1 valuator event, not 2.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit ee1a6c2841)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:43:48 -08:00
Tom Jaeger
d679cf70a7 Xi: XIGetDevice needs to ignore the MORE_EVENTS flag.
Reported in X.Org Bug 18882, Comment 5.
<http://bugs.freedesktop.org/show_bug.cgi?id=18882>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 78a62d7713)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:42:56 -08:00
Peter Hutterer
480caacbdd xfree86: init EQ before trying to initialise the devices (#18890)
The kbd driver may send events during device initialisation, and these events
need the EQ set up already.

X.Org Bug 18890 <http://bugs.freedesktop.org/show_bug.cgi?id=18890>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 39db182b63)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:42:16 -08:00
Maarten Maathuis
991f0be6e2 randr: Avoid needlessly creating a shadow framebuffer.
- pScreen->width and height were zero, so it didn't "fit" the screen.
(cherry picked from commit ffb484f7ef)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:41:50 -08:00
Timo Aaltonen
d6129ebf8d If AEI is on, disable 'vmmouse' in addition to 'kbd' and 'mouse'.
Signed-off-by: Timo Aaltonen <tjaalton@cc.hut.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit dd128ddcdc)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:40:14 -08:00
Julien Cristau
90900976ce randr: add swapped dispatch for RR[GS]etCrtcTransform
Fix a memory leak in ProcRRGetCrtcTransform() while I'm at it.

Signed-off-by: Julien Cristau <jcristau@debian.org>
Cc: Keith Packard <keithp@keithp.com>
(cherry picked from commit 0b5ecabfb8)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:39:35 -08:00
Kristian Høgsberg
de83a342f4 Test for DRI2 extension in dri_internal.h and only enable AIGLX DRI2 if found.
(cherry picked from commit 110a71d11a)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:39:06 -08:00
Peter Hutterer
3df1db67e3 Xi: change XIUnRegisterPropertyHandler to XIUnregisterPropertyHandler
CamelCase can be taken too far, and AFAICT there's no consumers of that
function yet anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:38:07 -08:00
Keith Packard
ba666a969e Revert "dmx: claim we support XI 2."
This reverts commit 8da8a0fec4.

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:36:41 -08:00
Keith Packard
b268458eab Bump version to 1.5.99.2 (1.6 beta 2)
Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02 23:43:02 -08:00
Alan Coopersmith
d68632e221 Add atKeynames.h to libdmxinput_a_SOURCES so it's included in tarballs
Reported by geearu in #xorg-devel
(cherry picked from commit c1db925d10)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02 23:39:06 -08:00
Adam Jackson
f5ef57e5fe randr: Don't send output property events on server exit
If the Window resource type is already gone, there's no point in trying
to send events, all it can do is access already-freed memory.

Relevant thread:

http://lists.freedesktop.org/archives/xorg/2008-November/040443.html
(cherry picked from commit b0d371ab0a)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02 23:38:33 -08:00
Alan Coopersmith
40116cd5d0 More man page updates for 1.6 release for Xorg, xorg.conf & exa man pages.
- Remove remaining references to XFree86-Misc options AllowNonLocalModInDev
  and DisableModInDev.
- Remove remaining references to grab-breaking keys & associated options.
- Update description of Ctrl-Alt-Backspace to new -retro/DontZap defaults.
- Add description of new options -modalias and -showopts.
- Update list of modules loaded by default.
- Update input driver references from keyboard to evdev & kbd.
- Update list of driver man pages to match xf86-*-* drivers with man pages.
- Add See Also section to exa man page.

and various formatting/typo/etc. fixes.

The Xorg/xorg.conf sections on input device selection could use further
updates to better match the current state of HAL-enabled configuration.
(cherry picked from commit 8c560422b4)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02 23:37:36 -08:00
Alan Coopersmith
4e5be5ad36 Correct warning for unknown GlxVisuals option in conf file
(cherry picked from commit 6a1850b8c6)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02 23:35:52 -08:00
Jay Cotton
ca744c371a Sun bug 6618220: Xorg server core dump in xf86RandRModeRefresh(NULL)
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6618220>
(cherry picked from commit 5f3f14179e)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02 23:35:18 -08:00
Alan Coopersmith
78af5d81e8 Update See Also lists in Xorg & xorg.conf man pages
Remove xorgconfig & xorgcfg
Update driver lists:
	- Remove vga
	- i810->intel
	- via->openchrome
(cherry picked from commit 24c562f04b)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02 23:34:22 -08:00
Bernhard Rosenkraenzer
e40841ce5a Xext: fix MultiBuffer compilation error with TryClientEvents. (#18835)
X.Org Bug 18835 <http://bugs.freedesktop.org/show_bug.cgi?id=18835>

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit 1dfed222e9)
2008-12-02 23:27:15 -08:00
Stuart Bennett
0d902b05ad xf86Cursors: xf86_reload_cursors shouldn't unconditionally show hwcursor (#14820)
Also, no need to call ShowCursor when SetCursorPosition already does it
Based on a previous patch by Maarten Maathuis

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 0b8f8b24f7)
2008-12-02 23:08:01 -08:00
Kristian Høgsberg
cbf4fec529 Bump dri2proto requirement to 1.99.3. 2008-12-01 21:37:04 -05:00
Kristian Høgsberg
670ac5d097 Drop unused DRI2 vblank infrastructure.
For this first iteration of DRI2 we don't have any vsync functionality
in place yet, so back out the support in DRI2 and the protocol for now.
2008-12-01 21:37:01 -05:00
Peter Hutterer
862d5b2dc5 xkb: don't attempt to filter events for devices without key classes.
Reported by Magnus Kessler.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-12-01 08:16:57 +10:00
Peter Hutterer
41471afa77 xkb: Extra sanity checks to prevent dev->key == NULL dereferencing. 2008-12-01 08:16:57 +10:00
Peter Hutterer
b983c4fa1e Require inputproto 1.5
Also claim to now support XI 1.5.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-12-01 08:16:57 +10:00
Peter Hutterer
f245c46d29 dix: don't detach SDs during grabs. 2008-12-01 08:16:57 +10:00
Peter Hutterer
71f289f7d1 dix: Don't deliver XI events from MDs.
Restore the XI 1.x event model: VCP/VCK deliver core events only, SDs device
events only.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-12-01 08:16:57 +10:00
Peter Hutterer
c910886737 Xi: Purge XGE remainders, we don't have any XGE events anymore. 2008-12-01 08:16:57 +10:00
Peter Hutterer
be4bf65d00 input: don't switch MDs' classes around between SDs.
Server 1.6 uses the X Input 1.x input model, where the core devices (VCP and
VCK) do not generate XI events. They don't have to swap device classes but
instead stay at the default number of classes at all times.
This means we can get rid of the DeviceClassesChangedEvents as well.
2008-12-01 08:16:57 +10:00
Peter Hutterer
aba1cbaadc dix: No DeviceEnterLeave events in server 1.6 2008-12-01 08:16:56 +10:00
Peter Hutterer
9739fac045 Xi: don't allow VCP/VCK be OpenDevice'd, but allow all SDs.
Reverting to traditional XI behaviour.
2008-12-01 08:16:56 +10:00
Peter Hutterer
7330cb5650 Xi: don't list attachment in ListInputDevices, but list all SDs.
In XI2, we only list the VCP and the VCK as well as floating SDs to non-XI2
clients. This is not the case here, we just list all devices.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-12-01 08:16:56 +10:00
Peter Hutterer
1d307ed7f2 Xi: remove the GetExtensionVersion hack - don't reply with supported version.
XI2 abuses the GEV request to reply with the min/major version of the
supported extension if the length for the name is 0. Don't do that, yet.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-12-01 08:16:56 +10:00
Peter Hutterer
cfe7301bcf Xi: remove all new XI2 protocol requests and their handling.
This commit reverts to XI 1.4 requests, plus the input device property
requests.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-12-01 08:16:56 +10:00
George Staplin
db115e7870 XQuartz: GL: Make various changes to makeFormat, so that it works better. Now glxgears looks normal with the old libGL.
Add various GLX extensions to the list of supported extensions.

Reformat the oddly formatted code in some areas.

Use xalloc and xfree instead of malloc and free.
(cherry picked from commit 755f53eb40)
2008-11-28 13:18:15 -08:00
Jeremy Huddleston
d4fb734c63 XQuartz: Added option to enable/disable test extensions
defaults write org.x.X11 enable_test_extensions -boolean true
(cherry picked from commit fd4710aff3)
(cherry picked from commit 635019ad18)
2008-11-28 13:01:07 -08:00
Jeremy Huddleston
e9ee5d4f61 XQuartz: Avoid some warning messages being spewed to system.log by AppKit
(cherry picked from commit 780eff230c)
2008-11-28 13:01:04 -08:00
Jeremy Huddleston
2ca2742aa5 XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well...
(cherry picked from commit cbae2b4473)
2008-11-28 13:00:49 -08:00
Jeremy Huddleston
added4cff7 XQuartz: Fix dead-acute on Greek keyboards
(cherry picked from commit 807f2ec35c)
2008-11-28 13:00:37 -08:00
Jeremy Huddleston
202908c613 XQuartz: Fix Czech keyboard dead-acute
(cherry picked from commit 771df2786b)
2008-11-28 13:00:24 -08:00
Jeremy Huddleston
c7c8eeaedc XQuartz: Fix an uninitialized keyboard_type on Tiger
(cherry picked from commit 27b1a5eb34)
2008-11-28 13:00:07 -08:00
Keith Packard
f0e7a792be Add server support for RRGetScreenResourcesCurrent
This depends on randrproto 1.2.99.1

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit fc70839431)
2008-11-26 15:55:56 -08:00
Keith Packard
f3edc1fb02 New version of dolt 2008-11-25 23:15:35 -08:00
Keith Packard
4715f079b9 Merge commit 'origin/master' 2008-11-25 22:19:08 -08:00
Keith Packard
9ffc671939 Move matrix operations from X server to pixman 0.13.2
pixman 0.13.2 now holds all of the matrix operations. This leaves
the protocol conversion routines and some ABI stubs in place

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-11-25 22:17:58 -08:00
Eamon Walsh
ed597f19fd xselinux: use "raw context" variants of getpeercon() and getcon(). 2008-11-25 22:49:19 -05:00
Peter Hutterer
ec1d08442f dix: Enable core devices in InitCoreDevices already.
Updated patch, see
http://lists.freedesktop.org/archives/xorg/2008-November/040540.html

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
2008-11-26 10:53:23 +10:00
Peter Hutterer
2b45602e82 Revert "dix: Enable core devices in InitCoreDevices already."
I merged the wrong patch. See correct patch at:
http://lists.freedesktop.org/archives/xorg/2008-November/040540.html

Not activating the device before attempting to enable it would leave the
sprite unset, crashing the server when enabling the real devices.

This reverts commit e078901a4e.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-11-26 10:53:23 +10:00
Jeremy Uejio
416685c295 Refix Sun bug #6685465: Xephyr uses wrong or bad colortable in 8-bit mode
<http://bugs.opensolaris.org/view_bug.do?bug_id=6685465>

This is a refix of the previous fix for CR 6685465.  In the first fix
I was shifting the colors to match the mask by the bits_per_rgb amount
in the visual structure.  That field has nothing to do with the # of
bits to shift by.  I should just instead shift the bits to match the mask.
2008-11-25 16:31:11 -08:00