Commit Graph

3466 Commits

Author SHA1 Message Date
Jeremy Huddleston 4d978af5c7 XQuartz: Fixed window levels.
(cherry picked from commit ef4d37c73f31048dd74efee2c63fa08b92608f87)
2008-10-21 09:31:56 -07:00
Rémi Cardona 58eacf0b7b Force LC_ALL=C when building xf86DefModeSet.c
Fixes build in not-quite-latin locales.
2008-10-21 10:07:24 -04:00
Peter Hutterer 8d0cb507ae dmx: avoid hilarious #define Xcalloc xcalloc game. 2008-10-17 10:19:11 +10:30
Peter Hutterer 8a23707b86 dmx: change remainder of manual EQ allocation to GetEventList(). 2008-10-17 10:19:10 +10:30
Peter Hutterer d936a4235c 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>
2008-10-16 21:35:27 +10:30
Jeremy Huddleston 84ef8ed6fb XQuartz: implemented primary-on-grab and fixed clipboard-to-pasteboard
(cherry picked from commit bcb83eea729a01026d99d1cfc2b77385b5b275fd)
2008-10-15 17:31:54 -07:00
Daniel Stone 2e60ebbd25 XFree86: Simplify DontZap/-retro interaction
How hard could it possibly be, right?
2008-10-15 14:11:13 +01:00
Alan Hourihane 66a87517bd re-enable DRI2 2008-10-15 12:00:16 +01:00
Kristian Høgsberg ced6690284 dri2: Update to latest protocol draft.
Mainly rename SwapBuffers to CopyRegion, which adds the xfixes region
argument and the bitmask argument to let us extend it in the future.
2008-10-15 00:00:44 -04:00
Adam Jackson b677bff97b int10: Degrade the checksum warning to X_INFO.
I've seen about one case in three years where this has actually been
correlated with the real cause of failure, and we've trained people to
freak out about X_WARNING, so let's be less alarmist.
2008-10-14 14:30:19 -04:00
Adam Jackson bd9c6b3a4d 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.
2008-10-14 14:04:01 -04:00
Nathaniel McCallum 8e368cf5b9 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-10-14 09:50:29 -04:00
Adam Jackson 3eb52de7f2 kdrive: Hardcode a different wrong value for number of mouse buttons
This should really come from the input driver directly, but, kdrive.
2008-10-14 09:46:04 -04:00
Aaron Plattner 3fc4f40b6c Restore xf86{Enable, Disable}GeneralHandler.
These were useful as part of the generic handler ABI, and are used by the NVIDIA
driver.

This reverts part of commit 50081d2dfb.
2008-10-12 16:08:26 -07:00
Aaron Plattner 2217d22a76 Revert "xfree86: xf86{Enable, Disable}InputHandler can be static."
These were potentially useful as part of the input handler ABI, even if nobody
currently uses them.

This reverts commit 278c11f01f.
2008-10-12 16:07:24 -07:00
Maarten Maathuis 5b336585a4 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.
2008-10-10 23:28:30 +02:00
Adam Jackson 94ed0ba1b5 Move xorg_backtrace() up to the OS level so we can call it from DIX. 2008-10-10 16:28:10 -04:00
Adam Jackson f650c1aeb0 Revert "Don't leak EDID_block"
This reverts commit 05cdef18ca.

http://lists.freedesktop.org/archives/xorg/2008-October/039305.html
2008-10-10 14:07:28 -04:00
Adam Jackson 0660dd9d70 EDID: Catch monitors that encode aspect ratio for physical size.
This is not legal in either EDID 1.3 or 1.4, but hey, when did a little
thing like legality stop anyone.
2008-10-10 13:59:08 -04:00
Peter Hutterer 18cdd733ad kdrive: fix dixflags so they're always defined before enqueuing events #17734
If absolute events were posted, dixflags got set conditionally on whether the
valuators are different from the last posted set of values.
If dixflags are undefined however, the DIX interprets them as relative
valuators. Fix this by making sure defining dixflags is always defined.

X.Org Bug 17724 <http://bugs.freedesktop.org/show_bug.cgi?id=17734>
2008-10-10 16:58:08 +10:30
Peter Hutterer d58f2c30c6 kdrive: lastx/y needs to be set to the event coordinates #17728
X.Org Bug 17728 <http://bugs.freedesktop.org/show_bug.cgi?id=17728>
2008-10-10 16:58:08 +10:30
Peter Hutterer 0b4b683f3e xfree86: export NewInputDeviceRequest/DeleteInputDeviceRequest
NIDR should be used to create a new SD from e.g. within a driver.
DIDR should be used to remove a device from the server.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-10-10 16:57:32 +10:30
Peter Hutterer 5e213fe102 xfree86: cache dev->isMaster before freeing the device. 2008-10-10 16:57:32 +10:30
Zhenyu Wang 05cdef18ca Don't leak EDID_block 2008-10-10 13:45:51 +08:00
Luc Verhaegen 2d9da7a5f3 DGA: Track client state even when using old style DGA.
This fixes the issue that a badly killed DGA will keep on hogging
mode/framebuffer/mouse/keyboard.
2008-10-09 22:22:53 +02:00
Luc Verhaegen 322335d5b5 DGA: Mash together xf86dga.c and xf86dga2.c.
This in preparation for an upcoming client state tracking fix.
2008-10-09 22:21:05 +02:00
Jeremy Huddleston d13c3cbd43 XQuartz: Some motion made towards supporting fullscreen.
(cherry picked from commit 99be3d68b64059caada739a373e5e01844c776e0)
2008-10-08 18:45:17 -07:00
Jeremy Huddleston dc166bf642 XQuartz: Fixed EXTRA_DIST for new GL files.
(cherry picked from commit a11c9052030b44045f037050a5825256b539ed50)
2008-10-08 18:45:13 -07:00
George Staplin 8033279294 XQuartz: GL: setVisualConfigs() copied the behavior of indirect.c which is wrong, with regard to the handling of xcalloc failure.
Use ErrorF for an error message after an xcalloc failure, and return instead of falling through to GlxSetVisualConfigs, or abort()ing at the test branch.
(cherry picked from commit 1056700971fd5c034396ed6dbea15e092f0c6332)
2008-10-08 18:45:09 -07:00
Jeremy Huddleston f1fec6f323 XQuartz: Call setVisualConfigs in InitOutput, and only when GLXEXT is defined.
(cherry picked from commit 97173d4eda142c73bb975cc05225b791778f85af)
2008-10-08 18:45:04 -07:00
George Staplin 52accec7db XQuartz: GL: Add the proper license information to the new files, and add more commentary to setVisualConfigs().
(cherry picked from commit 190a3d5e5de9915931928fb8e6da88bb9644cda4)
2008-10-08 18:44:28 -07:00
George Staplin 63abdf6115 XQuartz: GL: Add the new C code to the Makefile.am.
Commit the darwin.c changes I missed in the last commit, for calling
setVisualConfigs().
(cherry picked from commit eb3c014e1710bf0b93bda10ddb9b795cd150d02d)
2008-10-08 18:44:24 -07:00
George Staplin a8f5d422c9 XQuartz: GL: Provide code for getting the capabilities of the underlying system's CGL.
Add a setVisualConfigs that is called before the fbScreenInit, to setup the __GLXvisualConfigs.
(cherry picked from commit fc86f9e4482043eca76d9d7a96e166be1aabf674)
2008-10-08 18:44:21 -07:00
Jeremy Huddleston 2998e48be3 Xquartz: Fix parallel builds
(cherry picked from commit 1fe7298a3b9a2ed82c612292f9e547cf78f99ae5)
2008-10-08 18:44:17 -07:00
Adam Jackson 7aa535708f Fix more xcalloc stupidity.
Did I mention the hate?  Pretty sure I mentioned the hate.
2008-10-08 16:25:59 -04:00
Adam Jackson 4fe80aa14a I hate you xlib. Please die in a fire. 2008-10-08 16:22:35 -04:00
Adam Jackson 2c5332872f s/kdDontZap/kdAllowZap/ 2008-10-08 13:39:49 -04:00
Luc Verhaegen 1feb69eb63 DGA: Fix ProcXF86DGASetViewPort for missing support in driver.
Fixes a segfault when trying to activate a DGA mode without checking
whether DGA modesetting is at all possible.
2008-10-08 14:55:29 +02:00
Tiago Vignatti 4964a9ca6c mi: remove deprecated and unused functions.
miPointerDeltaCursor, miPointerGetMotionBufferSize and
miPointerSetNewScreen.
2008-10-08 03:41:17 -03:00
Tiago Vignatti adf3e296e2 Remove unused declarations.
AvailableClientInput (LBX debris) and xf86XinputFinalizeInit.
2008-10-08 03:41:17 -03:00
Tiago Vignatti bca9fa2efe Everyone knows that the loader is present. Silence it. 2008-10-08 03:41:17 -03:00
Zhenyu Wang 56c615368c Check nextEnabledOutput()'s return in bestModeForAspect()
In case no enabled outputs, we will reference wrong index of
output array.
2008-10-08 13:33:55 +08:00
Tiago Vignatti 278c11f01f xfree86: xf86{Enable, Disable}InputHandler can be static. 2008-10-08 01:18:49 -03:00
Tiago Vignatti 50081d2dfb xfree86: remove xf86{Enable, Disable}GeneralHandler and others unused. 2008-10-08 01:11:38 -03:00
Tiago Vignatti 54294e15ec xfree86: fix wrong function name message errors. 2008-10-08 00:43:22 -03:00
Daniel Stone 617933e8c2 XFree86: Fix DontZap interaction with -retro
-retro will now _not_ override (No)DontZap, if it's set in the config
file.
2008-10-08 02:45:59 +03:00
Daniel Stone d80bae2237 Update docs to reflect new DontZap default 2008-10-08 02:44:08 +03:00
Adam Jackson 42e7b64bf9 -retro enables zapping 2008-10-07 20:32:02 -04:00
Daniel Stone 9d135ac10a Input: Make DontZap the default
If you need to bail out the server, use Ctrl-Alt-Fx, or enable zapping
if it bothers you that much.  If Ctrl-Alt-Fx is broken, nag me until
it's permanently fixed.
2008-10-08 02:30:05 +03:00
Aaron Plattner b574365fca Revert "Unexport (and unimplement) xf86SetAccessFuncs" for now.
The nvidia driver currently uses these hooks to work around problems where RAC
will disable access to the hardware at unexpected times.  This change restores
these hooks until we can come up with a better API for working around RAC.

This reverts commit c1df4fbede.
2008-10-07 13:09:11 -07:00
Aaron Plattner fe85ec34ec Revert "Remove unused server state change callbackery" for now.
The nvidia driver currently uses these callbacks to work around problems where
RAC will disable access to the hardware at unexpected times.  This change
restores these hooks until we can come up with a better API for working around
RAC.

This reverts commit d7c0ba2e9e.

Conflicts:

	hw/xfree86/loader/xf86sym.c
2008-10-07 13:08:38 -07:00
Adam Jackson 94919480d8 int10: Fix a nasty memory leak. 2008-10-07 13:41:53 -04:00
Adam Jackson a57b2f172c int10: Don't warn when scanning for devices we don't have.
Some BIOSes (hi XGI!) will attempt to enumerate the PCI bus by asking
for the config space of every possible device number.  This despite
perfectly functional BIOS methods to enumerate the bus exactly.
2008-10-07 13:41:53 -04:00
Adam Jackson a65e36a873 int10: Remove useless check.
If you have more than one PCI device with the same d/b/d/f, you're
already in trouble.
2008-10-07 13:41:53 -04:00
Dave Airlie e7cd5d84ed fixup another calloc build issue 2008-10-07 16:09:17 +10:00
Adam Jackson c6d6d3e87a Loader: Unexport a handful of consumerless symbols from dixsym. 2008-10-06 16:18:21 -04:00
Adam Jackson 8a5b89e8e1 xalloc+memset(0) -> xcalloc 2008-10-06 15:36:51 -04:00
Adam Jackson 0b7b89fbac xalloc+bzero -> xcalloc 2008-10-06 14:19:30 -04:00
Jeremy Huddleston aacac3edac XQuartz: Bumped bundle version to 2.3.2 for beta1
(cherry picked from commit 2021c4c4e726a6b8f27f19f16ed3d86e37dbe448)
2008-10-04 21:17:14 -07:00
Jeremy Huddleston ed3134918d XQuartz: pbcopy: Re-enabled some code I commented out for testing
(cherry picked from commit 9b5d11409264080e394c8f18e06237122de80014)
2008-10-04 21:17:09 -07:00
Jeremy Huddleston b3a971d8b5 XQuartz: xpbproxy: Support some of the preference toggles from X11.app, cleaned up CLIPBOARD_MANAGER atom management.
(cherry picked from commit f7673bb4de3c1f71eb390a3279eed3589efc3df4)
2008-10-04 21:17:02 -07:00
Jeremy Huddleston fc35c7a2e2 XQuartz: GLX - enable_stereo defaults option should work now
(cherry picked from commit 3a6898f48756fdb2898292679301ef3dc109b4f6)
2008-10-04 21:16:54 -07:00
Roland Scheidegger 7818aba1d1 dri2: fix compilation (remove no longer existing include file) 2008-10-04 15:50:35 +02:00
Adam Jackson bd0e87c747 Remove a bunch of unused API from the mi export list. 2008-10-03 17:51:20 -04:00
Adam Jackson ee5e07bc22 loader: sort the mi symbol list 2008-10-03 17:51:20 -04:00
Adam Jackson 77d0b0ecfa Remove unused pciNumBuses 2008-10-03 17:51:20 -04:00
Adam Jackson 0ce61e21d6 Remove the Must_have_memory hack.
Also remove an astonishing amount of misunderstanding of how casts work.
2008-10-03 17:51:19 -04:00
Adam Jackson e6b1c1fada const cleanup 2008-10-03 17:51:19 -04:00
Adam Jackson fe616f9230 Drop the never-called SkippedRequestCallback list. 2008-10-03 17:51:19 -04:00
Adam Jackson 31136b9467 Unexport MakeClientGrab{Imp,P}ervious
xtrap used to use these, but it's gone now.  xtest still does but it's
linked statically.
2008-10-03 17:51:19 -04:00
Adam Jackson eaf3fdf970 Unexport xf86NoSharedResources 2008-10-03 17:51:19 -04:00
Adam Jackson d7d9edb506 Unexport xf86DeallocateResourcesForEntity 2008-10-03 17:51:19 -04:00
Adam Jackson 49673b4358 Unexport xf86SetEntityFuncs 2008-10-03 17:51:18 -04:00
Adam Jackson 949ef6b79a Unexport xf86ChkConflict
Also remove the unused internal ChkConflict()
2008-10-03 17:51:18 -04:00
Adam Jackson d7c0ba2e9e Remove unused server state change callbackery. 2008-10-03 17:51:18 -04:00
Adam Jackson 9ada146a16 xf86RegisterResources: Always print any failed registrations. 2008-10-03 17:51:18 -04:00
Adam Jackson a5d3fa90f3 Typo fix. 2008-10-03 17:51:18 -04:00
Adam Jackson cc33358585 Remove the old implementation of RemoveOverlaps 2008-10-03 17:51:18 -04:00
Adam Jackson 8fbf1185f5 Internalise some resource list API. 2008-10-03 17:51:17 -04:00
Adam Jackson 0ca4f3cee7 Unexport xf86EnterServerState 2008-10-03 17:51:17 -04:00
Adam Jackson c1df4fbede Unexport (and unimplement) xf86SetAccessFuncs.
Because, no.
2008-10-03 17:51:17 -04:00
Adam Jackson 44269e604e RAC: NO_SEPARATE_*_FROM_* are useless.
If anyone can come up with an example of a bus where:

- both i/o and memory resources are addressable
- access to them can be controlled
- but they can't be controlled independently

then by all means, reinstate this logic.
2008-10-03 17:51:17 -04:00
Adam Jackson 51fcb58f45 RAC: AccessEnable() and AccessDisable() are mandatory. 2008-10-03 17:51:17 -04:00
George Peter Staplin 7bb73a9513 XQuartz: pbproxy: Possibly fix a memory leak by using an [NSApp run] loop,
instead of calling CFRunLoopRun() directly.  The leak wasn't reproducible on
this machine, but someone was able to produce a leak trace with Instruments
that indicates it was leaking in the CFRunLoopRun() path.

x-input.m: dequeue and ignore events when pbproxy_active is false.

x-selection.h: add an is_active method that is used by x-input.m to ignore
events.

x-selection.m: Handle nearly every preference, except for primary_on_grab,
which I don't really understand yet.
(cherry picked from commit 4d51ad851e64da83cbdfb0a4a22428418a7bcf75)
2008-10-03 11:14:49 -07:00
Jeremy Huddleston 2a5ce41f03 XQuartz: Use "pointer" and "pen" for device names to please GDK.
(cherry picked from commit 00ca0f4d839abf47e9573a1552473e039cf787e6)
2008-10-03 11:14:43 -07:00
Jeremy Huddleston d3f597a986 XQuartz: Workaround for initial pressure/tilt being sent as 0 with motion during the proximity event
(cherry picked from commit 9a91d770a6411dd876187e64a8bda1f0745169ae)
2008-10-03 11:14:40 -07:00
Jeremy Huddleston 1657dfb843 XQuartz: Using absolute ranges for pointer location to increase resolution and better support tablets.
(cherry picked from commit d79ccb45f68b65d65718b5b77efe2fae6eeda762)
2008-10-03 11:14:38 -07:00
Jeremy Huddleston 88bb8c6f48 XQuartz: Removed resolved comment about localization.
(cherry picked from commit 8ed5faf058ac7b0782a9cc13a2c58b80168358d2)
2008-10-03 11:14:34 -07:00
George Peter Staplin b1d0b19661 XQuartz: pbproxy: Make the signal handler safer by using _exit, and only exit.
Remove some unnecesssary headers.

Remove some dead code that was never called or used in pbproxy.

Make use of an NSAutoreleasePool in x_init.  It could potentially cause a leak
on a startup without this.

Start adding reload_preferences to the x_selection class, as well as event
handling for that.
(cherry picked from commit 602e8ba8f7ee196696bc9e3cea6ecdf3200dcf5c)
2008-10-03 11:14:30 -07:00
Jeremy Huddleston ecd260143c XQuartz: Added some localizable strings that were missing.
(cherry picked from commit 2c8205ea8b709c5859412b466e83aec7a94acdcf)
2008-10-03 11:14:28 -07:00
Jeremy Huddleston aae878b890 XQuartz: Actually send the pointer event from the pen even if it happes to actually have 0 pressure and 0 tilt.
(cherry picked from commit f41583761955cb9c92c43239bfaa8ae0e5d95e33)
2008-10-03 11:13:03 -07:00
Jeremy Huddleston b7ad86ff8a Xquartz: xpbproxy: Split out app-specific stuff to app-main.m in prep for making this into a thread.
(cherry picked from commit c2012138a520560f8a2160518ea73fced410c3b7)
2008-10-03 11:12:57 -07:00
Jeremy Huddleston 5446adebfb XQuartz: Send AppleWMReloadPreferences where appropriate.
(cherry picked from commit 490cbe9888e2c1080495b003c429fdb1659444e1)
2008-10-03 11:12:49 -07:00
Jeremy Huddleston 6020c3fbfe XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
(cherry picked from commit 8edc5fb38c922f28659d2f823148339a8907c4d9)
(cherry picked from commit 88033a66a5549870fd053795b019d4c22950425b)
2008-10-03 11:11:47 -07:00
Peter Hutterer 036d424827 xfree86: don't let DGA steal key events outside of [9,255]. 2008-10-03 15:27:07 +09:30
Adam Jackson 56a24cf894 xorg.conf.man: We don't look in root's ~ anymore, don't say we do. 2008-10-02 17:56:31 -04:00
Adam Jackson f836e1f11b Unifdef ISC 2008-10-02 17:03:54 -04:00
George Peter Staplin eb8be3e90a XQuartz: pbproxy: Fix another STRING bug.
Fix the usage of the NSString cStringUsingEncoding: - it doesn't NUL
terminate the string, which lead to a bus error.  So, we use
lengthOfBytesUsingEncoding: to get the length in bytes instead of
strlen().
(cherry picked from commit 6333d619e747c3b6bd3ba7557e35c0e5f6daa40f)
2008-09-26 12:31:33 -07:00
George Peter Staplin edfa3f8233 XQuartz: pbproxy: Fix a bug that rxvt brought out in STRING copying. Now I can copy and paste to/from rxvt correctly.
(cherry picked from commit 82a4dc5f0f31a7911ee1cce5d1b162077befa811)
2008-09-26 12:31:29 -07:00
Jeremy Huddleston 12a59c44cb XQuartz: Fixed threading issue with TSM.
(cherry picked from commit 93ab4e0071670bb80bfa1170dd97ed9d6d51c67a)
2008-09-26 12:31:21 -07:00
Jeremy Huddleston ee87c9b024 XQuartz: pbproxy: Removed stray SPI include.
(cherry picked from commit 2fb2bc77b804d7b63002c1423cb0bfc658eeee45)
2008-09-26 12:31:18 -07:00
George Peter Staplin 591cc57627 XQuartz: pbproxy: Fix 3 paths that could leak memory.
2 of the paths leaked, when INCR transfers were done.  Now we
are leak free according to the leaks program for all transfers
I have tried so far.
(cherry picked from commit aa98db576bc02f0765cb35d0282a894ba3778213)
2008-09-26 12:31:12 -07:00
George Peter Staplin 586fbc91df XQuartz: pbproxy: Fix NSObject memory leaks by properly using the
NSAutoreleasePool.   Now the usage is consistent.  In x_input_run()
we create a pool, and release it after processing the XEvents.

Add some getpid() output to main for debugging.  It needs a bit more
testing before the next release.

Don't retain the NSPasteboard as the old code did.  That may have
contributed to the leak, and it made it so that we needed the
NSAutoreleasePool created in main().

Remove the _known_types, and _pasteboard instance variables from
the x_selection class.  They aren't needed anymore.

The leaks program now indicates 0 leaks after some usage.  I want
to test further, but this seems much better, and my memory usage
graph indicates it's not growing.
(cherry picked from commit b245d84a72ee3929546cd11a6eba3c60fb4a4d95)
2008-09-26 12:31:06 -07:00
George Peter Staplin 238999cfc9 XQuartz: pbproxy: Add a comment to pbproxy.h about how the DB()
macro causes a leak (according to the leaks program).

Attempt to fix several other leaks with release method calls.
For some reason the process still grows more than it should...

I will need to use some better methods than leaks, and malloc_history
I suspect.  Whatever is leaking, it's hard to find.  I need to isolate
the cases more.

Add a missing image/jpeg branch.

Remove read_prop_32 - it's not used.
(cherry picked from commit 63a680354dcb545fef935ac97596dd35ceaed960)
2008-09-26 12:31:01 -07:00
Adam Jackson ad14239a35 Upgrade GLX Public License 1.0 to FreeB 2.0.
According to the press release:

    Previous SGI contributions to the free and open source community
    are now available under the new license. These contributions
    include the SGI® OpenGL® Sample Implementation, the GLX™ API and
    other GLX extensions.

    [...]

    "SGI has been one of the most ardent commercial supporters of free
    and open source software, so it was important to us that we continue
    to support the free software development community by releasing our
    earlier OpenGL-related contributions under this new license," said
    Steve Neuner, director of Linux, SGI. "This license ensures that all
    existing user communities will benefit, and their work can proceed
    unimpeded. Both Mesa and the X.org Project can continue to utilize
    this code in free software distributions of GNU/Linux. Now more than
    ever, software previously released by SGI under earlier GLX and SGI
    Free Software License B is free."

"The GLX API" is here read to include the original GLX source release
from:

http://www.sgi.com/products/software/opensource/glx/download.html
ftp://ftp.sgi.com/sgi/opengl/glx/glx1_2.1.tgz

which includes glxext.c as included in XFree86, from which our copies
in glx/ and hw/dmx/glxProxy/ are derived.
2008-09-22 11:26:49 -04:00
Jeremy Huddleston af0d5e2ef7 XQuartz: 64bit crash fix ... don't pass pointers through xe.
(cherry picked from commit 5f1265b82edead8f15f2affc79c2782519502fa2)
2008-09-21 17:40:42 -07:00
George Peter Staplin 852a0b0dde XQuartz: pbproxy: Add an X error handler that returns 0.
Move the struct atom_list into the x-selection class, so that it's
no longer a global variable named atoms.  This may ease pthread
integration and reduce the chances of symbols conflicting.
(cherry picked from commit c1403c713ca80104ae3736bd2ed1eb6ffa5192b6)
2008-09-21 17:40:42 -07:00
George Peter Staplin 7fa6fc5ad0 XQuartz: pbproxy: Fix a bug that occured when a PICT format was available.
We may need another branch to convert a PICT to a PNG or JPEG.  For now
TIFF works well in all of the test image copying apps when converted to
PNG or JPEG with an NSBitmapImageRep class.
(cherry picked from commit adf339d8f948fc1e308dbcae38fcfce504b5b0ab)
2008-09-21 17:40:41 -07:00
George Peter Staplin f67490ceb5 XQuartz: pbproxy: Make the proxy handle copy request races, and PRIMARY
INCR transfers mixed with a CLIPBOARD change.

Fix a bug with some UTF-8 transfers.  I can only guess that my UTF-8
tests before were inadequate.  I can now copy/paste any characters between
uxterm and Textedit.app.
(cherry picked from commit 7ca1532e8e6e2c733c9c508eee0de73d09ecb947)
2008-09-21 17:40:41 -07:00
Jeremy Huddleston b666ffd781 XQuartz: "Disable" the text when syncing is disabled.
(cherry picked from commit 7713d7ab66e74b212a6c0d634a3ad82373e178db)
2008-09-21 17:40:41 -07:00
Jeremy Huddleston dba290ec23 XQuartz: Added a preferences UI for pbproxy options.
(cherry picked from commit d76cca5e1eae86450aa236e49a2024881d0bac01)
2008-09-21 17:40:35 -07:00
George Peter Staplin a928cae57b XQuartz: pbproxy: Add a missing include of Xutil.h. Another header
seems to have done this before, but correctness matters.
(cherry picked from commit 1b4987e779d97b90669bac2405a4672085677f7c)
2008-09-21 17:40:16 -07:00
George Peter Staplin 749bdf19b2 XQuartz: pbproxy: Add COMPOUND_TEXT handling. Do misc. cleanups with testing
to verify that the behavior didn't change.

main.m: XInternAtom compound_text, and atom_pair.

pbproxy.h: Add compound_text and atom_pair to the struct atom_list.

x-selection.m: Add an #include of Xutil.h.  Refactor the reply struct
initialization to be done in a common place.  Add send_reply: to simplify
the code a bit more.  Add send_compound_text: which handles the
COMPOUND_TEXT type.  Add the beginnings of a send_multiple:.  Change
handle_image:extension: to handle_image:.  The extension: message isn't
needed anymore.
(cherry picked from commit 1e9460abdf5bafe46215966bbef3e796cb1c33e0)
2008-09-21 17:40:16 -07:00
George Peter Staplin 00bfbee59f XQuartz: pbproxy: pbproxy now responds to selection request events.
We can now copy and paste images to and from X11.  Text copying and
pasting works as well.

The NSPasteboard can contain TIFF or PICT images, and pbproxy will
translate to an image/png or image/jpeg request, and list those in the
TARGETS.

I added a description of the basic design at the top of x-selection.m.

I removed the request_data x_selection class struct.  It's not needed.
(cherry picked from commit 4a8daf884694c9c420c45d427f1f84e608e7e48f)
2008-09-21 17:40:16 -07:00
George Peter Staplin 811e9f5e9e XQuartz: pbproxy: Use an NSBitmapImageRep to convert an "image/png" selection
to a TIFFRepresentation for use with NSPasteboard.

This has been tested with the Gimp and works with some minor quartz-wm changes.
The Finder clipboard shows the image updates after an Edit -> Copy.
(cherry picked from commit 12912adaeea759d30f96d8ae51a84fd1659ea0ac)
2008-09-21 17:40:16 -07:00
Jeremy Huddleston d8d555bac7 XQuartz: Don't enable 8bit visuals in the TrueColor server, since it's not working yet
(cherry picked from commit 1317c8ff94c4bd32617a5398e929f667bd87da58)
2008-09-21 17:40:15 -07:00
George Peter Staplin 23ec8261b6 XQuartz: pbproxy: The greedy CLIPBOARD handling now works for text.
This change adds some [self own_clipboard] calls in the necessary places to get the proper greedy behavior.

UTF8_STRING and STRING properties seem to work well now with the test cases (PRIMARY, and CLIPBOARD).  I can copy from several different X apps, and have the behavior be correct when pasting.  I also verified that quartz-wm isn't doing the copying, by disabling the quartz-wm paths.
(cherry picked from commit 934669f732c28f07b9d934d8f8f0b63ccfebd900)
2008-09-21 17:40:15 -07:00
George Peter Staplin 7c2eb3d41a XQuartz: pbproxy: return the TARGETS list as a 32-bit list to fix a bug that was in the original.
Add TRACE() calls where appropriate to try to figure out why we are losing CLIPBOARD at times, after transferring PRIMARY to the NSPasteboard.

Use the new pbproxy_clipboard_to_pasteboard where appropriate.
(cherry picked from commit 40190675a6c1889cca3574e5d1a9c16ab74315a7)
2008-09-21 17:40:15 -07:00
George Peter Staplin 81c836902d Rename reclaim_clipboard to claim_clipboard.
Convert the puts usage to use DB().

Add the initial handle_image method.

Check for nil in the NSString instantiation in various places.

Add some commentary to enhance the clarity of why I did some things.
(cherry picked from commit 37361567b65241eab64e8b30cd9729d0e71a86d2)
2008-09-21 17:40:15 -07:00
George Peter Staplin 85e23affea Add an image_jpeg Atom.
(cherry picked from commit ea9dc27977c5eab666f2aa2d914e4e28d36758c7)
2008-09-21 17:40:15 -07:00
George Peter Staplin 6b42f40ff9 Rename reclaim_clipboard to claim_clipboard.
(cherry picked from commit d333a8e2b5514b8b76a78c6a13a3f5149ea8de27)
2008-09-21 17:40:15 -07:00
George Peter Staplin 2ab56981b1 Add image/jpeg type, and rename reclaim_clipboard to claim_clipboard.
(cherry picked from commit 32b175ef62b68a971784e51e937e358cb10e20ac)
2008-09-21 17:40:14 -07:00
Jeremy Huddleston cbd32645f7 XQuartz: pbproxy: Added global variables to customize how pbproxy behaves
(cherry picked from commit 21a2d0b8d03faf1c66ec0c5c11fbd2ab24547727)
2008-09-21 17:40:14 -07:00
Jeremy Huddleston 5b397642cd XQuartz: pbproxy: First round of updates to pbproxy from George.
(cherry picked from commit 5c8b956f8f3f17e8d577d97cb66424954be72684)
2008-09-21 17:40:14 -07:00
Adam Jackson 8bfd88ca61 Revert accidental edid changes from previous commit. 2008-09-19 12:13:43 -04:00
Adam Jackson 69b79c1a66 Update to SGI FreeB 2.0.
Under the terms of version 1.1, "once Covered Code has been published
under a particular version of the License, Recipient may, for the
duration of the License, continue to use it under the terms of that
version, or choose to use such Covered Code under the terms of any
subsequent version published by SGI."

FreeB 2.0 license refers to "dates of first publication".  They are here
taken to be 1991-2000, as noted in the original license text:

 ** Original Code. The Original Code is: OpenGL Sample Implementation,
 ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
 ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
 ** Copyright in any portions created by third parties is as indicated
 ** elsewhere herein. All Rights Reserved.

Official FreeB 2.0 text:

http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf

As always, this code has not been tested for conformance with the OpenGL
specification.  OpenGL conformance testing is available from
http://khronos.org/ and is required for use of the OpenGL logo in
product advertising and promotion.
2008-09-19 12:02:28 -04:00
Jeremy Huddleston 999f3362d5 XQuartz: Dead code removal
(cherry picked from commit 43184cd379c4fb7254391b8a362016cbf89b5529)
2008-09-12 15:26:18 -07:00
Jeremy Huddleston 6548a55ebd XQuartz: 256 color support
(cherry picked from commit 8dd6d5c825d457f26b41b79d02d57ed4a5ecf1f5)
2008-09-12 15:26:13 -07:00
Jeremy Huddleston bad7cd14c2 XQuartz: Dead code removal
(cherry picked from commit bf10fb0b1f776e72db7c76db11f764e26f9d62c4)
2008-09-12 15:26:07 -07:00
Jeremy Huddleston 1119fe136f XQuartz: Changed around fd handoff model to be more robust
(cherry picked from commit 4fe605c2bc62d50e0b5764d9edda245af227630b)
2008-09-12 15:26:01 -07:00
Jeremy Huddleston 183233b27b XQuartz: Don't warp the pointer on server start for XQuartz
(cherry picked from commit c0da576d4921c246a9ac747921b48ab9e718347f)
2008-09-12 15:25:44 -07:00
Jeremy Huddleston 7a46dd30d3 XQuartz: Dead code removal
(cherry picked from commit 2e45344870f5d17181df6407da3448991036d783)
2008-09-12 15:22:46 -07:00
Jeremy Huddleston 1c70e53f25 XQuartz: Fixed proximity logic errors for tablets.
(cherry picked from commit d942849f248c368b92ca73e145e8a5bc339112d7)
2008-09-12 15:22:39 -07:00
Eric Anholt ce781cac1b Fix distcheck. 2008-09-11 16:48:23 -07:00
Aaron Plattner 079625570d Bump ABI major versions for the TryClientExceptions change from commit 883811c. 2008-09-08 08:50:52 -07:00
John Tapsell bf333c2f98 fbdevhw: Remove pixclock check.
The check can fail because the output from FBIOGET_VSCREENINFO is used to set
Clock in fbdev2xfree_timing().  Then in fbdevHWSetMode(), xfree2fbdev_timing()
is called which sets the pixclock based on Clock.  The resulting circle results
in slight rounding errors, causing the comparision check in fbdev_modes_equal
to fail.
2008-09-04 13:08:06 +02:00
Jeremy Huddleston 1669308be6 XQuartz: Added pasteboard proxy code stripped out of quartz-wm.
(cherry picked from commit 1f842c71c35db031a24de646429834d6054adf1d)
(cherry picked from commit 144746223d8dc3f6ff2a0e805aa27a6e57df558a)
2008-09-03 09:33:58 -07:00
Jeremy Huddleston 46168b3b40 XQuartz: Updated Tablet code to include ranges for valuators and added cursor and erasor
(cherry picked from commit 6bca78760951cb5cb57ea66b7631a2dc230dc27a)
(cherry picked from commit fafcafd6de39cf6b5967793f03b30b49db36fec5)
2008-09-03 09:33:53 -07:00
Jeremy Huddleston 7f5318131d XQuartz: Removed "Done" button from Applications Customization. Now properly save on exit.
(cherry picked from commit 2f1e163d5db6063e54fcaa045ea67c29ce3e46aa)
(cherry picked from commit 7542c00b96461c3474b8c23545171c4b6ddfd29d)
2008-09-03 09:33:45 -07:00
Jeremy Huddleston 700e8bf33f XQuartz: Updated man page
(cherry picked from commit 6932d0d19ea75c64ed38b82a246b68c6bbfb8cec)
(cherry picked from commit 8e3da36b6b0a261975808bc67b5caca733a1a23d)
2008-09-03 09:25:13 -07:00
Jeremy Huddleston 7430bb9093 XQuartz: Removed dead code (unused option definitions)
(cherry picked from commit 3d74f77490105c0704c0b10dc7a6eb859bf6e985)
(cherry picked from commit c1e5ea9ba058f6a13f564165a3d6862335729630)
2008-09-03 09:25:07 -07:00
Jeremy Huddleston b3836e5bdd XQuartz: Cleaned up our sleeping before adding the launchd socket.
(cherry picked from commit ebfe49dfca6e04d66232bad760f522629397cc35)
(cherry picked from commit 2cf74a76d54d795cfc3c0380a526b9177327782d)
2008-09-03 09:24:59 -07:00
Adam Jackson 613ce09550 Fix strict-aliasing silliness in XAA. 2008-09-02 15:43:15 -04:00
Maarten Maathuis 881bd15f44 xf86Crtc: Set mode to NULL, so nothing bad happens if crtc == NULL.
- Fix is courtesy of math_b.
2008-08-31 18:07:22 +02:00
Maarten Maathuis f4e9a1a98f damage: choose less ambiguous function names 2008-08-31 17:46:26 +02:00
Jeremy Huddleston 0cd6709db5 XQuartz: Fixed editing of Applications menu
(cherry picked from commit da647f1add4c1ae7854c0fbfbf972666ce5d12c8)
2008-08-30 16:25:06 -07:00
Jeremy Huddleston c4d290fc54 XQuartz: Fixed missing symbol in quartzKeyboard debugging
(cherry picked from commit 8ad55e484f0ba9073ce07a03de660cc546a7b668)
2008-08-30 14:21:17 -07:00
Thomas Bodzar 229e60db8f Xorg.man: typo (the the). 2008-08-30 15:34:29 +02:00
Jeremy Huddleston 1885582444 XQuartz: Placate automake which doesn't like escaped newlines even in comments...
(cherry picked from commit 73db1170129a31ad2d55a7e83ac6dfc8030e47f1)
2008-08-29 21:18:26 -07:00
Jeremy Huddleston 8abcc12fdd XQuartz: Added debugging output to the crash log to help track down two crashes, since people don't often report their system.log spew.
(cherry picked from commit aaf0f71db197526b6b866cc1b39fbdfe051879ef)
2008-08-29 20:55:25 -07:00