Cooper Yuan
75bad86992
Fix typo in xf86PickCrtcs()
...
(cherry picked from commit 2a61397d17
)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
f427d3aaa7
XQuartz: Updated menu item ordering for better HIG compliance
...
(cherry picked from commit 4c9bb241ce
)
(cherry picked from commit 73987010b2
)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
d0eb4337e3
XQuartz: Tiger fix, don't call Xplugin code in the Appkit thread if Xplugin isn't threadsafe.
...
(cherry picked from commit 748d9e5bd7
)
(cherry picked from commit fd31984e0c
)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
d9e1fdcd40
XQuartz: Fix path to executable
...
(cherry picked from commit 7e9d3698e0
)
(cherry picked from commit 5926b213b3
)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
e93daf4e71
XQuartz: fixed make dist
...
(cherry picked from commit 2d52367ab9
)
(cherry picked from commit 13eff12902
)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
1cf76f23c7
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
)
(cherry picked from commit fdf6425612
)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
22d3ecda18
XQuartz: unset DISPLAY if we didn't get a launchd socket handoff
...
(cherry picked from commit b959727f38
)
(cherry picked from commit 9cbed0a325
)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
9eb5f30929
XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
...
Also some prefix related fixes.
(cherry picked from commit fd459e9658
)
(cherry picked from commit 99b2cbf061
)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
19e6f73710
XQuartz: Removed some debug spew
...
(cherry picked from commit 370dcf11b3
)
(cherry picked from commit 8065953ea8
)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
ced368287b
XQuartz: darwinPointer reports the actual pixel position now rather than a relative position
...
(cherry picked from commit a41e7f75de
)
(cherry picked from commit 70930f6d31
)
2008-12-16 12:03:04 -08:00
Jeremy Huddleston
b5687a9d12
XQuartz: Corrected name/command labels in the customization widget
...
(cherry picked from commit a689c23f17
)
(cherry picked from commit 9ac2e68d86
)
2008-12-16 12:03:04 -08:00
Jeremy Huddleston
53d93d0d29
Removed unised option from configure.ac for launchd
...
(cherry picked from commit 87e4de0a9a
)
(cherry picked from commit 451050b1e2
)
2008-12-16 12:03:04 -08:00
Jeremy Huddleston
df3f23fe8d
XQuartz: pbproxy: Simplify linking
...
(cherry picked from commit 909cc5c4dc
)
(cherry picked from commit cbb9ee57f8
)
2008-12-16 12:03:04 -08:00
Peter Hutterer
6e8626f2eb
Xi: silence compiler warning
...
Don't mix declarations and statements.
(cherry picked from commit fb2a8d0e59
)
2008-12-16 12:03:04 -08:00
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
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