Commit Graph

6834 Commits

Author SHA1 Message Date
Peter Hutterer
e56059dfa5 xfree86: fix compiler warning (use of uninitialized variable)
drv and idev are only set for SDs, but are only dereferenced for SDs too, so
initializing them to NULL is safe.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit 8e32791349)
2008-12-16 12:03:04 -08:00
Peter Hutterer
0d12c44d83 xfree86: don't render SW cursors for devices attached to VCP (#16805)
When leaving 3D games such as quake3 or sauerbraten, a cursor may stay on the
screen. This is caused by one run of SW rendering for the SD, even though the
SD was attached to the VCP and thus has HW rendering capabilities.

Check for the SD's attachment (like in all other functions) before deciding on
SW or HW rendering.

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

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit bb072019fa)
2008-12-16 12:03:04 -08:00
Peter Hutterer
63b3bf85ed xkb: Allow NULL as rulesFile in XkbSetRulesDflts.
If no rules file is given, simply re-use the previous one. If no RF is given
the first time this function is called, use the built-in default.
This includes fixing the built-in default to something that actually exists.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit 463e02e7de)
2008-12-16 12:03:04 -08:00
Peter Hutterer
9a44cc619f Xi: don't update VCP's valuators from DeviceValuator events #18882
The VCP doesn't need to update the valuators anyway since it cannot send XI
events. Just skip that bit.

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

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-16 12:03:04 -08:00
Stuart Bennett
c7fffe9e13 dolt: allow older versions of bash to compile the xserver (#19031)
Signed-off-by: James Cloos <cloos@jhcloos.com>
(cherry picked from commit 7be6520d94)
2008-12-16 12:03:03 -08:00
Adam Jackson
ca56d764d2 xsync: Fix wakeup storm in idletime counter.
Wakeup scheduling only considered the threshold values, and not whether
the trigger was edge or level.

See also:
https://bugzilla.redhat.com/show_bug.cgi?id=474586
http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/test-idle-ext.c?view=markup
(cherry picked from commit 1f4fb0225b)
2008-12-16 09:55:27 -05:00
Adam Jackson
a82f10c5dd randr: clear primaryOutput when the output is deleted
(cherry picked from commit 86c64ddf21)
2008-12-16 09:55:24 -05:00
Adam Jackson
2bc53ce668 randr: use primary output for RRFirstOutput()
(cherry picked from commit fe65f400ed)
2008-12-16 09:55:20 -05:00
Adam Jackson
f0234a9eb8 randr: Mangle GetScreenResources sort order based on primary output
(cherry picked from commit cdcb516e56)
2008-12-16 09:55:17 -05:00
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
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
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