Commit graph

5505 commits

Author SHA1 Message Date
Jeremy Huddleston
7df46d26fd GL/glx: WRITE_PAIR the GLX_SAMPLE_BUFFERS_SGIS, and GLX_SAMPLES_SGIS mode data.
More recent versions of glxcmds.c already do this.

This enables glxinfo to correctly detect the multisampling with output like so
from glxinfo -v:
 multiSample=6  multiSampleBuffers=1
(cherry picked from commit 5bc78b9f96)
2008-11-05 19:22:42 -08:00
George Peter Staplin
9c76ed49cc XQuartz: GL: Add capability detection for depth buffers, and multisampling.
GL/capabilities.c: Add handleDepthModes(), and extend
handleRendererDescription() for the various depth and multisampling flags.

Add initialization of the new config options to initConfig().

GL/capabilities.h: Add depth and multisample config members.

GL/visualConfigs.c: Add depth and multisampling support to the visual config
setup.
(cherry picked from commit f527381eea)
2008-11-05 19:20:55 -08:00
George Peter Staplin
caa049246f XQuartz: GL: Work around problems with really deep visuals.
GL/capabilities.c: #if 0 (for now) any capabilities above 8 bits per channel,
because they introduce drawing problems.

GL/indirect.c: Comment out some visual setup code that shouldn't be running, and
actually seemed to cause some problems.  The current visualConfigs.c code seems
to do a reasonable job of setting up visuals for XQuartz.

GL/visualConfigs.c: Make use of the proper visual .class.   Eliminate depth 0.
It seems we really just want 24 for now, and 0 I think was a flaw in the original
code.
(cherry picked from commit 1e5f63f15e)
2008-11-05 19:20:50 -08:00
Jeremy Huddleston
a3a4746d25 XQuartz: Replace deprecated API usage thanks to Robery Murphy
(cherry picked from commit 71dd052412)
2008-11-05 19:20:44 -08:00
Jeremy Huddleston
f333d0ae6f XQuartz: version string updated for 2.3.2_beta3
(cherry picked from commit 81bb412857)
2008-11-05 19:20:38 -08:00
Jeremy Huddleston
fec491e316 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-11-05 19:20:26 -08:00
Adam Jackson
4c6a89ee78 xserver 1.5.3 2008-11-05 15:39:01 -05:00
Julien Cristau
b0c2d00985 xfree86: fix compiler warnings in DoModalias()
The precedence of == is higher than that of &, so that code was
probably buggy.

xf86Init.c: In function 'DoModalias':
xf86Init.c:300: warning: suggest parentheses around comparison in operand of &
xf86Init.c:304: warning: suggest parentheses around comparison in operand of &
xf86Init.c:308: warning: suggest parentheses around comparison in operand of &
(cherry picked from commit ffaaa1a198)
2008-11-05 14:41:11 -05:00
Nathaniel McCallum
a311fdc040 Xorg: add -modalias option
This scans the installed video drivers and prints a Linux-style modalias
listing of the devices each driver claims to support.
2008-11-05 14:40:59 -05:00
Michel Dänzer
b8fd8da1ad AIGLX: Reinstate call to driver texOffsetFinish hook.
It was accidentally lost when factoring out __glXDRIdoReleaseTexImage, so this
is a regression fix and should probably be backported to server-1.5-branch.
(cherry picked from commit a4d62bbf21)
2008-11-05 13:48:30 -05:00
Adam Jackson
377712dbfc linux: Drain the console fd of data when using evdev for keyboards
Works around a silly bug in the kernel that causes wakeup storms after
too many keypresses.  Should fix the kernel bug too, but this at least
keeps the idle wakeup count below 1000/sec.
(cherry picked from commit 446d9443ce)
2008-11-05 13:37:36 -05:00
Peter Hutterer
3245bf1136 xfree86: If AEI is on, disable "kbd" and "mouse" devices.
This consists of two parts:
In the implicit server layout, ignore those drivers when looking for a core
device.

And after finishing the server layout, run through the list of devices and
remove any that use mouse or kbd.

AEI is mutually exclusive with the kbd and mouse drivers, so pick either - or.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit c264826da9)
2008-11-05 13:36:42 -05:00
Peter Hutterer
58e6d6afe0 xfree86: if AllowEmptyInput is true, enable RAW mode on the console.
Usually, the console is set to RAW in the kbd driver. If we hotplug all input
devices (i.e. the evdev driver for keyboards) and the console is left as-is.
As a result, the evdev driver must put an EVIOCGRAB on the device to avoid
characters leaking onto the console. This again breaks many things, amongst
them lirc, in-kernel mouse button emulation and HAL.

This patch sets the console to RAW if AllowEmptyInput is on.

Use-cases:
1. AEI is off
  1.1. Only kbd driver is used - behaviour as-is.
  1.2. kbd and evdev driver is used: if evdev does not grab the device,
       duplicate events are generated.
2. AEI is on
  2.1. Only evdev driver is used - behaviour as-is, but evdev does not need
       to grab the device anymore.
  2.2. evdev and kbd are used: duplicate key events are generated if evdev
       does not grab the device.

1.2 is a marginal use-case that can be fixed by adding a "grab" option to the
evdev driver (update of xorg.conf is needed).

2.2 is an issue. If we have no ServerLayout section, AEI is on, but devices
specified in the xorg.conf are still added [1], resulting in duplicate events.
This is a common configuration and needs sorting out.

[1] 2eaed4a10f

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit d936a4235c)
2008-11-05 13:35:26 -05:00
Peter Hutterer
bc199fdf79 config: don't add duplicate devices through HAL.
If HAL is restarted, the device list is sent to the server again, leading
first to duplicate devices (and thus duplicate events), and later to a
FatalError "Too many input devices."

dev->config_info contains the UDI for the device. If the UDI of a new devices
is equal to one we already have in the device list, just ignore it.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit 6c45185955)
2008-11-05 13:30:32 -05:00
Matthieu Herrb
e63ef549bb Close well known connections in ServerAbort()
(cherry picked from commit d72cd753b9)
2008-11-05 13:04:33 -05:00
Adam Jackson
5d14e34541 exa: Add exaDrawableIsOffscreen() to the driver API.
(cherry picked from commit 3891dd8924)
2008-11-05 13:02:46 -05:00
Michel Dänzer
f4c33e2e64 EXA: Avoid excessive syncing in PutImage
(cherry picked from commit 2188582e5e)
2008-11-05 13:01:35 -05:00
Pierre Willenbrock
df22857b34 RANDR: Fix output property event delivery.
(cherry picked from commit 8de26770a4)
2008-11-05 13:01:10 -05:00
Keith Packard
42429aa326 RANDR: Delivery output property events.
(cherry picked from commit 9187f6ad9e)
2008-11-05 13:01:03 -05:00
Rémi Cardona
b28c25b5ae Force LC_ALL=C when building xf86DefModeSet.c
Fixes build in not-quite-latin locales.
2008-11-05 11:49:49 -05:00
Martin von Gagern
992a7168f0 Bug #17858: Fix Xvesa build on newer kernels.
Not cherry picked from master, Xvesa is gone there.
2008-11-05 11:44:03 -05:00
Jeremy Huddleston
fa6db0bcd2 XQuartz: Add option to allow access to the menu in fullscreen mode
(cherry picked from commit 637a9f4bd1)
2008-10-31 20:05:29 -07:00
Jeremy Huddleston
01fcbc410d GL: LP64 related casting fixes from Bob Murphy
(cherry picked from commit 0afd2ca49b)
2008-10-31 19:05:28 -07:00
Jeremy Huddleston
b7ec1fa59c XQuartz: LP64 related casting fixes from Bob Murphy
(cherry picked from commit ea71710aaa)
2008-10-31 19:03:23 -07:00
Jeremy Huddleston
836ed7b7bc Rootless: LP64 related casting fixes from Bob Murphy
(cherry picked from commit 40441c4e31)
2008-10-31 19:03:15 -07:00
Jeremy Huddleston
75733791d3 XQuartz: displayScreenBounds uses quartzEnableRootless rather than !quartzHasRoot
(cherry picked from commit c883a78ef0)
2008-10-31 15:51:44 -07:00
Jeremy Huddleston
9c6a7dff7e Rootless: Force initialization of static variable before use.
(cherry picked from commit cece293172)
2008-10-31 15:51:38 -07:00
Jeremy Huddleston
251ae8dbdc XQuartz: Silence pointer debug spam
(cherry picked from commit 9ca099e928)
2008-10-31 15:51:32 -07:00
Jeremy Huddleston
16cf8cd2e3 XQuartz: Don't map the menu bar to the screen area.
(cherry picked from commit 1115917ada)
2008-10-31 15:51:27 -07:00
Jeremy Huddleston
f95df525b1 XQuartz: Fixed Xplugin thread safety issues, so rea-enable background window check
(cherry picked from commit 5fc73b1141)
2008-10-31 15:51:22 -07:00
George Peter Staplin
5378c3715a XQuartz: GL: Mark visuals that are slower than others, due to lack of acceleration.
This is used in libGL to determine a preferred visual.  glxinfo -v will also
report "visualCaveat=Slow" for such visuals.
(cherry picked from commit d5c17f585a)
2008-10-31 15:51:16 -07:00
Jeremy Huddleston
446a75db6d Removed unused DARWIN_WITH_QUARTZ option from dix-config.h
(cherry picked from commit 423f68cd52)
2008-10-31 15:51:06 -07:00
Jeremy Huddleston
cfe04bc226 XQuartz: if 0 out a block to avoid thread-unsafe lockups
(cherry picked from commit 60d7359a67)
2008-10-31 15:50:58 -07:00
Jeremy Huddleston
770ae89d98 XQuartz: Purge the old XQUARTZ_EXPORTS_LAUNCHD_FD option
(cherry picked from commit 490756c7fb)
2008-10-31 15:50:52 -07:00
Jeremy Huddleston
996e509436 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-10-28 22:18:18 -07:00
Jeremy Huddleston
953e0c2f59 XQuartz: Pass along SIGINT and SIGTERM from the stub to X11.app
(cherry picked from commit 183ca5d68b)
2008-10-28 21:59:59 -07:00
George Peter Staplin
c1cd92dc2f XQuartz: pbproxy: Fix a bug that prevented nedit CLIPBOARD from being proxied.
It seems that we were calling copy_completed: too soon.  Now we return instead
of falling through to the free_propdata, and copy_completed:.
(cherry picked from commit 5797d5b662)
2008-10-28 21:59:55 -07:00
George Peter Staplin
7f096c8c17 XQuartz: pbproxy: Work around bugs in some apps that aren't ICCCM compliant.
Eterm ends up setting the type of the property to TARGETS, instead of ATOM.
That's why it wasn't working.
(cherry picked from commit 9be5998ede)
2008-10-28 21:59:50 -07:00
George Peter Staplin
7cf23e472c XQuartz: pbproxy: Add code to handle PICT conversion to PNG and JPEG.
This may work, unfortunately I don't have test apps that fail.

The way it works is by using an NSImage class initWithPasteboard:
method, which we then get the TIFFRepresentation of, and convert
to PNG or JPEG.

The TIFFRepresentation uses NSTIFFCompressionNone; which should be
lossless.
(cherry picked from commit 8d048cfa95)
2008-10-28 21:59:44 -07:00
Jeremy Huddleston
d79c581135 XQuartz: pbproxy: fixed blocking
(cherry picked from commit bb330a1b1c)
2008-10-28 21:59:38 -07:00
Jeremy Huddleston
f7b9ceea1e Xquartz: pbproxy: Some debugging about unhandled mime types... this will spam up quick, but will be useful for a while...
(cherry picked from commit 3647215310)
2008-10-28 21:59:33 -07:00
George Peter Staplin
a269d54c32 XQuartz: GL: Fix several error handling mistakes in handleRenderDescriptions, that were leftover before the final code evolved.
(cherry picked from commit fe35a36390)
2008-10-28 21:59:29 -07:00
George Peter Staplin
73566cef7c XQuartz: GL: Add feature detection of color sizes, and accum sizes.
This gives us a *lot* more visuals, and they should be more accurate.
Some of the visuals may have been wrong before.  This may enable more
OpenGL programs to behave correctly.

I also suspect libGL needs a little work to handle some of these correctly.
(cherry picked from commit 98a084ce9c)
2008-10-28 21:59:24 -07:00
Maarten Maathuis
ec5046ca75 dri: don't set the dixPrivate key to NULL, as this is a staticly set variable.
- This breaks on the 2nd server generation.
- No other subsystem seems to NULL their key.
- This should fix bug 17982.
(cherry picked from commit 5b336585a4)
2008-10-27 09:47:45 -04:00
Adam Jackson
f75163e5f6 Bug #18159: Spell "anisotropic" correctly
(cherry picked from commit 81e197b2a5)
2008-10-27 09:46:52 -04:00
Adam Jackson
b468eacf51 kdrive: Hardcode a different wrong value for number of mouse buttons
This should really come from the input driver directly, but, kdrive.
(cherry picked from commit 3eb52de7f2)
2008-10-27 09:46:46 -04:00
Adam Jackson
19776ede8f Add backtrace definitions to dix-config.h.in
(cherry picked from commit ad677238bc)
2008-10-27 09:46:37 -04:00
Adam Jackson
483fb847b4 mieq: Backtrace when the queue overflows.
Since we're probably stuck down in a driver somewhere, let's at least
try to point out where.  This will need to be rethought when the input
thread work lands though.
(cherry picked from commit b736f477f5)
2008-10-27 09:46:32 -04:00
Adam Jackson
7df5e93cf5 Move xorg_backtrace() up to the OS level so we can call it from DIX.
(cherry picked from commit 94ed0ba1b5)
2008-10-27 09:46:28 -04:00
Adam Jackson
aa548b0a9b EDID: Catch even more cases of encoding aspect as size.
Very cute, Samsung, not only do you claim to be 16cm by 9cm in the
global size record, you also claim to be 160mm by 90mm in the detailed
timings.  Grrr.
(cherry picked from commit bd9c6b3a4d)
2008-10-27 09:46:22 -04:00