Commit graph

7070 commits

Author SHA1 Message Date
Jeremy Huddleston
1313ff3eb8 Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-03-31 18:12:27 -07:00
Jeremy Huddleston
faef10ec17 XQuartz: Fix mouse tracking for quake, et. al. in wine
Patch courtesy of Codeweavers

Fix mouse movement tracking.  For a non-window-related mouse-move event,
calculate the new position by adding the event's delta-x and delta-y values
to the previous mouse position.  Do not rely on the current mouse position
because it may have been changed by a XWarpPointer call.
(cherry picked from commit 7a67935b05)
2009-03-30 20:41:29 -07:00
Adam Jackson
38b0f9edca Fix distcheck with dolt 2009-03-27 16:49:45 -04:00
Adam Jackson
509986d6f0 Fix Changelog generation 2009-03-27 16:28:26 -04:00
Adam Jackson
0f9fd02dac selinux: Add support for avc_acquire_netlink_fd()
Requires libselinux 2.0.79 or newer.  Without this, libselinux will
check for policy updates on the netlink socket on basically every policy
lookup.  Statistically speaking, they never happen, and the check
translates to at least one more syscall on basically every operation.

Instead, take control of the fd from the library, and check it in
WakeupHandler if it polls readable.
(cherry picked from commit 3992dd38ca)
2009-03-27 16:18:39 -04:00
Adam Jackson
b3484c8480 selinux: Don't bother relabeling resources that are being destroyed
Makes window destroy about 40x faster in Xvfb.
(cherry picked from commit b030f858f2)
2009-03-27 16:18:08 -04:00
Peter Hutterer
08ac9140f6 xkb: Fix wrong colour reference in XKB geometry copying. #20081
base_color and label_color need to reference the color in the destination, not
in the source.

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

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit f5bf1fdaf3)
2009-03-27 15:25:36 -04:00
Peter Hutterer
124da1da5c Xi: don't crash on a NULL property name, just return None.
strcmp doesn't like NULL-pointers.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 0d9a42dc03)
2009-03-27 15:25:24 -04:00
Peter Hutterer
ea9f51fd42 Xi: add XATOM_FLOAT to server-defined properties.
This property is used to denote type float for input properties. Such
properties can be accessed easily through the XIPropToFloat() function.

Code originally written by Simon Thum.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit a48c81dcdf)
2009-03-27 15:25:18 -04:00
Peter Hutterer
6ad6b6f900 Xi: add XIPropToInt() auxiliary function.
Converts an XIPropertyValuePtr to an integer, provided that type and format is
right.

Code originally written by Simon Thum.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit 669f6810af)
2009-03-27 15:25:07 -04:00
Adam Jackson
667865b9eb randr: Fix thinko in xf86TargetPreferred
The only-one-output case would only work right if that also happened to
be the zeroth output.  Oops.
(cherry picked from commit 8a6ed44a8b)
2009-03-20 16:58:06 -07:00
Jeremy Huddleston
da8b2891a1 XQuartz: Implement SendPSN for AppleWM
(cherry picked from commit 779e9fdc2d)
2009-03-04 13:40:35 -08:00
Eric Paris
f469726fec This patch changes all places in the X code to use _raw functions. The
X server should never see, translate, or deal with a munged context.
Display managers which show contexts to the user should take care of
translating these to human readable form.
(cherry picked from commit c7cf926d25)
2009-03-03 14:05:16 -05:00
Jeremy Huddleston
3b36a8688b Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-02-28 00:48:52 -08:00
Jeremy Huddleston
ccf5f7bc07 XQuartz: Don't erase the mode_switch+keysym if it's the same as shift+keysym
(cherry picked from commit 3e2427e6e9)
2009-02-26 21:25:13 -08:00
Keith Packard
60c161545a X server version 1.6.0
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-25 12:05:44 -08:00
Maarten Maathuis
e9a9f80797 exa: kill of exaImageGlyphBlt
- It serves no obvious purpose, yet it directly accesses many fb
symbols.
(cherry picked from commit 5cc67ae94c)
2009-02-25 11:49:37 -08:00
Jeremy Huddleston
10e0603fb9 XQuartz: Re-enable support for capslock
(cherry picked from commit 4901b8147e)
2009-02-25 11:35:19 -08:00
Michel Dänzer
e96921ca95 DRI1: Make DRICreateDrawable return TRUE for pixmaps.
GLX_EXT_texture_from_pixmap was broken since commit
a26c77ff43 ('glx: fix retval checks when failures
occur for drawable creation.')

Signed-off-by: Michel Dänzer <daenzer@vmware.com>
(cherry picked from commit ef320bdd5e)
2009-02-25 11:34:48 -08:00
Alan Coopersmith
584f46b81c Add Extensions section to xorg.conf man page
Extensions section was added in X11R6.8.0 and documented in the release notes:
   http://www.x.org/archive/X11R6.8.0/doc/RELNOTES2.html#3
but never made it into the man page.

Also fix a bonus typo.

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
(cherry picked from commit ab61033700)
2009-02-25 11:34:29 -08:00
Keith Packard
ae7991b16d Pre-clip panning coordinates to keep crtc within panning region
There is a separate panning region check, but that doesn't work under
transformation, so just pre-clip the mouse coordinates when computing the
panning offsets. This leaves the case where panning constants are changing
unresolved.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry pick from commit c090f5514d)
2009-02-25 11:27:15 -08:00
Keith Packard
e59aa804df RandR rotations and reflections offset by one pixel
The matrix computation for rotation and reflection resulted in dropping a
row or column of pixels as the offsets used in the matrix computations used
width and height rather than width-1 and height-1.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 77c7a64e88)
2009-02-25 11:12:43 -08:00
Jeremy Huddleston
dd787b6638 XQuartz: Re-enable support for capslock
(cherry picked from commit 4901b8147e)
2009-02-24 23:13:42 -08:00
Jeremy Huddleston
955e0fe68d XQuartz: Comment out the background pointer interaction that seems to be causing CPU spinning on some configurations
(cherry picked from commit 1d479fa4f3)
2009-02-24 22:21:05 -08:00
Jeremy Huddleston
3284e00286 1.5.99.903-apple2 2009-02-22 12:07:22 -08:00
George Staplin
d3120241f9 XQuartz: GL: Change from xalloc to xcalloc to potentially avoid
uninitialized data in the __GLXAquaContext.
2009-02-21 22:33:10 -07:00
George Staplin
c7e3383309 XQuartz: GL: Fix a bug with an uninitialized GLX data structure.
This was causing a crash randomly, due to random memory contents.
Use xcalloc to prevent this in the future, due to future changes or mistakes.

Set the drawableType to include GLX_PIXMAP_BIT and GLX_PBUFFER_BIT.
The new libGL supports these.

Set the max Pbuffer width/height, based on the results of a test program.
We may someday want to revisit this depending on what users need, so that
we create a CGLContextObj, make it current, and call glGetIntegerv to
gather the information at runtime.
2009-02-21 22:22:52 -07:00
Keith Packard
9a59e7f304 xf86CrtcShadowClear is unused.
Remove this now that clearing is done by repainting with appropriate extend
modes.
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 60a4f1368785d26a49a3ef6df829723ca154c154)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-19 20:55:53 -08:00
Keith Packard
369d7b22a9 Make panning+transform be correctly driven by mouse
Figuring out how to adjust the crtc origin to keep the mouse pointer within
the crtc is a bit of a trick

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 63810aca31b962c93be4796883bde6ccb653e3a9)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-19 20:55:25 -08:00
Alan Coopersmith
c0a3619700 Make RgbPath keyword in xorg.conf a non-fatal error
Xorg shouldn't refuse to run just because the user has an xorg.conf that
had the previously-used RgbPath keyword in it.

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit d2cf562bba)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-19 13:43:40 -08:00
George Staplin
295fe25bd8 XQuartz: Fix the new ProcAppleDRIDestroyPixmap code REQUEST_SIZE_MATCH.
It had a copy and paste mistake that I didn't notice. :/
It was using the CreatePixmapReq.

Also add a missing B16 to the end of the length for the DestroyPixmapReq struct.

Now the AppleDRIDestroyPixmap request seem to work.
2009-02-18 21:43:19 -07:00
Peter Hutterer
6b8bbbd21b config: if we can't connect to HAL, listen for a startup notification.
If HAL isn't available when we try to connect, the registered NameOwnerChanged
signal handler waits until HAL is available. Once we connected to HAL, we
unregister the signal handler again.
This allows HAL to be started in parallel or after the server has started.

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

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-18 17:50:21 -08:00
Keith Packard
4557b3f6c4 X11/fonts/fontmod.h doesn't exist anymore.
libXfont 1.4.0 no longer includes this file, nor do we need it, so just stop
attempting to reference it.

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-18 16:43:23 -08:00
Ian Romanick
3575cb86a1 glx: Inialize best_score before calculating visual scores
This bug was pointed out by Peter Åstrand.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 4039603413)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-18 10:20:10 -08:00
Jeremy Huddleston
d050a61747 configure.ac: Support version strings like W.X.Y.Z-XXXXXX
(cherry picked from commit 43967514cd)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-18 10:20:02 -08:00
Jeremy Huddleston
8e16e64f55 XQuartz: Don't need GlxSetVisualConfig any more
Fixes build failure resulting from 516f8e2cad
(cherry picked from commit 066b17028a)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-18 10:19:37 -08:00
Jeremy Huddleston
dc212ecab7 1.5.99.903-apple1 2009-02-17 23:26:02 -08:00
Jeremy Huddleston
43967514cd configure.ac: Support version strings like W.X.Y.Z-XXXXXX 2009-02-17 23:25:14 -08:00
Jeremy Huddleston
066b17028a XQuartz: Don't need GlxSetVisualConfig any more
Fixes build failure resulting from 516f8e2cad
2009-02-17 23:24:25 -08:00
Jeremy Huddleston
3384276e9d Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-02-17 22:34:30 -08:00
Keith Packard
eca523e7e7 Bump to 1.5.99.903 2009-02-17 22:17:41 -08:00
Keith Packard
a86dd529e9 Eliminate the shadow clear on transform change
When the crtc transformation changes, the entire crtc must be repainted.
This was being done by clearing the shadow and then painting the rectangle
containing the screen image; the clear being required as the screen image
may not fill the crtc. When changing the transform rapidly, this leads to
flashing. Eliminate the clear by painting the entire crtc instead of just
the screen rectangle.

(cherry picked fom commit 5394b7e662)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17 21:41:42 -08:00
Keith Packard
5946d603e7 Add XkbDir to Files config file section
The XKB base directory was not configuable through the config file.

(cherry picked from commit 76f18b94bd)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17 19:12:44 -08:00
Adam Jackson
39eb1bee84 RANDR: Fail softly on GetPanning if the screen can't do it.
Just return a zeroed-out reply in that case.  This is unambiguous, and
distinguishes "you didn't name a CRTC" from "you named a CRTC that can't
do panning".
(cherry picked from commit 1230939965)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17 19:11:30 -08:00
Paulo Cesar Pereira de Andrade
69a2728891 Default to use standard bitmap fonts, with builtins as fallback
The builtin-fonts configure option was removed, as it at best should
have been a runtime option. Instead, now it always register all "font
path element" backends, and adds built-ins fonts at the end of the
default font path.
  This should be a more reasonable solution, to "correct" the most
common Xorg FAQ (could not open default font 'fixed'), and also don't
break by default applications that use only the standard/historical
X Font rendering.
(cherry picked from commit 49b93df8a3)

    Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17 19:10:14 -08:00
Alan Hourihane
444127f9f4 glx: fix retval checks when failures occur for drawable creation.
(cherry picked from commit a26c77ff43)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17 19:07:52 -08:00
Keith Packard
4302a32391 Make crtc_notify wrap/unwrap code do nothing unless mode code is inuse
Drivers not using the new hw/xfree86/modes code would crash in DRI due to
that code trying to monitor CRTC changes.

(cherry picked from commit ea309e4745)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17 19:07:13 -08:00
Jeremy Huddleston
09cde70a6b XQuartz: GLX: Fix accidental exclusion of glBlitFramebufferEXT on Leopard
(cherry picked from commit 8620579483)
(cherry picked from commit 0dbc356795)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17 19:02:43 -08:00
Jeremy Huddleston
6bbe98f01d XQuartz: GLX: OpenGL.framework on Tiger doesn't have glBlitFramebufferEXT
(cherry picked from commit e01662cadc)
(cherry picked from commit fd08be749e)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17 19:02:37 -08:00
Jeremy Huddleston
519ae3a0df XQuartz: Don't need explicit Activate/EnableDevice in InitInput
(cherry picked from commit b1d2978441)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-02-17 19:02:28 -08:00