Commit Graph

5680 Commits

Author SHA1 Message Date
Peter Hutterer
4970d757a7 xkb: Extra sanity checks to prevent dev->key == NULL dereferencing.
(cherry picked from commit 95fc59a199)
2008-12-16 14:19:00 -05:00
Dave Airlie
336df75f12 EXA: avoid copy operations if no boxes in use
Simple fix for now, I'm sure damage shouldn't be calling us with nbox = 0.
(cherry picked from commit 8f8a9c19ad)
2008-12-16 14:06:25 -05:00
Alan Coopersmith
cd15136dc1 Non-Linux OS'es should default to kbd driver, not now-dead keyboard driver
(cherry picked from commit d63ea51013)
2008-12-16 14:06:14 -05:00
Alan Coopersmith
1e3f8913c5 Use OsSignal in Popen/Pclose to avoid SysV signal() stupidity
(cherry picked from commit c9051b684b)
2008-12-16 14:06:04 -05:00
Luc Verhaegen
244e960bb0 XAA PixmapOps: Sync before accessing unwrapped callbacks.
When using any XAAPixmapOps, we call into unknown but freshly
unwrapped callbacks (like fb ones). Unlike the XAA*Fallback calls,
we did so without syncing first, exposing us to all kinds of
synchronisation issues.

I believe that the rendering errors appeared now because *PaintWindow
vanished (e4d11e58), and we just use miPaintWindow instead. This
takes a less direct route to the hw and ends up at
PolyFillRectPixmap, which very often left drawing artifacts.

We now sync accordingly, and no longer get the rendering artifacts i
was methodically reproducing on radeonhd, radeon, unichrome...

Also, in order to allow driver authors to remove extensive syncing
or flushing to hide this issue, create XAA_VERSION_ defines, put
them in xaa.h and bump the patchlevel.

(novell bug #435791)
(cherry picked from commit 59f9fb4b8c)
2008-12-16 14:05:54 -05:00
Julien Cristau
bfe5a13499 xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags
When setting the depth to 24, leave bpp unset so the logic to pick
a supported value is used instead of ignoring the driver's preference
and forcing 32 bpp.
(cherry picked from commit 991c88b754)
2008-12-16 14:05:43 -05:00
Julien Cristau
8e1ee573b3 mi: Fix infinite loop on regen when swrast_dri.so is missing
The swrast DRI provider gets pushed on the glx provider stack at every
server generation, so the stack turns into a circular list on regen.

X.Org bug#18388 <https://bugs.freedesktop.org/show_bug.cgi?id=18388>
(cherry picked from commit d3d6be4948)
2008-12-16 14:05:19 -05:00
Egbert Eich
38e0a542fc int10: Do an mprotect(..,PROT_EXEC) on shmat()ed memory ranges.
When the linux kernel sets the NX bit vm86 segfaults when it tries to execute
code in memory that is not marked EXEC. Such code gets called whenever
we return from a VBIOS call to signal the calling program that the call
is actually finished and that we are not trapping for other reasons (like
IO accesses).
Use mprotect(2) to set these memory ranges PROT_EXEC.
(cherry picked from commit a9e20306fb)
2008-12-16 14:04:30 -05:00
Jeremy Huddleston
db663223e1 XQuartz: Updated menu item ordering for better HIG compliance
(cherry picked from commit 4c9bb241ce)
2008-12-15 03:21:57 -08:00
Jeremy Huddleston
a5f781c498 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:40 -08:00
Jeremy Huddleston
f8c10acd09 XQuartz: Fix path to executable
(cherry picked from commit 7e9d3698e0)
2008-12-10 15:08:23 -08:00
Jeremy Huddleston
f0014240ed XQuartz: fixed make dist
(cherry picked from commit 2d52367ab9)
2008-12-10 15:08:11 -08:00
Jeremy Huddleston
635cac44ab XQuartz: Make debugging output for invalid depths a bit more detailed
(cherry picked from commit 609fb166b7)
2008-12-10 15:07:55 -08:00
Jeremy Huddleston
8774c7d112 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:40 -08:00
Jeremy Huddleston
271f04bdad XQuartz: unset DISPLAY if we didn't get a launchd socket handoff
(cherry picked from commit b959727f38)
2008-12-10 15:05:37 -08:00
Jeremy Huddleston
639b9cd2bd 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:29 -08:00
Jeremy Huddleston
6ad71d6bea XQuartz: Removed some debug spew
(cherry picked from commit 370dcf11b3)
2008-12-06 14:10:37 -08:00
Jeremy Huddleston
2c35a89cf9 XQuartz: darwinPointer reports the actual pixel position now rather than a relative position
(cherry picked from commit a41e7f75de)
2008-12-06 14:10:22 -08:00
Jeremy Huddleston
d55f916f48 XQuartz: Corrected name/command labels in the customization widget
(cherry picked from commit a689c23f17)
2008-12-06 14:10:06 -08:00
Jeremy Huddleston
a77250f15d Removed unised option from configure.ac for launchd
(cherry picked from commit 87e4de0a9a)
2008-12-03 21:58:53 -08:00
Jeremy Huddleston
6cc5c29adc XQuartz: pbproxy: Simplify linking
(cherry picked from commit 909cc5c4dc)
2008-12-03 21:58:50 -08:00
George Staplin
755f53eb40 XQuartz: GL: Make various changes to makeFormat, so that it works better. Now glxgears looks normal with the old libGL.
Add various GLX extensions to the list of supported extensions.

Reformat the oddly formatted code in some areas.

Use xalloc and xfree instead of malloc and free.
2008-11-28 14:03:21 -07:00
Jeremy Huddleston
635019ad18 XQuartz: Added option to enable/disable test extensions
defaults write org.x.X11 enable_test_extensions -boolean true
(cherry picked from commit fd4710aff3)
2008-11-28 12:59:09 -08:00
Jeremy Huddleston
e8151e5346 XQuartz: Avoid some warning messages being spewed to system.log by AppKit
(cherry picked from commit 780eff230c)
2008-11-28 12:58:25 -08:00
Jeremy Huddleston
a39d43bd01 XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well...
(cherry picked from commit cbae2b4473)
2008-11-28 12:58:07 -08:00
Jeremy Huddleston
45fd0b681d XQuartz: Fix dead-acute on Greek keyboards
(cherry picked from commit 807f2ec35c)
2008-11-28 12:57:58 -08:00
Jeremy Huddleston
03fd0ba554 XQuartz: Fix Czech keyboard dead-acute
(cherry picked from commit 771df2786b)
2008-11-28 12:57:50 -08:00
Jeremy Huddleston
4fa7d91710 XQuartz: Fix an uninitialized keyboard_type on Tiger
(cherry picked from commit 27b1a5eb34)
2008-11-28 12:57:45 -08:00
Jeremy Huddleston
7c73f70bd6 XQuartz: Simplify the xquartz_resetenv_display path
(cherry picked from commit d2e0624dd3)
2008-11-25 11:52:37 -08:00
Jeremy Huddleston
bbc490cf68 XQuartz: Force X11Controller to reset a broken DISPLAY envvar.
(cherry picked from commit f1a52b5b5a)
2008-11-25 11:52:32 -08:00
Jeremy Huddleston
a132f94e5c XQuartz: Removed hardcoded org.x.X11 from MachIPC as well
(cherry picked from commit b4add7826d)
2008-11-25 11:52:28 -08:00
Jeremy Huddleston
f5150a6ac4 XQuartz: Add fallback for xpbproxy's display for Tiger or no-launchd-Leopard
(cherry picked from commit 7a8c666594)
2008-11-25 00:53:49 -08:00
Jeremy Huddleston
8a53f33f11 XQuartz: Use the environment to pass the bundle's prefs domain on to xinit/quartz-wm for Tiger or no-launchd-LEOPARD
(cherry picked from commit fbf4b0d33f)
2008-11-25 00:53:42 -08:00
Jeremy Huddleston
f2a80c34d3 XQuartz: Dead code removal
(cherry picked from commit eeb323612e)
2008-11-25 00:53:36 -08:00
Jeremy Huddleston
a315d74d3d XQuartz: Don't hardcode values of org.x.X11 for the preferences domain
(cherry picked from commit 3a500d9247)
2008-11-25 00:53:30 -08:00
Jeremy Huddleston
525a45d747 XQuartz: More dead code removal
(cherry picked from commit dcb0f6a2e6)
2008-11-25 00:53:24 -08:00
Jeremy Huddleston
37df4d8e2a XQuartz: Disable some error spew on Tiger (where it wouldn't be an error)
(cherry picked from commit 73ec6d3dfe)
2008-11-25 00:53:17 -08:00
Jeremy Huddleston
1fc07874e5 XQuartz: Dead code removal
(cherry picked from commit 46c077d9b4)
2008-11-25 00:53:10 -08:00
Jeremy Huddleston
0c69f87717 XQuartz: More Tiger cleanup: bootstrap_strerror
(cherry picked from commit 37f535aff3)
2008-11-25 00:53:06 -08:00
Jeremy Huddleston
b030eb0ce6 Xevie: Shutup gcc from warning about no previous prototype... 2008-11-22 14:39:37 -08:00
Jeremy Huddleston
d4a46fc3e6 fb: Removed a warning about unused variable 2008-11-22 14:33:01 -08:00
Jeremy Huddleston
d0f00dd2f9 dix: Added missing include for miPaintWindow 2008-11-22 14:30:36 -08:00
Jeremy Huddleston
7711c56dd6 XQuartz: Fixed --disable-glx 2008-11-22 14:06:50 -08:00
George Staplin
b772d64fce XQuartz: GL: Remove the inclusion of glcontextmodes.h.
Add some commentary about future directions needed for the GLX drawable
creation and destruction code.

Match xalloc with xfree.

I made some minor formatting improvements.
2008-11-22 11:37:08 -07:00
George Staplin
17f6a261fc XQuartz: GL: Add a branch to prevent a NULL DrawablePtr structure access.
In attach() check for pDraw being NULL, and also print an ErrorF message,
because we eventually want to track down why this is occuring.

It's unclear how this occurs, but as I noted in the 1.4 branch, I believe that
the DrawablePtr/struct _Drawable -> id is the member being accessed that causes
KERN_PROTECTION_FAILURE at 0x0000000000000004

This passes my tests using: env LIBGL_ALWAYS_INDIRECT=1 ./sometest.

I fixed a warning: caused by initializing the screen->base.visuals with the
configs.  It is a ** not a *.  It seems that some other part of GLX will
initialize this for us.
2008-11-22 11:06:28 -07:00
George Staplin
047ac0b4fd XQuartz: GL: Add 1 __GLXconfig for testing purposes. Now glxgears runs.
It looks much better with the new GLX/libGL, perhaps because of the old libGL
not understanding all of the tags written.  At least glxgears works with both.

glxgears is not a test for all OpenGL features, so most likely some things
are broken still.  Direct rendering is known to not work, or at least being
reported as not working.
2008-11-21 18:27:42 -07:00
George Staplin
594e81c397 XQuartz: GL: Convert some of the indirect.c code to work with the change to __GLXconfig.
Fix some obvious errors with uninitialized new members of GLX structs.

Add a type argument for the screen's drawable creation function, and pass the type to
__glXDrawableInit().

GLX still doesn't work.  There is more work needed to get it working again.  This gets
it building at least, although there are some warnings in the dispatch table setup,
that seem to be caused by const differences.

I also #if 0ed a bunch of function bodies that will need to be revisited soon.
2008-11-21 17:31:10 -07:00
George Staplin
3bed9b65c8 XQuartz: GL: remove glcontextmodes.* from the Makefile.am. It has been replaced.
The new replacement is __GLXconfig.
2008-11-21 17:28:11 -07:00
Jeremy Huddleston
3a18cd5044 XQuartz: Don't use LS to find X11.app on Tiger.
(cherry picked from commit e62107e552)
2008-11-21 11:55:20 -08:00
Jeremy Huddleston
2195e017b4 XQuartz: Update applewm deps
(cherry picked from commit 0ad91c59be)
2008-11-21 11:55:17 -08:00