summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-12-16XQuartz: darwinPointer reports the actual pixel position now rather than a ↵Jeremy Huddleston2-17/+24
relative position (cherry picked from commit a41e7f75decd340d064fdc0d2c4fe6c88d7dbc82) (cherry picked from commit 70930f6d31cc2ca16b40c17e101b106506a8337a)
2008-12-16XQuartz: Corrected name/command labels in the customization widgetJeremy Huddleston2-20/+6
(cherry picked from commit a689c23f17eb445c36b97eb617ef4b8bd157985f) (cherry picked from commit 9ac2e68d86ed1eb6e3f6c900c60908813eca140e)
2008-12-16Removed unised option from configure.ac for launchdJeremy Huddleston1-4/+0
(cherry picked from commit 87e4de0a9a8af6e5e0cbba74e585761f1160a6ab) (cherry picked from commit 451050b1e2dc0f2f6356d74ddb6f52183a794e8f)
2008-12-16XQuartz: pbproxy: Simplify linkingJeremy Huddleston3-4/+5
(cherry picked from commit 909cc5c4dca0f63e90505575bbd454b46a4670cc) (cherry picked from commit cbb9ee57f8f29d2a1c39946381471fcd3b8e495e)
2008-12-16Xi: silence compiler warningPeter Hutterer1-1/+1
Don't mix declarations and statements. (cherry picked from commit fb2a8d0e59a3d187255538f6add22ec67551507a)
2008-12-16xfree86: fix compiler warning (use of uninitialized variable)Peter Hutterer1-2/+2
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 8e3279134987a45f2a89c963ef2d33bc3d3c8179)
2008-12-16xfree86: don't render SW cursors for devices attached to VCP (#16805)Peter Hutterer1-1/+2
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 bb072019fa8dd292a50ef433d05caeefd1304a73)
2008-12-16xkb: Allow NULL as rulesFile in XkbSetRulesDflts.Peter Hutterer1-5/+24
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 463e02e7de5da3e582a3a049110a476713c7210e)
2008-12-16Xi: don't update VCP's valuators from DeviceValuator events #18882Peter Hutterer1-2/+6
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-16dolt: allow older versions of bash to compile the xserver (#19031)Stuart Bennett1-1/+1
Signed-off-by: James Cloos <cloos@jhcloos.com> (cherry picked from commit 7be6520d94df874c6bbd46d06a1830a12d0967f2)
2008-12-16xsync: Fix wakeup storm in idletime counter.Adam Jackson1-10/+41
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 1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5)
2008-12-16randr: clear primaryOutput when the output is deletedAdam Jackson1-0/+3
(cherry picked from commit 86c64ddf21763972aa7fc8c5770259123c9907b3)
2008-12-16randr: use primary output for RRFirstOutput()Adam Jackson1-0/+3
(cherry picked from commit fe65f400ed16cb39db8c9518b9446f590c34db1a)
2008-12-16randr: Mangle GetScreenResources sort order based on primary outputAdam Jackson1-3/+14
(cherry picked from commit cdcb516e561e2f65eb2fa523ca001c57674d5caf)
2008-12-16randr: Mangle compat Xinerama reply based on primary outputAdam Jackson1-17/+31
(cherry picked from commit d7b316e82bc7051f8829b4f4a640f50ae91c2db9)
2008-12-16randr: Add [GS]etOutputPrimaryAdam Jackson4-1/+145
(cherry picked from commit 9d58d2a319059989ccdfa758f586149ccdc16df6)
2008-12-15Patch brown-bag fix for bug 19017 (scrn->virtualX/virtualY 0 before PreInit)Keith Packard1-0/+6
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 063eb6743cd0d98dd52d1a9559b804381ee5144d)
2008-12-15Use scrn->virtualX/virtualY in xf86CrtcFitsScreen. Fix bug 19017.Keith Packard2-13/+2
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 fde2f961035609cfff8761ef1e0f23e6a9761be2)
2008-12-15When disabling SIGIO tracking, use SIG_IGN instead of SIG_DFL.Keith Packard1-1/+1
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 29a5b0596b396d3e4a8a014cacd3e3ef77467ab7)
2008-12-15Clean up rotation data when crtc is turned offKeith Packard3-1/+9
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 1ba4cbb15919759aadd71960c5c057af9ba94fe3)
2008-12-09Bump version to 1.5.99.3 (1.6 beta3)xorg-server-1.5.99.3Keith Packard1-1/+1
Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: Update SProcRandrVector for panningMatthias Hopf1-0/+39
(cherry picked from commit 44bef8b850c5a78a3d3eca5f0d92b71bdd0a87e2) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: Allow panning to be disabled per axisMatthias Hopf1-25/+39
(cherry picked from commit e5ab9e66628cde081757cf2a1013a78e927a622e) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: Rework panning area verificationMatthias Hopf1-25/+73
(cherry picked from commit bad118ace6c5bae5a5ed8a35129c90c38f1c1932) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: Don't change panning parameters if verification fails.Matthias Hopf1-4/+19
(cherry picked from commit 219c26ce0c65625d55cfd943ec66fe94a1a0ddfd) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: Rename pan() to set_origin(), and xf86CrtcPan() to xf86CrtcSetOrigin()Matthias Hopf3-8/+8
(cherry picked from commit 18a8bac1a1567b6215928f96870554ea63f39aab) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: Nuke config-timestamp for panningMatthias Hopf1-15/+0
(cherry picked from commit 825b2c2f4a59ac4852f90bbbddf18ab832297fdd) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: Protocol bits for panning supportMatthias Hopf3-0/+188
(cherry picked from commit eeeb98d1df59baaaec954b6318d788a37e388d11) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: Panning supportMatthias Hopf2-2/+178
(cherry picked from commit b929d721efdb17bcc94b9984c4f34d0df3d267d5) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: Crtc interface update for panning support.Matthias Hopf1-1/+35
(cherry picked from commit 834cbc16f3eb539704faade7bff347b161ce69d9) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: Weird enough, crtc->version was never set upon creation. Fix that.Matthias Hopf1-0/+1
(cherry picked from commit a475eb9feec75e9ce1e316da0f1679acd7dd3aa8) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09Default to x86emu even on i386 linuxAdam Jackson1-1/+0
vm86 mode is a bad idea anyway, and using the emulator everywhere means we get a consistent set of bugs. (cherry picked from commit 58a27d2932164e43c0db42b1286ec2f95250b420) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09ddxCtrls.c: XkbDDXUsesSoftRepeat always returns 1 nowSascha Hlusiak1-20/+0
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 bbf811514d3cdf84790bad5b852942a4e636902b) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09xfree86: don't FatalError on "too many input devices".Peter Hutterer4-10/+29
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-09dix: fix calculation of valuator events.Peter Hutterer1-3/+3
Follow-up to 4971315296cb. 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 ee1a6c28418a6dad6c89f79a994f27bfbaa77368) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09Xi: XIGetDevice needs to ignore the MORE_EVENTS flag.Tom Jaeger1-1/+1
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 78a62d7713c708d067d8824ec41b0a0225c1997f) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09xfree86: init EQ before trying to initialise the devices (#18890)Peter Hutterer1-2/+2
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 39db182b637041255ed6dac739ff77c8e4e07c30) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: Avoid needlessly creating a shadow framebuffer.Maarten Maathuis2-3/+12
- pScreen->width and height were zero, so it didn't "fit" the screen. (cherry picked from commit ffb484f7ef84099019b196ef97bfb2355eb6d52a) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09If AEI is on, disable 'vmmouse' in addition to 'kbd' and 'mouse'.Timo Aaltonen2-3/+4
Signed-off-by: Timo Aaltonen <tjaalton@cc.hut.fi> Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> (cherry picked from commit dd128ddcdcbe254a9cdd973590f6a979a7f0427e) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09randr: add swapped dispatch for RR[GS]etCrtcTransformJulien Cristau2-10/+25
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 0b5ecabfb803cd820338fb0364521fe39b05578b) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09Test for DRI2 extension in dri_internal.h and only enable AIGLX DRI2 if found.Kristian Høgsberg2-2/+24
(cherry picked from commit 110a71d11ab7a1a55a6a24d792457fdef0b0746d) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09Xi: change XIUnRegisterPropertyHandler to XIUnregisterPropertyHandlerPeter Hutterer2-2/+2
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-09Revert "dmx: claim we support XI 2."Keith Packard1-1/+1
This reverts commit 8da8a0fec4b1b9d9208635dedb2f449dc99e0004. Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02Bump version to 1.5.99.2 (1.6 beta 2)xorg-server-1.5.99.2Keith Packard1-1/+1
Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02Add atKeynames.h to libdmxinput_a_SOURCES so it's included in tarballsAlan Coopersmith1-0/+1
Reported by geearu in #xorg-devel (cherry picked from commit c1db925d10fd37077bed90612ed95c3fd20cd2e2) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02randr: Don't send output property events on server exitAdam Jackson1-1/+2
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 b0d371ab0a6efd4956c3677faa20b2ac15c33765) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02More man page updates for 1.6 release for Xorg, xorg.conf & exa man pages.Alan Coopersmith3-102/+66
- 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 8c560422b44e012053612754430d2b87dc44ed59) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02Correct warning for unknown GlxVisuals option in conf fileAlan Coopersmith1-1/+1
(cherry picked from commit 6a1850b8c677e2a2993f6f6b731ee3d35aa55d09) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02Sun bug 6618220: Xorg server core dump in xf86RandRModeRefresh(NULL)Jay Cotton1-1/+1
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6618220> (cherry picked from commit 5f3f14179edf48aad518f6f707bfdc37c27267c6) Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02Update See Also lists in Xorg & xorg.conf man pagesAlan Coopersmith2-7/+6
Remove xorgconfig & xorgcfg Update driver lists: - Remove vga - i810->intel - via->openchrome (cherry picked from commit 24c562f04b41d219c34f5fa3f963564accf329f2) Signed-off-by: Keith Packard <keithp@keithp.com>