Commit Graph

6989 Commits

Author SHA1 Message Date
Adam Jackson
2ef02833d6 randr: Mangle compat Xinerama reply based on primary output
(cherry picked from commit d7b316e82b)
2008-12-16 09:55:14 -05:00
Adam Jackson
0bdfdaa7df randr: Add [GS]etOutputPrimary
(cherry picked from commit 9d58d2a319)
2008-12-16 09:55:09 -05:00
Keith Packard
09039fb89f Patch brown-bag fix for bug 19017 (scrn->virtualX/virtualY 0 before PreInit)
When a driver uses a crtc during device detection, the scrn has not yet been
configured and virtualX/virtualY are still zero. This caused the X server
to try and allocate a shadow frame buffer, which couldn't work.

Detect this by checking for zero virtualX/virtualY values.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 063eb6743c)
2008-12-15 20:12:33 -08:00
Keith Packard
ae2cbbff9f Use scrn->virtualX/virtualY in xf86CrtcFitsScreen. Fix bug 19017.
pScreen->width/height are not initialized when doing initial mode setting,
which makes this function incorrectly fail. Using scrn->virtualX should work
in all cases though.

Bug 19017 reports a crash in xf86CrtcSetModeTransform when doing a modeset
for output probing, long before the screen array is initialized; that was
caused by a work-around to set pScreen->width/height so that xf86CrtcFitsScreen
could find the right values.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit fde2f96103)
2008-12-15 11:47:57 -08:00
Keith Packard
6d671b2dee When disabling SIGIO tracking, use SIG_IGN instead of SIG_DFL.
This avoids a race condition for drivers which mis-order the fd close and
signal disable.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 29a5b0596b)
2008-12-15 11:47:12 -08:00
Keith Packard
8f17a31aa7 Clean up rotation data when crtc is turned off
The shadow frame buffer and other data used for rotation need to be freed
when the crtc is disabled, not just when rotation is disabled.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 1ba4cbb159)
2008-12-15 11:46:47 -08:00
Jeremy Huddleston
73987010b2 XQuartz: Updated menu item ordering for better HIG compliance
(cherry picked from commit 4c9bb241ce)
2008-12-15 03:22:09 -08:00
Jeremy Huddleston
fd31984e0c XQuartz: Tiger fix, don't call Xplugin code in the Appkit thread if Xplugin isn't threadsafe.
(cherry picked from commit 748d9e5bd7)
2008-12-15 03:21:58 -08:00
Jeremy Huddleston
5926b213b3 XQuartz: Fix path to executable
(cherry picked from commit 7e9d3698e0)
2008-12-10 15:08:30 -08:00
Jeremy Huddleston
13eff12902 XQuartz: fixed make dist
(cherry picked from commit 2d52367ab9)
2008-12-10 15:08:18 -08:00
Jeremy Huddleston
1962af7ee3 XQuartz: Make debugging output for invalid depths a bit more detailed
(cherry picked from commit 609fb166b7)
2008-12-10 15:08:03 -08:00
Jeremy Huddleston
fdf6425612 XQuartz: Avoid using login /bin/sh blech. Just use a bash script to start the app, so it will inherit the right environment
(cherry picked from commit f4b7ad9cc6)
2008-12-10 15:07:49 -08:00
Jeremy Huddleston
9cbed0a325 XQuartz: unset DISPLAY if we didn't get a launchd socket handoff
(cherry picked from commit b959727f38)
2008-12-10 15:05:44 -08:00
Jeremy Huddleston
99b2cbf061 XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
Also some prefix related fixes.
(cherry picked from commit fd459e9658)
2008-12-10 15:05:34 -08:00
Jeremy Huddleston
e45877e05e Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2008-12-10 15:04:59 -08:00
Keith Packard
523aae1fa6 Bump version to 1.5.99.3 (1.6 beta3)
Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 22:10:56 -08:00
Matthias Hopf
4810226dfc randr: Update SProcRandrVector for panning
(cherry picked from commit 44bef8b850)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:57:47 -08:00
Matthias Hopf
798a4878a4 randr: Allow panning to be disabled per axis
(cherry picked from commit e5ab9e6662)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:57:13 -08:00
Matthias Hopf
5fa2cce83c randr: Rework panning area verification
(cherry picked from commit bad118ace6)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:57:05 -08:00
Matthias Hopf
97e8a75ce3 randr: Don't change panning parameters if verification fails.
(cherry picked from commit 219c26ce0c)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:56:57 -08:00
Matthias Hopf
6189f0832e randr: Rename pan() to set_origin(), and xf86CrtcPan() to xf86CrtcSetOrigin()
(cherry picked from commit 18a8bac1a1)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:56:47 -08:00
Matthias Hopf
68858b202a randr: Nuke config-timestamp for panning
(cherry picked from commit 825b2c2f4a)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:56:40 -08:00
Matthias Hopf
7cbded550d randr: Protocol bits for panning support
(cherry picked from commit eeeb98d1df)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:56:31 -08:00
Matthias Hopf
bc05471d11 randr: Panning support
(cherry picked from commit b929d721ef)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:56:17 -08:00
Matthias Hopf
f7e2fee8fe randr: Crtc interface update for panning support.
(cherry picked from commit 834cbc16f3)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:55:57 -08:00
Matthias Hopf
27ca32eb05 randr: Weird enough, crtc->version was never set upon creation. Fix that.
(cherry picked from commit a475eb9fee)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:55:48 -08:00
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
Jeremy Huddleston
8065953ea8 XQuartz: Removed some debug spew
(cherry picked from commit 370dcf11b3)
2008-12-06 14:11:36 -08:00
Jeremy Huddleston
70930f6d31 XQuartz: darwinPointer reports the actual pixel position now rather than a relative position
(cherry picked from commit a41e7f75de)
2008-12-06 14:11:25 -08:00
Jeremy Huddleston
9ac2e68d86 XQuartz: Corrected name/command labels in the customization widget
(cherry picked from commit a689c23f17)
2008-12-06 14:10:19 -08:00
Jeremy Huddleston
451050b1e2 Removed unised option from configure.ac for launchd
(cherry picked from commit 87e4de0a9a)
2008-12-03 22:06:36 -08:00
Jeremy Huddleston
cbb9ee57f8 XQuartz: pbproxy: Simplify linking
(cherry picked from commit 909cc5c4dc)
2008-12-03 22:06:27 -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