Commit graph

3051 commits

Author SHA1 Message Date
Jeremy Huddleston
b5bb6dbc8f Xquartz: Force sending mouse clicks to AppKit if we're over the menu bar
(cherry picked from commit 7dff93ec1a)
2008-11-14 11:09:53 -08:00
Jeremy Huddleston
84c68a9699 XQuartz: Made X11Application.m a little more tidy.
(cherry picked from commit 3520386261)
2008-11-14 11:09:45 -08:00
Jeremy Huddleston
82a03b631c XQuartz: Fixed XBell() when not using system alert.
(cherry picked from commit aa0e9ab1c7)
2008-11-13 11:34:12 -08:00
Jeremy Huddleston
628679275f XQuartz: Added more debugging to handoff spew
(cherry picked from commit acefa7e3c8)
2008-11-13 11:34:07 -08:00
George Staplin
73493d1ce9 XQuartz: GL: Handle the alpha differently when the alpha is equal to GLCAPS_COLOR_BUF_INVALID_VALUE.
This prevents visuals with odd sizes.  The machine I use didn't have
this problem, but it shows up on some others.
(cherry picked from commit ed181382dd)
2008-11-13 11:33:59 -08:00
George Staplin
33b8ee7846 XQuartz: Disable 2 calls to miSetVisualTypesAndMasks that seem to be unnecessary, and possibly wrong (with regard to masks and bits per RGB).
Use the settings queried from the system in xprScreen.c, rather than those 2 calls.

The 2 calls increased the total number of visuals a great deal (when using GLXEXT),
and not all of the visuals were usable with GLX.  Some of the visuals aren't usable
with GLX still, such as DirectColor, but that seems to be acceptable based on my
understanding of the manual that states "a subset of visuals are made available
for OpenGL rendering."
(cherry picked from commit 373b8a5f32)
2008-11-13 01:19:26 -08:00
Jeremy Huddleston
bd8098d05b XQuartz: CFBundleShortVersionString needs to conform to X.Y.Z as well... sigh
(cherry picked from commit 54d20f6d33)
2008-11-13 01:19:16 -08:00
George Staplin
d1d398db76 XQuartz: Restore the logic of AppleWMDoReorderWindow to the same as the 1.4 branch.
It was returning inverted values in comparison to the 1.4 branch.  This resulted in
the windows not drawing due to a deep path of: RootlessReorderWindow ->
SCREENREC(pScreen)->imp->DoReorderWindow(winRec) - > xprDoReorderWindow ->
AppleWMDoReorderWindow.
2008-11-13 01:33:58 -07:00
Jeremy Huddleston
43f3dfbbd6 XQuartz: Make LS parse our version properly... it didn't like our CFBundleVersion
(cherry picked from commit 980df1b4ff)
2008-11-06 14:49:46 -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
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
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
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
b7ec1fa59c XQuartz: LP64 related casting fixes from Bob Murphy
(cherry picked from commit ea71710aaa)
2008-10-31 19:03:23 -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
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
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
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
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
Jeremy Huddleston
733cb50011 XQuartz: Do check_xinitrc() later to avoid possible deadlock.
(cherry picked from commit af95174a08)
2008-10-23 19:20:29 -07:00
George Peter Staplin
882ae87740 XQuartz: pbproxy: pbproxy.h had invalid macro usage with 2 #else statements, so it wasn't building. Fix the build.
(cherry picked from commit 6bcbb9ba85)
2008-10-23 19:20:21 -07:00
George Peter Staplin
49b7a7c6f2 XQuartz: Remove the enable_stereo default. We now use feature detection to enable stereo visuals.
We need to revisit the GL/indirect.c changes.  I think indirect.c should
be using the same feature detection and GLX visual config code.  The
indirect changes will require testing...
2008-10-23 17:43:12 -06:00
Jeremy Huddleston
f285130dff XQuartz: pbproxy: Fix compilation on case-sensitive file systems...
(cherry picked from commit 6622efca21)
2008-10-23 16:30:28 -07:00
Jeremy Huddleston
524dc8cb61 XQuartz: Comment explaining the 0x10 flag for [e data2]
(cherry picked from commit 3c69528064)
2008-10-23 14:16:03 -07:00
Jeremy Huddleston
43d0bd6354 XQuartz: Honor the Spaces preference for "When switching to an application, switch to a space with open windows for the application"
(cherry picked from commit bf561a06b2)
2008-10-23 14:15:48 -07:00
Jeremy Huddleston
a1b7a04c66 XQuartz: Added missing semicolons to Localizable.strings
(cherry picked from commit e9fe3f36d9)
2008-10-23 14:15:41 -07:00