Commit Graph

3954 Commits

Author SHA1 Message Date
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 99be3d68b6)
2008-10-08 18:45:17 -07:00
Jeremy Huddleston
dc166bf642 XQuartz: Fixed EXTRA_DIST for new GL files.
(cherry picked from commit a11c905203)
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 1056700971)
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 97173d4eda)
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 190a3d5e5d)
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 eb3c014e17)
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 fc86f9e448)
2008-10-08 18:44:21 -07:00
Jeremy Huddleston
2998e48be3 Xquartz: Fix parallel builds
(cherry picked from commit 1fe7298a3b)
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 2021c4c4e7)
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 9b5d114092)
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 f7673bb4de)
2008-10-04 21:17:02 -07:00
Jeremy Huddleston
fc35c7a2e2 XQuartz: GLX - enable_stereo defaults option should work now
(cherry picked from commit 3a6898f487)
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 4d51ad851e)
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 00ca0f4d83)
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 9a91d770a6)
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 d79ccb45f6)
2008-10-03 11:14:38 -07:00
Jeremy Huddleston
88bb8c6f48 XQuartz: Removed resolved comment about localization.
(cherry picked from commit 8ed5faf058)
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 602e8ba8f7)
2008-10-03 11:14:30 -07:00
Jeremy Huddleston
ecd260143c XQuartz: Added some localizable strings that were missing.
(cherry picked from commit 2c8205ea8b)
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 f415837619)
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 c2012138a5)
2008-10-03 11:12:57 -07:00
Jeremy Huddleston
5446adebfb XQuartz: Send AppleWMReloadPreferences where appropriate.
(cherry picked from commit 490cbe9888)
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 8edc5fb38c)
(cherry picked from commit 88033a66a5)
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 6333d619e7)
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 82a4dc5f0f)
2008-09-26 12:31:29 -07:00
Jeremy Huddleston
12a59c44cb XQuartz: Fixed threading issue with TSM.
(cherry picked from commit 93ab4e0071)
2008-09-26 12:31:21 -07:00
Jeremy Huddleston
ee87c9b024 XQuartz: pbproxy: Removed stray SPI include.
(cherry picked from commit 2fb2bc77b8)
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 aa98db576b)
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 b245d84a72)
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 63a680354d)
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 5f1265b82e)
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 c1403c713c)
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 adf339d8f9)
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 7ca1532e8e)
2008-09-21 17:40:41 -07:00
Jeremy Huddleston
b666ffd781 XQuartz: "Disable" the text when syncing is disabled.
(cherry picked from commit 7713d7ab66)
2008-09-21 17:40:41 -07:00
Jeremy Huddleston
dba290ec23 XQuartz: Added a preferences UI for pbproxy options.
(cherry picked from commit d76cca5e1e)
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 1b4987e779)
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 1e9460abdf)
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 4a8daf8846)
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 12912adaee)
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 1317c8ff94)
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 934669f732)
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 40190675a6)
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 37361567b6)
2008-09-21 17:40:15 -07:00
George Peter Staplin
85e23affea Add an image_jpeg Atom.
(cherry picked from commit ea9dc27977)
2008-09-21 17:40:15 -07:00
George Peter Staplin
6b42f40ff9 Rename reclaim_clipboard to claim_clipboard.
(cherry picked from commit d333a8e2b5)
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 32b175ef62)
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 21a2d0b8d0)
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 5c8b956f8f)
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 43184cd379)
2008-09-12 15:26:18 -07:00
Jeremy Huddleston
6548a55ebd XQuartz: 256 color support
(cherry picked from commit 8dd6d5c825)
2008-09-12 15:26:13 -07:00
Jeremy Huddleston
bad7cd14c2 XQuartz: Dead code removal
(cherry picked from commit bf10fb0b1f)
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 4fe605c2bc)
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 c0da576d49)
2008-09-12 15:25:44 -07:00
Jeremy Huddleston
7a46dd30d3 XQuartz: Dead code removal
(cherry picked from commit 2e45344870)
2008-09-12 15:22:46 -07:00
Jeremy Huddleston
1c70e53f25 XQuartz: Fixed proximity logic errors for tablets.
(cherry picked from commit d942849f24)
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 1f842c71c3)
(cherry picked from commit 144746223d)
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 6bca787609)
(cherry picked from commit fafcafd6de)
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 2f1e163d5d)
(cherry picked from commit 7542c00b96)
2008-09-03 09:33:45 -07:00
Jeremy Huddleston
700e8bf33f XQuartz: Updated man page
(cherry picked from commit 6932d0d19e)
(cherry picked from commit 8e3da36b6b)
2008-09-03 09:25:13 -07:00
Jeremy Huddleston
7430bb9093 XQuartz: Removed dead code (unused option definitions)
(cherry picked from commit 3d74f77490)
(cherry picked from commit c1e5ea9ba0)
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 ebfe49dfca)
(cherry picked from commit 2cf74a76d5)
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 da647f1add)
2008-08-30 16:25:06 -07:00
Jeremy Huddleston
c4d290fc54 XQuartz: Fixed missing symbol in quartzKeyboard debugging
(cherry picked from commit 8ad55e484f)
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 73db117012)
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 aaf0f71db1)
2008-08-29 20:55:25 -07:00
Jeremy Huddleston
aee19c7b55 XQuartz: xp_is_symbolic_hotkey_event catches the input menu, but not our mainMenu, so we still need to do that the old way.
(cherry picked from commit 25eccf12c8)
2008-08-29 20:53:10 -07:00
Maarten Maathuis
1861250cd7 {damage,exa}: sanitise damage
- Redo damage naming for more consistency.
- Call post submission functions only where appropriate.
- EXA can now live without it's odd damage workarounds.
2008-08-29 22:15:23 +02:00
Kristian Høgsberg
5af77d43fe DRI2: Drop sarea use, implement server side swap buffers. 2008-08-29 12:33:28 -04:00
Tomas Carnecky
ebea78cdba Prepare for array-index based devPrivates.
TODO: static indices can be made just an int; some indices
can be combined.
2008-08-28 18:05:40 -04:00
Eamon Walsh
ec7907f8fa Add an array of integers for use as per-screen cursor private keys.
Replaces the use of the screen pointer itself as the key, which was
nice but won't work now that an array index is being stored.
2008-08-27 19:27:13 -04:00
Eamon Walsh
90b178cc7f Don't need to request space for Xnest pixmap private. 2008-08-28 19:36:22 -04:00
Adam Jackson
040212ee60 MIT-SHM pixmaps, if they exist, are ZPixmap. 2008-08-28 13:49:35 -04:00
Jeremy Huddleston
2db1afbf2e XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe.
(cherry picked from commit c8244177b0)
2008-08-26 23:10:18 -07:00
Jeremy Huddleston
319405fa4a XQuartz: Fixed needed xplugin version. ><
(cherry picked from commit 01b3a99dff)
2008-08-26 23:10:17 -07:00
Jeremy Huddleston
3350770bd6 XQuartz: Use new Xplugin API to determine if a keypress event corresponds to an OS-X hotkey that we should dispatch to Appkit.
(cherry picked from commit e7658e745f)
2008-08-26 20:19:47 -07:00
Jeremy Huddleston
7930ea9116 XQuartz: Made a note to come back to the xinitrc race condition in the 1.5 branch when we move up to it.
(cherry picked from commit 54a882dcbd)
2008-08-26 20:19:44 -07:00
Jeremy Huddleston
dc1171df5b XQuartz: Fixed bogus args to debug ErrorF
(cherry picked from commit f0351c2b80)
2008-08-26 20:19:41 -07:00
Jeremy Huddleston
ac936525af XQuartz: Cleaned up mouse event translation a bit more.
(cherry picked from commit c286f2a718)
2008-08-26 20:19:38 -07:00
Jeremy Huddleston
1b42f55000 Xquartz: Added missing ev_type for NSTabletPoint event.
(cherry picked from commit 07548f1394)
2008-08-26 20:19:35 -07:00
Jeremy Huddleston
13a89f1920 XQuartz: Added more explanation to debug keylayout spew to cut down on report-spam.
(cherry picked from commit fcdc9f8b5a)
2008-08-26 20:19:33 -07:00
Adam Jackson
41bd8d5dfe EDID: Build fix. 2008-08-25 11:27:26 -04:00
Adam Jackson
76ed409acd EDID: Publish the whole block on the root window if we've got it. 2008-08-25 10:44:45 -04:00
Adam Jackson
5724f7fb5b EDID: Publish the whole block in the RANDR property if we've got it. 2008-08-25 10:40:17 -04:00
Alan Coopersmith
668f89eba3 Remove unnecessary #ifdef __SOL8__'s 2008-08-22 10:32:18 -07:00
Alan Coopersmith
cc78d977ca Convert Solaris #ifdef's for <sys/kd.h> to AC_CHECK_HEADERS check
Upcoming virtual terminal support changes in Solaris kernel will provide
<sys/kd.h> on SPARC too, so this gets us ready for them.
2008-08-22 10:14:11 -07:00
Adam Jackson
64ef7ed072 Centralize declaration of ConnectionInfo. 2008-08-20 13:14:34 -04:00
Jeremy Huddleston
f1f44940f1 XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts.
(cherry picked from commit 81187364e5)
(cherry picked from commit f2ec79e4a1)
2008-08-20 10:00:43 -07:00
Jeremy Huddleston
6c5612c2e1 XQuartz: Added window_item_modifiers defaults item (and option to localization) to change the modifier keys used for the windows menu.
(cherry picked from commit e4110861d3)
(cherry picked from commit fcfc05482a)
2008-08-20 10:00:37 -07:00
Jeremy Huddleston
bdc277c9b3 XQuartz: Just cleaned up formatting of event processing code... no "meat" changed...
(cherry picked from commit 745bc8ab38)
(cherry picked from commit a28a2be524)
2008-08-20 10:00:32 -07:00
Jeremy Huddleston
ed42108920 XQuartz: Added appkit_modifiers defaults option which users can set to 'rcommand' to get access to the input menu with right command
(cherry picked from commit 02af74d7a5)
(cherry picked from commit 2da32894df)
2008-08-20 10:00:27 -07:00
Jeremy Huddleston
be06961312 XQuartz: More input fixes
stuck-modifier fixes (capslock)
3button-emulation now doesn't send the modifier key with the click
Added other options to fake_button2 and fake_button3 defaults options:
	({l,r}{control,alt,command,shift})
(cherry picked from commit 8fb6a1cf44)
(cherry picked from commit ae9c1b3cfb)
2008-08-20 10:00:20 -07:00
Jeremy Huddleston
436b659091 XQuartz: Updated bundle version to 2.3.1
(cherry picked from commit eedecba0b8)
(cherry picked from commit 7d9d864461)
2008-08-20 10:00:13 -07:00
Adam Jackson
38bdc34d55 Remove redundant check. 2008-08-19 15:12:39 -04:00
Adam Jackson
47b31233c2 Simplify driver setup.
No point warning about missing driver hooks, that just means the person
who gave you the driver is inept.  Might as well just crash.  Also,
just name anonymous screens as screen%d instead of failing after the 36th
screen.  Bonus points if you can figure out what the failure mode would
be on the 36th screen, and what the effective screen limit was.
2008-08-19 15:10:12 -04:00
Adam Jackson
b99fc65b53 Simplify calling xf86EnableIO() a bit. 2008-08-19 15:06:53 -04:00
Adam Jackson
b1f2c7a89a The ->Identify hook is not mandatory.
Best comment ever though.  Mad props.
2008-08-19 15:06:11 -04:00
Adam Jackson
41b68e0dea Remove unused -co option.
What did this even do anyway?
2008-08-19 11:02:31 -04:00
Adam Jackson
1f416fba99 Remove unused -bestRefresh option. 2008-08-19 10:56:45 -04:00
Adam Jackson
5a72c45d42 Remove unused -showunresolved option 2008-08-19 10:54:11 -04:00
Adam Jackson
9f08ffc557 Remove unused xf86Info.pMouse 2008-08-19 10:29:41 -04:00
Adam Jackson
75e495a4cd Remove unused xf86Info.mouseLocal 2008-08-18 17:58:08 -04:00
Adam Jackson
b3dfd7e3e4 Remove unused xf86Info.sharedMonitor 2008-08-18 17:56:18 -04:00
Adam Jackson
5e43cd2869 Remove the remainder of grab deactivation and closedown. 2008-08-18 17:51:42 -04:00
Adam Jackson
cd1e8f2614 Remove unused EstimateSizesAggressively option. 2008-08-18 17:40:46 -04:00
Mathieu Bérard
faaf004615 Remove xaaTEGlyphBlt.S
Should have been removed in 593144dddd but
ajax was asleep at the wheel.
2008-08-18 17:23:26 -04:00
Mathieu Bérard
562462e78d Remove dead {bsd,lnx}Resource.c 2008-08-18 17:05:55 -04:00
Adam Jackson
e3e47b35e3 Remove MAX_PCI_{BUSES,DOMAINS} and some associated #if 0. 2008-08-18 17:03:22 -04:00
Mathieu Bérard
593144dddd Remove some unused assembly code and assyntax.h 2008-08-18 16:46:36 -04:00
Adam Jackson
2d3e478384 int10: Fix int1A for %ax == 0xB101.
pciNumBuses was pretty much always 1 post-pciaccess.  That ain't good.
2008-08-18 15:09:44 -04:00
Adam Jackson
539717fe1f Remove (unused) pciMaxBusNum. 2008-08-18 14:50:33 -04:00
Adam Jackson
3c03d9f1ef Remove sparcPci.c
There is no way this code can have been building for anyone since pciaccess
was merged.  BSD and Linux were already using OS code on sparc, the only
people who could want this are Solaris, who should be using pciaccess
anyway.
2008-08-18 14:37:42 -04:00
Adam Jackson
9a39b6cfbd Remove XF86SCANPCI_WRAPPER. 2008-08-18 14:26:01 -04:00
Adam Jackson
470b05a610 Remove vestigial MAX_PCI_DEVICES. 2008-08-18 14:04:59 -04:00
Adam Jackson
fdf7c747a8 Remove PciProbeType and associated weirdness.
This code was effectively only used in ix86Pci.c to select PCI config
access type.  Nobody should be using that path anymore, in the glorious
pciaccess world; kernel services should get it right for you.
2008-08-18 13:13:03 -04:00
Mathieu Bérard
95bb6f5362 Remove ancient unused inline hack. 2008-08-18 11:47:19 -04:00
Adam Jackson
e1ae8db625 Drop dead PowerPC PCI code.
Also add a warning for anyone still using legacy PCI code.
2008-08-18 09:53:48 -04:00
Jeremy Huddleston
8b9ed7dec2 XQuartz: Fixed a stuck modifier key bug.
(cherry picked from commit eeb6e5a9e9)
2008-08-14 09:13:37 -07:00
Jeremy Huddleston
1770c85374 XQuartz: Made 3-button mouse simulation a little more consistent.
(cherry picked from commit d207b037d2)
2008-08-14 09:13:35 -07:00
Jeremy Huddleston
f51f77d25e XQuartz: Reverted "Control" text to be accurately "Command" in the input prefs.
(cherry picked from commit b287c481e1)
2008-08-14 09:13:34 -07:00
Adam Jackson
0ce687634f Eviscerate save-under support.
Use a compositing manager already.  Plus I really wanted to use 'eviscerate'
in a commit message.
2008-08-13 17:28:08 -04:00
Adam Jackson
f456f32cd9 Build fix. 2008-08-13 16:21:28 -04:00
Adam Jackson
544bfd0666 Remove xf86Version.h and related API.
We haven't meaningfully been API-compatible with xf86 modules in ages,
let's stop pretending.
2008-08-13 11:20:24 -04:00
Matthieu Herrb
2e2ce817ce Move strcasecmp(), strcasencmp() and strcasestr() prototypes to os.h
And make sure os.h is included in files that use it.
2008-08-10 23:07:46 +02:00
Matthieu Herrb
be2210b69d remove OpenBSD/amd64 specific mtrr API.
The old code never worked anyways and was removed from OpenBSD.
OpenBSD/amd64 4.4 and later support mtrr with the same API as
OpenBSD/i386.
2008-08-09 23:59:31 +02:00
Michel Dänzer
073116cc44 Remove commented out lines that make automake 1.9 puke. 2008-08-08 12:15:27 +02:00
Jeremy Huddleston
666781cd9b Removed rogue #include
(cherry picked from commit af238e99da)
2008-08-08 02:57:00 -07:00
Jeremy Huddleston
4a0947bf06 XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more...
(cherry picked from commit 4545ba91e9)
2008-08-08 01:53:36 -07:00
Jeremy Huddleston
5accc9b3ce XQuartz: Re-added deprecated code fallback failsafe for keyboard layout on Leopard with some debugging spew.
(cherry picked from commit 5854e712e9)
2008-08-08 01:21:08 -07:00
Simon Thum
d95136e151 xf86: don't replicate dix defaults for pointer acceleration
the defaults from InitVelocityData() or hypothetic driver-side changes
are now respected, not overridden.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2008-08-08 16:19:20 +09:30
Jeremy Huddleston
e72b1d21e4 XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition 2008-08-06 13:37:21 -07:00
Aaron Plattner
d1b96cdea9 Add an xf86PrintBacktrace wrapper around xorg_backtrace to aid driver debugging. 2008-08-06 10:37:32 -07:00
Jeremy Huddleston
26d31ad1c7 XQuartz: Added code and made comments more helpful for debugging first-client-auth bug.
(cherry picked from commit a8f0d32216)
2008-08-05 18:47:35 -07:00
Jeremy Huddleston
0ef3243fb5 XQuartz: More fd handoff cleanup.
(cherry picked from commit 199d2dcb70)
2008-08-05 18:47:35 -07:00
Jeremy Huddleston
e7dd3dd8f3 XQuartz: Fixed some errors / typos in the preferences pane.
(cherry picked from commit e1e0c398bb)
2008-08-05 18:47:34 -07:00
Jeremy Huddleston
6836f9aac8 XQUartz: UI Cleanup. Removed done/cancel buttons from Applications->Customize
(cherry picked from commit d3157ca45c)
2008-08-05 18:47:34 -07:00
Jeremy Huddleston
de4936d748 XQuartz: Fixed proper processing of tablet button presses
(cherry picked from commit ca0babafa4)
2008-08-05 12:55:02 -07:00
Jeremy Huddleston
b70a8ba3dc XQuartz: Nuke Sparkle.
(cherry picked from commit 4991f54a8d)
2008-08-05 12:54:57 -07:00
Jeremy Huddleston
30851efdd4 XQuartz: Fixed first-client-can't-connect bug
Readded the old exec() server startup path for regression testing.
Don't use the dynamic fd addition code since it's not quite working correctly.
(cherry picked from commit 08f3fe153e)
2008-08-05 12:54:51 -07:00
Tomas Carnecky
5532d63488 Redefine WindowTable as a fixed array
Instead of xalloc'ing it every server generation. The array is always
the same size (MAXSCREENS), anyway.
2008-08-05 01:17:32 +03:00
Simon Thum
18e9fd69fe dix: use average of pointer accel profile
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2008-08-04 15:13:30 +09:30
Ivaylo Boyadzhiev
25882af6d3 Fix a longstanding XAA CopyPlane bug.
TmpBitPlane is a plane mask, not a plane index.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
2008-08-03 18:56:51 -07:00
Adam Jackson
d980913f31 Erk. Actually check all the BARs, not just the first. 2008-08-01 16:15:04 -04:00
Adam Jackson
82d51e6df2 Silence the "No matching Device section" warning in some harmless cases.
If the device doesn't have any BARs then it's just a stub for some
lame operating systems that need one PCI device per output for
multihead.  No point in warning about it.
2008-08-01 13:17:55 -04:00
Adam Jackson
9643e8d348 Handle XGI cards in autoconfig.
It's all a bit wonky since both sis(4) and xgi(4) claim to support the
Volari Z7 and V5/8 (0x0020 and 0x0040), so let's side with xgi(4), why
not.  Note that the V3 (not V3XT) identifies itself as a trident chip.
2008-08-01 11:35:47 -04:00
Adam Jackson
63bdd4c27d Unifdef XIDLE.
Seriously how was this still here.
2008-07-31 17:31:36 -04:00
Xavier Bestel
bb2cacd33e Cosmetic fix to EDID decoding. 2008-07-29 13:06:10 -04:00
Kristian Høgsberg
25dd5ce077 Add atKeynames.h in hw/dmx/input and drop evil cross-ddx #include. 2008-07-28 12:35:03 -04:00
Julien Cristau
e39a16aa58 xfree86: don't output a spurious newline to the log when loading a module 2008-07-28 17:27:42 +02:00
Julien Cristau
2eaed4a10f xfree86: use xorg.conf input devices if there is no ServerLayout
If xorg.conf has no ServerLayout section, use the first mouse and
keyboard sections as core devices, even with AllowEmptyInput.
2008-07-28 17:27:38 +02:00
Simon Thum
805f28e96c some trivial changes regarding C compat, indentation, etc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2008-07-28 18:13:19 +09:30
Simon Thum
3209bd21d0 xfree86: perform pointer accel scheme selection by name, not number
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2008-07-28 18:13:19 +09:30
Michel Dänzer
b3e981c9d4 Fix Makefile.am crack.
Looks like an artifact from early modularization.
2008-07-28 09:32:54 +02:00
Peter Hutterer
47160edec7 xfree86: warn some more about potential missing input devices.
Put out a warning if xorg.conf has InputDevice sections, but these aren't
referenced in the used ServerLayout. This is only performed if AllowEmptyInput
is enabled.
The reason behind this is that the server used to auto-add the first
mouse/keyboard sections if none where referenced. Now, with HAL and AEI
enabled by default, setups that relied on this auto-adding break and are left
without input devices. The least we can do is warn them.
2008-07-28 09:05:07 +09:30
Peter Hutterer
f30b0823db xfree86: if AllowEmptyInput is on, warn the user that we rely on HAL now. 2008-07-28 09:05:02 +09:30
Kristian Høgsberg
036822584b Drop xf86CommonSpecialKey() and atKeynames.h
These are AT scancode specific, should really be part of xf86-input-keyboard.
Remove from server, move to xf86-input-keyboard.
2008-07-24 16:08:29 -04:00
Adam Jackson
f3ff238601 Sync is built-in and mandatory. 2008-07-24 15:46:08 -04:00
Adam Jackson
3fcf4d3eb8 XC-MISC is built-in and mandatory. 2008-07-24 15:46:08 -04:00
Adam Jackson
9757106bba Remove all empty extension reset hooks, replace with NULL. 2008-07-24 15:46:08 -04:00
Adam Jackson
f65c50c4e9 Bigreqs are built-in and mandatory. 2008-07-24 15:46:08 -04:00
Adam Jackson
d6228cb22a Shape extension is built-in and mandatory. 2008-07-24 15:46:08 -04:00
Kristian Høgsberg
990fc643ae Ugh, remove trailing backslash. 2008-07-24 15:02:40 -04:00
Kristian Høgsberg
806e8cf3c0 Remove SPARC muldiv code. Was used by ELF loader, which is no more. 2008-07-24 14:25:24 -04:00
Daniel Stone
5c1e254cc8 Remove xorgcfg
Us shipping a GUI configuration utility (especially as part of the
server!) was pretty pointless.  There was pretty much nothing it could
configure which wasn't already runtime adjustable: if you could get a
server up with functioning input and output, there wasn't much xorgcfg
could do for you.

Au revoir.
2008-07-24 03:01:45 +03:00
Daniel Stone
b74927c384 Remove ioport
I don't know why we would possibly be shipping this.
2008-07-24 02:42:13 +03:00
Daniel Stone
8c05183790 Remove kbd_mode
We only built this on BSD and Solaris, and if such a tool is generally
useful, ship it with the OS.
2008-07-24 02:40:02 +03:00
Adam Jackson
bd8bd2c700 Unifdef AIX. 2008-07-23 13:37:42 -04:00
Adam Jackson
5f5eed7f79 Unifdef DGUX. 2008-07-23 13:37:42 -04:00
Adam Jackson
856db05b58 Unifdef sgi. 2008-07-23 13:37:42 -04:00
Adam Jackson
b699364b1c Unifdef VXWORKS. 2008-07-23 11:44:07 -04:00
Adam Jackson
2e3c43d306 Assume __GNUC__ >= 3.
gcc 3.0 was seven years ago.  Get with the times.
2008-07-23 11:35:06 -04:00
Adam Jackson
0c1c9d7508 Remove some broken debugging scaffolding. 2008-07-23 10:44:34 -04:00
Adam Jackson
0ff5bc4048 Unifdef QNX.
Again, hasn't worked since at least 7.0.
2008-07-23 10:44:34 -04:00
Dodji Seketeli
92fdd01d8e [Xephyr] various X86_64 build cleanups 2008-07-23 01:07:29 +02:00
Dodji Seketeli
5de1867fbb [Xephyr] Fix #15839
Make sure the _XSERVER64 macro is not defined in Xlib client code.
That macro is meant to be define only on pure server code, when necessary.
2008-07-23 01:01:26 +02:00
Adam Jackson
d692e1a63e Build fix. 2008-07-22 10:21:22 -04:00
Peter Hutterer
880625eef5 xfree86: plug memory leak, free driver's private data when deleting the device. 2008-07-22 15:54:49 +09:30
Adam Jackson
8c8c4fdf34 EDID: Various reduced blanking fixes.
- Use a single common function to compute reducedness.
- Call it from both the old-school and new-school mode validation paths.
- Define monitor reduced-blanking support in accord with EDID 1.4.
- Attempt to filter RB DMT modes away from the "standard" EDID pool if
  the monitor doesn't claim RB support.
2008-07-21 16:49:17 -04:00
Adam Jackson
e8cd77e14d EDID: For standard timing blocks, prefer DMT timings if they exist. 2008-07-21 16:49:17 -04:00
Adam Jackson
6ba70091e2 EDID: Correct DDCEstablishedModes to conform to DMT. 2008-07-21 16:49:17 -04:00
Adam Jackson
c74ddc87c9 EDID: Add quirk to clamp max pixel clock to single DVI link speed.
On some panels you end up with all of:
- No range descriptor
- No description of physical connectivity
- Native panel size mode in standard timings list

In principle you're supposed to use the timings for that mode from the DMT
spec, but in practice the DMT spec has timings for both 1920x1200 normal
and 1920x1200RB, and the standard timing field gives you no way to
distinguish.  And, of course, the non-RB timings don't fit in a single
DVI link.
2008-07-21 15:10:20 -04:00
Daniel Stone
0dbfe0ebc6 Revert "Try nvidia before nv under the assumption that people who install it usually want to *use* it, too."
Per mailing list discussion.

This reverts commit 66fb253082.
2008-07-21 03:50:15 +03:00
Aaron Plattner
66fb253082 Try nvidia before nv under the assumption that people who install it usually want to *use* it, too. 2008-07-20 10:32:40 -07:00
Julien Cristau
35346a4227 Don't put xf86Build.h in the tarball (bug#9277)
This file is generated by configure, we don't need to ship a stale
version in the tarball.
X.Org bug#9277 <https://bugs.freedesktop.org/show_bug.cgi?id=9277>
2008-07-20 16:40:59 +02:00
Julien Cristau
43c6d5a6f8 distcheck fixes
Still seems to fail because hw/xquartz has too long filenames
2008-07-20 16:30:24 +02:00
James Cloos
92b0a04ffd Fix compile failure
This fixes a compile failure by ensuring that mouse-cfg.c
can see the MTYPE_ constants.
2008-07-19 18:21:37 -04:00
Adam Jackson
0b45ba488d Drop the FONTCACHE extension.
This appears to have been dead code since X-TT was merged.
2008-07-18 10:54:10 -04:00
Daniel Stone
16e40ecf43 Remove dead code, useless #defines, et al 2008-07-17 22:37:31 +03:00
Daniel Stone
446fe9eecd Dead code removal
Remove a whole bunch of code that was never built, be it entire files or
just dead ifdefs.
2008-07-17 21:37:50 +03:00
Daniel Stone
0564b5454a XFree86: Restore AllowMouseOpenFail usage text
This was incorrectly stuck behind the XFree86-Misc define, so got
deleted with the rest of misc: restore it unconditionally, as it should
be.
2008-07-17 20:46:27 +03:00
Daniel Stone
6c7c0ffeb7 KDrive: Delete rafts of unused code
Most of this stuff was gone with the last real hardware drivers that
used it.  Au revoir.
2008-07-17 20:45:01 +03:00
Alan Coopersmith
058100fd19 Remove more Lynx leftovers
A couple #if defined(Lynx) && defined(sun) had become just if defined(sun),
resulting in wrong settings for Solaris builds, so they're now just deleted.
2008-07-17 09:35:30 -07:00
Mathieu Bérard
47833eef35 Drop a bunch of #ifdef Lynx. 2008-07-17 11:59:24 -04:00
Adam Jackson
b9a0cee026 Drop hw/xfree86/os-support/lynxos/
This has never worked in any modular release, clearly no one cares.
2008-07-17 10:32:35 -04:00
Adam Jackson
d87f170bd9 Remove XF86Misc code from xorgcfg. 2008-07-17 10:29:52 -04:00
Jie Luo
8441e26266 Remove freetype from the list of autoloaded modules. 2008-07-17 10:23:37 -04:00
Daniel Stone
478d3918d5 XFree86: Remove remnants of XFree86-Misc
HandleMessage: dear god, no.
2008-07-17 03:29:54 +03:00
Adam Jackson
95000e34df Build fixes 2008-07-16 16:37:14 -04:00
Adam Jackson
affec10635 Remove loadable font renderer support. 2008-07-16 14:49:36 -04:00
Adam Jackson
acc9105431 Remove font module support from xorgcfg. 2008-07-16 14:24:47 -04:00
Adam Jackson
1a573e402e Update the Allow*Grabs documentation for xf86misc removal.
The API to turn the grab-break keys back off is gone now, so don't
say it exists.
2008-07-16 13:41:53 -04:00
Daniel Stone
22e64108ec XFree86: Remove XFree86-Misc extension
Its last remaining purpose in life has been destroyed by input
properties.  Au revoir: it's been fun, by which I mean awful.
2008-07-16 06:25:26 +03:00
Daniel Stone
35c89f3f5b XFree86: Remove mysticism from Makefile.am
The variables were always the same, so just shove them in with the rest
of the plebs.
2008-07-16 01:51:02 +03:00
Daniel Stone
b89a59248a XFree86: Delete OSMouse code
This should be moved into the mouse driver, if anything.
2008-07-16 01:50:27 +03:00
Daniel Stone
d0de5ea96d XFree86: Remove useless debugging code
Also remove documentation which told you how to use a non-module-aware
GDB, albeit only with old, non-shared, modules.
2008-07-16 01:49:27 +03:00
Daniel Stone
4b1273c9c2 XFree86: Delete empty file & function
xf86InitXkb() has been empty for as long as I can remember.
2008-07-16 01:48:50 +03:00
Daniel Stone
3a54f3f48f XFree86: Clean up init a tiny bit (no code changes)
Reshuffle and delete.
2008-07-16 01:39:45 +03:00
Daniel Stone
ddcefb50dd XFree86: Remove trailing whitespace 2008-07-16 01:39:45 +03:00
Daniel Stone
e6f35f28fb OS/KDrive/XFree86: Sanitise colour initialisation
OsInitColors always just returned TRUE, so just remove calls to it and
insane special-case logic.  Remove unused kcolor.c implementation, and
merge oscolor.h into oscolor.c since it was the only user.  Remove
open-coded strncasecmp in oscolor.c.

Since we no longer need to call OsInitColors after reading the config
file, just call PostConfigInit() from one place, and move PM handling to
one place so we can install the signal handlers earlier.
2008-07-16 01:38:22 +03:00
Adam Jackson
ccec16e519 Bug #7300: Move xf86RAC to hw/xfree86/common 2008-07-15 11:24:08 -04:00
Julien Cristau
9111944b29 Bug #16674: Make sure RANDR reports refresh as 0 if pixel clock is 0. 2008-07-15 10:36:38 -04:00
Peter Hutterer
11ee0ae939 xfree86: append, not prepent, new input devices to xf86InputDevs.
If devices are prepended to the list, their wake-up order on resume is not the
same as the original initialisation order. Hot-plugged devices, originally
inited last, are re-enabled before the xorg.conf devices and in some cases may
steal the device files. Result: we have different devices before and after
suspend/resume.

RedHat Bug 439386 <https://bugzilla.redhat.com/show_bug.cgi?id=439386>
2008-07-14 10:20:11 +09:30
Simon Thum
c9eb0e870c Add support for multiple pointer acceleration schemes. #8583
Available acceleration schemes:
 - xorg classic scheme.
 - the new "Predictable" polynomial accel scheme.

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

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2008-07-13 20:54:33 +09:30
Peter Hutterer
2bbb12c355 Xi: remove ChangeDeviceControl for CoreCtl.
If you want to set a device to core, attach it to a master device.
2008-07-13 20:54:33 +09:30
Jeremy Huddleston
c3267106fb XQuartz: Use CFEqual to compare keyboards
(cherry picked from commit 5538e43b9a)
2008-07-11 10:13:36 -07:00
Jeremy Huddleston
90dd2de845 XQuartz: Some fd handoff cleanup.
(cherry picked from commit 9c20a4804d)
2008-07-11 10:13:32 -07:00
Jeremy Huddleston
26d8030c38 XQuartz: Remove deprecated keyboard code.
(cherry picked from commit 69cfc1a21e)
2008-07-11 10:13:26 -07:00
Jeremy Huddleston
e69b9f9ca4 XQuartz: Set noPanoramixExtension earlier to avoid a possible race.
(cherry picked from commit 49668e8a88)
2008-07-11 10:13:13 -07:00
Jeremy Huddleston
8d2e2e1d85 Xquartz: Removed include directive for removed header
(cherry picked from commit e65a36d57f)
2008-07-11 10:13:06 -07:00
Aaron Plattner
ebd70c82fd Add LoaderShouldIgnoreABI to allow drivers that roll their own ABI checks (i.e. nvidia) to perform the check before ScreenInit. 2008-07-10 15:13:13 -07:00
Alan Coopersmith
08e2c625f6 Remove README.font, since it's just an old text copy of xorg-docs/sgml/fonts 2008-07-09 20:07:59 -07:00
Alan Coopersmith
5e847c1d4f Improved driver selection when autoconfiguring driver without xorg.conf
- Allow returning multiple drivers to try for a given PCI id (for instance,
  try "geode" then "amd" for AMD Geode hardware)
- On Solaris, use VIS_GETIDENTIFIER ioctl as well as PCI id to choose drivers
- Use wsfb instead of fbdev as a fallback on non-Linux SPARC platforms
2008-07-07 17:08:01 -07:00
Alan Coopersmith
235fea0e1a Update bsd & solaris descriptions in README.OS-lib 2008-07-07 15:21:59 -07:00
Tiago Vignatti
d78bebb20a Remove unused function and variables. 2008-07-04 04:04:19 -03:00
Tiago Vignatti
a8c4727f01 Fix typo in the last commit. 2008-07-04 04:03:46 -03:00
Tiago Vignatti
3164288b12 Remove deprecated function miPointerPosition(). 2008-07-04 03:55:59 -03:00
Tiago Vignatti
d1031a8972 Update README.OS-lib to reflect reality. 2008-07-04 03:46:21 -03:00
Tiago Vignatti
f72500c4a0 Nuke libc wrapper remaining stuffs. 2008-07-04 03:45:18 -03:00
Tiago Vignatti
3fd5fab566 Remove inexistent function headers. 2008-07-04 02:51:42 -03:00
Dave Airlie
0b9ef835a0 modes: fix initial xorg.conf mode selection.
This was all kinds of broken, we ignored user preferred modes for multiple
monitors and also for side-by-side configurations.
2008-07-04 07:29:32 +10:00
Peter Hutterer
e317943c12 xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled.
Remove AEI check from configImpliedLayout as the setting isn't actually parsed
at this point anyway (written by Sasha Hlusiak).

Resurrect checkInput() and check for devices there if AEI is false (this also
creates the default devices if required).

Set AllowEmptyInput to enabled by default if hotplugging is enabled.
2008-07-03 22:49:46 +09:30
Peter Hutterer
fe5cf7cb00 xfree86: handle missing Screen lines in the ServerLayout #16301
If no Screen is specified in the ServerLayout section, either take the first
one from the config file or autogenerate a default screen.

X.Org Bug 16301 <http://bugs.freedesktop.org/show_bug.cgi?id=16301>
2008-07-03 22:49:46 +09:30
Peter Hutterer
6674b87a7d xfree86: move declaration of configured_device to start of function.
Last I checked C doesn't allow declarations halfway down a block.
2008-07-03 22:49:46 +09:30
Dave Airlie
1771edcb44 modes: check the crtc is valid before using its desired modes.
this fixes a crash I was getting on radeon rotate when gnome is running.
I'm sure g-s-d was doing something bad, but really not crashing ftw.
2008-07-03 19:05:26 +10:00
Adam Jackson
689292e58c Fix GLX in Xvfb and kdrive. 2008-07-02 11:25:50 -04:00
Chris Ball
9a73bca859 Remove KdOffscreenMarkUsed() as all its callers are gone. 2008-07-02 09:46:06 -04:00
Adam Jackson
703a9645f3 Auf wiedersehen, KAA. 2008-07-01 17:50:48 -04:00
Jeremy Uejio
c8216aede6 Sun bug #6685465: Xephyr uses wrong or bad colortable in 8-bit mode
<http://bugs.opensolaris.org/view_bug.do?bug_id=6685465>

This bug is caused by Xephyr not handling the RGB byte order correctly
of the server where Xephyr is displaying on. The previous code just
assumed that the order was RGB and did not take into account that
Xservers may use different order (such as BGR).

The fix is to add a function to calculate the byte order and bits
to shift based on the visual mask and the visual bits_per_rgb (which
is usually 8, but could be server dependent).  Since the shifts won't
change once the display connection has been made, I can cache these
values so that Xephyr doesn't have to keep recalculating them everytime
it tries to translate the Xephyr colormap entries for Xephyr clients to
the actual server colormap entries (i.e. calling the function
hostx_set_cmap_entry() repeatedly for every colormap entry).
2008-07-01 13:37:12 -07:00
Aaron Plattner
2e8daee053 Work around the DIX losing mmWidth/mmHeight for RandR 1.1 DDXen.
RandR 1.1 has a physical size for each mode.  It used to be that the DIX would
remember these modes and pass them back up to the DDX when changing the screen
configuration.  The DDX uses RR_GET_MODE_MM to query the driver for the physical
dimensions of the screen, allowing it to preserve the DPI.

With RandR 1.2, the physical dimensions are stored as part of the output, rather
than per mode.  The DIX only uses the sizes passed in from the DDX to select the
mode pool for the "default" output, and forgets the physical sizes.  Then, when
reconfiguring the screen, it makes up a new RRScreenSizeRec using the dimensions
from the output, screwing up the DPI.

This change works around this problem by ignoring the DIX and querying the real
size from the driver.
2008-07-01 09:08:22 -07:00
Adam Jackson
e2bbf2d248 Don't try to load DRI2 if built without it. 2008-07-01 12:01:56 -04:00
Adam Jackson
66d7c9de82 Declare xf86InterpretEEDID() properly. 2008-07-01 10:55:54 -04:00
root
e4335e876d Revert "XInput ABI is 2.1, not 3.1."
This reverts commit 76576c87b0.
which was an incorrect revert of previous ABI bumps. Those
responsible for the accidental ABI bumps in both directions
have all been sacked.

This allows xf86-input-mouse to build again, for example.
2008-06-30 15:42:33 -07:00
Adam Jackson
76576c87b0 XInput ABI is 2.1, not 3.1. 2008-06-30 16:10:37 -04:00
Adam Jackson
bed12dd3df Do EEDID in RANDR 1.2. 2008-06-30 16:04:54 -04:00
Adam Jackson
4fc18b5fc3 Hexdump the whole EDID block if extensions present. 2008-06-30 16:04:54 -04:00
Adam Jackson
b4fbc31e10 Actually fetch all blocks of EEDID if asked to. 2008-06-30 16:04:54 -04:00
Adam Jackson
211e2bdcc6 Bump ABI minor numbers for the devPrivate ABI functions. 2008-06-30 10:29:17 -04:00
Alan Coopersmith
01f0b9c978 xf86GetOptValFreq wants a pointer to double, but maxPixClock is an int 2008-06-25 19:23:20 -07:00
Adam Jackson
cbc20d92de XTrap delenda est. 2008-06-25 09:52:36 -04:00
Tiago Vignatti
2ff7eb4995 xfree86: kill INHERIT_LOCK_STATE macro.
I don't know how this survived so long. Google didn't show
anything usable related with this.
2008-06-24 23:10:56 -03:00
Peter Hutterer
32a7bbbba6 xfree86: fix up leftover allocation of xf86Events.
Thanks to Eamon Walsh for spotting this.
2008-06-25 09:59:46 +09:30
Julien Cristau
9ed9d98dec x86emu: fix build, fallout from 9719354 2008-06-24 22:36:32 +02:00
Eamon Walsh
e9b4f3cd85 Fix "warning: suggest parentheses around && within ||". 2008-06-24 15:04:01 -04:00
Eamon Walsh
8910dde96e Fix "warning: assignment discards qualifiers from pointer target type". 2008-06-24 15:04:01 -04:00
Eamon Walsh
95d4ede538 Fix "warning: passing argument 1 of `modeIsPresent' from incompatible pointer type". 2008-06-24 15:04:01 -04:00
Eamon Walsh
fa1545eeda Fix "warning: passing argument 1 of `xf86addNewLoadDirective' from incompatible pointer type". 2008-06-24 15:04:01 -04:00
Adam Jackson
9719354ae0 Check for __amd64__, not __x86_64__.
Spiritual revert of 1fa4de80fc.  Intel's C
compiler claims to be gcc-compatible; if they're not defining the same
macros as gcc then that's their bug, not ours.  Even if we were to do
this aliasing we should do it once and for all in servermd.h.
2008-06-24 14:37:06 -04:00
Adam Jackson
9e5b3deafb Bug #11842: Fix emulation of int1A PCI BIOS services.
Use only %di to name the PCI register to read/write, rather than %edi.
DOS is only expecting the base PCI config space anyway, and the BIOS
might be using the high bits of %edi.
2008-06-24 14:08:04 -04:00
Adam Jackson
d34430414a Remove xorgconfig. Use X -configure instead. 2008-06-24 13:32:55 -04:00
Paul Bender
4c4e06af79 Bug #15665: Fix building without Composite. 2008-06-24 10:44:47 -04:00
Adam Jackson
59510a7643 Remove some default modes that really shouldn't be in the default set. 2008-06-24 10:40:36 -04:00
Julien Cristau
b622f6dc5d kdrive: fix building with --disable-xv (bug#16488) 2008-06-23 23:45:57 +02:00
Jesse Ruffin
3b58782692 Bug #16302: Fix GLX drawable refcounting in DMX. 2008-06-23 14:35:20 -04:00
Adam Jackson
c8d066a151 Implement bswap in x86emu.
Yes, this is a 486+ instruction and thus not strictly legal in vm86
mode, but enough BIOSes use it (looking at you VIA) that we might as
well implement it.
2008-06-23 14:00:50 -04:00
Matthieu Herrb
155fcecb32 Various messages clean-ups. 2008-06-19 16:59:41 +02:00
Matthieu Herrb
ce4d4b3c1b build fix 2008-06-19 16:57:20 +02:00
Matthieu Herrb
19c7e9da55 preserve errno around the SIGIO handler 2008-06-19 16:55:25 +02:00
Matthieu Herrb
0a81d47638 Remove RCS Id. 2008-06-19 16:53:40 +02:00
Matthieu Herrb
c0d7ad9c88 Let code build with gcc 2.95 2008-06-19 16:51:18 +02:00
Ian Romanick
f3490d3eba Bug #15169: Make the server build again on Alpha.
Still won't work until the kernel makes the resource files actually exist.
2008-06-17 10:35:24 -04:00
Eamon Walsh
720e44f973 Fix "warning: no previous prototype for ‘XevieExtensionInit’". 2008-06-13 21:42:37 -04:00
Eamon Walsh
2d7ba09dc4 Make devPrivates lookup functions ABI instead of static inlines.
This is required to preserve compatibility across changes to the
internal representation of the privates list.
2008-06-13 16:43:56 -04:00
Adam Jackson
f31bd087e8 Death to mfb.
Anyone still interested in 1 or 4 bpp framebuffers, talk to fb.
2008-06-13 10:51:18 -04:00
Adam Jackson
d15b379030 Remove xgl.
This code hasn't been updated with anything even resembling what anyone is
shipping in nearly thirty months.  It hasn't built out of the box since
7.1.  Most of its features over AIGLX are accomplished with DRI2 and
friends.
2008-06-12 16:00:50 -04:00
Dave Airlie
c37a93b485 modes: make aspect choosing work on single output case.
In the single output enabled case we never enter the loop and test
never gets set and so we fail to match a good mode.

This was causing my 2560x1600 to end up at 2048x1536.
2008-06-12 14:55:16 +10:00
Tiago Vignatti
390b155135 Welcome to hotplug era.
`rm -rf xorg.conf` does not imply an error message. Maybe a warning.

checkInput() is defined but not used.
2008-06-11 18:21:33 -03:00
Tiago Vignatti
6e018f6a30 No need for inputPending field in xf86Info. 2008-06-11 18:10:55 -03:00
Tiago Vignatti
84db8837d0 Remove unused xf86DeviceCursorUndisplay() function. 2008-06-11 17:47:00 -03:00
Peter Hutterer
656d5d9885 kdrive: fix wrong use of &, should be | instead.
Fallout from 26e7e69ab8
2008-06-11 17:32:59 +09:30
Peter Hutterer
e083b5a075 xnest: wrap the xnest cursor sprite funcs around the mi funcs.
Modelled after the xfree86 code. Call miDCInitialize to init the SW rendering
engine, then take the pointers, store it in a xnest-local variable, and put
the xnest-specific sprite funcs in place. In the xnest sprite funcs, call
through to the mi sprite funcs after doing xnest-specific stuff.
2008-06-11 17:24:19 +09:30
Peter Hutterer
a3a7c12fcf xfree86: Fix up xf86ScaleAxis
Some driver still call it, so we might as well work correctly. Always
resetting X to the Sxhigh is sub-optimal.
2008-06-11 17:24:19 +09:30
Jeremy Huddleston
f8431a62d5 XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.
(cherry picked from commit 4505bae5d7)
2008-06-10 10:52:04 -07:00
Jeremy Huddleston
c180a52332 XQuartz: Removed code path for old startup
(cherry picked from commit a9ee6b0d00)
2008-06-10 10:51:58 -07:00
Jeremy Huddleston
5170c169db XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it.
(cherry picked from commit ee92aced10)
2008-06-10 01:46:01 -07:00
Jeremy Huddleston
01ace5f3fd XQuartz: Updated icon with more rsolutions and made it more dark-background friendly
(cherry picked from commit d8cf5623fa)
2008-06-10 01:46:00 -07:00
Peter Hutterer
2854abd39d xnest: fix up sprite funcs to stop compiler warnings. 2008-06-08 23:28:28 +09:30
Peter Hutterer
c68ca0c7b2 xnest: switch to using EventList rather than xEvents. 2008-06-08 23:28:28 +09:30
Peter Hutterer
34429d16d3 xnest: call miDCInitialize rather than miPointerInitialize.
This unfortunately gives us a lots of artefacts, so cursor rendering cannot be
assumed complete. But it's better than crashing.
2008-06-08 23:28:28 +09:30
Peter Hutterer
585125685b ephyr: some whitespace changes. 2008-06-08 23:28:27 +09:30
Peter Hutterer
874dcdb3bd dmx: remove a ifndef XINPUT, XINPUT is always defined now. 2008-06-05 16:14:29 +09:30
Peter Hutterer
52752911ea dmx: don't free event list after use. 2008-06-05 16:14:23 +09:30
Peter Hutterer
5c5e581245 dmx: add an XFlush.
Beats me why we need it, but without it we get segfaults lateron.
2008-06-05 16:14:18 +09:30
Peter Hutterer
246c10441b dmx: fix false memory allocation.
beNumVisuals and the number of GLX Visuals can be significantly different.
2008-06-05 16:14:12 +09:30
Peter Hutterer
17cd262257 dmx: don't dereference a nullpointer. 2008-06-05 16:13:58 +09:30
Peter Hutterer
75eb635e35 dmx: add stubs for DeviceCursorInitialize, DeviceCursorCleanup 2008-06-05 16:13:44 +09:30
Peter Hutterer
3ff2f3a00e dmx: for now, don't acknowledge SDs. 2008-06-05 16:13:38 +09:30
Peter Hutterer
5bcd9e8953 dmx: learn about the existence of IsXExtensionPointer and IsXExtensionKeyboard 2008-06-05 16:13:23 +09:30
Peter Hutterer
8da8a0fec4 dmx: claim we support XI 2.
We don't really, yet, but at least we get the full device list this way.
2008-06-05 16:13:18 +09:30
Peter Hutterer
6f1d5147cb dmx: fix a segfault caused by GC devPrivates never being initalised. 2008-06-05 16:13:12 +09:30
Peter Hutterer
d10ba4591a dmx: some more build fixes. 2008-06-05 16:13:03 +09:30
Jeremy Huddleston
40855d8000 XQuartz: Removed async debugging sleep
(cherry picked from commit 7812a8bdf9)
2008-06-04 12:24:15 -07:00
Jeremy Huddleston
ee86b75119 XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling
(cherry picked from commit ff1c443cad)
2008-06-04 12:24:12 -07:00
Jeremy Huddleston
38da26cd36 XQuartz: Don't forget to destroy the mutex and cond after we're done with them
(cherry picked from commit c3558bb8cd)
2008-06-04 12:24:10 -07:00
Jeremy Huddleston
ea40fcf434 XQuartz: Fork for trigger
(cherry picked from commit dd0f8a0f59)
2008-06-04 12:24:06 -07:00
Jeremy Huddleston
2393dae6ff XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/
(cherry picked from commit 7f840e9dc1)
2008-06-04 12:24:04 -07:00
Peter Hutterer
26e7e69ab8 kdrive: don't post motion event if there was no motion. #16179
Based on the patch by Tomas Janousek.

X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179>
2008-06-02 11:11:37 +09:30
Peter Hutterer
ac1db45449 xfree86: suspend signals while removing a device (corrected version).
Block/Release is now symmetrical.
2008-06-02 10:40:10 +09:30
Peter Hutterer
95ecaa411a Revert "xfree86: suspend signals while removing a device."
Left the signals blocked hanging after removing a master device.

This reverts commit 74372fd004.
2008-06-02 10:38:45 +09:30
Tiago Vignatti
5ba07cb548 kdrive: changes ephyr API according mpx merge.
This fix host-cursor in Xephyr server.

Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-06-02 10:27:12 +09:30
Peter Hutterer
f79ad5674e kdrive: fix up callers to KdQueueEvent, need to pass xEvent, not EventListPtr 2008-05-31 18:46:35 +09:30
Peter Hutterer
942086fc96 dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it 2008-05-31 18:17:49 +09:30
Peter Hutterer
64677f6a16 xfree86: fix offset error in EDID parsing. #15964
X.Org Bug 15964 <http://bugs.freedesktop.org/show_bug.cgi?id=15964>
2008-05-27 21:18:35 +09:30
Paulo Cesar Pereira de Andrade
c8af7ce35a Correct a NULL pointer deference
The problem happens if Monitor/Card combo doesn't provide EDID info,
and the XFree86-VidModeExtension extension is used.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-27 15:20:28 +09:30
Peter Hutterer
3a1278907e xfree86: Bump XINPUT ABI to 3.0. 2008-05-26 18:14:31 +09:30
Peter Hutterer
26c1958c32 Merge branch 'master' into mpx 2008-05-26 17:37:31 +09:30
Peter Hutterer
1883485edd If core motion history is required, scale back to screen coords and INT16. 2008-05-26 17:22:25 +09:30
Peter Hutterer
0877de13ac Remove GetMotionProc from ValuatorClassRec.
With the MD/SD device hierarchy we need control over the generation of the
motion history as well as the conversion later before posting it to the
client. So let's not let the drivers change it.

No x.org driver currently uses it anyway, linuxwacom doesn't either so dumping
it seems safe enough.
2008-05-25 22:49:54 +09:30
Peter Hutterer
00b4339168 dmx: remove some #if 0'd code. 2008-05-25 22:34:11 +09:30
Michel Dänzer
29586101dc EXA: Only record damage generated by rendering operations.
Recording damage from other operations (e.g. creating a client damage record)
may confuse the migration code resulting in corruption.

Option "EXAOptimizeMigration" appears safe now, so enable it by default. Also
remove it from the manpage, as it should only be necessary on request in the
course of bug report diagnostics anymore.
2008-05-24 20:01:41 +02:00
Julien Cristau
e6cbb1e11e xfree86: fix build on GNU/kFreeBSD
GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
Unify preprocessor conditionals between variable declaration and use.
Debian bug #482550.
2008-05-23 23:01:24 +02:00
George Sapountzis
21a8052fdc glx: fix forgotten swrast -> SWRast 2008-05-23 22:40:26 +03:00
George Sapountzis
877e6c35ff glx: missing swrast is fatal 2008-05-23 22:40:26 +03:00
George Sapountzis
ae0504d34d kdrive: need not export symbols for glx anymore 2008-05-23 22:40:25 +03:00
Jeremy Huddleston
7082929ef7 XQuartz: A 2 second delay for launchd socket connections should be sufficient.
(cherry picked from commit 2bb4251b3c)
2008-05-23 02:32:37 -07:00
Jeremy Huddleston
225dddbaed XQuartz: Move the launchd display grabbing into mach_startup
(cherry picked from commit c3866c98d2)
2008-05-23 02:31:41 -07:00
Jeremy Huddleston
3a22190061 XQuartz: Fixed a few issues with fd passing... still not working =(
(cherry picked from commit 7dd3512715)
2008-05-23 02:31:38 -07:00
Peter Hutterer
6c9e9f8a40 input: instead of lastx/y, use a last.valuators[] array on the device.
During GetPointerEvents (and others), we need to access the last coordinates
posted for this device from the driver (not as posted to the client!). Lastx/y
is ok if we only have two axes, but with more complex devices we also need to
transition between all other axes.

ABI break, recompile your input drivers.
2008-05-23 12:01:37 +09:30
Peter Hutterer
74372fd004 xfree86: suspend signals while removing a device.
Getting a keyboard event while halfway through freeing memory can be
unpleasant.
2008-05-22 18:08:32 +09:30
Dave Airlie
ea4ec9e998 int10: add pci_device_enable support on Linux 2008-05-22 08:58:42 +10:00
Kristian Høgsberg
4230b92744 Clean up remaining afb references. 2008-05-21 17:58:15 -04:00
Adam Jackson
20ea99c655 Death to afb.
Planar framebuffer people, please talk to wfb for all your 1988 hardware
needs.
2008-05-21 17:03:25 -04:00
Dan Nicholson
c76fddeea2 Fix up paths for GL/glx -> glx renaming 2008-05-21 10:51:15 -07:00
Kristian Høgsberg
a8a9b40e55 Move the windows GL files to the xwin DDX. 2008-05-21 12:36:25 -04:00
Kristian Høgsberg
e5aad4bc08 Get out of the mesa symlinking business.
This copies over the files generated from mesa/src/mesa/glapi.  There's
a corresponding mesa commit that makes it easy to generate the glapi files
straight into the xserver tree when the XML definitions change.

The only few files that are copied from mesa but aren't generated are
glapi.[ch] and glthread.[ch].  Everything in there is technically DRI
driver API and the whole setup is still a bit fragile, but it's not a new
problem.

The --with-mesa-source configure option is still around since other
parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
but for common case of building with GLX and AIGLX support, that
option is no longer needed.
2008-05-21 12:15:18 -04:00
Kristian Høgsberg
f558c7d4d1 Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest. 2008-05-21 12:15:18 -04:00
Kristian Høgsberg
77ff8fd507 Drop glcore GLX provider.
Obsoleted by the DRI swrast driver.
2008-05-21 12:15:18 -04:00
George Sapountzis
255142b61e drop xprint remnants: InitGlobals 2008-05-21 18:13:09 +03:00
Peter Hutterer
7509fb498c Merge branch 'hwcursor' into mpx 2008-05-21 16:25:35 +09:30
George Sapountzis
6ff6465931 Add loader for the swrast dri driver. 2008-05-20 16:38:05 -04:00
Alan Coopersmith
925e895b86 Restore return type on xf86SetScrnInfoModes
Seems to have been accidentally lost by commit 	76943fec86
2008-05-19 18:43:29 -07:00
Peter Hutterer
99d28c3ef3 Merge branch 'master' into mpx
Conflicts:

	Xext/xprint.c (removed in master)
	config/hal.c
	dix/main.c
	hw/kdrive/ati/ati_cursor.c (removed in master)
	hw/kdrive/i810/i810_cursor.c (removed in master)
	hw/xprint/ddxInit.c (removed in master)
	xkb/ddxLoad.c
2008-05-20 10:20:14 +09:30
Adam Jackson
0178b6a4ab Fix reduced-blanking mode filtering in RANDR 1.2.
If the monitor isn't reduced-blanking (either through EDID logic, or
config file setting), then remove RB modes from the default pool.  Any
RB modes from the driver and config file pools will stick around though;
you asked for them, you got them.
2008-05-19 11:22:19 -04:00
Jeremy Huddleston
bb687465d0 XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server
(cherry picked from commit cccee9cfc2)
2008-05-19 02:47:18 -07:00
Jeremy Huddleston
4b69d22bcb XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config
(cherry picked from commit 2a72309c06)
2008-05-19 02:47:17 -07:00
Jeremy Huddleston
e997df8cd3 XQuartz: Cleaned up ListenOnOpenFD...
(cherry picked from commit 6fb587d3d5)
2008-05-18 23:32:57 -07:00
Jeremy Huddleston
738672858d New XQuartz icon thanks to Simone Karin Lehmann
(cherry picked from commit c27e0c8f3c)
2008-05-18 23:32:56 -07:00
Jeremy Huddleston
4be2104c80 XQuartz: More work towards Mach-IPC startup... started working on FD passing
(cherry picked from commit 27fbfeacfa)
2008-05-18 22:45:19 -07:00
Julien Cristau
82c4075d4b xfree86: fix initial output positions with Above or LeftOf and rotation
The fix in fa19e84714 was incomplete,
as it was still using the wrong output's initial rotation to compute
the position.
2008-05-19 03:27:12 +02:00
Dave Airlie
7dca84f3ee cursor: don't dereference NULL pointer is devPrivates not yet set.
This fixes a bug on server recycle with ati zaphod.
2008-05-19 11:16:08 +10:00
Jeremy Huddleston
5af5db5033 XQuartz: Ok, pass XQUARTZ_USE_XKB since it breaks worse without it... but we have issues when we have the keyboard configs installed... need to figure out what to do there...
(cherry picked from commit 301262b070)
2008-05-17 14:56:57 -07:00
Jeremy Huddleston
2408303d79 XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
(cherry picked from commit 543c2cd68d)
2008-05-17 14:56:53 -07:00
Jeremy Huddleston
01612fe612 XQuartz: Disable xkb since it doesn't work after getting xkeyboard-config installed
Need to setup configs for the quartz keyboard
(cherry picked from commit c28fecc621)
2008-05-17 14:56:34 -07:00
Jeremy Huddleston
1d09deaa6e XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init.
(cherry picked from commit 5626b0949b)
2008-05-17 14:56:30 -07:00
Jeremy Huddleston
adc62f62b9 Xquartz: Xquartz stub now can send Mach IPC to start the server.
(cherry picked from commit 55a3bca8ea)
2008-05-17 14:56:26 -07:00
Brad Smith
93c082a060 OpenBSD doesn't define __x86_64__, simplify tests.
Seeing as this code seems to be specific to OpenBSD I don't think
__x86_64__ should have been added there at all. It appears to have
been added wherever __amd64__ existed before which is wrong. I
think that part of the commit should be reverted but also all four of
the checks should be __OpenBSD__ && __amd64__ instead of two one
direction and two flipped.
2008-05-17 13:14:31 +02:00
Adam Jackson
aad1c37b09 RANDR 1.1 compat: remove senseless comparison against the virtual size. 2008-05-16 11:10:33 -04:00
Adam Jackson
14726b776d xf86SetDesiredModes(): Skip disabled CRTCs first thing. 2008-05-16 11:10:33 -04:00
Adam Jackson
459f34b089 Fix initial mode selection even harder.
The first guess used to be "is the preferred mode for one output the
preferred mode on all outputs".  Instead, do "find the largest mode that's
preferred for at least one output and available on all outputs".
2008-05-16 11:10:33 -04:00
Adam Jackson
96111c1547 Redo RANDR compatibility output selection.
Old logic was just the first one that happened to have an associated
CRTC.  The new logic tries to find one that's definitely connected, has
probed modes, and has the largest candidate mode.
2008-05-16 11:10:32 -04:00
Adam Jackson
a4bbe1c8bc Re-add sync range inference from legacy setup to RANDR 1.2. 2008-05-16 11:10:32 -04:00
Adam Jackson
99e4531f7c The great kdrive purge.
Most of these drivers didn't work.  ati was the only one that even came
close.  The igs, ipaq, itsy, pcmcia, savage, sis530, trident, trio, ts300,
and vxworks directories have never built since modularisation, so clearly
no one can miss them.
2008-05-16 08:16:01 -04:00
Peter Hutterer
6fb76acc45 mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
In the xnest and vfb DDX we don't need the call anyway, it's performed by
mieqProcessInputEvent.
2008-05-16 21:10:00 +09:30
Peter Hutterer
f611719edc xfree86: always render first cursor in HW, all others in SW. 2008-05-16 20:17:21 +09:30
Peter Hutterer
48ba58feac mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
In the xnest and vfb DDX we don't need the call anyway, it's performed by
mieqProcessInputEvent.
2008-05-16 19:33:51 +09:30
Tiago Vignatti
622d7c1d89 Restructure and organize the code.
It was removed and simplified some conditionals. We don't need test for
pDev->isMaster inside xf86CursorSetCursor() because only MD enters there.

In the last chunk, ScreenPriv fields were being assigned without need, so
that code was wrapped inside the conditional to avoid it.

I also tried to make the identation more sane in some parts that I touched.

Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>

Minor modification, part of the original patch led to cursors not being
updated properly when controlled through XTest.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-16 17:14:43 +09:30
Tiago Vignatti
5af90025fe Remove redundancy.
The only function that cat set SWCursor before xf86DeviceCursorInitialize()
is xf86InitCursor() when VCP and is created.

Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-16 17:02:15 +09:30
Brian Rogers
5127942f80 DGA: pass nevents to UpdateDeviceState. #15936
Missing parameter caused event processing to go nuts when checking valuators.

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

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-16 15:43:01 +09:30
Adam Jackson
166177e36b Simplify default font path setup. 2008-05-14 16:02:05 -04:00
Jeremy Huddleston
cbb4e80eb7 XQuartz: More work on the Mach-IPC startup path
(cherry picked from commit 49cd0b185f)
2008-05-14 01:16:04 -07:00
Jeremy Huddleston
3b57c59bb0 Xquartz: More work on the new Mach startup
(cherry picked from commit 6237acf75d)
2008-05-14 01:16:01 -07:00
Jeremy Huddleston
e435acc84c Added missing to EXTRA_DIST
(cherry picked from commit e39613f463)
2008-05-14 01:15:58 -07:00
Jeremy Huddleston
f7d6d20ad6 XQuartz: Cleaned up the about box.
(cherry picked from commit 0279a59706)
2008-05-14 01:15:56 -07:00
Jeremy Huddleston
b37e1f1f5c Don't need the fink-friendly printf in the DDX anymore.
(cherry picked from commit fe22794404)
2008-05-14 01:15:54 -07:00
Peter Hutterer
68b4f250ee dmx: fix build.
Just because it builds, doesn't mean it works.
2008-05-14 16:18:48 +09:30
Peter Hutterer
8234af6c6a xfree86: remove Ubuntu-ism.
Additional #include was required due to broken libc headers or something like
that. Remove it, there's more to the world than ubuntu alone.
2008-05-13 11:17:39 +09:30
Peter Hutterer
1fc1a2897e Remove UndisplayCursor API.
We can achieve the same thing by simply displaying a NullCursor, there's no
need for a separate API.
2008-05-13 11:17:02 +09:30
Adam Jackson
86678e7cc2 Fix fbdevhw initialization for PCI drivers.
graphics/fb%d, not graphics:fb%d.  Thanks sysfs.  Thysfs.
2008-05-12 14:53:37 -04:00
Adam Jackson
1c8bd318fb X n'est pas une print API. 2008-05-12 14:15:11 -04:00
Jeremy Huddleston
f9fae16456 XQuartz: Added some version checking protection so we don't trigger an infinite exec loop with new /usr/X11/bin/Xquartz and older X11.app
(cherry picked from commit 78032815ae)
2008-05-12 10:42:20 -07:00
Jeremy Huddleston
ac4e33a9cd XQuartz: More startup work... listen if we're the actual server
(cherry picked from commit 3b0afb47c3)
2008-05-12 10:42:16 -07:00
Jeremy Huddleston
a7800d9355 XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support
(cherry picked from commit 9b67fca9b7)
2008-05-12 10:42:12 -07:00
Dave Airlie
3b6735528e pci: don't do this pci stuff when we don't have hw access 2008-05-12 16:36:42 +10:00
Julien Cristau
9dfb525f6c kdrive: allow disabling Composite
KdInitOutput() used to enable Composite when it was disabled by default,
but now this hack prevents ``-extension Composite'' from working.
Remove it, as Composite is enabled by default anyway.
2008-05-11 23:35:41 +02:00
Drew Parsons
7b3066d9b9 Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into upstream-experimental 2008-05-10 00:01:15 +10:00
Drew Parsons
2a3d1421e0 Disable D-BUS from Xprint.
Use dummy config functions to replace those from config/config.c, and
therefore do not link Xprt with $CONFIG_LIB.

Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
(WaitForSomething() not waiting) when built with dbus, which was
causing Xprt to use 95% cpu.
2008-05-09 23:58:19 +10:00
Jeremy Huddleston
315f089056 XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
(cherry picked from commit 2232c91d5c)
2008-05-08 19:58:24 -07:00
Jeremy Huddleston
a07c5ad172 XQuartz: Set bundle version to 2.3.0
(cherry picked from commit 8a0524b30e)
2008-05-08 19:58:15 -07:00
Jeremy Huddleston
05f23ed3ea XQuartz: Fixed some issue in our bundle creation
(cherry picked from commit 330ffad547)
2008-05-08 19:58:09 -07:00
Adam Jackson
f17ba5d584 Bug #13104: Remove broken XAA a1 glyph fast path. 2008-05-08 16:04:24 -04:00
Adam Jackson
ddaecfa13c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2008-05-08 14:33:58 -04:00
Daniel Stone
641a5f955b Build: Ensure xf86DefModeSet.c ends in an empty line
This shuts up a warning.
2008-05-07 22:29:04 +03:00
Adam Jackson
9c2e0871cf Bug #13104: XAA: Adapt to glyph storage changes.
Glyph bits are now stored in a proper pixmap, not just hanging off the
end of a GlyphRec.
2008-05-07 13:21:26 -04:00
Adam Jackson
718652eaf9 Bug #13104: Don't let XAA glyph pixmaps anywhere near video memory.
Since glyphs are stored in pixmaps now, they can make their way into VRAM,
which invalidates a bunch of fast-path assumptions in the XAA code.  Thus
you end up doing color-expands or WriteBitmap from la-la land and your
aliased glyphs go all funny.

Since XAA isn't ever growing the ability to do sane glyph accel, just force
glyph pixmaps into host memory by catching them at CreatePixmap time.
2008-05-06 17:52:37 -04:00
Jeremy Huddleston
a85d3ac87c XQuartz: Fixed typo
(cherry picked from commit 56b7988d26)
2008-05-06 03:04:13 -07:00
Jeremy Huddleston
077ced6384 XQuartz: Added uncommitted files
(cherry picked from commit e414ec462c)
2008-05-06 03:04:09 -07:00
Jeremy Huddleston
80e502c5d1 Fixed up dist
(cherry picked from commit f225222ba2)
2008-05-06 03:04:04 -07:00
Jeremy Huddleston
7295e54433 XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite
(cherry picked from commit 453a982e63)
2008-05-06 02:49:48 -07:00
Ben Byer
d41d677ab4 Xquartz: experimental embedding of Sparkle.framework
(cherry picked from commit b7a1a640ce)
2008-05-06 02:49:41 -07:00
Peter Hutterer
9e0d73fd8a xfree86: call SetCursor for the VCP when switching between SW/HW rendering.
We need a manual call to SetCursor when we switch from SW to HW rendering and
the other way round. This way we display the new cursor after removing the old
one.
In addition, we only update the internal state for the VCP's sprite. This way,
when we switch back to HW rendering the state is up-to-date and wasn't
overwritten with the other sprite's state.

The second part is a hack. It would be better to keep a state for each sprite,
but then again we don't have hardware that can render multiple cursors so we
might as well do with the hack.
2008-05-06 17:52:15 +09:30
Dave Airlie
e4ebfed178 xf86edid: fix typo in debug output 2008-05-06 16:47:18 +10:00
Peter Hutterer
b9c1a57e7a xfree86: switch between to SW cursors if more than 1 sprite is available.
Switches back to HW cursors when sprites other than the VCP are removed.
The current state requires the cursor to change shape once before it updates
to SW / HW rendering (whatever is appropriate), e.g. by moving into a
different window. Until this is done, the cursor is invisible.
2008-05-06 14:51:23 +09:30
Peter Hutterer
3df88c17e3 xfree86: re-enable hardware cursor (for a single cursor)
This commit enables HW rendering for cursors again, but only for a single
cursor. Other cursors can be created, however they will not be visible.
2008-05-06 11:50:20 +09:30
Aaron Plattner
d500eeb945 Xephyr: Handle depth 30 and reject higher depths rather than crashing. 2008-05-04 10:26:25 -07:00
Jeremy Huddleston
f4a68f3701 XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values
(cherry picked from commit 8d9eab3a2e)
2008-05-02 17:42:41 -07:00
Jeremy Huddleston
96fa7da3b8 XQuartz: Avoid a possible crash at startup due to unfavorable context switching.
(cherry picked from commit ff10c37bdd)
2008-05-02 17:42:36 -07:00
Peter Hutterer
6f63724b28 xfree86: don't try to repaint the cursor before cursors exist. 2008-05-02 14:56:58 +09:30
Peter Hutterer
3344569529 Merge branch 'master' into mpx
Conflicts:

	Xi/exevents.c
	dix/devices.c
2008-05-02 11:00:14 +09:30
Jeremy Huddleston
a338007be6 XQuartz: Adjust the screen origin offset properly for multimonitor setups
(cherry picked from commit f2020b9836)
2008-05-01 18:04:18 -07:00
Paulo Cesar Pereira de Andrade
01c61f3d97 xorgcfg: Fix a crash if xorg.conf doesn't have a Files section.
This patch only creates a Files section if required, so if no entries are
added, an empty Files section will not be created.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-01 15:55:15 +09:30
Paulo Cesar Pereira de Andrade
6899ff81e8 Fix an off by one read error in drmSIGIOHandler().
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-01 10:14:30 +09:30
Jeremy Huddleston
ec0419b505 XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h
(cherry picked from commit 1fcf74a436)
2008-04-30 17:33:11 -07:00
Kazuhiro Inaoka
ce36ae526d Add M32R architecture support (bug #10020)
Still needs autotools support, so this won't actually _build_: it's just
a starting point.
2008-04-30 11:58:32 +03:00
Ben Byer
b71b51c982 xquartz: created darwinTablet, to represent tablet events
(cherry picked from commit 50641bce73)
2008-04-29 23:59:34 -07:00
Ben Byer
519581b0ba xquartz: remove unused params from DarwinEQInit
(cherry picked from commit 299a056737)
2008-04-29 23:59:31 -07:00
Jeremy Huddleston
d70487a4c0 XQuartz: Fix to tablet-event handling code; we now scale
more conservatively (to match Linux's Wacom driver) and
we now receive all tablet-related events.
(cherry picked from commit 588683cecc)
2008-04-29 23:59:26 -07:00
Hong Liu
f65a1a62f9 Keep rotation wrappers in place while transforms are in use
LeaveVT/EnterVT cycles will free/realloc shadow frame buffers. Because of
this, the presense/absence of that data is insufficient to know whether
the screen function wrappers are necessary. Instead, the 'transform_in_use'
flag should be used.

This patch also adds 'xf86RotateFreeShadow' for drivers to use at LeaveVT
time to free the rotation data; it will be reallocated on EnterVT.
2008-04-29 09:00:11 -07:00
Peter Hutterer
ec2fca7e6f xfree86: DGA needs to call into Xi.
Two steps: first use UpdateDeviceState() instead of replicating the device
changing code. And emulate XI events instead of core events.
2008-04-29 14:53:20 +09:30
Jeremy Huddleston
d5ab89f4f1 XQuartz: Unset CFProcessPath... blech
(cherry picked from commit ce4fbfbc75)
2008-04-28 15:55:01 -07:00
Jeremy Huddleston
0c2312b21b XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m)
(cherry picked from commit 22cf724376)
2008-04-28 15:42:12 -07:00
Jeremy Huddleston
c3dc4bdbb0 XQuartz: Disabled DPMS extension
(cherry picked from commit 1448fed9b6)
2008-04-28 15:42:02 -07:00
Jeremy Huddleston
07382a70c7 XQuartz: Added thread debugging to xprFrame.c
(cherry picked from commit 41542502b3)
2008-04-28 15:40:22 -07:00
Jeremy Huddleston
e973430608 XQuartz: More startup / threading house cleaning.
(cherry picked from commit 72653c24c0)
2008-04-28 11:49:19 -07:00
Jeremy Huddleston
4b46fc931e XQuartz: Updated Localizable.strings
(cherry picked from commit d8d9c866b9)
2008-04-28 11:49:18 -07:00
Jeremy Huddleston
4017ebe5bf XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST
(cherry picked from commit 03e707987f)
2008-04-28 11:49:16 -07:00
Jeremy Huddleston
0bd28315af Xquartz: Added missing to EXTRA_DIST
(cherry picked from commit f4b963256f)
2008-04-26 23:19:33 -07:00
Jeremy Huddleston
ef1c520537 XQuartz: Cleaned up startup and thread creation a tad.
(cherry picked from commit c861fe00e1)
2008-04-26 19:21:05 -07:00
Jeremy Huddleston
b114d4e861 XQuartz: Don't subtract the titlebar off of the pointer_y
(cherry picked from commit 00a9567acc)
2008-04-26 17:05:34 -07:00
Jeremy Huddleston
b9ca789635 XQuartz: Added some pseudoramiX debug traces
(cherry picked from commit 5bee1585a3)
2008-04-25 18:04:22 -07:00
Peter Hutterer
e251c9e75a Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac 2008-04-25 16:49:35 +09:30
Jeremy Huddleston
0209e46249 XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging.
(cherry picked from commit 515b8b855a)
2008-04-24 23:50:23 -07:00
Jeremy Huddleston
b65dbd350b XQuartz: Cleaned up multi-monitor support.
(cherry picked from commit c05abf0a19)
(cherry picked from commit 9112f29043)
2008-04-24 23:50:21 -07:00
Peter Hutterer
f5ac98747d Standardise copyright headers for all new files created as part of MPX. 2008-04-25 14:50:24 +09:30
Peter Hutterer
9ab4e2fd8e xfree86: don't free the config-file related information in DIDR. #15645
In DeleteInputDeviceRequest, leave the conf_idev (which is shared with
xf86ConfigLayout.input) alone for devices that were specified in the
ServerLayout section of the config file. This way, in the next server
generation we are left with what was the original config and can thus re-init
the devices.

This is an addon to 6d22a9615a, an attempt to
fix Bug 14418.

X.Org Bug 15645 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
X.Org Bug 14418 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
2008-04-24 14:19:28 +09:30
Peter Hutterer
7dc40c8eca xfree86: Don't free master devices.
The previous check works in the master-branch, but doesn't work with MPX. We
actually copy the SD's information into the MDs public.devicePrivate, so we
need to explicitly check whether a device is a MD before freeing the module.
2008-04-24 12:47:29 +09:30
Jeremy Huddleston
d09c520b32 Moved Apple GL bits into our DDX subtree
(cherry picked from commit c9356f3289)
2008-04-23 10:22:34 -07:00
Jeremy Huddleston
b05b416c62 XQuartz: No need to include indirect.c a second time
(cherry picked from commit 41ed532525)
2008-04-23 10:17:13 -07:00
Ben Byer
4e3a8af575 xquartz: clean up linker line for main binary
(cherry picked from commit 821d7400f2)
2008-04-23 10:16:55 -07:00
George Sapountzis
00effad583 xephyr: XEPHYR_DRI is identical to XF86DRI 2008-04-23 18:11:56 +03:00
George Sapountzis
6a9f7f28ec xephyr: sync with mesa 2008-04-23 18:11:56 +03:00
George Sapountzis
7ffc68c5cc xephyr: libGL is client lib 2008-04-23 18:11:56 +03:00
George Sapountzis
a27c244d72 xephyr: Makefile cleanup 2 2008-04-23 18:11:56 +03:00
George Sapountzis
d4d19b2f22 xephyr: Makefile cleanup 1 2008-04-23 18:11:56 +03:00
George Sapountzis
a88c6b6646 glcore: drop GLcore (files) 2008-04-23 18:11:55 +03:00
George Sapountzis
dd7a53f8f2 glcore: drop GLcore (build system) 2008-04-23 18:11:55 +03:00
George Sapountzis
567d389d47 glcore: build from mesa, dlopen from xorg
* The GLcore interface is disposable
* GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
  GLX_PROVIDER_INSTALL_DIR
2008-04-23 18:11:55 +03:00
George Sapountzis
efb723e166 glcore: prepare for dynamic loading
glcore gets linked with -ldl, -lpthread for s3tc and glapi
xserver needs
        DLOPEN_LIBS - to dlopen the glcore dso
        LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use

the ld flag is added to kdrive only when GLX is enabled, the net overhead for
Xephyr is ~155KB, could be reduced with --dynamic-list.
2008-04-23 18:11:55 +03:00
Julien Cristau
fbad87f2ae autoconfig: don't call closedir() when opendir() failed
If opendir() fails, return from matchDriverFromFiles() immediately.
Ubuntu bug 217647.
2008-04-23 14:59:24 +02:00
Jeremy Huddleston
76381092e8 XQuartz: Make sure QuartzAudioInit() gets run.
(cherry picked from commit bb3d034675)
(cherry picked from commit 824b31c7f8)
2008-04-23 02:22:28 -07:00
Peter Hutterer
275cdc1c74 xfree86: pass correct value to mieqEnqueue (merge detritus I guess) 2008-04-23 16:16:15 +09:30
Ross Burton
e77f65768e Reuse the existing framebuffer mode in kdrive/fbdev
When starting up kdrive/fbdev, if the current framebuffer mode is sensible use
that unless told otherwise.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2008-04-22 18:07:46 +01:00
Ross Burton
c4fd112153 Add mediumraw support to the linux kdrive driver
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2008-04-22 18:05:53 +01:00
Ross Burton
455383db95 Enable the epson kdrive driver
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2008-04-22 18:04:31 +01:00
Ross Burton
20a90bef8b Add a default touchscreen path
When enabling the touchscreen, open /dev/input/touchscreen0 if no path was
specified.
2008-04-22 16:37:02 +01:00
Peter Hutterer
8190ef8754 Merge branch 'master' into mpx
Conflicts:

	Xext/EVI.c
	Xext/appgroup.c
	Xext/cup.c
	Xext/mitmisc.c
	Xext/sampleEVI.c
	dix/window.c
2008-04-22 18:04:05 +09:30
Peter Hutterer
2ddbfd3457 xnest: re-enable XKB support. #10015
XKB was disabled in 08928afb05, with the comment
"Disable XKB, as we can't yet use it". Seems like "yet" is over, running GNOME
and changing XKB settings seems to work in Xnest now.

X.Org Bug 10015 <https://bugs.freedesktop.org/show_bug.cgi?id=10015>
2008-04-22 16:32:56 +09:30
Jeremy Huddleston
a8b8700c73 XQuartz: Fixed cmd-tab to bring all windows forward.
(cherry picked from commit e48e2ce931)
2008-04-21 23:45:00 -07:00
Jeremy Huddleston
590688131d XQuartz: Fixed quit dialog to be more conforming with HIG.
(cherry picked from commit 14c6b837bb)
2008-04-21 19:08:30 -07:00
Ben Byer
570b0dca26 Fix for pointer-offset issue when using a multi-display environment on X11.app.
(cherry picked from commit 9a7e14286c)
2008-04-21 17:55:19 -07:00
Jordan Crouse
4fa89fbe18 xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode' 2008-04-21 12:09:00 -06:00
Julien Cristau
40c6be1408 Minor xorg.conf manpage fixups
Use __libmansuffix__ instead of __oslibmansuffix__ which isn't getting
replaced, and rewrap some text to get __xservername__ replaced in the
description of Option "Accel" (cpp doesn't like the preceding quote).
2008-04-20 20:36:44 +02:00
Jeremy Huddleston
4bcfed2f9c Revert "Removed XWin DDX"
This reverts commit 6550078b09.

Doctor, I'm starting to get a pulse...
2008-04-20 08:35:42 -07:00
Jeremy Huddleston
14396fdeba XQuartz: Cleanup turning off COMPOSITE
(cherry picked from commit 8f920fca6f)
2008-04-20 01:24:54 -07:00
Jeremy Huddleston
d13828797f XQuartz: Cleaned up some casting to get rid of compiler warnings
(cherry picked from commit 6f1c85b965)
2008-04-20 01:24:51 -07:00
Jeremy Huddleston
6550078b09 Removed XWin DDX 2008-04-19 09:29:46 -07:00
Jeremy Huddleston
ed9dabb47c Last of the spam... I promise...
(cherry picked from commit 45ebee4f72)
2008-04-18 20:31:06 -07:00
Jeremy Huddleston
49f2bb4681 XQuartz: More sanitization of the namespace
(cherry picked from commit bc50d41f9d)
2008-04-18 20:25:38 -07:00
Jeremy Huddleston
c2f0d020b5 XQuartz: Removed unneccessary include
(cherry picked from commit 45ff59e69e)
2008-04-18 20:12:05 -07:00
Jeremy Huddleston
5183fea6d3 XQuartz: Handled sanitization of namespace better
(cherry picked from commit 8cb23d6721)
2008-04-18 20:07:55 -07:00
Ben Byer
edd3fb784b random flailing
(cherry picked from commit 7fb9b2dc61)
2008-04-18 20:07:41 -07:00
Adam Jackson
a7503615a6 Death to TOG-CUP.
If you still care about 8bpp visuals that much, fix Composite to provide
synthetic visuals.
2008-04-18 19:56:41 -04:00
Eric Anholt
25827fde68 Nuke the MIT-SUNDRY-NONSTANDARD extension.
This extension provided bug-compatibility with pre-X11R6, but has been
stubbed out in our server since 2006 to return BadRequest when you actually
asked for it.
2008-04-18 16:37:08 -07:00
Adam Jackson
eafaf40fb3 Death to APPGROUP. 2008-04-18 18:50:05 -04:00
Adam Jackson
f6617b4127 Death to Extended Visual Information. 2008-04-18 18:28:01 -04:00
Jeremy Huddleston
c14f5dc237 XQuartz: Forgot to commit xprEvent.[hc] ...
(cherry picked from commit 70e543baf2)
2008-04-17 20:31:24 -07:00
Ben Byer
22bb7608a0 Added XKB support for Xquartz
(cherry picked from commit 56dc121520)
2008-04-17 17:25:55 -07:00
Jeremy Huddleston
652479dba3 XQuartz: Moved some rootless-specific cruft into xpr
(cherry picked from commit 31625cc03b)
2008-04-17 15:50:11 -07:00
Jeremy Huddleston
2a1ba20af9 XQuartz: Use a mutex to ensure we only have one thread calling mieqEnqueue at a time.
(cherry picked from commit 7b087c965b)
2008-04-17 15:24:35 -07:00
Jeremy Huddleston
55f80d7545 XQuartz: A little more debugging output from threadSafety
(cherry picked from commit f6fbdbf838)
2008-04-17 15:24:33 -07:00
Jeremy Huddleston
0d61f6fca1 XQuartz: Fixed some missing prototypes
(cherry picked from commit 95056afc56)
2008-04-17 13:21:13 -07:00
Jeremy Huddleston
dbd4c03156 XQuartz: Added framework for asserting which thread we're in.
(cherry picked from commit 00beb98251)
2008-04-17 13:21:02 -07:00
Jeremy Huddleston
a3d40f0549 XQuartz: Include version info for CrashReporter
(cherry picked from commit b4992755c3)
2008-04-17 11:57:45 -07:00
Jeremy Huddleston
6d11712c2a XQuartz: Use strerror(errno)... cause I like text more than grepping header files
(cherry picked from commit 1b4c37d8f9)
2008-04-17 11:07:20 -07:00
Jeremy Huddleston
dcf4f917cc merged darwinKeyboard.[ch] into quartzKeyboard
(cherry picked from commit 57bb073209)
2008-04-17 11:03:31 -07:00
Ben Byer
582397cd02 oops, missed a spot
(cherry picked from commit 19872a6aeb)
2008-04-17 10:42:08 -07:00
Ben Byer
0bd1c369cc formatting cleanup
(cherry picked from commit 769acd2934)
2008-04-17 10:42:00 -07:00
Ben Byer
700e14c226 delete debugging spew
(cherry picked from commit f04f3af86a)
2008-04-17 10:41:55 -07:00
Ben Byer
a440eebf25 add support for horizontal scrolling (buttons 6 and 7)
(cherry picked from commit f525a4a432)
2008-04-17 10:41:50 -07:00
Ben Byer
612e901ef6 enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm
(cherry picked from commit ab662c736e)
2008-04-17 10:41:46 -07:00
Ben Byer
5bdfbfbedc darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx
(cherry picked from commit a8a090b853)
2008-04-17 10:41:42 -07:00
Ben Byer
58e42683c9 hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels
(cherry picked from commit cab54466a6)
2008-04-17 10:41:38 -07:00
Ben Byer
cd3470a0cf kludge: miEqEnqueue wants a device, even if we're passing custom messages,
so give it one
(cherry picked from commit a494ff04b2)
2008-04-17 10:41:30 -07:00
Drew Parsons
966ae1781f Create dix/libXpdix.la for Xprint-specific build of libdix.la
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)

required because of commit 7c0709a736,
which made requestingClient in dix specific to Xprint only.
Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
$(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.

Follows 571206832d (providing -DXPRINT
to xprint subdirs).

Note it may be possible to restructure the code so that
requestingClient is stored elsewhere than in dix. See discussions
following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
If this is done it may be possible to revert this commit (if not 571206...).
2008-04-18 01:20:36 +10:00
Drew Parsons
571206832d Define XPRINT in XPRINT_CFLAGS (configure.ac)
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736 it is also
required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
defined, so make it a global Xprint definition in configure.ac.
(cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
2008-04-18 01:14:01 +10:00
Jeremy Huddleston
8716d081fd XQuartz: Don't enable rootless accelerated functionality... crashy...
(cherry picked from commit cdb4c291d8)
2008-04-16 23:14:06 -07:00
Jeremy Huddleston
2ffdb0eb64 XQuartz: Don't use composite.
(cherry picked from commit 6d3d344b5b)
2008-04-16 21:54:00 -07:00
Jeremy Huddleston
757a1bf3a3 Xquartz: Don't need to link against rlAccel since we don't use it
(cherry picked from commit 180ec128ad)
2008-04-16 21:53:03 -07:00
Jeremy Huddleston
9e7ced94a5 XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
(cherry picked from commit cb27d5ca82)
2008-04-15 12:06:07 -07:00
Kristian Høgsberg
35982bc109 Make DRI2 a serverlayout/serverflags option.
Add xf86DRI2Enabled() to export the value of the setting.
2008-04-14 15:23:57 -04:00
Matt Turner
1fa4de80fc Check for __x86_64__ when we check for __amd64__
It seems Intel C Compiler neglects to define __amd64__, __amd64, or
amd64, but *does* define __x86_64__.
2008-04-12 20:39:18 +02:00
Jeremy Huddleston
b1f3f42840 Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking
(cherry picked from commit 55d9973b05)
2008-04-11 17:50:04 -07:00
Adam Jackson
0dab6fa358 So long, and thanks for all the cfb. 2008-04-11 09:47:51 -04:00
Peter Hutterer
6d22a9615a dix: Call DeleteInputDeviceRequest from CloseDownDevices (#14418)
The DDX (xfree86 anyway) maintains its own device list in addition to the one
in the DIX. CloseDevice will only remove it from the DIX, not the DDX. If the
server then restarts (last client disconnects), the DDX devices are still
there, will be re-initialised, then the hal devices come in and are added too.
This repeats until we run out of device ids.

This also requires us to strdup() the default pointer/keyboard in
checkCoreInputDevices.

X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418>
2008-04-11 18:45:32 +09:30
Eric Anholt
a7e3ad1c6b Remove NDEBUG (assert() disable) define from the X Server.
A few pieces of code were abusing this define for other purposes, which are
converted to #ifndef DEBUG instead.  There should be no ABI consequences
to this change.

The rationale is that having the define in xorg-server.h also disables
assert() drivers, which is unexpected, and also difficult to avoid since
xorg-server.h is included in their config.h, and you can't put a #undef in
config.h.  As for removing it from the server instead of moving it to an
internal header, we probably shouldn't have unnecessary assert()s in
critical server paths anyway, and if we do we could #define NDEBUG in the
specific cases needed.
2008-04-10 10:35:14 -07:00
Peter Hutterer
df2545b98d xfree86: Sanity check before retrieving the paired device.
Some pointer devices send key events [1], blindly getting the paired device
crashes the server. So let's check if the device is a pointer before we try to
get the paired device.

[1] The MS Wireless Optical Desktop 2000's multimedia keys are sent through
the pointer device, not through the keyboard device.
2008-04-10 08:50:43 +09:30
Dave Airlie
b19027fbae quirk: add quirk for ACR 640x350 default mode is wrong
RH #440186
2008-04-09 14:34:11 +10:00
Ben Byer
1f8188656a add missing dix-config include
(cherry picked from commit 126e9bc8c4)
2008-04-08 21:25:15 -07:00
Jeremy Huddleston
3f51f493b6 XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
(cherry picked from commit df21312c8b)
(cherry picked from commit 2d4194a8d1)
2008-04-08 17:03:18 -07:00
Peter Hutterer
fd06e8f8c1 Merge branch 'master' into dcdc_rework
Conflicts:

	Xext/xevie.c
	dix/dispatch.c
2008-04-07 07:56:41 +09:30
Sascha Hlusiak
539bf3c283 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2008-04-07 00:10:16 +02:00
Sascha Hlusiak
3ab33e7cd4 Remove stale code
The jstk code for Joysticks is not used by any module, was never actually compiled and uses an API
that is deprecated these days.

No reason to keep it.
2008-04-06 23:23:47 +02:00
Adam Jackson
cc7c045bae Fix PCI config space cycles from int10 emulator.
The top bit of 0xCF8 is an enable bit, not part of the domain.  Sending
cycles to domain 128 instead of domain 0 is rarely the right thing to do.
2008-04-04 12:58:12 -04:00
Kristian Høgsberg
16a8ce7558 Only autoload RECORD if it was enabled. 2008-04-04 10:47:46 -04:00
Dave Airlie
f0915fb3c4 quirk: add quirk for ACER EDID 2008-04-04 09:59:40 +10:00
Jeremy Huddleston
2e42b67b82 XQuartz: Change reporting of space change to debug log rather than stderr
(cherry picked from commit ed15556a9f)
2008-04-02 18:05:55 -07:00
Ben Byer
c737d04c75 The AppKit thread should not be calling directly into the X server
functions to change state when the keyboard is reloaded; instead,
pass it as an event.
(cherry picked from commit 7e653f806f)
2008-04-02 17:48:24 -07:00
Ben Byer
15b0084f1a formatting cleanup for X11Application.m (no code changes)
(cherry picked from commit eb083d3f68)
2008-04-02 17:48:15 -07:00
Ben Byer
e9e2d88436 moved and renamed QuartzMessageServerThread to
DarwinSendDDXEvent to make more clear what it actually does.
(cherry picked from commit bee2b377ef)
2008-04-02 17:48:01 -07:00
Ben Byer
c1be4e3379 shovelling code around ...
(cherry picked from commit 2143182ba4)
2008-04-02 17:47:59 -07:00
Ben Byer
985c631b2e just a bit of juggling headers around -- we're preparing
to call our Xquartz-specific event handlers directly
as mieqHandlers
(cherry picked from commit 4aedba5aa7)
2008-04-02 17:47:57 -07:00
Ben Byer
89f1d880e8 nuke DarwinEventQueue
(cherry picked from commit 1e0ec02202)
2008-04-02 17:47:52 -07:00
Jeremy Huddleston
8944b77ec0 continue with gutting darwinEvents.c
(cherry picked from commit c34fce7051)
2008-04-02 17:47:42 -07:00
Jeremy Huddleston
aa6d12e93e turns out we weren't actually using these files. oops
(cherry picked from commit bfec44d7b4)
2008-04-02 17:46:59 -07:00
Ben Byer
6c5962e447 remove vestigal DarwinEQPointerPost etc
(cherry picked from commit a25704c423)
2008-04-02 17:45:28 -07:00
Ben Byer
c6f0d5d1e5 gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment)
(cherry picked from commit a9e081a60c)
2008-04-02 17:45:23 -07:00
Ben Byer
5b6c273eaa add prototype for DarwinEventHandler
(cherry picked from commit 9a03ae33c4)
2008-04-02 17:45:20 -07:00
Ben Byer
3713be8b47 add logging of current thread ID to DEBUG_LOG macro
(cherry picked from commit 5848510cc5)
2008-04-02 17:45:17 -07:00
Ben Byer
1400a51ae7 Begin to move all of our Xquartz DDX-specific event handlers
to miEQ, in preparation to remove the DDX-specific code entirely.
(cherry picked from commit 3f4447b95f)
2008-04-02 17:45:09 -07:00
Jeremy Huddleston
8746daa673 XQuartz: Fixed missing close-paren in preference pane text.
(cherry picked from commit ea37e151dc)
2008-04-02 17:33:22 -07:00
Kristian Høgsberg
b5a0a865c3 Pick up dri2proto from the standard proto header include path. 2008-04-02 19:21:41 -04:00
Kristian Høgsberg
7c20f65fea Add @XORG_CFLAGS@ to satisfy xf86* includes.
Pointed out by Hasso Tepper.
2008-04-02 19:08:33 -04:00
Xiang, Haihao
b31de6a590 dri2: fix crasher if DRI2Connect fails 2008-04-02 16:29:30 +10:00
Hong Liu
ebc56aca8b Bug #15160: quirk Proview AY765C
prefer first detailed timing
2008-04-02 10:46:03 +08:00
Goneri Le Bouder
9500033b9e xfree86: don't crash in AutoConfig if the primary device is not pci
Only call matchDriverFromFiles() if we found a pci device.
Debian bug#472823 (http://bugs.debian.org/472823).
2008-04-01 20:23:38 +02:00
Ben Byer
a4d0349411 Add code to track 5 valuators for pointing device, in preparation
for supporting tablet input in Xquartz.
(cherry picked from commit 22c8849ea819eb70a14b2e06330b11b22aa63ebc)
2008-03-31 16:44:23 -07:00
Ben Byer
6648867d8b add debug statements so we can see if/when our Xinput stubs are getting called.
(cherry picked from commit 6e160bbe15dd2c2b8685847c06831cb6aebc6f74)
2008-03-31 16:44:22 -07:00
Ben Byer
19ff23ab0e Remove calls to InitValuatorAxisStruct -- these are now handled in dix by
InitValuatorDeviceClass.
Add InitProximityClassDeviceStruct call to prepare for tablet support.
(cherry picked from commit 1bd980a5b114f5320360943214f8f9f23b29c1e3)
2008-03-31 16:44:21 -07:00
Kristian Høgsberg
c40e0b51f0 Implement DRI2 direct rendering and update AIGLX to DRI interface changes.
Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
__GLXcontext.  Drop all #includes of glcontextmodes.h and glcore.h.
Drop the DRI context modes extension.

Add protocol code to DRI2 module and load DRI2 extension by default.
2008-03-31 16:50:58 -04:00
Jeremy Huddleston
b8ea9f2a25 XQuartz: Fixed names of enums to be more consistent
(cherry picked from commit c309a08806daf5d716a860c709e51eacad2c745a)
2008-03-28 17:03:20 -07:00
Jeremy Huddleston
bd28839eb8 =?utf-8?q?XQuartz:=20Another=20Expos=C3=A9=20fix:=20F9=20doesn't=20raise=20all=20windows
=20(cherry=20picked=20from=20commit=20b9cffa20debae73737c674bf75ab65db1bd74556)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
2008-03-28 17:03:19 -07:00
Adam Jackson
933ffcdf7d Compile fix. 2008-03-28 17:53:55 -04:00
Adam Jackson
9e8451d869 Add E-EDID segment selection. 2008-03-28 17:43:10 -04:00
Adam Jackson
0b4aef4d6d Refactor DDC2 code to allow for proper segmented addressing. 2008-03-28 17:43:01 -04:00
Adam Jackson
88ece11d6c Start E-EDID support in the DDC module.
Since there's no way to safely know how many blocks xf86DoEDID_DDC2 would
return, add a new xf86DoEEDID entrypoint to do that, and implement the
one in terms of the other.
2008-03-28 17:39:23 -04:00
Eamon Walsh
b5f98fcea2 XSELinux: Add xorg.conf option for permissive/enforcing/disabled.
Patch by Joe Nall.

The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
2008-03-28 14:14:23 -04:00
Jeremy Huddleston
415e49b940 XQuartz: Sanity-check the removal of the 256-color option
Fixes the 'one-time-preferences' bug in 2.2.0_rc1
(cherry picked from commit 38cbd13490)
2008-03-27 19:22:07 -07:00
Ben Byer
c1d37efe9a xquartz: copy in new stubs from Xi/stubs.c to replace our old
Xinput stubs.  Hey, it's a start.
(cherry picked from commit 566412b4aece24ae6af8c7c835986b685aa456a2)
2008-03-27 19:14:50 -07:00
Ben Byer
c4a616a741 prevent "fake mouse clicks" from generating spurious extra events
(cherry picked from commit bd85a24969427e41389688663ead2d4dd41c9999)
2008-03-27 19:14:39 -07:00
Dave Airlie
c747030a49 quirk: fix LPL monitors properly.
no point having a h cm fix when we really want to copy the sizes from the
other place.

RH BZ 435216
2008-03-27 15:19:52 +10:00
David Nusinow
f028e245a7 Bug #10016: Implement WM_CLASS hints in Xephyr. 2008-03-24 16:06:33 -04:00
Adam Jackson
862ff9ac92 Bug #11510: Fix build without RECORD. 2008-03-24 13:37:42 -04:00
Adam Jackson
87bfd3bd96 Bug #11508: Fix build without XV. 2008-03-24 13:33:38 -04:00
Julien Cristau
4217ba0cf0 xaa: use xf86ReturnOptValBool instead of xf86IsOptionSet
The latter doesn't return the option's value, just whether it's present
in the configuration.
2008-03-22 17:53:45 +01:00
Julien Cristau
6b9d2bb1f7 exa: use xf86ReturnOptValBool instead of xf86IsOptionSet
The latter doesn't give you the option's value, it just tells you if
it's present in the configuration.  So using Option "EXANoComposite" "false"
disabled composite acceleration.
2008-03-22 17:28:48 +01:00
Jeremy Huddleston
6385947396 XQuartz: Disable 256 color option and fullscreen option
(cherry picked from commit 7c1964338a)
2008-03-21 19:37:49 -07:00
Jeremy Huddleston
93daa3a3bf Xquartz: Added separate preference tab for quartz-wm settings
Added FFM and "Focus on new window" options
(cherry picked from commit 6841d078b7)
2008-03-21 19:37:46 -07:00
Jeremy Huddleston
c49e112683 XQuartz: Initial framework for dealing with spaces on OS-X
(cherry picked from commit 9831324998)
2008-03-21 19:37:42 -07:00
Jeremy Huddleston
4c76607b69 Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
(cherry picked from commit f03202ad15)
2008-03-21 19:33:21 -07:00
Jeremy Huddleston
87c64cfd69 =?utf-8?q?Apple:=20Xserver=20half=20of=20the=20Expos=C3=A9=20bug-fix=20(requires=20updated=20libXplugin=20from=20Apple...=20coming=20with=202.2)
=20(cherry=20picked=20from=20commit=2037be23e8c1d8e5c7a1157e9d66ef3f30a4c472c5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
2008-03-21 19:33:21 -07:00
Michel Dänzer
da973e962d Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
platforms) fixes it for me with the radeon driver and doesn't break intel.

Correct patch this time :)
2008-03-20 09:18:29 -04:00
Alex Deucher
f8c1eb29e2 Revert "Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB"
This reverts commit 2673525796.

Pushed the wrong patch.
2008-03-20 09:14:41 -04:00
Michel Dänzer
2673525796 Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
See bug 11796
2008-03-19 19:12:37 -04:00
Dodji Seketeli
cdadd2ff9b [Xephyr/DRI] correctly route motion events targeted at GL drawable 2008-03-18 14:02:41 +01:00
Jesse Barnes
afd7428690 Cleanup logic in xf86PrepareOutputs
Should have done this in the first place.  Since we're checking for the absence
of the get_crtc callback in the first place, we'll short circuit the later call
and disable the output, so the ugly "continue" block is unnecesary.
2008-03-17 14:55:44 -07:00
Jesse Barnes
ba85caacb5 Make xf86SetDesiredModes aware of current output configuration
By adding a new output callback, ->get_crtc, xf86SetDesiredModes is able to
avoid turning off outputs & CRTCs if the current output<->CRTC mappings are the
same as the desired configuration.  This helps avoid flickering displays at
startup time, which speeds things up a little and looks better.
2008-03-17 14:13:09 -07:00
Jesse Barnes
bee2ddf35f Fail CRTC configuration if !vtSema
Unless we check for vtSema before calling into the CRTC and output callbacks,
we may end up trying to access video memory that no longer exists, leading to a
crash.  So if we don't have vtSema, return FALSE to the caller, indicating that
we didn't do anything.

Fixes #14444.
2008-03-17 08:33:01 -07:00
Matthieu Herrb
db248ffb84 test for the presence of pci_system_init_dev_mem() before calling it.
This avoids creating a dependency on -current libpciaccess for
BSD systems other than OpenBSD (which don't otherwise need it).
2008-03-16 18:46:11 +01:00
Donnie Berkholz
aa231f28d5 Xephyr: Build fix: Port across XF86dri.c changes from Mesa. 2008-03-14 18:43:41 -07:00
Donnie Berkholz
a955c3b587 Xephyr: Distribute ephyrdriext.h in tarballs. 2008-03-14 18:43:40 -07:00
Adam Jackson
57d48d94b8 Fix a stray use of ALLOCATE_LOCAL. 2008-03-14 14:46:03 -04:00
Adam Jackson
8248537722 RANDR 1.2: Fix initial mode aspect ratio match in a corner case.
Actually more like in the mainline case, where the ideal mode happens to
be the very first aspect match on the first monitor.  But let's not
split hairs.
2008-03-14 14:24:21 -04:00
Bart Trojanowski
1b9878ffcf Bug #14332: Fix PCI access cycles from x86emu.
The address written to 0xcf8 contains the PCI slot address to send the
config cycle to.  However, we would ignore that and always send the
cycle to the device whose BIOS we were running.  This breaks some
integrated graphics platforms that have explicit knowledge about the
system's host bridge, for example.
2008-03-13 17:42:16 -04:00
Doug Chapman
f7abe05b33 Bug #14091: Fix build (and runtime) on ia64. 2008-03-13 17:40:34 -04:00
Adam Jackson
5d7437c29e RANDR 1.2: Fix the RANDR 1.1 screen size estimation to approach reality.
While the ScreenRec's notion of size in millimeters would get updates,
the RANDR 1.1 notion wouldn't, so your screen would appear to be square
and probably at some ludicrous DPI.
2008-03-13 17:37:12 -04:00
Adam Jackson
61c3f63a75 RANDR 1.2: Don't report a square resolution to RANDR 1.1 clients.
It can't possibly do anything useful, and older versions of Gnome (and
proably others) get very confused by it.  So do the drivers, for that
matter.
2008-03-13 17:34:54 -04:00
Mark Kettenis
06c0372c3a OpenBSD support for libpciaccess.
xserver and libpciaccess both need to open /dev/xf86, which can only
be opened once.  I implemented pci_system_init_dev_mem() like Ian
suggested.  This requires some minor changes to the BSD-specific
os-support code.  Since pci_system_init_dev_mem() is a no-op on
FreeBSD this should be no problem.
2008-03-12 21:45:37 +01:00
Matthias Hopf
2036851125 Return randr interface version in xf86CrtcScreenInit()
Necessary to allow drivers to be run-time backwards compatible when using the
modes/ functions w/o providing their own copy.
2008-03-12 11:37:28 +01:00
Kristian Høgsberg
bc504ffbba DRI2: Add DRI2AuthConnection().
DRI2 uses the same authentication scheme as XF86DRI, so implement this
entry point so DRI2 protocol code can access it.
2008-03-11 00:56:16 -04:00
Adam Jackson
ab9b0b36ac Add the "amd" driver to magic driver selection. 2008-03-10 13:40:00 -04:00