Commit Graph

3096 Commits

Author SHA1 Message Date
Jeremy Huddleston a07c5ad172 XQuartz: Set bundle version to 2.3.0
(cherry picked from commit 8a0524b30e1e860f3ae35741c116fc8da28aef79)
2008-05-08 19:58:15 -07:00
Jeremy Huddleston 05f23ed3ea XQuartz: Fixed some issue in our bundle creation
(cherry picked from commit 330ffad5477e32c5ab9ed338bc628bd5ae9f4c98)
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 56b7988d2662caa4d31094695b414080e4470ed4)
2008-05-06 03:04:13 -07:00
Jeremy Huddleston 077ced6384 XQuartz: Added uncommitted files
(cherry picked from commit e414ec462cfc63f8eb7f504f526f5a2c73f51e69)
2008-05-06 03:04:09 -07:00
Jeremy Huddleston 80e502c5d1 Fixed up dist
(cherry picked from commit f225222ba2bf4f03425107f258d60b73c88efaec)
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 453a982e6382cff06ea27abba225440b07068f50)
2008-05-06 02:49:48 -07:00
Ben Byer d41d677ab4 Xquartz: experimental embedding of Sparkle.framework
(cherry picked from commit b7a1a640cef8c69442859cbf89034ad362a19684)
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 8d9eab3a2ec5955cc2698fdcb1fa6ed12b2aadb7)
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 ff10c37bdd09656cf2f7ee9577f5552caa1ffdb8)
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 f2020b9836bacd0593ac0b4c8541e32714ab02a9)
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 1fcf74a436f2e19cceb3f285b89859025d94c040)
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 50641bce730ee03738fa0c4beb8125b34fda556f)
2008-04-29 23:59:34 -07:00
Ben Byer 519581b0ba xquartz: remove unused params from DarwinEQInit
(cherry picked from commit 299a056737168ca1faefd675dce6d6ab13176be9)
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 588683cecca2cfc65a28de035cd6ee3d64ff59d2)
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 ce4fbfbc75c62a092214d140c7550279aebe69ef)
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 22cf72437601c07b8a6c744b4f2f1f4cd6713e60)
2008-04-28 15:42:12 -07:00
Jeremy Huddleston c3dc4bdbb0 XQuartz: Disabled DPMS extension
(cherry picked from commit 1448fed9b6d484f471b9b2982c76ca921a9273b9)
2008-04-28 15:42:02 -07:00
Jeremy Huddleston 07382a70c7 XQuartz: Added thread debugging to xprFrame.c
(cherry picked from commit 41542502b321c697271c1752525b600872b6df96)
2008-04-28 15:40:22 -07:00
Jeremy Huddleston e973430608 XQuartz: More startup / threading house cleaning.
(cherry picked from commit 72653c24c00dfba64ce35a3d400598bcd77defc1)
2008-04-28 11:49:19 -07:00
Jeremy Huddleston 4b46fc931e XQuartz: Updated Localizable.strings
(cherry picked from commit d8d9c866b90fb24c93bd6e25fa90f8f2bf58ad34)
2008-04-28 11:49:18 -07:00
Jeremy Huddleston 4017ebe5bf XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST
(cherry picked from commit 03e707987f7f32e47dd0355c6d16bfb9169a379b)
2008-04-28 11:49:16 -07:00
Jeremy Huddleston 0bd28315af Xquartz: Added missing to EXTRA_DIST
(cherry picked from commit f4b963256feb03e9e6b5521bdefeb390e9a49688)
2008-04-26 23:19:33 -07:00
Jeremy Huddleston ef1c520537 XQuartz: Cleaned up startup and thread creation a tad.
(cherry picked from commit c861fe00e112b21ee0156d09a6cd5281642a1dcc)
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 00a9567acce2b27a649cbebd4790e3043688a7d8)
2008-04-26 17:05:34 -07:00
Jeremy Huddleston b9ca789635 XQuartz: Added some pseudoramiX debug traces
(cherry picked from commit 5bee1585a399eab0a7b6fc80ad476d81b5d227d3)
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 515b8b855ac5d2d5aef881053f73b2ad07a6dd2e)
2008-04-24 23:50:23 -07:00
Jeremy Huddleston b65dbd350b XQuartz: Cleaned up multi-monitor support.
(cherry picked from commit c05abf0a19b0ef0fc4ace9400a095ce2521456bc)
(cherry picked from commit 9112f290434c246d3e797551aaaf3a89d2006b23)
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 c9356f32892978faecb30f7b7af7488820ce37ff)
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 41ed532525da85d1bd2c20af5ffa28ac6d1f4996)
2008-04-23 10:17:13 -07:00
Ben Byer 4e3a8af575 xquartz: clean up linker line for main binary
(cherry picked from commit 821d7400f2ff917497b2ee58ceef2b69c2d47ec7)
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 bb3d034675b70e22e78df5554cab0ec2a3d913d0)
(cherry picked from commit 824b31c7f8144a67a320442abd3d854e99d2bfe2)
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 e48e2ce931228f4dfa36c39b8ec8c72a58025b1b)
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 14c6b837bb03bd0956f90882f550847f13d0ca09)
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 9a7e14286ced55c5e2a4512e2629e03836443009)
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 8f920fca6f9149185649d52569d33bf81b6c6857)
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 6f1c85b96550adf0bc34efb6ca649b87bcc1b18c)
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 45ebee4f729b148a75e925a4863b4eb850c88f8e)
2008-04-18 20:31:06 -07:00
Jeremy Huddleston 49f2bb4681 XQuartz: More sanitization of the namespace
(cherry picked from commit bc50d41f9d1aec04f0de0478cbd5036f1fe9b81e)
2008-04-18 20:25:38 -07:00
Jeremy Huddleston c2f0d020b5 XQuartz: Removed unneccessary include
(cherry picked from commit 45ff59e69eddfcceafced31cf6e73e381d0f6914)
2008-04-18 20:12:05 -07:00
Jeremy Huddleston 5183fea6d3 XQuartz: Handled sanitization of namespace better
(cherry picked from commit 8cb23d672177da919257c885804cecd18cf9af88)
2008-04-18 20:07:55 -07:00
Ben Byer edd3fb784b random flailing
(cherry picked from commit 7fb9b2dc615a3bd1a3c087438af7a8b88265cfaa)
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 70e543baf2508d636f01b2b7e8cb05172195b68c)
2008-04-17 20:31:24 -07:00
Ben Byer 22bb7608a0 Added XKB support for Xquartz
(cherry picked from commit 56dc1215202746590dbe8758411f47e8876e1317)
2008-04-17 17:25:55 -07:00
Jeremy Huddleston 652479dba3 XQuartz: Moved some rootless-specific cruft into xpr
(cherry picked from commit 31625cc03b58317120c2ac7877e227e2322e1de8)
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 7b087c965bce9f440ab5233d6383aa4a7de969b8)
2008-04-17 15:24:35 -07:00
Jeremy Huddleston 55f80d7545 XQuartz: A little more debugging output from threadSafety
(cherry picked from commit f6fbdbf838ab77c3a4635f0b2356b1bbb060ff5b)
2008-04-17 15:24:33 -07:00
Jeremy Huddleston 0d61f6fca1 XQuartz: Fixed some missing prototypes
(cherry picked from commit 95056afc562cfe58b116f5c36e4624018e79ff4a)
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 00beb982510e7a82d77e1f1d43e77c84d7bf74c2)
2008-04-17 13:21:02 -07:00
Jeremy Huddleston a3d40f0549 XQuartz: Include version info for CrashReporter
(cherry picked from commit b4992755c3e29086c5939683c38fa8fd7d2e6754)
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 1b4c37d8f9b517fbec5b94ed4e4a5e86a31472a5)
2008-04-17 11:07:20 -07:00
Jeremy Huddleston dcf4f917cc merged darwinKeyboard.[ch] into quartzKeyboard
(cherry picked from commit 57bb07320908b74facea0a97822bb19ed6f960a9)
2008-04-17 11:03:31 -07:00
Ben Byer 582397cd02 oops, missed a spot
(cherry picked from commit 19872a6aeb8ee9cb0e33e4b4ffd794c9dbefe0cf)
2008-04-17 10:42:08 -07:00
Ben Byer 0bd1c369cc formatting cleanup
(cherry picked from commit 769acd29348abf9e5b0bebfca6ae695d345f3077)
2008-04-17 10:42:00 -07:00
Ben Byer 700e14c226 delete debugging spew
(cherry picked from commit f04f3af86a91d0cafbc86a0d71aeb0599d685f07)
2008-04-17 10:41:55 -07:00
Ben Byer a440eebf25 add support for horizontal scrolling (buttons 6 and 7)
(cherry picked from commit f525a4a432ebd0545ad1dd0a7ad84ad3e47e8b61)
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 ab662c736e0654e2b4347091f0d9e87f26034216)
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 a8a090b853e811b9843a5732572cbbe542224f32)
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 cab54466a61281cfafc12825017c23d720cd75f4)
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 a494ff04b2a14470eaf5a23c7cf6dbdea182c6d1)
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 cdb4c291d8c10c3a9ea59d8e79275a30d2ea82b4)
2008-04-16 23:14:06 -07:00
Jeremy Huddleston 2ffdb0eb64 XQuartz: Don't use composite.
(cherry picked from commit 6d3d344b5b95b6dc4166556d03cfd8c9576dc3f0)
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 180ec128adef11a9a90cea1189dc31ac5de8359f)
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 cb27d5ca8230707b276763c0ec20e586203144c9)
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 55d9973b053f25bb95b26e00351dc5531caf5b04)
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 126e9bc8c480b403dedc44c1e8c4fe1476340ed9)
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 df21312c8b0e9ef0c809bfc57cdf64f27db0d8a7)
(cherry picked from commit 2d4194a8d124e7a9c7cd1b83635ba6957aa4ae1c)
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 ed15556a9fc4ebdb88f42961052fc8456082165f)
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 7e653f806ff5508aace059312156f319a9ed4479)
2008-04-02 17:48:24 -07:00
Ben Byer 15b0084f1a formatting cleanup for X11Application.m (no code changes)
(cherry picked from commit eb083d3f68f459d90417558da1ed00729b749950)
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 bee2b377efc930e25017636e5112093a3a6549c7)
2008-04-02 17:48:01 -07:00
Ben Byer c1be4e3379 shovelling code around ...
(cherry picked from commit 2143182ba49195bbb2e9163ea6872fd68e7a4a85)
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 4aedba5aa727e22316e8ca456f7218bea9ee0313)
2008-04-02 17:47:57 -07:00
Ben Byer 89f1d880e8 nuke DarwinEventQueue
(cherry picked from commit 1e0ec02202eeaffae480048b91bf02140ee29f8a)
2008-04-02 17:47:52 -07:00
Jeremy Huddleston 8944b77ec0 continue with gutting darwinEvents.c
(cherry picked from commit c34fce7051b996633291dddc061b696ff737f3fb)
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 bfec44d7b4baf0ad0aae55c8209bc60ac93c5b58)
2008-04-02 17:46:59 -07:00
Ben Byer 6c5962e447 remove vestigal DarwinEQPointerPost etc
(cherry picked from commit a25704c423598d596fd7f2ed4290d4b860bd5d5f)
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 a9e081a60ca227c0d96d4613075d97d6b762366a)
2008-04-02 17:45:23 -07:00
Ben Byer 5b6c273eaa add prototype for DarwinEventHandler
(cherry picked from commit 9a03ae33c4f9de830f15eabf3b994882ead7c000)
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 5848510cc5a8091b30230ab920d904ca6b159480)
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 3f4447b95f73a82b3aa0f7b0d1640aba5fb0d1bc)
2008-04-02 17:45:09 -07:00
Jeremy Huddleston 8746daa673 XQuartz: Fixed missing close-paren in preference pane text.
(cherry picked from commit ea37e151dc6032d2a1a33cef809f2a7d507aae35)
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 38cbd13490fc21724e8eef0ec7e1a20a9cc2e39d)
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 7c1964338a33558d3f25e369dfca99e3ef9d10f9)
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 6841d078b7cb0b0db3db948d26b4d5ec7747deb8)
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 9831324998f9d1f05ff944c58c5bf60dcae17355)
2008-03-21 19:37:42 -07:00
Jeremy Huddleston 4c76607b69 Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
(cherry picked from commit f03202ad15457c98be7ca78cc59bac88cf5f1966)
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
Adam Jackson 0f6aaf636b Bug #14927: Fix the math for xf86NumDefaultModes. 2008-03-10 09:14:20 -04:00
Kristian Høgsberg acedc03367 DRI2: Return event buffer head index in DRI2CreateDrawable.
And pass it to the DRI driver in AIGLX.
2008-03-09 21:39:19 -04:00
Julien Cristau 911f0c1476 Programs in hw/dmx/examples/ want client-side xkb headers. 2008-03-07 23:26:56 +01:00
Adam Jackson 3bf7ff7032 Size xf86DefaultModes explicitly.
i.e., don't check for the end of the list by ->name == NULL, since that
won't work now.  Fix the consumers of xf86DefaultModes to use the new
explicit size as well.
2008-03-07 09:25:06 -05:00
Adam Jackson 3fcb6445dc Fix segfault when a monitor exists but has no modes.
Thanks to Zhenyu Wang for finding this.
2008-03-07 08:30:19 -05:00
Aaron Plattner a8d760f567 Get modes code building with old X servers again.
This change uses XORG_VERSION_CURRENT < 7.0 to mean "server newer than 1.2"
since XORG_VERSION current went backwards at some point.
2008-03-06 14:42:00 -08:00
Jesse Barnes ca616b902b Allow RandR get output property to call into drivers
In order to report accurate values to users of the RandR property interface,
it's sometimes necessary to ask the driver to update the value (for example
when backlight brightness changes without the server's knowledge, due to hotkey
events or direct sysfs banging).

This patch wires up the core server code with a new xf86CrtcFuncs callback,
get_property, to allow for this.

The new code is available under the RANDR_13_INTERFACE define, which in turn
depends on the RANDR_12_INTERFACE code.
2008-03-06 13:50:58 -08:00
Adam Jackson 34b69e3bc0 Fix distcheck.
(cherry picked from commit 2a47accff8dccded4dfe031f9366c028ba927824)
2008-03-05 23:57:15 -05:00
Adam Jackson 27e7dacbf7 Make xf86InitialConfiguration slightly smarter.
Old heuristic was to find the first monitor that expressed a preference,
then attempt to get all other monitors to agree.  This doesn't work
particularly well when the two sets of modes don't precisely intersect,
you get overlapping-but-not-identical output geometry and things go wrong.

New heuristic is:
- Exact user preference, if given
- Exact output preference, if the same for all outputs
- Best (largest) mode of modes common to all outputs:
  - with the same aspect ratio as all outputs (may be NULL)
  - with 4:3 aspect ratio
- Then the old heuristic to try to get something lit

Note that it is simply not doable to have a reliable initial output guess if
you insist on trying to clone all outputs together.  It's far too easy to
end up with displays that simply don't have modes in common.  We need to
switch to right-of placement someday, once we're not limited to CRTC size
limits and we have working multi-GPU in RANDR.
2008-03-04 11:38:34 -05:00
Adam Jackson 95df04b744 Remove all mention of the vga driver from the config logic. 2008-03-04 10:59:24 -05:00
Peter Hutterer 4f2cd0ed96 Merge branch 'master' into mpx
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.

Conflicts:

	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c
2008-03-04 18:11:10 +10:30
James Cloos 613852ce6a Fix some documentation typos 2008-03-03 16:11:05 -05:00
Adam Jackson 708f07753f RANDR 1.2: Inherit PreferredMode from the global configuration, if any.
If you don't do this, then Modes "800x600" in the Display subsection will
be dutifully ignored and the driver will start at whatever resolution it
feels like.
2008-03-03 15:49:48 -05:00
Adam Jackson 605e6764df Fix Motif menu drawing in Xnest.
See also Red Hat bug #229350, OpenSolaris bug #6366490.
2008-03-03 15:45:17 -05:00
Adam Jackson 3b73d62791 xf86DDCMonitorSet: Honor the DisplaySize from the config file.
We honor sync ranges and pixel clock settings from the config here, no
reason to ignore DisplaySize.
2008-03-03 15:43:22 -05:00
David Nusinow f7ab2d3821 Add missing file from previous commit. 2008-03-02 18:36:25 -05:00
David Nusinow b5ce0e1d0b Bug #13860: Ensure that the DRI mode is in octal format. 2008-03-02 17:12:02 -05:00
Matthieu Herrb c934366424 use UTILS_SYS_LIBS to pass SYS_LIBS to utils/ioports correctly 2008-03-02 19:32:01 +01:00
David Nusinow 2bb9c1f36f bug #10008: Make Xvfb.1 document the correct default depth 2008-03-01 18:45:46 -05:00
George Sapountzis 3d64290547 clean some "unused" warnings 2008-03-01 19:49:24 +02:00
Maarten Maathuis 8af2c39bcc Fix big mistake in commit fd41f46ac6.
- When a mode is deleted, the name pointer is also free()'ed.
- This leaves other modes with an invalid pointer.
2008-03-01 16:54:01 +01:00
Eamon Walsh ef60632e20 dix: Modify callers of property and selection API to use new interfaces. 2008-02-29 18:01:37 -05:00
Eamon Walsh 34bf308a9e dix: Refactoring of selection code to allow for polyinstantiation.
Introduces dixLookupSelection() API.
Removes NumCurrentSelections from API.
2008-02-29 18:01:37 -05:00
Eamon Walsh d5715f7bea dix: Refactoring of property code to allow for polyinstantiation.
Introduces dixLookupProperty() API.
2008-02-29 18:01:37 -05:00
Adam Jackson b7eb92774a EDID 1.4: Print additional CVT support data in the log. 2008-02-29 16:01:15 -05:00
Adam Jackson 31014d88af EDID 1.4: Decode additional CVT support information.
Table 3.28: Display Range Limits & CVT Support Definition
2008-02-29 16:01:15 -05:00
Adam Jackson d1c48955f8 Fix CVT abuse in DDCModesFromStandardTiming.
CVT is enough different from GTF that it should not be used on monitors
that aren't expecting it.  This brings us closer to what the spec says
the correct behaviour is.
2008-02-29 16:01:15 -05:00
Adam Jackson 26c2e95fa5 Nuke a duplicate SYMFUNC(xf86CVTMode) 2008-02-29 16:01:15 -05:00
Adam Jackson ca5625b911 Add xf86GTFMode().
This should probably be shared like xf86CVTMode().
2008-02-29 16:01:15 -05:00
Adam Jackson 4cb4817c10 Remove the duplicate copy of xf86cvt.c 2008-02-29 16:01:15 -05:00
Adam Jackson e65e51a99b Constify the built-in mode tables. 2008-02-29 16:01:14 -05:00
Adam Jackson 6828d8fc2b Clean up DisplayModeRec handling in many places.
Use xf86DuplicateMode() instead of rolling our own, and change
malloc+memset to calloc.
2008-02-29 16:01:14 -05:00
Adam Jackson 85617b56e5 Remove some #if 0 guarding code duplicated in xf86Modes.c 2008-02-29 16:01:14 -05:00
Adam Jackson fd41f46ac6 Allow xf86DuplicateMode() to work correctly on read-only modes.
Before this it was meaningless to try to mark DisplayModeRec tables
const, since the mode name would be emitted as a pointer to an
anonymous string constant, and therefore would have to be fixed up by
ld.so and so couldn't live in .rodata.  With this change the standard
mode lists can live in .rodata, and modes duplicated from them will
have their names filled in on the fly.
2008-02-29 16:01:14 -05:00
Adam Jackson 8ac19d16a0 Add several comments documenting our EDID failures. 2008-02-29 16:01:14 -05:00
Kristian Høgsberg 13bfa5937d GLX: Adjust to changes in DRI driver interface. 2008-02-29 15:11:13 -05:00
Eamon Walsh 27bcf40cda XACE: Fix instances of DixUnknownAccess at hook callsites. 2008-02-28 16:43:43 -05:00
Tiago Vignatti aebd9dc252 Oops, there's one more parenthesis. 2008-02-28 01:22:31 -03:00
Dave Airlie 08afc70513 quirks: another LPL panel with the cm/mm wrong 2008-02-28 10:45:41 +10:00
Dodji Seketeli d74b0327e8 [Xephyr/GL] unbreak the build
Don't touch Xephyr DRI stuff when not compiling in a DRI environment.
2008-02-27 09:48:53 +01:00
Dave Airlie d12b7b6632 xf86Crtc: add higher level modesetting entry point.
For kernel modesetting work we need a bigger stick to beat the modesetting path
2008-02-27 07:09:14 +10:00
Tiago Vignatti c46f7b62d2 Fine, we don't need pciInit() anymore. Nuke, nuke, nuke... 2008-02-25 18:14:08 -03:00
Tiago Vignatti a9050d5424 Jesus, pciInit() was called 32 times in my machine without need!
xf86scanpci() will always call pciInit() before any other function, so
there's no need to guarantee it after.
2008-02-25 18:10:18 -03:00
Tiago Vignatti 81272f7ec9 Some doc clean up:
clean up legacy things in os-support/bus/Pci.c.

    Put InitOutput() comment to its right place.
2008-02-25 17:39:33 -03:00
Tiago Vignatti 7c582dd6de remove lnxPciInit() unused function. 2008-02-25 17:31:37 -03:00
Tiago Vignatti 9727db88d5 No more "-scanpci" given that we already have it in libpciaccess.
(Yeah, lets nuke dead code!)
2008-02-25 17:08:07 -03:00
Tiago Vignatti f19f7b8e53 Clean some garbage caused when pciaccess was merged:
FindPCIVideoInfo() function isn't need anymore.

    xf86scanpci() is being called only once so we don't need permanent
    (static) variables there.

    restorePciState() is not used for now (until we find why multiple
    cards aren't working).
2008-02-25 17:07:07 -03:00
Adam Jackson 4b50e71bf1 Bug #13736: Fix %bx in VBEGetPixelClock to match spec.
Reported by Yannick Henault.
2008-02-24 20:25:13 -05:00
Jeremy Huddleston 6dc369028d XQuartz: Quit now properly warns the user
(cherry picked from commit ed3d7b3959c2a0cb63e37210455bcc6cf195b807)
2008-02-23 00:28:41 -08:00
Adam Jackson e6a4cde16d Use the client-side XKB headers for the config utilities 2008-02-22 18:36:29 -05:00
Adam Jackson 347db49ebe s/via/openchrome/ in the autoconfig logic.
Xorg's via driver is effectively dead anyway.
2008-02-22 16:05:33 -05:00
Adam Jackson 69f7826767 Match Xephyr DRI definitions to the ones in xf86dri.h 2008-02-22 16:04:35 -05:00
Adam Jackson 24bebdded4 fbFillRegionTiled() is now dead code.
Only ever called from the old PaintWindow* screen hooks, but those are
gone now.  As a pleasant side effect, fb loses its #ifdef PANORAMIX.
2008-02-22 15:22:38 -05:00
Adam Jackson ee21aba6be Fix Xinerama's consolidated visual handling.
Formerly the code claimed it could only handle up to 256 visuals, which
was true.  Also true, but not explicitly stated, was that it could only
handle visuals with VID < 256.  If you have enough screens, and subsystems
that add lots of visuals, you can easily run off the end.  (Made worse
because we allocate visual IDs from the same pool as XIDs.)  If your app
then chooses a visual > 256, then the Xinerama code would throw BadMatch
on CreateColormap and your app wouldn't start.

With this change, PanoramiXVisualTable is gone.  Other subsystems that
were using it as a translation table between each screen's visuals now
use a PanoramiXTranslateVisual() helper.
2008-02-22 15:19:54 -05:00
Dodji Seketeli c14fd2a5cb [Xephyr/GL] properly route expose event on GL drawables
When an expose event happens on an host GL window paired with an
internal drawable, route that expose event to the clients listening
to the expose event on the internal drawable.
2008-02-21 15:33:02 +01:00
Dodji Seketeli 437c78ef9f [Xephyr/GL] don't crash when the host returns a NULL server string 2008-02-21 15:29:27 +01:00
Peter Hutterer 67a78e84a8 Revert "xfree86: plug a memory leak in xf86LoadModules."
This reverts commit 3abce3ea2b and
6cbaf15e61.

The memory returned to xf86LoadModule was allocated in doLoadModule, which
calls the respective module's PreInit. As it turns out, input and output
drivers store a pointer to the module elswhere, so freeing it in
xf86LoadModule is a bad idea.

For further reference: hw/xfree86/common/xf86Helper.c
    Input drivers: xf86InputDriverList[blah]->module = module;
    Output drivers: xf86DriverList[blah]->module = module;

Unloading the module would not look pretty then.
2008-02-19 21:31:50 +10:30
Jeremy Huddleston 5f5ec5db35 XQuartz: unsetenv("DISPLAY") before startx if X11.app can't connect to it.
Also fix casting to silence warning.
(cherry picked from commit a5cbf78471ec6e6ad672dc00118fc7edbd6ddc7c)
2008-02-19 00:01:42 -08:00